fix(server): handle multiple hierarchical subjects (#12509)

immich-app · Sep 9, 2024 · b3ef5fe · b3ef5fe
1 parent 7b2f98a
commit b3ef5fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/server/src/services/metadata.service.spec.ts b/server/src/services/metadata.service.spec.ts
@@ -453,7 +453,7 @@ describe(MetadataService.name, () => {
 
     it('should extract hierarchy from HierarchicalSubject', async () => {
       assetMock.getByIds.mockResolvedValue([assetStub.image]);
-      metadataMock.readTags.mockResolvedValue({ HierarchicalSubject: ['Parent|Child'] });
+      metadataMock.readTags.mockResolvedValue({ HierarchicalSubject: ['Parent|Child', 'TagA'] });
       tagMock.upsertValue.mockResolvedValueOnce(tagStub.parent);
       tagMock.upsertValue.mockResolvedValueOnce(tagStub.child);
 
@@ -465,6 +465,7 @@ describe(MetadataService.name, () => {
         value: 'Parent/Child',
         parent: tagStub.parent,
       });
+      expect(tagMock.upsertValue).toHaveBeenNthCalledWith(3, { userId: 'user-id', value: 'TagA', parent: undefined });
     });
 
     it('should extract ignore / characters in a HierarchicalSubject tag', async () => {

diff --git a/server/src/services/metadata.service.ts b/server/src/services/metadata.service.ts
@@ -384,12 +384,12 @@ export class MetadataService {
   }
 
   private async applyTagList(asset: AssetEntity, exifTags: ImmichTags) {
-    const tags: unknown[] = [];
+    const tags: Array<string | number> = [];
     if (exifTags.TagsList) {
       tags.push(...exifTags.TagsList);
     } else if (exifTags.HierarchicalSubject) {
       tags.push(
-        exifTags.HierarchicalSubject.map((tag) =>
+        ...exifTags.HierarchicalSubject.map((tag) =>
           tag
             // convert | to /
             .replaceAll('/', '<PLACEHOLDER>')