refactor: simplify schema names and remove provider id columns
This commit is contained in:
@@ -42,7 +42,7 @@ def upsert_user_by_sub(
|
||||
)
|
||||
|
||||
|
||||
def _build_user_role_rows(db: Session, user_sub: str) -> list[tuple[str, str, str, str, str, str, str, str, str]]:
|
||||
def _build_user_role_rows(db: Session, user_sub: str) -> list[tuple[str, str, str, str, str, str, str, str]]:
|
||||
users_repo = UsersRepository(db)
|
||||
user_sites_repo = UserSitesRepository(db)
|
||||
|
||||
@@ -56,12 +56,11 @@ def _build_user_role_rows(db: Session, user_sub: str) -> list[tuple[str, str, st
|
||||
site.site_key,
|
||||
site.display_name,
|
||||
company.company_key,
|
||||
company.display_name,
|
||||
company.name,
|
||||
system.system_key,
|
||||
system.name,
|
||||
role.role_key,
|
||||
role.name,
|
||||
role.provider_role_name,
|
||||
)
|
||||
for site, company, role, system in rows
|
||||
]
|
||||
@@ -82,7 +81,6 @@ def get_user_roles(user_sub: str, db: Session = Depends(get_db)) -> InternalUser
|
||||
system_name=system_name,
|
||||
role_key=role_key,
|
||||
role_name=role_name,
|
||||
provider_role_name=provider_role_name,
|
||||
)
|
||||
for (
|
||||
site_key,
|
||||
@@ -93,7 +91,6 @@ def get_user_roles(user_sub: str, db: Session = Depends(get_db)) -> InternalUser
|
||||
system_name,
|
||||
role_key,
|
||||
role_name,
|
||||
provider_role_name,
|
||||
) in rows
|
||||
],
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user