mirror of
https://github.com/zulip/zulip.git
synced 2025-11-02 21:13:36 +00:00
30495cec58
This migration applies under the assumption that extra_data_json has been populated for all existing and coming audit log entries. - This removes the manual conversions back and forth for extra_data throughout the codebase including the orjson.loads(), orjson.dumps(), and str() calls. - The custom handler used for converting Decimal is removed since DjangoJSONEncoder handles that for extra_data. - We remove None-checks for extra_data because it is now no longer nullable. - Meanwhile, we want the bouncer to support processing RealmAuditLog entries for remote servers before and after the JSONField migration on extra_data. - Since now extra_data should always be a dict for the newer remote server, which is now migrated, the test cases are updated to create RealmAuditLog objects by passing a dict for extra_data before sending over the analytics data. Note that while JSONField allows for non-dict values, a proper remote server always passes a dict for extra_data. - We still test out the legacy extra_data format because not all remote servers have migrated to use JSONField extra_data. This verifies that support for extra_data being a string or None has not been dropped. Co-authored-by: Siddharth Asthana <siddharthasthana31@gmail.com> Signed-off-by: Zixuan James Li <p359101898@gmail.com>
39 lines
1.1 KiB
Python
39 lines
1.1 KiB
Python
from typing import Optional
|
|
|
|
from django.db import transaction
|
|
from django.utils.timezone import now as timezone_now
|
|
|
|
from zerver.lib.realm_icon import realm_icon_url
|
|
from zerver.models import Realm, RealmAuditLog, UserProfile, active_user_ids
|
|
from zerver.tornado.django_api import send_event_on_commit
|
|
|
|
|
|
@transaction.atomic(durable=True)
|
|
def do_change_icon_source(
|
|
realm: Realm, icon_source: str, *, acting_user: Optional[UserProfile]
|
|
) -> None:
|
|
realm.icon_source = icon_source
|
|
realm.icon_version += 1
|
|
realm.save(update_fields=["icon_source", "icon_version"])
|
|
|
|
event_time = timezone_now()
|
|
RealmAuditLog.objects.create(
|
|
realm=realm,
|
|
event_type=RealmAuditLog.REALM_ICON_SOURCE_CHANGED,
|
|
extra_data={"icon_source": icon_source, "icon_version": realm.icon_version},
|
|
event_time=event_time,
|
|
acting_user=acting_user,
|
|
)
|
|
|
|
event = dict(
|
|
type="realm",
|
|
op="update_dict",
|
|
property="icon",
|
|
data=dict(icon_source=realm.icon_source, icon_url=realm_icon_url(realm)),
|
|
)
|
|
send_event_on_commit(
|
|
realm,
|
|
event,
|
|
active_user_ids(realm.id),
|
|
)
|