github-mirrors/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2026-03-07 10:37:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(server): assets in multiple albums duplicated in map view (#16245)

Browse Source
This commit is contained in:
Mert
2025-02-21 15:32:08 +03:00
committed by GitHub
parent 3925445de8
commit 616905211d
3 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/src/repositories/map.repository.ts
View File

@@ -76,7 +76,7 @@ export class MapRepository {
this.logger.log('Geodata import completed');
}
@GenerateSql({ params: [[DummyValue.UUID], []] })
@GenerateSql({ params: [[DummyValue.UUID], [DummyValue.UUID]] })
getMapMarkers(ownerIds: string[], albumIds: string[], options: MapMarkerSearchOptions = {}) {
const { isArchived, isFavorite, fileCreatedAfter, fileCreatedBefore } = options;
@@ -89,25 +89,31 @@ export class MapRepository {
.on('exif.longitude', 'is not', null),
)
.select(['id', 'exif.latitude as lat', 'exif.longitude as lon', 'exif.city', 'exif.state', 'exif.country'])
.leftJoin('albums_assets_assets', (join) => join.onRef('assets.id', '=', 'albums_assets_assets.assetsId'))
.where('isVisible', '=', true)
.$if(isArchived !== undefined, (q) => q.where('isArchived', '=', isArchived!))
.$if(isFavorite !== undefined, (q) => q.where('isFavorite', '=', isFavorite!))
.$if(fileCreatedAfter !== undefined, (q) => q.where('fileCreatedAt', '>=', fileCreatedAfter!))
.$if(fileCreatedBefore !== undefined, (q) => q.where('fileCreatedAt', '<=', fileCreatedBefore!))
.where('deletedAt', 'is', null)
.where((builder) => {
.where((eb) => {
const expression: Expression<SqlBool>[] = [];
if (ownerIds.length > 0) {
expression.push(builder('ownerId', 'in', ownerIds));
expression.push(eb('ownerId', 'in', ownerIds));
}
if (albumIds.length > 0) {
expression.push(builder('albums_assets_assets.albumsId', 'in', albumIds));
expression.push(
eb.exists((eb) =>
eb
.selectFrom('albums_assets_assets')
.whereRef('assets.id', '=', 'albums_assets_assets.assetsId')
.where('albums_assets_assets.albumsId', 'in', albumIds),
),
);
}
return builder.or(expression);
return eb.or(expression);
})
.orderBy('fileCreatedAt', 'desc')
.execute() as Promise<MapMarker[]>;