Merge pull request #604 from bcgov/feature/GRAD2-2431

GRAD2-2431: task is completed.
bcgov · Dec 18, 2023 · eab22fb · eab22fb
2 parents aca0628 + 72c0f1d
commit eab22fb
Showing 1 changed file with 22 additions and 10 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/service/DataConversionService.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/service/DataConversionService.java
@@ -275,21 +275,33 @@ private void populateOngoingUpdateFields(List<OngoingUpdateFieldDTO> fields, Gra
             if (f.getName() == FieldName.GRAD_PROGRAM) {
                 String newProgram = (String) f.getValue();
                 String currentProgram = targetObject.getProgram();
-                if (!StringUtils.equalsIgnoreCase(currentProgram, newProgram)) {
-                    if("SCCP".equalsIgnoreCase(currentProgram)) {
-                        log.info(" {} ==> {}: Archive Student Achievements and SLP_DATE is set to null.", currentProgram, newProgram);
-                        targetObject.setProgramCompletionDate(null);
-                        graduationStatusService.archiveStudentAchievements(targetObject.getStudentID(),accessToken);
-                    } else {
-                        log.info(" {} ==> {}: Delete Student Achievements.", currentProgram, newProgram);
-                        graduationStatusService.deleteStudentAchievements(targetObject.getStudentID(), accessToken);
-                    }
-                }
+                handleStudentAchievements(currentProgram, newProgram, targetObject, accessToken);
+                resetAdultStartDate(currentProgram, newProgram, targetObject);
             }
             populate(f, targetObject);
         });
     }
 
+    private void handleStudentAchievements(String currentProgram, String newProgram, GraduationStudentRecordEntity targetObject, String accessToken) {
+        if (!StringUtils.equalsIgnoreCase(currentProgram, newProgram)) {
+            if("SCCP".equalsIgnoreCase(currentProgram)) {
+                log.info(" {} ==> {}: Archive Student Achievements and SLP_DATE is set to null.", currentProgram, newProgram);
+                targetObject.setProgramCompletionDate(null);
+                graduationStatusService.archiveStudentAchievements(targetObject.getStudentID(),accessToken);
+            } else {
+                log.info(" {} ==> {}: Delete Student Achievements.", currentProgram, newProgram);
+                graduationStatusService.deleteStudentAchievements(targetObject.getStudentID(), accessToken);
+            }
+        }
+    }
+
+    private void resetAdultStartDate(String currentProgram, String newProgram, GraduationStudentRecordEntity targetObject) {
+        // Only when 1950 adult program is channged to another, reset adultStartDate to null
+        if (!StringUtils.equalsIgnoreCase(currentProgram, newProgram) && "1950".equalsIgnoreCase(currentProgram)) {
+            targetObject.setAdultStartDate(null);
+        }
+    }
+
     private void populate(OngoingUpdateFieldDTO field, GraduationStudentRecordEntity targetObject) {
         switch (field.getName()) {
             case SCHOOL_OF_RECORD -> {