Skip to content

created statistics and timelined statistics class #439

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

Closed
ecypeng wants to merge 1 commit into from
Closed

created statistics and timelined statistics class #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 24 additions & 14 deletions app/location/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,41 @@
from ..utils import countries
from ..utils.populations import country_population

class Statistic:
def __init__(self, last_updated, confirmed, deaths, recovered):
self.last_updated = last_updated
self.confirmed = confirmed
self.deaths = deaths
self.recovered = recovered

class TimelinedStatistic(Statistic):
def __init__(self, last_updated, timelines):
self.last_updated = last_updated

self.confirmed= timelines.get("confirmed").latest or 0,
self.deaths= timelines.get("deaths").latest or 0,
self.recovered= timelines.get("recovered").latest or 0,



# pylint: disable=redefined-builtin,invalid-name
class Location: # pylint: disable=too-many-instance-attributes
"""
A location in the world affected by the coronavirus.
A location in the world affected by the coronavirus.ccccccvektiuhjuilijekbikvjbretdnfrtbhgdtlnnv

"""

def __init__(
self, id, country, province, coordinates, last_updated, confirmed, deaths, recovered,
self, id, country, province, coordinates, statistics
): # pylint: disable=too-many-arguments
# General info.
self.id = id
self.country = country.strip()
self.province = province.strip()
self.coordinates = coordinates

# Last update.
self.last_updated = last_updated


# Statistics.
self.confirmed = confirmed
self.deaths = deaths
self.recovered = recovered
self.statistics = statistics

@property
def country_code(self):
Expand Down Expand Up @@ -80,7 +92,7 @@ class TimelinedLocation(Location):
"""

# pylint: disable=too-many-arguments
def __init__(self, id, country, province, coordinates, last_updated, timelines):
def __init__(self, id, country, province, coordinates, last_updated, timelinedStatistics):
super().__init__(
# General info.
id,
Expand All @@ -89,13 +101,11 @@ def __init__(self, id, country, province, coordinates, last_updated, timelines):
coordinates,
last_updated,
# 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,
statistics=timelinedStatistics
)

# Set timelines.
self.timelines = timelines


# pylint: disable=arguments-differ
def serialize(self, timelines=False):
Expand Down
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 @@ -8,7 +8,7 @@

V2 = APIRouter()


class Sources(str, enum.Enum):
"""
A source available for retrieving data.
Expand Down