Add delete attachments to posting states

Author: rafalp

misago/posting/state/base.py

@@ -6,6 +6,7 @@
 from django.http import HttpRequest
 from django.utils import timezone
 
+from ...attachments.delete import delete_attachments
 from ...attachments.models import Attachment
 from ...categories.models import Category
 from ...core.utils import slugify
@@ -30,6 +31,7 @@ class PostingState:
     thread: Thread
     post: Post
     attachments: list[Attachment]
+    delete_attachments: list[Attachment]
 
     parser_context: ParserContext
     message_ast: list[dict] | None
@@ -51,6 +53,7 @@ def __init__(self, request: HttpRequest):
         self.plugin_state = {}
 
         self.attachments = []
+        self.delete_attachments = []
 
         self.store_object_state(self.user)
 
@@ -141,6 +144,19 @@ def set_post_message(self, message: str):
     def set_attachments(self, attachments: list[Attachment]):
         self.attachments = attachments
 
+    def set_delete_attachments(self, attachments: list[Attachment]):
+        self.delete_attachments = []
+        delete_ids: set[int] = set(a.id for a in attachments)
+        save_attachments: list[Attachment] = []
+
+        for attachment in self.attachments:
+            if attachment.id in delete_ids:
+                self.delete_attachments.append(attachment)
+            else:
+                save_attachments.append(attachment)
+
+        self.set_attachments(save_attachments)
+
     def save_attachments(self):
         for attachment in self.attachments:
             if attachment.post_id:
@@ -151,3 +167,6 @@ def save_attachments(self):
             attachment.post = self.post
             attachment.uploaded_at = self.timestamp
             attachment.save()
+
+        if self.delete_attachments:
+            delete_attachments(self.delete_attachments, request=self.request)

misago/posting/state/edit.py

@@ -1,8 +1,6 @@
 from django.db import models, transaction
 from django.http import HttpRequest
 
