Merge branch 'master' into add-slot-eligibility-arms

5 files changed, 54 insertions, 12 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiIntervention.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiIntervention.scala
index f306a71..072ed25 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiIntervention.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiIntervention.scala
@@ -12,6 +12,7 @@ final case class ApiIntervention(id: Long,
                                  isActive: Boolean,
                                  arms: List[Long],
                                  trialId: String,
+                                 deliveryMethod: Option[String],
                                  originalName: String,
                                  originalDosage: String,
                                  originalType: Option[String]) {
@@ -26,7 +27,8 @@ final case class ApiIntervention(id: Long,
       originalType = this.originalType.map(id => id.toString),
       dosage = this.dosage,
       originalDosage = this.originalDosage,
-      isActive = this.isActive
+      isActive = this.isActive,
+      deliveryMethod = this.deliveryMethod
     )
 
     InterventionWithArms(intervention, this.arms.map { armId =>
@@ -47,6 +49,7 @@ object ApiIntervention {
       (JsPath \ "isActive").format[Boolean] and
       (JsPath \ "arms").format[List[Long]] and
       (JsPath \ "trialId").format[String] and
+      (JsPath \ "deliveryMethod").formatNullable[String] and
       (JsPath \ "originalName").format[String] and
       (JsPath \ "originalDosage").format[String] and
       (JsPath \ "originalType").formatNullable[String]
@@ -64,6 +67,7 @@ object ApiIntervention {
       isActive = intervention.isActive,
       arms = arms.map(_.armId.id),
       trialId = intervention.trialId.id,
+      deliveryMethod = intervention.deliveryMethod,
       originalName = intervention.originalName,
       originalDosage = intervention.originalDosage,
       originalType = intervention.originalType
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiInterventionType.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiInterventionType.scala
index ebef225..3db8bfa 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiInterventionType.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiInterventionType.scala
@@ -2,23 +2,25 @@ package xyz.driver.pdsuidomain.formats.json.intervention
 
 import play.api.libs.functional.syntax._
 import play.api.libs.json.{Format, JsPath}
-import xyz.driver.pdsuicommon.domain.LongId
 import xyz.driver.pdsuidomain.entities.InterventionType
+import xyz.driver.pdsuidomain.entities.InterventionType.DeliveryMethod
 
-final case class ApiInterventionType(id: Long, name: String) {
+final case class ApiInterventionType(id: Long, name: String, deliveryMethods: List[String]) {
 
-  def toDomain = InterventionType(id = LongId[InterventionType](id), name = name)
+  def toDomain = InterventionType.typeFromString(name)
 }
 
 object ApiInterventionType {
 
   implicit val format: Format[ApiInterventionType] = (
     (JsPath \ "id").format[Long] and
-      (JsPath \ "name").format[String]
+      (JsPath \ "name").format[String] and
+      (JsPath \ "deliveryMethods").format[List[String]]
   )(ApiInterventionType.apply, unlift(ApiInterventionType.unapply))
 
   def fromDomain(interventionType: InterventionType) = ApiInterventionType(
     id = interventionType.id.id,
-    name = interventionType.name
+    name = interventionType.name,
+    deliveryMethods = interventionType.deliveryMethods.map(DeliveryMethod.methodToString).toList
   )
 }
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 74f16e1..28a8555 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
@@ -16,6 +16,7 @@ final case class ApiPartialIntervention(name: Option[String],
                                         typeId: Option[Long],
                                         dosage: Option[String],
                                         isActive: Option[Boolean],
+                                        deliveryMethod: Option[String],
                                         arms: Option[List[Long]]) {
 
   def applyTo(orig: InterventionWithArms): InterventionWithArms = {
@@ -26,7 +27,8 @@ final case class ApiPartialIntervention(name: Option[String],
         name = name.getOrElse(origIntervention.name),
         typeId = typeId.map(LongId(_)).orElse(origIntervention.typeId),
         dosage = dosage.getOrElse(origIntervention.dosage),
-        isActive = isActive.getOrElse(origIntervention.isActive)
+        isActive = isActive.getOrElse(origIntervention.isActive),
+        deliveryMethod = deliveryMethod.orElse(origIntervention.deliveryMethod)
       ),
       arms = draftArmList.getOrElse(orig.arms)
     )
@@ -50,7 +52,8 @@ final case class ApiPartialIntervention(name: Option[String],
           originalType = Option(""),
           dosage = dosage.getOrElse(""),
           originalDosage = dosage.getOrElse(""),
-          isActive = isActive.getOrElse(false)
+          isActive = isActive.getOrElse(false),
+          deliveryMethod = deliveryMethod
         ),
         arms =
           arms.map(_.map(x => InterventionArm(armId = LongId(x), interventionId = LongId(0)))).getOrElse(List.empty)
@@ -69,6 +72,7 @@ object ApiPartialIntervention {
       (JsPath \ "typeId").readNullable[Long] and
       (JsPath \ "dosage").readNullable[String] and
       (JsPath \ "isActive").readNullable[Boolean] and
+      (JsPath \ "deliveryMethod").readNullable[String] and
       (JsPath \ "arms").readNullable[List[Long]]
   )(ApiPartialIntervention.apply _)
 
@@ -78,6 +82,7 @@ object ApiPartialIntervention {
       (JsPath \ "typeId").writeNullable[Long] and
       (JsPath \ "dosage").writeNullable[String] and
       (JsPath \ "isActive").writeNullable[Boolean] and
+      (JsPath \ "deliveryMethod").writeNullable[String] and
       (JsPath \ "arms").writeNullable[List[Long]]
   )(unlift(ApiPartialIntervention.unapply))
 
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiUpdateRecord.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiUpdateRecord.scala
index 47bc493..05d5a60 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiUpdateRecord.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiUpdateRecord.scala
@@ -37,7 +37,7 @@ object ApiUpdateRecord {
           JsSuccess(Json.stringify(x))
         })
         .map {
-          case Tristate.Present("{}") => Tristate.Absent
+          case Tristate.Present("[]") => Tristate.Absent
           case x                      => x
         }
   )(ApiUpdateRecord.apply _)
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala
index dcbe886..2ced434 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala
@@ -2,6 +2,7 @@ package xyz.driver.pdsuidomain.formats.json.sprayformats
 
 import spray.json._
 import xyz.driver.pdsuicommon.domain.{LongId, StringId}
+import xyz.driver.pdsuidomain.entities.InterventionType.DeliveryMethod
 import xyz.driver.pdsuidomain.entities._
 
 object intervention {
@@ -18,6 +19,7 @@ object intervention {
         "isActive"       -> obj.intervention.isActive.toJson,
         "arms"           -> obj.arms.map(_.armId).toJson,
         "trialId"        -> obj.intervention.trialId.toJson,
+        "deliveryMethod" -> obj.intervention.deliveryMethod.toJson,
         "originalName"   -> obj.intervention.originalName.toJson,
         "originalDosage" -> obj.intervention.originalDosage.toJson,
         "originalType"   -> obj.intervention.originalType.toJson
@@ -48,6 +50,10 @@ object intervention {
           .get("isActive")
           .exists(_.convertTo[Boolean])
 
+        val deliveryMethod = fields
+          .get("deliveryMethod")
+          .map(_.convertTo[String])
+
         val arms = fields
           .get("arms")
           .map(_.convertTo[List[LongId[SlotArm]]].map(x => InterventionArm(armId = x, interventionId = LongId(0))))
@@ -63,7 +69,8 @@ object intervention {
             originalType = None,
             dosage = dosage,
             originalDosage = dosage,
-            isActive = isActive
+            isActive = isActive,
+            deliveryMethod = deliveryMethod
           ),
           arms = arms
         )
@@ -90,6 +97,10 @@ object intervention {
         .get("isActive")
         .map(_.convertTo[Boolean])
 
+      val deliveryMethod = fields
+        .get("deliveryMethod")
+        .map(_.convertTo[String])
+
       val origIntervention = orig.intervention
       val arms = fields
         .get("arms")
@@ -100,7 +111,8 @@ object intervention {
           name = name.getOrElse(origIntervention.name),
           typeId = typeId.orElse(origIntervention.typeId),
           dosage = dosage.getOrElse(origIntervention.dosage),
-          isActive = isActive.getOrElse(origIntervention.isActive)
+          isActive = isActive.getOrElse(origIntervention.isActive),
+          deliveryMethod = deliveryMethod.orElse(origIntervention.deliveryMethod)
         ),
         arms = arms.getOrElse(orig.arms)
       )
@@ -108,6 +120,25 @@ object intervention {
     case _ => deserializationError(s"Expected Json Object as partial Intervention, but got $json")
   }
 
-  implicit val interventionTypeFormat: RootJsonFormat[InterventionType] = jsonFormat2(InterventionType.apply)
+  implicit val interventionTypeFormat: JsonFormat[InterventionType] = new RootJsonFormat[InterventionType] {
+    override def read(json: JsValue) = json match {
+      case JsObject(fields) =>
+        val name = fields
+          .get("name")
+          .map(_.convertTo[String])
+          .getOrElse(deserializationError(s"Intervention type json object does not contain `name` field: $json"))
+
+        InterventionType.typeFromString(name)
+
+      case _ => deserializationError(s"Expected Json Object as Intervention type, but got $json")
+    }
+
+    override def write(obj: InterventionType) =
+      JsObject(
+        "id"              -> obj.id.toJson,
+        "name"            -> obj.name.toJson,
+        "deliveryMethods" -> obj.deliveryMethods.map(DeliveryMethod.methodToString).toJson
+      )
+  }
 
 }