mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 08:30:25 +08:00 
			
		
		
		
	Move db related basic functions to models/db (#17075)
* Move db related basic functions to models/db * Fix lint * Fix lint * Fix test * Fix lint * Fix lint * revert unnecessary change * Fix test * Fix wrong replace string * Use *Context * Correct committer spelling and fix wrong replaced words Co-authored-by: zeripath <art27@cantab.net>
This commit is contained in:
		@@ -7,16 +7,17 @@ package models
 | 
			
		||||
import (
 | 
			
		||||
	"testing"
 | 
			
		||||
 | 
			
		||||
	"code.gitea.io/gitea/models/db"
 | 
			
		||||
	"github.com/stretchr/testify/assert"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
func TestRepository_AddCollaborator(t *testing.T) {
 | 
			
		||||
	assert.NoError(t, PrepareTestDatabase())
 | 
			
		||||
	assert.NoError(t, db.PrepareTestDatabase())
 | 
			
		||||
 | 
			
		||||
	testSuccess := func(repoID, userID int64) {
 | 
			
		||||
		repo := AssertExistsAndLoadBean(t, &Repository{ID: repoID}).(*Repository)
 | 
			
		||||
		repo := db.AssertExistsAndLoadBean(t, &Repository{ID: repoID}).(*Repository)
 | 
			
		||||
		assert.NoError(t, repo.GetOwner())
 | 
			
		||||
		user := AssertExistsAndLoadBean(t, &User{ID: userID}).(*User)
 | 
			
		||||
		user := db.AssertExistsAndLoadBean(t, &User{ID: userID}).(*User)
 | 
			
		||||
		assert.NoError(t, repo.AddCollaborator(user))
 | 
			
		||||
		CheckConsistencyFor(t, &Repository{ID: repoID}, &User{ID: userID})
 | 
			
		||||
	}
 | 
			
		||||
@@ -26,12 +27,12 @@ func TestRepository_AddCollaborator(t *testing.T) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func TestRepository_GetCollaborators(t *testing.T) {
 | 
			
		||||
	assert.NoError(t, PrepareTestDatabase())
 | 
			
		||||
	assert.NoError(t, db.PrepareTestDatabase())
 | 
			
		||||
	test := func(repoID int64) {
 | 
			
		||||
		repo := AssertExistsAndLoadBean(t, &Repository{ID: repoID}).(*Repository)
 | 
			
		||||
		repo := db.AssertExistsAndLoadBean(t, &Repository{ID: repoID}).(*Repository)
 | 
			
		||||
		collaborators, err := repo.GetCollaborators(ListOptions{})
 | 
			
		||||
		assert.NoError(t, err)
 | 
			
		||||
		expectedLen, err := x.Count(&Collaboration{RepoID: repoID})
 | 
			
		||||
		expectedLen, err := db.DefaultContext().Engine().Count(&Collaboration{RepoID: repoID})
 | 
			
		||||
		assert.NoError(t, err)
 | 
			
		||||
		assert.Len(t, collaborators, int(expectedLen))
 | 
			
		||||
		for _, collaborator := range collaborators {
 | 
			
		||||
@@ -46,49 +47,49 @@ func TestRepository_GetCollaborators(t *testing.T) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func TestRepository_IsCollaborator(t *testing.T) {
 | 
			
		||||
	assert.NoError(t, PrepareTestDatabase())
 | 
			
		||||
	assert.NoError(t, db.PrepareTestDatabase())
 | 
			
		||||
 | 
			
		||||
	test := func(repoID, userID int64, expected bool) {
 | 
			
		||||
		repo := AssertExistsAndLoadBean(t, &Repository{ID: repoID}).(*Repository)
 | 
			
		||||
		repo := db.AssertExistsAndLoadBean(t, &Repository{ID: repoID}).(*Repository)
 | 
			
		||||
		actual, err := repo.IsCollaborator(userID)
 | 
			
		||||
		assert.NoError(t, err)
 | 
			
		||||
		assert.Equal(t, expected, actual)
 | 
			
		||||
	}
 | 
			
		||||
	test(3, 2, true)
 | 
			
		||||
	test(3, NonexistentID, false)
 | 
			
		||||
	test(3, db.NonexistentID, false)
 | 
			
		||||
	test(4, 2, false)
 | 
			
		||||
	test(4, 4, true)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func TestRepository_ChangeCollaborationAccessMode(t *testing.T) {
 | 
			
		||||
	assert.NoError(t, PrepareTestDatabase())
 | 
			
		||||
	assert.NoError(t, db.PrepareTestDatabase())
 | 
			
		||||
 | 
			
		||||
	repo := AssertExistsAndLoadBean(t, &Repository{ID: 4}).(*Repository)
 | 
			
		||||
	repo := db.AssertExistsAndLoadBean(t, &Repository{ID: 4}).(*Repository)
 | 
			
		||||
	assert.NoError(t, repo.ChangeCollaborationAccessMode(4, AccessModeAdmin))
 | 
			
		||||
 | 
			
		||||
	collaboration := AssertExistsAndLoadBean(t, &Collaboration{RepoID: repo.ID, UserID: 4}).(*Collaboration)
 | 
			
		||||
	collaboration := db.AssertExistsAndLoadBean(t, &Collaboration{RepoID: repo.ID, UserID: 4}).(*Collaboration)
 | 
			
		||||
	assert.EqualValues(t, AccessModeAdmin, collaboration.Mode)
 | 
			
		||||
 | 
			
		||||
	access := AssertExistsAndLoadBean(t, &Access{UserID: 4, RepoID: repo.ID}).(*Access)
 | 
			
		||||
	access := db.AssertExistsAndLoadBean(t, &Access{UserID: 4, RepoID: repo.ID}).(*Access)
 | 
			
		||||
	assert.EqualValues(t, AccessModeAdmin, access.Mode)
 | 
			
		||||
 | 
			
		||||
	assert.NoError(t, repo.ChangeCollaborationAccessMode(4, AccessModeAdmin))
 | 
			
		||||
 | 
			
		||||
	assert.NoError(t, repo.ChangeCollaborationAccessMode(NonexistentID, AccessModeAdmin))
 | 
			
		||||
	assert.NoError(t, repo.ChangeCollaborationAccessMode(db.NonexistentID, AccessModeAdmin))
 | 
			
		||||
 | 
			
		||||
	CheckConsistencyFor(t, &Repository{ID: repo.ID})
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func TestRepository_DeleteCollaboration(t *testing.T) {
 | 
			
		||||
	assert.NoError(t, PrepareTestDatabase())
 | 
			
		||||
	assert.NoError(t, db.PrepareTestDatabase())
 | 
			
		||||
 | 
			
		||||
	repo := AssertExistsAndLoadBean(t, &Repository{ID: 4}).(*Repository)
 | 
			
		||||
	repo := db.AssertExistsAndLoadBean(t, &Repository{ID: 4}).(*Repository)
 | 
			
		||||
	assert.NoError(t, repo.GetOwner())
 | 
			
		||||
	assert.NoError(t, repo.DeleteCollaboration(4))
 | 
			
		||||
	AssertNotExistsBean(t, &Collaboration{RepoID: repo.ID, UserID: 4})
 | 
			
		||||
	db.AssertNotExistsBean(t, &Collaboration{RepoID: repo.ID, UserID: 4})
 | 
			
		||||
 | 
			
		||||
	assert.NoError(t, repo.DeleteCollaboration(4))
 | 
			
		||||
	AssertNotExistsBean(t, &Collaboration{RepoID: repo.ID, UserID: 4})
 | 
			
		||||
	db.AssertNotExistsBean(t, &Collaboration{RepoID: repo.ID, UserID: 4})
 | 
			
		||||
 | 
			
		||||
	CheckConsistencyFor(t, &Repository{ID: repo.ID})
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user