refactor(用户): 优化设备解绑逻辑并提取错误上报接口文档
Build docker and publish / build (20.15.1) (push) Successful in 7m15s
Build docker and publish / build (20.15.1) (push) Successful in 7m15s
重构设备解绑逻辑,简化事务处理流程并移除冗余代码。将错误上报接口的详细说明从主文档拆分到单独文件,提高文档可维护性。 - 合并设备查询与认证记录查询操作 - 简化匿名用户创建流程 - 移除冗余的错误日志记录 - 将错误上报接口文档拆分到单独文件
This commit is contained in:
@@ -53,21 +53,14 @@ func (l *UnbindDeviceLogic) UnbindDevice(req *types.UnbindDeviceRequest) error {
|
||||
logger.Field("user_id", u.Id))
|
||||
start := time.Now()
|
||||
err = l.svcCtx.DB.Transaction(func(tx *gorm.DB) error {
|
||||
// 1. 查询设备记录
|
||||
var device user.Device
|
||||
err = tx.Model(&device).Where("id = ?", req.Id).First(&device).Error
|
||||
if err != nil {
|
||||
var dev user.Device
|
||||
if err := tx.Model(&dev).Where("id = ?", req.Id).First(&dev).Error; err != nil {
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.QueueEnqueueError), "find device err: %v", err)
|
||||
}
|
||||
|
||||
// 2. 查询对应的认证记录
|
||||
var userAuth user.AuthMethods
|
||||
err = tx.Model(&userAuth).Where("auth_identifier = ? and auth_type = ?", device.Identifier, "device").First(&userAuth).Error
|
||||
if err != nil {
|
||||
if err := tx.Model(&userAuth).Where("auth_identifier = ? and auth_type = ?", dev.Identifier, "device").First(&userAuth).Error; err != nil {
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find user auth method err: %v", err)
|
||||
}
|
||||
|
||||
// 3. 创建新用户(匿名用户)
|
||||
newUser := &user.User{
|
||||
Salt: "default",
|
||||
OnlyFirstPurchase: &l.svcCtx.Config.Invite.OnlyFirstPurchase,
|
||||
@@ -75,65 +68,43 @@ func (l *UnbindDeviceLogic) UnbindDevice(req *types.UnbindDeviceRequest) error {
|
||||
if err := tx.Create(newUser).Error; err != nil {
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "create user failed: %v", err)
|
||||
}
|
||||
|
||||
// 生成并更新邀请码
|
||||
newUser.ReferCode = uuidx.UserInviteCode(newUser.Id)
|
||||
if err := tx.Model(&user.User{}).Where("id = ?", newUser.Id).Update("refer_code", newUser.ReferCode).Error; err != nil {
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "update refer code failed: %v", err)
|
||||
}
|
||||
|
||||
// 3.2 记录注册日志
|
||||
registerLog := log.Register{
|
||||
AuthMethod: "device",
|
||||
Identifier: device.Identifier,
|
||||
RegisterIP: device.Ip,
|
||||
UserAgent: device.UserAgent,
|
||||
Identifier: dev.Identifier,
|
||||
RegisterIP: dev.Ip,
|
||||
UserAgent: dev.UserAgent,
|
||||
Timestamp: time.Now().UnixMilli(),
|
||||
}
|
||||
content, _ := registerLog.Marshal()
|
||||
if err := tx.Create(&log.SystemLog{
|
||||
_ = tx.Create(&log.SystemLog{
|
||||
Type: log.TypeRegister.Uint8(),
|
||||
Date: time.Now().Format("2006-01-02"),
|
||||
ObjectID: newUser.Id,
|
||||
Content: string(content),
|
||||
}).Error; err != nil {
|
||||
l.Errorw("failed to insert register log",
|
||||
logger.Field("user_id", newUser.Id),
|
||||
logger.Field("error", err.Error()),
|
||||
)
|
||||
// Log error but don't fail transaction
|
||||
}
|
||||
|
||||
// 4. 迁移设备和认证记录到新用户
|
||||
// 更新设备归属
|
||||
if err := tx.Model(&user.Device{}).Where("id = ?", device.Id).Update("user_id", newUser.Id).Error; err != nil {
|
||||
}).Error
|
||||
if err := tx.Model(&user.Device{}).Where("id = ?", dev.Id).Update("user_id", newUser.Id).Error; err != nil {
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "update device owner failed: %v", err)
|
||||
}
|
||||
|
||||
// 更新认证归属
|
||||
if err := tx.Model(&user.AuthMethods{}).Where("id = ?", userAuth.Id).Update("user_id", newUser.Id).Error; err != nil {
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "update auth owner failed: %v", err)
|
||||
}
|
||||
|
||||
// 5. 检查原用户是否还有其他认证方式,如果没有则删除原用户
|
||||
var count int64
|
||||
err = tx.Model(user.AuthMethods{}).Where("user_id = ?", device.UserId).Count(&count).Error
|
||||
if err != nil {
|
||||
if err := tx.Model(user.AuthMethods{}).Where("user_id = ?", dev.UserId).Count(&count).Error; err != nil {
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "count user auth methods err: %v", err)
|
||||
}
|
||||
|
||||
if count < 1 {
|
||||
if err := tx.Where("id = ?", device.UserId).Delete(&user.User{}).Error; err != nil {
|
||||
if err := tx.Where("id = ?", dev.UserId).Delete(&user.User{}).Error; err != nil {
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseDeletedError), "delete old user failed: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
// 6. 清理缓存
|
||||
l.Infow("设备解绑并迁移成功",
|
||||
logger.Field("device_identifier", device.Identifier),
|
||||
logger.Field("old_user_id", device.UserId),
|
||||
logger.Field("device_identifier", dev.Identifier),
|
||||
logger.Field("old_user_id", dev.UserId),
|
||||
logger.Field("new_user_id", newUser.Id))
|
||||
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user