TRIAL-54 Study designs as enum

5 files changed, 25 insertions, 7 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/document.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/document.scala
index 69e8b75..4999365 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/document.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/document.scala
@@ -34,7 +34,7 @@ object document {
         val name = fields
           .get("name")
           .map(_.convertTo[String])
-          .getOrElse(deserializationError(s"Intervention type json object does not contain `name` field: $json"))
+          .getOrElse(deserializationError(s"Document type json object does not contain `name` field: $json"))
 
         DocumentType
           .fromString(name)
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 bd68566..e557e47 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
@@ -128,7 +128,9 @@ object intervention {
           .map(_.convertTo[String])
           .getOrElse(deserializationError(s"Intervention type json object does not contain `name` field: $json"))
 
-        InterventionType.typeFromString(name)
+        InterventionType
+          .typeFromString(name)
+          .getOrElse(deserializationError(s"Unknown intervention type: $name"))
 
       case _ => deserializationError(s"Expected Json Object as Intervention type, but got $json")
     }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/record.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/record.scala
index eac5ea7..09517e6 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/record.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/record.scala
@@ -42,13 +42,13 @@ object record {
         val name = fields
           .get("name")
           .map(_.convertTo[String])
-          .getOrElse(deserializationError(s"Intervention type json object does not contain `name` field: $json"))
+          .getOrElse(deserializationError(s"Provider type json object does not contain `name` field: $json"))
 
         ProviderType
           .fromString(name)
           .getOrElse(deserializationError(s"Unknown provider type: $name"))
 
-      case _ => deserializationError(s"Expected Json Object as Intervention type, but got $json")
+      case _ => deserializationError(s"Expected Json Object as Provider type, but got $json")
     }
 
     override def write(obj: ProviderType) =
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/studydesign.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/studydesign.scala
index e801666..3002b38 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/studydesign.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/studydesign.scala
@@ -7,6 +7,23 @@ object studydesign {
   import DefaultJsonProtocol._
   import common._
 
-  implicit val studyDesignFormat: RootJsonFormat[StudyDesign] = jsonFormat2(StudyDesign.apply)
+  implicit val studyDesignFormat: RootJsonFormat[StudyDesign] = new RootJsonFormat[StudyDesign] {
+    override def read(json: JsValue): StudyDesign = json match {
+      case JsObject(fields) =>
+        val name = fields
+          .get("name")
+          .map(_.convertTo[String])
+          .getOrElse(deserializationError(s"Study design json object does not contain `name` field: $json"))
+
+        StudyDesign
+          .fromString(name)
+          .getOrElse(deserializationError(s"Unknown study design: $name"))
+
+      case _ => deserializationError(s"Expected Json Object as Study design, but got $json")
+    }
+
+    override def write(obj: StudyDesign) =
+      JsObject("id" -> obj.id.toJson, "name" -> obj.name.toJson)
+  }
 
 }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/studydesign/ApiStudyDesign.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/studydesign/ApiStudyDesign.scala
index 1e9a226..12d40df 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/studydesign/ApiStudyDesign.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/studydesign/ApiStudyDesign.scala
@@ -3,11 +3,10 @@ package xyz.driver.pdsuidomain.formats.json.studydesign
 import xyz.driver.pdsuidomain.entities.StudyDesign
 import play.api.libs.functional.syntax._
 import play.api.libs.json.{Format, JsPath}
-import xyz.driver.pdsuicommon.domain.LongId
 
 final case class ApiStudyDesign(id: Long, name: String) {
 
-  def toDomain = StudyDesign(id = LongId[StudyDesign](id), name = name)
+  def toDomain: Option[StudyDesign] = StudyDesign.fromString(name)
 }
 
 object ApiStudyDesign {