add permission check for form productor and product

backend/src/users/service.py

@@ -56,7 +56,9 @@ def get_or_create_user(session: Session, user_create: models.UserCreate):
 
 
 def get_roles(session: Session):
-    statement = select(models.ContractType)
+    statement = (
+        select(models.ContractType)
+    )
     return session.exec(statement.order_by(models.ContractType.name)).all()
 
 
@@ -64,7 +66,9 @@ 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'))
+                'user', 'input cannot be None'
+            )
+        )
     new_user = models.User(
         name=user.name,
         email=user.email
@@ -81,17 +85,19 @@ def create_one(session: Session, user: models.UserCreate) -> models.UserPublic:
 
 def update_one(
         session: Session,
-        id: int,
+        _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)
+            messages.Messages.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:
-        raise exceptions.UserNotFoundError(f'User {id} not found')
+        raise exceptions.UserNotFoundError(f'User {_id} not found')
     new_user.email = user.email
     new_user.name = user.name
 
@@ -103,12 +109,12 @@ def update_one(
     return new_user
 
 
-def delete_one(session: Session, id: int) -> models.UserPublic:
-    statement = select(models.User).where(models.User.id == id)
+def delete_one(session: Session, _id: int) -> models.UserPublic:
+    statement = select(models.User).where(models.User.id == _id)
     result = session.exec(statement)
     user = result.first()
     if not user:
-        raise exceptions.UserNotFoundError(f'User {id} not found')
+        raise exceptions.UserNotFoundError(f'User {_id} not found')
     result = models.UserPublic.model_validate(user)
     session.delete(user)
     session.commit()

backend/src/users/users.py

@@ -32,16 +32,18 @@ def get_roles(
     return service.get_roles(session)
 
 
-@router.get('/{id}', response_model=models.UserPublic)
-def get_users(
-    id: int,
+@router.get('/{_id}', response_model=models.UserPublic)
+def get_user(
+    _id: int,
     user: models.User = Depends(get_current_user),
     session: Session = Depends(get_session)
 ):
-    result = service.get_one(session, id)
+    result = service.get_one(session, _id)
     if result is None:
-        raise HTTPException(status_code=404,
-                            detail=messages.Messages.not_found('user'))
+        raise HTTPException(
+            status_code=404,
+            detail=messages.Messages.not_found('user')
+        )
     return result
 
 
@@ -54,22 +56,27 @@ def create_user(
     try:
         user = service.create_one(session, user)
     except exceptions.UserCreateError as error:
-        raise HTTPException(status_code=400, detail=str(error))
+        raise HTTPException(
+            status_code=400, 
+            detail=str(error)
+        ) from error
     return user
 
 
-@router.put('/{id}', response_model=models.UserPublic)
+@router.put('/{_id}', response_model=models.UserPublic)
 def update_user(
-    id: int,
+    _id: int,
     user: models.UserUpdate,
     logged_user: models.User = Depends(get_current_user),
     session: Session = Depends(get_session)
 ):
     try:
-        result = service.update_one(session, id, user)
+        result = service.update_one(session, _id, user)
     except exceptions.UserNotFoundError as error:
-        raise HTTPException(status_code=404,
-                            detail=messages.Messages.not_found('user'))
+        raise HTTPException(
+            status_code=404,
+            detail=messages.Messages.not_found('user')
+        ) from error
     return result
 
 
@@ -82,6 +89,8 @@ def delete_user(
     try:
         result = service.delete_one(session, id)
     except exceptions.UserNotFoundError as error:
-        raise HTTPException(status_code=404,
-                            detail=messages.Messages.not_found('user'))
+        raise HTTPException(
+            status_code=404,
+            detail=messages.Messages.not_found('user')
+        ) from error
     return result