mirror of
https://github.com/rzmk/learnhouse.git
synced 2025-12-19 04:19:25 +00:00
feat: init activity starting from course
This commit is contained in:
swve
parent
a21ccb3626
commit
cf7285b6f9
8 changed files with 247 additions and 70 deletions
|
|
@ -1,20 +1,22 @@
|
|||
from fastapi import APIRouter, Depends, Request
|
||||
from src.dependencies.auth import get_current_user
|
||||
from src.services.activity import Activity, add_chapter_to_activity, close_activity, create_activity, get_user_activities
|
||||
from src.services.activity import Activity, add_lecture_to_activity, close_activity, create_activity, get_user_activities
|
||||
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
@router.post("/")
|
||||
@router.post("/start")
|
||||
async def api_start_activity(request: Request, activity_object: Activity, user=Depends(get_current_user)):
|
||||
"""
|
||||
Start activity
|
||||
Start activity
|
||||
"""
|
||||
return await create_activity(request, user, activity_object)
|
||||
|
||||
# TODO : get activity by user_is and org_id and course_id
|
||||
|
||||
@router.get("{org_id}/activities")
|
||||
|
||||
@router.get("/{org_id}/activities")
|
||||
async def api_get_activity_by_userid(request: Request, org_id: str, user=Depends(get_current_user)):
|
||||
"""
|
||||
Get a user activities
|
||||
|
|
@ -22,15 +24,15 @@ async def api_get_activity_by_userid(request: Request, org_id: str, user=Depends
|
|||
return await get_user_activities(request, user, org_id)
|
||||
|
||||
|
||||
@router.post("/{org_id}/add_chapter/{course_id}/{chapter_id}")
|
||||
async def api_add_chapter_to_activity(request: Request, org_id: str, course_id: str, chapter_id: str, user=Depends(get_current_user)):
|
||||
@router.post("/{org_id}/add_lecture/{course_id}/{lecture_id}")
|
||||
async def api_add_lecture_to_activity(request: Request, org_id: str, course_id: str, lecture_id: str, user=Depends(get_current_user)):
|
||||
"""
|
||||
Add chapter to activity
|
||||
Add lecture to activity
|
||||
"""
|
||||
return await add_chapter_to_activity(request, user, org_id, course_id, chapter_id)
|
||||
return await add_lecture_to_activity(request, user, org_id, course_id, lecture_id)
|
||||
|
||||
|
||||
@router.patch("{org_id}/close_activity/{activity_id}")
|
||||
@router.patch("/{org_id}/close_activity/{activity_id}")
|
||||
async def api_close_activity(request: Request, org_id: str, activity_id: str, user=Depends(get_current_user)):
|
||||
"""
|
||||
Close activity
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ class Activity(BaseModel):
|
|||
course_id: str
|
||||
status: Optional[Literal['ongoing', 'done', 'closed']] = 'ongoing'
|
||||
masked: Optional[bool] = False
|
||||
chapters_marked_complete: Optional[List[str]]
|
||||
chapters_data: Optional[List[dict]]
|
||||
lectures_marked_complete: Optional[List[str]]
|
||||
lectures_data: Optional[List[dict]]
|
||||
|
||||
|
||||
class ActivityInDB(Activity):
|
||||
|
|
@ -33,12 +33,18 @@ async def create_activity(request: Request, user: PublicUser, activity_object: A
|
|||
activities = request.app.db["activities"]
|
||||
|
||||
# find if the user has already started the course
|
||||
isActivityAlreadyStarted = activities.find_one(
|
||||
isActivityAlreadCreated = activities.find_one(
|
||||
{"course_id": activity_object.course_id, "user_id": user.user_id})
|
||||
|
||||
if isActivityAlreadyStarted:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_409_CONFLICT, detail="Activity already started")
|
||||
if isActivityAlreadCreated:
|
||||
if isActivityAlreadCreated['status'] == 'closed':
|
||||
activity_object.status = 'ongoing'
|
||||
activities.update_one(
|
||||
{"activity_id": isActivityAlreadCreated['activity_id']}, {"$set": activity_object.dict()})
|
||||
return activity_object
|
||||
else:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_409_CONFLICT, detail="Activity already created")
|
||||
|
||||
# create activity
|
||||
activity = ActivityInDB(**activity_object.dict(),
|
||||
|
|
@ -62,7 +68,7 @@ async def get_user_activities(request: Request, user: PublicUser, org_id: str):
|
|||
return [json.loads(json.dumps(activity, default=str)) for activity in user_activities]
|
||||
|
||||
|
||||
async def add_chapter_to_activity(request: Request, user: PublicUser, org_id: str, course_id: str, chapter_id: str):
|
||||
async def add_lecture_to_activity(request: Request, user: PublicUser, org_id: str, course_id: str, lecture_id: str):
|
||||
activities = request.app.db["activities"]
|
||||
|
||||
activity = activities.find_one(
|
||||
|
|
@ -75,24 +81,25 @@ async def add_chapter_to_activity(request: Request, user: PublicUser, org_id: st
|
|||
raise HTTPException(
|
||||
status_code=status.HTTP_409_CONFLICT, detail="Activity not found")
|
||||
|
||||
if chapter_id in activity['chapters_marked_complete']:
|
||||
if lecture_id in activity['lectures_marked_complete']:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_409_CONFLICT, detail="Chapter already marked complete")
|
||||
status_code=status.HTTP_409_CONFLICT, detail="Lecture already marked complete")
|
||||
|
||||
activity['chapters_marked_complete'].append(chapter_id)
|
||||
activity['lectures_marked_complete'].append(lecture_id)
|
||||
|
||||
activities.update_one(
|
||||
{"activity_id": activity['activity_id']}, {"$set": activity})
|
||||
|
||||
# send 200 custom message
|
||||
return {"message": "Chapter added to activity"}
|
||||
return {"message": "Lecture added to activity"}
|
||||
|
||||
|
||||
async def close_activity(request: Request, user: PublicUser, org_id: str, activity_id: str):
|
||||
async def close_activity(request: Request, user: PublicUser, activity_id: str, org_id: str,):
|
||||
activities = request.app.db["activities"]
|
||||
|
||||
print(activity_id)
|
||||
print(org_id)
|
||||
activity = activities.find_one(
|
||||
{"activity_id": activity_id, "user_id": user.user_id, "org_id": org_id})
|
||||
{"activity_id": activity_id, "user_id": user.user_id})
|
||||
|
||||
if not activity:
|
||||
raise HTTPException(
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@ async def update_coursechapters_meta(request: Request,course_id: str, coursechap
|
|||
"$set": {"chapters": coursechapters_metadata.chapterOrder}})
|
||||
|
||||
# update lectures in coursechapters
|
||||
# TODO : performance/optimization improvement
|
||||
# TODO : performance/optimization improvement, this does not work anyway.
|
||||
for coursechapter in coursechapters_metadata.chapters.__dict__.items():
|
||||
coursechapters.update_one({"coursechapter_id": coursechapter}, {
|
||||
"$set": {"lectures": coursechapters_metadata.chapters[coursechapter]["lectureIds"]}}) # type: ignore
|
||||
|
|
|
|||
|
|
@ -53,13 +53,13 @@ class CourseChapterInDB(CourseChapter):
|
|||
# CRUD
|
||||
####################################################
|
||||
|
||||
async def get_course(request: Request,course_id: str, current_user: PublicUser):
|
||||
async def get_course(request: Request, course_id: str, current_user: PublicUser):
|
||||
courses = request.app.db["courses"]
|
||||
|
||||
course = courses.find_one({"course_id": course_id})
|
||||
|
||||
# verify course rights
|
||||
await verify_rights(request,course_id, current_user, "read")
|
||||
await verify_rights(request, course_id, current_user, "read")
|
||||
|
||||
if not course:
|
||||
raise HTTPException(
|
||||
|
|
@ -69,14 +69,16 @@ async def get_course(request: Request,course_id: str, current_user: PublicUser):
|
|||
return course
|
||||
|
||||
|
||||
async def get_course_meta(request: Request,course_id: str, current_user: PublicUser):
|
||||
async def get_course_meta(request: Request, course_id: str, current_user: PublicUser):
|
||||
courses = request.app.db["courses"]
|
||||
coursechapters = request.app.db["coursechapters"]
|
||||
activities = request.app.db["activities"]
|
||||
|
||||
course = courses.find_one({"course_id": course_id})
|
||||
lectures = request.app.db["lectures"]
|
||||
|
||||
# verify course rights
|
||||
await verify_rights(request,course_id, current_user, "read")
|
||||
await verify_rights(request, course_id, current_user, "read")
|
||||
|
||||
if not course:
|
||||
raise HTTPException(
|
||||
|
|
@ -115,13 +117,23 @@ async def get_course_meta(request: Request,course_id: str, current_user: PublicU
|
|||
chapters_list_with_lectures.append(
|
||||
{"id": chapters[chapter]["id"], "name": chapters[chapter]["name"], "lectures": [lectures_list[lecture] for lecture in chapters[chapter]["lectureIds"]]})
|
||||
course = Course(**course)
|
||||
|
||||
# Get activity by user
|
||||
activity = activities.find_one(
|
||||
{"course_id": course_id, "user_id": current_user.user_id})
|
||||
if activity:
|
||||
activity = json.loads(json.dumps(activity, default=str))
|
||||
else:
|
||||
activity = ""
|
||||
|
||||
return {
|
||||
"course": course,
|
||||
"chapters": chapters_list_with_lectures,
|
||||
"activity": activity
|
||||
}
|
||||
|
||||
|
||||
async def create_course(request: Request,course_object: Course, org_id: str, current_user: PublicUser, thumbnail_file: UploadFile | None = None):
|
||||
async def create_course(request: Request, course_object: Course, org_id: str, current_user: PublicUser, thumbnail_file: UploadFile | None = None):
|
||||
courses = request.app.db["courses"]
|
||||
|
||||
# generate course_id with uuid4
|
||||
|
|
@ -152,7 +164,7 @@ async def create_course(request: Request,course_object: Course, org_id: str, cur
|
|||
return course.dict()
|
||||
|
||||
|
||||
async def update_course_thumbnail(request: Request,course_id: str, current_user: PublicUser, thumbnail_file: UploadFile | None = None):
|
||||
async def update_course_thumbnail(request: Request, course_id: str, current_user: PublicUser, thumbnail_file: UploadFile | None = None):
|
||||
|
||||
# verify course rights
|
||||
await verify_rights(request, course_id, current_user, "update")
|
||||
|
|
@ -182,7 +194,7 @@ async def update_course_thumbnail(request: Request,course_id: str, current_user:
|
|||
status_code=status.HTTP_409_CONFLICT, detail="Course does not exist")
|
||||
|
||||
|
||||
async def update_course(request: Request,course_object: Course, course_id: str, current_user: PublicUser):
|
||||
async def update_course(request: Request, course_object: Course, course_id: str, current_user: PublicUser):
|
||||
|
||||
# verify course rights
|
||||
await verify_rights(request, course_id, current_user, "update")
|
||||
|
|
@ -211,7 +223,7 @@ async def update_course(request: Request,course_object: Course, course_id: str,
|
|||
status_code=status.HTTP_409_CONFLICT, detail="Course does not exist")
|
||||
|
||||
|
||||
async def delete_course(request: Request,course_id: str, current_user: PublicUser):
|
||||
async def delete_course(request: Request, course_id: str, current_user: PublicUser):
|
||||
|
||||
# verify course rights
|
||||
await verify_rights(request, course_id, current_user, "delete")
|
||||
|
|
@ -237,7 +249,7 @@ async def delete_course(request: Request,course_id: str, current_user: PublicUse
|
|||
####################################################
|
||||
|
||||
|
||||
async def get_courses(request: Request,page: int = 1, limit: int = 10, org_id: str | None = None):
|
||||
async def get_courses(request: Request, page: int = 1, limit: int = 10, org_id: str | None = None):
|
||||
courses = request.app.db["courses"]
|
||||
# TODO : Get only courses that user is admin/has roles of
|
||||
# get all courses from database
|
||||
|
|
@ -250,7 +262,7 @@ async def get_courses(request: Request,page: int = 1, limit: int = 10, org_id: s
|
|||
#### Security ####################################################
|
||||
|
||||
|
||||
async def verify_rights(request: Request,course_id: str, current_user: PublicUser, action: str):
|
||||
async def verify_rights(request: Request, course_id: str, current_user: PublicUser, action: str):
|
||||
courses = request.app.db["courses"]
|
||||
|
||||
course = courses.find_one({"course_id": course_id})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue