From 1f941bc2722a94e3a1b30d2aea7d7acbb3789aaf Mon Sep 17 00:00:00 2001 From: Vyatcheslav Suharnikov Date: Wed, 5 Jul 2017 10:45:53 +0300 Subject: PDSUI-2013 Create Trial Curation's own messages table for trials --- .../json/trialissue/ApiPartialTrialIssue.scala | 40 +++++++++++++++++++++ .../formats/json/trialissue/ApiTrialIssue.scala | 42 ++++++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue/ApiPartialTrialIssue.scala create mode 100644 src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue/ApiTrialIssue.scala (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats') diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue/ApiPartialTrialIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue/ApiPartialTrialIssue.scala new file mode 100644 index 0000000..5dcde8a --- /dev/null +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue/ApiPartialTrialIssue.scala @@ -0,0 +1,40 @@ +package xyz.driver.pdsuidomain.formats.json.trialissue + +import java.time.LocalDateTime + +import play.api.libs.functional.syntax._ +import play.api.libs.json._ +import xyz.driver.pdsuicommon.domain.{LongId, StringId, User} +import xyz.driver.pdsuidomain.entities.{Trial, TrialIssue} + +final case class ApiPartialTrialIssue(text: String, evidence: String, archiveRequired: Boolean, meta: String) { + def applyTo(x: TrialIssue): TrialIssue = x.copy( + text = text, + evidence = evidence, + archiveRequired = archiveRequired, + meta = meta + ) + + def toDomain(userId: LongId[User], trialId: StringId[Trial]) = TrialIssue( + id = LongId(0), + userId = userId, + trialId = trialId, + lastUpdate = LocalDateTime.MIN, + isDraft = true, + text = text, + evidence = evidence, + archiveRequired = false, + meta = meta + ) +} + +object ApiPartialTrialIssue { + implicit val format: Format[ApiPartialTrialIssue] = ( + (JsPath \ "text").format[String] and + (JsPath \ "evidence").format[String] and + (JsPath \ "archiveRequired").format[Boolean] and + (JsPath \ "meta").format[String](Format(Reads { x => + JsSuccess(Json.stringify(x)) + }, Writes[String](Json.parse))) + )(ApiPartialTrialIssue.apply, unlift(ApiPartialTrialIssue.unapply)) +} 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 new file mode 100644 index 0000000..a5399aa --- /dev/null +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue/ApiTrialIssue.scala @@ -0,0 +1,42 @@ +package xyz.driver.pdsuidomain.formats.json.trialissue + +import java.time.{ZoneId, ZonedDateTime} + +import play.api.libs.functional.syntax._ +import play.api.libs.json._ +import xyz.driver.pdsuidomain.entities.TrialIssue + +final case class ApiTrialIssue(id: Long, + text: String, + lastUpdate: ZonedDateTime, + userId: Long, + isDraft: Boolean, + evidence: String, + archiveRequired: Boolean, + meta: String) + +object ApiTrialIssue { + implicit val format: Format[ApiTrialIssue] = ( + (JsPath \ "id").format[Long] and + (JsPath \ "text").format[String] and + (JsPath \ "lastUpdate").format[ZonedDateTime] and + (JsPath \ "userId").format[Long] and + (JsPath \ "isDraft").format[Boolean] and + (JsPath \ "evidence").format[String] and + (JsPath \ "archiveRequired").format[Boolean] and + (JsPath \ "meta").format[String](Format(Reads { x => + JsSuccess(Json.stringify(x)) + }, Writes[String](Json.parse))) + )(ApiTrialIssue.apply, unlift(ApiTrialIssue.unapply)) + + def fromDomain(x: TrialIssue) = ApiTrialIssue( + id = x.id.id, + text = x.text, + lastUpdate = ZonedDateTime.of(x.lastUpdate, ZoneId.of("Z")), + userId = x.userId.id, + isDraft = x.isDraft, + evidence = x.evidence, + archiveRequired = x.archiveRequired, + meta = x.meta + ) +} -- cgit v1.2.3