More updates after code review.

bcgov · Nov 21, 2024 · 4348d96 · 4348d96
1 parent 3e4ab7a
commit 4348d96
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/grad/report/service/CommonService.java b/api/src/main/java/ca/bc/gov/educ/api/grad/report/service/CommonService.java
@@ -678,7 +678,7 @@ private School getSchool(String schoolId, String accessToken) {
     private District getDistrict(String districtCode, String accessToken) {
         try {
             return webClient.get()
-                    .uri(String.format(constants.getDistrictByMincodeUrl(), districtCode))
+                    .uri(String.format(constants.getDistrictByDistrictNumberUrl(), districtCode))
                     .headers(h -> h.setBearerAuth(accessToken))
                     .retrieve()
                     .bodyToMono(District.class)

diff --git a/api/src/main/java/ca/bc/gov/educ/api/grad/report/util/EducGradReportApiConstants.java b/api/src/main/java/ca/bc/gov/educ/api/grad/report/util/EducGradReportApiConstants.java
@@ -109,8 +109,8 @@ private EducGradReportApiConstants(){}
     @Value("${endpoint.grad-trax-api.school-by-school-id.url}")
     private String schoolBySchoolIdUrl;
 
-    @Value("${endpoint.grad-trax-api.district-by-min-code.url}")
-    private String districtByMincodeUrl;
+    @Value("${endpoint.grad-trax-api.district-by-dist-no.url}")
+    private String districtByDistrictNumberUrl;
 
     // Splunk LogHelper Enabled
     @Value("${splunk.log-helper.enabled}")

diff --git a/api/src/main/resources/application.yaml b/api/src/main/resources/application.yaml
@@ -98,7 +98,7 @@ endpoint:
   grad-trax-api:
     school-by-school-id:
       url: ${GRAD_TRAX_API}api/v2/trax/school-clob/%s
-    district-by-min-code:
+    district-by-dist-no:
       url: ${GRAD_TRAX_API}api/v2/trax/district?distNo=%s
 
 #Splunk LogHelper

diff --git a/api/src/test/java/ca/bc/gov/educ/api/grad/report/service/CommonServiceTest.java b/api/src/test/java/ca/bc/gov/educ/api/grad/report/service/CommonServiceTest.java
@@ -1394,7 +1394,7 @@ public void testGetAllSchoolReportList() {
         district.setDisplayName("SOOKE");
 
         when(this.webClient.get()).thenReturn(this.requestHeadersUriMock);
-        when(this.requestHeadersUriMock.uri(String.format(constants.getDistrictByMincodeUrl(),district.getDistrictNumber()))).thenReturn(this.requestHeadersMock);
+        when(this.requestHeadersUriMock.uri(String.format(constants.getDistrictByDistrictNumberUrl(),district.getDistrictNumber()))).thenReturn(this.requestHeadersMock);
         when(this.requestHeadersMock.headers(any(Consumer.class))).thenReturn(this.requestHeadersMock);
         when(this.requestHeadersMock.retrieve()).thenReturn(this.responseMock);
         when(this.responseMock.bodyToMono(District.class)).thenReturn(Mono.just(district));

diff --git a/api/src/test/resources/application.yaml b/api/src/test/resources/application.yaml
@@ -82,7 +82,7 @@ endpoint:
   grad-trax-api:
     school-by-school-id:
       url: https://educ-grad-trax-api-77c02f-dev.apps.silver.devops.gov.bc.ca/api/v2/trax/school-clob/%s
-    district-by-min-code:
+    district-by-dist-no:
       url: https://educ-grad-trax-api-77c02f-dev.apps.silver.devops.gov.bc.ca/api/v2/trax/district?distNo=%s
 
 #Splunk LogHelper