models: use ClinicalAnalyst, #189

opencb · Sep 1, 2020 · 46a2415 · 46a2415
1 parent eebbc63
commit 46a2415
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 77 deletions.
diff --git a/biodata-models/src/main/java/org/opencb/biodata/models/clinical/ClinicalAnalyst.java b/biodata-models/src/main/java/org/opencb/biodata/models/clinical/ClinicalAnalyst.java
@@ -9,6 +9,9 @@ public class ClinicalAnalyst {
     private String assignedBy;
     private String date;
 
+    public ClinicalAnalyst() {
+    }
+
     public ClinicalAnalyst(String id, String name, String email, String assignedBy, String date) {
         this.id = id;
         this.name = name;

diff --git a/biodata-models/src/main/java/org/opencb/biodata/models/clinical/interpretation/Analyst.java b/biodata-models/src/main/java/org/opencb/biodata/models/clinical/interpretation/Analyst.java
diff --git a/...odels/src/main/java/org/opencb/biodata/models/clinical/interpretation/Interpretation.java b/...odels/src/main/java/org/opencb/biodata/models/clinical/interpretation/Interpretation.java
@@ -19,6 +19,7 @@
 
 package org.opencb.biodata.models.clinical.interpretation;
 
+import org.opencb.biodata.models.clinical.ClinicalAnalyst;
 import org.opencb.biodata.models.clinical.ClinicalComment;
 
 import java.util.List;
@@ -34,7 +35,7 @@ public class Interpretation {
     /**
      * Interpretation algorithm tool used to generate this interpretation.
      */
-    private Analyst analyst;
+    private ClinicalAnalyst analyst;
     private List<InterpretationMethod> methods;
 
     private List<ClinicalVariant> primaryFindings;
@@ -55,7 +56,7 @@ public class Interpretation {
     public Interpretation() {
     }
 
-    public Interpretation(String id, String uuid, String description, String clinicalAnalysisId, Analyst analyst,
+    public Interpretation(String id, String uuid, String description, String clinicalAnalysisId, ClinicalAnalyst analyst,
                           List<InterpretationMethod> methods, List<ClinicalVariant> primaryFindings,
                           List<ClinicalVariant> secondaryFindings, List<ClinicalComment> comments, String status, String creationDate,
                           int version, Map<String, Object> attributes) {
@@ -130,11 +131,11 @@ public Interpretation setClinicalAnalysisId(String clinicalAnalysisId) {
         return this;
     }
 
-    public Analyst getAnalyst() {
+    public ClinicalAnalyst getAnalyst() {
         return analyst;
     }
 
-    public Interpretation setAnalyst(Analyst analyst) {
+    public Interpretation setAnalyst(ClinicalAnalyst analyst) {
         this.analyst = analyst;
         return this;
     }