rzmk/learnhouse
1
0
Fork 0
mirror of https://github.com/rzmk/learnhouse.git synced 2025-12-19 04:19:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: remove star imports

Browse source
This commit is contained in:
swve 2023-06-19 17:51:39 +02:00
parent d4497e03fb
commit 9c2332961b
9 changed files with 69 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/services/courses/collections.py
View file

@ -34,7 +34,9 @@ async def get_collection(
collection = await collections.find_one({"collection_id": collection_id})
# verify collection rights
await verify_collection_rights(request, collection_id, current_user, "read")
await verify_collection_rights(
request, collection_id, current_user, "read", collection["org_id"]
)
if not collection:
raise HTTPException(
@ -99,12 +101,15 @@ async def update_collection(
current_user: PublicUser,
):
# verify collection rights
await verify_collection_rights(request, collection_id, current_user, "update")
collections = request.app.db["collections"]
collection = await collections.find_one({"collection_id": collection_id})
await verify_collection_rights(
request, collection_id, current_user, "update", collection["org_id"]
)
if not collection:
raise HTTPException(
status_code=status.HTTP_409_CONFLICT, detail="Collection does not exist"
@ -124,12 +129,14 @@ async def update_collection(
async def delete_collection(
request: Request, collection_id: str, current_user: PublicUser
):
await verify_collection_rights(request, collection_id, current_user, "delete")
collections = request.app.db["collections"]
collection = await collections.find_one({"collection_id": collection_id})
await verify_collection_rights(
request, collection_id, current_user, "delete", collection["org_id"]
)
if not collection:
raise HTTPException(
status_code=status.HTTP_409_CONFLICT, detail="Collection does not exist"
@ -160,6 +167,8 @@ async def get_collections(
):
collections = request.app.db["collections"]
print(org_id)
# get all collections from database without ObjectId
all_collections = (
collections.find({"org_id": org_id})
@ -168,7 +177,7 @@ async def get_collections(
.limit(limit)
)
await verify_collection_rights(request, "*", current_user, "read")
await verify_collection_rights(request, "*", current_user, "read", org_id)
# create list of collections and include courses in each collection
collections_list = []
@ -195,19 +204,27 @@ async def get_collections(
async def verify_collection_rights(
request: Request, collection_id: str, current_user: PublicUser, action: str
request: Request,
collection_id: str,
current_user: PublicUser,
action: str,
org_id: str,
):
collections = request.app.db["collections"]
collection = await collections.find_one({"collection_id": collection_id})
if not collection and action != "create":
if not collection and action != "create" and collection_id != "*":
raise HTTPException(
status_code=status.HTTP_409_CONFLICT, detail="Collection does not exist"
)
# Collections are public by default for now
if current_user.user_id == "anonymous" and action == "read":
return True
hasRoleRights = await verify_user_rights_with_roles(
request, action, current_user.user_id, collection_id, collection["org_id"]
request, action, current_user.user_id, collection_id, org_id
)
if not hasRoleRights: