fix getPersonAlbums

shefing · Oct 30, 2023 · c69fb58 · c69fb58
1 parent 4582231
commit c69fb58
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 8 deletions.
diff --git a/cli/src/api/open-api/api.ts b/cli/src/api/open-api/api.ts
diff --git a/mobile/openapi/doc/AlbumsForPersonResponseDto.md b/mobile/openapi/doc/AlbumsForPersonResponseDto.md
diff --git a/mobile/openapi/lib/model/albums_for_person_response_dto.dart b/mobile/openapi/lib/model/albums_for_person_response_dto.dart
diff --git a/mobile/openapi/test/albums_for_person_response_dto_test.dart b/mobile/openapi/test/albums_for_person_response_dto_test.dart
diff --git a/server/immich-openapi-specs.json b/server/immich-openapi-specs.json
@@ -5747,12 +5747,16 @@
             "format": "uuid",
             "type": "string"
           },
+          "albumName": {
+            "type": "string"
+          },
           "assetCount": {
             "type": "integer"
           }
         },
         "required": [
           "albumId",
+          "albumName",
           "assetCount"
         ],
         "type": "object"

diff --git a/server/src/domain/album/album-response.dto.ts b/server/src/domain/album/album-response.dto.ts
@@ -29,13 +29,16 @@ export class AlbumResponseDto {
 export class AlbumsForPersonResponseDto {
   @ValidateUUID()
   albumId!: string;
+  @ApiProperty({ type: 'string' })
+  albumName!: string;
   @ApiProperty({ type: 'integer' })
   assetCount!: number;
 }
 
 export function mapAlbumCount(entity: AlbumAssetCount): AlbumsForPersonResponseDto {
   return {
     albumId: entity.albumId,
+    albumName: entity.albumName,
     assetCount: entity.assetCount,
   };
 }

diff --git a/server/src/domain/repositories/album.repository.ts b/server/src/domain/repositories/album.repository.ts
@@ -4,6 +4,7 @@ export const IAlbumRepository = 'IAlbumRepository';
 
 export interface AlbumAssetCount {
   albumId: string;
+  albumName: string;
   assetCount: number;
 }
 

diff --git a/server/src/infra/repositories/album.repository.ts b/server/src/infra/repositories/album.repository.ts
@@ -77,6 +77,7 @@ export class AlbumRepository implements IAlbumRepository {
 
     return countByAlbums.map<AlbumAssetCount>((albumCount) => ({
       albumId: albumCount['album_id'],
+      albumName: '',
       assetCount: Number(albumCount['asset_count']),
     }));
   }

diff --git a/server/src/infra/repositories/person.repository.ts b/server/src/infra/repositories/person.repository.ts
@@ -165,17 +165,18 @@ export class PersonRepository implements IPersonRepository {
     const countByAlbums = await this.albumRepository
     .createQueryBuilder('album')
     .select('album.id')
-    .addSelect('COUNT(albums_assets.assetsId)', 'asset_count')
-    .innerJoin('albums_assets_assets', 'albums_assets', 'albums_assets.albumsId = album.id')
-    .innerJoin('asset_faces', 'asset_faces', 'asset_faces.assetId = albums_assets.assetId')
-    .innerJoin('person', 'person', 'asset_faces.personId = person.id')
-    .where('person.id = :personId', { personId })
-    .groupBy('person.id, album.name')
-    .orderBy('person.id, album.name')
+    .addSelect('album.albumName')
+    .addSelect('COUNT(asset.id)', 'asset_count')    
+    .innerJoin('album.assets', 'asset')
+    .innerJoin('asset.faces', 'face')
+    .where('face.personId = :personId', { personId })
+    .groupBy('face.personId, album.id')
+    .orderBy('face.personId, album.id')
     .getRawMany();
 
     return countByAlbums.map<AlbumAssetCount>((albumCount) => ({
       albumId: albumCount['album_id'],
+      albumName: albumCount['album_name'],
       assetCount: Number(albumCount['asset_count']),
     }));
   }

diff --git a/web/src/api/open-api/api.ts b/web/src/api/open-api/api.ts