-from ...attachments.delete import delete_attachments
-from ...attachments.models import Attachment
 from ...threads.checksums import update_post_checksum
 from ...threads.models import Post
 from ..hooks import (
@@ -18,13 +16,10 @@ class EditThreadPostState(PostingState):
     # This state can actually edit both post and its thread's title
     thread_title: str
     post_original: str
-    delete_attachments: list[Attachment]
 
     def __init__(self, request: HttpRequest, post: Post):
         super().__init__(request)
 
-        self.delete_attachments = []
-
         self.category = post.category
         self.thread = post.thread
         self.post = post
@@ -36,19 +31,6 @@ def __init__(self, request: HttpRequest, post: Post):
         self.thread_title = self.thread.title
         self.post_original = post.original
 
-    def set_delete_attachments(self, attachments: list[Attachment]):
-        self.delete_attachments = []
-        delete_ids: list[int] = [a.id for a in attachments]
-        save_attachments: list[Attachment] = []
-
-        for attachment in self.attachments:
-            if attachment.id in delete_ids:
-                self.delete_attachments.append(attachment)
-            else:
-                save_attachments.append(attachment)
-
-        self.set_attachments(save_attachments)
-
     @transaction.atomic()
     def save(self):
         save_edit_thread_post_state_hook(self.save_action, self.request, self)
@@ -85,12 +67,6 @@ def save_category(self):
         self.category.last_thread_slug = self.thread.slug
         self.update_object(self.category)
 
-    def save_attachments(self):
-        super().save_attachments()
-
-        if self.delete_attachments:
-            delete_attachments(self.delete_attachments, request=self.request)
-
 
 class EditPrivateThreadPostState(EditThreadPostState):
     @transaction.atomic()

misago/posting/tests/test_edit_thread_post_state.py

@@ -30,3 +30,92 @@ def test_edit_thread_post_state_save_updates_post(
     assert post.last_editor == user
     assert post.last_editor_name == user.username
     assert post.last_editor_slug == user.slug
+
+
+def test_edit_thread_post_state_save_updates_post_attachments(
+    user, other_user, user_request, other_user_thread, text_file, attachment_factory
+):
+    post = other_user_thread.first_post
+    post_attachment = attachment_factory(text_file, uploader=other_user, post=post)
+
+    attachment = attachment_factory(text_file, uploader=user)
+    assert not attachment.category
+    assert not attachment.thread
+    assert not attachment.post
+
+    state = EditThreadPostState(user_request, other_user_thread.first_post)
+    state.set_post_message("Edit reply")
+    state.set_attachments([attachment])
+    state.save()
+
+    post_attachment.refresh_from_db()
+    assert post_attachment.category == other_user_thread.category
+    assert post_attachment.thread == other_user_thread
+    assert post_attachment.post == post
+    assert post_attachment.uploader == other_user
+    assert post_attachment.uploaded_at < state.timestamp
+
+    attachment.refresh_from_db()
+    assert attachment.category == other_user_thread.category
+    assert attachment.thread == other_user_thread
+    assert attachment.post == post
+    assert attachment.uploader == user
+    assert attachment.uploaded_at == state.timestamp
+
+
+def test_edit_thread_post_state_save_deletes_post_attachments(
+    user, other_user, user_request, other_user_thread, text_file, attachment_factory
+):
+    post = other_user_thread.first_post
+    post_attachment = attachment_factory(text_file, uploader=other_user, post=post)
+
+    attachment = attachment_factory(text_file, uploader=user, post=post)
+
+    state = EditThreadPostState(user_request, other_user_thread.first_post)
+    state.set_post_message("Edit reply")
+    state.set_attachments([attachment, post_attachment])
+    state.set_delete_attachments([attachment])
+    state.save()
+
+    post_attachment.refresh_from_db()
+    assert post_attachment.category == other_user_thread.category
+    assert post_attachment.thread == other_user_thread
+    assert post_attachment.post == post
+    assert post_attachment.uploader == other_user
+    assert post_attachment.uploaded_at < state.timestamp
+
+    attachment.refresh_from_db()
+    assert not attachment.category
+    assert not attachment.thread
+    assert not attachment.post
+    assert attachment.uploader == user
+    assert attachment.is_deleted
+
+
+def test_edit_thread_post_state_save_deletes_temporary_attachments(
+    user, other_user, user_request, other_user_thread, text_file, attachment_factory
+):
+    post = other_user_thread.first_post
+    post_attachment = attachment_factory(text_file, uploader=other_user, post=post)
+
+    temp_attachment = attachment_factory(text_file, uploader=user)
+
+    state = EditThreadPostState(user_request, other_user_thread.first_post)
+    state.set_post_message("Edit reply")
+    state.set_attachments([temp_attachment, post_attachment])
+    state.set_delete_attachments([temp_attachment])
+    state.save()
+
+    post_attachment.refresh_from_db()
+    assert post_attachment.category == other_user_thread.category
+    assert post_attachment.thread == other_user_thread
+    assert post_attachment.post == post
+    assert post_attachment.uploader == other_user
+    assert post_attachment.uploaded_at < state.timestamp
+
+    temp_attachment.refresh_from_db()
+    assert not temp_attachment.category
+    assert not temp_attachment.thread
+    assert not temp_attachment.post
+    assert temp_attachment.uploader == user
+    assert temp_attachment.is_deleted

misago/posting/tests/test_reply_thread_state.py

@@ -130,7 +130,7 @@ def test_reply_thread_state_assigns_attachments_to_category_thread_and_post(
     assert attachment.uploaded_at == state.timestamp
 
 
-def test_reply_thread_state_updates_existing_post(
+def test_reply_thread_state_updates_existing_post_attachments(
     user, user_request, user_thread, text_file, attachment_factory
 ):
     post = user_thread.first_post

misago/posting/tests/test_start_thread_state.py

@@ -85,3 +85,46 @@ def test_start_thread_state_assigns_attachments_to_category_thread_and_post(
     assert attachment.thread == state.thread
     assert attachment.post == state.post
     assert attachment.uploaded_at == state.timestamp
+
+
+def test_start_thread_state_deletes_temp_attachments(
+    user_request, default_category, user, text_file, attachment_factory
+):
+    attachment = attachment_factory(text_file, uploader=user)
+    assert not attachment.category
+    assert not attachment.thread
+    assert not attachment.post
+
+    state = StartThreadState(user_request, default_category)
+    state.set_thread_title("Test thread")
+    state.set_post_message("Hello world")
+    state.set_attachments([attachment])
+    state.set_delete_attachments([attachment])
+    state.save()
+
+    attachment.refresh_from_db()
+    assert not attachment.category
+    assert not attachment.thread
+    assert not attachment.post
+    assert attachment.is_deleted
+
+
+def test_start_thread_state_delete_attachments_excludes_unknown_attachments(
+    user_request, default_category, user, text_file, attachment_factory, post
+):
+    attachment = attachment_factory(text_file, uploader=user, post=post)
+    assert attachment.category == post.category
+    assert attachment.thread == post.thread
+    assert attachment.post == post
+
+    state = StartThreadState(user_request, default_category)
+    state.set_thread_title("Test thread")
+    state.set_post_message("Hello world")
+    state.set_delete_attachments([attachment])
+    state.save()
+
+    attachment.refresh_from_db()
+    assert attachment.category == post.category
+    assert attachment.thread == post.thread
+    assert attachment.post == post
+    assert not attachment.is_deleted