PDSUI-2018 Change user type from LongId to StringId

10 files changed, 34 insertions, 48 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala
index 5c957fb..d324fcd 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala
@@ -6,13 +6,13 @@ 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.pdsuicommon.domain.{LongId, TextJson, User}
+import xyz.driver.pdsuicommon.compat.Implicits._
+import xyz.driver.pdsuicommon.domain._
 import xyz.driver.pdsuicommon.logging._
 import xyz.driver.pdsuicommon.utils.Utils
 import xyz.driver.pdsuicommon.validation.Validators
 import xyz.driver.pdsuicommon.validation.Validators.Validator
 import xyz.driver.pdsuidomain.entities.Document.Meta
-import xyz.driver.pdsuicommon.compat.Implicits._
 
 final case class ProviderType(id: LongId[ProviderType], name: String)
 
@@ -269,9 +269,9 @@ object Document {
 final case class Document(id: LongId[Document] = LongId(0L),
                           status: Document.Status,
                           previousStatus: Option[Document.Status],
-                          assignee: Option[LongId[User]],
-                          previousAssignee: Option[LongId[User]],
-                          lastActiveUserId: Option[LongId[User]],
+                          assignee: Option[StringId[User]],
+                          previousAssignee: Option[StringId[User]],
+                          lastActiveUserId: Option[StringId[User]],
                           recordId: LongId[MedicalRecord],
                           physician: Option[String],
                           typeId: Option[LongId[DocumentType]], // not null
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/LinkedPatient.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/LinkedPatient.scala
index 1b30c64..28f279f 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/LinkedPatient.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/LinkedPatient.scala
@@ -11,4 +11,4 @@ object LinkedPatient {
   }
 }
 
-case class LinkedPatient(userId: LongId[User], patientId: UuidId[Patient], trialId: StringId[Trial])
+case class LinkedPatient(userId: StringId[User], patientId: UuidId[Patient], trialId: StringId[Trial])
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala
index 0e30fa0..9f38283 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala
@@ -5,7 +5,7 @@ import java.time.LocalDateTime
 
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonSubTypes, JsonTypeInfo}
-import xyz.driver.pdsuicommon.domain.{LongId, TextJson, User, UuidId}
+import xyz.driver.pdsuicommon.domain._
 import xyz.driver.pdsuicommon.logging._
 import xyz.driver.pdsuicommon.utils.Utils
 import xyz.driver.pdsuidomain.entities.MedicalRecord.Meta
