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

feat:ユーザマスタ定義変更対応

Browse Source
This commit is contained in:
yono 2025-05-27 18:02:49 +09:00
parent f04455d803
commit af2d86899c
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ecs/jskult-webapp/src/controller/login.py
View File

@ -111,9 +111,9 @@ def login(
id_token=verified_token.id_token, id_token=verified_token.id_token,
refresh_token=verified_token.refresh_token, refresh_token=verified_token.refresh_token,
csrf_token=csrf_token, csrf_token=csrf_token,
bio_flg=user_record.auth_flg1, bio_flg=user_record.bio_sales_inq_auth_flg,
doc_flg=user_record.auth_flg2, doc_flg=user_record.ult_doctor_inq_auth_flg,
inst_flg=user_record.auth_flg3, inst_flg=user_record.ult_inst_inq_auth_flg,
master_mainte_flg=user_record.auth_flg4, master_mainte_flg=user_record.auth_flg4,
user_flg=user_record.mntuser_flg user_flg=user_record.mntuser_flg
) )
@ -170,9 +170,9 @@ def sso_authorize(
id_token=verified_token.id_token, id_token=verified_token.id_token,
refresh_token=verified_token.refresh_token, refresh_token=verified_token.refresh_token,
csrf_token=csrf_token, csrf_token=csrf_token,
bio_flg=user_record.auth_flg1, bio_flg=user_record.bio_sales_inq_auth_flg,
doc_flg=user_record.auth_flg2, doc_flg=user_record.ult_doctor_inq_auth_flg,
inst_flg=user_record.auth_flg3, inst_flg=user_record.ult_inst_inq_auth_flg,
master_mainte_flg=user_record.auth_flg4, master_mainte_flg=user_record.auth_flg4,
user_flg=user_record.mntuser_flg user_flg=user_record.mntuser_flg
) )

8
ecs/jskult-webapp/src/model/db/user_master.py
View File

@ -8,16 +8,16 @@ class UserMasterModel(BaseDBModel):
user_id: Optional[str] user_id: Optional[str]
mail_adr: Optional[str] mail_adr: Optional[str]
user_name: Optional[str] user_name: Optional[str]
auth_flg1: Optional[int] bio_sales_inq_auth_flg: Optional[int]
auth_flg2: Optional[int] ult_doctor_inq_auth_flg: Optional[int]
auth_flg3: Optional[int] ult_inst_inq_auth_flg: Optional[int]
auth_flg4: Optional[int] auth_flg4: Optional[int]
auth_flg5: Optional[int] auth_flg5: Optional[int]
auth_flg6: Optional[int] auth_flg6: Optional[int]
auth_flg7: Optional[int] auth_flg7: Optional[int]
auth_flg8: Optional[int] auth_flg8: Optional[int]
auth_flg9: Optional[int] auth_flg9: Optional[int]
auth_flg10: Optional[int] bio_sales_inq_auth_flg0: Optional[int]
pwd: Optional[str] pwd: Optional[str]
enabled_flg: Optional[str] enabled_flg: Optional[str]
creater: Optional[str] creater: Optional[str]

8
ecs/jskult-webapp/src/model/view/user_view_model.py
View File

@ -6,10 +6,10 @@ from src.system_var import constants
class UserViewModel(BaseModel): class UserViewModel(BaseModel):
bio_flg: Optional[int] # AUTH_FLG1 bio_flg: Optional[int] # bio_sales_inq_auth_flg
doc_flg: Optional[int] # AUTH_FLG2 doc_flg: Optional[int] # ult_doctor_inq_auth_flg
inst_flg: Optional[int] # AUTH_FLG3 inst_flg: Optional[int] # ult_inst_inq_auth_flg
master_mainte_flg: Optional[int] # AUTH_FLG4 # TODO: 削除予定 master_mainte_flg: Optional[int] # AUTH_FLG4
def has_ult_doctor_permission(self): def has_ult_doctor_permission(self):
return self.doc_flg == constants.PERMISSION_ENABLED return self.doc_flg == constants.PERMISSION_ENABLED

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

@ -23,7 +23,7 @@ class UserMasterRepository(BaseRepository):
SELECT SELECT
* *
FROM FROM
src05.user_mst src07.user_mst
WHERE WHERE
user_id = :user_id\ user_id = :user_id\
""" """
@ -44,7 +44,7 @@ class UserMasterRepository(BaseRepository):
try: try:
query = """\ query = """\
UPDATE UPDATE
src05.user_mst src07.user_mst
SET SET
mntuser_login_failed_cnt = mntuser_login_failed_cnt =
CASE CASE
@ -70,7 +70,7 @@ class UserMasterRepository(BaseRepository):
try: try:
query = """\ query = """\
UPDATE UPDATE
src05.user_mst src07.user_mst
SET SET
enabled_flg = 'N' enabled_flg = 'N'
WHERE WHERE