From 3a7e2c024944bf57d743fe99728a536dff493127 Mon Sep 17 00:00:00 2001
From: takezoe <takezoe@gmail.com>
Date: Sun, 14 Jul 2013 03:27:59 +0900
Subject: [PATCH] (refs #2)Record 'open pull request' activity.

---
 src/main/scala/app/PullRequestsController.scala | 8 +++++---
 src/main/scala/service/ActivityService.scala    | 7 +++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala
index ba869c971..c5d7a2adb 100644
--- a/src/main/scala/app/PullRequestsController.scala
+++ b/src/main/scala/app/PullRequestsController.scala
@@ -13,12 +13,12 @@ import scala.Some
 import util.JGitUtil.CommitInfo
 
 class PullRequestsController extends PullRequestsControllerBase
-  with RepositoryService with AccountService with IssuesService with PullRequestService with MilestonesService
+  with RepositoryService with AccountService with IssuesService with PullRequestService with MilestonesService with ActivityService
   with ReferrerAuthenticator with CollaboratorsAuthenticator
 
 trait PullRequestsControllerBase extends ControllerBase {
-  self: ReferrerAuthenticator with RepositoryService with IssuesService with MilestonesService
-    with PullRequestService with CollaboratorsAuthenticator =>
+  self: RepositoryService with IssuesService with MilestonesService with ActivityService with PullRequestService
+    with ReferrerAuthenticator with CollaboratorsAuthenticator =>
 
   val form = mapping(
     "title"           -> trim(label("Title"  , text(required, maxlength(100)))),
@@ -130,6 +130,8 @@ trait PullRequestsControllerBase extends ControllerBase {
       repository.name,
       form.requestCommitId)
 
+    recordPullRequestActivity(repository.owner, repository.name, loginUserName, issueId, form.title)
+
     redirect(s"/${repository.owner}/${repository.name}/pulls/${issueId}")
   })
 
diff --git a/src/main/scala/service/ActivityService.scala b/src/main/scala/service/ActivityService.scala
index 096ecc3c9..4649d4edc 100644
--- a/src/main/scala/service/ActivityService.scala
+++ b/src/main/scala/service/ActivityService.scala
@@ -110,6 +110,13 @@ trait ActivityService {
       None,
       currentDate)
 
+  def recordPullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
+    Activities.autoInc insert(userName, repositoryName, activityUserName,
+      "open_pullreq",
+      s"[user:${activityUserName}] opened pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
+      Some(title),
+      currentDate)
+
   def insertCommitId(userName: String, repositoryName: String, commitId: String) = {
     CommitLog insert (userName, repositoryName, commitId)
   }