WIP

Author: CaptainOfHacks

dags/fetch_notices_by_date.py

@@ -64,8 +64,7 @@ def validate_fetched_notices():
                                                            default_value=(datetime.now() - timedelta(days=1)).strftime(
                                                                "%Y%m%d*")), "%Y%m%d*")
         mongodb_client = MongoClient(config.MONGO_DB_AUTH_URL)
-        validate_and_update_daily_supra_notice(notice_publication_day=publication_date,
-                                               mongodb_client=mongodb_client)
+        validate_and_update_daily_supra_notice(ted_publication_date=publication_date, mongodb_client=mongodb_client)
 
     def _branch_selector():
         trigger_complete_workflow = get_dag_param(key=TRIGGER_COMPLETE_WORKFLOW_DAG_KEY,

ted_sws/supra_notice_manager/services/daily_supra_notice_manager.py

@@ -7,15 +7,15 @@
 
 
 def create_and_store_in_mongo_db_daily_supra_notice(notice_ids: List[str], mongodb_client: MongoClient,
-                                                    notice_fetched_date: date = date.today()):
+                                                    ted_publication_date: date = date.today()):
     """
         This function creates and stores a DailySupraNotice in MongoDB.
     :param notice_ids:
     :param mongodb_client:
-    :param notice_fetched_date:
+    :param ted_publication_date:
     :return:
     """
     daily_supra_notice_repository = DailySupraNoticeRepository(mongodb_client=mongodb_client)
-    daily_supra_notice = DailySupraNotice(notice_fetched_date=notice_fetched_date,
+    daily_supra_notice = DailySupraNotice(ted_publication_date=ted_publication_date,
                                           notice_ids=notice_ids)
     daily_supra_notice_repository.add(daily_supra_notice=daily_supra_notice)

ted_sws/supra_notice_manager/services/supra_notice_validator.py

@@ -17,16 +17,16 @@
 SUPRA_NOTICE_NOT_FOUND_ERROR = "SupraNotice not found in Database!"
 
 
-def validate_and_update_daily_supra_notice(notice_publication_day: day_type, mongodb_client: MongoClient,
+def validate_and_update_daily_supra_notice(ted_publication_date: 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())
+    if isinstance(ted_publication_date, date):
+        ted_publication_date = datetime.combine(ted_publication_date, time())
 
     repo = DailySupraNoticeRepository(mongodb_client=mongodb_client)
-    supra_notice: DailySupraNotice = repo.get(reference=notice_publication_day)
+    supra_notice: DailySupraNotice = repo.get(reference=ted_publication_date)
 
     if not supra_notice:
         raise ValueError(SUPRA_NOTICE_NOT_FOUND_ERROR)
@@ -35,7 +35,7 @@ def validate_and_update_daily_supra_notice(notice_publication_day: day_type, mon
     fetched_notice_ids = set(fetched_notice_ids_list)
 
     ted_api_adapter: TedAPIAdapter = TedAPIAdapter(request_api=request_api)
-    query = {"q": f"PD=[{notice_publication_day.strftime('%Y%m%d*')}]"}
+    query = {"q": f"PD=[{ted_publication_date.strftime('%Y%m%d*')}]"}
     documents = ted_api_adapter.get_by_query(query=query, result_fields={"fields": ["ND"]})
     api_notice_ids_list = [document["ND"] for document in documents] if documents and len(documents) else []
     api_notice_ids = set(api_notice_ids_list)
@@ -44,18 +44,18 @@ def validate_and_update_daily_supra_notice(notice_publication_day: day_type, mon
     missing_notice_ids = api_notice_ids - fetched_notice_ids
     if len(missing_notice_ids):
         validation_report.missing_notice_ids = list(missing_notice_ids)
-        log_technical_error(message=f"Supra notice for date [{notice_publication_day}] don't fetch notices with ids=[{missing_notice_ids}]")
+        log_technical_error(message=f"Supra notice for date [{ted_publication_date}] don't fetch notices with ids=[{missing_notice_ids}]")
 
     supra_notice.validation_report = validation_report
     repo.update(daily_supra_notice=supra_notice)
 
 
-def summary_validation_for_daily_supra_notice(notice_publication_day: day_type, mongodb_client: MongoClient):
-    if isinstance(notice_publication_day, date):
-        notice_publication_day = datetime.combine(notice_publication_day, time())
+def summary_validation_for_daily_supra_notice(ted_publication_date: day_type, mongodb_client: MongoClient):
+    if isinstance(ted_publication_date, date):
+        ted_publication_date = datetime.combine(ted_publication_date, time())
 
     repo = DailySupraNoticeRepository(mongodb_client=mongodb_client)
-    supra_notice: DailySupraNotice = repo.get(reference=notice_publication_day)
+    supra_notice: DailySupraNotice = repo.get(reference=ted_publication_date)
 
     if not supra_notice:
         raise ValueError(SUPRA_NOTICE_NOT_FOUND_ERROR)

tests/e2e/supra_notice_manager/test_supra_notice_validator.py

@@ -46,7 +46,7 @@ def test_summary_validation_for_daily_supra_notice(fake_mongodb_client, daily_su
     create_and_store_in_mongo_db_daily_supra_notice(notice_ids=notice_ids, mongodb_client=fake_mongodb_client,
                                                     notice_fetched_date=day)
 
-    summary_validation_for_daily_supra_notice(notice_publication_day=day, mongodb_client=fake_mongodb_client)
+    summary_validation_for_daily_supra_notice(ted_publication_date=day, mongodb_client=fake_mongodb_client)
     result = daily_supra_notice_repository.get(reference=day)
     assert isinstance(result.validation_summary, ValidationSummaryReport)
     assert result.notice_ids == notice_ids