From 5515c834853cbe3ce60460a4819a94805cfe24f7 Mon Sep 17 00:00:00 2001 From: vlad Date: Thu, 2 Nov 2017 17:37:25 -0700 Subject: Unifying user ids --- src/main/scala/xyz/driver/pdsuidomain/entities/Patient.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main/scala/xyz/driver/pdsuidomain/entities/Patient.scala') diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Patient.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Patient.scala index 7f29c0a..c48e0d9 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/Patient.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Patient.scala @@ -37,8 +37,8 @@ object Patient { implicit def toPhiString(x: Patient): PhiString = { import x._ - phi"Patient(id=$id, status=$status, previousStatus=$previousStatus, lastActiveUserId=$lastActiveUserId" + - phi"assignee=$assignee, previousAssignee=$previousAssignee)" + phi"Patient(id=$id, status=$status, previousStatus=$previousStatus, lastActiveUserId=${Unsafe(lastActiveUserId)}" + + phi"assignee=${Unsafe(assignee)}, previousAssignee=${Unsafe(previousAssignee)})" } } @@ -46,10 +46,10 @@ final case class Patient(id: UuidId[Patient], status: Patient.Status, name: FullName[Patient], dob: LocalDate, - assignee: Option[StringId[User]], + assignee: Option[xyz.driver.core.Id[User]], previousStatus: Option[Patient.Status], - previousAssignee: Option[StringId[User]], - lastActiveUserId: Option[StringId[User]], + previousAssignee: Option[xyz.driver.core.Id[User]], + lastActiveUserId: Option[xyz.driver.core.Id[User]], isUpdateRequired: Boolean, disease: CancerType, orderId: xyz.driver.core.Id[TestOrder], -- cgit v1.2.3