Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-07-21 08:04:54 +02:00
Code Issues Activity

Remove unused param doer

Browse Source
This commit is contained in:
Philip Peterson 2025-05-27 03:04:48 -07:00
parent 688da55f54
commit 2c7ceedb08
14 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
routers/api/v1/repo/migrate.go
View File

@ -203,7 +203,7 @@ func Migrate(ctx *context.APIContext) {
} }
if repo != nil { if repo != nil {
if errDelete := repo_service.DeleteRepositoryDirectly(ctx, ctx.Doer, repo.ID); errDelete != nil { if errDelete := repo_service.DeleteRepositoryDirectly(ctx, repo.ID); errDelete != nil {
log.Error("DeleteRepository: %v", errDelete) log.Error("DeleteRepository: %v", errDelete)
} }
} }

4
services/doctor/repository.go
View File

@ -7,7 +7,6 @@ import (
"context" "context"
"code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/db"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/storage" "code.gitea.io/gitea/modules/storage"
repo_service "code.gitea.io/gitea/services/repository" repo_service "code.gitea.io/gitea/services/repository"
@ -39,7 +38,6 @@ func deleteOrphanedRepos(ctx context.Context) (int64, error) {
batchSize := db.MaxBatchInsertSize("repository") batchSize := db.MaxBatchInsertSize("repository")
e := db.GetEngine(ctx) e := db.GetEngine(ctx)
var deleted int64 var deleted int64
adminUser := &user_model.User{IsAdmin: true}
for { for {
select { select {
@ -60,7 +58,7 @@ func deleteOrphanedRepos(ctx context.Context) (int64, error) {
} }
for _, id := range ids { for _, id := range ids {
if err := repo_service.DeleteRepositoryDirectly(ctx, adminUser, id, true); err != nil { if err := repo_service.DeleteRepositoryDirectly(ctx, id, true); err != nil {
return deleted, err return deleted, err
} }
deleted++ deleted++

4
services/org/team_test.go
View File

@ -281,7 +281,7 @@ func TestIncludesAllRepositoriesTeams(t *testing.T) {
} }
// Remove repo and check teams repositories. // Remove repo and check teams repositories.
assert.NoError(t, repo_service.DeleteRepositoryDirectly(db.DefaultContext, user, repoIDs[0]), "DeleteRepository") assert.NoError(t, repo_service.DeleteRepositoryDirectly(db.DefaultContext, repoIDs[0]), "DeleteRepository")
teamRepos[0] = repoIDs[1:] teamRepos[0] = repoIDs[1:]
teamRepos[1] = repoIDs[1:] teamRepos[1] = repoIDs[1:]
teamRepos[3] = repoIDs[1:3] teamRepos[3] = repoIDs[1:3]
@ -293,7 +293,7 @@ func TestIncludesAllRepositoriesTeams(t *testing.T) {
// Wipe created items. // Wipe created items.
for i, rid := range repoIDs { for i, rid := range repoIDs {
if i > 0 { // first repo already deleted. if i > 0 { // first repo already deleted.
assert.NoError(t, repo_service.DeleteRepositoryDirectly(db.DefaultContext, user, rid), "DeleteRepository %d", i) assert.NoError(t, repo_service.DeleteRepositoryDirectly(db.DefaultContext, rid), "DeleteRepository %d", i)
} }
} }
assert.NoError(t, DeleteOrganization(db.DefaultContext, org, false), "DeleteOrganization") assert.NoError(t, DeleteOrganization(db.DefaultContext, org, false), "DeleteOrganization")

2
services/repository/check.go
View File

@ -162,7 +162,7 @@ func DeleteMissingRepositories(ctx context.Context, doer *user_model.User) error
default: default:
} }
log.Trace("Deleting %d/%d...", repo.OwnerID, repo.ID) log.Trace("Deleting %d/%d...", repo.OwnerID, repo.ID)
if err := DeleteRepositoryDirectly(ctx, doer, repo.ID); err != nil { if err := DeleteRepositoryDirectly(ctx, repo.ID); err != nil {
log.Error("Failed to DeleteRepository %-v: Error: %v", repo, err) log.Error("Failed to DeleteRepository %-v: Error: %v", repo, err)
if err2 := system_model.CreateRepositoryNotice("Failed to DeleteRepository %s [%d]: Error: %v", repo.FullName(), repo.ID, err); err2 != nil { if err2 := system_model.CreateRepositoryNotice("Failed to DeleteRepository %s [%d]: Error: %v", repo.FullName(), repo.ID, err); err2 != nil {
log.Error("CreateRepositoryNotice: %v", err) log.Error("CreateRepositoryNotice: %v", err)

2
services/repository/create.go
View File

@ -455,7 +455,7 @@ func createRepositoryInDB(ctx context.Context, doer, u *user_model.User, repo *r
} }
func cleanupRepository(doer *user_model.User, repoID int64) { func cleanupRepository(doer *user_model.User, repoID int64) {
if errDelete := DeleteRepositoryDirectly(db.DefaultContext, doer, repoID); errDelete != nil { if errDelete := DeleteRepositoryDirectly(db.DefaultContext, repoID); errDelete != nil {
log.Error("cleanupRepository failed: %v", errDelete) log.Error("cleanupRepository failed: %v", errDelete)
// add system notice // add system notice
if err := system_model.CreateRepositoryNotice("DeleteRepositoryDirectly failed when cleanup repository: %v", errDelete); err != nil { if err := system_model.CreateRepositoryNotice("DeleteRepositoryDirectly failed when cleanup repository: %v", errDelete); err != nil {

2
services/repository/create_test.go
View File

@ -35,7 +35,7 @@ func TestCreateRepositoryDirectly(t *testing.T) {
unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: user2.Name, Name: createdRepo.Name}) unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: user2.Name, Name: createdRepo.Name})
err = DeleteRepositoryDirectly(db.DefaultContext, user2, createdRepo.ID) err = DeleteRepositoryDirectly(db.DefaultContext, createdRepo.ID)
assert.NoError(t, err) assert.NoError(t, err)
// a failed creating because some mock data // a failed creating because some mock data

4
services/repository/delete.go
View File

@ -48,7 +48,7 @@ func deleteDBRepository(ctx context.Context, repoID int64) error {
// DeleteRepository deletes a repository for a user or organization. // DeleteRepository deletes a repository for a user or organization.
// make sure if you call this func to close open sessions (sqlite will otherwise get a deadlock) // make sure if you call this func to close open sessions (sqlite will otherwise get a deadlock)
func DeleteRepositoryDirectly(ctx context.Context, doer *user_model.User, repoID int64, ignoreOrgTeams ...bool) error { func DeleteRepositoryDirectly(ctx context.Context, repoID int64, ignoreOrgTeams ...bool) error {
ctx, committer, err := db.TxContext(ctx) ctx, committer, err := db.TxContext(ctx)
if err != nil { if err != nil {
return err return err
@ -390,7 +390,7 @@ func DeleteOwnerRepositoriesDirectly(ctx context.Context, owner *user_model.User
break break
} }
for _, repo := range repos { for _, repo := range repos {
if err := DeleteRepositoryDirectly(ctx, owner, repo.ID); err != nil { if err := DeleteRepositoryDirectly(ctx, repo.ID); err != nil {
return fmt.Errorf("unable to delete repository %s for %s[%d]. Error: %w", repo.Name, owner.Name, owner.ID, err) return fmt.Errorf("unable to delete repository %s for %s[%d]. Error: %w", repo.Name, owner.Name, owner.ID, err)
} }
} }

2
services/repository/fork_test.go
View File

@ -68,7 +68,7 @@ func TestForkRepositoryCleanup(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
assert.True(t, exist) assert.True(t, exist)
err = DeleteRepositoryDirectly(db.DefaultContext, user2, fork.ID) err = DeleteRepositoryDirectly(db.DefaultContext, fork.ID)
assert.NoError(t, err) assert.NoError(t, err)
// a failed creating because some mock data // a failed creating because some mock data

2
services/repository/repository.go
View File

@ -69,7 +69,7 @@ func DeleteRepository(ctx context.Context, doer *user_model.User, repo *repo_mod
notify_service.DeleteRepository(ctx, doer, repo) notify_service.DeleteRepository(ctx, doer, repo)
} }
return DeleteRepositoryDirectly(ctx, doer, repo.ID) return DeleteRepositoryDirectly(ctx, repo.ID)
} }
// PushCreateRepo creates a repository when a new repository is pushed to an appropriate namespace // PushCreateRepo creates a repository when a new repository is pushed to an appropriate namespace

2
tests/integration/api_repo_test.go
View File

@ -586,7 +586,7 @@ func TestAPIRepoTransfer(t *testing.T) {
// cleanup // cleanup
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: apiRepo.ID}) repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: apiRepo.ID})
_ = repo_service.DeleteRepositoryDirectly(db.DefaultContext, user, repo.ID) _ = repo_service.DeleteRepositoryDirectly(db.DefaultContext, repo.ID)
} }
func transfer(t *testing.T) *repo_model.Repository { func transfer(t *testing.T) *repo_model.Repository {

2
tests/integration/ephemeral_actions_runner_deletion_test.go
View File

@ -52,7 +52,7 @@ func testEphemeralActionsRunnerDeletionByRepository(t *testing.T) {
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
err = repo_service.DeleteRepositoryDirectly(t.Context(), user, task.RepoID, true) err = repo_service.DeleteRepositoryDirectly(t.Context(), task.RepoID, true)
assert.NoError(t, err) assert.NoError(t, err)
_, err = actions_model.GetRunnerByID(t.Context(), 34350) _, err = actions_model.GetRunnerByID(t.Context(), 34350)

2
tests/integration/git_push_test.go
View File

@ -191,7 +191,7 @@ func runTestGitPush(t *testing.T, u *url.URL, gitOperation func(t *testing.T, gi
assert.Equal(t, commitID, branch.CommitID) assert.Equal(t, commitID, branch.CommitID)
} }
require.NoError(t, repo_service.DeleteRepositoryDirectly(db.DefaultContext, user, repo.ID)) require.NoError(t, repo_service.DeleteRepositoryDirectly(db.DefaultContext, repo.ID))
} }
func TestPushPullRefs(t *testing.T) { func TestPushPullRefs(t *testing.T) {

2
tests/integration/pull_compare_test.go
View File

@ -79,7 +79,7 @@ func TestPullCompare(t *testing.T) {
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
// delete the head repository and revisit the PR diff view // delete the head repository and revisit the PR diff view
err := repo_service.DeleteRepositoryDirectly(db.DefaultContext, user2, repoForked.ID) err := repo_service.DeleteRepositoryDirectly(db.DefaultContext, repoForked.ID)
assert.NoError(t, err) assert.NoError(t, err)
req = NewRequest(t, "GET", prFilesURL) req = NewRequest(t, "GET", prFilesURL)

2
tests/integration/repo_test.go
View File

@ -523,7 +523,7 @@ func TestGenerateRepository(t *testing.T) {
unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: user2.Name, Name: generatedRepo.Name}) unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: user2.Name, Name: generatedRepo.Name})
err = repo_service.DeleteRepositoryDirectly(db.DefaultContext, user2, generatedRepo.ID) err = repo_service.DeleteRepositoryDirectly(db.DefaultContext, generatedRepo.ID)
assert.NoError(t, err) assert.NoError(t, err)
// a failed creating because some mock data // a failed creating because some mock data