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

fix #2235

Browse Source
This commit is contained in:
KOUNOIKE
2018-12-29 18:33:39 +09:00
parent 38c8977dab
commit 2745a3bfaa
10 changed files with 88 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/scala/gitbucket/core/controller/DashboardController.scala
View File

@@ -9,6 +9,7 @@ import gitbucket.core.service.IssuesService._
class DashboardController
extends DashboardControllerBase
with IssuesService
with MergeService
with PullRequestService
with RepositoryService
with AccountService

1
src/main/scala/gitbucket/core/controller/IssuesController.scala
View File

@@ -24,6 +24,7 @@ class IssuesController
with ReadableUsersAuthenticator
with ReferrerAuthenticator
with WritableUsersAuthenticator
with MergeService
with PullRequestService
with WebHookIssueCommentService
with WebHookPullRequestReviewCommentService

29
src/main/scala/gitbucket/core/controller/PullRequestsController.scala
View File

@@ -534,15 +534,15 @@ trait PullRequestsControllerBase extends ControllerBase {
)
createPullRequest(
originUserName = repository.owner,
originRepositoryName = repository.name,
originRepository = repository,
issueId = issueId,
originBranch = form.targetBranch,
requestUserName = form.requestUserName,
requestRepositoryName = form.requestRepositoryName,
requestBranch = form.requestBranch,
commitIdFrom = form.commitIdFrom,
commitIdTo = form.commitIdTo
commitIdTo = form.commitIdTo,
loginAccount = context.loginAccount.get
)
// insert labels
@@ -557,29 +557,6 @@ trait PullRequestsControllerBase extends ControllerBase {
}
}
// fetch requested branch
fetchAsPullRequest(owner, name, form.requestUserName, form.requestRepositoryName, form.requestBranch, issueId)
// record activity
recordPullRequestActivity(owner, name, loginUserName, issueId, form.title)
// call web hook
callPullRequestWebHook("opened", repository, issueId, context.loginAccount.get)
getIssue(owner, name, issueId.toString) foreach { issue =>
// extract references and create refer comment
createReferComment(
owner,
name,
issue,
form.title + " " + form.content.getOrElse(""),
context.loginAccount.get
)
// call hooks
PluginRegistry().getPullRequestHooks.foreach(_.created(issue, repository))
}
redirect(s"/${owner}/${name}/pull/${issueId}")
}
})

1
src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
View File

@@ -50,6 +50,7 @@ class RepositoryViewerController
with ReadableUsersAuthenticator
with ReferrerAuthenticator
with WritableUsersAuthenticator
with MergeService
with PullRequestService
with CommitStatusService
with WebHookPullRequestService

12
src/main/scala/gitbucket/core/controller/api/ApiPullRequestControllerBase.scala
View File

