Moved aggregates to locations endpoint, side effect is the ability to filter locations by attributes other than just country_code

Author: SeanCena

README.md

@@ -45,6 +45,11 @@ GET /v2/locations
 ```
 ```json
 {
+  "aggregate": {
+    "confirmed": 272166,
+    "deaths": 11299,
+    "recovered": 87256
+  },
   "locations": [
     {
       "id": 0,

app/routes/v2/latest.py

@@ -3,16 +3,8 @@
 
 @api.route('/latest')
 def latest():
-    # Query parameters.
-    args = request.args
-
     # Get the serialized version of all the locations.
     locations = request.source.get_all()
-    #print([i.country_code for i in locations])
-
-    # Filter based on args.
-    if len(args) > 0:
-        locations = [i for i in locations for j in args if hasattr(i, j) and getattr(i, j) == args[j]]
 
     # All the latest information.
     # latest = list(map(lambda location: location['latest'], locations))

app/routes/v2/locations.py

@@ -5,18 +5,27 @@
 @api.route('/locations')
 def locations():
     # Query parameters.
-    timelines    = strtobool(request.args.get('timelines', default='0'))
-    country_code = request.args.get('country_code', type=str)
+    args         = request.args
+    timelines    = strtobool(args.get('timelines', default='0'))
 
     # Retrieve all the locations.
     locations = request.source.get_all()
 
-    # Filtering my country code if provided.
-    if not country_code is None:
-        locations = list(filter(lambda location: location.country_code == country_code.upper(), locations))
+    # Filtering by args if provided.
+    for i in args:
+        if i != 'timelines':
+            try:
+                locations = [j for j in locations if getattr(j, i) == args.get(i, type=str)]
+            except AttributeError:
+                print('TimelinedLocation object does not have attribute {}.'.format(i))
 
     # Serialize each location and return.
     return jsonify({
+        'aggregate': {
+            'confirmed': sum(map(lambda location: location.confirmed, locations)),
+            'deaths'   : sum(map(lambda location: location.deaths, locations)),
+            'recovered': sum(map(lambda location: location.recovered, locations)),
+        },
         'locations': [
             location.serialize(timelines) for location in locations
         ]