fix: people ordering incorrect (#19298)

server/src/queries/person.repository.sql

@@ -12,6 +12,37 @@ delete from "person"
 where
   "person"."id" in ($1)
 
+-- PersonRepository.getAllForUser
+select
+  "person".*
+from
+  "person"
+  inner join "asset_faces" on "asset_faces"."personId" = "person"."id"
+  inner join "assets" on "asset_faces"."assetId" = "assets"."id"
+  and "assets"."visibility" = 'timeline'
+  and "assets"."deletedAt" is null
+where
+  "person"."ownerId" = $1
+  and "asset_faces"."deletedAt" is null
+  and "person"."isHidden" = $2
+group by
+  "person"."id"
+having
+  (
+    "person"."name" != $3
+    or count("asset_faces"."assetId") >= $4
+  )
+order by
+  "person"."isHidden" asc,
+  "person"."isFavorite" desc,
+  NULLIF(person.name, '') asc nulls last,
+  count("asset_faces"."assetId") desc,
+  "person"."createdAt"
+limit
+  $5
+offset
+  $6
+
 -- PersonRepository.getAllWithoutFaces
 select
   "person".*

server/src/repositories/person.repository.ts

@@ -138,6 +138,7 @@ export class PersonRepository {
       .stream();
   }
 
+  @GenerateSql({ params: [{ take: 1, skip: 0 }, DummyValue.UUID] })
   async getAllForUser(pagination: PaginationOptions, userId: string, options?: PersonSearchOptions) {
     const items = await this.db
       .selectFrom('person')
@@ -179,8 +180,8 @@ export class PersonRepository {
       )
       .$if(!options?.closestFaceAssetId, (qb) =>
         qb
+          .orderBy(sql`NULLIF(person.name, '')`, (om) => om.asc().nullsLast())
           .orderBy((eb) => eb.fn.count('asset_faces.assetId'), 'desc')
-          .orderBy(sql`NULLIF(person.name, '') asc nulls last`)
           .orderBy('person.createdAt'),
       )
       .$if(!options?.withHidden, (qb) => qb.where('person.isHidden', '=', false))