@@ -142,9 +142,9 @@ object MedicalRecord {
 case class MedicalRecord(id: LongId[MedicalRecord],
                          status: MedicalRecord.Status,
                          previousStatus: Option[MedicalRecord.Status],
-                         assignee: Option[LongId[User]],
-                         previousAssignee: Option[LongId[User]],
-                         lastActiveUserId: Option[LongId[User]],
+                         assignee: Option[StringId[User]],
+                         previousAssignee: Option[StringId[User]],
+                         lastActiveUserId: Option[StringId[User]],
                          patientId: UuidId[Patient],
                          requestId: RecordRequestId,
                          disease: String,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Message.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Message.scala
index 2a73922..f02f481 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/Message.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Message.scala
@@ -8,7 +8,7 @@ import xyz.driver.pdsuicommon.logging._
 final case class Message(id: LongId[Message],
                          text: String,
                          lastUpdate: LocalDateTime,
-                         userId: LongId[User],
+                         userId: StringId[User],
                          isDraft: Boolean,
                          recordId: Option[LongId[MedicalRecord]],
                          documentId: Option[LongId[Document]],
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Patient.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Patient.scala
index 695245c..6be0b88 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/Patient.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Patient.scala
@@ -2,7 +2,7 @@ package xyz.driver.pdsuidomain.entities
 
 import java.time.{LocalDate, LocalDateTime}
 
-import xyz.driver.pdsuicommon.domain.{LongId, User, UuidId}
+import xyz.driver.pdsuicommon.domain._
 import xyz.driver.pdsuicommon.logging._
 import xyz.driver.pdsuicommon.utils.Utils
 
@@ -54,10 +54,10 @@ final case class Patient(id: UuidId[Patient],
                          status: Patient.Status,
                          name: String,
                          dob: LocalDate,
-                         assignee: Option[LongId[User]],
+                         assignee: Option[StringId[User]],
                          previousStatus: Option[Patient.Status],
-                         previousAssignee: Option[LongId[User]],
-                         lastActiveUserId: Option[LongId[User]],
+                         previousAssignee: Option[StringId[User]],
+                         lastActiveUserId: Option[StringId[User]],
                          isUpdateRequired: Boolean,
                          condition: String,
                          orderId: PatientOrderId,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientCriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientCriterion.scala
index 6c14458..469b21c 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientCriterion.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientCriterion.scala
@@ -64,6 +64,4 @@ object PatientCriterionArm {
 
 }
 
-final case class PatientCriterionArm(patientCriterionId: LongId[PatientCriterion],
-                                     armId: LongId[Arm],
-                                     armName: String)
+final case class PatientCriterionArm(patientCriterionId: LongId[PatientCriterion], armId: LongId[Arm], armName: String)
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala
index 0f478ca..3fe8176 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala
@@ -78,10 +78,10 @@ object Trial {
 final case class Trial(id: StringId[Trial],
                        externalId: UuidId[Trial],
                        status: Status,
-                       assignee: Option[LongId[User]],
+                       assignee: Option[StringId[User]],
                        previousStatus: Option[Status],
-                       previousAssignee: Option[LongId[User]],
-                       lastActiveUserId: Option[LongId[User]],
+                       previousAssignee: Option[StringId[User]],
+                       lastActiveUserId: Option[StringId[User]],
                        lastUpdate: LocalDateTime,
                        condition: Condition,
                        phase: String,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/TrialHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/TrialHistory.scala
index 829a351..c73aefe 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/TrialHistory.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/TrialHistory.scala
@@ -16,10 +16,10 @@ object TrialHistory {
 
   sealed trait State
   object State {
-    case object Summarize extends State
+    case object Summarize    extends State
     case object Criteriarize extends State
-    case object Review extends State
-    case object Flag extends State
+    case object Review       extends State
+    case object Flag         extends State
 
     val All: Set[State] = Set[State](Summarize, Criteriarize, Review, Flag)
 
@@ -50,12 +50,12 @@ object TrialHistory {
   }
 
   object Action {
-    case object Start extends Action
-    case object Submit extends Action
+    case object Start    extends Action
+    case object Submit   extends Action
     case object Unassign extends Action
-    case object Resolve extends Action
-    case object Flag extends Action
-    case object Archive extends Action
+    case object Resolve  extends Action
+    case object Flag     extends Action
+    case object Archive  extends Action
 
     val All: Set[Action] =
       Set[Action](Start, Submit, Unassign, Resolve, Flag, Archive)
@@ -85,9 +85,8 @@ object TrialHistory {
 }
 
 final case class TrialHistory(id: LongId[TrialHistory],
-                              executor: LongId[User],
+                              executor: StringId[User],
                               trialId: StringId[Trial],
                               state: State,
                               action: Action,
-                              created: LocalDateTime =
-                                LocalDateTime.now(ZoneId.of("Z")))
+                              created: LocalDateTime = LocalDateTime.now(ZoneId.of("Z")))
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/TrialIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/TrialIssue.scala
index 34895b6..2514f4d 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/TrialIssue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/TrialIssue.scala
@@ -6,7 +6,7 @@ import xyz.driver.pdsuicommon.domain.{LongId, StringId, User}
 import xyz.driver.pdsuicommon.logging._
 
 final case class TrialIssue(id: LongId[TrialIssue],
-                            userId: LongId[User],
+                            userId: StringId[User],
                             trialId: StringId[Trial],
                             lastUpdate: LocalDateTime,
                             isDraft: Boolean,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/UserHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/UserHistory.scala
index 4abb205..9be26b9 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/UserHistory.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/UserHistory.scala
@@ -7,7 +7,7 @@ import xyz.driver.pdsuicommon.logging._
 import xyz.driver.pdsuicommon.utils.Utils
 
 final case class UserHistory(id: LongId[UserHistory],
-                             executor: LongId[User],
+                             executor: StringId[User],
                              recordId: Option[LongId[MedicalRecord]] = None,
                              documentId: Option[LongId[Document]] = None,
                              trialId: Option[StringId[Trial]] = None,
@@ -18,7 +18,7 @@ final case class UserHistory(id: LongId[UserHistory],
 
 object UserHistory {
 
-  def forDocument(executor: LongId[User],
+  def forDocument(executor: StringId[User],
                   documentId: LongId[Document],
                   state: UserHistory.State,
                   action: UserHistory.Action): UserHistory = UserHistory(
@@ -29,7 +29,7 @@ object UserHistory {
     action = action
   )
 
-  def forRecord(executor: LongId[User],
+  def forRecord(executor: StringId[User],
                 recordId: LongId[MedicalRecord],
                 state: UserHistory.State,
                 action: UserHistory.Action): UserHistory = UserHistory(
@@ -40,18 +40,7 @@ object UserHistory {
     action = action
   )
 
-  def forTrial(executor: LongId[User],
-               trialId: StringId[Trial],
-               state: UserHistory.State,
-               action: UserHistory.Action): UserHistory = UserHistory(
-    id = LongId(0L),
-    executor = executor,
-    trialId = Some(trialId),
-    state = state,
-    action = action
-  )
-
-  def forPatient(executor: LongId[User],
+  def forPatient(executor: StringId[User],
                  patientId: UuidId[Patient],
                  state: UserHistory.State,
                  action: UserHistory.Action): UserHistory = UserHistory(