GRAD2-2949: task is complete.

bcgov · Oct 22, 2024 · f513913 · f513913
1 parent e2848ac
commit f513913
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 64 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
+				+ "]";
+	}
 }