From 2485285a068e59a60645f47c73a3eb83297209d9 Mon Sep 17 00:00:00 2001 From: swve Date: Mon, 20 Nov 2023 19:53:56 +0100 Subject: [PATCH] generic fixes --- .../block_types/imageBlock/imageBlock.py | 4 +-- .../blocks/block_types/pdfBlock/pdfBlock.py | 4 +-- .../block_types/videoBlock/videoBlock.py | 4 +-- .../src/services/courses/activities/pdf.py | 2 +- apps/api/src/services/dev/mocks/initial.py | 33 +++++++++---------- apps/api/src/services/install/install.py | 1 - apps/api/src/services/orgs/orgs.py | 2 +- apps/api/src/services/trail/trail.py | 14 ++++---- apps/api/src/services/users/users.py | 3 +- 9 files changed, 31 insertions(+), 36 deletions(-) diff --git a/apps/api/src/services/blocks/block_types/imageBlock/imageBlock.py b/apps/api/src/services/blocks/block_types/imageBlock/imageBlock.py index 26ec7609..f9f3eabf 100644 --- a/apps/api/src/services/blocks/block_types/imageBlock/imageBlock.py +++ b/apps/api/src/services/blocks/block_types/imageBlock/imageBlock.py @@ -50,11 +50,11 @@ async def create_image_block( # create block block = Block( - activity_id=activity.id is not None, + activity_id=activity.id if activity.id else 0, block_type=BlockTypeEnum.BLOCK_IMAGE, content=block_data.dict(), org_id=org_id, - course_id=course.id is not None, + course_id=course.id if course.id else 0, block_uuid=block_uuid, creation_date=str(datetime.now()), update_date=str(datetime.now()), diff --git a/apps/api/src/services/blocks/block_types/pdfBlock/pdfBlock.py b/apps/api/src/services/blocks/block_types/pdfBlock/pdfBlock.py index e9bd5941..07fea4ca 100644 --- a/apps/api/src/services/blocks/block_types/pdfBlock/pdfBlock.py +++ b/apps/api/src/services/blocks/block_types/pdfBlock/pdfBlock.py @@ -51,11 +51,11 @@ async def create_pdf_block( # create block block = Block( - activity_id=activity.id is not None, + activity_id=activity.id if activity.id else 0, block_type=BlockTypeEnum.BLOCK_DOCUMENT_PDF, content=block_data.dict(), org_id=org_id, - course_id=course.id is not None, + course_id=course.id if course.id else 0, block_uuid=block_uuid, creation_date=str(datetime.now()), update_date=str(datetime.now()), diff --git a/apps/api/src/services/blocks/block_types/videoBlock/videoBlock.py b/apps/api/src/services/blocks/block_types/videoBlock/videoBlock.py index b18ff94b..2af8c79b 100644 --- a/apps/api/src/services/blocks/block_types/videoBlock/videoBlock.py +++ b/apps/api/src/services/blocks/block_types/videoBlock/videoBlock.py @@ -51,11 +51,11 @@ async def create_video_block( # create block block = Block( - activity_id=activity.id is not None, + activity_id=activity.id if activity.id else 0, block_type=BlockTypeEnum.BLOCK_VIDEO, content=block_data.dict(), org_id=org_id, - course_id=course.id is not None, + course_id=course.id if course.id else 0, block_uuid=block_uuid, creation_date=str(datetime.now()), update_date=str(datetime.now()), diff --git a/apps/api/src/services/courses/activities/pdf.py b/apps/api/src/services/courses/activities/pdf.py index 8442d387..9011c8a5 100644 --- a/apps/api/src/services/courses/activities/pdf.py +++ b/apps/api/src/services/courses/activities/pdf.py @@ -80,7 +80,7 @@ async def create_documentpdf_activity( }, published_version=1, version=1, - org_id=org_id is not None, + org_id=org_id if org_id else 0, course_id=coursechapter.course_id, activity_uuid=activity_uuid, creation_date=str(datetime.now()), diff --git a/apps/api/src/services/dev/mocks/initial.py b/apps/api/src/services/dev/mocks/initial.py index 5bc4ac35..86973158 100644 --- a/apps/api/src/services/dev/mocks/initial.py +++ b/apps/api/src/services/dev/mocks/initial.py @@ -5,7 +5,6 @@ from uuid import uuid4 from fastapi import Request from src.services.users.schemas.users import UserInDB from src.security.security import security_hash_password -from src.services.courses.chapters import CourseChapter, create_coursechapter from src.services.courses.activities.activities import Activity, create_activity from src.services.users.users import PublicUser @@ -196,19 +195,19 @@ async def create_initial_data(request: Request): # await courses.insert_one(course.dict()) # create chapters - for i in range(0, 5): - coursechapter = CourseChapter( - name=fake_multilang.unique.sentence(), - description=fake_multilang.unique.text(), - activities=[], - ) - coursechapter = await create_coursechapter(request,coursechapter, course_id, current_user) - if coursechapter: - # create activities - for i in range(0, 5): - activity = Activity( - name=fake_multilang.unique.sentence(), - type="dynamic", - content={}, - ) - activity = await create_activity(request,activity, "org_test", coursechapter['coursechapter_id'], current_user) + # for i in range(0, 5): + # coursechapter = CourseChapter( + # name=fake_multilang.unique.sentence(), + # description=fake_multilang.unique.text(), + # activities=[], + # ) + # coursechapter = await create_coursechapter(request,coursechapter, course_id, current_user) + # if coursechapter: + # # create activities + # for i in range(0, 5): + # activity = Activity( + # name=fake_multilang.unique.sentence(), + # type="dynamic", + # content={}, + # ) + # activity = await create_activity(request,activity, "org_test", coursechapter['coursechapter_id'], current_user) diff --git a/apps/api/src/services/install/install.py b/apps/api/src/services/install/install.py index 33c2a31a..152ef745 100644 --- a/apps/api/src/services/install/install.py +++ b/apps/api/src/services/install/install.py @@ -6,7 +6,6 @@ import requests from config.config import get_learnhouse_config from src.security.security import security_hash_password from src.services.courses.activities.activities import Activity, create_activity -from src.services.courses.chapters import create_coursechapter, CourseChapter from src.services.orgs.schemas.orgs import Organization, OrganizationInDB from faker import Faker diff --git a/apps/api/src/services/orgs/orgs.py b/apps/api/src/services/orgs/orgs.py index a24737db..87f4e9f7 100644 --- a/apps/api/src/services/orgs/orgs.py +++ b/apps/api/src/services/orgs/orgs.py @@ -83,7 +83,7 @@ async def create_org( # Link user to org user_org = UserOrganization( user_id=int(current_user.id), - org_id=int(org.id is not None), + org_id=int(org.id if org.id else 0), role_id=1, creation_date=str(datetime.now()), update_date=str(datetime.now()), diff --git a/apps/api/src/services/trail/trail.py b/apps/api/src/services/trail/trail.py index ff7a8f56..92a5ae03 100644 --- a/apps/api/src/services/trail/trail.py +++ b/apps/api/src/services/trail/trail.py @@ -10,8 +10,6 @@ from src.db.trail_runs import TrailRun, TrailRunCreate, TrailRunRead from src.db.trail_steps import TrailStep from src.db.trails import Trail, TrailCreate, TrailRead from src.db.users import PublicUser -from src.services.orgs.schemas.orgs import PublicOrganization -from src.services.courses.chapters import get_coursechapters_meta async def create_user_trail( @@ -164,8 +162,8 @@ async def add_activity_to_trail( if not trailrun: trailrun = TrailRun( - trail_id=trail.id is not None, - course_id=course.id is not None, + trail_id=trail.id if trail.id is not None else 0, + course_id=course.id if course.id is not None else 0 , org_id=course.org_id, user_id=user.id, creation_date=str(datetime.now()), @@ -182,9 +180,9 @@ async def add_activity_to_trail( if not trailstep: trailstep = TrailStep( - trailrun_id=trailrun.id is not None, + trailrun_id=trailrun.id if trailrun.id is not None else 0 , activity_id=activity_id, - course_id=course.id is not None, + course_id=course.id if course.id is not None else 0, org_id=course.org_id, complete=False, teacher_verified=False, @@ -265,8 +263,8 @@ async def add_course_to_trail( if not trail_run: trail_run = TrailRun( - trail_id=trail.id is not None, - course_id=course.id is not None, + trail_id=trail.id if trail.id is not None else 0, + course_id=course.id if course.id is not None else 0, org_id=course.org_id, user_id=user.id, creation_date=str(datetime.now()), diff --git a/apps/api/src/services/users/users.py b/apps/api/src/services/users/users.py index d237aa9a..553a632a 100644 --- a/apps/api/src/services/users/users.py +++ b/apps/api/src/services/users/users.py @@ -75,7 +75,7 @@ async def create_user( # Link user and organization user_organization = UserOrganization( - user_id=user.id is not None, + user_id=user.id if user.id else 0, org_id=int(org_id), role_id=1, creation_date=str(datetime.now()), @@ -201,7 +201,6 @@ async def update_user_password( user.password = await security_hash_password(form.new_password) user.update_date = str(datetime.now()) - # Update user in database db_session.add(user) db_session.commit()