GG-291 Make nodes and totalCount fields optional

graphitron-codegen-parent/graphitron-java-codegen/src/main/java/no/sikt/graphitron/definitions/fields/ObjectField.java

@@ -24,7 +24,7 @@
 public class ObjectField extends GenerationSourceField<FieldDefinition> {
     private int firstDefault = 100;
     private int lastDefault = 100;
-    private boolean hasForwardPagination, hasBackwardPagination, hasRequiredPaginationFields;
+    private boolean hasForwardPagination, hasBackwardPagination, hasRequiredPaginationFields, hasPaginationTotalCountField;
     private final List<ArgumentField> arguments, nonReservedArguments;
     private final ArgumentField orderField;
     private final LinkedHashMap<String, ArgumentField> argumentsByName;
@@ -128,6 +128,15 @@ public boolean hasPagination() {
         return hasForwardPagination() || hasBackwardPagination();
     }
 
+    public boolean hasTotalCountFieldInReturnType() {
+        return hasPaginationTotalCountField;
+    }
+
+    public void setHasTotalCountFieldInReturnType(boolean hasTotalCountField) {
+        hasPaginationTotalCountField = hasTotalCountField;
+    }
+
+
     @Override
     public boolean hasMutationType() {
         return mutationType != null;

graphitron-codegen-parent/graphitron-java-codegen/src/main/java/no/sikt/graphitron/generators/datafetchers/operations/OperationMethodGenerator.java

@@ -137,7 +137,12 @@ private CodeBlock callQueryBlock(ObjectField target, String objectToCall, String
                 .build();
         return CodeBlock
                 .builder()
-                .add("return $L.$L($L", target.hasServiceReference() ? newServiceDataFetcherWithTransform() : newDataFetcher(), getFetcherMethodName(target, localObject), indentIfMultiline(innerCode))
+                .add("return $L.$L($L",
+                     target.hasServiceReference()
+                     ? newServiceDataFetcherWithTransform()
+                     : newDataFetcher(),
+                     getFetcherMethodName(target, localObject),
+                     indentIfMultiline(innerCode))
                 .addStatement(")")
                 .build();
     }
@@ -177,8 +182,13 @@ private CodeBlock callQueryBlockInner(ObjectField target, String objectToCall, S
             params.add(VAR_RESOLVER_KEYS);
         }
         params.addAll(parser.getMethodInputNames(false, false, true));
-        var countFunction = countFunction(objectToCall, method, params, target.hasServiceReference());
-        return CodeBlock.of(" $N,\n$L,\n$L$L", VAR_PAGE_SIZE, queryFunction, countFunction, transformWrap);
+
+        if (target.hasTotalCountFieldInReturnType()) {
+            var countFunction = countFunction(objectToCall, method, params, target.hasServiceReference());
+            return CodeBlock.of(" $N,\n$L,\n$L$L", VAR_PAGE_SIZE, queryFunction, countFunction, transformWrap);
+        } else {
+            return CodeBlock.of(" $N,\n$L$L", VAR_PAGE_SIZE, queryFunction, transformWrap);
+        }
     }
 
     /**

graphitron-codegen-parent/graphitron-java-codegen/src/main/java/no/sikt/graphitron/generators/db/FetchCountDBMethodGenerator.java

@@ -158,6 +158,7 @@ public List<MethodSpec> generateAll() {
                 .stream()
                 .filter(GenerationField::isGeneratedWithResolver)
                 .filter(ObjectField::hasRequiredPaginationFields)
+                .filter(ObjectField::hasTotalCountFieldInReturnType)
                 .filter(it -> !it.hasServiceReference())
                 .map(this::generate)
                 .filter(it -> !it.code().isEmpty())

graphitron-codegen-parent/graphitron-java-codegen/src/main/java/no/sikt/graphql/schema/ProcessedSchema.java

@@ -168,6 +168,8 @@ public ProcessedSchema(TypeDefinitionRegistry typeRegistry) {
 
         federationIsImported = LinkDirectiveProcessor.loadFederationImportedDefinitions(typeRegistry) != null;
         federationEntitiesExist = queryType != null && queryType.hasField(FEDERATION_ENTITIES_FIELD.getName()) && isFederationImported();
+
+        markConnectionsWithTotalCountField();
     }
 
     private SchemaDefinition createSchemaDefinition() {
@@ -196,6 +198,21 @@ private SchemaDefinition createSchemaDefinition() {
         return definitionBuilder.build();
     }
 
+    /**
+     * Mark fields whose return type is a connection type that contains the {@code totalCount} field. This is used to
+     * determine whether to generate a count method or not through
+     * {@link no.sikt.graphitron.generators.db.FetchCountDBMethodGenerator}.
+     */
+    private void markConnectionsWithTotalCountField() {
+        this.objects
+                .values()
+                .stream()
+                .flatMap(obj -> obj.getFields().stream())
+                .filter(this::isConnectionObject)
+                .filter(this::hasTotalCountField)
+                .forEach(field -> field.setHasTotalCountFieldInReturnType(true));
+    }
+
     public boolean nodeExists() {
         return nodeExists;
     }
@@ -829,6 +846,16 @@ public boolean federationEntitiesExist() {
         return federationEntitiesExist;
     }
 
+    /**
+     * @param field A field whose type is assumed to be a connection object present in {@link #connectionObjects}.
+     * @return Whether this field points to a connection object type that has a {@code totalCount} field.
+     */
+    private boolean hasTotalCountField(FieldSpecification field) {
+        return connectionObjects
+                .get(field.getTypeName())
+                .hasField(GraphQLReservedName.CONNECTION_TOTAL_COUNT.getName());
+    }
+
     /**
      * @return All types which could potentially have tables.
      */

graphitron-codegen-parent/graphitron-java-codegen/src/test/java/no/sikt/graphitron/common/configuration/SchemaComponent.java

@@ -31,7 +31,9 @@ public enum SchemaComponent {
     CUSTOMER_TABLE("basic/CustomerTable"),
     CUSTOMER_INPUT_TABLE("basic/CustomerInputTable"),
     CUSTOMER_CONNECTION_ONLY("basic/CustomerConnection", PAGE_INFO),
+    CUSTOMER_CONNECTION_WITH_NO_OPTIONALS_ONLY("basic/CustomerConnectionWithNoOptionals", PAGE_INFO),
     CUSTOMER_CONNECTION(CUSTOMER_TABLE, CUSTOMER_CONNECTION_ONLY),
+    CUSTOMER_CONNECTION_WITH_NO_OPTIONALS(CUSTOMER_TABLE, CUSTOMER_CONNECTION_WITH_NO_OPTIONALS_ONLY),
     CUSTOMER_CONNECTION_ORDER(CUSTOMER_CONNECTION_ONLY, ORDER),
     CUSTOMER_UNION("basic/CustomerUnion", CUSTOMER_QUERY),
     CUSTOMER_NODE_INPUT_TABLE("basic/CustomerNodeInputTable", CUSTOMER_NODE),

graphitron-codegen-parent/graphitron-java-codegen/src/test/java/no/sikt/graphitron/datafetchers/services/fetch/ResolverTest.java

@@ -146,4 +146,23 @@ void queryAfterService() {
                 "queryNormal() {return _iv_env -> {return"
         );
     }
+
+    @Test
+    @DisplayName("When optional field 'totalCount' is included in the schema for a field having a service and pagination, generate the count method")
+    void serviceWithPaginationAndAllOptionalFieldsIncluded() {
+        assertGeneratedContentMatches(
+                "operation/withPaginationAndAllOptionalFieldsIncluded",
+                CUSTOMER_CONNECTION
+        );
+    }
+
+
+    @Test
+    @DisplayName("When optional field 'totalCount' is not included in the schema for a field having a service and pagination, do not generate the count method")
+    void serviceWithPaginationAndNoOptionalFieldsIncluded() {
+        assertGeneratedContentMatches(
+                "operation/withPaginationAndNoOptionalFieldsIncluded",
+                CUSTOMER_CONNECTION_WITH_NO_OPTIONALS
+        );
+    }
 }

