Merge pull request #493 from bcgov/feature/GRAD2-2949

GRAD2-2949: task is complete.
bcgov · Nov 1, 2024 · 9952749 · 9952749
2 parents e2848ac + 4d8e1e6
commit 9952749
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 154 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/dto/GradAlgorithmGraduationStatus.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/dto/GradAlgorithmGraduationStatus.java
@@ -18,6 +18,7 @@ public class GradAlgorithmGraduationStatus implements Serializable {
     private String honoursStanding;
     private String recalculateGradStatus; 
     private String schoolOfRecord;
+    private UUID schoolOfRecordId;
     private String studentGrade;
     private String studentStatus;
     private UUID studentID;

diff --git a/api/src/main/java/ca/bc/gov/educ/api/ruleengine/dto/School.java b/api/src/main/java/ca/bc/gov/educ/api/ruleengine/dto/School.java
@@ -10,31 +10,20 @@
 public class School implements Serializable {
 
 	private String minCode;
+	private String schoolId;
     private String schoolName;
     private String districtName;
     private String transcriptEligibility;    
     private String certificateEligibility;
-    private String independentDesignation;    
-    private String mailerType;    
     private String address1;    
     private String address2;    
     private String city;    
-    private String provCode; 
-    private String provinceName;
-    private String countryCode; 
-    private String countryName;
+    private String provCode;
+    private String countryCode;
     private String postal;
-    private String independentAffiliation;
-    private String openFlag;    
-    private String signatureDistrict;
-    private String newMinCode;    
-    private String schoolOrg;    
-    private String appendTrans;
-    private String ministryContact;
-    private String principalName;
-    private String schoolPhone;
-    private String schoolFax;
-    private String schoolEmail;
+    private String openFlag;
+	private String schoolCategoryCode;
+	private String schoolCategoryCodeInstitute;
 
 	public String getSchoolName() {
 		return  schoolName != null ? schoolName.trim(): null;
@@ -56,61 +45,19 @@ public String getCity() {
 		return city != null ? city.trim(): null;
 	}
 
-	public String getProvinceName() {
-		return provinceName != null ? provinceName.trim(): null;
-	}
-
-	public String getCountryName() {
-		return countryName != null ? countryName.trim(): null;
-	}
-
 	public String getPostal() {
 		return postal != null ? postal.trim(): null;
 	}
 
-	public String getIndependentDesignation() {
-		return independentDesignation != null ? independentDesignation.trim(): null;
-	}
-
-	public String getIndependentAffiliation() {
-		return independentAffiliation != null ? independentAffiliation.trim(): null;
-	}
-
 	public String getOpenFlag() {
 		return openFlag != null ? openFlag.trim(): null;
 	}
-
-	public String getSignatureDistrict() {
-		return signatureDistrict != null ? signatureDistrict.trim(): null;
-	}
-
-	public String getSchoolEmail() {
-		return  schoolEmail != null ? schoolEmail.trim(): null;
-	}
-
-	public String getPrincipalName() {
-		return  principalName != null ? principalName.trim(): null;
-	}
-
-	public String getAppendTrans() {
-		return  appendTrans != null ? appendTrans.trim(): null;
-	}
-
-	public String getMinistryContact() {
-		return  ministryContact != null ? ministryContact.trim(): null;
-	}
 
 	@Override
 	public String toString() {
-		return "School [minCode=" + minCode + ", schoolName=" + schoolName + ", districtName=" + districtName
-				+ ", transcriptEligibility=" + transcriptEligibility + ", certificateEligibility="
-				+ certificateEligibility + ", independentDesignation=" + independentDesignation + ", mailerType="
-				+ mailerType + ", address1=" + address1 + ", address2=" + address2 + ", city=" + city + ", provCode="
-				+ provCode + ", provinceName=" + provinceName + ", countryCode=" + countryCode + ", countryName="
-				+ countryName + ", postal=" + postal + ", independentAffiliation=" + independentAffiliation
-				+ ", openFlag=" + openFlag + ", signatureDistrict=" + signatureDistrict + ", newMinCode=" + newMinCode
-				+ ", schoolOrg=" + schoolOrg + ", appendTrans=" + appendTrans + ", ministryContact=" + ministryContact
-				+ ", principalName=" + principalName + ", schoolPhone=" + schoolPhone + ", schoolFax=" + schoolFax
-				+ ", schoolEmail=" + schoolEmail + "]";
-	}	    
+		return "School [minCode=" + minCode + ", schoolId=" + schoolId + ", schoolCategoryCode=" + schoolCategoryCode + ", schoolCategoryCodeInstitute=" + schoolCategoryCodeInstitute
+				+ ", schoolName=" + schoolName + ", districtName=" + districtName + ", transcriptEligibility=" + transcriptEligibility + ", certificateEligibility=" + certificateEligibility
+				+ ", address1=" + address1 + ", address2=" + address2 + ", city=" + city + ", provCode=" + provCode + ", countryCode=" + countryCode + ", postal=" + postal + ", openFlag=" + openFlag
+				+ "]";
+	}
 }
diff --git a/api/src/test/resources/2018-EN-109496042.json b/api/src/test/resources/2018-EN-109496042.json
@@ -4861,31 +4861,20 @@
   },
   "school": {
     "minCode": "03636000",
+    "schoolId": "74ebdf25-9fda-407a-96da-d0fe2b9c0b2b",
     "schoolName": "CONTINUING ED SD 36",
     "districtName": "SURREY",
     "transcriptEligibility": "Y",
     "certificateEligibility": "Y",
-    "independentDesignation": "",
-    "mailerType": "1",
     "address1": "9457 KING GEORGE BLVD",
     "address2": "",
     "city": "SURREY",
     "provCode": "BC",
-    "provinceName": "BRITISH COLUMBIA",
-    "countryCode": "CN",
-    "countryName": "CANADA",
+    "countryCode": "CA",
     "postal": "V3V5W4",
-    "independentAffiliation": "",
     "openFlag": "Y",
-    "signatureDistrict": "",
-    "newMinCode": "03636000",
-    "schoolOrg": "O",
-    "appendTrans": "Y",
-    "ministryContact": "",
-    "principalName": "MR K DEBOICE",
-    "schoolPhone": "6045811413",
-    "schoolFax": "6045887139",
-    "schoolEmail": ""
+    "schoolCategoryCode": "01",
+    "schoolCategoryCodeInstitute": "PUBLIC"
   },
   "ldCounter": 0,
   "cpList": [],

