diff --git a/src/unipoll_api/actions/group.py b/src/unipoll_api/actions/group.py index de17955..e2f7b0f 100644 --- a/src/unipoll_api/actions/group.py +++ b/src/unipoll_api/actions/group.py @@ -25,8 +25,8 @@ async def get_group(group: Group, include_members: bool = False, include_policie members = (await get_group_members(group)).members if include_members else None policies = (await get_group_policies(group)).policies if include_policies else None workspace = WorkspaceSchemas.Workspace(**group.workspace.model_dump(exclude={"members", # type: ignore - "policies", - "groups"})) + "policies", + "groups"})) # Return the workspace with the fetched resources return GroupSchemas.Group(id=group.id, name=group.name, diff --git a/src/unipoll_api/documents.py b/src/unipoll_api/documents.py index 74c99bc..d489959 100644 --- a/src/unipoll_api/documents.py +++ b/src/unipoll_api/documents.py @@ -62,7 +62,7 @@ async def remove_member(self, account, save: bool = True) -> bool: for i, member in enumerate(self.members): if account.id == member.id: # type: ignore self.members.remove(member) - Debug.info(f"Removed member {member.id} from {self.resource_type} {self.id}") # type: ignore + Debug.info(f"Removed member {member.id} from {self.resource_type} {self.id}") break # Remove the policy from the group @@ -103,14 +103,14 @@ class Workspace(Resource): class Group(Resource): resource_type: Literal["group"] = "group" - workspace: BackLink[Workspace] = Field(original_field="groups") # type: ignore + workspace: BackLink[Workspace] = Field(original_field="groups") members: list[Link["Account"]] = [] groups: list[Link["Group"]] = [] class Policy(Document): id: ResourceID = Field(default_factory=ResourceID, alias="_id") - parent_resource: BackLink["Workspace"] | BackLink["Group"] | BackLink["Poll"] = Field(original_field="policies") # type: ignore + parent_resource: BackLink["Workspace"] | BackLink["Group"] | BackLink["Poll"] = Field(original_field="policies") policy_holder_type: Literal["account", "group"] policy_holder: Link["Group"] | Link["Account"] permissions: int @@ -118,7 +118,7 @@ class Policy(Document): class Poll(Resource): id: ResourceID = Field(default_factory=ResourceID, alias="_id") - workspace: BackLink["Workspace"] = Field(original_field="polls") # type: ignore + workspace: BackLink["Workspace"] = Field(original_field="polls") resource_type: Literal["poll"] = "poll" public: bool published: bool diff --git a/src/unipoll_api/routes/account.py b/src/unipoll_api/routes/account.py index cff7557..ef5c116 100644 --- a/src/unipoll_api/routes/account.py +++ b/src/unipoll_api/routes/account.py @@ -15,7 +15,7 @@ response_model=AccountSchemas.AccountList) async def get_all_accounts(): try: - accounts = [AccountSchemas.AccountShort(**account.model_dump()) for account in await Account.find_all().to_list()] + accounts = [AccountSchemas.AccountShort(**a.model_dump()) for a in await Account.find_all().to_list()] return AccountSchemas.AccountList(accounts=accounts) except APIException as e: raise HTTPException(status_code=e.code, detail=str(e))