Begin refacto duplicate(ids)

twentyhq · Jun 24, 2024 · 584f7d4 · 584f7d4
1 parent 5f155bb
commit 584f7d4
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 36 deletions.
diff --git a/...s/twenty-front/src/modules/object-record/hooks/__tests__/useFindDuplicateRecords.test.tsx b/...s/twenty-front/src/modules/object-record/hooks/__tests__/useFindDuplicateRecords.test.tsx
@@ -42,7 +42,7 @@ describe('useFindDuplicateRecords', () => {
     const { result } = renderHook(
       () =>
         useFindDuplicateRecords({
-          objectRecordId,
+          objectRecordIds: [objectRecordId],
           objectNameSingular,
         }),
       {

diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFindDuplicateRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useFindDuplicateRecords.ts
@@ -14,11 +14,11 @@ import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { logError } from '~/utils/logError';
 
 export const useFindDuplicateRecords = <T extends ObjectRecord = ObjectRecord>({
-  objectRecordId = '',
+  objectRecordIds = [],
   objectNameSingular,
   onCompleted,
 }: ObjectMetadataItemIdentifier & {
-  objectRecordId: string | undefined;
+  objectRecordIds: string[] | undefined;
   onCompleted?: (data: RecordGqlConnection) => void;
   skip?: boolean;
 }) => {
@@ -42,7 +42,7 @@ export const useFindDuplicateRecords = <T extends ObjectRecord = ObjectRecord>({
     findDuplicateRecordsQuery,
     {
       variables: {
-        id: objectRecordId,
+        ids: objectRecordIds,
       },
       onCompleted: (data) => {
         onCompleted?.(data[queryResponseField]);

diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFindDuplicatesRecordsQuery.ts b/packages/twenty-front/src/modules/object-record/hooks/useFindDuplicatesRecordsQuery.ts
@@ -22,10 +22,10 @@ export const useFindDuplicateRecordsQuery = ({
   const findDuplicateRecordsQuery = gql`
     query FindDuplicate${capitalize(
       objectMetadataItem.nameSingular,
-    )}($id: ID!) {
+    )}($ids: [ID]!) {
       ${getFindDuplicateRecordsQueryResponseField(
         objectMetadataItem.nameSingular,
-      )}(id: $id) {
+      )}(ids: $ids) {
         edges {
           node ${mapObjectMetadataToGraphQLQuery({
             objectMetadataItems,

diff --git a/...ect-record/record-show/record-detail-section/components/RecordDetailDuplicatesSection.tsx b/...ect-record/record-show/record-detail-section/components/RecordDetailDuplicatesSection.tsx
@@ -13,7 +13,7 @@ export const RecordDetailDuplicatesSection = ({
   objectNameSingular: string;
 }) => {
   const { records: duplicateRecords } = useFindDuplicateRecords({
-    objectRecordId,
+    objectRecordIds: [objectRecordId],
     objectNameSingular,
   });
 

diff --git a/...src/engine/api/graphql/workspace-query-builder/factories/find-duplicates-query.factory.ts b/...src/engine/api/graphql/workspace-query-builder/factories/find-duplicates-query.factory.ts
@@ -26,17 +26,23 @@ export class FindDuplicatesQueryFactory {
   async create(
     args: FindDuplicatesResolverArgs,
     options: WorkspaceQueryBuilderOptions,
-    currentRecord?: Record,
+    existingRecords?: Record[],
   ) {
     const fieldsString = await this.fieldsStringFactory.create(
       options.info,
       options.fieldMetadataCollection,
       options.objectMetadataCollection,
     );
 
-    if (currentRecord) {
+    if (existingRecords) {
+      const query = existingRecords.reduce((acc, record, index) => {
+        return (
+          acc + this.buildQuery(fieldsString, options, undefined, record, index)
+        );
+      }, '');
+
       return `query {
-        ${this.buildQuery(fieldsString, options, undefined, currentRecord)}
+        ${query}
       }`;
     }
 
@@ -67,14 +73,14 @@ export class FindDuplicatesQueryFactory {
     fieldsString: string,
     options: WorkspaceQueryBuilderOptions,
     data?: Record,
-    currentRecord?: Record,
+    existingRecord?: Record,
     index?: number,
   ) {
     const duplicateCondition =
       this.duplicateService.buildDuplicateConditionForGraphQL(
         options.objectMetadataItem,
-        data ?? currentRecord,
-        currentRecord?.id,
+        data ?? existingRecord,
+        existingRecord?.id,
       );
 
     const filters = stringifyWithoutKeyQuote(duplicateCondition);

diff --git a/...-server/src/engine/api/graphql/workspace-query-builder/workspace-query-builder.factory.ts b/...-server/src/engine/api/graphql/workspace-query-builder/workspace-query-builder.factory.ts
@@ -67,12 +67,12 @@ export class WorkspaceQueryBuilderFactory {
   findDuplicates(
     args: FindDuplicatesResolverArgs,
     options: WorkspaceQueryBuilderOptions,
-    existingRecord?: IRecord,
+    existingRecords?: IRecord[],
   ): Promise<string> {
     return this.findDuplicatesQueryFactory.create(
       args,
       options,
-      existingRecord,
+      existingRecords,
     );
   }
 

diff --git a/...rver/src/engine/api/graphql/workspace-query-runner/factories/query-runner-args.factory.ts b/...rver/src/engine/api/graphql/workspace-query-runner/factories/query-runner-args.factory.ts
@@ -75,10 +75,10 @@ export class QueryRunnerArgsFactory {
       case ResolverArgsType.FindDuplicates:
         return {
           ...args,
-          id: await this.overrideValueByFieldMetadata(
-            'id',
-            (args as FindDuplicatesResolverArgs).id,
-            fieldMetadataMap,
+          ids: await Promise.all(
+            (args as FindDuplicatesResolverArgs).ids?.map((id) =>
+              this.overrideValueByFieldMetadata('id', id, fieldMetadataMap),
+            ) ?? [],
           ),
           data: await Promise.all(
             (args as FindDuplicatesResolverArgs).data?.map((arg, index) =>

diff --git a/...ty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts b/...ty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts
@@ -172,13 +172,13 @@ export class WorkspaceQueryRunnerService {
     args: FindDuplicatesResolverArgs<TRecord>,
     options: WorkspaceQueryRunnerOptions,
   ): Promise<IConnection<TRecord> | undefined> {
-    if (!args.data && !args.id) {
+    if (!args.data && !args.ids) {
       throw new BadRequestException(
         'You have to provide either "data" or "id" argument',
       );
     }
 
-    if (!args.id && isEmpty(args.data)) {
+    if (!args.ids && isEmpty(args.data)) {
       throw new BadRequestException(
         'The "data" condition can not be empty when ID input not provided',
       );
@@ -192,24 +192,24 @@ export class WorkspaceQueryRunnerService {
       ResolverArgsType.FindDuplicates,
     )) as FindDuplicatesResolverArgs<TRecord>;
 
-    let existingRecord: Record<string, any> | null = null;
+    let existingRecords: IRecord[] | undefined = undefined;
 
-    if (computedArgs.id) {
-      existingRecord = await this.duplicateService.findExistingRecords(
-        [computedArgs.id],
+    if (computedArgs.ids && computedArgs.ids.length > 0) {
+      existingRecords = await this.duplicateService.findExistingRecords(
+        computedArgs.ids,
         objectMetadataItem,
         workspaceId,
       );
 
-      if (existingRecord && existingRecord.length != 1) {
-        throw new NotFoundError(`Object with id ${args.id} not found`);
+      if (!existingRecords || existingRecords.length === 0) {
+        throw new NotFoundError(`Object with id ${args.ids} not found`);
       }
     }
 
     const query = await this.workspaceQueryBuilderFactory.findDuplicates(
       computedArgs,
       options,
-      existingRecord ? existingRecord[0] : null,
+      existingRecords,
     );
 
     await this.workspacePreQueryHookService.executePreHooks(
@@ -672,9 +672,6 @@ export class WorkspaceQueryRunnerService {
             [],
           )[0],
         };
-
-    console.log('result', result);
-
     const errors = graphqlResult?.[0]?.resolve?.errors;
 
     if (
@@ -705,8 +702,6 @@ export class WorkspaceQueryRunnerService {
       objectMetadataItem,
     );
 
-    console.log(resultWithGetters);
-
     return parseResult(resultWithGetters);
   }
 

diff --git a/...pi/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface.ts b/...pi/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface.ts
@@ -40,7 +40,7 @@ export interface FindOneResolverArgs<Filter = any> {
 }
 
 export interface FindDuplicatesResolverArgs<Data extends Record = Record> {
-  id?: string;
+  ids?: string[];
   data?: Data[];
 }
 

diff --git a/...ty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-resolver-args.util.ts b/...ty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-resolver-args.util.ts
@@ -87,9 +87,10 @@ export const getResolverArgs = (
       };
     case 'findDuplicates':
       return {
-        id: {
+        ids: {
           type: GraphQLID,
           isNullable: true,
+          isArray: true,
         },
         data: {
           kind: InputTypeDefinitionKind.Create,

diff --git a/packages/twenty-server/src/engine/core-modules/duplicate/duplicate.service.ts b/packages/twenty-server/src/engine/core-modules/duplicate/duplicate.service.ts
@@ -1,6 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
 import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+import { Record as IRecord } from 'src/engine/api/graphql/workspace-query-builder/interfaces/record.interface';
 
 import { settings } from 'src/engine/constants/settings';
 import { DUPLICATE_CRITERIA_COLLECTION } from 'src/engine/core-modules/duplicate/constants/duplicate-criteria.constants';
@@ -38,7 +39,7 @@ export class DuplicateService {
       workspaceId,
     );
 
-    return results as Record<string, any>[] | null;
+    return results as IRecord[];
   }
 
   async findDuplicate(