diff --git a/api/src/test/resources/2018-EN-123236440.json b/api/src/test/resources/2018-EN-123236440.json
@@ -2750,31 +2750,20 @@
   },
   "school": {
     "minCode": "06161000",
+    "schoolId": "e389910e-be69-4521-a69f-54346511b141",
     "schoolName": "SJ BURNSIDE CONTINUING EDUCATION",
     "districtName": "GREATER VICTORIA",
     "transcriptEligibility": "Y",
     "certificateEligibility": "Y",
-    "independentDesignation": "",
-    "mailerType": "1",
     "address1": "498 CECELIA RD",
     "address2": "",
     "city": "VICTORIA",
     "provCode": "BC",
-    "provinceName": "BRITISH COLUMBIA",
-    "countryCode": "CN",
-    "countryName": "CANADA",
+    "countryCode": "CA",
     "postal": "V8T4T5",
-    "independentAffiliation": "",
     "openFlag": "Y",
-    "signatureDistrict": "",
-    "newMinCode": "06161000",
-    "schoolOrg": "O",
-    "appendTrans": "Y",
-    "ministryContact": "",
-    "principalName": "MRS LEAH MOREAU",
-    "schoolPhone": "2503604300",
-    "schoolFax": "2503604326",
-    "schoolEmail": ""
+    "schoolCategoryCode": "01",
+    "schoolCategoryCodeInstitute": "PUBLIC"
   },
   "ldCounter": 0,
   "cpList": [],

diff --git a/api/src/test/resources/2018-EN-126187616.json b/api/src/test/resources/2018-EN-126187616.json
@@ -4903,31 +4903,20 @@
   },
   "school": {
     "minCode": "07897034",
+    "schoolId": "6249b764-46ba-411f-9794-0bde43d26956",
     "schoolName": "STS'AILES COMMUNITY SCHOOL",
     "districtName": "FRASER-CASCADE",
     "transcriptEligibility": "Y",
     "certificateEligibility": "Y",
-    "independentDesignation": "6",
-    "mailerType": "1",
     "address1": "4690 SALISH WAY",
     "address2": "",
     "city": "AGASSIZ",
     "provCode": "BC",
-    "provinceName": "BRITISH COLUMBIA",
-    "countryCode": "CN",
-    "countryName": "CANADA",
+    "countryCode": "CA",
     "postal": "V0M1A1",
-    "independentAffiliation": "777",
     "openFlag": "Y",
-    "signatureDistrict": "",
-    "newMinCode": "07897034",
-    "schoolOrg": "O",
-    "appendTrans": "N",
-    "ministryContact": "",
-    "principalName": "BILL DIETRICH",
-    "schoolPhone": "6047962146",
-    "schoolFax": "6047963104",
-    "schoolEmail": "[email protected]"
+    "schoolCategoryCode": "01",
+    "schoolCategoryCodeInstitute": "PUBLIC"
   },
   "ldCounter": 0,
   "cpList": [],

