From ac00c03a9636727b7c46d676dd203a4d7e901b6a Mon Sep 17 00:00:00 2001
From: KOUNOIKE <kounoike.yuusuke@gmail.com>
Date: Sat, 13 Oct 2018 10:48:10 +0900
Subject: [PATCH] modify fields to option

---
 .../scala/gitbucket/core/api/UpdateAUser.scala     | 14 +++++++-------
 .../controller/api/ApiUserControllerBase.scala     |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/scala/gitbucket/core/api/UpdateAUser.scala b/src/main/scala/gitbucket/core/api/UpdateAUser.scala
index 25c917b67..1981c78b5 100644
--- a/src/main/scala/gitbucket/core/api/UpdateAUser.scala
+++ b/src/main/scala/gitbucket/core/api/UpdateAUser.scala
@@ -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]
 )
diff --git a/src/main/scala/gitbucket/core/controller/api/ApiUserControllerBase.scala b/src/main/scala/gitbucket/core/controller/api/ApiUserControllerBase.scala
index 009f298bb..4b696212f 100644
--- a/src/main/scala/gitbucket/core/controller/api/ApiUserControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiUserControllerBase.scala
@@ -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))