Merge branch 'main' into feat/notification-email-template

immich-app · Dec 3, 2024 · f82c0da · f82c0da
2 parents 498af7a + ba9b935
commit f82c0da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/server/src/queries/person.repository.sql b/server/src/queries/person.repository.sql
@@ -20,13 +20,12 @@ SELECT
   "person"."isHidden" AS "person_isHidden"
 FROM
   "person" "person"
-  LEFT JOIN "asset_faces" "face" ON "face"."personId" = "person"."id"
+  INNER JOIN "asset_faces" "face" ON "face"."personId" = "person"."id"
   INNER JOIN "assets" "asset" ON "asset"."id" = "face"."assetId"
   AND ("asset"."deletedAt" IS NULL)
 WHERE
   "person"."ownerId" = $1
   AND "asset"."isArchived" = false
-  AND "person"."thumbnailPath" != ''
   AND "person"."isHidden" = false
 GROUP BY
   "person"."id"
@@ -257,15 +256,12 @@ SELECT
   ) AS "hidden"
 FROM
   "person" "person"
-  LEFT JOIN "asset_faces" "face" ON "face"."personId" = "person"."id"
+  INNER JOIN "asset_faces" "face" ON "face"."personId" = "person"."id"
   INNER JOIN "assets" "asset" ON "asset"."id" = "face"."assetId"
   AND ("asset"."deletedAt" IS NULL)
 WHERE
   "person"."ownerId" = $1
   AND "asset"."isArchived" = false
-  AND "person"."thumbnailPath" != ''
-HAVING
-  COUNT("face"."assetId") != 0
 
 -- PersonRepository.getFacesByIds
 SELECT

diff --git a/server/src/repositories/person.repository.ts b/server/src/repositories/person.repository.ts
@@ -86,7 +86,7 @@ export class PersonRepository implements IPersonRepository {
   getAllForUser(pagination: PaginationOptions, userId: string, options?: PersonSearchOptions): Paginated<PersonEntity> {
     const queryBuilder = this.personRepository
       .createQueryBuilder('person')
-      .leftJoin('person.faces', 'face')
+      .innerJoin('person.faces', 'face')
       .where('person.ownerId = :userId', { userId })
       .innerJoin('face.asset', 'asset')
       .andWhere('asset.isArchived = false')
@@ -95,7 +95,6 @@ export class PersonRepository implements IPersonRepository {
       .addOrderBy('COUNT(face.assetId)', 'DESC')
       .addOrderBy("NULLIF(person.name, '')", 'ASC', 'NULLS LAST')
       .addOrderBy('person.createdAt')
-      .andWhere("person.thumbnailPath != ''")
       .having("person.name != '' OR COUNT(face.assetId) >= :faces", { faces: options?.minimumFaceCount || 1 })
       .groupBy('person.id');
     if (!options?.withHidden) {
@@ -232,14 +231,12 @@ export class PersonRepository implements IPersonRepository {
   async getNumberOfPeople(userId: string): Promise<PeopleStatistics> {
     const items = await this.personRepository
       .createQueryBuilder('person')
-      .leftJoin('person.faces', 'face')
+      .innerJoin('person.faces', 'face')
       .where('person.ownerId = :userId', { userId })
       .innerJoin('face.asset', 'asset')
       .andWhere('asset.isArchived = false')
-      .andWhere("person.thumbnailPath != ''")
       .select('COUNT(DISTINCT(person.id))', 'total')
       .addSelect('COUNT(DISTINCT(person.id)) FILTER (WHERE person.isHidden = true)', 'hidden')
-      .having('COUNT(face.assetId) != 0')
       .getRawOne();
 
     if (items == undefined) {