From 98a81bef17b7aaa1f88db597f86d1f40cd926566 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 1 Apr 2024 12:58:46 +0800 Subject: Refactor DeleteInactiveUsers, fix bug and add tests (#30206) (#30222) Backport #30206 by wxiaoguang 1. check `IsActive` before calling `IsLastAdminUser`. 2. Fix some comments and error messages. 3. Don't `return err` if "removing file" fails in `DeleteUser`. 4. Remove incorrect `DeleteInactiveEmailAddresses`. Active users could also have inactive emails, and inactive emails do not support "olderThan" 5. Add tests Co-authored-by: wxiaoguang --- models/user/email_address.go | 8 -------- 1 file changed, 8 deletions(-) (limited to 'models') diff --git a/models/user/email_address.go b/models/user/email_address.go index d26549f383..08771efe99 100644 --- a/models/user/email_address.go +++ b/models/user/email_address.go @@ -256,14 +256,6 @@ func IsEmailUsed(ctx context.Context, email string) (bool, error) { return db.GetEngine(ctx).Where("lower_email=?", strings.ToLower(email)).Get(&EmailAddress{}) } -// DeleteInactiveEmailAddresses deletes inactive email addresses -func DeleteInactiveEmailAddresses(ctx context.Context) error { - _, err := db.GetEngine(ctx). - Where("is_activated = ?", false). - Delete(new(EmailAddress)) - return err -} - // ActivateEmail activates the email address to given user. func ActivateEmail(ctx context.Context, email *EmailAddress) error { ctx, committer, err := db.TxContext(ctx) -- cgit v1.2.3