1 files changed, 46 insertions, 6 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiPartialIntervention.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiPartialIntervention.scala
index aa55506..e7f69a9 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiPartialIntervention.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiPartialIntervention.scala
@@ -1,18 +1,26 @@
 package xyz.driver.pdsuidomain.formats.json.intervention
 
-import xyz.driver.pdsuicommon.domain.LongId
-import xyz.driver.pdsuidomain.entities.{InterventionArm, InterventionWithArms}
+import play.api.data.validation.Invalid
+import xyz.driver.pdsuicommon.domain.{LongId, StringId}
+import xyz.driver.pdsuidomain.entities.{Intervention, InterventionArm, InterventionWithArms, Trial}
 import play.api.libs.functional.syntax._
 import play.api.libs.json._
+import xyz.driver.pdsuicommon.json.JsonValidationException
+import xyz.driver.pdsuicommon.validation.{AdditionalConstraints, JsonValidationErrors}
 
-final case class ApiPartialIntervention(typeId: Option[Long],
+import scala.collection.breakOut
+import scala.util.Try
+
+final case class ApiPartialIntervention(name: Option[String],
+                                        trialId: Option[String],
+                                        typeId: Option[Long],
                                         dosage: Option[String],
                                         isActive: Option[Boolean],
                                         arms: Option[List[Long]]) {
 
   def applyTo(orig: InterventionWithArms): InterventionWithArms = {
     val origIntervention = orig.intervention
-    val draftArmList     = arms.map(_.map(x => InterventionArm(LongId(x), orig.intervention.id)))
+    val draftArmList     = arms.map(_.map(x => InterventionArm(armId = LongId(x), interventionId = orig.intervention.id)))
     orig.copy(
       intervention = origIntervention.copy(
         typeId = typeId.map(LongId(_)).orElse(origIntervention.typeId),
@@ -22,19 +30,51 @@ final case class ApiPartialIntervention(typeId: Option[Long],
       arms = draftArmList.getOrElse(orig.arms)
     )
   }
+
+  def toDomain: Try[InterventionWithArms] = Try {
+    val validation = Map(JsPath \ "trialId" -> AdditionalConstraints.optionNonEmptyConstraint(trialId))
+
+    val validationErrors: JsonValidationErrors = validation.collect({
+      case (fieldName, e: Invalid) => (fieldName, e.errors)
+    })(breakOut)
+
+    if (validationErrors.isEmpty) {
+      InterventionWithArms(
+        intervention = Intervention(
+          id = LongId(0),
+          trialId = trialId.map(StringId[Trial]).get,
+          name = name.getOrElse(""),
+          originalName = name.getOrElse(""),
+          typeId = typeId.map(LongId(_)),
+          originalType = Option(""),
+          dosage = dosage.getOrElse(""),
+          originalDosage = dosage.getOrElse(""),
+          isActive = isActive.getOrElse(false)
+        ),
+        arms =
+          arms.map(_.map(x => InterventionArm(armId = LongId(x), interventionId = LongId(0)))).getOrElse(List.empty)
+      )
+    } else {
+      throw new JsonValidationException(validationErrors)
+    }
+  }
 }
 
 object ApiPartialIntervention {
 
   private val reads: Reads[ApiPartialIntervention] = (
-    (JsPath \ "typeId").readNullable[Long] and
+    (JsPath \ "name").readNullable[String] and
+      (JsPath \ "trialId").readNullable[String] and
+      (JsPath \ "typeId").readNullable[Long] and
       (JsPath \ "dosage").readNullable[String] and
       (JsPath \ "isActive").readNullable[Boolean] and
       (JsPath \ "arms").readNullable[List[Long]]
   )(ApiPartialIntervention.apply _)
 
   private val writes: Writes[ApiPartialIntervention] = (
-    (JsPath \ "typeId").writeNullable[Long] and
+    (JsPath \ "name").writeNullable[String] and
+      (JsPath \ "trialId").writeNullable[String] and
+      (JsPath \ "typeId").writeNullable[Long] and
       (JsPath \ "dosage").writeNullable[String] and
       (JsPath \ "isActive").writeNullable[Boolean] and
       (JsPath \ "arms").writeNullable[List[Long]]