All PDS UI domain models, API case classes, service traits and necessary utils moved to pdsui-commonv0.1.11

3 files changed, 137 insertions, 0 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiCriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiCriterion.scala
new file mode 100644
index 0000000..0f3b76e
--- /dev/null
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiCriterion.scala
@@ -0,0 +1,40 @@
+package xyz.driver.pdsuidomain.formats.json.criterion
+
+import xyz.driver.pdsuicommon.json.Serialization.seqJsonFormat
+import play.api.libs.functional.syntax._
+import play.api.libs.json._
+import xyz.driver.pdsuidomain.formats.json.label.ApiCriterionLabel
+import xyz.driver.pdsuidomain.services.CriterionService.RichCriterion
+
+final case class ApiCriterion(id: Long,
+                              meta: Option[String],
+                              arms: Seq[Long],
+                              text: Option[String],
+                              isCompound: Boolean,
+                              labels: Seq[ApiCriterionLabel],
+                              trialId: String)
+
+object ApiCriterion {
+
+  implicit val format: Format[ApiCriterion] = (
+    (JsPath \ "id").format[Long] and
+      (JsPath \ "meta").formatNullable(Format(Reads { x =>
+        JsSuccess(Json.stringify(x))
+      }, Writes[String](Json.parse))) and
+      (JsPath \ "arms").format(seqJsonFormat[Long]) and
+      (JsPath \ "text").formatNullable[String] and
+      (JsPath \ "isCompound").format[Boolean] and
+      (JsPath \ "labels").format(seqJsonFormat[ApiCriterionLabel]) and
+      (JsPath \ "trialId").format[String]
+    ) (ApiCriterion.apply, unlift(ApiCriterion.unapply))
+
+  def fromDomain(richCriterion: RichCriterion) = ApiCriterion(
+    id = richCriterion.criterion.id.id,
+    meta = Option(richCriterion.criterion.meta),
+    arms = richCriterion.armIds.map(_.id),
+    text = richCriterion.criterion.text,
+    isCompound = richCriterion.criterion.isCompound,
+    labels = richCriterion.labels.map(ApiCriterionLabel.fromDomain),
+    trialId = richCriterion.criterion.trialId.id
+  )
+}
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiNewCriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiNewCriterion.scala
new file mode 100644
index 0000000..85c91d5
--- /dev/null
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiNewCriterion.scala
@@ -0,0 +1,41 @@
+package xyz.driver.pdsuidomain.formats.json.criterion
+
+import xyz.driver.pdsuicommon.domain.{LongId, StringId}
+import xyz.driver.pdsuicommon.json.Serialization.seqJsonFormat
+import xyz.driver.pdsuidomain.entities._
+import play.api.libs.functional.syntax._
+import play.api.libs.json._
+import xyz.driver.pdsuidomain.formats.json.label.ApiCriterionLabel
+import xyz.driver.pdsuidomain.services.CriterionService.RichCriterion
+
+final case class ApiNewCriterion(meta: Option[String],
+                                 arms: Option[Seq[Long]],
+                                 text: Option[String],
+                                 labels: Seq[ApiCriterionLabel],
+                                 trialId: String) {
+
+  def toDomain = RichCriterion(
+    criterion = Criterion(
+      id = LongId(0L),
+      meta = meta.getOrElse(""),
+      trialId = StringId(trialId),
+      isCompound = false,
+      text = text
+    ),
+    armIds = arms.getOrElse(Seq.empty).map(LongId[Arm]),
+    labels = labels.map(_.toDomain(LongId(Long.MaxValue))) // A developer should specify right criterionId himself
+  )
+}
+
+object ApiNewCriterion {
+
+  implicit val format: Format[ApiNewCriterion] = (
+    (JsPath \ "meta").formatNullable(Format(Reads { x =>
+      JsSuccess(Json.stringify(x))
+    }, Writes[String](Json.parse))) and
+      (JsPath \ "arms").formatNullable(seqJsonFormat[Long]) and
+      (JsPath \ "text").formatNullable[String] and
+      (JsPath \ "labels").format(seqJsonFormat[ApiCriterionLabel]) and
+      (JsPath \ "trialId").format[String]
+    ) (ApiNewCriterion.apply, unlift(ApiNewCriterion.unapply))
+}
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiUpdateCriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiUpdateCriterion.scala
new file mode 100644
index 0000000..c73c3ef
--- /dev/null
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiUpdateCriterion.scala
@@ -0,0 +1,56 @@
+package xyz.driver.pdsuidomain.formats.json.criterion
+
+import xyz.driver.pdsuicommon.domain.LongId
+import xyz.driver.pdsuicommon.json.Serialization.seqJsonFormat
+import xyz.driver.pdsuidomain.entities.{Arm, Criterion}
+import org.davidbild.tristate._
+import org.davidbild.tristate.contrib.play.ToJsPathOpsFromJsPath
+import play.api.libs.functional.syntax._
+import play.api.libs.json._
+import xyz.driver.pdsuidomain.formats.json.label.ApiCriterionLabel
+import xyz.driver.pdsuidomain.services.CriterionService.RichCriterion
+
+final case class ApiUpdateCriterion(meta: Tristate[String],
+                                    arms: Tristate[Seq[Long]],
+                                    text: Option[String],
+                                    isCompound: Option[Boolean],
+                                    labels: Tristate[Seq[ApiCriterionLabel]]) {
+
+  def applyTo(orig: RichCriterion): RichCriterion = RichCriterion(
+    criterion = applyTo(orig.criterion),
+    armIds = arms.cata(_.map(LongId[Arm]), Seq.empty, orig.armIds),
+    labels = labels.cata(_.map(_.toDomain(orig.criterion.id)), Seq.empty, orig.labels)
+  )
+
+  private def applyTo(orig: Criterion): Criterion = Criterion(
+    id = orig.id,
+    meta = meta.cata(identity, "{}", orig.meta),
+    text = text.orElse(orig.text),
+    isCompound = isCompound.getOrElse(orig.isCompound),
+    trialId = orig.trialId
+  )
+}
+
+object ApiUpdateCriterion {
+
+  private val reads: Reads[ApiUpdateCriterion] = (
+    (JsPath \ "meta").readTristate(Reads { x => JsSuccess(Json.stringify(x)) }).map {
+      case Tristate.Present("{}") => Tristate.Absent
+      case x => x
+    } and
+      (JsPath \ "arms").readTristate(seqJsonFormat[Long]) and
+      (JsPath \ "text").readNullable[String] and
+      (JsPath \ "isCompound").readNullable[Boolean] and
+      (JsPath \ "labels").readTristate(seqJsonFormat[ApiCriterionLabel])
+    ) (ApiUpdateCriterion.apply _)
+
+  private val writes: Writes[ApiUpdateCriterion] = (
+    (JsPath \ "meta").writeTristate(Writes[String](Json.parse)) and
+      (JsPath \ "arms").writeTristate(seqJsonFormat[Long]) and
+      (JsPath \ "text").writeNullable[String] and
+      (JsPath \ "isCompound").writeNullable[Boolean] and
+      (JsPath \ "labels").writeTristate(seqJsonFormat[ApiCriterionLabel])
+    ) (unlift(ApiUpdateCriterion.unapply))
+
+  implicit val format: Format[ApiUpdateCriterion] = Format(reads, writes)
+}