Merge pull request #1527 from bcgov/fix/EDX-3102

add GA/HS for schools

Author: arcshiftsolutions

api/src/main/java/ca/bc/gov/educ/studentdatacollection/api/constants/v1/SchoolGradeCodes.java

@@ -278,6 +278,7 @@ public static List<String> getNonIndependentSchoolGrades() {
         codes.add(HOMESCHOOL.getCode());
         return codes;
     }
+
     public static List<String> getNonIndependentKtoSUGrades() {
         List<String> codes = new ArrayList<>();
         codes.add(KINDFULL.getCode());
@@ -316,4 +317,10 @@ public static List<String> getIndependentKtoGAGrades() {
         codes.addAll(getNonIndependentKtoGAGrades());
         return codes;
     }
+
+    public static List<String> getIndependentKtoHSGrades() {
+        List<String> codes = new ArrayList<>(getIndependentKtoGAGrades());
+        codes.add(HOMESCHOOL.getCode());
+        return codes;
+    }
 }

api/src/main/java/ca/bc/gov/educ/studentdatacollection/api/helpers/EllHeadcountHelper.java

@@ -70,9 +70,9 @@ public EllHeadcountHelper(
 
   public void setGradeCodes(Optional<SchoolTombstone> school) {
     if(school.isPresent() && SchoolCategoryCodes.INDEPENDENTS.contains(school.get().getSchoolCategoryCode())) {
-      gradeCodes = SchoolGradeCodes.getIndependentKtoSUGrades();
+      gradeCodes = SchoolGradeCodes.getIndependentKtoHSGrades();
     } else {
-      gradeCodes = SchoolGradeCodes.getNonIndependentKtoSUGrades();
+      gradeCodes = SchoolGradeCodes.getNonIndependentSchoolGrades();
     }
   }