[type:feat] refactor remove user function (#118)

* [type:feat] scopespace add user_id field and refactor remove user

* [type:feat] refactor remove user

Author: liuzwei

go.mod

@@ -6,6 +6,7 @@ require github.com/acmestack/godkits v0.0.10
 
 require (
 	github.com/acmestack/gobatis v0.2.8
+	github.com/acmestack/pagehelper v1.0.0
 	github.com/gin-gonic/gin v1.8.1
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/golang-jwt/jwt/v4 v4.4.2
@@ -17,7 +18,6 @@ require (
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver/v3 v3.1.1 // indirect
 	github.com/Masterminds/sprig/v3 v3.2.2 // indirect
-	github.com/acmestack/pagehelper v1.0.0 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect

internal/core/openapi/user.go

@@ -22,6 +22,7 @@ import (
 	"time"
 
 	"github.com/acmestack/envcd/internal/core/storage/dao"
+	"github.com/acmestack/envcd/internal/pkg/constant"
 	"github.com/acmestack/envcd/internal/pkg/entity"
 	"github.com/acmestack/envcd/pkg/entity/result"
 	"github.com/acmestack/godkits/array"
@@ -49,10 +50,6 @@ const (
 	hmacSecret = "9C035514A15F78"
 	userIdKey  = "userId"
 	tokenKey   = "accessToken"
-
-	userStateEnabled  = "enabled"
-	userStateDisabled = "disabled"
-	userStateDeleted  = "deleted"
 )
 
 type pageUserVO struct {
@@ -187,7 +184,7 @@ func (openapi *Openapi) createUser(ginCtx *gin.Context) {
 			Password:  password,
 			Salt:      salt,
 			Identity:  param.Identity,
-			State:     stringsx.DefaultIfEmpty(param.State, userStateEnabled),
+			State:     stringsx.DefaultIfEmpty(param.State, constant.EnabledState),
 			CreatedAt: time.Now(),
 			UpdatedAt: time.Now(),
 		}
@@ -253,14 +250,34 @@ func (openapi *Openapi) removeUser(ginCtx *gin.Context) {
 		}
 		// update user state to deleted
 		// todo tx and catch error @liuzhaowei
-		user.State = userStateDeleted
+		user.State = constant.DeletedState
 		daoAction.UpdateUser(user)
 
-		// update user dictionary state to deleted
-		daoAction.DeleteDictionaryByUserId(entity.Dictionary{UserId: user.Id})
+		// get all the user's dictionary and update state to deleted
+		dictParam := entity.Dictionary{UserId: user.Id}
+		dictionaries, err := daoAction.SelectDictionary(dictParam, nil)
+		if err != nil {
+			return result.InternalFailure(err)
+		}
+		if len(dictionaries) != 0 {
+			for i := range dictionaries {
+				dictionaries[i].State = constant.DeletedState
+			}
+			daoAction.UpdateDictionaryBatch(dictionaries)
+		}
 
-		// update user permission state to deleted
-		daoAction.DeletePermissionByUserId(entity.Permission{UserId: user.Id})
+		// get all the user's scopespace and update state to deleted
+		spaceParam := entity.ScopeSpace{UserId: user.Id}
+		spaces, err := daoAction.SelectScopeSpace(spaceParam)
+		if err != nil {
+			return result.InternalFailure(err)
+		}
+		if len(spaces) != 0 {
+			for i := range spaces {
+				spaces[i].State = constant.DeletedState
+			}
+			daoAction.UpdateScopeSpaceBatch(spaces)
+		}
 
 		return result.Success(nil)
 	})

internal/core/storage/dao/dictionary.go

@@ -79,12 +79,6 @@ func (dao *Dao) DeleteDictionary(model entity.Dictionary) (int64, error) {
 	return ret, err
 }
 
-func (dao *Dao) DeleteDictionaryByUserId(model entity.Dictionary) (int64, error) {
-	var ret int64
-	err := dao.storage.NewSession().Delete("dao.deleteDictionaryByUserId").Param(model).Result(&ret)
-	return ret, err
-}
-
 func (dao *Dao) DeleteDictionaryBatch(model []entity.Dictionary) (int64, error) {
 	var ret int64
 	err := dao.storage.NewSession().Delete("dao.deleteDictionaryBatch").Param(model).Result(&ret)

internal/core/storage/dao/permission.go

@@ -60,14 +60,14 @@ func (dao *Dao) UpdatePermission(model entity.Permission) (int64, error) {
 	return ret, err
 }
 
-func (dao *Dao) DeletePermission(model entity.Permission) (int64, error) {
+func (dao *Dao) UpdatePermissionBatch(model []entity.Permission) (int64, error) {
 	var ret int64
-	err := dao.storage.NewSession().Delete("dao.deletePermission").Param(model).Result(&ret)
+	err := dao.storage.NewSession().Update("dao.updatePermissionBatch").Param(model).Result(&ret)
 	return ret, err
 }
 
-func (dao *Dao) DeletePermissionByUserId(model entity.Permission) (int64, error) {
+func (dao *Dao) DeletePermission(model entity.Permission) (int64, error) {
 	var ret int64
-	err := dao.storage.NewSession().Delete("dao.deletePermissionByUserId").Param(model).Result(&ret)
+	err := dao.storage.NewSession().Delete("dao.deletePermission").Param(model).Result(&ret)
 	return ret, err
 }

internal/core/storage/xml/dictionary_mapper.xml

@@ -117,11 +117,6 @@
         </where>
     </delete>
 
-    <delete id="deleteDictionaryByUserId">
-        UPDATE dictionary set state = "deleted"
-        WHERE user_id =  #{Dictionary.user_id}
-    </delete>
-
     <delete id="deleteDictionaryBatch">
         DELETE FROM dictionary
         WHERE id IN

internal/core/storage/xml/permission_mapper.xml

@@ -83,6 +83,22 @@
         WHERE id = #{Permission.id}
     </update>
 
+    <update id="updatePermissionBatch">
+        UPDATE permission
+        SET state =
+        <foreach collection="{0}" index="index" item="item" separator=" " open="CASE id " close=" END,">
+            WHEN #{item.Permission.id} THEN #{item.Permission.state}
+        </foreach>
+        updated_at =
+        <foreach collection="{0}" index="index" item="item" separator=" " open="CASE id " close=" END ">
+            WHEN #{item.Permission.id} THEN #{item.Permission.updated_at}
+        </foreach>
+        WHERE id IN
+        <foreach collection="{0}" index="index" item="item" open="(" close=")" separator=",">
+            #{item.Permission.id}
+        </foreach>
+    </update>
+
     <delete id="deletePermission">
         DELETE FROM permission
         <where>
@@ -96,10 +112,4 @@
             <if test="{Permission.updated_at} != nil">AND updated_at = #{Permission.updated_at} </if>
         </where>
     </delete>
-
-
-    <delete id="deletePermissionByUserId">
-        UPDATE permission set state = "deleted"
-        WHERE user_id = #{Permission.user_id}
-    </delete>
 </mapper>

internal/core/storage/xml/scopespace_mapper.xml

@@ -17,7 +17,7 @@
   -->
 
 <mapper namespace="dao">
-    <sql id="columns_id">id,name,note,state,created_at,updated_at</sql>
+    <sql id="columns_id">id,user_id,name,note,state,created_at,updated_at</sql>
 
     <select id="selectScopeSpace">
         SELECT <include refid="columns_id"> </include> FROM scopespace