Skip to content

High performance self-hosted photo and video management solution.

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

Jason Rasmussen7b737786b303
diff --git a/server/src/interfaces/asset.interface.ts b/server/src/interfaces/asset.interface.ts
index 9f7213de82..0d37b64ebb 100644
--- a/server/src/interfaces/asset.interface.ts
+++ b/server/src/interfaces/asset.interface.ts
@@ -175,7 +175,7 @@ export interface IAssetRepository {
libraryId?: string,
withDeleted?: boolean,
): Paginated<AssetEntity>;
- getRandom(userId: string, count: number): Promise<AssetEntity[]>;
+ getRandom(userIds: string[], count: number): Promise<AssetEntity[]>;
getFirstAssetForAlbumId(albumId: string): Promise<AssetEntity | null>;
getLastUpdatedAssetForAlbumId(albumId: string): Promise<AssetEntity | null>;
getExternalLibraryAssetPaths(pagination: PaginationOptions, libraryId: string): Paginated<AssetPathEntity>;
diff --git a/server/src/repositories/asset.repository.ts b/server/src/repositories/asset.repository.ts
index 059a05f9e7..ac9dab6fbc 100644
--- a/server/src/repositories/asset.repository.ts
+++ b/server/src/repositories/asset.repository.ts
@@ -623,14 +623,9 @@ export class AssetRepository implements IAssetRepository {
return result;
}
- @GenerateSql({ params: [DummyValue.UUID, DummyValue.NUMBER] })
- getRandom(ownerId: string, count: number): Promise<AssetEntity[]> {
- const builder = this.getBuilder({
- userIds: [ownerId],
- exifInfo: true,
- });
-
- return builder.orderBy('RANDOM()').limit(count).getMany();
+ @GenerateSql({ params: [[DummyValue.UUID], DummyValue.NUMBER] })
+ getRandom(userIds: string[], count: number): Promise<AssetEntity[]> {
+ return this.getBuilder({ userIds, exifInfo: true }).orderBy('RANDOM()').limit(count).getMany();
}
@GenerateSql({ params: [{ size: TimeBucketSize.MONTH }] })
diff --git a/server/src/services/asset.service.ts b/server/src/services/asset.service.ts
index 1d8d7d05d3..06ca3af7d5 100644
--- a/server/src/services/asset.service.ts
+++ b/server/src/services/asset.service.ts
@@ -98,7 +98,12 @@ export class AssetService {
}
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 }));
}