From 201b99a6f88f062dee4bc4d5d942021e03a69a36 Mon Sep 17 00:00:00 2001 From: Vishnu Ks Date: Mon, 9 Jul 2018 23:40:31 +0530 Subject: [PATCH] models: Add USER_REACTIVATED event type constant to RealmAuditLog. --- analytics/tests/test_counts.py | 8 ++++---- zerver/lib/actions.py | 2 +- zerver/models.py | 1 + zerver/tests/test_audit_log.py | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/analytics/tests/test_counts.py b/analytics/tests/test_counts.py index 8b5cbed00b..002b4a730c 100644 --- a/analytics/tests/test_counts.py +++ b/analytics/tests/test_counts.py @@ -903,7 +903,7 @@ class TestActiveUsersAudit(AnalyticsTestCase): def test_user_reactivated_in_future(self) -> None: self.add_event(RealmAuditLog.USER_DEACTIVATED, 1) - self.add_event('user_reactivated', 0) + self.add_event(RealmAuditLog.USER_REACTIVATED, 0) do_fill_count_stat_at_hour(self.stat, self.TIME_ZERO) self.assertTableState(UserCount, [], []) @@ -915,7 +915,7 @@ class TestActiveUsersAudit(AnalyticsTestCase): def test_user_unactive_then_activated_same_day(self) -> None: self.add_event(RealmAuditLog.USER_DEACTIVATED, 1) - self.add_event('user_reactivated', .5) + self.add_event(RealmAuditLog.USER_REACTIVATED, .5) do_fill_count_stat_at_hour(self.stat, self.TIME_ZERO) self.assertTableState(UserCount, ['subgroup'], [['false']]) @@ -930,7 +930,7 @@ class TestActiveUsersAudit(AnalyticsTestCase): def test_user_deactivated_then_reactivated_with_day_gap(self) -> None: self.add_event(RealmAuditLog.USER_DEACTIVATED, 2) - self.add_event('user_reactivated', 1) + self.add_event(RealmAuditLog.USER_REACTIVATED, 1) process_count_stat(self.stat, self.TIME_ZERO) self.assertTableState(UserCount, ['subgroup'], [['false']]) @@ -938,7 +938,7 @@ class TestActiveUsersAudit(AnalyticsTestCase): self.add_event(RealmAuditLog.USER_CREATED, 4) self.add_event(RealmAuditLog.USER_DEACTIVATED, 3) self.add_event(RealmAuditLog.USER_ACTIVATED, 2) - self.add_event('user_reactivated', 1) + self.add_event(RealmAuditLog.USER_REACTIVATED, 1) for i in range(4): do_fill_count_stat_at_hour(self.stat, self.TIME_ZERO - i*self.DAY) self.assertTableState(UserCount, ['subgroup', 'end_time'], diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py index 113bf339c9..a4d3d2cbc9 100644 --- a/zerver/lib/actions.py +++ b/zerver/lib/actions.py @@ -560,7 +560,7 @@ def do_reactivate_user(user_profile: UserProfile, acting_user: Optional[UserProf event_time = timezone_now() RealmAuditLog.objects.create(realm=user_profile.realm, modified_user=user_profile, - event_type='user_reactivated', event_time=event_time, + event_type=RealmAuditLog.USER_REACTIVATED, event_time=event_time, acting_user=acting_user, requires_billing_update=activity_change_requires_seat_update(user_profile)) do_increment_logging_stat(user_profile.realm, COUNT_STATS['active_users_log:is_bot:day'], diff --git a/zerver/models.py b/zerver/models.py index 581d00b512..3577dd6803 100644 --- a/zerver/models.py +++ b/zerver/models.py @@ -1965,6 +1965,7 @@ class RealmAuditLog(models.Model): USER_CREATED = 'user_created' USER_ACTIVATED = 'user_activated' USER_DEACTIVATED = 'user_deactivated' + USER_REACTIVATED = 'user_reactivated' event_type = models.CharField(max_length=40) # type: str diff --git a/zerver/tests/test_audit_log.py b/zerver/tests/test_audit_log.py index 590aa91e40..6297376faf 100644 --- a/zerver/tests/test_audit_log.py +++ b/zerver/tests/test_audit_log.py @@ -29,7 +29,7 @@ class TestRealmAuditLog(ZulipTestCase): event_time__gte=now, event_time__lte=now+timedelta(minutes=60)) .order_by('event_time').values_list('event_type', flat=True)) self.assertEqual(event_types, [RealmAuditLog.USER_CREATED, RealmAuditLog.USER_DEACTIVATED, RealmAuditLog.USER_ACTIVATED, - RealmAuditLog.USER_DEACTIVATED, 'user_reactivated']) + RealmAuditLog.USER_DEACTIVATED, RealmAuditLog.USER_REACTIVATED]) def test_change_password(self) -> None: now = timezone_now()