sungmg/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-30 05:03:09 +00:00
Code Activity

Rename GetUnits to LoadUnits (#22970)

Browse source 
Same as https://github.com/go-gitea/gitea/pull/22967

---------

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
yp05327 2023-02-19 17:31:39 +09:00 committed by GitHub
parent 61b89747ed
commit 7eaf192967
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
models/organization/team.go
View file

@ -111,12 +111,8 @@ func (t *Team) ColorFormat(s fmt.State) {
t.AccessMode) t.AccessMode)
} }
// GetUnits return a list of available units for a team // LoadUnits load a list of available units for a team
func (t *Team) GetUnits() error { func (t *Team) LoadUnits(ctx context.Context) (err error) {
return t.getUnits(db.DefaultContext)
}
func (t *Team) getUnits(ctx context.Context) (err error) {
if t.Units != nil { if t.Units != nil {
return nil return nil
} }
@ -193,7 +189,7 @@ func (t *Team) UnitEnabled(ctx context.Context, tp unit.Type) bool {
// UnitAccessMode returns if the team has the given unit type enabled // UnitAccessMode returns if the team has the given unit type enabled
func (t *Team) UnitAccessMode(ctx context.Context, tp unit.Type) perm.AccessMode { func (t *Team) UnitAccessMode(ctx context.Context, tp unit.Type) perm.AccessMode {
if err := t.getUnits(ctx); err != nil { if err := t.LoadUnits(ctx); err != nil {
log.Warn("Error loading team (ID: %d) units: %s", t.ID, err.Error()) log.Warn("Error loading team (ID: %d) units: %s", t.ID, err.Error())
} }

2
models/organization/team_list.go
View file

@ -19,7 +19,7 @@ type TeamList []*Team
func (t TeamList) LoadUnits(ctx context.Context) error { func (t TeamList) LoadUnits(ctx context.Context) error {
for _, team := range t { for _, team := range t {
if err := team.getUnits(ctx); err != nil { if err := team.LoadUnits(ctx); err != nil {
return err return err
} }
} }

2
routers/api/v1/org/team.go
View file

@ -256,7 +256,7 @@ func EditTeam(ctx *context.APIContext) {
form := web.GetForm(ctx).(*api.EditTeamOption) form := web.GetForm(ctx).(*api.EditTeamOption)
team := ctx.Org.Team team := ctx.Org.Team
if err := team.GetUnits(); err != nil { if err := team.LoadUnits(ctx); err != nil {
ctx.InternalServerError(err) ctx.InternalServerError(err)
return return
} }

2
services/convert/convert.go
View file

@ -304,7 +304,7 @@ func ToTeams(ctx context.Context, teams []*organization.Team, loadOrgs bool) ([]
cache := make(map[int64]*api.Organization) cache := make(map[int64]*api.Organization)
apiTeams := make([]*api.Team, len(teams)) apiTeams := make([]*api.Team, len(teams))
for i := range teams { for i := range teams {
if err := teams[i].GetUnits(); err != nil { if err := teams[i].LoadUnits(ctx); err != nil {
return nil, err return nil, err
} }

6
tests/integration/api_team_test.go
View file

@ -111,7 +111,7 @@ func TestAPITeam(t *testing.T) {
// Read team. // Read team.
teamRead := unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: teamID}) teamRead := unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: teamID})
assert.NoError(t, teamRead.GetUnits()) assert.NoError(t, teamRead.LoadUnits(db.DefaultContext))
req = NewRequestf(t, "GET", "/api/v1/teams/%d?token="+token, teamID) req = NewRequestf(t, "GET", "/api/v1/teams/%d?token="+token, teamID)
resp = MakeRequest(t, req, http.StatusOK) resp = MakeRequest(t, req, http.StatusOK)
apiTeam = api.Team{} apiTeam = api.Team{}
@ -181,7 +181,7 @@ func TestAPITeam(t *testing.T) {
resp = MakeRequest(t, req, http.StatusOK) resp = MakeRequest(t, req, http.StatusOK)
apiTeam = api.Team{} apiTeam = api.Team{}
DecodeJSON(t, resp, &apiTeam) DecodeJSON(t, resp, &apiTeam)
assert.NoError(t, teamRead.GetUnits()) assert.NoError(t, teamRead.LoadUnits(db.DefaultContext))
checkTeamResponse(t, "ReadTeam2", &apiTeam, teamRead.Name, *teamToEditDesc.Description, teamRead.IncludesAllRepositories, checkTeamResponse(t, "ReadTeam2", &apiTeam, teamRead.Name, *teamToEditDesc.Description, teamRead.IncludesAllRepositories,
teamRead.AccessMode.String(), teamRead.GetUnitNames(), teamRead.GetUnitsMap()) teamRead.AccessMode.String(), teamRead.GetUnitNames(), teamRead.GetUnitsMap())
@ -210,7 +210,7 @@ func checkTeamResponse(t *testing.T, testName string, apiTeam *api.Team, name, d
func checkTeamBean(t *testing.T, id int64, name, description string, includesAllRepositories bool, permission string, units []string, unitsMap map[string]string) { func checkTeamBean(t *testing.T, id int64, name, description string, includesAllRepositories bool, permission string, units []string, unitsMap map[string]string) {
team := unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: id}) team := unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: id})
assert.NoError(t, team.GetUnits(), "GetUnits") assert.NoError(t, team.LoadUnits(db.DefaultContext), "LoadUnits")
apiTeam, err := convert.ToTeam(db.DefaultContext, team) apiTeam, err := convert.ToTeam(db.DefaultContext, team)
assert.NoError(t, err) assert.NoError(t, err)
checkTeamResponse(t, fmt.Sprintf("checkTeamBean/%s_%s", name, description), apiTeam, name, description, includesAllRepositories, permission, units, unitsMap) checkTeamResponse(t, fmt.Sprintf("checkTeamBean/%s_%s", name, description), apiTeam, name, description, includesAllRepositories, permission, units, unitsMap)