[GLT-4120] added project analysisReviewSkipped field (#48)

oicr-gsi · Apr 10, 2024 · 084c986 · 084c986
1 parent 61413af
commit 084c986
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/cardea-data/src/main/java/ca/on/oicr/gsi/cardea/data/Project.java b/cardea-data/src/main/java/ca/on/oicr/gsi/cardea/data/Project.java
@@ -16,11 +16,13 @@ public class Project {
 
   private final String name;
   private final String pipeline;
+  private final boolean analysisReviewSkipped;
   private final Map<DeliverableType, List<String>> deliverables;
 
   private Project(Builder builder) {
     this.name = requireNonNull(builder.name);
     this.pipeline = requireNonNull(builder.pipeline);
+    this.analysisReviewSkipped = builder.analysisReviewSkipped;
     Map<DeliverableType, List<String>> tempDeliverables = builder.deliverables.entrySet().stream()
         .collect(Collectors.toMap(entry -> entry.getKey(),
             entry -> Collections.unmodifiableList(entry.getValue())));
@@ -35,6 +37,10 @@ public String getPipeline() {
     return pipeline;
   }
 
+  public boolean isAnalysisReviewSkipped() {
+    return analysisReviewSkipped;
+  }
+
   public Map<DeliverableType, List<String>> getDeliverables() {
     return deliverables;
   }
@@ -44,6 +50,7 @@ public static class Builder {
 
     private String name;
     private String pipeline;
+    private boolean analysisReviewSkipped;
     private Map<DeliverableType, List<String>> deliverables;
 
     public Project build() {
@@ -60,6 +67,11 @@ public Builder pipeline(String pipeline) {
       return this;
     }
 
+    public Builder analysisReviewSkipped(boolean analysisReviewSkipped) {
+      this.analysisReviewSkipped = analysisReviewSkipped;
+      return this;
+    }
+
     public Builder deliverables(Map<DeliverableType, List<String>> deliverables) {
       this.deliverables = deliverables;
       return this;

diff --git a/cardea-server/src/main/java/ca/on/oicr/gsi/cardea/server/CaseLoader.java b/cardea-server/src/main/java/ca/on/oicr/gsi/cardea/server/CaseLoader.java
@@ -292,6 +292,7 @@ protected Map<String, Project> loadProjects(FileReader fileReader)
     List<Project> projects = loadFromJsonArrayFile(fileReader,
         json -> new Project.Builder().name(parseString(json, "name", true))
             .pipeline(parseString(json, "pipeline", true))
+            .analysisReviewSkipped(parseBoolean(json, "analysis_review_skipped"))
             .deliverables(parseProjectDeliverables(json.get("deliverables")))
             .build());
 

diff --git a/cardea-server/src/test/resources/testdata/projects.json b/cardea-server/src/test/resources/testdata/projects.json
@@ -2,6 +2,7 @@
   {
     "name": "PROJ",
     "pipeline": "Research",
+    "analysis_review_skipped": false,
     "deliverables": {
       "DATA_RELEASE": ["Full Pipeline", "cBioPortal Submission"]
     }

diff --git a/changes/add_analysisReviewSkipped.md b/changes/add_analysisReviewSkipped.md
@@ -0,0 +1 @@
+Project analysisReviewSkipped field