From 58fbeea97fc572a01021ed1fc1448a4c4ce9fed2 Mon Sep 17 00:00:00 2001 From: CaptainOfHacks <39195263+CaptainOfHacks@users.noreply.github.com> Date: Mon, 10 Oct 2022 14:11:39 +0300 Subject: [PATCH 1/3] WIP --- dags/notice_validation_workflow.py | 1 + dags/pipelines/notice_selectors_pipelines.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dags/notice_validation_workflow.py b/dags/notice_validation_workflow.py index 0554cce84..c7ed749af 100644 --- a/dags/notice_validation_workflow.py +++ b/dags/notice_validation_workflow.py @@ -43,6 +43,7 @@ def notice_daily_validation_workflow(): ) def validate_fetched_notices(): publication_date = get_notice_publication_date() + print(publication_date) mongodb_client = MongoClient(config.MONGO_DB_AUTH_URL) validate_and_update_daily_supra_notice(notice_publication_day=publication_date, mongodb_client=mongodb_client diff --git a/dags/pipelines/notice_selectors_pipelines.py b/dags/pipelines/notice_selectors_pipelines.py index 5e2df5ecb..d519da955 100644 --- a/dags/pipelines/notice_selectors_pipelines.py +++ b/dags/pipelines/notice_selectors_pipelines.py @@ -20,8 +20,8 @@ def build_selector_mongodb_filter(notice_status: str, form_number: str = None, if form_number: mongodb_filter[FORM_NUMBER] = form_number if start_date and end_date: - start_date = datetime.strptime(start_date, "%y-%m-%d") - end_date = datetime.strptime(end_date, "%y-%m-%d") + start_date = datetime.strptime(start_date, "%Y-%m-%d") + end_date = datetime.strptime(end_date, "%Y-%m-%d") mongodb_filter[PUBLICATION_DATE] = {'$gte': start_date, '$lte': end_date} if xsd_version: mongodb_filter[XSD_VERSION] = xsd_version From 877b3890ba9d129fcb0c981a341956124a01cccb Mon Sep 17 00:00:00 2001 From: CaptainOfHacks <39195263+CaptainOfHacks@users.noreply.github.com> Date: Mon, 10 Oct 2022 14:22:15 +0300 Subject: [PATCH 2/3] fix validate_and_update_daily_supra_notice request_api was None as default --- .../supra_notice_manager/services/supra_notice_validator.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ted_sws/supra_notice_manager/services/supra_notice_validator.py b/ted_sws/supra_notice_manager/services/supra_notice_validator.py index 043e327d7..13cb3c93b 100644 --- a/ted_sws/supra_notice_manager/services/supra_notice_validator.py +++ b/ted_sws/supra_notice_manager/services/supra_notice_validator.py @@ -5,7 +5,7 @@ from ted_sws.core.model.supra_notice import SupraNoticeValidationReport, DailySupraNotice from ted_sws.data_manager.adapters.supra_notice_repository import DailySupraNoticeRepository -from ted_sws.notice_fetcher.adapters.ted_api import TedAPIAdapter, RequestAPI +from ted_sws.notice_fetcher.adapters.ted_api import TedAPIAdapter, RequestAPI, TedRequestAPI from ted_sws.data_manager.adapters.notice_repository import NoticeRepository from ted_sws.core.model.notice import Notice from ted_sws.notice_validator.services.validation_summary_runner import generate_validation_summary_report_notices @@ -16,6 +16,9 @@ def validate_and_update_daily_supra_notice(notice_publication_day: day_type, mongodb_client: MongoClient, request_api: RequestAPI = None): + if request_api is None: + request_api = TedRequestAPI() + if isinstance(notice_publication_day, date): notice_publication_day = datetime.combine(notice_publication_day, time()) From b099f17018df6b49243cb556ee5d15f981135a51 Mon Sep 17 00:00:00 2001 From: CaptainOfHacks <39195263+CaptainOfHacks@users.noreply.github.com> Date: Mon, 10 Oct 2022 14:23:11 +0300 Subject: [PATCH 3/3] Update notice_validation_workflow.py --- dags/notice_validation_workflow.py | 1 - 1 file changed, 1 deletion(-) diff --git a/dags/notice_validation_workflow.py b/dags/notice_validation_workflow.py index c7ed749af..0554cce84 100644 --- a/dags/notice_validation_workflow.py +++ b/dags/notice_validation_workflow.py @@ -43,7 +43,6 @@ def notice_daily_validation_workflow(): ) def validate_fetched_notices(): publication_date = get_notice_publication_date() - print(publication_date) mongodb_client = MongoClient(config.MONGO_DB_AUTH_URL) validate_and_update_daily_supra_notice(notice_publication_day=publication_date, mongodb_client=mongodb_client