mirror of
				https://codeberg.org/forgejo/forgejo.git
				synced 2025-10-29 13:31:20 +00:00 
			
		
		
		
	This PR will avoid load pullrequest.Issue twice in pull request list page. It will reduce x times database queries for those WIP pull requests. Partially fix #29585 --------- Co-authored-by: Giteabot <teabot@gitea.io> (cherry picked from commit 62f8174aa2fae1481c7e17a6afcb731a5b178cd0) Conflicts: models/activities/notification_list.go moved to models/activities/notification.go
		
			
				
	
	
		
			173 lines
		
	
	
	
		
			5.4 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			173 lines
		
	
	
	
		
			5.4 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2020 The Gitea Authors. All rights reserved.
 | |
| // SPDX-License-Identifier: MIT
 | |
| 
 | |
| package integration
 | |
| 
 | |
| import (
 | |
| 	"net/http"
 | |
| 	"net/url"
 | |
| 	"strings"
 | |
| 	"testing"
 | |
| 	"time"
 | |
| 
 | |
| 	auth_model "code.gitea.io/gitea/models/auth"
 | |
| 	"code.gitea.io/gitea/models/db"
 | |
| 	issues_model "code.gitea.io/gitea/models/issues"
 | |
| 	"code.gitea.io/gitea/models/unittest"
 | |
| 	user_model "code.gitea.io/gitea/models/user"
 | |
| 	"code.gitea.io/gitea/modules/git"
 | |
| 	pull_service "code.gitea.io/gitea/services/pull"
 | |
| 	repo_service "code.gitea.io/gitea/services/repository"
 | |
| 	files_service "code.gitea.io/gitea/services/repository/files"
 | |
| 
 | |
| 	"github.com/stretchr/testify/assert"
 | |
| )
 | |
| 
 | |
| func TestAPIPullUpdate(t *testing.T) {
 | |
| 	onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
 | |
| 		// Create PR to test
 | |
| 		user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
 | |
| 		org26 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 26})
 | |
| 		pr := createOutdatedPR(t, user, org26)
 | |
| 
 | |
| 		// Test GetDiverging
 | |
| 		diffCount, err := pull_service.GetDiverging(git.DefaultContext, pr)
 | |
| 		assert.NoError(t, err)
 | |
| 		assert.EqualValues(t, 1, diffCount.Behind)
 | |
| 		assert.EqualValues(t, 1, diffCount.Ahead)
 | |
| 		assert.NoError(t, pr.LoadBaseRepo(db.DefaultContext))
 | |
| 		assert.NoError(t, pr.LoadIssue(db.DefaultContext))
 | |
| 
 | |
| 		session := loginUser(t, "user2")
 | |
| 		token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
 | |
| 		req := NewRequestf(t, "POST", "/api/v1/repos/%s/%s/pulls/%d/update", pr.BaseRepo.OwnerName, pr.BaseRepo.Name, pr.Issue.Index).
 | |
| 			AddTokenAuth(token)
 | |
| 		session.MakeRequest(t, req, http.StatusOK)
 | |
| 
 | |
| 		// Test GetDiverging after update
 | |
| 		diffCount, err = pull_service.GetDiverging(git.DefaultContext, pr)
 | |
| 		assert.NoError(t, err)
 | |
| 		assert.EqualValues(t, 0, diffCount.Behind)
 | |
| 		assert.EqualValues(t, 2, diffCount.Ahead)
 | |
| 	})
 | |
| }
 | |
| 
 | |
| func TestAPIPullUpdateByRebase(t *testing.T) {
 | |
| 	onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
 | |
| 		// Create PR to test
 | |
| 		user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
 | |
| 		org26 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 26})
 | |
| 		pr := createOutdatedPR(t, user, org26)
 | |
| 
 | |
| 		// Test GetDiverging
 | |
| 		diffCount, err := pull_service.GetDiverging(git.DefaultContext, pr)
 | |
| 		assert.NoError(t, err)
 | |
| 		assert.EqualValues(t, 1, diffCount.Behind)
 | |
| 		assert.EqualValues(t, 1, diffCount.Ahead)
 | |
| 		assert.NoError(t, pr.LoadBaseRepo(db.DefaultContext))
 | |
| 		assert.NoError(t, pr.LoadIssue(db.DefaultContext))
 | |
| 
 | |
| 		session := loginUser(t, "user2")
 | |
| 		token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
 | |
| 		req := NewRequestf(t, "POST", "/api/v1/repos/%s/%s/pulls/%d/update?style=rebase", pr.BaseRepo.OwnerName, pr.BaseRepo.Name, pr.Issue.Index).
 | |
| 			AddTokenAuth(token)
 | |
| 		session.MakeRequest(t, req, http.StatusOK)
 | |
| 
 | |
| 		// Test GetDiverging after update
 | |
