From ceb9dd5854186832d55066fa52378aec6160433c Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Mon, 21 Mar 2022 23:24:09 -0700 Subject: [PATCH] migrations: Fix confusing output for migration 0383. * Don't print the empty list for the vast majority of realms where this is a noop. * Make output a little more clear that this isn't revoking all Confirmations, just those associated with deactivated users. --- .../0383_revoke_invitations_from_deactivated_users.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/zerver/migrations/0383_revoke_invitations_from_deactivated_users.py b/zerver/migrations/0383_revoke_invitations_from_deactivated_users.py index 8c584bb8ba343..736c98524f1c9 100644 --- a/zerver/migrations/0383_revoke_invitations_from_deactivated_users.py +++ b/zerver/migrations/0383_revoke_invitations_from_deactivated_users.py @@ -52,7 +52,12 @@ def get_valid_invite_confirmations_generated_by_users( is_active=False, realm_id=realm_id ).values_list("id", flat=True) confirmation_ids = get_valid_invite_confirmations_generated_by_users(deactivated_user_ids) - print(f"Revoking Confirmations for realm {realm_id}: {confirmation_ids}") + + if len(confirmation_ids) > 0: + print( + f"Revoking invitations by deactivated users in realm {realm_id}: {confirmation_ids}" + ) + Confirmation.objects.filter(id__in=confirmation_ids).update(expiry_date=timezone_now())