aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala
diff options
context:
space:
mode:
authorktomskikh <ktomskih@datamonsters.co>2017-09-14 16:31:52 +0700
committerGitHub <noreply@github.com>2017-09-14 16:31:52 +0700
commit1e2acbe4e5134fc5a2657adf9da1873b5c7000cb (patch)
tree16a0f2edcffe7fecc02ddd97212265a339b9b482 /src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala
parentcb3992db49f7c73f37c2489d4225d10055a3cb5a (diff)
parent2e2f9213a16bf5728f4615f927ba29536b3c20be (diff)
downloadrest-query-1e2acbe4e5134fc5a2657adf9da1873b5c7000cb.tar.gz
rest-query-1e2acbe4e5134fc5a2657adf9da1873b5c7000cb.tar.bz2
rest-query-1e2acbe4e5134fc5a2657adf9da1873b5c7000cb.zip
Merge pull request #24 from drivergroup/PDSUI-2273
PDSUI-2273 Renamed intervention.description to dosage
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala')
-rw-r--r--src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala8
1 files changed, 4 insertions, 4 deletions
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 a8ce950..41afe6a 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
@@ -14,7 +14,7 @@ object intervention {
"id" -> obj.intervention.id.toJson,
"name" -> obj.intervention.name.toJson,
"typeId" -> obj.intervention.typeId.toJson,
- "description" -> obj.intervention.description.toJson,
+ "dosage" -> obj.intervention.dosage.toJson,
"isActive" -> obj.intervention.isActive.toJson,
"arms" -> obj.arms.map(_.armId).toJson,
"trialId" -> obj.intervention.trialId.toJson,
@@ -30,8 +30,8 @@ object intervention {
.get("typeId")
.map(_.convertTo[LongId[InterventionType]])
- val description = fields
- .get("description")
+ val dosage = fields
+ .get("dosage")
.map(_.convertTo[String])
val isActive = fields
@@ -46,7 +46,7 @@ object intervention {
orig.copy(
intervention = origIntervention.copy(
typeId = typeId.orElse(origIntervention.typeId),
- description = description.getOrElse(origIntervention.description),
+ dosage = dosage.getOrElse(origIntervention.dosage),
isActive = isActive.getOrElse(origIntervention.isActive)
),
arms = arms.getOrElse(orig.arms)