From ec322a8821bec44842fb5c5922369ad327d7e25e Mon Sep 17 00:00:00 2001 From: swve Date: Mon, 29 Jan 2024 11:40:11 +0100 Subject: [PATCH] fix: media directories issues --- .../src/services/courses/activities/uploads/videos.py | 2 +- apps/web/services/media/media.ts | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/api/src/services/courses/activities/uploads/videos.py b/apps/api/src/services/courses/activities/uploads/videos.py index bfc48476..bebd5afe 100644 --- a/apps/api/src/services/courses/activities/uploads/videos.py +++ b/apps/api/src/services/courses/activities/uploads/videos.py @@ -9,7 +9,7 @@ async def upload_video(video_file, activity_uuid, org_uuid, course_uuid): try: await upload_content( f"courses/{course_uuid}/activities/{activity_uuid}/video", - org_uuid, + 'orgs', org_uuid, contents, f"video.{video_format}", diff --git a/apps/web/services/media/media.ts b/apps/web/services/media/media.ts index 137be468..c99161d9 100644 --- a/apps/web/services/media/media.ts +++ b/apps/web/services/media/media.ts @@ -21,26 +21,26 @@ export function getUserAvatarMediaDirectory(userUUID: string, fileId: string) { export function getActivityBlockMediaDirectory(orgUUID: string, courseId: string, activityId: string, blockId: any, fileId: any, type: string) { if (type == "pdfBlock") { - let uri = `${getMediaUrl()}content/${orgUUID}/courses/${courseId}/activities/${activityId}/dynamic/blocks/pdfBlock/${blockId}/${fileId}`; + let uri = `${getMediaUrl()}content/orgs/${orgUUID}/courses/${courseId}/activities/${activityId}/dynamic/blocks/pdfBlock/${blockId}/${fileId}`; return uri; } if (type == "videoBlock") { - let uri = `${getMediaUrl()}content/${orgUUID}/courses/${courseId}/activities/${activityId}/dynamic/blocks/videoBlock/${blockId}/${fileId}`; + let uri = `${getMediaUrl()}content/orgs/${orgUUID}/courses/${courseId}/activities/${activityId}/dynamic/blocks/videoBlock/${blockId}/${fileId}`; return uri; } if (type == "imageBlock") { - let uri = `${getMediaUrl()}content/${orgUUID}/courses/${courseId}/activities/${activityId}/dynamic/blocks/imageBlock/${blockId}/${fileId}`; + let uri = `${getMediaUrl()}content/orgs/${orgUUID}/courses/${courseId}/activities/${activityId}/dynamic/blocks/imageBlock/${blockId}/${fileId}`; return uri; } } export function getActivityMediaDirectory(orgUUID: string, courseId: string, activityId: string, fileId: string, activityType: string) { if (activityType == "video") { - let uri = `${getMediaUrl()}content/${orgUUID}/courses/${courseId}/activities/${activityId}/video/${fileId}`; + let uri = `${getMediaUrl()}content/orgs/${orgUUID}/courses/${courseId}/activities/${activityId}/video/${fileId}`; return uri; } if (activityType == "documentpdf") { - let uri = `${getMediaUrl()}content/${orgUUID}/courses/${courseId}/activities/${activityId}/documentpdf/${fileId}`; + let uri = `${getMediaUrl()}content/orgs/${orgUUID}/courses/${courseId}/activities/${activityId}/documentpdf/${fileId}`; return uri; } }