feat: #2240 fetch codes by activity name (#2270)

xiaopeng0202 · web-flow · commit 3fd8fa69320d · 2025-12-17T15:13:32.000-08:00
diff --git a/frontend/src/api-service/ApiConfig.ts b/frontend/src/api-service/ApiConfig.ts
@@ -63,7 +63,9 @@ const ApiConfig = {
 
   purityTest: `${oracleServerHost}/api/purity-tests`,
 
-  searchTestActivities: `${oracleServerHost}/api/testing-activities`
+  searchTestActivities: `${oracleServerHost}/api/testing-activities`,
+
+  testCodes: `${oracleServerHost}/api/test-codes`
 };
 
 export default ApiConfig;
diff --git a/frontend/src/api-service/consep/searchTestingActivitiesAPI.ts b/frontend/src/api-service/consep/searchTestingActivitiesAPI.ts
@@ -2,7 +2,7 @@ import ApiConfig from '../ApiConfig';
 import api from '../api';
 
 import { ActivitySearchRequest } from '../../views/CONSEP/TestingActivities/TestSearch/definitions';
-import { PaginatedTestingSearchResponseType, TestCodeType } from '../../types/consep/TestingSearchType';
+import { PaginatedTestingSearchResponseType } from '../../types/consep/TestingSearchType';
 
 export const searchTestingActivities = (
   filter: ActivitySearchRequest,
@@ -21,13 +21,3 @@ export const searchTestingActivities = (
   return api.post(url, filter)
     .then((res): PaginatedTestingSearchResponseType => res.data);
 };
-
-export const getTestTypeCodes = () => {
-  const url = `${ApiConfig.searchTestActivities}/type-codes`;
-  return api.get(url).then((res): TestCodeType[] => res.data);
-};
-
-export const getTestCategoryCodes = () => {
-  const url = `${ApiConfig.searchTestActivities}/category-codes`;
-  return api.get(url).then((res): TestCodeType[] => res.data);
-};
diff --git a/frontend/src/api-service/consep/testCodesAPI.ts b/frontend/src/api-service/consep/testCodesAPI.ts
@@ -0,0 +1,19 @@
+import ApiConfig from '../ApiConfig';
+import api from '../api';
+
+import { TestCodeType } from '../../types/consep/TestingSearchType';
+
+export const getTestTypeCodes = () => {
+  const url = `${ApiConfig.testCodes}/type`;
+  return api.get(url).then((res): TestCodeType[] => res.data);
+};
+
+export const getTestCategoryCodes = () => {
+  const url = `${ApiConfig.testCodes}/category`;
+  return api.get(url).then((res): TestCodeType[] => res.data);
+};
+
+export const getCodesByActivity = (activity: string) => {
+  const url = `${ApiConfig.testCodes}/by-activity?activity=${encodeURIComponent(activity)}`;
+  return api.get(url).then((res): string[] => res.data);
+};
diff --git a/frontend/src/views/CONSEP/TestingActivities/PurityContent/index.tsx b/frontend/src/views/CONSEP/TestingActivities/PurityContent/index.tsx
@@ -35,6 +35,7 @@ import {
 } from '../../../../types/consep/TestingActivityType';
 import ComboBoxEvent from '../../../../types/ComboBoxEvent';
 import testingActivitiesAPI from '../../../../api-service/consep/testingActivitiesAPI';
+import { getCodesByActivity } from '../../../../api-service/consep/testCodesAPI';
 import { deleteImpurity, patchImpurities } from '../../../../api-service/consep/impuritiesAPI';
 import { initReplicatesList } from '../../../../utils/TestActivitiesUtils';
 import { utcToIsoSlashStyle } from '../../../../utils/DateUtils';
@@ -78,6 +79,11 @@ const PurityContent = () => {
     refetchOnMount: true
   });
 
