Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 13:35:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary comment and format code.

Browse Source
This commit is contained in:
takezoe
2013-08-05 18:49:08 +09:00
parent 6101e141d8
commit f31848721c
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,6 @@ import model._
trait PullRequestService { self: IssuesService => trait PullRequestService { self: IssuesService =>
import PullRequestService._ import PullRequestService._
// implicit val getPullRequestCount = GetResult(r => PullRequestCount(r.<<, r.<<))
def getPullRequest(owner: String, repository: String, issueId: Int): Option[(Issue, PullRequest)] = { def getPullRequest(owner: String, repository: String, issueId: Int): Option[(Issue, PullRequest)] = {
val issue = getIssue(owner, repository, issueId.toString) val issue = getIssue(owner, repository, issueId.toString)
@@ -19,7 +18,7 @@ trait PullRequestService { self: IssuesService =>
} else None } else None
} }
def getPullRequestCount(closed: Boolean, repository: Option[(String, String)]): List[PullRequestCount] = { def getPullRequestCount(closed: Boolean, repository: Option[(String, String)]): List[PullRequestCount] =
Query(PullRequests) Query(PullRequests)
.innerJoin(Issues).on { (t1, t2) => t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) } .innerJoin(Issues).on { (t1, t2) => t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) }
.filter { case (t1, t2) => .filter { case (t1, t2) =>
@@ -27,18 +26,11 @@ trait PullRequestService { self: IssuesService =>
(t1.userName is repository.get._1, repository.isDefined) && (t1.userName is repository.get._1, repository.isDefined) &&
(t1.repositoryName is repository.get._2, repository.isDefined) (t1.repositoryName is repository.get._2, repository.isDefined)
} }
.groupBy { case (t1, t2) => .groupBy { case (t1, t2) => t2.openedUserName }
t2.openedUserName .map { case (userName, t) => userName ~ t.length }
}
.map { case (userName, t) =>
userName ~ t.length
}
.list .list
.map { x => .map { x => PullRequestCount(x._1, x._2) }
PullRequestCount(x._1, x._2)
}
.sortBy(_.count).reverse .sortBy(_.count).reverse
}
def createPullRequest(originUserName: String, originRepositoryName: String, issueId: Int, def createPullRequest(originUserName: String, originRepositoryName: String, issueId: Int,
originBranch: String, requestUserName: String, requestRepositoryName: String, requestBranch: String, originBranch: String, requestUserName: String, requestRepositoryName: String, requestBranch: String,