Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
fad641b
added DeleteOrgRepos func
karthikbhandary2 Feb 24, 2026
226ace7
Merge branch 'go-gitea:main' into main
karthikbhandary2 Feb 25, 2026
acf9dc0
Merge branch 'go-gitea:main' into main
karthikbhandary2 Feb 26, 2026
e940dd2
Verified and tested the DeleteRepoOrgs
karthikbhandary2 Feb 26, 2026
c319345
ran make generate-swagger
karthikbhandary2 Feb 26, 2026
e4c5c38
error handling and swagger updated
karthikbhandary2 Feb 26, 2026
ed4b335
Removed additional check for permissions in DeleteOrgRepos
karthikbhandary2 Feb 26, 2026
5b819b4
updated DeleteOrgRepos to delete in the background
karthikbhandary2 Feb 27, 2026
9f31e6c
Merge branch 'go-gitea:main' into main
karthikbhandary2 Mar 6, 2026
a5092e5
added system notice
karthikbhandary2 Mar 6, 2026
20e3fe4
added batch processing and other fixes
karthikbhandary2 Mar 7, 2026
988ec17
Merge branch 'go-gitea:main' into main
karthikbhandary2 Mar 7, 2026
008415e
added retry logic
karthikbhandary2 Mar 7, 2026
63f9dbf
reverted back to old logic
karthikbhandary2 Mar 7, 2026
204100a
Merge branch 'go-gitea:main' into main
karthikbhandary2 Mar 7, 2026
9f7deee
Merge branch 'go-gitea:main' into main
karthikbhandary2 Mar 8, 2026
bef6617
Merge branch 'go-gitea:main' into main
karthikbhandary2 Mar 8, 2026
ae7b1a1
Merge branch 'go-gitea:main' into main
karthikbhandary2 Mar 9, 2026
84e3487
Merge branch 'go-gitea:main' into main
karthikbhandary2 Mar 9, 2026
974def8
Merge branch 'go-gitea:main' into main
karthikbhandary2 Mar 10, 2026
e29e9bf
Merge branch 'go-gitea:main' into main
karthikbhandary2 Mar 17, 2026
ce000b0
Merge branch 'go-gitea:main' into main
karthikbhandary2 Mar 20, 2026
95a0d70
Merge branch 'go-gitea:main' into main
karthikbhandary2 Mar 21, 2026
cff469d
Merge branch 'go-gitea:main' into main
karthikbhandary2 Mar 22, 2026
84ef882
Merge branch 'go-gitea:main' into main
karthikbhandary2 Mar 22, 2026
348feff
Merge branch 'go-gitea:main' into main
karthikbhandary2 Mar 22, 2026
cfcbdca
updated DeleteOrgRepos to use GetRepositoryByID
Mar 22, 2026
a36a3b5
Merge branch 'go-gitea:main' into main
karthikbhandary2 Mar 23, 2026
aea3d2b
Merge branch 'go-gitea:main' into main
karthikbhandary2 Mar 23, 2026
02343a2
Merge branch 'go-gitea:main' into main
karthikbhandary2 Mar 24, 2026
1633be5
Merge branch 'main' into main
karthikbhandary2 Mar 27, 2026
53a1aac
merge conflict fix
Mar 27, 2026
8b494d6
Merge branch 'go-gitea:main' into main
karthikbhandary2 Mar 28, 2026
41a1ed0
Merge branch 'main' into main
karthikbhandary2 Apr 2, 2026
35587c0
Merge branch 'go-gitea:main' into main
karthikbhandary2 Apr 3, 2026
e402e5f
Merge branch 'go-gitea:main' into main
karthikbhandary2 Apr 3, 2026
c8b09c8
Merge branch 'main' into main
karthikbhandary2 Apr 4, 2026
88381aa
add test to check if deletes were successful
Apr 4, 2026
0f0ec79
Merge branch 'main' into main
karthikbhandary2 Apr 5, 2026
41cff2f
refactor
wxiaoguang Apr 5, 2026
f723d35
refactor
wxiaoguang Apr 5, 2026
8ed094e
Merge branch 'go-gitea:main' into main
karthikbhandary2 Apr 6, 2026
76189cc
tests updated and delete endpoint updated
karthikbhandary2 Apr 6, 2026
bc073ce
Merge branch 'main' into main
karthikbhandary2 Apr 6, 2026
81fc298
Merge branch 'main' into main
karthikbhandary2 Apr 7, 2026
9e71545
clean up AI slop
wxiaoguang Apr 7, 2026
115b582
fine tune
wxiaoguang Apr 7, 2026
8017f5d
fine tune
wxiaoguang Apr 7, 2026
bea4c1c
Merge branch 'main' into main
karthikbhandary2 Apr 7, 2026
bbc3491
remove unnecessary test
wxiaoguang Apr 7, 2026
7af8f5f
Merge branch 'main' into main
karthikbhandary2 Apr 8, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions models/repo/org_repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,22 @@ import (
// GetOrgRepositories get repos belonging to the given organization
func GetOrgRepositories(ctx context.Context, orgID int64) (RepositoryList, error) {
var orgRepos []*Repository
return orgRepos, db.GetEngine(ctx).Where("owner_id = ?", orgID).Find(&orgRepos)
err := db.GetEngine(ctx).Where("owner_id = ?", orgID).Find(&orgRepos)
return orgRepos, err
}

// GetOrgRepositoryIDs get repo IDs belonging to the given organization
func GetOrgRepositoryIDs(ctx context.Context, orgID int64) (repoIDs []int64, _ error) {
err := db.GetEngine(ctx).Table("repository").Where("owner_id = ?", orgID).Cols("id").Find(&repoIDs)
return repoIDs, err
}

type SearchTeamRepoOptions struct {
db.ListOptions
TeamID int64
}

// GetRepositories returns paginated repositories in team of organization.
// GetTeamRepositories returns paginated repositories in team of organization.
func GetTeamRepositories(ctx context.Context, opts *SearchTeamRepoOptions) (RepositoryList, error) {
sess := db.GetEngine(ctx)
if opts.TeamID > 0 {
Expand Down
3 changes: 2 additions & 1 deletion routers/api/v1/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -1610,7 +1610,8 @@ func Routes() *web.Router {
Delete(reqToken(), reqOrgOwnership(), org.Delete)
m.Post("/rename", reqToken(), reqOrgOwnership(), bind(api.RenameOrgOption{}), org.Rename)
m.Combo("/repos").Get(user.ListOrgRepos).
Post(reqToken(), bind(api.CreateRepoOption{}), repo.CreateOrgRepo)
Post(reqToken(), bind(api.CreateRepoOption{}), repo.CreateOrgRepo).
Delete(reqToken(), reqOrgOwnership(), tokenRequiresScopes(auth_model.AccessTokenScopeCategoryRepository), org.DeleteOrgRepos)
m.Group("/members", func() {
m.Get("", reqToken(), org.ListMembers)
m.Combo("/{username}").Get(reqToken(), org.IsMember).
Expand Down
74 changes: 74 additions & 0 deletions routers/api/v1/org/org.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,20 @@
package org

import (
gocontext "context"
"errors"
"fmt"
"net/http"

activities_model "code.gitea.io/gitea/models/activities"
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/models/organization"
"code.gitea.io/gitea/models/perm"
repo_model "code.gitea.io/gitea/models/repo"
system_model "code.gitea.io/gitea/models/system"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/graceful"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/optional"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/util"
Expand All @@ -23,6 +29,7 @@ import (
"code.gitea.io/gitea/services/convert"
feed_service "code.gitea.io/gitea/services/feed"
"code.gitea.io/gitea/services/org"
repo_service "code.gitea.io/gitea/services/repository"
user_service "code.gitea.io/gitea/services/user"
)

Expand Down Expand Up @@ -497,3 +504,70 @@ func ListOrgActivityFeeds(ctx *context.APIContext) {

ctx.JSON(http.StatusOK, convert.ToActivities(ctx, feeds, ctx.Doer))
}

func deleteOrgReposBackground(ctx gocontext.Context, org *organization.Organization, repoIDs []int64, doer *user_model.User) {
defer func() {
if r := recover(); r != nil {
log.Error("panic during org repo deletion: %v, stack: %v", r, log.Stack(2))
}
}()

for _, repoID := range repoIDs {
repo, err := repo_model.GetRepositoryByID(ctx, repoID)
if err != nil {
desc := fmt.Sprintf("Failed to get repository ID %d in org %s: %v", repoID, org.Name, err)
_ = system_model.CreateNotice(ctx, system_model.NoticeRepository, desc)
log.Error("GetRepositoryByID failed: %v", desc)
continue
}
if err := repo_service.DeleteRepository(ctx, doer, repo, true); err != nil {
desc := fmt.Sprintf("Failed to delete repository %s (ID: %d) in org %s: %v", repo.Name, repo.ID, org.Name, err)
_ = system_model.CreateNotice(ctx, system_model.NoticeRepository, desc)
log.Error("DeleteRepository failed: %v", desc)
continue
}
log.Info("Successfully deleted repository %s (ID: %d) in org %s", repo.Name, repo.ID, org.Name)
}
log.Info("Completed deletion of repositories in org %s", org.Name)
}

func DeleteOrgRepos(ctx *context.APIContext) {
Comment thread
karthikbhandary2 marked this conversation as resolved.
// swagger:operation DELETE /orgs/{org}/repos organization orgDeleteRepos
// ---
// summary: Delete all repositories in an organization
// produces:
// - application/json
Comment thread
karthikbhandary2 marked this conversation as resolved.
// parameters:
// - name: org
// in: path
// description: name of the organization
// type: string
// required: true
// responses:
// "202":
// "$ref": "#/responses/empty"
// "204":
// "$ref": "#/responses/empty"
// "403":
// "$ref": "#/responses/forbidden"
Comment thread
karthikbhandary2 marked this conversation as resolved.
// "404":
// "$ref": "#/responses/notFound"
Comment thread
karthikbhandary2 marked this conversation as resolved.

// Intentionally it only loads repository IDs to avoid loading too much data into memory
// There is no need to do pagination here as the number of repositories is expected to be manageable
repoIDs, err := repo_model.GetOrgRepositoryIDs(ctx, ctx.Org.Organization.ID)
if err != nil {
ctx.APIErrorInternal(err)
return
}

if len(repoIDs) == 0 {
ctx.Status(http.StatusNoContent)
return
}

// Start deletion (slow) in background with detached context, so it can continue even if the request is canceled
go deleteOrgReposBackground(graceful.GetManager().ShutdownContext(), ctx.Org.Organization, repoIDs, ctx.Doer)

ctx.Status(http.StatusAccepted)
}
Comment thread
karthikbhandary2 marked this conversation as resolved.
33 changes: 33 additions & 0 deletions templates/swagger/v1_json.tmpl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 40 additions & 3 deletions tests/integration/api_org_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ import (
"net/http"
"strings"
"testing"
"time"

auth_model "code.gitea.io/gitea/models/auth"
org_model "code.gitea.io/gitea/models/organization"
"code.gitea.io/gitea/models/perm"
repo_model "code.gitea.io/gitea/models/repo"
unit_model "code.gitea.io/gitea/models/unit"
"code.gitea.io/gitea/models/unittest"
user_model "code.gitea.io/gitea/models/user"
Expand All @@ -24,8 +26,14 @@ import (
"github.com/stretchr/testify/require"
)

func TestAPIOrgCreateRename(t *testing.T) {
func TestAPIOrg(t *testing.T) {
defer tests.PrepareTestEnv(t)()
t.Run("General", testAPIOrgGeneral)
t.Run("CreateAndRename", testAPIOrgCreateRename)
t.Run("DeleteOrgRepos", testAPIDeleteOrgRepos)
}

func testAPIOrgCreateRename(t *testing.T) {
token := getUserToken(t, "user1", auth_model.AccessTokenScopeWriteOrganization)

org := api.CreateOrgOption{
Expand Down Expand Up @@ -110,8 +118,7 @@ func TestAPIOrgCreateRename(t *testing.T) {
})
}

func TestAPIOrgGeneral(t *testing.T) {
defer tests.PrepareTestEnv(t)()
func testAPIOrgGeneral(t *testing.T) {
user1Session := loginUser(t, "user1")
user1Token := getTokenForLoggedInUser(t, user1Session, auth_model.AccessTokenScopeWriteOrganization)

Expand Down Expand Up @@ -260,3 +267,33 @@ func TestAPIOrgGeneral(t *testing.T) {
MakeRequest(t, req, http.StatusForbidden)
})
}

func testAPIDeleteOrgRepos(t *testing.T) {
org3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "org3"})
orgRepos, err := repo_model.GetOrgRepositories(t.Context(), org3.ID)
require.NoError(t, err)
assert.NotEmpty(t, orgRepos) // this org contains repositories, so we can test the deletion of all org repos

t.Run("NoPermission", func(t *testing.T) {
nonOwnerSession := loginUser(t, "user4")
nonOwnerToken := getTokenForLoggedInUser(t, nonOwnerSession, auth_model.AccessTokenScopeWriteOrganization)
req := NewRequest(t, "DELETE", "/api/v1/orgs/org3/repos").AddTokenAuth(nonOwnerToken)
MakeRequest(t, req, http.StatusForbidden)
})

t.Run("DeleteAllOrgRepos", func(t *testing.T) {
session := loginUser(t, "user1")
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteOrganization, auth_model.AccessTokenScopeWriteRepository)
req := NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/orgs/%s/repos", org3.Name)).AddTokenAuth(token)
MakeRequest(t, req, http.StatusAccepted)

assert.Eventually(t, func() bool {
repos, err := repo_model.GetOrgRepositories(t.Context(), org3.ID)
require.NoError(t, err)
return len(repos) == 0
}, 2*time.Second, 50*time.Millisecond)

req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/orgs/%s/repos", org3.Name)).AddTokenAuth(token)
MakeRequest(t, req, http.StatusNoContent) // The org contains no repositories, so the API should return StatusNoContent
})
}
Loading