diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala index ba869c9..c5d7a2a 100644 --- a/src/main/scala/app/PullRequestsController.scala +++ b/src/main/scala/app/PullRequestsController.scala @@ -13,12 +13,12 @@ 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 @@ 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 096ecc3..4649d4e 100644 --- a/src/main/scala/service/ActivityService.scala +++ b/src/main/scala/service/ActivityService.scala @@ -110,6 +110,13 @@ 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) }