Added backend for device specific queue (bug 862474)

Author: Rob Hudson

apps/amo/tests/__init__.py

@@ -190,7 +190,9 @@ def __getattr__(self, name):
 
 
 ES_patchers = [mock.patch('amo.search.get_es', spec=True),
-               mock.patch('elasticutils.contrib.django', spec=True)]
+               mock.patch('elasticutils.contrib.django', spec=True),
+               mock.patch('mkt.webapps.models.WebappIndexer.get_es',
+                          spec=True)]
 
 
 def start_es_mock():

mkt/reviewers/helpers.py

@@ -5,9 +5,9 @@
 from django.core.exceptions import ObjectDoesNotExist
 
 import jinja2
+import waffle
 from jingo import register
 from tower import ugettext as _, ugettext_lazy as _lazy
-import waffle
 
 
 from access import acl
@@ -16,7 +16,7 @@
 
 from mkt.developers.helpers import mkt_page_title
 from mkt.reviewers.utils import (AppsReviewing, clean_sort_param,
-                                 create_sort_link)
+                                 create_sort_link, device_queue_search)
 
 
 @register.function
@@ -38,6 +38,7 @@ def reviewers_breadcrumbs(context, queue=None, items=None):
                   'rereview': _('Re-reviews'),
                   'updates': _('Updates'),
                   'escalated': _('Escalations'),
+                  'device': _('Device'),
                   'moderated': _('Moderated Reviews'),
                   'reviewing': _('Reviewing'),
                   'themes': _('Themes')}
@@ -73,11 +74,12 @@ def queue_tabnav(context):
 
     Each tuple contains three elements: (named_url. tab_code, tab_text)
     """
+    request = context['request']
     counts = context['queue_counts']
-    apps_reviewing = AppsReviewing(context['request']).get_apps()
+    apps_reviewing = AppsReviewing(request).get_apps()
 
     # Apps.
-    if acl.action_allowed(context['request'], 'Apps', 'Review'):
+    if acl.action_allowed(request, 'Apps', 'Review'):
         rv = [
             ('reviewers.apps.queue_pending', 'pending',
              _('Apps ({0})', counts['pending']).format(counts['pending'])),
@@ -89,7 +91,7 @@ def queue_tabnav(context):
             ('reviewers.apps.queue_updates', 'updates',
              _('Updates ({0})', counts['updates']).format(counts['updates'])),
         ]
-        if acl.action_allowed(context['request'], 'Apps', 'ReviewEscalated'):
+        if acl.action_allowed(request, 'Apps', 'ReviewEscalated'):
             rv.append(('reviewers.apps.queue_escalated', 'escalated',
                        _('Escalations ({0})', counts['escalated']).format(
                        counts['escalated'])))
@@ -105,10 +107,16 @@ def queue_tabnav(context):
         rv = []
 
     # Themes.
-    if (acl.action_allowed(context['request'], 'Personas', 'Review') and
+    if (acl.action_allowed(request, 'Personas', 'Review') and
         waffle.switch_is_active('mkt-themes')):
         rv.append(('reviewers.themes.list', 'themes',
                   _('Themes ({0})').format(counts['themes']),))
+
+    if waffle.switch_is_active('buchets') and 'pro' in request.GET:
+        device_srch = device_queue_search(request)
+        rv.append(('reviewers.apps.queue_device', 'device',
+                  _('Device ({0})').format(device_srch.count()),))
+
     return rv
 
 

mkt/reviewers/tests/test_views.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 import datetime
 import json
+import os.path
 import time
 from itertools import cycle
-import os.path
 
 from django.conf import settings
 from django.core import mail
@@ -13,13 +13,14 @@
 from django.utils import translation
 
 import mock
+import requests
 from nose import SkipTest
 from nose.tools import eq_, ok_
 from pyquery import PyQuery as pq
-import requests
 
 import amo
 import amo.tests
+import reviews
 from abuse.models import AbuseReport
 from access.models import GroupUser
 from addons.models import AddonDeviceType
@@ -35,16 +36,17 @@
 from files.models import File
 from lib.crypto import packaged
 from lib.crypto.tests import mock_sign
+from reviews.models import Review, ReviewFlag
+from users.models import UserProfile
+from versions.models import Version
+from zadmin.models import get_config, set_config
+
+from mkt.constants.features import FeatureProfile
 from mkt.reviewers.views import _do_sort, _queue_to_apps
 from mkt.site.fixtures import fixture
 from mkt.submit.tests.test_views import BasePackagedAppTest
 from mkt.webapps.models import Webapp
 from mkt.webapps.tests.test_models import PackagedFilesMixin
-import reviews
-from reviews.models import Review, ReviewFlag
-from users.models import UserProfile
-from versions.models import Version
-from zadmin.models import get_config, set_config
 
 
 class AttachmentManagementMixin(object):
@@ -660,6 +662,50 @@ def test_deleted_version_not_in_queue(self, _mock):
         ok_(self.apps[1] in apps)
 
 
+class TestDeviceQueue(AppReviewerTest, AccessMixin):
+    fixtures = fixture('group_editor.json', 'user_editor.json',
+                       'user_editor_group.json', 'user_999.json')
+
+    def setUp(self):
+        self.create_switch('buchets')
+        self.create_switch('search-api-es')
+
+        self.app1 = app_factory(name='XXX',
+                                version_kw={'version': '1.0',
+                                            'created': self.days_ago(2),
+                                            'nomination': self.days_ago(2)})
+        self.app1.versions.latest().features.update(has_sms=True)
+
+        self.app2 = app_factory(name='YYY',
+                                version_kw={'version': '1.0',
+                                            'created': self.days_ago(2),
+                                            'nomination': self.days_ago(2)})
+        self.app2.versions.latest().features.update(has_mp3=True)
+
+        self.app1.update(status=amo.STATUS_PENDING)
+        self.app2.update(status=amo.STATUS_PENDING)
+
+        self.apps = list(Webapp.objects.order_by('id'))
+        self.login_as_editor()
+        self.url = reverse('reviewers.apps.queue_device')
+
+    def test_no_queue_if_no_pro(self):
+        res = self.client.get(self.url)
+        eq_(res.status_code, 200)
+        ok_('queue_device' not in res.context['queue_counts'])
+        eq_(res.context['addons'], [])
+
+    def test_queue_filters(self):
+        "Test queue filters out apps we don't support."
+        pro = FeatureProfile(sms=True).to_signature()
+        res = self.client.get(self.url, {'pro': pro})
+        eq_(res.status_code, 200)
+        eq_(res.context['queue_counts']['device'], 1)
+        apps = [a.app for a in res.context['addons']]
+        ok_(self.app1 in apps)
+        ok_(self.app2 not in apps)
+
+
 class TestEscalationQueue(AppReviewerTest, AccessMixin, FlagsMixin,
                           SearchMixin, XSSMixin):
     fixtures = ['base/users']

mkt/reviewers/urls.py

@@ -22,8 +22,10 @@
         name='reviewers.apps.queue_updates'),
     url(r'^apps/queue/escalated/$', views.queue_escalated,
         name='reviewers.apps.queue_escalated'),
-    url(r'^apps/queue/moderated$', views.queue_moderated,
+    url(r'^apps/queue/moderated/$', views.queue_moderated,
         name='reviewers.apps.queue_moderated'),
+    url(r'^apps/queue/device/$', views.queue_device,
+        name='reviewers.apps.queue_device'),
     url(r'^apps/review/%s$' % amo.APP_SLUG, views.app_review,
         name='reviewers.apps.review'),
     url(r'^apps/review/%s/manifest$' % amo.APP_SLUG, views.app_view_manifest,

mkt/reviewers/utils.py

@@ -18,6 +18,7 @@
 from editors.models import EscalationQueue, RereviewQueue, ReviewerScore
 from files.models import File
 
+from mkt.constants.features import FeatureProfile
 from mkt.site.helpers import product_as_dict
 from mkt.webapps.models import Webapp
 
@@ -533,3 +534,23 @@ def add(self, addon_id):
         apps.append(addon_id)
         cache.set(self.key, ','.join(map(str, set(apps))),
                   amo.EDITOR_VIEWING_INTERVAL * 2)
+
+
+def device_queue_search(request):
+    """
+    Returns a queryset that can be used as a base for searching the device
+    specific queue.
+    """
+    filters = {
+        'type': amo.ADDON_WEBAPP,
+        'status': amo.STATUS_PENDING,
+        'disabled_by_user': False,
+    }
+    sig = request.GET.get('pro')
+    if sig:
+        profile = FeatureProfile.from_signature(sig)
+        filters.update(dict(
+            **profile.to_kwargs(prefix='_current_version__features__has_')
+        ))
+    return Webapp.version_and_file_transformer(
+        Webapp.objects.filter(**filters))

mkt/reviewers/views.py

@@ -44,7 +44,8 @@
 from users.models import UserProfile
 from zadmin.models import set_config, unmemoized_get_config
 
-from mkt.reviewers.utils import AppsReviewing, clean_sort_param
+from mkt.reviewers.utils import (AppsReviewing, clean_sort_param,
+                                 device_queue_search)
 from mkt.search.forms import ApiSearchForm
 from mkt.site.helpers import product_as_dict
 from mkt.submit.forms import AppFeaturesForm
@@ -67,6 +68,7 @@ def home(request):
     progress, percentage = _progress()
 
     data = context(
+        request,
         reviews_total=ActivityLog.objects.total_reviews(webapp=True)[:5],
         reviews_monthly=ActivityLog.objects.monthly_reviews(webapp=True)[:5],
         #new_editors=EventLog.new_editors(),  # Bug 747035
@@ -78,7 +80,7 @@ def home(request):
     return jingo.render(request, 'reviewers/home.html', data)
 
 
-def queue_counts():
+def queue_counts(request):
     excluded_ids = EscalationQueue.uncached.values_list('addon', flat=True)
 
     counts = {
@@ -114,6 +116,10 @@ def queue_counts():
                                  .filter(addon__status=amo.STATUS_PENDING)
                                  .count(),
     }
+
+    if waffle.switch_is_active('buchets') and 'pro' in request.GET:
+        counts.update({'device': device_queue_search(request).count()})
+
     rv = {}
     if isinstance(type, basestring):
         return counts[type]
@@ -154,10 +160,10 @@ def _progress():
     return (progress, percentage)
 
 
-def context(**kw):
+def context(request, **kw):
     statuses = dict((k, unicode(v)) for k, v in amo.STATUS_CHOICES.items())
     ctx = dict(motd=unmemoized_get_config('mkt_reviewers_motd'),
-               queue_counts=queue_counts(),
+               queue_counts=queue_counts(request),
                search_url=reverse('api_dispatch_list', kwargs={
                    'api_name': 'apps', 'resource_name': 'search'}),
                statuses=statuses, point_types=amo.REVIEWED_MARKETPLACE)
@@ -299,7 +305,7 @@ def _review(request, addon, version):
     num_pages = pager.paginator.num_pages
     count = pager.paginator.count
 
-    ctx = context(version=version, product=addon, pager=pager,
+    ctx = context(request, version=version, product=addon, pager=pager,
                   num_pages=num_pages, count=count,
                   flags=Review.objects.filter(addon=addon, flag=True),
                   form=form, canned=canned, is_admin=is_admin,
@@ -352,7 +358,7 @@ def _queue(request, apps, tab, pager_processor=None):
     per_page = request.GET.get('per_page', QUEUE_PER_PAGE)
     pager = paginate(request, apps, per_page)
 
-    return jingo.render(request, 'reviewers/queue.html', context(**{
+    return jingo.render(request, 'reviewers/queue.html', context(request, **{
         'addons': pager.object_list,
         'pager': pager,
         'tab': tab,
@@ -443,6 +449,21 @@ def queue_updates(request):
     return _queue(request, apps, 'updates')
 
 
+@permission_required('Apps', 'Review')
+def queue_device(request):
+    """
+    A device specific queue matching apps which require features that our
+    device support based on the `profile` query string.
+    """
+    if waffle.switch_is_active('buchets') and 'pro' in request.GET:
+        apps = [QueuedApp(app, app.all_versions[0].nomination)
+                for app in device_queue_search(request)]
+    else:
+        apps = []
+
+    return _queue(request, apps, 'device')
+
+
 @permission_required('Apps', 'Review')
 def queue_moderated(request):
     """Queue for reviewing app reviews."""
@@ -463,7 +484,7 @@ def queue_moderated(request):
         return redirect(reverse('reviewers.apps.queue_moderated'))
 
     return jingo.render(request, 'reviewers/queue.html',
-                        context(reviews_formset=reviews_formset,
+                        context(request, reviews_formset=reviews_formset,
                                 tab='moderated', page=page, flags=flags))
 
 
@@ -524,7 +545,7 @@ def logs(request):
                 Q(user__username__icontains=term)).distinct()
 
     pager = paginate(request, approvals, 50)
-    data = context(form=form, pager=pager, ACTION_DICT=amo.LOG_BY_ID,
+    data = context(request, form=form, pager=pager, ACTION_DICT=amo.LOG_BY_ID,
                    tab='apps')
     return jingo.render(request, 'reviewers/logs.html', data)
 
@@ -538,7 +559,7 @@ def motd(request):
     if form and request.method == 'POST' and form.is_valid():
         set_config(u'mkt_reviewers_motd', form.cleaned_data['motd'])
         return redirect(reverse('reviewers.apps.motd'))
-    data = context(form=form)
+    data = context(request, form=form)
     return jingo.render(request, 'reviewers/motd.html', data)
 
 
@@ -656,7 +677,8 @@ def app_abuse(request, addon):
     total = reports.count()
     reports = paginate(request, reports, count=total)
     return jingo.render(request, 'reviewers/abuse.html',
-                        context(addon=addon, reports=reports, total=total))
+                        context(request, addon=addon, reports=reports,
+                                total=total))
 
 
 @permission_required('Apps', 'Review')
@@ -718,7 +740,7 @@ def _sum(iter, types):
         }
     }
 
-    ctx = context(**{
+    ctx = context(request, **{
         'profile': user,
         'total': total,
         'breakdown': breakdown,
@@ -730,18 +752,18 @@ def _sum(iter, types):
 @permission_required('Apps', 'Review')
 def leaderboard(request):
 
-    return jingo.render(request, 'reviewers/leaderboard.html', context(**{
-        'scores': ReviewerScore.all_users_by_score(),
-    }))
+    return jingo.render(request, 'reviewers/leaderboard.html', context(request,
+        **{'scores': ReviewerScore.all_users_by_score()}))
 
 
 @permission_required('Apps', 'Review')
 @json_view
 def apps_reviewing(request):
 
-    return jingo.render(request, 'reviewers/apps_reviewing.html', context(**{
-        'apps': AppsReviewing(request).get_apps(),
-        'tab': 'reviewing'}))
+    return jingo.render(request, 'reviewers/apps_reviewing.html',
+                        context(request, **{
+                            'apps': AppsReviewing(request).get_apps(),
+                            'tab': 'reviewing'}))
 
 
 @permission_required('Apps', 'Review')