For real this time, it really works
This commit is contained in:
@@ -16,7 +16,7 @@ def get_users(db: Session):
|
|||||||
|
|
||||||
|
|
||||||
def create_user(db: Session, user: schemas.users.UserCreate):
|
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.add(db_user)
|
||||||
db.commit()
|
db.commit()
|
||||||
db.refresh(db_user)
|
db.refresh(db_user)
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ from fastapi import Depends, FastAPI, HTTPException
|
|||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
from models import Base
|
from models import Base
|
||||||
from database import SessionLocal, engine
|
from database import SessionLocal, engine
|
||||||
from schemas.users import UserCreate, User
|
from schemas import users
|
||||||
from typing import List
|
from typing import List
|
||||||
import crud
|
import crud
|
||||||
|
|
||||||
@@ -25,17 +25,18 @@ async def root():
|
|||||||
print("Hello world")
|
print("Hello world")
|
||||||
return {"message": "Hello world!"}
|
return {"message": "Hello world!"}
|
||||||
|
|
||||||
@app.post("/users", response_model=User)
|
@app.post("/users", response_model=users.User)
|
||||||
async def create_user(user: UserCreate, db: Session = Depends(get_db)):
|
async def create_user(user: users.UserCreate, db: Session = Depends(get_db)):
|
||||||
db_user = crud.get_user_by_username(db, username=user.username)
|
db_user = crud.get_user_by_username(db, username=user.username)
|
||||||
if db_user:
|
if db_user:
|
||||||
raise HTTPException(status_code=400, detail="Email already registered")
|
raise HTTPException(status_code=400, detail="Email already registered")
|
||||||
return crud.create_user(db=db, user=user)
|
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)):
|
async def read_users(db: Session = Depends(get_db)):
|
||||||
print("here")
|
print("here")
|
||||||
users = crud.get_users(db)
|
users = crud.get_users(db)
|
||||||
|
print(users[0].high_scores)
|
||||||
return users
|
return users
|
||||||
|
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ class User(BaseModel):
|
|||||||
username: str
|
username: str
|
||||||
hashed_password: str
|
hashed_password: str
|
||||||
|
|
||||||
high_scores: List[int] = []
|
high_score_ids: List[int] = []
|
||||||
course_progresses: List[int] = []
|
course_progress_ids: List[int] = []
|
||||||
|
|
||||||
class Config:
|
class Config:
|
||||||
orm_mode = True
|
orm_mode = True
|
||||||
|
|||||||
Reference in New Issue
Block a user