GRAD2-2637 - Cache institute api data into Redis

api/src/main/java/ca/bc/gov/educ/api/trax/model/transformer/institute/SchoolCategoryCodeTransformer.java

@@ -9,6 +9,7 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Component("SchoolCategoryCodeTransformer")
 public class SchoolCategoryCodeTransformer {
@@ -36,7 +37,13 @@ public SchoolCategoryCodeEntity transformToEntity(SchoolCategoryCode schoolCateg
         return modelMapper.map(schoolCategoryCode, SchoolCategoryCodeEntity.class);
     }
 
-    public List<SchoolCategoryCodeEntity> transformToEntity (Iterable<SchoolCategoryCode> schoolCategoryCodes ) {
-        return modelMapper.map(schoolCategoryCodes, new TypeToken<List<SchoolCategoryCodeEntity>>(){}.getType());
+    public List<SchoolCategoryCodeEntity> transformToEntity (List<SchoolCategoryCode> schoolCategoryCodes ) {
+        if (schoolCategoryCodes == null)
+            return null;
+
+        return schoolCategoryCodes
+                .stream()
+                .map(scc -> modelMapper.map(scc, SchoolCategoryCodeEntity.class))
+                .collect(Collectors.toList());
     }
 }

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

@@ -295,25 +295,23 @@ public void whenInitializeSchoolCategoryCodeCache_WithLoadingAndTrue_ThenForceLo
 		when(this.schoolCategoryCodeEntitiesMock.block())
 				.thenReturn(scces);
 
+		when(this.restUtils.getTokenResponseObject(anyString(), anyString()))
+				.thenReturn(responseObjectMock);
+		when(this.responseObjectMock.getAccess_token())
+				.thenReturn("accessToken");
 
 		when(redisTemplateMock.opsForValue())
 				.thenReturn(valueOperationsMock);
 		when(valueOperationsMock.get(CacheKey.SCHOOL_CATEGORY_CODE_CACHE.name()))
 				.thenReturn(String.valueOf(CacheStatus.LOADING));
 		doNothing().when(valueOperationsMock).set(CacheKey.SCHOOL_CATEGORY_CODE_CACHE.name(), CacheStatus.LOADING.name());
 
-		when(this.restUtils.getTokenResponseObject(anyString(), anyString()))
-				.thenReturn(responseObjectMock);
-		when(this.responseObjectMock.getAccess_token())
-				.thenReturn("accessToken");
-
 		CodeService codeServicemock = mock(CodeService.class);
 		when(codeServicemock.getSchoolCategoryCodesFromInstituteApi()).thenReturn(sccs);
 		doNothing().when(codeServicemock).loadSchoolCategoryCodesIntoRedisCache(sccs);
 
 		codeService.initializeSchoolCategoryCodeCache(true);
-
-		//verify(codeService).loadSchoolCategoryCodesIntoRedisCache(sccs);
+		//verify(codeServicemock).loadSchoolCategoryCodesIntoRedisCache(sccs);
 	}
 
 	@Test