Merge pull request #282 from bcgov/hotfix/GRAD2-2172

GRAD2-2172: bug fix on NPE when retrieving student optional programs.
bcgov · Jul 6, 2023 · 90a7fff · 90a7fff
2 parents a30d030 + 88324ca
commit 90a7fff
Showing 1 changed file with 16 additions and 14 deletions.
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
@@ -1135,23 +1135,25 @@ public void saveGraduationStudent(StudentGradDTO gradStudent, String accessToken
     }
 
     private void removeAndReCreateOptionalPrograms(StudentGradDTO gradStudent, String accessToken) {
-        List<String> optionalProgramCodes = new ArrayList<>();
-
         // Remove all optional programs
         List<StudentOptionalProgram> studentOptionalPrograms = restUtils.getStudentOptionalPrograms(gradStudent.getStudentID().toString(), accessToken);
-        studentOptionalPrograms.forEach(op -> {
-            log.info(" => [{}] optional program will be removed if exist.", op.getOptionalProgramCode());
-            removeStudentOptionalProgram(op.getOptionalProgramID(), gradStudent, accessToken);
-            if (isOptionalProgramRecreationRequired(op.getOptionalProgramCode())) {
-                optionalProgramCodes.add(op.getOptionalProgramCode());
-            }
-        });
+        if (studentOptionalPrograms != null && !studentOptionalPrograms.isEmpty()) {
+            List<String> optionalProgramCodes = new ArrayList<>();
 
-        // Recreate nonFI & nonDD optional programs
-        optionalProgramCodes.forEach(opc -> {
-            log.info(" => [{}] optional program will be re-created.", opc);
-            addStudentOptionalProgram(opc, gradStudent, true, accessToken);
-        });
+            studentOptionalPrograms.forEach(op -> {
+                log.info(" => [{}] optional program will be removed if exist.", op.getOptionalProgramCode());
+                removeStudentOptionalProgram(op.getOptionalProgramID(), gradStudent, accessToken);
+                if (isOptionalProgramRecreationRequired(op.getOptionalProgramCode())) {
+                    optionalProgramCodes.add(op.getOptionalProgramCode());
+                }
+            });
+
+            // Recreate nonFI & nonDD optional programs
+            optionalProgramCodes.forEach(opc -> {
+                log.info(" => [{}] optional program will be re-created.", opc);
+                addStudentOptionalProgram(opc, gradStudent, true, accessToken);
+            });
+        }
     }
 
     private void handleFIorDDOptionalProgram(StudentGradDTO gradStudent, String accessToken) {