Merge pull request #4 from reloc8/minor/remove-bounding-box

Remove bounding box from query response

Author: alessiovierti

fetch_properties/core/mapper/__init__.py

@@ -1,8 +1,7 @@
-import libgeohash
 from typing import Any, AnyStr, Dict, List
 
 from ..schema import Property, PropertyLocation, PropertiesPage, LocalStatistics, GlobalStatistics, Statistics, \
-    PriceStatistics, LocationBoundingBox, Point
+    PriceStatistics
 
 
 class PropertyMapper:
@@ -54,12 +53,11 @@ def map(local_statistics: List[LocalStatistics], global_statistics: GlobalStatis
 class LocalStatisticsMapper:
 
     @staticmethod
-    def map(price_statistics: PriceStatistics, geohash: AnyStr, bounding_box: LocationBoundingBox) -> LocalStatistics:
+    def map(price_statistics: PriceStatistics, geohash: AnyStr) -> LocalStatistics:
 
         mapped = LocalStatistics()
         mapped.price = price_statistics
         mapped.geohash = geohash
-        mapped.bounding_box = bounding_box
 
         return mapped
 
@@ -86,23 +84,3 @@ def map(min_price, max_price, avg_price) -> PriceStatistics:
         mapped.avg = avg_price
 
         return mapped
-
-
-class LocationBoundingBoxMapper:
-
-    @staticmethod
-    def map(geohash: AnyStr) -> LocationBoundingBox:
-
-        reversed_geohash = libgeohash.bbox(geohash)
-
-        mapped = LocationBoundingBox()
-        top_right = Point()
-        top_right.latitude = reversed_geohash.get('n')
-        top_right.longitude = reversed_geohash.get('e')
-        mapped.top_right = top_right
-        bottom_left = Point()
-        bottom_left.latitude = reversed_geohash.get('s')
-        bottom_left.longitude = reversed_geohash.get('w')
-        mapped.bottom_left = bottom_left
-
-        return mapped

fetch_properties/core/schema/__init__.py

@@ -43,7 +43,6 @@ class LocationBoundingBox(graphene.ObjectType):
 class LocalStatistics(graphene.ObjectType):
 
     geohash = graphene.String()
-    bounding_box = graphene.Field(LocationBoundingBox)
     price = graphene.Field(PriceStatistics)
 
 

fetch_properties/core/schema/resolver.py

@@ -7,7 +7,7 @@
 
 from . import SearchBoundingBox, PropertyFilter, PropertiesPage, Statistics
 from ..mapper import PropertyMapper, PropertiesPageMapper, LocalStatisticsMapper, PriceStatisticsMapper, \
-    LocationBoundingBoxMapper, GlobalStatisticsMapper, StatisticsMapper
+    GlobalStatisticsMapper, StatisticsMapper
 from ..mongodb import MongoDBConnection, MONGODB_CONNECTION
 
 
@@ -197,11 +197,9 @@ def find_statistics_by_filter(self, filter: PropertyFilter) -> Statistics:
                 avg_price=result.get('price').get('avg')
             )
             geohash = result.get('geohash')
-            bounding_box = LocationBoundingBoxMapper.map(geohash=geohash)
             local_statistics.append(LocalStatisticsMapper.map(
                 price_statistics=price_statistics,
-                geohash=geohash,
-                bounding_box=bounding_box
+                geohash=geohash
             ))
 
         global_result = list(global_results)[0]

setup.py

@@ -36,7 +36,6 @@ def private_dependency(personal_access_token: AnyStr,
             'dnspython',
             'pymongo',
             'graphene',
-            'libgeohash',
             private_dependency(personal_access_token=GITHUB_PERSONAL_ACCESS_TOKEN,
                                repo_user='reloc8', repo_name='lib-lambda-handler',
                                package_name='lambda_handler', package_version='1.0.0')

tests/resources/query-3.graphql

@@ -14,16 +14,6 @@
   ) {
     localStatistics {
         geohash
-        boundingBox {
-            bottomLeft {
-                latitude
-                longitude
-            }
-            topRight {
-                latitude
-                longitude
-            }
-        }
         price {
             min
             max

tests/resources/response-body-3.json

@@ -4,16 +4,6 @@
       "localStatistics": [
         {
           "geohash": "u0j0r1m",
-          "boundingBox": {
-            "bottomLeft": {
-              "latitude": 45.050811767578125,
-              "longitude": 7.345733642578125
-            },
-            "topRight": {
-              "latitude": 45.05218505859375,
-              "longitude": 7.34710693359375
-            }
-          },
           "price": {
             "min": 350000,
             "max": 350000,
@@ -22,16 +12,6 @@
         },
         {
           "geohash": "u0j3xvj",
-          "boundingBox": {
-            "bottomLeft": {
-              "latitude": 45.2911376953125,
-              "longitude": 7.730255126953125
-            },
-            "topRight": {
-              "latitude": 45.292510986328125,
-              "longitude": 7.73162841796875
-            }
-          },
           "price": {
             "min": 279000,
             "max": 279000,
@@ -40,16 +20,6 @@
         },
         {
           "geohash": "u0j2w6u",
-          "boundingBox": {
-            "bottomLeft": {
-              "latitude": 45.102996826171875,
-              "longitude": 7.6629638671875
-            },
-            "topRight": {
-              "latitude": 45.1043701171875,
-              "longitude": 7.664337158203125
-            }
-          },
           "price": {
             "min": 135000,
             "max": 135000,