Upstream updates (#9)

* fixed wrong date format and timelines appearing null

* fix csbs changing date format (for the second time)

* updated

* still support old recoveries

* fix tests

* fix tests (2)

* oops

* now

* now?

* tests fixed

* finally fixed tests

* works

* add funding option :)

* hotfix

* fix test

* Update README.md

* Update README.md

Co-authored-by: ExpDev <[email protected]>
Co-authored-by: ExpDev07 <[email protected]>

Author: 3 people

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+#github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+#patreon: # Replace with a single Patreon username
+#open_collective: # Replace with a single Open Collective username
+ko_fi: ExpDev
+#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+#liberapay: # Replace with a single Liberapay username
+#issuehunt: # Replace with a single IssueHunt username
+#otechie: # Replace with a single Otechie username
+#custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

README.md

@@ -1,4 +1,7 @@
-## Coronavirus Tracker API
+<h1 align="center">
+    Coronavirus Tracker API
+</h1>
+
 Provides up-to-date data about Coronavirus outbreak. Includes numbers about confirmed cases, deaths and recovered.
 Support multiple data-sources.
 
@@ -18,6 +21,10 @@ Support multiple data-sources.
 ![Covid-19 Recovered](https://covid19-badges.herokuapp.com/recovered/latest)
 ![Covid-19 Deaths](https://covid19-badges.herokuapp.com/deaths/latest)
 
+## Recovered cases showing 0
+
+**JHU (our main data provider) [no longer provides data for amount of recoveries](https://github.com/ExpDev07/coronavirus-tracker-api/issues/155), and as a result, the API will be showing 0 for this statistic. Apolegies for any inconvenience. Hopefully we'll be able to find an alternative data-source that offers this.**
+
 ## Available data-sources:
 
 Currently 2 different data-sources are available to retrieve the data:
@@ -28,7 +35,6 @@ Currently 2 different data-sources are available to retrieve the data:
 
 __jhu__ data-source will be used as a default source if you don't specify a *source parameter* in your request.
 
-
 ## API Reference
 
 All endpoints are located at ``coronavirus-tracker-api.herokuapp.com/v2/`` and are accessible via https. For instance: you can get data per location by using this URL: 
@@ -40,7 +46,6 @@ You can open the URL in your browser to further inspect the response. Or you can
 curl https://coronavirus-tracker-api.herokuapp.com/v2/locations | json_pp
 ```
 
-
 ## API Endpoints 
 
 ### Sources Endpoint

app/main.py

@@ -89,7 +89,7 @@ def get_latest(request: fastapi.Request, source: Sources = "jhu"):
 
 
 @V2.get(
-    "/locations", response_model=models.AllLocations, response_model_exclude_unset=True
+    "/locations", response_model=models.Locations, response_model_exclude_unset=True
 )
 def get_all_locations(
     request: fastapi.Request,
@@ -131,8 +131,9 @@ async def sources():
     """
     return {"sources": list(data_sources.keys())}
 
-
+# Include routers.
 APP.include_router(V2, prefix="/v2-beta", tags=["v2"])
+
 # mount the existing Flask app
 # v1 @ /
 # v2 @ /v2

app/models.py

@@ -3,48 +3,45 @@
 ~~~~~~~~~~~~~
 Reponse data models.
 """
-import datetime as dt
+from pydantic import BaseModel
 from typing import Dict, List
 
-import pydantic
-
-
-class Totals(pydantic.BaseModel):
+class Totals(BaseModel):
     confirmed: int
     deaths: int
     recovered: int
 
 
-class Latest(pydantic.BaseModel):
+class Latest(BaseModel):
     latest: Totals
 
 
-class TimelineStats(pydantic.BaseModel):
+class TimelineStats(BaseModel):
     latest: int
-    timeline: Dict[str, int]
+    timeline: Dict[str, int] = {}
 
 
-class TimelinedLocation(pydantic.BaseModel):
+class TimelinedLocation(BaseModel):
     confirmed: TimelineStats
     deaths: TimelineStats
     recovered: TimelineStats
 
 
-class Country(pydantic.BaseModel):
-    coordinates: Dict
+class Country(BaseModel):
+    id: int
     country: str
     country_code: str
-    id: int
-    last_updated: dt.datetime
-    latest: Totals
     province: str = ""
-    timelines: TimelinedLocation = None  # FIXME
+    last_updated: str # TODO use datetime.datetime type.
+    coordinates: Dict
+    latest: Totals
+    timelines: TimelinedLocation = {}
 
 
-class AllLocations(pydantic.BaseModel):
+class Locations(BaseModel):
     latest: Totals
-    locations: List[Country]
+    locations: List[Country] = []
 
 
-class Location(pydantic.BaseModel):
+class Location(BaseModel):
     location: Country

app/services/__init__.py

@@ -1,6 +0,0 @@
-from .location.jhu import JhuLocationService
-from .location.csbs import CSBSLocationService
-
-# Instances of the services.
-jhu = JhuLocationService()
-csbs = CSBSLocationService()

app/services/location/csbs.py

@@ -67,7 +67,7 @@ def get_locations():
             ),
 
             # Last update (parse as ISO).
-            datetime.strptime(last_update, '%Y/%m/%d %H:%M').isoformat() + 'Z', 
+            datetime.strptime(last_update, '%Y-%m-%d %H:%M').isoformat() + 'Z', 
 
             # Statistics.
             int(item['Confirmed'] or 0),

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_19-covid-%s.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):
@@ -39,10 +39,20 @@ def get_category(category):
     """
 
     # Adhere to category naming standard.
-    category = category.lower().capitalize();
+    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,7 +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']
+    # recovered = get_category('recovered')['locations']
 
     # Final locations to return.
     locations = []
@@ -117,7 +127,7 @@ def get_locations():
         timelines = {
             'confirmed' : confirmed[index]['history'],
             'deaths'    : deaths[index]['history'],
-            'recovered' : recovered[index]['history'],
+            # 'recovered' : recovered[index]['history'],
         }
 
         # Grab coordinates.
@@ -141,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({ datetime.strptime(date, '%m/%d/%y').isoformat() + 'Z': amount for date, amount in timelines['recovered'].items() })
+                'recovered': Timeline({})
             }
         ))
 

app/timeline.py

@@ -21,7 +21,15 @@ def latest(self):
         """
         Gets the latest available history value.
         """
-        return list(self.timeline.values())[-1] or 0
+        # Get values in a list.
+        values = list(self.timeline.values())
+
+        # Last item is the latest.
+        if len(values):
+            return values[-1] or 0
+        
+        # Fallback value of 0.
+        return 0
 
     def serialize(self):
         """