[GLT-3964] added QC notes to deliverables (#41)

cardea-data/src/main/java/ca/on/oicr/gsi/cardea/data/Deliverable.java

@@ -13,24 +13,30 @@ public class Deliverable {
   private final LocalDate analysisReviewQcDate;
   private final Boolean analysisReviewQcPassed;
   private final String analysisReviewQcUser;
+  private final String analysisReviewQcNote;
   private final LocalDate releaseApprovalQcDate;
   private final Boolean releaseApprovalQcPassed;
   private final String releaseApprovalQcUser;
+  private final String releaseApprovalQcNote;
   private final LocalDate releaseQcDate;
   private final Boolean releaseQcPassed;
   private final String releaseQcUser;
+  private final String releaseQcNote;
 
   private Deliverable(Builder builder) {
     this.deliverableType = requireNonNull(builder.deliverableType);
     this.analysisReviewQcDate = builder.analysisReviewQcDate;
     this.analysisReviewQcPassed = builder.analysisReviewQcPassed;
     this.analysisReviewQcUser = builder.analysisReviewQcUser;
+    this.analysisReviewQcNote = builder.analysisReviewQcNote;
     this.releaseApprovalQcDate = builder.releaseApprovalQcDate;
     this.releaseApprovalQcPassed = builder.releaseApprovalQcPassed;
     this.releaseApprovalQcUser = builder.releaseApprovalQcUser;
+    this.releaseApprovalQcNote = builder.releaseApprovalQcNote;
     this.releaseQcDate = builder.releaseQcDate;
     this.releaseQcPassed = builder.releaseQcPassed;
     this.releaseQcUser = builder.releaseQcUser;
+    this.releaseQcNote = builder.releaseQcNote;
   }
 
   public DeliverableType getDeliverableType() {
@@ -49,6 +55,10 @@ public String getAnalysisReviewQcUser() {
     return analysisReviewQcUser;
   }
 
+  public String getAnalysisReviewQcNote() {
+    return analysisReviewQcNote;
+  }
+
   public LocalDate getReleaseApprovalQcDate() {
     return releaseApprovalQcDate;
   }
@@ -61,6 +71,10 @@ public String getReleaseApprovalQcUser() {
     return releaseApprovalQcUser;
   }
 
+  public String getReleaseApprovalQcNote() {
+    return releaseApprovalQcNote;
+  }
+
   public LocalDate getReleaseQcDate() {
     return releaseQcDate;
   }
@@ -73,19 +87,26 @@ public String getReleaseQcUser() {
     return releaseQcUser;
   }
 
+  public String getReleaseQcNote() {
+    return releaseQcNote;
+  }
+
   @JsonPOJOBuilder(withPrefix = "")
   public static class Builder {
 
     private DeliverableType deliverableType;
     private LocalDate analysisReviewQcDate;
     private Boolean analysisReviewQcPassed;
     private String analysisReviewQcUser;
+    private String analysisReviewQcNote;
     private LocalDate releaseApprovalQcDate;
     private Boolean releaseApprovalQcPassed;
     private String releaseApprovalQcUser;
+    private String releaseApprovalQcNote;
     private LocalDate releaseQcDate;
     private Boolean releaseQcPassed;
     private String releaseQcUser;
+    private String releaseQcNote;
 
     public Builder deliverableType(DeliverableType deliverableType) {
       this.deliverableType = deliverableType;
@@ -107,6 +128,11 @@ public Builder analysisReviewQcUser(String analysisReviewQcUser) {
       return this;
     }
 
+    public Builder analysisReviewQcNote(String analysisReviewQcNote) {
+      this.analysisReviewQcNote = analysisReviewQcNote;
+      return this;
+    }
+
     public Builder releaseApprovalQcDate(LocalDate releaseApprovalQcDate) {
       this.releaseApprovalQcDate = releaseApprovalQcDate;
       return this;
@@ -122,6 +148,11 @@ public Builder releaseApprovalQcUser(String releaseApprovalQcUser) {
       return this;
     }
 
+    public Builder releaseApprovalQcNote(String releaseApprovalQcNote) {
+      this.releaseApprovalQcNote = releaseApprovalQcNote;
+      return this;
+    }
+
     public Builder releaseQcDate(LocalDate releaseQcDate) {
       this.releaseQcDate = releaseQcDate;
       return this;
@@ -137,6 +168,11 @@ public Builder releaseQcUser(String releaseQcUser) {
       return this;
     }
 
+    public Builder releaseQcNote(String releaseQcNote) {
+      this.releaseQcNote = releaseQcNote;
+      return this;
+    }
+
     public Deliverable build() {
       return new Deliverable(this);
     }

cardea-server/src/main/java/ca/on/oicr/gsi/cardea/server/CaseLoader.java

@@ -747,12 +747,15 @@ private List<Deliverable> parseDeliverables(JsonNode deliverablesNode) throws Da
           .analysisReviewQcDate(parseDate(node, "analysis_review_qc_date"))
           .analysisReviewQcPassed(parseQcPassed(node, "analysis_review_qc_state", false))
           .analysisReviewQcUser(parseString(node, "analysis_review_qc_user"))
+          .analysisReviewQcNote(parseString(node, "analysis_review_qc_note"))
           .releaseApprovalQcDate(parseDate(node, "release_approval_qc_date"))
           .releaseApprovalQcPassed(parseQcPassed(node, "release_approval_qc_state", false))
           .releaseApprovalQcUser(parseString(node, "release_approval_qc_user"))
+          .releaseApprovalQcNote(parseString(node, "release_approval_qc_note"))
           .releaseQcDate(parseDate(node, "release_qc_date"))
           .releaseQcPassed(parseQcPassed(node, "release_qc_state", false))
           .releaseQcUser(parseString(node, "release_qc_user"))
+          .releaseQcNote(parseString(node, "release_qc_note"))
           .build());
     }
     return deliverables;

cardea-server/src/test/resources/testdata/cases.json

@@ -79,12 +79,15 @@
         "analysis_review_qc_state": "Ready",
         "analysis_review_qc_user": "Person",
         "analysis_review_qc_date": "2021-08-10",
+        "analysis_review_qc_note": "ok",
         "release_approval_qc_state": null,
         "release_approval_qc_user": null,
         "release_approval_qc_date": null,
+        "release_approval_qc_note": null,
         "release_qc_state": null,
         "release_qc_user": null,
-        "release_qc_date": null
+        "release_qc_date": null,
+        "release_qc_note": null
       }
     ],
     "requisition_id": 512,

changes/add_deliverable_qcNotes.md

@@ -0,0 +1 @@
+QC notes to deliverables