Shop registration works now

backend/app/api/routes/login_routes.py

@@ -30,7 +30,7 @@ def login_access_token(
     """
     user = None
     user = user_crud.authenticate(
-        session=session, email=form_data.username, password=form_data.password, shop_id=None
+        session=session, email=form_data.username, password=form_data.password, shop_uuid=None
     )
     if not user:
         raise HTTPException(status_code=400, detail="Incorrect email or password")
@@ -39,6 +39,6 @@ def login_access_token(
     access_token_expires = timedelta(minutes=settings.ACCESS_TOKEN_EXPIRE_MINUTES)
     return Token(
         access_token=security.create_access_token(
-            user.id, expires_delta=access_token_expires
+            user.uuid, expires_delta=access_token_expires
         )
     )

backend/app/api/routes/shop_routes.py

@@ -1,18 +1,18 @@
-from fastapi import APIRouter
+from fastapi import APIRouter, HTTPException, status
 
 from app.api.dependencies import CurrentOwnerUser, SessionDep
 from app.schemas.shop_schemas import ShopCreate
 from app.schemas.user_schemas import Token
+from app.crud.shop_crud import create_shop
 
-router = APIRouter(prefix="/shop", tags=["Shop"])
+router = APIRouter(prefix="/shop", tags=["Dashboard"])
 
 
-@router.post("")
+@router.post("", response_model=bool, status_code=201)
 def register_new_shop(
     session: SessionDep,
     current_user: CurrentOwnerUser,
     shop_data: ShopCreate
 ) -> Token:
-    """
-    OAuth2 compatible token login, get an access token for future requests
-    """
+    create_shop(session, shop_data, current_user)
+    return True

backend/app/api/routes/user_routes.py

@@ -1,38 +1,35 @@
 import logging
 import re
 
-from fastapi import APIRouter, Body, HTTPException, status
+from fastapi import APIRouter, HTTPException, status
 from sqlalchemy.exc import IntegrityError
 
-from app.api.dependencies import SessionDep
+from app.api.dependencies import CurrentOwnerUser, SessionDep
 from app.crud import user_crud
 from app.database.models.user_model import UserRole
-from app.schemas.user_schemas import UserRegister
+from app.schemas.user_schemas import UserRegister, UserUpdate
 
 logger = logging.getLogger(__name__)
 
+INTERNAL_SERVER_ERROR = HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail="Internal server error")
+
 
 router = APIRouter(
     prefix="/user",
-    tags=["User"]
+    tags=["User", "Dashboard"]
 )
 
 
-@router.delete("/delete", summary="Delete user")
-async def delete_user():
-    raise NotImplementedError("delete_user() needs to be implemented.")
+@router.get("", summary="Get information about currently logged in user")
+async def get_user(session: SessionDep, current_user: CurrentOwnerUser):
+    pass
 
 
-@router.delete("/logout", summary="User logout")
-async def logout():
-    raise NotImplementedError("logout() needs to be implemented.")
-
-
-@router.post("/register", summary="Register new user")
+@router.post("", summary="Register new user", status_code=status.HTTP_201_CREATED, response_model=bool)
 async def register(session: SessionDep, user_data: UserRegister):
     try:
         user_crud.create_user(session, user_data, None, UserRole.OWNER)
-        return {"detail": "Registered succeesfully"}
+        return True
     except IntegrityError as e:
         field_mapping = {"uuid": "email"}  # If a UUID is duplicate, it means email is in use
 
@@ -49,10 +46,17 @@ async def register(session: SessionDep, user_data: UserRegister):
             detail=detail
         )
     except Exception as e:
+        if isinstance(e, HTTPException):
+            raise
         logger.error(e)
-        raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail="Failed to register")
+        raise INTERNAL_SERVER_ERROR
 
 
-@router.put("/update", summary="Update user details")
-async def update_user(data: dict = Body(...)):
-    raise NotImplementedError("update_user() needs to be implemented.")
+@router.delete("", summary="Delete user")
+async def delete_user():
+    raise HTTPException(status_code=status.HTTP_501_NOT_IMPLEMENTED, detail="delete_user() not implemented")
+
+
+@router.put("", summary="Update user details")
+async def update_user(data: UserUpdate):
+    raise HTTPException(status_code=status.HTTP_501_NOT_IMPLEMENTED, detail="update_user() not implemented")