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

fix getMergedComment for PR API merged field.

Browse Source
This commit is contained in:
KOUNOIKE Yuusuke
2017-07-30 11:39:36 +09:00
parent 0aafc16648
commit 9ee71e9f25
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/gitbucket/core/service/IssuesService.scala
View File

@@ -32,8 +32,12 @@ trait IssuesService {
.list .list
def getMergedComment(owner: String, repository: String, issueId: Int)(implicit s: Session): Option[(IssueComment, Account)] = { def getMergedComment(owner: String, repository: String, issueId: Int)(implicit s: Session): Option[(IssueComment, Account)] = {
getCommentsForApi(owner, repository, issueId) IssueComments.filter(_.byIssue(owner, repository, issueId))
.collectFirst { case (comment, account, _) if comment.action == "merged" => (comment, account) } .filter(_.action === "merge".bind)
.join(Accounts).on { case t1 ~ t2 => t1.commentedUserName === t2.userName }
.map { case t1 ~ t2 => (t1, t2)}
.list
.collectFirst { case (comment, account) if comment.action == "merge" => (comment, account) }
} }
def getComment(owner: String, repository: String, commentId: String)(implicit s: Session): Option[IssueComment] = { def getComment(owner: String, repository: String, commentId: String)(implicit s: Session): Option[IssueComment] = {