Refactoring: auth tests pass

This commit is contained in:
lvrossem
2023-04-16 07:15:03 -06:00
parent d38d4d5c16
commit 0bf764a0f4
14 changed files with 116 additions and 93 deletions

View File

@@ -27,15 +27,15 @@ def get_course_progress(db: Session, user: User, course: CourseEnum):
if course_progress:
result.append(
CourseProgressParent(
progress_value=course_progress.progress_value, course=course
progress=course_progress.progress, course=course
)
)
else:
db.add(
CourseProgress(progress_value=0.0, course=course, owner_id=user.user_id)
CourseProgress(progress=0.0, course=course, owner_id=user.user_id)
)
db.commit()
result.append(CourseProgressParent(progress_value=0.0, course=course))
result.append(CourseProgressParent(progress=0.0, course=course))
return result
@@ -45,7 +45,7 @@ def initialize_user(db: Session, user: User):
for course in CourseEnum:
if course != CourseEnum.All:
db.add(
CourseProgress(progress_value=0.0, course=course, owner_id=user.user_id)
CourseProgress(progress=0.0, course=course, owner_id=user.user_id)
)
db.commit()
@@ -54,7 +54,7 @@ def patch_course_progress(
db: Session, user: User, course: CourseEnum, course_progress: CourseProgressBase
):
"""Change the progress value for a given course"""
if course_progress.progress_value > 1 or course_progress.progress_value < 0:
if course_progress.progress > 1 or course_progress.progress < 0:
raise HTTPException(status_code=400, detail="Invalid progress value")
db_course_progress_list = []
@@ -75,10 +75,10 @@ def patch_course_progress(
)
for db_course_progress in db_course_progress_list:
db_course_progress.progress_value = course_progress.progress_value
db_course_progress.progress = course_progress.progress
db.commit()
return [
CourseProgressParent(course=db_cp.course, progress_value=db_cp.progress_value)
CourseProgressParent(course=db_cp.course, progress=db_cp.progress)
for db_cp in db_course_progress_list
]