fix: duplicate field #292

dineug · Nov 9, 2024 · 555d15c · 555d15c
1 parent 2064697
commit 555d15c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/packages/erd-editor/src/utils/draw-relationship/sort.ts b/packages/erd-editor/src/utils/draw-relationship/sort.ts
@@ -40,7 +40,6 @@ const directionNameToDirection: Record<string, number> = {
   [DirectionName.right]: Direction.right,
 };
 
-// TODO: concurrent
 export function relationshipSort(state: RootState) {
   const {
     doc: { tableIds, relationshipIds },

diff --git a/packages/erd-editor/src/utils/generator-code/graphql.ts b/packages/erd-editor/src/utils/generator-code/graphql.ts
@@ -127,7 +127,8 @@ function formatRelation(
     .collection('relationshipEntities')
     .selectByIds(relationshipIds);
 
-  // TODO: https://github.com/dineug/erd-editor/issues/292
+  const startFieldNames = new Set<string>();
+  const endFieldNames = new Set<string>();
 
   relationships
     .filter(relationship => relationship.end.tableId === table.id)
@@ -137,11 +138,16 @@ function formatRelation(
       if (startTable) {
         const typeName = getNameCase(startTable.name, tableNameCase);
         const fieldName = getNameCase(startTable.name, columnNameCase);
+        const field = `  ${fieldName}: ${typeName}`;
+        if (startFieldNames.has(field)) {
+          return;
+        }
 
         if (startTable.comment.trim() !== '') {
           buffer.push(`  # ${startTable.comment}`);
         }
-        buffer.push(`  ${fieldName}: ${typeName}`);
+        buffer.push(field);
+        startFieldNames.add(field);
       }
     });
 
@@ -153,21 +159,24 @@ function formatRelation(
       if (endTable) {
         const typeName = getNameCase(endTable.name, tableNameCase);
         const fieldName = getNameCase(endTable.name, columnNameCase);
+        const field = hasOneRelationship(relationship.relationshipType)
+          ? `  ${fieldName}: ${typeName}`
+          : hasNRelationship(relationship.relationshipType)
+            ? `  ${getNameCase(
+                `${fieldName}List`,
+                columnNameCase
+              )}: [${typeName}!]!`
+            : null;
+
+        if (field === null || endFieldNames.has(field)) {
+          return;
+        }
 
         if (endTable.comment.trim() !== '') {
           buffer.push(`  # ${endTable.comment}`);
         }
-
-        if (hasOneRelationship(relationship.relationshipType)) {
-          buffer.push(`  ${fieldName}: ${typeName}`);
-        } else if (hasNRelationship(relationship.relationshipType)) {
-          buffer.push(
-            `  ${getNameCase(
-              `${fieldName}List`,
-              columnNameCase
-            )}: [${typeName}!]!`
-          );
-        }
+        buffer.push(field);
+        endFieldNames.add(field);
       }
     });
 }