Slight changes in namingv0.5.2

3 files changed, 8 insertions, 8 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/eligibility.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/eligibility.scala
index 0d0965b..1a900ac 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/eligibility.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/eligibility.scala
@@ -54,8 +54,8 @@ object eligibility {
                                      evidence: Seq[Evidence])
   final case class MismatchRankedLabels(data: Seq[LabelMismatchRank], labelVersion: Int)
 
-  final case class MatchedPatient(patientId: Id[Patient],
-                                  name: FullName[Patient],
+  final case class MatchedPatient(patientId: Id[xyz.driver.entities.patient.Patient],
+                                  name: FullName[xyz.driver.entities.patient.Patient],
                                   birthDate: Date,
                                   orderId: Id[TestOrder],
                                   disease: CancerType,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/eligibility.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/eligibility.scala
index 7dc50be..5f3321c 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/eligibility.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/eligibility.scala
@@ -2,7 +2,7 @@ package xyz.driver.pdsuidomain.fakes.entities
 
 import xyz.driver.core.generators
 import xyz.driver.entities.clinic.{ClinicalRecord, TestOrder}
-import xyz.driver.entities.patient.CancerType
+import xyz.driver.entities.patient.{CancerType, Patient}
 import xyz.driver.entities.report.Report
 import xyz.driver.fakes
 import xyz.driver.pdsuidomain.entities.eligibility._
@@ -46,8 +46,8 @@ object eligibility {
       isPrimaryValue = nextOption(nextBoolean())
     )
 
-  def nextLabelWithEvidence(): LabelWithEvidence =
-    LabelWithEvidence(label = fakes.entities.labels.nextLabel(), evidence = Seq.empty)
+  def nextLabelEvidence(): LabelEvidence =
+    LabelEvidence(label = fakes.entities.labels.nextLabel(), evidence = Seq.empty)
 
   def nextLabelMismatchRank(): LabelMismatchRank =
     LabelMismatchRank(
@@ -62,8 +62,8 @@ object eligibility {
 
   def nextMatchedPatient(): MatchedPatient =
     MatchedPatient(
-      patientId = nextId[MatchedPatient](),
-      name = fakes.entities.common.nextFullName[MatchedPatient](),
+      patientId = nextId[Patient](),
+      name = fakes.entities.common.nextFullName[Patient](),
       birthDate = nextDate(),
       orderId = nextId[TestOrder](),
       disease = generators.oneOf[CancerType](CancerType.Breast, CancerType.Lung, CancerType.Prostate),
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/eligibility.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/eligibility.scala
index 30ceae2..b836e1c 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/eligibility.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/eligibility.scala
@@ -92,7 +92,7 @@ object eligibility {
     }
   }
 
-  implicit def labelWithEvidenceJsonFormat: RootJsonFormat[LabelWithEvidence] = jsonFormat2(LabelWithEvidence)
+  implicit def labelWithEvidenceJsonFormat: RootJsonFormat[LabelEvidence] = jsonFormat2(LabelEvidence)
 
   implicit def labelRankingFormat: RootJsonFormat[LabelMismatchRank]     = jsonFormat4(LabelMismatchRank)
   implicit def labelRankingsFormat: RootJsonFormat[MismatchRankedLabels] = jsonFormat2(MismatchRankedLabels)