Compare commits
21 Commits
5dd9e19877
...
feature/ex
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e970bb683a | ||
|
|
c27c7598b5 | ||
| b4b4fa7643 | |||
| 60812652cf | |||
| cb0235e19f | |||
|
|
5c356f5802 | ||
|
|
ff19448991 | ||
| 5e413b11e0 | |||
|
|
3cfa60507e | ||
|
|
6679107b13 | ||
|
|
20eba7f183 | ||
|
|
c6d75831c9 | ||
|
|
b2e2d02818 | ||
|
|
8cb7893aff | ||
|
|
015e09a980 | ||
|
|
a70ab5d3cb | ||
|
|
9d5dbd80cc | ||
|
|
1c6e810ec1 | ||
|
|
8352097ffb | ||
|
|
0e48d1bbaa | ||
| 8c6b25ded8 |
@@ -35,6 +35,12 @@ hatch run pytest
|
||||
hatch run pytest --cov=src -vv
|
||||
```
|
||||
|
||||
## Autoformat
|
||||
```console
|
||||
find -type f -name '*.py' ! -path 'alembic/*' -exec autopep8 --in-place --aggressive --aggressive '{}' \;
|
||||
pylint -d R0801,R0903,W0511,W0603,C0103,R0902 .
|
||||
```
|
||||
|
||||
## License
|
||||
|
||||
`backend` is distributed under the terms of the [MIT](https://spdx.org/licenses/MIT.html) license.
|
||||
|
||||
@@ -25,7 +25,8 @@ target_metadata = SQLModel.metadata
|
||||
|
||||
# other values from the config, defined by the needs of env.py,
|
||||
# can be acquired:
|
||||
config.set_main_option("sqlalchemy.url", f'postgresql://{settings.db_user}:{settings.db_pass}@{settings.db_host}:5432/{settings.db_name}')
|
||||
config.set_main_option(
|
||||
"sqlalchemy.url", f'postgresql://{settings.db_user}:{settings.db_pass}@{settings.db_host}:5432/{settings.db_name}')
|
||||
# ... etc.
|
||||
|
||||
|
||||
|
||||
@@ -22,7 +22,12 @@ depends_on: Union[str, Sequence[str], None] = None
|
||||
def upgrade() -> None:
|
||||
"""Upgrade schema."""
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
op.add_column('paymentmethod', sa.Column('max', sa.Integer(), nullable=True))
|
||||
op.add_column(
|
||||
'paymentmethod',
|
||||
sa.Column(
|
||||
'max',
|
||||
sa.Integer(),
|
||||
nullable=True))
|
||||
# ### end Alembic commands ###
|
||||
|
||||
|
||||
|
||||
@@ -22,28 +22,32 @@ depends_on: Union[str, Sequence[str], None] = None
|
||||
def upgrade() -> None:
|
||||
"""Upgrade schema."""
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
op.create_table('contracttype',
|
||||
sa.Column('id', sa.Integer(), nullable=False),
|
||||
sa.Column('name', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
)
|
||||
op.create_table('productor',
|
||||
sa.Column('name', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
|
||||
sa.Column('address', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
|
||||
sa.Column('type', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
|
||||
sa.Column('id', sa.Integer(), nullable=False),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
)
|
||||
op.create_table(
|
||||
'contracttype',
|
||||
sa.Column(
|
||||
'id',
|
||||
sa.Integer(),
|
||||
nullable=False),
|
||||
sa.Column(
|
||||
'name',
|
||||
sqlmodel.sql.sqltypes.AutoString(),
|
||||
nullable=False),
|
||||
sa.PrimaryKeyConstraint('id'))
|
||||
op.create_table(
|
||||
'productor', sa.Column(
|
||||
'name', sqlmodel.sql.sqltypes.AutoString(), nullable=False), sa.Column(
|
||||
'address', sqlmodel.sql.sqltypes.AutoString(), nullable=False), sa.Column(
|
||||
'type', sqlmodel.sql.sqltypes.AutoString(), nullable=False), sa.Column(
|
||||
'id', sa.Integer(), nullable=False), sa.PrimaryKeyConstraint('id'))
|
||||
op.create_table('template',
|
||||
sa.Column('id', sa.Integer(), nullable=False),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
)
|
||||
op.create_table('user',
|
||||
sa.Column('name', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
|
||||
sa.Column('email', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
|
||||
sa.Column('id', sa.Integer(), nullable=False),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
)
|
||||
op.create_table(
|
||||
'user', sa.Column(
|
||||
'name', sqlmodel.sql.sqltypes.AutoString(), nullable=False), sa.Column(
|
||||
'email', sqlmodel.sql.sqltypes.AutoString(), nullable=False), sa.Column(
|
||||
'id', sa.Integer(), nullable=False), sa.PrimaryKeyConstraint('id'))
|
||||
op.create_table('form',
|
||||
sa.Column('name', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
|
||||
sa.Column('productor_id', sa.Integer(), nullable=True),
|
||||
@@ -78,13 +82,13 @@ def upgrade() -> None:
|
||||
sa.ForeignKeyConstraint(['productor_id'], ['productor.id'], ),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
)
|
||||
op.create_table('usercontracttypelink',
|
||||
sa.Column('user_id', sa.Integer(), nullable=False),
|
||||
sa.Column('contract_type_id', sa.Integer(), nullable=False),
|
||||
sa.ForeignKeyConstraint(['contract_type_id'], ['contracttype.id'], ),
|
||||
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
|
||||
sa.PrimaryKeyConstraint('user_id', 'contract_type_id')
|
||||
)
|
||||
op.create_table(
|
||||
'usercontracttypelink', sa.Column(
|
||||
'user_id', sa.Integer(), nullable=False), sa.Column(
|
||||
'contract_type_id', sa.Integer(), nullable=False), sa.ForeignKeyConstraint(
|
||||
['contract_type_id'], ['contracttype.id'], ), sa.ForeignKeyConstraint(
|
||||
['user_id'], ['user.id'], ), sa.PrimaryKeyConstraint(
|
||||
'user_id', 'contract_type_id'))
|
||||
op.create_table('contract',
|
||||
sa.Column('firstname', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
|
||||
sa.Column('lastname', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
|
||||
|
||||
@@ -22,7 +22,14 @@ depends_on: Union[str, Sequence[str], None] = None
|
||||
def upgrade() -> None:
|
||||
"""Upgrade schema."""
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
op.add_column('form', sa.Column('visible', sa.Boolean(), nullable=False, default=False, server_default="False"))
|
||||
op.add_column(
|
||||
'form',
|
||||
sa.Column(
|
||||
'visible',
|
||||
sa.Boolean(),
|
||||
nullable=False,
|
||||
default=False,
|
||||
server_default="False"))
|
||||
# ### end Alembic commands ###
|
||||
|
||||
|
||||
|
||||
@@ -34,6 +34,7 @@ dependencies = [
|
||||
"pytest",
|
||||
"pytest-cov",
|
||||
"pytest-mock",
|
||||
"pylint",
|
||||
]
|
||||
|
||||
[project.urls]
|
||||
|
||||
@@ -0,0 +1,84 @@
|
||||
alembic==1.18.4
|
||||
annotated-doc==0.0.4
|
||||
annotated-types==0.7.0
|
||||
anyio==4.12.1
|
||||
astroid==4.0.4
|
||||
autopep8==2.3.2
|
||||
brotli==1.2.0
|
||||
certifi==2026.2.25
|
||||
cffi==2.0.0
|
||||
charset-normalizer==3.4.4
|
||||
click==8.3.1
|
||||
coverage==7.13.4
|
||||
cryptography==46.0.5
|
||||
cssselect2==0.9.0
|
||||
dill==0.4.1
|
||||
dnspython==2.8.0
|
||||
email-validator==2.3.0
|
||||
fastapi==0.135.1
|
||||
fastapi-cli==0.0.24
|
||||
fastapi-cloud-cli==0.14.0
|
||||
fastar==0.8.0
|
||||
fonttools==4.61.1
|
||||
greenlet==3.3.2
|
||||
h11==0.16.0
|
||||
httpcore==1.0.9
|
||||
httptools==0.7.1
|
||||
httpx==0.28.1
|
||||
idna==3.11
|
||||
iniconfig==2.3.0
|
||||
isort==8.0.1
|
||||
Jinja2==3.1.6
|
||||
lxml==6.0.2
|
||||
Mako==1.3.10
|
||||
markdown-it-py==4.0.0
|
||||
MarkupSafe==3.0.3
|
||||
mccabe==0.7.0
|
||||
mdurl==0.1.2
|
||||
odfdo==3.21.0
|
||||
packaging==26.0
|
||||
pillow==12.1.1
|
||||
platformdirs==4.9.2
|
||||
pluggy==1.6.0
|
||||
prek==0.3.4
|
||||
psycopg2-binary==2.9.11
|
||||
pycodestyle==2.14.0
|
||||
pycparser==3.0
|
||||
pydantic==2.12.5
|
||||
pydantic-extra-types==2.11.0
|
||||
pydantic-settings==2.13.1
|
||||
pydantic_core==2.41.5
|
||||
pydyf==0.12.1
|
||||
Pygments==2.19.2
|
||||
PyJWT==2.11.0
|
||||
pylint==4.0.5
|
||||
pyphen==0.17.2
|
||||
pytest==9.0.2
|
||||
pytest-cov==7.0.0
|
||||
pytest-mock==3.15.1
|
||||
python-dotenv==1.2.2
|
||||
python-multipart==0.0.22
|
||||
PyYAML==6.0.3
|
||||
requests==2.32.5
|
||||
rich==14.3.3
|
||||
rich-toolkit==0.19.7
|
||||
rignore==0.7.6
|
||||
sentry-sdk==2.53.0
|
||||
shellingham==1.5.4
|
||||
SQLAlchemy==2.0.47
|
||||
sqlmodel==0.0.37
|
||||
starlette==0.52.1
|
||||
tinycss2==1.5.1
|
||||
tinyhtml5==2.0.0
|
||||
tomlkit==0.14.0
|
||||
typer==0.24.1
|
||||
typing-inspection==0.4.2
|
||||
typing_extensions==4.15.0
|
||||
urllib3==2.6.3
|
||||
uvicorn==0.41.0
|
||||
uvloop==0.22.1
|
||||
watchfiles==1.1.1
|
||||
weasyprint==68.1
|
||||
webencodings==0.5.1
|
||||
websockets==16.0
|
||||
zopfli==0.4.1
|
||||
|
||||
0
backend/src/auth/__init__.py
Normal file
0
backend/src/auth/__init__.py
Normal file
@@ -1,26 +1,27 @@
|
||||
from typing import Annotated
|
||||
from fastapi import APIRouter, Security, HTTPException, Depends, Request, Cookie
|
||||
from fastapi.responses import RedirectResponse, Response
|
||||
from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
|
||||
from sqlmodel import Session, select
|
||||
import jwt
|
||||
from jwt import PyJWKClient
|
||||
|
||||
from src.settings import AUTH_URL, TOKEN_URL, JWKS_URL, ISSUER, LOGOUT_URL, settings
|
||||
import src.users.service as service
|
||||
from src.database import get_session
|
||||
from src.models import UserCreate, User, UserPublic
|
||||
|
||||
import secrets
|
||||
import requests
|
||||
from typing import Annotated
|
||||
from urllib.parse import urlencode
|
||||
import src.messages as messages
|
||||
|
||||
import jwt
|
||||
import requests
|
||||
import src.users.service as service
|
||||
from fastapi import APIRouter, Cookie, Depends, HTTPException, Request
|
||||
from fastapi.responses import RedirectResponse, Response
|
||||
from fastapi.security import HTTPBearer
|
||||
from jwt import PyJWKClient
|
||||
from sqlmodel import Session, select
|
||||
from src import messages
|
||||
from src.database import get_session
|
||||
from src.models import User, UserCreate, UserPublic
|
||||
from src.settings import (AUTH_URL, ISSUER, JWKS_URL, LOGOUT_URL, TOKEN_URL,
|
||||
settings)
|
||||
|
||||
router = APIRouter(prefix='/auth')
|
||||
|
||||
jwk_client = PyJWKClient(JWKS_URL)
|
||||
security = HTTPBearer()
|
||||
|
||||
|
||||
@router.get('/logout')
|
||||
def logout():
|
||||
params = {
|
||||
@@ -59,9 +60,11 @@ def login():
|
||||
'redirect_uri': settings.keycloak_redirect_uri,
|
||||
'state': state,
|
||||
}
|
||||
request_url = requests.Request('GET', AUTH_URL, params=params).prepare().url
|
||||
request_url = requests.Request(
|
||||
'GET', AUTH_URL, params=params).prepare().url
|
||||
return RedirectResponse(request_url)
|
||||
|
||||
|
||||
@router.get('/callback')
|
||||
def callback(code: str, session: Session = Depends(get_session)):
|
||||
data = {
|
||||
@@ -74,7 +77,18 @@ def callback(code: str, session: Session = Depends(get_session)):
|
||||
headers = {
|
||||
'Content-Type': 'application/x-www-form-urlencoded'
|
||||
}
|
||||
response = requests.post(TOKEN_URL, data=data, headers=headers)
|
||||
try:
|
||||
response = requests.post(
|
||||
TOKEN_URL,
|
||||
data=data,
|
||||
headers=headers,
|
||||
timeout=10
|
||||
)
|
||||
except requests.exceptions.Timeout as error:
|
||||
raise HTTPException(
|
||||
status_code=404,
|
||||
detail=messages.Messages.not_found('token')
|
||||
) from error
|
||||
if response.status_code != 200:
|
||||
raise HTTPException(
|
||||
status_code=404,
|
||||
@@ -85,7 +99,9 @@ def callback(code: str, session: Session = Depends(get_session)):
|
||||
|
||||
id_token = token_data['id_token']
|
||||
decoded_token = jwt.decode(id_token, options={'verify_signature': False})
|
||||
decoded_access_token = jwt.decode(token_data['access_token'], options={'verify_signature': False})
|
||||
decoded_access_token = jwt.decode(
|
||||
token_data['access_token'], options={
|
||||
'verify_signature': False})
|
||||
resource_access = decoded_access_token.get('resource_access')
|
||||
if not resource_access:
|
||||
data = {
|
||||
@@ -93,7 +109,13 @@ def callback(code: str, session: Session = Depends(get_session)):
|
||||
'client_secret': settings.keycloak_client_secret,
|
||||
'refresh_token': token_data['refresh_token'],
|
||||
}
|
||||
res = requests.post(LOGOUT_URL, data=data)
|
||||
try:
|
||||
requests.post(LOGOUT_URL, data=data, timeout=10)
|
||||
except requests.exceptions.Timeout as error:
|
||||
raise HTTPException(
|
||||
status_code=404,
|
||||
detail=messages.Messages.not_found('token')
|
||||
) from error
|
||||
resp = RedirectResponse(f'{settings.origins}?userNotAllowed=true')
|
||||
return resp
|
||||
roles = resource_access.get(settings.keycloak_client_id)
|
||||
@@ -103,7 +125,13 @@ def callback(code: str, session: Session = Depends(get_session)):
|
||||
'client_secret': settings.keycloak_client_secret,
|
||||
'refresh_token': token_data['refresh_token'],
|
||||
}
|
||||
res = requests.post(LOGOUT_URL, data=data)
|
||||
try:
|
||||
requests.post(LOGOUT_URL, data=data, timeout=10)
|
||||
except requests.exceptions.Timeout as error:
|
||||
raise HTTPException(
|
||||
status_code=404,
|
||||
detail=messages.Messages.not_found('token')
|
||||
) from error
|
||||
resp = RedirectResponse(f'{settings.origins}?userNotAllowed=true')
|
||||
return resp
|
||||
|
||||
@@ -141,6 +169,7 @@ def callback(code: str, session: Session = Depends(get_session)):
|
||||
|
||||
return response
|
||||
|
||||
|
||||
def verify_token(token: str):
|
||||
try:
|
||||
signing_key = jwk_client.get_signing_key_from_jwt(token)
|
||||
@@ -153,31 +182,52 @@ def verify_token(token: str):
|
||||
leeway=60,
|
||||
)
|
||||
return decoded
|
||||
except jwt.ExpiredSignatureError:
|
||||
raise HTTPException(status_code=401, detail=messages.Messages.tokenexipired)
|
||||
except jwt.InvalidTokenError:
|
||||
raise HTTPException(status_code=401, detail=messages.Messages.invalidtoken)
|
||||
except jwt.ExpiredSignatureError as error:
|
||||
raise HTTPException(
|
||||
status_code=401,
|
||||
detail=messages.Messages.tokenexipired
|
||||
) from error
|
||||
except jwt.InvalidTokenError as error:
|
||||
raise HTTPException(
|
||||
status_code=401,
|
||||
detail=messages.Messages.invalidtoken
|
||||
) from error
|
||||
|
||||
|
||||
def get_current_user(request: Request, session: Session = Depends(get_session)):
|
||||
def get_current_user(
|
||||
request: Request,
|
||||
session: Session = Depends(get_session)):
|
||||
access_token = request.cookies.get('access_token')
|
||||
if not access_token:
|
||||
raise HTTPException(status_code=401, detail=messages.Messages.notauthenticated)
|
||||
raise HTTPException(
|
||||
status_code=401,
|
||||
detail=messages.Messages.notauthenticated
|
||||
)
|
||||
payload = verify_token(access_token)
|
||||
if not payload:
|
||||
raise HTTPException(status_code=401, detail='aze')
|
||||
raise HTTPException(
|
||||
status_code=401,
|
||||
detail='aze'
|
||||
)
|
||||
email = payload.get('email')
|
||||
|
||||
if not email:
|
||||
raise HTTPException(status_code=401, detail=messages.Messages.notauthenticated)
|
||||
raise HTTPException(
|
||||
status_code=401,
|
||||
detail=messages.Messages.notauthenticated
|
||||
)
|
||||
|
||||
user = session.exec(select(User).where(User.email == email)).first()
|
||||
if not user:
|
||||
raise HTTPException(status_code=401, detail=messages.Messages.not_found('user'))
|
||||
raise HTTPException(
|
||||
status_code=401,
|
||||
detail=messages.Messages.not_found('user')
|
||||
)
|
||||
return user
|
||||
|
||||
|
||||
@router.post('/refresh')
|
||||
def refresh_token(refresh_token: Annotated[str | None, Cookie()] = None):
|
||||
def refresh_user_token(refresh_token: Annotated[str | None, Cookie()] = None):
|
||||
refresh = refresh_token
|
||||
data = {
|
||||
'grant_type': 'refresh_token',
|
||||
@@ -188,7 +238,18 @@ def refresh_token(refresh_token: Annotated[str | None, Cookie()] = None):
|
||||
headers = {
|
||||
'Content-Type': 'application/x-www-form-urlencoded'
|
||||
}
|
||||
result = requests.post(TOKEN_URL, data=data, headers=headers)
|
||||
try:
|
||||
result = requests.post(
|
||||
TOKEN_URL,
|
||||
data=data,
|
||||
headers=headers,
|
||||
timeout=10,
|
||||
)
|
||||
except requests.exceptions.Timeout as error:
|
||||
raise HTTPException(
|
||||
status_code=404,
|
||||
detail=messages.Messages.not_found('token')
|
||||
) from error
|
||||
if result.status_code != 200:
|
||||
raise HTTPException(
|
||||
status_code=404,
|
||||
@@ -201,7 +262,7 @@ def refresh_token(refresh_token: Annotated[str | None, Cookie()] = None):
|
||||
key='access_token',
|
||||
value=token_data['access_token'],
|
||||
httponly=True,
|
||||
secure=True if settings.debug == False else True,
|
||||
secure=True if settings.debug is False else True,
|
||||
samesite='strict',
|
||||
max_age=settings.max_age
|
||||
)
|
||||
@@ -209,7 +270,7 @@ def refresh_token(refresh_token: Annotated[str | None, Cookie()] = None):
|
||||
key='refresh_token',
|
||||
value=token_data['refresh_token'] or '',
|
||||
httponly=True,
|
||||
secure=True if settings.debug == False else True,
|
||||
secure=True if settings.debug is False else True,
|
||||
samesite='strict',
|
||||
max_age=30 * 24 * settings.max_age
|
||||
)
|
||||
@@ -223,6 +284,7 @@ def refresh_token(refresh_token: Annotated[str | None, Cookie()] = None):
|
||||
)
|
||||
return response
|
||||
|
||||
|
||||
@router.get('/user/me')
|
||||
def me(user: UserPublic = Depends(get_current_user)):
|
||||
if not user:
|
||||
@@ -233,6 +295,6 @@ def me(user: UserPublic = Depends(get_current_user)):
|
||||
'name': user.name,
|
||||
'email': user.email,
|
||||
'id': user.id,
|
||||
'roles': [role.name for role in user.roles]
|
||||
'roles': user.roles
|
||||
}
|
||||
}
|
||||
@@ -1,86 +1,62 @@
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
||||
from fastapi.responses import StreamingResponse
|
||||
from src.database import get_session
|
||||
from sqlmodel import Session
|
||||
from src.contracts.generate_contract import generate_html_contract, generate_recap
|
||||
from src.auth.auth import get_current_user
|
||||
import src.models as models
|
||||
import src.messages as messages
|
||||
import src.contracts.service as service
|
||||
import src.forms.service as form_service
|
||||
"""Router for contract resource"""
|
||||
import io
|
||||
import zipfile
|
||||
|
||||
import src.contracts.service as service
|
||||
import src.forms.service as form_service
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
||||
from fastapi.responses import StreamingResponse
|
||||
from sqlmodel import Session
|
||||
from src import messages, models
|
||||
from src.auth.auth import get_current_user
|
||||
from src.contracts.generate_contract import (generate_html_contract,
|
||||
generate_recap)
|
||||
from src.database import get_session
|
||||
|
||||
router = APIRouter(prefix='/contracts')
|
||||
|
||||
def compute_recurrent_prices(products_quantities: list[dict], nb_shipment: int):
|
||||
result = 0
|
||||
for product_quantity in products_quantities:
|
||||
product = product_quantity['product']
|
||||
quantity = product_quantity['quantity']
|
||||
result += compute_product_price(product, quantity, nb_shipment)
|
||||
return result
|
||||
|
||||
def compute_occasional_prices(occasionals: list[dict]):
|
||||
result = 0
|
||||
for occasional in occasionals:
|
||||
result += occasional['price']
|
||||
return result
|
||||
|
||||
def compute_product_price(product: models.Product, quantity: int, nb_shipment: int = 1):
|
||||
product_quantity_unit = 1 if product.unit == models.Unit.KILO else 1000
|
||||
final_quantity = quantity if product.price else quantity / product_quantity_unit
|
||||
final_price = product.price if product.price else product.price_kg
|
||||
return final_price * final_quantity * nb_shipment
|
||||
|
||||
def find_dict_in_list(lst, key, value):
|
||||
for i, dic in enumerate(lst):
|
||||
if dic[key].id == value:
|
||||
return i
|
||||
return -1
|
||||
|
||||
def create_occasional_dict(contract_products: list[models.ContractProduct]):
|
||||
result = []
|
||||
for contract_product in contract_products:
|
||||
existing_id = find_dict_in_list(
|
||||
result,
|
||||
'shipment',
|
||||
contract_product.shipment.id
|
||||
)
|
||||
if existing_id < 0:
|
||||
result.append({
|
||||
'shipment': contract_product.shipment,
|
||||
'price': compute_product_price(
|
||||
contract_product.product,
|
||||
contract_product.quantity
|
||||
),
|
||||
'products': [{
|
||||
'product': contract_product.product,
|
||||
'quantity': contract_product.quantity
|
||||
}]
|
||||
})
|
||||
else:
|
||||
result[existing_id]['products'].append({
|
||||
'product': contract_product.product,
|
||||
'quantity': contract_product.quantity
|
||||
})
|
||||
result[existing_id]['price'] += compute_product_price(
|
||||
contract_product.product,
|
||||
contract_product.quantity
|
||||
)
|
||||
return result
|
||||
|
||||
@router.post('')
|
||||
async def create_contract(
|
||||
contract: models.ContractCreate,
|
||||
session: Session = Depends(get_session),
|
||||
):
|
||||
"""Create contract route"""
|
||||
new_contract = service.create_one(session, contract)
|
||||
occasional_contract_products = list(filter(lambda contract_product: contract_product.product.type == models.ProductType.OCCASIONAL, new_contract.products))
|
||||
occasionals = create_occasional_dict(occasional_contract_products)
|
||||
recurrents = list(map(lambda x: {"product": x.product, "quantity": x.quantity}, filter(lambda contract_product: contract_product.product.type == models.ProductType.RECCURENT, new_contract.products)))
|
||||
recurrent_price = compute_recurrent_prices(recurrents, len(new_contract.form.shipments))
|
||||
price = recurrent_price + compute_occasional_prices(occasionals)
|
||||
cheques = list(map(lambda x: {"name": x.name, "value": x.value}, new_contract.cheques))
|
||||
occasional_contract_products = list(
|
||||
filter(
|
||||
lambda contract_product: (
|
||||
contract_product.product.type == models.ProductType.OCCASIONAL
|
||||
),
|
||||
new_contract.products
|
||||
)
|
||||
)
|
||||
occasionals = service.create_occasional_dict(occasional_contract_products)
|
||||
recurrents = list(
|
||||
map(
|
||||
lambda x: {'product': x.product, 'quantity': x.quantity},
|
||||
filter(
|
||||
lambda contract_product: (
|
||||
contract_product.product.type ==
|
||||
models.ProductType.RECCURENT
|
||||
),
|
||||
new_contract.products
|
||||
)
|
||||
)
|
||||
)
|
||||
prices = service.generate_products_prices(
|
||||
occasionals,
|
||||
recurrents,
|
||||
new_contract.form.shipments
|
||||
)
|
||||
recurrent_price = prices['recurrent']
|
||||
total_price = prices['total']
|
||||
cheques = list(
|
||||
map(
|
||||
lambda x: {'name': x.name, 'value': x.value},
|
||||
new_contract.cheques
|
||||
)
|
||||
)
|
||||
try:
|
||||
pdf_bytes = generate_html_contract(
|
||||
new_contract,
|
||||
@@ -88,46 +64,67 @@ async def create_contract(
|
||||
occasionals,
|
||||
recurrents,
|
||||
'{:10.2f}'.format(recurrent_price),
|
||||
'{:10.2f}'.format(price)
|
||||
'{:10.2f}'.format(total_price)
|
||||
)
|
||||
pdf_file = io.BytesIO(pdf_bytes)
|
||||
contract_id = f'{new_contract.firstname}_{new_contract.lastname}_{new_contract.form.productor.type}_{new_contract.form.season}'
|
||||
service.add_contract_file(session, new_contract.id, pdf_bytes, price)
|
||||
except Exception:
|
||||
raise HTTPException(status_code=400, detail=messages.pdferror)
|
||||
contract_id = (
|
||||
f'{new_contract.firstname}_'
|
||||
f'{new_contract.lastname}_'
|
||||
f'{new_contract.form.productor.type}_'
|
||||
f'{new_contract.form.season}'
|
||||
)
|
||||
service.add_contract_file(
|
||||
session, new_contract.id, pdf_bytes, total_price)
|
||||
except Exception as error:
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
detail=messages.pdferror
|
||||
) from error
|
||||
return StreamingResponse(
|
||||
pdf_file,
|
||||
media_type='application/pdf',
|
||||
headers={
|
||||
'Content-Disposition': f'attachment; filename=contract_{contract_id}.pdf'
|
||||
'Content-Disposition': (
|
||||
f'attachment; filename=contract_{contract_id}.pdf'
|
||||
)
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@router.get('/{form_id}/base')
|
||||
async def get_base_contract_template(
|
||||
form_id: int,
|
||||
session: Session = Depends(get_session),
|
||||
):
|
||||
"""Get contract template route"""
|
||||
form = form_service.get_one(session, form_id)
|
||||
recurrents = list(map(lambda x: {"product": x, "quantity": None}, filter(lambda product: product.type == models.ProductType.RECCURENT, form.productor.products)))
|
||||
recurrents = [
|
||||
{'product': product, 'quantity': None}
|
||||
for product in form.productor.products
|
||||
if product.type == models.ProductType.RECCURENT
|
||||
]
|
||||
occasionals = [{
|
||||
'shipment': sh,
|
||||
'price': None,
|
||||
'products': [{'product': pr, 'quantity': None} for pr in sh.products]
|
||||
} for sh in form.shipments]
|
||||
empty_contract = models.ContractPublic(
|
||||
firstname="",
|
||||
firstname='',
|
||||
form=form,
|
||||
lastname="",
|
||||
email="",
|
||||
phone="",
|
||||
lastname='',
|
||||
email='',
|
||||
phone='',
|
||||
products=[],
|
||||
payment_method="cheque",
|
||||
payment_method='cheque',
|
||||
cheque_quantity=3,
|
||||
total_price=0,
|
||||
id=1
|
||||
)
|
||||
cheques = [{"name": None, "value": None}, {"name": None, "value": None}, {"name": None, "value": None}]
|
||||
cheques = [
|
||||
{'name': None, 'value': None},
|
||||
{'name': None, 'value': None},
|
||||
{'name': None, 'value': None}
|
||||
]
|
||||
try:
|
||||
pdf_bytes = generate_html_contract(
|
||||
empty_contract,
|
||||
@@ -136,38 +133,60 @@ async def get_base_contract_template(
|
||||
recurrents,
|
||||
)
|
||||
pdf_file = io.BytesIO(pdf_bytes)
|
||||
contract_id = f'{empty_contract.form.productor.type}_{empty_contract.form.season}'
|
||||
except Exception as e:
|
||||
print(e)
|
||||
raise HTTPException(status_code=400, detail=messages.pdferror)
|
||||
contract_id = (
|
||||
f'{empty_contract.form.productor.type}_'
|
||||
f'{empty_contract.form.season}'
|
||||
)
|
||||
except Exception as error:
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
detail=messages.pdferror
|
||||
) from error
|
||||
return StreamingResponse(
|
||||
pdf_file,
|
||||
media_type='application/pdf',
|
||||
headers={
|
||||
'Content-Disposition': f'attachment; filename=contract_{contract_id}.pdf'
|
||||
'Content-Disposition': (
|
||||
f'attachment; filename=contract_{contract_id}.pdf'
|
||||
)
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@router.get('', response_model=list[models.ContractPublic])
|
||||
def get_contracts(
|
||||
forms: list[str] = Query([]),
|
||||
session: Session = Depends(get_session),
|
||||
user: models.User = Depends(get_current_user)
|
||||
):
|
||||
"""Get all contracts route"""
|
||||
return service.get_all(session, user, forms)
|
||||
|
||||
@router.get('/{id}/file')
|
||||
|
||||
@router.get('/{_id}/file')
|
||||
def get_contract_file(
|
||||
id: int,
|
||||
_id: int,
|
||||
session: Session = Depends(get_session),
|
||||
user: models.User = Depends(get_current_user)
|
||||
):
|
||||
if not service.is_allowed(session, user, id):
|
||||
raise HTTPException(status_code=403, detail=messages.Messages.not_allowed('contract', 'get'))
|
||||
contract = service.get_one(session, id)
|
||||
"""Get a contract file (in pdf) route"""
|
||||
if not service.is_allowed(session, user, _id):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('contract', 'get')
|
||||
)
|
||||
contract = service.get_one(session, _id)
|
||||
if contract is None:
|
||||
raise HTTPException(status_code=404, detail=messages.Messages.not_found('contract'))
|
||||
filename = f'{contract.form.name.replace(' ', '_')}_{contract.form.season}_{contract.firstname}-{contract.lastname}'
|
||||
raise HTTPException(
|
||||
status_code=404,
|
||||
detail=messages.Messages.not_found('contract')
|
||||
)
|
||||
filename = (
|
||||
f'{contract.form.name.replace(' ', '_')}_'
|
||||
f'{contract.form.season}_'
|
||||
f'{contract.firstname}_'
|
||||
f'{contract.lastname}'
|
||||
)
|
||||
return StreamingResponse(
|
||||
io.BytesIO(contract.file),
|
||||
media_type='application/pdf',
|
||||
@@ -176,23 +195,37 @@ def get_contract_file(
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@router.get('/{form_id}/files')
|
||||
def get_contract_files(
|
||||
form_id: int,
|
||||
session: Session = Depends(get_session),
|
||||
user: models.User = Depends(get_current_user)
|
||||
):
|
||||
if not form_service.is_allowed(session, user, form_id):
|
||||
raise HTTPException(status_code=403, detail=messages.Messages.not_allowed('contracts', 'get'))
|
||||
"""Get all contract files for a given form"""
|
||||
if not service.is_allowed(session, user, form_id):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('contracts', 'get')
|
||||
)
|
||||
form = form_service.get_one(session, form_id=form_id)
|
||||
contracts = service.get_all(session, user, forms=[form.name])
|
||||
zipped_contracts = io.BytesIO()
|
||||
with zipfile.ZipFile(zipped_contracts, "a", zipfile.ZIP_DEFLATED, False) as zip_file:
|
||||
with zipfile.ZipFile(
|
||||
zipped_contracts,
|
||||
'a',
|
||||
zipfile.ZIP_DEFLATED,
|
||||
False
|
||||
) as zip_file:
|
||||
for contract in contracts:
|
||||
contract_filename = f'{contract.form.name.replace(' ', '_')}_{contract.form.season}_{contract.firstname}-{contract.lastname}.pdf'
|
||||
contract_filename = (
|
||||
f'{contract.form.name.replace(' ', '_')}_'
|
||||
f'{contract.form.season}_'
|
||||
f'{contract.firstname}_'
|
||||
f'{contract.lastname}'
|
||||
)
|
||||
zip_file.writestr(contract_filename, contract.file)
|
||||
|
||||
filename = f'{form.name.replace(" ", "_")}_{form.season}'
|
||||
filename = f'{form.name.replace(' ', '_')}_{form.season}'
|
||||
return StreamingResponse(
|
||||
io.BytesIO(zipped_contracts.getvalue()),
|
||||
media_type='application/zip',
|
||||
@@ -201,39 +234,70 @@ def get_contract_files(
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@router.get('/{form_id}/recap')
|
||||
def get_contract_recap(
|
||||
form_id: int,
|
||||
session: Session = Depends(get_session),
|
||||
user: models.User = Depends(get_current_user)
|
||||
):
|
||||
"""Get a contract recap for a given form"""
|
||||
if not form_service.is_allowed(session, user, form_id):
|
||||
raise HTTPException(status_code=403, detail=messages.Messages.not_allowed('contract recap', 'get'))
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('contract recap', 'get')
|
||||
)
|
||||
form = form_service.get_one(session, form_id=form_id)
|
||||
contracts = service.get_all(session, user, forms=[form.name])
|
||||
|
||||
filename = f'{form.name}_recapitulatif_contrats.ods'
|
||||
return StreamingResponse(
|
||||
io.BytesIO(generate_recap(contracts, form)),
|
||||
media_type='application/zip',
|
||||
media_type='application/vnd.oasis.opendocument.spreadsheet',
|
||||
headers={
|
||||
'Content-Disposition': f'attachment; filename=filename.ods'
|
||||
'Content-Disposition': (
|
||||
f'attachment; filename={filename}'
|
||||
)
|
||||
}
|
||||
)
|
||||
|
||||
@router.get('/{id}', response_model=models.ContractPublic)
|
||||
def get_contract(id: int, session: Session = Depends(get_session), user: models.User = Depends(get_current_user)):
|
||||
if not service.is_allowed(session, user, id):
|
||||
raise HTTPException(status_code=403, detail=messages.Messages.not_allowed('contract', 'get'))
|
||||
result = service.get_one(session, id)
|
||||
|
||||
@router.get('/{_id}', response_model=models.ContractPublic)
|
||||
def get_contract(
|
||||
_id: int,
|
||||
session: Session = Depends(get_session),
|
||||
user: models.User = Depends(get_current_user)
|
||||
):
|
||||
"""Get a contract route"""
|
||||
if not service.is_allowed(session, user, _id):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('contract', 'get')
|
||||
)
|
||||
result = service.get_one(session, _id)
|
||||
if result is None:
|
||||
raise HTTPException(status_code=404, detail=messages.Messages.not_found('contract'))
|
||||
raise HTTPException(
|
||||
status_code=404,
|
||||
detail=messages.Messages.not_found('contract')
|
||||
)
|
||||
return result
|
||||
|
||||
@router.delete('/{id}', response_model=models.ContractPublic)
|
||||
def delete_contract(id: int, session: Session = Depends(get_session), user: models.User = Depends(get_current_user)):
|
||||
if not service.is_allowed(session, user, id):
|
||||
raise HTTPException(status_code=403, detail=messages.Messages.not_allowed('contract', 'delete'))
|
||||
result = service.delete_one(session, id)
|
||||
|
||||
@router.delete('/{_id}', response_model=models.ContractPublic)
|
||||
def delete_contract(
|
||||
_id: int,
|
||||
session: Session = Depends(get_session),
|
||||
user: models.User = Depends(get_current_user)
|
||||
):
|
||||
"""Delete contract route"""
|
||||
if not service.is_allowed(session, user, _id):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('contract', 'delete')
|
||||
)
|
||||
result = service.delete_one(session, _id)
|
||||
if result is None:
|
||||
raise HTTPException(status_code=404, detail=messages.Messages.not_found('contract'))
|
||||
raise HTTPException(
|
||||
status_code=404,
|
||||
detail=messages.Messages.not_found('contract')
|
||||
)
|
||||
return result
|
||||
|
||||
@@ -1,11 +1,15 @@
|
||||
|
||||
import html
|
||||
import io
|
||||
import pathlib
|
||||
import string
|
||||
|
||||
import jinja2
|
||||
import src.models as models
|
||||
import html
|
||||
import odfdo
|
||||
from src import models
|
||||
from src.contracts import service
|
||||
from weasyprint import HTML
|
||||
import io
|
||||
|
||||
import pathlib
|
||||
|
||||
def generate_html_contract(
|
||||
contract: models.Contract,
|
||||
@@ -14,10 +18,24 @@ def generate_html_contract(
|
||||
reccurents: list[dict],
|
||||
recurrent_price: float | None = None,
|
||||
total_price: float | None = None
|
||||
):
|
||||
) -> bytes:
|
||||
"""Generate a html contract
|
||||
Arguments:
|
||||
contract(models.Contract): Contract source.
|
||||
cheques(list[dict]): cheques formated in dict.
|
||||
occasionals(list[dict]): occasional products.
|
||||
reccurents(list[dict]): recurrent products.
|
||||
recurrent_price(float | None = None): total price of recurent products.
|
||||
total_price(float | None = Non): total price.
|
||||
Return:
|
||||
result(bytes): contract file in pdf as bytes.
|
||||
"""
|
||||
template_dir = pathlib.Path("./src/contracts/templates").resolve()
|
||||
template_loader = jinja2.FileSystemLoader(searchpath=template_dir)
|
||||
template_env = jinja2.Environment(loader=template_loader, autoescape=jinja2.select_autoescape(["html", "xml"]))
|
||||
template_env = jinja2.Environment(
|
||||
loader=template_loader,
|
||||
autoescape=jinja2.select_autoescape(["html", "xml"])
|
||||
)
|
||||
template_file = "layout.html"
|
||||
template = template_env.get_template(template_file)
|
||||
output_text = template.render(
|
||||
@@ -28,57 +46,532 @@ def generate_html_contract(
|
||||
referer_email=contract.form.referer.email,
|
||||
productor_name=contract.form.productor.name,
|
||||
productor_address=contract.form.productor.address,
|
||||
payment_methods_map={"cheque": "Ordre du chèque", "transfer": "virements"},
|
||||
payment_methods_map={
|
||||
"cheque": "Ordre du chèque",
|
||||
"transfer": "virements"},
|
||||
productor_payment_methods=contract.form.productor.payment_methods,
|
||||
member_name=f'{html.escape(contract.firstname)} {html.escape(contract.lastname)}',
|
||||
member_email=html.escape(contract.email),
|
||||
member_phone=html.escape(contract.phone),
|
||||
member_name=f'{
|
||||
html.escape(
|
||||
contract.firstname)} {
|
||||
html.escape(
|
||||
contract.lastname)}',
|
||||
member_email=html.escape(
|
||||
contract.email),
|
||||
member_phone=html.escape(
|
||||
contract.phone),
|
||||
contract_start_date=contract.form.start,
|
||||
contract_end_date=contract.form.end,
|
||||
occasionals=occasionals,
|
||||
recurrents=reccurents,
|
||||
recurrent_price=recurrent_price,
|
||||
total_price=total_price,
|
||||
contract_payment_method={"cheque": "chèque", "transfer": "virements"}[contract.payment_method],
|
||||
cheques=cheques
|
||||
)
|
||||
# options = {
|
||||
# 'page-size': 'Letter',
|
||||
# 'margin-top': '0.5in',
|
||||
# 'margin-right': '0.5in',
|
||||
# 'margin-bottom': '0.5in',
|
||||
# 'margin-left': '0.5in',
|
||||
# 'encoding': "UTF-8",
|
||||
# 'print-media-type': True,
|
||||
# "disable-javascript": True,
|
||||
# "disable-external-links": True,
|
||||
# 'enable-local-file-access': False,
|
||||
# "disable-local-file-access": True,
|
||||
# "no-images": True,
|
||||
# }
|
||||
contract_payment_method={
|
||||
"cheque": "chèque",
|
||||
"transfer": "virements"}[
|
||||
contract.payment_method],
|
||||
cheques=cheques)
|
||||
|
||||
return HTML(
|
||||
string=output_text,
|
||||
base_url=template_dir,
|
||||
).write_pdf()
|
||||
|
||||
from odfdo import Document, Table, Row, Cell
|
||||
|
||||
def flatten(xss):
|
||||
"""flatten a list of list.
|
||||
"""
|
||||
return [x for xs in xss for x in xs]
|
||||
|
||||
|
||||
def create_column_style_width(size: str) -> odfdo.Style:
|
||||
"""Create a table columm style for a given width.
|
||||
Paramenters:
|
||||
size(str): size of the style (format <number><unit>)
|
||||
unit can be in, cm... see odfdo documentation.
|
||||
Returns:
|
||||
odfdo.Style with the correct column-width attribute.
|
||||
"""
|
||||
return odfdo.Element.from_tag(
|
||||
'<style:style style:name="product-table.A" style:family="table-column">'
|
||||
f'<style:table-column-properties style:column-width="{size}"/>'
|
||||
'</style:style>'
|
||||
)
|
||||
|
||||
|
||||
def create_row_style_height(size: str) -> odfdo.Style:
|
||||
"""Create a table height style for a given height.
|
||||
Paramenters:
|
||||
size(str): size of the style (format <number><unit>)
|
||||
unit can be in, cm... see odfdo documentation.
|
||||
Returns:
|
||||
odfdo.Style with the correct column-height attribute.
|
||||
"""
|
||||
return odfdo.Element.from_tag(
|
||||
'<style:style style:name="product-table.A" style:family="table-row">'
|
||||
f'<style:table-row-properties style:row-height="{size}"/>'
|
||||
'</style:style>'
|
||||
)
|
||||
|
||||
|
||||
def create_currency_style(name: str = 'currency-euro'):
|
||||
"""Create a table currency style.
|
||||
Paramenters:
|
||||
name(str): name of the style (default to `currency-euro`).
|
||||
Returns:
|
||||
odfdo.Style with the correct column-height attribute.
|
||||
"""
|
||||
return odfdo.Element.from_tag(
|
||||
f"""
|
||||
<number:currency-style style:name="{name}">
|
||||
<number:number number:min-integer-digits="1"
|
||||
number:decimal-places="2"/>
|
||||
<number:text> €</number:text>
|
||||
</number:currency-style>"""
|
||||
)
|
||||
|
||||
|
||||
def create_cell_style(
|
||||
name: str = "centered-cell",
|
||||
font_size: str = '10pt',
|
||||
bold: bool = False,
|
||||
background_color: str = '#FFFFFF',
|
||||
color: str = '#000000',
|
||||
currency: bool = False,
|
||||
) -> odfdo.Style:
|
||||
"""Create a cell style
|
||||
Paramenters:
|
||||
name(str): name of the style (default to `centered-cell`).
|
||||
font_size(str): font_size of the cell (default to `10pt`).
|
||||
bold(str): is the text bold (default to `False`).
|
||||
background_color(str): background_color of the cell
|
||||
(default to `#FFFFFF`).
|
||||
color(str): color of the text of the cell (default to `#000000`).
|
||||
currency(str): is the cell a currency (default to `False`).
|
||||
Returns:
|
||||
odfdo.Style with the correct column-height attribute.
|
||||
"""
|
||||
bold_attr = """
|
||||
fo:font-weight="bold"
|
||||
style:font-weight-asian="bold"
|
||||
style:font-weight-complex="bold"
|
||||
""" if bold else ''
|
||||
currency_attr = """
|
||||
style:data-style-name="currency-euro">
|
||||
""" if currency else ''
|
||||
return odfdo.Element.from_tag(
|
||||
f"""<style:style style:name="{name}" style:family="table-cell"
|
||||
{currency_attr}>
|
||||
<style:table-cell-properties
|
||||
fo:border="0.75pt solid #000000"
|
||||
style:vertical-align="middle"
|
||||
fo:wrap-option="wrap"
|
||||
fo:background-color="{background_color}"/>
|
||||
<style:paragraph-properties fo:text-align="center"/>
|
||||
<style:text-properties
|
||||
{bold_attr}
|
||||
fo:font-size="{font_size}"
|
||||
fo:color="{color}"/>
|
||||
</style:style>"""
|
||||
)
|
||||
|
||||
|
||||
def apply_cell_style(
|
||||
document: odfdo.Document,
|
||||
table: odfdo.Table,
|
||||
currency_cols: list[int]
|
||||
):
|
||||
"""Apply cell style
|
||||
"""
|
||||
document.insert_style(
|
||||
style=create_currency_style(),
|
||||
)
|
||||
header_style = document.insert_style(
|
||||
create_cell_style(
|
||||
name="header-cells",
|
||||
bold=True,
|
||||
font_size='12pt',
|
||||
background_color="#3480eb",
|
||||
color="#FFF"
|
||||
)
|
||||
)
|
||||
body_style_even = document.insert_style(
|
||||
create_cell_style(
|
||||
name="body-style-even",
|
||||
bold=False,
|
||||
background_color="#e8eaed",
|
||||
color="#000000",
|
||||
)
|
||||
)
|
||||
body_style_odd = document.insert_style(
|
||||
create_cell_style(
|
||||
name="body-style-odd",
|
||||
bold=False,
|
||||
background_color="#FFFFFF",
|
||||
color="#000000",
|
||||
)
|
||||
)
|
||||
footer_style = document.insert_style(
|
||||
create_cell_style(
|
||||
name="footer-cells",
|
||||
bold=True,
|
||||
font_size='12pt',
|
||||
)
|
||||
)
|
||||
body_style_even_currency = document.insert_style(
|
||||
create_cell_style(
|
||||
name="body-style-even-currency",
|
||||
bold=False,
|
||||
background_color="#e8eaed",
|
||||
color="#000000",
|
||||
currency=True,
|
||||
)
|
||||
)
|
||||
body_style_odd_currency = document.insert_style(
|
||||
create_cell_style(
|
||||
name="body-style-odd-currency",
|
||||
bold=False,
|
||||
background_color="#FFFFFF",
|
||||
color="#000000",
|
||||
currency=True,
|
||||
)
|
||||
)
|
||||
footer_style_currency = document.insert_style(
|
||||
create_cell_style(
|
||||
name="footer-cells-currency",
|
||||
bold=True,
|
||||
font_size='12pt',
|
||||
currency=True,
|
||||
)
|
||||
)
|
||||
for index, row in enumerate(table.get_rows()):
|
||||
style = body_style_even
|
||||
currency_style = body_style_even_currency
|
||||
if index == 0 or index == 1:
|
||||
style = header_style
|
||||
elif index == len(table.get_rows()) - 1:
|
||||
style = footer_style
|
||||
currency_style = footer_style_currency
|
||||
elif index % 2 == 0:
|
||||
style = body_style_even
|
||||
currency_style = body_style_even_currency
|
||||
else:
|
||||
style = body_style_odd
|
||||
currency_style = body_style_odd_currency
|
||||
for cell_index, cell in enumerate(row.get_cells()):
|
||||
if cell_index in currency_cols and not (index == 0 or index == 1):
|
||||
cell.style = currency_style
|
||||
else:
|
||||
cell.style = style
|
||||
|
||||
|
||||
def apply_column_height_style(
|
||||
document: odfdo.Document,
|
||||
table: odfdo.Table
|
||||
):
|
||||
"""Apply column height for a given table
|
||||
"""
|
||||
header_style = document.insert_style(
|
||||
style=create_row_style_height('1.60cm'), name='1.60cm', automatic=True
|
||||
)
|
||||
body_style = document.insert_style(
|
||||
style=create_row_style_height('0.90cm'), name='0.90cm', automatic=True
|
||||
)
|
||||
for index, row in enumerate(table.get_rows()):
|
||||
if index == 1:
|
||||
row.style = header_style
|
||||
else:
|
||||
row.style = body_style
|
||||
|
||||
|
||||
def apply_cell_style_by_column(
|
||||
table: odfdo.Table,
|
||||
style: odfdo.Style,
|
||||
col_index: int
|
||||
):
|
||||
"""Apply cell style for a given table
|
||||
"""
|
||||
for cell in table.get_column_cells(col_index):
|
||||
cell.style = style
|
||||
|
||||
|
||||
def apply_column_width_style(
|
||||
document: odfdo.Document,
|
||||
table: odfdo.Table,
|
||||
widths: list[str]
|
||||
):
|
||||
"""Apply column width style to a table.
|
||||
Parameters:
|
||||
document(odfdo.Document): Document where the table is located.
|
||||
table(odfdo.Table): Table to apply columns widths.
|
||||
widths(list[str]): list of width in format <number><unit> unit ca be
|
||||
in, cm... see odfdo documentation.
|
||||
"""
|
||||
styles = []
|
||||
for w in widths:
|
||||
styles.append(document.insert_style(
|
||||
style=create_column_style_width(w), name=w, automatic=True)
|
||||
)
|
||||
|
||||
for position in range(table.width):
|
||||
col = table.get_column(position)
|
||||
col.style = styles[position]
|
||||
table.set_column(position, col)
|
||||
|
||||
|
||||
def generate_ods_letters(n: int):
|
||||
"""Generate letters following excel format.
|
||||
Arguments:
|
||||
n(int): `n` letters to generate.
|
||||
Return:
|
||||
result(list[str]): list of `n` letters that follow excel pattern.
|
||||
"""
|
||||
letters = string.ascii_lowercase
|
||||
result = []
|
||||
for i in range(n):
|
||||
if i > len(letters) - 1:
|
||||
letter = f'{letters[int(i / len(letters)) - 1]}'
|
||||
letter += f'{letters[i % len(letters)]}'
|
||||
result.append(letter)
|
||||
continue
|
||||
letter = letters[i]
|
||||
result.append(letters[i])
|
||||
return result
|
||||
|
||||
|
||||
def compute_contract_prices(contract: models.Contract) -> dict:
|
||||
"""Compute price for a give contract.
|
||||
"""
|
||||
occasional_contract_products = list(
|
||||
filter(
|
||||
lambda contract_product: (
|
||||
contract_product.product.type == models.ProductType.OCCASIONAL
|
||||
),
|
||||
contract.products
|
||||
)
|
||||
)
|
||||
occasionals_dict = service.create_occasional_dict(
|
||||
occasional_contract_products)
|
||||
recurrents_dict = list(
|
||||
map(
|
||||
lambda x: {'product': x.product, 'quantity': x.quantity},
|
||||
filter(
|
||||
lambda contract_product: (
|
||||
contract_product.product.type ==
|
||||
models.ProductType.RECCURENT
|
||||
),
|
||||
contract.products
|
||||
)
|
||||
)
|
||||
)
|
||||
prices = service.generate_products_prices(
|
||||
occasionals_dict,
|
||||
recurrents_dict,
|
||||
contract.form.shipments
|
||||
)
|
||||
return prices
|
||||
|
||||
|
||||
def transform_formula_cells(sheet: odfdo.Spreadsheet):
|
||||
"""Transform cell value to a formula using odfdo.
|
||||
"""
|
||||
for row in sheet.get_rows():
|
||||
for cell in row.get_cells():
|
||||
if not cell.value or cell.get_attribute("office:value-type") == "float":
|
||||
continue
|
||||
if '=' in cell.value:
|
||||
formula = cell.value
|
||||
cell.clear()
|
||||
cell.formula = formula
|
||||
|
||||
|
||||
def merge_shipment_cells(
|
||||
sheet: odfdo.Spreadsheet,
|
||||
prefix_header: list[str],
|
||||
recurrents: list[str],
|
||||
occasionnals: list[str],
|
||||
shipments: list[models.Shipment]
|
||||
):
|
||||
"""Merge cells for shipment header.
|
||||
"""
|
||||
index = len(prefix_header) + len(recurrents) + 1
|
||||
for _ in enumerate(shipments):
|
||||
startcol = index
|
||||
endcol = index+len(occasionnals) - 1
|
||||
sheet.set_span((startcol, 0, endcol, 0), merge=True)
|
||||
index += len(occasionnals)
|
||||
|
||||
|
||||
def generate_recap(
|
||||
contracts: list[models.Contract],
|
||||
form: models.Form,
|
||||
):
|
||||
data = [
|
||||
["nom", "email"],
|
||||
"""Generate excel recap for a list of contracts.
|
||||
"""
|
||||
product_unit_map = {
|
||||
'1': 'g',
|
||||
'2': 'Kg',
|
||||
'3': 'Piece'
|
||||
}
|
||||
recurrents = [
|
||||
f'{pr.name}{f' - {pr.quantity}{pr.quantity_unit}'
|
||||
if pr.quantity else ''} ({product_unit_map[pr.unit]})'
|
||||
for pr in form.productor.products
|
||||
if pr.type == models.ProductType.RECCURENT
|
||||
]
|
||||
doc = Document("spreadsheet")
|
||||
sheet = Table(name="Recap")
|
||||
recurrents.sort()
|
||||
occasionnals = [
|
||||
f'{pr.name}{f' - {pr.quantity}{pr.quantity_unit}'
|
||||
if pr.quantity else ''} ({product_unit_map[pr.unit]})'
|
||||
for pr in form.productor.products
|
||||
if pr.type == models.ProductType.OCCASIONAL
|
||||
]
|
||||
occasionnals.sort()
|
||||
shipments = form.shipments
|
||||
occasionnals_header = [
|
||||
occ for shipment in shipments for occ in occasionnals
|
||||
]
|
||||
|
||||
info_header: list[str] = ['', 'Nom', 'Email']
|
||||
cheque_header: list[str] = ['Cheque 1', 'Cheque 2', 'Cheque 3']
|
||||
payment_header = (
|
||||
cheque_header +
|
||||
[f'Total {len(shipments)} livraisons + produits occasionnels']
|
||||
)
|
||||
prefix_header: list[str] = (
|
||||
info_header +
|
||||
payment_header
|
||||
)
|
||||
suffix_header: list[str] = [
|
||||
'Total produits occasionnels',
|
||||
'Remarques',
|
||||
'Nom'
|
||||
]
|
||||
|
||||
shipment_header = flatten([
|
||||
[f'{shipment.name} - {shipment.date.strftime('%Y-%m-%d')}'] +
|
||||
['' * len(occasionnals)] for shipment in shipments] +
|
||||
[''] * len(suffix_header)
|
||||
)
|
||||
|
||||
header: list[str] = (
|
||||
prefix_header +
|
||||
recurrents +
|
||||
['Total produits récurrents'] +
|
||||
occasionnals_header +
|
||||
suffix_header
|
||||
)
|
||||
|
||||
letters = generate_ods_letters(len(header))
|
||||
payment_formula_letters = letters[
|
||||
len(info_header):len(info_header) + len(payment_header)
|
||||
]
|
||||
recurent_formula_letters = letters[
|
||||
len(info_header)+len(payment_formula_letters):
|
||||
len(info_header)+len(payment_formula_letters)+len(recurrents) + 1
|
||||
]
|
||||
occasionnals_formula_letters = letters[
|
||||
len(info_header)+len(payment_formula_letters) +
|
||||
len(recurent_formula_letters):
|
||||
len(info_header)+len(payment_formula_letters) +
|
||||
len(recurent_formula_letters)+len(occasionnals_header) + 1
|
||||
]
|
||||
|
||||
footer = (
|
||||
['', 'Total contrats', ''] +
|
||||
[f'=SUM({letter}3:{letter}{2+len(contracts)})'
|
||||
for letter in payment_formula_letters] +
|
||||
[f'=SUM({letter}3:{letter}{2+len(contracts)})'
|
||||
for letter in recurent_formula_letters] +
|
||||
[f'=SUM({letter}3:{letter}{2+len(contracts)})'
|
||||
for letter in occasionnals_formula_letters]
|
||||
)
|
||||
|
||||
main_data = []
|
||||
for index, contract in enumerate(contracts):
|
||||
prices = compute_contract_prices(contract)
|
||||
occasionnal_sorted = sorted(
|
||||
[
|
||||
product for product in contract.products
|
||||
if product.product.type == models.ProductType.OCCASIONAL
|
||||
],
|
||||
key=lambda x: (x.shipment.name, x.product.name)
|
||||
)
|
||||
recurrent_sorted = sorted(
|
||||
[
|
||||
product for product in contract.products
|
||||
if product.product.type == models.ProductType.RECCURENT
|
||||
],
|
||||
key=lambda x: x.product.name
|
||||
)
|
||||
|
||||
main_data.append([
|
||||
f'{index + 1}',
|
||||
f'{contract.firstname} {contract.lastname}',
|
||||
f'{contract.email}',
|
||||
*[float(contract.cheques[i].value)
|
||||
if len(contract.cheques) > i
|
||||
else ''
|
||||
for i in range(3)],
|
||||
prices['total'],
|
||||
*[pr.quantity for pr in recurrent_sorted],
|
||||
prices['recurrent'],
|
||||
*[pr.quantity for pr in occasionnal_sorted],
|
||||
prices['occasionnal'],
|
||||
'',
|
||||
f'{contract.firstname} {contract.lastname}',
|
||||
])
|
||||
|
||||
data = [
|
||||
[''] * (len(prefix_header) + len(recurrents) + 1) + shipment_header,
|
||||
header,
|
||||
*main_data,
|
||||
footer
|
||||
]
|
||||
|
||||
doc = odfdo.Document('spreadsheet')
|
||||
sheet = doc.body.get_sheet(0)
|
||||
sheet.name = 'Recap'
|
||||
sheet.set_values(data)
|
||||
|
||||
doc.body.append(sheet)
|
||||
if len(occasionnals) > 0:
|
||||
merge_shipment_cells(
|
||||
sheet,
|
||||
prefix_header,
|
||||
recurrents,
|
||||
occasionnals,
|
||||
shipments
|
||||
)
|
||||
|
||||
transform_formula_cells(sheet)
|
||||
|
||||
apply_column_width_style(
|
||||
doc,
|
||||
doc.body.get_table(0),
|
||||
['2cm'] +
|
||||
['6cm'] * 2 +
|
||||
['2.40cm'] * (len(payment_header) - 1) +
|
||||
['4cm'] * len(recurrents) +
|
||||
['4cm'] +
|
||||
['4cm'] * (len(occasionnals_header) + 1) +
|
||||
['4cm', '8cm', '6cm']
|
||||
)
|
||||
apply_column_height_style(
|
||||
doc,
|
||||
doc.body.get_table(0),
|
||||
)
|
||||
apply_cell_style(
|
||||
doc,
|
||||
doc.body.get_table(0),
|
||||
[
|
||||
3,
|
||||
4,
|
||||
5,
|
||||
6,
|
||||
len(info_header) + len(payment_header),
|
||||
len(info_header) + len(payment_header) + 1 + len(occasionnals),
|
||||
]
|
||||
)
|
||||
doc.body.append(sheet)
|
||||
buffer = io.BytesIO()
|
||||
doc.save(buffer)
|
||||
|
||||
return buffer.getvalue()
|
||||
|
||||
|
||||
@@ -1,28 +1,57 @@
|
||||
"""Contract service responsible for read, create, update and delete contracts"""
|
||||
from sqlalchemy.orm import selectinload
|
||||
from sqlmodel import Session, select
|
||||
import src.models as models
|
||||
from src import models
|
||||
|
||||
|
||||
def get_all(
|
||||
session: Session,
|
||||
user: models.User,
|
||||
forms: list[str] = [],
|
||||
forms: list[str] | None = None,
|
||||
form_id: int | None = None,
|
||||
) -> list[models.ContractPublic]:
|
||||
statement = select(models.Contract)\
|
||||
.join(models.Form, models.Contract.form_id == models.Form.id)\
|
||||
.join(models.Productor, models.Form.productor_id == models.Productor.id)\
|
||||
.where(models.Productor.type.in_([r.name for r in user.roles]))\
|
||||
"""Get all contracts"""
|
||||
statement = (
|
||||
select(models.Contract)
|
||||
.join(
|
||||
models.Form,
|
||||
models.Contract.form_id == models.Form.id
|
||||
)
|
||||
.join(
|
||||
models.Productor,
|
||||
models.Form.productor_id == models.Productor.id
|
||||
)
|
||||
.where(
|
||||
models.Productor.type.in_(
|
||||
[r.name for r in user.roles]
|
||||
)
|
||||
)
|
||||
.distinct()
|
||||
if len(forms) > 0:
|
||||
)
|
||||
if forms:
|
||||
statement = statement.where(models.Form.name.in_(forms))
|
||||
if form_id:
|
||||
statement = statement.where(models.Form.id == form_id)
|
||||
return session.exec(statement.order_by(models.Contract.id)).all()
|
||||
|
||||
def get_one(session: Session, contract_id: int) -> models.ContractPublic:
|
||||
|
||||
def get_one(
|
||||
session: Session,
|
||||
contract_id: int
|
||||
) -> models.ContractPublic:
|
||||
"""Get one contract"""
|
||||
return session.get(models.Contract, contract_id)
|
||||
|
||||
def create_one(session: Session, contract: models.ContractCreate) -> models.ContractPublic:
|
||||
contract_create = contract.model_dump(exclude_unset=True, exclude=["products", "cheques"])
|
||||
|
||||
def create_one(
|
||||
session: Session,
|
||||
contract: models.ContractCreate
|
||||
) -> models.ContractPublic:
|
||||
"""Create one contract"""
|
||||
contract_create = contract.model_dump(
|
||||
exclude_unset=True,
|
||||
exclude=["products", "cheques"]
|
||||
)
|
||||
new_contract = models.Contract(**contract_create)
|
||||
|
||||
new_contract.cheques = [
|
||||
@@ -45,10 +74,27 @@ def create_one(session: Session, contract: models.ContractCreate) -> models.Cont
|
||||
session.add(new_contract)
|
||||
session.commit()
|
||||
session.refresh(new_contract)
|
||||
return new_contract
|
||||
|
||||
def add_contract_file(session: Session, id: int, file: bytes, price: float):
|
||||
statement = select(models.Contract).where(models.Contract.id == id)
|
||||
statement = (
|
||||
select(models.Contract)
|
||||
.where(models.Contract.id == new_contract.id)
|
||||
.options(
|
||||
selectinload(models.Contract.form)
|
||||
.selectinload(models.Form.productor)
|
||||
)
|
||||
)
|
||||
|
||||
return session.exec(statement).one()
|
||||
|
||||
|
||||
def add_contract_file(
|
||||
session: Session,
|
||||
_id: int,
|
||||
file: bytes,
|
||||
price: float
|
||||
):
|
||||
"""Add a file to an existing contract"""
|
||||
statement = select(models.Contract).where(models.Contract.id == _id)
|
||||
result = session.exec(statement)
|
||||
contract = result.first()
|
||||
contract.total_price = price
|
||||
@@ -58,8 +104,14 @@ def add_contract_file(session: Session, id: int, file: bytes, price: float):
|
||||
session.refresh(contract)
|
||||
return contract
|
||||
|
||||
def update_one(session: Session, id: int, contract: models.ContractUpdate) -> models.ContractPublic:
|
||||
statement = select(models.Contract).where(models.Contract.id == id)
|
||||
|
||||
def update_one(
|
||||
session: Session,
|
||||
_id: int,
|
||||
contract: models.ContractUpdate
|
||||
) -> models.ContractPublic:
|
||||
"""Update one contract"""
|
||||
statement = select(models.Contract).where(models.Contract.id == _id)
|
||||
result = session.exec(statement)
|
||||
new_contract = result.first()
|
||||
if not new_contract:
|
||||
@@ -72,8 +124,13 @@ def update_one(session: Session, id: int, contract: models.ContractUpdate) -> mo
|
||||
session.refresh(new_contract)
|
||||
return new_contract
|
||||
|
||||
def delete_one(session: Session, id: int) -> models.ContractPublic:
|
||||
statement = select(models.Contract).where(models.Contract.id == id)
|
||||
|
||||
def delete_one(
|
||||
session: Session,
|
||||
_id: int
|
||||
) -> models.ContractPublic:
|
||||
"""Delete one contract"""
|
||||
statement = select(models.Contract).where(models.Contract.id == _id)
|
||||
result = session.exec(statement)
|
||||
contract = result.first()
|
||||
if not contract:
|
||||
@@ -83,11 +140,129 @@ def delete_one(session: Session, id: int) -> models.ContractPublic:
|
||||
session.commit()
|
||||
return result
|
||||
|
||||
def is_allowed(session: Session, user: models.User, id: int) -> bool:
|
||||
statement = select(models.Contract)\
|
||||
.join(models.Form, models.Contract.form_id == models.Form.id)\
|
||||
.join(models.Productor, models.Form.productor_id == models.Productor.id)\
|
||||
.where(models.Contract.id == id)\
|
||||
.where(models.Productor.type.in_([r.name for r in user.roles]))\
|
||||
|
||||
def is_allowed(
|
||||
session: Session,
|
||||
user: models.User,
|
||||
_id: int
|
||||
) -> bool:
|
||||
"""Determine if a user is allowed to access a contract by id"""
|
||||
statement = (
|
||||
select(models.Contract)
|
||||
.join(
|
||||
models.Form,
|
||||
models.Contract.form_id == models.Form.id
|
||||
)
|
||||
.join(
|
||||
models.Productor,
|
||||
models.Form.productor_id == models.Productor.id
|
||||
)
|
||||
.where(models.Contract.id == _id)
|
||||
.where(
|
||||
models.Productor.type.in_(
|
||||
[r.name for r in user.roles]
|
||||
)
|
||||
)
|
||||
.distinct()
|
||||
)
|
||||
return len(session.exec(statement).all()) > 0
|
||||
|
||||
|
||||
def compute_recurrent_prices(
|
||||
products_quantities: list[dict],
|
||||
nb_shipment: int
|
||||
):
|
||||
"""Compute price for recurrent products"""
|
||||
result = 0
|
||||
for product_quantity in products_quantities:
|
||||
product = product_quantity['product']
|
||||
quantity = product_quantity['quantity']
|
||||
result += compute_product_price(product, quantity, nb_shipment)
|
||||
return result
|
||||
|
||||
|
||||
def compute_occasional_prices(occasionals: list[dict]):
|
||||
"""Compute prices for occassional products"""
|
||||
result = 0
|
||||
for occasional in occasionals:
|
||||
result += occasional['price']
|
||||
return result
|
||||
|
||||
|
||||
def compute_product_price(
|
||||
product: models.Product,
|
||||
quantity: int,
|
||||
nb_shipment: int = 1
|
||||
):
|
||||
"""Compute price for a product"""
|
||||
product_quantity_unit = (
|
||||
1 if product.unit == models.Unit.KILO else 1000
|
||||
)
|
||||
final_quantity = (
|
||||
quantity if product.price else quantity / product_quantity_unit
|
||||
)
|
||||
final_price = (
|
||||
product.price if product.price else product.price_kg
|
||||
)
|
||||
return final_price * final_quantity * nb_shipment
|
||||
|
||||
|
||||
def find_dict_in_list(lst, key, value):
|
||||
"""Find the index of a dictionnary in a list of dictionnaries given a key
|
||||
and a value.
|
||||
"""
|
||||
for i, dic in enumerate(lst):
|
||||
if dic[key].id == value:
|
||||
return i
|
||||
return -1
|
||||
|
||||
|
||||
def create_occasional_dict(contract_products: list[models.ContractProduct]):
|
||||
"""Create a dictionnary of occasional products"""
|
||||
result = []
|
||||
for contract_product in contract_products:
|
||||
existing_id = find_dict_in_list(
|
||||
result,
|
||||
'shipment',
|
||||
contract_product.shipment.id
|
||||
)
|
||||
if existing_id < 0:
|
||||
result.append({
|
||||
'shipment': contract_product.shipment,
|
||||
'price': compute_product_price(
|
||||
contract_product.product,
|
||||
contract_product.quantity
|
||||
),
|
||||
'products': [{
|
||||
'product': contract_product.product,
|
||||
'quantity': contract_product.quantity
|
||||
}]
|
||||
})
|
||||
else:
|
||||
result[existing_id]['products'].append({
|
||||
'product': contract_product.product,
|
||||
'quantity': contract_product.quantity
|
||||
})
|
||||
result[existing_id]['price'] += compute_product_price(
|
||||
contract_product.product,
|
||||
contract_product.quantity
|
||||
)
|
||||
return result
|
||||
|
||||
|
||||
def generate_products_prices(
|
||||
occasionals: list[dict],
|
||||
recurrents: list[dict],
|
||||
shipments: list[models.ShipmentPublic]
|
||||
):
|
||||
recurrent_price = compute_recurrent_prices(
|
||||
recurrents,
|
||||
len(shipments)
|
||||
)
|
||||
occasional_price = compute_occasional_prices(occasionals)
|
||||
price = recurrent_price + occasional_price
|
||||
return {
|
||||
'total': price,
|
||||
'recurrent': recurrent_price,
|
||||
'occasionnal': occasional_price
|
||||
}
|
||||
|
||||
@@ -1,11 +1,14 @@
|
||||
from sqlmodel import create_engine, SQLModel, Session
|
||||
from sqlmodel import Session, SQLModel, create_engine
|
||||
from src.settings import settings
|
||||
|
||||
engine = create_engine(f'postgresql://{settings.db_user}:{settings.db_pass}@{settings.db_host}:5432/{settings.db_name}')
|
||||
engine = create_engine(
|
||||
f'postgresql://{settings.db_user}:{settings.db_pass}@{settings.db_host}:5432/{settings.db_name}')
|
||||
|
||||
|
||||
def get_session():
|
||||
with Session(engine) as session:
|
||||
yield session
|
||||
|
||||
|
||||
def create_all_tables():
|
||||
SQLModel.metadata.create_all(engine)
|
||||
|
||||
@@ -1,16 +1,25 @@
|
||||
"""Forms module exceptions"""
|
||||
import logging
|
||||
|
||||
class FormServiceError(Exception):
|
||||
"""Form service exception"""
|
||||
def __init__(self, message: str):
|
||||
super().__init__(message)
|
||||
logging.error('FormService : %s', message)
|
||||
|
||||
|
||||
class UserNotFoundError(FormServiceError):
|
||||
pass
|
||||
|
||||
|
||||
class ProductorNotFoundError(FormServiceError):
|
||||
pass
|
||||
|
||||
|
||||
class FormNotFoundError(FormServiceError):
|
||||
pass
|
||||
|
||||
|
||||
class FormCreateError(FormServiceError):
|
||||
def __init__(self, message: str, field: str | None = None):
|
||||
super().__init__(message)
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
from fastapi import APIRouter, HTTPException, Depends, Query
|
||||
import src.messages as messages
|
||||
import src.models as models
|
||||
from src.database import get_session
|
||||
from sqlmodel import Session
|
||||
import src.forms.service as service
|
||||
import src.forms.exceptions as exceptions
|
||||
import src.forms.service as service
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
||||
from sqlmodel import Session
|
||||
from src import messages, models
|
||||
from src.auth.auth import get_current_user
|
||||
from src.database import get_session
|
||||
|
||||
router = APIRouter(prefix='/forms')
|
||||
|
||||
|
||||
@router.get('', response_model=list[models.FormPublic])
|
||||
async def get_forms(
|
||||
seasons: list[str] = Query([]),
|
||||
@@ -18,6 +18,7 @@ async def get_forms(
|
||||
):
|
||||
return service.get_all(session, seasons, productors, current_season)
|
||||
|
||||
|
||||
@router.get('/referents', response_model=list[models.FormPublic])
|
||||
async def get_forms_filtered(
|
||||
seasons: list[str] = Query([]),
|
||||
@@ -28,53 +29,79 @@ async def get_forms_filtered(
|
||||
):
|
||||
return service.get_all(session, seasons, productors, current_season, user)
|
||||
|
||||
@router.get('/{id}', response_model=models.FormPublic)
|
||||
async def get_form(id: int, session: Session = Depends(get_session)):
|
||||
result = service.get_one(session, id)
|
||||
|
||||
@router.get('/{_id}', response_model=models.FormPublic)
|
||||
async def get_form(
|
||||
_id: int,
|
||||
session: Session = Depends(get_session)
|
||||
):
|
||||
result = service.get_one(session, _id)
|
||||
if result is None:
|
||||
raise HTTPException(status_code=404, detail=messages.Messages.not_found('form'))
|
||||
raise HTTPException(
|
||||
status_code=404,
|
||||
detail=messages.Messages.not_found('form')
|
||||
)
|
||||
return result
|
||||
|
||||
|
||||
@router.post('', response_model=models.FormPublic)
|
||||
async def create_form(
|
||||
form: models.FormCreate,
|
||||
user: models.User = Depends(get_current_user),
|
||||
session: Session = Depends(get_session)
|
||||
):
|
||||
if not service.is_allowed(session, user, form=form):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('forms', 'update')
|
||||
)
|
||||
try:
|
||||
form = service.create_one(session, form)
|
||||
except exceptions.ProductorNotFoundError as error:
|
||||
raise HTTPException(status_code=404, detail=str(error))
|
||||
raise HTTPException(status_code=404, detail=str(error)) from error
|
||||
except exceptions.UserNotFoundError as error:
|
||||
raise HTTPException(status_code=404, detail=str(error))
|
||||
raise HTTPException(status_code=404, detail=str(error)) from error
|
||||
except exceptions.FormCreateError as error:
|
||||
raise HTTPException(status_code=400, detail=str(error))
|
||||
raise HTTPException(status_code=400, detail=str(error)) from error
|
||||
return form
|
||||
|
||||
@router.put('/{id}', response_model=models.FormPublic)
|
||||
|
||||
@router.put('/{_id}', response_model=models.FormPublic)
|
||||
async def update_form(
|
||||
id: int, form: models.FormUpdate,
|
||||
_id: int,
|
||||
form: models.FormUpdate,
|
||||
user: models.User = Depends(get_current_user),
|
||||
session: Session = Depends(get_session)
|
||||
):
|
||||
if not service.is_allowed(session, user, _id=_id):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('forms', 'update')
|
||||
)
|
||||
try:
|
||||
result = service.update_one(session, id, form)
|
||||
result = service.update_one(session, _id, form)
|
||||
except exceptions.FormNotFoundError as error:
|
||||
raise HTTPException(status_code=404, detail=str(error))
|
||||
raise HTTPException(status_code=404, detail=str(error)) from error
|
||||
except exceptions.ProductorNotFoundError as error:
|
||||
raise HTTPException(status_code=404, detail=str(error))
|
||||
raise HTTPException(status_code=404, detail=str(error)) from error
|
||||
except exceptions.UserNotFoundError as error:
|
||||
raise HTTPException(status_code=404, detail=str(error))
|
||||
raise HTTPException(status_code=404, detail=str(error)) from error
|
||||
return result
|
||||
|
||||
@router.delete('/{id}', response_model=models.FormPublic)
|
||||
|
||||
@router.delete('/{_id}', response_model=models.FormPublic)
|
||||
async def delete_form(
|
||||
id: int,
|
||||
_id: int,
|
||||
user: models.User = Depends(get_current_user),
|
||||
session: Session = Depends(get_session)
|
||||
):
|
||||
if not service.is_allowed(session, user, _id=_id):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('forms', 'delete')
|
||||
)
|
||||
try:
|
||||
result = service.delete_one(session, id)
|
||||
result = service.delete_one(session, _id)
|
||||
except exceptions.FormNotFoundError as error:
|
||||
raise HTTPException(status_code=404, detail=str(error))
|
||||
raise HTTPException(status_code=404, detail=str(error)) from error
|
||||
return result
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
from sqlmodel import Session, select
|
||||
from sqlalchemy import func
|
||||
|
||||
import src.models as models
|
||||
import src.forms.exceptions as exceptions
|
||||
import src.messages as messages
|
||||
from sqlalchemy import func
|
||||
from sqlmodel import Session, select
|
||||
from src import messages, models
|
||||
|
||||
|
||||
def get_all(
|
||||
session: Session,
|
||||
@@ -14,24 +13,28 @@ def get_all(
|
||||
) -> list[models.FormPublic]:
|
||||
statement = select(models.Form)
|
||||
if user:
|
||||
statement = statement\
|
||||
.join(models.Productor, models.Form.productor_id == models.Productor.id)\
|
||||
.where(models.Productor.type.in_([r.name for r in user.roles]))\
|
||||
.distinct()
|
||||
statement = statement .join(
|
||||
models.Productor,
|
||||
models.Form.productor_id == models.Productor.id) .where(
|
||||
models.Productor.type.in_(
|
||||
[
|
||||
r.name for r in user.roles])) .distinct()
|
||||
if len(seasons) > 0:
|
||||
statement = statement.where(models.Form.season.in_(seasons))
|
||||
if len(productors) > 0:
|
||||
statement = statement.join(models.Productor).where(models.Productor.name.in_(productors))
|
||||
statement = statement.join(
|
||||
models.Productor).where(
|
||||
models.Productor.name.in_(productors))
|
||||
if not user:
|
||||
statement = statement.where(models.Form.visible == True)
|
||||
statement = statement.where(models.Form.visible)
|
||||
if current_season:
|
||||
subquery = (
|
||||
select(
|
||||
models.Productor.type,
|
||||
func.max(models.Form.start).label("max_start")
|
||||
)
|
||||
.join(models.Form)\
|
||||
.group_by(models.Productor.type)\
|
||||
.join(models.Form)
|
||||
.group_by(models.Productor.type)
|
||||
.subquery()
|
||||
)
|
||||
statement = select(models.Form)\
|
||||
@@ -41,18 +44,23 @@ def get_all(
|
||||
(models.Form.start == subquery.c.max_start)
|
||||
)
|
||||
if not user:
|
||||
statement = statement.where(models.Form.visible == True)
|
||||
statement = statement.where(models.Form.visible)
|
||||
return session.exec(statement.order_by(models.Form.name)).all()
|
||||
return session.exec(statement.order_by(models.Form.name)).all()
|
||||
|
||||
|
||||
def get_one(session: Session, form_id: int) -> models.FormPublic:
|
||||
return session.get(models.Form, form_id)
|
||||
|
||||
|
||||
def create_one(session: Session, form: models.FormCreate) -> models.FormPublic:
|
||||
if not form:
|
||||
raise exceptions.FormCreateError(messages.Messages.invalid_input('form', 'input cannot be None'))
|
||||
raise exceptions.FormCreateError(
|
||||
messages.Messages.invalid_input(
|
||||
'form', 'input cannot be None'))
|
||||
if not session.get(models.Productor, form.productor_id):
|
||||
raise exceptions.ProductorNotFoundError(messages.Messages.not_found('productor'))
|
||||
raise exceptions.ProductorNotFoundError(
|
||||
messages.Messages.not_found('productor'))
|
||||
if not session.get(models.User, form.referer_id):
|
||||
raise exceptions.UserNotFoundError(messages.Messages.not_found('user'))
|
||||
form_create = form.model_dump(exclude_unset=True)
|
||||
@@ -62,14 +70,20 @@ def create_one(session: Session, form: models.FormCreate) -> models.FormPublic:
|
||||
session.refresh(new_form)
|
||||
return new_form
|
||||
|
||||
def update_one(session: Session, id: int, form: models.FormUpdate) -> models.FormPublic:
|
||||
statement = select(models.Form).where(models.Form.id == id)
|
||||
|
||||
def update_one(
|
||||
session: Session,
|
||||
_id: int,
|
||||
form: models.FormUpdate) -> models.FormPublic:
|
||||
statement = select(models.Form).where(models.Form.id == _id)
|
||||
result = session.exec(statement)
|
||||
new_form = result.first()
|
||||
if not new_form:
|
||||
raise exceptions.FormNotFoundError(messages.Messages.not_found('form'))
|
||||
if form.productor_id and not session.get(models.Productor, form.productor_id):
|
||||
raise exceptions.ProductorNotFoundError(messages.Messages.not_found('productor'))
|
||||
if form.productor_id and not session.get(
|
||||
models.Productor, form.productor_id):
|
||||
raise exceptions.ProductorNotFoundError(
|
||||
messages.Messages.not_found('productor'))
|
||||
if form.referer_id and not session.get(models.User, form.referer_id):
|
||||
raise exceptions.UserNotFoundError(messages.Messages.not_found('user'))
|
||||
form_updates = form.model_dump(exclude_unset=True)
|
||||
@@ -80,8 +94,9 @@ def update_one(session: Session, id: int, form: models.FormUpdate) -> models.For
|
||||
session.refresh(new_form)
|
||||
return new_form
|
||||
|
||||
def delete_one(session: Session, id: int) -> models.FormPublic:
|
||||
statement = select(models.Form).where(models.Form.id == id)
|
||||
|
||||
def delete_one(session: Session, _id: int) -> models.FormPublic:
|
||||
statement = select(models.Form).where(models.Form.id == _id)
|
||||
result = session.exec(statement)
|
||||
form = result.first()
|
||||
if not form:
|
||||
@@ -91,10 +106,34 @@ def delete_one(session: Session, id: int) -> models.FormPublic:
|
||||
session.commit()
|
||||
return result
|
||||
|
||||
def is_allowed(session: Session, user: models.User, id: int) -> bool:
|
||||
statement = select(models.Form)\
|
||||
.join(models.Productor, models.Form.productor_id == models.Productor.id)\
|
||||
.where(models.Form.id == id)\
|
||||
.where(models.Productor.type.in_([r.name for r in user.roles]))\
|
||||
|
||||
def is_allowed(
|
||||
session: Session,
|
||||
user: models.User,
|
||||
_id: int = None,
|
||||
form: models.FormCreate = None
|
||||
) -> bool:
|
||||
if not _id and not form:
|
||||
return False
|
||||
if not _id:
|
||||
statement = (
|
||||
select(models.Productor)
|
||||
.where(models.Productor.id == form.productor_id)
|
||||
)
|
||||
productor = session.exec(statement).first()
|
||||
return productor.type in [r.name for r in user.roles]
|
||||
statement = (
|
||||
select(models.Form)
|
||||
.join(
|
||||
models.Productor,
|
||||
models.Form.productor_id == models.Productor.id
|
||||
)
|
||||
.where(models.Form.id == _id)
|
||||
.where(
|
||||
models.Productor.type.in_(
|
||||
[r.name for r in user.roles]
|
||||
)
|
||||
)
|
||||
.distinct()
|
||||
)
|
||||
return len(session.exec(statement).all()) > 0
|
||||
@@ -1,18 +1,15 @@
|
||||
from sqlmodel import SQLModel
|
||||
|
||||
from fastapi import FastAPI
|
||||
from fastapi.middleware.cors import CORSMiddleware
|
||||
|
||||
from src.templates.templates import router as template_router
|
||||
from src.auth.auth import router as auth_router
|
||||
from src.contracts.contracts import router as contracts_router
|
||||
from src.forms.forms import router as forms_router
|
||||
from src.productors.productors import router as productors_router
|
||||
from src.products.products import router as products_router
|
||||
from src.users.users import router as users_router
|
||||
from src.auth.auth import router as auth_router
|
||||
from src.shipments.shipments import router as shipment_router
|
||||
from src.settings import settings
|
||||
from src.database import engine, create_all_tables
|
||||
from src.shipments.shipments import router as shipment_router
|
||||
from src.templates.templates import router as template_router
|
||||
from src.users.users import router as users_router
|
||||
|
||||
app = FastAPI()
|
||||
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
pdferror = 'An error occured during PDF generation please contact administrator'
|
||||
|
||||
|
||||
class Messages:
|
||||
unauthorized = 'User is Unauthorized'
|
||||
notauthenticated = 'User is not authenticated'
|
||||
|
||||
@@ -1,99 +1,136 @@
|
||||
from sqlmodel import Field, SQLModel, Relationship, Column, LargeBinary
|
||||
import datetime
|
||||
from enum import StrEnum
|
||||
from typing import Optional
|
||||
import datetime
|
||||
|
||||
from sqlmodel import Column, Field, LargeBinary, Relationship, SQLModel
|
||||
|
||||
|
||||
class ContractType(SQLModel, table=True):
|
||||
id: int | None = Field(default=None, primary_key=True)
|
||||
id: int | None = Field(
|
||||
default=None,
|
||||
primary_key=True
|
||||
)
|
||||
name: str
|
||||
|
||||
|
||||
class UserContractTypeLink(SQLModel, table=True):
|
||||
user_id: int = Field(foreign_key="user.id", primary_key=True)
|
||||
contract_type_id: int = Field(foreign_key="contracttype.id", primary_key=True)
|
||||
user_id: int = Field(
|
||||
foreign_key='user.id',
|
||||
primary_key=True
|
||||
)
|
||||
contract_type_id: int = Field(
|
||||
foreign_key='contracttype.id',
|
||||
primary_key=True
|
||||
)
|
||||
|
||||
|
||||
class UserBase(SQLModel):
|
||||
name: str
|
||||
email: str
|
||||
|
||||
|
||||
class UserPublic(UserBase):
|
||||
id: int
|
||||
roles: list[ContractType]
|
||||
|
||||
|
||||
class User(UserBase, table=True):
|
||||
id: int | None = Field(default=None, primary_key=True)
|
||||
roles: list[ContractType] = Relationship(
|
||||
link_model=UserContractTypeLink
|
||||
)
|
||||
|
||||
|
||||
class UserUpdate(SQLModel):
|
||||
name: str | None
|
||||
email: str | None
|
||||
role_names: list[str] | None
|
||||
|
||||
|
||||
class UserCreate(UserBase):
|
||||
role_names: list[str] | None
|
||||
|
||||
|
||||
class PaymentMethodBase(SQLModel):
|
||||
name: str
|
||||
details: str
|
||||
max: int | None
|
||||
|
||||
|
||||
class PaymentMethod(PaymentMethodBase, table=True):
|
||||
id: int | None = Field(default=None, primary_key=True)
|
||||
productor_id: int = Field(foreign_key="productor.id", ondelete="CASCADE")
|
||||
productor: Optional["Productor"] = Relationship(
|
||||
back_populates="payment_methods",
|
||||
productor_id: int = Field(foreign_key='productor.id', ondelete='CASCADE')
|
||||
productor: Optional['Productor'] = Relationship(
|
||||
back_populates='payment_methods',
|
||||
)
|
||||
|
||||
|
||||
class PaymentMethodPublic(PaymentMethodBase):
|
||||
id: int
|
||||
productor: Optional["Productor"]
|
||||
productor: Optional['Productor']
|
||||
|
||||
|
||||
class ProductorBase(SQLModel):
|
||||
name: str
|
||||
address: str
|
||||
type: str
|
||||
|
||||
|
||||
class ProductorPublic(ProductorBase):
|
||||
id: int
|
||||
products: list["Product"] = []
|
||||
payment_methods: list["PaymentMethod"] = []
|
||||
products: list['Product'] = Field(default_factory=list)
|
||||
payment_methods: list['PaymentMethod'] = Field(default_factory=list)
|
||||
|
||||
|
||||
class Productor(ProductorBase, table=True):
|
||||
id: int | None = Field(default=None, primary_key=True)
|
||||
|
||||
products: list["Product"] = Relationship(
|
||||
products: list['Product'] = Relationship(
|
||||
back_populates='productor',
|
||||
sa_relationship_kwargs={
|
||||
"order_by": "Product.name"
|
||||
'order_by': 'Product.name'
|
||||
},
|
||||
)
|
||||
payment_methods: list["PaymentMethod"] = Relationship(
|
||||
back_populates="productor",
|
||||
payment_methods: list['PaymentMethod'] = Relationship(
|
||||
back_populates='productor',
|
||||
cascade_delete=True
|
||||
)
|
||||
|
||||
|
||||
class ProductorUpdate(SQLModel):
|
||||
name: str | None
|
||||
address: str | None
|
||||
payment_methods: list["PaymentMethod"] = []
|
||||
payment_methods: list['PaymentMethod'] = Field(default_factory=list)
|
||||
type: str | None
|
||||
|
||||
|
||||
class ProductorCreate(ProductorBase):
|
||||
payment_methods: list["PaymentMethod"] = []
|
||||
payment_methods: list['PaymentMethod'] = Field(default_factory=list)
|
||||
|
||||
|
||||
class Unit(StrEnum):
|
||||
GRAMS = "1"
|
||||
KILO = "2"
|
||||
PIECE = "3"
|
||||
GRAMS = '1'
|
||||
KILO = '2'
|
||||
PIECE = '3'
|
||||
|
||||
|
||||
class ProductType(StrEnum):
|
||||
OCCASIONAL = "1"
|
||||
RECCURENT = "2"
|
||||
OCCASIONAL = '1'
|
||||
RECCURENT = '2'
|
||||
|
||||
|
||||
class ShipmentProductLink(SQLModel, table=True):
|
||||
shipment_id: Optional[int] = Field(default=None, foreign_key="shipment.id", primary_key=True)
|
||||
product_id: Optional[int] = Field(default=None, foreign_key="product.id", primary_key=True)
|
||||
shipment_id: Optional[int] = Field(
|
||||
default=None,
|
||||
foreign_key='shipment.id',
|
||||
primary_key=True
|
||||
)
|
||||
product_id: Optional[int] = Field(
|
||||
default=None,
|
||||
foreign_key='product.id',
|
||||
primary_key=True
|
||||
)
|
||||
|
||||
|
||||
class ProductBase(SQLModel):
|
||||
name: str
|
||||
@@ -103,17 +140,31 @@ class ProductBase(SQLModel):
|
||||
quantity: float | None
|
||||
quantity_unit: str | None
|
||||
type: ProductType
|
||||
productor_id: int | None = Field(default=None, foreign_key="productor.id")
|
||||
productor_id: int | None = Field(
|
||||
default=None,
|
||||
foreign_key='productor.id'
|
||||
)
|
||||
|
||||
|
||||
class ProductPublic(ProductBase):
|
||||
id: int
|
||||
productor: Productor | None
|
||||
shipments: list["Shipment"] | None
|
||||
shipments: list['Shipment'] | None
|
||||
|
||||
|
||||
class Product(ProductBase, table=True):
|
||||
id: int | None = Field(default=None, primary_key=True)
|
||||
shipments: list["Shipment"] = Relationship(back_populates="products", link_model=ShipmentProductLink)
|
||||
productor: Optional[Productor] = Relationship(back_populates="products")
|
||||
id: int | None = Field(
|
||||
default=None,
|
||||
primary_key=True
|
||||
)
|
||||
shipments: list['Shipment'] = Relationship(
|
||||
back_populates='products',
|
||||
link_model=ShipmentProductLink
|
||||
)
|
||||
productor: Optional[Productor] = Relationship(
|
||||
back_populates='products'
|
||||
)
|
||||
|
||||
|
||||
class ProductUpdate(SQLModel):
|
||||
name: str | None
|
||||
@@ -125,41 +176,46 @@ class ProductUpdate(SQLModel):
|
||||
productor_id: int | None
|
||||
type: ProductType | None
|
||||
|
||||
|
||||
class ProductCreate(ProductBase):
|
||||
pass
|
||||
|
||||
|
||||
class FormBase(SQLModel):
|
||||
name: str
|
||||
productor_id: int | None = Field(default=None, foreign_key="productor.id")
|
||||
referer_id: int | None = Field(default=None, foreign_key="user.id")
|
||||
productor_id: int | None = Field(default=None, foreign_key='productor.id')
|
||||
referer_id: int | None = Field(default=None, foreign_key='user.id')
|
||||
season: str
|
||||
start: datetime.date
|
||||
end: datetime.date
|
||||
minimum_shipment_value: float | None
|
||||
visible: bool
|
||||
|
||||
|
||||
class FormPublic(FormBase):
|
||||
id: int
|
||||
productor: ProductorPublic | None
|
||||
referer: User | None
|
||||
shipments: list["ShipmentPublic"] = []
|
||||
shipments: list['ShipmentPublic'] = Field(default_factory=list)
|
||||
|
||||
|
||||
class Form(FormBase, table=True):
|
||||
id: int | None = Field(default=None, primary_key=True)
|
||||
productor: Optional['Productor'] = Relationship()
|
||||
referer: Optional['User'] = Relationship()
|
||||
shipments: list["Shipment"] = Relationship(
|
||||
back_populates="form",
|
||||
shipments: list['Shipment'] = Relationship(
|
||||
back_populates='form',
|
||||
cascade_delete=True,
|
||||
sa_relationship_kwargs={
|
||||
"order_by": "Shipment.name"
|
||||
'order_by': 'Shipment.name'
|
||||
},
|
||||
)
|
||||
contracts: list["Contract"] = Relationship(
|
||||
back_populates="form",
|
||||
contracts: list['Contract'] = Relationship(
|
||||
back_populates='form',
|
||||
cascade_delete=True
|
||||
)
|
||||
|
||||
|
||||
class FormUpdate(SQLModel):
|
||||
name: str | None
|
||||
productor_id: int | None
|
||||
@@ -170,35 +226,44 @@ class FormUpdate(SQLModel):
|
||||
minimum_shipment_value: float | None
|
||||
visible: bool | None
|
||||
|
||||
|
||||
class FormCreate(FormBase):
|
||||
pass
|
||||
|
||||
|
||||
class TemplateBase(SQLModel):
|
||||
pass
|
||||
|
||||
|
||||
class TemplatePublic(TemplateBase):
|
||||
id: int
|
||||
|
||||
|
||||
class Template(TemplateBase, table=True):
|
||||
id: int | None = Field(default=None, primary_key=True)
|
||||
|
||||
|
||||
class TemplateUpdate(SQLModel):
|
||||
pass
|
||||
|
||||
|
||||
class TemplateCreate(TemplateBase):
|
||||
pass
|
||||
|
||||
|
||||
class ChequeBase(SQLModel):
|
||||
name: str
|
||||
value: str
|
||||
|
||||
|
||||
class Cheque(ChequeBase, table=True):
|
||||
id: int | None = Field(default=None, primary_key=True)
|
||||
contract_id: int = Field(foreign_key="contract.id", ondelete="CASCADE")
|
||||
contract: Optional["Contract"] = Relationship(
|
||||
back_populates="cheques",
|
||||
contract_id: int = Field(foreign_key='contract.id', ondelete='CASCADE')
|
||||
contract: Optional['Contract'] = Relationship(
|
||||
back_populates='cheques',
|
||||
)
|
||||
|
||||
|
||||
class ContractBase(SQLModel):
|
||||
firstname: str
|
||||
lastname: str
|
||||
@@ -207,105 +272,122 @@ class ContractBase(SQLModel):
|
||||
payment_method: str
|
||||
cheque_quantity: int
|
||||
|
||||
|
||||
class Contract(ContractBase, table=True):
|
||||
id: int | None = Field(default=None, primary_key=True)
|
||||
|
||||
form_id: int = Field(
|
||||
foreign_key="form.id",
|
||||
foreign_key='form.id',
|
||||
nullable=False,
|
||||
ondelete="CASCADE"
|
||||
ondelete='CASCADE'
|
||||
)
|
||||
products: list["ContractProduct"] = Relationship(
|
||||
back_populates="contract",
|
||||
products: list['ContractProduct'] = Relationship(
|
||||
back_populates='contract',
|
||||
cascade_delete=True
|
||||
)
|
||||
form: Optional[Form] = Relationship(back_populates="contracts")
|
||||
form: Form = Relationship(back_populates='contracts')
|
||||
cheques: list[Cheque] = Relationship(
|
||||
back_populates="contract",
|
||||
back_populates='contract',
|
||||
cascade_delete=True
|
||||
)
|
||||
file: bytes = Field(sa_column=Column(LargeBinary))
|
||||
total_price: float | None
|
||||
|
||||
|
||||
class ContractCreate(ContractBase):
|
||||
products: list["ContractProductCreate"] = []
|
||||
cheques: list["Cheque"] = []
|
||||
products: list['ContractProductCreate'] = Field(default_factory=list)
|
||||
cheques: list['Cheque'] = Field(default_factory=list)
|
||||
form_id: int
|
||||
|
||||
|
||||
class ContractUpdate(SQLModel):
|
||||
file: bytes
|
||||
|
||||
|
||||
class ContractPublic(ContractBase):
|
||||
id: int
|
||||
products: list["ContractProduct"] = []
|
||||
products: list['ContractProduct'] = Field(default_factory=list)
|
||||
form: Form
|
||||
total_price: float | None
|
||||
# file: bytes
|
||||
|
||||
|
||||
class ContractProductBase(SQLModel):
|
||||
product_id: int = Field(
|
||||
foreign_key="product.id",
|
||||
foreign_key='product.id',
|
||||
nullable=False,
|
||||
ondelete="CASCADE"
|
||||
ondelete='CASCADE'
|
||||
)
|
||||
shipment_id: int | None = Field(
|
||||
default=None,
|
||||
foreign_key="shipment.id",
|
||||
foreign_key='shipment.id',
|
||||
nullable=True,
|
||||
ondelete="CASCADE"
|
||||
ondelete='CASCADE'
|
||||
)
|
||||
quantity: float
|
||||
|
||||
|
||||
class ContractProduct(ContractProductBase, table=True):
|
||||
id: int | None = Field(default=None, primary_key=True)
|
||||
contract_id: int = Field(
|
||||
foreign_key="contract.id",
|
||||
foreign_key='contract.id',
|
||||
nullable=False,
|
||||
ondelete="CASCADE"
|
||||
ondelete='CASCADE'
|
||||
)
|
||||
contract: Optional["Contract"] = Relationship(back_populates="products")
|
||||
product: Optional["Product"] = Relationship()
|
||||
shipment: Optional["Shipment"] = Relationship()
|
||||
contract: Optional['Contract'] = Relationship(back_populates='products')
|
||||
product: Optional['Product'] = Relationship()
|
||||
shipment: Optional['Shipment'] = Relationship()
|
||||
|
||||
|
||||
class ContractProductPublic(ContractProductBase):
|
||||
id: int
|
||||
quantity: float
|
||||
contract: Contract
|
||||
product: Product
|
||||
shipment: Optional["Shipment"]
|
||||
shipment: Optional['Shipment']
|
||||
|
||||
|
||||
class ContractProductCreate(ContractProductBase):
|
||||
pass
|
||||
|
||||
|
||||
class ContractProductUpdate(ContractProductBase):
|
||||
pass
|
||||
|
||||
|
||||
class ShipmentBase(SQLModel):
|
||||
name: str
|
||||
date: datetime.date
|
||||
form_id: int | None = Field(default=None, foreign_key="form.id", ondelete="CASCADE")
|
||||
form_id: int | None = Field(
|
||||
default=None,
|
||||
foreign_key='form.id',
|
||||
ondelete='CASCADE')
|
||||
|
||||
|
||||
class ShipmentPublic(ShipmentBase):
|
||||
id: int
|
||||
products: list[Product] = []
|
||||
products: list[Product] = Field(default_factory=list)
|
||||
form: Form | None
|
||||
|
||||
|
||||
class Shipment(ShipmentBase, table=True):
|
||||
id: int | None = Field(default=None, primary_key=True)
|
||||
products: list[Product] = Relationship(
|
||||
back_populates="shipments",
|
||||
back_populates='shipments',
|
||||
link_model=ShipmentProductLink,
|
||||
sa_relationship_kwargs={
|
||||
"order_by": "Product.name"
|
||||
'order_by': 'Product.name'
|
||||
},
|
||||
)
|
||||
form: Optional[Form] = Relationship(back_populates="shipments")
|
||||
form: Optional[Form] = Relationship(back_populates='shipments')
|
||||
|
||||
|
||||
class ShipmentUpdate(SQLModel):
|
||||
name: str | None
|
||||
date: datetime.date | None
|
||||
product_ids: list[int] | None = []
|
||||
product_ids: list[int] | None = Field(default_factory=list)
|
||||
|
||||
|
||||
class ShipmentCreate(ShipmentBase):
|
||||
product_ids: list[int] = []
|
||||
product_ids: list[int] = Field(default_factory=list)
|
||||
form_id: int
|
||||
@@ -1,10 +1,16 @@
|
||||
import logging
|
||||
|
||||
|
||||
class ProductorServiceError(Exception):
|
||||
def __init__(self, message: str):
|
||||
super().__init__(message)
|
||||
logging.error('ProductorService : %s', message)
|
||||
|
||||
|
||||
class ProductorNotFoundError(ProductorServiceError):
|
||||
pass
|
||||
|
||||
|
||||
class ProductorCreateError(ProductorServiceError):
|
||||
def __init__(self, message: str, field: str | None = None):
|
||||
super().__init__(message)
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
from fastapi import APIRouter, HTTPException, Depends, Query
|
||||
import src.messages as messages
|
||||
import src.models as models
|
||||
from src.database import get_session
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
||||
from sqlmodel import Session
|
||||
import src.productors.service as service
|
||||
import src.productors.exceptions as exceptions
|
||||
from src import messages, models
|
||||
from src.auth.auth import get_current_user
|
||||
from src.database import get_session
|
||||
from src.productors import exceptions, service
|
||||
|
||||
router = APIRouter(prefix='/productors')
|
||||
|
||||
|
||||
@router.get('', response_model=list[models.ProductorPublic])
|
||||
def get_productors(
|
||||
names: list[str] = Query([]),
|
||||
@@ -18,49 +17,76 @@ def get_productors(
|
||||
):
|
||||
return service.get_all(session, user, names, types)
|
||||
|
||||
@router.get('/{id}', response_model=models.ProductorPublic)
|
||||
|
||||
@router.get('/{_id}', response_model=models.ProductorPublic)
|
||||
def get_productor(
|
||||
id: int,
|
||||
_id: int,
|
||||
user: models.User = Depends(get_current_user),
|
||||
session: Session = Depends(get_session)
|
||||
):
|
||||
result = service.get_one(session, id)
|
||||
if not service.is_allowed(session, user, _id=_id):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('productor', 'get')
|
||||
)
|
||||
result = service.get_one(session, _id)
|
||||
if result is None:
|
||||
raise HTTPException(status_code=404, detail=messages.Messages.not_found('productor'))
|
||||
raise HTTPException(
|
||||
status_code=404,
|
||||
detail=messages.Messages.not_found('productor')
|
||||
)
|
||||
return result
|
||||
|
||||
|
||||
@router.post('', response_model=models.ProductorPublic)
|
||||
def create_productor(
|
||||
productor: models.ProductorCreate,
|
||||
user: models.User = Depends(get_current_user),
|
||||
session: Session = Depends(get_session)
|
||||
):
|
||||
if not service.is_allowed(session, user, productor=productor):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('productor', 'create')
|
||||
)
|
||||
try:
|
||||
result = service.create_one(session, productor)
|
||||
except exceptions.ProductorCreateError as error:
|
||||
raise HTTPException(status_code=400, detail=str(error))
|
||||
raise HTTPException(status_code=400, detail=str(error)) from error
|
||||
return result
|
||||
|
||||
@router.put('/{id}', response_model=models.ProductorPublic)
|
||||
|
||||
@router.put('/{_id}', response_model=models.ProductorPublic)
|
||||
def update_productor(
|
||||
id: int, productor: models.ProductorUpdate,
|
||||
_id: int, productor: models.ProductorUpdate,
|
||||
user: models.User = Depends(get_current_user),
|
||||
session: Session = Depends(get_session)
|
||||
):
|
||||
if not service.is_allowed(session, user, _id=_id):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('productor', 'update')
|
||||
)
|
||||
try:
|
||||
result = service.update_one(session, id, productor)
|
||||
result = service.update_one(session, _id, productor)
|
||||
except exceptions.ProductorNotFoundError as error:
|
||||
raise HTTPException(status_code=404, detail=str(error))
|
||||
raise HTTPException(status_code=404, detail=str(error)) from error
|
||||
return result
|
||||
|
||||
@router.delete('/{id}', response_model=models.ProductorPublic)
|
||||
|
||||
@router.delete('/{_id}', response_model=models.ProductorPublic)
|
||||
def delete_productor(
|
||||
id: int,
|
||||
_id: int,
|
||||
user: models.User = Depends(get_current_user),
|
||||
session: Session = Depends(get_session)
|
||||
):
|
||||
if not service.is_allowed(session, user, _id=_id):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('productor', 'delete')
|
||||
)
|
||||
try:
|
||||
result = service.delete_one(session, id)
|
||||
result = service.delete_one(session, _id)
|
||||
except exceptions.ProductorNotFoundError as error:
|
||||
raise HTTPException(status_code=404, detail=str(error))
|
||||
raise HTTPException(status_code=404, detail=str(error)) from error
|
||||
return result
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from sqlmodel import Session, select
|
||||
import src.models as models
|
||||
import src.productors.exceptions as exceptions
|
||||
import src.messages as messages
|
||||
from src import messages, models
|
||||
from src.productors import exceptions
|
||||
|
||||
|
||||
def get_all(
|
||||
session: Session,
|
||||
@@ -18,13 +18,20 @@ def get_all(
|
||||
statement = statement.where(models.Productor.type.in_(types))
|
||||
return session.exec(statement.order_by(models.Productor.name)).all()
|
||||
|
||||
|
||||
def get_one(session: Session, productor_id: int) -> models.ProductorPublic:
|
||||
return session.get(models.Productor, productor_id)
|
||||
|
||||
def create_one(session: Session, productor: models.ProductorCreate) -> models.ProductorPublic:
|
||||
|
||||
def create_one(
|
||||
session: Session,
|
||||
productor: models.ProductorCreate) -> models.ProductorPublic:
|
||||
if not productor:
|
||||
raise exceptions.ProductorCreateError(messages.Messages.invalid_input('productor', 'input cannot be None'))
|
||||
productor_create = productor.model_dump(exclude_unset=True, exclude='payment_methods')
|
||||
raise exceptions.ProductorCreateError(
|
||||
messages.Messages.invalid_input(
|
||||
'productor', 'input cannot be None'))
|
||||
productor_create = productor.model_dump(
|
||||
exclude_unset=True, exclude='payment_methods')
|
||||
new_productor = models.Productor(**productor_create)
|
||||
|
||||
new_productor.payment_methods = [
|
||||
@@ -39,12 +46,18 @@ def create_one(session: Session, productor: models.ProductorCreate) -> models.Pr
|
||||
session.refresh(new_productor)
|
||||
return new_productor
|
||||
|
||||
def update_one(session: Session, id: int, productor: models.ProductorUpdate) -> models.ProductorPublic:
|
||||
statement = select(models.Productor).where(models.Productor.id == id)
|
||||
|
||||
def update_one(
|
||||
session: Session,
|
||||
_id: int,
|
||||
productor: models.ProductorUpdate
|
||||
) -> models.ProductorPublic:
|
||||
statement = select(models.Productor).where(models.Productor.id == _id)
|
||||
result = session.exec(statement)
|
||||
new_productor = result.first()
|
||||
if not new_productor:
|
||||
raise exceptions.ProductorNotFoundError(messages.Messages.not_found('productor'))
|
||||
raise exceptions.ProductorNotFoundError(
|
||||
messages.Messages.not_found('productor'))
|
||||
|
||||
productor_updates = productor.model_dump(exclude_unset=True)
|
||||
if 'payment_methods' in productor_updates:
|
||||
@@ -67,13 +80,33 @@ def update_one(session: Session, id: int, productor: models.ProductorUpdate) ->
|
||||
session.refresh(new_productor)
|
||||
return new_productor
|
||||
|
||||
def delete_one(session: Session, id: int) -> models.ProductorPublic:
|
||||
statement = select(models.Productor).where(models.Productor.id == id)
|
||||
|
||||
def delete_one(session: Session, _id: int) -> models.ProductorPublic:
|
||||
statement = select(models.Productor).where(models.Productor.id == _id)
|
||||
result = session.exec(statement)
|
||||
productor = result.first()
|
||||
if not productor:
|
||||
raise exceptions.ProductorNotFoundError(messages.Messages.not_found('productor'))
|
||||
raise exceptions.ProductorNotFoundError(
|
||||
messages.Messages.not_found('productor'))
|
||||
result = models.ProductorPublic.model_validate(productor)
|
||||
session.delete(productor)
|
||||
session.commit()
|
||||
return result
|
||||
|
||||
def is_allowed(
|
||||
session: Session,
|
||||
user: models.User,
|
||||
_id: int = None,
|
||||
productor: models.ProductorCreate = None
|
||||
) -> bool:
|
||||
if not _id and not productor:
|
||||
return False
|
||||
if not _id:
|
||||
return productor.type in [r.name for r in user.roles]
|
||||
statement = (
|
||||
select(models.Productor)
|
||||
.where(models.Productor.id == _id)
|
||||
.where(models.Productor.type.in_([r.name for r in user.roles]))
|
||||
.distinct()
|
||||
)
|
||||
return len(session.exec(statement).all()) > 0
|
||||
|
||||
@@ -2,12 +2,15 @@ class ProductServiceError(Exception):
|
||||
def __init__(self, message: str):
|
||||
super().__init__(message)
|
||||
|
||||
|
||||
class ProductorNotFoundError(ProductServiceError):
|
||||
pass
|
||||
|
||||
|
||||
class ProductNotFoundError(ProductServiceError):
|
||||
pass
|
||||
|
||||
|
||||
class ProductCreateError(ProductServiceError):
|
||||
def __init__(self, message: str, field: str | None = None):
|
||||
super().__init__(message)
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
from fastapi import APIRouter, HTTPException, Depends, Query
|
||||
import src.messages as messages
|
||||
import src.models as models
|
||||
from src.database import get_session
|
||||
from sqlmodel import Session
|
||||
import src.products.service as service
|
||||
import src.products.exceptions as exceptions
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
||||
from sqlmodel import Session
|
||||
from src import messages, models
|
||||
from src.auth.auth import get_current_user
|
||||
from src.database import get_session
|
||||
from src.products import exceptions
|
||||
|
||||
router = APIRouter(prefix='/products')
|
||||
|
||||
|
||||
@router.get('', response_model=list[models.ProductPublic], )
|
||||
def get_products(
|
||||
user: models.User = Depends(get_current_user),
|
||||
@@ -25,53 +25,93 @@ def get_products(
|
||||
types,
|
||||
)
|
||||
|
||||
@router.get('/{id}', response_model=models.ProductPublic)
|
||||
|
||||
@router.get('/{_id}', response_model=models.ProductPublic)
|
||||
def get_product(
|
||||
id: int,
|
||||
_id: int,
|
||||
user: models.User = Depends(get_current_user),
|
||||
session: Session = Depends(get_session)
|
||||
):
|
||||
result = service.get_one(session, id)
|
||||
if not service.is_allowed(session, user, _id=_id):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('product', 'create')
|
||||
)
|
||||
result = service.get_one(session, _id)
|
||||
if result is None:
|
||||
raise HTTPException(status_code=404, detail=messages.Messages.not_found('product'))
|
||||
raise HTTPException(status_code=404,
|
||||
detail=messages.Messages.not_found('product'))
|
||||
return result
|
||||
|
||||
|
||||
@router.post('', response_model=models.ProductPublic)
|
||||
def create_product(
|
||||
product: models.ProductCreate,
|
||||
user: models.User = Depends(get_current_user),
|
||||
session: Session = Depends(get_session)
|
||||
):
|
||||
if not service.is_allowed(session, user, product=product):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('product', 'create')
|
||||
)
|
||||
try:
|
||||
result = service.create_one(session, product)
|
||||
except exceptions.ProductCreateError as error:
|
||||
raise HTTPException(status_code=400, detail=str(error))
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
detail=str(error)
|
||||
) from error
|
||||
except exceptions.ProductorNotFoundError as error:
|
||||
raise HTTPException(status_code=404, detail=str(error))
|
||||
raise HTTPException(
|
||||
status_code=404,
|
||||
detail=str(error)
|
||||
) from error
|
||||
return result
|
||||
|
||||
@router.put('/{id}', response_model=models.ProductPublic)
|
||||
|
||||
@router.put('/{_id}', response_model=models.ProductPublic)
|
||||
def update_product(
|
||||
id: int, product: models.ProductUpdate,
|
||||
_id: int, product: models.ProductUpdate,
|
||||
user: models.User = Depends(get_current_user),
|
||||
session: Session = Depends(get_session)
|
||||
):
|
||||
if not service.is_allowed(session, user, _id=_id):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('product', 'update')
|
||||
)
|
||||
try:
|
||||
result = service.update_one(session, id, product)
|
||||
result = service.update_one(session, _id, product)
|
||||
except exceptions.ProductNotFoundError as error:
|
||||
raise HTTPException(status_code=404, detail=str(error))
|
||||
raise HTTPException(
|
||||
status_code=404,
|
||||
detail=str(error)
|
||||
) from error
|
||||
except exceptions.ProductorNotFoundError as error:
|
||||
raise HTTPException(status_code=404, detail=str(error))
|
||||
raise HTTPException(
|
||||
status_code=404,
|
||||
detail=str(error)
|
||||
) from error
|
||||
return result
|
||||
|
||||
@router.delete('/{id}', response_model=models.ProductPublic)
|
||||
|
||||
@router.delete('/{_id}', response_model=models.ProductPublic)
|
||||
def delete_product(
|
||||
id: int,
|
||||
_id: int,
|
||||
user: models.User = Depends(get_current_user),
|
||||
session: Session = Depends(get_session)
|
||||
):
|
||||
if not service.is_allowed(session, user, _id=_id):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('product', 'delete')
|
||||
)
|
||||
try:
|
||||
result = service.delete_one(session, id)
|
||||
result = service.delete_one(session, _id)
|
||||
except exceptions.ProductNotFoundError as error:
|
||||
raise HTTPException(status_code=404, detail=str(error))
|
||||
raise HTTPException(
|
||||
status_code=404,
|
||||
detail=str(error)
|
||||
) from error
|
||||
return result
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from sqlmodel import Session, select
|
||||
import src.models as models
|
||||
import src.products.exceptions as exceptions
|
||||
import src.messages as messages
|
||||
from src import messages, models
|
||||
from src.products import exceptions
|
||||
|
||||
|
||||
def get_all(
|
||||
session: Session,
|
||||
@@ -10,10 +10,13 @@ def get_all(
|
||||
productors: list[str],
|
||||
types: list[str],
|
||||
) -> list[models.ProductPublic]:
|
||||
statement = select(models.Product)\
|
||||
.join(models.Productor, models.Product.productor_id == models.Productor.id)\
|
||||
.where(models.Productor.type.in_([r.name for r in user.roles]))\
|
||||
.distinct()
|
||||
statement = select(
|
||||
models.Product) .join(
|
||||
models.Productor,
|
||||
models.Product.productor_id == models.Productor.id) .where(
|
||||
models.Productor.type.in_(
|
||||
[
|
||||
r.name for r in user.roles])) .distinct()
|
||||
if len(names) > 0:
|
||||
statement = statement.where(models.Product.name.in_(names))
|
||||
if len(productors) > 0:
|
||||
@@ -22,14 +25,25 @@ def get_all(
|
||||
statement = statement.where(models.Product.type.in_(types))
|
||||
return session.exec(statement.order_by(models.Product.name)).all()
|
||||
|
||||
def get_one(session: Session, product_id: int) -> models.ProductPublic:
|
||||
|
||||
def get_one(
|
||||
session: Session,
|
||||
product_id: int,
|
||||
) -> models.ProductPublic:
|
||||
return session.get(models.Product, product_id)
|
||||
|
||||
def create_one(session: Session, product: models.ProductCreate) -> models.ProductPublic:
|
||||
|
||||
def create_one(
|
||||
session: Session,
|
||||
product: models.ProductCreate,
|
||||
) -> models.ProductPublic:
|
||||
if not product:
|
||||
raise exceptions.ProductCreateError(messages.Messages.invalid_input('product', 'input cannot be None'))
|
||||
raise exceptions.ProductCreateError(
|
||||
messages.Messages.invalid_input(
|
||||
'product', 'input cannot be None'))
|
||||
if not session.get(models.Productor, product.productor_id):
|
||||
raise exceptions.ProductorNotFoundError(messages.Messages.not_found('productor'))
|
||||
raise exceptions.ProductorNotFoundError(
|
||||
messages.Messages.not_found('productor'))
|
||||
product_create = product.model_dump(exclude_unset=True)
|
||||
new_product = models.Product(**product_create)
|
||||
session.add(new_product)
|
||||
@@ -37,14 +51,22 @@ def create_one(session: Session, product: models.ProductCreate) -> models.Produc
|
||||
session.refresh(new_product)
|
||||
return new_product
|
||||
|
||||
def update_one(session: Session, id: int, product: models.ProductUpdate) -> models.ProductPublic:
|
||||
statement = select(models.Product).where(models.Product.id == id)
|
||||
|
||||
def update_one(
|
||||
session: Session,
|
||||
_id: int,
|
||||
product: models.ProductUpdate
|
||||
) -> models.ProductPublic:
|
||||
statement = select(models.Product).where(models.Product.id == _id)
|
||||
result = session.exec(statement)
|
||||
new_product = result.first()
|
||||
if not new_product:
|
||||
raise exceptions.ProductNotFoundError(messages.Messages.not_found('product'))
|
||||
if product.productor_id and not session.get(models.Productor, product.productor_id):
|
||||
raise exceptions.ProductorNotFoundError(messages.Messages.not_found('productor'))
|
||||
raise exceptions.ProductNotFoundError(
|
||||
messages.Messages.not_found('product'))
|
||||
if product.productor_id and not session.get(
|
||||
models.Productor, product.productor_id):
|
||||
raise exceptions.ProductorNotFoundError(
|
||||
messages.Messages.not_found('productor'))
|
||||
|
||||
product_updates = product.model_dump(exclude_unset=True)
|
||||
for key, value in product_updates.items():
|
||||
@@ -55,13 +77,49 @@ def update_one(session: Session, id: int, product: models.ProductUpdate) -> mode
|
||||
session.refresh(new_product)
|
||||
return new_product
|
||||
|
||||
def delete_one(session: Session, id: int) -> models.ProductPublic:
|
||||
statement = select(models.Product).where(models.Product.id == id)
|
||||
|
||||
def delete_one(
|
||||
session: Session,
|
||||
_id: int
|
||||
) -> models.ProductPublic:
|
||||
statement = select(models.Product).where(models.Product.id == _id)
|
||||
result = session.exec(statement)
|
||||
product = result.first()
|
||||
if not product:
|
||||
raise exceptions.ProductNotFoundError(messages.Messages.not_found('product'))
|
||||
raise exceptions.ProductNotFoundError(
|
||||
messages.Messages.not_found('product'))
|
||||
result = models.ProductPublic.model_validate(product)
|
||||
session.delete(product)
|
||||
session.commit()
|
||||
return result
|
||||
|
||||
def is_allowed(
|
||||
session: Session,
|
||||
user: models.User,
|
||||
_id: int = None,
|
||||
product: models.ProductCreate = None,
|
||||
) -> bool:
|
||||
if not _id and not product:
|
||||
return False
|
||||
if not _id:
|
||||
statement = (
|
||||
select(models.Product)
|
||||
.join(
|
||||
models.Productor,
|
||||
models.Product.productor_id == models.Productor.id
|
||||
)
|
||||
.where(models.Product.id == product.productor_id)
|
||||
)
|
||||
productor = session.exec(statement).first()
|
||||
return productor.type in [r.name for r in user.roles]
|
||||
statement = (
|
||||
select(models.Product)
|
||||
.join(
|
||||
models.Productor,
|
||||
models.Product.productor_id == models.Productor.id
|
||||
)
|
||||
.where(models.Product.id == _id)
|
||||
.where(models.Productor.type.in_([r.name for r in user.roles]))
|
||||
.distinct()
|
||||
)
|
||||
return len(session.exec(statement).all()) > 0
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
from pydantic_settings import BaseSettings, SettingsConfigDict
|
||||
|
||||
|
||||
class Settings(BaseSettings):
|
||||
origins: str
|
||||
db_host: str
|
||||
@@ -20,10 +21,21 @@ class Settings(BaseSettings):
|
||||
env_file='../.env'
|
||||
)
|
||||
|
||||
|
||||
settings = Settings()
|
||||
|
||||
AUTH_URL = f"{settings.keycloak_server}/realms/{settings.keycloak_realm}/protocol/openid-connect/auth"
|
||||
TOKEN_URL = f"{settings.keycloak_server}/realms/{settings.keycloak_realm}/protocol/openid-connect/token"
|
||||
ISSUER = f"{settings.keycloak_server}/realms/{settings.keycloak_realm}"
|
||||
JWKS_URL = f"{ISSUER}/protocol/openid-connect/certs"
|
||||
LOGOUT_URL = f'{settings.keycloak_server}/realms/{settings.keycloak_realm}/protocol/openid-connect/logout'
|
||||
AUTH_URL = (
|
||||
f'{settings.keycloak_server}/realms/'
|
||||
f'{settings.keycloak_realm}/protocol/openid-connect/auth'
|
||||
)
|
||||
TOKEN_URL = (
|
||||
f'{settings.keycloak_server}/realms/'
|
||||
f'{settings.keycloak_realm}/protocol/openid-connect/token'
|
||||
)
|
||||
|
||||
ISSUER = f'{settings.keycloak_server}/realms/{settings.keycloak_realm}'
|
||||
JWKS_URL = f'{ISSUER}/protocol/openid-connect/certs'
|
||||
LOGOUT_URL = (
|
||||
f'{settings.keycloak_server}/realms/'
|
||||
f'{settings.keycloak_realm}/protocol/openid-connect/logout'
|
||||
)
|
||||
|
||||
@@ -1,10 +1,16 @@
|
||||
import logging
|
||||
|
||||
|
||||
class ShipmentServiceError(Exception):
|
||||
def __init__(self, message: str):
|
||||
super().__init__(message)
|
||||
logging.error('ShipmentService : %s', message)
|
||||
|
||||
|
||||
class ShipmentNotFoundError(ShipmentServiceError):
|
||||
pass
|
||||
|
||||
|
||||
class ShipmentCreateError(ShipmentServiceError):
|
||||
def __init__(self, message: str, field: str | None = None):
|
||||
super().__init__(message)
|
||||
|
||||
@@ -1,58 +1,110 @@
|
||||
from sqlmodel import Session, select
|
||||
import src.models as models
|
||||
import src.shipments.exceptions as exceptions
|
||||
import src.messages as messages
|
||||
# pylint: disable=E1101
|
||||
import datetime
|
||||
|
||||
import src.shipments.exceptions as exceptions
|
||||
from sqlmodel import Session, select
|
||||
from src import messages, models
|
||||
|
||||
|
||||
def get_all(
|
||||
session: Session,
|
||||
user: models.User,
|
||||
names: list[str],
|
||||
dates: list[str],
|
||||
forms: list[str]
|
||||
names: list[str] = None,
|
||||
dates: list[str] = None,
|
||||
forms: list[str] = None
|
||||
) -> list[models.ShipmentPublic]:
|
||||
statement = select(models.Shipment)\
|
||||
.join(models.Form, models.Shipment.form_id == models.Form.id)\
|
||||
.join(models.Productor, models.Form.productor_id == models.Productor.id)\
|
||||
.where(models.Productor.type.in_([r.name for r in user.roles]))\
|
||||
statement = (
|
||||
select(models.Shipment)
|
||||
.join(
|
||||
models.Form,
|
||||
models.Shipment.form_id == models.Form.id)
|
||||
.join(
|
||||
models.Productor,
|
||||
models.Form.productor_id == models.Productor.id)
|
||||
.where(
|
||||
models.Productor.type.in_(
|
||||
[r.name for r in user.roles]
|
||||
)
|
||||
)
|
||||
.distinct()
|
||||
if len(names) > 0:
|
||||
)
|
||||
if names and len(names) > 0:
|
||||
statement = statement.where(models.Shipment.name.in_(names))
|
||||
if len(dates) > 0:
|
||||
statement = statement.where(models.Shipment.date.in_(list(map(lambda x: datetime.datetime.strptime(x, '%Y-%m-%d').date(), dates))))
|
||||
if len(forms) > 0:
|
||||
if dates and len(dates) > 0:
|
||||
statement = statement.where(
|
||||
models.Shipment.date.in_(
|
||||
list(map(
|
||||
lambda x: datetime.datetime.strptime(
|
||||
x, '%Y-%m-%d').date(),
|
||||
dates
|
||||
))
|
||||
)
|
||||
)
|
||||
if forms and len(forms) > 0:
|
||||
statement = statement.where(models.Form.name.in_(forms))
|
||||
return session.exec(statement.order_by(models.Shipment.name)).all()
|
||||
|
||||
|
||||
def get_one(session: Session, shipment_id: int) -> models.ShipmentPublic:
|
||||
return session.get(models.Shipment, shipment_id)
|
||||
|
||||
def create_one(session: Session, shipment: models.ShipmentCreate) -> models.ShipmentPublic:
|
||||
|
||||
def create_one(
|
||||
session: Session,
|
||||
shipment: models.ShipmentCreate) -> models.ShipmentPublic:
|
||||
if shipment is None:
|
||||
raise exceptions.ShipmentCreateError(messages.Messages.invalid_input('shipment', 'input cannot be None'))
|
||||
products = session.exec(select(models.Product).where(models.Product.id.in_(shipment.product_ids))).all()
|
||||
shipment_create = shipment.model_dump(exclude_unset=True, exclude={'product_ids'})
|
||||
raise exceptions.ShipmentCreateError(
|
||||
messages.Messages.invalid_input(
|
||||
'shipment', 'input cannot be None'))
|
||||
products = session.exec(
|
||||
select(models.Product)
|
||||
.where(
|
||||
models.Product.id.in_(
|
||||
shipment.product_ids
|
||||
)
|
||||
)
|
||||
).all()
|
||||
shipment_create = shipment.model_dump(
|
||||
exclude_unset=True, exclude={'product_ids'}
|
||||
)
|
||||
new_shipment = models.Shipment(**shipment_create, products=products)
|
||||
session.add(new_shipment)
|
||||
session.commit()
|
||||
session.refresh(new_shipment)
|
||||
return new_shipment
|
||||
|
||||
def update_one(session: Session, id: int, shipment: models.ShipmentUpdate) -> models.ShipmentPublic:
|
||||
|
||||
def update_one(
|
||||
session: Session,
|
||||
_id: int,
|
||||
shipment: models.ShipmentUpdate) -> models.ShipmentPublic:
|
||||
if shipment is None:
|
||||
raise exceptions.ShipmentCreateError(messages.Messages.invalid_input('shipment', 'input cannot be None'))
|
||||
statement = select(models.Shipment).where(models.Shipment.id == id)
|
||||
raise exceptions.ShipmentCreateError(
|
||||
messages.Messages.invalid_input(
|
||||
'shipment', 'input cannot be None'))
|
||||
statement = select(models.Shipment).where(models.Shipment.id == _id)
|
||||
result = session.exec(statement)
|
||||
new_shipment = result.first()
|
||||
if not new_shipment:
|
||||
raise exceptions.ShipmentNotFoundError(messages.Messages.not_found('shipment'))
|
||||
raise exceptions.ShipmentNotFoundError(
|
||||
messages.Messages.not_found('shipment'))
|
||||
|
||||
products_to_add = session.exec(select(models.Product).where(models.Product.id.in_(shipment.product_ids))).all()
|
||||
products_to_add = session.exec(
|
||||
select(
|
||||
models.Product
|
||||
).where(
|
||||
models.Product.id.in_(
|
||||
shipment.product_ids
|
||||
)
|
||||
)
|
||||
).all()
|
||||
new_shipment.products.clear()
|
||||
for add in products_to_add:
|
||||
new_shipment.products.append(add)
|
||||
|
||||
shipment_updates = shipment.model_dump(exclude_unset=True, exclude={"product_ids"})
|
||||
shipment_updates = shipment.model_dump(
|
||||
exclude_unset=True, exclude={"product_ids"}
|
||||
)
|
||||
for key, value in shipment_updates.items():
|
||||
setattr(new_shipment, key, value)
|
||||
|
||||
@@ -61,14 +113,53 @@ def update_one(session: Session, id: int, shipment: models.ShipmentUpdate) -> mo
|
||||
session.refresh(new_shipment)
|
||||
return new_shipment
|
||||
|
||||
def delete_one(session: Session, id: int) -> models.ShipmentPublic:
|
||||
statement = select(models.Shipment).where(models.Shipment.id == id)
|
||||
|
||||
def delete_one(session: Session, _id: int) -> models.ShipmentPublic:
|
||||
statement = select(models.Shipment).where(models.Shipment.id == _id)
|
||||
result = session.exec(statement)
|
||||
shipment = result.first()
|
||||
if not shipment:
|
||||
raise exceptions.ShipmentNotFoundError(messages.Messages.not_found('shipment'))
|
||||
raise exceptions.ShipmentNotFoundError(
|
||||
messages.Messages.not_found('shipment'))
|
||||
|
||||
result = models.ShipmentPublic.model_validate(shipment)
|
||||
session.delete(shipment)
|
||||
session.commit()
|
||||
return result
|
||||
|
||||
|
||||
def is_allowed(
|
||||
session: Session,
|
||||
user: models.User,
|
||||
_id: int = None,
|
||||
shipment: models.ShipmentCreate = None,
|
||||
):
|
||||
if not _id and not shipment:
|
||||
return False
|
||||
if not _id:
|
||||
statement = (
|
||||
select(models.Shipment)
|
||||
.join(
|
||||
models.Form,
|
||||
models.Shipment.form_id == models.Form.id
|
||||
)
|
||||
.where(models.Form.id == shipment.form_id)
|
||||
)
|
||||
form = session.exec(statement).first()
|
||||
return form.productor.type in [r.name for r in user.roles]
|
||||
statement = (
|
||||
select(models.Shipment)
|
||||
.join(
|
||||
models.Form,
|
||||
models.Shipment.form_id == models.Form.id
|
||||
)
|
||||
.join(
|
||||
models.Productor,
|
||||
models.Form.productor_id == models.Productor.id
|
||||
)
|
||||
.where(models.Shipment.id == _id)
|
||||
.where(models.Productor.type.in_([r.name for r in user.roles]))
|
||||
.distinct()
|
||||
)
|
||||
return len(session.exec(statement).all()) > 0
|
||||
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
from fastapi import APIRouter, HTTPException, Depends, Query
|
||||
import src.messages as messages
|
||||
import src.models as models
|
||||
from src.database import get_session
|
||||
from sqlmodel import Session
|
||||
import src.shipments.service as service
|
||||
import src.shipments.exceptions as exceptions
|
||||
import src.shipments.service as service
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
||||
from sqlmodel import Session
|
||||
from src import messages, models
|
||||
from src.auth.auth import get_current_user
|
||||
from src.database import get_session
|
||||
|
||||
router = APIRouter(prefix='/shipments')
|
||||
|
||||
|
||||
@router.get('', response_model=list[models.ShipmentPublic], )
|
||||
def get_shipments(
|
||||
session: Session = Depends(get_session),
|
||||
@@ -25,50 +25,78 @@ def get_shipments(
|
||||
forms,
|
||||
)
|
||||
|
||||
@router.get('/{id}', response_model=models.ShipmentPublic)
|
||||
|
||||
@router.get('/{_id}', response_model=models.ShipmentPublic)
|
||||
def get_shipment(
|
||||
id: int,
|
||||
_id: int,
|
||||
user: models.User = Depends(get_current_user),
|
||||
session: Session = Depends(get_session)
|
||||
):
|
||||
result = service.get_one(session, id)
|
||||
if not service.is_allowed(session, user, _id=_id):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('shipment', 'get')
|
||||
)
|
||||
result = service.get_one(session, _id)
|
||||
if result is None:
|
||||
raise HTTPException(status_code=404, detail=messages.Messages.not_found('shipment'))
|
||||
raise HTTPException(
|
||||
status_code=404,
|
||||
detail=messages.Messages.not_found('shipment')
|
||||
)
|
||||
return result
|
||||
|
||||
|
||||
@router.post('', response_model=models.ShipmentPublic)
|
||||
def create_shipment(
|
||||
shipment: models.ShipmentCreate,
|
||||
user: models.User = Depends(get_current_user),
|
||||
session: Session = Depends(get_session)
|
||||
):
|
||||
if not service.is_allowed(session, user, shipment=shipment):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('shipment', 'create')
|
||||
)
|
||||
try:
|
||||
result = service.create_one(session, shipment)
|
||||
except exceptions.ShipmentCreateError as error:
|
||||
raise HTTPException(status_code=400, detail=str(error))
|
||||
raise HTTPException(status_code=400, detail=str(error)) from error
|
||||
return result
|
||||
|
||||
@router.put('/{id}', response_model=models.ShipmentPublic)
|
||||
|
||||
@router.put('/{_id}', response_model=models.ShipmentPublic)
|
||||
def update_shipment(
|
||||
id: int,
|
||||
_id: int,
|
||||
shipment: models.ShipmentUpdate,
|
||||
user: models.User = Depends(get_current_user),
|
||||
session: Session = Depends(get_session)
|
||||
):
|
||||
if not service.is_allowed(session, user, _id=_id):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('shipment', 'update')
|
||||
)
|
||||
try:
|
||||
result = service.update_one(session, id, shipment)
|
||||
result = service.update_one(session, _id, shipment)
|
||||
except exceptions.ShipmentNotFoundError as error:
|
||||
raise HTTPException(status_code=404, detail=str(error))
|
||||
raise HTTPException(status_code=404, detail=str(error)) from error
|
||||
return result
|
||||
|
||||
@router.delete('/{id}', response_model=models.ShipmentPublic)
|
||||
|
||||
@router.delete('/{_id}', response_model=models.ShipmentPublic)
|
||||
def delete_shipment(
|
||||
id: int,
|
||||
_id: int,
|
||||
user: models.User = Depends(get_current_user),
|
||||
session: Session = Depends(get_session)
|
||||
):
|
||||
if not service.is_allowed(session, user, _id=_id):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('shipment', 'delete')
|
||||
)
|
||||
|
||||
try:
|
||||
result = service.delete_one(session, id)
|
||||
result = service.delete_one(session, _id)
|
||||
except exceptions.ShipmentNotFoundError as error:
|
||||
raise HTTPException(status_code=404, detail=str(error))
|
||||
raise HTTPException(status_code=404, detail=str(error)) from error
|
||||
return result
|
||||
|
||||
@@ -1,14 +1,19 @@
|
||||
from sqlmodel import Session, select
|
||||
import src.models as models
|
||||
from src import models
|
||||
|
||||
|
||||
def get_all(session: Session) -> list[models.TemplatePublic]:
|
||||
statement = select(models.Template)
|
||||
return session.exec(statement.order_by(models.Template.name)).all()
|
||||
|
||||
|
||||
def get_one(session: Session, template_id: int) -> models.TemplatePublic:
|
||||
return session.get(models.Template, template_id)
|
||||
|
||||
def create_one(session: Session, template: models.TemplateCreate) -> models.TemplatePublic:
|
||||
|
||||
def create_one(
|
||||
session: Session,
|
||||
template: models.TemplateCreate) -> models.TemplatePublic:
|
||||
template_create = template.model_dump(exclude_unset=True)
|
||||
new_template = models.Template(**template_create)
|
||||
session.add(new_template)
|
||||
@@ -16,7 +21,11 @@ def create_one(session: Session, template: models.TemplateCreate) -> models.Temp
|
||||
session.refresh(new_template)
|
||||
return new_template
|
||||
|
||||
def update_one(session: Session, id: int, template: models.TemplateUpdate) -> models.TemplatePublic:
|
||||
|
||||
def update_one(
|
||||
session: Session,
|
||||
id: int,
|
||||
template: models.TemplateUpdate) -> models.TemplatePublic:
|
||||
statement = select(models.Template).where(models.Template.id == id)
|
||||
result = session.exec(statement)
|
||||
new_template = result.first()
|
||||
@@ -30,6 +39,7 @@ def update_one(session: Session, id: int, template: models.TemplateUpdate) -> mo
|
||||
session.refresh(new_template)
|
||||
return new_template
|
||||
|
||||
|
||||
def delete_one(session: Session, id: int) -> models.TemplatePublic:
|
||||
statement = select(models.Template).where(models.Template.id == id)
|
||||
result = session.exec(statement)
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
from fastapi import APIRouter, HTTPException, Depends
|
||||
import src.messages as messages
|
||||
import src.models as models
|
||||
from src.database import get_session
|
||||
from sqlmodel import Session
|
||||
import src.templates.service as service
|
||||
from fastapi import APIRouter, Depends, HTTPException
|
||||
from sqlmodel import Session
|
||||
from src import messages, models
|
||||
from src.auth.auth import get_current_user
|
||||
from src.database import get_session
|
||||
|
||||
router = APIRouter(prefix='/templates')
|
||||
|
||||
|
||||
@router.get('', response_model=list[models.TemplatePublic])
|
||||
def get_templates(
|
||||
user: models.User = Depends(get_current_user),
|
||||
@@ -15,6 +15,7 @@ def get_templates(
|
||||
):
|
||||
return service.get_all(session)
|
||||
|
||||
|
||||
@router.get('/{id}', response_model=models.TemplatePublic)
|
||||
def get_template(
|
||||
id: int,
|
||||
@@ -23,9 +24,11 @@ def get_template(
|
||||
):
|
||||
result = service.get_one(session, id)
|
||||
if result is None:
|
||||
raise HTTPException(status_code=404, detail=messages.Messages.not_found('template'))
|
||||
raise HTTPException(status_code=404,
|
||||
detail=messages.Messages.not_found('template'))
|
||||
return result
|
||||
|
||||
|
||||
@router.post('', response_model=models.TemplatePublic)
|
||||
def create_template(
|
||||
template: models.TemplateCreate,
|
||||
@@ -34,6 +37,7 @@ def create_template(
|
||||
):
|
||||
return service.create_one(session, template)
|
||||
|
||||
|
||||
@router.put('/{id}', response_model=models.TemplatePublic)
|
||||
def update_template(
|
||||
id: int, template: models.TemplateUpdate,
|
||||
@@ -42,9 +46,11 @@ def update_template(
|
||||
):
|
||||
result = service.update_one(session, id, template)
|
||||
if result is None:
|
||||
raise HTTPException(status_code=404, detail=messages.Messages.not_found('template'))
|
||||
raise HTTPException(status_code=404,
|
||||
detail=messages.Messages.not_found('template'))
|
||||
return result
|
||||
|
||||
|
||||
@router.delete('/{id}', response_model=models.TemplatePublic)
|
||||
def delete_template(
|
||||
id: int,
|
||||
@@ -53,5 +59,6 @@ def delete_template(
|
||||
):
|
||||
result = service.delete_one(session, id)
|
||||
if result is None:
|
||||
raise HTTPException(status_code=404, detail=messages.Messages.not_found('template'))
|
||||
raise HTTPException(status_code=404,
|
||||
detail=messages.Messages.not_found('template'))
|
||||
return result
|
||||
|
||||
@@ -1,10 +1,16 @@
|
||||
import logging
|
||||
|
||||
|
||||
class UserServiceError(Exception):
|
||||
def __init__(self, message: str):
|
||||
super().__init__(message)
|
||||
logging.error('UserService : %s', message)
|
||||
|
||||
|
||||
class UserNotFoundError(UserServiceError):
|
||||
pass
|
||||
|
||||
|
||||
class UserCreateError(UserServiceError):
|
||||
def __init__(self, message: str, field: str | None = None):
|
||||
super().__init__(message)
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
from sqlmodel import Session, select
|
||||
|
||||
import src.models as models
|
||||
import src.messages as messages
|
||||
|
||||
import src.users.exceptions as exceptions
|
||||
from sqlmodel import Session, select
|
||||
from src import messages, models
|
||||
|
||||
|
||||
def get_all(
|
||||
session: Session,
|
||||
@@ -17,11 +15,15 @@ def get_all(
|
||||
statement = statement.where(models.User.email.in_(emails))
|
||||
return session.exec(statement.order_by(models.User.name)).all()
|
||||
|
||||
|
||||
def get_one(session: Session, user_id: int) -> models.UserPublic:
|
||||
return session.get(models.User, user_id)
|
||||
|
||||
def get_or_create_roles(session: Session, role_names: list[str]) -> list[models.ContractType]:
|
||||
statement = select(models.ContractType).where(models.ContractType.name.in_(role_names))
|
||||
|
||||
def get_or_create_roles(session: Session,
|
||||
role_names: list[str]) -> list[models.ContractType]:
|
||||
statement = select(models.ContractType).where(
|
||||
models.ContractType.name.in_(role_names))
|
||||
existing = session.exec(statement).all()
|
||||
existing_roles = {role.name for role in existing}
|
||||
missing_role = set(role_names) - existing_roles
|
||||
@@ -37,24 +39,36 @@ def get_or_create_roles(session: Session, role_names: list[str]) -> list[models.
|
||||
session.refresh(role)
|
||||
return existing + new_roles
|
||||
|
||||
|
||||
def get_or_create_user(session: Session, user_create: models.UserCreate):
|
||||
statement = select(models.User).where(models.User.email == user_create.email)
|
||||
statement = select(
|
||||
models.User).where(
|
||||
models.User.email == user_create.email)
|
||||
user = session.exec(statement).first()
|
||||
if user:
|
||||
user_role_names = [r.name for r in user.roles]
|
||||
if user_role_names != user_create.role_names or user.name != user_create.name:
|
||||
if (user_role_names != user_create.role_names or
|
||||
user.name != user_create.name):
|
||||
user = update_one(session, user.id, user_create)
|
||||
return user
|
||||
user = create_one(session, user_create)
|
||||
return user
|
||||
|
||||
|
||||
def get_roles(session: Session):
|
||||
statement = select(models.ContractType)
|
||||
statement = (
|
||||
select(models.ContractType)
|
||||
)
|
||||
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'))
|
||||
raise exceptions.UserCreateError(
|
||||
messages.Messages.invalid_input(
|
||||
'user', 'input cannot be None'
|
||||
)
|
||||
)
|
||||
new_user = models.User(
|
||||
name=user.name,
|
||||
email=user.email
|
||||
@@ -68,14 +82,22 @@ def create_one(session: Session, user: models.UserCreate) -> models.UserPublic:
|
||||
session.refresh(new_user)
|
||||
return new_user
|
||||
|
||||
def update_one(session: Session, id: int, user: models.UserCreate) -> models.UserPublic:
|
||||
|
||||
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)
|
||||
raise exceptions.UserCreateError(
|
||||
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
|
||||
|
||||
@@ -86,13 +108,20 @@ def update_one(session: Session, id: int, user: models.UserCreate) -> models.Use
|
||||
session.refresh(new_user)
|
||||
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()
|
||||
return result
|
||||
|
||||
|
||||
def is_allowed(
|
||||
logged_user: models.User,
|
||||
):
|
||||
return len(logged_user.roles) >= 5
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
from fastapi import APIRouter, HTTPException, Depends, Query
|
||||
import src.messages as messages
|
||||
import src.models as models
|
||||
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
|
||||
import src.users.service as service
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
||||
from sqlmodel import Session
|
||||
from src import messages, models
|
||||
from src.auth.auth import get_current_user
|
||||
from src.database import get_session
|
||||
|
||||
router = APIRouter(prefix='/users')
|
||||
|
||||
|
||||
@router.get('', response_model=list[models.UserPublic])
|
||||
def get_users(
|
||||
session: Session = Depends(get_session),
|
||||
user: models.User = Depends(get_current_user),
|
||||
_: models.User = Depends(get_current_user),
|
||||
names: list[str] = Query([]),
|
||||
emails: list[str] = Query([]),
|
||||
):
|
||||
@@ -22,57 +22,99 @@ def get_users(
|
||||
emails,
|
||||
)
|
||||
|
||||
|
||||
@router.get('/roles', response_model=list[models.ContractType])
|
||||
def get_roles(
|
||||
user: models.User = Depends(get_current_user),
|
||||
session: Session = Depends(get_session)
|
||||
):
|
||||
if not service.is_allowed(user):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('roles', 'get all')
|
||||
)
|
||||
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)
|
||||
if not service.is_allowed(user):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('user', 'get')
|
||||
)
|
||||
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
|
||||
|
||||
|
||||
@router.post('', response_model=models.UserPublic)
|
||||
def create_user(
|
||||
user: models.UserCreate,
|
||||
logged_user: models.User = Depends(get_current_user),
|
||||
session: Session = Depends(get_session)
|
||||
):
|
||||
if not service.is_allowed(logged_user):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('user', 'create')
|
||||
)
|
||||
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)
|
||||
):
|
||||
if not service.is_allowed(logged_user):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('user', 'update')
|
||||
)
|
||||
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
|
||||
|
||||
@router.delete('/{id}', response_model=models.UserPublic)
|
||||
|
||||
@router.delete('/{_id}', response_model=models.UserPublic)
|
||||
def delete_user(
|
||||
id: int,
|
||||
_id: int,
|
||||
user: models.User = Depends(get_current_user),
|
||||
session: Session = Depends(get_session)
|
||||
):
|
||||
if not service.is_allowed(user):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('user', 'delete')
|
||||
)
|
||||
try:
|
||||
result = service.delete_one(session, id)
|
||||
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
|
||||
|
||||
BIN
backend/test.pdf
BIN
backend/test.pdf
Binary file not shown.
@@ -1,13 +1,14 @@
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlmodel import SQLModel, Session, create_engine
|
||||
from sqlalchemy.pool import StaticPool
|
||||
from sqlmodel import Session, SQLModel, create_engine
|
||||
from src import models
|
||||
from src.auth.auth import get_current_user
|
||||
from src.database import get_session
|
||||
from src.main import app
|
||||
|
||||
from .fixtures import *
|
||||
from src.main import app
|
||||
import src.models as models
|
||||
from src.database import get_session
|
||||
from src.auth.auth import get_current_user
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def mock_session(mocker):
|
||||
@@ -20,6 +21,7 @@ def mock_session(mocker):
|
||||
yield session
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def mock_user():
|
||||
user = models.User(id=1, name='test user', email='test@user.com')
|
||||
@@ -31,10 +33,12 @@ def mock_user():
|
||||
yield user
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def client():
|
||||
return TestClient(app)
|
||||
|
||||
|
||||
@pytest.fixture(name='session')
|
||||
def session_fixture():
|
||||
engine = create_engine(
|
||||
|
||||
3
backend/tests/factories/__init__.py
Normal file
3
backend/tests/factories/__init__.py
Normal file
@@ -0,0 +1,3 @@
|
||||
# SPDX-FileCopyrightText: 2026-present Julien Aldon <julien.aldon@wanadoo.fr>
|
||||
#
|
||||
# SPDX-License-Identifier: MIT
|
||||
@@ -1,10 +1,12 @@
|
||||
import src.models as models
|
||||
import tests.factories.contracts as contract_factory
|
||||
import tests.factories.products as product_factory
|
||||
from src import models
|
||||
|
||||
|
||||
def contract_product_factory(**kwargs):
|
||||
contract = contract_factory.contract_factory(id=1)
|
||||
product = product_factory.product_public_factory(id=1, type=models.ProductType.RECCURENT)
|
||||
product = product_factory.product_public_factory(
|
||||
id=1, type=models.ProductType.RECCURENT)
|
||||
data = dict(
|
||||
product_id=1,
|
||||
shipment_id=1,
|
||||
@@ -16,6 +18,7 @@ def contract_product_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.ContractProduct(**data)
|
||||
|
||||
|
||||
def contract_product_public_factory(**kwargs):
|
||||
contract = contract_factory.contract_factory(id=1)
|
||||
product = product_factory.product_public_factory(id=1)
|
||||
@@ -31,6 +34,7 @@ def contract_product_public_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.ContractProductPublic(**data)
|
||||
|
||||
|
||||
def contract_product_create_factory(**kwargs):
|
||||
data = dict(
|
||||
product_id=1,
|
||||
@@ -40,6 +44,7 @@ def contract_product_create_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.ContractProductCreate(**data)
|
||||
|
||||
|
||||
def contract_product_update_factory(**kwargs):
|
||||
data = dict(
|
||||
product_id=1,
|
||||
@@ -49,6 +54,7 @@ def contract_product_update_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.ContractProductUpdate(**data)
|
||||
|
||||
|
||||
def contract_product_body_factory(**kwargs):
|
||||
data = dict(
|
||||
product_id=1,
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
import src.models as models
|
||||
from src import models
|
||||
|
||||
from .forms import form_factory
|
||||
|
||||
|
||||
def contract_factory(**kwargs):
|
||||
data = dict(
|
||||
id=1,
|
||||
@@ -17,6 +19,7 @@ def contract_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.Contract(**data)
|
||||
|
||||
|
||||
def contract_public_factory(**kwargs):
|
||||
data = dict(
|
||||
id=1,
|
||||
@@ -33,6 +36,7 @@ def contract_public_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.ContractPublic(**data)
|
||||
|
||||
|
||||
def contract_create_factory(**kwargs):
|
||||
data = dict(
|
||||
firstname="test",
|
||||
@@ -48,6 +52,7 @@ def contract_create_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.ContractCreate(**data)
|
||||
|
||||
|
||||
def contract_update_factory(**kwargs):
|
||||
data = dict(
|
||||
firstname="test",
|
||||
@@ -60,6 +65,7 @@ def contract_update_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.ContractUpdate(**data)
|
||||
|
||||
|
||||
def contract_body_factory(**kwargs):
|
||||
data = dict(
|
||||
firstname="test",
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
import src.models as models
|
||||
from .productors import productor_public_factory
|
||||
from .shipments import shipment_public_factory
|
||||
from .users import user_factory
|
||||
import datetime
|
||||
|
||||
from src import models
|
||||
|
||||
from .productors import productor_public_factory
|
||||
from .users import user_factory
|
||||
|
||||
|
||||
def form_factory(**kwargs):
|
||||
data = dict(
|
||||
id=1,
|
||||
@@ -37,6 +39,7 @@ def form_body_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return data
|
||||
|
||||
|
||||
def form_create_factory(**kwargs):
|
||||
data = dict(
|
||||
name='form 1',
|
||||
@@ -51,6 +54,7 @@ def form_create_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.FormCreate(**data)
|
||||
|
||||
|
||||
def form_update_factory(**kwargs):
|
||||
data = dict(
|
||||
name='form 1',
|
||||
@@ -65,7 +69,8 @@ def form_update_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.FormUpdate(**data)
|
||||
|
||||
def form_public_factory(form=None, shipments=[],**kwargs):
|
||||
|
||||
def form_public_factory(form=None, shipments=[], **kwargs):
|
||||
data = dict(
|
||||
id=1,
|
||||
name='form 1',
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import src.models as models
|
||||
from src import models
|
||||
|
||||
|
||||
def productor_factory(**kwargs):
|
||||
data = dict(
|
||||
@@ -10,6 +11,7 @@ def productor_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.Productor(**data)
|
||||
|
||||
|
||||
def productor_public_factory(**kwargs):
|
||||
data = dict(
|
||||
id=1,
|
||||
@@ -22,6 +24,7 @@ def productor_public_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.ProductorPublic(**data)
|
||||
|
||||
|
||||
def productor_create_factory(**kwargs):
|
||||
data = dict(
|
||||
id=1,
|
||||
@@ -34,6 +37,7 @@ def productor_create_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.ProductorCreate(**data)
|
||||
|
||||
|
||||
def productor_update_factory(**kwargs):
|
||||
data = dict(
|
||||
id=1,
|
||||
@@ -46,6 +50,7 @@ def productor_update_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.ProductorUpdate(**data)
|
||||
|
||||
|
||||
def productor_body_factory(**kwargs):
|
||||
data = dict(
|
||||
id=1,
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import src.models as models
|
||||
from src import models
|
||||
|
||||
from .productors import productor_factory
|
||||
from .shipments import shipment_factory
|
||||
|
||||
|
||||
def product_body_factory(**kwargs):
|
||||
data = dict(
|
||||
@@ -16,6 +17,7 @@ def product_body_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return data
|
||||
|
||||
|
||||
def product_create_factory(**kwargs):
|
||||
data = dict(
|
||||
name='product test 1',
|
||||
@@ -30,6 +32,7 @@ def product_create_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.ProductCreate(**data)
|
||||
|
||||
|
||||
def product_update_factory(**kwargs):
|
||||
data = dict(
|
||||
name='product test 1',
|
||||
@@ -44,7 +47,8 @@ def product_update_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.ProductUpdate(**data)
|
||||
|
||||
def product_public_factory(productor=None, shipments=[],**kwargs):
|
||||
|
||||
def product_public_factory(productor=None, shipments=[], **kwargs):
|
||||
if productor is None:
|
||||
productor = productor_factory()
|
||||
data = dict(
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
import src.models as models
|
||||
import datetime
|
||||
|
||||
from src import models
|
||||
|
||||
|
||||
def shipment_factory(**kwargs):
|
||||
data = dict(
|
||||
id=1,
|
||||
@@ -11,6 +13,7 @@ def shipment_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.Shipment(**data)
|
||||
|
||||
|
||||
def shipment_public_factory(**kwargs):
|
||||
data = dict(
|
||||
id=1,
|
||||
@@ -23,6 +26,7 @@ def shipment_public_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.ShipmentPublic(**data)
|
||||
|
||||
|
||||
def shipment_create_factory(**kwargs):
|
||||
data = dict(
|
||||
name="test shipment",
|
||||
@@ -33,6 +37,7 @@ def shipment_create_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.ShipmentCreate(**data)
|
||||
|
||||
|
||||
def shipment_update_factory(**kwargs):
|
||||
data = dict(
|
||||
name="test shipment",
|
||||
@@ -43,6 +48,7 @@ def shipment_update_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.ShipmentUpdate(**data)
|
||||
|
||||
|
||||
def shipment_body_factory(**kwargs):
|
||||
data = dict(
|
||||
name="test shipment",
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import src.models as models
|
||||
from src import models
|
||||
|
||||
|
||||
def user_factory(**kwargs):
|
||||
data = dict(
|
||||
@@ -10,6 +11,7 @@ def user_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.User(**data)
|
||||
|
||||
|
||||
def user_public_factory(**kwargs):
|
||||
data = dict(
|
||||
id=1,
|
||||
@@ -20,6 +22,7 @@ def user_public_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.UserPublic(**data)
|
||||
|
||||
|
||||
def user_create_factory(**kwargs):
|
||||
data = dict(
|
||||
name="test user",
|
||||
@@ -29,6 +32,7 @@ def user_create_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.UserCreate(**data)
|
||||
|
||||
|
||||
def user_update_factory(**kwargs):
|
||||
data = dict(
|
||||
name="test user",
|
||||
@@ -38,6 +42,7 @@ def user_update_factory(**kwargs):
|
||||
data.update(kwargs)
|
||||
return models.UserUpdate(**data)
|
||||
|
||||
|
||||
def user_body_factory(**kwargs):
|
||||
data = dict(
|
||||
name="test user",
|
||||
|
||||
@@ -1,34 +1,35 @@
|
||||
import pytest
|
||||
import datetime
|
||||
from sqlmodel import Session
|
||||
|
||||
import src.models as models
|
||||
import pytest
|
||||
import src.forms.service as forms_service
|
||||
import src.shipments.service as shipments_service
|
||||
import src.productors.service as productors_service
|
||||
import src.products.service as products_service
|
||||
import src.shipments.service as shipments_service
|
||||
import src.users.service as users_service
|
||||
import tests.factories.forms as forms_factory
|
||||
import tests.factories.shipments as shipments_factory
|
||||
import tests.factories.productors as productors_factory
|
||||
import tests.factories.products as products_factory
|
||||
import tests.factories.shipments as shipments_factory
|
||||
import tests.factories.users as users_factory
|
||||
from sqlmodel import Session
|
||||
from src import models
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def productor(session: Session) -> models.ProductorPublic:
|
||||
productor = productors_service.create_one(
|
||||
result = productors_service.create_one(
|
||||
session,
|
||||
productors_factory.productor_create_factory(
|
||||
name='test productor',
|
||||
type='Légumineuses',
|
||||
)
|
||||
)
|
||||
return productor
|
||||
return result
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def productors(session: Session) -> models.ProductorPublic:
|
||||
productors = [
|
||||
result = [
|
||||
productors_service.create_one(
|
||||
session,
|
||||
productors_factory.productor_create_factory(
|
||||
@@ -44,11 +45,15 @@ def productors(session: Session) -> models.ProductorPublic:
|
||||
)
|
||||
)
|
||||
]
|
||||
return productors
|
||||
return result
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def products(session: Session, productor: models.ProductorPublic) -> list[models.ProductPublic]:
|
||||
products = [
|
||||
def products(
|
||||
session: Session,
|
||||
productor: models.ProductorPublic
|
||||
) -> list[models.ProductPublic]:
|
||||
result = [
|
||||
products_service.create_one(
|
||||
session,
|
||||
products_factory.product_create_factory(
|
||||
@@ -66,7 +71,8 @@ def products(session: Session, productor: models.ProductorPublic) -> list[models
|
||||
)
|
||||
),
|
||||
]
|
||||
return products
|
||||
return result
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def user(session: Session) -> models.UserPublic:
|
||||
@@ -80,39 +86,40 @@ def user(session: Session) -> models.UserPublic:
|
||||
)
|
||||
return user
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def users(session: Session) -> list[models.UserPublic]:
|
||||
users = [
|
||||
result = [
|
||||
users_service.create_one(
|
||||
session,
|
||||
users_factory.user_create_factory(
|
||||
name='test user 1 (admin)',
|
||||
email='test1@test.com',
|
||||
role_names=['Légumineuses', 'Légumes', 'Oeufs', 'Porc-Agneau', 'Vin', 'Fruits']
|
||||
)
|
||||
),
|
||||
role_names=[
|
||||
'Légumineuses',
|
||||
'Légumes',
|
||||
'Oeufs',
|
||||
'Porc-Agneau',
|
||||
'Vin',
|
||||
'Fruits'])),
|
||||
users_service.create_one(
|
||||
session,
|
||||
users_factory.user_create_factory(
|
||||
name='test user 2',
|
||||
email='test2@test.com',
|
||||
role_names=['Légumineuses']
|
||||
)
|
||||
),
|
||||
role_names=['Légumineuses'])),
|
||||
users_service.create_one(
|
||||
session,
|
||||
users_factory.user_create_factory(
|
||||
name='test user 3',
|
||||
email='test3@test.com',
|
||||
role_names=['Porc-Agneau']
|
||||
)
|
||||
)
|
||||
]
|
||||
return users
|
||||
role_names=['Porc-Agneau']))]
|
||||
return result
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def referer(session: Session) -> models.UserPublic:
|
||||
referer = users_service.create_one(
|
||||
result = users_service.create_one(
|
||||
session,
|
||||
users_factory.user_create_factory(
|
||||
name='test referer',
|
||||
@@ -120,11 +127,16 @@ def referer(session: Session) -> models.UserPublic:
|
||||
role_names=['Légumineuses'],
|
||||
)
|
||||
)
|
||||
return referer
|
||||
return result
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def shipments(session: Session, forms: list[models.FormPublic], products: list[models.ProductPublic]):
|
||||
shipments = [
|
||||
def shipments(
|
||||
session: Session,
|
||||
forms: list[models.FormPublic],
|
||||
products: list[models.ProductPublic]
|
||||
):
|
||||
result = [
|
||||
shipments_service.create_one(
|
||||
session,
|
||||
shipments_factory.shipment_create_factory(
|
||||
@@ -144,7 +156,8 @@ def shipments(session: Session, forms: list[models.FormPublic], products: list[m
|
||||
)
|
||||
),
|
||||
]
|
||||
return shipments
|
||||
return result
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def forms(
|
||||
@@ -152,7 +165,7 @@ def forms(
|
||||
productor: models.ProductorPublic,
|
||||
referer: models.UserPublic
|
||||
) -> list[models.FormPublic]:
|
||||
forms = [
|
||||
result = [
|
||||
forms_service.create_one(
|
||||
session,
|
||||
forms_factory.form_create_factory(
|
||||
@@ -172,5 +185,4 @@ def forms(
|
||||
)
|
||||
)
|
||||
]
|
||||
return forms
|
||||
|
||||
return result
|
||||
|
||||
3
backend/tests/routers/__init__.py
Normal file
3
backend/tests/routers/__init__.py
Normal file
@@ -0,0 +1,3 @@
|
||||
# SPDX-FileCopyrightText: 2026-present Julien Aldon <julien.aldon@wanadoo.fr>
|
||||
#
|
||||
# SPDX-License-Identifier: MIT
|
||||
@@ -1,15 +1,18 @@
|
||||
import src.contracts.service as service
|
||||
import src.models as models
|
||||
from src.main import app
|
||||
from src.auth.auth import get_current_user
|
||||
import tests.factories.contracts as contract_factory
|
||||
import tests.factories.forms as form_factory
|
||||
import tests.factories.contract_products as contract_products_factory
|
||||
|
||||
from fastapi.exceptions import HTTPException
|
||||
from src.auth.auth import get_current_user
|
||||
from src.main import app
|
||||
|
||||
|
||||
class TestContracts:
|
||||
def test_get_all(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_all(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user
|
||||
):
|
||||
mock_results = [
|
||||
contract_factory.contract_public_factory(id=1),
|
||||
contract_factory.contract_public_factory(id=2),
|
||||
@@ -31,7 +34,14 @@ class TestContracts:
|
||||
mock_user,
|
||||
[],
|
||||
)
|
||||
def test_get_all_filters(self, client, mocker, mock_session, mock_user):
|
||||
|
||||
def test_get_all_filters(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user
|
||||
):
|
||||
mock_results = [
|
||||
contract_factory.contract_public_factory(id=2),
|
||||
]
|
||||
@@ -52,7 +62,11 @@ class TestContracts:
|
||||
['form test'],
|
||||
)
|
||||
|
||||
def test_get_all_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_all_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -66,7 +80,13 @@ class TestContracts:
|
||||
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
def test_get_one(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_one(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock_result = contract_factory.contract_public_factory(id=2)
|
||||
|
||||
mock = mocker.patch.object(
|
||||
@@ -88,29 +108,48 @@ class TestContracts:
|
||||
mock_session,
|
||||
2
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
2
|
||||
)
|
||||
|
||||
def test_get_one_notfound(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_one_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock_result = None
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'get_one',
|
||||
return_value=mock_result
|
||||
)
|
||||
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
response = client.get('/api/contracts/2')
|
||||
response_data = response.json()
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
mock_session,
|
||||
2
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
2
|
||||
)
|
||||
|
||||
def test_get_one_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -124,42 +163,13 @@ class TestContracts:
|
||||
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
def test_create_one(self, client, mocker, mock_session, mock_user):
|
||||
contract_body = contract_factory.contract_body_factory(
|
||||
products=[
|
||||
contract_products_factory.contract_product_body_factory(product_id=1),
|
||||
contract_products_factory.contract_product_body_factory(product_id=2),
|
||||
contract_products_factory.contract_product_body_factory(product_id=3)
|
||||
],
|
||||
cheques=[{'name': '123123', 'value': '100'}]
|
||||
)
|
||||
contract_result = contract_factory.contract_factory(
|
||||
products=[
|
||||
contract_products_factory.contract_product_factory(product_id=1),
|
||||
contract_products_factory.contract_product_factory(product_id=2),
|
||||
contract_products_factory.contract_product_factory(product_id=3)
|
||||
],
|
||||
form=form_factory.form_factory(),
|
||||
cheques=[models.Cheque(name='123123', value='100')]
|
||||
)
|
||||
mock_create_one = mocker.patch.object(
|
||||
service,
|
||||
'create_one',
|
||||
return_value=contract_result
|
||||
)
|
||||
mock_add_contract_file = mocker.patch.object(
|
||||
service,
|
||||
'add_contract_file',
|
||||
return_value=True
|
||||
)
|
||||
mock_generate_html_contract = mocker.patch('src.contracts.generate_contract.generate_html_contract')
|
||||
|
||||
response = client.post('/api/contracts', json=contract_body)
|
||||
assert response.status_code == 200
|
||||
contract_id = 'test_test_test type_hiver-2026'
|
||||
assert response.headers['Content-Disposition'] == f'attachment; filename=contract_{contract_id}.pdf'
|
||||
|
||||
def test_delete_one(self, client, mocker, mock_session, mock_user):
|
||||
def test_delete_one(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
contract_result = contract_factory.contract_public_factory()
|
||||
|
||||
mock = mocker.patch.object(
|
||||
@@ -167,7 +177,6 @@ class TestContracts:
|
||||
'delete_one',
|
||||
return_value=contract_result
|
||||
)
|
||||
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
@@ -175,15 +184,25 @@ class TestContracts:
|
||||
)
|
||||
|
||||
response = client.delete('/api/contracts/2')
|
||||
response_data = response.json()
|
||||
|
||||
assert response.status_code == 200
|
||||
mock.assert_called_once_with(
|
||||
mock_session,
|
||||
2,
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
2
|
||||
)
|
||||
|
||||
def test_delete_one_notfound(self, client, mocker, mock_session, mock_user):
|
||||
def test_delete_one_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
contract_result = None
|
||||
|
||||
mock = mocker.patch.object(
|
||||
@@ -191,7 +210,6 @@ class TestContracts:
|
||||
'delete_one',
|
||||
return_value=contract_result
|
||||
)
|
||||
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
@@ -199,18 +217,25 @@ class TestContracts:
|
||||
)
|
||||
|
||||
response = client.delete('/api/contracts/2')
|
||||
response_data = response.json()
|
||||
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
mock_session,
|
||||
2,
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
2
|
||||
)
|
||||
|
||||
def test_delete_one_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_delete_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
contract_body = contract_factory.contract_body_factory()
|
||||
|
||||
app.dependency_overrides[get_current_user] = unauthorized
|
||||
|
||||
|
||||
@@ -1,14 +1,20 @@
|
||||
import src.forms.service as service
|
||||
import src.forms.exceptions as forms_exceptions
|
||||
import src.models as models
|
||||
from src.main import app
|
||||
from src.auth.auth import get_current_user
|
||||
import src.forms.service as service
|
||||
import tests.factories.forms as form_factory
|
||||
from fastapi.exceptions import HTTPException
|
||||
import src.messages as messages
|
||||
from src import messages
|
||||
from src.auth.auth import get_current_user
|
||||
from src.main import app
|
||||
|
||||
|
||||
class TestForms:
|
||||
def test_get_all(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_all(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock_results = [
|
||||
form_factory.form_public_factory(name="test 1", id=1),
|
||||
form_factory.form_public_factory(name="test 2", id=2),
|
||||
@@ -32,7 +38,14 @@ class TestForms:
|
||||
False,
|
||||
mock_user,
|
||||
)
|
||||
def test_get_all_filters(self, client, mocker, mock_session, mock_user):
|
||||
|
||||
def test_get_all_filters(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock_results = [
|
||||
form_factory.form_public_factory(name="test 2", id=2),
|
||||
]
|
||||
@@ -42,7 +55,8 @@ class TestForms:
|
||||
return_value=mock_results
|
||||
)
|
||||
|
||||
response = client.get('/api/forms/referents?current_season=true&seasons=hiver-2025&productors=test productor')
|
||||
response = client.get(
|
||||
'/api/forms/referents?current_season=true&seasons=hiver-2025&productors=test productor')
|
||||
response_data = response.json()
|
||||
assert response.status_code == 200
|
||||
assert response_data[0]['id'] == 2
|
||||
@@ -55,7 +69,11 @@ class TestForms:
|
||||
mock_user,
|
||||
)
|
||||
|
||||
def test_get_all_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_all_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -69,7 +87,13 @@ class TestForms:
|
||||
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
def test_get_one(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_one(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock_result = form_factory.form_public_factory(name="test 2", id=2)
|
||||
|
||||
mock = mocker.patch.object(
|
||||
@@ -77,7 +101,6 @@ class TestForms:
|
||||
'get_one',
|
||||
return_value=mock_result
|
||||
)
|
||||
|
||||
response = client.get('/api/forms/2')
|
||||
response_data = response.json()
|
||||
|
||||
@@ -87,8 +110,14 @@ class TestForms:
|
||||
mock_session,
|
||||
2
|
||||
)
|
||||
assert mock_user
|
||||
|
||||
def test_get_one_notfound(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_one_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
):
|
||||
mock_result = None
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
@@ -96,15 +125,19 @@ class TestForms:
|
||||
return_value=mock_result
|
||||
)
|
||||
response = client.get('/api/forms/2')
|
||||
response_data = response.json()
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
mock_session,
|
||||
2
|
||||
)
|
||||
|
||||
|
||||
def test_create_one(self, client, mocker, mock_session, mock_user):
|
||||
def test_create_one(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
form_body = form_factory.form_body_factory(name='test form create')
|
||||
form_create = form_factory.form_create_factory(name='test form create')
|
||||
form_result = form_factory.form_public_factory(name='test form create')
|
||||
@@ -114,6 +147,11 @@ class TestForms:
|
||||
'create_one',
|
||||
return_value=form_result
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
response = client.post('/api/forms', json=form_body)
|
||||
response_data = response.json()
|
||||
@@ -124,46 +162,95 @@ class TestForms:
|
||||
mock_session,
|
||||
form_create
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
form=form_create
|
||||
)
|
||||
|
||||
def test_create_one_referer_notfound(self, client, mocker, mock_session, mock_user):
|
||||
form_body = form_factory.form_body_factory(name='test form create', referer_id=12312)
|
||||
form_create = form_factory.form_create_factory(name='test form create', referer_id=12312)
|
||||
def test_create_one_referer_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
form_body = form_factory.form_body_factory(
|
||||
name='test form create', referer_id=12312
|
||||
)
|
||||
form_create = form_factory.form_create_factory(
|
||||
name='test form create', referer_id=12312
|
||||
)
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'create_one',
|
||||
side_effect=forms_exceptions.UserNotFoundError(messages.Messages.not_found('referer'))
|
||||
side_effect=forms_exceptions.UserNotFoundError(
|
||||
messages.Messages.not_found('referer')
|
||||
)
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
response = client.post('/api/forms', json=form_body)
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
mock_session,
|
||||
form_create
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
form=form_create
|
||||
)
|
||||
|
||||
def test_create_one_productor_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
form_body = form_factory.form_body_factory(
|
||||
name='test form create', productor_id=1231
|
||||
)
|
||||
form_create = form_factory.form_create_factory(
|
||||
name='test form create', productor_id=1231
|
||||
)
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'create_one',
|
||||
side_effect=forms_exceptions.ProductorNotFoundError(
|
||||
messages.Messages.not_found('productor')
|
||||
)
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
response = client.post('/api/forms', json=form_body)
|
||||
response_data = response.json()
|
||||
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
mock_session,
|
||||
form_create
|
||||
)
|
||||
|
||||
def test_create_one_productor_notfound(self, client, mocker, mock_session, mock_user):
|
||||
form_body = form_factory.form_body_factory(name='test form create', productor_id=1231)
|
||||
form_create = form_factory.form_create_factory(name='test form create', productor_id=1231)
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'create_one',
|
||||
side_effect=forms_exceptions.ProductorNotFoundError(messages.Messages.not_found('productor'))
|
||||
)
|
||||
|
||||
response = client.post('/api/forms', json=form_body)
|
||||
response_data = response.json()
|
||||
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
form_create
|
||||
mock_user,
|
||||
form=form_create
|
||||
)
|
||||
|
||||
def test_create_one_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_create_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
form_body = form_factory.form_body_factory(name='test form create')
|
||||
@@ -178,7 +265,13 @@ class TestForms:
|
||||
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
def test_update_one(self, client, mocker, mock_session, mock_user):
|
||||
def test_update_one(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
form_body = form_factory.form_body_factory(name='test form update')
|
||||
form_update = form_factory.form_update_factory(name='test form update')
|
||||
form_result = form_factory.form_public_factory(name='test form update')
|
||||
@@ -188,6 +281,11 @@ class TestForms:
|
||||
'update_one',
|
||||
return_value=form_result
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
response = client.put('/api/forms/2', json=form_body)
|
||||
response_data = response.json()
|
||||
@@ -199,19 +297,36 @@ class TestForms:
|
||||
2,
|
||||
form_update
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_update_one_notfound(self, client, mocker, mock_session, mock_user):
|
||||
def test_update_one_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
form_body = form_factory.form_body_factory(name='test form update')
|
||||
form_update = form_factory.form_update_factory(name='test form update')
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'update_one',
|
||||
side_effect=forms_exceptions.FormNotFoundError(messages.Messages.not_found('form'))
|
||||
side_effect=forms_exceptions.FormNotFoundError(
|
||||
messages.Messages.not_found('form')
|
||||
)
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
response = client.put('/api/forms/2', json=form_body)
|
||||
response_data = response.json()
|
||||
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
@@ -219,19 +334,34 @@ class TestForms:
|
||||
2,
|
||||
form_update
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_update_one_referer_notfound(self, client, mocker, mock_session, mock_user):
|
||||
def test_update_one_referer_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
form_body = form_factory.form_body_factory(name='test form update')
|
||||
form_update = form_factory.form_update_factory(name='test form update')
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service, 'update_one', side_effect=forms_exceptions.UserNotFoundError(
|
||||
messages.Messages.not_found('referer')
|
||||
)
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'update_one',
|
||||
side_effect=forms_exceptions.UserNotFoundError(messages.Messages.not_found('referer'))
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
response = client.put('/api/forms/2', json=form_body)
|
||||
response_data = response.json()
|
||||
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
@@ -239,19 +369,36 @@ class TestForms:
|
||||
2,
|
||||
form_update
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_update_one_productor_notfound(self, client, mocker, mock_session, mock_user):
|
||||
def test_update_one_productor_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
form_body = form_factory.form_body_factory(name='test form update')
|
||||
form_update = form_factory.form_update_factory(name='test form update')
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'update_one',
|
||||
side_effect=forms_exceptions.ProductorNotFoundError(messages.Messages.not_found('productor'))
|
||||
side_effect=forms_exceptions.ProductorNotFoundError(
|
||||
messages.Messages.not_found('productor')
|
||||
)
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
response = client.put('/api/forms/2', json=form_body)
|
||||
response_data = response.json()
|
||||
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
@@ -259,8 +406,17 @@ class TestForms:
|
||||
2,
|
||||
form_update
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_update_one_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_update_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
form_body = form_factory.form_body_factory(name='test form update')
|
||||
@@ -275,7 +431,13 @@ class TestForms:
|
||||
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
def test_delete_one(self, client, mocker, mock_session, mock_user):
|
||||
def test_delete_one(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
form_result = form_factory.form_public_factory(name='test form delete')
|
||||
|
||||
mock = mocker.patch.object(
|
||||
@@ -283,6 +445,11 @@ class TestForms:
|
||||
'delete_one',
|
||||
return_value=form_result
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
response = client.delete('/api/forms/2')
|
||||
response_data = response.json()
|
||||
@@ -293,26 +460,49 @@ class TestForms:
|
||||
mock_session,
|
||||
2,
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_delete_one_notfound(self, client, mocker, mock_session, mock_user):
|
||||
form_result = None
|
||||
|
||||
def test_delete_one_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'delete_one',
|
||||
side_effect=forms_exceptions.FormNotFoundError(messages.Messages.not_found('form'))
|
||||
side_effect=forms_exceptions.FormNotFoundError(
|
||||
messages.Messages.not_found('form'))
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
response = client.delete('/api/forms/2')
|
||||
response_data = response.json()
|
||||
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
mock_session,
|
||||
2,
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_delete_one_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_delete_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
|
||||
@@ -1,17 +1,19 @@
|
||||
from fastapi.exceptions import HTTPException
|
||||
|
||||
from src.main import app
|
||||
import src.models as models
|
||||
import src.messages as messages
|
||||
from src.auth.auth import get_current_user
|
||||
|
||||
import src.productors.service as service
|
||||
import src.productors.exceptions as exceptions
|
||||
|
||||
import tests.factories.productors as productor_factory
|
||||
from fastapi.exceptions import HTTPException
|
||||
from src import messages
|
||||
from src.auth.auth import get_current_user
|
||||
from src.main import app
|
||||
from src.productors import exceptions, service
|
||||
|
||||
|
||||
class TestProductors:
|
||||
def test_get_all(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_all(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock_results = [
|
||||
productor_factory.productor_public_factory(name="test 1", id=1),
|
||||
productor_factory.productor_public_factory(name="test 2", id=2),
|
||||
@@ -34,7 +36,14 @@ class TestProductors:
|
||||
[],
|
||||
[],
|
||||
)
|
||||
def test_get_all_filters(self, client, mocker, mock_session, mock_user):
|
||||
|
||||
def test_get_all_filters(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock_results = [
|
||||
productor_factory.productor_public_factory(name="test 2", id=2),
|
||||
]
|
||||
@@ -44,7 +53,8 @@ class TestProductors:
|
||||
return_value=mock_results
|
||||
)
|
||||
|
||||
response = client.get('/api/productors?types=Légumineuses&names=test 2')
|
||||
response = client.get(
|
||||
'/api/productors?types=Légumineuses&names=test 2')
|
||||
response_data = response.json()
|
||||
assert response.status_code == 200
|
||||
assert response_data[0]['id'] == 2
|
||||
@@ -56,7 +66,11 @@ class TestProductors:
|
||||
['Légumineuses'],
|
||||
)
|
||||
|
||||
def test_get_all_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_all_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -70,8 +84,21 @@ class TestProductors:
|
||||
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
def test_get_one(self, client, mocker, mock_session, mock_user):
|
||||
mock_result = productor_factory.productor_public_factory(name="test 2", id=2)
|
||||
def test_get_one(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock_result = productor_factory.productor_public_factory(
|
||||
name="test 2", id=2)
|
||||
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
@@ -89,22 +116,49 @@ class TestProductors:
|
||||
2
|
||||
)
|
||||
|
||||
def test_get_one_notfound(self, client, mocker, mock_session, mock_user):
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_get_one_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
mock_result = None
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'get_one',
|
||||
return_value=mock_result
|
||||
)
|
||||
response = client.get('/api/productors/2')
|
||||
response_data = response.json()
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
mock_session,
|
||||
2
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_get_one_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -118,10 +172,25 @@ class TestProductors:
|
||||
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
def test_create_one(self, client, mocker, mock_session, mock_user):
|
||||
productor_body = productor_factory.productor_body_factory(name='test productor create')
|
||||
productor_create = productor_factory.productor_create_factory(name='test productor create')
|
||||
productor_result = productor_factory.productor_public_factory(name='test productor create')
|
||||
def test_create_one(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
productor_body = productor_factory.productor_body_factory(
|
||||
name='test productor create')
|
||||
productor_create = productor_factory.productor_create_factory(
|
||||
name='test productor create')
|
||||
productor_result = productor_factory.productor_public_factory(
|
||||
name='test productor create')
|
||||
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
@@ -138,11 +207,21 @@ class TestProductors:
|
||||
mock_session,
|
||||
productor_create
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
productor=productor_create
|
||||
)
|
||||
|
||||
def test_create_one_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_create_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
productor_body = productor_factory.productor_body_factory(name='test productor create')
|
||||
productor_body = productor_factory.productor_body_factory(
|
||||
name='test productor create')
|
||||
|
||||
app.dependency_overrides[get_current_user] = unauthorized
|
||||
|
||||
@@ -154,10 +233,25 @@ class TestProductors:
|
||||
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
def test_update_one(self, client, mocker, mock_session, mock_user):
|
||||
productor_body = productor_factory.productor_body_factory(name='test productor update')
|
||||
productor_update = productor_factory.productor_update_factory(name='test productor update')
|
||||
productor_result = productor_factory.productor_public_factory(name='test productor update')
|
||||
def test_update_one(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
productor_body = productor_factory.productor_body_factory(
|
||||
name='test productor update')
|
||||
productor_update = productor_factory.productor_update_factory(
|
||||
name='test productor update')
|
||||
productor_result = productor_factory.productor_public_factory(
|
||||
name='test productor update')
|
||||
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
@@ -176,19 +270,41 @@ class TestProductors:
|
||||
productor_update
|
||||
)
|
||||
|
||||
def test_update_one_notfound(self, client, mocker, mock_session, mock_user):
|
||||
productor_body = productor_factory.productor_body_factory(name='test productor update')
|
||||
productor_update = productor_factory.productor_update_factory(name='test productor update')
|
||||
productor_result = None
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_update_one_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
productor_body = productor_factory.productor_body_factory(
|
||||
name='test productor update',
|
||||
)
|
||||
productor_update = productor_factory.productor_update_factory(
|
||||
name='test productor update',
|
||||
)
|
||||
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'update_one',
|
||||
side_effect=exceptions.ProductorNotFoundError(messages.Messages.not_found('productor'))
|
||||
side_effect=exceptions.ProductorNotFoundError(
|
||||
messages.Messages.not_found('productor')
|
||||
)
|
||||
)
|
||||
|
||||
response = client.put('/api/productors/2', json=productor_body)
|
||||
response_data = response.json()
|
||||
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
@@ -197,10 +313,21 @@ class TestProductors:
|
||||
productor_update
|
||||
)
|
||||
|
||||
def test_update_one_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_update_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
productor_body = productor_factory.productor_body_factory(name='test productor update')
|
||||
productor_body = productor_factory.productor_body_factory(
|
||||
name='test productor update')
|
||||
|
||||
app.dependency_overrides[get_current_user] = unauthorized
|
||||
|
||||
@@ -212,8 +339,21 @@ class TestProductors:
|
||||
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
def test_delete_one(self, client, mocker, mock_session, mock_user):
|
||||
productor_result = productor_factory.productor_public_factory(name='test productor delete')
|
||||
def test_delete_one(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
productor_result = productor_factory.productor_public_factory(
|
||||
name='test productor delete')
|
||||
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
@@ -230,18 +370,34 @@ class TestProductors:
|
||||
mock_session,
|
||||
2,
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_delete_one_notfound(self, client, mocker, mock_session, mock_user):
|
||||
productor_result = None
|
||||
def test_delete_one_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'delete_one',
|
||||
side_effect=exceptions.ProductorNotFoundError(messages.Messages.not_found('productor'))
|
||||
side_effect=exceptions.ProductorNotFoundError(
|
||||
messages.Messages.not_found('productor')
|
||||
)
|
||||
)
|
||||
|
||||
response = client.delete('/api/productors/2')
|
||||
response_data = response.json()
|
||||
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
@@ -249,11 +405,19 @@ class TestProductors:
|
||||
2,
|
||||
)
|
||||
|
||||
def test_delete_one_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_delete_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
productor_body = productor_factory.productor_body_factory(name='test productor delete')
|
||||
|
||||
app.dependency_overrides[get_current_user] = unauthorized
|
||||
|
||||
mock = mocker.patch('src.productors.service.delete_one')
|
||||
|
||||
@@ -1,14 +1,19 @@
|
||||
import src.products.service as service
|
||||
import src.products.exceptions as exceptions
|
||||
import src.models as models
|
||||
from src.main import app
|
||||
from src.auth.auth import get_current_user
|
||||
import tests.factories.products as product_factory
|
||||
|
||||
from fastapi.exceptions import HTTPException
|
||||
from src.auth.auth import get_current_user
|
||||
from src.main import app
|
||||
from src.products import exceptions
|
||||
|
||||
|
||||
class TestProducts:
|
||||
def test_get_all(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_all(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user
|
||||
):
|
||||
mock_results = [
|
||||
product_factory.product_public_factory(name="test 1", id=1),
|
||||
product_factory.product_public_factory(name="test 2", id=2),
|
||||
@@ -32,7 +37,14 @@ class TestProducts:
|
||||
[],
|
||||
[]
|
||||
)
|
||||
def test_get_all_filters(self, client, mocker, mock_session, mock_user):
|
||||
|
||||
def test_get_all_filters(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user
|
||||
):
|
||||
mock_results = [
|
||||
product_factory.product_public_factory(name="test 2", id=2),
|
||||
]
|
||||
@@ -55,7 +67,11 @@ class TestProducts:
|
||||
['1'],
|
||||
)
|
||||
|
||||
def test_get_all_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_all_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -69,8 +85,21 @@ class TestProducts:
|
||||
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
def test_get_one(self, client, mocker, mock_session, mock_user):
|
||||
mock_result = product_factory.product_public_factory(name="test 2", id=2)
|
||||
def test_get_one(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock_result = product_factory.product_public_factory(
|
||||
name="test 2", id=2)
|
||||
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
@@ -87,23 +116,47 @@ class TestProducts:
|
||||
mock_session,
|
||||
2
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_get_one_notfound(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_one_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock_result = None
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'get_one',
|
||||
return_value=mock_result
|
||||
)
|
||||
response = client.get('/api/products/2')
|
||||
response_data = response.json()
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
mock_session,
|
||||
2
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_get_one_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -117,11 +170,25 @@ class TestProducts:
|
||||
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
def test_create_one(self, client, mocker, mock_session, mock_user):
|
||||
product_body = product_factory.product_body_factory(name='test product create')
|
||||
product_create = product_factory.product_create_factory(name='test product create')
|
||||
product_result = product_factory.product_public_factory(name='test product create')
|
||||
def test_create_one(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
product_body = product_factory.product_body_factory(
|
||||
name='test product create')
|
||||
product_create = product_factory.product_create_factory(
|
||||
name='test product create')
|
||||
product_result = product_factory.product_public_factory(
|
||||
name='test product create')
|
||||
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'create_one',
|
||||
@@ -137,11 +204,21 @@ class TestProducts:
|
||||
mock_session,
|
||||
product_create
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
product=product_create
|
||||
)
|
||||
|
||||
def test_create_one_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_create_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
product_body = product_factory.product_body_factory(name='test product create')
|
||||
product_body = product_factory.product_body_factory(
|
||||
name='test product create')
|
||||
|
||||
app.dependency_overrides[get_current_user] = unauthorized
|
||||
|
||||
@@ -153,11 +230,28 @@ class TestProducts:
|
||||
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
def test_update_one(self, client, mocker, mock_session, mock_user):
|
||||
product_body = product_factory.product_body_factory(name='test product update')
|
||||
product_update = product_factory.product_update_factory(name='test product update')
|
||||
product_result = product_factory.product_public_factory(name='test product update')
|
||||
def test_update_one(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
product_body = product_factory.product_body_factory(
|
||||
name='test product update'
|
||||
)
|
||||
product_update = product_factory.product_update_factory(
|
||||
name='test product update'
|
||||
)
|
||||
product_result = product_factory.product_public_factory(
|
||||
name='test product update'
|
||||
)
|
||||
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'update_one',
|
||||
@@ -175,11 +269,31 @@ class TestProducts:
|
||||
product_update
|
||||
)
|
||||
|
||||
def test_update_one_notfound(self, client, mocker, mock_session, mock_user):
|
||||
product_body = product_factory.product_body_factory(name='test product update')
|
||||
product_update = product_factory.product_update_factory(name='test product update')
|
||||
product_result = None
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_update_one_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
product_body = product_factory.product_body_factory(
|
||||
name='test product update'
|
||||
)
|
||||
product_update = product_factory.product_update_factory(
|
||||
name='test product update'
|
||||
)
|
||||
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'update_one',
|
||||
@@ -187,7 +301,6 @@ class TestProducts:
|
||||
)
|
||||
|
||||
response = client.put('/api/products/2', json=product_body)
|
||||
response_data = response.json()
|
||||
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
@@ -195,11 +308,21 @@ class TestProducts:
|
||||
2,
|
||||
product_update
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_update_one_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_update_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
product_body = product_factory.product_body_factory(name='test product update')
|
||||
product_body = product_factory.product_body_factory(
|
||||
name='test product update')
|
||||
|
||||
app.dependency_overrides[get_current_user] = unauthorized
|
||||
|
||||
@@ -211,8 +334,15 @@ class TestProducts:
|
||||
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
def test_delete_one(self, client, mocker, mock_session, mock_user):
|
||||
product_result = product_factory.product_public_factory(name='test product delete')
|
||||
def test_delete_one(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
product_result = product_factory.product_public_factory(
|
||||
name='test product delete')
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
@@ -220,6 +350,11 @@ class TestProducts:
|
||||
return_value=product_result
|
||||
)
|
||||
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
response = client.delete('/api/products/2')
|
||||
response_data = response.json()
|
||||
|
||||
@@ -229,18 +364,31 @@ class TestProducts:
|
||||
mock_session,
|
||||
2,
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_delete_one_notfound(self, client, mocker, mock_session, mock_user):
|
||||
product_result = None
|
||||
|
||||
def test_delete_one_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'delete_one',
|
||||
side_effect=exceptions.ProductNotFoundError('Product not found')
|
||||
)
|
||||
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
response = client.delete('/api/products/2')
|
||||
response_data = response.json()
|
||||
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
@@ -248,11 +396,19 @@ class TestProducts:
|
||||
2,
|
||||
)
|
||||
|
||||
def test_delete_one_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_delete_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
product_body = product_factory.product_body_factory(name='test product delete')
|
||||
|
||||
app.dependency_overrides[get_current_user] = unauthorized
|
||||
|
||||
mock = mocker.patch('src.products.service.delete_one')
|
||||
|
||||
@@ -1,15 +1,20 @@
|
||||
import src.shipments.service as service
|
||||
import src.models as models
|
||||
from src.main import app
|
||||
import src.messages as messages
|
||||
import src.shipments.exceptions as exceptions
|
||||
from src.auth.auth import get_current_user
|
||||
import src.shipments.service as service
|
||||
import tests.factories.shipments as shipment_factory
|
||||
|
||||
from fastapi.exceptions import HTTPException
|
||||
from src import messages
|
||||
from src.auth.auth import get_current_user
|
||||
from src.main import app
|
||||
|
||||
|
||||
class TestShipments:
|
||||
def test_get_all(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_all(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock_results = [
|
||||
shipment_factory.shipment_public_factory(name="test 1", id=1),
|
||||
shipment_factory.shipment_public_factory(name="test 2", id=2),
|
||||
@@ -33,7 +38,14 @@ class TestShipments:
|
||||
[],
|
||||
[],
|
||||
)
|
||||
def test_get_all_filters(self, client, mocker, mock_session, mock_user):
|
||||
|
||||
def test_get_all_filters(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock_results = [
|
||||
shipment_factory.shipment_public_factory(name="test 2", id=2),
|
||||
]
|
||||
@@ -43,7 +55,8 @@ class TestShipments:
|
||||
return_value=mock_results
|
||||
)
|
||||
|
||||
response = client.get('/api/shipments?dates=2025-10-10&names=test 2&forms=contract form 1')
|
||||
response = client.get(
|
||||
'/api/shipments?dates=2025-10-10&names=test 2&forms=contract form 1')
|
||||
response_data = response.json()
|
||||
assert response.status_code == 200
|
||||
assert response_data[0]['id'] == 2
|
||||
@@ -56,7 +69,11 @@ class TestShipments:
|
||||
['contract form 1'],
|
||||
)
|
||||
|
||||
def test_get_all_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_all_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -70,14 +87,26 @@ class TestShipments:
|
||||
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
def test_get_one(self, client, mocker, mock_session, mock_user):
|
||||
mock_result = shipment_factory.shipment_public_factory(name="test 2", id=2)
|
||||
def test_get_one(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock_result = shipment_factory.shipment_public_factory(
|
||||
name="test 2", id=2)
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'get_one',
|
||||
return_value=mock_result
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
response = client.get('/api/shipments/2')
|
||||
response_data = response.json()
|
||||
@@ -88,23 +117,47 @@ class TestShipments:
|
||||
mock_session,
|
||||
2
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_get_one_notfound(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_one_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock_result = None
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'get_one',
|
||||
return_value=mock_result
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
response = client.get('/api/shipments/2')
|
||||
response_data = response.json()
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
mock_session,
|
||||
2
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_get_one_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -118,16 +171,33 @@ class TestShipments:
|
||||
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
def test_create_one(self, client, mocker, mock_session, mock_user):
|
||||
shipment_body = shipment_factory.shipment_body_factory(name='test shipment create')
|
||||
shipment_create = shipment_factory.shipment_create_factory(name='test shipment create')
|
||||
shipment_result = shipment_factory.shipment_public_factory(name='test shipment create')
|
||||
def test_create_one(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
shipment_body = shipment_factory.shipment_body_factory(
|
||||
name='test shipment create'
|
||||
)
|
||||
shipment_create = shipment_factory.shipment_create_factory(
|
||||
name='test shipment create'
|
||||
)
|
||||
shipment_result = shipment_factory.shipment_public_factory(
|
||||
name='test shipment create'
|
||||
)
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'create_one',
|
||||
return_value=shipment_result
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
response = client.post('/api/shipments', json=shipment_body)
|
||||
response_data = response.json()
|
||||
@@ -138,11 +208,22 @@ class TestShipments:
|
||||
mock_session,
|
||||
shipment_create
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
shipment=shipment_create
|
||||
)
|
||||
|
||||
def test_create_one_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_create_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
shipment_body = shipment_factory.shipment_body_factory(name='test shipment create')
|
||||
shipment_body = shipment_factory.shipment_body_factory(
|
||||
name='test shipment create'
|
||||
)
|
||||
|
||||
app.dependency_overrides[get_current_user] = unauthorized
|
||||
|
||||
@@ -154,16 +235,33 @@ class TestShipments:
|
||||
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
def test_update_one(self, client, mocker, mock_session, mock_user):
|
||||
shipment_body = shipment_factory.shipment_body_factory(name='test shipment update')
|
||||
shipment_update = shipment_factory.shipment_update_factory(name='test shipment update')
|
||||
shipment_result = shipment_factory.shipment_public_factory(name='test shipment update')
|
||||
def test_update_one(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
shipment_body = shipment_factory.shipment_body_factory(
|
||||
name='test shipment update'
|
||||
)
|
||||
shipment_update = shipment_factory.shipment_update_factory(
|
||||
name='test shipment update'
|
||||
)
|
||||
shipment_result = shipment_factory.shipment_public_factory(
|
||||
name='test shipment update'
|
||||
)
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'update_one',
|
||||
return_value=shipment_result
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
response = client.put('/api/shipments/2', json=shipment_body)
|
||||
response_data = response.json()
|
||||
@@ -175,19 +273,40 @@ class TestShipments:
|
||||
2,
|
||||
shipment_update
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_update_one_notfound(self, client, mocker, mock_session, mock_user):
|
||||
shipment_body = shipment_factory.shipment_body_factory(name='test shipment update')
|
||||
shipment_update = shipment_factory.shipment_update_factory(name='test shipment update')
|
||||
def test_update_one_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
shipment_body = shipment_factory.shipment_body_factory(
|
||||
name='test shipment update'
|
||||
)
|
||||
shipment_update = shipment_factory.shipment_update_factory(
|
||||
name='test shipment update'
|
||||
)
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'update_one',
|
||||
side_effect=exceptions.ShipmentNotFoundError(messages.Messages.not_found('shipment'))
|
||||
side_effect=exceptions.ShipmentNotFoundError(
|
||||
messages.Messages.not_found('shipment')
|
||||
)
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
response = client.put('/api/shipments/2', json=shipment_body)
|
||||
response_data = response.json()
|
||||
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
@@ -195,11 +314,22 @@ class TestShipments:
|
||||
2,
|
||||
shipment_update
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_update_one_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_update_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
shipment_body = shipment_factory.shipment_body_factory(name='test shipment update')
|
||||
shipment_body = shipment_factory.shipment_body_factory(
|
||||
name='test shipment update'
|
||||
)
|
||||
|
||||
app.dependency_overrides[get_current_user] = unauthorized
|
||||
|
||||
@@ -211,14 +341,27 @@ class TestShipments:
|
||||
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
def test_delete_one(self, client, mocker, mock_session, mock_user):
|
||||
shipment_result = shipment_factory.shipment_public_factory(name='test shipment delete')
|
||||
def test_delete_one(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
shipment_result = shipment_factory.shipment_public_factory(
|
||||
name='test shipment delete'
|
||||
)
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'delete_one',
|
||||
return_value=shipment_result
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
response = client.delete('/api/shipments/2')
|
||||
response_data = response.json()
|
||||
@@ -229,29 +372,52 @@ class TestShipments:
|
||||
mock_session,
|
||||
2,
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_delete_one_notfound(self, client, mocker, mock_session, mock_user):
|
||||
shipment_result = None
|
||||
|
||||
def test_delete_one_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'delete_one',
|
||||
side_effect=exceptions.ShipmentNotFoundError(messages.Messages.not_found('shipment'))
|
||||
side_effect=exceptions.ShipmentNotFoundError(
|
||||
messages.Messages.not_found('shipment')
|
||||
)
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
response = client.delete('/api/shipments/2')
|
||||
response_data = response.json()
|
||||
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
mock_session,
|
||||
2,
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
_id=2
|
||||
)
|
||||
|
||||
def test_delete_one_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_delete_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
shipment_body = shipment_factory.shipment_body_factory(name='test shipment delete')
|
||||
|
||||
app.dependency_overrides[get_current_user] = unauthorized
|
||||
|
||||
|
||||
@@ -1,14 +1,19 @@
|
||||
import src.users.service as service
|
||||
import src.models as models
|
||||
from src.main import app
|
||||
from src.auth.auth import get_current_user
|
||||
import tests.factories.users as user_factory
|
||||
import src.users.exceptions as exceptions
|
||||
|
||||
import src.users.service as service
|
||||
import tests.factories.users as user_factory
|
||||
from fastapi.exceptions import HTTPException
|
||||
from src.auth.auth import get_current_user
|
||||
from src.main import app
|
||||
|
||||
|
||||
class TestUsers:
|
||||
def test_get_all(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_all(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock_results = [
|
||||
user_factory.user_public_factory(name="test 1", id=1),
|
||||
user_factory.user_public_factory(name="test 2", id=2),
|
||||
@@ -30,7 +35,15 @@ class TestUsers:
|
||||
[],
|
||||
[],
|
||||
)
|
||||
def test_get_all_filters(self, client, mocker, mock_session, mock_user):
|
||||
assert mock_user
|
||||
|
||||
def test_get_all_filters(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock_results = [
|
||||
user_factory.user_public_factory(name="test 2", id=2),
|
||||
]
|
||||
@@ -39,7 +52,6 @@ class TestUsers:
|
||||
'get_all',
|
||||
return_value=mock_results
|
||||
)
|
||||
|
||||
response = client.get('/api/users?emails=test@test.test&names=test 2')
|
||||
response_data = response.json()
|
||||
assert response.status_code == 200
|
||||
@@ -50,8 +62,13 @@ class TestUsers:
|
||||
['test 2'],
|
||||
['test@test.test'],
|
||||
)
|
||||
assert mock_user
|
||||
|
||||
def test_get_all_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_all_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -65,7 +82,13 @@ class TestUsers:
|
||||
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
def test_get_one(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_one(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock_result = user_factory.user_public_factory(name="test 2", id=2)
|
||||
|
||||
mock = mocker.patch.object(
|
||||
@@ -73,6 +96,11 @@ class TestUsers:
|
||||
'get_one',
|
||||
return_value=mock_result
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
response = client.get('/api/users/2')
|
||||
response_data = response.json()
|
||||
@@ -83,23 +111,43 @@ class TestUsers:
|
||||
mock_session,
|
||||
2
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_user
|
||||
)
|
||||
|
||||
def test_get_one_notfound(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_one_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock_result = None
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'get_one',
|
||||
return_value=mock_result
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
response = client.get('/api/users/2')
|
||||
response_data = response.json()
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
mock_session,
|
||||
2
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_user
|
||||
)
|
||||
|
||||
def test_get_one_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_get_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -113,7 +161,13 @@ class TestUsers:
|
||||
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
def test_create_one(self, client, mocker, mock_session, mock_user):
|
||||
def test_create_one(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
user_body = user_factory.user_body_factory(name='test user create')
|
||||
user_create = user_factory.user_create_factory(name='test user create')
|
||||
user_result = user_factory.user_public_factory(name='test user create')
|
||||
@@ -123,6 +177,11 @@ class TestUsers:
|
||||
'create_one',
|
||||
return_value=user_result
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
response = client.post('/api/users', json=user_body)
|
||||
response_data = response.json()
|
||||
@@ -133,8 +192,15 @@ class TestUsers:
|
||||
mock_session,
|
||||
user_create
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_user
|
||||
)
|
||||
|
||||
def test_create_one_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_create_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
user_body = user_factory.user_body_factory(name='test user create')
|
||||
@@ -149,7 +215,13 @@ class TestUsers:
|
||||
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
def test_update_one(self, client, mocker, mock_session, mock_user):
|
||||
def test_update_one(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
user_body = user_factory.user_body_factory(name='test user update')
|
||||
user_update = user_factory.user_update_factory(name='test user update')
|
||||
user_result = user_factory.user_public_factory(name='test user update')
|
||||
@@ -159,6 +231,11 @@ class TestUsers:
|
||||
'update_one',
|
||||
return_value=user_result
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
response = client.put('/api/users/2', json=user_body)
|
||||
response_data = response.json()
|
||||
@@ -170,20 +247,32 @@ class TestUsers:
|
||||
2,
|
||||
user_update
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_user
|
||||
)
|
||||
|
||||
def test_update_one_notfound(self, client, mocker, mock_session, mock_user):
|
||||
def test_update_one_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
user_body = user_factory.user_body_factory(name='test user update')
|
||||
user_update = user_factory.user_update_factory(name='test user update')
|
||||
user_result = None
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'update_one',
|
||||
side_effect=exceptions.UserNotFoundError('User 2 not found')
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
response = client.put('/api/users/2', json=user_body)
|
||||
response_data = response.json()
|
||||
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
@@ -191,8 +280,15 @@ class TestUsers:
|
||||
2,
|
||||
user_update
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_user
|
||||
)
|
||||
|
||||
def test_update_one_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_update_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
user_body = user_factory.user_body_factory(name='test user update')
|
||||
@@ -207,7 +303,13 @@ class TestUsers:
|
||||
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
def test_delete_one(self, client, mocker, mock_session, mock_user):
|
||||
def test_delete_one(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
user_result = user_factory.user_public_factory(name='test user delete')
|
||||
|
||||
mock = mocker.patch.object(
|
||||
@@ -215,6 +317,11 @@ class TestUsers:
|
||||
'delete_one',
|
||||
return_value=user_result
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
response = client.delete('/api/users/2')
|
||||
response_data = response.json()
|
||||
@@ -225,30 +332,46 @@ class TestUsers:
|
||||
mock_session,
|
||||
2,
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_user
|
||||
)
|
||||
|
||||
def test_delete_one_notfound(self, client, mocker, mock_session, mock_user):
|
||||
user_result = None
|
||||
|
||||
def test_delete_one_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'delete_one',
|
||||
side_effect=exceptions.UserNotFoundError('User 2 not found')
|
||||
)
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
response = client.delete('/api/users/2')
|
||||
response_data = response.json()
|
||||
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
mock_session,
|
||||
2,
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_user
|
||||
)
|
||||
|
||||
def test_delete_one_unauthorized(self, client, mocker, mock_session, mock_user):
|
||||
def test_delete_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
user_body = user_factory.user_body_factory(name='test user delete')
|
||||
|
||||
app.dependency_overrides[get_current_user] = unauthorized
|
||||
|
||||
mock = mocker.patch('src.users.service.delete_one')
|
||||
|
||||
3
backend/tests/services/__init__.py
Normal file
3
backend/tests/services/__init__.py
Normal file
@@ -0,0 +1,3 @@
|
||||
# SPDX-FileCopyrightText: 2026-present Julien Aldon <julien.aldon@wanadoo.fr>
|
||||
#
|
||||
# SPDX-License-Identifier: MIT
|
||||
@@ -1,35 +1,41 @@
|
||||
import pytest
|
||||
from sqlmodel import Session
|
||||
|
||||
import src.models as models
|
||||
import src.forms.service as forms_service
|
||||
import src.forms.exceptions as forms_exceptions
|
||||
import src.forms.service as forms_service
|
||||
import tests.factories.forms as forms_factory
|
||||
from sqlmodel import Session
|
||||
from src import models
|
||||
|
||||
|
||||
class TestFormsService:
|
||||
def test_get_all_forms(self, session: Session, forms: list[models.FormPublic]):
|
||||
def test_get_all_forms(self, session: Session,
|
||||
forms: list[models.FormPublic]):
|
||||
result = forms_service.get_all(session, [], [], False)
|
||||
|
||||
assert len(result) == 2
|
||||
assert result == forms
|
||||
|
||||
def test_get_all_forms_filter_productors(self, session: Session, forms: list[models.FormPublic]):
|
||||
def test_get_all_forms_filter_productors(
|
||||
self, session: Session, forms: list[models.FormPublic]):
|
||||
result = forms_service.get_all(session, [], ['test productor'], False)
|
||||
|
||||
assert len(result) == 2
|
||||
assert result == forms
|
||||
|
||||
def test_get_all_forms_filter_season(self, session: Session, forms: list[models.FormPublic]):
|
||||
def test_get_all_forms_filter_season(
|
||||
self, session: Session, forms: list[models.FormPublic]):
|
||||
result = forms_service.get_all(session, ['test season 1'], [], False)
|
||||
|
||||
assert len(result) == 1
|
||||
|
||||
def test_get_all_forms_all_filters(self, session: Session, forms: list[models.FormPublic]):
|
||||
result = forms_service.get_all(session, ['test season 1'], ['test productor'], True)
|
||||
def test_get_all_forms_all_filters(
|
||||
self, session: Session, forms: list[models.FormPublic]):
|
||||
result = forms_service.get_all(
|
||||
session, ['test season 1'], ['test productor'], True)
|
||||
|
||||
assert result == forms
|
||||
|
||||
def test_get_one_form(self, session: Session, forms: list[models.FormPublic]):
|
||||
def test_get_one_form(self, session: Session,
|
||||
forms: list[models.FormPublic]):
|
||||
result = forms_service.get_one(session, forms[0].id)
|
||||
|
||||
assert result == forms[0]
|
||||
@@ -37,7 +43,7 @@ class TestFormsService:
|
||||
def test_get_one_form_notfound(self, session: Session):
|
||||
result = forms_service.get_one(session, 122)
|
||||
|
||||
assert result == None
|
||||
assert result is None
|
||||
|
||||
def test_create_form(
|
||||
self,
|
||||
@@ -77,7 +83,6 @@ class TestFormsService:
|
||||
with pytest.raises(forms_exceptions.UserNotFoundError):
|
||||
result = forms_service.create_one(session, form_create)
|
||||
|
||||
|
||||
def test_update_form(
|
||||
self,
|
||||
session: Session,
|
||||
@@ -141,7 +146,7 @@ class TestFormsService:
|
||||
result = forms_service.delete_one(session, form_id)
|
||||
|
||||
check = forms_service.get_one(session, form_id)
|
||||
assert check == None
|
||||
assert check is None
|
||||
|
||||
def test_delete_form_notfound(
|
||||
self,
|
||||
@@ -151,4 +156,3 @@ class TestFormsService:
|
||||
form_id = 123
|
||||
with pytest.raises(forms_exceptions.FormNotFoundError):
|
||||
result = forms_service.delete_one(session, form_id)
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import pytest
|
||||
from sqlmodel import Session
|
||||
|
||||
import src.models as models
|
||||
import src.productors.service as productors_service
|
||||
import src.productors.exceptions as productors_exceptions
|
||||
import src.productors.service as productors_service
|
||||
import tests.factories.productors as productors_factory
|
||||
from sqlmodel import Session
|
||||
from src import models
|
||||
|
||||
|
||||
class TestProductorsService:
|
||||
def test_get_all_productors(
|
||||
@@ -63,7 +63,9 @@ class TestProductorsService:
|
||||
|
||||
assert len(result) == 1
|
||||
|
||||
def test_get_one_productor(self, session: Session, productors: list[models.ProductorPublic]):
|
||||
def test_get_one_productor(self,
|
||||
session: Session,
|
||||
productors: list[models.ProductorPublic]):
|
||||
result = productors_service.get_one(session, productors[0].id)
|
||||
|
||||
assert result == productors[0]
|
||||
@@ -71,7 +73,7 @@ class TestProductorsService:
|
||||
def test_get_one_productor_notfound(self, session: Session):
|
||||
result = productors_service.get_one(session, 122)
|
||||
|
||||
assert result == None
|
||||
assert result is None
|
||||
|
||||
def test_create_productor(
|
||||
self,
|
||||
@@ -104,7 +106,8 @@ class TestProductorsService:
|
||||
name='updated test productor',
|
||||
)
|
||||
productor_id = productors[0].id
|
||||
result = productors_service.update_one(session, productor_id, productor_update)
|
||||
result = productors_service.update_one(
|
||||
session, productor_id, productor_update)
|
||||
|
||||
assert result.id == productor_id
|
||||
assert result.name == 'updated test productor'
|
||||
@@ -119,7 +122,8 @@ class TestProductorsService:
|
||||
)
|
||||
productor_id = 123
|
||||
with pytest.raises(productors_exceptions.ProductorNotFoundError):
|
||||
result = productors_service.update_one(session, productor_id, productor_update)
|
||||
result = productors_service.update_one(
|
||||
session, productor_id, productor_update)
|
||||
|
||||
def test_delete_productor(
|
||||
self,
|
||||
@@ -130,7 +134,7 @@ class TestProductorsService:
|
||||
result = productors_service.delete_one(session, productor_id)
|
||||
|
||||
check = productors_service.get_one(session, productor_id)
|
||||
assert check == None
|
||||
assert check is None
|
||||
|
||||
def test_delete_productor_notfound(
|
||||
self,
|
||||
@@ -140,4 +144,3 @@ class TestProductorsService:
|
||||
productor_id = 123
|
||||
with pytest.raises(productors_exceptions.ProductorNotFoundError):
|
||||
result = productors_service.delete_one(session, productor_id)
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import pytest
|
||||
from sqlmodel import Session
|
||||
|
||||
import src.models as models
|
||||
import src.products.service as products_service
|
||||
import src.products.exceptions as products_exceptions
|
||||
import src.products.service as products_service
|
||||
import tests.factories.products as products_factory
|
||||
from sqlmodel import Session
|
||||
from src import models
|
||||
|
||||
|
||||
class TestProductsService:
|
||||
def test_get_all_products(
|
||||
@@ -83,7 +83,8 @@ class TestProductsService:
|
||||
|
||||
assert len(result) == 1
|
||||
|
||||
def test_get_one_product(self, session: Session, products: list[models.ProductPublic]):
|
||||
def test_get_one_product(self, session: Session,
|
||||
products: list[models.ProductPublic]):
|
||||
result = products_service.get_one(session, products[0].id)
|
||||
|
||||
assert result == products[0]
|
||||
@@ -91,7 +92,7 @@ class TestProductsService:
|
||||
def test_get_one_product_notfound(self, session: Session):
|
||||
result = products_service.get_one(session, 122)
|
||||
|
||||
assert result == None
|
||||
assert result is None
|
||||
|
||||
def test_create_product(
|
||||
self,
|
||||
@@ -118,7 +119,8 @@ class TestProductsService:
|
||||
with pytest.raises(products_exceptions.ProductCreateError):
|
||||
result = products_service.create_one(session, product_create)
|
||||
|
||||
product_create = products_factory.product_create_factory(productor_id=123)
|
||||
product_create = products_factory.product_create_factory(
|
||||
productor_id=123)
|
||||
with pytest.raises(products_exceptions.ProductorNotFoundError):
|
||||
result = products_service.create_one(session, product_create)
|
||||
|
||||
@@ -134,7 +136,8 @@ class TestProductsService:
|
||||
productor_id=productor.id,
|
||||
)
|
||||
product_id = products[0].id
|
||||
result = products_service.update_one(session, product_id, product_update)
|
||||
result = products_service.update_one(
|
||||
session, product_id, product_update)
|
||||
|
||||
assert result.id == product_id
|
||||
assert result.name == 'updated test product'
|
||||
@@ -151,7 +154,8 @@ class TestProductsService:
|
||||
)
|
||||
product_id = 123
|
||||
with pytest.raises(products_exceptions.ProductNotFoundError):
|
||||
result = products_service.update_one(session, product_id, product_update)
|
||||
result = products_service.update_one(
|
||||
session, product_id, product_update)
|
||||
|
||||
def test_update_product_invalidinput(
|
||||
self,
|
||||
@@ -160,9 +164,11 @@ class TestProductsService:
|
||||
products: list[models.ProductPublic]
|
||||
):
|
||||
product_id = products[0].id
|
||||
product_update = products_factory.product_update_factory(productor_id=123)
|
||||
product_update = products_factory.product_update_factory(
|
||||
productor_id=123)
|
||||
with pytest.raises(products_exceptions.ProductorNotFoundError):
|
||||
result = products_service.update_one(session, product_id, product_update)
|
||||
result = products_service.update_one(
|
||||
session, product_id, product_update)
|
||||
|
||||
product_update = products_factory.product_update_factory(
|
||||
productor_id=productor.id,
|
||||
@@ -178,7 +184,7 @@ class TestProductsService:
|
||||
result = products_service.delete_one(session, product_id)
|
||||
|
||||
check = products_service.get_one(session, product_id)
|
||||
assert check == None
|
||||
assert check is None
|
||||
|
||||
def test_delete_product_notfound(
|
||||
self,
|
||||
@@ -188,4 +194,3 @@ class TestProductsService:
|
||||
product_id = 123
|
||||
with pytest.raises(products_exceptions.ProductNotFoundError):
|
||||
result = products_service.delete_one(session, product_id)
|
||||
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
import pytest
|
||||
import datetime
|
||||
from sqlmodel import Session
|
||||
|
||||
import src.models as models
|
||||
import src.shipments.service as shipments_service
|
||||
import pytest
|
||||
import src.shipments.exceptions as shipments_exceptions
|
||||
import src.shipments.service as shipments_service
|
||||
import tests.factories.shipments as shipments_factory
|
||||
from sqlmodel import Session
|
||||
from src import models
|
||||
|
||||
|
||||
class TestShipmentsService:
|
||||
def test_get_all_shipments(
|
||||
@@ -25,7 +26,8 @@ class TestShipmentsService:
|
||||
shipments: list[models.ShipmentPublic],
|
||||
user: models.UserPublic,
|
||||
):
|
||||
result = shipments_service.get_all(session, user, ['test shipment 1'], [], [])
|
||||
result = shipments_service.get_all(
|
||||
session, user, ['test shipment 1'], [], [])
|
||||
|
||||
assert len(result) == 1
|
||||
assert result == [shipments[0]]
|
||||
@@ -36,7 +38,8 @@ class TestShipmentsService:
|
||||
shipments: list[models.ShipmentPublic],
|
||||
user: models.UserPublic,
|
||||
):
|
||||
result = shipments_service.get_all(session, user, [], ['2025-10-10'], [])
|
||||
result = shipments_service.get_all(
|
||||
session, user, [], ['2025-10-10'], [])
|
||||
|
||||
assert len(result) == 1
|
||||
|
||||
@@ -47,7 +50,8 @@ class TestShipmentsService:
|
||||
forms: list[models.FormPublic],
|
||||
user: models.UserPublic,
|
||||
):
|
||||
result = shipments_service.get_all(session, user, [], [], [forms[0].name])
|
||||
result = shipments_service.get_all(
|
||||
session, user, [], [], [forms[0].name])
|
||||
|
||||
assert len(result) == 2
|
||||
|
||||
@@ -58,11 +62,13 @@ class TestShipmentsService:
|
||||
forms: list[models.FormPublic],
|
||||
user: models.UserPublic,
|
||||
):
|
||||
result = shipments_service.get_all(session, user, ['test shipment 1'], ['2025-10-10'], [forms[0].name])
|
||||
result = shipments_service.get_all(session, user, ['test shipment 1'], [
|
||||
'2025-10-10'], [forms[0].name])
|
||||
|
||||
assert len(result) == 1
|
||||
|
||||
def test_get_one_shipment(self, session: Session, shipments: list[models.ShipmentPublic]):
|
||||
def test_get_one_shipment(self, session: Session,
|
||||
shipments: list[models.ShipmentPublic]):
|
||||
result = shipments_service.get_one(session, shipments[0].id)
|
||||
|
||||
assert result == shipments[0]
|
||||
@@ -70,7 +76,7 @@ class TestShipmentsService:
|
||||
def test_get_one_shipment_notfound(self, session: Session):
|
||||
result = shipments_service.get_one(session, 122)
|
||||
|
||||
assert result == None
|
||||
assert result is None
|
||||
|
||||
def test_create_shipment(
|
||||
self,
|
||||
@@ -103,7 +109,8 @@ class TestShipmentsService:
|
||||
date='2025-12-10',
|
||||
)
|
||||
shipment_id = shipments[0].id
|
||||
result = shipments_service.update_one(session, shipment_id, shipment_update)
|
||||
result = shipments_service.update_one(
|
||||
session, shipment_id, shipment_update)
|
||||
|
||||
assert result.id == shipment_id
|
||||
assert result.name == 'updated shipment 1'
|
||||
@@ -119,7 +126,8 @@ class TestShipmentsService:
|
||||
)
|
||||
shipment_id = 123
|
||||
with pytest.raises(shipments_exceptions.ShipmentNotFoundError):
|
||||
result = shipments_service.update_one(session, shipment_id, shipment_update)
|
||||
result = shipments_service.update_one(
|
||||
session, shipment_id, shipment_update)
|
||||
|
||||
def test_delete_shipment(
|
||||
self,
|
||||
@@ -130,7 +138,7 @@ class TestShipmentsService:
|
||||
result = shipments_service.delete_one(session, shipment_id)
|
||||
|
||||
check = shipments_service.get_one(session, shipment_id)
|
||||
assert check == None
|
||||
assert check is None
|
||||
|
||||
def test_delete_shipment_notfound(
|
||||
self,
|
||||
@@ -140,4 +148,3 @@ class TestShipmentsService:
|
||||
shipment_id = 123
|
||||
with pytest.raises(shipments_exceptions.ShipmentNotFoundError):
|
||||
result = shipments_service.delete_one(session, shipment_id)
|
||||
|
||||
|
||||
@@ -1,35 +1,41 @@
|
||||
import pytest
|
||||
from sqlmodel import Session
|
||||
|
||||
import src.models as models
|
||||
import src.users.service as users_service
|
||||
import src.users.exceptions as users_exceptions
|
||||
import src.users.service as users_service
|
||||
import tests.factories.users as users_factory
|
||||
from sqlmodel import Session
|
||||
from src import models
|
||||
|
||||
|
||||
class TestUsersService:
|
||||
def test_get_all_users(self, session: Session, users: list[models.UserPublic]):
|
||||
def test_get_all_users(self, session: Session,
|
||||
users: list[models.UserPublic]):
|
||||
result = users_service.get_all(session, [], [])
|
||||
|
||||
assert len(result) == 3
|
||||
assert result == users
|
||||
|
||||
def test_get_all_users_filter_names(self, session: Session, users: list[models.UserPublic]):
|
||||
def test_get_all_users_filter_names(
|
||||
self, session: Session, users: list[models.UserPublic]):
|
||||
result = users_service.get_all(session, ['test user 1 (admin)'], [])
|
||||
|
||||
assert len(result) == 1
|
||||
assert result == [users[0]]
|
||||
|
||||
def test_get_all_users_filter_emails(self, session: Session, users: list[models.UserPublic]):
|
||||
def test_get_all_users_filter_emails(
|
||||
self, session: Session, users: list[models.UserPublic]):
|
||||
result = users_service.get_all(session, [], ['test1@test.com'])
|
||||
|
||||
assert len(result) == 1
|
||||
|
||||
def test_get_all_users_all_filters(self, session: Session, users: list[models.UserPublic]):
|
||||
result = users_service.get_all(session, ['test user 1 (admin)'], ['test1@test.com'])
|
||||
def test_get_all_users_all_filters(
|
||||
self, session: Session, users: list[models.UserPublic]):
|
||||
result = users_service.get_all(
|
||||
session, ['test user 1 (admin)'], ['test1@test.com'])
|
||||
|
||||
assert len(result) == 1
|
||||
|
||||
def test_get_one_user(self, session: Session, users: list[models.UserPublic]):
|
||||
def test_get_one_user(self, session: Session,
|
||||
users: list[models.UserPublic]):
|
||||
result = users_service.get_one(session, users[0].id)
|
||||
|
||||
assert result == users[0]
|
||||
@@ -37,7 +43,7 @@ class TestUsersService:
|
||||
def test_get_one_user_notfound(self, session: Session):
|
||||
result = users_service.get_one(session, 122)
|
||||
|
||||
assert result == None
|
||||
assert result is None
|
||||
|
||||
def test_create_user(
|
||||
self,
|
||||
@@ -102,7 +108,7 @@ class TestUsersService:
|
||||
result = users_service.delete_one(session, user_id)
|
||||
|
||||
check = users_service.get_one(session, user_id)
|
||||
assert check == None
|
||||
assert check is None
|
||||
|
||||
def test_delete_user_notfound(
|
||||
self,
|
||||
@@ -112,4 +118,3 @@ class TestUsersService:
|
||||
user_id = 123
|
||||
with pytest.raises(users_exceptions.UserNotFoundError):
|
||||
result = users_service.delete_one(session, user_id)
|
||||
|
||||
|
||||
@@ -160,6 +160,7 @@
|
||||
"and/or": "and/or",
|
||||
"form name recommandation": "recommendation: Contract <contract-type> (Example: Pork-Lamb Contract)",
|
||||
"submit contract": "submit contract",
|
||||
"submit": "submit",
|
||||
"example in user forms": "example in user contract form",
|
||||
"occasional product": "occasional product",
|
||||
"recurrent product": "recurrent product",
|
||||
|
||||
@@ -160,6 +160,7 @@
|
||||
"and/or": "et/ou",
|
||||
"form name recommandation": "recommandation : Contrat <contract-type> (Exemple : Contrat Porc-Agneau)",
|
||||
"submit contract": "envoyer le contrat",
|
||||
"submit": "envoyer",
|
||||
"example in user forms": "exemple dans le formulaire à destination des amapiens",
|
||||
"occasional product": "produit occasionnel",
|
||||
"recurrent product": "produit récurrent",
|
||||
|
||||
@@ -26,6 +26,9 @@ export function ContractModal({ opened, onClose, handleSubmit }: ContractModalPr
|
||||
});
|
||||
|
||||
const formSelect = useMemo(() => {
|
||||
if (!allForms) {
|
||||
return [];
|
||||
}
|
||||
return allForms?.map((form) => ({
|
||||
value: String(form.id),
|
||||
label: `${form.season} ${form.name}`,
|
||||
|
||||
@@ -53,6 +53,8 @@ export default function FormModal({ opened, onClose, currentForm, handleSubmit }
|
||||
});
|
||||
|
||||
const usersSelect = useMemo(() => {
|
||||
if (!users)
|
||||
return [];
|
||||
return users?.map((user) => ({
|
||||
value: String(user.id),
|
||||
label: `${user.name}`,
|
||||
@@ -60,6 +62,8 @@ export default function FormModal({ opened, onClose, currentForm, handleSubmit }
|
||||
}, [users]);
|
||||
|
||||
const productorsSelect = useMemo(() => {
|
||||
if (!productors)
|
||||
return [];
|
||||
return productors?.map((prod) => ({
|
||||
value: String(prod.id),
|
||||
label: `${prod.name}`,
|
||||
|
||||
@@ -4,9 +4,12 @@ import "./index.css";
|
||||
import { Group, Loader } from "@mantine/core";
|
||||
import { Config } from "@/config/config";
|
||||
import { useAuth } from "@/services/auth/AuthProvider";
|
||||
import { useMediaQuery } from "@mantine/hooks";
|
||||
import { IconHome, IconLogin, IconLogout, IconSettings } from "@tabler/icons-react";
|
||||
|
||||
export function Navbar() {
|
||||
const { loggedUser: user, isLoading } = useAuth();
|
||||
const isPhone = useMediaQuery("(max-width: 760px");
|
||||
|
||||
if (!user && isLoading) {
|
||||
return (
|
||||
@@ -20,11 +23,11 @@ export function Navbar() {
|
||||
<nav>
|
||||
<Group>
|
||||
<NavLink className={"navLink"} aria-label={t("home")} to="/">
|
||||
{t("home", { capfirst: true })}
|
||||
{isPhone ? <IconHome/> : t("home", { capfirst: true })}
|
||||
</NavLink>
|
||||
{user?.logged ? (
|
||||
<NavLink className={"navLink"} aria-label={t("dashboard")} to="/dashboard/help">
|
||||
{t("dashboard", { capfirst: true })}
|
||||
{isPhone ? <IconSettings/> : t("dashboard", { capfirst: true })}
|
||||
</NavLink>
|
||||
) : null}
|
||||
</Group>
|
||||
@@ -34,7 +37,7 @@ export function Navbar() {
|
||||
className={"navLink"}
|
||||
aria-label={t("login with keycloak", { capfirst: true })}
|
||||
>
|
||||
{t("login with keycloak", { capfirst: true })}
|
||||
{isPhone ? <IconLogin/> : t("login with keycloak", { capfirst: true })}
|
||||
</a>
|
||||
) : (
|
||||
<a
|
||||
@@ -42,7 +45,7 @@ export function Navbar() {
|
||||
className={"navLink"}
|
||||
aria-label={t("logout", { capfirst: true })}
|
||||
>
|
||||
{t("logout", { capfirst: true })}
|
||||
{isPhone ? <IconLogout/> : t("logout", { capfirst: true })}
|
||||
</a>
|
||||
)}
|
||||
</nav>
|
||||
|
||||
@@ -19,7 +19,7 @@ import {
|
||||
type ProductorInputs,
|
||||
} from "@/services/resources/productors";
|
||||
import { useMemo } from "react";
|
||||
import { useGetRoles } from "@/services/api";
|
||||
import { useAuth } from "@/services/auth/AuthProvider";
|
||||
|
||||
export type ProductorModalProps = ModalBaseProps & {
|
||||
currentProductor?: Productor;
|
||||
@@ -32,7 +32,7 @@ export function ProductorModal({
|
||||
currentProductor,
|
||||
handleSubmit,
|
||||
}: ProductorModalProps) {
|
||||
const { data: allRoles } = useGetRoles();
|
||||
const { loggedUser } = useAuth();
|
||||
|
||||
const form = useForm<ProductorInputs>({
|
||||
initialValues: {
|
||||
@@ -58,8 +58,8 @@ export function ProductorModal({
|
||||
});
|
||||
|
||||
const roleSelect = useMemo(() => {
|
||||
return allRoles?.map((role) => ({ value: String(role.name), label: role.name }));
|
||||
}, [allRoles]);
|
||||
return loggedUser?.user?.roles?.map((role) => ({ value: String(role.name), label: role.name }));
|
||||
}, [loggedUser?.user?.roles]);
|
||||
|
||||
return (
|
||||
<Modal opened={opened} onClose={onClose} title={t("create productor", { capfirst: true })}>
|
||||
|
||||
@@ -59,6 +59,8 @@ export function ProductModal({ opened, onClose, currentProduct, handleSubmit }:
|
||||
});
|
||||
|
||||
const productorsSelect = useMemo(() => {
|
||||
if (!productors)
|
||||
return [];
|
||||
return productors?.map((productor) => ({
|
||||
value: String(productor.id),
|
||||
label: `${productor.name}`,
|
||||
|
||||
@@ -48,6 +48,8 @@ export default function ShipmentModal({
|
||||
const { data: allProductors } = useGetProductors();
|
||||
|
||||
const formsSelect = useMemo(() => {
|
||||
if (!allForms)
|
||||
return [];
|
||||
return allForms?.map((currentForm) => ({
|
||||
value: String(currentForm.id),
|
||||
label: `${currentForm.name} ${currentForm.season}`,
|
||||
@@ -55,7 +57,7 @@ export default function ShipmentModal({
|
||||
}, [allForms]);
|
||||
|
||||
const productsSelect = useMemo(() => {
|
||||
if (!allProducts || !allProductors) return;
|
||||
if (!allProducts || !allProductors) return [];
|
||||
return allProductors?.map((productor) => {
|
||||
return {
|
||||
group: productor.name,
|
||||
|
||||
@@ -36,6 +36,8 @@ export function UserModal({ opened, onClose, currentUser, handleSubmit }: UserMo
|
||||
});
|
||||
|
||||
const roleSelect = useMemo(() => {
|
||||
if (!allRoles)
|
||||
return [];
|
||||
return allRoles?.map((role) => ({ value: String(role.name), label: role.name }));
|
||||
}, [allRoles]);
|
||||
|
||||
|
||||
@@ -165,7 +165,7 @@ export function Contract() {
|
||||
);
|
||||
|
||||
return (
|
||||
<Stack w={{ base: "100%", md: "80%", lg: "50%" }}>
|
||||
<Stack w={{ base: "100%", md: "80%", lg: "50%" }} p={{base: 'xs'}}>
|
||||
<Title order={2}>{form.name}</Title>
|
||||
<Title order={3}>{t("informations", { capfirst: true })}</Title>
|
||||
<Text size="sm">
|
||||
@@ -283,6 +283,10 @@ export function Contract() {
|
||||
ref={(el) => {
|
||||
inputRefs.current.payment_method = el;
|
||||
}}
|
||||
comboboxProps={{
|
||||
withinPortal: false,
|
||||
position: "bottom-start",
|
||||
}}
|
||||
/>
|
||||
{inputForm.values.payment_method === "cheque" ? (
|
||||
<ContractCheque
|
||||
@@ -319,7 +323,7 @@ export function Contract() {
|
||||
<Button
|
||||
leftSection={<IconDownload/>}
|
||||
aria-label={t("submit contracts")} onClick={handleSubmit}>
|
||||
{t("submit contract", {capfirst: true})}
|
||||
{t("submit", {capfirst: true})}
|
||||
</Button>
|
||||
</Overlay>
|
||||
</Stack>
|
||||
|
||||
@@ -27,6 +27,8 @@ export default function Contracts() {
|
||||
const { data: allContracts } = useGetContracts();
|
||||
|
||||
const forms = useMemo(() => {
|
||||
if (!allContracts)
|
||||
return [];
|
||||
return allContracts
|
||||
?.map((contract: Contract) => contract.form.name)
|
||||
.filter((contract, index, array) => array.indexOf(contract) === index);
|
||||
@@ -89,7 +91,7 @@ export default function Contracts() {
|
||||
label={t("download recap", { capfirst: true })}
|
||||
>
|
||||
<ActionIcon
|
||||
disabled={true}
|
||||
disabled={false}
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
navigate(
|
||||
|
||||
@@ -40,12 +40,16 @@ export default function Productors() {
|
||||
}, [navigate, searchParams]);
|
||||
|
||||
const names = useMemo(() => {
|
||||
if (!allProductors)
|
||||
return [];
|
||||
return allProductors
|
||||
?.map((productor: Productor) => productor.name)
|
||||
.filter((season, index, array) => array.indexOf(season) === index);
|
||||
}, [allProductors]);
|
||||
|
||||
const types = useMemo(() => {
|
||||
if (!allProductors)
|
||||
return [];
|
||||
return allProductors
|
||||
?.map((productor: Productor) => productor.type)
|
||||
.filter((productor, index, array) => array.indexOf(productor) === index);
|
||||
|
||||
@@ -38,12 +38,16 @@ export default function Products() {
|
||||
const { data: allProducts } = useGetProducts();
|
||||
|
||||
const names = useMemo(() => {
|
||||
if (!allProducts)
|
||||
return [];
|
||||
return allProducts
|
||||
?.map((product: Product) => product.name)
|
||||
.filter((season, index, array) => array.indexOf(season) === index);
|
||||
}, [allProducts]);
|
||||
|
||||
const productors = useMemo(() => {
|
||||
if (!allProducts)
|
||||
return [];
|
||||
return allProducts
|
||||
?.map((product: Product) => product.productor.name)
|
||||
.filter((productor, index, array) => array.indexOf(productor) === index);
|
||||
|
||||
@@ -44,12 +44,16 @@ export default function Shipments() {
|
||||
const { data: allShipments } = useGetShipments();
|
||||
|
||||
const names = useMemo(() => {
|
||||
if (!allShipments)
|
||||
return [];
|
||||
return allShipments
|
||||
?.map((shipment: Shipment) => shipment.name)
|
||||
.filter((season, index, array) => array.indexOf(season) === index);
|
||||
}, [allShipments]);
|
||||
|
||||
const forms = useMemo(() => {
|
||||
if (!allShipments)
|
||||
return [];
|
||||
return allShipments
|
||||
?.map((shipment: Shipment) => shipment.form.name)
|
||||
.filter((season, index, array) => array.indexOf(season) === index);
|
||||
|
||||
@@ -36,6 +36,8 @@ export default function Users() {
|
||||
const { data: allUsers } = useGetUsers();
|
||||
|
||||
const names = useMemo(() => {
|
||||
if (!allUsers)
|
||||
return [];
|
||||
return allUsers
|
||||
?.map((user: User) => user.name)
|
||||
.filter((season, index, array) => array.indexOf(season) === index);
|
||||
|
||||
Reference in New Issue
Block a user