Skip to content
This repository was archived by the owner on Mar 15, 2018. It is now read-only.

Commit 292ba68

Browse files
author
Allen Short
committed
Move /search/featured/ to /fireplace/search/featured/ (bug 875548)
1 parent ccd1462 commit 292ba68

File tree

4 files changed

+8
-15
lines changed

4 files changed

+8
-15
lines changed

docs/api/topics/search.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ Search
5656
:status 401: if attempting to filter by status, you do not have that role.
5757

5858
Featured App Listing
59-
===================================
59+
====================
6060

61-
.. http:get:: /api/v1/apps/search/featured/
61+
.. http:get:: /api/v1/fireplace/search/featured/
6262
6363
**Request**
6464

mkt/api/urls.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@
1717
api.register(ValidationResource())
1818
api.register(AppResource())
1919
api.register(PreviewResource())
20-
api.register(WithFeaturedResource())
2120
api.register(SearchResource())
2221
api.register(StatusResource())
2322
api.register(RatingResource())
2423

24+
fireplace = Api(api_name='fireplace')
25+
fireplace.register(WithFeaturedResource())
26+
2527
apps = SlugRouter()
2628
apps.register(r'category', CategoryViewSet, base_name='app-category')
2729

@@ -41,6 +43,7 @@
4143

4244
urlpatterns = patterns('',
4345
url(r'^', include(api.urls)),
46+
url(r'^', include(fireplace.urls)),
4447
url(r'^apps/', include(apps.urls)),
4548
url(r'^', include(stats_api.urls)),
4649
url(r'^', include(services.urls))

mkt/search/api.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,16 +132,6 @@ def dehydrate(self, bundle):
132132

133133
return bundle
134134

135-
def override_urls(self):
136-
return [
137-
url(r'^(?P<resource_name>%s)/featured%s$' %
138-
(self._meta.resource_name, trailing_slash()),
139-
self.wrap_view('with_featured'), name='api_with_featured')
140-
]
141-
142-
def with_featured(self, request, **kwargs):
143-
return WithFeaturedResource().dispatch('list', request, **kwargs)
144-
145135

146136
class WithFeaturedResource(SearchResource):
147137

mkt/search/tests/test_api.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ class TestFeaturedNoCategories(BaseOAuth, ESTestCase):
487487
list_url = list_url('search/featured')
488488

489489
def setUp(self):
490-
super(TestFeaturedNoCategories, self).setUp()
490+
super(TestFeaturedNoCategories, self).setUp(api_name='fireplace')
491491
self.create_switch('search-api-es')
492492
self.create_switch('buchets')
493493
self.cat = Category.objects.create(type=amo.ADDON_WEBAPP, slug='shiny')
@@ -554,7 +554,7 @@ class TestFeaturedWithCategories(BaseOAuth, ESTestCase):
554554
list_url = list_url('search/featured')
555555

556556
def setUp(self):
557-
super(TestFeaturedWithCategories, self).setUp()
557+
super(TestFeaturedWithCategories, self).setUp(api_name='fireplace')
558558
self.create_switch('search-api-es')
559559
self.create_switch('buchets')
560560
self.cat = Category.objects.create(type=amo.ADDON_WEBAPP, slug='shiny')

0 commit comments

Comments
 (0)