From 833f870bbf05feef4766a743d77f7c5dbed7e85b Mon Sep 17 00:00:00 2001 From: Solracion Date: Tue, 20 Jul 2021 15:13:16 -0400 Subject: [PATCH 1/3] this is a test --- app/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/main.py b/app/main.py index b9aff949..1adf3c13 100644 --- a/app/main.py +++ b/app/main.py @@ -21,6 +21,7 @@ # ############ # FastAPI App # ############ +# this is a test LOGGER = logging.getLogger("api") SETTINGS = get_settings() From 7ed67eda268df114cd6faed4bcda58464ff6313a Mon Sep 17 00:00:00 2001 From: Solracion Date: Wed, 21 Jul 2021 19:47:33 -0400 Subject: [PATCH 2/3] Data_Source change for a more Aggregate approach --- app/data/__init__.py | 22 +++++++++------------- app/main.py | 1 - 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/app/data/__init__.py b/app/data/__init__.py index 60a75dac..12c0f7b1 100644 --- a/app/data/__init__.py +++ b/app/data/__init__.py @@ -2,20 +2,16 @@ from ..services.location.csbs import CSBSLocationService from ..services.location.jhu import JhuLocationService from ..services.location.nyt import NYTLocationService +from ..services.location import LocationService # Mapping of services to data-sources. -DATA_SOURCES = { - "jhu": JhuLocationService(), - "csbs": CSBSLocationService(), - "nyt": NYTLocationService(), -} +class DATA_SOURCES: + DATA_SOURCES = {} + def data(self) + self.data_Sources['jhu'] = JhuLocationService() + self.data_Sources['csbs'] = CSBSLocationService() + self.data_Sources['nyt'] = NYTLocationService() -def data_source(source): - """ - Retrieves the provided data-source service. - - :returns: The service. - :rtype: LocationService - """ - return DATA_SOURCES.get(source.lower()) + def data_source(self, source : str)-> LocationService: + return self.dataSource.get(source.lower()) diff --git a/app/main.py b/app/main.py index 1adf3c13..b9aff949 100644 --- a/app/main.py +++ b/app/main.py @@ -21,7 +21,6 @@ # ############ # FastAPI App # ############ -# this is a test LOGGER = logging.getLogger("api") SETTINGS = get_settings() From 3987b3cc8ba6872d1a001b65f78791842b6c0740 Mon Sep 17 00:00:00 2001 From: Solracion Date: Wed, 21 Jul 2021 21:44:36 -0400 Subject: [PATCH 3/3] Data_Source change for a more Aggregate approach --- app/data/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/data/__init__.py b/app/data/__init__.py index 12c0f7b1..e5804fae 100644 --- a/app/data/__init__.py +++ b/app/data/__init__.py @@ -9,9 +9,9 @@ class DATA_SOURCES: DATA_SOURCES = {} def data(self) - self.data_Sources['jhu'] = JhuLocationService() - self.data_Sources['csbs'] = CSBSLocationService() - self.data_Sources['nyt'] = NYTLocationService() + self.DATA_SOURCES['jhu'] = JhuLocationService() + self.DATA_SOURCES['csbs'] = CSBSLocationService() + self.DATA_SOURCES['nyt'] = NYTLocationService() def data_source(self, source : str)-> LocationService: - return self.dataSource.get(source.lower()) + return self.DATA_SOURCES.get(source.lower())