(refs #241)Modify AccountService#getGroupMembers() to returns list of GroupMember instead of Tuple2

This commit is contained in:
takezoe
2014-03-06 16:17:41 +09:00
parent c65d80bc72
commit b641bfb56a
8 changed files with 32 additions and 28 deletions

View File

@@ -129,11 +129,10 @@ trait AccountService {
}
}
def getGroupMembers(groupName: String): List[(String, Boolean)] =
def getGroupMembers(groupName: String): List[GroupMember] =
Query(GroupMembers)
.filter(_.groupName is groupName.bind)
.sortBy(_.userName)
.map(m => m.userName ~ m.isManager)
.list
def getGroupsByUserName(userName: String): List[String] =

View File

@@ -204,7 +204,7 @@ trait RepositoryService { self: AccountService =>
private def getRepositoryManagers(userName: String): Seq[String] =
if(getAccountByUserName(userName).exists(_.isGroupAccount)){
getGroupMembers(userName).filter(_._2).map(_._1)
getGroupMembers(userName).collect { case x if(x.isManager) => x.userName }
} else {
Seq(userName)
}