diff --git a/ecs/jskult-batch/src/batch/trn_result_data_bio_lot.py b/ecs/jskult-batch/src/batch/trn_result_data_bio_lot.py index 91ab123e..65e7408a 100644 --- a/ecs/jskult-batch/src/batch/trn_result_data_bio_lot.py +++ b/ecs/jskult-batch/src/batch/trn_result_data_bio_lot.py @@ -11,6 +11,8 @@ from src.error.exceptions import (BatchOperationException, EnvironmentVariableNotSetException, MaxRunCountReachedException) from src.logging.get_logger import get_logger +from src.system_var import constants + @@ -37,6 +39,7 @@ class TrnResultDataBioLot(JskultBatchEntrypoint): jskult_hdke_tbl_manager = JskultHdkeTblManager() jskult_batch_run_manager = JskultBatchRunManager( + self.environment.BATCH_MANAGE_DYNAMODB_TABLE_NAME, self.environment.BATCH_EXECUTION_ID) if not jskult_hdke_tbl_manager.can_run_process(): logger.error( @@ -74,12 +77,12 @@ class TrnResultDataBioLot(JskultBatchEntrypoint): ) try: - jskult_batch_status_manager.set_process_status("start") + jskult_batch_status_manager.set_process_status(constants.BATCH_ACTF_BATCH_START) try: if not jskult_batch_status_manager.can_run_post_process(): # 後続処理の起動条件を満たしていない場合 # 処理ステータスを「処理待」に設定 - jskult_batch_status_manager.set_process_status("waiting") + jskult_batch_status_manager.set_process_status(constants.PROCESS_STATUS_WAITING) # バッチ実行管理テーブルに「retry」で登録 jskult_batch_run_manager.batch_retry() @@ -88,7 +91,7 @@ class TrnResultDataBioLot(JskultBatchEntrypoint): except MaxRunCountReachedException: logger.info('最大起動回数に到達したため、生物由来卸販売ロット分解処理を実行します。') - jskult_batch_status_manager.set_process_status("doing") + jskult_batch_status_manager.set_process_status(constants.PROCESS_STATUS_DOING) db = Database.get_instance() try: db.connect() @@ -108,7 +111,7 @@ class TrnResultDataBioLot(JskultBatchEntrypoint): # 処理が全て正常終了した際に、バッチ実行管理テーブルに「success」で登録 logger.info("生物由来卸販売ロット分解処理を正常終了します。") jskult_batch_run_manager.batch_success() - jskult_batch_status_manager.set_process_status("done") + jskult_batch_status_manager.set_process_status(constants.PROCESS_STATUS_DONE) return except Exception as e: @@ -120,7 +123,7 @@ class TrnResultDataBioLot(JskultBatchEntrypoint): # 何らかのエラーが発生した際に、バッチ実行管理テーブルに「failed」で登録 logger.exception(f'予期せぬエラーが発生したため、生物由来卸販売ロット分解処理を終了します。{e}') jskult_batch_run_manager.batch_failed() - jskult_batch_status_manager.set_process_status("failed") + jskult_batch_status_manager.set_process_status(constants.PROCESS_STATUS_ERROR) def _delete_not_confirm_data_in_trn_result_data_bio_lot(self, db: Database):