Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-05-31 04:05:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: mobile album sync always triggered when opening the app (#14233)

Browse Source 
* fix: mobile album sync always triggered when opening the app

* send lastModifiedAssetTimestamp when get individual album
This commit is contained in:
Alex 2024-11-19 15:36:55 -06:00 committed by GitHub
parent 69e50d0d27
commit f8bbc6eabe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e2e/src/api/specs/album.e2e-spec.ts
View File

@ -141,6 +141,7 @@ describe('/albums', () => {
expect(body).toEqual({ expect(body).toEqual({
...user1Albums[0], ...user1Albums[0],
assets: [expect.objectContaining({ isFavorite: false })], assets: [expect.objectContaining({ isFavorite: false })],
lastModifiedAssetTimestamp: expect.any(String),
}); });
}); });
@ -297,6 +298,7 @@ describe('/albums', () => {
expect(body).toEqual({ expect(body).toEqual({
...user1Albums[0], ...user1Albums[0],
assets: [expect.objectContaining({ id: user1Albums[0].assets[0].id })], assets: [expect.objectContaining({ id: user1Albums[0].assets[0].id })],
lastModifiedAssetTimestamp: expect.any(String),
}); });
}); });
@ -327,6 +329,7 @@ describe('/albums', () => {
expect(body).toEqual({ expect(body).toEqual({
...user1Albums[0], ...user1Albums[0],
assets: [expect.objectContaining({ id: user1Albums[0].assets[0].id })], assets: [expect.objectContaining({ id: user1Albums[0].assets[0].id })],
lastModifiedAssetTimestamp: expect.any(String),
}); });
}); });
@ -340,6 +343,7 @@ describe('/albums', () => {
...user1Albums[0], ...user1Albums[0],
assets: [], assets: [],
assetCount: 1, assetCount: 1,
lastModifiedAssetTimestamp: expect.any(String),
}); });
}); });
}); });

4
server/src/services/album.service.ts
View File

@ -74,7 +74,7 @@ export class AlbumService extends BaseService {
startDate: albumMetadata[album.id].startDate, startDate: albumMetadata[album.id].startDate,
endDate: albumMetadata[album.id].endDate, endDate: albumMetadata[album.id].endDate,
assetCount: albumMetadata[album.id].assetCount, 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 withAssets = dto.withoutAssets === undefined ? true : !dto.withoutAssets;
const album = await this.findOrFail(id, { withAssets }); const album = await this.findOrFail(id, { withAssets });
const [albumMetadataForIds] = await this.albumRepository.getMetadataForIds([album.id]); const [albumMetadataForIds] = await this.albumRepository.getMetadataForIds([album.id]);
const lastModifiedAsset = await this.assetRepository.getLastUpdatedAssetForAlbumId(album.id);
return { return {
...mapAlbum(album, withAssets, auth), ...mapAlbum(album, withAssets, auth),
startDate: albumMetadataForIds.startDate, startDate: albumMetadataForIds.startDate,
endDate: albumMetadataForIds.endDate, endDate: albumMetadataForIds.endDate,
assetCount: albumMetadataForIds.assetCount, assetCount: albumMetadataForIds.assetCount,
lastModifiedAssetTimestamp: lastModifiedAsset?.updatedAt,
}; };
} }