diff options
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/user')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiPartialUser.scala | 8 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiUser.scala | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiPartialUser.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiPartialUser.scala index a37fea8..f31efb3 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiPartialUser.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiPartialUser.scala @@ -1,6 +1,8 @@ package xyz.driver.pdsuidomain.formats.json.user -import xyz.driver.pdsuicommon.domain.{Email, LongId, PasswordHash, User} +import java.util.UUID + +import xyz.driver.pdsuicommon.domain._ import play.api.data.validation._ import play.api.libs.functional.syntax._ import play.api.libs.json._ @@ -29,7 +31,7 @@ final case class ApiPartialUser(email: Option[String], name: Option[String], rol } } - def toDomain(id: LongId[User] = LongId(0L)): Try[User] = Try { + def toDomain(id: StringId[User] = StringId(UUID.randomUUID().toString)): Try[User] = Try { val validation = Map( JsPath \ "email" -> AdditionalConstraints.optionNonEmptyConstraint(email), JsPath \ "name" -> AdditionalConstraints.optionNonEmptyConstraint(name), @@ -62,7 +64,7 @@ object ApiPartialUser { implicit val format: Format[ApiPartialUser] = ( (JsPath \ "email").formatNullable[String](Format(Reads.email, Writes.StringWrites)) and (JsPath \ "name").formatNullable[String](Format( - Reads.filterNot[String](ValidationError("Username is too long (max length is 255 chars)", 255))(_.size > 255), + Reads.filterNot[String](ValidationError("Username is too long (max length is 255 chars)", 255))(_.length > 255), Writes.StringWrites )) and (JsPath \ "roleId").formatNullable[String]( diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiUser.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiUser.scala index 29138ed..8dbedfe 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiUser.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiUser.scala @@ -7,12 +7,16 @@ import play.api.data.validation.ValidationError import play.api.libs.functional.syntax._ import play.api.libs.json._ -final case class ApiUser(id: Long, email: String, name: String, roleId: String, latestActivity: Option[ZonedDateTime]) +final case class ApiUser(id: String, + email: String, + name: String, + roleId: String, + latestActivity: Option[ZonedDateTime]) object ApiUser { implicit val format: Format[ApiUser] = ( - (JsPath \ "id").format[Long] and + (JsPath \ "id").format[String] and (JsPath \ "email").format[String](Reads.email) and (JsPath \ "name").format[String] and (JsPath \ "roleId").format[String]( |