diff options
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/entities')
19 files changed, 82 insertions, 111 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..471d345 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._ @@ -403,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 => @@ -443,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 a82da12..0a8480b 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 @@ -11,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)" } @@ -83,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 0ec8b00..279ef38 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentIssue.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentIssue.scala @@ -2,11 +2,12 @@ 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 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], @@ -18,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 591b8bd..d3bc56e 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 @@ -109,7 +112,7 @@ object MedicalRecord { case _ => None } - val All = Set[Status]( + val All: Set[Status] = Set[Status]( Unprocessed, PreCleaning, New, @@ -123,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)) } @@ -139,21 +142,21 @@ 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: 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..4259737 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 @@ -11,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)" } @@ -86,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 0d5a498..6cdad49 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordIssue.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordIssue.scala @@ -2,11 +2,12 @@ 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 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], @@ -18,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 3bdbac8..68fd5cd 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/Message.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Message.scala @@ -2,13 +2,14 @@ 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], text: String, lastUpdate: LocalDateTime, - userId: StringId[User], + userId: xyz.driver.core.Id[User], isDraft: Boolean, recordId: Option[LongId[MedicalRecord]], documentId: Option[LongId[Document]], @@ -29,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 598b11e..c48e0d9 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,29 +28,17 @@ 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)) } 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)})" } } @@ -56,13 +46,13 @@ 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: 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..bea2c3b 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, UuidId} import xyz.driver.pdsuicommon.logging._ import xyz.driver.pdsuicommon.utils.Utils import xyz.driver.pdsuidomain.entities.PatientHistory.{Action, State} @@ -11,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 @@ -85,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 f616754..b60c2ea 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala @@ -2,11 +2,12 @@ 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._ final case class PatientIssue(id: LongId[PatientIssue], - userId: StringId[User], + userId: xyz.driver.core.Id[User], patientId: UuidId[Patient], lastUpdate: LocalDateTime, isDraft: Boolean, @@ -16,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/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..cb75803 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 @@ -86,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]) @@ -95,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 c73aefe..c66048b 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/TrialHistory.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/TrialHistory.scala @@ -6,12 +6,13 @@ 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 { 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 @@ -85,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 2514f4d..f69e681 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/TrialIssue.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/TrialIssue.scala @@ -2,11 +2,12 @@ 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], - userId: StringId[User], + userId: xyz.driver.core.Id[User], trialId: StringId[Trial], lastUpdate: LocalDateTime, isDraft: Boolean, @@ -18,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 9be26b9..6299ed4 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/UserHistory.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/UserHistory.scala @@ -2,12 +2,13 @@ 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 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, @@ -18,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( @@ -29,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( @@ -40,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( @@ -138,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/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)" } } |