Using common request contexts and user objects

19 files changed, 36 insertions, 67 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/CaseId.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/CaseId.scala
deleted file mode 100644
index 751545e..0000000
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/CaseId.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-package xyz.driver.pdsuidomain.entities
-
-import java.util.UUID
-
-final case class CaseId(id: String)
-
-object CaseId {
-
-  def apply() = new CaseId(UUID.randomUUID().toString)
-}
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala
index fa5f4ce..4a0c5ca 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.core.{JsonGenerator, JsonParser}
 import com.fasterxml.jackson.databind._
 import com.fasterxml.jackson.databind.annotation.{JsonDeserialize, JsonSerialize}
+import xyz.driver.core.auth.User
 import xyz.driver.pdsuicommon.compat.Implicits._
 import xyz.driver.pdsuicommon.domain._
 import xyz.driver.pdsuicommon.logging._
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentHistory.scala
index a82da12..cbbeaee 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentHistory.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentHistory.scala
@@ -2,6 +2,7 @@ package xyz.driver.pdsuidomain.entities
 
 import java.time.{LocalDateTime, ZoneId}
 
+import xyz.driver.core.auth.User
 import xyz.driver.pdsuicommon.domain._
 import xyz.driver.pdsuicommon.logging._
 import xyz.driver.pdsuicommon.utils.Utils
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentIssue.scala
index 0ec8b00..074c96e 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentIssue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentIssue.scala
@@ -2,7 +2,8 @@ package xyz.driver.pdsuidomain.entities
 
 import java.time.LocalDateTime
 
-import xyz.driver.pdsuicommon.domain.{LongId, StringId, User}
+import xyz.driver.core.auth.User
+import xyz.driver.pdsuicommon.domain.{LongId, StringId}
 import xyz.driver.pdsuicommon.logging._
 
 final case class DocumentIssue(id: LongId[DocumentIssue],
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala
index 591b8bd..4794c00 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala
@@ -5,6 +5,9 @@ import java.time.LocalDateTime
 
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonSubTypes, JsonTypeInfo}
+import xyz.driver.core.auth.User
+import xyz.driver.entities.assays.PatientCase
+import xyz.driver.entities.clinic.ClinicalRecord
 import xyz.driver.pdsuicommon.domain._
 import xyz.driver.pdsuicommon.logging._
 import xyz.driver.pdsuicommon.utils.Utils
