Sort of fix StrEnum issue
This commit is contained in:
24
src/main.py
24
src/main.py
@@ -15,10 +15,7 @@ from models import Base
|
||||
from schemas import courseprogress, highscores, users
|
||||
|
||||
app = FastAPI()
|
||||
|
||||
|
||||
Base.metadata.create_all(bind=engine)
|
||||
|
||||
bearer_scheme = HTTPBearer()
|
||||
|
||||
|
||||
@@ -61,14 +58,17 @@ async def read_users(db: Session = Depends(get_db)):
|
||||
async def patch_current_user(
|
||||
user: users.UserCreate,
|
||||
current_user_name=Depends(get_current_user_name),
|
||||
db: Session = Depends(get_db),
|
||||
db: Session = Depends(get_db)
|
||||
):
|
||||
crud_users.patch_user(db, current_user_name, user)
|
||||
|
||||
|
||||
@app.post("/register")
|
||||
async def register(user: users.UserCreate, db: Session = Depends(get_db)):
|
||||
return crud_authentication.register(db, user.username, user.password)
|
||||
access_token = crud_authentication.register(db, user.username, user.password, user.avatar)
|
||||
user = crud_users.get_user_by_username(db, user.username)
|
||||
crud_courseprogress.initialize_user(db, user)
|
||||
return access_token
|
||||
|
||||
|
||||
@app.post("/login")
|
||||
@@ -78,18 +78,21 @@ async def login(user: users.UserCreate, db: Session = Depends(get_db)):
|
||||
|
||||
@app.get("/highscores", response_model=List[users.UserHighScore])
|
||||
async def get_high_scores(
|
||||
db: Session = Depends(get_db),
|
||||
minigame: Optional[MinigameEnum] = None,
|
||||
nr_highest: Optional[int] = None,
|
||||
db: Session = Depends(get_db)
|
||||
):
|
||||
return crud_highscores.get_high_scores(db, minigame, nr_highest)
|
||||
|
||||
|
||||
@app.post("/highscores", response_model=highscores.HighScore)
|
||||
async def create_high_score(
|
||||
high_score: highscores.HighScoreCreate, db: Session = Depends(get_db)
|
||||
high_score: highscores.HighScoreBase,
|
||||
current_user_name = Depends(get_current_user_name),
|
||||
db: Session = Depends(get_db)
|
||||
):
|
||||
return crud_highscores.create_high_score(db=db, high_score=high_score)
|
||||
current_user = crud_users.get_user_by_username(db, current_user_name)
|
||||
return crud_highscores.create_high_score(db, current_user, high_score)
|
||||
|
||||
|
||||
#### TESTING!! DELETE LATER
|
||||
@@ -104,6 +107,7 @@ async def protected_route(current_user_name=Depends(get_current_user_name)):
|
||||
async def get_course_progress(
|
||||
course: Optional[CourseEnum] = CourseEnum.All,
|
||||
current_user_name=Depends(get_current_user_name),
|
||||
db: Session = Depends(get_db),
|
||||
db: Session = Depends(get_db)
|
||||
):
|
||||
return crud_courseprogress.get_course_progress(db, current_user_name, course)
|
||||
current_user = crud_users.get_user_by_username(db, current_user_name)
|
||||
return crud_courseprogress.get_course_progress(db, current_user, course)
|
||||
|
||||
Reference in New Issue
Block a user