graphitron-codegen-parent/graphitron-java-codegen/src/test/java/no/sikt/graphitron/datafetchers/standard/fetch/ResolverPaginationTest.java

@@ -14,6 +14,8 @@
 import java.util.Set;
 
 import static no.sikt.graphitron.common.configuration.ReferencedEntry.CONTEXT_CONDITION;
+import static no.sikt.graphitron.common.configuration.SchemaComponent.CUSTOMER_CONNECTION;
+import static no.sikt.graphitron.common.configuration.SchemaComponent.CUSTOMER_CONNECTION_WITH_NO_OPTIONALS;
 import static no.sikt.graphitron.common.configuration.SchemaComponent.DUMMY_CONNECTION;
 import static no.sikt.graphitron.common.configuration.SchemaComponent.SPLIT_QUERY_WRAPPER;
 
@@ -104,4 +106,34 @@ void withContextCondition() {
                 "countQueryForQuery(_iv_ctx, _cf_ctxField)"
         );
     }
+
+    @Test
+    @DisplayName("When optional field 'totalCount' is included in the schema, generate the count method")
+    void countMethodCalledWhenAllOptionalFieldsIncluded() {
+        assertGeneratedContentContains(
+                "operation/allOptionalFieldsIncluded",
+                Set.of(CUSTOMER_CONNECTION),
+                        """
+                        .loadPaginated(
+                        _iv_pageSize,
+                        (_iv_ctx, _iv_selectionSet) -> QueryDBQueries.customersForQuery(_iv_ctx, _iv_pageSize, _mi_after, _iv_selectionSet),
+                        (_iv_ctx, _iv_keys) -> QueryDBQueries.countCustomersForQuery(_iv_ctx)
+                        """
+        );
+    }
+
+    @Test
+    @DisplayName("When optional field 'totalCount' is not included in the schema, do not generate the count method")
+    void countMethodNotCalledWhenAllOptionalFieldsDisabled() {
+        assertGeneratedContentContains(
+                "operation/allOptionalFieldsExcluded",
+                Set.of(CUSTOMER_CONNECTION_WITH_NO_OPTIONALS),
+                        """
+                        .loadPaginated(
+                        _iv_pageSize,
+                        (_iv_ctx, _iv_selectionSet) -> QueryDBQueries.customersForQuery(_iv_ctx, _iv_pageSize, _mi_after, _iv_selectionSet)
+                        );
+                        """
+        );
+    }
 }

