modify fields to option

This commit is contained in:
KOUNOIKE
2018-10-13 10:48:10 +09:00
parent c5760bd378
commit ac00c03a96
2 changed files with 10 additions and 10 deletions

View File

@@ -1,11 +1,11 @@
package gitbucket.core.api
case class UpdateAUser(
name: String,
email: String,
blog: String,
company: String,
location: String,
hireable: Boolean,
bio: String
name: Option[String],
email: Option[String],
blog: Option[String],
company: Option[String],
location: Option[String],
hireable: Option[Boolean],
bio: Option[String]
)

View File

@@ -38,9 +38,9 @@ trait ApiUserControllerBase extends ControllerBase {
(for {
data <- extractFromJsonBody[UpdateAUser]
} yield {
val updatedAccount = context.loginAccount.get.copy(
mailAddress = data.email,
description = Some(data.bio)
val loginAccount = context.loginAccount.get
val updatedAccount = loginAccount.copy(
mailAddress = data.email.getOrElse(loginAccount.mailAddress)
)
updateAccount(updatedAccount)
JsonFormat(ApiUser(updatedAccount))