From cc84fc8e1ca82435d66ce840d51ff32c2531b6b9 Mon Sep 17 00:00:00 2001 From: Laiba Zahid Date: Tue, 16 Mar 2021 11:54:11 -0400 Subject: [PATCH 01/14] commit text file --- text.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 text.txt diff --git a/text.txt b/text.txt new file mode 100644 index 0000000..a3ce849 --- /dev/null +++ b/text.txt @@ -0,0 +1 @@ +new changes \ No newline at end of file From 15ac3455b54a03b2018789283419b4d3afa70883 Mon Sep 17 00:00:00 2001 From: Laiba Zahid Date: Tue, 16 Mar 2021 23:18:00 -0400 Subject: [PATCH 02/14] Encapsulation of location based Covid timeline updates --- COVID19Py/covid19.py | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/COVID19Py/covid19.py b/COVID19Py/covid19.py index a68faa7..c13517f 100644 --- a/COVID19Py/covid19.py +++ b/COVID19Py/covid19.py @@ -49,16 +49,6 @@ def __init__(self, url="https://covid-tracker-us.herokuapp.com", data_source='jh raise ValueError("Invalid data source. Expected one of: %s" % self._valid_data_sources) self.data_source = data_source - def _update(self, timelines): - latest = self.getLatest() - locations = self.getLocations(timelines) - if self.latestData: - self.previousData = self.latestData - self.latestData = { - "latest": latest, - "locations": locations - } - def _getSources(self): response = requests.get(self.url + "/v2/sources") response.raise_for_status() @@ -71,6 +61,17 @@ def _request(self, endpoint, params=None): response.raise_for_status() return response.json() + + def _update(self, timelines): + latest = self.getLatest() + locations = self.getLocations(timelines) + if self.latestData: + self.previousData = self.latestData + self.latestData = { + "latest": latest, + "locations": locations + } + def getAll(self, timelines=False): self._update(timelines) return self.latestData @@ -98,6 +99,14 @@ def getLatest(self) -> List[Dict[str, int]]: data = self._request("/v2/latest") return data["latest"] +############################################################################################### + +class Locatio_based_updates: + + def __init__(self, timelines=False, request): + self.request = request + self.timelines = timelines + def getLocations(self, timelines=False, rank_by: str = None) -> List[Dict]: """ Gets all locations affected by COVID-19, as well as latest case data. @@ -155,4 +164,4 @@ def getLocationById(self, country_id: int): :return: A dictionary with case information for the specified location. """ data = self._request("/v2/locations/" + str(country_id)) - return data["location"] + return data["location"] \ No newline at end of file From 54190faab6e9f39fd39d6d77f887e499fac510f2 Mon Sep 17 00:00:00 2001 From: Laiba Zahid Date: Tue, 16 Mar 2021 23:56:04 -0400 Subject: [PATCH 03/14] Encapsulation of location based Covid timeline updates --- COVID19Py/covid19.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/COVID19Py/covid19.py b/COVID19Py/covid19.py index c13517f..4119dd5 100644 --- a/COVID19Py/covid19.py +++ b/COVID19Py/covid19.py @@ -64,7 +64,7 @@ def _request(self, endpoint, params=None): def _update(self, timelines): latest = self.getLatest() - locations = self.getLocations(timelines) + locations = self.data(timelines) if self.latestData: self.previousData = self.latestData self.latestData = { @@ -103,7 +103,7 @@ def getLatest(self) -> List[Dict[str, int]]: class Locatio_based_updates: - def __init__(self, timelines=False, request): + def __init__(self, timelines=False, request, data): self.request = request self.timelines = timelines From 358728da2a959cbf119ccc2be93a16257d4d6aae Mon Sep 17 00:00:00 2001 From: Laiba Zahid Date: Wed, 17 Mar 2021 00:00:52 -0400 Subject: [PATCH 04/14] Encapsulation of location based Covid timeline updates --- COVID19Py/covid19.py | 1 + 1 file changed, 1 insertion(+) diff --git a/COVID19Py/covid19.py b/COVID19Py/covid19.py index 4119dd5..ac0a85e 100644 --- a/COVID19Py/covid19.py +++ b/COVID19Py/covid19.py @@ -8,6 +8,7 @@ class COVID19(object): data_source = "" previousData = None latestData = None + data = None _valid_data_sources = [] mirrors_source = "https://raw.github.com/Kamaropoulos/COVID19Py/master/mirrors.json" From 6c066655230875fb7c3580f2170daf80174503e3 Mon Sep 17 00:00:00 2001 From: Laiba Zahid Date: Wed, 17 Mar 2021 00:05:27 -0400 Subject: [PATCH 05/14] Encapsulation of location based Covid timeline updates --- COVID19Py/covid19.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/COVID19Py/covid19.py b/COVID19Py/covid19.py index ac0a85e..449f919 100644 --- a/COVID19Py/covid19.py +++ b/COVID19Py/covid19.py @@ -8,7 +8,7 @@ class COVID19(object): data_source = "" previousData = None latestData = None - data = None + # data = None _valid_data_sources = [] mirrors_source = "https://raw.github.com/Kamaropoulos/COVID19Py/master/mirrors.json" @@ -65,7 +65,8 @@ def _request(self, endpoint, params=None): def _update(self, timelines): latest = self.getLatest() - locations = self.data(timelines) + getlocation = Locatio_based_updates.getLocations + locations = self.getlocation(timelines) if self.latestData: self.previousData = self.latestData self.latestData = { From f1c5de73d01caf1641ad2f8a41500ce05f25432a Mon Sep 17 00:00:00 2001 From: Laiba Zahid Date: Wed, 17 Mar 2021 00:07:15 -0400 Subject: [PATCH 06/14] Encapsulation of location based Covid timeline updates --- COVID19Py/covid19.py | 1 - 1 file changed, 1 deletion(-) diff --git a/COVID19Py/covid19.py b/COVID19Py/covid19.py index 449f919..841053a 100644 --- a/COVID19Py/covid19.py +++ b/COVID19Py/covid19.py @@ -8,7 +8,6 @@ class COVID19(object): data_source = "" previousData = None latestData = None - # data = None _valid_data_sources = [] mirrors_source = "https://raw.github.com/Kamaropoulos/COVID19Py/master/mirrors.json" From c92400897470cbc07c1a173ef7abaa79905dc1e0 Mon Sep 17 00:00:00 2001 From: Laiba Zahid Date: Wed, 17 Mar 2021 00:41:12 -0400 Subject: [PATCH 07/14] Encapsulation of cases updates --- COVID19Py/covid19.py | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/COVID19Py/covid19.py b/COVID19Py/covid19.py index 841053a..3456106 100644 --- a/COVID19Py/covid19.py +++ b/COVID19Py/covid19.py @@ -1,4 +1,5 @@ -from typing import Dict, List +from typing +import Dict, List import requests import json @@ -61,8 +62,16 @@ def _request(self, endpoint, params=None): response.raise_for_status() return response.json() +########################################################################## +class updates: - def _update(self, timelines): + def __init__(self, latestData, previousData, timelines, request): + self.latestData = latestData + self.previousData = previousData + self.timelines = timelines + self.request = request + + def _update(self, timelines): latest = self.getLatest() getlocation = Locatio_based_updates.getLocations locations = self.getlocation(timelines) @@ -81,9 +90,9 @@ def getLatestChanges(self): changes = None if self.previousData: changes = { - "confirmed": self.latestData["latest"]["confirmed"] - self.latestData["latest"]["confirmed"], - "deaths": self.latestData["latest"]["deaths"] - self.latestData["latest"]["deaths"], - "recovered": self.latestData["latest"]["recovered"] - self.latestData["latest"]["recovered"], + "confirmed": self.latestData["latest"]["confirmed"] - self.previousData["latest"]["confirmed"], + "deaths": self.latestData["latest"]["deaths"] - self.previousData["latest"]["deaths"], + "recovered": self.latestData["latest"]["recovered"] - self.previousData["latest"]["recovered"], } else: changes = { @@ -97,14 +106,15 @@ def getLatest(self) -> List[Dict[str, int]]: """ :return: The latest amount of total confirmed cases, deaths, and recoveries. """ - data = self._request("/v2/latest") + data = self._request("/v2/latest") return data["latest"] -############################################################################################### + + ############################################################################################### class Locatio_based_updates: - def __init__(self, timelines=False, request, data): + def __init__(self, timelines=False, request): self.request = request self.timelines = timelines From 2528f94829e5288fd871f5fbb20a34f768651f05 Mon Sep 17 00:00:00 2001 From: Laiba Zahid Date: Wed, 17 Mar 2021 00:49:16 -0400 Subject: [PATCH 08/14] Encapsulation of cases updates --- COVID19Py/covid19.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COVID19Py/covid19.py b/COVID19Py/covid19.py index 3456106..222ad5a 100644 --- a/COVID19Py/covid19.py +++ b/COVID19Py/covid19.py @@ -63,7 +63,7 @@ def _request(self, endpoint, params=None): return response.json() ########################################################################## -class updates: +class updates def __init__(self, latestData, previousData, timelines, request): self.latestData = latestData From df283096e6cf90f61fb50393110d8d530f432b16 Mon Sep 17 00:00:00 2001 From: Laiba Zahid Date: Wed, 17 Mar 2021 00:52:59 -0400 Subject: [PATCH 09/14] aggregation of updated cases --- COVID19Py/covid19.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/COVID19Py/covid19.py b/COVID19Py/covid19.py index 222ad5a..6320989 100644 --- a/COVID19Py/covid19.py +++ b/COVID19Py/covid19.py @@ -63,8 +63,8 @@ def _request(self, endpoint, params=None): return response.json() ########################################################################## -class updates - +class updates: + def __init__(self, latestData, previousData, timelines, request): self.latestData = latestData self.previousData = previousData From 20f93bb479ded63804400ad8eb024c6404051bca Mon Sep 17 00:00:00 2001 From: Laiba Zahid Date: Wed, 17 Mar 2021 00:58:36 -0400 Subject: [PATCH 10/14] aggregation of updated cases --- COVID19Py/covid19.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/COVID19Py/covid19.py b/COVID19Py/covid19.py index 6320989..cee4f5e 100644 --- a/COVID19Py/covid19.py +++ b/COVID19Py/covid19.py @@ -63,8 +63,8 @@ def _request(self, endpoint, params=None): return response.json() ########################################################################## -class updates: - +class updates: + def __init__(self, latestData, previousData, timelines, request): self.latestData = latestData self.previousData = previousData From 291a1aa27eff66a72f608304ddfd78349a84e9b8 Mon Sep 17 00:00:00 2001 From: Laiba Zahid Date: Wed, 17 Mar 2021 01:11:00 -0400 Subject: [PATCH 11/14] aggregation of updated cases --- COVID19Py/covid19.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COVID19Py/covid19.py b/COVID19Py/covid19.py index cee4f5e..97b17cb 100644 --- a/COVID19Py/covid19.py +++ b/COVID19Py/covid19.py @@ -63,7 +63,7 @@ def _request(self, endpoint, params=None): return response.json() ########################################################################## -class updates: +class updates: def __init__(self, latestData, previousData, timelines, request): self.latestData = latestData From cf9e4be09441fdeb9288cab6672057aa7635a56d Mon Sep 17 00:00:00 2001 From: Laiba Zahid Date: Wed, 17 Mar 2021 01:18:30 -0400 Subject: [PATCH 12/14] Aggregation of update on cases --- COVID19Py/covid19.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COVID19Py/covid19.py b/COVID19Py/covid19.py index 97b17cb..3bb9786 100644 --- a/COVID19Py/covid19.py +++ b/COVID19Py/covid19.py @@ -63,7 +63,7 @@ def _request(self, endpoint, params=None): return response.json() ########################################################################## -class updates: +class updates: def __init__(self, latestData, previousData, timelines, request): self.latestData = latestData From f658cad4956538a250e4082fd1500c13106837b5 Mon Sep 17 00:00:00 2001 From: Laiba Zahid Date: Wed, 17 Mar 2021 01:22:24 -0400 Subject: [PATCH 13/14] Aggregation of update on cases --- COVID19Py/covid19.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COVID19Py/covid19.py b/COVID19Py/covid19.py index 3bb9786..af9838c 100644 --- a/COVID19Py/covid19.py +++ b/COVID19Py/covid19.py @@ -63,7 +63,7 @@ def _request(self, endpoint, params=None): return response.json() ########################################################################## -class updates: +class updates: def __init__(self, latestData, previousData, timelines, request): self.latestData = latestData From be6bf96b53ad77290968ccc25ee3e512c296d63b Mon Sep 17 00:00:00 2001 From: Laiba Zahid Date: Wed, 17 Mar 2021 01:23:24 -0400 Subject: [PATCH 14/14] Aggregation of update on cases --- COVID19Py/covid19.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COVID19Py/covid19.py b/COVID19Py/covid19.py index af9838c..54a8e55 100644 --- a/COVID19Py/covid19.py +++ b/COVID19Py/covid19.py @@ -63,7 +63,7 @@ def _request(self, endpoint, params=None): return response.json() ########################################################################## -class updates: +class updates: def __init__(self, latestData, previousData, timelines, request): self.latestData = latestData