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 index c22d53fa..c6308121 100644 --- 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 @@ -923,9 +923,11 @@ private ConversionResultType processProgramCodes(GraduationStudentRecord student private Pair handleProgramCode(String programCode, GraduationStudentRecord student, StudentLoadType studentLoadType, StudentLoadType originalStudentLoadType, ConversionStudentSummaryDTO summary) { ConversionResultType resultType; boolean isCareerProgramCreated = false; + if (isStudentSCCPForTwoPrograms(student.getProgram(), originalStudentLoadType)) { + return Pair.of(ConversionResultType.SUCCESS, isCareerProgramCreated); + } if (isOptionalProgramCode(programCode)) { - resultType = isStudentSCCPForTwoPrograms(student.getProgram(), originalStudentLoadType)? ConversionResultType.SUCCESS : - createStudentOptionalProgram(programCode, student, studentLoadType, summary); + resultType = createStudentOptionalProgram(programCode, student, studentLoadType, summary); } else { resultType = createStudentCareerProgram(programCode, student, summary); if (ConversionResultType.SUCCESS == resultType) {