From 05026c621303d81308f208823f8615036c90e09b Mon Sep 17 00:00:00 2001 From: "mori.k" Date: Wed, 11 Jun 2025 13:55:16 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=E8=AA=A4=E3=81=A3=E3=81=9F=E5=88=A4?= =?UTF-8?q?=E5=AE=9A=E3=82=92=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F=E9=83=A8?= =?UTF-8?q?=E5=88=86=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=81=A8=E3=82=B9=E3=83=86?= =?UTF-8?q?=E3=83=BC=E3=82=BF=E3=82=B9=E3=82=92doing=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=E3=81=99=E3=82=8B=E9=83=A8=E5=88=86=E3=81=AE=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch/src/batch/update_business_day.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ecs/jskult-batch/src/batch/update_business_day.py b/ecs/jskult-batch/src/batch/update_business_day.py index 963c17f4..0bd720d4 100644 --- a/ecs/jskult-batch/src/batch/update_business_day.py +++ b/ecs/jskult-batch/src/batch/update_business_day.py @@ -64,8 +64,8 @@ class UpdateBusinessDay(JskultBatchEntrypoint): return try: - if not jskult_batch_status_manager.can_run_post_process(): - # 後続処理の起動条件を満たしていない場合 + if not jskult_batch_status_manager.can_run_business_day_update(): + # 日付更新処理の起動条件を満たしていない場合 # 処理ステータスを「処理待」に設定 jskult_batch_status_manager.set_process_status( constants.PROCESS_STATUS_WAITING) @@ -82,6 +82,9 @@ class UpdateBusinessDay(JskultBatchEntrypoint): jskult_batch_status_manager.set_process_status( constants.PROCESS_STATUS_ERROR) return + + jskult_batch_status_manager.set_process_status( + constants.PROCESS_STATUS_DOING) try: # 日付テーブルの処理年月日を取得する _, _, syor_date = jskult_hdke_tbl_manager.get_batch_statuses() @@ -192,7 +195,7 @@ class UpdateBusinessDay(JskultBatchEntrypoint): for jsk_transfer_data in jsk_transfer_data_list ) ] - if missing_files != 0: + if len(missing_files) != 0: logger.info( f'I-5 [NOTICE]日次連携受領ファイルに不足がありました。ファイル名：{missing_files}') From 18643e0a2222f54eb25596e1ea8e26320d9ca482 Mon Sep 17 00:00:00 2001 From: "mori.k" Date: Wed, 11 Jun 2025 14:02:31 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=E7=92=B0=E5=A2=83=E5=A4=89=E6=95=B0?= =?UTF-8?q?=E3=81=8C=E4=B8=8D=E8=B6=B3=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F?= =?UTF-8?q?=E9=83=A8=E5=88=86=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jskult/task_settings/update_business_day_task_settings.env | 2 ++ 1 file changed, 2 insertions(+) diff --git a/s3/config/jskult/task_settings/update_business_day_task_settings.env b/s3/config/jskult/task_settings/update_business_day_task_settings.env index b5217d60..f8728fff 100644 --- a/s3/config/jskult/task_settings/update_business_day_task_settings.env +++ b/s3/config/jskult/task_settings/update_business_day_task_settings.env @@ -1,6 +1,8 @@ # task environment file. LOG_LEVEL=INFO PROCESS_NAME=jskult-batch-update-business-day +TRANSFER_RESULT_FOLDER=transfer_result +TRANSFER_RESULT_FILE_NAME=transfer_result.json JSKULT_CONFIG_CALENDAR_FOLDER=jskult/calendar JSKULT_CONFIG_CALENDAR_RUN_ARCHIVE_DAY_FILE_NAME=jsk_archive_run_day.txt JSKULT_CONFIG_EXPECTED_DATA_LIST_FOLDER=jskult/expected_data_list From 77b389bbe21c3198c6c6126df2bf870897e0a373 Mon Sep 17 00:00:00 2001 From: "mori.k" Date: Thu, 12 Jun 2025 13:37:35 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=E8=AA=A4=E5=88=A4=E5=AE=9A=E9=98=B2?= =?UTF-8?q?=E6=AD=A2=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch/src/batch/update_business_day.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ecs/jskult-batch/src/batch/update_business_day.py b/ecs/jskult-batch/src/batch/update_business_day.py index 0bd720d4..8bcb0c9a 100644 --- a/ecs/jskult-batch/src/batch/update_business_day.py +++ b/ecs/jskult-batch/src/batch/update_business_day.py @@ -1,4 +1,5 @@ import json +import re from datetime import datetime import boto3 @@ -187,11 +188,10 @@ class UpdateBusinessDay(JskultBatchEntrypoint): """jsk_transfer_data_listと比較し、結果不足ファイルがあった場合ログ出力 """ missing_files = [ - jsk_transfer_expected_data - for jsk_transfer_expected_data in jsk_transfer_expected_data_list + expected + for expected in jsk_transfer_expected_data_list if not any( - jsk_transfer_data.startswith( - jsk_transfer_expected_data) + re.match(f"{re.escape(expected)}_\\d{{14}}", jsk_transfer_data) for jsk_transfer_data in jsk_transfer_data_list ) ] @@ -206,9 +206,9 @@ class UpdateBusinessDay(JskultBatchEntrypoint): jsk_transfer_data for jsk_transfer_data in jsk_transfer_data_list if not any( - jsk_transfer_data.startswith( - jsk_transfer_expected_data) - for jsk_transfer_expected_data in jsk_transfer_expected_data_list + re.match(f"{re.escape(expected)}_\\d{{14}}", + jsk_transfer_data) + for expected in jsk_transfer_expected_data_list ) ] if len(unexpected_data) != 0: From b7f20012f21d91939b413217e04887edfd11a24d Mon Sep 17 00:00:00 2001 From: "mori.k" Date: Thu, 12 Jun 2025 14:25:24 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=E7=92=B0=E5=A2=83=E5=A4=89=E6=95=B0JSK=5FB?= =?UTF-8?q?ACKUP=5FFOLDER=E3=81=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch/src/system_var/environment.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ecs/jskult-batch/src/system_var/environment.py b/ecs/jskult-batch/src/system_var/environment.py index fbb334f3..4dacb4e5 100644 --- a/ecs/jskult-batch/src/system_var/environment.py +++ b/ecs/jskult-batch/src/system_var/environment.py @@ -34,6 +34,7 @@ JSKULT_CONFIG_EXPECTED_DATA_LIST_FILE_NAME = os.environ.get( ) JSK_IO_BUCKET = os.environ.get('JSK_IO_BUCKET', None) JSK_DATA_SEND_FOLDER = os.environ.get('JSK_DATA_SEND_FOLDER', None) +JSK_BACKUP_FOLDER = os.environ.get('JSK_BACKUP_FOLDER', None) # 初期値がある環境変数 From 92f250abdc381a8261292df0f059c8f284b36ab9 Mon Sep 17 00:00:00 2001 From: "mori.k" Date: Thu, 12 Jun 2025 14:41:10 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=E8=B5=B7=E5=8B=95=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E3=82=92=E6=BA=80=E3=81=9F=E3=81=97=E3=81=A6=E3=81=84=E3=81=AA?= =?UTF-8?q?=E3=81=84=E5=A0=B4=E5=90=88=E3=81=AE=E3=83=AD=E3=82=B0=E3=82=92?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch/src/batch/update_business_day.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ecs/jskult-batch/src/batch/update_business_day.py b/ecs/jskult-batch/src/batch/update_business_day.py index 8bcb0c9a..a1d1630b 100644 --- a/ecs/jskult-batch/src/batch/update_business_day.py +++ b/ecs/jskult-batch/src/batch/update_business_day.py @@ -73,6 +73,7 @@ class UpdateBusinessDay(JskultBatchEntrypoint): # バッチ実行管理テーブルに「retry」で登録 jskult_batch_run_manager.batch_retry() + logger.info('起動条件を満たしていないため、日付テーブル更新処理を終了します。') return From 9bd19142ea1157e3658ac0d397d2b910c58ead42 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Thu, 12 Jun 2025 14:52:24 +0900 Subject: [PATCH 6/6] =?UTF-8?q?format:=20=E3=83=95=E3=82=A9=E3=83=BC?= =?UTF-8?q?=E3=83=9E=E3=83=83=E3=83=88=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch/src/aws/s3.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ecs/jskult-batch/src/aws/s3.py b/ecs/jskult-batch/src/aws/s3.py index c5868f68..c44e61b0 100644 --- a/ecs/jskult-batch/src/aws/s3.py +++ b/ecs/jskult-batch/src/aws/s3.py @@ -2,6 +2,7 @@ import os.path as path import tempfile import boto3 + from src.system_var import environment @@ -63,10 +64,10 @@ class ConfigBucket(S3Bucket): jsk_archive_run_day_list_key = f'{environment.JSKULT_CONFIG_CALENDAR_FOLDER}/{environment.JSKULT_CONFIG_CALENDAR_RUN_ARCHIVE_DAY_FILE_NAME}' with open(temporary_file_path, mode='wb') as f: self._s3_client.download_file( - self._bucket_name, jsk_archive_run_day_list_key, f) + self._bucket_name, jsk_archive_run_day_list_key, f) f.seek(0) return temporary_file_path - + def download_jsk_expected_data_list(self): temporary_dir = tempfile.mkdtemp() temporary_file_path = path.join( @@ -79,7 +80,6 @@ class ConfigBucket(S3Bucket): return temporary_file_path - class JskUltBackupBucket(S3Bucket): _bucket_name = environment.JSKULT_BACKUP_BUCKET @@ -122,4 +122,4 @@ class JskSendBucket(S3Bucket): dat_key = f'{self._send_folder}/{dat_file_key}' backup_key = f'{jskult_backup_bucket._folder}/{datetime_key}/{dat_file_key.replace(f"{self._send_folder}/", "")}' self._s3_client.copy(self._bucket_name, dat_key, - jskult_backup_bucket._bucket_name, backup_key) \ No newline at end of file + jskult_backup_bucket._bucket_name, backup_key)