enables ordering by created in product search
This commit is contained in:
@@ -27,7 +27,7 @@ class SearchResultSerializer(TaggitSerializer, serializers.ModelSerializer):
|
|||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Product
|
model = Product
|
||||||
exclude = ['created', 'updated', 'creator']
|
exclude = ['creator', ]
|
||||||
|
|
||||||
|
|
||||||
class TagFilterSerializer(TaggitSerializer, serializers.ModelSerializer):
|
class TagFilterSerializer(TaggitSerializer, serializers.ModelSerializer):
|
||||||
|
|||||||
@@ -191,33 +191,6 @@ class ProductViewSetTest(APITestCase):
|
|||||||
# Assert number of instnaces in response
|
# Assert number of instnaces in response
|
||||||
self.assertEquals(len(expected_instance), len(payload))
|
self.assertEquals(len(expected_instance), len(payload))
|
||||||
|
|
||||||
def test_anon_user_can_order_products(self):
|
|
||||||
# create instances
|
|
||||||
company = CompanyFactory()
|
|
||||||
unexpected_instance = [
|
|
||||||
self.factory(category='roperos', tags="zapatos, azules"),
|
|
||||||
self.factory(category='enropados', tags="xxl")
|
|
||||||
]
|
|
||||||
expected_instance = [
|
|
||||||
self.factory(category='ropa', tags="zapatos, rojos", company=company),
|
|
||||||
self.factory(category='ropa', tags="rojos", company=company),
|
|
||||||
self.factory(category='ropa', tags="colores/rojos", company=company)
|
|
||||||
]
|
|
||||||
# prepare url
|
|
||||||
url = f"{self.endpoint}?ordering=created"
|
|
||||||
|
|
||||||
# Request list
|
|
||||||
response = self.client.get(url)
|
|
||||||
payload = response.json()
|
|
||||||
|
|
||||||
# Assert access is granted
|
|
||||||
self.assertEqual(response.status_code, status.HTTP_200_OK)
|
|
||||||
# assert correct order
|
|
||||||
dates = [d['created'][:-1] for d in payload]
|
|
||||||
for i in range(len(dates)-1):
|
|
||||||
# first instance should be most recent
|
|
||||||
self.assertTrue(datetime.datetime.fromisoformat(dates[i]) > datetime.datetime.fromisoformat(dates[i+1]))
|
|
||||||
|
|
||||||
# authenticated user
|
# authenticated user
|
||||||
def test_auth_user_can_list_instances(self):
|
def test_auth_user_can_list_instances(self):
|
||||||
"""Regular logged-in user can list instance
|
"""Regular logged-in user can list instance
|
||||||
@@ -782,6 +755,69 @@ class ProductSearchTest(TestCase):
|
|||||||
for product in payload['products']:
|
for product in payload['products']:
|
||||||
self.assertTrue(float(product['price']) <= price_max)
|
self.assertTrue(float(product['price']) <= price_max)
|
||||||
|
|
||||||
|
def test_anon_user_can_search_newest(self):
|
||||||
|
expected_instances = [
|
||||||
|
self.factory(tags="lunares/rojos", category='zapatos', description="zapatos verdes"),
|
||||||
|
self.factory(tags="colores/rojos, tono/brillante"),
|
||||||
|
self.factory(tags="lunares/azules", description="zapatos rojos"),
|
||||||
|
self.factory(tags="lunares/rojos", description="zapatos"),
|
||||||
|
self.factory(attributes='"zapatos de campo", tono/oscuro'),
|
||||||
|
]
|
||||||
|
unexpected_instances = [
|
||||||
|
self.factory(description="chanclas"),
|
||||||
|
self.factory(tags="azules"),
|
||||||
|
]
|
||||||
|
|
||||||
|
q = quote("zapatos rojos")
|
||||||
|
|
||||||
|
url = f"{self.endpoint}?q={q}&order=newest"
|
||||||
|
# send in request
|
||||||
|
response = self.client.get(url)
|
||||||
|
|
||||||
|
# check response
|
||||||
|
self.assertEqual(response.status_code, 200)
|
||||||
|
# load response data
|
||||||
|
payload = response.json()
|
||||||
|
# check for object creation
|
||||||
|
self.assertEquals(len(payload['products']), len(expected_instances))
|
||||||
|
# check results ordered by newest
|
||||||
|
# assert correct order
|
||||||
|
dates = [d['created'][:-1] for d in payload['products']]
|
||||||
|
for i in range(len(dates)-1):
|
||||||
|
# first instance should be most recent
|
||||||
|
self.assertTrue(dates[i] > dates[i+1])
|
||||||
|
|
||||||
|
def test_anon_user_can_search_oldest(self):
|
||||||
|
expected_instances = [
|
||||||
|
self.factory(tags="lunares/rojos", category='zapatos', description="zapatos verdes"),
|
||||||
|
self.factory(tags="colores/rojos, tono/brillante"),
|
||||||
|
self.factory(tags="lunares/azules", description="zapatos rojos"),
|
||||||
|
self.factory(tags="lunares/rojos", description="zapatos"),
|
||||||
|
self.factory(attributes='"zapatos de campo", tono/oscuro'),
|
||||||
|
]
|
||||||
|
unexpected_instances = [
|
||||||
|
self.factory(description="chanclas"),
|
||||||
|
self.factory(tags="azules"),
|
||||||
|
]
|
||||||
|
|
||||||
|
q = quote("zapatos rojos")
|
||||||
|
|
||||||
|
url = f"{self.endpoint}?q={q}&order=oldest"
|
||||||
|
# send in request
|
||||||
|
response = self.client.get(url)
|
||||||
|
|
||||||
|
# check response
|
||||||
|
self.assertEqual(response.status_code, 200)
|
||||||
|
# load response data
|
||||||
|
payload = response.json()
|
||||||
|
# check for object creation
|
||||||
|
self.assertEquals(len(payload['products']), len(expected_instances))
|
||||||
|
# check results ordered by newest
|
||||||
|
# assert correct order
|
||||||
|
dates = [d['created'][:-1] for d in payload['products']]
|
||||||
|
for i in range(len(dates)-1):
|
||||||
|
# first instance should be most recent
|
||||||
|
self.assertTrue(dates[i] < dates[i+1])
|
||||||
|
|
||||||
class MyProductsViewTest(APITestCase):
|
class MyProductsViewTest(APITestCase):
|
||||||
"""my_products tests
|
"""my_products tests
|
||||||
|
|||||||
@@ -156,6 +156,7 @@ def product_search(request):
|
|||||||
- discount: true/false
|
- discount: true/false
|
||||||
- category: string
|
- category: string
|
||||||
- tags: string
|
- tags: string
|
||||||
|
- order: string (newest/oldest)
|
||||||
"""
|
"""
|
||||||
# capture query params
|
# capture query params
|
||||||
q = request.GET.get('q', None)
|
q = request.GET.get('q', None)
|
||||||
@@ -181,6 +182,7 @@ def product_search(request):
|
|||||||
tags = request.GET.get('tags', None)
|
tags = request.GET.get('tags', None)
|
||||||
price_min = request.GET.get('price_min', None)
|
price_min = request.GET.get('price_min', None)
|
||||||
price_max = request.GET.get('price_max', None)
|
price_max = request.GET.get('price_max', None)
|
||||||
|
order = request.GET.get('order', '')
|
||||||
|
|
||||||
if q is None:
|
if q is None:
|
||||||
return Response({"errors": {"details": "No query string to parse"}})
|
return Response({"errors": {"details": "No query string to parse"}})
|
||||||
@@ -204,10 +206,19 @@ def product_search(request):
|
|||||||
|
|
||||||
# extract filters from result_set
|
# extract filters from result_set
|
||||||
filters = extract_search_filters(result_set)
|
filters = extract_search_filters(result_set)
|
||||||
# order results by RANK
|
|
||||||
result_list = list(result_set)
|
result_list = list(result_set)
|
||||||
ranked_products = sorted(result_list, key= lambda rank:rank.rank, reverse=True)
|
if order == 'newest':
|
||||||
serializer = SearchResultSerializer(ranked_products, many=True)
|
# order results by created
|
||||||
|
ordered_products = sorted(result_list, key= lambda x:x.created, reverse=True)
|
||||||
|
elif order == 'oldest':
|
||||||
|
# order results by created
|
||||||
|
ordered_products = sorted(result_list, key= lambda x:x.created, reverse=False)
|
||||||
|
else:
|
||||||
|
# order results by RANK
|
||||||
|
ordered_products = sorted(result_list, key= lambda rank:rank.rank, reverse=True)
|
||||||
|
|
||||||
|
serializer = SearchResultSerializer(ordered_products, many=True)
|
||||||
product_results = [dict(i) for i in serializer.data]
|
product_results = [dict(i) for i in serializer.data]
|
||||||
total_results = len(product_results)
|
total_results = len(product_results)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user