aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiIntervention.scala
diff options
context:
space:
mode:
authorKseniya Tomskikh <ktomskih@datamonsters.co>2017-09-26 16:55:38 +0700
committerKseniya Tomskikh <ktomskih@datamonsters.co>2017-09-26 16:55:38 +0700
commitc0ffb2a34240876c16f9ce62205cf257aa6d5991 (patch)
tree15fe180be3f035f308168d5564d01cf293a1f83a /src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiIntervention.scala
parent2cd8e672feba0d076f4f44f556f993f1db2043b7 (diff)
downloadrest-query-c0ffb2a34240876c16f9ce62205cf257aa6d5991.tar.gz
rest-query-c0ffb2a34240876c16f9ce62205cf257aa6d5991.tar.bz2
rest-query-c0ffb2a34240876c16f9ce62205cf257aa6d5991.zip
PDSUI-2275 Added delivery_method field to intervention table
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiIntervention.scala')
-rw-r--r--src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiIntervention.scala6
1 files changed, 5 insertions, 1 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