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

指摘事項修正

Browse Source
This commit is contained in:
野間 2023-07-06 13:03:58 +09:00
parent 518c84695e
commit a8de16a3bd
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ecs/jskult-batch-daily/src/aws/s3.py
View File

@ -159,14 +159,14 @@ class VjskSendBucket(S3Bucket):
_bucket_name = environment.VJSK_DATA_BUCKET
_send_folder = environment.VJSK_DATA_SEND_FOLDER
def upload_vjsk_csv_file(self, vjsk_create_csv: str, csv_file_path: str):
def upload_inst_pharm_csv_file(self, vjsk_create_csv: str, csv_file_path: str):
# S3バケットにファイルを移動
csv_file_name = f'{self._send_folder}/{vjsk_create_csv}'
s3_client = S3Client()
s3_client.upload_file(csv_file_path, self._bucket_name, csv_file_name)
return
def backup_vjsk_csv_file(self, dat_file_key: str, datetime_key: str):
def backup_inst_pharm_csv_file(self, dat_file_key: str, datetime_key: str):
# バックアップバケットにコピー
vjsk_backup_bucket = VjskBackupBucket()
dat_key = f'{self._send_folder}/{dat_file_key}'

10
ecs/jskult-batch-daily/src/batch/ultmarc/output_vjsk_inst_pharm_data.py
View File

@ -45,15 +45,14 @@ def exec():
vjsk_bucket = VjskSendBucket()
try:
# s3へデータ移動
vjsk_bucket.upload_vjsk_csv_file(vjsk_csv_file_name, csv_file_path)
vjsk_bucket.upload_inst_pharm_csv_file(vjsk_csv_file_name, csv_file_path)
except Exception as e:
logger.info('S3バケットにCSVデータを作成できませんでした。')
raise e
try:
# 処理後ファイルをバックアップ
batch_context = BatchContext.get_instance()
vjsk_bucket.backup_vjsk_csv_file(vjsk_csv_file_name, batch_context.syor_date)
vjsk_bucket.backup_inst_pharm_csv_file(vjsk_csv_file_name, batch_context.syor_date)
except Exception as e:
logger.info('バックアップバケットへCSVデータをコピーできませんでした。')
raise e
@ -142,7 +141,7 @@ def select_inst_record(db):
"""
return db.execute_select(sql)
except Exception as e:
logger.debug(f'{sql_err_msg}')
logger.debug(sql_err_msg)
raise e
@ -220,7 +219,7 @@ def select_pharm_record(db):
"""
return db.execute_select(sql)
except Exception as e:
logger.debug(f'{sql_err_msg}')
logger.debug(sql_err_msg)
raise e
@ -266,7 +265,6 @@ def make_csv_data(record_inst: list, record_pharm: list, vjsk_csv_file_name: str
writer.writerow(csv_data)
except Exception as e:
logger.info('ワークデータの作成に失敗しました。')
logger.info('CSVデータの作成に失敗しました。')
raise e