prevent fetching the whole subtree also for __typename of a union type

Blazebit · Jan 11, 2023 · cdb7fb1 · cdb7fb1
1 parent 424fb17
commit cdb7fb1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/.../src/main/java/com/blazebit/persistence/integration/graphql/GraphQLEntityViewSupport.java b/.../src/main/java/com/blazebit/persistence/integration/graphql/GraphQLEntityViewSupport.java
@@ -636,9 +636,14 @@ public void applyFetches(DataFetchingEnvironment dataFetchingEnvironment, Entity
                     // its id field. Otherwise, skip this fieldPart and effectively put the intermediate field path
                     // into fetches - in reality this wouldn't lead to any unnecessary joins since the EV in that case
                     // corresponds to an embeddable entity.
-                    ManagedViewType<?> managedViewType = typeNameToViewType.get(typeName);
-                    if (managedViewType instanceof ViewType) {
-                        mappedFields.add(((ViewType<?>) managedViewType).getIdAttribute().getName());
+                    for (String metaFieldTypeName: field.getObjectTypeNames()) {
+                        // Meta field might have more parent types (in case of a union type). Try to find a first
+                        // ViewType among them and use its id field to ensure the type info can be obtained from DB.
+                        ManagedViewType<?> managedViewType = typeNameToViewType.get(metaFieldTypeName);
+                        if (managedViewType instanceof ViewType) {
+                            mappedFields.add(((ViewType<?>) managedViewType).getIdAttribute().getName());
+                            break;
+                        }
                     }
                     continue;
                 }

diff --git a/.../test/java/com/blazebit/persistence/integration/graphql/GraphQLEntityViewSupportTest.java b/.../test/java/com/blazebit/persistence/integration/graphql/GraphQLEntityViewSupportTest.java
@@ -52,7 +52,7 @@ public class GraphQLEntityViewSupportTest {
     public void testFetchesInSetting() {
         GraphQLFieldDefinition rootFieldDefinition = makeFieldDefinition("getDocument", documentObjectType);
         DataFetchingFieldSelectionSet selectionSet =
-                makeMockSelectionSet("Document", "name", "owner", "owner/name", "__typename");
+                makeMockSelectionSet("Document", "name", "owner", "owner/name", "Document.__typename");
 
         DataFetchingEnvironment dfe = makeMockDataFetchingEnvironment(rootFieldDefinition, selectionSet);
 
@@ -78,13 +78,13 @@ public void testFetchesInPaginatedSetting() {
     @Test
     public void testRootUnionInSelectionSet() {
         GraphQLFieldDefinition rootFieldDefinition = makeFieldDefinition("getAnimal", animalUnionType);
-        DataFetchingFieldSelectionSet selectionSet = makeMockSelectionSet("Cat", "name");
+        DataFetchingFieldSelectionSet selectionSet = makeMockSelectionSet("Cat", "name", "[Cat,Animal].__typename");
 
         DataFetchingEnvironment dfe = makeMockDataFetchingEnvironment(rootFieldDefinition, selectionSet);
 
         EntityViewSetting<AnimalView, CriteriaBuilder<AnimalView>> setting = graphQLEntityViewSupport.createSetting(dfe);
 
-        Assert.assertEquals(new HashSet<>(Arrays.asList("name")), setting.getFetches());
+        Assert.assertEquals(new HashSet<>(Arrays.asList("id", "name")), setting.getFetches());
     }
 
     @Test

diff --git a/...graphql/src/test/java/com/blazebit/persistence/integration/graphql/TestSchemaHelpers.java b/...graphql/src/test/java/com/blazebit/persistence/integration/graphql/TestSchemaHelpers.java
@@ -118,7 +118,7 @@ public static DataFetchingFieldSelectionSet makeMockSelectionSet(String rootType
                 if (fieldPart.contains(".")) {
                     // provided fieldPart is already fully qualified
                     qualifiedFieldParts.add(fieldPart);
-                    baseType = (fieldPart.split("\\."))[0];
+                    baseType = getBaseTypes(fieldPart)[0];
                     fieldPart = (fieldPart.split("\\."))[1];
                 } else {
                     qualifiedFieldParts.add(baseType + "." + fieldPart);
@@ -129,6 +129,7 @@ public static DataFetchingFieldSelectionSet makeMockSelectionSet(String rootType
             SelectedField selectedField = mock(SelectedField.class);
             when(selectedField.getFullyQualifiedName()).thenReturn(String.join("/", qualifiedFieldParts));
             when(selectedField.getType()).thenReturn(fieldType);
+            when(selectedField.getObjectTypeNames()).thenReturn(Arrays.asList(getBaseTypes(fieldParts[fieldParts.length-1])));
             return selectedField;
         }).collect(Collectors.toList());
 
@@ -137,6 +138,10 @@ public static DataFetchingFieldSelectionSet makeMockSelectionSet(String rootType
         return selectionSet;
     }
 
+    private static String[] getBaseTypes(String fieldPart) {
+        return (fieldPart.split("\\."))[0].replaceFirst("^\\[", "").replaceFirst("]$", "").split(",");
+    }
+
     public static GraphQLEntityViewSupport getGraphQLEntityViewSupport() {
         TypeDef documentTypeDef = new TypeDef("Document", DocumentView.class, Arrays.asList("id", "name", "owner"));
         TypeDef personTypeDef = new TypeDef("Person", PersonView.class, Arrays.asList("id", "name", "animal"));