Sort of fix StrEnum issue
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
from fastapi import HTTPException
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from enums import CourseEnum
|
||||
from enums import CourseEnum, course_enum_list
|
||||
from models import User, CourseProgress
|
||||
|
||||
|
||||
def get_course_progress(db: Session, username: str, course: CourseEnum):
|
||||
def get_course_progress(db: Session, user: User, course: CourseEnum):
|
||||
"""Get the progress a user has for a certain course"""
|
||||
user = get_user_by_username(db, username)
|
||||
if course != CourseEnum.All:
|
||||
course_progress = (
|
||||
db.query(CourseProgress)
|
||||
@@ -18,10 +18,18 @@ def get_course_progress(db: Session, username: str, course: CourseEnum):
|
||||
if course_progress:
|
||||
return [
|
||||
CourseProgressBase(
|
||||
progress_value=course_progress.progress_value,
|
||||
course=course_progress.course,
|
||||
progress_value = course_progress.progress_value,
|
||||
course = course_progress.course,
|
||||
)
|
||||
]
|
||||
else:
|
||||
return [CourseProgressBase(progress_value=0, course=course)]
|
||||
return [CourseProgressBase(progress_value = 0, course=course)]
|
||||
return []
|
||||
|
||||
|
||||
def initialize_user(db: Session, user: User):
|
||||
for course in course_enum_list:
|
||||
db.add(CourseProgress(progress_value = 0.0, course = course, owner_id = user.user_id))
|
||||
db.commit()
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user