From 462043654fa2d3e731dd7853d4bd9761f5aefe67 Mon Sep 17 00:00:00 2001 From: *lcOeIaePm0 Date: Mon, 30 May 2022 10:57:28 +0900 Subject: [PATCH] =?UTF-8?q?fix:SAP=E3=83=87=E3=83=BC=E3=82=BF=E6=97=A5?= =?UTF-8?q?=E6=AC=A1=E5=8F=97=E9=A0=98=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF?= =?UTF-8?q?=E5=87=A6=E7=90=86=20=E3=83=AA=E3=82=B9=E3=83=88=E5=86=85?= =?UTF-8?q?=E5=8C=85=E8=A1=A8=E8=A8=98=E3=82=92=E4=BD=BF=E7=94=A8=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=81=A8=E3=83=A1=E3=83=A2=E3=83=AA=E4=B8=8D=E8=B6=B3?= =?UTF-8?q?=E3=81=A3=E3=81=BD=E3=81=84=E5=8B=95=E3=81=8D=E3=82=92=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=81=AE=E3=81=A7=E5=88=A5=E3=81=AE=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E3=81=AB=E4=BF=AE=E6=AD=A3=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...-newdwh2021-staging-lambda-sap-fin-receive-check-daily.py | 5 +++-- ...-newdwh2021-staging-lambda-sap-sup-receive-check-daily.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lambda/mbj-newdwh2021-staging-lambda-sap-fin-receive-check-daily.py b/lambda/mbj-newdwh2021-staging-lambda-sap-fin-receive-check-daily.py index 191e7856..8a894c91 100644 --- a/lambda/mbj-newdwh2021-staging-lambda-sap-fin-receive-check-daily.py +++ b/lambda/mbj-newdwh2021-staging-lambda-sap-fin-receive-check-daily.py @@ -124,10 +124,11 @@ def lambda_handler(event, context): # 2.日次I/Fファイルチェック処理 logger.info('I-04-03 日次I/Fファイルチェック処理開始') logger.info('I-04-04 取得したオブジェクトリストと日次I/Fファイルネーム設定ファイルの突き合わせを開始します') - row_count = sum(1 for line in open(io.TextIOWrapper(io.BytesIO(receive_daily_file_name_response["Body"].read()), encoding='utf-8'))) + row_count = 0 match_count = 0 receive_daily_file_name_body = io.TextIOWrapper(io.BytesIO(receive_daily_file_name_response["Body"].read()), encoding='utf-8') - for row in csv.reader(receive_daily_file_name_body, delimiter='\t'): + for i, row in enumerate(csv.reader(receive_daily_file_name_body, delimiter='\t'), 1): + row_count = i file_exists = False for file_name in file_list: match_result = re.fullmatch(row[INDEX_REGEX], file_name) diff --git a/lambda/mbj-newdwh2021-staging-lambda-sap-sup-receive-check-daily.py b/lambda/mbj-newdwh2021-staging-lambda-sap-sup-receive-check-daily.py index f34fc592..2f43f12d 100644 --- a/lambda/mbj-newdwh2021-staging-lambda-sap-sup-receive-check-daily.py +++ b/lambda/mbj-newdwh2021-staging-lambda-sap-sup-receive-check-daily.py @@ -124,10 +124,11 @@ def lambda_handler(event, context): # 2.日次I/Fファイルチェック処理 logger.info('I-04-03 日次I/Fファイルチェック処理開始') logger.info('I-04-04 取得したオブジェクトリストと日次I/Fファイルネーム設定ファイルの突き合わせを開始します') - row_count = sum(1 for line in open(io.TextIOWrapper(io.BytesIO(receive_daily_file_name_response["Body"].read()), encoding='utf-8'))) + row_count = 0 match_count = 0 receive_daily_file_name_body = io.TextIOWrapper(io.BytesIO(receive_daily_file_name_response["Body"].read()), encoding='utf-8') - for row in csv.reader(receive_daily_file_name_body, delimiter='\t'): + for i, row in enumerate(csv.reader(receive_daily_file_name_body, delimiter='\t'), 1): + row_count = i file_exists = False for file_name in file_list: match_result = re.fullmatch(row[INDEX_REGEX], file_name)