From e2313321736520e6acaeb9aaa6ab426e6a8415ff Mon Sep 17 00:00:00 2001 From: Vyatcheslav Suharnikov Date: Wed, 12 Jul 2017 11:39:40 +0300 Subject: PDSUI-2018 Change user type from LongId to StringId --- .../pdsuidomain/formats/json/trialissue/ApiPartialTrialIssue.scala | 2 +- .../driver/pdsuidomain/formats/json/trialissue/ApiTrialIssue.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue') 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 index 5dcde8a..fc31371 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue/ApiPartialTrialIssue.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue/ApiPartialTrialIssue.scala @@ -15,7 +15,7 @@ final case class ApiPartialTrialIssue(text: String, evidence: String, archiveReq meta = meta ) - def toDomain(userId: LongId[User], trialId: StringId[Trial]) = TrialIssue( + def toDomain(userId: StringId[User], trialId: StringId[Trial]) = TrialIssue( id = LongId(0), userId = userId, trialId = trialId, 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 a5399aa..852c4f6 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 @@ -9,7 +9,7 @@ import xyz.driver.pdsuidomain.entities.TrialIssue final case class ApiTrialIssue(id: Long, text: String, lastUpdate: ZonedDateTime, - userId: Long, + userId: String, isDraft: Boolean, evidence: String, archiveRequired: Boolean, @@ -20,7 +20,7 @@ object ApiTrialIssue { (JsPath \ "id").format[Long] and (JsPath \ "text").format[String] and (JsPath \ "lastUpdate").format[ZonedDateTime] and - (JsPath \ "userId").format[Long] and + (JsPath \ "userId").format[String] and (JsPath \ "isDraft").format[Boolean] and (JsPath \ "evidence").format[String] and (JsPath \ "archiveRequired").format[Boolean] and -- cgit v1.2.3