From a8de16a3bd5492ac1a5538fa77079486e3b3f394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8E=E9=96=93?= <noma.a@tyo-nds.co.jp>
Date: Thu, 6 Jul 2023 13:03:58 +0900
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=91=98=E4=BA=8B=E9=A0=85=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-batch-daily/src/aws/s3.py                   |  4 ++--
 .../src/batch/ultmarc/output_vjsk_inst_pharm_data.py   | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ecs/jskult-batch-daily/src/aws/s3.py b/ecs/jskult-batch-daily/src/aws/s3.py
index 86ffc169..764b600c 100644
--- a/ecs/jskult-batch-daily/src/aws/s3.py
+++ b/ecs/jskult-batch-daily/src/aws/s3.py
@@ -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}'
diff --git a/ecs/jskult-batch-daily/src/batch/ultmarc/output_vjsk_inst_pharm_data.py b/ecs/jskult-batch-daily/src/batch/ultmarc/output_vjsk_inst_pharm_data.py
index f72e8d92..838dae34 100644
--- a/ecs/jskult-batch-daily/src/batch/ultmarc/output_vjsk_inst_pharm_data.py
+++ b/ecs/jskult-batch-daily/src/batch/ultmarc/output_vjsk_inst_pharm_data.py
@@ -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