diff options
| author | Vyatcheslav Suharnikov <arz.freezy@gmail.com> | 2017-07-12 11:39:40 +0300 |
|---|---|---|
| committer | Vyatcheslav Suharnikov <arz.freezy@gmail.com> | 2017-07-12 14:07:05 +0300 |
| commit | e2313321736520e6acaeb9aaa6ab426e6a8415ff (patch) | |
| tree | d95187e353f2b03644ec02d8a92711ce9ec69efb /src/main/scala/xyz/driver/pdsuidomain/formats/json/message | |
| parent | 7ab16021fe2b7e1f7d9d7800458e737d015e7630 (diff) | |
| download | rest-query-e2313321736520e6acaeb9aaa6ab426e6a8415ff.tar.gz rest-query-e2313321736520e6acaeb9aaa6ab426e6a8415ff.tar.bz2 rest-query-e2313321736520e6acaeb9aaa6ab426e6a8415ff.zip | |
PDSUI-2018 Change user type from LongId to StringId
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/message')
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/message/ApiMessage.scala | 4 | ||||
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/message/ApiPartialMessage.scala | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/message/ApiMessage.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/message/ApiMessage.scala index 05f9564..2591509 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/message/ApiMessage.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/message/ApiMessage.scala @@ -9,7 +9,7 @@ import xyz.driver.pdsuidomain.entities.Message final case class ApiMessage(id: Long, text: String, lastUpdate: ZonedDateTime, - userId: Long, + userId: String, isDraft: Boolean, recordId: Option[Long], documentId: Option[Long], @@ -44,7 +44,7 @@ object ApiMessage { (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 \ "recordId").formatNullable[Long] and (JsPath \ "documentId").formatNullable[Long] and diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/message/ApiPartialMessage.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/message/ApiPartialMessage.scala index 88dd5a3..a2656f2 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/message/ApiPartialMessage.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/message/ApiPartialMessage.scala @@ -18,7 +18,7 @@ final case class ApiPartialMessage(text: Option[String], archiveRequired: Option[Boolean], meta: Option[String]) { - def toDomain(userId: LongId[User]) = Message( + def toDomain(userId: StringId[User]) = Message( id = LongId(0), text = text.getOrElse(""), userId = userId, |