Filtered the result of apps by adult/child (bug 852567)

Author: Rob Hudson

mkt/api/resources.py

@@ -16,7 +16,7 @@
 
 import amo
 from addons.forms import CategoryFormSet
-from addons.models import Addon, AddonUser, Category, Preview
+from addons.models import Addon, AddonUser, Category, Preview, Webapp
 from amo.decorators import write
 from amo.utils import no_translation
 from constants.applications import DEVICE_TYPES
@@ -35,7 +35,7 @@
 from mkt.carriers import get_carrier_id
 from mkt.developers import tasks
 from mkt.developers.forms import NewManifestForm, PreviewForm
-from mkt.regions import get_region_id
+from mkt.regions import get_region_id, get_region, REGIONS_DICT
 from mkt.submit.forms import AppDetailsBasicForm
 from mkt.webapps.utils import app_to_dict
 
@@ -110,7 +110,7 @@ class AppResource(CORSResource, MarketplaceModelResource):
                                   'previews', readonly=True)
 
     class Meta(MarketplaceModelResource.Meta):
-        queryset = Addon.objects.filter(type=amo.ADDON_WEBAPP)
+        queryset = Webapp.objects.all()  # Gets overriden in dispatch.
         fields = ['categories', 'description', 'device_types',
                   'homepage', 'id', 'name', 'privacy_policy',
                   'status', 'summary', 'support_email',
@@ -126,6 +126,15 @@ class Meta(MarketplaceModelResource.Meta):
         # Throttle users without Apps:APIUnthrottled at 10 POST requests/day.
         throttle = CacheThrottle(throttle_at=10, timeframe=60 * 60 * 24)
 
+    def dispatch(self, request_type, request, **kwargs):
+        # Using `Webapp.objects.all()` here forces a new queryset, which for
+        # now avoids bug 854505. We're also using this to filter by flagged
+        # apps.
+        self._meta.queryset = Webapp.objects.exclude(
+            id__in=Webapp.get_excluded_in(REGIONS_DICT[get_region()]))
+        return super(AppResource, self).dispatch(request_type, request,
+                                                 **kwargs)
+
     @write
     @transaction.commit_on_success
     def obj_create(self, bundle, request, **kwargs):
@@ -188,13 +197,8 @@ def get_and_check_ownership(self, request, allow_anon=False, **kwargs):
         try:
             # Use queryset, not get_object_list to ensure a distinction
             # between a 404 and a 403.
-            #
-            # For reasons I haven't been able to figure out, accessing the
-            # queryset at this point will get you the locale of the class
-            # when it was initialized, which means that the locale gets
-            # set and results in bug 854505.
-            obj = Addon.objects.filter(type=amo.ADDON_WEBAPP).get(**kwargs)
-        except Addon.DoesNotExist:
+            obj = self._meta.queryset.get(**kwargs)
+        except self._meta.object_class.DoesNotExist:
             raise ImmediateHttpResponse(response=http.HttpNotFound())
 
         # If it's public, just return it.
@@ -250,8 +254,8 @@ def get_object_list(self, request):
         if not request.amo_user:
             log.info('Anonymous listing not allowed')
             raise ImmediateHttpResponse(response=http.HttpForbidden())
-        return Addon.objects.filter(type=amo.ADDON_WEBAPP,
-                                    authors=request.amo_user)
+        return self._meta.queryset.filter(type=amo.ADDON_WEBAPP,
+                                          authors=request.amo_user)
 
 
 class StatusResource(MarketplaceModelResource):

mkt/api/tests/test_handlers.py

@@ -8,7 +8,7 @@
 
 import amo
 from addons.models import (Addon, AddonUpsell, AddonDeviceType,
-                           AddonUser, Category, Preview)
+                           AddonUser, Category, Flag, Preview)
 from amo.tests import app_factory, AMOPaths
 from files.models import FileUpload
 from users.models import UserProfile
@@ -691,18 +691,29 @@ def test_public_waiting(self):
 class TestAppDetail(BaseOAuth, AMOPaths):
     fixtures = fixture('user_2519', 'webapp_337141')
 
-    def test_price(self):
+    def setUp(self):
+        super(TestAppDetail, self).setUp()
         self.get_url = get_url('app', pk=337141)
+
+    def test_price(self):
         res = self.client.get(self.get_url)
         data = json.loads(res.content)
         eq_(data['price'], None)
 
     def test_price_other_region(self):
-        self.get_url = get_url('app', pk=337141)
         res = self.client.get(self.get_url, {'lang': 'fr'})
         data = json.loads(res.content)
         eq_(data['price'], None)
 
