Hide apps from API search (bug 728070)

Author: kumar303

apps/api/tests/test_views.py

@@ -552,6 +552,11 @@ def test_defaults(self):
         response = make_call('list')
         self.assertContains(response, '<addon id', 3)
 
+    def test_ignore_apps(self):
+        Addon.objects.update(type=amo.ADDON_WEBAPP)
+        response = make_call('list')
+        self.assertNotContains(response, '<addon id')
+
     def test_type_filter(self):
         """
         This tests that list filtering works.
@@ -834,6 +839,12 @@ def test_search_for_specifics(self):
             response = self.client.get(url)
             self.assertContains(response, text, msg_prefix=url)
 
+    def test_ignore_apps(self):
+        Addon.objects.update(type=amo.ADDON_WEBAPP)
+        self.reindex(Addon)
+        rp = self.client.get('/en-US/firefox/api/1.2/search/delicious')
+        self.assertNotContains(rp, 'Delicious')
+
     def test_search_limits(self):
         """
         Test that we limit our results correctly.

apps/api/views.py

@@ -339,6 +339,9 @@ def process_request(self, query, addon_type='ALL', limit=10,
 
         qs = Addon.search().query(or_=name_query(query))
         filters.update(qs_filters)
+        if 'type' not in filters:
+            # Filter by ALL types, which is really all types except for apps.
+            filters['type__in'] = list(amo.ADDON_SEARCH_TYPES)
         qs = qs.filter(**filters)
 
         return self.render('api/search.xml', {
@@ -400,7 +403,7 @@ def process_request(self, list_type='recommended', addon_type='ALL',
         """
         limit = min(MAX_LIMIT, int(limit))
         APP, platform = self.request.APP, platform.lower()
-        qs = Addon.objects.listed(APP)
+        qs = Addon.objects.listed(APP).exclude(type=amo.ADDON_WEBAPP)
         shuffle = True
 
         if list_type in ('by_adu', 'featured'):