Merge pull request #66 from brobots-hub/fix-issue-64

fix issue 64

Author: andrewyazura

resources/Area.py

@@ -23,16 +23,23 @@ def get(self):
             except:
                 args = [(i[0], i[1][0]) for i in args]
 
-            latitude, longitude = args[0][1], args[1][1]
+            latitude, longitude = \
+                args[0][1].ljust(9, '0'), \
+                args[1][1].ljust(9, '0')
+
             area = AreaModel.query \
-                .filter_by(latitude=latitude) \
-                .filter_by(longitude=longitude) \
-                .order_by(desc(AreaModel.created)).first()
+                .order_by(
+                    AreaModel.created.desc()
+                ).filter_by(
+                    latitude=latitude
+                ).filter_by(
+                    longitude=longitude
+                ).first()
 
             if not area:
                 return {'code': 404, 'message': 'Area not found'}, 404
 
         except:
-            return {'code': 404, 'message': 'Area not found'}, 404
+            return {'code': 500, 'message': 'Internal Server Error'}, 500
 
         return convert_types_to_names(area)

resources/Map.py

@@ -10,19 +10,21 @@
 class Map(Resource):
     def get(self):
         aqi_records = []
-        sensors = SensorModel.query.all()
+        sensor_ids = set([sensor.external_id
+                          for sensor in SensorModel.query.all()
+                          ])
         maxdate = datetime.now() - timedelta(
             hours=int(environ.get('MAX_RECORD_HOURS'))
         )
 
-        for sensor in sensors:
+        for sensor in sensor_ids:
             aqi_record = AreaModel.query \
                 .order_by(
                     AreaModel.created.desc()
                 ).filter(
                     AreaModel.created >= maxdate
                 ).filter_by(
-                    sensor_id=sensor.external_id
+                    sensor_id=sensor
                 ).first()
 
             if aqi_record:

resources/api-schema.json

@@ -72,7 +72,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/Map"
+                  "$ref": "#/components/schemas/Area"
                 }
               }
             }