search tests broken, but geo search working

products/views.py

@@ -2,6 +2,7 @@ import logging
 import csv
 import datetime
 import json
+from decimal import Decimal
 
 from django.db.models import Q
 from django.core import serializers
@@ -135,7 +136,8 @@ def product_search(request):
     - order: string (newest/oldest)
     - price_min: int
     - price_max: int
-    - geo: {'longitude': 23.23, 'latitude': 23432.23423}
+    - longitude: 23.23
+    - latitude: 22.234
 
     In the response:
     - filters
@@ -165,11 +167,15 @@ def product_search(request):
             discount = False
         else:
             discount = None
-    geo = request.GET.get('geo', None)
-    if geo is not None:
-        coordinates = (geo.get('longitude'), geo.get('latitude'))
-    else:
-        coordinates = None
+    longitude = request.GET.get('longitude', None)
+    latitude = request.GET.get('latitude', None)
+    try:
+        if longitude and latitude:
+            coordinates = (Decimal(longitude), Decimal(latitude))
+        else:
+            coordinates = None
+    except:
+        return Response({"error": "Improperly formated coordinates"}, status=406)
     category = request.GET.get('category', None)
     tags = request.GET.get('tags', None)
     price_min = request.GET.get('price_min', None)
@@ -214,21 +220,6 @@ def product_search(request):
             # serialize and list data
             serializer = SearchResultSerializer(product_set, many=True)
             result_list = [dict(i) for i in serializer.data]
-            '''
-            for chunk in chunks:
-                product_set, min_price, max_price, georesult  = ranked_product_search(chunk, shipping_cost, discount, category, tags, price_min, price_max, coordinates)
-                # update price values
-                if product_set:
-                    if prices['min'] is None or min_price['price__min'] < prices['min']:
-                        prices['min'] = min_price['price__min']
-                    if prices['max'] is None or max_price['price__max'] > prices['max']:
-                        prices['max'] = max_price['price__max']
-                    # add to result set
-                    result_set.update(product_set)
-            # serialize and list data
-            serializer = SearchResultSerializer(product_set, many=True)
-            result_list = [dict(i) for i in serializer.data]
-            '''
 
         # extract filters from result_set
         filters = extract_search_filters(result_set)
@@ -254,6 +245,7 @@ def product_search(request):
             result_list = result_list[:limit]
         return Response(data={"filters": filters, "count": total_results, "products": result_list, 'prices': prices})
     except Exception as e:
+        import  ipdb; ipdb.set_trace()
         return Response({"errors": {"details": str(e)}}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)