From 0d69fc482b412f70dfacd89cb1835151bf757bd5 Mon Sep 17 00:00:00 2001 From: Vishnu Ks Date: Tue, 10 Jul 2018 09:54:03 +0530 Subject: [PATCH] models: Add USER_TOS_VERSION_CHANGED event type constant to RealmAuditLog. --- zerver/lib/actions.py | 3 ++- zerver/models.py | 1 + zerver/tests/test_audit_log.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py index 11a65e8697..ba03dffab3 100644 --- a/zerver/lib/actions.py +++ b/zerver/lib/actions.py @@ -2872,7 +2872,8 @@ def do_change_tos_version(user_profile: UserProfile, tos_version: str) -> None: user_profile.save(update_fields=["tos_version"]) event_time = timezone_now() RealmAuditLog.objects.create(realm=user_profile.realm, acting_user=user_profile, - modified_user=user_profile, event_type='user_tos_version_changed', + modified_user=user_profile, + event_type=RealmAuditLog.USER_TOS_VERSION_CHANGED, event_time=event_time) def do_regenerate_api_key(user_profile: UserProfile, acting_user: UserProfile) -> None: diff --git a/zerver/models.py b/zerver/models.py index c19897a122..14af7375d5 100644 --- a/zerver/models.py +++ b/zerver/models.py @@ -1970,6 +1970,7 @@ class RealmAuditLog(models.Model): USER_CHANGE_AVATAR_SOURCE = 'user_change_avatar_source' USER_FULL_NAME_CHANGED = 'user_full_name_changed' USER_EMAIL_CHANGED = 'user_email_changed' + USER_TOS_VERSION_CHANGED = 'user_tos_version_changed' 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 4a5b01a5a4..e81a9dbda9 100644 --- a/zerver/tests/test_audit_log.py +++ b/zerver/tests/test_audit_log.py @@ -78,7 +78,7 @@ class TestRealmAuditLog(ZulipTestCase): user = self.example_user("hamlet") tos_version = 'android' do_change_tos_version(user, tos_version) - self.assertEqual(RealmAuditLog.objects.filter(event_type='user_tos_version_changed', + self.assertEqual(RealmAuditLog.objects.filter(event_type=RealmAuditLog.USER_TOS_VERSION_CHANGED, event_time__gte=now).count(), 1) self.assertEqual(tos_version, user.tos_version)