Fixing IN in filters, Model from EVLS added to common, Reusing domain model labelsv0.5.1

1 files changed, 4 insertions, 7 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/rep/ExportPatientGen.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/rep/ExportPatientGen.scala
index c2909f3..e3ef6bc 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/rep/ExportPatientGen.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/rep/ExportPatientGen.scala
@@ -1,14 +1,11 @@
 package xyz.driver.pdsuidomain.fakes.entities.rep
 
 import xyz.driver.core.generators._
+import xyz.driver.entities.labels.Label
 import xyz.driver.pdsuicommon.domain.{LongId, UuidId}
+import xyz.driver.pdsuidomain.fakes.entities.common._
 import xyz.driver.pdsuidomain.entities._
-import xyz.driver.pdsuidomain.entities.export.patient.{
-  ExportPatientLabel,
-  ExportPatientLabelEvidence,
-  ExportPatientLabelEvidenceDocument,
-  ExportPatientWithLabels
-}
+import xyz.driver.pdsuidomain.entities.export.patient._
 import xyz.driver.pdsuidomain.fakes.entities.common.{nextLocalDate, nextLongId}
 
 object ExportPatientGen {
@@ -41,7 +38,7 @@ object ExportPatientGen {
   def nextExportPatientLabelEvidence(documentId: LongId[Document]): ExportPatientLabelEvidence = {
     ExportPatientLabelEvidence(
       id = nextLongId[ExtractedData],
-      value = Common.nextFuzzyValue(),
+      value = nextFuzzyValue(),
       evidenceText = nextString(),
       document = nextExportPatientLabelEvidenceDocument(documentId)
     )