diff --git a/api/src/main/java/ca/bc/gov/educ/api/trax/model/dto/School.java b/api/src/main/java/ca/bc/gov/educ/api/trax/model/dto/School.java index 0cc622af..87243a70 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/trax/model/dto/School.java +++ b/api/src/main/java/ca/bc/gov/educ/api/trax/model/dto/School.java @@ -12,6 +12,7 @@ public class School implements Comparable { private String minCode; private String schoolId; private String schoolName; + private String districtId; private String districtName; private String transcriptEligibility; private String certificateEligibility; @@ -69,8 +70,8 @@ public int hashCode() { @Override public String toString() { - return "School [minCode=" + minCode + ", schoolId=" + schoolId + ", schoolCategoryCode=" + schoolCategoryCode + ", schoolCategoryLegacyCode=" + schoolCategoryLegacyCode - + ", schoolName=" + schoolName + ", districtName=" + districtName + ", transcriptEligibility=" + transcriptEligibility + ", certificateEligibility=" + certificateEligibility + return "School [minCode=" + minCode + ", schoolId=" + schoolId + ", schoolName=" + schoolName + ", schoolCategoryCode=" + schoolCategoryCode + ", schoolCategoryLegacyCode=" + schoolCategoryLegacyCode + + ", districtId=" + districtId + ", 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/main/java/ca/bc/gov/educ/api/trax/service/institute/CommonService.java b/api/src/main/java/ca/bc/gov/educ/api/trax/service/institute/CommonService.java index 60cb5aef..104dae4a 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/trax/service/institute/CommonService.java +++ b/api/src/main/java/ca/bc/gov/educ/api/trax/service/institute/CommonService.java @@ -83,6 +83,7 @@ private School convertSchoolDetailIntoSchoolClob(ca.bc.gov.educ.api.trax.model.d school.setOpenFlag(schoolDetail.getClosedDate() == null? "Y" : "N"); // District + school.setDistrictId(schoolDetail.getDistrictId()); ca.bc.gov.educ.api.trax.model.dto.institute.District district = districtService.getDistrictByIdFromRedisCache(schoolDetail.getDistrictId()); if (district != null) { school.setDistrictName(district.getDisplayName());