Merge pull request #59 from drivergroup/common-contextsv0.13.1

Using common request contexts and user objects

1 files changed, 7 insertions, 5 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala
index fa5f4ce..471d345 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.core.{JsonGenerator, JsonParser}
 import com.fasterxml.jackson.databind._
 import com.fasterxml.jackson.databind.annotation.{JsonDeserialize, JsonSerialize}
+import xyz.driver.core.auth.User
 import xyz.driver.pdsuicommon.compat.Implicits._
 import xyz.driver.pdsuicommon.domain._
 import xyz.driver.pdsuicommon.logging._
@@ -403,8 +404,9 @@ object Document {
 
   implicit def toPhiString(x: Document): PhiString = {
     import x._
-    phi"Document(id=$id, status=$status, assignee=$assignee, " +
-      phi"previousAssignee=$previousAssignee, lastActiveUserId=$lastActiveUserId, recordId=$recordId)"
+    phi"Document(id=$id, status=$status, assignee=${Unsafe(assignee)}, " +
+      phi"previousAssignee=${Unsafe(previousAssignee)}, " +
+      phi"lastActiveUserId=${Unsafe(lastActiveUserId)}, recordId=$recordId)"
   }
 
   val validator: Validator[Document, Document] = { input =>
@@ -443,9 +445,9 @@ object Document {
 final case class Document(id: LongId[Document] = LongId(0L),
                           status: Document.Status,
                           previousStatus: Option[Document.Status],
-                          assignee: Option[StringId[User]],
-                          previousAssignee: Option[StringId[User]],
-                          lastActiveUserId: Option[StringId[User]],
+                          assignee: Option[xyz.driver.core.Id[User]],
+                          previousAssignee: Option[xyz.driver.core.Id[User]],
+                          lastActiveUserId: Option[xyz.driver.core.Id[User]],
                           recordId: LongId[MedicalRecord],
                           physician: Option[String],
                           typeId: Option[LongId[DocumentType]], // not null