add forms, shipments tests

backend/src/users/exceptions.py

@@ -0,0 +1,11 @@
+class UserServiceError(Exception):
+    def __init__(self, message: str):
+        super().__init__(message)
+
+class UserNotFoundError(UserServiceError):
+    pass
+
+class UserCreateError(UserServiceError):
+    def __init__(self, message: str, field: str | None = None):
+        super().__init__(message)
+        self.field = field

backend/src/users/service.py

@@ -1,5 +1,9 @@
 from sqlmodel import Session, select
+
 import src.models as models
+import src.messages as messages
+
+import src.users.exceptions as exceptions
 
 def get_all(
     session: Session,
@@ -49,6 +53,8 @@ def get_roles(session: Session):
     return session.exec(statement.order_by(models.ContractType.name)).all()
 
 def create_one(session: Session, user: models.UserCreate) -> models.UserPublic:
+    if user is None:
+        raise exceptions.UserCreateError(messages.Messages.invalid_input('user', 'input cannot be None'))
     new_user = models.User(
         name=user.name,
         email=user.email
@@ -63,12 +69,13 @@ def create_one(session: Session, user: models.UserCreate) -> models.UserPublic:
     return new_user
 
 def update_one(session: Session, id: int, user: models.UserCreate) -> models.UserPublic:
+    if user is None:
+        raise exceptions.UserCreateError(messages.s.invalid_input('user', 'input cannot be None'))
     statement = select(models.User).where(models.User.id == id)
     result = session.exec(statement)
     new_user = result.first()
     if not new_user:
-        return None
-
+        raise exceptions.UserNotFoundError(f'User {id} not found')
     new_user.email = user.email
     new_user.name = user.name
 
@@ -84,7 +91,7 @@ def delete_one(session: Session, id: int) -> models.UserPublic:
     result = session.exec(statement)
     user = result.first()
     if not user:
-        return None
+        raise exceptions.UserNotFoundError(f'User {id} not found')
     result = models.UserPublic.model_validate(user)
     session.delete(user)
     session.commit()

backend/src/users/users.py

@@ -5,6 +5,7 @@ from src.database import get_session
 from sqlmodel import Session
 import src.users.service as service
 from src.auth.auth import get_current_user
+import src.users.exceptions as exceptions
 
 router = APIRouter(prefix='/users')
 
@@ -36,7 +37,7 @@ def get_users(
 ):
     result = service.get_one(session, id)
     if result is None:
-        raise HTTPException(status_code=404, detail=messages.notfound)
+        raise HTTPException(status_code=404, detail=messages.Messages.not_found('user'))
     return result
 
 @router.post('', response_model=models.UserPublic)
@@ -45,7 +46,11 @@ def create_user(
     logged_user: models.User = Depends(get_current_user),
     session: Session = Depends(get_session)
 ):
-    return service.create_one(session, user)
+    try:
+        user = service.create_one(session, user)
+    except exceptions.UserCreateError as error:
+        raise HTTPException(status_code=400, detail=str(error))
+    return user
 
 @router.put('/{id}', response_model=models.UserPublic)
 def update_user(
@@ -54,9 +59,10 @@ def update_user(
     logged_user: models.User = Depends(get_current_user),
     session: Session = Depends(get_session)
 ):
-    result = service.update_one(session, id, user)
-    if result is None:
-        raise HTTPException(status_code=404, detail=messages.notfound)
+    try:
+        result = service.update_one(session, id, user)
+    except exceptions.UserNotFoundError as error:
+        raise HTTPException(status_code=404, detail=messages.Messages.not_found('user'))
     return result
 
 @router.delete('/{id}', response_model=models.UserPublic)
@@ -65,7 +71,8 @@ def delete_user(
     user: models.User = Depends(get_current_user),
     session: Session = Depends(get_session)
 ):
-    result = service.delete_one(session, id)
-    if result is None:
-        raise HTTPException(status_code=404, detail=messages.notfound)
+    try:
+        result = service.delete_one(session, id)
+    except exceptions.UserNotFoundError as error:
+        raise HTTPException(status_code=404, detail=messages.Messages.not_found('user'))
     return result