@@ -106,15 +106,15 @@ trait ApiPullRequestControllerBase extends ControllerBase {
)
createPullRequest(
originUserName = repository.owner,
originRepositoryName = repository.name,
originRepository = repository,
issueId = issueId,
originBranch = createPullReq.base,
requestUserName = reqOwner,
requestRepositoryName = repository.name,
requestBranch = reqBranch,
commitIdFrom = commitIdFrom.getName,
commitIdTo = commitIdTo.getName
commitIdTo = commitIdTo.getName,
loginAccount = context.loginAccount.get
)
getApiPullRequest(repository, issueId).map(JsonFormat(_))
case _ =>
@@ -133,15 +133,15 @@ trait ApiPullRequestControllerBase extends ControllerBase {
case (Some(commitIdFrom), Some(commitIdTo)) =>
changeIssueToPullRequest(repository.owner, repository.name, createPullReqAlt.issue)
createPullRequest(
originUserName = repository.owner,
originRepositoryName = repository.name,
originRepository = repository,
issueId = createPullReqAlt.issue,
originBranch = createPullReqAlt.base,
requestUserName = reqOwner,
requestRepositoryName = repository.name,
requestBranch = reqBranch,
commitIdFrom = commitIdFrom.getName,
commitIdTo = commitIdTo.getName
commitIdTo = commitIdTo.getName,
loginAccount = context.loginAccount.get
)
getApiPullRequest(repository, createPullReqAlt.issue).map(JsonFormat(_))
case _ =>

79
src/main/scala/gitbucket/core/service/PullRequestService.scala
View File

@@ -6,6 +6,8 @@ import gitbucket.core.model.Profile.profile.blockingApi._
import difflib.{Delta, DiffUtils}
import gitbucket.core.service.RepositoryService.RepositoryInfo
import gitbucket.core.api.JsonFormat
import gitbucket.core.controller.Context
import gitbucket.core.plugin.PluginRegistry
import gitbucket.core.util.SyntaxSugars._
import gitbucket.core.util.Directory._
import gitbucket.core.util.Implicits._
@@ -20,7 +22,13 @@ import org.eclipse.jgit.lib.ObjectId
import scala.collection.JavaConverters._
trait PullRequestService {
self: IssuesService with CommitsService with WebHookService with WebHookPullRequestService with RepositoryService =>
self: IssuesService
with CommitsService
with WebHookService
with WebHookPullRequestService
with RepositoryService
with MergeService
with ActivityService =>
import PullRequestService._
def getPullRequest(owner: String, repository: String, issueId: Int)(
@@ -81,27 +89,66 @@ trait PullRequestService {
// .map { x => PullRequestCount(x._1, x._2) }
def createPullRequest(
originUserName: String,
originRepositoryName: String,
originRepository: RepositoryInfo,
issueId: Int,
originBranch: String,
requestUserName: String,
requestRepositoryName: String,
requestBranch: String,
commitIdFrom: String,
commitIdTo: String
)(implicit s: Session): Unit =
PullRequests insert PullRequest(
originUserName,
originRepositoryName,
issueId,
originBranch,
requestUserName,
requestRepositoryName,
requestBranch,
commitIdFrom,
commitIdTo
)
commitIdTo: String,
loginAccount: Account
)(implicit s: Session, context: Context): Unit = {
getIssue(originRepository.owner, originRepository.name, issueId.toString).foreach { baseIssue =>
PullRequests insert PullRequest(
originRepository.owner,
originRepository.name,
issueId,
originBranch,
requestUserName,
requestRepositoryName,
requestBranch,
commitIdFrom,
commitIdTo
)
// fetch requested branch
fetchAsPullRequest(
originRepository.owner,
originRepository.name,
requestUserName,
requestRepositoryName,
requestBranch,
issueId
)
// record activity
recordPullRequestActivity(
originRepository.owner,
originRepository.name,
loginAccount.userName,
issueId,
baseIssue.title
)
// call web hook
callPullRequestWebHook("opened", originRepository, issueId, loginAccount)
getIssue(originRepository.owner, originRepository.name, issueId.toString) foreach { issue =>
// extract references and create refer comment
createReferComment(
originRepository.owner,
originRepository.name,
issue,
baseIssue.title + " " + baseIssue.content,
loginAccount
)
// call hooks
PluginRegistry().getPullRequestHooks.foreach(_.created(issue, originRepository))
}
}
}
def getPullRequestsByRequest(userName: String, repositoryName: String, branch: String, closed: Option[Boolean])(
implicit s: Session

1
src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
View File

@@ -215,6 +215,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
with AccountService
with IssuesService
with ActivityService
with MergeService
with PullRequestService
with WebHookService
with LabelsService

1
src/test/scala/gitbucket/core/service/PullRequestServiceSpec.scala
View File

@@ -6,6 +6,7 @@ import org.scalatest.FunSpec
class PullRequestServiceSpec
extends FunSpec
with ServiceSpecBase
with MergeService
with PullRequestService
with IssuesService
with AccountService

16
src/test/scala/gitbucket/core/service/ServiceSpecBase.scala
View File

@@ -10,12 +10,12 @@ import gitbucket.core.model._
import gitbucket.core.model.Profile._
import gitbucket.core.model.Profile.profile._
import gitbucket.core.model.Profile.profile.blockingApi._
import org.apache.commons.io.FileUtils
import java.sql.DriverManager
import java.io.File
import gitbucket.core.controller.Context
import scala.util.Random
trait ServiceSpecBase {
@@ -44,8 +44,8 @@ trait ServiceSpecBase {
def user(name: String)(implicit s: Session): Account = AccountService.getAccountByUserName(name).get
lazy val dummyService = new RepositoryService with AccountService with ActivityService with IssuesService
with PullRequestService with CommitsService with CommitStatusService with LabelsService with MilestonesService
with PrioritiesService with WebHookService with WebHookPullRequestService
with MergeService with PullRequestService with CommitsService with CommitStatusService with LabelsService
with MilestonesService with PrioritiesService with WebHookService with WebHookPullRequestService
with WebHookPullRequestReviewCommentService {}
def generateNewUserWithDBRepository(userName: String, repositoryName: String)(implicit s: Session): Account = {
@@ -76,16 +76,18 @@ trait ServiceSpecBase {
val Array(baseUserName, baseRepositoryName, baesBranch) = base.split("/")
val Array(requestUserName, requestRepositoryName, requestBranch) = request.split("/")
val issueId = generateNewIssue(baseUserName, baseRepositoryName, Option(loginUser).getOrElse(requestUserName))
val baseRepository = dummyService.getRepository(baseUserName, baseRepositoryName)
val loginAccount = dummyService.getAccountByUserName(loginUser)
dummyService.createPullRequest(
originUserName = baseUserName,
originRepositoryName = baseRepositoryName,
originRepository = baseRepository.get,
issueId = issueId,
originBranch = baesBranch,
requestUserName = requestUserName,
requestRepositoryName = requestRepositoryName,
requestBranch = requestBranch,
commitIdFrom = baesBranch,
commitIdTo = requestBranch
commitIdTo = requestBranch,
loginAccount = loginAccount.get
)
dummyService.getPullRequest(baseUserName, baseRepositoryName, issueId).get
}

4
src/test/scala/gitbucket/core/service/WebHookServiceSpec.scala
View File

@@ -6,8 +6,8 @@ import gitbucket.core.model.WebHookContentType
class WebHookServiceSpec extends FunSuite with ServiceSpecBase {
lazy val service = new WebHookPullRequestService with AccountService with ActivityService with RepositoryService
with PullRequestService with IssuesService with CommitsService with LabelsService with MilestonesService
with PrioritiesService with WebHookPullRequestReviewCommentService
with MergeService with PullRequestService with IssuesService with CommitsService with LabelsService
with MilestonesService with PrioritiesService with WebHookPullRequestReviewCommentService
test("WebHookPullRequestService.getPullRequestsByRequestForWebhook") {
withTestDB { implicit session =>