Merge pull request #31 from takezoe/fix-pull-request-build

Fix pull request build

Author: takezoe

src/main/scala/Plugin.scala

@@ -1,11 +1,11 @@
 import javax.servlet.ServletContext
 
 import gitbucket.core.controller.Context
-import gitbucket.core.plugin.{Link, PluginRegistry, ReceiveHook, RepositoryHook}
+import gitbucket.core.plugin._
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service.SystemSettingsService
 import io.github.gitbucket.ci.controller.CIController
-import io.github.gitbucket.ci.hook.{CICommitHook, CIRepositoryHook}
+import io.github.gitbucket.ci.hook.{CICommitHook, CIPullRequestHook, CIRepositoryHook}
 import io.github.gitbucket.ci.manager.BuildManager
 import io.github.gitbucket.solidbase.migration.LiquibaseMigration
 import io.github.gitbucket.solidbase.model.Version
@@ -36,6 +36,7 @@ class Plugin extends gitbucket.core.plugin.Plugin {
 
   override val receiveHooks: Seq[ReceiveHook] = Seq(new CICommitHook())
   override val repositoryHooks: Seq[RepositoryHook] = Seq(new CIRepositoryHook())
+  override val pullRequestHooks: Seq[PullRequestHook] = Seq(new CIPullRequestHook())
 
   // TODO GitBucket should provide a hook method to initialize plugin...
   BuildManager.startBuildManager()

src/main/scala/io/github/gitbucket/ci/hook/CICommitHook.scala

@@ -41,33 +41,32 @@ class CICommitHook extends ReceiveHook
                 config              = config
               )
             }
-          } else {
-            val pullRequests = PullRequests
+          }
+          
+          for {
+            (pullreq, issue) <- PullRequests
               .join(Issues).on { (t1, t2) => t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) }
               .filter { case (t1, t2) =>
                 (t1.requestUserName === owner.bind) && (t1.requestRepositoryName === repository.bind) &&
-                (t1.requestBranch === branch.bind) && (t2.closed === false.bind)
+                  (t1.requestBranch === branch.bind) && (t2.closed === false.bind)
               }
               .list
-
-            pullRequests.foreach { case (pullRequest, issue) =>
-              loadCIConfig(pullRequest.userName, pullRequest.repositoryName).foreach { config =>
-                runBuild(
-                  userName            = pullRequest.userName,
-                  repositoryName      = pullRequest.repositoryName,
-                  buildUserName       = owner,
-                  buildRepositoryName = repository,
-                  buildBranch         = branch,
-                  sha                 = sha,
-                  commitMessage       = revCommit.getShortMessage,
-                  commitUserName      = revCommit.getCommitterIdent.getName,
-                  commitMailAddress   = revCommit.getCommitterIdent.getEmailAddress,
-                  pullRequestId       = Some(pullRequest.issueId),
-                  pusher              = pusher,
-                  config              = config
-                )
-              }
-            }
+            buildConfig <- loadCIConfig(pullreq.userName, pullreq.repositoryName)
+          } yield {
+            runBuild(
+              userName            = pullreq.userName,
+              repositoryName      = pullreq.repositoryName,
+              buildUserName       = owner,
+              buildRepositoryName = repository,
+              buildBranch         = branch,
+              sha                 = sha,
+              commitMessage       = revCommit.getShortMessage,
+              commitUserName      = revCommit.getCommitterIdent.getName,
+              commitMailAddress   = revCommit.getCommitterIdent.getEmailAddress,
+              pullRequestId       = Some(pullreq.issueId),
+              pusher              = pusher,
+              config              = buildConfig
+            )
           }
         }
       }

src/main/scala/io/github/gitbucket/ci/hook/CIPullRequestHook.scala

@@ -0,0 +1,49 @@
+package io.github.gitbucket.ci.hook
+
+import gitbucket.core.controller.Context
+import gitbucket.core.model.Issue
+import gitbucket.core.plugin.PullRequestHook
+import gitbucket.core.service.RepositoryService.RepositoryInfo
+import gitbucket.core.model.Profile._
+import gitbucket.core.service._
+import gitbucket.core.util.Directory.getRepositoryDir
+import gitbucket.core.util.JGitUtil
+import gitbucket.core.util.SyntaxSugars.using
+import io.github.gitbucket.ci.service.CIService
+import org.eclipse.jgit.api.Git
+import profile.api._
+
+class CIPullRequestHook extends PullRequestHook
+  with PullRequestService with IssuesService with CommitsService with AccountService
+  with RepositoryService with CIService {
+
+  override def created(issue: Issue, repository: RepositoryInfo)(implicit session: Session, context: Context): Unit = {
+    if(issue.isPullRequest){
+      for {
+        (_, pullreq) <- getPullRequest(issue.userName, issue.repositoryName, issue.issueId)
+        buildAuthor  <- context.loginAccount
+        buildConfig  <- loadCIConfig(pullreq.userName, pullreq.repositoryName)
+      } yield {
+        val revCommit = using(Git.open(getRepositoryDir(pullreq.requestUserName, pullreq.requestRepositoryName))) { git =>
+          val objectId = git.getRepository.resolve(pullreq.commitIdTo)
+          JGitUtil.getRevCommitFromId(git, objectId)
+        }
+        runBuild(
+          userName            = pullreq.userName,
+          repositoryName      = pullreq.repositoryName,
+          buildUserName       = pullreq.requestUserName,
+          buildRepositoryName = pullreq.requestRepositoryName,
+          buildBranch         = pullreq.requestBranch,
+          sha                 = pullreq.commitIdTo,
+          commitMessage       = revCommit.getShortMessage,
+          commitUserName      = revCommit.getCommitterIdent.getName,
+          commitMailAddress   = revCommit.getCommitterIdent.getEmailAddress,
+          pullRequestId       = Some(pullreq.issueId),
+          buildAuthor         = buildAuthor,
+          config              = buildConfig
+        )
+      }
+    }
+  }
+
+}