From 5515c834853cbe3ce60460a4819a94805cfe24f7 Mon Sep 17 00:00:00 2001
From: vlad <vlad@driver.xyz>
Date: Thu, 2 Nov 2017 17:37:25 -0700
Subject: Unifying user ids

---
 .../scala/xyz/driver/pdsuidomain/entities/UserHistory.scala    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/main/scala/xyz/driver/pdsuidomain/entities/UserHistory.scala')

diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/UserHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/UserHistory.scala
index 3528b4c..6299ed4 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/UserHistory.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/UserHistory.scala
@@ -8,7 +8,7 @@ import xyz.driver.pdsuicommon.logging._
 import xyz.driver.pdsuicommon.utils.Utils
 
 final case class UserHistory(id: LongId[UserHistory],
-                             executor: StringId[User],
+                             executor: xyz.driver.core.Id[User],
                              recordId: Option[LongId[MedicalRecord]] = None,
                              documentId: Option[LongId[Document]] = None,
                              trialId: Option[StringId[Trial]] = None,
@@ -19,7 +19,7 @@ final case class UserHistory(id: LongId[UserHistory],
 
 object UserHistory {
 
-  def forDocument(executor: StringId[User],
+  def forDocument(executor: xyz.driver.core.Id[User],
                   documentId: LongId[Document],
                   state: UserHistory.State,
                   action: UserHistory.Action): UserHistory = UserHistory(
@@ -30,7 +30,7 @@ object UserHistory {
     action = action
   )
 
-  def forRecord(executor: StringId[User],
+  def forRecord(executor: xyz.driver.core.Id[User],
                 recordId: LongId[MedicalRecord],
                 state: UserHistory.State,
                 action: UserHistory.Action): UserHistory = UserHistory(
@@ -41,7 +41,7 @@ object UserHistory {
     action = action
   )
 
-  def forPatient(executor: StringId[User],
+  def forPatient(executor: xyz.driver.core.Id[User],
                  patientId: UuidId[Patient],
                  state: UserHistory.State,
                  action: UserHistory.Action): UserHistory = UserHistory(
@@ -139,7 +139,7 @@ object UserHistory {
 
   implicit def toPhiString(x: UserHistory): PhiString = {
     import x._
-    phi"UserHistory(id=$id, executor=$executor, recordId=$recordId, " +
+    phi"UserHistory(id=$id, executor=${Unsafe(executor)}, recordId=$recordId, " +
       phi"documentId=$documentId, trialId=$trialId, patientId=$patientId, " +
       phi"state=$state, action=$action, created=$created)"
   }
-- 
cgit v1.2.3