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

Fixed fallback affiliate query causing duplicate results in channel aggregate.

This commit is contained in:
DebaucheryLibrarian 2025-12-15 01:54:41 +01:00
parent 83efdf59d4
commit 456b69f1ca
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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')