The second aggregate pattern

Author: ZhiXuZhao

app/location/__init__.py

@@ -6,11 +6,15 @@
 # put confirmed cases, deaths cases, recovered cases into one class
 # Inseated of using confirmed cases, deaths cases, recovered cases as attributes, we can use CaseNumbers class instance as attribute
 class CaseNumbers:
-    def __init__(self, confirmed = 0, deaths = 0, recovered = 0):
+    def __init__(self, id, confirmed = 0, deaths = 0, recovered = 0):
+        self.id = id
         self.confirmed = confirmed
         self.deaths = deaths
         self.recovered = recovered
 
+
+#put all location information into one class
+#CaseNumbers, Locationinfo, coordinates and Location forms one aggregate
 class Locationinfo:
     def __init__(self, id, country, province, coordinates):
         self.id = id
@@ -29,7 +33,7 @@ class Location:  # pylint: disable=too-many-instance-attributes
 
     # Use instance of class CaseNumbers as attribute
     def __init__(
-        self, locationinfo, last_updated, casenumbers
+        self, id, locationinfo, last_updated, casenumbers
     ):  # pylint: disable=too-many-arguments
         # General info.
         self.locationinfo = locationinfo
@@ -48,7 +52,7 @@ def country_code(self):
         :returns: The country code.
         :rtype: str
         """
-        return (countries.country_code(self.country) or countries.DEFAULT_COUNTRY_CODE).upper()
+        return (countries.country_code(self.locationinfo.country) or countries.DEFAULT_COUNTRY_CODE).upper()
 
     @property
     def country_population(self):
@@ -69,13 +73,13 @@ def serialize(self):
         """
         return {
             # General info.
-            "id": self.id,
-            "country": self.country,
+            "id": self.locationinfo.id,
+            "country": self.locationinfo.country,
             "country_code": self.country_code,
             "country_population": self.country_population,
-            "province": self.province,
+            "province": self.locationinfo.province,
             # Coordinates.
-            "coordinates": self.coordinates.serialize(),
+            "coordinates": self.locationinfo.coordinates.serialize(),
             # Last updated.
             "last_updated": self.last_updated,
             # Latest data (statistics).
@@ -93,13 +97,10 @@ class TimelinedLocation(Location):
     """
 
     # pylint: disable=too-many-arguments
-    def __init__(self, id, country, province, coordinates, last_updated, timelines, casenumbers):
+    def __init__(self, locationinfo, last_updated, timelines, casenumbers):
         super().__init__(
             # General info.
-            id,
-            country,
-            province,
-            coordinates,
+            locationinfo,
             last_updated,
             # Statistics (retrieve latest from timelines).
             casenumbers

app/services/location/csbs.py

@@ -12,6 +12,8 @@
 from ...utils import httputils
 from . import LocationService
 
+from urls import URLs
+
 LOGGER = logging.getLogger("services.location.csbs")
 
 
@@ -32,7 +34,7 @@ async def get(self, loc_id):  # pylint: disable=arguments-differ
 
 
 # Base URL for fetching data
-BASE_URL = "https://facts.csbs.org/covid-19/covid19_county.csv"
+#BASE_URL = "https://facts.csbs.org/covid-19/covid19_county.csv"
 
 
 @cached(cache=TTLCache(maxsize=1, ttl=1800))
@@ -52,7 +54,7 @@ async def get_locations():
         locations = cache_results
     else:
         LOGGER.info(f"{data_id} shared cache empty")
-        async with httputils.CLIENT_SESSION.get(BASE_URL) as response:
+        async with httputils.CLIENT_SESSION.get(URLs.CSBS) as response:
             text = await response.text()
 
         LOGGER.debug(f"{data_id} Data received")

app/services/location/jhu.py

@@ -17,6 +17,8 @@
 from ...utils import httputils
 from . import LocationService
 
+from urls import URLs
+
 LOGGER = logging.getLogger("services.location.jhu")
 PID = os.getpid()
 
@@ -41,7 +43,7 @@ async def get(self, loc_id):  # pylint: disable=arguments-differ
 
 
 # Base URL for fetching category.
-BASE_URL = "https://raw.githubusercontent.com/CSSEGISandData/2019-nCoV/master/csse_covid_19_data/csse_covid_19_time_series/"
+# BASE_URL = "https://raw.githubusercontent.com/CSSEGISandData/2019-nCoV/master/csse_covid_19_data/csse_covid_19_time_series/"
 
 
 @cached(cache=TTLCache(maxsize=4, ttl=1800))
@@ -64,7 +66,7 @@ async def get_category(category):
     else:
         LOGGER.info(f"{data_id} shared cache empty")
         # URL to request data from.
-        url = BASE_URL + "time_series_covid19_%s_global.csv" % category
+        url = URLs.JHU + "time_series_covid19_%s_global.csv" % category
 
         # Request the data
         LOGGER.info(f"{data_id} Requesting data...")

app/services/location/nyt.py

@@ -13,6 +13,8 @@
 from ...utils import httputils
 from . import LocationService
 
+from urls import URLs
+
 LOGGER = logging.getLogger("services.location.nyt")
 
 
@@ -36,7 +38,7 @@ async def get(self, loc_id):  # pylint: disable=arguments-differ
 
 
 # Base URL for fetching category.
-BASE_URL = "https://raw.githubusercontent.com/nytimes/covid-19-data/master/us-counties.csv"
+# BASE_URL = "https://raw.githubusercontent.com/nytimes/covid-19-data/master/us-counties.csv"
 
 
 def get_grouped_locations_dict(data):
@@ -85,7 +87,7 @@ async def get_locations():
         locations = cache_results
     else:
         LOGGER.info(f"{data_id} shared cache empty")
-        async with httputils.CLIENT_SESSION.get(BASE_URL) as response:
+        async with httputils.CLIENT_SESSION.get(URLs.NYT) as response:
             text = await response.text()
 
         LOGGER.debug(f"{data_id} Data received")

app/services/location/urls.py

@@ -0,0 +1,8 @@
+import enum
+
+# Encapsulate urls into one class, clas URLs serve as aggregate root.
+class URLs(str, enum.Enum):
+
+    JHU = "https://raw.githubusercontent.com/CSSEGISandData/2019-nCoV/master/csse_covid_19_data/csse_covid_19_time_series/"
+    CSBS = "https://facts.csbs.org/covid-19/covid19_county.csv"
+    NYT = "https://raw.githubusercontent.com/nytimes/covid-19-data/master/us-counties.csv"