Finish sqlmodel migration

- merge card.py, user.py and dbmodels.py into models.py
- deduplicate
- change responsemodels in the manager functions
- correct inports

app/controllers/cardManager.py

@@ -2,8 +2,7 @@ from fastapi import APIRouter, Depends, HTTPException
 from sqlmodel import Session
 from typing import List
 
-from ..model.dbModels import Card, AccessAuthorization
-from ..model.card import CardBase, AccessAuthorizationCreate, AccessAuthorization as AccessSchema
+from ..model.models import Card, AccessAuthorizationDB, AccessAuthorizationCreate, AccessAuthorizationResponse
 from ..services.database import engine
 import uuid as gen_uuid
 
@@ -14,7 +13,7 @@ def register_card(name: str):
     card = Card(user_id=name, uuid=uuid)
     return card
 
-@card_router.get("/cards", response_model=List[AccessSchema])
+@card_router.get("/cards", response_model=List[AccessAuthorizationResponse])
 def get_accesses():
     with Session(engine) as db:
         accesses = db.query(AccessAuthorization).all()
@@ -22,7 +21,7 @@ def get_accesses():
             raise HTTPException(status_code=404, detail="N/A")
         return accesses
 
-@card_router.post("/cards", response_model=AccessSchema)
+@card_router.post("/cards", response_model=AccessAuthorizationResponse)
 def create_access(access: AccessAuthorizationCreate):
     with Session(engine) as db:
         db_access = AccessAuthorization(**access.dict())
@@ -33,7 +32,7 @@ def create_access(access: AccessAuthorizationCreate):
         db.refresh(db_access)
         return db_access
 
-@card_router.get("/cards/{auth_name}", response_model=List[CardBase])
+@card_router.get("/cards/{auth_name}", response_model=List[Card])
 def get_cards(auth_name: str):
     with Session(engine) as db:
         stmt = select(AccessAuthorization).where(AccessAuthorization.name == auth_name)
@@ -42,7 +41,7 @@ def get_cards(auth_name: str):
             raise HTTPException(status_code=404, detail="Not found!")
         return access_auth.card_id
 
-@card_router.post("/cards/{auth_name}", response_model=CardBase)
+@card_router.post("/cards/{auth_name}", response_model=Card)
 def add_card(auth_name: str):
     with Session(engine) as db:
         card = register_card(auth_name)

app/controllers/userManager.py

@@ -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()