Export entities JSON formatsv0.1.13

3 files changed, 20 insertions, 16 deletions

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
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialWithLabels.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialWithLabels.scala
index 1655a88..60b74ff 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialWithLabels.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialWithLabels.scala
@@ -36,16 +36,21 @@ object ExportTrialWithLabels {
       condition = trial.condition,
       lastReviewed = trial.lastReviewed,
       labelVersion = 1, // TODO It is needed to replace this mock label version.
-      arms = rawData.groupBy(_.armId).map { case (armId, rawTrials) =>
-        ExportTrialArm(armId, rawTrials.head.armName)
-      }(breakOut),
-      criteria = rawData.groupBy { x =>
-        (x.criterionId, x.labelId)
-      }.map {
-        case (_, rawTrialLabels) =>
-          val armIds = rawTrialLabels.map(_.criterionArmId).toSet
-          ExportTrialLabelCriterion.fromRaw(rawTrialLabels.head, armIds)
-      }(breakOut)
+      arms = rawData
+        .groupBy(_.armId)
+        .map {
+          case (armId, rawTrials) =>
+            ExportTrialArm(armId, rawTrials.head.armName)
+        }(breakOut),
+      criteria = rawData
+        .groupBy { x =>
+          (x.criterionId, x.labelId)
+        }
+        .map {
+          case (_, rawTrialLabels) =>
+            val armIds = rawTrialLabels.map(_.criterionArmId).toSet
+            ExportTrialLabelCriterion.fromRaw(rawTrialLabels.head, armIds)
+        }(breakOut)
     )
   }