App toDomain converion to ApiTrialIssue

1 files changed, 19 insertions, 1 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue/ApiTrialIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue/ApiTrialIssue.scala
index 852c4f6..c9475c6 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue/ApiTrialIssue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue/ApiTrialIssue.scala
@@ -4,20 +4,37 @@ import java.time.{ZoneId, ZonedDateTime}
 
 import play.api.libs.functional.syntax._
 import play.api.libs.json._
+import xyz.driver.pdsuicommon.domain._
 import xyz.driver.pdsuidomain.entities.TrialIssue
 
 final case class ApiTrialIssue(id: Long,
+                               trialId: String,
                                text: String,
                                lastUpdate: ZonedDateTime,
                                userId: String,
                                isDraft: Boolean,
                                evidence: String,
                                archiveRequired: Boolean,
-                               meta: String)
+                               meta: String) {
+
+  def toDomain = TrialIssue(
+    id = LongId(this.id),
+    trialId = StringId(this.trialId),
+    text = this.text,
+    userId = StringId(this.userId),
+    lastUpdate = this.lastUpdate.toLocalDateTime,
+    isDraft = this.isDraft,
+    evidence = this.evidence,
+    archiveRequired = this.archiveRequired,
+    meta = this.meta
+  )
+
+}
 
 object ApiTrialIssue {
   implicit val format: Format[ApiTrialIssue] = (
     (JsPath \ "id").format[Long] and
+      (JsPath \ "trialId").format[String] and
       (JsPath \ "text").format[String] and
       (JsPath \ "lastUpdate").format[ZonedDateTime] and
       (JsPath \ "userId").format[String] and
@@ -31,6 +48,7 @@ object ApiTrialIssue {
 
   def fromDomain(x: TrialIssue) = ApiTrialIssue(
     id = x.id.id,
+    trialId = x.trialId.id,
     text = x.text,
     lastUpdate = ZonedDateTime.of(x.lastUpdate, ZoneId.of("Z")),
     userId = x.userId.id,