diff --git a/src/crud.py b/src/crud.py index 8255e2d..6be16ce 100644 --- a/src/crud.py +++ b/src/crud.py @@ -16,7 +16,7 @@ def get_users(db: Session): def create_user(db: Session, user: schemas.users.UserCreate): - db_user = models.User(username=user.username, hashed_password=user.hashed_password) + db_user = models.User(username=user.username, hashed_password=user.password) db.add(db_user) db.commit() db.refresh(db_user) diff --git a/src/main.py b/src/main.py index 2ebd2e3..a5a10a0 100644 --- a/src/main.py +++ b/src/main.py @@ -2,7 +2,7 @@ from fastapi import Depends, FastAPI, HTTPException from sqlalchemy.orm import Session from models import Base from database import SessionLocal, engine -from schemas.users import UserCreate, User +from schemas import users from typing import List import crud @@ -25,17 +25,18 @@ async def root(): print("Hello world") return {"message": "Hello world!"} -@app.post("/users", response_model=User) -async def create_user(user: UserCreate, db: Session = Depends(get_db)): +@app.post("/users", response_model=users.User) +async def create_user(user: users.UserCreate, db: Session = Depends(get_db)): db_user = crud.get_user_by_username(db, username=user.username) if db_user: raise HTTPException(status_code=400, detail="Email already registered") return crud.create_user(db=db, user=user) -@app.get("/users")#, response_model=List[User]) +@app.get("/users", response_model=List[users.User]) async def read_users(db: Session = Depends(get_db)): print("here") users = crud.get_users(db) + print(users[0].high_scores) return users diff --git a/src/schemas/users.py b/src/schemas/users.py index 3322c43..cbcaa6d 100644 --- a/src/schemas/users.py +++ b/src/schemas/users.py @@ -7,8 +7,8 @@ class User(BaseModel): username: str hashed_password: str - high_scores: List[int] = [] - course_progresses: List[int] = [] + high_score_ids: List[int] = [] + course_progress_ids: List[int] = [] class Config: orm_mode = True