From 1040fb721935e9014a4d612f73b7c5fb64c78112 Mon Sep 17 00:00:00 2001 From: Steve Howell Date: Fri, 13 Nov 2020 17:27:40 +0000 Subject: [PATCH] email digests: Remove handle_digest_email shim. The previous commit made it so we only call the shim in tests, so now we completely remove it. --- zerver/lib/digest.py | 3 --- zerver/tests/test_digest.py | 5 ++--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/zerver/lib/digest.py b/zerver/lib/digest.py index ba81b708f4..95a3fdaf32 100644 --- a/zerver/lib/digest.py +++ b/zerver/lib/digest.py @@ -371,9 +371,6 @@ def bulk_write_realm_audit_logs(users: List[UserProfile]) -> None: RealmAuditLog.objects.bulk_create(log_rows) -def handle_digest_email(user_id: int, cutoff: float) -> None: - bulk_handle_digest_email([user_id], cutoff) - def get_modified_streams(user_ids: List[int], cutoff_date: datetime.datetime) -> Dict[int, Set[int]]: events = [ RealmAuditLog.SUBSCRIPTION_CREATED, diff --git a/zerver/tests/test_digest.py b/zerver/tests/test_digest.py index ae2807f934..33a932d7e5 100644 --- a/zerver/tests/test_digest.py +++ b/zerver/tests/test_digest.py @@ -16,7 +16,6 @@ from zerver.lib.digest import ( gather_new_streams, get_modified_streams, get_recent_streams, - handle_digest_email, ) from zerver.lib.message import get_last_message_id from zerver.lib.streams import create_stream_if_needed @@ -67,7 +66,7 @@ class TestDigestEmailMessages(ZulipTestCase): # To trigger this, we call the one_click_unsubscribe_link function below. one_click_unsubscribe_link(othello, 'digest') with queries_captured() as queries: - handle_digest_email(othello.id, cutoff) + bulk_handle_digest_email([othello.id], cutoff) self.assert_length(queries, 9) @@ -123,7 +122,7 @@ class TestDigestEmailMessages(ZulipTestCase): # To trigger this, we call the one_click_unsubscribe_link function below. one_click_unsubscribe_link(polonius, 'digest') with queries_captured() as queries: - handle_digest_email(polonius.id, cutoff) + bulk_handle_digest_email([polonius.id], cutoff) self.assert_length(queries, 9)