add albumThumbnailAssetId

shefing · Oct 31, 2023 · 102982d · 102982d
1 parent 8044d9a
commit 102982d
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 9 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
@@ -5750,13 +5750,18 @@
           "albumName": {
             "type": "string"
           },
+          "albumThumbnailAssetId": {
+            "format": "uuid",
+            "type": "string"
+          },
           "assetCount": {
             "type": "integer"
           }
         },
         "required": [
           "albumId",
           "albumName",
+          "albumThumbnailAssetId",
           "assetCount"
         ],
         "type": "object"

diff --git a/server/src/domain/album/album-response.dto.ts b/server/src/domain/album/album-response.dto.ts
@@ -3,7 +3,7 @@ import { ApiProperty } from '@nestjs/swagger';
 import { AssetResponseDto, mapAsset } from '../asset';
 import { UserResponseDto, mapUser } from '../user';
 import { ValidateUUID } from '../domain.util';
-import { AlbumAssetCount } from '../repositories/album.repository';
+import { AlbumInfoAssetCount } from '../repositories/album.repository';
 
 
 export class AlbumResponseDto {
@@ -31,14 +31,17 @@ export class AlbumsForPersonResponseDto {
   albumId!: string;
   @ApiProperty({ type: 'string' })
   albumName!: string;
+  @ValidateUUID()
+  albumThumbnailAssetId!: string;
   @ApiProperty({ type: 'integer' })
   assetCount!: number;
 }
 
-export function mapAlbumCount(entity: AlbumAssetCount): AlbumsForPersonResponseDto {
+export function mapAlbumCount(entity: AlbumInfoAssetCount): AlbumsForPersonResponseDto {
   return {
     albumId: entity.albumId,
     albumName: entity.albumName,
+    albumThumbnailAssetId: entity.albumThumbnailAssetId,
     assetCount: entity.assetCount,
   };
 }

diff --git a/server/src/domain/repositories/album.repository.ts b/server/src/domain/repositories/album.repository.ts
@@ -3,8 +3,14 @@ import { AlbumEntity } from '@app/infra/entities';
 export const IAlbumRepository = 'IAlbumRepository';
 
 export interface AlbumAssetCount {
+  albumId: string;
+  assetCount: number;
+}
+
+export interface AlbumInfoAssetCount {
   albumId: string;
   albumName: string;
+  albumThumbnailAssetId: string;
   assetCount: number;
 }
 

diff --git a/server/src/domain/repositories/person.repository.ts b/server/src/domain/repositories/person.repository.ts
@@ -1,5 +1,5 @@
 import { AssetEntity, AssetFaceEntity, PersonEntity } from '@app/infra/entities';
-import { AlbumAssetCount } from './album.repository';
+import { AlbumInfoAssetCount } from './album.repository';
 
 export const IPersonRepository = 'IPersonRepository';
 
@@ -37,7 +37,7 @@ export interface IPersonRepository {
   getAssets(personId: string): Promise<AssetEntity[]>;
   prepareReassignFaces(data: UpdateFacesData): Promise<string[]>;
   reassignFaces(data: UpdateFacesData): Promise<number>;
-  getAlbums(personId: string): Promise<AlbumAssetCount[]>;
+  getAlbums(personId: string): Promise<AlbumInfoAssetCount[]>;
 
   create(entity: Partial<PersonEntity>): Promise<PersonEntity>;
   update(entity: Partial<PersonEntity>): Promise<PersonEntity>;

diff --git a/server/src/infra/repositories/album.repository.ts b/server/src/infra/repositories/album.repository.ts
@@ -77,7 +77,6 @@ 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
@@ -1,5 +1,5 @@
 import {
-  AlbumAssetCount,
+  AlbumInfoAssetCount,
   AssetFaceId,
   IPersonRepository,
   PersonNameSearchOptions,
@@ -161,11 +161,12 @@ export class PersonRepository implements IPersonRepository {
     });
   }
 
-  async getAlbums(personId: string): Promise<AlbumAssetCount[]> {
+  async getAlbums(personId: string): Promise<AlbumInfoAssetCount[]> {
     const countByAlbums = await this.albumRepository
     .createQueryBuilder('album')
     .select('album.id')
     .addSelect('album.albumName')
+    .addSelect('album.albumThumbnailAssetId')
     .addSelect('COUNT(asset.id)', 'asset_count')    
     .innerJoin('album.assets', 'asset')
     .innerJoin('asset.faces', 'face')
@@ -174,9 +175,10 @@ export class PersonRepository implements IPersonRepository {
     .orderBy('face.personId, album.id')
     .getRawMany();
 
-    return countByAlbums.map<AlbumAssetCount>((albumCount) => ({
+    return countByAlbums.map<AlbumInfoAssetCount>((albumCount) => ({
       albumId: albumCount['album_id'],
       albumName: albumCount['album_albumName'],
+      albumThumbnailAssetId: albumCount['album_albumThumbnailAssetId'],
       assetCount: Number(albumCount['asset_count']),
     }));
   }

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