| 		diffCount, err = pull_service.GetDiverging(git.DefaultContext, pr)
 | |
| 		assert.NoError(t, err)
 | |
| 		assert.EqualValues(t, 0, diffCount.Behind)
 | |
| 		assert.EqualValues(t, 1, diffCount.Ahead)
 | |
| 	})
 | |
| }
 | |
| 
 | |
| func createOutdatedPR(t *testing.T, actor, forkOrg *user_model.User) *issues_model.PullRequest {
 | |
| 	baseRepo, _, _ := CreateDeclarativeRepo(t, actor, "repo-pr-update", nil, nil, nil)
 | |
| 
 | |
| 	headRepo, err := repo_service.ForkRepository(git.DefaultContext, actor, forkOrg, repo_service.ForkRepoOptions{
 | |
| 		BaseRepo:    baseRepo,
 | |
| 		Name:        "repo-pr-update",
 | |
| 		Description: "desc",
 | |
| 	})
 | |
| 	assert.NoError(t, err)
 | |
| 	assert.NotEmpty(t, headRepo)
 | |
| 
 | |
| 	// create a commit on base Repo
 | |
| 	_, err = files_service.ChangeRepoFiles(git.DefaultContext, baseRepo, actor, &files_service.ChangeRepoFilesOptions{
 | |
| 		Files: []*files_service.ChangeRepoFile{
 | |
| 			{
 | |
| 				Operation:     "create",
 | |
| 				TreePath:      "File_A",
 | |
| 				ContentReader: strings.NewReader("File A"),
 | |
| 			},
 | |
| 		},
 | |
| 		Message:   "Add File A",
 | |
| 		OldBranch: "main",
 | |
| 		NewBranch: "main",
 | |
| 		Author: &files_service.IdentityOptions{
 | |
| 			Name:  actor.Name,
 | |
| 			Email: actor.Email,
 | |
| 		},
 | |
| 		Committer: &files_service.IdentityOptions{
 | |
| 			Name:  actor.Name,
 | |
| 			Email: actor.Email,
 | |
| 		},
 | |
| 		Dates: &files_service.CommitDateOptions{
 | |
| 			Author:    time.Now(),
 | |
| 			Committer: time.Now(),
 | |
| 		},
 | |
| 	})
 | |
| 	assert.NoError(t, err)
 | |
| 
 | |
| 	// create a commit on head Repo
 | |
| 	_, err = files_service.ChangeRepoFiles(git.DefaultContext, headRepo, actor, &files_service.ChangeRepoFilesOptions{
 | |
| 		Files: []*files_service.ChangeRepoFile{
 | |
| 			{
 | |
| 				Operation:     "create",
 | |
| 				TreePath:      "File_B",
 | |
| 				ContentReader: strings.NewReader("File B"),
 | |
| 			},
 | |
| 		},
 | |
| 		Message:   "Add File on PR branch",
 | |
| 		OldBranch: "main",
 | |
| 		NewBranch: "newBranch",
 | |
| 		Author: &files_service.IdentityOptions{
 | |
| 			Name:  actor.Name,
 | |
| 			Email: actor.Email,
 | |
| 		},
 | |
| 		Committer: &files_service.IdentityOptions{
 | |
| 			Name:  actor.Name,
 | |
| 			Email: actor.Email,
 | |
| 		},
 | |
| 		Dates: &files_service.CommitDateOptions{
 | |
| 			Author:    time.Now(),
 | |
| 			Committer: time.Now(),
 | |
| 		},
 | |
| 	})
 | |
| 	assert.NoError(t, err)
 | |
| 
 | |
| 	// create Pull
 | |
| 	pullIssue := &issues_model.Issue{
 | |
| 		RepoID:   baseRepo.ID,
 | |
| 		Title:    "Test Pull -to-update-",
 | |
| 		PosterID: actor.ID,
 | |
| 		Poster:   actor,
 | |
| 		IsPull:   true,
 | |
| 	}
 | |
| 	pullRequest := &issues_model.PullRequest{
 | |
| 		HeadRepoID: headRepo.ID,
 | |
| 		BaseRepoID: baseRepo.ID,
 | |
| 		HeadBranch: "newBranch",
 | |
| 		BaseBranch: "main",
 | |
| 		HeadRepo:   headRepo,
 | |
| 		BaseRepo:   baseRepo,
 | |
| 		Type:       issues_model.PullRequestGitea,
 | |
| 	}
 | |
| 	err = pull_service.NewPullRequest(git.DefaultContext, baseRepo, pullIssue, nil, nil, pullRequest, nil)
 | |
| 	assert.NoError(t, err)
 | |
| 
 | |
| 	issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{Title: "Test Pull -to-update-"})
 | |
| 	assert.NoError(t, issue.LoadPullRequest(db.DefaultContext))
 | |
| 
 | |
| 	return issue.PullRequest
 | |
| }
 |