refactor all service dependency injection
This commit is contained in:
@@ -3,9 +3,11 @@ package user
|
||||
import (
|
||||
"errors"
|
||||
|
||||
"bsm/full/module/base/mgt/internal/impl"
|
||||
"bsm/full/module/base/mgt/internal/libs"
|
||||
"bsm/full/module/base/mgt/internal/models"
|
||||
"bsm/full/module/base/mgt/internal/types"
|
||||
|
||||
"git.apinb.com/bsm-sdk/core/errcode"
|
||||
"git.apinb.com/bsm-sdk/core/infra"
|
||||
"git.apinb.com/bsm-sdk/core/middleware"
|
||||
@@ -46,23 +48,23 @@ func Create(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
db := models.DBService.Model(&models.MgtUser{})
|
||||
db := impl.DBService.Model(&models.MgtUser{})
|
||||
if err = db.Where("phone = ? or account = ?", request.Phone, request.Account).First(&data).Error; err != nil {
|
||||
if !errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
infra.Response.Error(c, errcode.ErrDB)
|
||||
return
|
||||
}
|
||||
var deletedData models.MgtUser
|
||||
if err = models.DBService.Unscoped().Where("phone = ?", request.Phone).First(&deletedData).Error; err == nil {
|
||||
if err = models.DBService.Unscoped().Delete(&deletedData).Error; err != nil {
|
||||
if err = impl.DBService.Unscoped().Where("phone = ?", request.Phone).First(&deletedData).Error; err == nil {
|
||||
if err = impl.DBService.Unscoped().Delete(&deletedData).Error; err != nil {
|
||||
infra.Response.Error(c, errcode.ErrDB)
|
||||
return
|
||||
}
|
||||
printer.Info("user deleted: id=%d, phone=%s", deletedData.ID, deletedData.Phone)
|
||||
}
|
||||
if request.Phone != request.Account {
|
||||
if err = models.DBService.Unscoped().Where("account = ?", request.Account).First(&deletedData).Error; err == nil {
|
||||
if err = models.DBService.Unscoped().Delete(&deletedData).Error; err != nil {
|
||||
if err = impl.DBService.Unscoped().Where("account = ?", request.Account).First(&deletedData).Error; err == nil {
|
||||
if err = impl.DBService.Unscoped().Delete(&deletedData).Error; err != nil {
|
||||
infra.Response.Error(c, errcode.ErrDB)
|
||||
return
|
||||
}
|
||||
@@ -76,7 +78,7 @@ func Create(c *gin.Context) {
|
||||
if request.Workspace == "" {
|
||||
request.Workspace = "def"
|
||||
}
|
||||
if err = models.DBService.Model(&models.MgtApplication{}).Where("workspace = ?", request.Workspace).First(&linkData).Error; err != nil {
|
||||
if err = impl.DBService.Model(&models.MgtApplication{}).Where("workspace = ?", request.Workspace).First(&linkData).Error; err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
infra.Response.Error(c, errcode.ErrRecordNotFound)
|
||||
return
|
||||
@@ -103,7 +105,7 @@ func Create(c *gin.Context) {
|
||||
Std_IICUDS: coreTypes.Std_IICUDS{Identity: coreutils.UUID(), Status: 1},
|
||||
}
|
||||
|
||||
if err = models.DBService.Transaction(func(tx *gorm.DB) error {
|
||||
if err = impl.DBService.Transaction(func(tx *gorm.DB) error {
|
||||
if err = tx.Model(&models.MgtUser{}).Create(&userModel).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user