Merge pull request #598 from bcgov/feature/Grad2-2341RecordAuditHisto…

…ryStudentFlagsEdit Grad2-2341 Flip updating flags for students
bcgov · Dec 6, 2023 · dd75e14 · dd75e14
2 parents fbb0630 + b1e0b93
commit dd75e14
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/service/GraduationStatusService.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/service/GraduationStatusService.java
@@ -205,7 +205,7 @@ public Pair<GraduationStudentRecord, GradStatusEvent> updateGraduationStatus(UUI
                 validation.stopOnErrors();
                 return Pair.of(new GraduationStudentRecord(), null);
             }
-            if(hasDataChanged.hasDataChanged() && !sourceObject.getProgram().equalsIgnoreCase(gradEntity.getProgram())) {
+            if(hasDataChanged.hasDataChanged()) {
                 deleteStudentOptionalPrograms(sourceObject.getStudentID());
                 deleteStudentCareerPrograms(sourceObject.getStudentID());
                 if(gradEntity.getProgram().equalsIgnoreCase("SCCP")) {
@@ -220,19 +220,17 @@ public Pair<GraduationStudentRecord, GradStatusEvent> updateGraduationStatus(UUI
                 } else {
                     deleteStudentAchievements(sourceObject.getStudentID(), accessToken);
                 }
-            }
-
-            if("".equals(sourceObject.getRecalculateGradStatus()) || "N".equalsIgnoreCase(sourceObject.getRecalculateGradStatus())) {
-                gradEntity.setRecalculateGradStatus(null);
-            }
-            else {
-                gradEntity.setRecalculateGradStatus(sourceObject.getRecalculateGradStatus());
-            }
-            if ("".equals(sourceObject.getRecalculateProjectedGrad()) || "N".equalsIgnoreCase(sourceObject.getRecalculateProjectedGrad())) {
-                gradEntity.setRecalculateProjectedGrad(null);
-            }
-            else {
-                gradEntity.setRecalculateProjectedGrad(sourceObject.getRecalculateProjectedGrad());
+            } else {
+                if ("".equals(sourceObject.getRecalculateGradStatus()) || "N".equalsIgnoreCase(sourceObject.getRecalculateGradStatus())) {
+                    gradEntity.setRecalculateGradStatus(null);
+                } else {
+                    gradEntity.setRecalculateGradStatus(sourceObject.getRecalculateGradStatus());
+                }
+                if ("".equals(sourceObject.getRecalculateProjectedGrad()) || "N".equalsIgnoreCase(sourceObject.getRecalculateProjectedGrad())) {
+                    gradEntity.setRecalculateProjectedGrad(null);
+                } else {
+                    gradEntity.setRecalculateProjectedGrad(sourceObject.getRecalculateProjectedGrad());
+                }
             }