From de1e82273ef81e441bfac9362cc3e52267caef56 Mon Sep 17 00:00:00 2001 From: Nik Afiq Date: Wed, 15 May 2024 11:19:00 +0900 Subject: [PATCH] =?UTF-8?q?get=E3=81=A8read=E5=87=A6=E7=90=86=E5=88=86?= =?UTF-8?q?=E3=81=91=E3=81=9F=E3=83=BB=E3=82=A4=E3=83=B3=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=95=E3=82=A7=E3=83=BC=E3=82=B9=E5=91=BD=E5=90=8D=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/crm-datafetch/src/aws/s3.py | 30 +++++++++---------- .../sap-fin-receive-check-daily.py | 3 +- .../sap-fin-receive-check-monthly.py | 3 +- .../sap-sup-receive-check-daily.py | 3 +- .../sap-sup-receive-check-monthly.py | 3 +- 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/ecs/crm-datafetch/src/aws/s3.py b/ecs/crm-datafetch/src/aws/s3.py index ed062fca..2501ce94 100644 --- a/ecs/crm-datafetch/src/aws/s3.py +++ b/ecs/crm-datafetch/src/aws/s3.py @@ -12,7 +12,7 @@ from src.system_var.environments import (CRM_BACKUP_BUCKET, CRM_CONFIG_BUCKET, RESPONSE_JSON_BACKUP_FOLDER) -class S3Resource: +class S3Client: def __init__(self, bucket_name: str) -> None: self.__s3_client = boto3.client(AWS_RESOURCE_S3) self.__s3_bucket = bucket_name @@ -33,66 +33,66 @@ class S3Resource: class ConfigBucket: - __s3_resource: S3Resource = None + __s3_client: S3Client = None def __init__(self) -> None: - self.__s3_resource = S3Resource(CRM_CONFIG_BUCKET) + self.__s3_client = S3Client(CRM_CONFIG_BUCKET) def __str__(self) -> str: return CRM_CONFIG_BUCKET def get_object_info_file(self) -> str: - return self.__s3_resource.get_object(f'{OBJECT_INFO_FOLDER}/{OBJECT_INFO_FILENAME}') + return self.__s3_client.get_object(f'{OBJECT_INFO_FOLDER}/{OBJECT_INFO_FILENAME}') def get_last_fetch_datetime_file(self, file_key: str) -> str: - return self.__s3_resource.get_object(f'{LAST_FETCH_DATE_FOLDER}/{file_key}') + return self.__s3_client.get_object(f'{LAST_FETCH_DATE_FOLDER}/{file_key}') def put_last_fetch_datetime_file(self, file_key: str, local_file_path: str) -> None: - self.__s3_resource.put_object( + self.__s3_client.put_object( f'{LAST_FETCH_DATE_FOLDER}/{file_key}', local_file_path) return class DataBucket: - __s3_resource: S3Resource = None + __s3_client: S3Client = None def __init__(self) -> None: - self.__s3_resource = S3Resource(IMPORT_DATA_BUCKET) + self.__s3_client = S3Client(IMPORT_DATA_BUCKET) def __str__(self) -> str: return IMPORT_DATA_BUCKET def put_csv(self, file_key: str, local_file_path: str) -> None: object_key = f'{CRM_IMPORT_DATA_FOLDER}/{file_key}' - self.__s3_resource.put_object(object_key, local_file_path) + self.__s3_client.put_object(object_key, local_file_path) return def put_csv_from(self, src_bucket: str, src_key: str): dest_filename = src_key.split('/')[-1] - self.__s3_resource.copy(src_bucket, src_key, str(self), f'{CRM_IMPORT_DATA_FOLDER}/{dest_filename}') + self.__s3_client.copy(src_bucket, src_key, str(self), f'{CRM_IMPORT_DATA_FOLDER}/{dest_filename}') return class BackupBucket: - __s3_resource: S3Resource = None + __s3_client: S3Client = None def __init__(self) -> None: - self.__s3_resource = S3Resource(CRM_BACKUP_BUCKET) + self.__s3_client = S3Client(CRM_BACKUP_BUCKET) def __str__(self) -> str: return CRM_BACKUP_BUCKET def put_response_json(self, file_key: str, local_file_path: str) -> None: object_key = f'{RESPONSE_JSON_BACKUP_FOLDER}/{file_key}' - self.__s3_resource.put_object(object_key, local_file_path) + self.__s3_client.put_object(object_key, local_file_path) return def put_csv(self, file_key: str, local_file_path: str) -> None: object_key = f'{CRM_IMPORT_DATA_BACKUP_FOLDER}/{file_key}' - self.__s3_resource.put_object(object_key, local_file_path) + self.__s3_client.put_object(object_key, local_file_path) return def put_result_json(self, file_key: str, local_file_path: str) -> None: object_key = f'{PROCESS_RESULT_FOLDER}/{file_key}' - self.__s3_resource.put_object(object_key, local_file_path) + self.__s3_client.put_object(object_key, local_file_path) return diff --git a/lambda/sap-fin-receive-check-daily/sap-fin-receive-check-daily.py b/lambda/sap-fin-receive-check-daily/sap-fin-receive-check-daily.py index dcad4886..08c82708 100644 --- a/lambda/sap-fin-receive-check-daily/sap-fin-receive-check-daily.py +++ b/lambda/sap-fin-receive-check-daily/sap-fin-receive-check-daily.py @@ -123,7 +123,8 @@ def lambda_handler(event, context): logger.info('I-04-04 取得したオブジェクトリストと日次I/Fファイルネーム設定ファイルの突き合わせを開始します') receive_daily_file_name_body = io.TextIOWrapper(io.BytesIO(receive_daily_file_name_response["Body"].read()), encoding='utf-8') match_count = 0 - row_count = sum(1 for line in io.BytesIO(s3_client.get_object(Bucket=CONFIG_BUCKET_NAME, Key=RECEIVE_DAILY_FILE_NAME_LIST_PATH)["Body"].read())) + receive_daily_file_name_response = s3_client.get_object(Bucket=CONFIG_BUCKET_NAME, Key=RECEIVE_DAILY_FILE_NAME_LIST_PATH) + row_count = sum(1 for line in io.BytesIO(receive_daily_file_name_response["Body"].read())) for row in csv.reader(receive_daily_file_name_body, delimiter='\t'): file_exists = False for file_name in file_list: diff --git a/lambda/sap-fin-receive-check-monthly/sap-fin-receive-check-monthly.py b/lambda/sap-fin-receive-check-monthly/sap-fin-receive-check-monthly.py index 25058295..d29f8654 100644 --- a/lambda/sap-fin-receive-check-monthly/sap-fin-receive-check-monthly.py +++ b/lambda/sap-fin-receive-check-monthly/sap-fin-receive-check-monthly.py @@ -127,7 +127,8 @@ def lambda_handler(event, context): logger.info('I-04-04 取得したオブジェクトリストと月次I/Fファイルネーム設定ファイルの突き合わせを開始します') receive_monthly_file_name_body = io.TextIOWrapper(io.BytesIO(receive_monthly_file_name_response["Body"].read()), encoding='utf-8') match_count = 0 - row_count = sum(1 for line in io.BytesIO(s3_client.get_object(Bucket=CONFIG_BUCKET_NAME, Key=RECEIVE_MONTHLY_FILE_NAME_LIST_PATH)["Body"].read())) + receive_monthly_file_name_response = s3_client.get_object(Bucket=CONFIG_BUCKET_NAME, Key=RECEIVE_MONTHLY_FILE_NAME_LIST_PATH) + row_count = sum(1 for line in io.BytesIO(receive_monthly_file_name_response["Body"].read())) for row in csv.reader(receive_monthly_file_name_body, delimiter='\t'): file_exists = False for file_name in file_list: diff --git a/lambda/sap-sup-receive-check-daily/sap-sup-receive-check-daily.py b/lambda/sap-sup-receive-check-daily/sap-sup-receive-check-daily.py index 033ae53b..f4cef00f 100644 --- a/lambda/sap-sup-receive-check-daily/sap-sup-receive-check-daily.py +++ b/lambda/sap-sup-receive-check-daily/sap-sup-receive-check-daily.py @@ -123,7 +123,8 @@ def lambda_handler(event, context): logger.info('I-04-04 取得したオブジェクトリストと日次I/Fファイルネーム設定ファイルの突き合わせを開始します') receive_daily_file_name_body = io.TextIOWrapper(io.BytesIO(receive_daily_file_name_response["Body"].read()), encoding='utf-8') match_count = 0 - row_count = sum(1 for line in io.BytesIO(s3_client.get_object(Bucket=CONFIG_BUCKET_NAME, Key=RECEIVE_DAILY_FILE_NAME_LIST_PATH)["Body"].read())) + receive_daily_file_name_response = s3_client.get_object(Bucket=CONFIG_BUCKET_NAME, Key=RECEIVE_DAILY_FILE_NAME_LIST_PATH) + row_count = sum(1 for line in io.BytesIO(receive_daily_file_name_response["Body"].read())) for row in csv.reader(receive_daily_file_name_body, delimiter='\t'): file_exists = False for file_name in file_list: diff --git a/lambda/sap-sup-receive-check-monthly/sap-sup-receive-check-monthly.py b/lambda/sap-sup-receive-check-monthly/sap-sup-receive-check-monthly.py index 10ffb8f0..9cc9b42b 100644 --- a/lambda/sap-sup-receive-check-monthly/sap-sup-receive-check-monthly.py +++ b/lambda/sap-sup-receive-check-monthly/sap-sup-receive-check-monthly.py @@ -126,7 +126,8 @@ def lambda_handler(event, context): logger.info('I-04-04 取得したオブジェクトリストと月次I/Fファイルネーム設定ファイルの突き合わせを開始します') receive_monthly_file_name_body = io.TextIOWrapper(io.BytesIO(receive_monthly_file_name_response["Body"].read()), encoding='utf-8') match_count = 0 - row_count = sum(1 for line in io.BytesIO(s3_client.get_object(Bucket=CONFIG_BUCKET_NAME, Key=RECEIVE_MONTHLY_FILE_NAME_LIST_PATH)["Body"].read())) + receive_monthly_file_name_response = s3_client.get_object(Bucket=CONFIG_BUCKET_NAME, Key=RECEIVE_MONTHLY_FILE_NAME_LIST_PATH) + row_count = sum(1 for line in io.BytesIO(receive_monthly_file_name_response["Body"].read())) for row in csv.reader(receive_monthly_file_name_body, delimiter='\t'): file_exists = False for file_name in file_list: