From c8b1bf19a8aa5f89a13702166a4c2079ef383f28 Mon Sep 17 00:00:00 2001 From: "mori.k" Date: Thu, 5 Jun 2025 10:52:58 +0900 Subject: [PATCH] =?UTF-8?q?=E5=86=8D=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E7=B5=90=E6=9E=9C=E3=81=AE=E5=8F=8D=E6=98=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/batch/update_business_day.py | 13 +++---- s3/config/jsk_expected_data_list.json | 37 ------------------- .../calendar}/jsk_archive_run_day.txt | 0 .../jsk_expected_data_list.json | 37 +++++++++++++++++++ 4 files changed, 42 insertions(+), 45 deletions(-) delete mode 100644 s3/config/jsk_expected_data_list.json rename s3/config/{ => jskult/calendar}/jsk_archive_run_day.txt (100%) create mode 100644 s3/config/jskult/expected_data_list/jsk_expected_data_list.json diff --git a/ecs/jskult-batch/src/batch/update_business_day.py b/ecs/jskult-batch/src/batch/update_business_day.py index 20b99f5d..fc4d9855 100644 --- a/ecs/jskult-batch/src/batch/update_business_day.py +++ b/ecs/jskult-batch/src/batch/update_business_day.py @@ -80,7 +80,6 @@ class UpdateBusinessDay(JskultBatchEntrypoint): jskult_batch_run_manager.batch_failed() jskult_batch_status_manager.set_process_status( constants.PROCESS_STATUS_ERROR) - logger.error(f'E-1 異常終了：実消化＆アルトマーク_日付テーブル更新。{e}') return try: # 日付テーブルの処理年月日を取得する @@ -117,7 +116,6 @@ class UpdateBusinessDay(JskultBatchEntrypoint): jskult_batch_run_manager.batch_failed() jskult_batch_status_manager.set_process_status( constants.PROCESS_STATUS_ERROR) - logger.error(f'E-1 異常終了：実消化＆アルトマーク_日付テーブル更新。{e}') return with open(transfer_list_file_path) as f: @@ -135,7 +133,6 @@ class UpdateBusinessDay(JskultBatchEntrypoint): jskult_batch_run_manager.batch_failed() jskult_batch_status_manager.set_process_status( constants.PROCESS_STATUS_ERROR) - logger.error(f'E-1 異常終了：実消化＆アルトマーク_日付テーブル更新。{e}') return @@ -145,10 +142,8 @@ class UpdateBusinessDay(JskultBatchEntrypoint): jsk_transfer_expected_data_list = jsk_expected_data_list['jsk_transfer_list'] if len(jsk_transfer_data_list) != 0: - # 不足ファイルがあった場合ログ出力 self._check_missing_received_files( jsk_transfer_expected_data_list, jsk_transfer_data_list) - # 受領予定にないファイルがあった場合ログ出力 self._check_extra_received_files( jsk_transfer_expected_data_list, jsk_transfer_data_list) @@ -168,7 +163,7 @@ class UpdateBusinessDay(JskultBatchEntrypoint): constants.PROCESS_STATUS_ERROR) logger.error(f'E-1 異常終了：実消化＆アルトマーク_日付テーブル更新。{e}') - def _is_archive_run_day(self, syor_date: str): + def _is_archive_run_day(self, syor_date: str) -> bool: """アーカイブ取得日カレンダーを取得し、処理日がアーカイブ起動日かを確認 Returns: @@ -184,7 +179,8 @@ class UpdateBusinessDay(JskultBatchEntrypoint): return target_days.compare_date(syor_date) def _check_missing_received_files(self, jsk_transfer_expected_data_list: list, jsk_transfer_data_list: list): - # jsk_transfer_data_listと比較し、結果不足ファイルがあった場合ログ出力 + """jsk_transfer_data_listと比較し、結果不足ファイルがあった場合ログ出力 + """ missing_files = [ jsk_transfer_expected_data for jsk_transfer_expected_data in jsk_transfer_expected_data_list @@ -199,7 +195,8 @@ class UpdateBusinessDay(JskultBatchEntrypoint): f'I-5 [NOTICE]日次連携受領ファイルに不足がありました。ファイル名：{missing_files}') def _check_extra_received_files(self, jsk_transfer_expected_data_list: list, jsk_transfer_data_list: list): - # jsk_transfer_data_listと比較し、受領予定にないファイルがあった場合ログ出力 + """jsk_transfer_data_listと比較し、受領予定にないファイルがあった場合ログ出力 + """ unexpected_data = [ jsk_transfer_data for jsk_transfer_data in jsk_transfer_data_list diff --git a/s3/config/jsk_expected_data_list.json b/s3/config/jsk_expected_data_list.json deleted file mode 100644 index 0b8183c0..00000000 --- a/s3/config/jsk_expected_data_list.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "jsk_transfer_list":[ - "TRN_RESULT_DATA", - "TRN_RESULT_DATA_BIO", - "TRN_Recive_Inventry", - "INST_IM_PLN", - "MR_YR_PLN_INST_KY", - "MST_WHLSLR", - "MST_SALES_PLACE", - "WHLSLR_LVL4", - "WHLSLR_LVL3", - "WHLSLR_LVL2", - "WHLSLR_LVL1", - "MST_COMPANY", - "MST_COMPANY_GRP", - "MST_DEAL_DIV", - "MST_PROD_PKG", - "PROD_PRICE", - "IM_PLN_PROD", - "MST_ASSN_PROD_GRP", - "PROD_ASSN_TEAM", - "MST_ATC_PHARM_PROD_GRP", - "CUSTOMER_LOTNO_ALL", - "MST_INST", - "ATC_PHARM", - "MST_WAREHOUSE", - "EMP", - "ORG_LVL4", - "ORG_LVL3", - "ORG_LVL2", - "ORG_LVL1", - "MST_JIS_PREF", - "MST_JIS_CITY", - "MST_INST_ASSN", - "MST_GENERAL" - ] -} \ No newline at end of file diff --git a/s3/config/jsk_archive_run_day.txt b/s3/config/jskult/calendar/jsk_archive_run_day.txt similarity index 100% rename from s3/config/jsk_archive_run_day.txt rename to s3/config/jskult/calendar/jsk_archive_run_day.txt diff --git a/s3/config/jskult/expected_data_list/jsk_expected_data_list.json b/s3/config/jskult/expected_data_list/jsk_expected_data_list.json new file mode 100644 index 00000000..ff6a05ed --- /dev/null +++ b/s3/config/jskult/expected_data_list/jsk_expected_data_list.json @@ -0,0 +1,37 @@ +{ + "jsk_transfer_list": [ + "TRN_RESULT_DATA", + "TRN_RESULT_DATA_BIO", + "TRN_Recive_Inventry", + "INST_IM_PLN", + "MR_YR_PLN_INST_KY", + "MST_WHLSLR", + "MST_SALES_PLACE", + "WHLSLR_LVL4", + "WHLSLR_LVL3", + "WHLSLR_LVL2", + "WHLSLR_LVL1", + "MST_COMPANY", + "MST_COMPANY_GRP", + "MST_DEAL_DIV", + "MST_PROD_PKG", + "PROD_PRICE", + "IM_PLN_PROD", + "MST_ASSN_PROD_GRP", + "PROD_ASSN_TEAM", + "MST_ATC_PHARM_PROD_GRP", + "CUSTOMER_LOTNO_ALL", + "MST_INST", + "ATC_PHARM", + "MST_WAREHOUSE", + "EMP", + "ORG_LVL4", + "ORG_LVL3", + "ORG_LVL2", + "ORG_LVL1", + "MST_JIS_PREF", + "MST_JIS_CITY", + "MST_INST_ASSN", + "MST_GENERAL" + ] +}