nik/newdwh2021
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 動作確認し、動かなかった部分を修正。

Browse Source
This commit is contained in:
shimoda.m@nds-tyo.co.jp 2025-05-16 16:52:52 +09:00
parent 6714914dbf
commit 8819d036a9
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ecs/jskult-transfer-receive-file/src/aws/s3.py
View File

@ -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)

2
ecs/jskult-transfer-receive-file/src/manager/jskult_hdke_tbl_manager.py
View File

@ -1,4 +1,4 @@
import datetime
from datetime import datetime
from src.db.database import Database
from src.error.exceptions import BatchOperationException, DBException