2 files changed, 40 insertions, 15 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ListResponse.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ListResponse.scala
index 2a670c4..59a1a48 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ListResponse.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ListResponse.scala
@@ -27,13 +27,40 @@ object ListResponse extends DefaultJsonProtocol {
 
   implicit val listResponseMetaFormat: RootJsonFormat[Meta] = jsonFormat4(Meta.apply)
 
-  implicit def listResponseMetaWriter[T: JsonWriter]: RootJsonWriter[ListResponse[T]] =
+  private def listResponseJsonWriter[T: JsonWriter](listResponse: ListResponse[T]) = {
+    JsObject(
+      itemsField -> listResponse.items.map(_.toJson).toJson,
+      metaField  -> listResponse.meta.toJson
+    )
+  }
+
+  implicit def listResponseWriter[T: JsonWriter]: RootJsonWriter[ListResponse[T]] =
     new RootJsonWriter[ListResponse[T]] {
       override def write(listResponse: ListResponse[T]): JsValue = {
-        JsObject(
-          itemsField -> listResponse.items.map(_.toJson).toJson,
-          metaField  -> listResponse.meta.toJson
-        )
+        listResponseJsonWriter(listResponse)
+      }
+    }
+
+  implicit def listResponseFormat[T: RootJsonFormat]: RootJsonFormat[ListResponse[T]] =
+    new RootJsonFormat[ListResponse[T]] {
+      override def write(listResponse: ListResponse[T]): JsValue = {
+        listResponseJsonWriter(listResponse)
+      }
+
+      override def read(json: JsValue): ListResponse[T] = json match {
+        case JsObject(fields) =>
+          val items = fields
+            .get(itemsField)
+            .map(_.convertTo[Seq[T]])
+            .getOrElse(deserializationError(s"ListResponse json object does not contain `$itemsField` field: $json"))
+
+          val meta = fields
+            .get(metaField)
+            .map(_.convertTo[Meta])
+            .getOrElse(deserializationError(s"ListResponse json object does not contain `$metaField` field: $json"))
+
+          ListResponse(items, meta)
+        case _ => deserializationError(s"Expected ListResponse json object, but got $json")
       }
     }
 }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala
index 7e8c220..f41c846 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala
@@ -12,17 +12,15 @@ object patientcriterion {
 
   def applyUpdateToPatientCriterion(json: JsValue, orig: PatientCriterion): PatientCriterion = json match {
     case JsObject(fields) =>
-      val eligibilityStatus = if (fields.contains("eligibilityStatus")) {
-        fields
-          .get("eligibilityStatus")
-          .map(_.convertTo[LabelValue])
-      } else orig.eligibilityStatus
+      val eligibilityStatus = fields
+        .get("eligibilityStatus")
+        .map(_.convertTo[Option[LabelValue]])
+        .getOrElse(orig.eligibilityStatus)
 
-      val verifiedEligibilityStatus = if (fields.contains("verifiedEligibilityStatus")) {
-        fields
-          .get("verifiedEligibilityStatus")
-          .map(_.convertTo[LabelValue])
-      } else orig.verifiedEligibilityStatus
+      val verifiedEligibilityStatus = fields
+        .get("verifiedEligibilityStatus")
+        .map(_.convertTo[Option[LabelValue]])
+        .getOrElse(orig.verifiedEligibilityStatus)
 
       orig.copy(
         eligibilityStatus = eligibilityStatus,