Merge pull request #5 from reloc8/bugfix/global-statistics-when-no-results

Fix global statistics query result when no results

Author: alessiovierti

fetch_properties/core/schema/resolver.py

@@ -202,11 +202,21 @@ def find_statistics_by_filter(self, filter: PropertyFilter) -> Statistics:
                 geohash=geohash
             ))
 
-        global_result = list(global_results)[0]
+        global_results = list(global_results)
+
+        min_price = None
+        max_price = None
+        avg_price = None
+        if len(global_results) > 0:
+            global_result = global_results[0]
+            min_price = global_result.get('price').get('min')
+            max_price = global_result.get('price').get('max')
+            avg_price = global_result.get('price').get('avg')
+
         global_price_statistics = PriceStatisticsMapper.map(
-            min_price=global_result.get('price').get('min'),
-            max_price=global_result.get('price').get('max'),
-            avg_price=global_result.get('price').get('avg')
+            min_price=min_price,
+            max_price=max_price,
+            avg_price=avg_price
         )
         global_statistics = GlobalStatisticsMapper.map(price_statistics=global_price_statistics)
 

tests/resources/response-body-4.json

@@ -0,0 +1,14 @@
+{
+  "data": {
+    "statisticsByFilter": {
+      "localStatistics": [],
+      "globalStatistics": {
+        "price": {
+          "min": null,
+          "max": null,
+          "avg": null
+        }
+      }
+    }
+  }
+}

tests/test_lambda_fetch_properties.py

@@ -163,6 +163,50 @@ def testRunWhenReceiveApiGatewayEventAndQueryStatistics(self):
 
         mock_mongodb_client.drop_database(mongodb_database)
 
+    def testRunWhenReceiveApiGatewayEventAndQueryStatisticsAndCollectionIsEmpty(self):
+
+        mongodb_uri = MONGODB_CONTAINER.get_connection_url()
+        os.environ['MONGODB_URI'] = mongodb_uri
+        os.environ['MONGODB_MAX_PAGE_SIZE'] = '2'
+        os.environ['MONGODB_DATABASE'] = ''
+        os.environ['MONGODB_COLLECTION'] = ''
+
+        with open('resources/event-api-gateway.json', 'r') as file:
+            event = json.load(file)
+
+        with open('resources/query-3.graphql', 'r') as file:
+            query = ' '.join(file.readlines())
+
+        with open('resources/response-body-4.json', 'r') as file:
+            expected_body = json.load(file)
+
+        with open('resources/event-api-gateway-response.json', 'r') as file:
+            event_response = json.load(file)
+
+        event['queryStringParameters'] = dict(query=query)
+        expected_response = event_response
+        expected_response['body'] = json.dumps(expected_body)
+
+        from fetch_properties.core.handler import LAMBDA_HANDLER, MONGODB_CONNECTION
+
+        mongodb_connection = MONGODB_CONNECTION
+        mongodb_database = mongodb_connection.database
+        mongodb_collection = mongodb_connection.collection
+        mock_mongodb_client = pymongo.MongoClient(mongodb_uri)
+
+        actual_response = LAMBDA_HANDLER.run(event=event, context=None)
+
+        actual_body = json.loads(actual_response['body'])
+        expected_body = json.loads(expected_response['body'])
+
+        self.assertEqual('timeSeriesDB', mongodb_database)
+        self.assertEqual('properties', mongodb_collection)
+
+        self.assertCountEqual(actual_body['data']['statisticsByFilter']['localStatistics'], expected_body['data']['statisticsByFilter']['localStatistics'])
+        self.assertDictEqual(actual_body['data']['statisticsByFilter']['globalStatistics'], expected_body['data']['statisticsByFilter']['globalStatistics'])
+
+        mock_mongodb_client.drop_database(mongodb_database)
+
     @classmethod
     def tearDownClass(cls) -> None: