feat(user): implement soft deletion for user accounts and update related logic

apis/types.api

@@ -32,7 +32,6 @@ type (
 		CreatedAt             int64            `json:"created_at"`
 		UpdatedAt             int64            `json:"updated_at"`
 		DeletedAt             int64            `json:"deleted_at,omitempty"`
-		IsDel                 bool             `json:"is_del,omitempty"`
 	}
 	Follow {
 		Id        int64  `json:"id"`

internal/logic/auth/userLoginLogic.go

@@ -68,6 +68,10 @@ func (l *UserLoginLogic) UserLogin(req *types.UserLoginRequest) (resp *types.Log
 
 	userInfo, err = l.svcCtx.UserModel.FindOneByEmail(l.ctx, req.Email)
 
+	if userInfo.DeletedAt.Valid {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.UserNotExist), "user email deleted: %v", req.Email)
+	}
+
 	if err != nil {
 		if errors.As(err, &gorm.ErrRecordNotFound) {
 			return nil, errors.Wrapf(xerr.NewErrCode(xerr.UserNotExist), "user email not exist: %v", req.Email)

internal/logic/auth/userRegisterLogic.go

@@ -79,13 +79,16 @@ func (l *UserRegisterLogic) UserRegister(req *types.UserRegisterRequest) (resp *
 		}
 	}
 	// Check if the user exists
-	_, err = l.svcCtx.UserModel.FindOneByEmail(l.ctx, req.Email)
+	u, err := l.svcCtx.UserModel.FindOneByEmail(l.ctx, req.Email)
 	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 		l.Errorw("FindOneByEmail Error", logger.Field("error", err))
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query user info failed: %v", err.Error())
-	} else if err == nil {
+	} else if err == nil && !u.DeletedAt.Valid {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.UserExist), "user email exist: %v", req.Email)
+	} else if err == nil && u.DeletedAt.Valid {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.UserDisabled), "user email deleted: %v", req.Email)
 	}
+
 	// Generate password
 	pwd := tool.EncodePassWord(req.Password)
 	userInfo := &user.User{

internal/model/user/default.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 
 	"github.com/perfect-panel/server/pkg/cache"
+	"github.com/perfect-panel/server/pkg/logger"
 	"github.com/redis/go-redis/v9"
 	"gorm.io/gorm"
 )
@@ -72,7 +73,7 @@ func (m *defaultUserModel) FindOneByEmail(ctx context.Context, email string) (*U
 		if err := conn.Model(&AuthMethods{}).Where("`auth_type` = 'email' AND `auth_identifier` = ?", email).First(&data).Error; err != nil {
 			return err
 		}
-		return conn.Model(&User{}).Where("`id` = ?", data.UserId).Preload("UserDevices").Preload("AuthMethods").First(v).Error
+		return conn.Model(&User{}).Unscoped().Where("`id` = ?", data.UserId).Preload("UserDevices").Preload("AuthMethods").First(v).Error
 	})
 	return &user, err
 }
@@ -91,7 +92,7 @@ func (m *defaultUserModel) FindOne(ctx context.Context, id int64) (*User, error)
 	userIdKey := fmt.Sprintf("%s%v", cacheUserIdPrefix, id)
 	var resp User
 	err := m.QueryCtx(ctx, &resp, userIdKey, func(conn *gorm.DB, v interface{}) error {
-		return conn.Model(&User{}).Where("`id` = ?", id).Preload("UserDevices").Preload("AuthMethods").First(&resp).Error
+		return conn.Model(&User{}).Unscoped().Where("`id` = ?", id).Preload("UserDevices").Preload("AuthMethods").First(&resp).Error
 	})
 	return &resp, err
 }
@@ -119,10 +120,11 @@ func (m *defaultUserModel) Delete(ctx context.Context, id int64, tx ...*gorm.DB)
 		return err
 	}
 
-	// 使用批量相关缓存清理，包含所有相关数据的缓存
+	// Use batch related cache cleaning, including a cache of all relevant data
 	defer func() {
 		if clearErr := m.BatchClearRelatedCache(ctx, data); clearErr != nil {
-			// 记录清理缓存错误，但不阻断删除操作
+			// Record cache cleaning errors, but do not block deletion operations
+			logger.Errorf("failed to clear related cache for user %d: %v", id, clearErr.Error())
 		}
 	}()
 
@@ -130,24 +132,11 @@ func (m *defaultUserModel) Delete(ctx context.Context, id int64, tx ...*gorm.DB)
 		if len(tx) > 0 {
 			db = tx[0]
 		}
-
-		// 删除用户相关的所有数据
+		// Soft deletion of user information without any processing of other information (Determine whether to allow login/subscription based on the user's deletion status)
 		if err := db.Model(&User{}).Where("`id` = ?", id).Delete(&User{}).Error; err != nil {
 			return err
 		}
 
-		if err := db.Model(&AuthMethods{}).Where("`user_id` = ?", id).Delete(&AuthMethods{}).Error; err != nil {
-			return err
-		}
-
-		if err := db.Model(&Subscribe{}).Where("`user_id` = ?", id).Delete(&Subscribe{}).Error; err != nil {
-			return err
-		}
-
-		if err := db.Model(&Device{}).Where("`user_id` = ?", id).Delete(&Device{}).Error; err != nil {
-			return err
-		}
-
 		return nil
 	})
 }

internal/model/user/user.go

@@ -2,6 +2,8 @@ package user
 
 import (
 	"time"
+
+	"gorm.io/gorm"
 )
 
 type User struct {
@@ -28,6 +30,7 @@ type User struct {
 	Rules                 string         `gorm:"type:TEXT;comment:User Rules"`
 	CreatedAt             time.Time      `gorm:"<-:create;comment:Creation Time"`
 	UpdatedAt             time.Time      `gorm:"comment:Update Time"`
+	DeletedAt             gorm.DeletedAt `gorm:"index;comment:Deletion Time"`
 }
 
 func (*User) TableName() string {

internal/types/types.go

@@ -2540,7 +2540,6 @@ type User struct {
 	CreatedAt             int64            `json:"created_at"`
 	UpdatedAt             int64            `json:"updated_at"`
 	DeletedAt             int64            `json:"deleted_at,omitempty"`
-	IsDel                 bool             `json:"is_del,omitempty"`
 }
 
 type UserAffiliate struct {