evan/next-terminal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复了用户组和用户名唯一判断错误的问题

Browse Source
This commit is contained in:
dushixiang
2022-03-05 16:17:08 +08:00
parent 3ad1567a60
commit a6096bee06
6 changed files with 77 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
server/service/user_group.go
View File

@ -2,7 +2,6 @@ package service
import (
"context"
"errors"
"next-terminal/server/constant"
"next-terminal/server/env"
@ -36,14 +35,13 @@ func (service userGroupService) DeleteById(userGroupId string) error {
}
func (service userGroupService) Create(name string, members []string) (model.UserGroup, error) {
var err error
_, err = repository.UserGroupRepository.FindByName(context.TODO(), name)
if err == nil {
return model.UserGroup{}, constant.ErrNameAlreadyUsed
exist, err := repository.UserGroupRepository.ExistByName(context.TODO(), name)
if err != nil {
return model.UserGroup{}, err
}
if !errors.Is(gorm.ErrRecordNotFound, err) {
return model.UserGroup{}, err
if exist {
return model.UserGroup{}, constant.ErrNameAlreadyUsed
}
userGroupId := utils.UUID()
@ -76,15 +74,21 @@ func (service userGroupService) Create(name string, members []string) (model.Use
}
func (service userGroupService) Update(userGroupId string, name string, members []string) (err error) {
var userGroup model.UserGroup
userGroup, err = repository.UserGroupRepository.FindByName(context.TODO(), name)
if err == nil && userGroup.ID != userGroupId {
return constant.ErrNameAlreadyUsed
}
if errors.Is(gorm.ErrRecordNotFound, err) {
dbUserGroup, err := repository.UserGroupRepository.FindById(context.TODO(), userGroupId)
if err != nil {
return err
}
if dbUserGroup.Name != name {
// 修改了名称
exist, err := repository.UserGroupRepository.ExistByName(context.TODO(), name)
if err != nil {
return err
}
if exist {
return constant.ErrNameAlreadyUsed
}
}
return env.GetDB().Transaction(func(tx *gorm.DB) error {
c := context.WithValue(context.TODO(), constant.DB, tx)