Merge pull request #331 from bcgov/feature/GRAD2-2673

GRAD2-2673: task is complete.
bcgov · Jun 26, 2024 · aa7e5c0 · aa7e5c0
2 parents 89e2fb5 + 294e181
commit aa7e5c0
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 289 deletions.
diff --git a/...rc/main/java/ca/bc/gov/educ/api/dataconversion/choreographer/ChoreographEventHandler.java b/...rc/main/java/ca/bc/gov/educ/api/dataconversion/choreographer/ChoreographEventHandler.java
@@ -56,11 +56,6 @@ public void handleEvent(@NonNull final Event event) {
             final TraxGraduationUpdateDTO updateGrad = JsonUtil.getJsonObjectFromString(TraxGraduationUpdateDTO.class, event.getEventPayload());
             this.eventServiceMap.get(UPD_GRAD.toString()).processEvent(updateGrad, event);
             break;
-          case "UPD_STD_STATUS": // UPD_STD_STATUS will be deprecated
-            log.debug("Processing UPD_STD_STATUS event record :: {} ", event);
-            final TraxStudentStatusUpdateDTO updateStudentStatus = JsonUtil.getJsonObjectFromString(TraxStudentStatusUpdateDTO.class, event.getEventPayload());
-            this.eventServiceMap.get(UPD_STD_STATUS.toString()).processEvent(updateStudentStatus, event);
-            break;
           case "XPROGRAM":
             log.debug("Processing XPROGRAM event record :: {} ", event);
             final TraxXProgramDTO xprogram = JsonUtil.getJsonObjectFromString(TraxXProgramDTO.class, event.getEventPayload());

diff --git a/api/src/main/java/ca/bc/gov/educ/api/dataconversion/constant/EventType.java b/api/src/main/java/ca/bc/gov/educ/api/dataconversion/constant/EventType.java
@@ -13,7 +13,6 @@ public enum EventType {
   NEWSTUDENT,
   UPD_DEMOG,
   UPD_GRAD,
-  UPD_STD_STATUS, // UPD_STD_STATUS will be deprecated
   XPROGRAM,
   ASSESSMENT,
   COURSE,

diff --git a/api/src/main/java/ca/bc/gov/educ/api/dataconversion/model/TraxStudentStatusUpdateDTO.java b/api/src/main/java/ca/bc/gov/educ/api/dataconversion/model/TraxStudentStatusUpdateDTO.java
diff --git a/api/src/main/java/ca/bc/gov/educ/api/dataconversion/process/StudentProcess.java b/api/src/main/java/ca/bc/gov/educ/api/dataconversion/process/StudentProcess.java
@@ -490,14 +490,6 @@ public void saveGraduationStudent(String pen, StudentGradDTO gradStudent, EventT
                 requestDTO.getUpdateFields().add(field);
             }
         }
-        // UPD_STD_STATUS will be deprecated
-        // Student Status
-        if (eventType == EventType.UPD_STD_STATUS && StringUtils.isNotBlank(gradStudent.getNewStudentStatus())) {
-            OngoingUpdateFieldDTO field = OngoingUpdateFieldDTO.builder()
-                    .type(FieldType.STRING).name(FieldName.STUDENT_STATUS).value(gradStudent.getNewStudentStatus())
-                    .build();
-            requestDTO.getUpdateFields().add(field);
-        }
 
         // Others ======================================================
         // Batch Flags

diff --git a/...va/ca/bc/gov/educ/api/dataconversion/service/student/StudentStatusUpdateEventService.java b/...va/ca/bc/gov/educ/api/dataconversion/service/student/StudentStatusUpdateEventService.java
diff --git a/api/src/test/java/ca/bc/gov/educ/api/dataconversion/process/StudentProcessTest.java b/api/src/test/java/ca/bc/gov/educ/api/dataconversion/process/StudentProcessTest.java
@@ -916,7 +916,7 @@ public void testSaveGraduationStudent_whenStudentStatus_isChanged_then_returnAPI
 
         boolean exceptionIsThrown = false;
         try {
-            studentProcess.saveGraduationStudent(pen, requestStudent, EventType.UPD_STD_STATUS, "123");
+            studentProcess.saveGraduationStudent(pen, requestStudent, EventType.UPD_GRAD, "123");
         } catch (Exception e) {
             exceptionIsThrown = true;
         }

diff --git a/...t/java/ca/bc/gov/educ/api/dataconversion/service/StudentStatusUpdateEventServiceTest.java b/...t/java/ca/bc/gov/educ/api/dataconversion/service/StudentStatusUpdateEventServiceTest.java