Merge pull request #3154 from gnawf/fix-applied-argument-deleted-on-field

andimarek · web-flow · commit 85765bf5bee2 · 2023-03-29T22:33:16.000Z
Fix applied argument deleted on field
diff --git a/src/main/java/graphql/schema/diffing/ana/EditOperationAnalyzer.java b/src/main/java/graphql/schema/diffing/ana/EditOperationAnalyzer.java
@@ -300,16 +300,21 @@ private void appliedDirectiveArgumentDeleted(EditOperation editOperation) {
             Vertex interfaceOrObjective = oldSchemaGraph.getFieldsContainerForField(field);
             if (interfaceOrObjective.isOfType(SchemaGraph.OBJECT)) {
                 Vertex object = interfaceOrObjective;
+                if (isObjectDeleted(object.getName())) {
+                    return;
+                }
                 AppliedDirectiveObjectFieldLocation location = new AppliedDirectiveObjectFieldLocation(object.getName(), field.getName());
                 getObjectModification(object.getName()).getDetails().add(new AppliedDirectiveArgumentDeletion(location, deletedArgument.getName()));
             } else {
                 assertTrue(interfaceOrObjective.isOfType(SchemaGraph.INTERFACE));
                 Vertex interfaze = interfaceOrObjective;
+                if (isInterfaceDeleted(interfaze.getName())) {
+                    return;
+                }
                 AppliedDirectiveInterfaceFieldLocation location = new AppliedDirectiveInterfaceFieldLocation(interfaze.getName(), field.getName());
                 getInterfaceModification(interfaze.getName()).getDetails().add(new AppliedDirectiveArgumentDeletion(location, deletedArgument.getName()));
             }
         }
-
     }
 
     private void appliedDirectiveArgumentChanged(EditOperation editOperation) {
diff --git a/src/test/groovy/graphql/schema/diffing/ana/EditOperationAnalyzerTest.groovy b/src/test/groovy/graphql/schema/diffing/ana/EditOperationAnalyzerTest.groovy
@@ -2123,6 +2123,56 @@ class EditOperationAnalyzerTest extends Specification {
         changes.directiveDifferences["test"] instanceof DirectiveAddition
     }
 
+    def "delete object with applied directive on field"() {
+        given:
+        def oldSdl = '''
+        type Query {
+            user(id: ID!): User
+        }
+        directive @id(type: String, owner: String) on FIELD_DEFINITION
+        type User {
+            id: ID! @id(type: "user", owner: "profiles")
+        }
+        '''
+        def newSdl = '''
+        type Query {
+            echo: String
+        }
+        directive @id(type: String, owner: String) on FIELD_DEFINITION
+        '''
+
+        when:
+        def changes = calcDiff(oldSdl, newSdl)
+
+        then:
+        changes.objectDifferences["User"] instanceof ObjectDeletion
+    }
+
+    def "delete interface with applied directive on field"() {
+        given:
+        def oldSdl = '''
+        type Query {
+            user(id: ID!): User
+        }
+        directive @id(type: String, owner: String) on FIELD_DEFINITION
+        interface User {
+            id: ID! @id(type: "user", owner: "profiles")
+        }
+        '''
+        def newSdl = '''
+        type Query {
+            echo: String
+        }
+        directive @id(type: String, owner: String) on FIELD_DEFINITION
+        '''
+
+        when:
+        def changes = calcDiff(oldSdl, newSdl)
+
+        then:
+        changes.interfaceDifferences["User"] instanceof InterfaceDeletion
+    }
+
     EditOperationAnalysisResult calcDiff(
             String oldSdl,
             String newSdl
