Finish sqlmodel migration
- merge card.py, user.py and dbmodels.py into models.py - deduplicate - change responsemodels in the manager functions - correct inports
This commit is contained in:
@@ -2,13 +2,12 @@ from fastapi import APIRouter, Depends, HTTPException
|
||||
from sqlmodel import Session
|
||||
from typing import List
|
||||
|
||||
from ..model.dbModels import User
|
||||
from ..model.user import UserCreate, User as UserSchema
|
||||
from ..model.models import UserResponse, UserCreate, UserDB
|
||||
from ..services.database import engine
|
||||
|
||||
user_router = APIRouter(tags=["users"])
|
||||
|
||||
@user_router.post("/users/", response_model=UserSchema)
|
||||
@user_router.post("/users/", response_model=UserResponse)
|
||||
def create_user(user: UserCreate):
|
||||
with Session(engine) as db:
|
||||
db_user = User(**user.dict())
|
||||
@@ -17,13 +16,13 @@ def create_user(user: UserCreate):
|
||||
db.refresh(db_user)
|
||||
return db_user
|
||||
|
||||
@user_router.get("/users/", response_model=List[UserSchema])
|
||||
@user_router.get("/users/", response_model=List[UserResponse])
|
||||
def read_users():
|
||||
with Session(engine) as db:
|
||||
users = db.query(User).all()
|
||||
return users
|
||||
|
||||
@user_router.get("/users/{user_id}", response_model=UserSchema)
|
||||
@user_router.get("/users/{user_id}", response_model=UserResponse)
|
||||
def read_user(user_id: int):
|
||||
with Session(engine) as db:
|
||||
db_user = db.query(User).filter(User.id == user_id).first()
|
||||
@@ -31,7 +30,7 @@ def read_user(user_id: int):
|
||||
raise HTTPException(status_code=404, detail="User not found")
|
||||
return db_user
|
||||
|
||||
@user_router.put("/users/{user_id}", response_model=UserSchema)
|
||||
@user_router.put("/users/{user_id}", response_model=UserResponse)
|
||||
def update_user(user_id: int, user: UserCreate):
|
||||
with Session(engine) as db:
|
||||
db_user = db.query(User).filter(User.id == user_id).first()
|
||||
|
||||
Reference in New Issue
Block a user