fix(server): do not match live photos across libraries

immich-app · Aug 20, 2024 · dab5fcd · dab5fcd
1 parent fd225e7
commit dab5fcd
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/server/src/interfaces/asset.interface.ts b/server/src/interfaces/asset.interface.ts
@@ -16,6 +16,7 @@ export interface AssetStatsOptions {
 
 export interface LivePhotoSearchOptions {
   ownerId: string;
+  libraryId?: string | null;
   livePhotoCID: string;
   otherAssetId: string;
   type: AssetType;

diff --git a/server/src/repositories/asset.repository.ts b/server/src/repositories/asset.repository.ts
@@ -363,12 +363,13 @@ export class AssetRepository implements IAssetRepository {
   }
 
   findLivePhotoMatch(options: LivePhotoSearchOptions): Promise<AssetEntity | null> {
-    const { ownerId, otherAssetId, livePhotoCID, type } = options;
+    const { ownerId, libraryId, otherAssetId, livePhotoCID, type } = options;
 
     return this.repository.findOne({
       where: {
         id: Not(otherAssetId),
         ownerId,
+        libraryId: libraryId || IsNull(),
         type,
         exifInfo: {
           livePhotoCID,

diff --git a/server/src/services/metadata.service.spec.ts b/server/src/services/metadata.service.spec.ts
@@ -218,6 +218,29 @@ describe(MetadataService.name, () => {
         assetStub.livePhotoMotionAsset.id,
       );
     });
+
+    it('should search by libraryId', async () => {
+      assetMock.getByIds.mockResolvedValue([
+        {
+          ...assetStub.livePhotoStillAsset,
+          libraryId: 'library-id',
+          exifInfo: { livePhotoCID: 'CID' } as ExifEntity,
+        },
+      ]);
+      assetMock.findLivePhotoMatch.mockResolvedValue(null);
+
+      await expect(sut.handleLivePhotoLinking({ id: assetStub.livePhotoStillAsset.id })).resolves.toBe(
+        JobStatus.SKIPPED,
+      );
+
+      expect(assetMock.findLivePhotoMatch).toHaveBeenCalledWith({
+        ownerId: 'user-id',
+        otherAssetId: 'live-photo-still-asset',
+        livePhotoCID: 'CID',
+        libraryId: 'library-id',
+        type: 'VIDEO',
+      });
+    });
   });
 
   describe('handleQueueMetadataExtraction', () => {

diff --git a/server/src/services/metadata.service.ts b/server/src/services/metadata.service.ts
@@ -173,6 +173,7 @@ export class MetadataService {
     const match = await this.assetRepository.findLivePhotoMatch({
       livePhotoCID: asset.exifInfo.livePhotoCID,
       ownerId: asset.ownerId,
+      libraryId: asset.libraryId,
       otherAssetId: asset.id,
       type: otherType,
     });