diff options
author | vlad <vlad@driver.xyz> | 2017-11-02 16:22:11 -0700 |
---|---|---|
committer | vlad <vlad@driver.xyz> | 2017-11-02 16:22:11 -0700 |
commit | b331892f87846945f69a28e9f3ee786cd4b93577 (patch) | |
tree | cd1489df3a8c85f3791ba25b281c1817e286ec8d /src/main/scala/xyz/driver/pdsuidomain/formats/json | |
parent | 4583af5213b9f7b1e8a06f58321813556763f2d1 (diff) | |
download | rest-query-b331892f87846945f69a28e9f3ee786cd4b93577.tar.gz rest-query-b331892f87846945f69a28e9f3ee786cd4b93577.tar.bz2 rest-query-b331892f87846945f69a28e9f3ee786cd4b93577.zip |
Using common request contexts and user objects
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json')
8 files changed, 23 insertions, 38 deletions
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 082fa83..b3bc95f 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/documentissue.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/documentissue.scala @@ -3,7 +3,8 @@ package xyz.driver.pdsuidomain.formats.json import java.time.LocalDateTime import spray.json._ -import xyz.driver.pdsuicommon.domain.{LongId, StringId, User} +import xyz.driver.core.auth.User +import xyz.driver.pdsuicommon.domain.{LongId, StringId} import xyz.driver.pdsuidomain.entities._ object documentissue { diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/export.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/export.scala index d70ce6f..8fb7d03 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/export.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/export.scala @@ -1,6 +1,7 @@ package xyz.driver.pdsuidomain.formats.json import spray.json._ +import xyz.driver.core.json.idFormat import xyz.driver.entities.labels.Label import xyz.driver.formats.json.labels._ import xyz.driver.pdsuicommon.domain.LongId 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 0830723..43062b6 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient.scala @@ -3,12 +3,14 @@ package xyz.driver.pdsuidomain.formats.json import java.time.{LocalDate, LocalDateTime} import spray.json._ -import xyz.driver.core.json.EnumJsonFormat +import xyz.driver.core.auth.User +import xyz.driver.core.json._ +import xyz.driver.entities.clinic.TestOrder 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, User, UuidId} +import xyz.driver.pdsuicommon.domain.{StringId, UuidId} import xyz.driver.pdsuidomain.entities._ object patient { @@ -25,14 +27,6 @@ object patient { "Flagged" -> Status.Flagged ) - implicit val patientOrderIdFormat: RootJsonFormat[PatientOrderId] = new RootJsonFormat[PatientOrderId] { - override def write(orderId: PatientOrderId): JsString = JsString(orderId.toString) - override def read(json: JsValue): PatientOrderId = json match { - case JsString(value) => PatientOrderId(value) - case _ => deserializationError(s"Expected string as PatientOrderId, but got $json") - } - } - implicit val patientFormat: RootJsonFormat[Patient] = new RootJsonFormat[Patient] { override def write(patient: Patient): JsValue = JsObject( @@ -95,7 +89,7 @@ object patient { val orderId = fields .get("orderId") - .map(_.convertTo[PatientOrderId]) + .map(_.convertTo[xyz.driver.core.Id[TestOrder]]) .getOrElse(deserializationError(s"Patient create json object does not contain `orderId` field: $json")) val lastUpdate = fields 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 9345581..e880917 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue.scala @@ -3,7 +3,8 @@ package xyz.driver.pdsuidomain.formats.json import java.time.LocalDateTime import spray.json._ -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.pdsuidomain.entities._ object patientissue { diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/record.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/record.scala index b6ed103..083796b 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/record.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/record.scala @@ -1,10 +1,11 @@ package xyz.driver.pdsuidomain.formats.json import java.time.LocalDateTime -import java.util.UUID import spray.json._ -import xyz.driver.core.json.{EnumJsonFormat, GadtJsonFormat} +import xyz.driver.core.Id +import xyz.driver.core.json._ +import xyz.driver.entities.clinic.ClinicalRecord import xyz.driver.pdsuicommon.domain.{LongId, TextJson, UuidId} import xyz.driver.pdsuidomain.entities.MedicalRecord.Meta._ import xyz.driver.pdsuidomain.entities._ @@ -14,7 +15,7 @@ object record { import MedicalRecord._ import common._ - implicit val recordStatusFormat = new EnumJsonFormat[Status]( + implicit val recordStatusFormat: EnumJsonFormat[Status] = new EnumJsonFormat[Status]( "PreCleaning" -> Status.PreCleaning, "Unprocessed" -> Status.Unprocessed, "PreOrganized" -> Status.PreOrganized, @@ -29,14 +30,6 @@ object record { "Archived" -> Status.Archived ) - implicit val requestIdFormat = new RootJsonFormat[RecordRequestId] { - override def write(requestId: RecordRequestId): JsString = JsString(requestId.toString) - override def read(json: JsValue): RecordRequestId = json match { - case JsString(value) => RecordRequestId(UUID.fromString(value)) - case _ => deserializationError(s"Expected string as RecordRequestId, but got $json") - } - } - implicit val providerTypeFormat: RootJsonFormat[ProviderType] = new RootJsonFormat[ProviderType] { override def read(json: JsValue): ProviderType = json match { case JsObject(fields) => @@ -56,14 +49,6 @@ object record { JsObject("id" -> obj.id.toJson, "name" -> obj.name.toJson) } - implicit val caseIdFormat = new RootJsonFormat[CaseId] { - override def write(caseId: CaseId): JsString = JsString(caseId.toString) - override def read(json: JsValue): CaseId = json match { - case JsString(value) => CaseId(value) - case _ => deserializationError(s"Expected string as CaseId, but got $json") - } - } - implicit val duplicateMetaFormat: RootJsonFormat[Duplicate] = new RootJsonFormat[Duplicate] { override def write(obj: Duplicate) = JsObject( @@ -149,7 +134,7 @@ object record { } } - implicit val recordMetaFormat = new RootJsonFormat[TextJson[List[Meta]]] { + implicit val recordMetaFormat: RootJsonFormat[TextJson[List[Meta]]] = new RootJsonFormat[TextJson[List[Meta]]] { override def write(obj: TextJson[List[Meta]]): JsArray = JsArray(obj.content.map(_.toJson).toVector) override def read(json: JsValue): TextJson[List[Meta]] = json match { case JsArray(values) => TextJson[List[Meta]](values.map(_.convertTo[Meta]).toList) @@ -191,7 +176,7 @@ object record { val requestId = fields .get("requestId") - .map(_.convertTo[RecordRequestId]) + .map(_.convertTo[Id[ClinicalRecord]]) .getOrElse(deserializationError(s"MedicalRecord json object does not contain `requestId` field: $json")) MedicalRecord( 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 29b12f6..4745862 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/recordissue.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/recordissue.scala @@ -3,7 +3,8 @@ package xyz.driver.pdsuidomain.formats.json import java.time.LocalDateTime import spray.json._ -import xyz.driver.pdsuicommon.domain.{LongId, StringId, User} +import xyz.driver.core.auth.User +import xyz.driver.pdsuicommon.domain.{LongId, StringId} import xyz.driver.pdsuidomain.entities._ object recordissue { @@ -63,6 +64,6 @@ object recordissue { case _ => deserializationError(s"Expected Json Object as MedicalRecordIssue, but got $json") } - implicit val recordIssueFormat = jsonFormat9(MedicalRecordIssue.apply) + implicit val recordIssueFormat: RootJsonFormat[MedicalRecordIssue] = jsonFormat9(MedicalRecordIssue.apply) } 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 dc9c5e0..f22401b 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial.scala @@ -3,8 +3,9 @@ package xyz.driver.pdsuidomain.formats.json import java.time.{LocalDateTime, ZoneId, ZonedDateTime} import spray.json._ +import xyz.driver.core.auth.User import xyz.driver.core.json.EnumJsonFormat -import xyz.driver.pdsuicommon.domain.{LongId, StringId, User, UuidId} +import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId} import xyz.driver.pdsuidomain.entities._ object trial { 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 b2a3023..c22fff3 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue.scala @@ -3,7 +3,8 @@ package xyz.driver.pdsuidomain.formats.json import java.time.LocalDateTime import spray.json._ -import xyz.driver.pdsuicommon.domain.{LongId, StringId, User} +import xyz.driver.core.auth.User +import xyz.driver.pdsuicommon.domain.{LongId, StringId} import xyz.driver.pdsuidomain.entities._ object trialissue { |