still support old recoveries

Author: ExpDev07

app/routes/v1/all.py

@@ -1,5 +1,4 @@
 from flask import jsonify
-from .recovered import dummy
 from ...routes import api_v1 as api
 from ...services.location.jhu import get_category
 
@@ -8,17 +7,18 @@ def all():
     # Get all the categories.
     confirmed = get_category('confirmed')
     deaths    = get_category('deaths')
+    recovered = get_category('recovered')
 
     return jsonify({
         # Data.
         'confirmed': confirmed,
         'deaths':    deaths,
-        'recovered': dummy,
+        'recovered': recovered,
 
         # Latest.
         'latest': {
             'confirmed': confirmed['latest'],
             'deaths':    deaths['latest'],
-            'recovered': 0,
+            'recovered': recovered['latest'],
         }
     })

app/routes/v1/recovered.py

@@ -1,15 +1,7 @@
 from flask import jsonify
 from ...routes import api_v1 as api
-
-# Dummy response.
-dummy = {
-    'source'      : 'https://github.com/ExpDev07/coronavirus-tracker-api',
-    'last_updated': '2020-03-24T03:57:10.057450Z',
-    'latest'      : 0,
-    'locations'   : [],
-}
+from ...services.location.jhu import get_category
 
 @api.route('/recovered')
 def recovered():
-    # Dummy data.
-    return jsonify(dummy)
+    return jsonify(get_category('recovered'))

app/services/location/jhu.py

@@ -27,7 +27,7 @@ def get(self, id):
 """
 Base URL for fetching category.
 """
-base_url = 'https://raw.githubusercontent.com/CSSEGISandData/2019-nCoV/master/csse_covid_19_data/csse_covid_19_time_series/time_series_covid19_%s_global.csv';
+base_url = 'https://raw.githubusercontent.com/CSSEGISandData/2019-nCoV/master/csse_covid_19_data/csse_covid_19_time_series/';
 
 @cached(cache=TTLCache(maxsize=1024, ttl=3600))
 def get_category(category):
@@ -41,8 +41,18 @@ def get_category(category):
     # Adhere to category naming standard.
     category = category.lower();
 
+    # URL to request data from.
+    url = base_url + 'time_series_covid19_%s_global.csv' % category
+
+    # Different URL is needed for recoveries.
+    # Read about deprecation here: https://github.com/CSSEGISandData/COVID-19/tree/master/csse_covid_19_data/csse_covid_19_time_series.
+    if category == 'recovered':
+        url = base_url + 'time_series_19-covid-Recovered.csv'
+
+    print (url)
+
     # Request the data
-    request = requests.get(base_url % category)
+    request = requests.get(url)
     text    = request.text
 
     # Parse the CSV.
@@ -106,6 +116,7 @@ def get_locations():
     # Get all of the data categories locations.
     confirmed = get_category('confirmed')['locations']
     deaths    = get_category('deaths')['locations']
+    recovered = get_category('recovered')['locations']
 
     # Final locations to return.
     locations = []
@@ -116,7 +127,7 @@ def get_locations():
         timelines = {
             'confirmed' : confirmed[index]['history'],
             'deaths'    : deaths[index]['history'],
-            'recovered' : {},
+            'recovered' : recovered[index]['history'],
         }
 
         # Grab coordinates.
@@ -140,7 +151,7 @@ def get_locations():
             {
                 'confirmed': Timeline({ datetime.strptime(date, '%m/%d/%y').isoformat() + 'Z': amount for date, amount in timelines['confirmed'].items() }),
                 'deaths'   : Timeline({ datetime.strptime(date, '%m/%d/%y').isoformat() + 'Z': amount for date, amount in timelines['deaths'].items() }),
-                'recovered': Timeline({})
+                'recovered': Timeline({ datetime.strptime(date, '%m/%d/%y').isoformat() + 'Z': amount for date, amount in timelines['recovered'].items() })
             }
         ))