paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 06:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

invites: Delete old compat code in the invites queue worker.

Browse Source 
1.7.* is old enough at this point that we can clean up this code.
This commit is contained in:
Mateusz Mandera
2021-02-11 18:21:44 +01:00
committed by Tim Abbott
parent d1c24d3f67
commit b9c1fed18c
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/tests/test_queue_worker.py
View File

@@ -445,8 +445,6 @@ class WorkerTest(ZulipTestCase):
dict(prereg_id=prereg_alice.id, referrer_id=inviter.id, email_body=None), dict(prereg_id=prereg_alice.id, referrer_id=inviter.id, email_body=None),
# Nonexistent prereg_id, as if the invitation was deleted # Nonexistent prereg_id, as if the invitation was deleted
dict(prereg_id=-1, referrer_id=inviter.id, email_body=None), dict(prereg_id=-1, referrer_id=inviter.id, email_body=None),
# Form with `email` is from versions up to Zulip 1.7.1
dict(email=self.nonreg_email("bob"), referrer_id=inviter.id, email_body=None),
] ]
for element in data: for element in data:
fake_client.enqueue("invites", element) fake_client.enqueue("invites", element)
@@ -458,7 +456,7 @@ class WorkerTest(ZulipTestCase):
"zerver.worker.queue_processors.send_future_email" "zerver.worker.queue_processors.send_future_email"
) as send_mock: ) as send_mock:
worker.start() worker.start()
self.assertEqual(send_mock.call_count, 2) self.assertEqual(send_mock.call_count, 1)
def test_error_handling(self) -> None: def test_error_handling(self) -> None:
processed = [] processed = []

19
zerver/worker/queue_processors.py
View File

@@ -410,19 +410,12 @@ class LoopQueueProcessingWorker(QueueProcessingWorker):
@assign_queue("invites") @assign_queue("invites")
class ConfirmationEmailWorker(QueueProcessingWorker): class ConfirmationEmailWorker(QueueProcessingWorker):
def consume(self, data: Mapping[str, Any]) -> None: def consume(self, data: Mapping[str, Any]) -> None:
if "email" in data: invitee = filter_to_valid_prereg_users(
# When upgrading from a version up through 1.7.1, there may be PreregistrationUser.objects.filter(id=data["prereg_id"])
# existing items in the queue with `email` instead of `prereg_id`. ).first()
invitee = filter_to_valid_prereg_users( if invitee is None:
PreregistrationUser.objects.filter(email__iexact=data["email"].strip()) # The invitation could have been revoked
).latest("invited_at") return
else:
invitee = filter_to_valid_prereg_users(
PreregistrationUser.objects.filter(id=data["prereg_id"])
).first()
if invitee is None:
# The invitation could have been revoked
return
referrer = get_user_profile_by_id(data["referrer_id"]) referrer = get_user_profile_by_id(data["referrer_id"])
logger.info( logger.info(