paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-27 01:53:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

digest: Fix the structure that we enqueue across when digesting.

Browse Source 
This rename was missed in bfa0bdf3d6.
Without this fix, digest messages fail to send.
This commit is contained in:
Alex Vandiver
2021-02-08 15:53:26 -08:00
parent d0ba3cadcf
commit d0f0c2f2ed
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/lib/digest.py
View File

@@ -88,7 +88,7 @@ def should_process_digest(realm_str: str) -> bool:
def queue_digest_user_ids(user_ids: List[int], cutoff: datetime.datetime) -> None: def queue_digest_user_ids(user_ids: List[int], cutoff: datetime.datetime) -> None:
# Convert cutoff to epoch seconds for transit. # Convert cutoff to epoch seconds for transit.
event = { event = {
"user_profile_id": user_ids, "user_ids": user_ids,
"cutoff": cutoff.strftime('%s') "cutoff": cutoff.strftime('%s')
} }
queue_json_publish("digest_emails", event) queue_json_publish("digest_emails", event)

6
zerver/tests/test_digest.py
View File

@@ -313,7 +313,7 @@ class TestDigestEmailMessages(ZulipTestCase):
# Check that all users without an a UserActivityInterval entry are considered # Check that all users without an a UserActivityInterval entry are considered
# inactive users and get enqueued. # inactive users and get enqueued.
with mock.patch('zerver.lib.digest.queue_digest_user_ids') as queue_mock: with mock.patch('zerver.worker.queue_processors.bulk_handle_digest_email') as queue_mock:
_enqueue_emails_for_realm(realm, cutoff) _enqueue_emails_for_realm(realm, cutoff)
num_queued_users = len(queue_mock.call_args[0][0]) num_queued_users = len(queue_mock.call_args[0][0])
@@ -328,7 +328,7 @@ class TestDigestEmailMessages(ZulipTestCase):
) )
# Now we expect no users, due to recent activity. # Now we expect no users, due to recent activity.
with mock.patch('zerver.lib.digest.queue_digest_user_ids') as queue_mock: with mock.patch('zerver.worker.queue_processors.bulk_handle_digest_email') as queue_mock:
_enqueue_emails_for_realm(realm, cutoff) _enqueue_emails_for_realm(realm, cutoff)
self.assertEqual(queue_mock.call_count, 0) self.assertEqual(queue_mock.call_count, 0)
@@ -337,7 +337,7 @@ class TestDigestEmailMessages(ZulipTestCase):
last_visit = timezone_now() - datetime.timedelta(days=7) last_visit = timezone_now() - datetime.timedelta(days=7)
UserActivityInterval.objects.all().update(start=last_visit, end=last_visit) UserActivityInterval.objects.all().update(start=last_visit, end=last_visit)
with mock.patch('zerver.lib.digest.queue_digest_user_ids') as queue_mock: with mock.patch('zerver.worker.queue_processors.bulk_handle_digest_email') as queue_mock:
_enqueue_emails_for_realm(realm, cutoff) _enqueue_emails_for_realm(realm, cutoff)
num_queued_users = len(queue_mock.call_args[0][0]) num_queued_users = len(queue_mock.call_args[0][0])

1
zerver/worker/queue_processors.py
View File

@@ -612,7 +612,6 @@ class DigestWorker(QueueProcessingWorker): # nocoverage
# Who gets a digest is entirely determined by the enqueue_digest_emails # Who gets a digest is entirely determined by the enqueue_digest_emails
# management command, not here. # management command, not here.
def consume(self, event: Mapping[str, Any]) -> None: def consume(self, event: Mapping[str, Any]) -> None:
logging.info("Received digest event: %s", event)
if "user_ids" in event: if "user_ids" in event:
user_ids = event["user_ids"] user_ids = event["user_ids"]
else: else: