From 485648879f167986cf898ced3d86853ee7ba05be Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Thu, 31 Aug 2023 12:58:08 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20repository=E3=82=AF=E3=83=A9=E3=82=B9?= =?UTF-8?q?=E3=81=A7connect-disconnect=E3=82=92=E3=81=97=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/repositories/ultmarc_doctor_repository.py | 6 ------ .../src/repositories/ultmarc_dr_wrkplace_his_repository.py | 3 --- .../src/repositories/ultmarc_dr_wrkplace_repository.py | 6 ------ .../src/repositories/ultmarc_inst_repository.py | 6 ------ .../src/repositories/ultmarc_inst_trt_course_repository.py | 3 --- .../src/repositories/ultmarc_sosiety_repository.py | 3 --- .../repositories/ultmarc_specialist_license_repository.py | 3 --- .../src/repositories/ultmarc_trt_course_repository.py | 3 --- .../src/repositories/user_master_repository.py | 3 --- .../src/repositories/wholesaler_master_repository.py | 3 --- 10 files changed, 39 deletions(-) diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py index a60a3583..ceca822d 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py @@ -53,7 +53,6 @@ class UltmarcDoctorRepository(BaseRepository): def fetch_many(self, parameter: UltmarcDoctorSearchModel) -> list[UltmarcDoctorDBModel]: try: - self._database.connect() # 文字列の検索を部分一致にするため、モデルをコピー。以降はこのコピーを使用する。 clone_parameter = UltmarcDoctorSearchModel(**parameter.model_dump()) where_clause = self.__build_condition(clone_parameter) @@ -66,8 +65,6 @@ class UltmarcDoctorRepository(BaseRepository): except Exception as e: logger.exception(f"DB Error : Exception={e.args}") raise e - finally: - self._database.disconnect() def __build_condition(self, parameter: UltmarcDoctorSearchModel): where_clauses: list[SQLCondition] = [] @@ -187,7 +184,6 @@ class UltmarcDoctorRepository(BaseRepository): def fetch_one(self, id) -> UltmarcDoctorInfoDBModel: try: - self._database.connect() query = self.FETCH_ONE_SQL result = self._database.execute_select(query, {'id': id}) models = [UltmarcDoctorInfoDBModel(**r) for r in result] @@ -197,5 +193,3 @@ class UltmarcDoctorRepository(BaseRepository): except Exception as e: logger.exception(f"DB Error : Exception={e.args}") raise e - finally: - self._database.disconnect() diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py index cd2464cd..708c30a9 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py @@ -31,7 +31,6 @@ class UltmarcDoctorWrkplaceHisRepository(BaseRepository): def fetch_many(self, id) -> list[UltmarcDoctorWrkplaceHisDBModel]: try: - self._database.connect() query = self.FETCH_SQL result = self._database.execute_select(query, {'id': id}) models = [UltmarcDoctorWrkplaceHisDBModel(**r) for r in result] @@ -41,5 +40,3 @@ class UltmarcDoctorWrkplaceHisRepository(BaseRepository): except Exception as e: logger.exception(f"DB Error : Exception={e.args}") raise e - finally: - self._database.disconnect() diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py index 0e98f64b..fc42685a 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py @@ -30,7 +30,6 @@ class UltmarcDoctorWrkplaceRepository(BaseRepository): def fetch_many(self, id) -> list[UltmarcDoctorWrkplaceDBModel]: try: - self._database.connect() query = self.FETCH_SQL result = self._database.execute_select(query, {'id': id}) models = [UltmarcDoctorWrkplaceDBModel(**r) for r in result] @@ -40,8 +39,6 @@ class UltmarcDoctorWrkplaceRepository(BaseRepository): except Exception as e: logger.exception(f"DB Error : Exception={e.args}") raise e - finally: - self._database.disconnect() FETCH_COUNT_SQL = """\ SELECT COUNT(*) AS count @@ -51,7 +48,6 @@ class UltmarcDoctorWrkplaceRepository(BaseRepository): def fetch_count(self, id) -> UltmarcDoctorWrkplaceCountDBModel: try: - self._database.connect() query = self.FETCH_COUNT_SQL result = self._database.execute_select(query, {'id': id}) models = [UltmarcDoctorWrkplaceCountDBModel(**r) for r in result] @@ -61,5 +57,3 @@ class UltmarcDoctorWrkplaceRepository(BaseRepository): except Exception as e: logger.exception(f"DB Error : Exception={e.args}") raise e - finally: - self._database.disconnect() diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py index 3b485402..6a86c9df 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py @@ -39,7 +39,6 @@ class UltmarcInstRepository(BaseRepository): def fetch_many(self, parameter: UltmarcInstSearchModel) -> list[UltmarcInstDBModel]: try: - self._database.connect() # 文字列の検索を部分一致にするため、モデルをコピー。以降はこのコピーを使用する。 clone_parameter = UltmarcInstSearchModel(**parameter.model_dump()) where_clause = self.__build_condition(clone_parameter) @@ -52,8 +51,6 @@ class UltmarcInstRepository(BaseRepository): except Exception as e: logger.exception(f"DB Error : Exception={e.args}") raise e - finally: - self._database.disconnect() def __build_condition(self, parameter: UltmarcInstSearchModel): where_clauses: list[SQLCondition] = [] @@ -188,7 +185,6 @@ class UltmarcInstRepository(BaseRepository): def fetch_one(self, id) -> UltmarcInstInfoDBModel: try: - self._database.connect() query = self.FETCH_ONE_SQL result = self._database.execute_select(query, {'id': id}) models = [UltmarcInstInfoDBModel(**r) for r in result] @@ -198,5 +194,3 @@ class UltmarcInstRepository(BaseRepository): except Exception as e: logger.exception(f"DB Error : Exception={e.args}") raise e - finally: - self._database.disconnect() diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_inst_trt_course_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_inst_trt_course_repository.py index 0c6c2827..9fb36a8a 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_inst_trt_course_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_inst_trt_course_repository.py @@ -18,7 +18,6 @@ class UltmarcInstTrtCourseRepository(BaseRepository): def fetch_many(self, id) -> list[UltmarcInstTrtCourseDBModel]: try: - self._database.connect() query = self.FETCH_SQL result = self._database.execute_select(query, {'id': id}) @@ -29,5 +28,3 @@ class UltmarcInstTrtCourseRepository(BaseRepository): except Exception as e: logger.exception(f"DB Error : Exception={e.args}") raise e - finally: - self._database.disconnect() diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_sosiety_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_sosiety_repository.py index 0cd55e8c..97418a9a 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_sosiety_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_sosiety_repository.py @@ -18,7 +18,6 @@ class UltmarcSosietyRepository(BaseRepository): def fetch_many(self, id) -> list[UltmarcSosietyDBModel]: try: - self._database.connect() query = self.FETCH_SQL result = self._database.execute_select(query, {'id': id}) models = [UltmarcSosietyDBModel(**r) for r in result] @@ -28,5 +27,3 @@ class UltmarcSosietyRepository(BaseRepository): except Exception as e: logger.exception(f"DB Error : Exception={e.args}") raise e - finally: - self._database.disconnect() diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_specialist_license_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_specialist_license_repository.py index 7024b616..1e331142 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_specialist_license_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_specialist_license_repository.py @@ -20,7 +20,6 @@ class UltmarcSpecialistLicenseRepository(BaseRepository): def fetch_many(self, id) -> UltmarcSpecialistLicenseDBModel: try: - self._database.connect() query = self.FETCH_SQL result = self._database.execute_select(query, {'id': id}) models = [UltmarcSpecialistLicenseDBModel(**r) for r in result] @@ -30,5 +29,3 @@ class UltmarcSpecialistLicenseRepository(BaseRepository): except Exception as e: logger.exception(f"DB Error : Exception={e.args}") raise e - finally: - self._database.disconnect() diff --git a/ecs/jskult-webapp/src/repositories/ultmarc_trt_course_repository.py b/ecs/jskult-webapp/src/repositories/ultmarc_trt_course_repository.py index 5709a361..16eaa8fe 100644 --- a/ecs/jskult-webapp/src/repositories/ultmarc_trt_course_repository.py +++ b/ecs/jskult-webapp/src/repositories/ultmarc_trt_course_repository.py @@ -18,7 +18,6 @@ class UltmarcDrTrtCourseRepository(BaseRepository): def fetch_many(self, id) -> list[UltmarcDrTrtCourseDBModel]: try: - self._database.connect() query = self.FETCH_SQL result = self._database.execute_select(query, {'id': id}) @@ -29,5 +28,3 @@ class UltmarcDrTrtCourseRepository(BaseRepository): except Exception as e: logger.exception(f"DB Error : Exception={e.args}") raise e - finally: - self._database.disconnect() diff --git a/ecs/jskult-webapp/src/repositories/user_master_repository.py b/ecs/jskult-webapp/src/repositories/user_master_repository.py index d109c57e..7edde00a 100644 --- a/ecs/jskult-webapp/src/repositories/user_master_repository.py +++ b/ecs/jskult-webapp/src/repositories/user_master_repository.py @@ -17,7 +17,6 @@ class UserMasterRepository(BaseRepository): def fetch_one(self, parameter: dict) -> UserMasterModel: try: - self._database.connect() query = self.FETCH_SQL result = self._database.execute_select(query, parameter) models = [UserMasterModel(**r) for r in result] @@ -27,5 +26,3 @@ class UserMasterRepository(BaseRepository): except Exception as e: logger.exception(f"DB Error : Exception={e}") raise e - finally: - self._database.disconnect() diff --git a/ecs/jskult-webapp/src/repositories/wholesaler_master_repository.py b/ecs/jskult-webapp/src/repositories/wholesaler_master_repository.py index e9229d8e..0ed59753 100644 --- a/ecs/jskult-webapp/src/repositories/wholesaler_master_repository.py +++ b/ecs/jskult-webapp/src/repositories/wholesaler_master_repository.py @@ -31,7 +31,6 @@ class WholesalerMasterRepository(BaseRepository): def fetch_all(self) -> list[WholesalerMasterModel]: try: - self._database.connect() result = self._database.execute_select(self.FETCH_SQL) result_data = [res for res in result] models = [WholesalerMasterModel(**r) for r in result_data] @@ -39,5 +38,3 @@ class WholesalerMasterRepository(BaseRepository): except Exception as e: logger.exception(f"DB Error : Exception={e}") raise e - finally: - self._database.disconnect()