feat: #1190 disturbance search frontend (#1220)

Author: craigyu

backend/src/main/java/ca/bc/gov/restapi/results/common/repository/GenericCodeRepository.java

@@ -15,5 +15,7 @@ public interface GenericCodeRepository<T extends GenericCodeEntity>
   @Override
   List<T> findAll();
 
+  List<T> findAllByOrderByExpiryDateDesc();
+
   List<T> findAllByExpiryDateAfter(LocalDate now);
 }

backend/src/main/java/ca/bc/gov/restapi/results/common/service/impl/AbstractCodeService.java

@@ -7,6 +7,7 @@
 import ca.bc.gov.restapi.results.common.repository.OrgUnitRepository;
 import ca.bc.gov.restapi.results.common.service.CodeService;
 import ca.bc.gov.restapi.results.common.util.CodeConverterUtil;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Objects;
 import lombok.AccessLevel;
@@ -33,59 +34,70 @@ public abstract class AbstractCodeService implements CodeService {
 
   @Override
   public List<CodeDescriptionDto> getAllSilvBaseCode() {
-    return CodeConverterUtil.toCodeDescriptionDtos(silvBaseCodeRepository.findAll());
+    return CodeConverterUtil.toCodeDescriptionDtos(
+        silvBaseCodeRepository.findAllByOrderByExpiryDateDesc());
   }
 
   @Override
   public List<CodeDescriptionDto> getAllSilvTechniqueCode() {
-    return CodeConverterUtil.toCodeDescriptionDtos(silvTechniqueCodeRepository.findAll());
+    return CodeConverterUtil.toCodeDescriptionDtos(
+        silvTechniqueCodeRepository.findAllByOrderByExpiryDateDesc());
   }
 
   @Override
   public List<CodeDescriptionDto> getAllSilvMethodCode() {
-    return CodeConverterUtil.toCodeDescriptionDtos(silvMethodCodeRepository.findAll());
+    return CodeConverterUtil.toCodeDescriptionDtos(
+        silvMethodCodeRepository.findAllByOrderByExpiryDateDesc());
   }
 
   @Override
   public List<CodeDescriptionDto> getAllSilvObjectiveCode() {
-    return CodeConverterUtil.toCodeDescriptionDtos(silvObjectiveCodeRepository.findAll());
+    return CodeConverterUtil.toCodeDescriptionDtos(
+        silvObjectiveCodeRepository.findAllByOrderByExpiryDateDesc());
   }
 
   @Override
   public List<CodeDescriptionDto> getAllSilvFundSrceCode() {
-    return CodeConverterUtil.toCodeDescriptionDtos(silvFundSrceCodeRepository.findAll());
+    return CodeConverterUtil.toCodeDescriptionDtos(
+        silvFundSrceCodeRepository.findAllByOrderByExpiryDateDesc());
   }
 
   @Override
   public List<CodeDescriptionDto> getAllSilvSystemCode() {
-    return CodeConverterUtil.toCodeDescriptionDtos(silvSystemCodeRepository.findAll());
+    return CodeConverterUtil.toCodeDescriptionDtos(
+        silvSystemCodeRepository.findAllByOrderByExpiryDateDesc());
   }
 
   @Override
   public List<CodeDescriptionDto> getAllSilvSystemVariantCode() {
-    return CodeConverterUtil.toCodeDescriptionDtos(silvSystemVariantCodeRepository.findAll());
+    return CodeConverterUtil.toCodeDescriptionDtos(
+        silvSystemVariantCodeRepository.findAllByOrderByExpiryDateDesc());
   }
 
   @Override
   public List<CodeDescriptionDto> getAllSilvCutPhaseCode() {
-    return CodeConverterUtil.toCodeDescriptionDtos(silvCutPhaseCodeRepository.findAll());
+    return CodeConverterUtil.toCodeDescriptionDtos(
+        silvCutPhaseCodeRepository.findAllByOrderByExpiryDateDesc());
   }
 
   @Override
   public List<CodeDescriptionDto> getAllDisturbanceCode() {
-    return CodeConverterUtil.toCodeDescriptionDtos(disturbanceCodeRepository.findAll());
+    return CodeConverterUtil.toCodeDescriptionDtos(
+        disturbanceCodeRepository.findAllByOrderByExpiryDateDesc());
   }
 
   @Override
   public List<CodeDescriptionDto> getAllOpenStatusCode() {
-    return CodeConverterUtil.toCodeDescriptionDtos(openingStatusCodeRepository.findAll());
+    return CodeConverterUtil.toCodeDescriptionDtos(
+        openingStatusCodeRepository.findAllByOrderByExpiryDateDesc());
   }
 
   @Override
   public List<CodeDescriptionDto> findAllCategories(boolean includeExpired) {
     log.info("Getting all open category codes. Include expired: {}", includeExpired);
     // Prefer converting entity results through the shared converter utility when possible.
-    List<? extends GenericCodeEntity> entities = openCategoryCodeRepository.findAll();
+    List<? extends GenericCodeEntity> entities =
+        openCategoryCodeRepository.findAllByOrderByExpiryDateDesc();
 
     log.info(
         "Found {} open category codes ({}cluding expired)",
@@ -98,13 +110,7 @@ public List<CodeDescriptionDto> findAllCategories(boolean includeExpired) {
       return CodeConverterUtil.toCodeDescriptionDtos(filtered);
     }
 
-    return entities.stream()
-        .map(
-            ent ->
-                new CodeDescriptionDto(
-                    ent.getCode(),
-                    ent.isExpired() ? ent.getDescription() + " (Expired)" : ent.getDescription()))
-        .toList();
+    return CodeConverterUtil.toCodeDescriptionDtos(entities);
   }
 
   @Override
@@ -117,11 +123,17 @@ public List<CodeDescriptionDto> findAllOrgUnits() {
       return List.of();
     }
 
+    LocalDate now = LocalDate.now();
     List<CodeDescriptionDto> orgUnits =
         orgUnitRepository.findAllByOrgUnitCodeIn(silvaConfiguration.getOrgUnits()).stream()
             .map(
-                orgUnit ->
-                    new CodeDescriptionDto(orgUnit.getOrgUnitCode(), orgUnit.getOrgUnitName()))
+                orgUnit -> {
+                  boolean expired =
+                      orgUnit.getExpiryDate() != null && orgUnit.getExpiryDate().isBefore(now);
+                  return new CodeDescriptionDto(
+                      orgUnit.getOrgUnitCode(),
+                      expired ? orgUnit.getOrgUnitName() + " (Expired)" : orgUnit.getOrgUnitName());
+                })
             .toList();
 
     log.info("Found {} org units by codes", orgUnits.size());

backend/src/main/java/ca/bc/gov/restapi/results/common/util/CodeConverterUtil.java

@@ -11,15 +11,22 @@
 public class CodeConverterUtil {
 
   /**
-   * Convert a list of GenericCodeEntity to CodeDescriptionDto.
+   * Convert a list of GenericCodeEntity to CodeDescriptionDto. Appends " (Expired)" to description
+   * if entity is expired.
    *
    * @param codes List of code entities to convert.
    * @return List of CodeDescriptionDto.
    */
   public static List<CodeDescriptionDto> toCodeDescriptionDtos(
       List<? extends GenericCodeEntity> codes) {
     return codes.stream()
-        .map(entity -> new CodeDescriptionDto(entity.getCode(), entity.getDescription()))
+        .map(
+            entity ->
+                new CodeDescriptionDto(
+                    entity.getCode(),
+                    entity.isExpired()
+                        ? entity.getDescription() + " (Expired)"
+                        : entity.getDescription()))
         .toList();
   }
 }

frontend/src/__test__/components/ActivitySearchSection/ActivitySearchInput.test.tsx

@@ -310,7 +310,7 @@ describe('ActivitySearchInput', () => {
       expect(screen.getByText('File ID')).toBeInTheDocument();
       expect(screen.getByTestId('forest-client-multiselect')).toBeInTheDocument();
       expect(screen.getByText('Opening status')).toBeInTheDocument();
-      expect(screen.getByText('Intra-agency number')).toBeInTheDocument();
+      expect(screen.getByText('Inter-agency number')).toBeInTheDocument();
     });
   });
 
@@ -421,7 +421,7 @@ describe('ActivitySearchInput', () => {
     });
   });
 
-  it('handles Intra-agency number input change', async () => {
+  it('handles Inter-agency number input change', async () => {
     const user = userEvent.setup();
     const { wrapper } = renderWithProviders();
     render(
@@ -441,10 +441,10 @@ describe('ActivitySearchInput', () => {
     await user.click(moreFiltersButton);
 
     await waitFor(() => {
-      const intraAgencyInput = screen.getByPlaceholderText(
-        'Enter intra-agency number'
+      const interAgencyInput = screen.getByPlaceholderText(
+        'Enter inter-agency number'
       );
-      expect(intraAgencyInput).toBeInTheDocument();
+      expect(interAgencyInput).toBeInTheDocument();
     });
   });