diff --git a/api/src/test/resources/2018-EN-127970861.json b/api/src/test/resources/2018-EN-127970861.json
@@ -5270,31 +5270,20 @@
   },
   "school": {
     "minCode": "03996007",
+    "schoolId": "1a7e95b1-0fe6-45b4-88f5-aac09597be9b",
     "schoolName": "VANCOUVER COLLEGE",
     "districtName": "VANCOUVER",
     "transcriptEligibility": "Y",
     "certificateEligibility": "Y",
-    "independentDesignation": "1",
-    "mailerType": "1",
     "address1": "5400 CARTIER ST",
     "address2": "",
     "city": "VANCOUVER",
     "provCode": "BC",
-    "provinceName": "BRITISH COLUMBIA",
-    "countryCode": "CN",
-    "countryName": "CANADA",
+    "countryCode": "CA",
     "postal": "V6M3A5",
-    "independentAffiliation": "888",
     "openFlag": "Y",
-    "signatureDistrict": "",
-    "newMinCode": "03996007",
-    "schoolOrg": "P",
-    "appendTrans": "Y",
-    "ministryContact": "",
-    "principalName": "BROTHER KIERAN MURPHY",
-    "schoolPhone": "6042614285",
-    "schoolFax": "6042612284",
-    "schoolEmail": ""
+    "schoolCategoryCode": "01",
+    "schoolCategoryCodeInstitute": "PUBLIC"
   },
   "ldCounter": 0,
   "cpList": [],

diff --git a/api/src/test/resources/2023-EN-109496042.json b/api/src/test/resources/2023-EN-109496042.json
@@ -4861,31 +4861,20 @@
   },
   "school": {
     "minCode": "03636000",
+    "schoolId": "73044742-7a89-4df3-874c-92076aaa5d5c",
     "schoolName": "CONTINUING ED SD 36",
     "districtName": "SURREY",
     "transcriptEligibility": "Y",
     "certificateEligibility": "Y",
-    "independentDesignation": "",
-    "mailerType": "1",
     "address1": "9457 KING GEORGE BLVD",
     "address2": "",
     "city": "SURREY",
     "provCode": "BC",
-    "provinceName": "BRITISH COLUMBIA",
-    "countryCode": "CN",
-    "countryName": "CANADA",
+    "countryCode": "CA",
     "postal": "V3V5W4",
-    "independentAffiliation": "",
     "openFlag": "Y",
-    "signatureDistrict": "",
-    "newMinCode": "03636000",
-    "schoolOrg": "O",
-    "appendTrans": "Y",
-    "ministryContact": "",
-    "principalName": "MR K DEBOICE",
-    "schoolPhone": "6045811413",
-    "schoolFax": "6045887139",
-    "schoolEmail": ""
+    "schoolCategoryCode": "01",
+    "schoolCategoryCodeInstitute": "PUBLIC"
   },
   "ldCounter": 0,
   "cpList": [],

diff --git a/api/src/test/resources/FI-126259126.json b/api/src/test/resources/FI-126259126.json
@@ -5010,31 +5010,20 @@
   },
   "school": {
     "minCode": "03499101",
+    "schoolId": "8fff13ab-aebb-4eb1-8ed4-e8649f34446f",
     "schoolName": "ABBOTSFORD VIRTUAL SCHOOL",
     "districtName": "ABBOTSFORD",
     "transcriptEligibility": "Y",
     "certificateEligibility": "Y",
-    "independentDesignation": "",
-    "mailerType": "1",
     "address1": "33952 PINE ST",
     "address2": "",
     "city": "ABBOTSFORD",
     "provCode": "BC",
-    "provinceName": "BRITISH COLUMBIA",
-    "countryCode": "CN",
-    "countryName": "CANADA",
+    "countryCode": "CA",
     "postal": "V2S2P3",
-    "independentAffiliation": "",
     "openFlag": "Y",
-    "signatureDistrict": "",
-    "newMinCode": "        ",
-    "schoolOrg": "O",
-    "appendTrans": "Y",
-    "ministryContact": "",
-    "principalName": "BRAD HUTCHINSON",
-    "schoolPhone": "6048599803",
-    "schoolFax": "6048535281",
-    "schoolEmail": "[email protected]"
+    "schoolCategoryCode": "01",
+    "schoolCategoryCodeInstitute": "PUBLIC"
   },
   "ldCounter": 0,
   "cpList": [],