Fix request path issues
This commit is contained in:
@@ -4,15 +4,15 @@ from models import User, HighScore, CourseProgress
|
||||
import schemas, models
|
||||
|
||||
def get_user(db: Session, user_id: int):
|
||||
return db.query(models.User).filter(models.User.user_id == user_id).first()
|
||||
return db.query(User).filter(User.user_id == user_id).first()
|
||||
|
||||
|
||||
def get_user_by_username(db: Session, username: str):
|
||||
return db.query(User).filter(models.User.username == username).first()
|
||||
return db.query(User).filter(User.username == username).first()
|
||||
|
||||
|
||||
def get_users(db: Session):
|
||||
return db.query(models.User).all()
|
||||
return db.query(User).all()
|
||||
|
||||
|
||||
def create_user(db: Session, user: schemas.users.UserCreate):
|
||||
|
||||
@@ -3,10 +3,10 @@ from sqlalchemy.ext.declarative import declarative_base
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
|
||||
# SQLALCHEMY_DATABASE_URL = "sqlite:///./sql_app.db"
|
||||
SQLALCHEMY_DATABASE_URL = 'postgresql://user:password@postgresserver/wesign-dev'
|
||||
SQLALCHEMY_DATABASE_URL = 'postgresql://admin:WeSign123!@localhost/wesigndev'
|
||||
|
||||
engine = create_engine(SQLALCHEMY_DATABASE_URL)
|
||||
|
||||
SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
|
||||
|
||||
Base = declarative_base()
|
||||
Base = declarative_base()
|
||||
|
||||
21
src/main.py
21
src/main.py
@@ -3,6 +3,7 @@ from sqlalchemy.orm import Session
|
||||
from models import Base
|
||||
from database import SessionLocal, engine
|
||||
from schemas.users import UserCreate, User
|
||||
from typing import List
|
||||
import crud
|
||||
|
||||
app = FastAPI()
|
||||
@@ -12,25 +13,29 @@ Base.metadata.create_all(bind=engine)
|
||||
def get_db():
|
||||
db = SessionLocal()
|
||||
try:
|
||||
print("Yield")
|
||||
yield db
|
||||
finally:
|
||||
print("Close")
|
||||
db.close()
|
||||
|
||||
|
||||
@app.post("/users/", response_model=User)
|
||||
def create_user(user: UserCreate, db: Session = Depends(get_db)):
|
||||
@app.get("/")
|
||||
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)):
|
||||
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])
|
||||
def read_users(db: Session = Depends(get_db)):
|
||||
@app.get("/users")#, response_model=List[User])
|
||||
async def read_users(db: Session = Depends(get_db)):
|
||||
print("here")
|
||||
users = crud.get_users(db)
|
||||
return users
|
||||
|
||||
|
||||
@app.get("/")
|
||||
async def root():
|
||||
return {"message": "Hello World"}
|
||||
Reference in New Issue
Block a user