diff options
| author | Vyatcheslav Suharnikov <arz.freezy@gmail.com> | 2017-07-13 05:55:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-13 05:55:28 +0300 |
| commit | 3d902b5197db861c30325c159dc10cfb211ae209 (patch) | |
| tree | d95187e353f2b03644ec02d8a92711ce9ec69efb /src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue | |
| parent | 7ab16021fe2b7e1f7d9d7800458e737d015e7630 (diff) | |
| parent | e2313321736520e6acaeb9aaa6ab426e6a8415ff (diff) | |
| download | rest-query-3d902b5197db861c30325c159dc10cfb211ae209.tar.gz rest-query-3d902b5197db861c30325c159dc10cfb211ae209.tar.bz2 rest-query-3d902b5197db861c30325c159dc10cfb211ae209.zip | |
Merge pull request #6 from drivergroup/PDSUI-2018v0.1.24
PDSUI-2018 Change user type from LongId to StringId
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue')
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue/ApiPartialTrialIssue.scala | 2 | ||||
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/trialissue/ApiTrialIssue.scala | 4 |
2 files changed, 3 insertions, 3 deletions
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 |