From 9031456dd73feb754a39637af112e7121b7d1409 Mon Sep 17 00:00:00 2001 From: Jinil Sung Date: Thu, 18 Jan 2024 14:29:31 -0800 Subject: [PATCH] GRAD2-2425: task is complete. GRAD2-2425: task is complete. --- .../student/StudentGraduationUpdateEventService.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/api/src/main/java/ca/bc/gov/educ/api/dataconversion/service/student/StudentGraduationUpdateEventService.java b/api/src/main/java/ca/bc/gov/educ/api/dataconversion/service/student/StudentGraduationUpdateEventService.java index e9e55814..cfe76989 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/dataconversion/service/student/StudentGraduationUpdateEventService.java +++ b/api/src/main/java/ca/bc/gov/educ/api/dataconversion/service/student/StudentGraduationUpdateEventService.java @@ -164,15 +164,11 @@ private void handleProgramChange(String newGradProgram, StudentGradDTO currentSt // from SCCP to PF addDualDogwood = true; } else if (newGradProgram.endsWith("-EN")) { - // from PF to EN - not allowed - if (currentStudent.getProgram().endsWith("-PF")) { - currentStudent.setNewProgram(null); - return; - } + // from PF to EN - allowed for SD93/Yukon PF schools // from EN to EN // from 1950 to EN // from SCCP to EN - if (studentProcess.hasAnyFrenchImmersionCourse(newGradProgram, pen, accessToken)) { + if (currentStudent.getProgram().endsWith("-PF") || studentProcess.hasAnyFrenchImmersionCourse(newGradProgram, pen, accessToken)) { addFrenchImmersion = true; } }