Merge pull request #276 from Xpirix/check_error_on_my_plugins

Only show latest unapproved version in the reviews list

Author: Xpirix

qgis-app/plugins/models.py

@@ -385,6 +385,12 @@ class FeedbackReceivedPlugins(models.Manager):
     """
 
     def get_queryset(self):
+        latest_version = (
+            PluginVersion.objects.filter(plugin=OuterRef("pk"))
+            .order_by("-created_on")
+            .values("approved")[:1]
+        )
+
         feedback_count_subquery = (
             PluginVersionFeedback.objects.filter(
                 version=OuterRef("pluginversion"), is_completed=False
@@ -398,12 +404,17 @@ def get_queryset(self):
             super(FeedbackReceivedPlugins, self)
             .get_queryset()
             .filter(
-                pluginversion__approved=False,
                 deprecated=False,
                 is_deleted=False,
             )
-            .annotate(received_feedback_count=Subquery(feedback_count_subquery))
-            .filter(received_feedback_count__gte=1)
+            .annotate(
+                latest_version_approved=Subquery(latest_version),
+                received_feedback_count=Subquery(feedback_count_subquery),
+            )
+            .filter(
+                latest_version_approved=False,
+                received_feedback_count__gte=1,
+            )
             .extra(
                 select={
                     "average_vote": "rating_score / (rating_votes + 0.001)",
@@ -430,18 +441,25 @@ class FeedbackPendingPlugins(models.Manager):
     """
 
     def get_queryset(self):
+        latest_version = PluginVersion.objects.filter(
+            plugin=OuterRef("pk")
+        ).order_by("-created_on").values("approved")[:1]
+
         return (
             super(FeedbackPendingPlugins, self)
             .get_queryset()
             .filter(
-                pluginversion__approved=False,
                 deprecated=False,
                 is_deleted=False,
             )
             .annotate(
+                latest_version_approved=Subquery(latest_version),
                 total_feedback_count=Count("pluginversion__feedback"),
             )
-            .filter(total_feedback_count=0)
+            .filter(
+                latest_version_approved=False,
+                total_feedback_count=0,
+            )
             .extra(
                 select={
                     "average_vote": "rating_score / (rating_votes + 0.001)",

qgis-app/plugins/tests/test_plugin_version_feedback.py

@@ -263,6 +263,47 @@ def test_approved_plugin_should_not_show_in_feedback_received_list(self):
             []
         )
 
+    def test_plugin_with_older_approved_version_shows_in_feedback_received_list(self):
+        """Plugin should appear if its latest version is unapproved, even if an older one is approved."""
+        self.version_1.approved = True
+        self.version_1.save()
+
+        newer_version = PluginVersion.objects.create(
+            plugin=self.plugin_1,
+            created_by=self.creator,
+            min_qg_version="0.0.0",
+            max_qg_version="99.99.99",
+            version="0.2",
+            approved=False,
+            external_deps="test"
+        )
+        PluginVersionFeedback.objects.create(
+            version=newer_version,
+            reviewer=self.staff,
+            task="feedback on newer version"
+        )
+
+        self.client.force_login(user=self.staff)
+        response = self.client.get(self.url)
+        self.assertIn(self.plugin_1, response.context['object_list'])
+
+    def test_plugin_with_latest_version_approved_does_not_show_in_feedback_received_list(self):
+        """Plugin should not appear if its latest version is approved, even if an older one is unapproved."""
+        PluginVersion.objects.create(
+            plugin=self.plugin_1,
+            created_by=self.creator,
+            min_qg_version="0.0.0",
+            max_qg_version="99.99.99",
+            version="0.2",
+            approved=True,
+            external_deps="test"
+        )
+
+        self.client.force_login(user=self.staff)
+        response = self.client.get(self.url)
+        self.assertNotIn(self.plugin_1, response.context['object_list'])
+
+
 
 class TestPluginFeedbackPendingList(SetupMixin, TestCase):
     fixtures = ["fixtures/auth.json"]
@@ -304,6 +345,43 @@ def test_staff_should_see_plugin_feedback_pending_list(self):
             list(response.context['object_list']),
             []
         )
+    def test_plugin_with_older_approved_version_shows_in_feedback_pending_list(self):
+        """Plugin should appear if its latest version is unapproved and has no feedback,
+        even if an older version is approved."""
+        self.version_2.approved = True
+        self.version_2.save()
+
+        PluginVersion.objects.create(
+            plugin=self.plugin_2,
+            created_by=self.creator,
+            min_qg_version="0.0.0",
+            max_qg_version="99.99.99",
+            version="2.1",
+            approved=False,
+            external_deps="test"
+        )
+
+        self.client.force_login(user=self.staff)
+        response = self.client.get(self.url)
+        self.assertIn(self.plugin_2, response.context['object_list'])
+
+
+    def test_plugin_with_latest_version_approved_does_not_show_in_feedback_pending_list(self):
+        """Plugin should not appear if its latest version is approved,
+        even if an older one is unapproved."""
+        PluginVersion.objects.create(
+            plugin=self.plugin_2,
+            created_by=self.creator,
+            min_qg_version="0.0.0",
+            max_qg_version="99.99.99",
+            version="2.1",
+            approved=True,
+            external_deps="test"
+        )
+
+        self.client.force_login(user=self.staff)
+        response = self.client.get(self.url)
+        self.assertNotIn(self.plugin_2, response.context['object_list'])
 
 
 class TestCreateVersionFeedback(SetupMixin, TestCase):