From 56187bec9276f51886a01a2752c663f2227d9fc3 Mon Sep 17 00:00:00 2001 From: vlad Date: Fri, 30 Jun 2017 23:06:43 -0700 Subject: Export entities JSON formats --- .../pdsuidomain/entities/export/patient/ExportPatientLabel.scala | 4 +--- .../entities/export/patient/ExportPatientWithLabels.scala | 7 ++++--- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'src/main/scala/xyz/driver/pdsuidomain/entities/export/patient') diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientLabel.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientLabel.scala index 5474413..5135c21 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientLabel.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientLabel.scala @@ -4,9 +4,7 @@ import xyz.driver.pdsuicommon.domain.LongId import xyz.driver.pdsuicommon.logging._ import xyz.driver.pdsuidomain.entities.{Label, RawPatientLabel} -final case class ExportPatientLabel(id: LongId[Label], - name: String, - evidences: List[ExportPatientLabelEvidence]) +final case class ExportPatientLabel(id: LongId[Label], name: String, evidences: List[ExportPatientLabelEvidence]) object ExportPatientLabel extends PhiLogging { diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientWithLabels.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientWithLabels.scala index e6262ed..bd6173b 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientWithLabels.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/export/patient/ExportPatientWithLabels.scala @@ -6,7 +6,9 @@ import xyz.driver.pdsuidomain.entities.{Patient, RawPatientLabel} import scala.collection.breakOut -final case class ExportPatientWithLabels(patientId: UuidId[Patient], labelVersion: Long, labels: List[ExportPatientLabel]) +final case class ExportPatientWithLabels(patientId: UuidId[Patient], + labelVersion: Long, + labels: List[ExportPatientLabel]) object ExportPatientWithLabels { @@ -15,8 +17,7 @@ object ExportPatientWithLabels { phi"ExportPatientWithLabels(patientId=$patientId, version=${Unsafe(labelVersion)}, labels=$labels)" } - def fromRaw(patientId: UuidId[Patient], - rawPatientRefs: List[RawPatientLabel]) = ExportPatientWithLabels( + def fromRaw(patientId: UuidId[Patient], rawPatientRefs: List[RawPatientLabel]) = ExportPatientWithLabels( patientId = patientId, labelVersion = 1L, // TODO It is needed to replace this mock label version. labels = rawPatientRefs -- cgit v1.2.3