Structural pattern

app/data/__init__.py

@@ -3,19 +3,26 @@
 from ..services.location.jhu import JhuLocationService
 from ..services.location.nyt import NYTLocationService
 
-# Mapping of services to data-sources.
-DATA_SOURCES = {
-    "jhu": JhuLocationService(),
-    "csbs": CSBSLocationService(),
-    "nyt": NYTLocationService(),
-}
 
 
-def data_source(source):
+class Source:
+
+    def __init__(self, source):
+        # Mapping of services to data-sources.
+        self.__DATA_SOURCES_LIST = {
+            "jhu": JhuLocationService(),
+            "csbs": CSBSLocationService(),
+            "nyt": NYTLocationService(),
+        }
+
+    def all_data_source(self):
+        return self.__DATA_SOURCES_LIST
+
+    def single_data_source(self, source):
     """
     Retrieves the provided data-source service.
 
     :returns: The service.
     :rtype: LocationService
     """
-    return DATA_SOURCES.get(source.lower())
+    return self.__DATA_SOURCES_LIST.get(source.lower())

app/location/__init__.py

@@ -1,7 +1,7 @@
 """app.location"""
 from ..coordinates import Coordinates
-from ..utils import countries
-from ..utils.populations import country_population
+from ..utils import countries_population
+from ..utils.populations import POPULATION
 
 
 # pylint: disable=redefined-builtin,invalid-name
@@ -11,6 +11,7 @@ class Location:  # pylint: disable=too-many-instance-attributes
     """
 
     def __init__(
+
         self, id, country, province, coordinates, last_updated, confirmed, deaths, recovered,
     ):  # pylint: disable=too-many-arguments
         # General info.

app/location/csbs.py

@@ -1,6 +1,6 @@
 """app.locations.csbs.py"""
 from . import Location
-
+from . import serialize
 
 class CSBSLocation(Location):
     """
@@ -25,19 +25,7 @@ def __init__(self, id, state, county, coordinates, last_updated, confirmed, deat
         self.state = state
         self.county = county
 
-    def serialize(self, timelines=False):  # pylint: disable=arguments-differ,unused-argument
-        """
-        Serializes the location into a dict.
-
-        :returns: The serialized location.
-        :rtype: dict
-        """
-        serialized = super().serialize()
+
+
 
-        # Update with new fields.
-        serialized.update(
-            {"state": self.state, "county": self.county,}
-        )
 
-        # Return the serialized location.
-        return serialized

app/location/nyt.py

@@ -1,5 +1,6 @@
 """app.locations.nyt.py"""
 from . import TimelinedLocation
+from . import serialize
 
 
 class NYTLocation(TimelinedLocation):
@@ -14,19 +15,4 @@ def __init__(self, id, state, county, coordinates, last_updated, timelines):
         self.state = state
         self.county = county
 
-    def serialize(self, timelines=False):  # pylint: disable=arguments-differ,unused-argument
-        """
-        Serializes the location into a dict.
-
-        :returns: The serialized location.
-        :rtype: dict
-        """
-        serialized = super().serialize(timelines)
-
-        # Update with new fields.
-        serialized.update(
-            {"state": self.state, "county": self.county,}
-        )
-
-        # Return the serialized location.
-        return serialized
+

app/location/serialize.py

@@ -0,0 +1,19 @@
+
+class serialize:
+    def serialize(self, timelines=False):  # pylint: disable=arguments-differ,unused-argument
+        """
+        Serializes the location into a dict.
+
+        :returns: The serialized location.
+        :rtype: dict
+        """
+        serialized = super().serialize(timelines)
+
+        # Update with new fields.
+        serialized.update(
+            {"state": self.state, "county": self.county,}
+        )
+
+        # Return the serialized location.
+        return serialized
+

app/main.py

@@ -14,7 +14,7 @@
 from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
 
 from .config import get_settings
-from .data import data_source
+from .data import Source
 from .routers import V1, V2
 from .utils.httputils import setup_client_session, teardown_client_session
 
@@ -46,6 +46,7 @@
 #######################
 
 # Scout APM
+
 if SETTINGS.scout_name:  # pragma: no cover
     LOGGER.info(f"Adding Scout APM middleware for `{SETTINGS.scout_name}`")
     APP.add_middleware(ScoutMiddleware)
@@ -67,14 +68,14 @@
 )
 APP.add_middleware(GZipMiddleware, minimum_size=1000)
 
-
+SOURCES = Source()
 @APP.middleware("http")
 async def add_datasource(request: Request, call_next):
     """
     Attach the data source to the request.state.
     """
     # Retrieve the datas ource from query param.
-    source = data_source(request.query_params.get("source", default="jhu"))
+    source = SOURCE.get_data_source(request.query_params.get("source", default="jhu"))
 
     # Abort with 404 if source cannot be found.
     if not source:

app/routers/v2.py

@@ -3,7 +3,7 @@
 
 from fastapi import APIRouter, HTTPException, Request
 
-from ..data import DATA_SOURCES
+from ..data import Source
 from ..models import LatestResponse, LocationResponse, LocationsResponse
 
 V2 = APIRouter()
@@ -101,10 +101,10 @@ async def get_location_by_id(
     location = await request.state.source.get(id)
     return {"location": location.serialize(timelines)}
 
-
+SOURCE = Source()
 @V2.get("/sources")
 async def sources():
     """
     Retrieves a list of data-sources that are availble to use.
     """
-    return {"sources": list(DATA_SOURCES.keys())}
+    return {"sources": list(SOURCE.all_data_source)}