From 956700c27f1be5a84bf95aaf484a6b852c26c405 Mon Sep 17 00:00:00 2001 From: Tao Chen Date: Wed, 6 Nov 2024 14:36:12 +0800 Subject: [PATCH 1/2] fix: cannot delete user --- service/user.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/service/user.go b/service/user.go index c6e80ed..9f9867b 100644 --- a/service/user.go +++ b/service/user.go @@ -215,12 +215,11 @@ func (us *UserService) Delete(u *model.User) error { tx.Rollback() return err } + tx.Commit() // 删除关联的peer if err := AllService.PeerService.EraseUserId(u.Id); err != nil { - tx.Rollback() return err } - tx.Commit() return nil } From 34a27ba0738afc3999f28a83c36e4d60a1885ae1 Mon Sep 17 00:00:00 2001 From: Tao Chen Date: Wed, 6 Nov 2024 15:06:15 +0800 Subject: [PATCH 2/2] add error information --- service/user.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/user.go b/service/user.go index 9f9867b..e6ae890 100644 --- a/service/user.go +++ b/service/user.go @@ -217,8 +217,8 @@ func (us *UserService) Delete(u *model.User) error { } tx.Commit() // 删除关联的peer - if err := AllService.PeerService.EraseUserId(u.Id); err != nil { - return err + return AllService.PeerService.EraseUserId(u.Id); err != nil { + return errors.New("User deleted successfully, but failed to unlink peer.") } return nil }