Merge pull request #381 from bcgov/fix/GRAD2-3170

Changes to sync trax changes to GRAD based on new student status.

Author: sumathi-thirumani

api/src/main/java/ca/bc/gov/educ/api/dataconversion/service/student/StudentGraduationUpdateBaseService.java

@@ -56,7 +56,8 @@ protected void handleAdultStartDate(StudentGradDTO currentStudent) {
 
     protected boolean processSchoolOfRecordId(StudentGradDTO currentStudent, UUID value) {
         boolean isChanged = false;
-        switch(currentStudent.getStudentStatus()) {
+        String studentStatus = StringUtils.defaultIfEmpty(currentStudent.getNewStudentStatus(), currentStudent.getStudentStatus());
+        switch(studentStatus) {
             case STUDENT_STATUS_CURRENT -> {
                 // UpdData
                 currentStudent.setNewSchoolOfRecordId(value);
@@ -94,7 +95,8 @@ protected boolean processSchoolOfRecordId(StudentGradDTO currentStudent, UUID va
 
     protected boolean processStudentGrade(StudentGradDTO currentStudent, String value) {
         boolean isChanged = false;
-        switch(currentStudent.getStudentStatus()) {
+        String studentStatus = StringUtils.defaultIfEmpty(currentStudent.getNewStudentStatus(), currentStudent.getStudentStatus());
+        switch(studentStatus) {
             case STUDENT_STATUS_CURRENT -> {
                 // UpdData
                 currentStudent.setNewStudentGrade(value);
@@ -134,7 +136,8 @@ protected boolean processStudentGrade(StudentGradDTO currentStudent, String valu
 
     protected boolean processGraduationProgram(StudentGradDTO currentStudent, String pen, String gradProgram, String accessToken) {
         boolean isChanged = false;
-        switch(currentStudent.getStudentStatus()) {
+        String studentStatus = StringUtils.defaultIfEmpty(currentStudent.getNewStudentStatus(), currentStudent.getStudentStatus());
+        switch(studentStatus) {
             case STUDENT_STATUS_CURRENT -> {
                 if (!currentStudent.isGraduated() || currentStudent.isSCCP()) {
                     // UpdData
@@ -173,7 +176,8 @@ protected boolean processGraduationProgram(StudentGradDTO currentStudent, String
 
     protected boolean processSlpDate(StudentGradDTO currentStudent, String value) {
         boolean isChanged = false;
-        switch(currentStudent.getStudentStatus()) {
+        String studentStatus = StringUtils.defaultIfEmpty(currentStudent.getNewStudentStatus(), currentStudent.getStudentStatus());
+        switch(studentStatus) {
             case STUDENT_STATUS_CURRENT -> {
                 if (!currentStudent.isGraduated()) {
                     // UpdData
@@ -209,7 +213,8 @@ protected boolean processSlpDate(StudentGradDTO currentStudent, String value) {
 
     protected boolean processCitizenship(StudentGradDTO currentStudent, String value) {
         boolean isChanged = false;
-        switch(currentStudent.getStudentStatus()) {
+        String studentStatus = StringUtils.defaultIfEmpty(currentStudent.getNewStudentStatus(), currentStudent.getStudentStatus());
+        switch(studentStatus) {
             case STUDENT_STATUS_CURRENT -> {
                 // UpdData
                 currentStudent.setNewCitizenship(value);

api/src/main/java/ca/bc/gov/educ/api/dataconversion/service/student/StudentGraduationUpdateEventService.java

@@ -70,16 +70,24 @@ public <T extends Object> void processEvent(T request, Event event) {
     public void processStudent(TraxGraduationUpdateDTO updateGrad, StudentGradDTO currentStudent, String accessToken) {
         boolean isChanged = false;
         log.info(" Process Student : studentID = {}, pen = {}", currentStudent.getStudentID(), updateGrad.getPen());
+
+        // Student Status - This step is moved to top to determine the update fields based on new status.
+        String newStudentStatus = getGradStudentStatus(updateGrad.getStudentStatus(), updateGrad.getArchiveFlag());
+        if (newStudentStatus != null) {
+            processStudentStatus(currentStudent, newStudentStatus);
+            log.info(" => student status : current = {}, request = {}", currentStudent.getStudentStatus(), currentStudent.getNewStudentStatus());
+            isChanged = true;
+        }
         // Processing order is important for the first 3 fields below.
         // 1. School of Record Guid
         if (updateGrad.getSchoolOfRecordId() != null) {
-            isChanged = processSchoolOfRecordId(currentStudent, updateGrad.getSchoolOfRecordId());
+            isChanged = processSchoolOfRecordId(currentStudent, updateGrad.getSchoolOfRecordId()) || isChanged;
             log.info(" => school of record id : current = {}, request = {}", currentStudent.getSchoolOfRecordId(), currentStudent.getNewSchoolOfRecordId());
         }
         // 2. Grad Program
         String gradProgram = getGradProgram(updateGrad.getGraduationRequirementYear(), currentStudent.getUpToDateSchoolOfRecordId(), null);
         if (gradProgram != null) {
-            isChanged = processGraduationProgram(currentStudent, updateGrad.getPen(), gradProgram, accessToken);
+            isChanged = processGraduationProgram(currentStudent, updateGrad.getPen(), gradProgram, accessToken) || isChanged;
             if (isChanged && StringUtils.isNotBlank(currentStudent.getNewProgram())) {
                 log.info(" => grad program : current = {}, request = {}", currentStudent.getProgram(), currentStudent.getNewProgram());
             } else {
@@ -89,7 +97,7 @@ public void processStudent(TraxGraduationUpdateDTO updateGrad, StudentGradDTO cu
         // 3. SLP Date
         String slpDate = updateGrad.getSlpDateWithDefaultFormat();
         if (slpDate != null && "SCCP".equalsIgnoreCase(currentStudent.getUpToDateGradProgram())) {
-            isChanged = processSlpDate(currentStudent, slpDate);
+            isChanged = processSlpDate(currentStudent, slpDate) || isChanged;
             if (isChanged) {
                 log.info(" => slp date : current = {}, request = {}", currentStudent.getGradDate(), slpDate);
             } else {
@@ -98,21 +106,14 @@ public void processStudent(TraxGraduationUpdateDTO updateGrad, StudentGradDTO cu
         }
         // 4. Student Grade
         if (StringUtils.isNotBlank(updateGrad.getStudentGrade())) {
-            isChanged = processStudentGrade(currentStudent, updateGrad.getStudentGrade());
+            isChanged = processStudentGrade(currentStudent, updateGrad.getStudentGrade()) || isChanged;
             log.info(" => student grade : current = {}, request = {}", currentStudent.getStudentGrade(), currentStudent.getNewStudentGrade());
         }
         // 5. Citizenship
         if (StringUtils.isNotBlank(updateGrad.getCitizenship())) {
-            isChanged = processCitizenship(currentStudent, updateGrad.getCitizenship());
+            isChanged = processCitizenship(currentStudent, updateGrad.getCitizenship()) || isChanged;
             log.info(" => student citizenship : current = {}, request = {}", currentStudent.getCitizenship(), currentStudent.getNewCitizenship());
         }
-        String newStudentStatus = getGradStudentStatus(updateGrad.getStudentStatus(), updateGrad.getArchiveFlag());
-        // 6. Student Status
-        if (newStudentStatus != null) {
-            processStudentStatus(currentStudent, newStudentStatus);
-            log.info(" => student status : current = {}, request = {}", currentStudent.getStudentStatus(), currentStudent.getNewStudentStatus());
-            isChanged = true;
-        }
 
         if (isChanged) {
             log.info(" Save Student : studentID = {}, pen = {}", currentStudent.getStudentID(), updateGrad.getPen());