github-mirrors/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2026-03-04 09:57:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: do not select album in time bucket query (#17662)

Browse Source
This commit is contained in:
Daniel Dietzler
2025-04-16 23:52:22 +02:00
committed by GitHub
parent 29b30570bf
commit 8b38f8a58d
3 changed files with 5 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/src/repositories/asset.repository.ts
View File

@@ -9,7 +9,6 @@ import {
hasPeople,
searchAssetBuilder,
truncatedDate,
withAlbums,
withExif,
withFaces,
withFacesAndPeople,
@@ -381,16 +380,6 @@ export class AssetRepository {
await this.db.deleteFrom('assets').where('ownerId', '=', ownerId).execute();
}
async getByAlbumId(pagination: PaginationOptions, albumId: string): Paginated<AssetEntity> {
const items = await withAlbums(this.db.selectFrom('assets'), { albumId })
.selectAll('assets')
.where('deletedAt', 'is', null)
.orderBy('fileCreatedAt', 'desc')
.execute();
return paginationHelper(items as any as AssetEntity[], pagination.take);
}
async getByDeviceIds(ownerId: string, deviceId: string, deviceAssetIds: string[]): Promise<string[]> {
const assets = await this.db
.selectFrom('assets')
@@ -760,7 +749,11 @@ export class AssetRepository {
.selectFrom('assets')
.selectAll('assets')
.$call(withExif)
.$if(!!options.albumId, (qb) => withAlbums(qb, { albumId: options.albumId }))
.$if(!!options.albumId, (qb) =>
qb
.innerJoin('albums_assets_assets', 'albums_assets_assets.assetsId', 'assets.id')
.where('albums_assets_assets.albumsId', '=', options.albumId!),
)
.$if(!!options.personId, (qb) => hasPeople(qb, [options.personId!]))
.$if(!!options.userIds, (qb) => qb.where('assets.ownerId', '=', anyUuid(options.userIds!)))
.$if(options.isArchived !== undefined, (qb) => qb.where('assets.isArchived', '=', options.isArchived!))