Formatting
This commit is contained in:
@@ -7,7 +7,6 @@ from sqlalchemy.orm import Session
|
|||||||
|
|
||||||
from src.crud.users import get_user_by_username, pwd_context
|
from src.crud.users import get_user_by_username, pwd_context
|
||||||
from src.models import User
|
from src.models import User
|
||||||
from src.schemas.users import UserCreate
|
|
||||||
|
|
||||||
DEFAULT_NR_HIGH_SCORES = 10
|
DEFAULT_NR_HIGH_SCORES = 10
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
from fastapi import HTTPException
|
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from src.enums import CourseEnum, course_enum_list
|
from src.enums import CourseEnum, course_enum_list
|
||||||
|
|||||||
@@ -7,6 +7,8 @@ from src.models import HighScore, User
|
|||||||
from src.schemas.highscores import HighScoreBase
|
from src.schemas.highscores import HighScoreBase
|
||||||
from src.schemas.users import UserHighScore
|
from src.schemas.users import UserHighScore
|
||||||
|
|
||||||
|
DEFAULT_NR_HIGH_SCORES = 10
|
||||||
|
|
||||||
|
|
||||||
def get_high_scores(db: Session, minigame: MinigameEnum, nr_highest: int):
|
def get_high_scores(db: Session, minigame: MinigameEnum, nr_highest: int):
|
||||||
"""Get the n highest scores of a given minigame"""
|
"""Get the n highest scores of a given minigame"""
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import sys
|
import sys
|
||||||
from typing import List, Optional
|
from typing import List, Optional
|
||||||
|
|
||||||
from fastapi import Depends, FastAPI, HTTPException
|
from fastapi import Depends, FastAPI
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
sys.path.append("..")
|
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 courseprogress as crud_courseprogress
|
||||||
from src.crud import highscores as crud_highscores
|
from src.crud import highscores as crud_highscores
|
||||||
from src.crud import users as crud_users
|
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.enums import CourseEnum, MinigameEnum
|
||||||
from src.schemas import courseprogress, highscores, users
|
from src.schemas import courseprogress, highscores, users
|
||||||
|
|
||||||
@@ -85,7 +85,7 @@ async def get_course_progress(
|
|||||||
|
|
||||||
|
|
||||||
@app.patch("/courseprogress")
|
@app.patch("/courseprogress")
|
||||||
async def get_course_progress(
|
async def patch_course_progress(
|
||||||
course_progress: courseprogress.CourseProgressBase,
|
course_progress: courseprogress.CourseProgressBase,
|
||||||
current_user_name: str = Depends(crud_authentication.get_current_user_name),
|
current_user_name: str = Depends(crud_authentication.get_current_user_name),
|
||||||
db: Session = Depends(get_db),
|
db: Session = Depends(get_db),
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
from sqlalchemy import Column, Float, ForeignKey, Integer, String
|
from sqlalchemy import Column, Float, ForeignKey, Integer, String
|
||||||
from sqlalchemy.dialects.postgresql import ARRAY
|
|
||||||
from sqlalchemy.orm import relationship
|
from sqlalchemy.orm import relationship
|
||||||
|
|
||||||
from src.database import Base
|
from src.database import Base
|
||||||
from src.enums import CourseEnum, MinigameEnum, StrEnumType
|
|
||||||
|
|
||||||
|
|
||||||
class User(Base):
|
class User(Base):
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
from typing import List
|
|
||||||
|
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
import sys
|
import sys
|
||||||
|
|
||||||
sys.path.append("..")
|
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from sqlalchemy import create_engine
|
from sqlalchemy import create_engine
|
||||||
from sqlalchemy.orm import sessionmaker
|
|
||||||
|
sys.path.append("..")
|
||||||
|
|
||||||
from src.database import Base as ProductionBase
|
from src.database import Base as ProductionBase
|
||||||
from tests.config.database import (SQLALCHEMY_DATABASE_URL, TestBase,
|
from tests.config.database import (SQLALCHEMY_DATABASE_URL, TestBase,
|
||||||
|
|||||||
Reference in New Issue
Block a user