fix & finish

Author: 6543

routers/api/v1/repo/pull_review.go

@@ -16,6 +16,7 @@ import (
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/web"
 	"code.gitea.io/gitea/routers/api/v1/utils"
+	"code.gitea.io/gitea/services/automerge"
 	"code.gitea.io/gitea/services/context"
 	"code.gitea.io/gitea/services/convert"
 	issue_service "code.gitea.io/gitea/services/issue"
@@ -376,6 +377,11 @@ func CreatePullReview(ctx *context.APIContext) {
 		return
 	}
 
+	// as a missing / blocking reviews could have blocked a pending automerge let's recheck
+	if reviewType == issues_model.ReviewTypeApprove {
+		automerge.MergeScheduledPullRequest(pr)
+	}
+
 	// convert response
 	apiReview, err := convert.ToPullReview(ctx, review, ctx.Doer)
 	if err != nil {
@@ -464,6 +470,11 @@ func SubmitPullReview(ctx *context.APIContext) {
 		return
 	}
 
+	// as a missing / blocking reviews could have blocked a pending automerge let's recheck
+	if review.Type == issues_model.ReviewTypeApprove {
+		automerge.MergeScheduledPullRequest(pr)
+	}
+
 	// convert response
 	apiReview, err := convert.ToPullReview(ctx, review, ctx.Doer)
 	if err != nil {
@@ -889,12 +900,15 @@ func dismissReview(ctx *context.APIContext, msg string, isDismiss, dismissPriors
 		return
 	}
 
-	_, err := pull_service.DismissReview(ctx, review.ID, ctx.Repo.Repository.ID, msg, ctx.Doer, isDismiss, dismissPriors)
+	comm, err := pull_service.DismissReview(ctx, review.ID, ctx.Repo.Repository.ID, msg, ctx.Doer, isDismiss, dismissPriors)
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, "pull_service.DismissReview", err)
 		return
 	}
 
+	// as reviews could have blocked a pending automerge let's recheck
+	automerge.MergeScheduledPullRequest(comm.Issue.PullRequest)
+
 	if review, err = issues_model.GetReviewByID(ctx, review.ID); err != nil {
 		ctx.Error(http.StatusInternalServerError, "GetReviewByID", err)
 		return

routers/web/repo/pull_review.go

@@ -15,6 +15,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/web"
+	"code.gitea.io/gitea/services/automerge"
 	"code.gitea.io/gitea/services/context"
 	"code.gitea.io/gitea/services/context/upload"
 	"code.gitea.io/gitea/services/forms"
@@ -265,6 +266,17 @@ func SubmitReview(ctx *context.Context) {
 		}
 		return
 	}
+
+	// as a missing / blocking reviews could have blocked a pending automerge let's recheck
+	if reviewType == issues_model.ReviewTypeApprove {
+		pr, err := issue.GetPullRequest(ctx)
+		if err != nil {
+			ctx.ServerError("GetPullRequest", err)
+			return
+		}
+		automerge.MergeScheduledPullRequest(pr)
+	}
+
 	ctx.JSONRedirect(fmt.Sprintf("%s/pulls/%d#%s", ctx.Repo.RepoLink, issue.Index, comm.HashTag()))
 }
 
@@ -277,6 +289,9 @@ func DismissReview(ctx *context.Context) {
 		return
 	}
 
+	// as reviews could have blocked a pending automerge let's recheck
+	automerge.MergeScheduledPullRequest(comm.Issue.PullRequest)
+
 	ctx.Redirect(fmt.Sprintf("%s/pulls/%d#%s", ctx.Repo.RepoLink, comm.Issue.Index, comm.HashTag()))
 }
 

services/pull/review.go

@@ -20,7 +20,6 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/util"
-	"code.gitea.io/gitea/services/automerge"
 	notify_service "code.gitea.io/gitea/services/notify"
 )
 
@@ -317,11 +316,6 @@ func SubmitReview(ctx context.Context, doer *user_model.User, gitRepo *git.Repos
 		}
 	}
 
-	// as a missing / blocking reviews could have blocked a pending automerge let's recheck
-	if review.Type == issues_model.ReviewTypeApprove {
-		automerge.MergeScheduledPullRequest(pr)
-	}
-
 	return review, comm, nil
 }
 
@@ -438,8 +432,5 @@ func DismissReview(ctx context.Context, reviewID, repoID int64, message string,
 
 	notify_service.PullReviewDismiss(ctx, doer, review, comment)
 
-	// as reviews could have blocked a pending automerge let's recheck
-	automerge.MergeScheduledPullRequest(review.Issue.PullRequest)
-
 	return comment, nil
 }