graphitron-codegen-parent/graphitron-java-codegen/src/test/java/no/sikt/graphitron/queries/fetch/PaginationTest.java

@@ -1,9 +1,8 @@
 package no.sikt.graphitron.queries.fetch;
 
 import no.sikt.graphitron.common.GeneratorTest;
-import no.sikt.graphitron.common.configuration.SchemaComponent;
 import no.sikt.graphitron.generators.abstractions.ClassGenerator;
-import no.sikt.graphitron.reducedgenerators.MapOnlyFetchDBClassGenerator;
+import no.sikt.graphitron.reducedgenerators.PaginationOnlyDBClassGenerator;
 import no.sikt.graphql.schema.ProcessedSchema;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -20,43 +19,63 @@ protected String getSubpath() {
         return "queries/fetch/pagination";
     }
 
-    @Override
-    protected Set<SchemaComponent> getComponents() {
-        return makeComponents(CUSTOMER_CONNECTION);
-    }
-
     @Override
     protected List<ClassGenerator> makeGenerators(ProcessedSchema schema) {
-        return List.of(new MapOnlyFetchDBClassGenerator(schema));
+        return List.of(new PaginationOnlyDBClassGenerator(schema));
     }
 
     @Test
     @DisplayName("Connection with no other fields")
     void defaultCase() {
-        assertGeneratedContentMatches("default");
+        assertGeneratedContentMatches("default", CUSTOMER_CONNECTION_WITH_NO_OPTIONALS);
     }
 
     @Test
     @DisplayName("Connection with an extra field")
     void withOtherField() {
         assertGeneratedContentContains(
                 "withOtherField",
+                Set.of(CUSTOMER_CONNECTION_WITH_NO_OPTIONALS),
                 ", String _mi_name, Integer _iv_pageSize, String _mi_after,"
         );
     }
 
     @Test
     @DisplayName("Connection not on the root level")
     void splitQuery() {
-        assertGeneratedContentMatches("splitQuery", SPLIT_QUERY_WRAPPER);
+        assertGeneratedContentMatches(
+                "splitQuery",
+                CUSTOMER_CONNECTION_WITH_NO_OPTIONALS,
+                SPLIT_QUERY_WRAPPER
+        );
     }
 
     @Test
     @DisplayName("No pagination on non-connection multiset")
     void multiset() {
-        resultDoesNotContain("multiset", Set.of(CUSTOMER_TABLE),
+        resultDoesNotContain(
+                "multiset",
+                Set.of(CUSTOMER_TABLE),
                 ".getOrderByValues(",
                 ".seek("
         );
     }
+
+    @Test
+    @DisplayName("When optional field 'totalCount' is included in the schema, generate the count method")
+    void shouldGenerateAllOptionalFields() {
+        assertGeneratedContentContains(
+                "allOptionalFieldsIncluded",
+                Set.of(CUSTOMER_CONNECTION),
+                "countCustomersForQuery(");
+    }
+
+    @Test
+    @DisplayName("When optional field 'totalCount' is not included in the schema, do not generate the count method")
+    void shouldGenerateNoOptionalFields() {
+        resultDoesNotContain(
+                "allOptionalFieldsExcluded",
+                Set.of(CUSTOMER_CONNECTION_WITH_NO_OPTIONALS),
+                "countCustomersForQuery(");
+    }
 }

