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/userhistory/ApiUserHistory.scala | |
| 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/userhistory/ApiUserHistory.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/userhistory/ApiUserHistory.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/userhistory/ApiUserHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/userhistory/ApiUserHistory.scala index 2d0df80..127337f 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/userhistory/ApiUserHistory.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/userhistory/ApiUserHistory.scala @@ -7,7 +7,7 @@ import play.api.libs.json.{Format, JsPath} import xyz.driver.pdsuidomain.entities.UserHistory final case class ApiUserHistory(id: Long, - executor: Long, + executor: String, recordId: Option[Long], documentId: Option[Long], trialId: Option[String], @@ -19,7 +19,7 @@ final case class ApiUserHistory(id: Long, object ApiUserHistory { implicit val format: Format[ApiUserHistory] = ( (JsPath \ "id").format[Long] and - (JsPath \ "executor").format[Long] and + (JsPath \ "executor").format[String] and (JsPath \ "recordId").formatNullable[Long] and (JsPath \ "documentId").formatNullable[Long] and (JsPath \ "trialId").formatNullable[String] and |