From 9a1975c389fe18d3fca4c932cf49580096d1bd6d Mon Sep 17 00:00:00 2001 From: luxferre Date: Thu, 28 May 2026 13:37:32 +0100 Subject: [PATCH] minor: iam schema nomenclature --- src/iam/router.py | 18 +++++++++--------- src/iam/schemas.py | 36 ++++++++++++++++++------------------ 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/iam/router.py b/src/iam/router.py index feb4f3e..a6398a9 100644 --- a/src/iam/router.py +++ b/src/iam/router.py @@ -35,10 +35,10 @@ from src.iam.service import service_key_dependency from src.iam.models import Permission as Perm, GroupPermissions as GPerms, Group, UserGroups from src.iam.dependencies import group_model_query_dependency, group_model_body_dependency, perm_model_body_dependency from src.iam.schemas import IAMGetGroupPermissionsResponse, IAMGetGroupUsersResponse, IAMPostGroupRequest, \ - GroupResponse, IAMPostGroupResponse, IAMPutGroupPermissionRequest, IAMPutGroupPermissionResponse, \ + GroupSchema, IAMPostGroupResponse, IAMPutGroupPermissionRequest, IAMPutGroupPermissionResponse, \ IAMPutGroupUserRequest, IAMPutGroupUserResponse, IAMDeleteGroupPermissionRequest, IAMDeleteGroupPermissionResponse, \ IAMDeleteGroupUserRequest, IAMDeleteGroupUserResponse, IAMGetPermissionsResponse, IAMPostPermissionRequest, \ - IAMPostPermissionResponse, PermissionResponse, IAMDeletePermissionRequest, IAMGetPermissionsSearchRequest, IAMGetPermissionsSearchResponse + IAMPostPermissionResponse, PermissionSchema, IAMDeletePermissionRequest, IAMGetPermissionsSearchRequest, IAMGetPermissionsSearchResponse router = APIRouter( tags=["IAM"], @@ -101,7 +101,7 @@ async def create_group(db: db_dependency, org_model: org_model_root_claim_body_d except IntegrityError as e: if isinstance(e.orig, errors.UniqueViolation): raise Conflict("Group with this name already exists") - response = GroupResponse(**group_model.__dict__) + response = GroupSchema(**group_model.__dict__) db.commit() return {"group": response} @@ -117,7 +117,7 @@ async def add_group_permission(db: db_dependency, group_model: group_model_body_ group_model.permission_rel.append(perm_model) db.flush() - response = IAMPutGroupPermissionResponse(group=GroupResponse(**group_model.__dict__), permissions=group_model.permission_rel) + response = IAMPutGroupPermissionResponse(group=GroupSchema(**group_model.__dict__), permissions=group_model.permission_rel) db.commit() return response @@ -132,7 +132,7 @@ async def add_group_user(db: db_dependency, group_model: group_model_body_depend group_model.user_rel.append(user_model) db.flush() - response = IAMPutGroupUserResponse(group=GroupResponse(**group_model.__dict__), users=group_model.user_rel) + response = IAMPutGroupUserResponse(group=GroupSchema(**group_model.__dict__), users=group_model.user_rel) db.commit() return response @@ -144,8 +144,8 @@ async def remove_group_permissions(db: db_dependency, group_model: group_model_b group_model.permission_rel.remove(perm_model) db.flush() - response = IAMDeleteGroupPermissionResponse(group=GroupResponse(**group_model.__dict__), - permissions=group_model.permission_rel) + response = IAMDeleteGroupPermissionResponse(group=GroupSchema(**group_model.__dict__), + permissions=group_model.permission_rel) db.commit() return response @@ -157,7 +157,7 @@ async def remove_group_user(db: db_dependency, group_model: group_model_body_dep user_model.group_rel.remove(group_model) db.flush() - response = IAMDeleteGroupUserResponse(group=GroupResponse(**group_model.__dict__), users=group_model.user_rel) + response = IAMDeleteGroupUserResponse(group=GroupSchema(**group_model.__dict__), users=group_model.user_rel) db.commit() return response @@ -179,7 +179,7 @@ async def create_new_permission(db: db_dependency, su: super_admin_dependency, r if isinstance(e.orig, errors.UniqueViolation): raise Conflict(message="Permission already exists") db.flush() - response = IAMPostPermissionResponse(permission=PermissionResponse(**perm_model.__dict__)) + response = IAMPostPermissionResponse(permission=PermissionSchema(**perm_model.__dict__)) db.commit() return response diff --git a/src/iam/schemas.py b/src/iam/schemas.py index 1b1d4d2..3f34390 100644 --- a/src/iam/schemas.py +++ b/src/iam/schemas.py @@ -2,7 +2,7 @@ Pydantic models for the IAM module Models follow the nomenclature of: -- Sub-models: "Response" +- Sub-models: "Schema" - Mixins: "Mixin" - Models: "" ie "IAMGetGroupPermissionsResponse" """ @@ -15,20 +15,20 @@ from src.schemas import CustomBaseModel from user.schemas import UserIDMixin -class UserResponse(CustomBaseModel): +class UserSchema(CustomBaseModel): id: int first_name: str last_name: str email: EmailStr -class PermissionResponse(CustomBaseModel): +class PermissionSchema(CustomBaseModel): model_config = ConfigDict(from_attributes=True, extra="ignore") service_name: str resource: str action: str -class GroupResponse(CustomBaseModel): +class GroupSchema(CustomBaseModel): id: int name: str @@ -39,47 +39,47 @@ class PermIDMixin(CustomBaseModel): permission_id: int class IAMGetGroupPermissionsResponse(CustomBaseModel): - permissions: list[PermissionResponse] + permissions: list[PermissionSchema] class IAMGetGroupUsersResponse(CustomBaseModel): - users : list[UserResponse] + users : list[UserSchema] class IAMPostGroupRequest(OrgIDMixin): name: str class IAMPostGroupResponse(CustomBaseModel): - group: GroupResponse + group: GroupSchema class IAMPutGroupPermissionRequest(GroupIDMixin, PermIDMixin): pass class IAMPutGroupPermissionResponse(CustomBaseModel): - group: GroupResponse - permissions: list[PermissionResponse] + group: GroupSchema + permissions: list[PermissionSchema] class IAMPutGroupUserRequest(GroupIDMixin, UserIDMixin): pass class IAMPutGroupUserResponse(CustomBaseModel): - group: GroupResponse - users: list[UserResponse] + group: GroupSchema + users: list[UserSchema] class IAMDeleteGroupPermissionRequest(GroupIDMixin, PermIDMixin): pass class IAMDeleteGroupPermissionResponse(CustomBaseModel): - group: GroupResponse - permissions: list[PermissionResponse] + group: GroupSchema + permissions: list[PermissionSchema] class IAMDeleteGroupUserRequest(GroupIDMixin, UserIDMixin): pass class IAMDeleteGroupUserResponse(CustomBaseModel): - group: GroupResponse - users: list[UserResponse] + group: GroupSchema + users: list[UserSchema] class IAMGetPermissionsResponse(CustomBaseModel): - permissions: list[PermissionResponse] + permissions: list[PermissionSchema] class IAMPostPermissionRequest(CustomBaseModel): service_id: int @@ -87,7 +87,7 @@ class IAMPostPermissionRequest(CustomBaseModel): action: str class IAMPostPermissionResponse(CustomBaseModel): - permission: PermissionResponse + permission: PermissionSchema class IAMDeletePermissionRequest(PermIDMixin): pass @@ -98,4 +98,4 @@ class IAMGetPermissionsSearchRequest(CustomBaseModel): action: Optional[str] = None class IAMGetPermissionsSearchResponse(CustomBaseModel): - permissions: list[PermissionResponse] + permissions: list[PermissionSchema]