1 files changed, 18 insertions, 1 deletions
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)
+  }
 
 }