remove optionals for record, add getters for optional fields for sample

qbicsoftware · Jul 12, 2023 · e36ae18 · e36ae18
1 parent 36adc81
commit e36ae18
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/...ectmanagement/src/main/java/life/qbic/projectmanagement/domain/project/sample/Sample.java b/...ectmanagement/src/main/java/life/qbic/projectmanagement/domain/project/sample/Sample.java
@@ -48,7 +48,7 @@ public class Sample {
 
   private Sample(SampleId id, SampleCode sampleCode, BatchId assignedBatch, String label,
       ExperimentId experimentId, Long experimentalGroupId, SampleOrigin sampleOrigin,
-      BiologicalReplicateId replicateReference, Optional<String> analysisType, Optional<String> comment
+      BiologicalReplicateId replicateReference, String analysisType, String comment
   ) {
     this.id = id;
     this.sampleCode = Objects.requireNonNull(sampleCode);
@@ -58,8 +58,8 @@ private Sample(SampleId id, SampleCode sampleCode, BatchId assignedBatch, String
     this.sampleOrigin = sampleOrigin;
     this.biologicalReplicateId = replicateReference;
     this.assignedBatch = assignedBatch;
-    this.analysisType = analysisType.orElse("");
-    this.comment = comment.orElse("");
+    this.analysisType = analysisType;
+    this.comment = comment;
   }
 
   protected Sample() {
@@ -82,7 +82,7 @@ public static Sample create(
         sampleRegistrationRequest.label(), sampleRegistrationRequest.experimentId(),
         sampleRegistrationRequest.experimentalGroupId(),
         sampleRegistrationRequest.sampleOrigin(), sampleRegistrationRequest.replicateReference(),
-        sampleRegistrationRequest.getAnalysisType(), sampleRegistrationRequest.getComment());
+        sampleRegistrationRequest.analysisType(), sampleRegistrationRequest.comment());
   }
 
   public BatchId assignedBatch() {
@@ -105,6 +105,14 @@ public String label() {
     return this.label;
   }
 
+  public Optional<String> analysisType() {
+    return Optional.ofNullable(analysisType);
+  }
+
+  public Optional<String> comment() {
+    return Optional.ofNullable(comment);
+  }
+
   public Long experimentalGroupId() {
     return this.experimentalGroupId;
   }

diff --git a/...ain/java/life/qbic/projectmanagement/domain/project/sample/SampleRegistrationRequest.java b/...ain/java/life/qbic/projectmanagement/domain/project/sample/SampleRegistrationRequest.java
@@ -38,10 +38,4 @@ public SampleRegistrationRequest(String label, BatchId assignedBatch, Experiment
     this.analysisType = analysisType;
   }
 
-  public Optional<String> getAnalysisType() {
-    return Optional.ofNullable(analysisType);
-  }
-  public Optional<String> getComment() {
-    return Optional.ofNullable(comment);
-  }
 }