Skip to content

Commit f0dd070

Browse files
committed
pull request updates will also trigger code owners review requests
1 parent 8362a41 commit f0dd070

File tree

3 files changed

+21
-7
lines changed

3 files changed

+21
-7
lines changed

services/issue/issue.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,12 @@ func ChangeTitle(ctx context.Context, issue *issues_model.Issue, doer *user_mode
9292

9393
var reviewNotifiers []*ReviewRequestNotifier
9494
if issue.IsPull && issues_model.HasWorkInProgressPrefix(oldTitle) && !issues_model.HasWorkInProgressPrefix(title) {
95+
if err := issue.LoadPullRequest(ctx); err != nil {
96+
return err
97+
}
98+
9599
var err error
96-
reviewNotifiers, err = PullRequestCodeOwnersReview(ctx, issue, issue.PullRequest)
100+
reviewNotifiers, err = PullRequestCodeOwnersReview(ctx, issue.PullRequest)
97101
if err != nil {
98102
log.Error("PullRequestCodeOwnersReview: %v", err)
99103
}

services/issue/pull.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@ type ReviewRequestNotifier struct {
4040
ReviewTeam *org_model.Team
4141
}
4242

43-
func PullRequestCodeOwnersReview(ctx context.Context, issue *issues_model.Issue, pr *issues_model.PullRequest) ([]*ReviewRequestNotifier, error) {
44-
files := []string{"CODEOWNERS", "docs/CODEOWNERS", ".gitea/CODEOWNERS"}
45-
43+
func PullRequestCodeOwnersReview(ctx context.Context, pr *issues_model.PullRequest) ([]*ReviewRequestNotifier, error) {
44+
if err := pr.LoadIssue(ctx); err != nil {
45+
return nil, err
46+
}
47+
issue := pr.Issue
4648
if pr.IsWorkInProgress(ctx) {
4749
return nil, nil
4850
}
49-
5051
if err := pr.LoadHeadRepo(ctx); err != nil {
5152
return nil, err
5253
}
53-
5454
if err := pr.LoadBaseRepo(ctx); err != nil {
5555
return nil, err
5656
}
@@ -71,6 +71,7 @@ func PullRequestCodeOwnersReview(ctx context.Context, issue *issues_model.Issue,
7171
}
7272

7373
var data string
74+
files := []string{"CODEOWNERS", "docs/CODEOWNERS", ".gitea/CODEOWNERS"}
7475
for _, file := range files {
7576
if blob, err := commit.GetBlobByPath(file); err == nil {
7677
data, err = blob.GetBlobContent(setting.UI.MaxDisplayFileSize)

services/pull/pull.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ func NewPullRequest(ctx context.Context, opts *NewPullRequestOptions) error {
176176
}
177177

178178
if !pr.IsWorkInProgress(ctx) {
179-
reviewNotifiers, err = issue_service.PullRequestCodeOwnersReview(ctx, issue, pr)
179+
reviewNotifiers, err = issue_service.PullRequestCodeOwnersReview(ctx, pr)
180180
if err != nil {
181181
return err
182182
}
@@ -453,6 +453,15 @@ func AddTestPullRequestTask(doer *user_model.User, repoID int64, branch string,
453453
}
454454
}
455455

456+
if !pr.IsWorkInProgress(ctx) {
457+
reviewNotifiers, err := issue_service.PullRequestCodeOwnersReview(ctx, pr)
458+
if err != nil {
459+
log.Error("PullRequestCodeOwnersReview: %v", err)
460+
} else {
461+
issue_service.ReviewRequestNotify(ctx, pr.Issue, doer, reviewNotifiers)
462+
}
463+
}
464+
456465
notify_service.PullRequestSynchronized(ctx, doer, pr)
457466
}
458467
}

0 commit comments

Comments
 (0)