Code coverage improvements.

Author: sumathi-thirumani

api/src/test/java/ca/bc/gov/educ/api/trax/service/institute/InstituteCodeServiceTest.java

@@ -6,6 +6,7 @@
 import ca.bc.gov.educ.api.trax.messaging.jetstream.Publisher;
 import ca.bc.gov.educ.api.trax.messaging.jetstream.Subscriber;
 import ca.bc.gov.educ.api.trax.model.dto.ResponseObj;
+import ca.bc.gov.educ.api.trax.model.dto.institute.School;
 import ca.bc.gov.educ.api.trax.model.dto.institute.SchoolCategoryCode;
 import ca.bc.gov.educ.api.trax.model.dto.institute.SchoolFundingGroupCode;
 import ca.bc.gov.educ.api.trax.model.entity.institute.SchoolCategoryCodeEntity;
@@ -17,6 +18,7 @@
 import ca.bc.gov.educ.api.trax.service.RESTService;
 import ca.bc.gov.educ.api.trax.util.EducGradTraxApiConstants;
 import ca.bc.gov.educ.api.trax.util.RestUtils;
+import org.checkerframework.checker.nullness.Opt;
 import org.junit.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.runner.RunWith;
@@ -42,6 +44,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Consumer;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
@@ -164,6 +167,87 @@ public void whenGetSchoolCategoryCodesFromInstituteApi_returnsListOfSchoolCatego
 		assertDoesNotThrow(() -> codeService.loadSchoolCategoryCodesFromInstituteApiIntoRedisCacheAsync());
 	}
 
