Unifying user ids

14 files changed, 49 insertions, 47 deletions

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)"
   }