member/member-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: rename idp fields to provider naming

Browse Source
This commit is contained in:
Chris
2026-04-03 01:05:01 +08:00
parent ce181ebf67
commit 388a3f461c
26 changed files with 202 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/repositories/companies_repo.py
View File

@@ -36,14 +36,14 @@ class CompaniesRepository:
company_key: str,
display_name: str,
legal_name: str | None,
idp_group_id: str | None = None,
provider_group_id: str | None = None,
status: str = "active",
) -> Company:
item = Company(
company_key=company_key,
display_name=display_name,
legal_name=legal_name,
idp_group_id=idp_group_id,
provider_group_id=provider_group_id,
status=status,
)
self.db.add(item)
@@ -57,15 +57,15 @@ class CompaniesRepository:
*,
display_name: str | None = None,
legal_name: str | None = None,
idp_group_id: str | None = None,
provider_group_id: str | None = None,
status: str | None = None,
) -> Company:
if display_name is not None:
item.display_name = display_name
if legal_name is not None:
item.legal_name = legal_name
if idp_group_id is not None:
item.idp_group_id = idp_group_id
if provider_group_id is not None:
item.provider_group_id = provider_group_id
if status is not None:
item.status = status
self.db.commit()

12
app/repositories/roles_repo.py
View File

@@ -30,7 +30,7 @@ class RolesRepository:
cond = or_(
Role.role_key.ilike(pattern),
Role.name.ilike(pattern),
Role.idp_role_name.ilike(pattern),
Role.provider_role_name.ilike(pattern),
Role.description.ilike(pattern),
)
stmt = stmt.where(cond)
@@ -52,7 +52,7 @@ class RolesRepository:
system_id: str,
name: str,
description: str | None,
idp_role_name: str,
provider_role_name: str,
status: str = "active",
) -> Role:
item = Role(
@@ -60,7 +60,7 @@ class RolesRepository:
system_id=system_id,
name=name,
description=description,
idp_role_name=idp_role_name,
provider_role_name=provider_role_name,
status=status,
)
self.db.add(item)
@@ -75,7 +75,7 @@ class RolesRepository:
system_id: str | None = None,
name: str | None = None,
description: str | None = None,
idp_role_name: str | None = None,
provider_role_name: str | None = None,
status: str | None = None,
) -> Role:
if system_id is not None:
@@ -84,8 +84,8 @@ class RolesRepository:
item.name = name
if description is not None:
item.description = description
if idp_role_name is not None:
item.idp_role_name = idp_role_name
if provider_role_name is not None:
item.provider_role_name = provider_role_name
if status is not None:
item.status = status
self.db.commit()

10
app/repositories/sites_repo.py
View File

@@ -45,7 +45,7 @@ class SitesRepository:
company_id: str,
display_name: str,
domain: str | None,
idp_group_id: str | None = None,
provider_group_id: str | None = None,
status: str = "active",
) -> Site:
item = Site(
@@ -53,7 +53,7 @@ class SitesRepository:
company_id=company_id,
display_name=display_name,
domain=domain,
idp_group_id=idp_group_id,
provider_group_id=provider_group_id,
status=status,
)
self.db.add(item)
@@ -68,7 +68,7 @@ class SitesRepository:
company_id: str | None = None,
display_name: str | None = None,
domain: str | None = None,
idp_group_id: str | None = None,
provider_group_id: str | None = None,
status: str | None = None,
) -> Site:
if company_id is not None:
@@ -77,8 +77,8 @@ class SitesRepository:
item.display_name = display_name
if domain is not None:
item.domain = domain
if idp_group_id is not None:
item.idp_group_id = idp_group_id
if provider_group_id is not None:
item.provider_group_id = provider_group_id
if status is not None:
item.status = status
self.db.commit()

12
app/repositories/systems_repo.py
View File

@@ -19,7 +19,7 @@ class SystemsRepository:
count_stmt = select(func.count()).select_from(System)
if keyword:
pattern = f"%{keyword}%"
cond = or_(System.system_key.ilike(pattern), System.name.ilike(pattern), System.idp_client_id.ilike(pattern))
cond = or_(System.system_key.ilike(pattern), System.name.ilike(pattern), System.provider_client_id.ilike(pattern))
stmt = stmt.where(cond)
count_stmt = count_stmt.where(cond)
if status:
@@ -29,8 +29,8 @@ class SystemsRepository:
stmt = stmt.order_by(System.created_at.desc()).limit(limit).offset(offset)
return list(self.db.scalars(stmt).all()), int(self.db.scalar(count_stmt) or 0)
def create(self, *, system_key: str, name: str, idp_client_id: str, status: str = "active") -> System:
item = System(system_key=system_key, name=name, idp_client_id=idp_client_id, status=status)
def create(self, *, system_key: str, name: str, provider_client_id: str, status: str = "active") -> System:
item = System(system_key=system_key, name=name, provider_client_id=provider_client_id, status=status)
self.db.add(item)
self.db.commit()
self.db.refresh(item)
@@ -41,13 +41,13 @@ class SystemsRepository:
item: System,
*,
name: str | None = None,
idp_client_id: str | None = None,
provider_client_id: str | None = None,
status: str | None = None,
) -> System:
if name is not None:
item.name = name
if idp_client_id is not None:
item.idp_client_id = idp_client_id
if provider_client_id is not None:
item.provider_client_id = provider_client_id
if status is not None:
item.status = status
self.db.commit()

8
app/repositories/users_repo.py
View File

@@ -54,13 +54,13 @@ class UsersRepository:
display_name: str | None,
is_active: bool,
status: str = "active",
idp_user_id: str | None = None,
provider_user_id: str | None = None,
) -> User:
user = self.get_by_sub(user_sub)
if user is None:
user = User(
user_sub=user_sub,
idp_user_id=idp_user_id,
provider_user_id=provider_user_id,
username=username,
email=email,
display_name=display_name,
@@ -69,8 +69,8 @@ class UsersRepository:
)
self.db.add(user)
else:
if idp_user_id is not None:
user.idp_user_id = idp_user_id
if provider_user_id is not None:
user.provider_user_id = provider_user_id
user.username = username
user.email = email
user.display_name = display_name