feat(team): add team name uniqueness check and related functionalities

aide-cloud · aide-cloud · commit 3a9c10eacfea · 2025-06-11T10:40:20.000+08:00
- Add CheckNameUnique method to Team interface and implement it in teamRepoImpl
- Add FindByName method to Team interface and implement it in teamRepoImpl
- Modify SaveTeam method to check for team name uniqueness before saving
- Update Create and Update methods in teamRepoImpl to return errors instead of team objects
- Add CONFLICT error type in i18n files and err.proto
diff --git a/cmd/palace/internal/biz/repository/team.go b/cmd/palace/internal/biz/repository/team.go
@@ -9,8 +9,10 @@ import (
 
 type Team interface {
 	FindByID(ctx context.Context, id uint32) (do.Team, error)
-	Create(ctx context.Context, team bo.CreateTeamRequest) (do.Team, error)
-	Update(ctx context.Context, team bo.UpdateTeamRequest) (do.Team, error)
+	Create(ctx context.Context, team bo.CreateTeamRequest) error
+	Update(ctx context.Context, team bo.UpdateTeamRequest) error
 	Delete(ctx context.Context, id uint32) error
 	List(ctx context.Context, req *bo.TeamListRequest) (*bo.TeamListReply, error)
+	CheckNameUnique(ctx context.Context, name string, teamID uint32) error
+	FindByName(ctx context.Context, name string) (do.Team, error)
 }
diff --git a/cmd/palace/internal/biz/team.go b/cmd/palace/internal/biz/team.go
@@ -128,31 +128,12 @@ func (t *Team) getTeamMembers(ctx context.Context, ids []uint32) []do.TeamMember
 }
 
 func (t *Team) SaveTeam(ctx context.Context, req *bo.SaveOneTeamRequest) error {
+	// check team name is unique
+	if err := t.teamRepo.CheckNameUnique(ctx, req.GetName(), req.TeamID); err != nil {
+		return err
+	}
+
 	return t.transaction.MainExec(ctx, func(ctx context.Context) error {
-		var (
-			teamDo do.Team
-			err    error
-		)
-		defer func() {
-			if err != nil {
-				t.helper.WithContext(ctx).Errorw("msg", "save team fail", "err", err)
-				return
-			}
-			if err = t.userRepo.AppendTeam(ctx, teamDo); err != nil {
-				t.helper.WithContext(ctx).Errorw("msg", "append team to user fail", "err", err)
-				return
-			}
-			createMemberParams := &bo.CreateTeamMemberReq{
-				Team:     teamDo,
-				User:     teamDo.GetLeader(),
-				Status:   vobj.MemberStatusNormal,
-				Position: vobj.PositionSuperAdmin,
-			}
-			if err := t.memberRepo.Create(ctx, createMemberParams); err != nil {
-				t.helper.WithContext(ctx).Errorw("msg", "create team member fail", "err", err)
-				return
-			}
-		}()
 		if req.TeamID <= 0 {
 			leaderId, ok := permission.GetUserIDByContext(ctx)
 			if !ok {
@@ -163,16 +144,39 @@ func (t *Team) SaveTeam(ctx context.Context, req *bo.SaveOneTeamRequest) error {
 				return err
 			}
 			createParams := req.WithCreateTeamRequest(leaderDo)
-			teamDo, err = t.teamRepo.Create(ctx, createParams)
-			return err
+			if err := t.teamRepo.Create(ctx, createParams); err != nil {
+				return err
+			}
+		} else {
+			teamInfo, err := t.teamRepo.FindByID(ctx, req.TeamID)
+			if err != nil {
+				return err
+			}
+			updateTeamParams := req.WithUpdateTeamRequest(teamInfo)
+			if err := t.teamRepo.Update(ctx, updateTeamParams); err != nil {
+				return err
+			}
 		}
-		teamInfo, err := t.teamRepo.FindByID(ctx, req.TeamID)
+		teamDo, err := t.teamRepo.FindByName(ctx, req.GetName())
 		if err != nil {
 			return err
 		}
-		updateTeamParams := req.WithUpdateTeamRequest(teamInfo)
-		teamDo, err = t.teamRepo.Update(ctx, updateTeamParams)
-		return err
+
+		if err := t.userRepo.AppendTeam(ctx, teamDo); err != nil {
+			t.helper.WithContext(ctx).Errorw("msg", "append team to user fail", "err", err)
+			return err
+		}
+		createMemberParams := &bo.CreateTeamMemberReq{
+			Team:     teamDo,
+			User:     teamDo.GetLeader(),
+			Status:   vobj.MemberStatusNormal,
+			Position: vobj.PositionSuperAdmin,
+		}
+		if err := t.memberRepo.Create(ctx, createMemberParams); err != nil {
+			t.helper.WithContext(ctx).Errorw("msg", "create team member fail", "err", err)
+			return err
+		}
+		return nil
 	})
 }
 
diff --git a/cmd/palace/internal/data/impl/team.go b/cmd/palace/internal/data/impl/team.go
@@ -3,16 +3,19 @@ package impl
 import (
 	"context"
 
+	"github.com/go-kratos/kratos/v2/errors"
 	"github.com/go-kratos/kratos/v2/log"
 	"gorm.io/gen"
 	"gorm.io/gen/field"
+	"gorm.io/gorm"
 
 	"github.com/aide-family/moon/cmd/palace/internal/biz/bo"
 	"github.com/aide-family/moon/cmd/palace/internal/biz/do"
 	"github.com/aide-family/moon/cmd/palace/internal/biz/do/system"
 	"github.com/aide-family/moon/cmd/palace/internal/biz/repository"
 	"github.com/aide-family/moon/cmd/palace/internal/biz/vobj"
 	"github.com/aide-family/moon/cmd/palace/internal/data"
+	"github.com/aide-family/moon/pkg/merr"
 	"github.com/aide-family/moon/pkg/util/crypto"
 	"github.com/aide-family/moon/pkg/util/slices"
 	"github.com/aide-family/moon/pkg/util/validate"
@@ -30,7 +33,7 @@ type teamRepoImpl struct {
 	helper *log.Helper
 }
 
-func (r *teamRepoImpl) Create(ctx context.Context, team bo.CreateTeamRequest) (do.Team, error) {
+func (r *teamRepoImpl) Create(ctx context.Context, team bo.CreateTeamRequest) error {
 	teamMutation := getMainQuery(ctx, r).Team
 	teamDo := &system.Team{
 		Name:          team.GetName(),
@@ -47,13 +50,10 @@ func (r *teamRepoImpl) Create(ctx context.Context, team bo.CreateTeamRequest) (d
 		AlarmDBConfig: crypto.NewObject(team.GetAlarmDBConfig()),
 	}
 	teamDo.WithContext(ctx)
-	if err := teamMutation.WithContext(ctx).Create(teamDo); err != nil {
-		return nil, err
-	}
-	return teamDo, nil
+	return teamMutation.WithContext(ctx).Create(teamDo)
 }
 
-func (r *teamRepoImpl) Update(ctx context.Context, team bo.UpdateTeamRequest) (do.Team, error) {
+func (r *teamRepoImpl) Update(ctx context.Context, team bo.UpdateTeamRequest) error {
 	teamMutation := getMainQuery(ctx, r).Team
 	wrappers := []gen.Condition{
 		teamMutation.ID.Eq(team.GetTeam().GetID()),
@@ -64,10 +64,7 @@ func (r *teamRepoImpl) Update(ctx context.Context, team bo.UpdateTeamRequest) (d
 		teamMutation.Logo.Value(team.GetLogo()),
 	}
 	_, err := teamMutation.WithContext(ctx).Where(wrappers...).UpdateColumnSimple(mutations...)
-	if err != nil {
-		return nil, err
-	}
-	return r.FindByID(ctx, team.GetTeam().GetID())
+	return err
 }
 
 func (r *teamRepoImpl) Delete(ctx context.Context, id uint32) error {
@@ -81,7 +78,7 @@ func (r *teamRepoImpl) Delete(ctx context.Context, id uint32) error {
 
 func (r *teamRepoImpl) FindByID(ctx context.Context, id uint32) (do.Team, error) {
 	systemQuery := getMainQuery(ctx, r).Team
-	teamDo, err := systemQuery.WithContext(ctx).Where(systemQuery.ID.Eq(id)).First()
+	teamDo, err := systemQuery.WithContext(ctx).Preload(field.Associations).Where(systemQuery.ID.Eq(id)).First()
 	if err != nil {
 		return nil, teamNotFound(err)
 	}
@@ -91,7 +88,7 @@ func (r *teamRepoImpl) FindByID(ctx context.Context, id uint32) (do.Team, error)
 func (r *teamRepoImpl) List(ctx context.Context, req *bo.TeamListRequest) (*bo.TeamListReply, error) {
 	query := getMainQuery(ctx, r)
 	teamQuery := query.Team
-	wrapper := teamQuery.WithContext(ctx)
+	wrapper := teamQuery.WithContext(ctx).Preload(field.Associations)
 	if !validate.TextIsNull(req.Keyword) {
 		wrapper = wrapper.Where(teamQuery.Name.Like(req.Keyword))
 	}
@@ -138,3 +135,35 @@ func (r *teamRepoImpl) List(ctx context.Context, req *bo.TeamListRequest) (*bo.T
 	rows := slices.Map(teamDos, func(teamDo *system.Team) do.Team { return teamDo })
 	return req.ToListReply(rows), nil
 }
+
+func (r *teamRepoImpl) CheckNameUnique(ctx context.Context, name string, teamID uint32) error {
+	teamQuery := getMainQuery(ctx, r).Team
+	wrapper := teamQuery.WithContext(ctx)
+	if teamID > 0 {
+		wrapper = wrapper.Where(teamQuery.ID.Neq(teamID))
+	}
+	teamDo, err := wrapper.Where(teamQuery.Name.Eq(name)).First()
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil
+		}
+		return err
+	}
+	if teamDo != nil {
+		return merr.ErrorConflict("team name already exists")
+	}
+	return nil
+}
+
+func (r *teamRepoImpl) FindByName(ctx context.Context, name string) (do.Team, error) {
+	teamQuery := getMainQuery(ctx, r).Team
+	wrapper := teamQuery.WithContext(ctx).Preload(field.Associations)
+	teamDo, err := wrapper.Where(teamQuery.Name.Eq(name)).First()
+	if err != nil {
+		return nil, teamNotFound(err)
+	}
+	if teamDo == nil {
+		return nil, merr.ErrorNotFound("team not found")
+	}
+	return teamDo, nil
+}
diff --git a/i18n/en.toml b/i18n/en.toml
@@ -55,6 +55,9 @@ other = "Resource not open"
 [REQUIRED]
 other = "Params is required"
 
+[CONFLICT]
+other = ""
+
 [UNAUTHORIZED]
 other = "Unauthorized"
 
diff --git a/i18n/ja.toml b/i18n/ja.toml
@@ -55,6 +55,9 @@ other = "リソースが開放されていません"
 [REQUIRED]
 other = "パラメーターが必須です"
 
+[CONFLICT]
+other = ""
+
 [UNAUTHORIZED]
 other = "未認証"
 
diff --git a/i18n/zh.toml b/i18n/zh.toml
@@ -55,6 +55,9 @@ other = "资源未开放"
 [REQUIRED]
 other = "参数不能为空"
 
+[CONFLICT]
+other = ""
+
 [UNAUTHORIZED]
 other = "未授权"
 
diff --git a/proto/api/merr/err.proto b/proto/api/merr/err.proto
@@ -18,6 +18,7 @@ enum ClientError {
   EXIST = 7;
   RESOURCE_NOT_OPEN = 8;
   REQUIRED = 9;
+  CONFLICT = 10;
 }
 
 enum UnauthorizedError {

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ enum ClientError {`
`18`	`18`	`EXIST = 7;`
`19`	`19`	`RESOURCE_NOT_OPEN = 8;`
`20`	`20`	`REQUIRED = 9;`
	`21`	`+ CONFLICT = 10;`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`enum UnauthorizedError {`