Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-05-07 20:07:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

improve getAccountByMailAddress query.

Browse Source
This commit is contained in:
KOUNOIKE Yuusuke
2018-04-15 11:34:55 +09:00
parent d65637ce0c
commit 243833c3fc
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/scala/gitbucket/core/service/AccountService.scala
View File

@@ -114,20 +114,16 @@ trait AccountService {
def getAccountByMailAddress(mailAddress: String, includeRemoved: Boolean = false)(
implicit s: Session
): Option[Account] =
Accounts
.filter(
t => (t.mailAddress.toLowerCase === mailAddress.toLowerCase.bind) && (t.removed === false.bind, !includeRemoved)
)
.firstOption
.map(Some(_)) getOrElse {
AccountExtraMailAddresses
.filter(
t => (t.extraMailAddress.toLowerCase === mailAddress.toLowerCase.bind)
)
.firstOption
.map(x => getAccountByUserName(x.userName, includeRemoved))
.flatten
}
(Accounts joinLeft AccountExtraMailAddresses on { case (a, e) => a.userName === e.userName })
.filter {
case (a, x) =>
((a.mailAddress.toLowerCase === mailAddress.toLowerCase.bind) ||
(x.map { e =>
e.extraMailAddress.toLowerCase === mailAddress.toLowerCase.bind
}
.getOrElse(false.bind))) && (a.removed === false.bind, !includeRemoved)
}
.map { case (a, e) => a } firstOption
def getAllUsers(includeRemoved: Boolean = true, includeGroups: Boolean = true)(implicit s: Session): List[Account] = {
Accounts filter { t =>