1 files changed, 16 insertions, 1 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/extracteddata/ApiExtractedData.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/extracteddata/ApiExtractedData.scala
index ec4185f..4182c8d 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/extracteddata/ApiExtractedData.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/extracteddata/ApiExtractedData.scala
@@ -1,5 +1,7 @@
 package xyz.driver.pdsuidomain.formats.json.extracteddata
 
+import xyz.driver.pdsuicommon.domain.{LongId, TextJson}
+import xyz.driver.pdsuidomain.entities.ExtractedData
 import xyz.driver.pdsuidomain.formats.json.label.ApiExtractedDataLabel
 import play.api.libs.json._
 import play.api.data.validation._
@@ -16,7 +18,20 @@ final case class ApiExtractedData(id: Long,
                                   evidence: Option[String],
                                   meta: Option[String],
                                   // An empty list and no-existent list are different cases
-                                  labels: Option[List[ApiExtractedDataLabel]])
+                                  labels: Option[List[ApiExtractedDataLabel]]) {
+
+  def toDomain = RichExtractedData(
+    extractedData = ExtractedData(
+      id = LongId(this.id),
+      documentId = LongId(this.documentId),
+      keywordId = this.keywordId.map(LongId(_)),
+      evidenceText = this.evidence,
+      meta = this.meta.map(x => TextJson(JsonSerializer.deserialize[ExtractedData.Meta](x)))
+    ),
+    labels = labels.getOrElse(List.empty).map(_.toDomain())
+  )
+
+}
 
 object ApiExtractedData {