[GLT-4100] fixed pending release approval and release filters

changes/fix_allDeliverableFilters.md

@@ -0,0 +1 @@
+The 'Pending: Release Approval' and 'Pending: Release' filters (without a deliverable type specified) were not including all of the appropriate cases

changes/fix_deliverableReleaseApprovalFilters.md

@@ -0,0 +1 @@
+The "Pending: Release Approval - Data Release" and "Pending: Release Approval - Clinical Report" filters were not including stopped cases

src/main/java/ca/on/oicr/gsi/dimsum/service/filtering/PendingState.java

@@ -258,19 +258,20 @@ public boolean qualifyCase(Case kase) {
 
     @Override
     public boolean qualifyCase(Case kase) {
-      return (kase.isStopped() || CompletedGate.ANALYSIS_REVIEW.qualifyCase(kase))
-          && !CompletedGate.RELEASE_APPROVAL.qualifyCase(kase);
+      return (kase.isStopped() && !CompletedGate.RELEASE_APPROVAL.qualifyCase(kase))
+          || RELEASE_APPROVAL_DATA_RELEASE.qualifyCase(kase)
+          || RELEASE_APPROVAL_CLINICAL_REPORT.qualifyCase(kase);
     }
   },
-  RELEASE_APPROVAL_DATA_RELEASE("Release Approval - Data Release", true) {
+  RELEASE_APPROVAL_DATA_RELEASE("Release Approval - Data Release", false) {
     @Override
     public boolean qualifyCase(Case kase) {
       return (kase.isStopped() || CompletedGate.ANALYSIS_REVIEW_DATA_RELEASE.qualifyCase(kase))
           && CompletedGate.RELEASE_APPROVAL_DATA_RELEASE.isApplicable(kase)
           && !CompletedGate.RELEASE_APPROVAL_DATA_RELEASE.qualifyCase(kase);
     }
   },
-  RELEASE_APPROVAL_CLINICAL_REPORT("Release Approval - Clinical Report", true) {
+  RELEASE_APPROVAL_CLINICAL_REPORT("Release Approval - Clinical Report", false) {
     @Override
     public boolean qualifyCase(Case kase) {
       return (kase.isStopped() || CompletedGate.ANALYSIS_REVIEW_CLINICAL_REPORT.qualifyCase(kase))
@@ -281,8 +282,7 @@ public boolean qualifyCase(Case kase) {
   RELEASE("Release", false) {
     @Override
     public boolean qualifyCase(Case kase) {
-      return CompletedGate.RELEASE_APPROVAL.qualifyCase(kase)
-          && !CompletedGate.RELEASE.qualifyCase(kase);
+      return RELEASE_DATA_RELEASE.qualifyCase(kase) || RELEASE_CLINICAL_REPORT.qualifyCase(kase);
     }
   },
   RELEASE_DATA_RELEASE("Release - Data Release", false) {

src/test/java/ca/on/oicr/gsi/dimsum/MockCase.java

@@ -31,7 +31,8 @@ public static List<Case> getCases() {
           makeCase6(), makeCase7(), makeCase8(), makeCase9(), makeCase10(), makeCase11(),
           makeCase12(), makeCase13(), makeCase14(), makeCase15(), makeCase16(), makeCase17(),
           makeCase18(), makeCase19(), makeCase20(), makeCase21(), makeCase22(), makeCase23(),
-          makeCase24(), makeCase25(), makeCase26(), makeCase27(), makeCase28());
+          makeCase24(), makeCase25(), makeCase26(), makeCase27(), makeCase28(), makeCase29(),
+          makeCase30(), makeCase31());
 
   private static Case makeCase0() {
     final int caseNumber = 0;
@@ -290,8 +291,11 @@ private static Case makeCase22() {
   }
 
   private static Case makeCase23() {
+    // Case is stopped
     final int caseNumber = 23;
     Case kase = makeCase("PRO23_001", "Single Test", "PRO23", "REQ23", caseNumber);
+    when(kase.isStopped()).thenReturn(true);
+    when(kase.getRequisition().isStopped()).thenReturn(true);
     addTest(kase, caseNumber, 1, "Test", "WG", false, false, false, false);
     return kase;
   }
@@ -357,6 +361,43 @@ private static Case makeCase28() {
     return kase;
   }
 
+  private static Case makeCase29() {
+    final int caseNumber = 29;
+    // Case is pending release approval - data release, and pending release - clinical report
+    Case kase = makeCase("PRO29_0001", "Single Test", "PRO29", "REQ29", caseNumber);
+    addTest(kase, caseNumber, 1, "Test", "WG", true, true, true, true);
+    markAnalysisReview(kase.getDeliverables().get(0), true);
+    CaseDeliverable deliverable =
+        addDeliverable(kase, DeliverableType.CLINICAL_REPORT, "Clinical Report");
+    markAnalysisReview(deliverable, true);
+    markReleaseApproval(deliverable, true);
+    return kase;
+  }
+
+  private static Case makeCase30() {
+    final int caseNumber = 30;
+    // Case is pending release approval - data release, and pending analysis review - clinical
+    // report
+    Case kase = makeCase("PRO30_0001", "Single Test", "PRO30", "REQ30", caseNumber);
+    addTest(kase, caseNumber, 1, "Test", "WG", true, true, true, true);
+    markAnalysisReview(kase.getDeliverables().get(0), true);
+    addDeliverable(kase, DeliverableType.CLINICAL_REPORT, "Clinical Report");
+    return kase;
+  }
+
+  private static Case makeCase31() {
+    final int caseNumber = 31;
+    // Case is completed release - clinical report, but pending analysis review - data release
+    Case kase = makeCase("PRO31_0001", "Single Test", "PRO31", "REQ31", caseNumber);
+    addTest(kase, caseNumber, 1, "Test", "WG", true, true, true, true);
+    CaseDeliverable deliverable =
+        addDeliverable(kase, DeliverableType.CLINICAL_REPORT, "Clinical Report");
+    markAnalysisReview(deliverable, true);
+    markReleaseApproval(deliverable, true);
+    markRelease(deliverable.getReleases().get(0), true);
+    return kase;
+  }
+
   private static Case makeCase(String donorName, String assayName, String projectName,
       String requisitionName, int caseNumber) {
     Case kase = mock(Case.class);
@@ -408,7 +449,6 @@ private static Project makeProject(String name) {
   private static Requisition addRequisition(Case kase, int caseNumber, String name) {
     Requisition requisition = mock(Requisition.class);
     when(requisition.getId()).thenReturn(Long.valueOf(caseNumber));
-    when(requisition.isStopped()).thenReturn(caseNumber == 23);
     when(requisition.isPaused()).thenReturn(caseNumber == 24);
     when(requisition.getName()).thenReturn(name);
     when(kase.getRequisition()).thenReturn(requisition);