GRAD2-2638 - Institute - Create V2 endpoints for School data

bcgov · Aug 7, 2024 · 3507d34 · 3507d34
1 parent 81b0315
commit 3507d34
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 5 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/trax/controller/v2/DistrictController.java b/api/src/main/java/ca/bc/gov/educ/api/trax/controller/v2/DistrictController.java
@@ -42,9 +42,9 @@ public DistrictController(DistrictService districtService, GradValidation valida
  @PreAuthorize(PermissionsConstants.READ_SCHOOL_DATA)
  @Operation(summary = "Find a District by District Number", description = "Get District by District Number", tags = { "District" })
  @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK")})
- public ResponseEntity<District> getDistrictDetails(@PathVariable String distCode) {
- if(distCode.length() <=3) {
- District distResponse = districtService.getDistrictByNoFromRedisCache(distCode);
+ public ResponseEntity<District> getDistrictDetailsByDistNo(@PathVariable String distNo) {
+ if(distNo.length() <=3) {
+ District distResponse = districtService.getDistrictByDistNoFromRedisCache(distNo);
  if (distResponse != null) {
  return response.GET(distResponse);
  }

diff --git a/api/src/main/java/ca/bc/gov/educ/api/trax/service/institute/DistrictService.java b/api/src/main/java/ca/bc/gov/educ/api/trax/service/institute/DistrictService.java
@@ -67,7 +67,7 @@ public void initializeDistrictCache(boolean force) {
  serviceHelper.initializeCache(force, CacheKey.DISTRICT_CACHE, this);
  }
 
- public District getDistrictByNoFromRedisCache(String districtNumber) {
+ public District getDistrictByDistNoFromRedisCache(String districtNumber) {
  log.debug("**** Getting district by district no. from Redis Cache.");
  return districtTransformer.transformToDTO(districtRedisRepository.findByDistrictNumber(districtNumber));
  }

diff --git a/api/src/test/java/ca/bc/gov/educ/api/trax/controller/DistrictControllerTest.java b/api/src/test/java/ca/bc/gov/educ/api/trax/controller/DistrictControllerTest.java
@@ -12,6 +12,7 @@
 import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -21,13 +22,18 @@ public class DistrictControllerTest {
 
  @Mock
  private DistrictService districtService;
+ @Mock
+ private ca.bc.gov.educ.api.trax.service.institute.DistrictService districtServiceV2;
 
  @Mock
  ResponseHelper responseHelper;
 
  @InjectMocks
  private DistrictController districtController;
 
+ @InjectMocks
+ private ca.bc.gov.educ.api.trax.controller.v2.DistrictController districtControllerV2;
+
  @Test
  public void testGetSchoolDetails() {
  final District district = new District();
@@ -51,4 +57,37 @@ public void testGetDistrictBySchoolCategoryCode() {
  Mockito.verify(districtService).getDistrictBySchoolCategory("123");
 
  }
+
+ @Test
+ public void whenGetDistrictDetailsByDistNo_ReturnsDistrict() {
+ String distNo = "123";
+ ca.bc.gov.educ.api.trax.model.dto.institute.District district = new ca.bc.gov.educ.api.trax.model.dto.institute.District();
+ district.setDistrictId("123456");
+ district.setDistrictNumber("123");
+ district.setDistrictRegionCode("BC");
+
+ Mockito.when(districtServiceV2.getDistrictByDistNoFromRedisCache(distNo)).thenReturn(district);
+ districtControllerV2.getDistrictDetailsByDistNo(distNo);
+ Mockito.verify(districtServiceV2).getDistrictByDistNoFromRedisCache(distNo);
+ }
+
+ @Test
+ public void whenGetDistrictsBySchoolCategoryCode_ReturnListOfDistricts() {
+ String schoolCategoryCode = "123";
+ final List<ca.bc.gov.educ.api.trax.model.dto.institute.District> districts = new ArrayList<>();
+ ca.bc.gov.educ.api.trax.model.dto.institute.District district = new ca.bc.gov.educ.api.trax.model.dto.institute.District();
+ district.setDistrictId("123456");
+ district.setDistrictNumber("123");
+ district.setDistrictRegionCode("BC");
+ districts.add(district);
+ district = new ca.bc.gov.educ.api.trax.model.dto.institute.District();
+ district.setDistrictId("789012");
+ district.setDistrictNumber("456");
+ district.setDistrictRegionCode("BC");
+ districts.add(district);
+
+ Mockito.when(districtServiceV2.getDistrictsBySchoolCategoryCode(schoolCategoryCode)).thenReturn(districts);
+ districtControllerV2.getDistrictsBySchoolCategoryCode(schoolCategoryCode);
+ Mockito.verify(districtServiceV2).getDistrictsBySchoolCategoryCode(schoolCategoryCode);
+ }
 }
diff --git a/...src/test/java/ca/bc/gov/educ/api/trax/service/institute/InstituteDistrictServiceTest.java b/...src/test/java/ca/bc/gov/educ/api/trax/service/institute/InstituteDistrictServiceTest.java
@@ -227,7 +227,7 @@ public void whenInitializeDistrictCache_WithLoadingAndTrue_ThenForceLoad() {
  doNothing().when(districtServiceMock).loadDistrictsIntoRedisCache(ds);
 
  districtService.initializeDistrictCache(true);
- //verify(codeServicemock).loadSchoolCategoryCodesIntoRedisCache(sccs);
+ verify(districtServiceMock).loadDistrictsIntoRedisCache(ds);
  }
 
  @Test