fix: File.objects.only("id") query when deleting a user (django-cms#1357

)

* Fix: Failing js test

* Fix Flie.objects.only("id") query

refs django-cms#1290

* Add test for deleting users

---------

Co-authored-by: William Lindholm <[email protected]>

CHANGELOG.rst

@@ -2,6 +2,11 @@
 CHANGELOG
 =========
 
+unreleased
+==========
+
+* Fix File.objects.only() query required for deleting user who own files.
+
 2.2.5 (2023-06-11)
 ==================
 

filer/models/filemodels.py

@@ -13,6 +13,7 @@
 from django.utils.translation import gettext_lazy as _
 
 from polymorphic.managers import PolymorphicManager
+from polymorphic.query import PolymorphicQuerySet
 from polymorphic.models import PolymorphicModel
 
 from .. import settings as filer_settings
@@ -21,7 +22,16 @@
 from .foldermodels import Folder
 
 
+class FileQuerySet(PolymorphicQuerySet):
+    def only(self, *fields):
+        fields = set(fields)
+        fields.update(["_file_size", "sha1", "is_public"])
+        return super().only(*fields)
+
+
 class FileManager(PolymorphicManager):
+    queryset_class = FileQuerySet
+
     def find_all_duplicates(self):
         r = {}
         for file_obj in self.all():

tests/test_models.py

@@ -35,9 +35,11 @@ def tearDown(self):
         for f in File.objects.all():
             f.delete()
 
-    def create_filer_image(self):
+    def create_filer_image(self, owner=None):
+        if owner is None:
+            owner = self.superuser
         file_obj = DjangoFile(open(self.filename, 'rb'), name=self.image_name)
-        image = Image.objects.create(owner=self.superuser,
+        image = Image.objects.create(owner=owner,
                                      original_filename=self.image_name,
                                      file=file_obj)
         return image
@@ -307,3 +309,22 @@ def test_canonical_url_settings(self):
         image.save()
         canonical = image.canonical_url
         self.assertTrue(canonical.startswith('/filer/test-path/'))
+
+    def test_delete_user_who_owns_file(self):
+        """Tests if deleting users who own files works"""
+        from django.contrib.auth.models import User
+
+        user = User.objects.create(
+            username="test",
+            password="top-secret",
+            email="[email protected]",
+            is_staff=True,
+        )
+        image = self.create_filer_image(user)
+
+        user.delete()
+
+        # User needs to be gone
+        self.assertEqual(len(User.objects.filter(username="test")), 0)
+        # Image remains w/o owner
+        self.assertIsNone(File.objects.get(pk=image.pk).owner)