Improve code

Author: lunny

models/org_team.go

@@ -142,11 +142,6 @@ func (t *Team) GetUnitNames() (res []string) {
 	return
 }
 
-// HasWriteAccess returns true if team has at least write level access mode.
-func (t *Team) HasWriteAccess() bool {
-	return t.Authorize >= perm.AccessModeWrite
-}
-
 // IsOwnerTeam returns true if team is owner team.
 func (t *Team) IsOwnerTeam() bool {
 	return t.Name == ownerTeamName
@@ -442,16 +437,7 @@ func (t *Team) UnitEnabled(tp unit.Type) bool {
 }
 
 func (t *Team) unitEnabled(e db.Engine, tp unit.Type) bool {
-	if err := t.getUnits(e); err != nil {
-		log.Warn("Error loading team (ID: %d) units: %s", t.ID, err.Error())
-	}
-
-	for _, unit := range t.Units {
-		if unit.Type == tp {
-			return true
-		}
-	}
-	return false
+	return t.unitAccessMode(e, tp) > AccessModeNone
 }
 
 // UnitAccessMode returns if the team has the given unit type enabled

models/perm/access_mode.go

@@ -7,6 +7,7 @@ package perm
 import (
 	"fmt"
 
+	unit_model "code.gitea.io/gitea/models/unit"
 	"code.gitea.io/gitea/modules/log"
 )
 
@@ -59,3 +60,18 @@ func ParseAccessMode(permission string) AccessMode {
 		return AccessModeRead
 	}
 }
+
+// MinUnitPerms returns the minial permission of the permission map
+func MinUnitPerms(unitsMap map[unit_model.Type]AccessMode) AccessMode {
+	var res = AccessModeNone
+	for _, mode := range unitsMap {
+		if mode > AccessModeNone {
+			if res == AccessModeNone {
+				res = mode
+			} else if mode < res {
+				res = mode
+			}
+		}
+	}
+	return res
+}

models/unit/unit.go

@@ -288,8 +288,8 @@ func FindUnitTypes(nameKeys ...string) (res []Type) {
 	return
 }
 
-// UnitTypeFromKey give the unit key name and return unit
-func UnitTypeFromKey(nameKey string) Type {
+// TypeFromKey give the unit key name and return unit
+func TypeFromKey(nameKey string) Type {
 	for t, u := range Units {
 		if strings.EqualFold(nameKey, u.NameKey) {
 			return t

routers/api/v1/org/team.go

@@ -153,12 +153,20 @@ func attachTeamUnits(team *models.Team, units []string) {
 	}
 }
 
+func convertUnitsMap(unitsMap map[string]string) map[unit_model.Type]models.AccessMode {
+	var res = make(map[unit_model.Type]models.AccessMode, len(unitsMap))
+	for unitKey, perm := range unitsMap {
+		res[unit_model.TypeFromKey(unitKey)] = models.ParseAccessMode(perm)
+	}
+	return res
+}
+
 func attachTeamUnitsMap(team *models.Team, unitsMap map[string]string) {
 	team.Units = make([]*models.TeamUnit, 0, len(unitsMap))
 	for unitKey, perm := range unitsMap {
 		team.Units = append(team.Units, &models.TeamUnit{
 			OrgID:     team.OrgID,
-			Type:      unit_model.UnitTypeFromKey(unitKey),
+			Type:      unit_model.TypeFromKey(unitKey),
 			Authorize: perm.ParseAccessMode(perm),
 		})
 	}
@@ -189,13 +197,19 @@ func CreateTeam(ctx *context.APIContext) {
 	//   "422":
 	//     "$ref": "#/responses/validationError"
 	form := web.GetForm(ctx).(*api.CreateTeamOption)
+
+	var p = perm.ParseAccessMode(form.Permission)
+	if p < perm.AccessModeOwner {
+		p = perm.MinUnitPerms(convertUnitsMap(form.UnitsMap))
+	}
+
 	team := &models.Team{
 		OrgID:                   ctx.Org.Organization.ID,
 		Name:                    form.Name,
 		Description:             form.Description,
 		IncludesAllRepositories: form.IncludesAllRepositories,
 		CanCreateOrgRepo:        form.CanCreateOrgRepo,
-		Authorize:               perm.ParseAccessMode(form.Permission),
+		Authorize:               p,
 	}
 
 	if team.Authorize < perm.AccessModeOwner {
@@ -268,11 +282,14 @@ func EditTeam(ctx *context.APIContext) {
 	isIncludeAllChanged := false
 	if !team.IsOwnerTeam() && len(form.Permission) != 0 {
 		// Validate permission level.
-		auth := perm.ParseAccessMode(form.Permission)
+		var p = perm.ParseAccessMode(form.Permission)
+		if p < perm.AccessModeOwner {
+			p = perm.MinUnitPerms(convertUnitsMap(form.UnitsMap))
+		}
 
-		if team.Authorize != auth {
+		if team.Authorize != p {
 			isAuthChanged = true
-			team.Authorize = auth
+			team.Authorize = p
 		}
 
 		if form.IncludesAllRepositories != nil {

routers/web/org/teams.go

@@ -247,12 +247,16 @@ func NewTeamPost(ctx *context.Context) {
 	ctx.Data["Units"] = unit_model.Units
 	var includesAllRepositories = form.RepoAccess == "all"
 	var unitPerms = getUnitPerms(ctx.Req.Form)
+	var p = perm.ParseAccessMode(form.Permission)
+	if p < perm.AccessModeOwner {
+		p = perm.MinUnitPerms(unitPerms)
+	}
 
 	t := &models.Team{
 		OrgID:                   ctx.Org.Organization.ID,
 		Name:                    form.TeamName,
 		Description:             form.Description,
-		Authorize:               perm.ParseAccessMode(form.Permission),
+		Authorize:               p,
 		IncludesAllRepositories: includesAllRepositories,
 		CanCreateOrgRepo:        form.CanCreateOrgRepo,
 	}