[GLT-4271]add deliverable filter (#239)

oicr-gsi · Nov 21, 2024 · bb61aa1 · bb61aa1
1 parent 04df44c
commit bb61aa1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/changes/add_GLT-4271 b/changes/add_GLT-4271
@@ -0,0 +1 @@
+Deliverable filter to find cases for a specific deliverable
diff --git a/src/main/java/ca/on/oicr/gsi/dimsum/service/filtering/CaseFilterKey.java b/src/main/java/ca/on/oicr/gsi/dimsum/service/filtering/CaseFilterKey.java
@@ -115,6 +115,16 @@ public Function<String, Predicate<Sample>> samplePredicate(MetricCategory reques
       return string -> sample -> Objects.equals(sample.getLibraryDesignCode(), string);
     }
   },
+  DELIVERABLE(string -> kase -> {
+    for (CaseDeliverable caseDeliverable : kase.getDeliverables()) {
+        for (CaseRelease release : caseDeliverable.getReleases()) {
+            if (string.equalsIgnoreCase(release.getDeliverable())) {
+                return true;
+            }
+        }
+    }
+    return false;
+}),
   STARTED_BEFORE(string -> kase -> kase.getStartDate() != null && kase.getStartDate().isBefore(LocalDate.parse(string))),
   STARTED_AFTER(string -> kase -> kase.getStartDate() != null && kase.getStartDate().isAfter(LocalDate.parse(string))),
   COMPLETED_BEFORE(string -> kase -> {

diff --git a/src/test/java/ca/on/oicr/gsi/dimsum/service/filtering/CaseFilterTest.java b/src/test/java/ca/on/oicr/gsi/dimsum/service/filtering/CaseFilterTest.java
@@ -1142,6 +1142,12 @@ public void testNonPausedCaseFilter() {
         17, 18, 19, 20, 21, 22, 23, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35));
   }
 
+  @org.junit.jupiter.api.Test
+  public void testDeliverableFilter() {
+    CaseFilter filter = new CaseFilter(CaseFilterKey.DELIVERABLE, "Clinical Report");
+    testFilterCases(filter, Arrays.asList(25, 26, 27, 29, 30, 31));
+  }
+
   @org.junit.jupiter.api.Test
   public void testStartedBeforeFilter() {
     CaseFilter filter = new CaseFilter(CaseFilterKey.STARTED_BEFORE, "2024-01-02");

diff --git a/ts/component/table-components.ts b/ts/component/table-components.ts
@@ -93,6 +93,12 @@ export const caseFilters: FilterDefinition[] = [
     values: yesNoOptions,
   },
   libraryDesignFilter,
+  {
+    title: "Deliverable",
+    key: "DELIVERABLE",
+    type: "dropdown",
+    values: siteConfig.deliverables,
+  },
   {
     title: "Started After",
     key: "STARTED_AFTER",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Deliverable filter to find cases for a specific deliverable