From 52afbe5e8dfb95f768abc82c032c773d6c7a1c1e Mon Sep 17 00:00:00 2001 From: Puneeth Chaganti Date: Tue, 12 Mar 2019 07:18:01 +0530 Subject: [PATCH] soft-deactivation: Rename maybe_catch_up_soft_deactivated_user. Rename `maybe_catch_up_soft_deactivated_user` to `reactivate_user_if_soft_deactivated`. --- zerver/lib/events.py | 4 ++-- zerver/lib/soft_deactivation.py | 4 ++-- zerver/tests/test_events.py | 2 +- zerver/tests/test_messages.py | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/zerver/lib/events.py b/zerver/lib/events.py index 359b6cd55b..6f2fb02fd6 100644 --- a/zerver/lib/events.py +++ b/zerver/lib/events.py @@ -26,7 +26,7 @@ from zerver.lib.message import ( ) from zerver.lib.narrow import check_supported_events_narrow_filter, read_stop_words from zerver.lib.push_notifications import push_notifications_enabled -from zerver.lib.soft_deactivation import maybe_catch_up_soft_deactivated_user +from zerver.lib.soft_deactivation import reactivate_user_if_soft_deactivated from zerver.lib.realm_icon import realm_icon_url from zerver.lib.realm_logo import realm_logo_url from zerver.lib.request import JsonableError @@ -768,7 +768,7 @@ def do_events_register(user_profile: UserProfile, user_client: Client, event_types_set = None # Fill up the UserMessage rows if a soft-deactivated user has returned - maybe_catch_up_soft_deactivated_user(user_profile) + reactivate_user_if_soft_deactivated(user_profile) ret = fetch_initial_state_data(user_profile, event_types_set, queue_id, client_gravatar=client_gravatar, diff --git a/zerver/lib/soft_deactivation.py b/zerver/lib/soft_deactivation.py index f26330eb27..debf437191 100644 --- a/zerver/lib/soft_deactivation.py +++ b/zerver/lib/soft_deactivation.py @@ -210,7 +210,7 @@ def do_soft_deactivate_users(users: List[UserProfile]) -> List[UserProfile]: return users_soft_deactivated -def maybe_catch_up_soft_deactivated_user(user_profile: UserProfile) -> Union[UserProfile, None]: +def reactivate_user_if_soft_deactivated(user_profile: UserProfile) -> Union[UserProfile, None]: if user_profile.long_term_idle: add_missing_messages(user_profile) user_profile.long_term_idle = False @@ -245,7 +245,7 @@ def get_users_for_soft_deactivation(inactive_for_days: int, filter_kwargs: Any) def do_soft_activate_users(users: List[UserProfile]) -> List[UserProfile]: users_soft_activated = [] for user_profile in users: - user_activated = maybe_catch_up_soft_deactivated_user(user_profile) + user_activated = reactivate_user_if_soft_deactivated(user_profile) if user_activated: users_soft_activated.append(user_activated) return users_soft_activated diff --git a/zerver/tests/test_events.py b/zerver/tests/test_events.py index 7a5903604e..023c154638 100644 --- a/zerver/tests/test_events.py +++ b/zerver/tests/test_events.py @@ -185,7 +185,7 @@ class EventsEndpointTest(ZulipTestCase): return_user_events = [] # type: (List[Any]) # Test that call is made to deal with a returning soft deactivated user. - with mock.patch('zerver.lib.events.maybe_catch_up_soft_deactivated_user') as fa: + with mock.patch('zerver.lib.events.reactivate_user_if_soft_deactivated') as fa: with stub_event_queue_user_events(return_event_queue, return_user_events): result = self.api_post(email, '/json/register', dict(event_types=ujson.dumps(['pointer']))) self.assertEqual(fa.call_count, 1) diff --git a/zerver/tests/test_messages.py b/zerver/tests/test_messages.py index 3677aefbc5..2f18860c9d 100644 --- a/zerver/tests/test_messages.py +++ b/zerver/tests/test_messages.py @@ -76,7 +76,7 @@ from zerver.lib.soft_deactivation import ( add_missing_messages, do_soft_activate_users, do_soft_deactivate_users, - maybe_catch_up_soft_deactivated_user, + reactivate_user_if_soft_deactivated, ) from zerver.models import ( @@ -3639,7 +3639,7 @@ class DeleteMessageTest(ZulipTestCase): class SoftDeactivationMessageTest(ZulipTestCase): - def test_maybe_catch_up_soft_deactivated_user(self) -> None: + def test_reactivate_user_if_soft_deactivated(self) -> None: recipient_list = [self.example_user("hamlet"), self.example_user("iago")] for user_profile in recipient_list: self.subscribe(user_profile, "Denmark") @@ -3666,7 +3666,7 @@ class SoftDeactivationMessageTest(ZulipTestCase): idle_user_msg_count = len(idle_user_msg_list) self.assertNotEqual(idle_user_msg_list[-1].content, message) with queries_captured() as queries: - maybe_catch_up_soft_deactivated_user(long_term_idle_user) + reactivate_user_if_soft_deactivated(long_term_idle_user) self.assert_length(queries, 8) self.assertFalse(long_term_idle_user.long_term_idle) self.assertEqual(last_realm_audit_log_entry(