Merge pull request #261 from Xpirix/match_plugins_count

Match plugins count in XML with QGIS 4 Ready List

Author: Xpirix

qgis-app/plugins/models.py

@@ -33,14 +33,14 @@ class BasePluginManager(models.Manager):
     * weighted_rating uses the Bayesian Average formula
     to provide a more balanced rating that mitigates the effect of low vote counts.
 
-    Excludes soft-deleted plugins by default.
+    Includes soft-deleted plugins so they remain visible in listings until
+    permanently deleted.
     """
 
     def get_queryset(self):
         return (
             super(BasePluginManager, self)
             .get_queryset()
-            .filter(is_deleted=False)
             .extra(
                 select={
                     "average_vote": "rating_score / (rating_votes + 0.001)",
@@ -121,7 +121,6 @@ def get_queryset(self):
             .filter(
                 pluginversion__approved=True,
                 pluginversion__max_qg_version__gte=f"{settings.NEW_QGIS_MAJOR_VERSION}.0",
-                deprecated=False
             )
             .distinct()
             .order_by("-created_on")
@@ -204,7 +203,7 @@ def get_queryset(self):
         return (
             super(UnapprovedPlugins, self)
             .get_queryset()
-            .filter(pluginversion__approved=False, deprecated=False)
+            .filter(pluginversion__approved=False, deprecated=False, is_deleted=False)
             .extra(
                 select={
                     "average_vote": "rating_score / (rating_votes + 0.001)",

qgis-app/plugins/search_indexes.py

@@ -26,5 +26,5 @@ def get_model(self):
         return Plugin
 
     def index_queryset(self, using=None):
-        """Only search in approved plugins."""
+        """Search in approved plugins, including those marked for deletion."""
         return Plugin.approved_objects.all()

qgis-app/plugins/tests/test_soft_delete.py

@@ -76,8 +76,12 @@ def test_plugin_soft_delete_marks_as_deleted(self):
         self.assertTrue(plugin.is_deleted)
         self.assertIsNotNone(plugin.deleted_on)
 
-    def test_soft_deleted_plugin_excluded_from_approved_objects(self):
-        """Test that soft-deleted plugins don't appear in approved_objects."""
+    def test_soft_deleted_plugin_still_in_approved_objects(self):
+        """Test that soft-deleted plugins still appear in approved_objects.
+
+        Plugins marked for deletion should remain visible in the public listing
+        until they are permanently deleted (see issue #253).
+        """
         # First, approve and verify plugin appears
         self.version1.approved = True
         self.version1.save()
@@ -88,8 +92,8 @@ def test_soft_deleted_plugin_excluded_from_approved_objects(self):
         self.plugin.deleted_on = timezone.now()
         self.plugin.save()
 
-        # Plugin should not appear in approved_objects
-        self.assertNotIn(self.plugin, Plugin.approved_objects.all())
+        # Plugin should still appear in approved_objects (visible in listings)
+        self.assertIn(self.plugin, Plugin.approved_objects.all())
 
     def test_soft_deleted_plugin_visible_in_my_plugins(self):
         """Test that soft-deleted plugins are visible to owners in My Plugins."""
@@ -162,6 +166,44 @@ def test_only_soft_deleted_plugins_can_be_permanently_deleted(self):
         # Should get 404
         self.assertEqual(response.status_code, 404)
 
+    def test_soft_deleted_plugin_visible_in_approved_listing(self):
+        """Test that soft-deleted plugins still appear in the approved plugin listing.
+
+        Plugins marked for deletion remain accessible until permanently deleted
+        so users can still download them during the grace period (see issue #253).
+        """
+        # Approve the version so plugin appears in approved listing
+        self.version1.approved = True
+        self.version1.save()
+        self.assertIn(self.plugin, Plugin.approved_objects.all())
+
+        # Soft delete the plugin
+        self.plugin.is_deleted = True
+        self.plugin.deleted_on = timezone.now()
+        self.plugin.save()
+
+        # Plugin should still appear in approved_objects listing
+        self.assertIn(self.plugin, Plugin.approved_objects.all())
+
+        # Check it also appears in the view response
+        response = self.client.get(reverse("approved_plugins"))
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, self.plugin.name)
+
+    def test_soft_deleted_plugin_excluded_from_unapproved_listing(self):
+        """Test that soft-deleted plugins don't appear in the unapproval queue."""
+        # version2 is unapproved, so the plugin appears in unapproved_objects
+        self.assertIn(self.plugin, Plugin.unapproved_objects.all())
+
+        # Soft delete the plugin
+        self.plugin.is_deleted = True
+        self.plugin.deleted_on = timezone.now()
+        self.plugin.save()
+
+        # Plugin should NOT appear in unapproved_objects (no need to review
+        # plugins that are being deleted)
+        self.assertNotIn(self.plugin, Plugin.unapproved_objects.all())
+
 
 class TestDeleteMarkedPluginsTask(SetupMixin, TestCase):
     """Test the Celery task for permanent deletion of marked plugins."""