Only consider active NHR when filtering for due date reasons (#23421)

Author: diox

src/olympia/addons/models.py

@@ -363,10 +363,12 @@ def get_queryset_for_pending_queues(
         version_subqs = versions_due_qs.all()
         if due_date_reasons_choices:
             versions_filter = Q(
-                versions__needshumanreview__reason__in=due_date_reasons_choices.values
+                versions__needshumanreview__reason__in=due_date_reasons_choices.values,
+                versions__needshumanreview__is_active=True,
             )
             version_subqs = version_subqs.filter(
-                needshumanreview__reason__in=due_date_reasons_choices.values
+                needshumanreview__reason__in=due_date_reasons_choices.values,
+                needshumanreview__is_active=True,
             )
         else:
             versions_filter = None

src/olympia/addons/tests/test_models.py

@@ -3938,14 +3938,26 @@ def test_get_queryset_for_pending_queues_for_specific_due_date_reasons(self):
                 'needshumanreview_kw': {
                     'reason': NeedsHumanReview.REASONS.DEVELOPER_REPLY
                 },
-                'due_date': self.days_ago(23),
+                'due_date': self.days_ago(234),
             }
         )  # Should not show up
+        addon_factory(
+            version_kw={
+                'needshumanreview_kw': {
+                    'reason': NeedsHumanReview.REASONS.DEVELOPER_REPLY
+                },
+                'due_date': self.days_ago(342),
+            }
+        ).current_version.needshumanreview_set.create(
+            reason=NeedsHumanReview.REASONS.SCANNER_ACTION, is_active=False
+        )  # Should not show up either (SCANNER_ACTION NHR is inactive)
+
         addons = Addon.objects.get_queryset_for_pending_queues(
             due_date_reasons_choices=NeedsHumanReview.REASONS.extract_subset(
                 'AUTO_APPROVAL_DISABLED', 'SCANNER_ACTION'
             )
         )
+        assert list(addons) == expected_addons
         expected_version = expected_addons[0].versions.get(version='0.2')
         assert addons[0].first_version_id == expected_version.pk
         assert addons[0].first_pending_version == expected_version