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

bcgov · Aug 7, 2024 · 81b0315 · 81b0315
1 parent 2b021e2
commit 81b0315
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 1 deletion.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/trax/controller/v2/SchoolController.java b/api/src/main/java/ca/bc/gov/educ/api/trax/controller/v2/SchoolController.java
@@ -79,7 +79,7 @@ public List<SchoolDetail> getAllSchoolDetails() {
             @ApiResponse(responseCode = "204", description = "NO CONTENT")})
     public ResponseEntity<SchoolDetail> getSchoolDetailsByMincode(@PathVariable String minCode) {
         log.debug("getSchoolDetails : ");
-        SchoolDetail schoolDetailResponse = schoolService.getSchoolDetailByIdFromInstituteApi(minCode);
+        SchoolDetail schoolDetailResponse = schoolService.getSchoolDetailByMincodeFromRedisCache(minCode);
         if(schoolDetailResponse != null) {
             return response.GET(schoolDetailResponse);
         }else {

diff --git a/api/src/main/java/ca/bc/gov/educ/api/trax/repository/redis/SchoolDetailRedisRepository.java b/api/src/main/java/ca/bc/gov/educ/api/trax/repository/redis/SchoolDetailRedisRepository.java
@@ -11,4 +11,6 @@ public interface SchoolDetailRedisRepository extends CrudRepository<SchoolDetail
     String HASH_KEY = "SchoolDetail";
 
     List<SchoolDetailEntity> findBySchoolCategoryCode(String schoolCategoryCode);
+
+    SchoolDetailEntity findByMincode(String mincode);
 }
diff --git a/api/src/main/java/ca/bc/gov/educ/api/trax/service/institute/SchoolService.java b/api/src/main/java/ca/bc/gov/educ/api/trax/service/institute/SchoolService.java
@@ -112,6 +112,11 @@ public List<SchoolDetail> getSchoolDetailsFromRedisCache() {
 		return schoolDetailTransformer.transformToDTO(schoolDetailRedisRepository.findAll());
 	}
 
+	public SchoolDetail getSchoolDetailByMincodeFromRedisCache(String mincode) {
+		log.debug("**** Getting school Details By Mincode from Redis Cache.");
+		return schoolDetailTransformer.transformToDTO(schoolDetailRedisRepository.findByMincode(mincode));
+	}
+
 	public void initializeSchoolDetailCache(boolean force) {
 		serviceHelper.initializeCache(force, CacheKey.SCHOOL_DETAIL_CACHE, this);
 	}

diff --git a/api/src/test/java/ca/bc/gov/educ/api/trax/controller/SchoolControllerTest.java b/api/src/test/java/ca/bc/gov/educ/api/trax/controller/SchoolControllerTest.java
@@ -169,6 +169,19 @@ public void whenGetAllSchools_ReturnsListOfSchools() {
         Mockito.verify(schoolServiceV2).getSchoolsFromRedisCache();
     }
 
+    @Test
+    public void whenGetSchoolByMincode_ReturnsSchool() {
+        String mincode = "12345678";
+        ca.bc.gov.educ.api.trax.model.dto.institute.School school = new ca.bc.gov.educ.api.trax.model.dto.institute.School();
+        school.setSchoolId("1234567");
+        school.setDistrictId("9876543");
+        school.setMincode(mincode);
+
+        Mockito.when(schoolServiceV2.getSchoolByMincodeFromRedisCache(mincode)).thenReturn(school);
+        schoolControllerV2.getSchoolByMincode(mincode);
+        Mockito.verify(schoolServiceV2).getSchoolByMincodeFromRedisCache(mincode);
+    }
+
     @Test
     public void whenGetAllSchoolDetails_ReturnsListOfSchoolDetails() {
         final List<SchoolDetail> schoolDetails = new ArrayList<>();
@@ -185,4 +198,17 @@ public void whenGetAllSchoolDetails_ReturnsListOfSchoolDetails() {
         schoolControllerV2.getAllSchoolDetails();
         Mockito.verify(schoolServiceV2).getSchoolDetailsFromRedisCache();
     }
+
+    @Test
+    public void whenGetSchoolDetailsByMincode_ReturnsSchoolDetail() {
+        String mincode = "12345678";
+        SchoolDetail schoolDetail = new SchoolDetail();
+        schoolDetail.setSchoolId("1234567");
+        schoolDetail.setDistrictId("9876543");
+        schoolDetail.setMincode(mincode);
+
+        Mockito.when(schoolServiceV2.getSchoolDetailByMincodeFromRedisCache(mincode)).thenReturn(schoolDetail);
+        schoolControllerV2.getSchoolDetailsByMincode(mincode);
+        Mockito.verify(schoolServiceV2).getSchoolDetailByMincodeFromRedisCache(mincode);
+    }
 }