fix(server) remove unnecessary getLastUpdatedAssetForAlbumId call for GET /api/album/:id

also remove getLastUpdatedAssetForAlbumId query as it is no longer referenced

Author: PathToLife

server/src/repositories/album.repository.ts

@@ -142,19 +142,19 @@ export class AlbumRepository {
           eb.fn
             .min<any>(
               sql`
-              ("assets"."localDateTime" AT TIME ZONE 'UTC'::text)
-                                                  ::date
-            `,
+                ("assets"."localDateTime" AT TIME ZONE 'UTC'::text)
+                                                    ::date
+              `,
             )
             .as('startDate'),
         )
         .select((eb) =>
           eb.fn
             .max<any>(
               sql`
-              ("assets"."localDateTime" AT TIME ZONE 'UTC'::text)
-                                                  ::date
-            `,
+                ("assets"."localDateTime" AT TIME ZONE 'UTC'::text)
+                                                    ::date
+              `,
             )
             .as('endDate'),
         )
@@ -163,17 +163,17 @@ export class AlbumRepository {
           eb.fn
             .max<any>(
               sql`
-              ("assets"."updatedAt" AT TIME ZONE 'UTC'::text)
-                                                  ::date
-            `,
+                ("assets"."updatedAt" AT TIME ZONE 'UTC'::text)
+                                                    ::date
+              `,
             )
             .as('lastModifiedAssetTimestamp'),
         )
         .select((eb) =>
           sql<number>`
-          ${eb.fn.count('assets.id')}
-                ::int
-        `.as('assetCount'),
+            ${eb.fn.count('assets.id')}
+                  ::int
+          `.as('assetCount'),
         )
         .where('album_assets.albumsId', 'in', ids)
         .where('assets.deletedAt', 'is', null)

server/src/repositories/asset.repository.ts

@@ -728,17 +728,6 @@ export class AssetRepository {
     return paginationHelper(items as any as AssetEntity[], pagination.take);
   }
 
-  getLastUpdatedAssetForAlbumId(albumId: string): Promise<AssetEntity | undefined> {
-    return this.db
-      .selectFrom('assets')
-      .selectAll('assets')
-      .innerJoin('albums_assets_assets', 'assets.id', 'albums_assets_assets.assetsId')
-      .where('albums_assets_assets.albumsId', '=', asUuid(albumId))
-      .orderBy('updatedAt', 'desc')
-      .limit(1)
-      .executeTakeFirst() as Promise<AssetEntity | undefined>;
-  }
-
   getStatistics(ownerId: string, { isArchived, isFavorite, isTrashed }: AssetStatsOptions): Promise<AssetStats> {
     return this.db
       .selectFrom('assets')

server/src/services/album.service.ts

@@ -75,14 +75,13 @@ export class AlbumService extends BaseService {
     const withAssets = dto.withoutAssets === undefined ? true : !dto.withoutAssets;
     const album = await this.findOrFail(id, { withAssets });
     const [albumMetadataForIds] = await this.albumRepository.getMetadataForIds([album.id]);
-    const lastModifiedAsset = await this.assetRepository.getLastUpdatedAssetForAlbumId(album.id);
 
     return {
       ...mapAlbum(album, withAssets, auth),
       startDate: albumMetadataForIds?.startDate ?? undefined,
       endDate: albumMetadataForIds?.endDate ?? undefined,
       assetCount: albumMetadataForIds?.assetCount ?? 0,
-      lastModifiedAssetTimestamp: lastModifiedAsset?.updatedAt,
+      lastModifiedAssetTimestamp: albumMetadataForIds?.lastModifiedAssetTimestamp ?? undefined,
     };
   }
 

server/test/repositories/asset.repository.mock.ts

@@ -21,7 +21,6 @@ export const newAssetRepositoryMock = (): Mocked<RepositoryInterface<AssetReposi
     getByChecksums: vitest.fn(),
     getUploadAssetIdByChecksum: vitest.fn(),
     getRandom: vitest.fn(),
-    getLastUpdatedAssetForAlbumId: vitest.fn(),
     getAll: vitest.fn().mockResolvedValue({ items: [], hasNextPage: false }),
     getAllByDeviceId: vitest.fn(),
     getLivePhotoCount: vitest.fn(),