tcjlj/nezha
1
0
Fork 0
mirror of https://github.com/nezhahq/nezha.git synced 2025-01-22 12:48:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

update user api error handling

Browse Source
This commit is contained in:
uubulb 2024-12-21 19:07:19 +08:00
parent 4f4c482103
commit a839056d69
2 changed files with 47 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/dashboard/controller/user.go
View File

@ -151,6 +151,6 @@ func batchDeleteUser(c *gin.Context) (any, error) {
return nil, singleton.Localizer.ErrorT("can't delete yourself")
}
singleton.OnUserDelete(ids)
return nil, singleton.DB.Where("id IN (?)", ids).Delete(&model.User{}).Error
err := singleton.OnUserDelete(ids, newGormError)
return nil, err
}

70
service/singleton/user.go
View File

@ -39,50 +39,65 @@ func OnUserUpdate(u *model.User) {
AgentSecretToUserId[u.AgentSecret] = u.ID
}
func OnUserDelete(id []uint64) {
func OnUserDelete(id []uint64, errorFunc func(string, ...interface{}) error) error {
UserLock.Lock()
defer UserLock.Unlock()
if len(id) < 1 {
return
return Localizer.ErrorT("user id not specified")
}
var (
cron bool
server bool
cron, server bool
crons, servers []uint64
)
for _, uid := range id {
secret := UserIdToAgentSecret[uid]
delete(AgentSecretToUserId, secret)
delete(UserIdToAgentSecret, uid)
err := DB.Transaction(func(tx *gorm.DB) error {
CronLock.RLock()
crons = model.FindUserID(CronList, uid)
CronLock.RUnlock()
CronLock.RLock()
crons := model.FindUserID(CronList, uid)
CronLock.RUnlock()
cron = len(crons) > 0
if cron {
if err := tx.Unscoped().Delete(&model.Cron{}, "id in (?)", crons).Error; err != nil {
return err
}
}
cron = len(crons) > 0
if cron {
DB.Unscoped().Delete(&model.Cron{}, "id in (?)", crons)
OnDeleteCron(crons)
}
SortedServerLock.RLock()
servers = model.FindUserID(SortedServerList, uid)
SortedServerLock.RUnlock()
SortedServerLock.RLock()
servers := model.FindUserID(SortedServerList, uid)
SortedServerLock.RUnlock()
server = len(servers) > 0
if server {
DB.Transaction(func(tx *gorm.DB) error {
server = len(servers) > 0
if server {
if err := tx.Unscoped().Delete(&model.Server{}, "id in (?)", servers).Error; err != nil {
return err
}
if err := tx.Unscoped().Delete(&model.ServerGroupServer{}, "server_id in (?)", servers).Error; err != nil {
return err
}
return nil
})
}
if err := tx.Unscoped().Delete(&model.Transfer{}, "server_id in (?)", servers).Error; err != nil {
return err
}
if err := tx.Where("id IN (?)", id).Delete(&model.User{}).Error; err != nil {
return err
}
return nil
})
if err != nil {
return errorFunc("%v", err)
}
if cron {
OnDeleteCron(crons)
}
if server {
AlertsLock.Lock()
for _, sid := range servers {
for _, alert := range Alerts {
@ -93,10 +108,13 @@ func OnUserDelete(id []uint64) {
}
}
}
DB.Unscoped().Delete(&model.Transfer{}, "server_id in (?)", servers)
AlertsLock.Unlock()
OnServerDelete(servers)
}
secret := UserIdToAgentSecret[uid]
delete(AgentSecretToUserId, secret)
delete(UserIdToAgentSecret, uid)
}
if cron {
@ -106,4 +124,6 @@ func OnUserDelete(id []uint64) {
if server {
ReSortServer()
}
return nil
}