From 065d885ca0bb68e25c02aeb80e7536d81544926d Mon Sep 17 00:00:00 2001 From: Lukas Date: Thu, 23 Jan 2025 21:33:24 -0500 Subject: [PATCH] fix(server): Fix for sorting faces during merging (#15571) * Fix for sorting faces * Put uneccessary orderBy in if statement --- server/src/repositories/person.repository.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/server/src/repositories/person.repository.ts b/server/src/repositories/person.repository.ts index fdcecd9d0a..45183f39d6 100644 --- a/server/src/repositories/person.repository.ts +++ b/server/src/repositories/person.repository.ts @@ -133,10 +133,6 @@ export class PersonRepository implements IPersonRepository { ) .where('person.ownerId', '=', userId) .orderBy('person.isHidden', 'asc') - .orderBy(sql`NULLIF(person.name, '') is null`, 'asc') - .orderBy((eb) => eb.fn.count('asset_faces.assetId'), 'desc') - .orderBy(sql`NULLIF(person.name, '')`, sql`asc nulls last`) - .orderBy('person.createdAt') .having((eb) => eb.or([ eb('person.name', '!=', ''), @@ -161,6 +157,13 @@ export class PersonRepository implements IPersonRepository { ), ), ) + .$if(!options?.closestFaceAssetId, (qb) => + qb + .orderBy(sql`NULLIF(person.name, '') is null`, 'asc') + .orderBy((eb) => eb.fn.count('asset_faces.assetId'), 'desc') + .orderBy(sql`NULLIF(person.name, '')`, sql`asc nulls last`) + .orderBy('person.createdAt'), + ) .$if(!options?.withHidden, (qb) => qb.where('person.isHidden', '=', false)) .offset(pagination.skip ?? 0) .limit(pagination.take + 1)