From af2d86899c0dcec3dd95f74cbdeecc383b0d1923 Mon Sep 17 00:00:00 2001 From: yono Date: Tue, 27 May 2025 18:02:49 +0900 Subject: [PATCH] =?UTF-8?q?feat:=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=9E?= =?UTF-8?q?=E3=82=B9=E3=82=BF=E5=AE=9A=E7=BE=A9=E5=A4=89=E6=9B=B4=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-webapp/src/controller/login.py | 12 ++++++------ ecs/jskult-webapp/src/model/db/user_master.py | 8 ++++---- ecs/jskult-webapp/src/model/view/user_view_model.py | 8 ++++---- .../src/repositories/user_master_repository.py | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ecs/jskult-webapp/src/controller/login.py b/ecs/jskult-webapp/src/controller/login.py index 9b2c808e..caad063b 100644 --- a/ecs/jskult-webapp/src/controller/login.py +++ b/ecs/jskult-webapp/src/controller/login.py @@ -111,9 +111,9 @@ def login( id_token=verified_token.id_token, refresh_token=verified_token.refresh_token, csrf_token=csrf_token, - bio_flg=user_record.auth_flg1, - doc_flg=user_record.auth_flg2, - inst_flg=user_record.auth_flg3, + bio_flg=user_record.bio_sales_inq_auth_flg, + doc_flg=user_record.ult_doctor_inq_auth_flg, + inst_flg=user_record.ult_inst_inq_auth_flg, master_mainte_flg=user_record.auth_flg4, user_flg=user_record.mntuser_flg ) @@ -170,9 +170,9 @@ def sso_authorize( id_token=verified_token.id_token, refresh_token=verified_token.refresh_token, csrf_token=csrf_token, - bio_flg=user_record.auth_flg1, - doc_flg=user_record.auth_flg2, - inst_flg=user_record.auth_flg3, + bio_flg=user_record.bio_sales_inq_auth_flg, + doc_flg=user_record.ult_doctor_inq_auth_flg, + inst_flg=user_record.ult_inst_inq_auth_flg, master_mainte_flg=user_record.auth_flg4, user_flg=user_record.mntuser_flg ) diff --git a/ecs/jskult-webapp/src/model/db/user_master.py b/ecs/jskult-webapp/src/model/db/user_master.py index d86253ae..04d06d11 100644 --- a/ecs/jskult-webapp/src/model/db/user_master.py +++ b/ecs/jskult-webapp/src/model/db/user_master.py @@ -8,16 +8,16 @@ class UserMasterModel(BaseDBModel): user_id: Optional[str] mail_adr: Optional[str] user_name: Optional[str] - auth_flg1: Optional[int] - auth_flg2: Optional[int] - auth_flg3: Optional[int] + bio_sales_inq_auth_flg: Optional[int] + ult_doctor_inq_auth_flg: Optional[int] + ult_inst_inq_auth_flg: Optional[int] auth_flg4: Optional[int] auth_flg5: Optional[int] auth_flg6: Optional[int] auth_flg7: Optional[int] auth_flg8: Optional[int] auth_flg9: Optional[int] - auth_flg10: Optional[int] + bio_sales_inq_auth_flg0: Optional[int] pwd: Optional[str] enabled_flg: Optional[str] creater: Optional[str] diff --git a/ecs/jskult-webapp/src/model/view/user_view_model.py b/ecs/jskult-webapp/src/model/view/user_view_model.py index bae3af73..332deb22 100644 --- a/ecs/jskult-webapp/src/model/view/user_view_model.py +++ b/ecs/jskult-webapp/src/model/view/user_view_model.py @@ -6,10 +6,10 @@ from src.system_var import constants class UserViewModel(BaseModel): - bio_flg: Optional[int] # AUTH_FLG1 - doc_flg: Optional[int] # AUTH_FLG2 - inst_flg: Optional[int] # AUTH_FLG3 - master_mainte_flg: Optional[int] # AUTH_FLG4 + bio_flg: Optional[int] # bio_sales_inq_auth_flg + doc_flg: Optional[int] # ult_doctor_inq_auth_flg + inst_flg: Optional[int] # ult_inst_inq_auth_flg + # TODO: 削除予定 master_mainte_flg: Optional[int] # AUTH_FLG4 def has_ult_doctor_permission(self): return self.doc_flg == constants.PERMISSION_ENABLED diff --git a/ecs/jskult-webapp/src/repositories/user_master_repository.py b/ecs/jskult-webapp/src/repositories/user_master_repository.py index 3acbc105..b295c2fd 100644 --- a/ecs/jskult-webapp/src/repositories/user_master_repository.py +++ b/ecs/jskult-webapp/src/repositories/user_master_repository.py @@ -23,7 +23,7 @@ class UserMasterRepository(BaseRepository): SELECT * FROM - src05.user_mst + src07.user_mst WHERE user_id = :user_id\ """ @@ -44,7 +44,7 @@ class UserMasterRepository(BaseRepository): try: query = """\ UPDATE - src05.user_mst + src07.user_mst SET mntuser_login_failed_cnt = CASE @@ -70,7 +70,7 @@ class UserMasterRepository(BaseRepository): try: query = """\ UPDATE - src05.user_mst + src07.user_mst SET enabled_flg = 'N' WHERE