Skip to content

Fix applied argument deleted on field #3154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andimarek merged 1 commit into from
Mar 29, 2023
Merged

Fix applied argument deleted on field #3154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/main/java/graphql/schema/diffing/ana/EditOperationAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
50 changes: 50 additions & 0 deletions src/test/groovy/graphql/schema/diffing/ana/EditOperationAnalyzerTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down