Merge pull request #24 from drivergroup/PDSUI-2273

PDSUI-2273 Renamed intervention.description to dosage

6 files changed, 18 insertions, 18 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Intervention.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Intervention.scala
index e691547..3911437 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/Intervention.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Intervention.scala
@@ -27,7 +27,7 @@ final case class Intervention(id: LongId[Intervention],
                               originalName: String,
                               typeId: Option[LongId[InterventionType]],
                               originalType: Option[String],
-                              description: String,
+                              dosage: String,
                               originalDescription: String,
                               isActive: Boolean)
 
diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala
index caa6bca..35ca3fd 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala
@@ -74,7 +74,7 @@ object trialcuration {
     originalName = generators.nextString(),
     typeId = Option(nextLongId[InterventionType]),
     originalType = Option(generators.nextString()),
-    description = generators.nextString(),
+    dosage = generators.nextString(),
     originalDescription = generators.nextString(),
     isActive = generators.nextBoolean()
   )
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 39acbde..ba383b6 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
@@ -8,7 +8,7 @@ import play.api.libs.json.{Format, JsPath}
 final case class ApiIntervention(id: Long,
                                  name: String,
                                  typeId: Option[Long],
-                                 description: String,
+                                 dosage: String,
                                  isActive: Boolean,
                                  arms: List[Long],
                                  trialId: String,
@@ -24,7 +24,7 @@ final case class ApiIntervention(id: Long,
       originalName = this.originalName,
       typeId = this.typeId.map(id => LongId(id)),
       originalType = this.originalType.map(id => id.toString),
-      description = this.description,
+      dosage = this.dosage,
       originalDescription = this.originalDescription,
       isActive = this.isActive
     )
@@ -43,7 +43,7 @@ object ApiIntervention {
     (JsPath \ "id").format[Long] and
       (JsPath \ "name").format[String] and
       (JsPath \ "typeId").formatNullable[Long] and
-      (JsPath \ "description").format[String] and
+      (JsPath \ "dosage").format[String] and
       (JsPath \ "isActive").format[Boolean] and
       (JsPath \ "arms").format[List[Long]] and
       (JsPath \ "trialId").format[String] and
@@ -60,7 +60,7 @@ object ApiIntervention {
       id = intervention.id.id,
       name = intervention.name,
       typeId = intervention.typeId.map(_.id),
-      description = intervention.description,
+      dosage = intervention.dosage,
       isActive = intervention.isActive,
       arms = arms.map(_.armId.id),
       trialId = intervention.trialId.id,
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 f67ba6b..aa55506 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
@@ -6,7 +6,7 @@ import play.api.libs.functional.syntax._
 import play.api.libs.json._
 
 final case class ApiPartialIntervention(typeId: Option[Long],
-                                        description: Option[String],
+                                        dosage: Option[String],
                                         isActive: Option[Boolean],
                                         arms: Option[List[Long]]) {
 
@@ -16,7 +16,7 @@ final case class ApiPartialIntervention(typeId: Option[Long],
     orig.copy(
       intervention = origIntervention.copy(
         typeId = typeId.map(LongId(_)).orElse(origIntervention.typeId),
-        description = description.getOrElse(origIntervention.description),
+        dosage = dosage.getOrElse(origIntervention.dosage),
         isActive = isActive.getOrElse(origIntervention.isActive)
       ),
       arms = draftArmList.getOrElse(orig.arms)
@@ -28,14 +28,14 @@ object ApiPartialIntervention {
 
   private val reads: Reads[ApiPartialIntervention] = (
     (JsPath \ "typeId").readNullable[Long] and
-      (JsPath \ "description").readNullable[String] 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 \ "description").writeNullable[String] and
+      (JsPath \ "dosage").writeNullable[String] and
       (JsPath \ "isActive").writeNullable[Boolean] and
       (JsPath \ "arms").writeNullable[List[Long]]
   )(unlift(ApiPartialIntervention.unapply))
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)
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/InterventionFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/InterventionFormatSuite.scala
index 784a655..18c790a 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/InterventionFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/InterventionFormatSuite.scala
@@ -16,7 +16,7 @@ class InterventionFormatSuite extends FlatSpec with Matchers {
       originalName = "orig name",
       typeId = Some(LongId(10)),
       originalType = Some("orig type"),
-      description = "",
+      dosage = "",
       originalDescription = "",
       isActive = true
     )
@@ -32,12 +32,12 @@ class InterventionFormatSuite extends FlatSpec with Matchers {
     val writtenJson = interventionWriter.write(orig)
 
     writtenJson should be(
-      """{"id":1,"name":"intervention name","typeId":10,"description":"","isActive":true,"arms":[20,21,22],
+      """{"id":1,"name":"intervention name","typeId":10,"dosage":"","isActive":true,"arms":[20,21,22],
         "trialId":"NCT000001","originalName":"orig name","originalDescription":"","originalType":"orig type"}""".parseJson)
 
-    val updateInterventionJson = """{"description":"descr","arms":[21,22]}""".parseJson
+    val updateInterventionJson = """{"dosage":"descr","arms":[21,22]}""".parseJson
     val expectedUpdatedIntervention = orig.copy(
-      intervention = intervention.copy(description = "descr"),
+      intervention = intervention.copy(dosage = "descr"),
       arms = List(
         InterventionArm(interventionId = intervention.id, armId = LongId(21)),
         InterventionArm(interventionId = intervention.id, armId = LongId(22))