From 5515c834853cbe3ce60460a4819a94805cfe24f7 Mon Sep 17 00:00:00 2001 From: vlad Date: Thu, 2 Nov 2017 17:37:25 -0700 Subject: Unifying user ids --- .../scala/xyz/driver/pdsuidomain/entities/PatientHistory.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/scala/xyz/driver/pdsuidomain/entities/PatientHistory.scala') diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientHistory.scala index c67fa6f..bea2c3b 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientHistory.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientHistory.scala @@ -3,7 +3,7 @@ package xyz.driver.pdsuidomain.entities import java.time.{LocalDateTime, ZoneId} import xyz.driver.core.auth.User -import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId} +import xyz.driver.pdsuicommon.domain.{LongId, UuidId} import xyz.driver.pdsuicommon.logging._ import xyz.driver.pdsuicommon.utils.Utils import xyz.driver.pdsuidomain.entities.PatientHistory.{Action, State} @@ -12,7 +12,8 @@ object PatientHistory { implicit def toPhiString(x: PatientHistory): PhiString = { import x._ - phi"PatientHistory(id=$id, executor=$executor, patientId=$patientId, state=$state, action=$action, created=$created)" + phi"PatientHistory(id=$id, executor=${Unsafe(executor)}, patientId=$patientId, " + + phi"state=$state, action=$action, created=$created)" } sealed trait State @@ -86,7 +87,7 @@ object PatientHistory { } final case class PatientHistory(id: LongId[PatientHistory], - executor: StringId[User], + executor: xyz.driver.core.Id[User], patientId: UuidId[Patient], state: State, action: Action, -- cgit v1.2.3