From b331892f87846945f69a28e9f3ee786cd4b93577 Mon Sep 17 00:00:00 2001
From: vlad <vlad@driver.xyz>
Date: Thu, 2 Nov 2017 16:22:11 -0700
Subject: Using common request contexts and user objects

---
 .../scala/xyz/driver/pdsuicommon/acl/ACL.scala     |  46 +++---
 .../pdsuicommon/auth/AnonymousRequestContext.scala |  11 --
 .../auth/AuthenticatedRequestContext.scala         |  36 -----
 .../xyz/driver/pdsuicommon/auth/RequestId.scala    |  14 --
 .../xyz/driver/pdsuicommon/domain/Email.scala      |   3 -
 .../scala/xyz/driver/pdsuicommon/domain/User.scala | 163 ---------------------
 .../driver/pdsuicommon/error/ErrorsResponse.scala  |   9 +-
 .../xyz/driver/pdsuicommon/http/Directives.scala   |  29 +---
 .../driver/pdsuicommon/logging/TimeLogger.scala    |   3 +-
 9 files changed, 42 insertions(+), 272 deletions(-)
 delete mode 100644 src/main/scala/xyz/driver/pdsuicommon/auth/AnonymousRequestContext.scala
 delete mode 100644 src/main/scala/xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala
 delete mode 100644 src/main/scala/xyz/driver/pdsuicommon/auth/RequestId.scala
 delete mode 100644 src/main/scala/xyz/driver/pdsuicommon/domain/Email.scala
 delete mode 100644 src/main/scala/xyz/driver/pdsuicommon/domain/User.scala

(limited to 'src/main/scala/xyz/driver/pdsuicommon')

diff --git a/src/main/scala/xyz/driver/pdsuicommon/acl/ACL.scala b/src/main/scala/xyz/driver/pdsuicommon/acl/ACL.scala
index 3eb1a65..c1907cd 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/acl/ACL.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/acl/ACL.scala
@@ -1,22 +1,32 @@
 package xyz.driver.pdsuicommon.acl
 
+import xyz.driver.core.auth.Role
+import xyz.driver.core.rest.AuthorizedServiceRequestContext
+import xyz.driver.entities.auth._
+import xyz.driver.entities.users.AuthUserInfo
 import xyz.driver.pdsuicommon.logging._
