feat: 修改 app 信息时检查 app name 是否存在

ncuhome · Nov 25, 2023 · b93adc9 · b93adc9
1 parent 784fc15
commit b93adc9
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/internal/api/callback/code.go b/internal/api/callback/code.go
@@ -92,7 +92,7 @@ var (
 	ErrAppNameExist = &Msg{
 		Code:       cErrAppNameExist,
 		Msg:        "名称已被占用",
-		HttpStatus: 400,
+		HttpStatus: 409,
 	}
 	ErrGroupNotFound = &Msg{
 		Code:       cErrGroupNotFound,
@@ -112,7 +112,7 @@ var (
 	ErrMfaAlreadyExist = &Msg{
 		Code:       cErrMfaAlreadyExist,
 		Msg:        "双因素校验已开启",
-		HttpStatus: 400,
+		HttpStatus: 409,
 	}
 	ErrMfaAddExpired = &Msg{
 		Code:       cErrMfaAddExpired,

diff --git a/internal/api/controllers/user/dev/app.go b/internal/api/controllers/user/dev/app.go
@@ -66,23 +66,23 @@ func ApplyApp(c *gin.Context) {
 		return
 	}
 
-	appSrc, err := service.App.Begin()
+	appSrv, err := service.App.Begin()
 	if err != nil {
 		callback.Error(c, callback.ErrForm, err)
 		return
 	}
-	defer appSrc.Rollback()
+	defer appSrv.Rollback()
 
 	uid := tools.GetUserInfo(c).ID
-	newApp, err := appSrc.New(uid, f.Name, f.Callback, f.PermitAll)
+	newApp, err := appSrv.New(uid, f.Name, f.Callback, f.PermitAll)
 	if err != nil {
 		callback.Error(c, callback.ErrDBOperation, err)
 		return
 	}
 
 	var groups = make([]dto.Group, 0)
 	if !f.PermitAll && len(f.PermitGroups) != 0 {
-		appGroupSrv := service.AppGroupSrv{DB: appSrc.DB}
+		appGroupSrv := service.AppGroupSrv{DB: appSrv.DB}
 
 		if groups, err = appGroupSrv.BindForApp(newApp.ID, f.PermitGroups); err != nil {
 			if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -94,7 +94,7 @@ func ApplyApp(c *gin.Context) {
 		}
 	}
 
-	if err = redis.AppCode.Add(newApp.AppCode); err != nil || appSrc.Commit().Error != nil {
+	if err = redis.AppCode.Add(newApp.AppCode); err != nil || appSrv.Commit().Error != nil {
 		callback.Error(c, callback.ErrUnexpected, err)
 		return
 	}
@@ -204,6 +204,14 @@ func ModifyApp(c *gin.Context) {
 	appInfoChanged := false
 
 	if f.Name != app.Name {
+		if exist, err := appSrv.NameExist(f.Name); err != nil {
+			callback.Error(c, callback.ErrDBOperation, err)
+			return
+		} else if exist {
+			callback.Error(c, callback.ErrAppNameExist)
+			return
+		}
+
 		appInfoChanged = true
 	}
 

diff --git a/internal/db/dao/App.go b/internal/db/dao/App.go
@@ -57,6 +57,11 @@ func (a *App) sqlOderForNav(tx *gorm.DB) *gorm.DB {
 	return tx.Order("views DESC,name,id DESC")
 }
 
+func (a *App) Exist(tx *gorm.DB) (bool, error) {
+	var t bool
+	return t, tx.Model(a).Select("1").Where(a).Limit(1).First(&t).Error
+}
+
 func (a *App) Insert(tx *gorm.DB) error {
 	return tx.Create(a).Error
 }

diff --git a/internal/service/App.go b/internal/service/App.go
@@ -33,6 +33,12 @@ func (a AppSrv) This(host string) *dao.App {
 	}
 }
 
+func (a AppSrv) NameExist(name string, opts ...daoUtil.ServiceOpt) (bool, error) {
+	return (&dao.App{
+		Name: name,
+	}).Exist(daoUtil.TxOpts(a.DB, opts...))
+}
+
 func (a AppSrv) New(uid uint, name, callback string, permitAll bool) (*dao.App, error) {
 	randSrc := rand.NewSource(time.Now().UnixNano())
 	var t = dao.App{