Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

retention: Clean up code of move_messages_to_archive().

This commit is contained in:
Mateusz Mandera 2019-06-12 17:24:15 +02:00 committed by Tim Abbott
parent a68c460a14
commit 37a22844b9
1 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
zerver/lib/retention.py
View File

@ -281,35 +281,9 @@ def move_messages_to_archive(message_ids: List[int]) -> None:
ArchivedMessage.objects.bulk_create([ArchivedMessage(**message) for message in messages]) ArchivedMessage.objects.bulk_create([ArchivedMessage(**message) for message in messages])
# Move user_messages to the archive. move_related_objects_to_archive(message_ids)
user_messages = UserMessage.objects.filter(
message_id__in=message_ids).exclude(id__in=ArchivedUserMessage.objects.all()).values()
user_messages_ids = [user_message['id'] for user_message in user_messages]
ArchivedUserMessage.objects.bulk_create(
[ArchivedUserMessage(**user_message) for user_message in user_messages]
)
for model in models_with_message_key:
elements = model['class'].objects.filter(message_id__in=message_ids).exclude(
id__in=model['archive_class'].objects.all()
).values()
model['archive_class'].objects.bulk_create(
[model['archive_class'](**element) for element in elements]
)
# Move attachments to archive
attachments = Attachment.objects.filter(messages__id__in=message_ids).exclude(
id__in=ArchivedAttachment.objects.all()).distinct().values()
ArchivedAttachment.objects.bulk_create(
[ArchivedAttachment(**attachment) for attachment in attachments]
)
move_attachment_messages_to_archive(message_ids)
# Remove data from main tables # Remove data from main tables
Message.objects.filter(id__in=message_ids).delete() delete_messages(message_ids)
UserMessage.objects.filter(id__in=user_messages_ids, message_id__isnull=True).delete()
archived_attachments = ArchivedAttachment.objects.filter(messages__id__in=message_ids).distinct() archived_attachments = ArchivedAttachment.objects.filter(messages__id__in=message_ids).distinct()
Attachment.objects.filter(messages__isnull=True, id__in=archived_attachments).delete() Attachment.objects.filter(messages__isnull=True, id__in=archived_attachments).delete()