diff --git a/src/covid19/blueprints/admin/admin_views.py b/src/covid19/blueprints/admin/admin_views.py index 69c210c75838776ba6a3464b3b0dd5def80f445c..ed666941be942399fff49956741cce201f609505 100644 --- a/src/covid19/blueprints/admin/admin_views.py +++ b/src/covid19/blueprints/admin/admin_views.py @@ -267,7 +267,8 @@ def url_task_admin_database_drop(): flash("url_task_admin_database_drop [start]") app.logger.info("admin_service.run_admin_database_drop_and_create [start]") admin_service.run_admin_database_drop_and_create() - app.logger.info("admin_service.run_admin_database_drop_and_create [done]") + flash("admin_service.run_admin_database_drop_and_create() [done]") + app.logger.info("admin_service.run_admin_database_drop_and_create() [done]") if drop_and_create_data_again: who_service.pretask_database_drop_create() # divi_service.pretask_database_drop_create() @@ -276,8 +277,9 @@ def url_task_admin_database_drop(): rki_vaccination_service.pretask_database_drop_create() # rki_service_bundeslaender.pretask_database_drop_create() # rki_service_landkreise.pretask_database_drop_create() - flash("task_admin_database_drop_create async started") task_admin_database_drop_create.apply_async() + flash(message="async task_admin_database_drop_create [start]", category="warning") + app.logger.warn("async task_admin_database_drop_create [start]") app.logger.info("url_task_admin_database_drop [done]") return redirect(url_for('app_admin.url_admin_tasks')) @@ -300,8 +302,8 @@ def url_task_admin_download_all_files(): def url_task_admin_import_all_files(): app.logger.info("url_task_admin_import_all_files [start]") task_admin_import_all_files.apply_async() - flash("task_admin_import_all_files async started") - app.logger.info("task_admin_import_all_files async started") + flash(message="async url_task_admin_import_all_files [start]", category="warning") + app.logger.warn("async url_task_admin_import_all_files [start]") app.logger.info("url_task_admin_import_all_files [done]") return redirect(url_for('app_admin.url_admin_tasks')) @@ -310,8 +312,8 @@ def url_task_admin_import_all_files(): def url_task_admin_update_dimension_tables(): app.logger.info("url_task_admin_update_dimension_tables [start]") task_admin_update_dimension_tables_only.apply_async() - flash("task_admin_import_all_files async started") - app.logger.info("task_admin_update_all_blueprints async started") + flash(message="async task_admin_update_dimension_tables_only [start]", category="warning") + app.logger.warn("async task_admin_update_dimension_tables_only [start]") app.logger.info("url_task_admin_update_dimension_tables [done]") return redirect(url_for('app_admin.url_admin_tasks')) @@ -320,8 +322,8 @@ def url_task_admin_update_dimension_tables(): def url_task_admin_update_full_dimension_tables(): app.logger.info("url_task_admin_update_full_dimension_tables [start]") task_admin_update_dimension_tables_only.apply_async() - flash("task_admin_import_all_files async started") - app.logger.info("task_admin_update_all_blueprints async started") + flash(message="async task_admin_update_dimension_tables_only [start]", category="warning") + app.logger.warn("async task_admin_update_dimension_tables_only [start]") app.logger.info("url_task_admin_update_full_dimension_tables [done]") return redirect(url_for('app_admin.url_admin_tasks')) @@ -330,8 +332,8 @@ def url_task_admin_update_full_dimension_tables(): def url_task_admin_update_full_fact_tables(): app.logger.info("url_task_admin_update_full_fact_tables [start]") task_admin_update_fact_table_initial_only.apply_async() - flash("task_admin_update_fact_table_initial_only async started") - app.logger.info("task_admin_update_fact_table_initial_only async started") + flash(message="async task_admin_update_fact_table_initial_only [start]", category="warning") + app.logger.warn("async task_admin_update_fact_table_initial_only [start]") app.logger.info("url_task_admin_update_full_fact_tables [done]") return redirect(url_for('app_admin.url_admin_tasks')) @@ -340,8 +342,8 @@ def url_task_admin_update_full_fact_tables(): def url_task_admin_update_fact_tables(): app.logger.info("url_admin_update_fact_table_incremental_only [start]") task_admin_update_fact_table_incremental_only.apply_async() - flash("task_admin_update_fact_table_incremental_only async started") - app.logger.info("task_admin_update_fact_table_incremental_only async started") + flash(message="async task_admin_update_fact_table_incremental_only [start]", category="warning") + app.logger.warn("async task_admin_update_fact_table_incremental_only [start]") app.logger.info("url_admin_update_fact_table_incremental_only [done]") return redirect(url_for('app_admin.url_admin_tasks')) @@ -350,8 +352,8 @@ def url_task_admin_update_fact_tables(): def url_task_admin_full_update_star_schema(): app.logger.info("url_task_admin_full_update_star_schema [start]") task_admin_update_star_schema_initial.apply_async() - flash("task_admin_update_fact_table_incremental_only async started") - app.logger.info("task_admin_update_fact_table_incremental_only async started") + flash(message="async task_admin_update_star_schema_initial [start]", category="warning") + app.logger.warn("async task_admin_update_star_schema_initial [start]") app.logger.info("url_task_admin_full_update_star_schema [done]") return redirect(url_for('app_admin.url_admin_tasks')) @@ -360,8 +362,8 @@ def url_task_admin_full_update_star_schema(): def url_task_admin_update_star_schema(): app.logger.info("url_task_admin_update_star_schema [start]") task_admin_update_star_schema_incremental.apply_async() - flash("task_admin_update_fact_table_incremental_only async started") - app.logger.info("task_admin_update_fact_table_incremental_only async started") + flash(message="async task_admin_update_star_schema_incremental [start]", category="warning") + app.logger.warn("async task_admin_update_star_schema_incremental [start]") app.logger.info("url_task_admin_update_star_schema [done]") return redirect(url_for('app_admin.url_admin_tasks')) diff --git a/src/covid19/blueprints/who/who_model.py b/src/covid19/blueprints/who/who_model.py index 475cf83158c684ee065a78a126d704e300ade507..cf768574c020d4d2cfbfab02ea7f9e9f37e4479f 100644 --- a/src/covid19/blueprints/who/who_model.py +++ b/src/covid19/blueprints/who/who_model.py @@ -367,4 +367,4 @@ class WhoData(db.Model): @classmethod def get_joungest_datum(cls): - return cls.get_datum_of_all_who_data().pop() + return cls.get_datum_of_all_data().pop() diff --git a/src/covid19/blueprints/who/who_service.py b/src/covid19/blueprints/who/who_service.py index a346442458bd4f504038835c48500fd74c1eeeed..479a226ece6cb2484b6c1fc6783e6ec71a41f962 100644 --- a/src/covid19/blueprints/who/who_service.py +++ b/src/covid19/blueprints/who/who_service.py @@ -22,19 +22,19 @@ class WhoService: app.logger.info(" WHO Service [ready]") def database_drop_create_pretask(self): - flash("WhoService.database_drop_create_pretask started") - app.logger.info("WhoService.pretask_database_drop_create started") + flash("WhoService.database_drop_create_pretask [start]") + app.logger.info("WhoService.pretask_database_drop_create [start]") self.service_download.download_file() - app.logger.info("WhoService.pretask_database_drop_create done") - flash("WhoService.database_drop_create_pretask done") + app.logger.info("WhoService.pretask_database_drop_create [done]") + flash("WhoService.database_drop_create_pretask [done]") return self def database_drop_create_posttask(self): - app.logger.info("WhoService.database_drop_create_posttask started") + app.logger.info("WhoService.database_drop_create_posttask [start]") self.service_import.import_file() self.service_update_full.full_update_dimension_tables() self.service_update_full.full_update_fact_table() - app.logger.info("WhoService.database_drop_create_posttask done") + app.logger.info("WhoService.database_drop_create_posttask [done]") return self def download_all_files(self): @@ -70,11 +70,11 @@ class WhoService: return self def pretask_database_drop_create(self): - flash("self.service_download.download_file() start") - app.logger.info("self.service_download.download_file() start") + flash("self.service_download.download_file() [start]") + app.logger.info("self.service_download.download_file() [start]") self.service_download.download_file() - app.logger.info("self.service_download.download_file() done") - flash("self.service_download.download_file() done") + app.logger.info("self.service_download.download_file() [done]") + flash("self.service_download.download_file() [done]") return self diff --git a/src/covid19/blueprints/who/who_service_update.py b/src/covid19/blueprints/who/who_service_update.py index 2af11ac60bef55225d9850ee50600ff6682a7f94..45c5c2a84bd0fd72e4af4d60cca9348cba7c6ee8 100644 --- a/src/covid19/blueprints/who/who_service_update.py +++ b/src/covid19/blueprints/who/who_service_update.py @@ -160,7 +160,7 @@ class WhoServiceUpdate(WhoServiceUpdateBase): def __who_import_get_new_dates_as_array(self): new_dates_reported_from_import = [] - list_datum_of_all_who_data = WhoData.get_datum_of_all_who_data() + list_datum_of_all_who_data = WhoData.get_datum_of_all_data() for item in WhoImport.get_datum_of_all_who_import(): if not item in list_datum_of_all_who_data: new_dates_reported_from_import.append(item)