From 8819d036a92640d9347d37e86fb439f18693d1c9 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 16 May 2025 16:52:52 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8B=95=E4=BD=9C=E7=A2=BA=E8=AA=8D?= =?UTF-8?q?=E3=81=97=E3=80=81=E5=8B=95=E3=81=8B=E3=81=AA=E3=81=8B=E3=81=A3?= =?UTF-8?q?=E3=81=9F=E9=83=A8=E5=88=86=E3=82=92=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 | 13 ++++++------- .../src/manager/jskult_hdke_tbl_manager.py | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ecs/jskult-transfer-receive-file/src/aws/s3.py b/ecs/jskult-transfer-receive-file/src/aws/s3.py index 2615db0f..a85cbb0b 100644 --- a/ecs/jskult-transfer-receive-file/src/aws/s3.py +++ b/ecs/jskult-transfer-receive-file/src/aws/s3.py @@ -6,6 +6,7 @@ import shutil import tempfile import boto3 + from src.system_var import environment @@ -99,8 +100,7 @@ class JskIOBucket(S3Bucket): jsk_backup_bucket._bucket_name, backup_key) def delete_file(self, target_file: dict): - delete_path = target_file.get("filename").replace( - f"{self._recv_folder}/", "") + delete_path = target_file.get("filename") self._s3_client.delete_file( self._bucket_name, delete_path) @@ -112,7 +112,7 @@ class DataImportBucket(S3Bucket): class UltmarcBucket(S3Bucket): _bucket_name = environment.ULTMARC_DATA_BUCKET - _folder = environment.ULTMARC_DATA_FOLDER + _folder = environment.ULTMARC_RECEIVE_FOLDER def get_file_list(self): return self._s3_client.list_objects(self._bucket_name, self._folder) @@ -122,12 +122,11 @@ class UltmarcBucket(S3Bucket): ultmarc_backup_bucket = UltmarcBackupBucket() target_file_path = target_file.get("filename") backup_key = f'{ultmarc_backup_bucket._folder}/{datetime_key}/{target_file_path.replace(f"{self._folder}/", "")}' - self._s3_client.copy(self._bucket_name, target_file, + self._s3_client.copy(self._bucket_name, target_file_path, ultmarc_backup_bucket._bucket_name, backup_key) def delete_file(self, target_file: dict): - delete_path = target_file.get("filename").replace( - f"{self._recv_folder}/", "") + delete_path = target_file.get("filename") self._s3_client.delete_file( self._bucket_name, delete_path) @@ -139,7 +138,7 @@ class UltmarcImportBucket(S3Bucket): 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._recv_folder}/", "") + f"{self._folder}/", "") data_import_key = f'{self._folder}/{backup_to_filename}' self._s3_client.copy(self._bucket_name, backup_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 51bc30c6..aecf3965 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 @@ -1,4 +1,4 @@ -import datetime +from datetime import datetime from src.db.database import Database from src.error.exceptions import BatchOperationException, DBException