WeSign/back-end
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The great endpoint refactor

Browse Source
This commit is contained in:
lvrossem
2023-04-10 14:44:21 -06:00
parent e7145369b5
commit 8e128ca033
8 changed files with 100 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/crud/courseprogress.py
View File

@@ -3,7 +3,7 @@ from fastapi import HTTPException
from src.enums import CourseEnum
from src.models import CourseProgress, User
from src.schemas.courseprogress import CourseProgressBase
from src.schemas.courseprogress import CourseProgressBase, CourseProgressParent
def get_course_progress(db: Session, user: User, course: CourseEnum):
@@ -26,7 +26,7 @@ def get_course_progress(db: Session, user: User, course: CourseEnum):
if course_progress:
result.append(
CourseProgressBase(
CourseProgressParent(
progress_value=course_progress.progress_value, course=course
)
)
@@ -35,7 +35,7 @@ def get_course_progress(db: Session, user: User, course: CourseEnum):
CourseProgress(progress_value=0.0, course=course, owner_id=user.user_id)
)
db.commit()
result.append(CourseProgressBase(progress_value=0.0, course=course))
result.append(CourseProgressParent(progress_value=0.0, course=course))
return result
@@ -50,18 +50,18 @@ def initialize_user(db: Session, user: User):
db.commit()
def patch_course_progress(db: Session, user: User, course_progress: CourseProgressBase):
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:
raise HTTPException(status_code=400, detail="Invalid progress value")
db_course_progress_list = []
if course_progress.course != CourseEnum.All:
if course != CourseEnum.All:
db_course_progress_list = (
db.query(CourseProgress)
.filter(
CourseProgress.owner_id == user.user_id,
CourseProgress.course == course_progress.course,
CourseProgress.course == course,
)
.all()
)
@@ -71,12 +71,12 @@ def patch_course_progress(db: Session, user: User, course_progress: CourseProgre
.filter(CourseProgress.owner_id == user.user_id)
.all()
)
print(f"LENGTH OF LIST OF {course_progress.course}: {len(db_course_progress_list)}")
for db_course_progress in db_course_progress_list:
db_course_progress.progress_value = course_progress.progress_value
db.commit()
return [
CourseProgressBase(course=db_cp.course, progress_value=db_cp.progress_value)
CourseProgressParent(course=db_cp.course, progress_value=db_cp.progress_value)
for db_cp in db_course_progress_list
]