From 9a406757f5b9c145a89a666edfd1099bd2950611 Mon Sep 17 00:00:00 2001 From: Gusted Date: Fri, 31 Jan 2025 14:17:52 +0100 Subject: [PATCH] chore: Remove `UpdateTeamUnits` - Introduced in 0b3ea428477b9da33f40252e79aafe85b09526f3 and removed in b7221bec34fd49495234a18c26e4f5d81483e102. --- .deadcode-out | 1 - models/organization/team_unit.go | 21 --------------------- modules/repository/collaborator_test.go | 3 +-- 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/.deadcode-out b/.deadcode-out index f63a880743..dcae3a4367 100644 --- a/.deadcode-out +++ b/.deadcode-out @@ -42,7 +42,6 @@ code.gitea.io/gitea/models/issues IsErrIssueWasClosed code.gitea.io/gitea/models/organization - UpdateTeamUnits SearchMembersOptions.ToConds code.gitea.io/gitea/models/perm/access diff --git a/models/organization/team_unit.go b/models/organization/team_unit.go index 3087b70770..b5237c2c58 100644 --- a/models/organization/team_unit.go +++ b/models/organization/team_unit.go @@ -28,24 +28,3 @@ func (t *TeamUnit) Unit() unit.Unit { func getUnitsByTeamID(ctx context.Context, teamID int64) (units []*TeamUnit, err error) { return units, db.GetEngine(ctx).Where("team_id = ?", teamID).Find(&units) } - -// UpdateTeamUnits updates a teams's units -func UpdateTeamUnits(ctx context.Context, team *Team, units []TeamUnit) (err error) { - ctx, committer, err := db.TxContext(ctx) - if err != nil { - return err - } - defer committer.Close() - - if _, err = db.GetEngine(ctx).Where("team_id = ?", team.ID).Delete(new(TeamUnit)); err != nil { - return err - } - - if len(units) > 0 { - if err = db.Insert(ctx, units); err != nil { - return err - } - } - - return committer.Commit() -} diff --git a/modules/repository/collaborator_test.go b/modules/repository/collaborator_test.go index 3844197bf1..63352e33e8 100644 --- a/modules/repository/collaborator_test.go +++ b/modules/repository/collaborator_test.go @@ -272,8 +272,7 @@ func TestRepoPermissionPrivateOrgRepo(t *testing.T) { // update team information and then check permission team := unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: 5}) - err = organization.UpdateTeamUnits(db.DefaultContext, team, nil) - require.NoError(t, err) + unittest.AssertSuccessfulDelete(t, &organization.TeamUnit{TeamID: team.ID}) perm, err = access_model.GetUserRepoPermission(db.DefaultContext, repo, owner) require.NoError(t, err) for _, unit := range repo.Units {