diff options
| author | timgushue <tim@driver.xyz> | 2017-09-27 09:34:45 -0700 |
|---|---|---|
| committer | timgushue <tim@driver.xyz> | 2017-09-27 09:34:45 -0700 |
| commit | e9d3e19f637614809aab39d9df2d1fcc6c78916e (patch) | |
| tree | 29560b9b5bfb1b235c6429506f56fa9dab8d4510 /src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiIntervention.scala | |
| parent | 0ef0059e9b47430e52d6bad4ced5b1be7f3b1a0d (diff) | |
| parent | c24679f1ae7d7ccc4e6693535b0aa3ac0e1ca225 (diff) | |
| download | rest-query-e9d3e19f637614809aab39d9df2d1fcc6c78916e.tar.gz rest-query-e9d3e19f637614809aab39d9df2d1fcc6c78916e.tar.bz2 rest-query-e9d3e19f637614809aab39d9df2d1fcc6c78916e.zip | |
Merge branch 'master' into add-slot-eligibility-arms
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.scala | 6 |
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 |