implement NotifyPullRequestReview for ui notification

go-gitea · Oct 18, 2018 · ef91809 · ef91809
1 parent d608022
commit ef91809
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/models/issue.go b/models/issue.go
@@ -112,6 +112,10 @@ func (issue *Issue) GetPullRequest() (pr *PullRequest, err error) {
  }
 
  pr, err = getPullRequestByIssueID(x, issue.ID)
+ if err != nil {
+ return nil, err
+ }
+ pr.Issue = issue
  return
 }
 

diff --git a/models/review.go b/models/review.go
@@ -239,6 +239,8 @@ func getCurrentReview(e Engine, reviewer *User, issue *Issue) (*Review, error) {
  if len(reviews) == 0 {
  return nil, ErrReviewNotExist{}
  }
+ reviews[0].Reviewer = reviewer
+ reviews[0].Issue = issue
  return reviews[0], nil
 }
 

diff --git a/modules/notification/ui/ui.go b/modules/notification/ui/ui.go
@@ -80,7 +80,11 @@ func (ns *notificationService) NotifyNewPullRequest(pr *models.PullRequest) {
  }
 }
 
-func (ns *notificationService) NotifyPullRequestReview(*models.PullRequest, *models.Review, *models.Comment) {
+func (ns *notificationService) NotifyPullRequestReview(pr *models.PullRequest, r *models.Review, c *models.Comment) {
+ ns.issueQueue <- issueNotificationOpts{
+ pr.Issue,
+ r.Reviewer.ID,
+ }
 }
 
 func (ns *notificationService) NotifyUpdateComment(doer *models.User, c *models.Comment, oldContent string) {

diff --git a/routers/repo/pull_review.go b/routers/repo/pull_review.go
@@ -184,5 +184,13 @@ func SubmitReview(ctx *context.Context, form auth.SubmitReviewForm) {
  ctx.ServerError("Publish", err)
  return
  }
+
+ pr, err := issue.GetPullRequest()
+ if err != nil {
+ ctx.ServerError("GetPullRequest", err)
+ return
+ }
+ notification.NotifyPullRequestReview(pr, review, comm)
+
  ctx.Redirect(fmt.Sprintf("%s/pulls/%d#%s", ctx.Repo.RepoLink, issue.Index, comm.HashTag()))
 }