-import xyz.driver.pdsuicommon.auth.AuthenticatedRequestContext
 
 /**
   * @see https://driverinc.atlassian.net/wiki/display/RA/User+permissions#UserPermissions-AccessControlList
   */
 object ACL extends PhiLogging {
 
-  import xyz.driver.pdsuicommon.domain.User.Role
-  import Role._
-
   type AclCheck = Role => Boolean
 
   val Forbid: AclCheck = _ => false
 
   val Allow: AclCheck = _ => true
 
+  val RepRoles: Set[Role] = Set[Role](RecordAdmin, RecordCleaner, RecordOrganizer, DocumentExtractor)
+
+  val TcRoles: Set[Role] = Set[Role](TrialSummarizer, CriteriaCurator, TrialAdmin)
+
+  val TreatmentMatchingRoles: Set[Role] = Set[Role](RoutesCurator, EligibilityVerifier, TreatmentMatchingAdmin)
+
+  val PepRoles: Set[Role] = Set[Role](ResearchOncologist)
+
+  val All: Set[Role] = RepRoles ++ TcRoles ++ TreatmentMatchingRoles ++ PepRoles + AdministratorRole
+
   // Common
 
   object UserHistory
@@ -28,9 +38,9 @@ object ACL extends PhiLogging {
   object Queue
       extends BaseACL(
         label = "queue",
-        create = Set(SystemUser),
-        read = Set(SystemUser),
-        update = Set(SystemUser)
+        create = Set(AdministratorRole),
+        read = Set(AdministratorRole),
+        update = Set(AdministratorRole)
       )
 
   // REP
@@ -38,7 +48,7 @@ object ACL extends PhiLogging {
   object MedicalRecord
       extends BaseACL(
         label = "medical record",
-        read = RepRoles + RoutesCurator + TreatmentMatchingAdmin + ResearchOncologist + SystemUser,
+        read = RepRoles + RoutesCurator + TreatmentMatchingAdmin + ResearchOncologist + AdministratorRole,
         update = RepRoles - DocumentExtractor
       )
 
@@ -116,7 +126,7 @@ object ACL extends PhiLogging {
   object Trial
       extends BaseACL(
         label = "trial",
-        read = TcRoles + RoutesCurator + TreatmentMatchingAdmin + ResearchOncologist + SystemUser,
+        read = TcRoles + RoutesCurator + TreatmentMatchingAdmin + ResearchOncologist + AdministratorRole,
         update = TcRoles
       )
 
@@ -187,7 +197,7 @@ object ACL extends PhiLogging {
   object Patient
       extends BaseACL(
         label = "patient",
-        read = TreatmentMatchingRoles + ResearchOncologist + SystemUser,
+        read = TreatmentMatchingRoles + ResearchOncologist + AdministratorRole,
         update = TreatmentMatchingRoles
       )
 
@@ -248,20 +258,20 @@ object ACL extends PhiLogging {
                          update: AclCheck = Forbid,
                          delete: AclCheck = Forbid) {
 
-    def isCreateAllow()(implicit requestContext: AuthenticatedRequestContext): Boolean = {
-      check("create", create)(requestContext.executor.roles)
+    def isCreateAllow()(implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Boolean = {
+      check("create", create)(requestContext.authenticatedUser.roles)
     }
 
-    def isReadAllow()(implicit requestContext: AuthenticatedRequestContext): Boolean = {
-      check("read", read)(requestContext.executor.roles)
+    def isReadAllow()(implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Boolean = {
+      check("read", read)(requestContext.authenticatedUser.roles)
     }
 
-    def isUpdateAllow()(implicit requestContext: AuthenticatedRequestContext): Boolean = {
-      check("update", update)(requestContext.executor.roles)
+    def isUpdateAllow()(implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Boolean = {
+      check("update", update)(requestContext.authenticatedUser.roles)
     }
 
-    def isDeleteAllow()(implicit requestContext: AuthenticatedRequestContext): Boolean = {
-      check("delete", delete)(requestContext.executor.roles)
+    def isDeleteAllow()(implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Boolean = {
+      check("delete", delete)(requestContext.authenticatedUser.roles)
     }
 
     private def check(action: String, isAllowed: AclCheck)(executorRoles: Set[Role]): Boolean = {
diff --git a/src/main/scala/xyz/driver/pdsuicommon/auth/AnonymousRequestContext.scala b/src/main/scala/xyz/driver/pdsuicommon/auth/AnonymousRequestContext.scala
deleted file mode 100644
index c677ef8..0000000
--- a/src/main/scala/xyz/driver/pdsuicommon/auth/AnonymousRequestContext.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-package xyz.driver.pdsuicommon.auth
-
-class AnonymousRequestContext(val requestId: RequestId) {
-
-  override def equals(that: Any): Boolean = {
-    that.getClass == classOf[AnonymousRequestContext] &&
-    that.asInstanceOf[AnonymousRequestContext].requestId == requestId
-  }
-
-  override def hashCode(): Int = requestId.hashCode()
-}
diff --git a/src/main/scala/xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala b/src/main/scala/xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala
deleted file mode 100644
index 5c07a9a..0000000
--- a/src/main/scala/xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package xyz.driver.pdsuicommon.auth
-
-import xyz.driver.entities.users.AuthUserInfo
-import xyz.driver.pdsuicommon.logging._
-import xyz.driver.pdsuicommon.domain.User
-
-class AuthenticatedRequestContext(val driverUser: AuthUserInfo,
-                                  override val requestId: RequestId,
-                                  val authToken: String)
-    extends AnonymousRequestContext(requestId) {
-
-  val executor: User = new User(driverUser)
-
-  override def equals(that: Any): Boolean = {
-    that.getClass == this.getClass && {
-      val another = that.asInstanceOf[AuthenticatedRequestContext]
-      another.executor == executor && another.requestId == requestId
-    }
-  }
-
-  override def hashCode(): Int = {
-    val initial = 37
-    val first   = initial * 17 + executor.hashCode()
-    first * 17 + requestId.hashCode()
-  }
-}
-
-object AuthenticatedRequestContext {
-
-  def apply(driverUser: AuthUserInfo, authToken: String = "") =
-    new AuthenticatedRequestContext(driverUser, RequestId(), authToken)
-
-  implicit def toPhiString(x: AuthenticatedRequestContext): PhiString = {
-    phi"AuthenticatedRequestContext(executor=${x.executor}, requestId=${x.requestId})"
-  }
-}
diff --git a/src/main/scala/xyz/driver/pdsuicommon/auth/RequestId.scala b/src/main/scala/xyz/driver/pdsuicommon/auth/RequestId.scala
deleted file mode 100644
index 9982bb0..0000000
--- a/src/main/scala/xyz/driver/pdsuicommon/auth/RequestId.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-package xyz.driver.pdsuicommon.auth
-
-import xyz.driver.pdsuicommon.logging._
-import xyz.driver.pdsuicommon.auth.RequestId._
-import xyz.driver.pdsuicommon.utils.RandomUtils
-
-final case class RequestId(value: String = RandomUtils.randomString(IdLength))
-
-object RequestId {
-
-  private val IdLength = 20
-
-  implicit def toPhiString(x: RequestId): PhiString = phi"RequestId(${Unsafe(x.value)})"
-}
diff --git a/src/main/scala/xyz/driver/pdsuicommon/domain/Email.scala b/src/main/scala/xyz/driver/pdsuicommon/domain/Email.scala
deleted file mode 100644
index 092ad40..0000000
--- a/src/main/scala/xyz/driver/pdsuicommon/domain/Email.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-package xyz.driver.pdsuicommon.domain
-
-final case class Email(value: String)
diff --git a/src/main/scala/xyz/driver/pdsuicommon/domain/User.scala b/src/main/scala/xyz/driver/pdsuicommon/domain/User.scala
deleted file mode 100644
index f75f391..0000000
--- a/src/main/scala/xyz/driver/pdsuicommon/domain/User.scala
+++ /dev/null
@@ -1,163 +0,0 @@
-package xyz.driver.pdsuicommon.domain
-
-import java.math.BigInteger
-import java.security.SecureRandom
-import java.time.{Instant, LocalDateTime, ZoneId}
-
-import xyz.driver.pdsuicommon.logging._
-import xyz.driver.pdsuicommon.domain.User.Role
-import xyz.driver.pdsuicommon.utils.Utils
-
-final case class User(id: StringId[User],
-                      email: Email,
-                      name: String,
-                      roles: Set[Role],
-                      latestActivity: Option[LocalDateTime],
-                      deleted: Option[LocalDateTime]) {
-
-  def this(driverUser: xyz.driver.entities.users.AuthUserInfo) {
-    this(
-      id = StringId[xyz.driver.pdsuicommon.domain.User](driverUser.id.value),
-      email = Email(driverUser.email.toString),
-      name = driverUser.name.toString,
-      roles = driverUser.roles.flatMap(User.mapRoles),
-      latestActivity =
-        driverUser.lastLoginTime.map(t => Instant.ofEpochMilli(t.millis).atZone(ZoneId.of("Z")).toLocalDateTime),
-      deleted = Option.empty[LocalDateTime]
-    )
-  }
-}
-
-object User {
-
-  sealed trait Role extends Product with Serializable {
-
-    /**
-      * Bit representation of this role
-      */
-    def bit: Int
-
-    def is(that: Role): Boolean = this == that
-
-    def oneOf(roles: Role*): Boolean = roles.contains(this)
-
-    def oneOf(roles: Set[Role]): Boolean = roles.contains(this)
-  }
-
-  object Role extends PhiLogging {
-    case object RecordAdmin            extends Role { val bit = 1 << 0  }
-    case object RecordCleaner          extends Role { val bit = 1 << 1  }
-    case object RecordOrganizer        extends Role { val bit = 1 << 2  }
-    case object DocumentExtractor      extends Role { val bit = 1 << 3  }
-    case object TrialSummarizer        extends Role { val bit = 1 << 4  }
-    case object CriteriaCurator        extends Role { val bit = 1 << 5  }
-    case object TrialAdmin             extends Role { val bit = 1 << 6  }
-    case object EligibilityVerifier    extends Role { val bit = 1 << 7  }
-    case object TreatmentMatchingAdmin extends Role { val bit = 1 << 8  }
-    case object RoutesCurator          extends Role { val bit = 1 << 9  }
-    case object SystemUser             extends Role { val bit = 1 << 10 }
-    case object ResearchOncologist     extends Role { val bit = 1 << 11 }
-
-    val RepRoles = Set[Role](RecordAdmin, RecordCleaner, RecordOrganizer, DocumentExtractor)
-
-    val TcRoles = Set[Role](TrialSummarizer, CriteriaCurator, TrialAdmin)
-
-    val TreatmentMatchingRoles = Set[Role](RoutesCurator, EligibilityVerifier, TreatmentMatchingAdmin)
-
-    val PepRoles = Set[Role](ResearchOncologist)
-
-    val All = RepRoles ++ TcRoles ++ TreatmentMatchingRoles ++ PepRoles + SystemUser
-
-    def apply(bitMask: Int): Role = {
-      def extractRole(role: Role): Set[Role] =
-        if ((bitMask & role.bit) != 0) Set(role) else Set.empty[Role]
-
-      val roles = All.flatMap(extractRole)
-      roles.size match {
-        case 1 => roles.head
-        case _ =>
-          logger.error(phi"Can't convert a bit mask ${Unsafe(bitMask)} to any role")
-          throw new IllegalArgumentException()
-      }
-    }
-
-    implicit def toPhiString(x: Role): PhiString = Unsafe(Utils.getClassSimpleName(x.getClass))
-  }
-
-  implicit def toPhiString(x: User): PhiString = {
-    import x._
-    phi"User(id=$id, roles=${Unsafe(roles.map(_.toString).mkString(", "))})"
-  }
-
-  // SecureRandom is thread-safe, see the implementation
-  private val random = new SecureRandom()
-
-  def createPassword: String = new BigInteger(240, random).toString(32)
-
-  def mapRoles(coreRole: xyz.driver.core.auth.Role): Set[xyz.driver.pdsuicommon.domain.User.Role] = {
-    coreRole match {
-      case xyz.driver.entities.auth.AdministratorRole =>
-        Set(
-          xyz.driver.pdsuicommon.domain.User.Role.SystemUser,
-          xyz.driver.pdsuicommon.domain.User.Role.RecordAdmin,
-          xyz.driver.pdsuicommon.domain.User.Role.TrialAdmin,
-          xyz.driver.pdsuicommon.domain.User.Role.TreatmentMatchingAdmin
-        )
-      case xyz.driver.entities.auth.RecordAdmin =>
-        Set(xyz.driver.pdsuicommon.domain.User.Role.RecordAdmin)
-      case xyz.driver.entities.auth.RecordCleaner =>
-        Set(xyz.driver.pdsuicommon.domain.User.Role.RecordCleaner)
-      case xyz.driver.entities.auth.RecordOrganizer =>
-        Set(xyz.driver.pdsuicommon.domain.User.Role.RecordOrganizer)
-      case xyz.driver.entities.auth.DocumentExtractor =>
-        Set(xyz.driver.pdsuicommon.domain.User.Role.DocumentExtractor)
-      case xyz.driver.entities.auth.TrialSummarizer =>
-        Set(xyz.driver.pdsuicommon.domain.User.Role.TrialSummarizer)
-      case xyz.driver.entities.auth.CriteriaCurator =>
-        Set(xyz.driver.pdsuicommon.domain.User.Role.CriteriaCurator)
-      case xyz.driver.entities.auth.TrialAdmin =>
-        Set(xyz.driver.pdsuicommon.domain.User.Role.TrialAdmin)
-      case xyz.driver.entities.auth.EligibilityVerifier =>
-        Set(xyz.driver.pdsuicommon.domain.User.Role.EligibilityVerifier)
-      case xyz.driver.entities.auth.TreatmentMatchingAdmin =>
-        Set(xyz.driver.pdsuicommon.domain.User.Role.TreatmentMatchingAdmin)
-      case xyz.driver.entities.auth.RoutesCurator =>
-        Set(xyz.driver.pdsuicommon.domain.User.Role.RoutesCurator)
-      case xyz.driver.entities.auth.ResearchOncologist =>
-        Set(xyz.driver.pdsuicommon.domain.User.Role.ResearchOncologist)
-      case _ =>
-        Set.empty[xyz.driver.pdsuicommon.domain.User.Role]
-    }
-  }
-
-  def mapRolesToDriver(pdsuiRole: xyz.driver.pdsuicommon.domain.User.Role): Set[xyz.driver.core.auth.Role] = {
-    pdsuiRole match {
-      case xyz.driver.pdsuicommon.domain.User.Role.SystemUser =>
-        Set(xyz.driver.entities.auth.AdministratorRole)
-      case xyz.driver.pdsuicommon.domain.User.Role.RecordAdmin =>
-        Set(xyz.driver.entities.auth.RecordAdmin)
-      case xyz.driver.pdsuicommon.domain.User.Role.RecordCleaner =>
-        Set(xyz.driver.entities.auth.RecordCleaner)
-      case xyz.driver.pdsuicommon.domain.User.Role.RecordOrganizer =>
-        Set(xyz.driver.entities.auth.RecordOrganizer)
-      case xyz.driver.pdsuicommon.domain.User.Role.DocumentExtractor =>
-        Set(xyz.driver.entities.auth.DocumentExtractor)
-      case xyz.driver.pdsuicommon.domain.User.Role.TrialSummarizer =>
-        Set(xyz.driver.entities.auth.TrialSummarizer)
-      case xyz.driver.pdsuicommon.domain.User.Role.CriteriaCurator =>
-        Set(xyz.driver.entities.auth.CriteriaCurator)
-      case xyz.driver.pdsuicommon.domain.User.Role.TrialAdmin =>
-        Set(xyz.driver.entities.auth.TrialAdmin)
-      case xyz.driver.pdsuicommon.domain.User.Role.EligibilityVerifier =>
-        Set(xyz.driver.entities.auth.EligibilityVerifier)
-      case xyz.driver.pdsuicommon.domain.User.Role.TreatmentMatchingAdmin =>
-        Set(xyz.driver.entities.auth.TreatmentMatchingAdmin)
-      case xyz.driver.pdsuicommon.domain.User.Role.RoutesCurator =>
-        Set(xyz.driver.entities.auth.RoutesCurator)
-      case xyz.driver.pdsuicommon.domain.User.Role.ResearchOncologist =>
-        Set(xyz.driver.entities.auth.ResearchOncologist)
-      case _ =>
-        Set.empty[xyz.driver.core.auth.Role]
-    }
-  }
-}
diff --git a/src/main/scala/xyz/driver/pdsuicommon/error/ErrorsResponse.scala b/src/main/scala/xyz/driver/pdsuicommon/error/ErrorsResponse.scala
index ccb84c2..4d6aa0b 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/error/ErrorsResponse.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/error/ErrorsResponse.scala
@@ -2,9 +2,8 @@ package xyz.driver.pdsuicommon.error
 
 import spray.json._
 import ErrorsResponse.ResponseError
-import xyz.driver.pdsuicommon.auth.RequestId
 
-final case class ErrorsResponse(errors: Seq[ResponseError], requestId: RequestId)
+final case class ErrorsResponse(errors: Seq[ResponseError], requestId: String)
 
 object ErrorsResponse {
   import DefaultJsonProtocol._
@@ -28,11 +27,11 @@ object ErrorsResponse {
     override def write(obj: ErrorsResponse): JsValue = {
       JsObject(
         "errors"    -> obj.errors.map(_.toJson).toJson,
-        "requestId" -> obj.requestId.value.toJson
+        "requestId" -> obj.requestId.toJson
       )
     }
 
-    override def read(json: JsValue) = json match {
+    override def read(json: JsValue): ErrorsResponse = json match {
       case JsObject(fields) =>
         val errors = fields
           .get("errors")
@@ -41,7 +40,7 @@ object ErrorsResponse {
 
         val requestId = fields
           .get("requestId")
-          .map(id => RequestId(id.convertTo[String]))
+          .map(id => id.convertTo[String])
           .getOrElse(deserializationError(s"ErrorsResponse json object does not contain `requestId` field: $json"))
 
         ErrorsResponse(errors, requestId)
diff --git a/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala b/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala
index 4f5cd8a..93eb62f 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala
@@ -4,9 +4,6 @@ import akka.http.scaladsl.server._
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.model._
 import xyz.driver.core.app.DriverApp
-import xyz.driver.core.rest.ContextHeaders
-import xyz.driver.entities.users.AuthUserInfo
-import xyz.driver.pdsuicommon.auth._
 import xyz.driver.pdsuicommon.error._
 import xyz.driver.pdsuicommon.error.DomainError._
 import xyz.driver.pdsuicommon.error.ErrorsResponse.ResponseError
@@ -14,7 +11,9 @@ import xyz.driver.pdsuicommon.parsers._
 import xyz.driver.pdsuicommon.db.{Pagination, SearchFilterExpr, Sorting}
 import xyz.driver.pdsuicommon.domain._
 import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
-import xyz.driver.core.rest.auth.AuthProvider
+import xyz.driver.core.generators
+import xyz.driver.core.rest.ContextHeaders
+
 import scala.util.control._
 import scala.util._
 
@@ -69,7 +68,7 @@ trait Directives {
     case other                    => other
   }
 
-  def domainExceptionHandler(req: RequestId): ExceptionHandler = {
+  def domainExceptionHandler(req: String): ExceptionHandler = {
     def errorResponse(ex: Throwable) =
       ErrorsResponse(Seq(ResponseError(None, ex.getMessage, 1)), req)
     ExceptionHandler {
@@ -81,7 +80,7 @@ trait Directives {
     }
   }
 
-  def domainRejectionHandler(req: RequestId): RejectionHandler = {
+  def domainRejectionHandler(req: String): RejectionHandler = {
     def wrapContent(message: String) = {
       import ErrorsResponse._
       val err: ErrorsResponse = ErrorsResponse(Seq(ResponseError(None, message, 1)), req)
@@ -95,27 +94,15 @@ trait Directives {
     }
   }
 
-  val tracked: Directive1[RequestId] = optionalHeaderValueByName(ContextHeaders.TrackingIdHeader) flatMap {
-    case Some(id) => provide(RequestId(id))
-    case None     => provide(RequestId())
+  val tracked: Directive1[String] = optionalHeaderValueByName(ContextHeaders.TrackingIdHeader) flatMap {
+    case Some(id) => provide(id)
+    case None     => provide(generators.nextUuid().toString)
   }
 
   val domainResponse: Directive0 = tracked.flatMap { id =>
     handleExceptions(domainExceptionHandler(id)) & handleRejections(domainRejectionHandler(id))
   }
 
-  implicit class AuthProviderWrapper(provider: AuthProvider[AuthUserInfo]) {
-    val authenticated: Directive1[AuthenticatedRequestContext] = (provider.authorize() & tracked) tflatMap {
-      case (core, requestId) =>
-        provide(
-          new AuthenticatedRequestContext(
-            core.authenticatedUser,
-            requestId,
-            core.contextHeaders(ContextHeaders.AuthenticationTokenHeader)
-          ))
-    }
-  }
-
 }
 
 object Directives extends Directives
diff --git a/src/main/scala/xyz/driver/pdsuicommon/logging/TimeLogger.scala b/src/main/scala/xyz/driver/pdsuicommon/logging/TimeLogger.scala
index 297b0e1..349d925 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/logging/TimeLogger.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/logging/TimeLogger.scala
@@ -2,7 +2,8 @@ package xyz.driver.pdsuicommon.logging
 
 import java.time.{LocalDateTime, ZoneId}
 
-import xyz.driver.pdsuicommon.domain.{StringId, User}
+import xyz.driver.core.auth.User
+import xyz.driver.pdsuicommon.domain.StringId
 
 object TimeLogger extends PhiLogging {
 
-- 
cgit v1.2.3


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

---
 .../xyz/driver/pdsuicommon/logging/TimeLogger.scala  |  5 ++---
 .../xyz/driver/pdsuidomain/entities/Document.scala   | 11 ++++++-----
 .../pdsuidomain/entities/DocumentHistory.scala       |  4 ++--
 .../driver/pdsuidomain/entities/DocumentIssue.scala  |  6 +++---
 .../driver/pdsuidomain/entities/MedicalRecord.scala  | 14 +++++++-------
 .../pdsuidomain/entities/MedicalRecordHistory.scala  |  4 ++--
 .../pdsuidomain/entities/MedicalRecordIssue.scala    |  6 +++---
 .../xyz/driver/pdsuidomain/entities/Message.scala    |  4 ++--
 .../xyz/driver/pdsuidomain/entities/Patient.scala    | 10 +++++-----
 .../driver/pdsuidomain/entities/PatientHistory.scala |  7 ++++---
 .../driver/pdsuidomain/entities/PatientIssue.scala   |  4 ++--
 .../xyz/driver/pdsuidomain/entities/Trial.scala      |  8 ++++----
 .../driver/pdsuidomain/entities/TrialHistory.scala   |  4 ++--
 .../xyz/driver/pdsuidomain/entities/TrialIssue.scala |  4 ++--
 .../driver/pdsuidomain/entities/UserHistory.scala    | 10 +++++-----
 .../fakes/entities/recordprocessing.scala            | 20 ++++++++++----------
 .../fakes/entities/treatmentmatching.scala           | 10 +++++-----
 .../pdsuidomain/fakes/entities/trialcuration.scala   | 10 +++++-----
 .../driver/pdsuidomain/formats/json/document.scala   |  2 +-
 .../pdsuidomain/formats/json/documenthistory.scala   |  2 +-
 .../pdsuidomain/formats/json/documentissue.scala     |  7 +++++--
 .../driver/pdsuidomain/formats/json/patient.scala    |  8 ++++----
 .../pdsuidomain/formats/json/patienthistory.scala    |  6 +++---
 .../pdsuidomain/formats/json/patientissue.scala      |  7 +++++--
 .../pdsuidomain/formats/json/recordhistory.scala     |  2 +-
 .../pdsuidomain/formats/json/recordissue.scala       |  5 +++--
 .../xyz/driver/pdsuidomain/formats/json/trial.scala  |  8 ++++----
 .../pdsuidomain/formats/json/trialhistory.scala      |  2 +-
 .../driver/pdsuidomain/formats/json/trialissue.scala |  3 ++-
 .../formats/json/DocumentHistoryFormatSuite.scala    |  6 +++---
 .../formats/json/DocumentIssueFormatSuite.scala      |  8 ++++----
 .../json/MedicalRecordHistoryFormatSuite.scala       |  6 +++---
 .../formats/json/MedicalRecordIssueFormatSuite.scala |  8 ++++----
 .../formats/json/PatientHistoryFormatSuite.scala     |  6 +++---
 .../formats/json/PatientIssueFormatSuite.scala       |  6 +++---
 .../formats/json/TrialHistoryFormatSuite.scala       |  2 +-
 .../formats/json/TrialIssueFormatSuite.scala         |  4 ++--
 37 files changed, 124 insertions(+), 115 deletions(-)

(limited to 'src/main/scala/xyz/driver/pdsuicommon')

diff --git a/src/main/scala/xyz/driver/pdsuicommon/logging/TimeLogger.scala b/src/main/scala/xyz/driver/pdsuicommon/logging/TimeLogger.scala
index 349d925..fbd17eb 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/logging/TimeLogger.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/logging/TimeLogger.scala
@@ -3,12 +3,11 @@ package xyz.driver.pdsuicommon.logging
 import java.time.{LocalDateTime, ZoneId}
 
 import xyz.driver.core.auth.User
-import xyz.driver.pdsuicommon.domain.StringId
 
 object TimeLogger extends PhiLogging {
 
-  def logTime(userId: StringId[User], label: String, obj: String): Unit = {
+  def logTime(userId: xyz.driver.core.Id[User], label: String, obj: String): Unit = {
     val now = LocalDateTime.now(ZoneId.of("Z"))
-    logger.info(phi"User id=$userId performed an action at ${Unsafe(label)}=$now with a ${Unsafe(obj)} ")
+    logger.info(phi"User id=${Unsafe(userId)} performed an action at ${Unsafe(label)}=$now with a ${Unsafe(obj)} ")
   }
 }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala
index 4a0c5ca..471d345 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala
@@ -404,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 =>
@@ -444,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
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentHistory.scala
index cbbeaee..0a8480b 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentHistory.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentHistory.scala
@@ -12,7 +12,7 @@ object DocumentHistory {
 
   implicit def toPhiString(x: DocumentHistory): PhiString = {
     import x._
-    phi"DocumentHistory(id=$id, executor=$executor, documentId=$documentId, state=$state, action=$action, " +
+    phi"DocumentHistory(id=$id, executor=${Unsafe(executor)}, documentId=$documentId, state=$state, action=$action, " +
       phi"created=$created)"
   }
 
@@ -84,7 +84,7 @@ object DocumentHistory {
 }
 
 final case class DocumentHistory(id: LongId[DocumentHistory],
-                                 executor: StringId[User],
+                                 executor: xyz.driver.core.Id[User],
                                  documentId: LongId[Document],
                                  state: State,
                                  action: Action,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentIssue.scala
index 074c96e..279ef38 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentIssue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentIssue.scala
@@ -3,11 +3,11 @@ package xyz.driver.pdsuidomain.entities
 import java.time.LocalDateTime
 
 import xyz.driver.core.auth.User
-import xyz.driver.pdsuicommon.domain.{LongId, StringId}
+import xyz.driver.pdsuicommon.domain.LongId
 import xyz.driver.pdsuicommon.logging._
 
 final case class DocumentIssue(id: LongId[DocumentIssue],
-                               userId: StringId[User],
+                               userId: xyz.driver.core.Id[User],
                                documentId: LongId[Document],
                                startPage: Option[Double],
                                endPage: Option[Double],
@@ -19,6 +19,6 @@ final case class DocumentIssue(id: LongId[DocumentIssue],
 object DocumentIssue {
   implicit def toPhiString(x: DocumentIssue): PhiString = {
     import x._
-    phi"DocumentIssue(id=$id, userId=$userId, documentId=$documentId)"
+    phi"DocumentIssue(id=$id, userId=${Unsafe(userId)}, documentId=$documentId)"
   }
 }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala
index 4794c00..d3bc56e 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala
@@ -112,7 +112,7 @@ object MedicalRecord {
       case _               => None
     }
 
-    val All = Set[Status](
+    val All: Set[Status] = Set[Status](
       Unprocessed,
       PreCleaning,
       New,
@@ -126,7 +126,7 @@ object MedicalRecord {
       Archived
     )
 
-    val AllPrevious = Set[Status](New, Cleaned, Reviewed, Organized)
+    val AllPrevious: Set[Status] = Set[Status](New, Cleaned, Reviewed, Organized)
 
     implicit def toPhiString(x: Status): PhiString = Unsafe(Utils.getClassSimpleName(x.getClass))
   }
@@ -142,17 +142,17 @@ object MedicalRecord {
 
   implicit def toPhiString(x: MedicalRecord): PhiString = {
     import x._
-    phi"MedicalRecord(id=$id, status=$status, assignee=$assignee, " +
-      phi"previousAssignee=$previousAssignee, lastActiveUserId=$lastActiveUserId)"
+    phi"MedicalRecord(id=$id, status=$status, assignee=${Unsafe(assignee)}, " +
+      phi"previousAssignee=${Unsafe(previousAssignee)}, lastActiveUserId=${Unsafe(lastActiveUserId)})"
   }
 }
 
 final case class MedicalRecord(id: LongId[MedicalRecord],
                                status: MedicalRecord.Status,
                                previousStatus: Option[MedicalRecord.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]],
                                patientId: UuidId[Patient],
                                requestId: xyz.driver.core.Id[ClinicalRecord],
                                disease: String,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala
index 3e141e5..4259737 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala
@@ -12,7 +12,7 @@ object MedicalRecordHistory {
 
   implicit def toPhiString(x: MedicalRecordHistory): PhiString = {
     import x._
-    phi"MedicalRecordHistory(id=$id, executor=$executor, recordId=$recordId, state=$state, action=$action, " +
+    phi"MedicalRecordHistory(id=$id, executor=${Unsafe(executor)}, recordId=$recordId, state=$state, action=$action, " +
       phi"created=$created)"
   }
 
@@ -87,7 +87,7 @@ object MedicalRecordHistory {
 }
 
 final case class MedicalRecordHistory(id: LongId[MedicalRecordHistory],
-                                      executor: StringId[User],
+                                      executor: xyz.driver.core.Id[User],
                                       recordId: LongId[MedicalRecord],
                                       state: State,
                                       action: Action,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordIssue.scala
index c768958..6cdad49 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordIssue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordIssue.scala
@@ -3,11 +3,11 @@ package xyz.driver.pdsuidomain.entities
 import java.time.LocalDateTime
 
 import xyz.driver.core.auth.User
-import xyz.driver.pdsuicommon.domain.{LongId, StringId}
+import xyz.driver.pdsuicommon.domain.LongId
 import xyz.driver.pdsuicommon.logging._
 
 final case class MedicalRecordIssue(id: LongId[MedicalRecordIssue],
-                                    userId: StringId[User],
+                                    userId: xyz.driver.core.Id[User],
                                     recordId: LongId[MedicalRecord],
                                     startPage: Option[Double],
                                     endPage: Option[Double],
@@ -19,6 +19,6 @@ final case class MedicalRecordIssue(id: LongId[MedicalRecordIssue],
 object MedicalRecordIssue {
   implicit def toPhiString(x: MedicalRecordIssue): PhiString = {
     import x._
-    phi"MedicalRecordIssue(id=$id, userId=$userId, recordId=$recordId)"
+    phi"MedicalRecordIssue(id=$id, userId=${Unsafe(userId)}, recordId=$recordId)"
   }
 }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Message.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Message.scala
index 5192410..68fd5cd 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/Message.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Message.scala
@@ -9,7 +9,7 @@ import xyz.driver.pdsuicommon.logging._
 final case class Message(id: LongId[Message],
                          text: String,
                          lastUpdate: LocalDateTime,
-                         userId: StringId[User],
+                         userId: xyz.driver.core.Id[User],
                          isDraft: Boolean,
                          recordId: Option[LongId[MedicalRecord]],
                          documentId: Option[LongId[Document]],
@@ -30,6 +30,6 @@ object Message {
       .orElse(documentId.map(_.toString))
       .orElse(patientId.map(_.toString))
 
-    phi"Message(id=$id, userId=$userId, isDraft=$isDraft, entityId=${Unsafe(entityId)}"
+    phi"Message(id=$id, userId=${Unsafe(userId)}, isDraft=$isDraft, entityId=${Unsafe(entityId)}"
   }
 }
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],
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,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala
index b83ec82..b60c2ea 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala
@@ -7,7 +7,7 @@ import xyz.driver.pdsuicommon.domain._
 import xyz.driver.pdsuicommon.logging._
 
 final case class PatientIssue(id: LongId[PatientIssue],
-                              userId: StringId[User],
+                              userId: xyz.driver.core.Id[User],
                               patientId: UuidId[Patient],
                               lastUpdate: LocalDateTime,
                               isDraft: Boolean,
@@ -17,6 +17,6 @@ final case class PatientIssue(id: LongId[PatientIssue],
 object PatientIssue {
   implicit def toPhiString(x: PatientIssue): PhiString = {
     import x._
-    phi"PatientIssue(id=$id, userId=$userId, patientId=$patientId)"
+    phi"PatientIssue(id=$id, userId=${Unsafe(userId)}, patientId=$patientId)"
   }
 }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala
index 684f349..cb75803 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala
@@ -87,7 +87,7 @@ object Trial {
   implicit def toPhiString(x: Trial): PhiString = {
     import x._
     phi"Trial(id=$id, externalId=$externalId, status=$status, previousStatus=$previousStatus, " +
-      phi"lastActiveUserId=$lastActiveUserId, assignee=$assignee, previousAssignee=$previousAssignee, "
+      phi"lastActiveUserId=${Unsafe(lastActiveUserId)}, assignee=${Unsafe(assignee)}, previousAssignee=${Unsafe(previousAssignee)})"
   }
 
   final case class Locations(locations: List[String])
@@ -96,10 +96,10 @@ object Trial {
 final case class Trial(id: StringId[Trial],
                        externalId: UuidId[Trial],
                        status: Status,
-                       assignee: Option[StringId[User]],
+                       assignee: Option[xyz.driver.core.Id[User]],
                        previousStatus: Option[Status],
-                       previousAssignee: Option[StringId[User]],
-                       lastActiveUserId: Option[StringId[User]],
+                       previousAssignee: Option[xyz.driver.core.Id[User]],
+                       lastActiveUserId: Option[xyz.driver.core.Id[User]],
                        lastUpdate: LocalDateTime,
                        phase: String,
                        hypothesisId: Option[UuidId[Hypothesis]],
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/TrialHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/TrialHistory.scala
index 7366567..c66048b 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/TrialHistory.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/TrialHistory.scala
@@ -12,7 +12,7 @@ object TrialHistory {
 
   implicit def toPhiString(x: TrialHistory): PhiString = {
     import x._
-    phi"TrialHistory(id=$id, executor=$executor, trialId=$trialId, state=$state, action=$action, created=$created)"
+    phi"TrialHistory(id=$id, executor=${Unsafe(executor)}, trialId=$trialId, state=$state, action=$action, created=$created)"
   }
 
   sealed trait State
@@ -86,7 +86,7 @@ object TrialHistory {
 }
 
 final case class TrialHistory(id: LongId[TrialHistory],
-                              executor: StringId[User],
+                              executor: xyz.driver.core.Id[User],
                               trialId: StringId[Trial],
                               state: State,
                               action: Action,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/TrialIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/TrialIssue.scala
index 14610d5..f69e681 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/TrialIssue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/TrialIssue.scala
@@ -7,7 +7,7 @@ import xyz.driver.pdsuicommon.domain.{LongId, StringId}
 import xyz.driver.pdsuicommon.logging._
 
 final case class TrialIssue(id: LongId[TrialIssue],
-                            userId: StringId[User],
+                            userId: xyz.driver.core.Id[User],
                             trialId: StringId[Trial],
                             lastUpdate: LocalDateTime,
                             isDraft: Boolean,
@@ -19,6 +19,6 @@ final case class TrialIssue(id: LongId[TrialIssue],
 object TrialIssue {
   implicit def toPhiString(x: TrialIssue): PhiString = {
     import x._
-    phi"TrialIssue(id=$id, userId=$userId, trialId=$trialId)"
+    phi"TrialIssue(id=$id, userId=${Unsafe(userId)}, trialId=$trialId)"
   }
 }
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)"
   }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/recordprocessing.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/recordprocessing.scala
index 199be29..5903dc8 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/recordprocessing.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/recordprocessing.scala
@@ -108,9 +108,9 @@ object recordprocessing {
     id = nextLongId[MedicalRecord],
     status = nextMedicalRecordStatus(),
     previousStatus = nextOption(generators.oneOf[MedicalRecord.Status](MedicalRecord.Status.AllPrevious)),
-    assignee = nextOption(nextStringId[User]),
-    previousAssignee = nextOption(nextStringId[User]),
-    lastActiveUserId = nextOption(nextStringId[User]),
+    assignee = nextOption(generators.nextId[User]),
+    previousAssignee = nextOption(generators.nextId[User]),
+    lastActiveUserId = nextOption(generators.nextId[User]),
     patientId = nextUuidId[Patient],
     requestId = generators.nextId[ClinicalRecord](),
     disease = generators.nextString(),
@@ -123,7 +123,7 @@ object recordprocessing {
 
   def nextMedicalRecordHistory(): MedicalRecordHistory = MedicalRecordHistory(
     id = nextLongId[MedicalRecordHistory],
-    executor = nextStringId[User],
+    executor = generators.nextId[User],
     recordId = nextLongId[MedicalRecord],
     state = nextMedicalRecordHistoryState(),
     action = nextMedicalRecordHistoryAction(),
@@ -135,7 +135,7 @@ object recordprocessing {
 
     MedicalRecordIssue(
       id = nextLongId[MedicalRecordIssue],
-      userId = nextStringId[User],
+      userId = generators.nextId[User],
       recordId = nextLongId[MedicalRecord],
       startPage = startPage,
       endPage = endPage,
@@ -171,9 +171,9 @@ object recordprocessing {
       id = nextLongId[Document],
       status = nextDocumentStatus(),
       previousStatus = nextOption(generators.oneOf[Document.Status](Document.Status.AllPrevious)),
-      assignee = nextOption(nextStringId[User]),
-      previousAssignee = nextOption(nextStringId[User]),
-      lastActiveUserId = nextOption(nextStringId[User]),
+      assignee = nextOption(generators.nextId[User]),
+      previousAssignee = nextOption(generators.nextId[User]),
+      lastActiveUserId = nextOption(generators.nextId[User]),
       recordId = nextLongId[MedicalRecord],
       physician = nextOption(nextString()),
       typeId = nextOption(nextLongId[DocumentType]),
@@ -193,7 +193,7 @@ object recordprocessing {
     val (startPage, endPage) = nextStartAndEndPagesOption
     DocumentIssue(
       id = nextLongId[DocumentIssue],
-      userId = nextStringId[User],
+      userId = generators.nextId[User],
       documentId = nextLongId[Document],
       startPage = startPage,
       endPage = endPage,
@@ -206,7 +206,7 @@ object recordprocessing {
 
   def nextDocumentHistory(): DocumentHistory = DocumentHistory(
     id = nextLongId[DocumentHistory],
-    executor = nextStringId[User],
+    executor = generators.nextId[User],
     documentId = nextLongId[Document],
     state = nextDocumentHistoryState(),
     action = nextDocumentHistoryAction(),
diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala
index b35418d..441c1db 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala
@@ -47,10 +47,10 @@ object treatmentmatching {
     status = nextPatientStatus,
     name = nextFullName[Patient],
     dob = nextLocalDate,
-    assignee = generators.nextOption(nextStringId[User]),
+    assignee = generators.nextOption(generators.nextId[User]),
     previousStatus = generators.nextOption(generators.oneOf[Patient.Status](Patient.Status.AllPrevious)),
-    previousAssignee = generators.nextOption(nextStringId[User]),
-    lastActiveUserId = generators.nextOption(nextStringId[User]),
+    previousAssignee = generators.nextOption(generators.nextId[User]),
+    lastActiveUserId = generators.nextOption(generators.nextId[User]),
     isUpdateRequired = generators.nextBoolean(),
     disease = nextCancerType,
     orderId = generators.nextId(),
@@ -171,7 +171,7 @@ object treatmentmatching {
 
   def nextPatientIssue(): PatientIssue = PatientIssue(
     id = nextLongId[PatientIssue],
-    userId = nextStringId[User],
+    userId = generators.nextId[User],
     patientId = nextUuidId[Patient],
     lastUpdate = nextLocalDateTime,
     isDraft = generators.nextBoolean(),
@@ -181,7 +181,7 @@ object treatmentmatching {
 
   def nextPatientHistory(): PatientHistory = PatientHistory(
     id = nextLongId[PatientHistory],
-    executor = nextStringId[User],
+    executor = generators.nextId[User],
     patientId = nextUuidId[Patient],
     state = nextPatientState,
     action = nextPatientAction,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala
index 2bbff90..94bc27a 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala
@@ -20,10 +20,10 @@ object trialcuration {
     id = nextStringId[Trial],
     externalId = nextUuidId[Trial],
     status = nextTrialStatus,
-    assignee = Option(nextStringId[User]),
+    assignee = Option(generators.nextId[User]),
     previousStatus = Option(nextPreviousTrialStatus),
-    previousAssignee = Option(nextStringId[User]),
-    lastActiveUserId = Option(nextStringId[User]),
+    previousAssignee = Option(generators.nextId[User]),
+    lastActiveUserId = Option(generators.nextId[User]),
     lastUpdate = nextLocalDateTime,
     phase = generators.nextString(),
     hypothesisId = Option(nextUuidId[Hypothesis]),
@@ -107,7 +107,7 @@ object trialcuration {
 
   def nextTrialIssue(): TrialIssue = TrialIssue(
     id = nextLongId[TrialIssue],
-    userId = nextStringId[User],
+    userId = generators.nextId[User],
     trialId = nextStringId[Trial],
     lastUpdate = nextLocalDateTime,
     isDraft = generators.nextBoolean(),
@@ -119,7 +119,7 @@ object trialcuration {
 
   def nextTrialHistory(): TrialHistory = TrialHistory(
     id = nextLongId[TrialHistory],
-    executor = nextStringId[User],
+    executor = generators.nextId[User],
     trialId = nextStringId[Trial],
     state = nextTrialState,
     action = nextTrialAction,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/document.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/document.scala
index aaca391..3cce5de 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/document.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/document.scala
@@ -3,7 +3,7 @@ package xyz.driver.pdsuidomain.formats.json
 import java.time.{LocalDate, LocalDateTime}
 
 import spray.json._
-import xyz.driver.core.json.EnumJsonFormat
+import xyz.driver.core.json._
 import xyz.driver.pdsuicommon.domain.{LongId, TextJson}
 import xyz.driver.pdsuidomain.entities._
 
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/documenthistory.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/documenthistory.scala
index a0eb3f5..ea79b92 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/documenthistory.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/documenthistory.scala
@@ -1,7 +1,7 @@
 package xyz.driver.pdsuidomain.formats.json
 
 import spray.json._
-import xyz.driver.core.json.EnumJsonFormat
+import xyz.driver.core.json._
 import xyz.driver.pdsuidomain.entities._
 
 object documenthistory {
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/documentissue.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/documentissue.scala
index b3bc95f..dbf544e 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/documentissue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/documentissue.scala
@@ -4,7 +4,8 @@ import java.time.LocalDateTime
 
 import spray.json._
 import xyz.driver.core.auth.User
-import xyz.driver.pdsuicommon.domain.{LongId, StringId}
+import xyz.driver.core.json._
+import xyz.driver.pdsuicommon.domain.LongId
 import xyz.driver.pdsuidomain.entities._
 
 object documentissue {
@@ -37,7 +38,9 @@ object documentissue {
 
   }
 
-  def jsValueToDocumentIssue(json: JsValue, documentId: LongId[Document], userId: StringId[User]): DocumentIssue =
+  def jsValueToDocumentIssue(json: JsValue,
+                             documentId: LongId[Document],
+                             userId: xyz.driver.core.Id[User]): DocumentIssue =
     json match {
       case JsObject(fields) =>
         val text = fields
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient.scala
index 43062b6..774a1ff 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient.scala
@@ -10,7 +10,7 @@ import xyz.driver.entities.common.FullName
 import xyz.driver.entities.patient.CancerType
 import xyz.driver.formats.json.common._
 import xyz.driver.formats.json.patient._
-import xyz.driver.pdsuicommon.domain.{StringId, UuidId}
+import xyz.driver.pdsuicommon.domain.UuidId
 import xyz.driver.pdsuidomain.entities._
 
 object patient {
@@ -68,7 +68,7 @@ object patient {
 
           val assignee = fields
             .get("assignee")
-            .flatMap(_.convertTo[Option[StringId[User]]])
+            .flatMap(_.convertTo[Option[xyz.driver.core.Id[User]]])
 
           val previousStatus = fields
             .get("previousStatus")
@@ -76,11 +76,11 @@ object patient {
 
           val previousAssignee = fields
             .get("previousAssignee")
-            .flatMap(_.convertTo[Option[StringId[User]]])
+            .flatMap(_.convertTo[Option[xyz.driver.core.Id[User]]])
 
           val lastActiveUser = fields
             .get("lastActiveUser")
-            .flatMap(_.convertTo[Option[StringId[User]]])
+            .flatMap(_.convertTo[Option[xyz.driver.core.Id[User]]])
 
           val disease = fields
             .get("disease")
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patienthistory.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patienthistory.scala
index bd20b27..c9cdc63 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patienthistory.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patienthistory.scala
@@ -1,7 +1,7 @@
 package xyz.driver.pdsuidomain.formats.json
 
 import spray.json._
-import xyz.driver.core.json.EnumJsonFormat
+import xyz.driver.core.json._
 import xyz.driver.pdsuidomain.entities._
 
 object patienthistory {
@@ -9,14 +9,14 @@ object patienthistory {
   import PatientHistory._
   import common._
 
-  implicit val patientStateFormat = new EnumJsonFormat[State](
+  implicit val patientStateFormat: RootJsonFormat[State] = new EnumJsonFormat[State](
     "Verify" -> State.Verify,
     "Curate" -> State.Curate,
     "Review" -> State.Review,
     "Flag"   -> State.Flag
   )
 
-  implicit val patientActionFormat = new EnumJsonFormat[Action](
+  implicit val patientActionFormat: RootJsonFormat[Action] = new EnumJsonFormat[Action](
     "Start"    -> Action.Start,
     "Submit"   -> Action.Submit,
     "Unassign" -> Action.Unassign,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue.scala
index e880917..0ee4c6c 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue.scala
@@ -4,7 +4,8 @@ import java.time.LocalDateTime
 
 import spray.json._
 import xyz.driver.core.auth.User
-import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId}
+import xyz.driver.core.json._
+import xyz.driver.pdsuicommon.domain.{LongId, UuidId}
 import xyz.driver.pdsuidomain.entities._
 
 object patientissue {
@@ -23,7 +24,9 @@ object patientissue {
     }
   }
 
-  def jsValueToPatientIssue(json: JsValue, patientId: UuidId[Patient], userId: StringId[User]): PatientIssue = {
+  def jsValueToPatientIssue(json: JsValue,
+                            patientId: UuidId[Patient],
+                            userId: xyz.driver.core.Id[User]): PatientIssue = {
     json.asJsObject.getFields("text") match {
       case Seq(text) =>
         PatientIssue(
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/recordhistory.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/recordhistory.scala
index 00071e1..8341f97 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/recordhistory.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/recordhistory.scala
@@ -1,7 +1,7 @@
 package xyz.driver.pdsuidomain.formats.json
 
 import spray.json._
-import xyz.driver.core.json.EnumJsonFormat
+import xyz.driver.core.json._
 import xyz.driver.pdsuidomain.entities._
 
 object recordhistory {
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/recordissue.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/recordissue.scala
index 4745862..976a852 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/recordissue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/recordissue.scala
@@ -4,7 +4,8 @@ import java.time.LocalDateTime
 
 import spray.json._
 import xyz.driver.core.auth.User
-import xyz.driver.pdsuicommon.domain.{LongId, StringId}
+import xyz.driver.core.json._
+import xyz.driver.pdsuicommon.domain.LongId
 import xyz.driver.pdsuidomain.entities._
 
 object recordissue {
@@ -40,7 +41,7 @@ object recordissue {
 
   def jsValueToRecordIssue(json: JsValue,
                            recordId: LongId[MedicalRecord],
-                           userId: StringId[User]): MedicalRecordIssue = json match {
+                           userId: xyz.driver.core.Id[User]): MedicalRecordIssue = json match {
     case JsObject(fields) =>
       val text = fields
         .get("text")
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial.scala
index f22401b..ac02070 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial.scala
@@ -4,7 +4,7 @@ import java.time.{LocalDateTime, ZoneId, ZonedDateTime}
 
 import spray.json._
 import xyz.driver.core.auth.User
-import xyz.driver.core.json.EnumJsonFormat
+import xyz.driver.core.json._
 import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId}
 import xyz.driver.pdsuidomain.entities._
 
@@ -65,16 +65,16 @@ object trial {
             .getOrElse(deserializationError(s"Trial create json object does not contain `status` field: $json"))
           val assignee = fields
             .get("assignee")
-            .flatMap(_.convertTo[Option[StringId[User]]])
+            .flatMap(_.convertTo[Option[xyz.driver.core.Id[User]]])
           val previousStatus = fields
             .get("previousStatus")
             .flatMap(_.convertTo[Option[Trial.Status]])
           val previousAssignee = fields
             .get("previousAssignee")
-            .flatMap(_.convertTo[Option[StringId[User]]])
+            .flatMap(_.convertTo[Option[xyz.driver.core.Id[User]]])
           val lastActiveUser = fields
             .get("lastActiveUser")
-            .flatMap(_.convertTo[Option[StringId[User]]])
+            .flatMap(_.convertTo[Option[xyz.driver.core.Id[User]]])
           val lastUpdate = fields
             .get("lastUpdate")
             .map(_.convertTo[LocalDateTime])
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialhistory.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialhistory.scala
index 6185d5a..cc01dd1 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialhistory.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialhistory.scala
@@ -1,7 +1,7 @@
 package xyz.driver.pdsuidomain.formats.json
 
 import spray.json._
-import xyz.driver.core.json.EnumJsonFormat
+import xyz.driver.core.json._
 import xyz.driver.pdsuidomain.entities._
 
 object trialhistory {
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue.scala
index c22fff3..bb431fe 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue.scala
@@ -4,6 +4,7 @@ import java.time.LocalDateTime
 
 import spray.json._
 import xyz.driver.core.auth.User
+import xyz.driver.core.json._
 import xyz.driver.pdsuicommon.domain.{LongId, StringId}
 import xyz.driver.pdsuidomain.entities._
 
@@ -25,7 +26,7 @@ object trialissue {
     }
   }
 
-  def jsValueToTrialIssue(json: JsValue, trialId: StringId[Trial], userId: StringId[User]): TrialIssue = {
+  def jsValueToTrialIssue(json: JsValue, trialId: StringId[Trial], userId: xyz.driver.core.Id[User]): TrialIssue = {
     json.asJsObject.getFields("text", "evidence", "meta") match {
       case Seq(text, evidence, meta) =>
         TrialIssue(
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/DocumentHistoryFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/DocumentHistoryFormatSuite.scala
index e4a0733..4dc4d00 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/DocumentHistoryFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/DocumentHistoryFormatSuite.scala
@@ -2,9 +2,9 @@ package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 
-import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
-import xyz.driver.pdsuicommon.domain.{LongId, StringId}
+import spray.json._
+import xyz.driver.pdsuicommon.domain.LongId
 import xyz.driver.pdsuidomain.entities.DocumentHistory
 
 class DocumentHistoryFormatSuite extends FlatSpec with Matchers {
@@ -14,7 +14,7 @@ class DocumentHistoryFormatSuite extends FlatSpec with Matchers {
     val documentHistory = DocumentHistory(
       id = LongId(10),
       documentId = LongId(1),
-      executor = StringId("userId-001"),
+      executor = xyz.driver.core.Id("userId-001"),
       state = DocumentHistory.State.Extract,
       action = DocumentHistory.Action.Start,
       created = LocalDateTime.parse("2017-08-10T18:00:00")
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/DocumentIssueFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/DocumentIssueFormatSuite.scala
index 7f34725..2ddd5e7 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/DocumentIssueFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/DocumentIssueFormatSuite.scala
@@ -2,9 +2,9 @@ package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 
-import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
-import xyz.driver.pdsuicommon.domain.{LongId, StringId}
+import spray.json._
+import xyz.driver.pdsuicommon.domain.LongId
 import xyz.driver.pdsuidomain.entities.DocumentIssue
 
 class DocumentIssueFormatSuite extends FlatSpec with Matchers {
@@ -14,7 +14,7 @@ class DocumentIssueFormatSuite extends FlatSpec with Matchers {
     val documentIssue = DocumentIssue(
       id = LongId(10),
       documentId = LongId(1),
-      userId = StringId("userId-001"),
+      userId = xyz.driver.core.Id("userId-001"),
       lastUpdate = LocalDateTime.parse("2017-08-10T18:00:00"),
       isDraft = false,
       text = "message text",
@@ -31,7 +31,7 @@ class DocumentIssueFormatSuite extends FlatSpec with Matchers {
     val createDocumentIssueJson = """{"text":"message text","startPage":1.0,"endPage":2.0}""".parseJson
     val expectedCreatedDocumentIssue =
       documentIssue.copy(id = LongId(0), lastUpdate = LocalDateTime.MIN, isDraft = true)
-    val parsedCreateDocumentIssue = jsValueToDocumentIssue(createDocumentIssueJson, LongId(1), StringId("userId-001"))
+    val parsedCreateDocumentIssue = jsValueToDocumentIssue(createDocumentIssueJson, LongId(1), xyz.driver.core.Id("userId-001"))
     parsedCreateDocumentIssue should be(expectedCreatedDocumentIssue)
 
     val updateDocumentIssueJson =
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordHistoryFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordHistoryFormatSuite.scala
index ca4058e..88240cd 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordHistoryFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordHistoryFormatSuite.scala
@@ -2,9 +2,9 @@ package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 
-import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
-import xyz.driver.pdsuicommon.domain.{LongId, StringId}
+import spray.json._
+import xyz.driver.pdsuicommon.domain.LongId
 import xyz.driver.pdsuidomain.entities.MedicalRecordHistory
 
 class MedicalRecordHistoryFormatSuite extends FlatSpec with Matchers {
@@ -14,7 +14,7 @@ class MedicalRecordHistoryFormatSuite extends FlatSpec with Matchers {
     val recordHistory = MedicalRecordHistory(
       id = LongId(10),
       recordId = LongId(1),
-      executor = StringId("userId-001"),
+      executor = xyz.driver.core.Id("userId-001"),
       state = MedicalRecordHistory.State.Clean,
       action = MedicalRecordHistory.Action.Start,
       created = LocalDateTime.parse("2017-08-10T18:00:00")
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordIssueFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordIssueFormatSuite.scala
index c7c82a4..b93e2bd 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordIssueFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordIssueFormatSuite.scala
@@ -2,9 +2,9 @@ package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 
-import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
-import xyz.driver.pdsuicommon.domain.{LongId, StringId}
+import spray.json._
+import xyz.driver.pdsuicommon.domain.LongId
 import xyz.driver.pdsuidomain.entities.MedicalRecordIssue
 
 class MedicalRecordIssueFormatSuite extends FlatSpec with Matchers {
@@ -14,7 +14,7 @@ class MedicalRecordIssueFormatSuite extends FlatSpec with Matchers {
     val recordIssue = MedicalRecordIssue(
       id = LongId(10),
       recordId = LongId(1),
-      userId = StringId("userId-001"),
+      userId = xyz.driver.core.Id("userId-001"),
       lastUpdate = LocalDateTime.parse("2017-08-10T18:00:00"),
       isDraft = false,
       text = "message text",
@@ -30,7 +30,7 @@ class MedicalRecordIssueFormatSuite extends FlatSpec with Matchers {
 
     val createRecordIssueJson      = """{"text":"message text","startPage":1.0,"endPage":2.0}""".parseJson
     val expectedCreatedRecordIssue = recordIssue.copy(id = LongId(0), lastUpdate = LocalDateTime.MIN, isDraft = true)
-    val parsedCreateRecordIssue    = jsValueToRecordIssue(createRecordIssueJson, LongId(1), StringId("userId-001"))
+    val parsedCreateRecordIssue    = jsValueToRecordIssue(createRecordIssueJson, LongId(1), xyz.driver.core.Id("userId-001"))
     parsedCreateRecordIssue should be(expectedCreatedRecordIssue)
 
     val updateRecordIssueJson =
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientHistoryFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientHistoryFormatSuite.scala
index e46cf50..74f6f70 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientHistoryFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientHistoryFormatSuite.scala
@@ -2,9 +2,9 @@ package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 
-import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
-import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId}
+import spray.json._
+import xyz.driver.pdsuicommon.domain.{LongId, UuidId}
 import xyz.driver.pdsuidomain.entities.PatientHistory
 
 class PatientHistoryFormatSuite extends FlatSpec with Matchers {
@@ -14,7 +14,7 @@ class PatientHistoryFormatSuite extends FlatSpec with Matchers {
     val patientHistory = PatientHistory(
       id = LongId(10),
       patientId = UuidId("40892a07-c638-49d2-9795-1edfefbbcc7c"),
-      executor = StringId("userId-001"),
+      executor = xyz.driver.core.Id("userId-001"),
       state = PatientHistory.State.Verify,
       action = PatientHistory.Action.Start,
       created = LocalDateTime.parse("2017-08-10T18:00:00")
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientIssueFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientIssueFormatSuite.scala
index 0d56918..ee76094 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientIssueFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientIssueFormatSuite.scala
@@ -4,7 +4,7 @@ import java.time.LocalDateTime
 
 import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
-import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId}
+import xyz.driver.pdsuicommon.domain.{LongId, UuidId}
 import xyz.driver.pdsuidomain.entities.PatientIssue
 
 class PatientIssueFormatSuite extends FlatSpec with Matchers {
@@ -14,7 +14,7 @@ class PatientIssueFormatSuite extends FlatSpec with Matchers {
     val patientIssue = PatientIssue(
       id = LongId(10),
       patientId = UuidId("40892a07-c638-49d2-9795-1edfefbbcc7c"),
-      userId = StringId("userId-001"),
+      userId = xyz.driver.core.Id("userId-001"),
       lastUpdate = LocalDateTime.parse("2017-08-10T18:00:00"),
       isDraft = false,
       text = "message text",
@@ -29,7 +29,7 @@ class PatientIssueFormatSuite extends FlatSpec with Matchers {
     val expectedCreatedPatientIssue = patientIssue.copy(id = LongId(0), lastUpdate = LocalDateTime.MIN, isDraft = true)
     val parsedCreatePatientIssue = jsValueToPatientIssue(createPatientIssueJson,
                                                          UuidId("40892a07-c638-49d2-9795-1edfefbbcc7c"),
-                                                         StringId("userId-001"))
+                                                         xyz.driver.core.Id("userId-001"))
     parsedCreatePatientIssue should be(expectedCreatedPatientIssue)
 
     val updatePatientIssueJson =
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/TrialHistoryFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/TrialHistoryFormatSuite.scala
index aa0b404..c17327b 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/TrialHistoryFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/TrialHistoryFormatSuite.scala
@@ -14,7 +14,7 @@ class TrialHistoryFormatSuite extends FlatSpec with Matchers {
     val trialHistory = TrialHistory(
       id = LongId(10),
       trialId = StringId("NCT000001"),
-      executor = StringId("userId-001"),
+      executor = xyz.driver.core.Id("userId-001"),
       state = TrialHistory.State.Summarize,
       action = TrialHistory.Action.Start,
       created = LocalDateTime.parse("2017-08-10T18:00:00")
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/TrialIssueFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/TrialIssueFormatSuite.scala
index 5c6aa8d..a3b5931 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/TrialIssueFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/TrialIssueFormatSuite.scala
@@ -14,7 +14,7 @@ class TrialIssueFormatSuite extends FlatSpec with Matchers {
     val trialIssue = TrialIssue(
       id = LongId(10),
       trialId = StringId("NCT000001"),
-      userId = StringId("userId-001"),
+      userId = xyz.driver.core.Id("userId-001"),
       lastUpdate = LocalDateTime.parse("2017-08-10T18:00:00"),
       isDraft = false,
       text = "message text",
@@ -30,7 +30,7 @@ class TrialIssueFormatSuite extends FlatSpec with Matchers {
     val createTrialIssueJson      = """{"text":"message text","evidence":"evidence","meta":"{}"}""".parseJson
     val expectedCreatedTrialIssue = trialIssue.copy(id = LongId(0), lastUpdate = LocalDateTime.MIN, isDraft = true)
     val parsedCreateTrialIssue =
-      jsValueToTrialIssue(createTrialIssueJson, StringId("NCT000001"), StringId("userId-001"))
+      jsValueToTrialIssue(createTrialIssueJson, StringId("NCT000001"), xyz.driver.core.Id("userId-001"))
     parsedCreateTrialIssue should be(expectedCreatedTrialIssue)
 
     val updateTrialIssueJson =
-- 
cgit v1.2.3