mirror of
https://github.com/rzmk/learnhouse.git
synced 2025-12-19 04:19:25 +00:00
feat: add external video endpoint
This commit is contained in:
parent
ddc8e38277
commit
cdd1ca46d3
2 changed files with 180 additions and 30 deletions
|
|
@ -2,21 +2,37 @@ from fastapi import APIRouter, Depends, UploadFile, Form, Request
|
||||||
from src.services.courses.activities.activities import *
|
from src.services.courses.activities.activities import *
|
||||||
from src.security.auth import get_current_user
|
from src.security.auth import get_current_user
|
||||||
from src.services.courses.activities.pdf import create_documentpdf_activity
|
from src.services.courses.activities.pdf import create_documentpdf_activity
|
||||||
from src.services.courses.activities.video import create_video_activity
|
from src.services.courses.activities.video import (
|
||||||
|
ExternalVideo,
|
||||||
|
create_external_video_activity,
|
||||||
|
create_video_activity,
|
||||||
|
)
|
||||||
|
|
||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
|
|
||||||
|
|
||||||
@router.post("/")
|
@router.post("/")
|
||||||
async def api_create_activity(request: Request, activity_object: Activity, org_id: str, coursechapter_id: str, current_user: PublicUser = Depends(get_current_user)):
|
async def api_create_activity(
|
||||||
|
request: Request,
|
||||||
|
activity_object: Activity,
|
||||||
|
org_id: str,
|
||||||
|
coursechapter_id: str,
|
||||||
|
current_user: PublicUser = Depends(get_current_user),
|
||||||
|
):
|
||||||
"""
|
"""
|
||||||
Create new activity
|
Create new activity
|
||||||
"""
|
"""
|
||||||
return await create_activity(request, activity_object, org_id, coursechapter_id, current_user)
|
return await create_activity(
|
||||||
|
request, activity_object, org_id, coursechapter_id, current_user
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@router.get("/{activity_id}")
|
@router.get("/{activity_id}")
|
||||||
async def api_get_activity(request: Request, activity_id: str, current_user: PublicUser = Depends(get_current_user)):
|
async def api_get_activity(
|
||||||
|
request: Request,
|
||||||
|
activity_id: str,
|
||||||
|
current_user: PublicUser = Depends(get_current_user),
|
||||||
|
):
|
||||||
"""
|
"""
|
||||||
Get single activity by activity_id
|
Get single activity by activity_id
|
||||||
"""
|
"""
|
||||||
|
|
@ -24,7 +40,11 @@ async def api_get_activity(request: Request, activity_id: str, current_user: Pu
|
||||||
|
|
||||||
|
|
||||||
@router.get("/coursechapter/{coursechapter_id}")
|
@router.get("/coursechapter/{coursechapter_id}")
|
||||||
async def api_get_activities(request: Request, coursechapter_id: str, current_user: PublicUser = Depends(get_current_user)):
|
async def api_get_activities(
|
||||||
|
request: Request,
|
||||||
|
coursechapter_id: str,
|
||||||
|
current_user: PublicUser = Depends(get_current_user),
|
||||||
|
):
|
||||||
"""
|
"""
|
||||||
Get CourseChapter activities
|
Get CourseChapter activities
|
||||||
"""
|
"""
|
||||||
|
|
@ -32,7 +52,12 @@ async def api_get_activities(request: Request, coursechapter_id: str, current_
|
||||||
|
|
||||||
|
|
||||||
@router.put("/{activity_id}")
|
@router.put("/{activity_id}")
|
||||||
async def api_update_activity(request: Request, activity_object: Activity, activity_id: str, current_user: PublicUser = Depends(get_current_user)):
|
async def api_update_activity(
|
||||||
|
request: Request,
|
||||||
|
activity_object: Activity,
|
||||||
|
activity_id: str,
|
||||||
|
current_user: PublicUser = Depends(get_current_user),
|
||||||
|
):
|
||||||
"""
|
"""
|
||||||
Update activity by activity_id
|
Update activity by activity_id
|
||||||
"""
|
"""
|
||||||
|
|
@ -40,25 +65,63 @@ async def api_update_activity(request: Request, activity_object: Activity, activ
|
||||||
|
|
||||||
|
|
||||||
@router.delete("/{activity_id}")
|
@router.delete("/{activity_id}")
|
||||||
async def api_delete_activity(request: Request, activity_id: str, org_id: str, current_user: PublicUser = Depends(get_current_user)):
|
async def api_delete_activity(
|
||||||
|
request: Request,
|
||||||
|
activity_id: str,
|
||||||
|
current_user: PublicUser = Depends(get_current_user),
|
||||||
|
):
|
||||||
"""
|
"""
|
||||||
Delete activity by activity_id
|
Delete activity by activity_id
|
||||||
"""
|
"""
|
||||||
return await delete_activity(request, activity_id, current_user)
|
return await delete_activity(request, activity_id, current_user)
|
||||||
|
|
||||||
|
|
||||||
# Video activity
|
# Video activity
|
||||||
|
|
||||||
|
|
||||||
@router.post("/video")
|
@router.post("/video")
|
||||||
async def api_create_video_activity(request: Request, org_id: str, name: str = Form(), coursechapter_id: str = Form(), current_user: PublicUser = Depends(get_current_user), video_file: UploadFile | None = None):
|
async def api_create_video_activity(
|
||||||
|
request: Request,
|
||||||
|
name: str = Form(),
|
||||||
|
coursechapter_id: str = Form(),
|
||||||
|
current_user: PublicUser = Depends(get_current_user),
|
||||||
|
video_file: UploadFile | None = None,
|
||||||
|
):
|
||||||
"""
|
"""
|
||||||
Create new activity
|
Create new activity
|
||||||
"""
|
"""
|
||||||
return await create_video_activity(request, name, coursechapter_id, current_user, video_file)
|
return await create_video_activity(
|
||||||
|
request, name, coursechapter_id, current_user, video_file
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/external_video")
|
||||||
|
async def api_create_external_video_activity(
|
||||||
|
request: Request,
|
||||||
|
external_video: ExternalVideo,
|
||||||
|
coursechapter_id: str = Form(),
|
||||||
|
current_user: PublicUser = Depends(get_current_user),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Create new activity
|
||||||
|
"""
|
||||||
|
return await create_external_video_activity(
|
||||||
|
request, coursechapter_id, current_user, external_video
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@router.post("/documentpdf")
|
@router.post("/documentpdf")
|
||||||
async def api_create_documentpdf_activity(request: Request, org_id: str, name: str = Form(), coursechapter_id: str = Form(), current_user: PublicUser = Depends(get_current_user), pdf_file: UploadFile | None = None):
|
async def api_create_documentpdf_activity(
|
||||||
|
request: Request,
|
||||||
|
org_id: str,
|
||||||
|
name: str = Form(),
|
||||||
|
coursechapter_id: str = Form(),
|
||||||
|
current_user: PublicUser = Depends(get_current_user),
|
||||||
|
pdf_file: UploadFile | None = None,
|
||||||
|
):
|
||||||
"""
|
"""
|
||||||
Create new activity
|
Create new activity
|
||||||
"""
|
"""
|
||||||
return await create_documentpdf_activity(request, name, coursechapter_id, current_user, pdf_file)
|
return await create_documentpdf_activity(
|
||||||
|
request, name, coursechapter_id, current_user, pdf_file
|
||||||
|
)
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,6 @@
|
||||||
|
from typing import Literal
|
||||||
|
|
||||||
|
from pydantic import BaseModel
|
||||||
from src.security.security import verify_user_rights_with_roles
|
from src.security.security import verify_user_rights_with_roles
|
||||||
from src.services.courses.activities.uploads.videos import upload_video
|
from src.services.courses.activities.uploads.videos import upload_video
|
||||||
from src.services.users.users import PublicUser
|
from src.services.users.users import PublicUser
|
||||||
|
|
@ -7,7 +10,13 @@ from uuid import uuid4
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
|
|
||||||
async def create_video_activity(request: Request,name: str, coursechapter_id: str, current_user: PublicUser, video_file: UploadFile | None = None):
|
async def create_video_activity(
|
||||||
|
request: Request,
|
||||||
|
name: str,
|
||||||
|
coursechapter_id: str,
|
||||||
|
current_user: PublicUser,
|
||||||
|
video_file: UploadFile | None = None,
|
||||||
|
):
|
||||||
activities = request.app.db["activities"]
|
activities = request.app.db["activities"]
|
||||||
courses = request.app.db["courses"]
|
courses = request.app.db["courses"]
|
||||||
|
|
||||||
|
|
@ -16,19 +25,22 @@ async def create_video_activity(request: Request,name: str, coursechapter_id: s
|
||||||
|
|
||||||
# get org_id from course
|
# get org_id from course
|
||||||
coursechapter = await courses.find_one(
|
coursechapter = await courses.find_one(
|
||||||
{"chapters_content.coursechapter_id": coursechapter_id})
|
{"chapters_content.coursechapter_id": coursechapter_id}
|
||||||
|
)
|
||||||
|
|
||||||
org_id = coursechapter["org_id"]
|
org_id = coursechapter["org_id"]
|
||||||
|
|
||||||
|
|
||||||
# check if video_file is not None
|
# check if video_file is not None
|
||||||
if not video_file:
|
if not video_file:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_409_CONFLICT, detail="Video : No video file provided")
|
status_code=status.HTTP_409_CONFLICT,
|
||||||
|
detail="Video : No video file provided",
|
||||||
|
)
|
||||||
|
|
||||||
if video_file.content_type not in ["video/mp4", "video/webm"]:
|
if video_file.content_type not in ["video/mp4", "video/webm"]:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_409_CONFLICT, detail="Video : Wrong video format")
|
status_code=status.HTTP_409_CONFLICT, detail="Video : Wrong video format"
|
||||||
|
)
|
||||||
|
|
||||||
# get video format
|
# get video format
|
||||||
if video_file.filename:
|
if video_file.filename:
|
||||||
|
|
@ -36,7 +48,9 @@ async def create_video_activity(request: Request,name: str, coursechapter_id: s
|
||||||
|
|
||||||
else:
|
else:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_409_CONFLICT, detail="Video : No video file provided")
|
status_code=status.HTTP_409_CONFLICT,
|
||||||
|
detail="Video : No video file provided",
|
||||||
|
)
|
||||||
|
|
||||||
activity_object = ActivityInDB(
|
activity_object = ActivityInDB(
|
||||||
org_id=org_id,
|
org_id=org_id,
|
||||||
|
|
@ -46,7 +60,7 @@ async def create_video_activity(request: Request,name: str, coursechapter_id: s
|
||||||
type="video",
|
type="video",
|
||||||
content={
|
content={
|
||||||
"video": {
|
"video": {
|
||||||
"filename": "video."+video_format,
|
"filename": "video." + video_format,
|
||||||
"activity_id": activity_id,
|
"activity_id": activity_id,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -54,11 +68,15 @@ async def create_video_activity(request: Request,name: str, coursechapter_id: s
|
||||||
updateDate=str(datetime.now()),
|
updateDate=str(datetime.now()),
|
||||||
)
|
)
|
||||||
|
|
||||||
hasRoleRights = await verify_user_rights_with_roles(request,"create", current_user.user_id, activity_id, element_org_id=org_id)
|
hasRoleRights = await verify_user_rights_with_roles(
|
||||||
|
request, "create", current_user.user_id, activity_id, element_org_id=org_id
|
||||||
|
)
|
||||||
|
|
||||||
if not hasRoleRights:
|
if not hasRoleRights:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_409_CONFLICT, detail="Roles : Insufficient rights to perform this action")
|
status_code=status.HTTP_409_CONFLICT,
|
||||||
|
detail="Roles : Insufficient rights to perform this action",
|
||||||
|
)
|
||||||
|
|
||||||
# create activity
|
# create activity
|
||||||
activity = ActivityInDB(**activity_object.dict())
|
activity = ActivityInDB(**activity_object.dict())
|
||||||
|
|
@ -71,7 +89,76 @@ async def create_video_activity(request: Request,name: str, coursechapter_id: s
|
||||||
|
|
||||||
# todo : choose whether to update the chapter or not
|
# todo : choose whether to update the chapter or not
|
||||||
# update chapter
|
# update chapter
|
||||||
await courses.update_one({"chapters_content.coursechapter_id": coursechapter_id}, {
|
await courses.update_one(
|
||||||
"$addToSet": {"chapters_content.$.activities": activity_id}})
|
{"chapters_content.coursechapter_id": coursechapter_id},
|
||||||
|
{"$addToSet": {"chapters_content.$.activities": activity_id}},
|
||||||
|
)
|
||||||
|
|
||||||
|
return activity
|
||||||
|
|
||||||
|
|
||||||
|
class ExternalVideo(BaseModel):
|
||||||
|
name: str
|
||||||
|
uri: str
|
||||||
|
type: Literal["youtube", "vimeo"]
|
||||||
|
activity_id: str
|
||||||
|
|
||||||
|
|
||||||
|
async def create_external_video_activity(
|
||||||
|
request: Request,
|
||||||
|
coursechapter_id: str,
|
||||||
|
current_user: PublicUser,
|
||||||
|
data: ExternalVideo,
|
||||||
|
):
|
||||||
|
activities = request.app.db["activities"]
|
||||||
|
courses = request.app.db["courses"]
|
||||||
|
|
||||||
|
# generate activity_id
|
||||||
|
activity_id = str(f"activity_{uuid4()}")
|
||||||
|
|
||||||
|
# get org_id from course
|
||||||
|
coursechapter = await courses.find_one(
|
||||||
|
{"chapters_content.coursechapter_id": coursechapter_id}
|
||||||
|
)
|
||||||
|
|
||||||
|
org_id = coursechapter["org_id"]
|
||||||
|
|
||||||
|
activity_object = ActivityInDB(
|
||||||
|
org_id=org_id,
|
||||||
|
activity_id=activity_id,
|
||||||
|
coursechapter_id=coursechapter_id,
|
||||||
|
name=data.name,
|
||||||
|
type="video",
|
||||||
|
content={
|
||||||
|
"external_video": {
|
||||||
|
"uri": data.uri,
|
||||||
|
"activity_id": activity_id,
|
||||||
|
"type": data.type,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
creationDate=str(datetime.now()),
|
||||||
|
updateDate=str(datetime.now()),
|
||||||
|
)
|
||||||
|
|
||||||
|
hasRoleRights = await verify_user_rights_with_roles(
|
||||||
|
request, "create", current_user.user_id, activity_id, element_org_id=org_id
|
||||||
|
)
|
||||||
|
|
||||||
|
if not hasRoleRights:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_409_CONFLICT,
|
||||||
|
detail="Roles : Insufficient rights to perform this action",
|
||||||
|
)
|
||||||
|
|
||||||
|
# create activity
|
||||||
|
activity = ActivityInDB(**activity_object.dict())
|
||||||
|
await activities.insert_one(activity.dict())
|
||||||
|
|
||||||
|
# todo : choose whether to update the chapter or not
|
||||||
|
# update chapter
|
||||||
|
await courses.update_one(
|
||||||
|
{"chapters_content.coursechapter_id": coursechapter_id},
|
||||||
|
{"$addToSet": {"chapters_content.$.activities": activity_id}},
|
||||||
|
)
|
||||||
|
|
||||||
return activity
|
return activity
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue