Updated collection device filtering to work for android (bug 975063)

mkt/collections/serializers.py

@@ -42,8 +42,8 @@ class CollectionAppSerializer(SimpleAppSerializer):
 
 class CollectionESAppSerializer(SimpleESAppSerializer):
     """
-    Like CollectionAppSerializer, but used when fetching apps from ES instead of
-    the database.
+    Like CollectionAppSerializer, but used when fetching apps from ES instead
+    of the database.
     """
     pass
 
@@ -65,15 +65,27 @@ def to_native_es(self, value):
         ser = CollectionESAppSerializer(value, context=self.context, many=True)
         return ser.data
 
+    def _get_device(self, request):
+        # Fireplace sends `dev` and `device`. See the API docs. When
+        # `dev` is 'android' we also need to check `device` to pick a device
+        # object.
+        dev = request.GET.get('dev')
+        device = request.GET.get('device')
+
+        if dev == 'android' and device:
+            dev = '%s-%s' % (dev, device)
+
+        return amo.DEVICE_LOOKUP.get(dev)
+
     def field_to_native(self, obj, field_name):
         if not hasattr(self, 'context') or not 'request' in self.context:
             raise ImproperlyConfigured('Pass request in self.context when'
                                        ' using CollectionMembershipField.')
 
         request = self.context['request']
 
-        # Having 'use-es-for-apps' in the context means the parent view wants us
-        # to use ES to fetch the apps. If that key is present, check that we
+        # Having 'use-es-for-apps' in the context means the parent view wants
+        # us to use ES to fetch the apps. If that key is present, check that we
         # have a view in the context and that the waffle flag is active. If
         # everything checks out, bypass the db and use ES to fetch apps for a
         # nice performance boost.
@@ -83,7 +95,7 @@ def field_to_native(self, obj, field_name):
         qs = get_component(obj, self.source)
 
         # Filter apps based on device and feature profiles.
-        device = amo.DEVICE_LOOKUP.get(request.GET.get('dev'))
+        device = self._get_device(request)
         profile = get_feature_profile(request)
         if device and device != amo.DEVICE_DESKTOP:
             qs = qs.filter(addondevicetype__device_type=device.id)
@@ -103,7 +115,7 @@ def field_to_native_es(self, obj, request):
         """
         profile = get_feature_profile(request)
         region = self.context['view'].get_region(request)
-        device = amo.DEVICE_LOOKUP.get(request.GET.get('dev'))
+        device = self._get_device(request)
 
         _rget = lambda d: getattr(request, d, False)
         qs = Webapp.from_search(request, region=region, gaia=_rget('GAIA'),

mkt/collections/tests/test_serializers.py

@@ -67,8 +67,10 @@ def test_to_native(self):
         eq_(data[1]['id'], int(self.app2.id))
         eq_(data[1]['resource_uri'], self.app2.get_api_url(pk=self.app2.pk))
 
-    def _field_to_native_profile(self, profile='0.0', dev='firefoxos'):
-        request = self.get_request({'pro': profile, 'dev': dev})
+    def _field_to_native_profile(self, **kwargs):
+        query = {'pro': '0.0', 'dev': 'firefoxos'}
+        query.update(kwargs)
+        request = self.get_request(query)
         self.field.parent = self.collection
         self.field.source = 'apps'
         self.field.context['request'] = request
@@ -106,23 +108,24 @@ def test_app_pending(self):
         eq_(len(result), 0)
 
     def test_field_to_native_profile(self):
-        result = self._field_to_native_profile(self.profile)
+        result = self._field_to_native_profile(pro=self.profile)
         eq_(len(result), 1)
         eq_(int(result[0]['id']), self.app.id)
 
     def test_field_to_native_profile_mismatch(self):
         self.app.current_version.features.update(has_geolocation=True)
-        result = self._field_to_native_profile(self.profile)
+        result = self._field_to_native_profile(pro=self.profile)
         eq_(len(result), 0)
 
     def test_field_to_native_invalid_profile(self):
-        result = self._field_to_native_profile('muahahah')
+        result = self._field_to_native_profile(pro='muahahah')
         # Ensure that no filtering took place.
         eq_(len(result), 1)
         eq_(int(result[0]['id']), self.app.id)
 
     def test_field_to_native_device_filter(self):
-        result = self._field_to_native_profile('muahahah', 'android-mobile')
+        result = self._field_to_native_profile(pro='muahahah', dev='android',
+                                               device='mobile')
         eq_(len(result), 0)
 
 
@@ -149,12 +152,14 @@ def setUp(self):
         AddonUser.objects.create(addon=self.app, user=self.user)
         self.refresh('webapp')
 
-    def _field_to_native_profile(self, profile='0.0', dev='firefoxos'):
+    def _field_to_native_profile(self, **kwargs):
         """
         Like _field_to_native_profile in BaseTestCollectionMembershipField,
         but calling field_to_native_es directly.
         """
-        request = self.get_request({'pro': profile, 'dev': dev})
+        query = {'pro': '0.0', 'dev': 'firefoxos'}
+        query.update(kwargs)
+        request = self.get_request(query)
         self.field.context['request'] = request
         return self.field.field_to_native_es(self.collection, request)
 
@@ -163,7 +168,7 @@ def test_field_to_native_profile_mismatch(self):
         # FIXME: a simple refresh() wasn't enough, don't we reindex apps when
         # feature profiles change ? Investigate.
         self.reindex(self.app.__class__, 'webapp')
-        result = self._field_to_native_profile(self.profile)
+        result = self._field_to_native_profile(pro=self.profile)
         eq_(len(result), 0)
 
     def test_ordering(self):