Lab8 aggregate pattern 1

app/location/__init__.py

@@ -1,6 +1,7 @@
 """app.location"""
 from ..coordinates import Coordinates
-from ..utils import countries
+from ..utils.countries import Country
+# from ..utils import country
 from ..utils.populations import country_population
 
 
@@ -10,12 +11,13 @@ class Location:  # pylint: disable=too-many-instance-attributes
     A location in the world affected by the coronavirus.
     """
 
-    def __init__(
+    def __init__( 
         self, id, country, province, coordinates, last_updated, confirmed, deaths, recovered,
     ):  # pylint: disable=too-many-arguments
         # General info.
         self.id = id
-        self.country = country.strip()
+        self.country_obj = country # country_obj should contain a reference to a Country Class that is being passed 
+        self.country = self.country_obj.get_country().strip()
         self.province = province.strip()
         self.coordinates = coordinates
 
@@ -27,6 +29,7 @@ def __init__(
         self.deaths = deaths
         self.recovered = recovered
 
+
     @property
     def country_code(self):
         """
@@ -35,7 +38,8 @@ def country_code(self):
         :returns: The country code.
         :rtype: str
         """
-        return (countries.country_code(self.country) or countries.DEFAULT_COUNTRY_CODE).upper()
+        country_code = (self.country.get_country_code() or self.country.get_default_country_code()).upper
+        return country_code
 
     @property
     def country_population(self):
@@ -91,7 +95,7 @@ def __init__(self, id, country, province, coordinates, last_updated, timelines):
             # Statistics (retrieve latest from timelines).
             confirmed=timelines.get("confirmed").latest or 0,
             deaths=timelines.get("deaths").latest or 0,
-            recovered=timelines.get("recovered").latest or 0,
+            recovered=timelines.get("recovered").latest or 0
         )
 
         # Set timelines.

app/services/location/jhu.py

@@ -12,11 +12,12 @@
 from ...coordinates import Coordinates
 from ...location import TimelinedLocation
 from ...models import Timeline
-from ...utils import countries
+from ...utils.countries import Country
 from ...utils import date as date_util
 from ...utils import httputils
 from . import LocationService
 
+
 LOGGER = logging.getLogger("services.location.jhu")
 PID = os.getpid()
 
@@ -94,11 +95,12 @@ async def get_category(category):
             latest = list(history.values())[-1]
 
             # Normalize the item and append to locations.
+
             locations.append(
                 {
                     # General info.
                     "country": country,
-                    "country_code": countries.country_code(country),
+                    "country_code": Country(country),
                     "province": item["Province/State"],
                     # Coordinates.
                     "coordinates": {"lat": item["Lat"], "long": item["Long"],},
@@ -169,13 +171,14 @@ async def get_locations():
 
         # Grab coordinates.
         coordinates = location["coordinates"]
+        # Creation of Country Class
 
         # Create location (supporting timelines) and append.
         locations.append(
             TimelinedLocation(
                 # General info.
                 index,
-                location["country"],
+                Country(location["country"]),
                 location["province"],
                 # Coordinates.
                 Coordinates(latitude=coordinates["lat"], longitude=coordinates["long"]),