From 739384febdb76e676f1ab3841eac606e7a261f4f Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 28 Jul 2023 09:17:32 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=E3=83=A2=E3=83=87=E3=83=AB?= =?UTF-8?q?=E3=82=AF=E3=83=A9=E3=82=B9=E5=90=8D=E3=81=A8=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E5=90=8D=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...odel.py => ultmarc_doctor_search_view_model.py} | 2 +- ..._model.py => ultmarc_inst_search_view_model.py} | 2 +- .../src/services/ultmarc_view_service.py | 14 ++++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) rename ecs/jskult-webapp/src/model/view/{ultmarc_doctor_view_model.py => ultmarc_doctor_search_view_model.py} (98%) rename ecs/jskult-webapp/src/model/view/{ultmarc_inst_view_model.py => ultmarc_inst_search_view_model.py} (98%) diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_search_view_model.py similarity index 98% rename from ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py rename to ecs/jskult-webapp/src/model/view/ultmarc_doctor_search_view_model.py index b648cb2f..1bfb0289 100644 --- a/ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py +++ b/ecs/jskult-webapp/src/model/view/ultmarc_doctor_search_view_model.py @@ -9,7 +9,7 @@ from src.model.request.ultmarc_doctor import UltmarcDoctorSearchModel from src.system_var import environment -class UltmarcDoctorViewModel(BaseModel): +class UltmarcDoctorSearchViewModel(BaseModel): subtitle: str = '医師検索一覧' is_batch_processing: Optional[bool] prefc_models: list[PrefcMasterModel] diff --git a/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py b/ecs/jskult-webapp/src/model/view/ultmarc_inst_search_view_model.py similarity index 98% rename from ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py rename to ecs/jskult-webapp/src/model/view/ultmarc_inst_search_view_model.py index 126371de..f7dec105 100644 --- a/ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py +++ b/ecs/jskult-webapp/src/model/view/ultmarc_inst_search_view_model.py @@ -10,7 +10,7 @@ from src.model.request.ultmarc_inst import UltmarcInstSearchModel from src.system_var import environment -class UltmarcInstViewModel(BaseModel): +class UltmarcInstSearchViewModel(BaseModel): subtitle: str = '施設検索一覧' is_batch_processing: Optional[bool] prefc_models: list[PrefcMasterModel] diff --git a/ecs/jskult-webapp/src/services/ultmarc_view_service.py b/ecs/jskult-webapp/src/services/ultmarc_view_service.py index 24cf1d75..e210b7c8 100644 --- a/ecs/jskult-webapp/src/services/ultmarc_view_service.py +++ b/ecs/jskult-webapp/src/services/ultmarc_view_service.py @@ -3,10 +3,12 @@ from src.model.request.ultmarc_doctor import UltmarcDoctorSearchModel from src.model.request.ultmarc_inst import UltmarcInstSearchModel from src.model.view.ultmarc_doctor_info_view_model import \ UltmarcDoctorInfoViewModel -from src.model.view.ultmarc_doctor_view_model import UltmarcDoctorViewModel +from src.model.view.ultmarc_doctor_search_view_model import \ + UltmarcDoctorSearchViewModel from src.model.view.ultmarc_inst_info_view_model import \ UltmarcInstInfoViewModel -from src.model.view.ultmarc_inst_view_model import UltmarcInstViewModel +from src.model.view.ultmarc_inst_search_view_model import \ + UltmarcInstSearchViewModel from src.repositories.base_repository import BaseRepository from src.repositories.inst_master_repository import InstDivMasterRepository from src.repositories.prefc_master_repository import PrefcMasterRepository @@ -70,12 +72,12 @@ class UltmarcViewService(BaseService): ######################### def prepare_ultmarc_doctor_search_view( self - ) -> UltmarcDoctorViewModel: + ) -> UltmarcDoctorSearchViewModel: # 医師一覧画面の表示データ取得 # 都道府県リストを取得 prefcs = self.prefc_repository.fetch_all() - ultmarc = UltmarcDoctorViewModel( + ultmarc = UltmarcDoctorSearchViewModel( prefc_models=prefcs ) return ultmarc @@ -118,14 +120,14 @@ class UltmarcViewService(BaseService): ######################### def prepare_ultmarc_inst_search_view( self - ) -> UltmarcInstViewModel: + ) -> UltmarcInstSearchViewModel: # 施設一覧画面の表示データ取得 # 都道府県リストを取得 prefcs = self.prefc_repository.fetch_all() # 施設区分リストを取得 inst_div = self.inst_div_repository.fetch_all() - ultmarc = UltmarcInstViewModel( + ultmarc = UltmarcInstSearchViewModel( prefc_models=prefcs, inst_div_models=inst_div )