@@ -151,9 +154,9 @@ final case class MedicalRecord(id: LongId[MedicalRecord],
                                previousAssignee: Option[StringId[User]],
                                lastActiveUserId: Option[StringId[User]],
                                patientId: UuidId[Patient],
-                               requestId: RecordRequestId,
+                               requestId: xyz.driver.core.Id[ClinicalRecord],
                                disease: String,
-                               caseId: Option[CaseId],
+                               caseId: Option[xyz.driver.core.Id[PatientCase]],
                                physician: Option[String],
                                meta: Option[TextJson[List[Meta]]],
                                lastUpdate: LocalDateTime,
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala
index d01433c..3e141e5 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala
@@ -2,6 +2,7 @@ package xyz.driver.pdsuidomain.entities
 
 import java.time.{LocalDateTime, ZoneId}
 
+import xyz.driver.core.auth.User
 import xyz.driver.pdsuicommon.domain._
 import xyz.driver.pdsuicommon.logging._
 import xyz.driver.pdsuicommon.utils.Utils
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordIssue.scala
index 0d5a498..c768958 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordIssue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordIssue.scala
@@ -2,7 +2,8 @@ package xyz.driver.pdsuidomain.entities
 
 import java.time.LocalDateTime
 
-import xyz.driver.pdsuicommon.domain.{LongId, StringId, User}
+import xyz.driver.core.auth.User
+import xyz.driver.pdsuicommon.domain.{LongId, StringId}
 import xyz.driver.pdsuicommon.logging._
 
 final case class MedicalRecordIssue(id: LongId[MedicalRecordIssue],
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Message.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Message.scala
index 3bdbac8..5192410 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/Message.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Message.scala
@@ -2,7 +2,8 @@ package xyz.driver.pdsuidomain.entities
 
 import java.time.LocalDateTime
 
-import xyz.driver.pdsuicommon.domain.{LongId, StringId, User, UuidId}
+import xyz.driver.core.auth.User
+import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId}
 import xyz.driver.pdsuicommon.logging._
 
 final case class Message(id: LongId[Message],
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Patient.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Patient.scala
index 598b11e..7f29c0a 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/Patient.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Patient.scala
@@ -2,6 +2,8 @@ package xyz.driver.pdsuidomain.entities
 
 import java.time.{LocalDate, LocalDateTime}
 
+import xyz.driver.core.auth.User
+import xyz.driver.entities.clinic.TestOrder
 import xyz.driver.entities.common.FullName
 import xyz.driver.entities.patient.CancerType
 import xyz.driver.pdsuicommon.domain._
@@ -26,21 +28,9 @@ object Patient {
     case object Flagged  extends Status
     case object Done     extends Status
 
-    val AllPrevious = Set[Status](
-      New,
-      Verified,
-      Reviewed,
-      Curated
-    )
+    val AllPrevious: Set[Status] = Set[Status](New, Verified, Reviewed, Curated)
 
-    val All = Set[Status](
-      New,
-      Verified,
-      Reviewed,
-      Curated,
-      Flagged,
-      Done
-    )
+    val All: Set[Status] = Set[Status](New, Verified, Reviewed, Curated, Flagged, Done)
 
     implicit def toPhiString(x: Status): PhiString = Unsafe(Utils.getClassSimpleName(x.getClass))
   }
@@ -62,7 +52,7 @@ final case class Patient(id: UuidId[Patient],
                          lastActiveUserId: Option[StringId[User]],
                          isUpdateRequired: Boolean,
                          disease: CancerType,
-                         orderId: PatientOrderId,
+                         orderId: xyz.driver.core.Id[TestOrder],
                          lastUpdate: LocalDateTime) {
 
   import Patient.Status._
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientHistory.scala
index 39817c4..c67fa6f 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientHistory.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientHistory.scala
@@ -2,7 +2,8 @@ package xyz.driver.pdsuidomain.entities
 
 import java.time.{LocalDateTime, ZoneId}
 
-import xyz.driver.pdsuicommon.domain.{LongId, StringId, User, UuidId}
+import xyz.driver.core.auth.User
+import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId}
 import xyz.driver.pdsuicommon.logging._
 import xyz.driver.pdsuicommon.utils.Utils
 import xyz.driver.pdsuidomain.entities.PatientHistory.{Action, State}
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala
index f616754..b83ec82 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala
@@ -2,6 +2,7 @@ package xyz.driver.pdsuidomain.entities
 
 import java.time.LocalDateTime
 
+import xyz.driver.core.auth.User
 import xyz.driver.pdsuicommon.domain._
 import xyz.driver.pdsuicommon.logging._
 
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientOrderId.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientOrderId.scala
deleted file mode 100644
index 50a97ce..0000000
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientOrderId.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-package xyz.driver.pdsuidomain.entities
-
-import java.util.UUID
-
-final case class PatientOrderId(id: UUID) {
-  override def toString: String = id.toString
-}
-
-object PatientOrderId {
-
-  def apply() = new PatientOrderId(UUID.randomUUID())
-
-  def apply(x: String) = new PatientOrderId(UUID.fromString(x))
-}
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/RawPatientDocument.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/RawPatientDocument.scala
index b66483c..45cdc4e 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/RawPatientDocument.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/RawPatientDocument.scala
@@ -2,12 +2,14 @@ package xyz.driver.pdsuidomain.entities
 
 import java.time.LocalDate
 
+import xyz.driver.core.Id
+import xyz.driver.entities.clinic.ClinicalRecord
 import xyz.driver.pdsuicommon.domain.{LongId, UuidId}
 import xyz.driver.pdsuicommon.logging._
 
 final case class RawPatientDocument(disease: String,
                                     patientId: UuidId[Patient],
-                                    requestId: RecordRequestId,
+                                    requestId: Id[ClinicalRecord],
                                     recordId: LongId[MedicalRecord],
                                     recordStatus: MedicalRecord.Status,
                                     documentId: LongId[Document],
@@ -20,7 +22,7 @@ object RawPatientDocument {
 
   implicit def toPhiString(x: RawPatientDocument): PhiString = {
     import x._
-    phi"RawPatientDocument(disease=${Unsafe(disease)}, patientId=$patientId, requestId=$requestId, " +
+    phi"RawPatientDocument(disease=${Unsafe(disease)}, patientId=$patientId, requestId=${Unsafe(requestId)}, " +
       phi"recordId=$recordId, recordStatus=$recordStatus, documentId=$documentId, " +
       phi"documentType=${Unsafe(documentType)}, providerType=${Unsafe(documentProviderType)}, " +
       phi"startDate=$documentStartDate, documentStatus=$documentStatus)"
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/RecordRequestId.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/RecordRequestId.scala
deleted file mode 100644
index 5df87c2..0000000
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/RecordRequestId.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-package xyz.driver.pdsuidomain.entities
-
-import java.util.UUID
-import xyz.driver.pdsuicommon.logging._
-
-final case class RecordRequestId(id: UUID) {
-  override def toString: String = id.toString
-}
-
-object RecordRequestId {
-
-  def apply() = new RecordRequestId(UUID.randomUUID())
-
-  implicit def toPhiString(x: RecordRequestId): PhiString = phi"${x.id}"
-}
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala
index e734779..684f349 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala
@@ -2,7 +2,8 @@ package xyz.driver.pdsuidomain.entities
 
 import java.time.LocalDateTime
 
-import xyz.driver.pdsuicommon.domain.{LongId, StringId, User, UuidId}
+import xyz.driver.core.auth.User
+import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId}
 import xyz.driver.pdsuicommon.logging._
 import xyz.driver.pdsuicommon.utils.Utils
 import xyz.driver.pdsuidomain.entities.Trial.Status
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/TrialHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/TrialHistory.scala
index c73aefe..7366567 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/TrialHistory.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/TrialHistory.scala
@@ -6,6 +6,7 @@ import xyz.driver.pdsuicommon.domain._
 import xyz.driver.pdsuicommon.logging._
 import xyz.driver.pdsuicommon.utils.Utils
 import TrialHistory._
+import xyz.driver.core.auth.User
 
 object TrialHistory {
 
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/TrialIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/TrialIssue.scala
index 2514f4d..14610d5 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/TrialIssue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/TrialIssue.scala
@@ -2,7 +2,8 @@ package xyz.driver.pdsuidomain.entities
 
 import java.time.LocalDateTime
 
-import xyz.driver.pdsuicommon.domain.{LongId, StringId, User}
+import xyz.driver.core.auth.User
+import xyz.driver.pdsuicommon.domain.{LongId, StringId}
 import xyz.driver.pdsuicommon.logging._
 
 final case class TrialIssue(id: LongId[TrialIssue],
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/UserHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/UserHistory.scala
index 9be26b9..3528b4c 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/UserHistory.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/UserHistory.scala
@@ -2,6 +2,7 @@ package xyz.driver.pdsuidomain.entities
 
 import java.time.{LocalDateTime, ZoneId}
 
+import xyz.driver.core.auth.User
 import xyz.driver.pdsuicommon.domain._
 import xyz.driver.pdsuicommon.logging._
 import xyz.driver.pdsuicommon.utils.Utils
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientLabelEvidenceDocument.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientLabelEvidenceDocument.scala
index 467170b..1b3a6d6 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientLabelEvidenceDocument.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientLabelEvidenceDocument.scala
@@ -2,12 +2,13 @@ package xyz.driver.pdsuidomain.entities.export.patient
 
 import java.time.LocalDate
 
-import xyz.driver.pdsuicommon.domain._
+import xyz.driver.entities.clinic.ClinicalRecord
+import xyz.driver.pdsuicommon.domain.LongId
 import xyz.driver.pdsuicommon.logging._
 import xyz.driver.pdsuidomain.entities._
 
 final case class ExportPatientLabelEvidenceDocument(documentId: LongId[Document],
-                                                    requestId: RecordRequestId,
+                                                    requestId: xyz.driver.core.Id[ClinicalRecord],
                                                     documentType: DocumentType,
                                                     providerType: ProviderType,
                                                     date: LocalDate)
@@ -16,7 +17,7 @@ object ExportPatientLabelEvidenceDocument extends PhiLogging {
 
   implicit def toPhiString(x: ExportPatientLabelEvidenceDocument): PhiString = {
     import x._
-    phi"ExportPatientLabelEvidenceDocument(documentId=$documentId, requestId=$requestId, " +
+    phi"ExportPatientLabelEvidenceDocument(documentId=$documentId, requestId=${Unsafe(requestId)}, " +
       phi"documentType=${Unsafe(documentType)}, providerType=${Unsafe(providerType)}, date=$date)"
   }
 }