used 7-day rolling average

This commit is contained in:
Luis Aleixo 2022-10-13 10:35:35 +02:00
parent 1a93439984
commit 5915a0d520

View file

@ -318,7 +318,7 @@ class CasesData(BaseRequestHandler):
country_name = json.loads(response.body)['name']['common']
# Get global incident rates
URL = 'https://covid19.who.int/WHO-COVID-19-global-table-data.csv'
URL = 'https://covid19.who.int/WHO-COVID-19-global-data.csv'
try:
response = await http_client.fetch(HTTPRequest(
url=URL,
@ -329,8 +329,12 @@ class CasesData(BaseRequestHandler):
print("Something went wrong: %s" % e)
df = pd.read_csv(StringIO(response.body.decode('utf-8')), index_col=False)
cases_past_7_days = df.loc[df['Name'] == country_name]['Cases - newly reported in last 7 days']
return self.finish(str(cases_past_7_days.values[0]))
cases = df.loc[df['Country'] == country_name]
# 7-day rolling average
current_date = str(datetime.datetime.now()).split(' ')[0]
eight_days_ago = str(datetime.datetime.now() - datetime.timedelta(days=7)).split(' ')[0]
cases = cases.set_index(['Date_reported'])
return self.finish(str(round(cases.loc[eight_days_ago:current_date]['New_cases'].mean())))
def make_app(