Merge branch 'master' into entity-list-responses

4 files changed, 28 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 e05e841..c584b96 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)
@@ -126,7 +126,8 @@ object document {
         "previousAssignee" -> document.previousAssignee.toJson,
         "meta"             -> document.meta.toJson,
         "lastActiveUser"   -> document.lastActiveUserId.toJson,
-        "lastUpdate"       -> document.lastUpdate.toJson
+        "lastUpdate"       -> document.lastUpdate.toJson,
+        "labelVersion"     -> document.labelVersion.toJson
       )
 
     override def read(json: JsValue): Document = json match {
@@ -185,7 +186,8 @@ object document {
           assignee = None,
           previousAssignee = None,
           lastActiveUserId = None,
-          lastUpdate = LocalDateTime.MIN
+          lastUpdate = LocalDateTime.MIN,
+          labelVersion = 0
         )
 
       case _ => deserializationError(s"Expected Json Object as Document, but got $json")
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)
+  }
 
 }