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

fix:SAP受領チェック処理（月次）

Browse Source 
・タイムゾーンの変更処理
・通知メールのタイトルの改行コード取り除き
This commit is contained in:
Y_SAKAI 2022-05-30 15:02:26 +09:00
parent cf29d0786a
commit 38e0718271
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lambda/mbj-newdwh2021-staging-lambda-sap-fin-receive-check-monthly.py
View File

@ -6,6 +6,7 @@ import re
import csv
import logging
from abc import *
from zoneinfo import ZoneInfo
# 環境変数
CHECK_BUCKET_NAME = os.environ["CHECK_BUCKET_NAME"]
@ -38,10 +39,13 @@ sns_client = boto3.client('sns')
# logger設定
logger = logging.getLogger()
def custome_time(*arg):
return datetime.datetime.now(ZoneInfo("Asia/Tokyo")).timetuple()
formatter = logging.Formatter(
'[%(levelname)s]\t%(asctime)s\t%(message)s\n',
'%Y-%m-%d %H:%M:%S'
)
formatter.converter = custome_time
for handler in logger.handlers:
handler.setFormatter(formatter)
@ -122,9 +126,9 @@ 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_monthly_file_name_response["Body"].read()), encoding='utf-8')))
match_count = 0
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(receive_monthly_file_name_obj.get()["Body"].read()))
for row in csv.reader(receive_monthly_file_name_body, delimiter='\t'):
file_exists = False
for file_name in file_list:
@ -170,7 +174,7 @@ def lambda_handler(event, context):
logger.info(f'I-05-07 メール送信指示をします　送信先トピック：{MBJ_SAP_NOTICE_TOPIC}')
params = {
'TopicArn': MBJ_SAP_NOTICE_TOPIC,
'Subject': mail_title,
'Subject': mail_title.rstrip('\n'),
'Message': mail_body
}
sns_client.publish(**params)

10
lambda/mbj-newdwh2021-staging-lambda-sap-sup-receive-check-monthly.py
View File

@ -6,6 +6,7 @@ import re
import csv
import logging
from abc import *
from zoneinfo import ZoneInfo
# 環境変数
CHECK_BUCKET_NAME = os.environ["CHECK_BUCKET_NAME"]
@ -38,10 +39,13 @@ sns_client = boto3.client('sns')
# logger設定
logger = logging.getLogger()
def custome_time(*arg):
return datetime.datetime.now(ZoneInfo("Asia/Tokyo")).timetuple()
formatter = logging.Formatter(
'[%(levelname)s]\t%(asctime)s\t%(message)s\n',
'%Y-%m-%d %H:%M:%S'
)
formatter.converter = custome_time
for handler in logger.handlers:
handler.setFormatter(formatter)
@ -122,9 +126,9 @@ 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_monthly_file_name_response["Body"].read()), encoding='utf-8')))
match_count = 0
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(receive_monthly_file_name_obj.get()["Body"].read()))
for row in csv.reader(receive_monthly_file_name_body, delimiter='\t'):
file_exists = False
for file_name in file_list:
@ -170,7 +174,7 @@ def lambda_handler(event, context):
logger.info(f'I-05-07 メール送信指示をします　送信先トピック：{MBJ_SAP_NOTICE_TOPIC}')
params = {
'TopicArn': MBJ_SAP_NOTICE_TOPIC,
'Subject': mail_title,
'Subject': mail_title.rstrip('\n'),
'Message': mail_body
}
sns_client.publish(**params)