diff --git a/ecs/jskult-transfer-receive-file/src/aws/s3.py b/ecs/jskult-transfer-receive-file/src/aws/s3.py index a85cbb0b..015992b4 100644 --- a/ecs/jskult-transfer-receive-file/src/aws/s3.py +++ b/ecs/jskult-transfer-receive-file/src/aws/s3.py @@ -6,7 +6,6 @@ import shutil import tempfile import boto3 - from src.system_var import environment @@ -136,11 +135,11 @@ class UltmarcImportBucket(S3Bucket): _folder = environment.ULTMARC_IMPORT_FOLDER def transfer_file_to_import(self, target_file: dict): - backup_from_file_path = target_file.get("filename") - backup_to_filename = backup_from_file_path.replace( - f"{self._folder}/", "") - data_import_key = f'{self._folder}/{backup_to_filename}' - self._s3_client.copy(self._bucket_name, backup_from_file_path, + from_file_path = target_file.get("filename") + to_filename = from_file_path.replace( + f"{UltmarcBucket()._folder}/", "") + data_import_key = f'{self._folder}/{to_filename}' + self._s3_client.copy(self._bucket_name, from_file_path, self._bucket_name, data_import_key) diff --git a/ecs/jskult-transfer-receive-file/src/manager/jskult_hdke_tbl_manager.py b/ecs/jskult-transfer-receive-file/src/manager/jskult_hdke_tbl_manager.py index aecf3965..31984125 100644 --- a/ecs/jskult-transfer-receive-file/src/manager/jskult_hdke_tbl_manager.py +++ b/ecs/jskult-transfer-receive-file/src/manager/jskult_hdke_tbl_manager.py @@ -113,7 +113,7 @@ class JskultHdkeTblManager: finally: self._db.disconnect() # 日次バッチ処理中の場合、後続の処理は行わない - if batch_processing_flag == constants.BATCH_ACTF_BATCH_START: + if batch_processing_flag != constants.BATCH_ACTF_BATCH_START: return False # dump取得が正常終了していない場合、後続の処理は行わない if dump_status_kbn != constants.DUMP_STATUS_KBN_COMPLETE: