Merge pull request #374 from bcgov/fix/edx-1916

Filter out expired collection types

api/src/main/java/ca/bc/gov/educ/studentdatacollection/api/repository/v1/CollectionTypeCodeRepository.java

@@ -12,4 +12,5 @@ public interface CollectionTypeCodeRepository extends JpaRepository<CollectionTy
 
   List<CollectionTypeCodeEntity> findAllByOpenDateBeforeAndEffectiveDateLessThanAndExpiryDateGreaterThan(LocalDateTime dateTime, LocalDateTime dateTimeGreat, LocalDateTime dateTimeLess);
 
+  List<CollectionTypeCodeEntity> findAllByExpiryDateAfter(LocalDateTime now);
 }

api/src/main/java/ca/bc/gov/educ/studentdatacollection/api/service/v1/CodeTableService.java

@@ -6,6 +6,7 @@
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
 
@@ -95,7 +96,8 @@ public List<GenderCodeEntity> getAllGenderCodes() {
 
   @Cacheable("collectionCodes")
   public List<CollectionTypeCodeEntity> getCollectionCodeList() {
-    return collectionCodeRepository.findAll();
+
+    return collectionCodeRepository.findAllByExpiryDateAfter(LocalDateTime.now());
   }
 
   @Cacheable("schoolGradeCodes")

api/src/test/java/ca/bc/gov/educ/studentdatacollection/api/BaseStudentDataCollectionAPITest.java

@@ -130,7 +130,7 @@ public SchoolFundingGroupCodeEntity createSchoolFundingGroupCodeData() {
 
   public CollectionTypeCodeEntity createCollectionTypeCodeData() {
     return CollectionTypeCodeEntity.builder().collectionTypeCode("SEPTEMBER").label("September").description("September collection")
-            .displayOrder(10).effectiveDate(LocalDateTime.now()).expiryDate(LocalDateTime.MAX).openDate(LocalDateTime.now().minusMonths(1))
+            .displayOrder(10).effectiveDate(LocalDateTime.now()).expiryDate(LocalDateTime.now().plusYears(10)).openDate(LocalDateTime.now().minusMonths(1))
             .closeDate(LocalDateTime.now().plusMonths(1)).createUser("TEST").snapshotDate(LocalDate.now()).updateUser("TEST").build();
   }