DebaucheryLibrarian
/
traxxx-web
1
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: DebaucheryLibrarian:83efdf59d478583e1fa57da80c2e5e038e235016
Branches Tags
DebaucheryLibrarian:main
...
compare: DebaucheryLibrarian:233829223e2a2a623a9a4787c9d7b28734413342
Branches Tags
DebaucheryLibrarian:main

2 Commits
83efdf59d4 ... 233829223e

Author SHA1 Message Date
DebaucheryLibrarian 233829223e 0.41.22 2025-12-15 01:54:43 +01:00
DebaucheryLibrarian 456b69f1ca Fixed fallback affiliate query causing duplicate results in channel aggregate. 2025-12-15 01:54:41 +01:00
3 changed files with 7 additions and 7 deletions
Show Stats Expand all files Collapse all files

4
package-lock.json generated
View File

@ -1,11 +1,11 @@
{ {
"name": "traxxx-web", "name": "traxxx-web",
"version": "0.41.21", "version": "0.41.22",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"version": "0.41.21", "version": "0.41.22",
"dependencies": { "dependencies": {
"@brillout/json-serializer": "^0.5.8", "@brillout/json-serializer": "^0.5.8",
"@dicebear/collection": "^7.0.5", "@dicebear/collection": "^7.0.5",

2
package.json
View File

@ -87,7 +87,7 @@
"overrides": { "overrides": {
"vite": "$vite" "vite": "$vite"
}, },
"version": "0.41.21", "version": "0.41.22",
"imports": { "imports": {
"#/*": "./*.js" "#/*": "./*.js"
} }

8
src/entities.js
View File

@ -97,18 +97,18 @@ export async function fetchEntitiesById(entityIds, options = {}, reqUser) {
.select( .select(
'entities.*', 'entities.*',
knex.raw('row_to_json(parents) as parent'), knex.raw('row_to_json(parents) as parent'),
knex.raw('row_to_json(affiliates) as affiliate'), knex.raw('coalesce(row_to_json(affiliates), row_to_json(network_affiliates)) as affiliate'),
) )
.whereIn('entities.id', entityIds) .whereIn('entities.id', entityIds)
.leftJoin('entities as parents', 'parents.id', 'entities.parent_id') .leftJoin('entities as parents', 'parents.id', 'entities.parent_id')
.leftJoin('affiliates', knex.raw('affiliates.entity_id in (entities.id, parents.id)')) .leftJoin('affiliates', 'affiliates.entity_id', 'entities.id')
.leftJoin('affiliates as network_affiliates', 'network_affiliates.entity_id', 'parents.id')
.modify((builder) => { .modify((builder) => {
if (options.order) { if (options.order) {
builder.orderBy(...options.order); builder.orderBy(...options.order);
} }
}) })
.orderBy(knex.raw('case when affiliates.entity_id = entities.id then 1 else 2 end')) .groupBy('entities.id', 'parents.id', 'affiliates.id', 'affiliates.entity_id', 'network_affiliates.id', 'network_affiliates.entity_id'),
.groupBy('entities.id', 'parents.id', 'affiliates.id', 'affiliates.entity_id'),
options.includeChildren ? knex('entities') options.includeChildren ? knex('entities')
.whereIn('entities.parent_id', entityIds) .whereIn('entities.parent_id', entityIds)
.whereNot('type', 'info') .whereNot('type', 'info')