1
0
mirror of https://github.com/immich-app/immich.git synced 2024-11-28 09:33:27 +02:00

fix: album performances (#5224)

* fix: album performances

* fix: tests
This commit is contained in:
martin 2023-11-21 15:49:53 +01:00 committed by GitHub
parent c46e82561e
commit c438e17954
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions

View File

@ -81,7 +81,8 @@ export class AlbumService {
async get(authUser: AuthUserDto, id: string, dto: AlbumInfoDto): Promise<AlbumResponseDto> {
await this.access.requirePermission(authUser, Permission.ALBUM_READ, id);
await this.albumRepository.updateThumbnails();
return mapAlbum(await this.findOrFail(id, { withAssets: true }), !dto.withoutAssets);
const withAssets = dto.withoutAssets === undefined ? true : !dto.withoutAssets;
return mapAlbum(await this.findOrFail(id, { withAssets }), !dto.withoutAssets);
}
async create(authUser: AuthUserDto, dto: CreateAlbumDto): Promise<AlbumResponseDto> {

View File

@ -56,6 +56,7 @@ export class AlbumRepository implements IAlbumRepository {
],
relations: { owner: true, sharedUsers: true },
order: { createdAt: 'DESC' },
relationLoadStrategy: 'query',
});
}
@ -91,6 +92,7 @@ export class AlbumRepository implements IAlbumRepository {
relations: { sharedUsers: true, sharedLinks: true, owner: true },
where: { ownerId },
order: { createdAt: 'DESC' },
relationLoadStrategy: 'query',
});
}
@ -106,6 +108,7 @@ export class AlbumRepository implements IAlbumRepository {
{ ownerId, sharedUsers: { id: Not(IsNull()) } },
],
order: { createdAt: 'DESC' },
relationLoadStrategy: 'query',
});
}
@ -117,6 +120,7 @@ export class AlbumRepository implements IAlbumRepository {
relations: { sharedUsers: true, sharedLinks: true, owner: true },
where: { ownerId, sharedUsers: { id: IsNull() }, sharedLinks: { id: IsNull() } },
order: { createdAt: 'DESC' },
relationLoadStrategy: 'query',
});
}