Skip to content

Commit

Permalink
refactor: Fixed mypy issues
Browse files Browse the repository at this point in the history
  • Loading branch information
mike-pisman committed Oct 23, 2023
1 parent cfeebf7 commit d6ec5b8
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions src/unipoll_api/actions/workspace.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
from unipoll_api.utils import Permissions
from unipoll_api.schemas import WorkspaceSchemas
from unipoll_api.exceptions import WorkspaceExceptions
from unipoll_api.dependencies import get_member
# from unipoll_api.dependencies import get_member


# Get a list of workspaces where the account is a owner/member
async def get_workspaces(account: Account | None = None) -> WorkspaceSchemas.WorkspaceList:
account = AccountManager.active_user.get()
account = AccountManager.active_user.get() if not account else account
workspace_list = []

members = await Member.find(Member.account.id == account.id, fetch_links=True).to_list()
members = await Member.find(Member.account.id == account.id, fetch_links=True).to_list()
workspaces = [member.workspace for member in members]

# Create a workspace list for output schema using the search results
Expand Down
6 changes: 3 additions & 3 deletions src/unipoll_api/dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ async def get_account(account_id: ResourceID) -> Account:
return account


async def get_member(account: Account, resource: Resource) -> Member:
async def get_member(account: Account, resource: Workspace | Group) -> Member:
"""
Returns a member with the given id.
"""

for member in resource.members:
if member.account.id == account.id:
return member
if member.account.id == account.id: # type: ignore
return member # type: ignore
raise Exceptions.ResourceExceptions.ResourceNotFound("member", account.id)


Expand Down
16 changes: 8 additions & 8 deletions src/unipoll_api/documents.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,24 +106,24 @@ async def add_member(self, account: "Account", permissions, save: bool = True) -
await self.save(link_rule=WriteRules.WRITE) # type: ignore
return new_member

async def remove_member(self, member: "Member", save: bool = True) -> bool:
async def remove_member(self, member_to_delete: "Member", save: bool = True) -> bool:
# Remove the account from the workspace
for _member in self.members:
if _member.id == member.id: # type: ignore
self.members.remove(_member)
await _member.delete()
for member in self.members:
if member.id == member_to_delete.id: # type: ignore
self.members.remove(member)
await member.delete() # type: ignore
# type: ignore
Debug.info(f"Removed member {member.id} from {self.get_document_type()} {self.id}") # type: ignore
break

# Remove the policy from the workspace
await self.remove_policy_by_holder(member, save=False) # type: ignore
await self.remove_policy_by_holder(member_to_delete, save=False) # type: ignore

# Remove the member from all groups in the workspace
group: Group
for group in self.groups: # type: ignore
await group.remove_member(member, save=False)
await group.remove_policy_by_holder(member, save=False)
await group.remove_member(member_to_delete, save=False)
await group.remove_policy_by_holder(member_to_delete, save=False)
await Group.save(group, link_rule=WriteRules.WRITE)

if save:
Expand Down

0 comments on commit d6ec5b8

Please sign in to comment.