graphitron-codegen-parent/graphitron-java-codegen/src/test/java/no/sikt/graphitron/reducedgenerators/PaginationOnlyDBClassGenerator.java

@@ -0,0 +1,27 @@
+package no.sikt.graphitron.reducedgenerators;
+
+import no.sikt.graphitron.definitions.objects.ObjectDefinition;
+import no.sikt.graphitron.generators.db.DBClassGenerator;
+import no.sikt.graphitron.generators.db.FetchCountDBMethodGenerator;
+import no.sikt.graphitron.generators.db.FetchMappedObjectDBMethodGenerator;
+import no.sikt.graphitron.generators.db.SelectHelperDBMethodGenerator;
+import no.sikt.graphitron.javapoet.TypeSpec;
+import no.sikt.graphql.schema.ProcessedSchema;
+
+import java.util.List;
+
+public class PaginationOnlyDBClassGenerator extends DBClassGenerator {
+    public PaginationOnlyDBClassGenerator(ProcessedSchema processedSchema) {
+        super(processedSchema);
+    }
+
+    @Override
+    public TypeSpec generate(ObjectDefinition target) {
+        return getSpec(
+                target.getName(),
+                List.of(new FetchMappedObjectDBMethodGenerator(target, processedSchema),
+                        new SelectHelperDBMethodGenerator(target, processedSchema),
+                        new FetchCountDBMethodGenerator(target, processedSchema))
+        ).build();
+    }
+}

graphitron-codegen-parent/graphitron-java-codegen/src/test/resources/components/basic/CustomerConnection.graphqls

