Grad release 1.10.0

bcgov · Nov 16, 2023 · 57e7c76 · 57e7c76
2 parents cc04d98 + f4df44e
commit 57e7c76
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 31 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>ca.bc.gov.educ</groupId>
 	<artifactId>educ-grad-algorithm-api</artifactId>
-	<version>1.8.30</version>
+	<version>1.8.32</version>
 	<name>educ-grad-algorithm-api</name>
 	<description>Graduation Algorithm API for GRAD team</description>
 

diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradalgorithm/service/GradAlgorithmService.java b/api/src/main/java/ca/bc/gov/educ/api/gradalgorithm/service/GradAlgorithmService.java
@@ -645,54 +645,51 @@ private Pair<Boolean, String> checkHonoursExemptRule(String program,List<Student
 				|| "TS".equalsIgnoreCase(sc.getCompletedCourseLetterGrade()))).count();
 
 		switch (program) {
-			case "2018-EN":
-			case "2018-PF":
+			case "2023-EN", "2023-PF", "2018-EN", "2018-PF" -> {
 				StudentCourse sCCheck = studentCourseList.stream().filter(sc -> sc.isUsed() && (sc.getCourseCode().equalsIgnoreCase("GT")
 								|| sc.getCourseCode().equalsIgnoreCase("GTF")
 								|| sc.getCourseCode().equalsIgnoreCase("PORT")
 								|| sc.getCourseCode().equalsIgnoreCase("PORTF")))
 						.findAny()
 						.orElse(null);
-				if(sCCheck == null) {
-					if(totalCreditsTSSGRM > 32) {
-						isExempted=true;
-						honourValue="N";
+				if (sCCheck == null) {
+					if (totalCreditsTSSGRM > 32) {
+						isExempted = true;
+						honourValue = "N";
 					}
 				} else {
-					if(totalCreditsTSSGRM > 36) {
-						isExempted=true;
-						honourValue="N";
+					if (totalCreditsTSSGRM > 36) {
+						isExempted = true;
+						honourValue = "N";
 					}
 				}
-				break;
-			case "1950":
-				if(totalCoursesTSSG > 3) {
+			}
+			case "1950" -> {
+				if (totalCoursesTSSG > 3) {
 					isExempted = true;
 					honourValue = "N";
 				}
-				break;
-			case "2004-EN":
-			case "2004-PF":
-				if(totalCreditsTSSGRM > 36) {
-					isExempted=true;
-					honourValue="N";
+			}
+			case "2004-EN", "2004-PF" -> {
+				if (totalCreditsTSSGRM > 36) {
+					isExempted = true;
+					honourValue = "N";
 				}
-				break;
-			case "1996-EN":
-			case "1996-PF":
-				if(totalCreditsTSSGRM > 24) {
-					isExempted=true;
-					honourValue="N";
+			}
+			case "1996-EN", "1996-PF" -> {
+				if (totalCreditsTSSGRM > 24) {
+					isExempted = true;
+					honourValue = "N";
 				}
-				break;
-			case "1986-EN":
-			case "1986-PF":
-				if(totalCoursesTSSG > 6) {
+			}
+			case "1986-EN", "1986-PF" -> {
+				if (totalCoursesTSSG > 6) {
 					isExempted = true;
 					honourValue = "N";
 				}
-				break;
-			default:
+			}
+			default -> {
+			}
 		}
 		return Pair.of(isExempted,honourValue);
 	}