Merge pull request #25 from drivergroup/PDSUI-2273v0.3.12

PDSUI-2273 Renamed intervention.originalDescription to originalDosage

5 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 3911437..cb677cf 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/Intervention.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Intervention.scala
@@ -28,7 +28,7 @@ final case class Intervention(id: LongId[Intervention],
                               typeId: Option[LongId[InterventionType]],
                               originalType: Option[String],
                               dosage: String,
-                              originalDescription: String,
+                              originalDosage: String,
                               isActive: Boolean)
 
 object Intervention {
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 35ca3fd..ecb6e0a 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala
@@ -75,7 +75,7 @@ object trialcuration {
     typeId = Option(nextLongId[InterventionType]),
     originalType = Option(generators.nextString()),
     dosage = generators.nextString(),
-    originalDescription = generators.nextString(),
+    originalDosage = 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 ba383b6..f306a71 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
@@ -13,7 +13,7 @@ final case class ApiIntervention(id: Long,
                                  arms: List[Long],
                                  trialId: String,
                                  originalName: String,
-                                 originalDescription: String,
+                                 originalDosage: String,
                                  originalType: Option[String]) {
 
   def toDomain = {
@@ -25,7 +25,7 @@ final case class ApiIntervention(id: Long,
       typeId = this.typeId.map(id => LongId(id)),
       originalType = this.originalType.map(id => id.toString),
       dosage = this.dosage,
-      originalDescription = this.originalDescription,
+      originalDosage = this.originalDosage,
       isActive = this.isActive
     )
 
@@ -48,7 +48,7 @@ object ApiIntervention {
       (JsPath \ "arms").format[List[Long]] and
       (JsPath \ "trialId").format[String] and
       (JsPath \ "originalName").format[String] and
-      (JsPath \ "originalDescription").format[String] and
+      (JsPath \ "originalDosage").format[String] and
       (JsPath \ "originalType").formatNullable[String]
   )(ApiIntervention.apply, unlift(ApiIntervention.unapply))
 
@@ -65,7 +65,7 @@ object ApiIntervention {
       arms = arms.map(_.armId.id),
       trialId = intervention.trialId.id,
       originalName = intervention.originalName,
-      originalDescription = intervention.originalDescription,
+      originalDosage = intervention.originalDosage,
       originalType = intervention.originalType
     )
   }
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 41afe6a..9314391 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
@@ -11,16 +11,16 @@ object intervention {
   implicit val interventionWriter: JsonWriter[InterventionWithArms] = new JsonWriter[InterventionWithArms] {
     override def write(obj: InterventionWithArms) =
       JsObject(
-        "id"                  -> obj.intervention.id.toJson,
-        "name"                -> obj.intervention.name.toJson,
-        "typeId"              -> obj.intervention.typeId.toJson,
-        "dosage"              -> obj.intervention.dosage.toJson,
-        "isActive"            -> obj.intervention.isActive.toJson,
-        "arms"                -> obj.arms.map(_.armId).toJson,
-        "trialId"             -> obj.intervention.trialId.toJson,
-        "originalName"        -> obj.intervention.originalName.toJson,
-        "originalDescription" -> obj.intervention.originalDescription.toJson,
-        "originalType"        -> obj.intervention.originalType.toJson
+        "id"             -> obj.intervention.id.toJson,
+        "name"           -> obj.intervention.name.toJson,
+        "typeId"         -> obj.intervention.typeId.toJson,
+        "dosage"         -> obj.intervention.dosage.toJson,
+        "isActive"       -> obj.intervention.isActive.toJson,
+        "arms"           -> obj.arms.map(_.armId).toJson,
+        "trialId"        -> obj.intervention.trialId.toJson,
+        "originalName"   -> obj.intervention.originalName.toJson,
+        "originalDosage" -> obj.intervention.originalDosage.toJson,
+        "originalType"   -> obj.intervention.originalType.toJson
       )
   }
 
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 18c790a..0f01d4a 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
@@ -17,7 +17,7 @@ class InterventionFormatSuite extends FlatSpec with Matchers {
       typeId = Some(LongId(10)),
       originalType = Some("orig type"),
       dosage = "",
-      originalDescription = "",
+      originalDosage = "",
       isActive = true
     )
     val arms = List(
@@ -33,7 +33,7 @@ class InterventionFormatSuite extends FlatSpec with Matchers {
 
     writtenJson should be(
       """{"id":1,"name":"intervention name","typeId":10,"dosage":"","isActive":true,"arms":[20,21,22],
-        "trialId":"NCT000001","originalName":"orig name","originalDescription":"","originalType":"orig type"}""".parseJson)
+        "trialId":"NCT000001","originalName":"orig name","originalDosage":"","originalType":"orig type"}""".parseJson)
 
     val updateInterventionJson = """{"dosage":"descr","arms":[21,22]}""".parseJson
     val expectedUpdatedIntervention = orig.copy(