@@ -2,6 +2,7 @@ type CustomerConnection {
   edges: [CustomerConnectionEdge]
   pageInfo: PageInfo
   nodes: [CustomerTable!]!
+  totalCount: Int
 }
 
 type CustomerConnectionEdge {

graphitron-codegen-parent/graphitron-java-codegen/src/test/resources/components/basic/CustomerConnectionWithNoOptionals.graphqls

@@ -0,0 +1,9 @@
+type CustomerConnection {
+  edges: [CustomerConnectionEdge]
+  pageInfo: PageInfo
+}
+
+type CustomerConnectionEdge {
+  cursor: String
+  node: CustomerTable
+}

graphitron-codegen-parent/graphitron-java-codegen/src/test/resources/components/basic/DummyConnection.graphqls

@@ -2,6 +2,7 @@ type DummyConnection {
   edges: [DummyConnectionEdge]
   pageInfo: PageInfo
   nodes: [DummyType!]!
+  totalCount: Int
 }
 
 type DummyConnectionEdge {

graphitron-codegen-parent/graphitron-java-codegen/src/test/resources/components/basic/PersonWithEmailConnection.graphqls

@@ -1,6 +1,7 @@
 type PersonWithEmailConnection {
     edges: [PersonWithEmailConnectionEdge]
     nodes: [PersonWithEmail!]!
+    totalCount: Int
 }
 
 type PersonWithEmailConnectionEdge {

graphitron-codegen-parent/graphitron-java-codegen/src/test/resources/components/basic/SomeUnionConnection.graphqls

@@ -2,6 +2,7 @@ type SomeUnionConnection {
     edges: [SomeUnionConnectionEdge]
     pageInfo: PageInfo
     nodes: [SomeUnion!]!
+    totalCount: Int
 }
 
 type SomeUnionConnectionEdge {

graphitron-codegen-parent/graphitron-java-codegen/src/test/resources/datafetchers/fetch/pagination/operation/allOptionalFieldsExcluded/schema.graphqls

@@ -0,0 +1,3 @@
+type Query {
+  customers(first: Int = 100, after: String): CustomerConnection
+}

graphitron-codegen-parent/graphitron-java-codegen/src/test/resources/datafetchers/fetch/pagination/operation/allOptionalFieldsIncluded/schema.graphqls

@@ -0,0 +1,3 @@
+type Query {
+  customers(first: Int = 100, after: String): CustomerConnection
+}

graphitron-codegen-parent/graphitron-java-codegen/src/test/resources/datafetchers/fetch/services/operation/withPaginationAndAllOptionalFieldsIncluded/expected/QueryGeneratedDataFetcher.java

@@ -0,0 +1,28 @@
+import fake.code.generated.transform.RecordTransformer;
+import fake.graphql.example.model.CustomerTable;
+import graphql.schema.DataFetcher;
+import java.lang.Integer;
+import java.lang.String;
+import java.util.concurrent.CompletableFuture;
+import no.sikt.graphitron.codereferences.services.ResolverFetchService;
+import no.sikt.graphql.helpers.resolvers.ResolverHelpers;
+import no.sikt.graphql.helpers.resolvers.ServiceDataFetcherHelper;
+import no.sikt.graphql.relay.ConnectionImpl;
+
+public class QueryGeneratedDataFetcher {
+    public static DataFetcher<CompletableFuture<ConnectionImpl<CustomerTable>>> customers() {
+        return _iv_env -> {
+            Integer _mi_first = _iv_env.getArgument("first");
+            String _mi_after = _iv_env.getArgument("after");
+            int _iv_pageSize = ResolverHelpers.getPageSize(_mi_first, 1000, 100);
+            var _iv_transform = new RecordTransformer(_iv_env);
+            var _rs_resolverFetchService = new ResolverFetchService(_iv_transform.getCtx());
+            return new ServiceDataFetcherHelper<>(_iv_transform).loadPaginated(
+                    _iv_pageSize,
+                    () -> _rs_resolverFetchService.queryList(_iv_pageSize, _mi_after),
+                    (_iv_keys) -> _rs_resolverFetchService.countQueryList(),
+                    (_iv_recordTransform, _iv_response) -> _iv_recordTransform.customerTableRecordToGraphType(_iv_response, "")
+            );
+        } ;
+    }
+}

graphitron-codegen-parent/graphitron-java-codegen/src/test/resources/datafetchers/fetch/services/operation/withPaginationAndAllOptionalFieldsIncluded/schema.graphqls

@@ -0,0 +1,4 @@
+type Query {
+  customers(first: Int = 100, after: String): CustomerConnection @service(
+    service: {name: "RESOLVER_FETCH_SERVICE", method: "queryList"})
+}