Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-07 14:05:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactoring. avoid Option#get

Browse Source
This commit is contained in:
xuwei-k
2013-10-14 01:18:31 +09:00
parent 7de0a3fd70
commit d772fc3ba2
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/scala/service/PullRequestService.scala
View File

@@ -9,13 +9,10 @@ trait PullRequestService { self: IssuesService =>
import PullRequestService._
def getPullRequest(owner: String, repository: String, issueId: Int): Option[(Issue, PullRequest)] =
defining(getIssue(owner, repository, issueId.toString)){ issue =>
if(issue.isDefined){
Query(PullRequests).filter(_.byPrimaryKey(owner, repository, issueId)).firstOption match {
case Some(pullreq) => Some((issue.get, pullreq))
case None => None
}
} else None
getIssue(owner, repository, issueId.toString).flatMap{ issue =>
Query(PullRequests).filter(_.byPrimaryKey(owner, repository, issueId)).firstOption.map{
pullreq => (issue, pullreq)
}
}
def getPullRequestCountGroupByUser(closed: Boolean, owner: String, repository: Option[String]): List[PullRequestCount] =
@@ -54,4 +51,4 @@ object PullRequestService {
case class PullRequestCount(userName: String, count: Int)
}
}