moved timelines logic to TimelinedLocation

Author: ExpDev07

README.md

@@ -21,7 +21,7 @@ We provide multiple data-sources you can pick from, simply add the query paramat
 
 #### Available sources:
 
-* **jhu** -  https://github.com/CSSEGISandData/COVID-19 - Data repository operated by the Johns Hopkins University Center for Systems Science and Engineering (JHU CSSE).
+* **jhu** - https://github.com/CSSEGISandData/COVID-19 - Data repository operated by the Johns Hopkins University Center for Systems Science and Engineering (JHU CSSE).
 
 * **... more to come later**.
 

app/data/__init__.py

@@ -5,7 +5,7 @@
     'jhu': JhuLocationService(),
 }
 
-def data_source(source: str):
+def data_source(source):
     """
     Retrieves the provided data-source service.
 

app/location.py app/location/__init__.pyapp/location.py renamed to app/location/__init__.py

@@ -1,5 +1,5 @@
-from .coordinates import Coordinates
-from .utils import countrycodes
+from ..coordinates import Coordinates
+from ..utils import countrycodes
 
 class Location:
     """
@@ -13,7 +13,7 @@ def __init__(self, id, country, province, coordinates, confirmed, deaths, recove
         self.province = province.strip()
         self.coordinates = coordinates
 
-        # Data.
+        # Statistics.
         self.confirmed = confirmed
         self.deaths = deaths
         self.recovered = recovered
@@ -25,38 +25,65 @@ def country_code(self):
         """
         return (countrycodes.country_code(self.country) or countrycodes.default_code).upper()
 
-    def serialize(self, timelines = False):
+    def serialize(self):
         """
         Serializes the location into a dict.
 
-        :param timelines: Whether to include the timelines.
         :returns: The serialized location.
         :rtype: dict
         """
-        serialized = {
+        return {
             # General info.
             'id'          : self.id,
             'country'     : self.country, 
-            'province'    : self.province,
             'country_code': self.country_code,
+            'province'    : self.province,
 
             # Coordinates.
             'coordinates': self.coordinates.serialize(),
 
-            # Latest data.
+            # Latest data (statistics).
             'latest': {
-                'confirmed': self.confirmed.latest,
-                'deaths'   : self.deaths.latest,
-                'recovered': self.recovered.latest
+                'confirmed': self.confirmed,
+                'deaths'   : self.deaths,
+                'recovered': self.recovered
             },
         }
 
+class TimelinedLocation(Location):
+    """
+    A location with timelines.
+    """
+
+    def __init__(self, id, country, province, coordinates, timelines):
+        super().__init__(
+            # General info.
+            id, country, province, coordinates,
+
+            # Statistics (retrieve latest from timelines).
+            confirmed=timelines.get('confirmed').latest,
+            deaths=timelines.get('deaths').latest,
+            recovered=timelines.get('recovered').latest,
+        )
+
+        # Set timelines.
+        self.timelines = timelines
+
+    def serialize(self, timelines = False):
+        """
+        Serializes the location into a dict.
+
+        :param timelines: Whether to include the timelines.
+        :returns: The serialized location.
+        :rtype: dict
+        """
+        serialized = super().serialize()
+
         # Whether to include the timelines or not.
         if timelines:
             serialized.update({ 'timelines': {
-                'confirmed': self.confirmed.serialize(),
-                'deaths'   : self.deaths.serialize(),
-                'recovered': self.recovered.serialize(),
+                # Serialize all the timelines.
+                key: value.serialize() for (key, value) in self.timelines.items()
             }})
 
         # Return the serialized location.

app/routes/v2/latest.py

@@ -4,15 +4,15 @@
 @api.route('/latest')
 def latest():
     # Get the serialized version of all the locations.
-    locations = [ location.serialize() for location in request.source.get_all() ]
+    locations = request.source.get_all()
 
     # All the latest information.
-    latest = list(map(lambda location: location['latest'], locations))
+    # latest = list(map(lambda location: location['latest'], locations))
 
     return jsonify({
         'latest': {
-            'confirmed': sum(map(lambda latest: latest['confirmed'], latest)),
-            'deaths'   : sum(map(lambda latest: latest['deaths'], latest)),
-            'recovered': sum(map(lambda latest: latest['recovered'], latest)),
+            'confirmed': sum(map(lambda location: location.confirmed, locations)),
+            'deaths'   : sum(map(lambda location: location.deaths, locations)),
+            'recovered': sum(map(lambda location: location.recovered, locations)),
         }
     })

app/services/location/jhu.py

@@ -1,5 +1,5 @@
 from . import LocationService
-from ...location import Location
+from ...location import TimelinedLocation
 from ...coordinates import Coordinates
 from ...timeline import Timeline
 
@@ -16,6 +16,8 @@ def get(self, id):
         # Get location at the index equal to provided id.
         return self.get_all()[id]
 
+# ---------------------------------------------------------------
+
 import requests
 import csv
 from datetime import datetime
@@ -121,15 +123,17 @@ def get_locations():
         # Grab coordinates.
         coordinates = location['coordinates']
 
-        # Create location and append.
-        locations.append(Location(
+        # Create location (supporting timelines) and append.
+        locations.append(TimelinedLocation(
             # General info.
             index, location['country'], location['province'], Coordinates(coordinates['lat'], coordinates['long']),
 
             # Timelines (parse dates as ISO).
-            Timeline({ datetime.strptime(date, '%m/%d/%y').isoformat() + 'Z': amount for date, amount in timelines['confirmed'].items() }),
-            Timeline({ datetime.strptime(date, '%m/%d/%y').isoformat() + 'Z': amount for date, amount in timelines['deaths'].items() }),
-            Timeline({ datetime.strptime(date, '%m/%d/%y').isoformat() + 'Z': amount for date, amount in timelines['recovered'].items() })
+            {
+                '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() })
+            }
         ))
 
     # Finally, return the locations.