diff --git a/ecs/jskult-webapp/src/controller/master_mainte.py b/ecs/jskult-webapp/src/controller/master_mainte.py index ac9fa50b..e9d4ed14 100644 --- a/ecs/jskult-webapp/src/controller/master_mainte.py +++ b/ecs/jskult-webapp/src/controller/master_mainte.py @@ -19,6 +19,7 @@ from src.model.view.master_mainte_menu_view_model import \ from src.model.view.table_override_view_model import TableOverrideViewModel from src.router.session_router import AuthenticatedRoute from src.services.batch_status_service import BatchStatusService +from src.services.login_service import LoginService from src.services.master_mainte_service import MasterMainteService from src.system_var import constants from src.templates import templates @@ -164,7 +165,8 @@ def new_inst_result_view( request: Request, csv_upload_form: Optional[MasterMainteCsvUpModel] = Depends(MasterMainteCsvUpModel.as_form), master_mainte_service: MasterMainteService = Depends(get_service(MasterMainteService)), - batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService)) + batch_status_service: BatchStatusService = Depends(get_service(BatchStatusService)), + login_service: LoginService = Depends(get_service(LoginService)) ): session: UserSession = request.session @@ -179,9 +181,10 @@ def new_inst_result_view( # dump処理中の場合、ログアウトさせる if batch_status_service.is_dump_processing(): raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail=constants.LOGOUT_REASON_BACKUP_PROCESSING) - - # 画面表示用のモデル - mainte_csv_up = master_mainte_service.prepare_mainte_new_inst_view(session.user_id, csv_upload_form) + # ユーザIDからユーザ名を取得 + user_name = login_service.logged_in_user(session.user_id).user_name + # CSVデータを登録し、登録完了画面のモデルを返却する + mainte_csv_up = master_mainte_service.prepare_mainte_new_inst_view(user_name, csv_upload_form) # レスポンス session_key = session.session_key