From 0e233ea81b4ae258bb5d5865316843944666ee0d Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 5 Sep 2022 10:57:17 +0800 Subject: [PATCH 1/3] Fix delete user missed some comments --- models/user.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/models/user.go b/models/user.go index 49374014aa7db..3eb59e227a957 100644 --- a/models/user.go +++ b/models/user.go @@ -100,9 +100,9 @@ func DeleteUser(ctx context.Context, u *user_model.User) (err error) { // Delete Comments const batchSize = 50 - for start := 0; ; start += batchSize { - comments := make([]*issues_model.Comment, 0, batchSize) - if err = e.Where("type=? AND poster_id=?", issues_model.CommentTypeComment, u.ID).Limit(batchSize, start).Find(&comments); err != nil { + for { + comments := make([]*issues_model.Comment, 0, 50) + if err = e.Where("type=? AND poster_id=?", issues_model.CommentTypeComment, u.ID).Limit(batchSize, 0).Find(&comments); err != nil { return err } if len(comments) == 0 { @@ -200,7 +200,7 @@ func DeleteUser(ctx context.Context, u *user_model.User) (err error) { // ***** END: ExternalLoginUser ***** if _, err = e.ID(u.ID).Delete(new(user_model.User)); err != nil { - return fmt.Errorf("Delete: %v", err) + return fmt.Errorf("delete: %v", err) } return nil From 68fd2e4479f921aaf3929fc2044dee92e7f9e74d Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 5 Sep 2022 23:34:14 +0800 Subject: [PATCH 2/3] Fix lint --- models/packages/package_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/packages/package_test.go b/models/packages/package_test.go index 3d3a2333bae87..0bfe6a398bb4c 100644 --- a/models/packages/package_test.go +++ b/models/packages/package_test.go @@ -27,7 +27,7 @@ func TestMain(m *testing.M) { func TestHasOwnerPackages(t *testing.T) { assert.NoError(t, unittest.PrepareTestDatabase()) - owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) + owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}).(*user_model.User) p, err := packages_model.TryInsertPackage(db.DefaultContext, &packages_model.Package{ OwnerID: owner.ID, From 5b72bb8fdedd49cabc50709d82d64fca43e06bc7 Mon Sep 17 00:00:00 2001 From: zeripath Date: Mon, 5 Sep 2022 17:16:45 +0100 Subject: [PATCH 3/3] Update models/user.go --- models/user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/user.go b/models/user.go index 3eb59e227a957..fb9246070d5aa 100644 --- a/models/user.go +++ b/models/user.go @@ -101,7 +101,7 @@ func DeleteUser(ctx context.Context, u *user_model.User) (err error) { // Delete Comments const batchSize = 50 for { - comments := make([]*issues_model.Comment, 0, 50) + comments := make([]*issues_model.Comment, 0, batchSize) if err = e.Where("type=? AND poster_id=?", issues_model.CommentTypeComment, u.ID).Limit(batchSize, 0).Find(&comments); err != nil { return err }