Updates for authenticationv0.2.2

3 files changed, 19 insertions, 54 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/linkedpatient/ApiLinkedPatient.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/linkedpatient/ApiLinkedPatient.scala
deleted file mode 100644
index 327bda2..0000000
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/linkedpatient/ApiLinkedPatient.scala
+++ /dev/null
@@ -1,29 +0,0 @@
-package xyz.driver.pdsuidomain.formats.json.linkedpatient
-
-import java.util.UUID
-
-import play.api.libs.json.{Format, Json}
-import xyz.driver.pdsuicommon.domain._
-import xyz.driver.pdsuidomain.services.LinkedPatientService.RichLinkedPatient
-
-final case class ApiLinkedPatient(email: String, name: String, patientId: UUID, trialId: String) {
-
-  def toDomain = RichLinkedPatient(
-    email = Email(email),
-    name = name,
-    patientId = UuidId(patientId),
-    trialId = StringId(trialId)
-  )
-}
-
-object ApiLinkedPatient {
-
-  implicit val format: Format[ApiLinkedPatient] = Json.format[ApiLinkedPatient]
-
-  def fromDomain(entity: RichLinkedPatient) = ApiLinkedPatient(
-    email = entity.email.value,
-    name = entity.name,
-    patientId = entity.patientId.id,
-    trialId = entity.trialId.id
-  )
-}
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 5fad653..cf20d32 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
@@ -9,11 +9,11 @@ import play.api.libs.json._
 
 import scala.collection._
 import scala.util.Try
-import User._
 import xyz.driver.pdsuicommon.json.JsonValidationException
+import xyz.driver.pdsuicommon.json.Serialization.seqJsonFormat
 import xyz.driver.pdsuicommon.validation.{AdditionalConstraints, JsonValidationErrors}
 
-final case class ApiPartialUser(email: Option[String], name: Option[String], roleId: Option[String]) {
+final case class ApiPartialUser(email: Option[String], name: Option[String], roles: Option[Seq[String]]) {
 
   def applyTo(orig: User): Try[User] = Try {
     val validation = Map(
@@ -33,9 +33,9 @@ final case class ApiPartialUser(email: Option[String], name: Option[String], rol
 
   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),
-      JsPath \ "roleId" -> AdditionalConstraints.optionNonEmptyConstraint(roleId)
+      JsPath \ "email" -> AdditionalConstraints.optionNonEmptyConstraint(email),
+      JsPath \ "name"  -> AdditionalConstraints.optionNonEmptyConstraint(name),
+      JsPath \ "roles" -> AdditionalConstraints.optionNonEmptyConstraint(roles)
     )
 
     val validationErrors: JsonValidationErrors = validation.collect({
@@ -48,8 +48,7 @@ final case class ApiPartialUser(email: Option[String], name: Option[String], rol
         id = id,
         email = userEmail,
         name = name.get,
-        role = roleId.map(UserRole.roleFromString).get,
-        passwordHash = PasswordHash(createPassword),
+        roles = roles.toSeq.flatMap(_.map(UserRole.roleFromString)).toSet,
         latestActivity = None,
         deleted = None
       )
@@ -69,13 +68,9 @@ object ApiPartialUser {
             _.length > 255),
           Writes.StringWrites
         )) and
-      (JsPath \ "roleId").formatNullable[String](
-        Format(Reads
-                 .of[String]
-                 .filter(ValidationError("unknown role"))({
-                   case x if UserRole.roleFromString.isDefinedAt(x) => true
-                   case _                                           => false
-                 }),
-               Writes.of[String]))
+      (JsPath \ "roles").formatNullable[Seq[String]](
+        Format(seqJsonFormat[String].filter(ValidationError("unknown roles"))(
+                 _.forall(UserRole.roleFromString.isDefinedAt)),
+               Writes.of[Seq[String]]))
   )(ApiPartialUser.apply, unlift(ApiPartialUser.unapply))
 }
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 8dbedfe..c21edd1 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
@@ -3,14 +3,17 @@ package xyz.driver.pdsuidomain.formats.json.user
 import java.time.{ZoneId, ZonedDateTime}
 
 import xyz.driver.pdsuicommon.domain.User
+import xyz.driver.pdsuicommon.json.Serialization.seqJsonFormat
 import play.api.data.validation.ValidationError
 import play.api.libs.functional.syntax._
 import play.api.libs.json._
 
+import scala.collection.Seq
+
 final case class ApiUser(id: String,
                          email: String,
                          name: String,
-                         roleId: String,
+                         roles: Seq[String],
                          latestActivity: Option[ZonedDateTime])
 
 object ApiUser {
@@ -19,14 +22,10 @@ object ApiUser {
     (JsPath \ "id").format[String] and
       (JsPath \ "email").format[String](Reads.email) and
       (JsPath \ "name").format[String] and
-      (JsPath \ "roleId").format[String](
-        Format(Reads
-                 .of[String]
-                 .filter(ValidationError("unknown role"))({
-                   case x if UserRole.roleFromString.isDefinedAt(x) => true
-                   case _                                           => false
-                 }),
-               Writes.of[String])) and
+      (JsPath \ "roles").format(
+        Format(
+          seqJsonFormat[String].filter(ValidationError("unknown role"))(_.forall(UserRole.roleFromString.isDefinedAt)),
+          Writes.of[Seq[String]])) and
       (JsPath \ "latestActivity").formatNullable[ZonedDateTime]
   )(ApiUser.apply, unlift(ApiUser.unapply))
 
@@ -34,7 +33,7 @@ object ApiUser {
     user.id.id,
     user.email.value,
     user.name,
-    UserRole.roleToString(user.role),
+    user.roles.map(UserRole.roleToString).toSeq,
     user.latestActivity.map(ZonedDateTime.of(_, ZoneId.of("Z")))
   )
 }