From 5515c834853cbe3ce60460a4819a94805cfe24f7 Mon Sep 17 00:00:00 2001 From: vlad Date: Thu, 2 Nov 2017 17:37:25 -0700 Subject: Unifying user ids --- .../xyz/driver/pdsuicommon/logging/TimeLogger.scala | 5 ++--- .../xyz/driver/pdsuidomain/entities/Document.scala | 11 ++++++----- .../pdsuidomain/entities/DocumentHistory.scala | 4 ++-- .../driver/pdsuidomain/entities/DocumentIssue.scala | 6 +++--- .../driver/pdsuidomain/entities/MedicalRecord.scala | 14 +++++++------- .../pdsuidomain/entities/MedicalRecordHistory.scala | 4 ++-- .../pdsuidomain/entities/MedicalRecordIssue.scala | 6 +++--- .../xyz/driver/pdsuidomain/entities/Message.scala | 4 ++-- .../xyz/driver/pdsuidomain/entities/Patient.scala | 10 +++++----- .../driver/pdsuidomain/entities/PatientHistory.scala | 7 ++++--- .../driver/pdsuidomain/entities/PatientIssue.scala | 4 ++-- .../xyz/driver/pdsuidomain/entities/Trial.scala | 8 ++++---- .../driver/pdsuidomain/entities/TrialHistory.scala | 4 ++-- .../xyz/driver/pdsuidomain/entities/TrialIssue.scala | 4 ++-- .../driver/pdsuidomain/entities/UserHistory.scala | 10 +++++----- .../fakes/entities/recordprocessing.scala | 20 ++++++++++---------- .../fakes/entities/treatmentmatching.scala | 10 +++++----- .../pdsuidomain/fakes/entities/trialcuration.scala | 10 +++++----- .../driver/pdsuidomain/formats/json/document.scala | 2 +- .../pdsuidomain/formats/json/documenthistory.scala | 2 +- .../pdsuidomain/formats/json/documentissue.scala | 7 +++++-- .../driver/pdsuidomain/formats/json/patient.scala | 8 ++++---- .../pdsuidomain/formats/json/patienthistory.scala | 6 +++--- .../pdsuidomain/formats/json/patientissue.scala | 7 +++++-- .../pdsuidomain/formats/json/recordhistory.scala | 2 +- .../pdsuidomain/formats/json/recordissue.scala | 5 +++-- .../xyz/driver/pdsuidomain/formats/json/trial.scala | 8 ++++---- .../pdsuidomain/formats/json/trialhistory.scala | 2 +- .../driver/pdsuidomain/formats/json/trialissue.scala | 3 ++- .../formats/json/DocumentHistoryFormatSuite.scala | 6 +++--- .../formats/json/DocumentIssueFormatSuite.scala | 8 ++++---- .../json/MedicalRecordHistoryFormatSuite.scala | 6 +++--- .../formats/json/MedicalRecordIssueFormatSuite.scala | 8 ++++---- .../formats/json/PatientHistoryFormatSuite.scala | 6 +++--- .../formats/json/PatientIssueFormatSuite.scala | 6 +++--- .../formats/json/TrialHistoryFormatSuite.scala | 2 +- .../formats/json/TrialIssueFormatSuite.scala | 4 ++-- 37 files changed, 124 insertions(+), 115 deletions(-) (limited to 'src') diff --git a/src/main/scala/xyz/driver/pdsuicommon/logging/TimeLogger.scala b/src/main/scala/xyz/driver/pdsuicommon/logging/TimeLogger.scala index 349d925..fbd17eb 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/logging/TimeLogger.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/logging/TimeLogger.scala @@ -3,12 +3,11 @@ package xyz.driver.pdsuicommon.logging import java.time.{LocalDateTime, ZoneId} import xyz.driver.core.auth.User -import xyz.driver.pdsuicommon.domain.StringId object TimeLogger extends PhiLogging { - def logTime(userId: StringId[User], label: String, obj: String): Unit = { + def logTime(userId: xyz.driver.core.Id[User], label: String, obj: String): Unit = { val now = LocalDateTime.now(ZoneId.of("Z")) - logger.info(phi"User id=$userId performed an action at ${Unsafe(label)}=$now with a ${Unsafe(obj)} ") + logger.info(phi"User id=${Unsafe(userId)} performed an action at ${Unsafe(label)}=$now with a ${Unsafe(obj)} ") } } 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)" } diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/recordprocessing.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/recordprocessing.scala index 199be29..5903dc8 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/recordprocessing.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/recordprocessing.scala @@ -108,9 +108,9 @@ object recordprocessing { id = nextLongId[MedicalRecord], status = nextMedicalRecordStatus(), previousStatus = nextOption(generators.oneOf[MedicalRecord.Status](MedicalRecord.Status.AllPrevious)), - assignee = nextOption(nextStringId[User]), - previousAssignee = nextOption(nextStringId[User]), - lastActiveUserId = nextOption(nextStringId[User]), + assignee = nextOption(generators.nextId[User]), + previousAssignee = nextOption(generators.nextId[User]), + lastActiveUserId = nextOption(generators.nextId[User]), patientId = nextUuidId[Patient], requestId = generators.nextId[ClinicalRecord](), disease = generators.nextString(), @@ -123,7 +123,7 @@ object recordprocessing { def nextMedicalRecordHistory(): MedicalRecordHistory = MedicalRecordHistory( id = nextLongId[MedicalRecordHistory], - executor = nextStringId[User], + executor = generators.nextId[User], recordId = nextLongId[MedicalRecord], state = nextMedicalRecordHistoryState(), action = nextMedicalRecordHistoryAction(), @@ -135,7 +135,7 @@ object recordprocessing { MedicalRecordIssue( id = nextLongId[MedicalRecordIssue], - userId = nextStringId[User], + userId = generators.nextId[User], recordId = nextLongId[MedicalRecord], startPage = startPage, endPage = endPage, @@ -171,9 +171,9 @@ object recordprocessing { id = nextLongId[Document], status = nextDocumentStatus(), previousStatus = nextOption(generators.oneOf[Document.Status](Document.Status.AllPrevious)), - assignee = nextOption(nextStringId[User]), - previousAssignee = nextOption(nextStringId[User]), - lastActiveUserId = nextOption(nextStringId[User]), + assignee = nextOption(generators.nextId[User]), + previousAssignee = nextOption(generators.nextId[User]), + lastActiveUserId = nextOption(generators.nextId[User]), recordId = nextLongId[MedicalRecord], physician = nextOption(nextString()), typeId = nextOption(nextLongId[DocumentType]), @@ -193,7 +193,7 @@ object recordprocessing { val (startPage, endPage) = nextStartAndEndPagesOption DocumentIssue( id = nextLongId[DocumentIssue], - userId = nextStringId[User], + userId = generators.nextId[User], documentId = nextLongId[Document], startPage = startPage, endPage = endPage, @@ -206,7 +206,7 @@ object recordprocessing { def nextDocumentHistory(): DocumentHistory = DocumentHistory( id = nextLongId[DocumentHistory], - executor = nextStringId[User], + executor = generators.nextId[User], documentId = nextLongId[Document], state = nextDocumentHistoryState(), action = nextDocumentHistoryAction(), diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala index b35418d..441c1db 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala @@ -47,10 +47,10 @@ object treatmentmatching { status = nextPatientStatus, name = nextFullName[Patient], dob = nextLocalDate, - assignee = generators.nextOption(nextStringId[User]), + assignee = generators.nextOption(generators.nextId[User]), previousStatus = generators.nextOption(generators.oneOf[Patient.Status](Patient.Status.AllPrevious)), - previousAssignee = generators.nextOption(nextStringId[User]), - lastActiveUserId = generators.nextOption(nextStringId[User]), + previousAssignee = generators.nextOption(generators.nextId[User]), + lastActiveUserId = generators.nextOption(generators.nextId[User]), isUpdateRequired = generators.nextBoolean(), disease = nextCancerType, orderId = generators.nextId(), @@ -171,7 +171,7 @@ object treatmentmatching { def nextPatientIssue(): PatientIssue = PatientIssue( id = nextLongId[PatientIssue], - userId = nextStringId[User], + userId = generators.nextId[User], patientId = nextUuidId[Patient], lastUpdate = nextLocalDateTime, isDraft = generators.nextBoolean(), @@ -181,7 +181,7 @@ object treatmentmatching { def nextPatientHistory(): PatientHistory = PatientHistory( id = nextLongId[PatientHistory], - executor = nextStringId[User], + executor = generators.nextId[User], patientId = nextUuidId[Patient], state = nextPatientState, action = nextPatientAction, diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala index 2bbff90..94bc27a 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala @@ -20,10 +20,10 @@ object trialcuration { id = nextStringId[Trial], externalId = nextUuidId[Trial], status = nextTrialStatus, - assignee = Option(nextStringId[User]), + assignee = Option(generators.nextId[User]), previousStatus = Option(nextPreviousTrialStatus), - previousAssignee = Option(nextStringId[User]), - lastActiveUserId = Option(nextStringId[User]), + previousAssignee = Option(generators.nextId[User]), + lastActiveUserId = Option(generators.nextId[User]), lastUpdate = nextLocalDateTime, phase = generators.nextString(), hypothesisId = Option(nextUuidId[Hypothesis]), @@ -107,7 +107,7 @@ object trialcuration { def nextTrialIssue(): TrialIssue = TrialIssue( id = nextLongId[TrialIssue], - userId = nextStringId[User], + userId = generators.nextId[User], trialId = nextStringId[Trial], lastUpdate = nextLocalDateTime, isDraft = generators.nextBoolean(), @@ -119,7 +119,7 @@ object trialcuration { def nextTrialHistory(): TrialHistory = TrialHistory( id = nextLongId[TrialHistory], - executor = nextStringId[User], + executor = generators.nextId[User], trialId = nextStringId[Trial], state = nextTrialState, action = nextTrialAction, 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( diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/DocumentHistoryFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/DocumentHistoryFormatSuite.scala index e4a0733..4dc4d00 100644 --- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/DocumentHistoryFormatSuite.scala +++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/DocumentHistoryFormatSuite.scala @@ -2,9 +2,9 @@ package xyz.driver.pdsuidomain.formats.json import java.time.LocalDateTime -import spray.json._ import org.scalatest.{FlatSpec, Matchers} -import xyz.driver.pdsuicommon.domain.{LongId, StringId} +import spray.json._ +import xyz.driver.pdsuicommon.domain.LongId import xyz.driver.pdsuidomain.entities.DocumentHistory class DocumentHistoryFormatSuite extends FlatSpec with Matchers { @@ -14,7 +14,7 @@ class DocumentHistoryFormatSuite extends FlatSpec with Matchers { val documentHistory = DocumentHistory( id = LongId(10), documentId = LongId(1), - executor = StringId("userId-001"), + executor = xyz.driver.core.Id("userId-001"), state = DocumentHistory.State.Extract, action = DocumentHistory.Action.Start, created = LocalDateTime.parse("2017-08-10T18:00:00") diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/DocumentIssueFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/DocumentIssueFormatSuite.scala index 7f34725..2ddd5e7 100644 --- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/DocumentIssueFormatSuite.scala +++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/DocumentIssueFormatSuite.scala @@ -2,9 +2,9 @@ package xyz.driver.pdsuidomain.formats.json import java.time.LocalDateTime -import spray.json._ import org.scalatest.{FlatSpec, Matchers} -import xyz.driver.pdsuicommon.domain.{LongId, StringId} +import spray.json._ +import xyz.driver.pdsuicommon.domain.LongId import xyz.driver.pdsuidomain.entities.DocumentIssue class DocumentIssueFormatSuite extends FlatSpec with Matchers { @@ -14,7 +14,7 @@ class DocumentIssueFormatSuite extends FlatSpec with Matchers { val documentIssue = DocumentIssue( id = LongId(10), documentId = LongId(1), - userId = StringId("userId-001"), + userId = xyz.driver.core.Id("userId-001"), lastUpdate = LocalDateTime.parse("2017-08-10T18:00:00"), isDraft = false, text = "message text", @@ -31,7 +31,7 @@ class DocumentIssueFormatSuite extends FlatSpec with Matchers { val createDocumentIssueJson = """{"text":"message text","startPage":1.0,"endPage":2.0}""".parseJson val expectedCreatedDocumentIssue = documentIssue.copy(id = LongId(0), lastUpdate = LocalDateTime.MIN, isDraft = true) - val parsedCreateDocumentIssue = jsValueToDocumentIssue(createDocumentIssueJson, LongId(1), StringId("userId-001")) + val parsedCreateDocumentIssue = jsValueToDocumentIssue(createDocumentIssueJson, LongId(1), xyz.driver.core.Id("userId-001")) parsedCreateDocumentIssue should be(expectedCreatedDocumentIssue) val updateDocumentIssueJson = diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordHistoryFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordHistoryFormatSuite.scala index ca4058e..88240cd 100644 --- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordHistoryFormatSuite.scala +++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordHistoryFormatSuite.scala @@ -2,9 +2,9 @@ package xyz.driver.pdsuidomain.formats.json import java.time.LocalDateTime -import spray.json._ import org.scalatest.{FlatSpec, Matchers} -import xyz.driver.pdsuicommon.domain.{LongId, StringId} +import spray.json._ +import xyz.driver.pdsuicommon.domain.LongId import xyz.driver.pdsuidomain.entities.MedicalRecordHistory class MedicalRecordHistoryFormatSuite extends FlatSpec with Matchers { @@ -14,7 +14,7 @@ class MedicalRecordHistoryFormatSuite extends FlatSpec with Matchers { val recordHistory = MedicalRecordHistory( id = LongId(10), recordId = LongId(1), - executor = StringId("userId-001"), + executor = xyz.driver.core.Id("userId-001"), state = MedicalRecordHistory.State.Clean, action = MedicalRecordHistory.Action.Start, created = LocalDateTime.parse("2017-08-10T18:00:00") diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordIssueFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordIssueFormatSuite.scala index c7c82a4..b93e2bd 100644 --- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordIssueFormatSuite.scala +++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordIssueFormatSuite.scala @@ -2,9 +2,9 @@ package xyz.driver.pdsuidomain.formats.json import java.time.LocalDateTime -import spray.json._ import org.scalatest.{FlatSpec, Matchers} -import xyz.driver.pdsuicommon.domain.{LongId, StringId} +import spray.json._ +import xyz.driver.pdsuicommon.domain.LongId import xyz.driver.pdsuidomain.entities.MedicalRecordIssue class MedicalRecordIssueFormatSuite extends FlatSpec with Matchers { @@ -14,7 +14,7 @@ class MedicalRecordIssueFormatSuite extends FlatSpec with Matchers { val recordIssue = MedicalRecordIssue( id = LongId(10), recordId = LongId(1), - userId = StringId("userId-001"), + userId = xyz.driver.core.Id("userId-001"), lastUpdate = LocalDateTime.parse("2017-08-10T18:00:00"), isDraft = false, text = "message text", @@ -30,7 +30,7 @@ class MedicalRecordIssueFormatSuite extends FlatSpec with Matchers { val createRecordIssueJson = """{"text":"message text","startPage":1.0,"endPage":2.0}""".parseJson val expectedCreatedRecordIssue = recordIssue.copy(id = LongId(0), lastUpdate = LocalDateTime.MIN, isDraft = true) - val parsedCreateRecordIssue = jsValueToRecordIssue(createRecordIssueJson, LongId(1), StringId("userId-001")) + val parsedCreateRecordIssue = jsValueToRecordIssue(createRecordIssueJson, LongId(1), xyz.driver.core.Id("userId-001")) parsedCreateRecordIssue should be(expectedCreatedRecordIssue) val updateRecordIssueJson = diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientHistoryFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientHistoryFormatSuite.scala index e46cf50..74f6f70 100644 --- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientHistoryFormatSuite.scala +++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientHistoryFormatSuite.scala @@ -2,9 +2,9 @@ package xyz.driver.pdsuidomain.formats.json import java.time.LocalDateTime -import spray.json._ import org.scalatest.{FlatSpec, Matchers} -import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId} +import spray.json._ +import xyz.driver.pdsuicommon.domain.{LongId, UuidId} import xyz.driver.pdsuidomain.entities.PatientHistory class PatientHistoryFormatSuite extends FlatSpec with Matchers { @@ -14,7 +14,7 @@ class PatientHistoryFormatSuite extends FlatSpec with Matchers { val patientHistory = PatientHistory( id = LongId(10), patientId = UuidId("40892a07-c638-49d2-9795-1edfefbbcc7c"), - executor = StringId("userId-001"), + executor = xyz.driver.core.Id("userId-001"), state = PatientHistory.State.Verify, action = PatientHistory.Action.Start, created = LocalDateTime.parse("2017-08-10T18:00:00") diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientIssueFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientIssueFormatSuite.scala index 0d56918..ee76094 100644 --- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientIssueFormatSuite.scala +++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientIssueFormatSuite.scala @@ -4,7 +4,7 @@ import java.time.LocalDateTime import spray.json._ import org.scalatest.{FlatSpec, Matchers} -import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId} +import xyz.driver.pdsuicommon.domain.{LongId, UuidId} import xyz.driver.pdsuidomain.entities.PatientIssue class PatientIssueFormatSuite extends FlatSpec with Matchers { @@ -14,7 +14,7 @@ class PatientIssueFormatSuite extends FlatSpec with Matchers { val patientIssue = PatientIssue( id = LongId(10), patientId = UuidId("40892a07-c638-49d2-9795-1edfefbbcc7c"), - userId = StringId("userId-001"), + userId = xyz.driver.core.Id("userId-001"), lastUpdate = LocalDateTime.parse("2017-08-10T18:00:00"), isDraft = false, text = "message text", @@ -29,7 +29,7 @@ class PatientIssueFormatSuite extends FlatSpec with Matchers { val expectedCreatedPatientIssue = patientIssue.copy(id = LongId(0), lastUpdate = LocalDateTime.MIN, isDraft = true) val parsedCreatePatientIssue = jsValueToPatientIssue(createPatientIssueJson, UuidId("40892a07-c638-49d2-9795-1edfefbbcc7c"), - StringId("userId-001")) + xyz.driver.core.Id("userId-001")) parsedCreatePatientIssue should be(expectedCreatedPatientIssue) val updatePatientIssueJson = diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/TrialHistoryFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/TrialHistoryFormatSuite.scala index aa0b404..c17327b 100644 --- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/TrialHistoryFormatSuite.scala +++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/TrialHistoryFormatSuite.scala @@ -14,7 +14,7 @@ class TrialHistoryFormatSuite extends FlatSpec with Matchers { val trialHistory = TrialHistory( id = LongId(10), trialId = StringId("NCT000001"), - executor = StringId("userId-001"), + executor = xyz.driver.core.Id("userId-001"), state = TrialHistory.State.Summarize, action = TrialHistory.Action.Start, created = LocalDateTime.parse("2017-08-10T18:00:00") diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/TrialIssueFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/TrialIssueFormatSuite.scala index 5c6aa8d..a3b5931 100644 --- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/TrialIssueFormatSuite.scala +++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/TrialIssueFormatSuite.scala @@ -14,7 +14,7 @@ class TrialIssueFormatSuite extends FlatSpec with Matchers { val trialIssue = TrialIssue( id = LongId(10), trialId = StringId("NCT000001"), - userId = StringId("userId-001"), + userId = xyz.driver.core.Id("userId-001"), lastUpdate = LocalDateTime.parse("2017-08-10T18:00:00"), isDraft = false, text = "message text", @@ -30,7 +30,7 @@ class TrialIssueFormatSuite extends FlatSpec with Matchers { val createTrialIssueJson = """{"text":"message text","evidence":"evidence","meta":"{}"}""".parseJson val expectedCreatedTrialIssue = trialIssue.copy(id = LongId(0), lastUpdate = LocalDateTime.MIN, isDraft = true) val parsedCreateTrialIssue = - jsValueToTrialIssue(createTrialIssueJson, StringId("NCT000001"), StringId("userId-001")) + jsValueToTrialIssue(createTrialIssueJson, StringId("NCT000001"), xyz.driver.core.Id("userId-001")) parsedCreateTrialIssue should be(expectedCreatedTrialIssue) val updateTrialIssueJson = -- cgit v1.2.3