Skip to content

Applying Composite pattern to clean code and reduce instantiation of data sources not needed #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anurosan wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Applying Composite pattern to clean code and reduce instantiation of data sources not needed #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e967ea
Create dataSource.py
anurosan Aug 16, 2021
fab782b
Updated method data_source to go through DataSource class
anurosan Aug 16, 2021
c4edcfc
Updated v2 so that DATA_SOURCES is no longer treated as a dictionary
anurosan Aug 16, 2021
6109ac1
Precondition has been implemented
anurosan Aug 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions app/data/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,25 @@
from ..services.location.csbs import CSBSLocationService
from ..services.location.jhu import JhuLocationService
from ..services.location.nyt import NYTLocationService
from app.data.dataSource import DataSource

# Mapping of services to data-sources.
DATA_SOURCES = {
"jhu": JhuLocationService(),
"csbs": CSBSLocationService(),
"nyt": NYTLocationService(),
}

DATA_SOURCES = ["jhu","csbs","nyt"]

def data_source(source):
"""
Retrieves the provided data-source service.

:returns: The service.
:rtype: LocationService
"""
return DATA_SOURCES.get(source.lower())
"""

exists = False

for i in DATA_SOURCES:
if DATA_SOURCES.index[i] == source:
exists = True

if exists == True:
return DataSource.getService(source)
else:
return DataSource.getService("jhu")
15 changes: 15 additions & 0 deletions app/data/dataSource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
from ..services.location.csbs import CSBSLocationService
from ..services.location.jhu import JhuLocationService
from ..services.location.nyt import NYTLocationService

class DataSource():
def getService(source):
if source.lower() == "csbs":
temp = CSBSLocationService()
return temp
elif source.lower() == "nyt":
temp = NYTLocationService()
return temp
else:
temp = JhuLocationService()
return temp
2 changes: 1 addition & 1 deletion app/routers/v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,4 @@ async def sources():
"""
Retrieves a list of data-sources that are availble to use.
"""
return {"sources": list(DATA_SOURCES.keys())}
return {"sources": DATA_SOURCES}