Merge pull request #590 from bcgov/feature/GRAD2-2389

GRAD2-2389, 2390, 2412: task is complete.

api/src/main/java/ca/bc/gov/educ/api/gradstudent/constant/FieldName.java

@@ -0,0 +1,15 @@
+package ca.bc.gov.educ.api.gradstudent.constant;
+
+public enum FieldName {
+    SCHOOL_OF_RECORD,
+    GRAD_PROGRAM,
+    ADULT_START_DATE,
+    SLP_DATE,
+    STUDENT_GRADE,
+    CITIZENSHIP,
+    STUDENT_STATUS,
+
+    RECALC_GRAD_ALG,
+    RECALC_TVR
+
+}

api/src/main/java/ca/bc/gov/educ/api/gradstudent/constant/FieldType.java

@@ -0,0 +1,6 @@
+package ca.bc.gov.educ.api.gradstudent.constant;
+
+public enum FieldType {
+    STRING,
+    DATE
+}

api/src/main/java/ca/bc/gov/educ/api/gradstudent/constant/TraxEventType.java

@@ -0,0 +1,18 @@
+package ca.bc.gov.educ.api.gradstudent.constant;
+
+public enum TraxEventType {
+  /* ===========================================================
+    Incremental updates from Trax to Grad
+   =============================================================*/
+    /**
+     * Trax update type
+     */
+    NEWSTUDENT,
+    UPD_DEMOG,
+    UPD_GRAD,
+    UPD_STD_STATUS,
+    XPROGRAM,
+    ASSESSMENT,
+    COURSE,
+    FI10ADD
+}

api/src/main/java/ca/bc/gov/educ/api/gradstudent/controller/DataConversionController.java

@@ -45,10 +45,20 @@ public class DataConversionController {
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK")})
     public ResponseEntity<GraduationStudentRecord> saveStudentGradStatus(@PathVariable String studentID,
                                                                          @RequestParam(value = "ongoingUpdate", required = false, defaultValue = "false") boolean ongoingUpdate,
-                                                                         @RequestBody GraduationStudentRecord graduationStatus,
-                                                                         @RequestHeader(name="Authorization") String accessToken) {
+                                                                         @RequestBody GraduationStudentRecord graduationStatus) {
         logger.debug("Save Graduation Student Record for Student ID");
-        var result = dataConversionService.saveGraduationStudentRecord(UUID.fromString(studentID),graduationStatus, ongoingUpdate, accessToken.replace(BEARER, ""));
+        var result = dataConversionService.saveGraduationStudentRecord(UUID.fromString(studentID),graduationStatus, ongoingUpdate);
+        return response.GET(result);
+    }
+
+    @PostMapping(EducGradStudentApiConstants.CONV_GRADUATION_STATUS_FOR_ONGOING_UPDATES)
+    @PreAuthorize(PermissionsConstants.UPDATE_GRADUATION_STUDENT)
+    @Operation(summary = "Update Graduation Status At Field Level for Ongoing Updates", description = "Update Graduation Status At Field Level for Ongoing Updates", tags = { "Data Conversion" })
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK")})
+    public ResponseEntity<GraduationStudentRecord> updateGraduationStatusForOngoingUpdates(@RequestBody OngoingUpdateRequestDTO requestDTO,
+                                                                                           @RequestHeader(name="Authorization") String accessToken) {
+        logger.debug("Save Graduation Student Record for Student ID");
+        var result = dataConversionService.updateGraduationStatusByFields(requestDTO, accessToken.replace(BEARER, ""));
         return response.GET(result);
     }
 

api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/OngoingUpdateFieldDTO.java

@@ -0,0 +1,38 @@
+package ca.bc.gov.educ.api.gradstudent.model.dto;
+
+import ca.bc.gov.educ.api.gradstudent.constant.FieldName;
+import ca.bc.gov.educ.api.gradstudent.constant.FieldType;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.Objects;
+
+@Builder
+@Data
+public class OngoingUpdateFieldDTO {
+    private FieldType type;
+    private FieldName name;
+    private Object value;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        OngoingUpdateFieldDTO that = (OngoingUpdateFieldDTO) o;
+        return getName() == that.getName();
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getName());
+    }
+
+    @Override
+    public String toString() {
+        return "OngoingUpdateFieldDTO{" +
+                "type=" + type +
+                ", name=" + name +
+                ", value=" + value +
+                '}';
+    }
+}

api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/OngoingUpdateRequestDTO.java

@@ -0,0 +1,17 @@
+package ca.bc.gov.educ.api.gradstudent.model.dto;
+
+import ca.bc.gov.educ.api.gradstudent.constant.TraxEventType;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@NoArgsConstructor
+@Data
+public class OngoingUpdateRequestDTO {
+    private String studentID;
+    private String pen;
+    private TraxEventType eventType;
+    private List<OngoingUpdateFieldDTO> updateFields = new ArrayList<>();
+}