+  const impurityCodesQuery = useQuery({
+    queryKey: ['impurityCodes'],
+    queryFn: () => getCodesByActivity('DEBRIS_TYPE_CD')
+  });
+
   const updateImpuritiesMutation = useMutation({
     mutationFn: (impurityPayload: ImpurityPayload[]) => patchImpurities(
       riaKey || '',
@@ -382,6 +388,12 @@ const PurityContent = () => {
     }
   ];
 
+  const {
+    data: impurityCodes,
+    isPending: isImpurityCodesPending,
+    isError: isImpurityCodesError
+  } = impurityCodesQuery;
+
   const impurityPerReplicate = (impurity: SingleImpurityType, replicateNumber: number) => (
     <Row key={`impurity-${replicateNumber}-${impurity.debrisRank}`} className="consep-impurity-content">
       <Column sm={2} md={2} lg={2} xlg={2}>
@@ -400,16 +412,25 @@ const PurityContent = () => {
           className="consep-impurity-combobox"
           id={`impurity-${impurity.debrisRank}-${impurity.debrisCategory}`}
           name={fieldsConfig.impuritySection.secondaryfieldName}
-          items={fieldsConfig.impuritySection.options}
-          placeholder={fieldsConfig.impuritySection.placeholder}
+          items={impurityCodes ?? []}
+          placeholder={(() => {
+            if (isImpurityCodesPending) return 'Loading debris types...';
+            if (isImpurityCodesError) return 'Failed to load debris types';
+            return fieldsConfig.impuritySection.placeholder;
+          })()}
           titleText={
             impurity.debrisRank === 1
               ? fieldsConfig.impuritySection.secondaryfieldName
               : ''
           }
           value={impurity.debrisCategory}
+          disabled={isImpurityCodesPending || isImpurityCodesError}
           onChange={(e: ComboBoxEvent) => {
             const { selectedItem } = e;
+            if (!selectedItem) {
+              return;
+            }
+
             updateImpuritiesMutation.mutate([
               {
                 replicateNumber,
@@ -419,6 +440,7 @@ const PurityContent = () => {
             ]);
           }}
         />
+
       </Column>
       <Column className="consep-impurity-content-remove" sm={1} md={1} lg={2} xlg={2}>
         <Button
diff --git a/frontend/src/views/CONSEP/TestingActivities/TestSearch/AdvancedFilter/index.tsx b/frontend/src/views/CONSEP/TestingActivities/TestSearch/AdvancedFilter/index.tsx
@@ -18,7 +18,7 @@ import {
 import ComboBoxEvent from '../../../../../types/ComboBoxEvent';
 import { capitalizeFirstLetter } from '../../../../../utils/StringUtils';
 import useWindowSize from '../../../../../hooks/UseWindowSize';
-import { getTestCategoryCodes } from '../../../../../api-service/consep/searchTestingActivitiesAPI';
+import { getTestCategoryCodes } from '../../../../../api-service/consep/testCodesAPI';
 
 import type { TestCodeType } from '../../../../../types/consep/TestingSearchType';
 import {
diff --git a/frontend/src/views/CONSEP/TestingActivities/TestSearch/index.tsx b/frontend/src/views/CONSEP/TestingActivities/TestSearch/index.tsx
@@ -22,7 +22,8 @@ import { mkConfig, generateCsv, download } from 'export-to-csv';
 
 import Breadcrumbs from '../../../../components/Breadcrumbs';
 import PageTitle from '../../../../components/PageTitle';
-import { searchTestingActivities, getTestTypeCodes } from '../../../../api-service/consep/searchTestingActivitiesAPI';
+import { searchTestingActivities } from '../../../../api-service/consep/searchTestingActivitiesAPI';
+import { getTestTypeCodes } from '../../../../api-service/consep/testCodesAPI';
 import ComboBoxEvent from '../../../../types/ComboBoxEvent';
 import type {
   TestingSearchResponseType,
diff --git a/oracle-api/src/main/java/ca/bc/gov/oracleapi/endpoint/consep/ActivitySearchEndpoint.java b/oracle-api/src/main/java/ca/bc/gov/oracleapi/endpoint/consep/ActivitySearchEndpoint.java
@@ -2,24 +2,20 @@
 
 import ca.bc.gov.oracleapi.dto.consep.ActivitySearchPageResponseDto;
 import ca.bc.gov.oracleapi.dto.consep.ActivitySearchRequestDto;
-import ca.bc.gov.oracleapi.dto.consep.TestCodeDto;
 import ca.bc.gov.oracleapi.security.RoleAccessConfig;
 import ca.bc.gov.oracleapi.service.consep.ActivitySearchService;
-import ca.bc.gov.oracleapi.service.consep.TestCodeService;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
 import org.springframework.http.HttpStatus;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
 import jakarta.validation.constraints.Pattern;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -40,7 +36,6 @@
 @Tag(name = "TestingActivitySearch", description = "Resource to search testing activities.")
 public class ActivitySearchEndpoint {
   private final ActivitySearchService activitySearchService;
-  private final TestCodeService testCodeService;
 
   @PostMapping("/search")
   @ApiResponses(value = {
@@ -87,38 +82,4 @@ public ActivitySearchPageResponseDto searchTestingActivities(
       sortDirection
     );
   }
-
-  @GetMapping("/type-codes")
-  @ApiResponses(value = {
-    @ApiResponse(
-      responseCode = "200",
-      description = "Successfully retrieved all valid test activity type codes."
-    ),
-    @ApiResponse(
-      responseCode = "401",
-      description = "Access token is missing or invalid",
-      content = @Content(schema = @Schema(implementation = Void.class))
-    )
-  })
-  @RoleAccessConfig({ "SPAR_TSC_SUBMITTER", "SPAR_TSC_SUPERVISOR" })
-  public List<TestCodeDto> getTestTypeCodes() {
-    return testCodeService.getTestTypeCodes();
-  }
-
-  @GetMapping("/category-codes")
-  @ApiResponses(value = {
-    @ApiResponse(
-      responseCode = "200",
-      description = "Successfully retrieved all valid test category codes."
-    ),
-    @ApiResponse(
-      responseCode = "401",
-      description = "Access token is missing or invalid",
-      content = @Content(schema = @Schema(implementation = Void.class))
-    )
-  })
-  @RoleAccessConfig({ "SPAR_TSC_SUBMITTER", "SPAR_TSC_SUPERVISOR" })
-  public List<TestCodeDto> getTestCategoryCodes() {
-    return testCodeService.getTestCategoryCodes();
-  }
 }
diff --git a/oracle-api/src/main/java/ca/bc/gov/oracleapi/endpoint/consep/TestCodeEndpoint.java b/oracle-api/src/main/java/ca/bc/gov/oracleapi/endpoint/consep/TestCodeEndpoint.java
@@ -0,0 +1,92 @@
+package ca.bc.gov.oracleapi.endpoint.consep;
+
+import ca.bc.gov.oracleapi.dto.consep.TestCodeDto;
+import ca.bc.gov.oracleapi.security.RoleAccessConfig;
+import ca.bc.gov.oracleapi.service.consep.TestCodeService;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * This class exposes test code API.
+ */
+@RestController
+@RequestMapping("/api/test-codes")
+@RequiredArgsConstructor
+@Validated
+@Tag(name = "TestCode", description = "Resource to retrieve test codes.")
+public class TestCodeEndpoint {
+  private final TestCodeService testCodeService;
+
+  @GetMapping("/type")
+  @ApiResponses(value = {
+    @ApiResponse(
+      responseCode = "200",
+      description = "Successfully retrieved all valid test activity type codes."
+    ),
+    @ApiResponse(
+      responseCode = "401",
+      description = "Access token is missing or invalid",
+      content = @Content(schema = @Schema(implementation = Void.class))
+    )
+  })
+  @RoleAccessConfig({ "SPAR_TSC_SUBMITTER", "SPAR_TSC_SUPERVISOR" })
+  public List<TestCodeDto> getTestTypeCodes() {
+    return testCodeService.getTestTypeCodes();
+  }
+
+  @GetMapping("/category")
+  @ApiResponses(value = {
+    @ApiResponse(
+      responseCode = "200",
+      description = "Successfully retrieved all valid test category codes."
+    ),
+    @ApiResponse(
+      responseCode = "401",
+      description = "Access token is missing or invalid",
+      content = @Content(schema = @Schema(implementation = Void.class))
+    )
+  })
+  @RoleAccessConfig({ "SPAR_TSC_SUBMITTER", "SPAR_TSC_SUPERVISOR" })
+  public List<TestCodeDto> getTestCategoryCodes() {
+    return testCodeService.getTestCategoryCodes();
+  }
+
+  @GetMapping("/by-activity")
+  @ApiResponses(value = {
+    @ApiResponse(
+      responseCode = "200",
+      description = "Successfully retrieved all valid codes for the specified activity."
+    ),
+    @ApiResponse(
+      responseCode = "401", 
+      description = "Access token is missing or invalid",
+      content = @Content(schema = @Schema(implementation = Void.class))
+    )})
+  @RoleAccessConfig({"SPAR_TSC_SUBMITTER", "SPAR_TSC_SUPERVISOR"})
+  public List<String> getCodesByActivity(
+    @Parameter(
+      description = """
+      Activity name used to filter test codes.
+      This value corresponds to the columnName field in TestCodeEntity.
+      Must be a non-blank string.
+          """, 
+      required = true, 
+      example = "SEEDLOT_TEST") 
+    @RequestParam String activity) {
+    if (activity == null || activity.trim().isEmpty()) {
+      throw new IllegalArgumentException("activity must not be blank");
+    }
+    return testCodeService.getCodesByColumnActivity(activity);
+  }
+}
diff --git a/oracle-api/src/main/java/ca/bc/gov/oracleapi/repository/consep/TestCodeRepository.java b/oracle-api/src/main/java/ca/bc/gov/oracleapi/repository/consep/TestCodeRepository.java
@@ -27,4 +27,14 @@ public interface TestCodeRepository extends JpaRepository<TestCodeEntity, String
           AND (t.expiryDate IS NULL OR t.expiryDate >= CURRENT_DATE)
         """)
   List<Object[]> findTestCategoryCodes();
+
+  @Query("""
+        SELECT t.codeArgument AS code
+        FROM TestCodeEntity t
+        WHERE t.columnName = :activity
+          AND t.effectiveDate <= CURRENT_DATE
+          AND (t.expiryDate IS NULL OR t.expiryDate >= CURRENT_DATE)
+        ORDER BY t.codeArgument
+        """)
+  List<Object[]> findCodesByActivity(String activity);
 }
diff --git a/oracle-api/src/main/java/ca/bc/gov/oracleapi/service/consep/TestCodeService.java b/oracle-api/src/main/java/ca/bc/gov/oracleapi/service/consep/TestCodeService.java
@@ -1,6 +1,7 @@
 package ca.bc.gov.oracleapi.service.consep;
 
 import ca.bc.gov.oracleapi.dto.consep.TestCodeDto;
+import ca.bc.gov.oracleapi.entity.consep.TestCodeEntity;
 import ca.bc.gov.oracleapi.repository.consep.TestCodeRepository;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -42,8 +43,27 @@ public List<TestCodeDto> getTestCategoryCodes() {
         .stream()
         .map(obj -> new TestCodeDto(
             (String) obj[0],
-            (String) obj[1]
-        ))
+            (String) obj[1]))
+        .toList();
+  }
+  
+  /**
+   * Retrieves all valid code values for a specific test-code activity.
+   * <p>
+   * The {@code activity} parameter represents a value of the
+   * {@code columnName} field in {@link TestCodeEntity}, such as
+   * {@code "DEBRIS_TYPE_CD"}, rather than an arbitrary database column name.
+   * Only codes that are currently effective (effectiveDate <= today and
+   * expiryDate >= today or null) are returned.
+   *
+   * @param activity the test code activity identifier (e.g. "DEBRIS_TYPE_CD")
+   *                 used to filter codes by {@code TestCodeEntity.columnName}
+   * @return list of valid code values as strings, sorted for consistent display
+   */
+  public List<String> getCodesByColumnActivity(String activity) {
+    return testCodeRepository.findCodesByActivity(activity)
+        .stream()
+        .map(obj -> (String) obj[0])
         .toList();
   }
 }
diff --git a/oracle-api/src/test/java/ca/bc/gov/oracleapi/endpoint/consep/ActivitySearchEndpointTest.java b/oracle-api/src/test/java/ca/bc/gov/oracleapi/endpoint/consep/ActivitySearchEndpointTest.java
@@ -112,26 +112,6 @@ void searchTestingActivityData_invalidSortField_shouldFail() throws Exception {
                 .getMessage().contains("Invalid sort field")));
   }
 
-  @Test
-  void getTestTypeCodes_shouldReturnList() throws Exception {
-    List<TestCodeDto> mockCodes = List.of(new TestCodeDto("TT1", "TEST type 1"));
-    when(testCodeService.getTestTypeCodes()).thenReturn(mockCodes);
-
-    mockMvc.perform(get("/api/testing-activities/type-codes").with(csrf()))
-        .andExpect(status().isOk()).andExpect(jsonPath("$", hasSize(1)))
-        .andExpect(jsonPath("$[0].code").value("TT1"));
-  }
-
-  @Test
-  void getTestCategoryCodes_shouldReturnList() throws Exception {
-    List<TestCodeDto> mockCodes = List.of(new TestCodeDto("CAT1", "Category 1"));
-    when(testCodeService.getTestCategoryCodes()).thenReturn(mockCodes);
-
-    mockMvc.perform(get("/api/testing-activities/category-codes").with(csrf()))
-        .andExpect(status().isOk()).andExpect(jsonPath("$", hasSize(1)))
-        .andExpect(jsonPath("$[0].code").value("CAT1"));
-  }
-
   private ActivitySearchRequestDto createDummyRequestDto() {
     return new ActivitySearchRequestDto(List.of("00098"), "D1", "D1", null,
         LocalDate.of(1997, 10, 1), LocalDate.of(1998, 10, 31), false, true, "RTS19981299A", "RTS",
diff --git a/oracle-api/src/test/java/ca/bc/gov/oracleapi/endpoint/consep/TestCodesEndpointTest.java b/oracle-api/src/test/java/ca/bc/gov/oracleapi/endpoint/consep/TestCodesEndpointTest.java
diff --git a/oracle-api/src/test/java/ca/bc/gov/oracleapi/service/consep/TestCodeServiceTest.java b/oracle-api/src/test/java/ca/bc/gov/oracleapi/service/consep/TestCodeServiceTest.java
