removed getAll() and get() from data source files

Author: simran7s

app/services/location/csbs.py

@@ -14,22 +14,15 @@
 
 LOGGER = logging.getLogger("services.location.csbs")
 
+# Base URL for fetching data
+BASE_URL = "https://facts.csbs.org/covid-19/covid19_county.csv"
+
 
 class CSBSLocationService(LocationService):
     """
     Service for retrieving locations from csbs
     """
 
-    async def get_all(self):
-        # Get the locations.
-        locations = await get_locations()
-        return locations
-
-    async def get(self, loc_id):  # pylint: disable=arguments-differ
-        # Get location at the index equal to the provided id.
-        locations = await self.get_all()
-        return locations[loc_id]
-
     @cached(cache=TTLCache(maxsize=1, ttl=1800))
     async def get_locations():
         """
@@ -96,7 +89,3 @@ async def get_locations():
 
         # Return the locations.
         return locations
-
-
-# Base URL for fetching data
-BASE_URL = "https://facts.csbs.org/covid-19/covid19_county.csv"

app/services/location/jhu.py

@@ -20,22 +20,15 @@
 LOGGER = logging.getLogger("services.location.jhu")
 PID = os.getpid()
 
+# Base URL for fetching category.
+BASE_URL = "https://raw.githubusercontent.com/CSSEGISandData/2019-nCoV/master/csse_covid_19_data/csse_covid_19_time_series/"
+
 
 class JhuLocationService(LocationService):
     """
     Service for retrieving locations from Johns Hopkins CSSE (https://github.com/CSSEGISandData/COVID-19).
     """
 
-    async def get_all(self):
-        # Get the locations.
-        locations = await get_locations()
-        return locations
-
-    async def get(self, loc_id):  # pylint: disable=arguments-differ
-        # Get location at the index equal to provided id.
-        locations = await self.get_all()
-        return locations[loc_id]
-
     @cached(cache=TTLCache(maxsize=1, ttl=1800))
     async def get_locations():
         """
@@ -123,10 +116,6 @@ async def get_locations():
 # ---------------------------------------------------------------
 
 
-# Base URL for fetching category.
-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))
 async def get_category(category):
     """

app/services/location/nyt.py

@@ -15,22 +15,15 @@
 
 LOGGER = logging.getLogger("services.location.nyt")
 
+# Base URL for fetching category.
+BASE_URL = "https://raw.githubusercontent.com/nytimes/covid-19-data/master/us-counties.csv"
+
 
 class NYTLocationService(LocationService):
     """
     Service for retrieving locations from New York Times (https://github.com/nytimes/covid-19-data).
     """
 
-    async def get_all(self):
-        # Get the locations.
-        locations = await get_locations()
-        return locations
-
-    async def get(self, loc_id):  # pylint: disable=arguments-differ
-        # Get location at the index equal to provided id.
-        locations = await self.get_all()
-        return locations[loc_id]
-
     @cached(cache=TTLCache(maxsize=1, ttl=1800))
     async def get_locations():
         """
@@ -114,10 +107,6 @@ async def get_locations():
 # ---------------------------------------------------------------
 
 
-# Base URL for fetching category.
-BASE_URL = "https://raw.githubusercontent.com/nytimes/covid-19-data/master/us-counties.csv"
-
-
 def get_grouped_locations_dict(data):
     """
     Helper function to group history for locations into one dict.