aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial.scala
diff options
context:
space:
mode:
authorvlad <vlad@driver.xyz>2017-11-02 17:37:25 -0700
committervlad <vlad@driver.xyz>2017-11-02 17:37:25 -0700
commit5515c834853cbe3ce60460a4819a94805cfe24f7 (patch)
tree13a0a8a51f477a4fce2bb8f4d5cd8248de54a73b /src/main/scala/xyz/driver/pdsuidomain/formats/json/trial.scala
parentb331892f87846945f69a28e9f3ee786cd4b93577 (diff)
downloadrest-query-5515c834853cbe3ce60460a4819a94805cfe24f7.tar.gz
rest-query-5515c834853cbe3ce60460a4819a94805cfe24f7.tar.bz2
rest-query-5515c834853cbe3ce60460a4819a94805cfe24f7.zip
Unifying user ids
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/trial.scala')
-rw-r--r--src/main/scala/xyz/driver/pdsuidomain/formats/json/trial.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial.scala
index f22401b..ac02070 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial.scala
@@ -4,7 +4,7 @@ import java.time.{LocalDateTime, ZoneId, ZonedDateTime}
import spray.json._
import xyz.driver.core.auth.User
-import xyz.driver.core.json.EnumJsonFormat
+import xyz.driver.core.json._
import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId}
import xyz.driver.pdsuidomain.entities._
@@ -65,16 +65,16 @@ object trial {
.getOrElse(deserializationError(s"Trial create json object does not contain `status` field: $json"))
val assignee = fields
.get("assignee")
- .flatMap(_.convertTo[Option[StringId[User]]])
+ .flatMap(_.convertTo[Option[xyz.driver.core.Id[User]]])
val previousStatus = fields
.get("previousStatus")
.flatMap(_.convertTo[Option[Trial.Status]])
val previousAssignee = fields
.get("previousAssignee")
- .flatMap(_.convertTo[Option[StringId[User]]])
+ .flatMap(_.convertTo[Option[xyz.driver.core.Id[User]]])
val lastActiveUser = fields
.get("lastActiveUser")
- .flatMap(_.convertTo[Option[StringId[User]]])
+ .flatMap(_.convertTo[Option[xyz.driver.core.Id[User]]])
val lastUpdate = fields
.get("lastUpdate")
.map(_.convertTo[LocalDateTime])