Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions api/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,3 +194,10 @@ async def update(self, obj):
if res.matched_count == 0:
raise ValueError(f"No object found with id: {obj.id}")
return obj.__class__(**await col.find_one(ObjectId(obj.id)))

async def delete_by_id(self, model, obj_id):
"""Delete one object matching a given id"""
col = self._get_collection(model)
result = await col.delete_one({"_id": ObjectId(obj_id)})
if result.deleted_count == 0:
raise ValueError(f"No object found with id: {obj_id}")
27 changes: 27 additions & 0 deletions api/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,33 @@ async def get_group(group_id: str):
return await db.find_by_id(UserGroup, group_id)


@app.delete('/group/{group_id}', response_model=PageModel)
async def delete_group(group_id: str,
current_user: User = Depends(get_current_superuser)):
"""Delete user group matching the provided group id"""
group_from_id = await db.find_by_id(UserGroup, group_id)
if not group_from_id:
raise HTTPException(
status_code=status.HTTP_404_NOT_FOUND,
detail=f"Group not found with id: {group_id}"
)
# Remove users from the group before deleting it
users = await db.find_by_attributes(
User, {"groups.name": group_from_id.name})
for user in users.items:
user['groups'].remove(group_from_id)
await db.update(User(**user))

# Remove group from user groups that are permitted to update node
nodes = await db.find_by_attributes(
Node, {"user_groups": group_from_id.name})
for node in nodes.items:
node['user_groups'].remove(group_from_id.name)
await db.update(Node(**node))

await db.delete_by_id(UserGroup, group_id)


# -----------------------------------------------------------------------------
# Nodes

Expand Down