From d586bf68efbee40741b179ba45b1a6030a190e7a Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 31 Mar 2023 14:44:07 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20URL=E3=83=91=E3=82=B9=E4=B8=80=E8=A6=A7?= =?UTF-8?q?=E3=81=AE=E8=A1=A8=E8=A8=98=E3=81=AB=E5=90=88=E3=82=8F=E3=81=9B?= =?UTF-8?q?=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-webapp/src/controller/bio.py | 4 ++-- ecs/jskult-webapp/src/controller/bio_download.py | 2 +- ecs/jskult-webapp/src/controller/healthcheck.py | 2 +- ecs/jskult-webapp/src/controller/login.py | 4 ++-- ecs/jskult-webapp/src/controller/logout.py | 6 +++--- ecs/jskult-webapp/src/controller/menu.py | 2 +- ecs/jskult-webapp/src/main.py | 12 ++++++------ .../src/model/db/pharmacy_product_master.py | 4 +++- ecs/jskult-webapp/src/model/db/wholesaler_master.py | 10 ++++++---- ecs/jskult-webapp/src/templates/bioSearchList.html | 2 +- ecs/jskult-webapp/src/templates/maintlogin.html | 4 +--- 11 files changed, 27 insertions(+), 25 deletions(-) diff --git a/ecs/jskult-webapp/src/controller/bio.py b/ecs/jskult-webapp/src/controller/bio.py index cf191331..a54909bd 100644 --- a/ecs/jskult-webapp/src/controller/bio.py +++ b/ecs/jskult-webapp/src/controller/bio.py @@ -21,7 +21,7 @@ router.route_class = AuthenticatedRoute ######################### # Views # ######################### -@router.get('/bio/BioSearchList') +@router.get('/BioSearchList') def bio_view( request: Request, batch_status_service:BatchStatusService=Depends(get_service(BatchStatusService)), @@ -50,7 +50,7 @@ def bio_view( ) return templates_response -@router.post('/bio/BioSearchList') +@router.post('/BioSearchList') def search_bio( request: Request, bio_form: Optional[BioModel] = Depends(BioModel.as_form), diff --git a/ecs/jskult-webapp/src/controller/bio_download.py b/ecs/jskult-webapp/src/controller/bio_download.py index 576e7a83..67593fb7 100644 --- a/ecs/jskult-webapp/src/controller/bio_download.py +++ b/ecs/jskult-webapp/src/controller/bio_download.py @@ -23,7 +23,7 @@ router = APIRouter() ######################### # APIs # ######################### -@router.post('/api/bio/download') +@router.post('/download') async def download_bio_data( search_param: BioModel=Depends(BioModel.as_body), download_param: BioDownloadModel=Depends(BioDownloadModel.as_body), diff --git a/ecs/jskult-webapp/src/controller/healthcheck.py b/ecs/jskult-webapp/src/controller/healthcheck.py index b36abc8d..bd571edd 100644 --- a/ecs/jskult-webapp/src/controller/healthcheck.py +++ b/ecs/jskult-webapp/src/controller/healthcheck.py @@ -5,6 +5,6 @@ router = APIRouter() ######################### # Views # ######################### -@router.get('/healthcheck') +@router.get('/') def healthcheck(): return {'status': 'OK'} diff --git a/ecs/jskult-webapp/src/controller/login.py b/ecs/jskult-webapp/src/controller/login.py index 35550850..a7bc6808 100644 --- a/ecs/jskult-webapp/src/controller/login.py +++ b/ecs/jskult-webapp/src/controller/login.py @@ -53,8 +53,8 @@ def login_maintenance_view(request: Request): ######################### # APIs # ######################### -@router.post('/login') -def sso_authorize( +@router.post('/maintlogin') +def login( response: Response, request: LoginModel = Depends(LoginModel.as_form), login_service: LoginService = Depends(get_service(LoginService)) diff --git a/ecs/jskult-webapp/src/controller/logout.py b/ecs/jskult-webapp/src/controller/logout.py index 252e2a01..8cad1b5f 100644 --- a/ecs/jskult-webapp/src/controller/logout.py +++ b/ecs/jskult-webapp/src/controller/logout.py @@ -14,16 +14,16 @@ router = APIRouter() ######################### # Views # ######################### -@router.get('/logout', response_class=HTMLResponse) +@router.get('/', response_class=HTMLResponse) def logout_view( request: Request, reason: Optional[str] = None, session: Union[UserSession, None]=Depends(verify_session) ): - redirect_to = '/userlogin' + redirect_to = '/login/userlogin' link_text = 'MeDaCA機能メニューへ' if session is not None and session.user_flg == '1': - redirect_to = '/maintlogin' + redirect_to = '/login/maintlogin' link_text = 'Login画面に戻る' logout = LogoutViewModel() logout.redirect_to = redirect_to diff --git a/ecs/jskult-webapp/src/controller/menu.py b/ecs/jskult-webapp/src/controller/menu.py index 26cf9482..a9e450bb 100644 --- a/ecs/jskult-webapp/src/controller/menu.py +++ b/ecs/jskult-webapp/src/controller/menu.py @@ -16,7 +16,7 @@ router.route_class = AuthenticatedRoute ######################### # Views # ######################### -@router.get('/menu', response_class=HTMLResponse) +@router.get('/', response_class=HTMLResponse) def menu_view( request: Request, batch_status_service:BatchStatusService=Depends(get_service(BatchStatusService)) diff --git a/ecs/jskult-webapp/src/main.py b/ecs/jskult-webapp/src/main.py index fbc990cf..f00f5ac3 100644 --- a/ecs/jskult-webapp/src/main.py +++ b/ecs/jskult-webapp/src/main.py @@ -15,18 +15,18 @@ app = FastAPI() # 静的ファイルをマウント app.mount('/static', StaticFiles(directory=path.dirname(static.__file__)), name='static') # ログイン関連のルーター -app.include_router(login.router) +app.include_router(login.router, prefix='/login') # ログアウト関連のルーター -app.include_router(logout.router) +app.include_router(logout.router, prefix='/logout') # メニュー画面関連のルーター -app.include_router(menu.router) +app.include_router(menu.router, prefix='/menu') # 生物由来関連のルーター -app.include_router(bio.router) +app.include_router(bio.router, prefix='/bio') # 生物由来のダウンロード用APIルーター。 # クライアントから非同期呼出しされるため、共通ルーターとは異なる扱いとする。 -app.include_router(bio_download.router) +app.include_router(bio_download.router, prefix='/bio') # ヘルスチェック用のルーター -app.include_router(healthcheck.router) +app.include_router(healthcheck.router, prefix='/healthcheck') # エラー発生時にログアウト画面に遷移させるハンドラー app.add_exception_handler(status.HTTP_401_UNAUTHORIZED, http_exception_handler) diff --git a/ecs/jskult-webapp/src/model/db/pharmacy_product_master.py b/ecs/jskult-webapp/src/model/db/pharmacy_product_master.py index e26f4381..863fd87d 100644 --- a/ecs/jskult-webapp/src/model/db/pharmacy_product_master.py +++ b/ecs/jskult-webapp/src/model/db/pharmacy_product_master.py @@ -1,5 +1,7 @@ +from typing import Optional + from src.model.db.base_db_model import BaseDBModel class PharmacyProductMasterModel(BaseDBModel): - mkr_cd_nm: str + mkr_cd_nm: Optional[str] diff --git a/ecs/jskult-webapp/src/model/db/wholesaler_master.py b/ecs/jskult-webapp/src/model/db/wholesaler_master.py index 90cccc3f..762711a5 100644 --- a/ecs/jskult-webapp/src/model/db/wholesaler_master.py +++ b/ecs/jskult-webapp/src/model/db/wholesaler_master.py @@ -1,8 +1,10 @@ +from typing import Optional + from src.model.db.base_db_model import BaseDBModel class WholesalerMasterModel(BaseDBModel): - rec_whs_cd: str - rec_whs_sub_cd: str - nm: str - whs_nm: str + rec_whs_cd: Optional[str] + rec_whs_sub_cd: Optional[str] + nm: Optional[str] + whs_nm: Optional[str] diff --git a/ecs/jskult-webapp/src/templates/bioSearchList.html b/ecs/jskult-webapp/src/templates/bioSearchList.html index b5984481..cc208efd 100644 --- a/ecs/jskult-webapp/src/templates/bioSearchList.html +++ b/ecs/jskult-webapp/src/templates/bioSearchList.html @@ -211,7 +211,7 @@ $.ajax({ type: "POST", - url: "/api/bio/download", + url: "/bio/download", contentType: 'application/json', data: JSON.stringify(downloadRequestParams), scriptCharset: 'utf-8', diff --git a/ecs/jskult-webapp/src/templates/maintlogin.html b/ecs/jskult-webapp/src/templates/maintlogin.html index 5c2ac157..06f28098 100644 --- a/ecs/jskult-webapp/src/templates/maintlogin.html +++ b/ecs/jskult-webapp/src/templates/maintlogin.html @@ -13,13 +13,11 @@ Mainte Login

-
+
- -