diff --git a/e2e/src/api/specs/album.e2e-spec.ts b/e2e/src/api/specs/album.e2e-spec.ts index 9e925c4021..5c101a0793 100644 --- a/e2e/src/api/specs/album.e2e-spec.ts +++ b/e2e/src/api/specs/album.e2e-spec.ts @@ -141,6 +141,7 @@ describe('/albums', () => { expect(body).toEqual({ ...user1Albums[0], assets: [expect.objectContaining({ isFavorite: false })], + lastModifiedAssetTimestamp: expect.any(String), }); }); @@ -297,6 +298,7 @@ describe('/albums', () => { expect(body).toEqual({ ...user1Albums[0], assets: [expect.objectContaining({ id: user1Albums[0].assets[0].id })], + lastModifiedAssetTimestamp: expect.any(String), }); }); @@ -327,6 +329,7 @@ describe('/albums', () => { expect(body).toEqual({ ...user1Albums[0], assets: [expect.objectContaining({ id: user1Albums[0].assets[0].id })], + lastModifiedAssetTimestamp: expect.any(String), }); }); @@ -340,6 +343,7 @@ describe('/albums', () => { ...user1Albums[0], assets: [], assetCount: 1, + lastModifiedAssetTimestamp: expect.any(String), }); }); }); diff --git a/server/src/services/album.service.ts b/server/src/services/album.service.ts index 2cf83e9b99..e57e6b168c 100644 --- a/server/src/services/album.service.ts +++ b/server/src/services/album.service.ts @@ -74,7 +74,7 @@ export class AlbumService extends BaseService { startDate: albumMetadata[album.id].startDate, endDate: albumMetadata[album.id].endDate, assetCount: albumMetadata[album.id].assetCount, - lastModifiedAssetTimestamp: lastModifiedAsset?.fileModifiedAt, + lastModifiedAssetTimestamp: lastModifiedAsset?.updatedAt, }; }), ); @@ -86,12 +86,14 @@ 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, endDate: albumMetadataForIds.endDate, assetCount: albumMetadataForIds.assetCount, + lastModifiedAssetTimestamp: lastModifiedAsset?.updatedAt, }; }