diff --git a/src/covid19/blueprints/who_test/templates/who_test/who_tests.html b/src/covid19/blueprints/who_test/templates/who_test/who_tests.html index 96ca99f9cd984c072b85c06cf8e4b6d4fcc0d7bf..f79ff4b1cf1ea3bce6075f1d7108fefaa131b554 100644 --- a/src/covid19/blueprints/who_test/templates/who_test/who_tests.html +++ b/src/covid19/blueprints/who_test/templates/who_test/who_tests.html @@ -41,11 +41,8 @@ <div class="col"> <div class="btn-group-vertical" role="group" aria-label="Views"> <a class="btn btn-primary btn-lg btn-block text-left" - href="{{ url_for( 'who.url_task_who_update_star_schema_initial') }}" - role="button">WHO :: Task :: update :: star_schema :: initial</a> - <a class="btn btn-primary btn-lg btn-block text-left" - href="{{ url_for( 'who.url_task_who_update_star_schema_incremental') }}" - role="button">WHO :: Task :: update :: star_schema :: incremental</a> + href="{{ url_for( 'who_test.url_task_who_test_update_star_schema_incremental') }}" + role="button">url_task_who_test_update_star_schema_incremental</a> </div> </div> </div> diff --git a/src/covid19/blueprints/who_test/who_test_service.py b/src/covid19/blueprints/who_test/who_test_service.py index ab8f987ab1317ececcee9bea766bec621db365fa..d976957d184b68b5735165305b811527f4161f29 100644 --- a/src/covid19/blueprints/who_test/who_test_service.py +++ b/src/covid19/blueprints/who_test/who_test_service.py @@ -15,6 +15,9 @@ class WhoTestService: app.logger.info(" WHO Test Service [ready]") def delete_last_day(self): + app.logger.debug("------------------------------------------------------------") + app.logger.debug(" WhoTestService.delete_last_day() [START]") + app.logger.debug("------------------------------------------------------------") joungest_datum_str = WhoData.get_joungest_datum() joungest_datum = WhoDateReported.find_by_date_reported(joungest_datum_str) app.logger.info("joungest_datum:") @@ -27,3 +30,15 @@ class WhoTestService: app.logger.info(line) app.logger.info("WhoData.delete_data_for_one_day(joungest_datum)") WhoData.delete_data_for_one_day(joungest_datum) + app.logger.debug("------------------------------------------------------------") + app.logger.debug(" WhoTestService.delete_last_day() [DONE]") + app.logger.debug("------------------------------------------------------------") + + def run_update_star_schema_incremental(self): + app.logger.debug("------------------------------------------------------------") + app.logger.debug(" WhoTestService.run_update_star_schema_incremental() [START]") + app.logger.debug("------------------------------------------------------------") + app.logger.debug("") + app.logger.debug("------------------------------------------------------------") + app.logger.debug(" WhoTestService.run_update_star_schema_incremental() [DONE]") + app.logger.debug("------------------------------------------------------------") diff --git a/src/covid19/blueprints/who_test/who_test_views.py b/src/covid19/blueprints/who_test/who_test_views.py index 44b05ae99f888be1370743c17628ba4a3217dd4f..592ae7734f832744e1cc9f148dfb4d82cedc507a 100644 --- a/src/covid19/blueprints/who_test/who_test_views.py +++ b/src/covid19/blueprints/who_test/who_test_views.py @@ -107,3 +107,34 @@ def url_who_test_who_test_service_delete_last_days_data(): app.logger.info("url_who_test_who_test_service_delete_last_days_data - DONE: WhoService.who_import_get_new_dates_as_array()") return redirect(url_for('who_test.url_who_test_tests')) + +# ---------------------------------------------------------------------------------------------------------------- +# Celery TASKS +# ---------------------------------------------------------------------------------------------------------------- + + +@celery.task(bind=True) +def task_who_test_update_star_schema_incremental(self): + logger = get_task_logger(__name__) + self.update_state(state=states.STARTED) + logger.info("------------------------------------------------------------") + logger.info(" Received: task_who_test_update_star_schema_incremental [OK] ") + logger.info("------------------------------------------------------------") + who_test_service.run_update_star_schema_incremental() + self.update_state(state=states.SUCCESS) + result = "OK (task_who_test_update_star_schema_incremental)" + return result + +# ---------------------------------------------------------------------------------------------------------------- +# URL Routes for Celery TASKS +# ---------------------------------------------------------------------------------------------------------------- + +@app_who_test.route('/task/update_star_schema_incremental') +@login_required +def url_task_who_test_update_star_schema_incremental(): + app.logger.info("url_task_who_update_star_schema_incremental - START: task_who_update_star_schema_incremental()") + flash("url_task_who_update_star_schema_incremental - START: task_who_update_star_schema_incremental()") + task_who_test_update_star_schema_incremental.apply_async() + flash("url_task_who_update_star_schema_incremental - DONE: task_who_update_star_schema_incremental()") + app.logger.info("url_task_who_update_star_schema_incremental - DONE: task_who_update_star_schema_incremental()") + return redirect(url_for('who_test.url_who_test_tests'))