1 files changed, 7 insertions, 7 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/extracteddata.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/extracteddata.scala
index 5d5585a..436fbe9 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/extracteddata.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/extracteddata.scala
@@ -37,15 +37,15 @@ object extracteddata {
     case JsObject(fields) =>
       val labelId = fields
         .get("id")
-        .map(_.convertTo[LongId[Label]])
+        .flatMap(_.convertTo[Option[LongId[Label]]])
 
       val categoryId = fields
         .get("categoryId")
-        .map(_.convertTo[LongId[LabelCategory]])
+        .flatMap(_.convertTo[Option[LongId[LabelCategory]]])
 
       val value = fields
         .get("value")
-        .map(_.convertTo[LabelValue])
+        .flatMap(_.convertTo[Option[LabelValue]])
 
       ExtractedDataLabel(
         id = LongId(0),
@@ -100,7 +100,7 @@ object extracteddata {
   implicit val extractedDataFormat: RootJsonFormat[RichExtractedData] = new RootJsonFormat[RichExtractedData] {
     override def write(richData: RichExtractedData): JsValue =
       JsObject(
-        "id"         -> richData.extractedData.id.id.toJson,
+        "id"         -> richData.extractedData.id.toJson,
         "documentId" -> richData.extractedData.documentId.toJson,
         "keywordId"  -> richData.extractedData.keywordId.toJson,
         "evidence"   -> richData.extractedData.evidenceText.toJson,
@@ -118,15 +118,15 @@ object extracteddata {
 
         val keywordId = fields
           .get("keywordId")
-          .map(_.convertTo[LongId[Keyword]])
+          .flatMap(_.convertTo[Option[LongId[Keyword]]])
 
         val evidence = fields
           .get("evidence")
-          .map(_.convertTo[String])
+          .flatMap(_.convertTo[Option[String]])
 
         val meta = fields
           .get("meta")
-          .map(_.convertTo[TextJson[Meta]])
+          .flatMap(_.convertTo[Option[TextJson[Meta]]])
 
         val labels = fields
           .get("labels")