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

chore: adapt to SQLModel 16 & SQLAlchemy 2.x

Browse source
This commit is contained in:
swve 2024-04-01 12:20:29 +02:00
parent 938c3a2349
commit c8f6aff996
24 changed files with 120 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

12
apps/api/src/services/courses/chapters.py
View file

@ -34,7 +34,7 @@ async def create_chapter(
current_user: PublicUser | AnonymousUser,
db_session: Session,
) -> ChapterRead:
chapter = Chapter.from_orm(chapter_object)
chapter = Chapter.model_validate(chapter_object)
# Get COurse
statement = select(Course).where(Course.id == chapter_object.course_id)
@ -68,7 +68,7 @@ async def create_chapter(
db_session.commit()
db_session.refresh(chapter)
chapter = ChapterRead(**chapter.dict(), activities=[])
chapter = ChapterRead(**chapter.model_dump(), activities=[])
# Check if COurseChapter link exists
@ -135,8 +135,8 @@ async def get_chapter(
activities = db_session.exec(statement).all()
chapter = ChapterRead(
**chapter.dict(),
activities=[ActivityRead(**activity.dict()) for activity in activities],
**chapter.model_dump(),
activities=[ActivityRead(**activity.model_dump()) for activity in activities],
)
return chapter
@ -231,7 +231,7 @@ async def get_course_chapters(
)
chapters = db_session.exec(statement).all()
chapters = [ChapterRead(**chapter.dict(), activities=[]) for chapter in chapters]
chapters = [ChapterRead(**chapter.model_dump(), activities=[]) for chapter in chapters]
# RBAC check
await rbac_check(request, course.course_uuid, current_user, "read", db_session) # type: ignore
@ -255,7 +255,7 @@ async def get_course_chapters(
activity = db_session.exec(statement).first()
if activity:
chapter.activities.append(ActivityRead(**activity.dict()))
chapter.activities.append(ActivityRead(**activity.model_dump()))
return chapters