clones/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2024-09-21 10:37:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(server): include partner assets in random endpoint (#12599)

Browse Source
This commit is contained in:
Jason Rasmussen 2024-09-12 13:56:38 -04:00 committed by GitHub
parent d03e97f650
commit 7b737786b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/interfaces/asset.interface.ts
View File

@ -175,7 +175,7 @@ export interface IAssetRepository {
libraryId?: string, libraryId?: string,
withDeleted?: boolean, withDeleted?: boolean,
): Paginated<AssetEntity>; ): Paginated<AssetEntity>;
getRandom(userId: string, count: number): Promise<AssetEntity[]>; getRandom(userIds: string[], count: number): Promise<AssetEntity[]>;
getFirstAssetForAlbumId(albumId: string): Promise<AssetEntity | null>; getFirstAssetForAlbumId(albumId: string): Promise<AssetEntity | null>;
getLastUpdatedAssetForAlbumId(albumId: string): Promise<AssetEntity | null>; getLastUpdatedAssetForAlbumId(albumId: string): Promise<AssetEntity | null>;
getExternalLibraryAssetPaths(pagination: PaginationOptions, libraryId: string): Paginated<AssetPathEntity>; getExternalLibraryAssetPaths(pagination: PaginationOptions, libraryId: string): Paginated<AssetPathEntity>;

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

@ -623,14 +623,9 @@ export class AssetRepository implements IAssetRepository {
return result; return result;
} }
@GenerateSql({ params: [DummyValue.UUID, DummyValue.NUMBER] }) @GenerateSql({ params: [[DummyValue.UUID], DummyValue.NUMBER] })
getRandom(ownerId: string, count: number): Promise<AssetEntity[]> { getRandom(userIds: string[], count: number): Promise<AssetEntity[]> {
const builder = this.getBuilder({ return this.getBuilder({ userIds, exifInfo: true }).orderBy('RANDOM()').limit(count).getMany();
userIds: [ownerId],
exifInfo: true,
});
return builder.orderBy('RANDOM()').limit(count).getMany();
} }
@GenerateSql({ params: [{ size: TimeBucketSize.MONTH }] }) @GenerateSql({ params: [{ size: TimeBucketSize.MONTH }] })

7
server/src/services/asset.service.ts
View File

@ -98,7 +98,12 @@ export class AssetService {
} }
async getRandom(auth: AuthDto, count: number): Promise<AssetResponseDto[]> { async getRandom(auth: AuthDto, count: number): Promise<AssetResponseDto[]> {
const assets = await this.assetRepository.getRandom(auth.user.id, count); const partnerIds = await getMyPartnerIds({
userId: auth.user.id,
repository: this.partnerRepository,
timelineEnabled: true,
});
const assets = await this.assetRepository.getRandom([auth.user.id, ...partnerIds], count);
return assets.map((a) => mapAsset(a, { auth })); return assets.map((a) => mapAsset(a, { auth }));
} }