Fix cases where argument was already added or deleted

gnawf · gnawf · commit 3210fbc58f7d · 2023-03-31T12:10:02.000+13:00
diff --git a/src/main/java/graphql/schema/diffing/ana/EditOperationAnalyzer.java b/src/main/java/graphql/schema/diffing/ana/EditOperationAnalyzer.java
@@ -1722,6 +1722,8 @@ private void deletedDirective(EditOperation editOperation) {
     }
 
     private void argumentDeleted(EditOperation editOperation) {
+        // Note: sometimes the edit operation is the argument vertex itself being deleted
+        // Other times, it is the edge to the argument type being deleted
         Vertex deletedArgument = editOperation.getSourceVertex();
         if (deletedArgument == null) {
             deletedArgument = editOperation.getSourceEdge().getTo();
@@ -1736,13 +1738,25 @@ private void argumentDeleted(EditOperation editOperation) {
                 if (isObjectDeleted(object.getName())) {
                     return;
                 }
+                if (isFieldDeletedFromExistingObject(object.getName(), field.getName())) {
+                    return;
+                }
+                if (isArgumentDeletedFromExistingObjectField(object.getName(), field.getName(), deletedArgument.getName())) {
+                    return;
+                }
                 getObjectModification(object.getName()).getDetails().add(new ObjectFieldArgumentDeletion(field.getName(), deletedArgument.getName()));
             } else {
                 assertTrue(fieldsContainerForField.isOfType(SchemaGraph.INTERFACE));
                 Vertex interfaze = fieldsContainerForField;
                 if (isInterfaceDeleted(interfaze.getName())) {
                     return;
                 }
+                if (isFieldDeletedFromExistingInterface(interfaze.getName(), field.getName())) {
+                    return;
+                }
+                if (isArgumentDeletedFromExistingInterfaceField(interfaze.getName(), field.getName(), deletedArgument.getName())) {
+                    return;
+                }
                 getInterfaceModification(interfaze.getName()).getDetails().add(new InterfaceFieldArgumentDeletion(field.getName(), deletedArgument.getName()));
             }
         } else {
@@ -1751,9 +1765,11 @@ private void argumentDeleted(EditOperation editOperation) {
             if (isDirectiveDeleted(directive.getName())) {
                 return;
             }
+            if (isArgumentDeletedFromExistingDirective(directive.getName(), deletedArgument.getName())) {
+                return;
+            }
             getDirectiveModification(directive.getName()).getDetails().add(new DirectiveArgumentDeletion(deletedArgument.getName()));
         }
-
     }
 
     private void argumentAdded(EditOperation editOperation) {
@@ -1772,13 +1788,25 @@ private void argumentAdded(EditOperation editOperation) {
                 if (isObjectAdded(object.getName())) {
                     return;
                 }
+                if (isFieldNewForExistingObject(object.getName(), field.getName())) {
+                    return;
+                }
+                if (isArgumentNewForExistingObjectField(object.getName(), field.getName(), addedArgument.getName())) {
+                    return;
+                }
                 getObjectModification(object.getName()).getDetails().add(new ObjectFieldArgumentAddition(field.getName(), addedArgument.getName()));
             } else {
                 assertTrue(fieldsContainerForField.isOfType(SchemaGraph.INTERFACE));
                 Vertex interfaze = fieldsContainerForField;
                 if (isInterfaceAdded(interfaze.getName())) {
                     return;
                 }
+                if (isFieldNewForExistingInterface(interfaze.getName(), field.getName())) {
+                    return;
+                }
+                if (isArgumentNewForExistingInterfaceField(interfaze.getName(), field.getName(), addedArgument.getName())) {
+                    return;
+                }
                 getInterfaceModification(interfaze.getName()).getDetails().add(new InterfaceFieldArgumentAddition(field.getName(), addedArgument.getName()));
             }
         } else {
@@ -1787,6 +1815,9 @@ private void argumentAdded(EditOperation editOperation) {
             if (isDirectiveAdded(directive.getName())) {
                 return;
             }
+            if (isArgumentNewForExistingDirective(directive.getName(), addedArgument.getName())) {
+                return;
+            }
             getDirectiveModification(directive.getName()).getDetails().add(new DirectiveArgumentAddition(addedArgument.getName()));
         }
     }
diff --git a/src/test/groovy/graphql/schema/diffing/ana/EditOperationAnalyzerTest.groovy b/src/test/groovy/graphql/schema/diffing/ana/EditOperationAnalyzerTest.groovy
@@ -1727,11 +1727,9 @@ class EditOperationAnalyzerTest extends Specification {
         rename[0].newName == "echo"
 
         def argumentDeletion = objectDiff.getDetails(ObjectFieldArgumentDeletion)
-        argumentDeletion.size() == 2
+        argumentDeletion.size() == 1
         argumentDeletion[0].fieldName == "ping"
         argumentDeletion[0].name == "pong"
-        argumentDeletion[1].fieldName == "ping"
-        argumentDeletion[1].name == "pong"
 
         def typeModification = objectDiff.getDetails(ObjectFieldTypeModification)
         typeModification.size() == 1
