Use Option.map instead of pattern matching.

This commit is contained in:
takezoe
2013-06-25 14:44:02 +09:00
parent cfef0b80d5
commit 1ff87ff6b3
6 changed files with 174 additions and 229 deletions

View File

@@ -22,26 +22,19 @@ trait AccountControllerBase extends ControllerBase {
*/
get("/:userName") {
val userName = params("userName")
getAccountByUserName(userName) match {
case Some(a) => account.html.userinfo(a, getVisibleRepositories(userName, baseUrl, context.loginAccount.map(_.userName)))
case None => NotFound()
}
getAccountByUserName(userName).map {
account.html.userinfo(_, getVisibleRepositories(userName, baseUrl, context.loginAccount.map(_.userName)))
} getOrElse NotFound()
}
get("/:userName/_edit")(ownerOnly {
val userName = params("userName")
getAccountByUserName(userName) match {
case Some(a) => account.html.useredit(a)
case None => NotFound()
}
getAccountByUserName(userName).map(account.html.useredit(_)) getOrElse NotFound()
})
post("/:userName/_edit", form)(ownerOnly { form =>
val userName = params("userName")
updateAccount(getAccountByUserName(userName).get.copy(
mailAddress = form.mailAddress,
url = form.url))
updateAccount(getAccountByUserName(userName).get.copy(mailAddress = form.mailAddress, url = form.url))
redirect("/%s".format(userName))
})