Merge branch 'master' into PDSUI-2345

3 files changed, 10 insertions, 9 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/recordprocessing.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/recordprocessing.scala
index 5903dc8..d3d76b8 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/recordprocessing.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/recordprocessing.scala
@@ -264,7 +264,7 @@ object recordprocessing {
     )
   }
 
-  def nextExtractedDataLabel(dataId: LongId[ExtractedData]): ExtractedDataLabel = {
+  def nextExtractedDataLabel(): ExtractedDataLabel = {
     ExtractedDataLabel(
       id = nextLongId[ExtractedDataLabel],
       dataId = nextLongId[ExtractedData],
@@ -280,7 +280,7 @@ object recordprocessing {
       extractedData = extractedData,
       labels = List.fill(
         nextInt(maxItemsInCollectionNumber)
-      )(nextExtractedDataLabel(extractedData.id))
+      )(nextExtractedDataLabel())
     )
   }
 
diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala
index 441c1db..f2d6a1b 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala
@@ -62,8 +62,8 @@ object treatmentmatching {
     patientId = nextUuidId[Patient],
     labelId = nextLongId[Label],
     score = generators.nextInt(100),
-    primaryValue = generators.nextOption(fakes.entities.labels.nextLabelValue()),
-    verifiedPrimaryValue = generators.nextOption(fakes.entities.labels.nextLabelValue()),
+    primaryValue = fakes.entities.labels.nextLabelValue(),
+    verifiedPrimaryValue = fakes.entities.labels.nextLabelValue(),
     isImplicitMatch = generators.nextBoolean(),
     isVisible = generators.nextBoolean()
   )
@@ -82,8 +82,8 @@ object treatmentmatching {
     criterionText = generators.nextString(),
     criterionValue = generators.nextOption(generators.nextBoolean()),
     criterionIsDefining = generators.nextBoolean(),
-    eligibilityStatus = generators.nextOption(fakes.entities.labels.nextLabelValue()),
-    verifiedEligibilityStatus = generators.nextOption(fakes.entities.labels.nextLabelValue()),
+    eligibilityStatus = fakes.entities.labels.nextLabelValue(),
+    verifiedEligibilityStatus = fakes.entities.labels.nextLabelValue(),
     isVerified = generators.nextBoolean(),
     isVisible = generators.nextBoolean(),
     lastUpdate = nextLocalDateTime,
@@ -139,8 +139,8 @@ object treatmentmatching {
     patientId = nextUuidId[Patient],
     trialId = trialId,
     hypothesisId = nextUuidId[Hypothesis],
-    eligibilityStatus = generators.nextOption(fakes.entities.labels.nextLabelValue()),
-    verifiedEligibilityStatus = generators.nextOption(fakes.entities.labels.nextLabelValue()),
+    eligibilityStatus = fakes.entities.labels.nextLabelValue(),
+    verifiedEligibilityStatus = fakes.entities.labels.nextLabelValue(),
     isVerified = generators.nextBoolean()
   )
 
diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala
index 94bc27a..1e4ad51 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala
@@ -123,7 +123,8 @@ object trialcuration {
     trialId = nextStringId[Trial],
     state = nextTrialState,
     action = nextTrialAction,
-    created = nextLocalDateTime
+    created = nextLocalDateTime,
+    comment = generators.nextOption(generators.nextString())
   )
 
   def nextHypothesis(): Hypothesis = Hypothesis(