+    def test_flagged(self):
+        # Acess a flagged app via API should 404.
+        Flag.objects.create(addon_id=337141, adult_content=True)
+        Webapp.objects.get(pk=337141).save()
+        res = self.client.get(
+            self.get_url,
+            data={'region': list(regions.ADULT_EXCLUDED)[0].slug})
+        eq_(res.status_code, 404)
+
 
 class TestCategoryHandler(BaseOAuth):
 

mkt/webapps/models.py

@@ -23,7 +23,7 @@
 import amo.models
 from access.acl import action_allowed, check_reviewer
 from addons import query
-from addons.models import (Addon, AddonDeviceType, Category,
+from addons.models import (Addon, AddonDeviceType, Category, Flag,
                            update_search_index)
 from addons.signals import version_changed
 from amo.decorators import skip_cache
@@ -40,6 +40,7 @@
 from mkt.zadmin.models import FeaturedApp
 
 import mkt
+from mkt import regions
 from mkt.constants import apps
 from mkt.constants import APP_IMAGE_SIZES
 from mkt.webapps.utils import get_locale_properties
@@ -102,9 +103,9 @@ def by_identifier(self, identifier):
         Look up a single app by its `id` or `app_slug`.
 
         If the identifier is coercable into an integer, we first check for an
-        ID match, falling back to a slug check (probably not necessary, as there
-        is validation preventing numeric slugs). Otherwise, we only look for a
-        slug match.
+        ID match, falling back to a slug check (probably not necessary, as
+        there is validation preventing numeric slugs). Otherwise, we only look
+        for a slug match.
         """
         try:
             return self.get(id=identifier)
@@ -517,9 +518,9 @@ def get_regions(self):
              <class 'mkt.constants.regions.US'>,
              <class 'mkt.constants.regions.WORLDWIDE'>]
         """
-        regions = map(mkt.regions.REGIONS_CHOICES_ID_DICT.get,
-                      self.get_region_ids(worldwide=True))
-        return sorted(regions, key=lambda x: x.slug)
+        _regions = map(mkt.regions.REGIONS_CHOICES_ID_DICT.get,
+                       self.get_region_ids(worldwide=True))
+        return sorted(_regions, key=lambda x: x.slug)
 
     def listed_in(self, region=None, category=None):
         listed = []
@@ -559,8 +560,18 @@ def featured(cls, cat=None, region=None, limit=9, mobile=False,
     @classmethod
     def get_excluded_in(cls, region):
         """Return IDs of Webapp objects excluded from a particular region."""
-        return list(AddonExcludedRegion.objects.filter(region=region.id)
-                    .values_list('addon', flat=True))
+        excluded = list(AddonExcludedRegion.objects.filter(region=region.id)
+                        .values_list('addon', flat=True))
+        q = models.Q()
+        if region.id in regions.ADULT_EXCLUDED_IDS:
+            q |= models.Q(adult_content=True)
+        if region.id in regions.CHILD_EXCLUDED_IDS:
+            q |= models.Q(child_content=True)
+
+        excluded += list(Flag.objects.filter(q)
+                         .values_list('addon', flat=True))
+
+        return list(set(excluded))
 
     @classmethod
     def from_search(cls, cat=None, region=None, gaia=False, mobile=False,

mkt/webapps/tests/test_models.py

@@ -19,7 +19,8 @@
 
 import amo
 from addons.models import (Addon, AddonCategory, AddonDeviceType,
-                           BlacklistedSlug, Category, Preview, version_changed)
+                           BlacklistedSlug, Category, Flag, Preview,
+                           version_changed)
 from addons.signals import version_changed as version_changed_signal
 from amo.helpers import absolutify
 from amo.tests import app_factory, version_factory
@@ -415,6 +416,15 @@ def test_nomination_pkg_public_new_version(self):
         v = Version.objects.create(addon=app, version='1.9')
         self.assertCloseToNow(v.nomination)
 
+    def test_excluded_in(self):
+        app1 = app_factory()
+        app2 = app_factory()
+        region = list(mkt.regions.ADULT_EXCLUDED)[0]
+        AddonExcludedRegion.objects.create(addon=app1, region=region.id)
+        Flag.objects.create(addon=app1, adult_content=True)
+        Flag.objects.create(addon=app2, adult_content=True)
+        eq_(Webapp.get_excluded_in(region), [app1.id, app2.id])
+
 
 class TestPackagedAppManifestUpdates(amo.tests.TestCase):
     # Note: More extensive tests for `Addon.update_names` are in the Addon