diff --git a/src/crud/authentication.py b/src/crud/authentication.py index 3ec81ec..201e25b 100644 --- a/src/crud/authentication.py +++ b/src/crud/authentication.py @@ -7,7 +7,6 @@ from sqlalchemy.orm import Session from src.crud.users import get_user_by_username, pwd_context from src.models import User -from src.schemas.users import UserCreate DEFAULT_NR_HIGH_SCORES = 10 diff --git a/src/crud/courseprogress.py b/src/crud/courseprogress.py index 6fb4b38..4818f1e 100644 --- a/src/crud/courseprogress.py +++ b/src/crud/courseprogress.py @@ -1,4 +1,3 @@ -from fastapi import HTTPException from sqlalchemy.orm import Session from src.enums import CourseEnum, course_enum_list diff --git a/src/crud/highscores.py b/src/crud/highscores.py index 45c397c..5809027 100644 --- a/src/crud/highscores.py +++ b/src/crud/highscores.py @@ -7,6 +7,8 @@ from src.models import HighScore, User from src.schemas.highscores import HighScoreBase from src.schemas.users import UserHighScore +DEFAULT_NR_HIGH_SCORES = 10 + def get_high_scores(db: Session, minigame: MinigameEnum, nr_highest: int): """Get the n highest scores of a given minigame""" diff --git a/src/main.py b/src/main.py index e3e0869..29b16f4 100644 --- a/src/main.py +++ b/src/main.py @@ -1,7 +1,7 @@ import sys from typing import List, Optional -from fastapi import Depends, FastAPI, HTTPException +from fastapi import Depends, FastAPI from sqlalchemy.orm import Session sys.path.append("..") @@ -10,7 +10,7 @@ from src.crud import authentication as crud_authentication from src.crud import courseprogress as crud_courseprogress from src.crud import highscores as crud_highscores from src.crud import users as crud_users -from src.database import Base, SessionLocal, engine, get_db +from src.database import Base, engine, get_db from src.enums import CourseEnum, MinigameEnum from src.schemas import courseprogress, highscores, users @@ -85,7 +85,7 @@ async def get_course_progress( @app.patch("/courseprogress") -async def get_course_progress( +async def patch_course_progress( course_progress: courseprogress.CourseProgressBase, current_user_name: str = Depends(crud_authentication.get_current_user_name), db: Session = Depends(get_db), diff --git a/src/models.py b/src/models.py index 516d9c6..99a3965 100644 --- a/src/models.py +++ b/src/models.py @@ -1,9 +1,7 @@ from sqlalchemy import Column, Float, ForeignKey, Integer, String -from sqlalchemy.dialects.postgresql import ARRAY from sqlalchemy.orm import relationship from src.database import Base -from src.enums import CourseEnum, MinigameEnum, StrEnumType class User(Base): diff --git a/src/schemas/users.py b/src/schemas/users.py index 3077af7..d98b5e6 100644 --- a/src/schemas/users.py +++ b/src/schemas/users.py @@ -1,5 +1,3 @@ -from typing import List - from pydantic import BaseModel diff --git a/tests/config/setup.py b/tests/config/setup.py index fa49ebe..71466e6 100644 --- a/tests/config/setup.py +++ b/tests/config/setup.py @@ -1,10 +1,9 @@ import sys -sys.path.append("..") - import pytest from sqlalchemy import create_engine -from sqlalchemy.orm import sessionmaker + +sys.path.append("..") from src.database import Base as ProductionBase from tests.config.database import (SQLALCHEMY_DATABASE_URL, TestBase,