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

(refs #1271)Add some properties to ApiPullRequest model

Browse Source
This commit is contained in:
Naoki Takezoe
2016-12-09 20:19:55 +09:00
parent 840479a022
commit 0c2283ce28
3 changed files with 89 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/scala/gitbucket/core/api/ApiPullRequest.scala
View File

@@ -15,6 +15,8 @@ case class ApiPullRequest(
head: ApiPullRequest.Commit, head: ApiPullRequest.Commit,
base: ApiPullRequest.Commit, base: ApiPullRequest.Commit,
mergeable: Option[Boolean], mergeable: Option[Boolean],
merged: Boolean,
merged_at: Option[Date],
title: String, title: String,
body: String, body: String,
user: ApiUser) { user: ApiUser) {
@@ -31,7 +33,8 @@ case class ApiPullRequest(
} }
object ApiPullRequest{ object ApiPullRequest{
def apply(issue: Issue, pullRequest: PullRequest, headRepo: ApiRepository, baseRepo: ApiRepository, user: ApiUser): ApiPullRequest = def apply(issue: Issue, pullRequest: PullRequest, headRepo: ApiRepository, baseRepo: ApiRepository, user: ApiUser,
/*mergeable: Boolean,*/ merged: Boolean, mergedAt: Option[Date]): ApiPullRequest =
ApiPullRequest( ApiPullRequest(
number = issue.issueId, number = issue.issueId,
updated_at = issue.updatedDate, updated_at = issue.updatedDate,
@@ -45,6 +48,8 @@ object ApiPullRequest{
ref = pullRequest.branch, ref = pullRequest.branch,
repo = baseRepo)(issue.userName), repo = baseRepo)(issue.userName),
mergeable = None, // TODO: need check mergeable. mergeable = None, // TODO: need check mergeable.
merged = merged,
merged_at = mergedAt,
title = issue.title, title = issue.title,
body = issue.content.getOrElse(""), body = issue.content.getOrElse(""),
user = user user = user

30
src/main/scala/gitbucket/core/controller/ApiController.scala
View File

@@ -405,13 +405,18 @@ trait ApiControllerBase extends ControllerBase {
repos = repository.owner -> repository.name repos = repository.owner -> repository.name
) )
JsonFormat(issues.map { case (issue, issueUser, commentCount, pullRequest, headRepo, headOwner) => JsonFormat(issues.map { case (issue, issueUser, commentCount, pullRequest, headRepo, headOwner) =>
val comments = getCommentsForApi(repository.owner, repository.name, issue.issueId)
ApiPullRequest( ApiPullRequest(
issue, issue = issue,
pullRequest, pullRequest = pullRequest,
ApiRepository(headRepo, ApiUser(headOwner)), headRepo = ApiRepository(headRepo, ApiUser(headOwner)),
ApiRepository(repository, ApiUser(baseOwner)), baseRepo = ApiRepository(repository, ApiUser(baseOwner)),
ApiUser(issueUser) user = ApiUser(issueUser),
merged = comments.exists { case (comment, _, _) => comment.action == "merged" },
mergedAt = comments.collectFirst { case (comment, _, _) if(comment.action == "merged") => comment.registeredDate }
) )
}) })
}) })
@@ -429,12 +434,17 @@ trait ApiControllerBase extends ControllerBase {
issueUser <- users.get(issue.openedUserName) issueUser <- users.get(issue.openedUserName)
headRepo <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName) headRepo <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName)
} yield { } yield {
val comments = getCommentsForApi(repository.owner, repository.name, issueId)
JsonFormat(ApiPullRequest( JsonFormat(ApiPullRequest(
issue, issue = issue,
pullRequest, pullRequest = pullRequest,
ApiRepository(headRepo, ApiUser(headOwner)), headRepo = ApiRepository(headRepo, ApiUser(headOwner)),
ApiRepository(repository, ApiUser(baseOwner)), baseRepo = ApiRepository(repository, ApiUser(baseOwner)),
ApiUser(issueUser))) user = ApiUser(issueUser),
merged = comments.exists { case (comment, _, _) => comment.action == "merged" },
mergedAt = comments.collectFirst { case (comment, _, _) if(comment.action == "merged") => comment.registeredDate }
))
}) getOrElse NotFound() }) getOrElse NotFound()
}) })

88
src/main/scala/gitbucket/core/service/WebHookService.scala
View File

