refactor CreateEvent method with dynamic query builder

core/build.gradle.kts

@@ -58,6 +58,10 @@ micronaut {
             importMapping.put("EventType", "org.justserve.model.EventType")
             schemaMapping.put("ProjectLocationType", "org.justserve.model.ProjectLocationType")
             importMapping.put("ProjectLocationType", "org.justserve.model.ProjectLocationType")
+            schemaMapping.put("ProjectStatus", "org.justserve.model.ProjectStatus")
+            importMapping.put("ProjectStatus", "org.justserve.model.ProjectStatus")
+            schemaMapping.put("TimeZone", "org.justserve.model.TimeZone")
+            importMapping.put("TimeZone", "org.justserve.model.TimeZone")
         }
     }
     processing {

core/src/main/java/org/justserve/client/GraphQLClient.java

@@ -7,13 +7,26 @@
 import io.micronaut.http.client.annotation.Client;
 import io.micronaut.retry.annotation.Retryable;
 import org.justserve.model.*;
+import org.justserve.model.graph.*;
+
+import java.util.ArrayList;
+import java.util.List;
 
 @Produces("application/json")
 @Consumes("application/graphql-response+json; charset=utf-8")
 @Retryable
 @Client(id = "justserve", path = "/graphql")
 public interface GraphQLClient {
 
+    @Post
+    GraphQLResponse<ProjectEvent> createEvent(@Body CreateEventMutation request);
+
+    @Post
+    GraphQLResponse<CreateEventsData> createEvents(@Body CreateEventsMutation request);
+
+    @Post
+    GraphQLResponse<CreateRecurringEventsData> createRecurringEvents(@Body CreateRecurringEventsMutation request);
+
     @Post
     GraphQLResponse<GraphQLAddProjectAttachmentData> executeAddProjectAttachment(@Body GraphQLAddProjectAttachmentRequest request);
 
@@ -23,9 +36,6 @@ public interface GraphQLClient {
     @Post
     GraphQLResponse<GraphQLCombinedMutationUpdateProjectAddProjectTagData> executeCombinedMutationUpdateProjectAddProjectTag(@Body GraphQLCombinedMutationUpdateProjectAddProjectTagRequest request);
 
-    @Post
-    GraphQLResponse<GraphQLCreateEventData> executeCreateEvent(@Body GraphQLCreateEventRequest request);
-
     @Post
     GraphQLResponse<GraphQLCreateProjectData> executeCreateProject(@Body GraphQLCreateProjectRequest request);
 
@@ -71,14 +81,6 @@ default GraphQLResponse<GraphQLCombinedMutationUpdateProjectAddProjectTagData> c
         return this.executeCombinedMutationUpdateProjectAddProjectTag(request);
     }
 
-    default GraphQLResponse<GraphQLCreateEventData> createEvent(GraphQLCreateEventVariables variables) {
-        String fixedQuery = "mutation createEvent($projectId: ID!, $projectEvent: UpdateProjectEventInput!) {\n      createEvent(\n        projectId: $projectId\n        projectEvent: $projectEvent\n      ) {\n        id\n        projectId\n        contactEmail\n        contactName\n        contactPhone\n        start\n        end\n        groupCap\n        groupLimit\n        timezone\n        totalVolunteersNeeded\n        volunteerCap\n      }\n    }";
-        GraphQLCreateEventRequest request = new GraphQLCreateEventRequest();
-        request.setQuery(fixedQuery);
-        request.setVariables(variables);
-        return this.executeCreateEvent(request);
-    }
-
     default GraphQLResponse<GraphQLCreateProjectData> createProject(GraphQLCreateProjectVariables variables) {
         String fixedQuery = "mutation createProject($title: String!, $eventType: ProjectType!, $locationType: ProjectLocationType!, $redirect: String) {\n      createProject(\n        title: $title\n        eventType: $eventType\n        locationType: $locationType\n        redirect: $redirect\n      ) {\n          id\n          title\n          typeId\n          locationTypeId\n          externalVolunteerUrl\n          statusId\n        }\n      }";
         GraphQLCreateProjectRequest request = new GraphQLCreateProjectRequest();
@@ -128,9 +130,20 @@ default GraphQLResponse<GraphQLUpdateProjectListingData> updateProjectListing(Gr
     }
 
     default GraphQLResponse<GraphQLUpdateProjectData> updateProject(GraphQLUpdateProjectVariables variables) {
-        String fixedQuery = "mutation ($projectId: ID!, $logo: String!) {\n      updateProject(id: $projectId, modify: { logo: $logo }) {\n        id\n        logo\n      }\n    }";
+        String mutationFormat = "mutation ($projectId: ID!, $logo: String!) {\n      updateProject(id: $projectId, modify: { logo: $logo }) {\n        %s\n      }\n    }";
+
+        List<String> responseFields = new ArrayList<>();
+        responseFields.add("id");
+
+        if (variables.getLogo() != null) {
+            responseFields.add("logo");
+        }
+
+        String fieldsString = String.join("\n", responseFields);
+        String dynamicQuery = String.format(mutationFormat, fieldsString);
+
         GraphQLUpdateProjectRequest request = new GraphQLUpdateProjectRequest();
-        request.setQuery(fixedQuery);
+        request.setQuery(dynamicQuery);
         request.setVariables(variables);
         return this.executeUpdateProject(request);
     }

core/src/main/java/org/justserve/model/CivicGeography.java

@@ -0,0 +1,17 @@
+package org.justserve.model;
+
+import io.micronaut.core.annotation.Introspected;
+import io.micronaut.serde.annotation.Serdeable;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * This class is currently a placeholder for a future work.
+ * This class does nothing.
+ */
+@Data
+@Accessors(chain = true)
+@Serdeable
+@Introspected
+public class CivicGeography {
+}

core/src/main/java/org/justserve/model/EventType.java

@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.micronaut.serde.annotation.Serdeable;
-import jakarta.annotation.Generated;
+import lombok.Generated;
 import lombok.RequiredArgsConstructor;
 
 import java.util.Arrays;
@@ -12,16 +12,40 @@
 import java.util.stream.Collectors;
 
 /**
- * Gets or Sets EventType
+ * Defines the scheduling model for a JustServe project, determining how its
+ * {@link ProjectEvent}s are structured and displayed.
+ *
+ * @author Jonathan Zollinger
+ * @since 0.1.0
  */
 @RequiredArgsConstructor
 @Serdeable
-@Generated("io.micronaut.openapi.generator.JavaMicronautClientCodegen")
 public enum EventType {
-//    None(0, "None"),
+    /**
+     * <h4>Date, Time, and Location</h4>
+     * A standard event that occurs at a specific time and place.
+     */
     DTL(1, "DTL"),
+
+    /**
+     * <h4>Ongoing</h4>
+     * An event with no specific time. The start and end dates determine visibility on JustServe
+     */
     Ongoing(2, "ONGOING"),
+
+    /**
+     * <h4>Recurring</h4>
+     * An event that repeats on a regular schedule, such as weekly or monthly.
+     * <p><b>Example:</b> An evening opportunity that occurs every Monday, Wednesday,
+     * and Friday for three months.
+     */
     Recurring(3, "RECURRING"),
+
+    /**
+     * <h4>Multiple Date, Time, and Location</h4>
+     * A complex event that has multiple, distinct shifts or occurrences.
+     * <p><b>Example:</b> A project with multiple shifts on each Saturday for several weeks.
+     */
     MultipleDTL(4, "MULTIPLE_DTL");
 
     public static final Map<Integer, EventType> VALUE_MAPPING = Map.copyOf(Arrays.stream(values())
@@ -40,8 +64,13 @@ public String getStringValue() {
         return stringValue;
     }
 
-    // 2. RECEIVING (Response): This catches the incoming data.
-    // It can handle the Integer '1' from GraphQL, or even a String if a REST endpoint sends one.
+    /**
+     * Parses the incoming value to either the string or integer value, whichever the server is using.
+     *
+     * @param value the incoming value from the server
+     * @return the event type that matches the incoming value
+     */
+    @Generated //manually placed annotation to tell jacoco coverage report to ignore this
     @JsonCreator
     public static EventType fromValue(Object value) {
         if (value instanceof Number) {
@@ -56,4 +85,4 @@ public static EventType fromValue(Object value) {
         }
         throw new IllegalArgumentException("Unexpected value '" + value + "' for EventType");
     }
-}
+}