+	@Test
+	public void whenGetSchoolCategoryCodeFromRedisCache_returnSchoolCategoryCode() {
+		SchoolCategoryCodeEntity scce = new SchoolCategoryCodeEntity();
+		List<SchoolCategoryCodeEntity> scces = new ArrayList<SchoolCategoryCodeEntity>();
+		scce.setSchoolCategoryCode("SCC1");
+		scce.setLabel("SCC1-label");
+		scces.add(scce);
+		scce = new SchoolCategoryCodeEntity();
+		scce.setSchoolCategoryCode("SCC2");
+		scce.setLabel("SCC2-label");
+		scces.add(scce);
+
+		SchoolCategoryCode scc = new SchoolCategoryCode();
+		List<SchoolCategoryCode> sccs = new ArrayList<SchoolCategoryCode>();
+		scc.setSchoolCategoryCode("SCC1");
+		scc.setLabel("SCC1-label");
+		scc.setDescription("Desc");
+		scc.setLegacyCode("SCC1-legacy");
+		scc.setDisplayOrder("10");
+		scc.setEffectiveDate("01-01-2024");
+		scc.setExpiryDate("01-01-2024");
+		sccs.add(scc);
+		scc = new SchoolCategoryCode();
+		scc.setSchoolCategoryCode("SCC2");
+		scc.setLabel("SCC2-label");
+		scc.setDescription("Desc");
+		scc.setLegacyCode("SCC2-legacy");
+		scc.setDisplayOrder("20");
+		scc.setEffectiveDate("01-01-2024");
+		scc.setExpiryDate("01-01-2024");
+		sccs.add(scc);
+
+		when(this.schoolCategoryCodeRedisRepository.findById("SCC1"))
+				.thenReturn(Optional.of(scce));
+		assertNotNull(codeService.getSchoolCategoryCodeFromRedisCache("SCC1"));
+	}
+
+	@Test
+	public void whenGetSchoolCategoryCodeFromRedisCache_NotFound_returnSchoolCategoryCode() {
+		SchoolCategoryCodeEntity scce = new SchoolCategoryCodeEntity();
+		List<SchoolCategoryCodeEntity> scces = new ArrayList<SchoolCategoryCodeEntity>();
+		scce.setSchoolCategoryCode("SCC1");
+		scce.setLabel("SCC1-label");
+		scces.add(scce);
+		scce = new SchoolCategoryCodeEntity();
+		scce.setSchoolCategoryCode("SCC2");
+		scce.setLabel("SCC2-label");
+		scces.add(scce);
+
+		SchoolCategoryCode scc = new SchoolCategoryCode();
+		List<SchoolCategoryCode> sccs = new ArrayList<SchoolCategoryCode>();
+		scc.setSchoolCategoryCode("SCC1");
+		scc.setLabel("SCC1-label");
+		scc.setDescription("Desc");
+		scc.setLegacyCode("SCC1-legacy");
+		scc.setDisplayOrder("10");
+		scc.setEffectiveDate("01-01-2024");
+		scc.setExpiryDate("01-01-2024");
+		sccs.add(scc);
+		scc = new SchoolCategoryCode();
+		scc.setSchoolCategoryCode("SCC2");
+		scc.setLabel("SCC2-label");
+		scc.setDescription("Desc");
+		scc.setLegacyCode("SCC2-legacy");
+		scc.setDisplayOrder("20");
+		scc.setEffectiveDate("01-01-2024");
+		scc.setExpiryDate("01-01-2024");
+		sccs.add(scc);
+
+		when(restServiceMock.get(constants.getAllSchoolCategoryCodesFromInstituteApiUrl(), List.class, instWebClient)).thenReturn(scces);
+		when(schoolCategoryCodeTransformer.transformToDTO(scces))
+				.thenReturn(sccs);
+		List<SchoolCategoryCode> result = codeService.getSchoolCategoryCodesFromInstituteApi();
+		assertNotNull(result);
+		assertDoesNotThrow(() -> codeService.loadSchoolCategoryCodesFromInstituteApiIntoRedisCacheAsync());
+
+		when(this.schoolCategoryCodeRedisRepository.findById("SCC1"))
+				.thenReturn(Optional.empty());
+		assertNotNull(codeService.getSchoolCategoryCodeFromRedisCache("SCC1"));
+	}
+
 	@Test
 	public void whenGetSchoolFundingGroupCodesFromInstituteApi_returnsListOfSchoolFundingGroupCode() {
 		List<SchoolFundingGroupCodeEntity> schoolFundingGroupCodes = new ArrayList<>();

api/src/test/java/ca/bc/gov/educ/api/trax/service/institute/InstituteSchoolServiceTest.java

@@ -412,38 +412,6 @@ void whenInitializeSchoolCache_DoNothing() {
 		Assertions.assertDoesNotThrow(() -> schoolService.initializeSchoolCache(false));
     }
 
-	@Test
-	void whenInitializeSchoolCache() {
-		List<SchoolEntity> schoolEntities = new ArrayList<>();
-		SchoolEntity schoolEntity = new SchoolEntity();
-
-		schoolEntity.setSchoolId("ID");
-		schoolEntity.setDistrictId("DistID");
-		schoolEntity.setSchoolNumber("12345");
-		schoolEntity.setSchoolCategoryCode("SCC");
-		schoolEntity.setEmail("[email protected]");
-		schoolEntity.setDisplayName("Tk̓emlúps te Secwépemc");
-		schoolEntity.setDisplayNameNoSpecialChars("Tkkemlups te Secwepemc");
-		schoolEntities.add(schoolEntity);
-
-		List<School> schools = new ArrayList<>();
-		School school = new School();
-		school.setSchoolId("ID");
-		school.setDistrictId("DistID");
-		school.setSchoolNumber("12345");
-		school.setSchoolCategoryCode("SCC");
-		school.setEmail("[email protected]");
-		school.setDisplayName("Tk̓emlúps te Secwépemc");
-		school.setDisplayNameNoSpecialChars("Tkkemlups te Secwepemc");
-		schools.add(school);
-
-
-		when(this.schoolTransformer.transformToDTO(schoolEntities)).thenReturn(schools);
-		when(this.restServiceMock.get(constants.getAllSchoolsFromInstituteApiUrl(),
-				List.class, instWebClient)).thenReturn(schoolEntities);
-		assertDoesNotThrow( () -> serviceHelperMock.initializeCache(true, CacheKey.SCHOOL_CACHE, serviceHelperMock));
-	}
-
 	@Test
 	void whenGetSchoolDetailsFromInstituteApi_returnsListOfSchoolDetails() {
 		List<School> schools = new ArrayList<>();