Merge f1111bbc62 into baad38f0e6

e2e/src/api/specs/person.e2e-spec.ts

@@ -122,7 +122,7 @@ describe('/people', () => {
       expect(status).toBe(200);
       expect(body).toEqual({
         hasNextPage: false,
-        total: 11,
+        total: 10,
         hidden: 1,
         people: [
           expect.objectContaining({ name: 'Freddy' }),
@@ -144,7 +144,7 @@ describe('/people', () => {
 
       expect(status).toBe(200);
       expect(body.hasNextPage).toBe(false);
-      expect(body.total).toBe(11); // All persons
+      expect(body.total).toBe(10); // All persons
       expect(body.hidden).toBe(1); // 'hidden_person'
 
       const people = body.people as PersonResponseDto[];
@@ -170,7 +170,7 @@ describe('/people', () => {
       expect(status).toBe(200);
       expect(body).toEqual({
         hasNextPage: false,
-        total: 11,
+        total: 10,
         hidden: 1,
         people: [
           expect.objectContaining({ name: 'Freddy' }),
@@ -195,7 +195,7 @@ describe('/people', () => {
       expect(status).toBe(200);
       expect(body).toEqual({
         hasNextPage: true,
-        total: 11,
+        total: 10,
         hidden: 1,
         people: [expect.objectContaining({ name: 'Alice' })],
       });

server/src/queries/person.repository.sql

@@ -259,8 +259,13 @@ where
           and "asset"."visibility" = 'timeline'
           and "asset"."deletedAt" is null
       )
+    having
+      (
+        "person"."name" != $2
+        or count("asset_face"."assetId") >= $3
+      )
   )
-  and "person"."ownerId" = $2
+  and "person"."ownerId" = $4
 
 -- PersonRepository.refreshFaces
 with

server/src/repositories/person.repository.ts

@@ -358,7 +358,7 @@ export class PersonRepository {
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
-  getNumberOfPeople(userId: string) {
+  getNumberOfPeople(userId: string, options?: PersonSearchOptions) {
     const zero = sql.lit(0);
     return this.db
       .selectFrom('person')
@@ -368,6 +368,12 @@ export class PersonRepository {
             .selectFrom('asset_face')
             .whereRef('asset_face.personId', '=', 'person.id')
             .where('asset_face.deletedAt', 'is', null)
+            .having((eb) =>
+              eb.or([
+                eb('person.name', '!=', ''),
+                eb((innerEb) => innerEb.fn.count('asset_face.assetId'), '>=', options?.minimumFaceCount || 1),
+              ]),
+            )
             .where((eb) =>
               eb.exists((eb) =>
                 eb

server/src/services/person.service.ts

@@ -67,7 +67,10 @@ export class PersonService extends BaseService {
       withHidden,
       closestFaceAssetId,
     });
-    const { total, hidden } = await this.personRepository.getNumberOfPeople(auth.user.id);
+    const { total, hidden } = await this.personRepository.getNumberOfPeople(auth.user.id, {
+      minimumFaceCount: machineLearning.facialRecognition.minFaces,
+      withHidden,
+    });
 
     return {
       people: items.map((person) => mapPerson(person)),