Only return duplicates within the same scope in the `FilesResolver#du…

…plicates` field resolver (#2048) Previously, duplicates in all scopes were returned.
vivid-planet · May 13, 2024 · 584d14d · 584d14d
1 parent e938254
commit 584d14d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.changeset/wild-clocks-dress.md b/.changeset/wild-clocks-dress.md
@@ -0,0 +1,7 @@
+---
+"@comet/cms-api": patch
+---
+
+Only return duplicates within the same scope in the `FilesResolver#duplicates` field resolver
+
+As a side effect `FilesService#findAllByHash` now accepts an optional scope parameter.
diff --git a/packages/api/cms-api/src/dam/files/files.resolver.ts b/packages/api/cms-api/src/dam/files/files.resolver.ts
@@ -263,7 +263,7 @@ export function createFilesResolver({
 
         @ResolveField(() => [File])
         async duplicates(@Parent() file: FileInterface): Promise<FileInterface[]> {
-            const files = await this.filesService.findAllByHash(file.contentHash);
+            const files = await this.filesService.findAllByHash(file.contentHash, { scope: file.scope });
             return files.filter((f) => f.id !== file.id);
         }
 

diff --git a/packages/api/cms-api/src/dam/files/files.service.ts b/packages/api/cms-api/src/dam/files/files.service.ts
@@ -176,8 +176,8 @@ export class FilesService {
         return [files, totalCount];
     }
 
-    async findAllByHash(contentHash: string): Promise<FileInterface[]> {
-        return withFilesSelect(this.selectQueryBuilder(), { contentHash }).getResult();
+    async findAllByHash(contentHash: string, options?: { scope?: DamScopeInterface }): Promise<FileInterface[]> {
+        return withFilesSelect(this.selectQueryBuilder(), { contentHash, scope: options?.scope }).getResult();
     }
 
     async findMultipleByIds(ids: string[]) {