UT + condition fix

bcgov · Nov 30, 2023 · a0305cb · a0305cb
1 parent 6072f00
commit a0305cb
Show file tree

Hide file tree

Showing 3 changed files with 309 additions and 1 deletion.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/institute/constants/v1/Constants.java b/api/src/main/java/ca/bc/gov/educ/api/institute/constants/v1/Constants.java
@@ -17,5 +17,7 @@ private Constants() {}
     public static final String UPPERBOUND = "999";
     public static final String DEFAULTNUMBER = "000";
     public static final String INDEPENDENT="INDEPEND";
+    public static final String OFFSHORE="OFFSHORE";
     public static final String NONINDEPENDENT="FED_BAND";
+    public static final String INDEPENDENTFNS="INDP_FNS";
 }
diff --git a/api/src/main/java/ca/bc/gov/educ/api/institute/service/v1/SchoolService.java b/api/src/main/java/ca/bc/gov/educ/api/institute/service/v1/SchoolService.java
@@ -452,7 +452,9 @@ private SchoolEntity moveSchoolHelper(School school, School existingSchool) {
               school.getSchoolNumber(), UUID.fromString(school.getDistrictId()));
 
       if(school.getSchoolCategoryCode().equals(existingSchool.getSchoolCategoryCode()) &&
-              !school.getSchoolCategoryCode().equals(Constants.INDEPENDENT) && !school.getSchoolCategoryCode().equals(Constants.NONINDEPENDENT) && schools.isEmpty()) {
+              !school.getSchoolCategoryCode().equals(Constants.INDEPENDENT) && !school.getSchoolCategoryCode().equals(Constants.NONINDEPENDENT)
+              && !school.getSchoolCategoryCode().equals(Constants.INDEPENDENTFNS) && !school.getSchoolCategoryCode().equals(Constants.OFFSHORE)
+              && schools.isEmpty()) {
         schoolEntity.setSchoolNumber(school.getSchoolNumber());
       } else {
         schoolEntity.setSchoolNumber(