diff --git a/api/src/main/java/ca/bc/gov/educ/grad/report/api/client/TraxSchool.java b/api/src/main/java/ca/bc/gov/educ/grad/report/api/client/TraxSchool.java index 06416145..d9b7a074 100644 --- a/api/src/main/java/ca/bc/gov/educ/grad/report/api/client/TraxSchool.java +++ b/api/src/main/java/ca/bc/gov/educ/grad/report/api/client/TraxSchool.java @@ -6,64 +6,50 @@ public class TraxSchool { 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 postal; - private String independentAffiliation; private String openFlag; - private String signatureDistrict; private String schoolCategoryCode; + private String schoolCategoryCodeInstitute; public String getSchoolName() { - return schoolName != null ? schoolName.trim(): null; + return schoolName != null ? schoolName.trim() : null; } public String getDistrictName() { - return districtName != null ? districtName.trim(): null; + return districtName != null ? districtName.trim() : null; } public String getAddress1() { - return address1 != null ? address1.trim(): null; + return address1 != null ? address1.trim() : null; } public String getAddress2() { - return address2 != null ? address2.trim(): null; + return address2 != null ? address2.trim() : null; } 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; + return city != null ? city.trim() : null; } public String getPostal() { - return postal != null ? postal.trim(): null; + return postal != null ? postal.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 +"]"; + 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 + + "]"; } -} +} \ No newline at end of file diff --git a/api/src/main/resources/application.yaml b/api/src/main/resources/application.yaml index dd5c62bd..a8010047 100644 --- a/api/src/main/resources/application.yaml +++ b/api/src/main/resources/application.yaml @@ -100,9 +100,9 @@ endpoint: url: ${GRAD_REPORT_API}api/v1/reports/signatures educ-grad-trax-api: get-district-details: - url: ${GRAD_TRAX_API}api/v1/trax/district/%s + url: ${GRAD_TRAX_API}api/v2/trax/district/%s school-by-min-code: - url: ${GRAD_TRAX_API}api/v1/trax/school/%s + url: ${GRAD_TRAX_API}api/v2/trax/school-clob/%s country-by-code: url: ${GRAD_TRAX_API}api/v1/trax/code/country/%s grad-student-api: diff --git a/api/src/test/resources/application.yaml b/api/src/test/resources/application.yaml index 8fedc41c..67a5cacc 100644 --- a/api/src/test/resources/application.yaml +++ b/api/src/test/resources/application.yaml @@ -113,9 +113,9 @@ endpoint: url: https://educ-grad-report-api-77c02f-dev.apps.silver.devops.gov.bc.ca/api/v1/reports/signatures educ-grad-trax-api: get-district-details: - url: https://educ-grad-trax-api-77c02f-dev.apps.silver.devops.gov.bc.ca/api/v1/trax/district/%s + url: https://educ-grad-trax-api-77c02f-dev.apps.silver.devops.gov.bc.ca/api/v2/trax/district/%s school-by-min-code: - url: https://educ-grad-trax-api-77c02f-dev.apps.silver.devops.gov.bc.ca/api/v1/trax/school/%s + url: https://educ-grad-trax-api-77c02f-dev.apps.silver.devops.gov.bc.ca/api/v2/trax/school-clob/%s country-by-code: url: https://educ-grad-trax-api-77c02f-dev.apps.silver.devops.gov.bc.ca/api/v1/trax/code/country/%s grad-student-api: