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

feat: リポジトリクラスのエラーログ出力をloggerに統一

Browse Source
This commit is contained in:
shimoda.m@nds-tyo.co.jp 2023-07-06 10:41:16 +09:00
parent 5595717d0c
commit a114aacf95
13 changed files with 60 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ecs/jskult-webapp/src/model/db/ultmarc_trt_course.py
View File

@ -5,5 +5,5 @@ from src.util.sanitize import sanitize
@sanitize
class UltmarcTrtCourseDBModel(BaseDBModel):
class UltmarcDrTrtCourseDBModel(BaseDBModel):
trt_course_name: Optional[str]

4
ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
View File

@ -10,7 +10,7 @@ from src.model.db.ultmarc_doctor_wrkplace_his import \
from src.model.db.ultmarc_sosiety import UltmarcSosietyDBModel
from src.model.db.ultmarc_specialist_license import \
UltmarcSpecialistLicenseDBModel
from src.model.db.ultmarc_trt_course import UltmarcTrtCourseDBModel
from src.model.db.ultmarc_trt_course import UltmarcDrTrtCourseDBModel
from src.system_var import environment
@ -18,7 +18,7 @@ class UltmarcDoctorInfoViewModel(BaseModel):
subtitle: str = '医師情報'
is_batch_processing: Optional[bool]
doctor_info_data: Optional[UltmarcDoctorInfoDBModel]
trt_coursed_data: Optional[list[UltmarcTrtCourseDBModel]]
trt_coursed_data: Optional[list[UltmarcDrTrtCourseDBModel]]
sosiety_data: Optional[list[UltmarcSosietyDBModel]]
specialist_license_data: Optional[list[UltmarcSpecialistLicenseDBModel]]
doctor_wrkplace_data: Optional[list[UltmarcDoctorWrkplaceDBModel]]

7
ecs/jskult-webapp/src/repositories/inst_master_repository.py
View File

@ -1,6 +1,9 @@
from src.logging.get_logger import get_logger
from src.model.db.inst_div_master import InstDivMasterModel
from src.repositories.base_repository import BaseRepository
logger = get_logger('COM_施設区分取得')
class InstDivMasterRepository(BaseRepository):
@ -21,9 +24,7 @@ class InstDivMasterRepository(BaseRepository):
models = [InstDivMasterModel(**r) for r in result_data]
return models
except Exception as e:
# TODO: ファイルへの書き出しはloggerでやる
print(f"[ERROR] getOroshiData DB Error. ")
print(f"[ERROR] ErrorMessage: {e.args}")
logger.exception(f"DB Error : Exception={e.args}")
raise e
finally:
self._database.disconnect()

7
ecs/jskult-webapp/src/repositories/prefc_master_repository.py
View File

@ -1,6 +1,9 @@
from src.logging.get_logger import get_logger
from src.model.db.prefc_master import PrefcMasterModel
from src.repositories.base_repository import BaseRepository
logger = get_logger('都道府県マスタ取得')
class PrefcMasterRepository(BaseRepository):
@ -23,9 +26,7 @@ class PrefcMasterRepository(BaseRepository):
models = [PrefcMasterModel(**r) for r in result_data]
return models
except Exception as e:
# TODO: ファイルへの書き出しはloggerでやる
print(f"[ERROR] getOroshiData DB Error. ")
print(f"[ERROR] ErrorMessage: {e.args}")
logger.exception(f"DB Error : Exception={e.args}")
raise e
finally:
self._database.disconnect()

16
ecs/jskult-webapp/src/repositories/ultmarc_doctor_repository.py
View File

@ -1,11 +1,15 @@
import mojimoji
from src.db import sql_condition as condition
from src.db.sql_condition import SQLCondition
from src.logging.get_logger import get_logger
from src.model.db.ultmarc_doctor import UltmarcDoctorDBModel
from src.model.db.ultmarc_doctor_info import UltmarcDoctorInfoDBModel
from src.model.request.ultmarc_doctor import UltmarcDoctorSearchModel
from src.repositories.base_repository import BaseRepository
from src.util.string_util import is_not_empty
import mojimoji
logger = get_logger('COM_医師取得')
class UltmarcDoctorRepository(BaseRepository):
@ -56,8 +60,7 @@ class UltmarcDoctorRepository(BaseRepository):
return models
except Exception as e:
# TODO: ファイルへの書き出しはloggerでやる
print(f"[ERROR] DB Error : Exception={e.args}")
logger.exception(f"DB Error : Exception={e.args}")
raise e
finally:
self._database.disconnect()
@ -79,7 +82,7 @@ class UltmarcDoctorRepository(BaseRepository):
if is_not_empty(parameter.dr_name_kana):
# 必ず部分一致で検索
# ひらがなを全角カタカナへ変換
zenkaku_katakana = ''.join([chr(n+96) if (12352 < n and n < 12439) or n == 12445 or n == 12446 else chr(n)
zenkaku_katakana = ''.join([chr(n + 96) if (12352 < n and n < 12439) or n == 12445 or n == 12446 else chr(n)
for n in [ord(c) for c in parameter.dr_name_kana]])
# 全角カタカナを半角カタカナへ変換
hankaku_katakana = mojimoji.zen_to_han(zenkaku_katakana)
@ -101,7 +104,7 @@ class UltmarcDoctorRepository(BaseRepository):
if is_not_empty(parameter.form_inst_name_kana):
# 必ず部分一致で検索
# ひらがなを全角カタカナへ変換
zenkaku_katakana = ''.join([chr(n+96) if (12352 < n and n < 12439) or n == 12445 or n == 12446 else chr(n)
zenkaku_katakana = ''.join([chr(n + 96) if (12352 < n and n < 12439) or n == 12445 or n == 12446 else chr(n)
for n in [ord(c) for c in parameter.form_inst_name_kana]])
# 全角カタカナを半角カタカナへ変換
hankaku_katakana = mojimoji.zen_to_han(zenkaku_katakana)
@ -178,8 +181,7 @@ class UltmarcDoctorRepository(BaseRepository):
return None
return models[0]
except Exception as e:
# TODO: ファイルへの書き出しはloggerでやる
print(f"[ERROR] DB Error : Exception={e.args}")
logger.exception(f"DB Error : Exception={e.args}")
raise e
finally:
self._database.disconnect()

6
ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_his_repository.py
View File

@ -1,7 +1,10 @@
from src.logging.get_logger import get_logger
from src.model.db.ultmarc_doctor_wrkplace_his import \
UltmarcDoctorWrkplaceHisDBModel
from src.repositories.base_repository import BaseRepository
logger = get_logger('COM_医師勤務先履歴取得')
class UltmarcDoctorWrkplaceHisRepository(BaseRepository):
@ -35,8 +38,7 @@ class UltmarcDoctorWrkplaceHisRepository(BaseRepository):
return None
return models
except Exception as e:
# TODO: ファイルへの書き出しはloggerでやる
print(f"[ERROR] DB Error : Exception={e.args}")
logger.exception(f"DB Error : Exception={e.args}")
raise e
finally:
self._database.disconnect()

9
ecs/jskult-webapp/src/repositories/ultmarc_dr_wrkplace_repository.py
View File

@ -1,8 +1,11 @@
from src.logging.get_logger import get_logger
from src.model.db.ultmarc_doctor_wrkplace import UltmarcDoctorWrkplaceDBModel
from src.model.db.ultmarc_doctor_wrkplace_count import \
UltmarcDoctorWrkplaceCountDBModel
from src.repositories.base_repository import BaseRepository
logger = get_logger('COM_医師勤務先取得')
class UltmarcDoctorWrkplaceRepository(BaseRepository):
@ -34,8 +37,7 @@ class UltmarcDoctorWrkplaceRepository(BaseRepository):
return None
return models
except Exception as e:
# TODO: ファイルへの書き出しはloggerでやる
print(f"[ERROR] DB Error : Exception={e.args}")
logger.exception(f"DB Error : Exception={e.args}")
raise e
finally:
self._database.disconnect()
@ -56,8 +58,7 @@ class UltmarcDoctorWrkplaceRepository(BaseRepository):
return 0
return models[0].count
except Exception as e:
# TODO: ファイルへの書き出しはloggerでやる
print(f"[ERROR] DB Error : Exception={e.args}")
logger.exception(f"DB Error : Exception={e.args}")
raise e
finally:
self._database.disconnect()

14
ecs/jskult-webapp/src/repositories/ultmarc_inst_repository.py
View File

@ -1,11 +1,15 @@
import mojimoji
from src.db import sql_condition as condition
from src.db.sql_condition import SQLCondition
from src.logging.get_logger import get_logger
from src.model.db.ultmarc_inst import UltmarcInstDBModel
from src.model.db.ultmarc_inst_info import UltmarcInstInfoDBModel
from src.model.request.ultmarc_inst import UltmarcInstSearchModel
from src.repositories.base_repository import BaseRepository
from src.util.string_util import is_not_empty
import mojimoji
logger = get_logger('COM_施設取得')
class UltmarcInstRepository(BaseRepository):
@ -43,8 +47,7 @@ class UltmarcInstRepository(BaseRepository):
return models
except Exception as e:
# TODO: ファイルへの書き出しはloggerでやる
print(f"[ERROR] DB Error : Exception={e.args}")
logger.exception(f"DB Error : Exception={e.args}")
raise e
finally:
self._database.disconnect()
@ -72,7 +75,7 @@ class UltmarcInstRepository(BaseRepository):
if is_not_empty(parameter.form_inst_name_kana):
# 部分一致検索
# ひらがなを全角カタカナへ変換
zenkaku_katakana = ''.join([chr(n+96) if (12352 < n and n < 12439) or n == 12445 or n == 12446 else chr(n)
zenkaku_katakana = ''.join([chr(n + 96) if (12352 < n and n < 12439) or n == 12445 or n == 12446 else chr(n)
for n in [ord(c) for c in parameter.form_inst_name_kana]])
# 全角カタカナを半角カタカナへ変換
hankaku_katakana = mojimoji.zen_to_han(zenkaku_katakana)
@ -187,8 +190,7 @@ class UltmarcInstRepository(BaseRepository):
return None
return models[0]
except Exception as e:
# TODO: ファイルへの書き出しはloggerでやる
print(f"[ERROR] DB Error : Exception={e.args}")
logger.exception(f"DB Error : Exception={e.args}")
raise e
finally:
self._database.disconnect()

6
ecs/jskult-webapp/src/repositories/ultmarc_inst_trt_course_repository.py
View File

@ -1,6 +1,9 @@
from src.logging.get_logger import get_logger
from src.model.db.ultmarc_inst_trt_course import UltmarcInstTrtCourseDBModel
from src.repositories.base_repository import BaseRepository
logger = get_logger('COM_施設診療科目取得')
class UltmarcInstTrtCourseRepository(BaseRepository):
@ -24,8 +27,7 @@ class UltmarcInstTrtCourseRepository(BaseRepository):
return None
return models
except Exception as e:
# TODO: ファイルへの書き出しはloggerでやる
print(f"[ERROR] DB Error : Exception={e.args}")
logger.exception(f"DB Error : Exception={e.args}")
raise e
finally:
self._database.disconnect()

6
ecs/jskult-webapp/src/repositories/ultmarc_sosiety_repository.py
View File

@ -1,6 +1,9 @@
from src.logging.get_logger import get_logger
from src.model.db.ultmarc_sosiety import UltmarcSosietyDBModel
from src.repositories.base_repository import BaseRepository
logger = get_logger('COM_学会取得')
class UltmarcSosietyRepository(BaseRepository):
@ -23,8 +26,7 @@ class UltmarcSosietyRepository(BaseRepository):
return None
return models
except Exception as e:
# TODO: ファイルへの書き出しはloggerでやる
print(f"[ERROR] DB Error : Exception={e.args}")
logger.exception(f"DB Error : Exception={e.args}")
raise e
finally:
self._database.disconnect()

6
ecs/jskult-webapp/src/repositories/ultmarc_specialist_license_repository.py
View File

@ -1,7 +1,10 @@
from src.logging.get_logger import get_logger
from src.model.db.ultmarc_specialist_license import \
UltmarcSpecialistLicenseDBModel
from src.repositories.base_repository import BaseRepository
logger = get_logger('COM_専門医資格取得')
class UltmarcSpecialistLicenseRepository(BaseRepository):
@ -25,8 +28,7 @@ class UltmarcSpecialistLicenseRepository(BaseRepository):
return None
return models
except Exception as e:
# TODO: ファイルへの書き出しはloggerでやる
print(f"[ERROR] DB Error : Exception={e.args}")
logger.exception(f"DB Error : Exception={e.args}")
raise e
finally:
self._database.disconnect()

14
ecs/jskult-webapp/src/repositories/ultmarc_trt_course_repository.py
View File

@ -1,8 +1,11 @@
from src.model.db.ultmarc_trt_course import UltmarcTrtCourseDBModel
from src.logging.get_logger import get_logger
from src.model.db.ultmarc_trt_course import UltmarcDrTrtCourseDBModel
from src.repositories.base_repository import BaseRepository
logger = get_logger('COM_医師診療科目取得')
class UltmarcTrtCourseRepository(BaseRepository):
class UltmarcDrTrtCourseRepository(BaseRepository):
FETCH_SQL = """\
SELECT trt_course_name
@ -13,19 +16,18 @@ class UltmarcTrtCourseRepository(BaseRepository):
ORDER BY com_trt_course.trt_course_cd
"""
def fetch_many(self, id) -> list[UltmarcTrtCourseDBModel]:
def fetch_many(self, id) -> list[UltmarcDrTrtCourseDBModel]:
try:
self._database.connect()
query = self.FETCH_SQL
result = self._database.execute_select(query, {'id': id})
models = [UltmarcTrtCourseDBModel(**r) for r in result]
models = [UltmarcDrTrtCourseDBModel(**r) for r in result]
if len(models) == 0:
return None
return models
except Exception as e:
# TODO: ファイルへの書き出しはloggerでやる
print(f"[ERROR] DB Error : Exception={e.args}")
logger.exception(f"DB Error : Exception={e.args}")
raise e
finally:
self._database.disconnect()

6
ecs/jskult-webapp/src/services/ultmarc_view_service.py
View File

@ -23,7 +23,7 @@ from src.repositories.ultmarc_sosiety_repository import \
from src.repositories.ultmarc_specialist_license_repository import \
UltmarcSpecialistLicenseRepository
from src.repositories.ultmarc_trt_course_repository import \
UltmarcTrtCourseRepository
UltmarcDrTrtCourseRepository
from src.services.base_service import BaseService
@ -33,7 +33,7 @@ class UltmarcViewService(BaseService):
'prefc_repository': PrefcMasterRepository,
'inst_div_repository': InstDivMasterRepository,
'ultmarc_inst_repository': UltmarcInstRepository,
'ultmarc_trt_course_repository': UltmarcTrtCourseRepository,
'ultmarc_trt_course_repository': UltmarcDrTrtCourseRepository,
'ultmarc_inst_trt_course_repository': UltmarcInstTrtCourseRepository,
'ultmarc_sosiety_repository': UltmarcSosietyRepository,
'ultmarc_doctor_wrkplace_repository': UltmarcDoctorWrkplaceRepository,
@ -45,7 +45,7 @@ class UltmarcViewService(BaseService):
prefc_repository: PrefcMasterRepository
inst_div_repository: InstDivMasterRepository
ultmarc_inst_repository: UltmarcInstRepository
ultmarc_trt_course_repository: UltmarcTrtCourseRepository
ultmarc_trt_course_repository: UltmarcDrTrtCourseRepository
ultmarc_inst_trt_course_repository: UltmarcInstTrtCourseRepository
ultmarc_sosiety_repository: UltmarcSosietyRepository
ultmarc_doctor_wrkplace_repository: UltmarcDoctorWrkplaceRepository