Merge branch 'grad-release' of https://github.com/bcgov/EDUC-RULE-ENG…

…INE-API into develop/alex-GRAD2-2799
bcgov · Jun 27, 2024 · afa8a5b · afa8a5b
2 parents a8325aa + 0021957
commit afa8a5b
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build.from.developer.branch.deploy.to.dev.yml b/.github/workflows/build.from.developer.branch.deploy.to.dev.yml
@@ -48,7 +48,7 @@ on:
 jobs:
   openshift-ci-cd:
     name: Build and deploy to OpenShift DEV from developer branch
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: dev
 
     steps:

diff --git a/.github/workflows/build.from.main.branch.deploy.to.dev.yml b/.github/workflows/build.from.main.branch.deploy.to.dev.yml
@@ -36,7 +36,7 @@ on:
 jobs:
   openshift-ci-cd:
     name: Build and deploy to OpenShift DEV
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: dev
 
     steps:

diff --git a/.github/workflows/build.from.release.branch.deploy.to.dev.yml b/.github/workflows/build.from.release.branch.deploy.to.dev.yml
@@ -43,7 +43,7 @@ on:
 jobs:
   openshift-ci-cd:
     name: Build and deploy to OpenShift DEV from release branch
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: dev
 
     steps:

diff --git a/.github/workflows/create_tag.yml b/.github/workflows/create_tag.yml
@@ -26,7 +26,7 @@ on:
 jobs:
   tag_image:
     name: Tag Image
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: dev
 
     outputs:

diff --git a/.github/workflows/deploy_prod.yml b/.github/workflows/deploy_prod.yml
@@ -32,7 +32,7 @@ on:
 jobs:
   deploy-to-openshift-prod:
     name: Deploy to OpenShift PROD
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: prod
 
     outputs:

diff --git a/.github/workflows/deploy_test.yml b/.github/workflows/deploy_test.yml
@@ -32,7 +32,7 @@ on:
 jobs:
   deploy-to-openshift-test:
     name: Deploy to OpenShift TEST
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     environment: test
 
     outputs:

diff --git a/.github/workflows/on.pr.yml b/.github/workflows/on.pr.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   quality_profile:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     defaults:
       run:

diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/CareerProgramMatchRule.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/CareerProgramMatchRule.java
@@ -58,7 +58,7 @@ public RuleData fire() {
 
         	StudentCourse sc = studentCourseIterator.next();
         	for(OptionalProgramRequirement pR:careerProgramRulesMatch) {            	
-            	if((pR.getOptionalProgramRequirementCode().getRequiredLevel() == null || pR.getOptionalProgramRequirementCode().getRequiredLevel().trim().compareTo("") == 0) && (sc.getWorkExpFlag() != null && sc.getWorkExpFlag().equalsIgnoreCase("Y"))) {
+            	if(pR.getOptionalProgramRequirementCode().getRequiredLevel() == null || pR.getOptionalProgramRequirementCode().getRequiredLevel().trim().compareTo("") == 0) {
                     requiredCredits = Integer.parseInt(pR.getOptionalProgramRequirementCode().getRequiredCredits());
                     if (totalCredits + sc.getCredits() <= requiredCredits) {
                         totalCredits += sc.getCredits();