Skip to content

Commit 5cbdf83

Browse files
authored
Use pullrequestlist instead of []*pullrequest (go-gitea#33765)
Just renames no code changed.
1 parent 2c8bdd2 commit 5cbdf83

File tree

3 files changed

+18
-19
lines changed

3 files changed

+18
-19
lines changed

models/issues/pull_list.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func listPullRequestStatement(ctx context.Context, baseRepoID int64, opts *PullR
6161
}
6262

6363
// GetUnmergedPullRequestsByHeadInfo returns all pull requests that are open and has not been merged
64-
func GetUnmergedPullRequestsByHeadInfo(ctx context.Context, repoID int64, branch string) ([]*PullRequest, error) {
64+
func GetUnmergedPullRequestsByHeadInfo(ctx context.Context, repoID int64, branch string) (PullRequestList, error) {
6565
prs := make([]*PullRequest, 0, 2)
6666
sess := db.GetEngine(ctx).
6767
Join("INNER", "issue", "issue.id = pull_request.issue_id").
@@ -116,7 +116,7 @@ func HasUnmergedPullRequestsByHeadInfo(ctx context.Context, repoID int64, branch
116116

117117
// GetUnmergedPullRequestsByBaseInfo returns all pull requests that are open and has not been merged
118118
// by given base information (repo and branch).
119-
func GetUnmergedPullRequestsByBaseInfo(ctx context.Context, repoID int64, branch string) ([]*PullRequest, error) {
119+
func GetUnmergedPullRequestsByBaseInfo(ctx context.Context, repoID int64, branch string) (PullRequestList, error) {
120120
prs := make([]*PullRequest, 0, 2)
121121
return prs, db.GetEngine(ctx).
122122
Where("base_repo_id=? AND base_branch=? AND has_merged=? AND issue.is_closed=?",

models/issues/pull_list_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import (
1616
func TestPullRequestList_LoadAttributes(t *testing.T) {
1717
assert.NoError(t, unittest.PrepareTestDatabase())
1818

19-
prs := []*issues_model.PullRequest{
19+
prs := issues_model.PullRequestList{
2020
unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: 1}),
2121
unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: 2}),
2222
}
23-
assert.NoError(t, issues_model.PullRequestList(prs).LoadAttributes(db.DefaultContext))
23+
assert.NoError(t, prs.LoadAttributes(db.DefaultContext))
2424
for _, pr := range prs {
2525
assert.NotNil(t, pr.Issue)
2626
assert.Equal(t, pr.IssueID, pr.Issue.ID)
@@ -32,11 +32,11 @@ func TestPullRequestList_LoadAttributes(t *testing.T) {
3232
func TestPullRequestList_LoadReviewCommentsCounts(t *testing.T) {
3333
assert.NoError(t, unittest.PrepareTestDatabase())
3434

35-
prs := []*issues_model.PullRequest{
35+
prs := issues_model.PullRequestList{
3636
unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: 1}),
3737
unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: 2}),
3838
}
39-
reviewComments, err := issues_model.PullRequestList(prs).LoadReviewCommentsCounts(db.DefaultContext)
39+
reviewComments, err := prs.LoadReviewCommentsCounts(db.DefaultContext)
4040
assert.NoError(t, err)
4141
assert.Len(t, reviewComments, 2)
4242
for _, pr := range prs {
@@ -47,11 +47,11 @@ func TestPullRequestList_LoadReviewCommentsCounts(t *testing.T) {
4747
func TestPullRequestList_LoadReviews(t *testing.T) {
4848
assert.NoError(t, unittest.PrepareTestDatabase())
4949

50-
prs := []*issues_model.PullRequest{
50+
prs := issues_model.PullRequestList{
5151
unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: 1}),
5252
unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: 2}),
5353
}
54-
reviewList, err := issues_model.PullRequestList(prs).LoadReviews(db.DefaultContext)
54+
reviewList, err := prs.LoadReviews(db.DefaultContext)
5555
assert.NoError(t, err)
5656
// 1, 7, 8, 9, 10, 22
5757
assert.Len(t, reviewList, 6)

services/pull/pull.go

+10-11
Original file line numberDiff line numberDiff line change
@@ -407,11 +407,10 @@ func AddTestPullRequestTask(doer *user_model.User, repoID int64, branch string,
407407
}
408408

409409
if isSync {
410-
requests := issues_model.PullRequestList(prs)
411-
if err = requests.LoadAttributes(ctx); err != nil {
410+
if err = prs.LoadAttributes(ctx); err != nil {
412411
log.Error("PullRequestList.LoadAttributes: %v", err)
413412
}
414-
if invalidationErr := checkForInvalidation(ctx, requests, repoID, doer, branch); invalidationErr != nil {
413+
if invalidationErr := checkForInvalidation(ctx, prs, repoID, doer, branch); invalidationErr != nil {
415414
log.Error("checkForInvalidation: %v", invalidationErr)
416415
}
417416
if err == nil {
@@ -645,7 +644,7 @@ func retargetBranchPulls(ctx context.Context, doer *user_model.User, repoID int6
645644
return err
646645
}
647646

648-
if err := issues_model.PullRequestList(prs).LoadAttributes(ctx); err != nil {
647+
if err := prs.LoadAttributes(ctx); err != nil {
649648
return err
650649
}
651650

@@ -672,11 +671,11 @@ func AdjustPullsCausedByBranchDeleted(ctx context.Context, doer *user_model.User
672671
return err
673672
}
674673

675-
if err := issues_model.PullRequestList(prs).LoadAttributes(ctx); err != nil {
674+
if err := prs.LoadAttributes(ctx); err != nil {
676675
return err
677676
}
678-
issues_model.PullRequestList(prs).SetHeadRepo(repo)
679-
if err := issues_model.PullRequestList(prs).LoadRepositories(ctx); err != nil {
677+
prs.SetHeadRepo(repo)
678+
if err := prs.LoadRepositories(ctx); err != nil {
680679
return err
681680
}
682681

@@ -707,11 +706,11 @@ func AdjustPullsCausedByBranchDeleted(ctx context.Context, doer *user_model.User
707706
return err
708707
}
709708

710-
if err := issues_model.PullRequestList(prs).LoadAttributes(ctx); err != nil {
709+
if err := prs.LoadAttributes(ctx); err != nil {
711710
return err
712711
}
713-
issues_model.PullRequestList(prs).SetBaseRepo(repo)
714-
if err := issues_model.PullRequestList(prs).LoadRepositories(ctx); err != nil {
712+
prs.SetBaseRepo(repo)
713+
if err := prs.LoadRepositories(ctx); err != nil {
715714
return err
716715
}
717716

@@ -744,7 +743,7 @@ func CloseRepoBranchesPulls(ctx context.Context, doer *user_model.User, repo *re
744743
return err
745744
}
746745

747-
if err = issues_model.PullRequestList(prs).LoadAttributes(ctx); err != nil {
746+
if err = prs.LoadAttributes(ctx); err != nil {
748747
return err
749748
}
750749

0 commit comments

Comments
 (0)