🐛 Fix recycle account error

This commit is contained in:
LittleSheep 2024-07-12 13:31:39 +08:00
parent d405b34747
commit 0e7e7e6d55

View File

@ -2,10 +2,11 @@ package services
import ( import (
"fmt" "fmt"
"time"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/spf13/viper" "github.com/spf13/viper"
"gorm.io/datatypes" "gorm.io/datatypes"
"time"
"git.solsynth.dev/hydrogen/passport/pkg/internal/database" "git.solsynth.dev/hydrogen/passport/pkg/internal/database"
"git.solsynth.dev/hydrogen/passport/pkg/internal/models" "git.solsynth.dev/hydrogen/passport/pkg/internal/models"
@ -207,7 +208,6 @@ func DeleteAccount(id uint) error {
&models.AuthTicket{}, &models.AuthTicket{},
&models.MagicToken{}, &models.MagicToken{},
&models.ThirdClient{}, &models.ThirdClient{},
&models.Notification{},
&models.NotificationSubscriber{}, &models.NotificationSubscriber{},
&models.AccountFriendship{}, &models.AccountFriendship{},
} { } {
@ -217,6 +217,11 @@ func DeleteAccount(id uint) error {
} }
} }
if err := tx.Delete(&models.Notification{}, "recipient_id = ?", id).Error; err != nil {
tx.Rollback()
return err
}
if err := tx.Delete(&models.Account{}, "id = ?", id).Error; err != nil { if err := tx.Delete(&models.Account{}, "id = ?", id).Error; err != nil {
tx.Rollback() tx.Rollback()
return err return err