mirror of https://github.com/go-gitea/gitea
Move AddCollabrator and CreateRepositoryByExample to service layer (#32419)
- [x] Move `CreateRepositoryByExample` to service layer - [x] Move `AddCollabrator` to service layer - [x] Add a new parameter for `AddCollabrator` so that changing mode immediately after that will become unnecessary.pull/32431/head^2
Lunny Xiao
2 weeks ago
committed by
GitHub
parent
913be9e8ac
commit
276500c314
@ -1,48 +0,0 @@ |
||||
// Copyright 2022 The Gitea Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
package repository |
||||
|
||||
import ( |
||||
"context" |
||||
|
||||
"code.gitea.io/gitea/models/db" |
||||
"code.gitea.io/gitea/models/perm" |
||||
access_model "code.gitea.io/gitea/models/perm/access" |
||||
repo_model "code.gitea.io/gitea/models/repo" |
||||
user_model "code.gitea.io/gitea/models/user" |
||||
|
||||
"xorm.io/builder" |
||||
) |
||||
|
||||
func AddCollaborator(ctx context.Context, repo *repo_model.Repository, u *user_model.User) error { |
||||
if err := repo.LoadOwner(ctx); err != nil { |
||||
return err |
||||
} |
||||
|
||||
if user_model.IsUserBlockedBy(ctx, u, repo.OwnerID) || user_model.IsUserBlockedBy(ctx, repo.Owner, u.ID) { |
||||
return user_model.ErrBlockedUser |
||||
} |
||||
|
||||
return db.WithTx(ctx, func(ctx context.Context) error { |
||||
has, err := db.Exist[repo_model.Collaboration](ctx, builder.Eq{ |
||||
"repo_id": repo.ID, |
||||
"user_id": u.ID, |
||||
}) |
||||
if err != nil { |
||||
return err |
||||
} else if has { |
||||
return nil |
||||
} |
||||
|
||||
if err = db.Insert(ctx, &repo_model.Collaboration{ |
||||
RepoID: repo.ID, |
||||
UserID: u.ID, |
||||
Mode: perm.AccessModeWrite, |
||||
}); err != nil { |
||||
return err |
||||
} |
||||
|
||||
return access_model.RecalculateUserAccess(ctx, repo, u.ID) |
||||
}) |
||||
} |
||||
@ -1,280 +0,0 @@ |
||||
// Copyright 2019 The Gitea Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
package repository |
||||
|
||||
import ( |
||||
"testing" |
||||
|
||||
"code.gitea.io/gitea/models/db" |
||||
"code.gitea.io/gitea/models/organization" |
||||
perm_model "code.gitea.io/gitea/models/perm" |
||||
access_model "code.gitea.io/gitea/models/perm/access" |
||||
repo_model "code.gitea.io/gitea/models/repo" |
||||
"code.gitea.io/gitea/models/unit" |
||||
"code.gitea.io/gitea/models/unittest" |
||||
user_model "code.gitea.io/gitea/models/user" |
||||
|
||||
"github.com/stretchr/testify/assert" |
||||
) |
||||
|
||||
func TestRepository_AddCollaborator(t *testing.T) { |
||||
assert.NoError(t, unittest.PrepareTestDatabase()) |
||||
|
||||
testSuccess := func(repoID, userID int64) { |
||||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: repoID}) |
||||
assert.NoError(t, repo.LoadOwner(db.DefaultContext)) |
||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: userID}) |
||||
assert.NoError(t, AddCollaborator(db.DefaultContext, repo, user)) |
||||
unittest.CheckConsistencyFor(t, &repo_model.Repository{ID: repoID}, &user_model.User{ID: userID}) |
||||
} |
||||
testSuccess(1, 4) |
||||
testSuccess(1, 4) |
||||
testSuccess(3, 4) |
||||
} |
||||
|
||||
func TestRepoPermissionPublicNonOrgRepo(t *testing.T) { |
||||
assert.NoError(t, unittest.PrepareTestDatabase()) |
||||
|
||||
// public non-organization repo
|
||||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 4}) |
||||
assert.NoError(t, repo.LoadUnits(db.DefaultContext)) |
||||
|
||||
// plain user
|
||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) |
||||
perm, err := access_model.GetUserRepoPermission(db.DefaultContext, repo, user) |
||||
assert.NoError(t, err) |
||||
for _, unit := range repo.Units { |
||||
assert.True(t, perm.CanRead(unit.Type)) |
||||
assert.False(t, perm.CanWrite(unit.Type)) |
||||
} |
||||
|
||||
// change to collaborator
|
||||
assert.NoError(t, AddCollaborator(db.DefaultContext, repo, user)) |
||||
perm, err = access_model.GetUserRepoPermission(db.DefaultContext, repo, user) |
||||
assert.NoError(t, err) |
||||
for _, unit := range repo.Units { |
||||
assert.True(t, perm.CanRead(unit.Type)) |
||||
assert.True(t, perm.CanWrite(unit.Type)) |
||||
} |
||||
|
||||
// collaborator
|
||||
collaborator := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4}) |
||||
perm, err = access_model.GetUserRepoPermission(db.DefaultContext, repo, collaborator) |
||||
assert.NoError(t, err) |
||||
for _, unit := range repo.Units { |
||||
assert.True(t, perm.CanRead(unit.Type)) |
||||
assert.True(t, perm.CanWrite(unit.Type)) |
||||
} |
||||
|
||||
// owner
|
||||
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5}) |
||||
perm, err = access_model.GetUserRepoPermission(db.DefaultContext, repo, owner) |
||||
assert.NoError(t, err) |
||||
for _, unit := range repo.Units { |
||||
assert.True(t, perm.CanRead(unit.Type)) |
||||
assert.True(t, perm.CanWrite(unit.Type)) |
||||
} |
||||
|
||||
// admin
|
||||
admin := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) |
||||
perm, err = access_model.GetUserRepoPermission(db.DefaultContext, repo, admin) |
||||
assert.NoError(t, err) |
||||
for _, unit := range repo.Units { |
||||
assert.True(t, perm.CanRead(unit.Type)) |
||||
assert.True(t, perm.CanWrite(unit.Type)) |
||||
} |
||||
} |
||||
|
||||
func TestRepoPermissionPrivateNonOrgRepo(t *testing.T) { |
||||
assert.NoError(t, unittest.PrepareTestDatabase()) |
||||
|
||||
// private non-organization repo
|
||||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2}) |
||||
assert.NoError(t, repo.LoadUnits(db.DefaultContext)) |
||||
|
||||
// plain user
|
||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4}) |
||||
perm, err := access_model.GetUserRepoPermission(db.DefaultContext, repo, user) |
||||
assert.NoError(t, err) |
||||
for _, unit := range repo.Units { |
||||
assert.False(t, perm.CanRead(unit.Type)) |
||||
assert.False(t, perm.CanWrite(unit.Type)) |
||||
} |
||||
|
||||
// change to collaborator to default write access
|
||||
assert.NoError(t, AddCollaborator(db.DefaultContext, repo, user)) |
||||
perm, err = access_model.GetUserRepoPermission(db.DefaultContext, repo, user) |
||||
assert.NoError(t, err) |
||||
for _, unit := range repo.Units { |
||||
assert.True(t, perm.CanRead(unit.Type)) |
||||
assert.True(t, perm.CanWrite(unit.Type)) |
||||
} |
||||
|
||||
assert.NoError(t, repo_model.ChangeCollaborationAccessMode(db.DefaultContext, repo, user.ID, perm_model.AccessModeRead)) |
||||
perm, err = access_model.GetUserRepoPermission(db.DefaultContext, repo, user) |
||||
assert.NoError(t, err) |
||||
for _, unit := range repo.Units { |
||||
assert.True(t, perm.CanRead(unit.Type)) |
||||
assert.False(t, perm.CanWrite(unit.Type)) |
||||
} |
||||
|
||||
// owner
|
||||
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) |
||||
perm, err = access_model.GetUserRepoPermission(db.DefaultContext, repo, owner) |
||||
assert.NoError(t, err) |
||||
for _, unit := range repo.Units { |
||||
assert.True(t, perm.CanRead(unit.Type)) |
||||
assert.True(t, perm.CanWrite(unit.Type)) |
||||
} |
||||
|
||||
// admin
|
||||
admin := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) |
||||
perm, err = access_model.GetUserRepoPermission(db.DefaultContext, repo, admin) |
||||
assert.NoError(t, err) |
||||
for _, unit := range repo.Units { |
||||
assert.True(t, perm.CanRead(unit.Type)) |
||||
assert.True(t, perm.CanWrite(unit.Type)) |
||||
} |
||||
} |
||||
|
||||
func TestRepoPermissionPublicOrgRepo(t *testing.T) { |
||||
assert.NoError(t, unittest.PrepareTestDatabase()) |
||||
|
||||
// public organization repo
|
||||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 32}) |
||||
assert.NoError(t, repo.LoadUnits(db.DefaultContext)) |
||||
|
||||
// plain user
|
||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5}) |
||||
perm, err := access_model.GetUserRepoPermission(db.DefaultContext, repo, user) |
||||
assert.NoError(t, err) |
||||
for _, unit := range repo.Units { |
||||
assert.True(t, perm.CanRead(unit.Type)) |
||||
assert.False(t, perm.CanWrite(unit.Type)) |
||||
} |
||||
|
||||
// change to collaborator to default write access
|
||||
assert.NoError(t, AddCollaborator(db.DefaultContext, repo, user)) |
||||
perm, err = access_model.GetUserRepoPermission(db.DefaultContext, repo, user) |
||||
assert.NoError(t, err) |
||||
for _, unit := range repo.Units { |
||||
assert.True(t, perm.CanRead(unit.Type)) |
||||
assert.True(t, perm.CanWrite(unit.Type)) |
||||
} |
||||
|
||||
assert.NoError(t, repo_model.ChangeCollaborationAccessMode(db.DefaultContext, repo, user.ID, perm_model.AccessModeRead)) |
||||
perm, err = access_model.GetUserRepoPermission(db.DefaultContext, repo, user) |
||||
assert.NoError(t, err) |
||||
for _, unit := range repo.Units { |
||||
assert.True(t, perm.CanRead(unit.Type)) |
||||
assert.False(t, perm.CanWrite(unit.Type)) |
||||
} |
||||
|
||||
// org member team owner
|
||||
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) |
||||
perm, err = access_model.GetUserRepoPermission(db.DefaultContext, repo, owner) |
||||
assert.NoError(t, err) |
||||
for _, unit := range repo.Units { |
||||
assert.True(t, perm.CanRead(unit.Type)) |
||||
assert.True(t, perm.CanWrite(unit.Type)) |
||||
} |
||||
|
||||
// org member team tester
|
||||
member := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 15}) |
||||
perm, err = access_model.GetUserRepoPermission(db.DefaultContext, repo, member) |
||||
assert.NoError(t, err) |
||||
for _, unit := range repo.Units { |
||||
assert.True(t, perm.CanRead(unit.Type)) |
||||
} |
||||
assert.True(t, perm.CanWrite(unit.TypeIssues)) |
||||
assert.False(t, perm.CanWrite(unit.TypeCode)) |
||||
|
||||
// admin
|
||||
admin := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) |
||||
perm, err = access_model.GetUserRepoPermission(db.DefaultContext, repo, admin) |
||||
assert.NoError(t, err) |
||||
for _, unit := range repo.Units { |
||||
assert.True(t, perm.CanRead(unit.Type)) |
||||
assert.True(t, perm.CanWrite(unit.Type)) |
||||
} |
||||
} |
||||
|
||||
func TestRepoPermissionPrivateOrgRepo(t *testing.T) { |
||||
assert.NoError(t, unittest.PrepareTestDatabase()) |
||||
|
||||
// private organization repo
|
||||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 24}) |
||||
assert.NoError(t, repo.LoadUnits(db.DefaultContext)) |
||||
|
||||
// plain user
|
||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5}) |
||||
perm, err := access_model.GetUserRepoPermission(db.DefaultContext, repo, user) |
||||
assert.NoError(t, err) |
||||
for _, unit := range repo.Units { |
||||
assert.False(t, perm.CanRead(unit.Type)) |
||||
assert.False(t, perm.CanWrite(unit.Type)) |
||||
} |
||||
|
||||
// change to collaborator to default write access
|
||||
assert.NoError(t, AddCollaborator(db.DefaultContext, repo, user)) |
||||
perm, err = access_model.GetUserRepoPermission(db.DefaultContext, repo, user) |
||||
assert.NoError(t, err) |
||||
for _, unit := range repo.Units { |
||||
assert.True(t, perm.CanRead(unit.Type)) |
||||
assert.True(t, perm.CanWrite(unit.Type)) |
||||
} |
||||
|
||||
assert.NoError(t, repo_model.ChangeCollaborationAccessMode(db.DefaultContext, repo, user.ID, perm_model.AccessModeRead)) |
||||
perm, err = access_model.GetUserRepoPermission(db.DefaultContext, repo, user) |
||||
assert.NoError(t, err) |
||||
for _, unit := range repo.Units { |
||||
assert.True(t, perm.CanRead(unit.Type)) |
||||
assert.False(t, perm.CanWrite(unit.Type)) |
||||
} |
||||
|
||||
// org member team owner
|
||||
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 15}) |
||||
perm, err = access_model.GetUserRepoPermission(db.DefaultContext, repo, owner) |
||||
assert.NoError(t, err) |
||||
for _, unit := range repo.Units { |
||||
assert.True(t, perm.CanRead(unit.Type)) |
||||
assert.True(t, perm.CanWrite(unit.Type)) |
||||
} |
||||
|
||||
// update team information and then check permission
|
||||
team := unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: 5}) |
||||
err = organization.UpdateTeamUnits(db.DefaultContext, team, nil) |
||||
assert.NoError(t, err) |
||||
perm, err = access_model.GetUserRepoPermission(db.DefaultContext, repo, owner) |
||||
assert.NoError(t, err) |
||||
for _, unit := range repo.Units { |
||||
assert.True(t, perm.CanRead(unit.Type)) |
||||
assert.True(t, perm.CanWrite(unit.Type)) |
||||
} |
||||
|
||||
// org member team tester
|
||||
tester := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) |
||||
perm, err = access_model.GetUserRepoPermission(db.DefaultContext, repo, tester) |
||||
assert.NoError(t, err) |
||||
assert.True(t, perm.CanWrite(unit.TypeIssues)) |
||||
assert.False(t, perm.CanWrite(unit.TypeCode)) |
||||
assert.False(t, perm.CanRead(unit.TypeCode)) |
||||
|
||||
// org member team reviewer
|
||||
reviewer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 20}) |
||||
perm, err = access_model.GetUserRepoPermission(db.DefaultContext, repo, reviewer) |
||||
assert.NoError(t, err) |
||||
assert.False(t, perm.CanRead(unit.TypeIssues)) |
||||
assert.False(t, perm.CanWrite(unit.TypeCode)) |
||||
assert.True(t, perm.CanRead(unit.TypeCode)) |
||||
|
||||
// admin
|
||||
admin := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) |
||||
perm, err = access_model.GetUserRepoPermission(db.DefaultContext, repo, admin) |
||||
assert.NoError(t, err) |
||||
for _, unit := range repo.Units { |
||||
assert.True(t, perm.CanRead(unit.Type)) |
||||
assert.True(t, perm.CanWrite(unit.Type)) |
||||
} |
||||
} |
||||
Loading…
Reference in new issue