Update expired information requests count on reviewer tools homepage (#…

…8856) * Update expired info requests count * Add test
mozilla · Jul 13, 2018 · 4b4cf1b · 4b4cf1b
1 parent 0bbd658
commit 4b4cf1b
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 6 deletions.
diff --git a/src/olympia/reviewers/tests/test_views.py b/src/olympia/reviewers/tests/test_views.py
@@ -510,10 +510,47 @@ def test_admin_all_permissions(self):
         admins_group = Group.objects.create(name='Admins', rules='*:*')
         GroupUser.objects.create(user=self.user, group=admins_group)
 
-        # Addon with expired info request
-        expired = addon_factory(name=u'Expired')
+        # Pending addon with expired info request.
+        addon1 = addon_factory(name=u'Pending Addön 1',
+                               status=amo.STATUS_NOMINATED)
+        AddonReviewerFlags.objects.create(
+            addon=addon1,
+            pending_info_request=self.days_ago(2))
+
+        # Public addon with expired info request.
+        addon2 = addon_factory(name=u'Public Addön 2',
+                               status=amo.STATUS_PUBLIC)
+        AddonReviewerFlags.objects.create(
+            addon=addon2,
+            pending_info_request=self.days_ago(42))
+
+        # Deleted addon with expired info request.
+        addon3 = addon_factory(name=u'Deleted Addön 3',
+                               status=amo.STATUS_DELETED)
+        AddonReviewerFlags.objects.create(
+            addon=addon3,
+            pending_info_request=self.days_ago(42))
+
+        # Mozilla-disabled addon with expired info request.
+        addon4 = addon_factory(name=u'Disabled Addön 4',
+                               status=amo.STATUS_DISABLED)
+        AddonReviewerFlags.objects.create(
+            addon=addon4,
+            pending_info_request=self.days_ago(42))
+
+        # Incomplete addon with expired info request.
+        addon5 = addon_factory(name=u'Incomplete Addön 5',
+                               status=amo.STATUS_NULL)
+        AddonReviewerFlags.objects.create(
+            addon=addon5,
+            pending_info_request=self.days_ago(42))
+
+        # Invisible (user-disabled) addon with expired info request.
+        addon6 = addon_factory(name=u'Incomplete Addön 5',
+                               status=amo.STATUS_PUBLIC,
+                               disabled_by_user=True)
         AddonReviewerFlags.objects.create(
-            addon=expired,
+            addon=addon6,
             pending_info_request=self.days_ago(42))
 
         # Rating
@@ -563,7 +600,7 @@ def test_admin_all_permissions(self):
         assert (doc('.dashboard a')[18].text ==
                 'Ratings Awaiting Moderation (1)')
         assert (doc('.dashboard a')[24].text ==
-                'Expired Information Requests (1)')
+                'Expired Information Requests (2)')
 
     def test_can_see_all_through_reviewer_view_all_permission(self):
         self.grant_permission(self.user, 'ReviewerTools:View')

diff --git a/src/olympia/reviewers/views.py b/src/olympia/reviewers/views.py
@@ -272,8 +272,10 @@ def dashboard(request):
             request, amo.permissions.REVIEWS_ADMIN):
         expired = (
             Addon.objects.filter(
-                addonreviewerflags__pending_info_request__lt=datetime.now()
-            ).order_by('addonreviewerflags__pending_info_request'))
+                addonreviewerflags__pending_info_request__lt=datetime.now(),
+                status__in=(amo.STATUS_NOMINATED, amo.STATUS_PUBLIC),
+                disabled_by_user=False)
+            .order_by('addonreviewerflags__pending_info_request'))
 
         sections[ugettext('Admin Tools')] = [(
             ugettext('Expired Information Requests ({0})'.format(