From 19901bf80e68c890f6176f8ef95878e214fa0b0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= Date: Tue, 11 Jul 2023 18:15:27 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=E3=83=AA=E3=83=9D=E3=82=B8=E3=83=88?= =?UTF-8?q?=E3=83=AA=E3=81=A7=E3=82=A8=E3=83=A9=E3=83=BC=E3=83=AD=E3=82=B0?= =?UTF-8?q?=E5=87=BA=E5=8A=9B=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/repositories/bu_master_cd_repository.py | 5 ++++- .../src/repositories/emp_chg_inst_repository.py | 11 +++++++---- .../src/repositories/emp_master_repository.py | 5 ++++- .../src/repositories/mst_inst_repository.py | 11 +++++++---- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/ecs/jskult-webapp/src/repositories/bu_master_cd_repository.py b/ecs/jskult-webapp/src/repositories/bu_master_cd_repository.py index 62b24de0..36992192 100644 --- a/ecs/jskult-webapp/src/repositories/bu_master_cd_repository.py +++ b/ecs/jskult-webapp/src/repositories/bu_master_cd_repository.py @@ -1,5 +1,8 @@ from src.repositories.base_repository import BaseRepository from src.model.db.master_mente_count import MasterMenteCountModel +from src.logging.get_logger import get_logger + +logger = get_logger('ビジネスユニットマスタ') class BuMasterRepository(BaseRepository): @@ -23,7 +26,7 @@ class BuMasterRepository(BaseRepository): return 0 return models[0].count except Exception as e: - print(f"[ERROR] DB Error : Exception={e.args}") + logger.exception(f"DB Error : Exception={e.args}") raise e finally: self._database.disconnect() diff --git a/ecs/jskult-webapp/src/repositories/emp_chg_inst_repository.py b/ecs/jskult-webapp/src/repositories/emp_chg_inst_repository.py index b90ea51c..abcd93ea 100644 --- a/ecs/jskult-webapp/src/repositories/emp_chg_inst_repository.py +++ b/ecs/jskult-webapp/src/repositories/emp_chg_inst_repository.py @@ -1,5 +1,8 @@ from src.repositories.base_repository import BaseRepository from src.model.db.master_mente_count import MasterMenteCountModel +from src.logging.get_logger import get_logger + +logger = get_logger('従業員担当施設マスタ') class EmpChgInstRepository(BaseRepository): @@ -66,7 +69,7 @@ class EmpChgInstRepository(BaseRepository): 'update_user_name': update_user_name }) except Exception as e: - print(f"[ERROR] DB Error : Exception={e.args}") + logger.exception(f"DB Error : Exception={e.args}") raise e UPDATE_SQL = """\ @@ -94,7 +97,7 @@ class EmpChgInstRepository(BaseRepository): 'update_user_name': update_user_name }) except Exception as e: - print(f"[ERROR] DB Error : Exception={e.args}") + logger.exception(f"DB Error : Exception={e.args}") raise e UPDATE_SQL = """\ @@ -121,7 +124,7 @@ class EmpChgInstRepository(BaseRepository): 'update_user_name': update_user_name }) except Exception as e: - print(f"[ERROR] DB Error : Exception={e.args}") + logger.exception(f"DB Error : Exception={e.args}") raise e FETCH_COUNT_SQL = """\ @@ -146,7 +149,7 @@ class EmpChgInstRepository(BaseRepository): return 0 return models[0].count except Exception as e: - print(f"[ERROR] DB Error : Exception={e.args}") + logger.exception(f"DB Error : Exception={e.args}") raise e finally: self._database.disconnect() diff --git a/ecs/jskult-webapp/src/repositories/emp_master_repository.py b/ecs/jskult-webapp/src/repositories/emp_master_repository.py index 631bd643..620e4fee 100644 --- a/ecs/jskult-webapp/src/repositories/emp_master_repository.py +++ b/ecs/jskult-webapp/src/repositories/emp_master_repository.py @@ -1,5 +1,8 @@ from src.repositories.base_repository import BaseRepository from src.model.db.master_mente_count import MasterMenteCountModel +from src.logging.get_logger import get_logger + +logger = get_logger('従業員マスタ') class EmpMasterRepository(BaseRepository): @@ -26,7 +29,7 @@ class EmpMasterRepository(BaseRepository): return 0 return models[0].count except Exception as e: - print(f"[ERROR] DB Error : Exception={e.args}") + logger.exception(f"DB Error : Exception={e.args}") raise e finally: self._database.disconnect() diff --git a/ecs/jskult-webapp/src/repositories/mst_inst_repository.py b/ecs/jskult-webapp/src/repositories/mst_inst_repository.py index bafcc525..9c92599c 100644 --- a/ecs/jskult-webapp/src/repositories/mst_inst_repository.py +++ b/ecs/jskult-webapp/src/repositories/mst_inst_repository.py @@ -1,5 +1,8 @@ from src.repositories.base_repository import BaseRepository from src.model.db.master_mente_count import MasterMenteCountModel +from src.logging.get_logger import get_logger + +logger = get_logger('メルク施設マスタ') class MstInstRepository(BaseRepository): @@ -10,20 +13,20 @@ class MstInstRepository(BaseRepository): FROM src05.mst_inst WHERE - mst_inst.inst_cd = :instcd + mst_inst.inst_cd = :inst_cd """ - def fetch_count(self, instcd) -> MasterMenteCountModel: + def fetch_count(self, inst_cd) -> MasterMenteCountModel: try: self._database.connect() query = self.FETCH_COUNT_SQL - result = self._database.execute_select(query, {'instcd': instcd}) + result = self._database.execute_select(query, {'inst_cd': inst_cd}) models = [MasterMenteCountModel(**r) for r in result] if len(models) == 0: return 0 return models[0].count except Exception as e: - print(f"[ERROR] DB Error : Exception={e.args}") + logger.exception(f"DB Error : Exception={e.args}") raise e finally: self._database.disconnect()