@@ -1,9 +1,11 @@
package gitbucket.core.service package gitbucket.core.service
import java.util.Date
import fr.brouillard.oss.security.xhub.XHub import fr.brouillard.oss.security.xhub.XHub
import fr.brouillard.oss.security.xhub.XHub.{XHubDigest, XHubConverter} import fr.brouillard.oss.security.xhub.XHub.{XHubConverter, XHubDigest}
import gitbucket.core.api._ import gitbucket.core.api._
import gitbucket.core.model.{WebHook, Account, Issue, PullRequest, IssueComment, WebHookEvent, CommitComment} import gitbucket.core.model.{Account, CommitComment, Issue, IssueComment, PullRequest, WebHook, WebHookEvent}
import gitbucket.core.model.Profile._ import gitbucket.core.model.Profile._
import org.apache.http.client.utils.URLEncodedUtils import org.apache.http.client.utils.URLEncodedUtils
import profile.simple._ import profile.simple._
@@ -16,6 +18,7 @@ import org.apache.http.message.BasicNameValuePair
import org.eclipse.jgit.api.Git import org.eclipse.jgit.api.Git
import org.eclipse.jgit.lib.ObjectId import org.eclipse.jgit.lib.ObjectId
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
import scala.concurrent._ import scala.concurrent._
import org.apache.http.HttpRequest import org.apache.http.HttpRequest
import org.apache.http.HttpResponse import org.apache.http.HttpResponse
@@ -189,6 +192,8 @@ trait WebHookPullRequestService extends WebHookService {
issueUser <- users.get(issue.openedUserName) issueUser <- users.get(issue.openedUserName)
headRepo <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName) headRepo <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName)
} yield { } yield {
val comments = getCommentsForApi(repository.owner, repository.name, issueId)
WebHookPullRequestPayload( WebHookPullRequestPayload(
action = action, action = action,
issue = issue, issue = issue,
@@ -198,7 +203,10 @@ trait WebHookPullRequestService extends WebHookService {
headOwner = headOwner, headOwner = headOwner,
baseRepository = repository, baseRepository = repository,
baseOwner = baseOwner, baseOwner = baseOwner,
sender = sender) sender = sender,
merged = comments.exists { case (comment, _, _) => comment.action == "merged" },
mergedAt = comments.collectFirst { case (comment, _, _) if(comment.action == "merged") => comment.registeredDate }
)
} }
} }
} }
@@ -228,6 +236,8 @@ trait WebHookPullRequestService extends WebHookService {
((issue, issueUser, pullRequest, baseOwner, headOwner), webHooks) <- getPullRequestsByRequestForWebhook(requestRepository.owner, requestRepository.name, requestBranch) ((issue, issueUser, pullRequest, baseOwner, headOwner), webHooks) <- getPullRequestsByRequestForWebhook(requestRepository.owner, requestRepository.name, requestBranch)
baseRepo <- getRepository(pullRequest.userName, pullRequest.repositoryName) baseRepo <- getRepository(pullRequest.userName, pullRequest.repositoryName)
} yield { } yield {
val comments = getCommentsForApi(baseRepo.owner, baseRepo.name, issue.issueId)
val payload = WebHookPullRequestPayload( val payload = WebHookPullRequestPayload(
action = action, action = action,
issue = issue, issue = issue,
@@ -237,7 +247,11 @@ trait WebHookPullRequestService extends WebHookService {
headOwner = headOwner, headOwner = headOwner,
baseRepository = baseRepo, baseRepository = baseRepo,
baseOwner = baseOwner, baseOwner = baseOwner,
sender = sender) sender = sender,
merged = comments.exists { case (comment, _, _) => comment.action == "merged" },
mergedAt = comments.collectFirst { case (comment, _, _) if(comment.action == "merged") => comment.registeredDate }
)
callWebHook(WebHook.PullRequest, webHooks, payload) callWebHook(WebHook.PullRequest, webHooks, payload)
} }
} }
@@ -257,6 +271,8 @@ trait WebHookPullRequestReviewCommentService extends WebHookService {
issueUser <- users.get(issue.openedUserName) issueUser <- users.get(issue.openedUserName)
headRepo <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName) headRepo <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName)
} yield { } yield {
val comments = getCommentsForApi(repository.owner, repository.name, issue.issueId)
WebHookPullRequestReviewCommentPayload( WebHookPullRequestReviewCommentPayload(
action = action, action = action,
comment = comment, comment = comment,
@@ -267,7 +283,10 @@ trait WebHookPullRequestReviewCommentService extends WebHookService {
headOwner = headOwner, headOwner = headOwner,
baseRepository = repository, baseRepository = repository,
baseOwner = baseOwner, baseOwner = baseOwner,
sender = sender) sender = sender,
merged = comments.exists { case (comment, _, _) => comment.action == "merged" },
mergedAt = comments.collectFirst { case (comment, _, _) if(comment.action == "merged") => comment.registeredDate }
)
} }
} }
} }
@@ -365,11 +384,14 @@ object WebHookService {
headOwner: Account, headOwner: Account,
baseRepository: RepositoryInfo, baseRepository: RepositoryInfo,
baseOwner: Account, baseOwner: Account,
sender: Account): WebHookPullRequestPayload = { sender: Account,
merged: Boolean,
mergedAt: Option[Date]): WebHookPullRequestPayload = {
val headRepoPayload = ApiRepository(headRepository, headOwner) val headRepoPayload = ApiRepository(headRepository, headOwner)
val baseRepoPayload = ApiRepository(baseRepository, baseOwner) val baseRepoPayload = ApiRepository(baseRepository, baseOwner)
val senderPayload = ApiUser(sender) val senderPayload = ApiUser(sender)
val pr = ApiPullRequest(issue, pullRequest, headRepoPayload, baseRepoPayload, ApiUser(issueUser)) val pr = ApiPullRequest(issue, pullRequest, headRepoPayload, baseRepoPayload, ApiUser(issueUser), merged, mergedAt)
WebHookPullRequestPayload( WebHookPullRequestPayload(
action = action, action = action,
number = issue.issueId, number = issue.issueId,
@@ -389,7 +411,7 @@ object WebHookService {
sender: ApiUser sender: ApiUser
) extends WebHookPayload ) extends WebHookPayload
object WebHookIssueCommentPayload{ object WebHookIssueCommentPayload {
def apply( def apply(
issue: Issue, issue: Issue,
issueUser: Account, issueUser: Account,
@@ -415,28 +437,44 @@ object WebHookService {
sender: ApiUser sender: ApiUser
) extends WebHookPayload ) extends WebHookPayload
object WebHookPullRequestReviewCommentPayload{ object WebHookPullRequestReviewCommentPayload {
def apply( def apply(
action: String, action: String,
comment: CommitComment, comment: CommitComment,
issue: Issue, issue: Issue,
issueUser: Account, issueUser: Account,
pullRequest: PullRequest, pullRequest: PullRequest,
headRepository: RepositoryInfo, headRepository: RepositoryInfo,
headOwner: Account, headOwner: Account,
baseRepository: RepositoryInfo, baseRepository: RepositoryInfo,
baseOwner: Account, baseOwner: Account,
sender: Account sender: Account,
) : WebHookPullRequestReviewCommentPayload = { merged: Boolean,
mergedAt: Option[Date]
) : WebHookPullRequestReviewCommentPayload = {
val headRepoPayload = ApiRepository(headRepository, headOwner) val headRepoPayload = ApiRepository(headRepository, headOwner)
val baseRepoPayload = ApiRepository(baseRepository, baseOwner) val baseRepoPayload = ApiRepository(baseRepository, baseOwner)
val senderPayload = ApiUser(sender) val senderPayload = ApiUser(sender)
WebHookPullRequestReviewCommentPayload( WebHookPullRequestReviewCommentPayload(
action = action, action = action,
comment = ApiPullRequestReviewComment(comment, senderPayload, RepositoryName(baseRepository), issue.issueId), comment = ApiPullRequestReviewComment(
pull_request = ApiPullRequest(issue, pullRequest, headRepoPayload, baseRepoPayload, ApiUser(issueUser)), comment = comment,
repository = baseRepoPayload, commentedUser = senderPayload,
sender = senderPayload) repositoryName = RepositoryName(baseRepository),
issueId = issue.issueId
),
pull_request = ApiPullRequest(
issue = issue,
pullRequest = pullRequest,
headRepo = headRepoPayload,
baseRepo = baseRepoPayload,
user = ApiUser(issueUser),
merged = merged,
mergedAt = mergedAt
),
repository = baseRepoPayload,
sender = senderPayload)
} }
} }
} }