more fixups

oicr-gsi · Dec 13, 2024 · d49424e · d49424e
1 parent 667a69c
commit d49424e
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/main/java/ca/on/oicr/gsi/dimsum/util/reporting/reports/DonorAssayReport.java b/src/main/java/ca/on/oicr/gsi/dimsum/util/reporting/reports/DonorAssayReport.java
@@ -30,6 +30,9 @@ public class DonorAssayReport extends Report {
           Column.forString("Start Date", kase -> kase.getStartDate().toString()),
           Column.forString("Latest Activity", kase -> kase.getLatestActivityDate().toString()),
           Column.forString("Status", DonorAssayReport::getCaseStatus),
+          Column.forString("Completed",
+              kase -> CompletedGate.RELEASE.qualifyCase(kase) ? "Yes" : "No"),
+          Column.forString("Stopped/Paused", DonorAssayReport::getStoppedPausedStatus),
           Column.forString("Stop/Pause Reason", DonorAssayReport::getStopPauseReason))) {
         @Override
         public List<Case> getData(CaseService caseService, JsonNode parameters) {
@@ -57,15 +60,23 @@ private static String getProjectPipelines(Case kase) {
   private static String getCaseStatus(Case kase) {
     if (CompletedGate.RELEASE.qualifyCase(kase)) {
       return "Completed";
-    } else if (kase.isStopped()) {
-      return "Failed";
     } else if (kase.getRequisition().isPaused()) {
       return "Paused";
     } else {
       return "In Progress";
     }
   }
 
+  private static String getStoppedPausedStatus(Case kase) {
+    if (kase.isStopped()) {
+      return "Stopped";
+    } else if (kase.getRequisition().isPaused()) {
+      return "Paused";
+    } else {
+      return "Neither";
+    }
+  }
+
   private static String getStopPauseReason(Case kase) {
     if (kase.isStopped()) {
       return kase.getRequisition().getStopReason() != null