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: fix trail bugs

Browse source
This commit is contained in:
swve 2023-06-25 18:42:05 +02:00
parent a748b398d0
commit a2401661e8
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/services/trail.py
View file

@ -107,8 +107,7 @@ async def get_user_trail_with_orgslug(request: Request, user: PublicUser, org_sl
trail = await trails.find_one({"user_id": user.user_id, "org_id": org["org_id"]}) trail = await trails.find_one({"user_id": user.user_id, "org_id": org["org_id"]})
if not trail: if not trail:
raise HTTPException( return Trail(masked=False, courses=[])
status_code=status.HTTP_404_NOT_FOUND, detail="Trail not found")
# Check if these courses still exist in the database # Check if these courses still exist in the database
for course in trail["courses"]: for course in trail["courses"]:
@ -156,8 +155,7 @@ async def add_activity_to_trail(request: Request, user: PublicUser, course_id:
trail = await trails.find_one({"user_id": user.user_id, "courses.course_id": courseid , "org_id": org_id}) trail = await trails.find_one({"user_id": user.user_id, "courses.course_id": courseid , "org_id": org_id})
if not trail: if not trail:
raise HTTPException( return Trail(masked=False, courses=[])
status_code=status.HTTP_404_NOT_FOUND, detail="Trail not found")
# if a trail has course_id in the courses array, then add the activity_id to the activities_marked_complete array # if a trail has course_id in the courses array, then add the activity_id to the activities_marked_complete array
for element in trail["courses"]: for element in trail["courses"]:
@ -176,7 +174,7 @@ async def add_activity_to_trail(request: Request, user: PublicUser, course_id:
# modify trail object # modify trail object
await trails.replace_one({"trail_id": trail["trail_id"]}, trail) await trails.replace_one({"trail_id": trail["trail_id"]}, trail)
return Trail(**trail) return Trail(**trail.dict())
async def add_course_to_trail(request: Request, user: PublicUser, orgslug: str, course_id: str) -> Trail: async def add_course_to_trail(request: Request, user: PublicUser, orgslug: str, course_id: str) -> Trail:
@ -188,17 +186,16 @@ async def add_course_to_trail(request: Request, user: PublicUser, orgslug: str,
org = PublicOrganization(**org) org = PublicOrganization(**org)
trail = await trails.find_one( trail = await trails.find_one(
{"user_id": user.user_id, "org_id": org["org_id"]}) {"user_id": user.user_id, "org_id": org["org_id"]})
if not trail: if not trail:
trail_to_insert = TrailInDB(trail_id=f"trail_{uuid4()}", user_id=user.user_id, org_id=org["org_id"], courses=[]) trail_to_insert = TrailInDB(trail_id=f"trail_{uuid4()}", user_id=user.user_id, org_id=org["org_id"], courses=[])
trail_to_insert = await trails.insert_one(trail_to_insert.dict()) trail_to_insert = await trails.insert_one(trail_to_insert.dict())
trail = await trails.find_one({"_id": trail_to_insert.inserted_id})
# check if course is already present in the trail # check if course is already present in the trail
for element in trail["courses"]: for element in trail["courses"]:
if element["course_id"] == course_id: if element["course_id"] == course_id: