Unifying user ids

11 files changed, 30 insertions, 22 deletions

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(