From 5c5b40a6be95df8d785c6ac6551e3463ece0ab53 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Thu, 22 May 2025 09:15:44 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BB=A2=E9=80=81=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=81=AE=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-transfer-receive-file/src/aws/s3.py | 11 +++++------ .../src/manager/jskult_hdke_tbl_manager.py | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) 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: