Compare commits
18 Commits
3cfa60507e
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4c3c5cfc60 | ||
|
|
85df411724 | ||
|
|
f0fd0efb7f | ||
|
|
6a4de725b5 | ||
|
|
71839b0ccf | ||
|
|
7bf20bafa8 | ||
|
|
76bc1c2302 | ||
|
|
46b369ecd9 | ||
|
|
74bf1474e2 | ||
|
|
61710a0347 | ||
|
|
e970bb683a | ||
|
|
c27c7598b5 | ||
| b4b4fa7643 | |||
| 60812652cf | |||
| cb0235e19f | |||
|
|
5c356f5802 | ||
|
|
ff19448991 | ||
| 5e413b11e0 |
@@ -24,3 +24,6 @@
|
||||
### Show on cascade deletion
|
||||
|
||||
## Update contract after (without registration)
|
||||
|
||||
## Preview form (if not visible can be accessed by referer nothing is stored)
|
||||
## View and edit contract application (dashboard/contracts/id/edit/)
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
default_language_version:
|
||||
python: python3.13
|
||||
|
||||
repos:
|
||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||
rev: v6.0.0
|
||||
hooks:
|
||||
- id: check-added-large-files
|
||||
- id: trailing-whitespace
|
||||
- id: check-ast
|
||||
- id: check-builtin-literals
|
||||
- id: check-docstring-first
|
||||
- id: check-yaml
|
||||
- id: check-toml
|
||||
- id: mixed-line-ending
|
||||
- id: end-of-file-fixer
|
||||
- repo: local
|
||||
hooks:
|
||||
- id: check-pylint
|
||||
name: check-pylint
|
||||
entry: pylint -d R0801,R0903,W0511,W0603,C0103,R0902
|
||||
language: system
|
||||
types: [python]
|
||||
pass_filenames: false
|
||||
args:
|
||||
- backend
|
||||
@@ -34,8 +34,6 @@ dependencies = [
|
||||
"pytest",
|
||||
"pytest-cov",
|
||||
"pytest-mock",
|
||||
"autopep8",
|
||||
"prek",
|
||||
"pylint",
|
||||
]
|
||||
|
||||
|
||||
0
backend/src/auth/__init__.py
Normal file
0
backend/src/auth/__init__.py
Normal file
@@ -1,20 +1,20 @@
|
||||
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')
|
||||
|
||||
@@ -77,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,
|
||||
@@ -98,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)
|
||||
@@ -108,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
|
||||
|
||||
@@ -159,13 +182,16 @@ def verify_token(token: str):
|
||||
leeway=60,
|
||||
)
|
||||
return decoded
|
||||
except jwt.ExpiredSignatureError:
|
||||
raise HTTPException(status_code=401,
|
||||
detail=messages.Messages.tokenexipired)
|
||||
except jwt.InvalidTokenError:
|
||||
except jwt.ExpiredSignatureError as error:
|
||||
raise HTTPException(
|
||||
status_code=401,
|
||||
detail=messages.Messages.invalidtoken)
|
||||
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(
|
||||
@@ -173,26 +199,35 @@ def get_current_user(
|
||||
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',
|
||||
@@ -203,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,
|
||||
@@ -216,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
|
||||
)
|
||||
@@ -224,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
|
||||
)
|
||||
@@ -249,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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,11 +4,10 @@ import zipfile
|
||||
|
||||
import src.contracts.service as service
|
||||
import src.forms.service as form_service
|
||||
import src.messages as messages
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
||||
from fastapi.responses import StreamingResponse
|
||||
from sqlmodel import Session
|
||||
from src import models
|
||||
from src import messages, models
|
||||
from src.auth.auth import get_current_user
|
||||
from src.contracts.generate_contract import (generate_html_contract,
|
||||
generate_recap)
|
||||
@@ -17,88 +16,6 @@ from src.database import get_session
|
||||
router = APIRouter(prefix='/contracts')
|
||||
|
||||
|
||||
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
|
||||
|
||||
|
||||
@router.post('')
|
||||
async def create_contract(
|
||||
contract: models.ContractCreate,
|
||||
@@ -114,7 +31,7 @@ async def create_contract(
|
||||
new_contract.products
|
||||
)
|
||||
)
|
||||
occasionals = create_occasional_dict(occasional_contract_products)
|
||||
occasionals = service.create_occasional_dict(occasional_contract_products)
|
||||
recurrents = list(
|
||||
map(
|
||||
lambda x: {'product': x.product, 'quantity': x.quantity},
|
||||
@@ -127,11 +44,13 @@ async def create_contract(
|
||||
)
|
||||
)
|
||||
)
|
||||
recurrent_price = compute_recurrent_prices(
|
||||
prices = service.generate_products_prices(
|
||||
occasionals,
|
||||
recurrents,
|
||||
len(new_contract.form.shipments)
|
||||
new_contract.form.shipments
|
||||
)
|
||||
price = recurrent_price + compute_occasional_prices(occasionals)
|
||||
recurrent_price = prices['recurrent']
|
||||
total_price = prices['total']
|
||||
cheques = list(
|
||||
map(
|
||||
lambda x: {'name': x.name, 'value': x.value},
|
||||
@@ -145,7 +64,7 @@ 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 = (
|
||||
@@ -154,7 +73,8 @@ async def create_contract(
|
||||
f'{new_contract.form.productor.type}_'
|
||||
f'{new_contract.form.season}'
|
||||
)
|
||||
service.add_contract_file(session, new_contract.id, pdf_bytes, price)
|
||||
service.add_contract_file(
|
||||
session, new_contract.id, pdf_bytes, total_price)
|
||||
except Exception as error:
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
@@ -276,6 +196,24 @@ def get_contract_file(
|
||||
)
|
||||
|
||||
|
||||
@router.get(
|
||||
'/{_id}/preview-delete',
|
||||
response_model=list[models.DeleteDependency]
|
||||
)
|
||||
async def preview_delete(
|
||||
_id: int,
|
||||
session: Session = Depends(get_session),
|
||||
user: models.User = Depends(get_current_user),
|
||||
):
|
||||
if not service.is_allowed(session, user, _id=_id):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('contract', 'delete')
|
||||
)
|
||||
result = []
|
||||
return result
|
||||
|
||||
|
||||
@router.get('/{form_id}/files')
|
||||
def get_contract_files(
|
||||
form_id: int,
|
||||
@@ -329,12 +267,18 @@ def get_contract_recap(
|
||||
)
|
||||
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'
|
||||
recap = generate_recap(contracts, form)
|
||||
if recap is None:
|
||||
raise HTTPException(
|
||||
status_code=404, detail=messages.Messages.not_found('contracts')
|
||||
)
|
||||
return StreamingResponse(
|
||||
io.BytesIO(generate_recap(contracts, form)),
|
||||
media_type='application/zip',
|
||||
io.BytesIO(recap),
|
||||
media_type='application/vnd.oasis.opendocument.spreadsheet',
|
||||
headers={
|
||||
'Content-Disposition': (
|
||||
'attachment; filename=filename.ods'
|
||||
f'attachment; filename={filename}'
|
||||
)
|
||||
}
|
||||
)
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
import html
|
||||
import io
|
||||
import pathlib
|
||||
import string
|
||||
|
||||
import jinja2
|
||||
import odfdo
|
||||
# from odfdo import Cell, Document, Row, Style, Table
|
||||
from odfdo.element import Element
|
||||
from src import models
|
||||
from src.contracts import service
|
||||
from weasyprint import HTML
|
||||
|
||||
|
||||
@@ -18,11 +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"]))
|
||||
loader=template_loader,
|
||||
autoescape=jinja2.select_autoescape(["html", "xml"])
|
||||
)
|
||||
template_file = "layout.html"
|
||||
template = template_env.get_template(template_file)
|
||||
output_text = template.render(
|
||||
@@ -65,13 +78,16 @@ def generate_html_contract(
|
||||
|
||||
|
||||
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.
|
||||
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.
|
||||
"""
|
||||
@@ -85,7 +101,8 @@ def create_column_style_width(size: str) -> odfdo.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.
|
||||
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.
|
||||
"""
|
||||
@@ -96,73 +113,204 @@ def create_row_style_height(size: str) -> odfdo.Style:
|
||||
)
|
||||
|
||||
|
||||
def create_center_cell_style(name: str = "centered-cell") -> odfdo.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'<style:style style:name="{name}" style:family="table-cell">'
|
||||
'<style:table-cell-properties style:vertical-align="middle" fo:wrap-option="wrap"/>'
|
||||
'<style:paragraph-properties fo:text-align="center"/>'
|
||||
'</style:style>'
|
||||
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_with_font(name: str = "font", font_size="14pt", bold: bool = False) -> odfdo.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" '
|
||||
f'xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0">'
|
||||
'<style:table-cell-properties style:vertical-align="middle" fo:wrap-option="wrap"/>'
|
||||
f'<style:paragraph-properties fo:text-align="center" fo:font-size="{font_size}" '
|
||||
f'{"fo:font-weight=\"bold\"" if bold else ""}/>'
|
||||
'</style:style>'
|
||||
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_center_cell_style(document: odfdo.Document, row: odfdo.Row):
|
||||
style = document.insert_style(
|
||||
create_center_cell_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(),
|
||||
)
|
||||
for cell in row.get_cells():
|
||||
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_height_style(document: odfdo.Document, row: odfdo.Row, height: str):
|
||||
style = document.insert_style(
|
||||
style=create_row_style_height(height), name=height, automatic=True
|
||||
)
|
||||
row.style = style
|
||||
|
||||
|
||||
def apply_font_style(document: odfdo.Document, table: odfdo.Table, size: str = "14pt"):
|
||||
style_header = document.insert_style(
|
||||
style=create_cell_style_with_font(
|
||||
'header_font', font_size=size, bold=True
|
||||
)
|
||||
)
|
||||
|
||||
style_body = document.insert_style(
|
||||
style=create_cell_style_with_font(
|
||||
'body_font', font_size=size, bold=False
|
||||
)
|
||||
)
|
||||
|
||||
for position in range(table.height):
|
||||
row = table.get_row(position)
|
||||
for cell in row.get_cells():
|
||||
cell.style = style_header if position == 0 or position == 1 else style_body
|
||||
for paragraph in cell.get_paragraphs():
|
||||
paragraph.style = cell.style
|
||||
|
||||
|
||||
def apply_column_width_style(document: odfdo.Document, table: odfdo.Table, widths: list[str]):
|
||||
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.
|
||||
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))
|
||||
style=create_column_style_width(w), name=w, automatic=True)
|
||||
)
|
||||
|
||||
for position in range(table.width):
|
||||
col = table.get_column(position)
|
||||
@@ -170,75 +318,272 @@ def apply_column_width_style(document: odfdo.Document, table: odfdo.Table, width
|
||||
table.set_column(position, col)
|
||||
|
||||
|
||||
def generate_recap(
|
||||
contracts: list[models.Contract],
|
||||
form: models.Form,
|
||||
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]
|
||||
):
|
||||
recurrents = [pr.name for pr in form.productor.products if pr.type ==
|
||||
models.ProductType.RECCURENT]
|
||||
recurrents.sort()
|
||||
occasionnals = [pr.name 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]
|
||||
shipment_header = flatten(
|
||||
[[f'{shipment.name} - {shipment.date.strftime('%Y-%m-%d')}'] + ["" * len(occasionnals)] for shipment in shipments])
|
||||
product_unit_map = {
|
||||
"1": "g",
|
||||
"2": "kg",
|
||||
"3": "p"
|
||||
}
|
||||
|
||||
header = (
|
||||
["Nom", "Email"] +
|
||||
["Tarif panier", "Total Paniers", "Total à payer"] +
|
||||
["Cheque 1", "Cheque 2", "Cheque 3"] +
|
||||
[f"Total {len(shipments)} livraisons + produits occasionnels"] +
|
||||
recurrents +
|
||||
occasionnals_header +
|
||||
["Remarques", "Nom"]
|
||||
)
|
||||
|
||||
data = [
|
||||
[""] * (9 + len(recurrents)) + shipment_header,
|
||||
header,
|
||||
*[
|
||||
[
|
||||
f'{contract.firstname} {contract.lastname}',
|
||||
f'{contract.email}',
|
||||
*[f'{pr.quantity} {product_unit_map[pr.product.unit]}' for pr in sorted(
|
||||
contract.products, key=lambda x: x.product.name) if pr.product.type == models.ProductType.RECCURENT],
|
||||
*[f'{pr.quantity} {product_unit_map[pr.product.unit]}' for pr in sorted(
|
||||
contract.products, key=lambda x: x.product.name) if pr.product.type == models.ProductType.OCCASIONAL],
|
||||
"",
|
||||
f'{contract.firstname} {contract.lastname}',
|
||||
] for contract in contracts
|
||||
]
|
||||
]
|
||||
|
||||
doc = odfdo.Document("spreadsheet")
|
||||
sheet = doc.body.get_sheet(0)
|
||||
sheet.name = 'Recap'
|
||||
sheet.set_values(data)
|
||||
apply_column_width_style(doc, doc.body.get_table(0), ["4cm"] * len(header))
|
||||
apply_column_height_style(
|
||||
doc,
|
||||
doc.body.get_table(0).get_rows((1, 1))[0],
|
||||
"1.20cm"
|
||||
)
|
||||
apply_center_cell_style(doc, doc.body.get_table(0).get_rows((1, 1))[0])
|
||||
apply_font_style(doc, doc.body.get_table(0))
|
||||
index = 9 + len(recurrents)
|
||||
"""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)
|
||||
|
||||
doc.body.append(sheet)
|
||||
|
||||
def generate_recap(
|
||||
contracts: list[models.Contract],
|
||||
form: models.Form,
|
||||
):
|
||||
"""Generate excel recap for a list of contracts.
|
||||
"""
|
||||
product_unit_map = {
|
||||
'1': 'g',
|
||||
'2': 'Kg',
|
||||
'3': 'Piece'
|
||||
}
|
||||
if len(contracts) <= 0:
|
||||
# TODO: raise correct exception
|
||||
return None
|
||||
first_contract = contracts[0]
|
||||
reccurents_sorted = sorted(
|
||||
[
|
||||
product for product in first_contract.products
|
||||
if product.product.type == models.ProductType.RECCURENT
|
||||
],
|
||||
key=lambda x: (x.product.name, x.product.quantity)
|
||||
)
|
||||
recurrents = [
|
||||
f'{pr.product.name}{f' - {pr.product.quantity}{pr.product.quantity_unit}'
|
||||
if pr.product.quantity else ''} ({product_unit_map[pr.product.unit]})'
|
||||
for pr in reccurents_sorted
|
||||
]
|
||||
occasionnals_sorted = sorted(
|
||||
[
|
||||
product for product in first_contract.products
|
||||
if product.product.type == models.ProductType.OCCASIONAL
|
||||
],
|
||||
key=lambda x: (x.shipment.name, x.product.name)
|
||||
)
|
||||
occasionnals = [
|
||||
f'{pr.product.name}{f' - {pr.product.quantity}{pr.product.quantity_unit}'
|
||||
if pr.product.quantity else ''} ({product_unit_map[pr.product.unit]})'
|
||||
for pr in occasionnals_sorted
|
||||
]
|
||||
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, x.product.quantity)
|
||||
)
|
||||
|
||||
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)
|
||||
|
||||
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,
|
||||
]
|
||||
)
|
||||
doc.body.append(sheet)
|
||||
buffer = io.BytesIO()
|
||||
doc.save('test.ods')
|
||||
doc.save(buffer)
|
||||
return buffer.getvalue()
|
||||
|
||||
@@ -166,3 +166,103 @@ def is_allowed(
|
||||
.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,9 +1,8 @@
|
||||
import src.forms.exceptions as exceptions
|
||||
import src.forms.service as service
|
||||
import src.messages as messages
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
||||
from sqlmodel import Session
|
||||
from src import models
|
||||
from src import messages, models
|
||||
from src.auth.auth import get_current_user
|
||||
from src.database import get_session
|
||||
|
||||
@@ -31,8 +30,35 @@ async def get_forms_filtered(
|
||||
return service.get_all(session, seasons, productors, current_season, user)
|
||||
|
||||
|
||||
@router.get(
|
||||
'/{_id}/preview-delete',
|
||||
response_model=list[models.DeleteDependency]
|
||||
)
|
||||
async def preview_delete(
|
||||
_id: int,
|
||||
session: Session = Depends(get_session),
|
||||
user: models.User = Depends(get_current_user),
|
||||
):
|
||||
if not service.is_allowed(session, user, _id=_id):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('forms', 'delete')
|
||||
)
|
||||
try:
|
||||
result = service.get_delete_dependencies(
|
||||
session,
|
||||
_id
|
||||
)
|
||||
except exceptions.FormNotFoundError as error:
|
||||
raise HTTPException(status_code=404, detail=str(error)) from error
|
||||
return result
|
||||
|
||||
|
||||
@router.get('/{_id}', response_model=models.FormPublic)
|
||||
async def get_form(_id: int, session: Session = Depends(get_session)):
|
||||
async def get_form(
|
||||
_id: int,
|
||||
session: Session = Depends(get_session)
|
||||
):
|
||||
result = service.get_one(session, _id)
|
||||
if result is None:
|
||||
raise HTTPException(
|
||||
@@ -48,6 +74,11 @@ async def create_form(
|
||||
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:
|
||||
@@ -61,10 +92,16 @@ async def create_form(
|
||||
|
||||
@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)
|
||||
except exceptions.FormNotFoundError as error:
|
||||
@@ -82,6 +119,11 @@ async def delete_form(
|
||||
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)
|
||||
except exceptions.FormNotFoundError as error:
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
import src.forms.exceptions as exceptions
|
||||
import src.messages as messages
|
||||
from sqlalchemy import func
|
||||
from sqlmodel import Session, select
|
||||
from src import models
|
||||
from src import messages, models
|
||||
|
||||
|
||||
def get_all(
|
||||
@@ -108,12 +107,64 @@ def delete_one(session: Session, _id: int) -> models.FormPublic:
|
||||
return result
|
||||
|
||||
|
||||
def is_allowed(session: Session, user: models.User, _id: int) -> bool:
|
||||
def get_delete_dependencies(
|
||||
session: Session,
|
||||
_id: int
|
||||
) -> list[models.DeleteDependency]:
|
||||
statement = select(models.Form).where(models.Form.id == _id)
|
||||
result = session.exec(statement)
|
||||
form = result.first()
|
||||
if not form:
|
||||
raise exceptions.FormNotFoundError(messages.Messages.not_found('form'))
|
||||
statement_shipment = (
|
||||
select(models.Shipment)
|
||||
.where(models.Shipment.form_id == _id)
|
||||
.distinct()
|
||||
)
|
||||
statement_contracts = (
|
||||
select(models.Contract)
|
||||
.where(models.Contract.form_id == _id)
|
||||
.distinct()
|
||||
)
|
||||
shipments = session.exec(statement_shipment).all()
|
||||
contracts = session.exec(statement_contracts).all()
|
||||
result = [
|
||||
models.DeleteDependency(
|
||||
name=sh.name,
|
||||
id=sh.id,
|
||||
type='shipment'
|
||||
) for sh in shipments
|
||||
] + [
|
||||
models.DeleteDependency(
|
||||
name=f'{co.firstname} {co.lastname}',
|
||||
id=co.id,
|
||||
type='contract'
|
||||
) for co in contracts
|
||||
]
|
||||
return result
|
||||
|
||||
|
||||
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)
|
||||
models.Form.productor_id == models.Productor.id
|
||||
)
|
||||
.where(models.Form.id == _id)
|
||||
.where(
|
||||
models.Productor.type.in_(
|
||||
|
||||
@@ -5,6 +5,12 @@ from typing import Optional
|
||||
from sqlmodel import Column, Field, LargeBinary, Relationship, SQLModel
|
||||
|
||||
|
||||
class DeleteDependency(SQLModel):
|
||||
id: int
|
||||
name: str
|
||||
type: str
|
||||
|
||||
|
||||
class ContractType(SQLModel, table=True):
|
||||
id: int | None = Field(
|
||||
default=None,
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
import src.messages as messages
|
||||
import src.productors.exceptions as exceptions
|
||||
import src.productors.service as service
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
||||
from sqlmodel import Session
|
||||
from src import models
|
||||
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')
|
||||
|
||||
@@ -20,12 +18,41 @@ def get_productors(
|
||||
return service.get_all(session, user, names, types)
|
||||
|
||||
|
||||
@router.get(
|
||||
'/{_id}/preview-delete',
|
||||
response_model=list[models.DeleteDependency]
|
||||
)
|
||||
async def preview_delete(
|
||||
_id: int,
|
||||
session: Session = Depends(get_session),
|
||||
user: models.User = Depends(get_current_user),
|
||||
):
|
||||
if not service.is_allowed(session, user, _id=_id):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('productors', 'delete')
|
||||
)
|
||||
try:
|
||||
result = service.get_delete_dependencies(
|
||||
session,
|
||||
_id
|
||||
)
|
||||
except exceptions.ProductorNotFoundError as error:
|
||||
raise HTTPException(status_code=404, detail=str(error)) from error
|
||||
return result
|
||||
|
||||
|
||||
@router.get('/{_id}', response_model=models.ProductorPublic)
|
||||
def get_productor(
|
||||
_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', 'get')
|
||||
)
|
||||
result = service.get_one(session, _id)
|
||||
if result is None:
|
||||
raise HTTPException(
|
||||
@@ -41,6 +68,11 @@ def create_productor(
|
||||
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:
|
||||
@@ -54,6 +86,11 @@ def update_productor(
|
||||
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)
|
||||
except exceptions.ProductorNotFoundError as error:
|
||||
@@ -67,6 +104,11 @@ def delete_productor(
|
||||
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)
|
||||
except exceptions.ProductorNotFoundError as error:
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import src.messages as messages
|
||||
import src.productors.exceptions as exceptions
|
||||
from sqlmodel import Session, select
|
||||
from src import models
|
||||
from src import messages, models
|
||||
from src.productors import exceptions
|
||||
|
||||
|
||||
def get_all(
|
||||
@@ -50,9 +49,10 @@ def create_one(
|
||||
|
||||
def update_one(
|
||||
session: Session,
|
||||
id: int,
|
||||
productor: models.ProductorUpdate) -> models.ProductorPublic:
|
||||
statement = select(models.Productor).where(models.Productor.id == id)
|
||||
_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:
|
||||
@@ -81,8 +81,8 @@ def update_one(
|
||||
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:
|
||||
@@ -92,3 +92,48 @@ def delete_one(session: Session, id: int) -> models.ProductorPublic:
|
||||
session.delete(productor)
|
||||
session.commit()
|
||||
return result
|
||||
|
||||
|
||||
def get_delete_dependencies(
|
||||
session: Session,
|
||||
_id: int
|
||||
) -> list[models.DeleteDependency]:
|
||||
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'))
|
||||
products_statement = (
|
||||
select(models.Product)
|
||||
.where(models.Product.productor_id == _id)
|
||||
.distinct()
|
||||
)
|
||||
products = session.exec(products_statement).all()
|
||||
result = [
|
||||
models.DeleteDependency(
|
||||
name=pro.name,
|
||||
id=pro.id,
|
||||
type='product'
|
||||
) for pro in products
|
||||
]
|
||||
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
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
import src.messages as messages
|
||||
import src.products.exceptions as exceptions
|
||||
import src.products.service as service
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
||||
from sqlmodel import Session
|
||||
from src import models
|
||||
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')
|
||||
|
||||
@@ -27,13 +26,35 @@ def get_products(
|
||||
)
|
||||
|
||||
|
||||
@router.get('/{id}', response_model=models.ProductPublic)
|
||||
@router.get(
|
||||
'/{_id}/preview-delete',
|
||||
response_model=list[models.DeleteDependency]
|
||||
)
|
||||
async def preview_delete(
|
||||
_id: int,
|
||||
session: Session = Depends(get_session),
|
||||
user: models.User = Depends(get_current_user),
|
||||
):
|
||||
if not service.is_allowed(session, user, _id=_id):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('product', 'delete')
|
||||
)
|
||||
return []
|
||||
|
||||
|
||||
@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'))
|
||||
@@ -46,38 +67,68 @@ def create_product(
|
||||
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,6 @@
|
||||
import src.messages as messages
|
||||
import src.products.exceptions as exceptions
|
||||
from sqlmodel import Session, select
|
||||
from src import models
|
||||
from src import messages, models
|
||||
from src.products import exceptions
|
||||
|
||||
|
||||
def get_all(
|
||||
@@ -27,13 +26,17 @@ def get_all(
|
||||
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:
|
||||
session: Session,
|
||||
product: models.ProductCreate,
|
||||
) -> models.ProductPublic:
|
||||
if not product:
|
||||
raise exceptions.ProductCreateError(
|
||||
messages.Messages.invalid_input(
|
||||
@@ -50,10 +53,11 @@ def create_one(
|
||||
|
||||
|
||||
def update_one(
|
||||
session: Session,
|
||||
id: int,
|
||||
product: models.ProductUpdate) -> models.ProductPublic:
|
||||
statement = select(models.Product).where(models.Product.id == id)
|
||||
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:
|
||||
@@ -74,8 +78,11 @@ def update_one(
|
||||
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:
|
||||
@@ -85,3 +92,31 @@ def delete_one(session: Session, id: int) -> models.ProductPublic:
|
||||
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.Productor)
|
||||
.where(models.Productor.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,10 +1,9 @@
|
||||
# pylint: disable=E1101
|
||||
import datetime
|
||||
|
||||
import src.messages as messages
|
||||
import src.shipments.exceptions as exceptions
|
||||
from sqlmodel import Session, select
|
||||
from src import models
|
||||
from src import messages, models
|
||||
|
||||
|
||||
def get_all(
|
||||
@@ -127,3 +126,35 @@ def delete_one(session: Session, _id: int) -> models.ShipmentPublic:
|
||||
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.Form)
|
||||
.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,9 +1,8 @@
|
||||
import src.messages as messages
|
||||
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 models
|
||||
from src import messages, models
|
||||
from src.auth.auth import get_current_user
|
||||
from src.database import get_session
|
||||
|
||||
@@ -27,12 +26,34 @@ def get_shipments(
|
||||
)
|
||||
|
||||
|
||||
@router.get(
|
||||
'/{_id}/preview-delete',
|
||||
response_model=list[models.DeleteDependency]
|
||||
)
|
||||
async def preview_delete(
|
||||
_id: int,
|
||||
session: Session = Depends(get_session),
|
||||
user: models.User = Depends(get_current_user),
|
||||
):
|
||||
if not service.is_allowed(session, user, _id=_id):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('shipment', 'delete')
|
||||
)
|
||||
return []
|
||||
|
||||
|
||||
@router.get('/{_id}', response_model=models.ShipmentPublic)
|
||||
def get_shipment(
|
||||
_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', 'get')
|
||||
)
|
||||
result = service.get_one(session, _id)
|
||||
if result is None:
|
||||
raise HTTPException(
|
||||
@@ -48,6 +69,11 @@ def create_shipment(
|
||||
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:
|
||||
@@ -62,6 +88,11 @@ def update_shipment(
|
||||
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)
|
||||
except exceptions.ShipmentNotFoundError as error:
|
||||
@@ -75,6 +106,12 @@ def delete_shipment(
|
||||
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)
|
||||
except exceptions.ShipmentNotFoundError as error:
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
import src.messages as messages
|
||||
import src.templates.service as service
|
||||
from fastapi import APIRouter, Depends, HTTPException
|
||||
from sqlmodel import Session
|
||||
from src import models
|
||||
from src import messages, models
|
||||
from src.auth.auth import get_current_user
|
||||
from src.database import get_session
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import src.messages as messages
|
||||
import src.users.exceptions as exceptions
|
||||
from sqlmodel import Session, select
|
||||
from src import models
|
||||
from src import messages, models
|
||||
|
||||
|
||||
def get_all(
|
||||
@@ -48,7 +47,8 @@ def get_or_create_user(session: Session, user_create: models.UserCreate):
|
||||
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)
|
||||
@@ -56,7 +56,9 @@ def get_or_create_user(session: Session, user_create: models.UserCreate):
|
||||
|
||||
|
||||
def get_roles(session: Session):
|
||||
statement = select(models.ContractType)
|
||||
statement = (
|
||||
select(models.ContractType)
|
||||
)
|
||||
return session.exec(statement.order_by(models.ContractType.name)).all()
|
||||
|
||||
|
||||
@@ -64,7 +66,9 @@ def create_one(session: Session, user: models.UserCreate) -> models.UserPublic:
|
||||
if user is None:
|
||||
raise exceptions.UserCreateError(
|
||||
messages.Messages.invalid_input(
|
||||
'user', 'input cannot be None'))
|
||||
'user', 'input cannot be None'
|
||||
)
|
||||
)
|
||||
new_user = models.User(
|
||||
name=user.name,
|
||||
email=user.email
|
||||
@@ -81,17 +85,19 @@ def create_one(session: Session, user: models.UserCreate) -> models.UserPublic:
|
||||
|
||||
def update_one(
|
||||
session: Session,
|
||||
id: int,
|
||||
_id: int,
|
||||
user: models.UserCreate) -> models.UserPublic:
|
||||
if user is None:
|
||||
raise exceptions.UserCreateError(
|
||||
messages.s.invalid_input(
|
||||
'user', 'input cannot be None'))
|
||||
statement = select(models.User).where(models.User.id == id)
|
||||
messages.Messages.invalid_input(
|
||||
'user', 'input cannot be None'
|
||||
)
|
||||
)
|
||||
statement = select(models.User).where(models.User.id == _id)
|
||||
result = session.exec(statement)
|
||||
new_user = result.first()
|
||||
if not new_user:
|
||||
raise exceptions.UserNotFoundError(f'User {id} not found')
|
||||
raise exceptions.UserNotFoundError(f'User {_id} not found')
|
||||
new_user.email = user.email
|
||||
new_user.name = user.name
|
||||
|
||||
@@ -103,13 +109,19 @@ def update_one(
|
||||
return new_user
|
||||
|
||||
|
||||
def delete_one(session: Session, id: int) -> models.UserPublic:
|
||||
statement = select(models.User).where(models.User.id == id)
|
||||
def delete_one(session: Session, _id: int) -> models.UserPublic:
|
||||
statement = select(models.User).where(models.User.id == _id)
|
||||
result = session.exec(statement)
|
||||
user = result.first()
|
||||
if not user:
|
||||
raise exceptions.UserNotFoundError(f'User {id} not found')
|
||||
raise exceptions.UserNotFoundError(f'User {_id} not found')
|
||||
result = models.UserPublic.model_validate(user)
|
||||
session.delete(user)
|
||||
session.commit()
|
||||
return result
|
||||
|
||||
|
||||
def is_allowed(
|
||||
logged_user: models.User,
|
||||
):
|
||||
return len(logged_user.roles) >= 5
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
import src.messages as messages
|
||||
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 models
|
||||
from src import messages, models
|
||||
from src.auth.auth import get_current_user
|
||||
from src.database import get_session
|
||||
|
||||
@@ -13,7 +12,7 @@ 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([]),
|
||||
):
|
||||
@@ -29,19 +28,47 @@ 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}/preview-delete',
|
||||
response_model=list[models.DeleteDependency]
|
||||
)
|
||||
async def preview_delete(
|
||||
_id: int,
|
||||
user: models.User = Depends(get_current_user),
|
||||
):
|
||||
if not service.is_allowed(user):
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=messages.Messages.not_allowed('user', 'delete')
|
||||
)
|
||||
return []
|
||||
|
||||
|
||||
@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
|
||||
|
||||
|
||||
@@ -51,37 +78,59 @@ def create_user(
|
||||
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.
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
|
||||
@@ -17,19 +17,19 @@ 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(
|
||||
@@ -45,13 +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(
|
||||
@@ -69,7 +71,7 @@ def products(session: Session,
|
||||
)
|
||||
),
|
||||
]
|
||||
return products
|
||||
return result
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
@@ -87,7 +89,7 @@ def user(session: Session) -> models.UserPublic:
|
||||
|
||||
@pytest.fixture
|
||||
def users(session: Session) -> list[models.UserPublic]:
|
||||
users = [
|
||||
result = [
|
||||
users_service.create_one(
|
||||
session,
|
||||
users_factory.user_create_factory(
|
||||
@@ -112,12 +114,12 @@ def users(session: Session) -> list[models.UserPublic]:
|
||||
name='test user 3',
|
||||
email='test3@test.com',
|
||||
role_names=['Porc-Agneau']))]
|
||||
return users
|
||||
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',
|
||||
@@ -125,14 +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(
|
||||
@@ -152,7 +156,7 @@ def shipments(session: Session,
|
||||
)
|
||||
),
|
||||
]
|
||||
return shipments
|
||||
return result
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
@@ -161,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(
|
||||
@@ -181,4 +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 tests.factories.contract_products as contract_products_factory
|
||||
import tests.factories.contracts as contract_factory
|
||||
import tests.factories.forms as form_factory
|
||||
from fastapi.exceptions import HTTPException
|
||||
from src import models
|
||||
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),
|
||||
@@ -32,7 +35,13 @@ class TestContracts:
|
||||
[],
|
||||
)
|
||||
|
||||
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),
|
||||
]
|
||||
@@ -54,11 +63,10 @@ class TestContracts:
|
||||
)
|
||||
|
||||
def test_get_all_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -72,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(
|
||||
@@ -80,7 +94,7 @@ class TestContracts:
|
||||
'get_one',
|
||||
return_value=mock_result
|
||||
)
|
||||
mocker.patch.object(
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
@@ -94,33 +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
|
||||
)
|
||||
|
||||
mocker.patch.object(
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
|
||||
response = client.get('/api/contracts/2')
|
||||
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):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -134,7 +163,13 @@ class TestContracts:
|
||||
|
||||
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,
|
||||
):
|
||||
contract_result = contract_factory.contract_public_factory()
|
||||
|
||||
mock = mocker.patch.object(
|
||||
@@ -142,8 +177,7 @@ class TestContracts:
|
||||
'delete_one',
|
||||
return_value=contract_result
|
||||
)
|
||||
|
||||
mocker.patch.object(
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
@@ -156,13 +190,18 @@ class TestContracts:
|
||||
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
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
contract_result = None
|
||||
|
||||
@@ -171,8 +210,7 @@ class TestContracts:
|
||||
'delete_one',
|
||||
return_value=contract_result
|
||||
)
|
||||
|
||||
mocker.patch.object(
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
@@ -185,13 +223,16 @@ class TestContracts:
|
||||
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
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -1,15 +1,20 @@
|
||||
import src.forms.exceptions as forms_exceptions
|
||||
import src.forms.service as service
|
||||
import src.messages as messages
|
||||
import tests.factories.forms as form_factory
|
||||
from fastapi.exceptions import HTTPException
|
||||
from src import models
|
||||
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),
|
||||
@@ -34,7 +39,13 @@ class TestForms:
|
||||
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),
|
||||
]
|
||||
@@ -59,11 +70,10 @@ class TestForms:
|
||||
)
|
||||
|
||||
def test_get_all_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -77,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(
|
||||
@@ -85,7 +101,6 @@ class TestForms:
|
||||
'get_one',
|
||||
return_value=mock_result
|
||||
)
|
||||
|
||||
response = client.get('/api/forms/2')
|
||||
response_data = response.json()
|
||||
|
||||
@@ -95,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,
|
||||
@@ -104,14 +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')
|
||||
@@ -121,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()
|
||||
@@ -131,53 +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):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
form_body = form_factory.form_body_factory(
|
||||
name='test form create', referer_id=12312)
|
||||
name='test form create', referer_id=12312
|
||||
)
|
||||
form_create = form_factory.form_create_factory(
|
||||
name='test form create', referer_id=12312)
|
||||
name='test form create', referer_id=12312
|
||||
)
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service, 'create_one', side_effect=forms_exceptions.UserNotFoundError(
|
||||
messages.Messages.not_found('referer')))
|
||||
|
||||
service,
|
||||
'create_one',
|
||||
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)
|
||||
response_data = response.json()
|
||||
|
||||
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):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
form_body = form_factory.form_body_factory(
|
||||
name='test form create', productor_id=1231)
|
||||
name='test form create', productor_id=1231
|
||||
)
|
||||
form_create = form_factory.form_create_factory(
|
||||
name='test form create', productor_id=1231)
|
||||
name='test form create', productor_id=1231
|
||||
)
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service, 'create_one', side_effect=forms_exceptions.ProductorNotFoundError(
|
||||
messages.Messages.not_found('productor')))
|
||||
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
|
||||
)
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user,
|
||||
form=form_create
|
||||
)
|
||||
|
||||
def test_create_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
form_body = form_factory.form_body_factory(name='test form create')
|
||||
@@ -192,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')
|
||||
@@ -202,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()
|
||||
@@ -213,22 +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):
|
||||
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')))
|
||||
service,
|
||||
'update_one',
|
||||
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(
|
||||
@@ -236,18 +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):
|
||||
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')))
|
||||
messages.Messages.not_found('referer')
|
||||
)
|
||||
)
|
||||
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(
|
||||
@@ -255,18 +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):
|
||||
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')))
|
||||
service,
|
||||
'update_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.put('/api/forms/2', json=form_body)
|
||||
response_data = response.json()
|
||||
|
||||
assert response.status_code == 404
|
||||
mock.assert_called_once_with(
|
||||
@@ -274,13 +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):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
form_body = form_factory.form_body_factory(name='test form update')
|
||||
@@ -295,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(
|
||||
@@ -303,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()
|
||||
@@ -313,34 +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
|
||||
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock = mocker.patch.object(
|
||||
service, 'delete_one', side_effect=forms_exceptions.FormNotFoundError(
|
||||
messages.Messages.not_found('form')))
|
||||
service,
|
||||
'delete_one',
|
||||
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):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
|
||||
@@ -1,15 +1,19 @@
|
||||
import src.messages as messages
|
||||
import src.productors.exceptions as exceptions
|
||||
import src.productors.service as service
|
||||
import tests.factories.productors as productor_factory
|
||||
from fastapi.exceptions import HTTPException
|
||||
from src import models
|
||||
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),
|
||||
@@ -33,7 +37,13 @@ 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),
|
||||
]
|
||||
@@ -57,11 +67,10 @@ class TestProductors:
|
||||
)
|
||||
|
||||
def test_get_all_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -75,10 +84,22 @@ class TestProductors:
|
||||
|
||||
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 = 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,
|
||||
'get_one',
|
||||
@@ -95,27 +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):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -129,7 +172,13 @@ class TestProductors:
|
||||
|
||||
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,
|
||||
):
|
||||
productor_body = productor_factory.productor_body_factory(
|
||||
name='test productor create')
|
||||
productor_create = productor_factory.productor_create_factory(
|
||||
@@ -137,6 +186,12 @@ class TestProductors:
|
||||
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,
|
||||
'create_one',
|
||||
@@ -152,13 +207,17 @@ 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):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
productor_body = productor_factory.productor_body_factory(
|
||||
@@ -174,7 +233,13 @@ class TestProductors:
|
||||
|
||||
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,
|
||||
):
|
||||
productor_body = productor_factory.productor_body_factory(
|
||||
name='test productor update')
|
||||
productor_update = productor_factory.productor_update_factory(
|
||||
@@ -182,6 +247,12 @@ class TestProductors:
|
||||
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,
|
||||
'update_one',
|
||||
@@ -199,24 +270,41 @@ class TestProductors:
|
||||
productor_update
|
||||
)
|
||||
|
||||
def test_update_one_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user):
|
||||
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')
|
||||
name='test productor update',
|
||||
)
|
||||
productor_update = productor_factory.productor_update_factory(
|
||||
name='test productor update')
|
||||
productor_result = None
|
||||
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')))
|
||||
service,
|
||||
'update_one',
|
||||
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(
|
||||
@@ -225,12 +313,17 @@ class TestProductors:
|
||||
productor_update
|
||||
)
|
||||
|
||||
def test_update_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user):
|
||||
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(
|
||||
@@ -246,10 +339,22 @@ class TestProductors:
|
||||
|
||||
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,
|
||||
):
|
||||
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,
|
||||
'delete_one',
|
||||
@@ -265,21 +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
|
||||
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')))
|
||||
service,
|
||||
'delete_one',
|
||||
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(
|
||||
@@ -287,17 +405,19 @@ class TestProductors:
|
||||
2,
|
||||
)
|
||||
|
||||
def test_delete_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user):
|
||||
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.exceptions as exceptions
|
||||
import src.products.service as service
|
||||
import tests.factories.products as product_factory
|
||||
from fastapi.exceptions import HTTPException
|
||||
from src import models
|
||||
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),
|
||||
@@ -33,7 +38,13 @@ 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),
|
||||
]
|
||||
@@ -57,11 +68,10 @@ class TestProducts:
|
||||
)
|
||||
|
||||
def test_get_all_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -75,10 +85,22 @@ class TestProducts:
|
||||
|
||||
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 = 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,
|
||||
'get_one',
|
||||
@@ -94,28 +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):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -129,7 +170,13 @@ class TestProducts:
|
||||
|
||||
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,
|
||||
):
|
||||
product_body = product_factory.product_body_factory(
|
||||
name='test product create')
|
||||
product_create = product_factory.product_create_factory(
|
||||
@@ -137,6 +184,11 @@ class TestProducts:
|
||||
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',
|
||||
@@ -152,13 +204,17 @@ 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):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
product_body = product_factory.product_body_factory(
|
||||
@@ -174,14 +230,28 @@ class TestProducts:
|
||||
|
||||
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,
|
||||
):
|
||||
product_body = product_factory.product_body_factory(
|
||||
name='test product update')
|
||||
name='test product update'
|
||||
)
|
||||
product_update = product_factory.product_update_factory(
|
||||
name='test product update')
|
||||
name='test product update'
|
||||
)
|
||||
product_result = product_factory.product_public_factory(
|
||||
name='test product update')
|
||||
name='test product update'
|
||||
)
|
||||
|
||||
mock_is_allowed = mocker.patch.object(
|
||||
service,
|
||||
'is_allowed',
|
||||
return_value=True
|
||||
)
|
||||
mock = mocker.patch.object(
|
||||
service,
|
||||
'update_one',
|
||||
@@ -199,18 +269,31 @@ class TestProducts:
|
||||
product_update
|
||||
)
|
||||
|
||||
def test_update_one_notfound(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
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_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',
|
||||
@@ -218,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(
|
||||
@@ -226,13 +308,17 @@ 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):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
product_body = product_factory.product_body_factory(
|
||||
@@ -248,7 +334,13 @@ class TestProducts:
|
||||
|
||||
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,
|
||||
):
|
||||
product_result = product_factory.product_public_factory(
|
||||
name='test product delete')
|
||||
|
||||
@@ -258,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()
|
||||
|
||||
@@ -267,23 +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
|
||||
|
||||
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(
|
||||
@@ -291,17 +396,19 @@ class TestProducts:
|
||||
2,
|
||||
)
|
||||
|
||||
def test_delete_one_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_is_allowed.assert_called_once_with(
|
||||
mock_session,
|
||||
mock_user):
|
||||
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.messages as messages
|
||||
import src.shipments.exceptions as exceptions
|
||||
import src.shipments.service as service
|
||||
import tests.factories.shipments as shipment_factory
|
||||
from fastapi.exceptions import HTTPException
|
||||
from src import models
|
||||
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),
|
||||
@@ -34,7 +39,13 @@ 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),
|
||||
]
|
||||
@@ -59,11 +70,10 @@ class TestShipments:
|
||||
)
|
||||
|
||||
def test_get_all_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -77,7 +87,13 @@ class TestShipments:
|
||||
|
||||
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 = shipment_factory.shipment_public_factory(
|
||||
name="test 2", id=2)
|
||||
|
||||
@@ -86,6 +102,11 @@ class TestShipments:
|
||||
'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()
|
||||
@@ -96,28 +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):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -131,19 +171,33 @@ class TestShipments:
|
||||
|
||||
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,
|
||||
):
|
||||
shipment_body = shipment_factory.shipment_body_factory(
|
||||
name='test shipment create')
|
||||
name='test shipment create'
|
||||
)
|
||||
shipment_create = shipment_factory.shipment_create_factory(
|
||||
name='test shipment create')
|
||||
name='test shipment create'
|
||||
)
|
||||
shipment_result = shipment_factory.shipment_public_factory(
|
||||
name='test shipment create')
|
||||
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()
|
||||
@@ -154,17 +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):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
shipment_body = shipment_factory.shipment_body_factory(
|
||||
name='test shipment create')
|
||||
name='test shipment create'
|
||||
)
|
||||
|
||||
app.dependency_overrides[get_current_user] = unauthorized
|
||||
|
||||
@@ -176,19 +235,33 @@ class TestShipments:
|
||||
|
||||
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,
|
||||
):
|
||||
shipment_body = shipment_factory.shipment_body_factory(
|
||||
name='test shipment update')
|
||||
name='test shipment update'
|
||||
)
|
||||
shipment_update = shipment_factory.shipment_update_factory(
|
||||
name='test shipment update')
|
||||
name='test shipment update'
|
||||
)
|
||||
shipment_result = shipment_factory.shipment_public_factory(
|
||||
name='test shipment update')
|
||||
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()
|
||||
@@ -200,24 +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):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
shipment_body = shipment_factory.shipment_body_factory(
|
||||
name='test shipment update')
|
||||
name='test shipment update'
|
||||
)
|
||||
shipment_update = shipment_factory.shipment_update_factory(
|
||||
name='test shipment update')
|
||||
name='test shipment update'
|
||||
)
|
||||
|
||||
mock = mocker.patch.object(
|
||||
service, 'update_one', side_effect=exceptions.ShipmentNotFoundError(
|
||||
messages.Messages.not_found('shipment')))
|
||||
service,
|
||||
'update_one',
|
||||
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(
|
||||
@@ -225,17 +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):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
shipment_body = shipment_factory.shipment_body_factory(
|
||||
name='test shipment update')
|
||||
name='test shipment update'
|
||||
)
|
||||
|
||||
app.dependency_overrides[get_current_user] = unauthorized
|
||||
|
||||
@@ -247,15 +341,27 @@ class TestShipments:
|
||||
|
||||
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,
|
||||
):
|
||||
shipment_result = shipment_factory.shipment_public_factory(
|
||||
name='test shipment delete')
|
||||
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()
|
||||
@@ -266,38 +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
|
||||
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user,
|
||||
):
|
||||
mock = mocker.patch.object(
|
||||
service, 'delete_one', side_effect=exceptions.ShipmentNotFoundError(
|
||||
messages.Messages.not_found('shipment')))
|
||||
service,
|
||||
'delete_one',
|
||||
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):
|
||||
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
|
||||
|
||||
|
||||
@@ -2,13 +2,18 @@ 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 import models
|
||||
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,8 +35,15 @@ class TestUsers:
|
||||
[],
|
||||
[],
|
||||
)
|
||||
assert 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 = [
|
||||
user_factory.user_public_factory(name="test 2", id=2),
|
||||
]
|
||||
@@ -40,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
|
||||
@@ -51,13 +62,13 @@ class TestUsers:
|
||||
['test 2'],
|
||||
['test@test.test'],
|
||||
)
|
||||
assert mock_user
|
||||
|
||||
def test_get_all_unauthorized(
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
mock_session,
|
||||
mock_user):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -71,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(
|
||||
@@ -79,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()
|
||||
@@ -89,28 +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):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
|
||||
@@ -124,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')
|
||||
@@ -134,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()
|
||||
@@ -144,13 +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):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
user_body = user_factory.user_body_factory(name='test user create')
|
||||
@@ -165,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')
|
||||
@@ -175,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()
|
||||
@@ -186,25 +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):
|
||||
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(
|
||||
@@ -212,13 +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):
|
||||
self,
|
||||
client,
|
||||
mocker,
|
||||
):
|
||||
def unauthorized():
|
||||
raise HTTPException(status_code=401)
|
||||
user_body = user_factory.user_body_factory(name='test user update')
|
||||
@@ -233,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(
|
||||
@@ -241,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()
|
||||
@@ -251,40 +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
|
||||
|
||||
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):
|
||||
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,214 +1,225 @@
|
||||
{
|
||||
"help": "help",
|
||||
"how to use dashboard": "how to use the dashboard",
|
||||
"product name": "product name",
|
||||
"product price": "product price",
|
||||
"product quantity": "product quantity",
|
||||
"product quantity unit": "product quantity unit",
|
||||
"product type": "product type",
|
||||
"occasional": "occasional",
|
||||
"occasional products": "occasional products per shipment",
|
||||
"select products per shipment": "select products for each shipment.",
|
||||
"recurrent": "recurrent",
|
||||
"recurrent products": "recurrent products",
|
||||
"your selection in this category will apply for all shipments": "your selection will apply to all shipments (Example: For 6 shipments, the product will be counted 6 times: once per shipment).",
|
||||
"product price kg": "product price per kilogram",
|
||||
"product unit": "product sales unit",
|
||||
"piece": "piece",
|
||||
"in": "in",
|
||||
"enter quantity": "enter quantity",
|
||||
"filter by season": "filter by season",
|
||||
"filter by form": "filter by form",
|
||||
"filter by productor": "filter by producer",
|
||||
"name": "name",
|
||||
"season": "season",
|
||||
"start": "start",
|
||||
"end": "end",
|
||||
"productor": "producer",
|
||||
"referer": "referent",
|
||||
"edit form": "edit contract form",
|
||||
"form name": "contract form name",
|
||||
"contract season": "contract season",
|
||||
"contract season recommandation": "recommendation: <Season>-<year> (Example: Winter-2025), if a form is already created, reuse it's season name.",
|
||||
"start date": "start date",
|
||||
"end date": "end date",
|
||||
"nothing found": "nothing to display",
|
||||
"number of shipment": "number of shipments",
|
||||
"cancel": "cancel",
|
||||
"create form": "create contract form",
|
||||
"create productor": "create producer",
|
||||
"edit productor": "edit producer",
|
||||
"remove productor": "remove producer",
|
||||
"home": "home",
|
||||
"dashboard": "dashboard",
|
||||
"filter by name": "filter by name",
|
||||
"filter by type": "filter by type",
|
||||
"address": "address",
|
||||
"payment methods": "payment methods",
|
||||
"type": "type",
|
||||
"cheque": "cheque",
|
||||
"transfer": "bank transfer",
|
||||
"order name": "cheque payable to",
|
||||
"productor name": "producer name",
|
||||
"productor type": "producer type",
|
||||
"productor address": "producer address",
|
||||
"productor payment": "producer payment methods",
|
||||
"priceKg": "price per kilogram",
|
||||
"quantity": "quantity",
|
||||
"quantity unit": "quantity unit",
|
||||
"unit": "sales unit",
|
||||
"price": "price",
|
||||
"total price": "total price",
|
||||
"create product": "create product",
|
||||
"informations": "information",
|
||||
"remove product": "remove product",
|
||||
"edit product": "edit product",
|
||||
"shipment name": "shipment name",
|
||||
"shipment date": "shipment date",
|
||||
"shipments": "shipments",
|
||||
"shipment": "shipment",
|
||||
"shipment products": "shipment products",
|
||||
"shipment form": "shipment related form",
|
||||
"minimum shipment value": "minimum shipment value (€)",
|
||||
"shipment products is necessary only for occasional products (if all products are recurrent leave empty)": "shipment products configuration is only necessary for occasional products (leave empty if all products are recurrent).",
|
||||
"recurrent product is for all shipments, occasional product is for a specific shipment (see shipment form)": "recurrent products are for all shipments, occasional products are for a specific shipment (see shipment form).",
|
||||
"some contracts require a minimum value per shipment, ignore this field if it's not the case": "some contracts require a minimum value per shipment. Ignore this field if it does not apply to your contract.",
|
||||
"export contracts": "export contracts",
|
||||
"download recap": "download recap",
|
||||
"fill contract online": "fill contract online",
|
||||
"download base template to print": "download base template to print",
|
||||
"to export contracts submissions before sending to the productor go to the contracts section": "to export contracts submissions before sending to the productor go to the contracts section.",
|
||||
"in this page you can view all contracts submissions, you can remove duplicates submission or download a specific contract": "in this page you can view all contracts submissions, you can remove duplicates submission or download a specific contract",
|
||||
"you can download all contracts for your form using the export all": "you can download all contracts for your form using the export all",
|
||||
"in the same corner you can download a recap by clicking on the button": "in the same corner you can download a recap by clicking on the",
|
||||
"once all contracts downloaded, you can delete the form (to avoid new submissions) and hide it from the home page": "once all contracts downloaded, you can delete the form (to avoid new submissions) and hide it from the home page",
|
||||
"by checking this option the form will be accessible publicly on the home page, only check it if everything is fine with your form": "by checking this option the form will be accessible publicly on the home page, only check it if everything is fine with your form",
|
||||
"contracts": "contracts",
|
||||
"hidden": "hidden",
|
||||
"visible": "visible",
|
||||
"minimum price for this shipment should be at least": "minimum price for this shipment should be at least",
|
||||
"there is": "there is",
|
||||
"for this contract": "for this contract.",
|
||||
"remove shipment": "remove shipment",
|
||||
"productors": "producers",
|
||||
"products": "products",
|
||||
"templates": "templates",
|
||||
"users": "users",
|
||||
"forms": "contract forms",
|
||||
"max cheque number": "max cheque number",
|
||||
"can be empty default to 3": "can be empty default to 3",
|
||||
"form": "contract form",
|
||||
"select a form": "select a form",
|
||||
"download contracts": "download contracts",
|
||||
"all contracts": "all contracts",
|
||||
"remove contract": "remove contract",
|
||||
"download contract": "download contract",
|
||||
"by selecting a form here you can download all contracts of your form": "by selecting a form here you can download all contracts of your form.",
|
||||
"edit user": "edit user",
|
||||
"remove user": "remove user",
|
||||
"logout": "logout",
|
||||
"all forms": "all contract forms",
|
||||
"create new form": "create new contract form",
|
||||
"a address": "an address",
|
||||
"a email": "an email address",
|
||||
"a end date": "an end date",
|
||||
"a fistname": "a first name",
|
||||
"a form": "a contract form",
|
||||
"a lastname": "a last name",
|
||||
"a name": "a name",
|
||||
"a new contract form should be created for each new season, do not edit a previous contract and change it's values (for history purpose)": "a new contract form must be created for each new season. Do not edit past contracts.",
|
||||
"a payment method": "a payment method",
|
||||
"a phone": "a phone number",
|
||||
"a price": "a price",
|
||||
"a price or priceKg": "a price or price per kilogram",
|
||||
"a priceKg": "a price per kilogram",
|
||||
"a product": "a product",
|
||||
"a product can be edited if its informations change, it should not be recreated for each contracts": "a product can be edited if information changes. It should not be recreated for each contract.",
|
||||
"a product type define the way it will be organized on the final contract form (showed to users) it can be reccurent or occassional. Recurrent products will be set for all shipments if selected by user, Occasional products can be choosen for each shipments": "a product type defines how it will be organized in the final contract form. It can be recurrent or occasional. Recurrent products will be set for all shipments if selected. Occasional products can be chosen for each shipment.",
|
||||
"a productor": "a producer",
|
||||
"a productor can be edited if its informations change, it should not be recreated for each contracts": "a producer can be edited if information changes. It should not be recreated for each contract.",
|
||||
"a quantity": "a quantity",
|
||||
"a quantity unit": "a quantity unit",
|
||||
"a referer": "a referent",
|
||||
"a season": "a season",
|
||||
"a sell unit": "a sales unit",
|
||||
"a shipment": "a shipment",
|
||||
"a start date": "a start date",
|
||||
"a type": "a type",
|
||||
"actions": "actions",
|
||||
"add all products linked to this productor in the products section": "add your products linked to the producer in the \"Products\" section.",
|
||||
"address": "address",
|
||||
"all contracts": "all contracts",
|
||||
"all forms": "all contract forms",
|
||||
"all productors": "all producers",
|
||||
"all products": "all products",
|
||||
"all shipments": "all shipments",
|
||||
"all referers": "all referents",
|
||||
"is required": "is required",
|
||||
"a name": "a name",
|
||||
"a season": "a season",
|
||||
"a start date": "a start date",
|
||||
"a end date": "an end date",
|
||||
"a productor": "a producer",
|
||||
"a referer": "a referent",
|
||||
"a phone": "a phone number",
|
||||
"a fistname": "a first name",
|
||||
"a lastname": "a last name",
|
||||
"a email": "an email address",
|
||||
"a price or priceKg": "a price or price per kilogram",
|
||||
"a address": "an address",
|
||||
"a type": "a type",
|
||||
"a form": "a contract form",
|
||||
"a price": "a price",
|
||||
"a priceKg": "a price per kilogram",
|
||||
"a quantity": "a quantity",
|
||||
"a product": "a product",
|
||||
"a quantity unit": "a quantity unit",
|
||||
"a payment method": "a payment method",
|
||||
"a sell unit": "a sales unit",
|
||||
"sell unit": "sales unit",
|
||||
"product": "product",
|
||||
"a shipment": "a shipment",
|
||||
"the products": "the products",
|
||||
"the shipments": "the shipments",
|
||||
"link to the section": "link to section: {{section}}",
|
||||
"to add a use the": "to add {{section}} use the button",
|
||||
"to edit a use the": "to edit {{section}} use the button",
|
||||
"to delete a use the": "to delete {{section}} use the button",
|
||||
"button in top right of the page": "at the top right of the {{section}} page.",
|
||||
"button in front of the line you want to edit": "in front of the line you want to edit (in the actions column).",
|
||||
"button in front of the line you want to delete": "in front of the line you want to delete (in the actions column).",
|
||||
"glossary": "glossary",
|
||||
"start to create a productor in the productors section": "start by creating a producer in the \"Producers\" section.",
|
||||
"add all products linked to this productor in the products section": "add your products linked to the producer in the \"Products\" section.",
|
||||
"create your contract form, it will create a form in the home page (accessible to users)": "create your contract form in the \"Contract Forms\" section. Adding an entry here will create a form on the home page.",
|
||||
"create shipments for your contract form": "create shipments for your contract",
|
||||
"creation order": "creation order",
|
||||
"dashboard is for referers only, with this dashboard you can create productors, products, forms and shipments": "the dashboard is only visible to referents. You can create your producer, products, contract forms, and shipments.",
|
||||
"is defined by": "is defined by",
|
||||
"a product type define the way it will be organized on the final contract form (showed to users) it can be reccurent or occassional. Recurrent products will be set for all shipments if selected by user, Occasional products can be choosen for each shipments": "a product type defines how it will be organized in the final contract form. It can be recurrent or occasional. Recurrent products will be set for all shipments if selected. Occasional products can be chosen for each shipment.",
|
||||
"and/or": "and/or",
|
||||
"form name recommandation": "recommendation: Contract <contract-type> (Example: Pork-Lamb Contract)",
|
||||
"submit contract": "submit contract",
|
||||
"example in user forms": "example in user contract form",
|
||||
"occasional product": "occasional product",
|
||||
"recurrent product": "recurrent product",
|
||||
"with grams as product unit selected": "with grams selected as product unit",
|
||||
"product example": "product example",
|
||||
"payment methods are defined for a productor. At the end of a form a section payment method let the user select his prefered payment method": "payment methods are defined for a producer. At the end of the form, users can select their preferred payment method.",
|
||||
"with cheque and transfer": "with cheque and transfer configured for the producer",
|
||||
"mililiter": "milliliters (ml)",
|
||||
"this field is optionnal a product can have a quantity if configured inside the product it will be shown inside the form": "this field is optional. It represents the product quantity and will be shown in the form.",
|
||||
"this field is also optionnal if a product have a quantity you can select the correct unit (metric system). It will be shown next to product quantity inside the form": "this field is optional. It represents the measurement unit and will be shown next to the quantity.",
|
||||
"with 150 set as quantity and g as quantity unit in product": "with 150 set as quantity and grams selected as quantity unit",
|
||||
"all shipments": "all shipments",
|
||||
"all shipments should be recreated for each form creation": "shipments must be recreated for each new contract form.",
|
||||
"a productor can be edited if its informations change, it should not be recreated for each contracts": "a producer can be edited if information changes. It should not be recreated for each contract.",
|
||||
"a product can be edited if its informations change, it should not be recreated for each contracts": "a product can be edited if information changes. It should not be recreated for each contract.",
|
||||
"a new contract form should be created for each new season, do not edit a previous contract and change it's values (for history purpose)": "a new contract form must be created for each new season. Do not edit past contracts.",
|
||||
"grams": "grams (g)",
|
||||
"kilo": "kilograms (kg)",
|
||||
"liter": "liters (L)",
|
||||
"success": "success",
|
||||
"success edit": "{{entity}} correctly edited",
|
||||
"success create": "{{entity}} correctly created",
|
||||
"success delete": "{{entity}} correctly deleted",
|
||||
"all theses informations are for contract generation": "all this information is required for contract generation.",
|
||||
"and/or": "and/or",
|
||||
"are you sure you want to delete": "are you sure you want to delete",
|
||||
"button in front of the line you want to delete": "in front of the line you want to delete (in the actions column).",
|
||||
"button in front of the line you want to edit": "in front of the line you want to edit (in the actions column).",
|
||||
"button in top right of the page": "at the top right of the {{section}} page.",
|
||||
"by checking this option the form will be accessible publicly on the home page, only check it if everything is fine with your form": "by checking this option the form will be accessible publicly on the home page, only check it if everything is fine with your form",
|
||||
"by selecting a form here you can download all contracts of your form": "by selecting a form here you can download all contracts of your form.",
|
||||
"can be empty default to 3": "can be empty default to 3",
|
||||
"cancel": "cancel",
|
||||
"cheque": "cheque",
|
||||
"cheque id": "cheque identifier",
|
||||
"cheque quantity": "number of cheques",
|
||||
"cheque value": "cheque amount",
|
||||
"choose payment method": "choose your payment method (you do not need to pay now).",
|
||||
"contract": "contract",
|
||||
"contract season": "contract season",
|
||||
"contract season recommandation": "recommendation: <Season>-<year> (Example: Winter-2025), if a form is already created, reuse it's season name.",
|
||||
"contracts": "contracts",
|
||||
"create form": "create contract form",
|
||||
"create new form": "create new contract form",
|
||||
"create product": "create product",
|
||||
"create productor": "create producer",
|
||||
"create shipment": "create shipment",
|
||||
"create shipments for your contract form": "create shipments for your contract",
|
||||
"create user": "create user",
|
||||
"create your contract form, it will create a form in the home page (accessible to users)": "create your contract form in the \"Contract Forms\" section. Adding an entry here will create a form on the home page.",
|
||||
"creation order": "creation order",
|
||||
"dashboard": "dashboard",
|
||||
"dashboard is for referers only, with this dashboard you can create productors, products, forms and shipments": "the dashboard is only visible to referents. You can create your producer, products, contract forms, and shipments.",
|
||||
"delete": "delete",
|
||||
"delete entity": "delete {{entity}}",
|
||||
"download base template to print": "download base template to print",
|
||||
"download contract": "download contract",
|
||||
"download contracts": "download contracts",
|
||||
"download recap": "download recap",
|
||||
"edit form": "edit contract form",
|
||||
"edit product": "edit product",
|
||||
"edit productor": "edit producer",
|
||||
"edit shipment": "edit shipment",
|
||||
"edit user": "edit user",
|
||||
"end": "end",
|
||||
"end date": "end date",
|
||||
"enter cheque quantity": "enter number of cheques",
|
||||
"enter cheque value": "enter cheque amount",
|
||||
"enter payment method": "select your payment method",
|
||||
"enter quantity": "enter quantity",
|
||||
"error": "error",
|
||||
"error edit": "error during edit {{entity}}",
|
||||
"error create": "error during create {{entity}}",
|
||||
"error delete": "error during suppress {{entity}}",
|
||||
"of the user": "of the user",
|
||||
"error edit": "error during edit {{entity}}",
|
||||
"example in user forms": "example in user contract form",
|
||||
"export contracts": "export contracts",
|
||||
"fill contract online": "fill contract online",
|
||||
"filter by form": "filter by form",
|
||||
"filter by name": "filter by name",
|
||||
"filter by productor": "filter by producer",
|
||||
"filter by season": "filter by season",
|
||||
"filter by type": "filter by type",
|
||||
"for this contract": "for this contract.",
|
||||
"for transfer method contact your referer or productor": "for bank transfer, contact your referent or producer.",
|
||||
"form": "contract form",
|
||||
"form name": "contract form name",
|
||||
"form name recommandation": "recommendation: Contract <contract-type> (Example: Pork-Lamb Contract)",
|
||||
"forms": "contract forms",
|
||||
"glossary": "glossary",
|
||||
"grams": "grams (g)",
|
||||
"help": "help",
|
||||
"hidden": "hidden",
|
||||
"home": "home",
|
||||
"how to use dashboard": "how to use the dashboard",
|
||||
"in": "in",
|
||||
"in the same corner you can download a recap by clicking on the button": "in the same corner you can download a recap by clicking on the",
|
||||
"in this page you can view all contracts submissions, you can remove duplicates submission or download a specific contract": "in this page you can view all contracts submissions, you can remove duplicates submission or download a specific contract",
|
||||
"informations": "information",
|
||||
"is defined by": "is defined by",
|
||||
"is required": "is required",
|
||||
"kilo": "kilograms (kg)",
|
||||
"link to the section": "link to section: {{section}}",
|
||||
"liter": "liters (L)",
|
||||
"login with keycloak": "login with keycloak",
|
||||
"logout": "logout",
|
||||
"max cheque number": "max cheque number",
|
||||
"mililiter": "milliliters (ml)",
|
||||
"minimum price for this shipment should be at least": "minimum price for this shipment should be at least",
|
||||
"minimum shipment value": "minimum shipment value (€)",
|
||||
"name": "name",
|
||||
"nothing found": "nothing to display",
|
||||
"number of cheques between 1 and 3 cheques also enter your cheques identifiers, value is calculated automatically": "number of cheques between 1 and 3. Also enter cheque identifiers.",
|
||||
"number of shipment": "number of shipments",
|
||||
"occasional": "occasional",
|
||||
"occasional product": "occasional product",
|
||||
"occasional products": "occasional products per shipment",
|
||||
"of the contract": "of the contract",
|
||||
"of the form": "of the form",
|
||||
"of the product": "of the product",
|
||||
"of the productor": "of the producer",
|
||||
"of the shipment": "of the shipment",
|
||||
"of the contract": "of the contract",
|
||||
"login with keycloak": "login with keycloak",
|
||||
"there is no contract for now": "there is no contract at the moment.",
|
||||
"for transfer method contact your referer or productor": "for bank transfer, contact your referent or producer.",
|
||||
"cheque quantity": "number of cheques",
|
||||
"enter cheque quantity": "enter number of cheques",
|
||||
"cheque id": "cheque identifier",
|
||||
"cheque value": "cheque amount",
|
||||
"enter cheque value": "enter cheque amount",
|
||||
"enter payment method": "select your payment method",
|
||||
"number of cheques between 1 and 3 cheques also enter your cheques identifiers, value is calculated automatically": "number of cheques between 1 and 3. Also enter cheque identifiers.",
|
||||
"of the user": "of the user",
|
||||
"once all contracts downloaded, you can delete the form (to avoid new submissions) and hide it from the home page": "once all contracts downloaded, you can delete the form (to avoid new submissions) and hide it from the home page",
|
||||
"order name": "cheque payable to",
|
||||
"payment method": "payment method",
|
||||
"your session has expired please log in again": "your session has expired please log in again",
|
||||
"session expired": "session expired",
|
||||
"user not allowed": "user not allowed",
|
||||
"payment methods": "payment methods",
|
||||
"payment methods are defined for a productor. At the end of a form a section payment method let the user select his prefered payment method": "payment methods are defined for a producer. At the end of the form, users can select their preferred payment method.",
|
||||
"piece": "piece",
|
||||
"price": "price",
|
||||
"priceKg": "price per kilogram",
|
||||
"product": "product",
|
||||
"product example": "product example",
|
||||
"product name": "product name",
|
||||
"product price": "product price",
|
||||
"product price kg": "product price per kilogram",
|
||||
"product quantity": "product quantity",
|
||||
"product quantity unit": "product quantity unit",
|
||||
"product type": "product type",
|
||||
"product unit": "product sales unit",
|
||||
"productor": "producer",
|
||||
"productor address": "producer address",
|
||||
"productor name": "producer name",
|
||||
"productor payment": "producer payment methods",
|
||||
"productor type": "producer type",
|
||||
"productors": "producers",
|
||||
"products": "products",
|
||||
"quantity": "quantity",
|
||||
"quantity unit": "quantity unit",
|
||||
"recurrent": "recurrent",
|
||||
"recurrent product": "recurrent product",
|
||||
"recurrent product is for all shipments, occasional product is for a specific shipment (see shipment form)": "recurrent products are for all shipments, occasional products are for a specific shipment (see shipment form).",
|
||||
"recurrent products": "recurrent products",
|
||||
"referer": "referent",
|
||||
"remove contract": "remove contract",
|
||||
"remove form": "remove form",
|
||||
"remove product": "remove product",
|
||||
"remove productor": "remove producer",
|
||||
"remove shipment": "remove shipment",
|
||||
"remove user": "remove user",
|
||||
"roles": "roles",
|
||||
"your keycloak user has no roles, please contact your administrator": "your keycloak user has no roles, please contact your administrator",
|
||||
"choose payment method": "choose your payment method (you do not need to pay now).",
|
||||
"season": "season",
|
||||
"select a form": "select a form",
|
||||
"select products per shipment": "select products for each shipment.",
|
||||
"sell unit": "sales unit",
|
||||
"session expired": "session expired",
|
||||
"shipment": "shipment",
|
||||
"shipment date": "shipment date",
|
||||
"shipment form": "shipment related form",
|
||||
"shipment name": "shipment name",
|
||||
"shipment products": "shipment products",
|
||||
"shipment products is necessary only for occasional products (if all products are recurrent leave empty)": "shipment products configuration is only necessary for occasional products (leave empty if all products are recurrent).",
|
||||
"shipments": "shipments",
|
||||
"some contracts require a minimum value per shipment, ignore this field if it's not the case": "some contracts require a minimum value per shipment. Ignore this field if it does not apply to your contract.",
|
||||
"start": "start",
|
||||
"start date": "start date",
|
||||
"start to create a productor in the productors section": "start by creating a producer in the \"Producers\" section.",
|
||||
"submit": "submit",
|
||||
"submit contract": "submit contract",
|
||||
"success": "success",
|
||||
"success create": "{{entity}} correctly created",
|
||||
"success delete": "{{entity}} correctly deleted",
|
||||
"success edit": "{{entity}} correctly edited",
|
||||
"templates": "templates",
|
||||
"the product unit will be assigned to the quantity requested in the form": "the product unit defines the unit used in the contract form.",
|
||||
"all theses informations are for contract generation": "all this information is required for contract generation."
|
||||
}
|
||||
"the products": "the products",
|
||||
"the shipments": "the shipments",
|
||||
"there is": "there is",
|
||||
"there is no contract for now": "there is no contract at the moment.",
|
||||
"this field is also optionnal if a product have a quantity you can select the correct unit (metric system). It will be shown next to product quantity inside the form": "this field is optional. It represents the measurement unit and will be shown next to the quantity.",
|
||||
"this field is optionnal a product can have a quantity if configured inside the product it will be shown inside the form": "this field is optional. It represents the product quantity and will be shown in the form.",
|
||||
"this will also delete": "this will also delete",
|
||||
"to add a use the": "to add {{section}} use the button",
|
||||
"to delete a use the": "to delete {{section}} use the button",
|
||||
"to edit a use the": "to edit {{section}} use the button",
|
||||
"to export contracts submissions before sending to the productor go to the contracts section": "to export contracts submissions before sending to the productor go to the contracts section.",
|
||||
"total price": "total price",
|
||||
"transfer": "bank transfer",
|
||||
"type": "type",
|
||||
"unit": "sales unit",
|
||||
"user": "user",
|
||||
"user not allowed": "user not allowed",
|
||||
"users": "users",
|
||||
"visible": "visible",
|
||||
"with 150 set as quantity and g as quantity unit in product": "with 150 set as quantity and grams selected as quantity unit",
|
||||
"with cheque and transfer": "with cheque and transfer configured for the producer",
|
||||
"with grams as product unit selected": "with grams selected as product unit",
|
||||
"you can download all contracts for your form using the export all": "you can download all contracts for your form using the export all",
|
||||
"your keycloak user has no roles, please contact your administrator": "your keycloak user has no roles, please contact your administrator",
|
||||
"your selection in this category will apply for all shipments": "your selection will apply to all shipments (Example: For 6 shipments, the product will be counted 6 times: once per shipment).",
|
||||
"your session has expired please log in again": "your session has expired please log in again"
|
||||
}
|
||||
@@ -1,214 +1,225 @@
|
||||
{
|
||||
"help": "aide",
|
||||
"how to use dashboard": "comment utiliser le tableau de bord",
|
||||
"product name": "nom du produit",
|
||||
"product price": "prix du produit",
|
||||
"product quantity": "quantité du produit",
|
||||
"product quantity unit": "unité de quantité du produit",
|
||||
"product type": "type de produit",
|
||||
"occasional": "occasionnel",
|
||||
"occasional products": "produits occasionnels par livraison",
|
||||
"select products per shipment": "sélectionnez les produits pour chaque livraison.",
|
||||
"recurrent": "récurent",
|
||||
"recurrent products": "produits récurrents",
|
||||
"your selection in this category will apply for all shipments": "votre sélection sera appliquée pour chaque livraisons (Exemple: Pour 6 livraisons, le produits sera compté 6 fois : une fois par livraison).",
|
||||
"product price kg": "prix du produit au Kilo",
|
||||
"product unit": "unité de vente du produit",
|
||||
"piece": "pièce",
|
||||
"in": "en",
|
||||
"enter quantity": "entrez la quantité",
|
||||
"filter by season": "filtrer par saisons",
|
||||
"filter by form": "filtrer par formulaire",
|
||||
"filter by productor": "filtrer par producteur·trice",
|
||||
"name": "nom",
|
||||
"season": "saison",
|
||||
"start": "début",
|
||||
"end": "fin",
|
||||
"productor": "producteur·trice",
|
||||
"referer": "référent·e",
|
||||
"edit form": "modifier le formulaire de contrat",
|
||||
"form name": "nom du formulaire de contrat",
|
||||
"contract season": "saison du contrat",
|
||||
"contract season recommandation": "recommandation : <Saison>-<année> (Exemple: Hiver-2025), si un formulaire est déjà créé pour la saison, reprenez son nom de saison si possible.",
|
||||
"start date": "date de début",
|
||||
"end date": "date de fin",
|
||||
"nothing found": "rien à afficher",
|
||||
"number of shipment": "nombre de livraisons",
|
||||
"cancel": "annuler",
|
||||
"create form": "créer un formulaire de contrat",
|
||||
"create productor": "créer le/la producteur·trice",
|
||||
"edit productor": "modifier le/la producteur·trice",
|
||||
"remove productor": "supprimer le/la producteur·trice",
|
||||
"home": "accueil",
|
||||
"dashboard": "tableau de bord",
|
||||
"filter by name": "filtrer par nom",
|
||||
"filter by type": "filtrer par type",
|
||||
"address": "adresse",
|
||||
"payment methods": "méthodes de paiement",
|
||||
"type": "type",
|
||||
"cheque": "chèque",
|
||||
"transfer": "virement",
|
||||
"order name": "ordre du chèque",
|
||||
"productor name": "nom du producteur·trice",
|
||||
"productor type": "type du producteur·trice",
|
||||
"productor address": "adresse du producteur·trice",
|
||||
"productor payment": "méthodes de paiement du producteur·trice",
|
||||
"priceKg": "prix au kilo",
|
||||
"quantity": "quantité",
|
||||
"quantity unit": "unité de quantité",
|
||||
"unit": "unité de vente",
|
||||
"price": "prix",
|
||||
"total price": "prix total",
|
||||
"create product": "créer le produit",
|
||||
"informations": "informations",
|
||||
"remove product": "supprimer le produit",
|
||||
"edit product": "modifier le produit",
|
||||
"shipment name": "nom de la livraison",
|
||||
"shipment date": "date de la livraison",
|
||||
"shipments": "livraisons",
|
||||
"shipment": "livraison",
|
||||
"shipment products": "produits pour la livraison",
|
||||
"shipment form": "formulaire lié a la livraison",
|
||||
"minimum shipment value": "valeur minimum d'une livraison (€)",
|
||||
"shipment products is necessary only for occasional products (if all products are recurrent leave empty)": "il est nécessaire de configurer les produits pour la livraison uniquement si il y a des produits occasionnels (laisser vide si tous les produits sont récurents).",
|
||||
"recurrent product is for all shipments, occasional product is for a specific shipment (see shipment form)": "les produits récurrents sont pour toutes les livraisons, les produits occasionnels sont pour une livraison particulière (voir formulaire de création de livraison).",
|
||||
"some contracts require a minimum value per shipment, ignore this field if it's not the case": "certains contrats nécessitent une valeur minimum par livraison. Ce champ peut être ignoré s’il ne s’applique pas à votre contrat.",
|
||||
"by checking this option the form will be accessible publicly on the home page, only check it if everything is fine with your form": "en cochant cette option le formulaire sera accessible publiquement sur la page d'accueil, cochez cette option uniquement si tout est prêt avec votre formulaire.",
|
||||
"contracts": "contrats",
|
||||
"hidden": "caché",
|
||||
"visible": "visible",
|
||||
"minimum price for this shipment should be at least": "le prix minimum d'une livraison doit être au moins de",
|
||||
"there is": "il y a",
|
||||
"for this contract": "pour ce contrat.",
|
||||
"remove shipment": "supprimer la livraison",
|
||||
"productors": "producteur·trices",
|
||||
"products": "produits",
|
||||
"templates": "modèles",
|
||||
"users": "utilisateur·trices",
|
||||
"forms": "formulaires de contrat",
|
||||
"form": "formulaire de contrat",
|
||||
"select a form": "selectionnez un formulaire",
|
||||
"download contracts": "télécharger les contrats",
|
||||
"all contracts": "tous les contrats",
|
||||
"remove contract": "supprimer le contrat",
|
||||
"download contract": "télécharger le contrat",
|
||||
"fill contract online": "remplir le contrat en ligne",
|
||||
"download base template to print": "télécharger le contrat à remplir sur papier",
|
||||
"by selecting a form here you can download all contracts of your form": "en selectionnant un formulaire, vous téléchargez tous les contrats pour un formulaire donné.",
|
||||
"edit user": "modifier l'utilisateur·trice",
|
||||
"remove user": "supprimer l'utilisateur·trice",
|
||||
"max cheque number": "numbre maximum de cheques possible",
|
||||
"can be empty default to 3": "optionnel, la valeur par défaut est à 3 cheques",
|
||||
"all forms": "tous les formulaires de contrat",
|
||||
"create new form": "créer un nouveau formulaire de contrat",
|
||||
"a address": "une adresse",
|
||||
"a email": "une adresse email",
|
||||
"a end date": "une date de fin",
|
||||
"a fistname": "un prénom",
|
||||
"a form": "un formulaire de contrat",
|
||||
"a lastname": "un nom",
|
||||
"a name": "un nom",
|
||||
"a new contract form should be created for each new season, do not edit a previous contract and change it's values (for history purpose)": "un formulaire de contrat doit être créé pour chaque nouvelle saison, pour des raison d'historique, n'éditez pas un formulaire de contrat passé pour une nouvelle saison, recréez en un nouveau.",
|
||||
"a payment method": "une méthode de paiement",
|
||||
"a phone": "un numéro de téléphone",
|
||||
"a price": "un prix",
|
||||
"a price or priceKg": "un prix ou un prix au kilo",
|
||||
"a priceKg": "un prix au kilo",
|
||||
"a product": "un produit",
|
||||
"a product can be edited if its informations change, it should not be recreated for each contracts": "un produit peut être édité si ses informations changent, il ne doit pas être recréé pour chaque nouveau formulaire de contrat.",
|
||||
"a product type define the way it will be organized on the final contract form (showed to users) it can be reccurent or occassional. Recurrent products will be set for all shipments if selected by user, Occasional products can be choosen for each shipments": "un type de produit définit la manière dont un produit va être présenté aux amapiens dans le formulaire de contrat. Il peut être récurrent ou occasionnel. Un produit récurrent si selectionné sera compté pour toutes les livraisons. Un produit occasionnel sera facultatif pour chaques livraison (l'amapien devra selectionner la quantité voulue pour chaque livraisons).",
|
||||
"a productor": "un(e) producteur·trice",
|
||||
"a productor can be edited if its informations change, it should not be recreated for each contracts": "un(e) producteur·trice peut être édité si ses informations changent, il/elle ne doit pas être recréé pour chaque nouveau contrat.",
|
||||
"a quantity": "une quantité",
|
||||
"a quantity unit": "une unité de quantité",
|
||||
"a referer": "un(e) référent·e",
|
||||
"a season": "une saison",
|
||||
"a sell unit": "une unité de vente",
|
||||
"a shipment": "une livraison",
|
||||
"a start date": "une date de début",
|
||||
"a type": "un type",
|
||||
"actions": "actions",
|
||||
"add all products linked to this productor in the products section": "ajoutez vos produits liés au/à la producteur·trice dans la section \"Produits\".",
|
||||
"address": "adresse",
|
||||
"all contracts": "tous les contrats",
|
||||
"all forms": "tous les formulaires de contrat",
|
||||
"all productors": "tous les producteur·trices",
|
||||
"all products": "tous les produits",
|
||||
"all shipments": "toutes les livraisons",
|
||||
"all referers": "tous les référent·es",
|
||||
"is required": "est requis·e",
|
||||
"a name": "un nom",
|
||||
"a season": "une saison",
|
||||
"a start date": "une date de début",
|
||||
"a end date": "une date de fin",
|
||||
"a productor": "un(e) producteur·trice",
|
||||
"a referer": "un(e) référent·e",
|
||||
"a phone": "un numéro de téléphone",
|
||||
"a fistname": "un prénom",
|
||||
"a lastname": "un nom",
|
||||
"a email": "une adresse email",
|
||||
"a price or priceKg": "un prix ou un prix au kilo",
|
||||
"a address": "une adresse",
|
||||
"a type": "un type",
|
||||
"a form": "un formulaire de contrat",
|
||||
"a price": "un prix",
|
||||
"a priceKg": "un prix au kilo",
|
||||
"a quantity": "une quantité",
|
||||
"a product": "un produit",
|
||||
"a quantity unit": "une unité de quantité",
|
||||
"a payment method": "une méthode de paiement",
|
||||
"a sell unit": "une unité de vente",
|
||||
"sell unit": "unité de vente",
|
||||
"product": "produit",
|
||||
"a shipment": "une livraison",
|
||||
"the products": "les produits",
|
||||
"the shipments": "les livraisons",
|
||||
"link to the section": "lien vers la section : {{section}}",
|
||||
"to add a use the": "pour ajouter {{section}} utilisez le bouton",
|
||||
"to edit a use the": "pour éditer {{section}} utilisez le bouton",
|
||||
"to delete a use the": "pour supprimer {{section}} utilisez le bouton",
|
||||
"button in top right of the page": "en haut à droite de la page {{section}}.",
|
||||
"button in front of the line you want to edit": "en face de la ligne que vous souhaitez éditer. (dans la colonne actions).",
|
||||
"button in front of the line you want to delete": "en face de la ligne que vous souhaitez supprimer. (dans la colonne actions).",
|
||||
"glossary": "glossaire",
|
||||
"logout": "se déconnecter",
|
||||
"start to create a productor in the productors section": "commencez par créer un(e) producteur·trice dans la section \"Producteur·trices\".",
|
||||
"add all products linked to this productor in the products section": "ajoutez vos produits liés au/à la producteur·trice dans la section \"Produits\".",
|
||||
"create your contract form, it will create a form in the home page (accessible to users)": "créez votre formulaire de contrat dans la section \"Formulaire de contrat\". Ajouter une entrée dans cette section ajoutera un formulaire dans la page d'accueil.",
|
||||
"export contracts": "Télécharger les contrats",
|
||||
"download recap": "Télécharger le récapitulatif",
|
||||
"in this page you can view all contracts submissions, you can remove duplicates submission or download a specific contract": "dans cette page vous pouvez voir tous les contrats, vous pouvez supprimer un contrat en doublon, ou télécharger uniquement un contrat.",
|
||||
"create shipments for your contract form": "créez les livraisons pour votre contrat",
|
||||
"creation order": "ordre de création",
|
||||
"in the same corner you can download a recap by clicking on the button": "au même endroit vous pouvez exporter votre récapitulatif (format odt) à vérifier et transmettre au producteur en cliquant sur le bouton",
|
||||
"to export contracts submissions before sending to the productor go to the contracts section": "pour exporter les contrats avant de les envoyer aux producteurs allez dans la section \"contrats\".",
|
||||
"once all contracts downloaded, you can delete the form (to avoid new submissions) and hide it from the home page": "une fois tous les contrats récupérés vous pouvez supprimer le formulaire (pour éviter les nouvelles demandes de contrat et pour cacher le formulaire de la page principale).",
|
||||
"you can download all contracts for your form using the export all": "vous pouvez télécharger tous les contrats de votre formulaire en utilisant le bouton",
|
||||
"dashboard is for referers only, with this dashboard you can create productors, products, forms and shipments": "le tableau de bord est visible uniquement pour les référents, vous pouvez créer votre producteur, vos produits, vos formulaires de contrat et vos livraisons.",
|
||||
"is defined by": "est defini par",
|
||||
"a product type define the way it will be organized on the final contract form (showed to users) it can be reccurent or occassional. Recurrent products will be set for all shipments if selected by user, Occasional products can be choosen for each shipments": "un type de produit définit la manière dont un produit va être présenté aux amapiens dans le formulaire de contrat. Il peut être récurrent ou occasionnel. Un produit récurrent si selectionné sera compté pour toutes les livraisons. Un produit occasionnel sera facultatif pour chaques livraison (l'amapien devra selectionner la quantité voulue pour chaque livraisons).",
|
||||
"and/or": "et/ou",
|
||||
"form name recommandation": "recommandation : Contrat <contract-type> (Exemple : Contrat Porc-Agneau)",
|
||||
"submit contract": "envoyer le contrat",
|
||||
"example in user forms": "exemple dans le formulaire à destination des amapiens",
|
||||
"occasional product": "produit occasionnel",
|
||||
"recurrent product": "produit récurrent",
|
||||
"with grams as product unit selected": "avec \"grammes\" selectionné pour l'unité de produit",
|
||||
"product example": "exemple de produit",
|
||||
"payment methods are defined for a productor. At the end of a form a section payment method let the user select his prefered payment method": "les méthodes de paiement sont définies par producteurs. À la fin du formulaire de contrat l'amapien pourra séléctionner sa méthode de paiement parmis celles que vous avez ajoutés.",
|
||||
"with cheque and transfer": "avec chèques et virements configuré pour le producteur",
|
||||
"mililiter": "mililitres (ml)",
|
||||
"this field is optionnal a product can have a quantity if configured inside the product it will be shown inside the form": "ce champ est optionnel dans la configuration d'un produit, il représente la quantité d'un produit (poids d'une tranche de foie, poids d'un panier, taille d'un bocal...). Si ce champs est renseigné il sera affiché dans le formulaire à destination des amapiens.",
|
||||
"this field is also optionnal if a product have a quantity you can select the correct unit (metric system). It will be shown next to product quantity inside the form": "ce champs est optionnel dans la configuation d'un produit, il représente l'unité de mesure associée à la quantité d'un produit (g, kg, ml, L). Si ce champs est renseigné il sera affiché dans le formulaire à destination des amapiens à coté de la quantité du produit.",
|
||||
"with 150 set as quantity and g as quantity unit in product": "avec \"150\" en quantité de produit et \"grammes\" selectionné dans l'unité de quantité du produit",
|
||||
"all shipments": "toutes les livraisons",
|
||||
"all shipments should be recreated for each form creation": "les livraisons étant liées à un formulaire elles doivent être recréés pour chaque nouveau formulaire.",
|
||||
"a productor can be edited if its informations change, it should not be recreated for each contracts": "un(e) producteur·trice peut être édité si ses informations changent, il/elle ne doit pas être recréé pour chaque nouveau contrat.",
|
||||
"a product can be edited if its informations change, it should not be recreated for each contracts": "un produit peut être édité si ses informations changent, il ne doit pas être recréé pour chaque nouveau formulaire de contrat.",
|
||||
"a new contract form should be created for each new season, do not edit a previous contract and change it's values (for history purpose)": "un formulaire de contrat doit être créé pour chaque nouvelle saison, pour des raison d'historique, n'éditez pas un formulaire de contrat passé pour une nouvelle saison, recréez en un nouveau.",
|
||||
"grams": "grammes (g)",
|
||||
"kilo": "kilogrammes (kg)",
|
||||
"liter": "litres (L)",
|
||||
"success": "succès",
|
||||
"success edit": "{{entity}} correctement édité",
|
||||
"success create": "{{entity}} correctement créé",
|
||||
"success delete": "{{entity}} correctement supprimé",
|
||||
"all theses informations are for contract generation": "ces informations sont nécessaires pour la génération de contrat.",
|
||||
"and/or": "et/ou",
|
||||
"are you sure you want to delete": "êtes vous sûr de vouloir supprimer",
|
||||
"button in front of the line you want to delete": "en face de la ligne que vous souhaitez supprimer. (dans la colonne actions).",
|
||||
"button in front of the line you want to edit": "en face de la ligne que vous souhaitez éditer. (dans la colonne actions).",
|
||||
"button in top right of the page": "en haut à droite de la page {{section}}.",
|
||||
"by checking this option the form will be accessible publicly on the home page, only check it if everything is fine with your form": "en cochant cette option le formulaire sera accessible publiquement sur la page d'accueil, cochez cette option uniquement si tout est prêt avec votre formulaire.",
|
||||
"by selecting a form here you can download all contracts of your form": "en selectionnant un formulaire, vous téléchargez tous les contrats pour un formulaire donné.",
|
||||
"can be empty default to 3": "optionnel, la valeur par défaut est à 3 cheques",
|
||||
"cancel": "annuler",
|
||||
"cheque": "chèque",
|
||||
"cheque id": "identifiant du chèque",
|
||||
"cheque quantity": "quantité de chèques (pour le paiement en plusieurs fois)",
|
||||
"cheque value": "valeur du chèque",
|
||||
"choose payment method": "choisissez votre méthode de paiement (vous n'avez pas à payer tout de suite, uniquement renseigner comment vous souhaitez régler votre commande).",
|
||||
"contract": "contrat",
|
||||
"contract season": "saison du contrat",
|
||||
"contract season recommandation": "recommandation : <Saison>-<année> (Exemple: Hiver-2025), si un formulaire est déjà créé pour la saison, reprenez son nom de saison si possible.",
|
||||
"contracts": "contrats",
|
||||
"create form": "créer un formulaire de contrat",
|
||||
"create new form": "créer un nouveau formulaire de contrat",
|
||||
"create product": "créer le produit",
|
||||
"create productor": "créer le/la producteur·trice",
|
||||
"create shipment": "créer la livraison",
|
||||
"create shipments for your contract form": "créez les livraisons pour votre contrat",
|
||||
"create user": "créer l'utilisateur·trice",
|
||||
"create your contract form, it will create a form in the home page (accessible to users)": "créez votre formulaire de contrat dans la section \"Formulaire de contrat\". Ajouter une entrée dans cette section ajoutera un formulaire dans la page d'accueil.",
|
||||
"creation order": "ordre de création",
|
||||
"dashboard": "tableau de bord",
|
||||
"dashboard is for referers only, with this dashboard you can create productors, products, forms and shipments": "le tableau de bord est visible uniquement pour les référents, vous pouvez créer votre producteur, vos produits, vos formulaires de contrat et vos livraisons.",
|
||||
"delete": "supprimer",
|
||||
"delete entity": "supprimer le/la {{entity}}",
|
||||
"download base template to print": "télécharger le contrat à remplir sur papier",
|
||||
"download contract": "télécharger le contrat",
|
||||
"download contracts": "télécharger les contrats",
|
||||
"download recap": "Télécharger le récapitulatif",
|
||||
"edit form": "modifier le formulaire de contrat",
|
||||
"edit product": "modifier le produit",
|
||||
"edit productor": "modifier le/la producteur·trice",
|
||||
"edit shipment": "modifier la livraison",
|
||||
"edit user": "modifier l'utilisateur·trice",
|
||||
"end": "fin",
|
||||
"end date": "date de fin",
|
||||
"enter cheque quantity": "entrez la quantité de chèques",
|
||||
"enter cheque value": "entrez la valeur du chèque",
|
||||
"enter payment method": "sélectionnez votre méthode de paiement",
|
||||
"enter quantity": "entrez la quantité",
|
||||
"error": "erreur",
|
||||
"error edit": "erreur pendant l'édition {{entity}}",
|
||||
"error create": "erreur pendant la création {{entity}}",
|
||||
"error delete": "erreur pendant la suppression {{entity}}",
|
||||
"of the user": "de l'utilisateur·trice",
|
||||
"error edit": "erreur pendant l'édition {{entity}}",
|
||||
"example in user forms": "exemple dans le formulaire à destination des amapiens",
|
||||
"export contracts": "Télécharger les contrats",
|
||||
"fill contract online": "remplir le contrat en ligne",
|
||||
"filter by form": "filtrer par formulaire",
|
||||
"filter by name": "filtrer par nom",
|
||||
"filter by productor": "filtrer par producteur·trice",
|
||||
"filter by season": "filtrer par saisons",
|
||||
"filter by type": "filtrer par type",
|
||||
"for this contract": "pour ce contrat.",
|
||||
"for transfer method contact your referer or productor": "pour mettre en place le virement automatique, contactez votre référent ou le producteur.",
|
||||
"form": "formulaire de contrat",
|
||||
"form name": "nom du formulaire de contrat",
|
||||
"form name recommandation": "recommandation : Contrat <contract-type> (Exemple : Contrat Porc-Agneau)",
|
||||
"forms": "formulaires de contrat",
|
||||
"glossary": "glossaire",
|
||||
"grams": "grammes (g)",
|
||||
"help": "aide",
|
||||
"hidden": "caché",
|
||||
"home": "accueil",
|
||||
"how to use dashboard": "comment utiliser le tableau de bord",
|
||||
"in": "en",
|
||||
"in the same corner you can download a recap by clicking on the button": "au même endroit vous pouvez exporter votre récapitulatif (format odt) à vérifier et transmettre au producteur en cliquant sur le bouton",
|
||||
"in this page you can view all contracts submissions, you can remove duplicates submission or download a specific contract": "dans cette page vous pouvez voir tous les contrats, vous pouvez supprimer un contrat en doublon, ou télécharger uniquement un contrat.",
|
||||
"informations": "informations",
|
||||
"is defined by": "est defini par",
|
||||
"is required": "est requis·e",
|
||||
"kilo": "kilogrammes (kg)",
|
||||
"link to the section": "lien vers la section : {{section}}",
|
||||
"liter": "litres (L)",
|
||||
"login with keycloak": "se connecter avec keycloak",
|
||||
"logout": "se déconnecter",
|
||||
"max cheque number": "numbre maximum de cheques possible",
|
||||
"mililiter": "mililitres (ml)",
|
||||
"minimum price for this shipment should be at least": "le prix minimum d'une livraison doit être au moins de",
|
||||
"minimum shipment value": "valeur minimum d'une livraison (€)",
|
||||
"name": "nom",
|
||||
"nothing found": "rien à afficher",
|
||||
"number of cheques between 1 and 3 cheques also enter your cheques identifiers, value is calculated automatically": "nombre de chèques entre 1 et 3, entrez également les identifiants des chèques utilisés.",
|
||||
"number of shipment": "nombre de livraisons",
|
||||
"occasional": "occasionnel",
|
||||
"occasional product": "produit occasionnel",
|
||||
"occasional products": "produits occasionnels par livraison",
|
||||
"of the contract": "du contrat",
|
||||
"of the form": "du formulaire",
|
||||
"of the product": "du produit",
|
||||
"of the productor": "du producteur·trice",
|
||||
"of the shipment": "de la livraison",
|
||||
"of the contract": "du contrat",
|
||||
"login with keycloak": "se connecter avec keycloak",
|
||||
"there is no contract for now": "il n'y a pas de contrats pour le moment.",
|
||||
"for transfer method contact your referer or productor": "pour mettre en place le virement automatique, contactez votre référent ou le producteur.",
|
||||
"cheque quantity": "quantité de chèques (pour le paiement en plusieurs fois)",
|
||||
"enter cheque quantity": "entrez la quantité de chèques",
|
||||
"cheque id": "identifiant du chèque",
|
||||
"cheque value": "valeur du chèque",
|
||||
"enter cheque value": "entrez la valeur du chèque",
|
||||
"enter payment method": "sélectionnez votre méthode de paiement",
|
||||
"number of cheques between 1 and 3 cheques also enter your cheques identifiers, value is calculated automatically": "nombre de chèques entre 1 et 3, entrez également les identifiants des chèques utilisés.",
|
||||
"of the user": "de l'utilisateur·trice",
|
||||
"once all contracts downloaded, you can delete the form (to avoid new submissions) and hide it from the home page": "une fois tous les contrats récupérés vous pouvez supprimer le formulaire (pour éviter les nouvelles demandes de contrat et pour cacher le formulaire de la page principale).",
|
||||
"order name": "ordre du chèque",
|
||||
"payment method": "méthode de paiement",
|
||||
"your session has expired please log in again": "votre session a expiré veuillez vous reconnecter.",
|
||||
"session expired": "session expirée",
|
||||
"user not allowed": "utilisateur non authorisé",
|
||||
"payment methods": "méthodes de paiement",
|
||||
"payment methods are defined for a productor. At the end of a form a section payment method let the user select his prefered payment method": "les méthodes de paiement sont définies par producteurs. À la fin du formulaire de contrat l'amapien pourra séléctionner sa méthode de paiement parmis celles que vous avez ajoutés.",
|
||||
"piece": "pièce",
|
||||
"price": "prix",
|
||||
"priceKg": "prix au kilo",
|
||||
"product": "produit",
|
||||
"product example": "exemple de produit",
|
||||
"product name": "nom du produit",
|
||||
"product price": "prix du produit",
|
||||
"product price kg": "prix du produit au Kilo",
|
||||
"product quantity": "quantité du produit",
|
||||
"product quantity unit": "unité de quantité du produit",
|
||||
"product type": "type de produit",
|
||||
"product unit": "unité de vente du produit",
|
||||
"productor": "producteur·trice",
|
||||
"productor address": "adresse du producteur·trice",
|
||||
"productor name": "nom du producteur·trice",
|
||||
"productor payment": "méthodes de paiement du producteur·trice",
|
||||
"productor type": "type du producteur·trice",
|
||||
"productors": "producteur·trices",
|
||||
"products": "produits",
|
||||
"quantity": "quantité",
|
||||
"quantity unit": "unité de quantité",
|
||||
"recurrent": "récurent",
|
||||
"recurrent product": "produit récurrent",
|
||||
"recurrent product is for all shipments, occasional product is for a specific shipment (see shipment form)": "les produits récurrents sont pour toutes les livraisons, les produits occasionnels sont pour une livraison particulière (voir formulaire de création de livraison).",
|
||||
"recurrent products": "produits récurrents",
|
||||
"referer": "référent·e",
|
||||
"remove contract": "supprimer le contrat",
|
||||
"remove form": "supprimer un formulaire de contrat",
|
||||
"remove product": "supprimer le produit",
|
||||
"remove productor": "supprimer le/la producteur·trice",
|
||||
"remove shipment": "supprimer la livraison",
|
||||
"remove user": "supprimer l'utilisateur·trice",
|
||||
"roles": "roles",
|
||||
"your keycloak user has no roles, please contact your administrator": "votre utilisateur keycloak n'a pas de roles configurés, contactez votre administrateur.",
|
||||
"choose payment method": "choisissez votre méthode de paiement (vous n'avez pas à payer tout de suite, uniquement renseigner comment vous souhaitez régler votre commande).",
|
||||
"season": "saison",
|
||||
"select a form": "selectionnez un formulaire",
|
||||
"select products per shipment": "sélectionnez les produits pour chaque livraison.",
|
||||
"sell unit": "unité de vente",
|
||||
"session expired": "session expirée",
|
||||
"shipment": "livraison",
|
||||
"shipment date": "date de la livraison",
|
||||
"shipment form": "formulaire lié a la livraison",
|
||||
"shipment name": "nom de la livraison",
|
||||
"shipment products": "produits pour la livraison",
|
||||
"shipment products is necessary only for occasional products (if all products are recurrent leave empty)": "il est nécessaire de configurer les produits pour la livraison uniquement si il y a des produits occasionnels (laisser vide si tous les produits sont récurents).",
|
||||
"shipments": "livraisons",
|
||||
"some contracts require a minimum value per shipment, ignore this field if it's not the case": "certains contrats nécessitent une valeur minimum par livraison. Ce champ peut être ignoré s’il ne s’applique pas à votre contrat.",
|
||||
"start": "début",
|
||||
"start date": "date de début",
|
||||
"start to create a productor in the productors section": "commencez par créer un(e) producteur·trice dans la section \"Producteur·trices\".",
|
||||
"submit": "envoyer",
|
||||
"submit contract": "envoyer le contrat",
|
||||
"success": "succès",
|
||||
"success create": "{{entity}} correctement créé",
|
||||
"success delete": "{{entity}} correctement supprimé",
|
||||
"success edit": "{{entity}} correctement édité",
|
||||
"templates": "modèles",
|
||||
"the product unit will be assigned to the quantity requested in the form": "l'unité de vente du produit définit l'unité associée à la quantité demandée dans le formulaire des amapiens.",
|
||||
"all theses informations are for contract generation": "ces informations sont nécessaires pour la génération de contrat."
|
||||
}
|
||||
"the products": "les produits",
|
||||
"the shipments": "les livraisons",
|
||||
"there is": "il y a",
|
||||
"there is no contract for now": "il n'y a pas de contrats pour le moment.",
|
||||
"this field is also optionnal if a product have a quantity you can select the correct unit (metric system). It will be shown next to product quantity inside the form": "ce champs est optionnel dans la configuation d'un produit, il représente l'unité de mesure associée à la quantité d'un produit (g, kg, ml, L). Si ce champs est renseigné il sera affiché dans le formulaire à destination des amapiens à coté de la quantité du produit.",
|
||||
"this field is optionnal a product can have a quantity if configured inside the product it will be shown inside the form": "ce champ est optionnel dans la configuration d'un produit, il représente la quantité d'un produit (poids d'une tranche de foie, poids d'un panier, taille d'un bocal...). Si ce champs est renseigné il sera affiché dans le formulaire à destination des amapiens.",
|
||||
"this will also delete": "cette action supprimera aussi",
|
||||
"to add a use the": "pour ajouter {{section}} utilisez le bouton",
|
||||
"to delete a use the": "pour supprimer {{section}} utilisez le bouton",
|
||||
"to edit a use the": "pour éditer {{section}} utilisez le bouton",
|
||||
"to export contracts submissions before sending to the productor go to the contracts section": "pour exporter les contrats avant de les envoyer aux producteurs allez dans la section \"contrats\".",
|
||||
"total price": "prix total",
|
||||
"transfer": "virement",
|
||||
"type": "type",
|
||||
"unit": "unité de vente",
|
||||
"user": "utilisateur·trice",
|
||||
"user not allowed": "utilisateur non authorisé",
|
||||
"users": "utilisateur·trices",
|
||||
"visible": "visible",
|
||||
"with 150 set as quantity and g as quantity unit in product": "avec \"150\" en quantité de produit et \"grammes\" selectionné dans l'unité de quantité du produit",
|
||||
"with cheque and transfer": "avec chèques et virements configuré pour le producteur",
|
||||
"with grams as product unit selected": "avec \"grammes\" selectionné pour l'unité de produit",
|
||||
"you can download all contracts for your form using the export all": "vous pouvez télécharger tous les contrats de votre formulaire en utilisant le bouton",
|
||||
"your keycloak user has no roles, please contact your administrator": "votre utilisateur keycloak n'a pas de roles configurés, contactez votre administrateur.",
|
||||
"your selection in this category will apply for all shipments": "votre sélection sera appliquée pour chaque livraisons (Exemple: Pour 6 livraisons, le produits sera compté 6 fois : une fois par livraison).",
|
||||
"your session has expired please log in again": "votre session a expiré veuillez vous reconnecter."
|
||||
}
|
||||
@@ -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}`,
|
||||
|
||||
@@ -2,16 +2,17 @@ import { ActionIcon, Table, Tooltip } from "@mantine/core";
|
||||
import { type Contract } from "@/services/resources/contracts";
|
||||
import { IconDownload, IconX } from "@tabler/icons-react";
|
||||
import { t } from "@/config/i18n";
|
||||
import { useDeleteContract, useGetContractFile } from "@/services/api";
|
||||
import { useGetContractFile } from "@/services/api";
|
||||
import { useCallback } from "react";
|
||||
import { useNavigate } from "react-router";
|
||||
|
||||
export type ContractRowProps = {
|
||||
contract: Contract;
|
||||
};
|
||||
|
||||
export default function ContractRow({ contract }: ContractRowProps) {
|
||||
const deleteMutation = useDeleteContract();
|
||||
const getContractMutation = useGetContractFile();
|
||||
const navigate = useNavigate();
|
||||
|
||||
const handleDownload = useCallback(async () => {
|
||||
getContractMutation.mutateAsync(contract.id);
|
||||
@@ -29,12 +30,10 @@ export default function ContractRow({ contract }: ContractRowProps) {
|
||||
{contract.cheque_quantity > 0 && contract.cheque_quantity} {contract.payment_method}
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
{
|
||||
`${Intl.NumberFormat("fr-FR", {
|
||||
style: "currency",
|
||||
currency: "EUR",
|
||||
}).format(contract.total_price)}`
|
||||
}
|
||||
{`${Intl.NumberFormat("fr-FR", {
|
||||
style: "currency",
|
||||
currency: "EUR",
|
||||
}).format(contract.total_price)}`}
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
<Tooltip label={t("download contract", { capfirst: true })}>
|
||||
@@ -54,8 +53,9 @@ export default function ContractRow({ contract }: ContractRowProps) {
|
||||
color="red"
|
||||
size="sm"
|
||||
mr="5"
|
||||
onClick={() => {
|
||||
deleteMutation.mutate(contract.id);
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
navigate(`/dashboard/contracts/${contract.id}/delete`);
|
||||
}}
|
||||
>
|
||||
<IconX />
|
||||
|
||||
78
frontend/src/components/DeleteModal/index.tsx
Normal file
78
frontend/src/components/DeleteModal/index.tsx
Normal file
@@ -0,0 +1,78 @@
|
||||
import { t } from "@/config/i18n";
|
||||
import { useGetDeleteDependencies } from "@/services/api";
|
||||
import { Button, Group, List, Modal, Text, type ModalBaseProps } from "@mantine/core";
|
||||
import { IconCancel, IconCheck } from "@tabler/icons-react";
|
||||
import { Link } from "react-router";
|
||||
|
||||
export type DeleteModalProps = ModalBaseProps & {
|
||||
handleSubmit: (id: number) => void;
|
||||
entityType: string;
|
||||
entity?: { name: string; id: number } | undefined;
|
||||
};
|
||||
|
||||
export function DeleteModal({
|
||||
opened,
|
||||
onClose,
|
||||
handleSubmit,
|
||||
entityType,
|
||||
entity,
|
||||
}: DeleteModalProps) {
|
||||
if (!entity) {
|
||||
return null;
|
||||
}
|
||||
const { data: deleteDependencies } = useGetDeleteDependencies(entityType, entity.id);
|
||||
|
||||
return (
|
||||
<Modal
|
||||
opened={opened}
|
||||
onClose={onClose}
|
||||
title={t("delete entity", { capfirst: true, entity: t(entityType) })}
|
||||
>
|
||||
<Text>{`${t("are you sure you want to delete", { capfirst: true })} : "${entity.name}"`}</Text>
|
||||
{deleteDependencies && deleteDependencies.length > 0 ? (
|
||||
<Text>{`${t("this will also delete", { capfirst: true })} :`}</Text>
|
||||
) : null}
|
||||
{
|
||||
<List>
|
||||
{deleteDependencies?.map((dependency) => (
|
||||
<List.Item key={dependency.id}>
|
||||
{dependency.type === "contract" ? (
|
||||
`${t(dependency.type, { capfirst: true })} - ${dependency.name}`
|
||||
) : (
|
||||
<Link
|
||||
to={`/dashboard/${dependency.type}s/${dependency.id}/edit`}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
>
|
||||
{`${t(dependency.type, { capfirst: true })} - ${dependency.name}`}
|
||||
</Link>
|
||||
)}
|
||||
</List.Item>
|
||||
))}
|
||||
</List>
|
||||
}
|
||||
<Group mt="sm" justify="space-between">
|
||||
<Button
|
||||
variant="filled"
|
||||
color="red"
|
||||
aria-label={t("cancel", { capfirst: true })}
|
||||
leftSection={<IconCancel />}
|
||||
onClick={onClose}
|
||||
>
|
||||
{t("cancel", { capfirst: true })}
|
||||
</Button>
|
||||
<Button
|
||||
variant="filled"
|
||||
aria-label={t("delete entity", { capfirst: true, entity: t(entityType) })}
|
||||
leftSection={<IconCheck />}
|
||||
onClick={() => {
|
||||
handleSubmit(entity.id);
|
||||
onClose();
|
||||
}}
|
||||
>
|
||||
{t("delete", { capfirst: true })}
|
||||
</Button>
|
||||
</Group>
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
@@ -10,37 +10,33 @@ export type FormCardProps = {
|
||||
};
|
||||
|
||||
export function FormCard({ form }: FormCardProps) {
|
||||
const contractBaseTemplate = useGetContractFileTemplate()
|
||||
const contractBaseTemplate = useGetContractFileTemplate();
|
||||
return (
|
||||
<Paper shadow="xl" p="xl" miw={{ base: "100vw", md: "25vw", lg: "20vw" }}>
|
||||
<Group justify="start" mb="md">
|
||||
<Tooltip
|
||||
label={t("download base template to print")}
|
||||
>
|
||||
<ActionIcon
|
||||
variant={"outline"}
|
||||
aria-label={t("download base template to print")}
|
||||
onClick={async () => {
|
||||
await contractBaseTemplate.mutateAsync(form.id)
|
||||
}}
|
||||
>
|
||||
<IconDownload/>
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
<Tooltip
|
||||
label={t("fill contract online")}
|
||||
>
|
||||
<ActionIcon
|
||||
variant={"outline"}
|
||||
aria-label={t("fill contract online")}
|
||||
component={Link}
|
||||
to={`/form/${form.id}`}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
>
|
||||
<IconExternalLink/>
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
<Tooltip label={t("download base template to print")}>
|
||||
<ActionIcon
|
||||
variant={"outline"}
|
||||
aria-label={t("download base template to print")}
|
||||
onClick={async () => {
|
||||
await contractBaseTemplate.mutateAsync(form.id);
|
||||
}}
|
||||
>
|
||||
<IconDownload />
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
<Tooltip label={t("fill contract online")}>
|
||||
<ActionIcon
|
||||
variant={"outline"}
|
||||
aria-label={t("fill contract online")}
|
||||
component={Link}
|
||||
to={`/form/${form.id}`}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
>
|
||||
<IconExternalLink />
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
</Group>
|
||||
|
||||
<Box
|
||||
|
||||
@@ -34,7 +34,7 @@ export default function FormModal({ opened, onClose, currentForm, handleSubmit }
|
||||
productor_id: currentForm?.productor?.id.toString() ?? "",
|
||||
referer_id: currentForm?.referer?.id.toString() ?? "",
|
||||
minimum_shipment_value: currentForm?.minimum_shipment_value ?? null,
|
||||
visible: currentForm?.visible ?? false
|
||||
visible: currentForm?.visible ?? false,
|
||||
},
|
||||
validate: {
|
||||
name: (value) =>
|
||||
@@ -53,6 +53,7 @@ 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 +61,7 @@ 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}`,
|
||||
@@ -138,10 +140,14 @@ export default function FormModal({ opened, onClose, currentForm, handleSubmit }
|
||||
radius="sm"
|
||||
{...form.getInputProps("minimum_shipment_value")}
|
||||
/>
|
||||
<Checkbox mt="lg"
|
||||
label={t("visible", {capfirst: true})}
|
||||
description={t("by checking this option the form will be accessible publicly on the home page, only check it if everything is fine with your form", {capfirst: true})}
|
||||
{...form.getInputProps("visible", {type: "checkbox"})}
|
||||
<Checkbox
|
||||
mt="lg"
|
||||
label={t("visible", { capfirst: true })}
|
||||
description={t(
|
||||
"by checking this option the form will be accessible publicly on the home page, only check it if everything is fine with your form",
|
||||
{ capfirst: true },
|
||||
)}
|
||||
{...form.getInputProps("visible", { type: "checkbox" })}
|
||||
/>
|
||||
<Group mt="sm" justify="space-between">
|
||||
<Button
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { ActionIcon, Badge, Table, Tooltip } from "@mantine/core";
|
||||
import { useNavigate, useSearchParams } from "react-router";
|
||||
import { useDeleteForm } from "@/services/api";
|
||||
import { IconEdit, IconX } from "@tabler/icons-react";
|
||||
import { t } from "@/config/i18n";
|
||||
import type { Form } from "@/services/resources/forms";
|
||||
@@ -11,16 +10,15 @@ export type FormRowProps = {
|
||||
|
||||
export default function FormRow({ form }: FormRowProps) {
|
||||
const [searchParams] = useSearchParams();
|
||||
const deleteMutation = useDeleteForm();
|
||||
const navigate = useNavigate();
|
||||
|
||||
return (
|
||||
<Table.Tr key={form.id}>
|
||||
<Table.Td>
|
||||
{form.visible ?
|
||||
<Badge color="green">{t("visible", {capfirst: true})}</Badge> :
|
||||
<Badge color="red">{t("hidden", {capfirst: true})}</Badge>
|
||||
}
|
||||
{form.visible ? (
|
||||
<Badge color="green">{t("visible", { capfirst: true })}</Badge>
|
||||
) : (
|
||||
<Badge color="red">{t("hidden", { capfirst: true })}</Badge>
|
||||
)}
|
||||
</Table.Td>
|
||||
<Table.Td>{form.name}</Table.Td>
|
||||
<Table.Td>{form.season}</Table.Td>
|
||||
@@ -29,7 +27,7 @@ export default function FormRow({ form }: FormRowProps) {
|
||||
<Table.Td>{form.productor.name}</Table.Td>
|
||||
<Table.Td>{form.referer.name}</Table.Td>
|
||||
<Table.Td>
|
||||
<Tooltip label={t("edit productor", { capfirst: true })}>
|
||||
<Tooltip label={t("edit form", { capfirst: true })}>
|
||||
<ActionIcon
|
||||
size="sm"
|
||||
mr="5"
|
||||
@@ -43,13 +41,16 @@ export default function FormRow({ form }: FormRowProps) {
|
||||
<IconEdit />
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
<Tooltip label={t("remove productor", { capfirst: true })}>
|
||||
<Tooltip label={t("remove form", { capfirst: true })}>
|
||||
<ActionIcon
|
||||
color="red"
|
||||
size="sm"
|
||||
mr="5"
|
||||
onClick={() => {
|
||||
deleteMutation.mutate(form.id);
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
navigate(
|
||||
`/dashboard/forms/${form.id}/delete${searchParams ? `?${searchParams.toString()}` : ""}`,
|
||||
);
|
||||
}}
|
||||
>
|
||||
<IconX />
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -1,88 +1,86 @@
|
||||
import { t } from "@/config/i18n";
|
||||
import type { ContractInputs } from "@/services/resources/contracts";
|
||||
import type { Productor } from "@/services/resources/productors";
|
||||
import { Group, NumberInput, Stack, TextInput, Title } from "@mantine/core";
|
||||
import type { UseFormReturnType } from "@mantine/form";
|
||||
import { useEffect, useMemo } from "react";
|
||||
|
||||
export type ContractChequeProps = {
|
||||
inputForm: UseFormReturnType<ContractInputs>;
|
||||
price: number;
|
||||
productor: Productor;
|
||||
};
|
||||
|
||||
export type Cheque = {
|
||||
name: string;
|
||||
value: string;
|
||||
};
|
||||
|
||||
export function ContractCheque({ inputForm, price, productor }: ContractChequeProps) {
|
||||
useEffect(() => {
|
||||
if (!inputForm.values.payment_method.includes("cheque")) {
|
||||
return;
|
||||
}
|
||||
const quantity = Number(inputForm.values.cheque_quantity);
|
||||
if (!quantity || quantity <= 0) return;
|
||||
const cheques = inputForm.values.cheques || [];
|
||||
if (cheques.length !== quantity) {
|
||||
const newCheques = Array.from({ length: quantity }, (_, i) => ({
|
||||
name: cheques[i]?.name ?? "",
|
||||
value: cheques[i]?.value ?? 0,
|
||||
}));
|
||||
inputForm.setFieldValue("cheques", newCheques);
|
||||
}
|
||||
|
||||
const totalCents = Math.round(price * 100);
|
||||
const base = Math.floor(totalCents / quantity);
|
||||
const rest = totalCents - base * quantity;
|
||||
for (let i = 0; i < quantity; i++) {
|
||||
const val = (i === quantity - 1 ? base + rest : base) / 100;
|
||||
inputForm.setFieldValue(`cheques.${i}.value`, val.toFixed(2));
|
||||
}
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [inputForm.values.cheque_quantity, price, inputForm.values.cheques]);
|
||||
|
||||
const paymentMethod = useMemo(() => {
|
||||
return productor?.payment_methods.find((el) => el.name === "cheque")
|
||||
}, [productor]);
|
||||
|
||||
return (
|
||||
<Stack>
|
||||
<Title order={4}>{`${t("order name")} : ${paymentMethod?.details}`}</Title>
|
||||
<NumberInput
|
||||
label={t("cheque quantity", { capfirst: true })}
|
||||
placeholder={t("enter cheque quantity", { capfirst: true })}
|
||||
description={t(
|
||||
"number of cheques between 1 and 3 cheques also enter your cheques identifiers, value is calculated automatically",
|
||||
{ capfirst: true },
|
||||
)}
|
||||
min={1}
|
||||
max={paymentMethod?.max && paymentMethod?.max !== "" ? Number(paymentMethod?.max) : 3}
|
||||
{...inputForm.getInputProps(`cheque_quantity`)}
|
||||
/>
|
||||
<Group grow>
|
||||
{inputForm.values.cheques.map((cheque, index) => (
|
||||
<Stack key={`${index}`}>
|
||||
<TextInput
|
||||
label={t("cheque id", { capfirst: true })}
|
||||
placeholder={t("cheque id", { capfirst: true })}
|
||||
{...inputForm.getInputProps(`cheques.${index}.name`)}
|
||||
error={
|
||||
cheque.name == "" ?
|
||||
inputForm?.errors.cheques :
|
||||
null
|
||||
}
|
||||
/>
|
||||
<NumberInput
|
||||
readOnly
|
||||
label={t("cheque value", { capfirst: true })}
|
||||
suffix={"€"}
|
||||
placeholder={t("enter cheque value", { capfirst: true })}
|
||||
{...inputForm.getInputProps(`cheques.${index}.value`)}
|
||||
/>
|
||||
</Stack>
|
||||
))}
|
||||
</Group>
|
||||
</Stack>
|
||||
);
|
||||
}
|
||||
import { t } from "@/config/i18n";
|
||||
import type { ContractInputs } from "@/services/resources/contracts";
|
||||
import type { Productor } from "@/services/resources/productors";
|
||||
import { Group, NumberInput, Stack, TextInput, Title } from "@mantine/core";
|
||||
import type { UseFormReturnType } from "@mantine/form";
|
||||
import { useEffect, useMemo } from "react";
|
||||
|
||||
export type ContractChequeProps = {
|
||||
inputForm: UseFormReturnType<ContractInputs>;
|
||||
price: number;
|
||||
productor: Productor;
|
||||
};
|
||||
|
||||
export type Cheque = {
|
||||
name: string;
|
||||
value: string;
|
||||
};
|
||||
|
||||
export function ContractCheque({ inputForm, price, productor }: ContractChequeProps) {
|
||||
useEffect(() => {
|
||||
if (!inputForm.values.payment_method.includes("cheque")) {
|
||||
return;
|
||||
}
|
||||
const quantity = Number(inputForm.values.cheque_quantity);
|
||||
if (!quantity || quantity <= 0) return;
|
||||
const cheques = inputForm.values.cheques || [];
|
||||
if (cheques.length !== quantity) {
|
||||
const newCheques = Array.from({ length: quantity }, (_, i) => ({
|
||||
name: cheques[i]?.name ?? "",
|
||||
value: cheques[i]?.value ?? 0,
|
||||
}));
|
||||
inputForm.setFieldValue("cheques", newCheques);
|
||||
}
|
||||
|
||||
const totalCents = Math.round(price * 100);
|
||||
const base = Math.floor(totalCents / quantity);
|
||||
const rest = totalCents - base * quantity;
|
||||
for (let i = 0; i < quantity; i++) {
|
||||
const val = (i === quantity - 1 ? base + rest : base) / 100;
|
||||
inputForm.setFieldValue(`cheques.${i}.value`, val.toFixed(2));
|
||||
}
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [inputForm.values.cheque_quantity, price, inputForm.values.cheques]);
|
||||
|
||||
const paymentMethod = useMemo(() => {
|
||||
return productor?.payment_methods.find((el) => el.name === "cheque");
|
||||
}, [productor]);
|
||||
|
||||
return (
|
||||
<Stack>
|
||||
<Title order={4}>{`${t("order name")} : ${paymentMethod?.details}`}</Title>
|
||||
<NumberInput
|
||||
label={t("cheque quantity", { capfirst: true })}
|
||||
placeholder={t("enter cheque quantity", { capfirst: true })}
|
||||
description={t(
|
||||
"number of cheques between 1 and 3 cheques also enter your cheques identifiers, value is calculated automatically",
|
||||
{ capfirst: true },
|
||||
)}
|
||||
min={1}
|
||||
max={
|
||||
paymentMethod?.max && paymentMethod?.max !== "" ? Number(paymentMethod?.max) : 3
|
||||
}
|
||||
{...inputForm.getInputProps(`cheque_quantity`)}
|
||||
/>
|
||||
<Group grow>
|
||||
{inputForm.values.cheques.map((cheque, index) => (
|
||||
<Stack key={`${index}`}>
|
||||
<TextInput
|
||||
label={t("cheque id", { capfirst: true })}
|
||||
placeholder={t("cheque id", { capfirst: true })}
|
||||
{...inputForm.getInputProps(`cheques.${index}.name`)}
|
||||
error={cheque.name == "" ? inputForm?.errors.cheques : null}
|
||||
/>
|
||||
<NumberInput
|
||||
readOnly
|
||||
label={t("cheque value", { capfirst: true })}
|
||||
suffix={"€"}
|
||||
placeholder={t("enter cheque value", { capfirst: true })}
|
||||
{...inputForm.getInputProps(`cheques.${index}.value`)}
|
||||
/>
|
||||
</Stack>
|
||||
))}
|
||||
</Group>
|
||||
</Stack>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -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: {
|
||||
@@ -48,21 +48,31 @@ export function ProductorModal({
|
||||
!value ? `${t("address", { capfirst: true })} ${t("is required")}` : null,
|
||||
type: (value) =>
|
||||
!value ? `${t("type", { capfirst: true })} ${t("is required")}` : null,
|
||||
payment_methods: (value) =>
|
||||
value.length === 0 || value.some(
|
||||
(payment) =>
|
||||
payment.name === "cheque" &&
|
||||
payment.details === "") ?
|
||||
`${t("a payment method", { capfirst: true })} ${t("is required")}` : null,
|
||||
payment_methods: (value) =>
|
||||
value.length === 0 ||
|
||||
value.some((payment) => payment.name === "cheque" && payment.details === "")
|
||||
? `${t("a payment method", { capfirst: true })} ${t("is required")}`
|
||||
: null,
|
||||
},
|
||||
});
|
||||
|
||||
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 })}>
|
||||
<Modal
|
||||
opened={opened}
|
||||
onClose={onClose}
|
||||
title={
|
||||
currentProductor
|
||||
? t("edit productor", { capfirst: true })
|
||||
: t("create productor", { capfirst: true })
|
||||
}
|
||||
>
|
||||
<Title order={4}>{t("Informations", { capfirst: true })}</Title>
|
||||
<TextInput
|
||||
label={t("productor name", { capfirst: true })}
|
||||
@@ -127,7 +137,7 @@ export function ProductorModal({
|
||||
<NumberInput
|
||||
label={t("max cheque number", { capfirst: true })}
|
||||
placeholder={t("max cheque number", { capfirst: true })}
|
||||
description={t("can be empty default to 3", {capfirst: true})}
|
||||
description={t("can be empty default to 3", { capfirst: true })}
|
||||
{...form.getInputProps(`payment_methods.${index}.max`)}
|
||||
/>
|
||||
</Stack>
|
||||
|
||||
@@ -2,7 +2,6 @@ import { ActionIcon, Badge, Table, Tooltip } from "@mantine/core";
|
||||
import { t } from "@/config/i18n";
|
||||
import { IconEdit, IconX } from "@tabler/icons-react";
|
||||
import type { Productor } from "@/services/resources/productors";
|
||||
import { useDeleteProductor } from "@/services/api";
|
||||
import { useNavigate, useSearchParams } from "react-router";
|
||||
|
||||
export type ProductorRowProps = {
|
||||
@@ -11,7 +10,6 @@ export type ProductorRowProps = {
|
||||
|
||||
export default function ProductorRow({ productor }: ProductorRowProps) {
|
||||
const [searchParams] = useSearchParams();
|
||||
const deleteMutation = useDeleteProductor();
|
||||
const navigate = useNavigate();
|
||||
|
||||
return (
|
||||
@@ -46,8 +44,11 @@ export default function ProductorRow({ productor }: ProductorRowProps) {
|
||||
color="red"
|
||||
size="sm"
|
||||
mr="5"
|
||||
onClick={() => {
|
||||
deleteMutation.mutate(productor.id);
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
navigate(
|
||||
`/dashboard/productors/${productor.id}/delete${searchParams ? `?${searchParams.toString()}` : ""}`,
|
||||
);
|
||||
}}
|
||||
>
|
||||
<IconX />
|
||||
|
||||
@@ -59,6 +59,7 @@ export function ProductModal({ opened, onClose, currentProduct, handleSubmit }:
|
||||
});
|
||||
|
||||
const productorsSelect = useMemo(() => {
|
||||
if (!productors) return [];
|
||||
return productors?.map((productor) => ({
|
||||
value: String(productor.id),
|
||||
label: `${productor.name}`,
|
||||
@@ -66,7 +67,15 @@ export function ProductModal({ opened, onClose, currentProduct, handleSubmit }:
|
||||
}, [productors]);
|
||||
|
||||
return (
|
||||
<Modal opened={opened} onClose={onClose} title={t("create product", { capfirst: true })}>
|
||||
<Modal
|
||||
opened={opened}
|
||||
onClose={onClose}
|
||||
title={
|
||||
currentProduct
|
||||
? t("edit product", { capfirst: true })
|
||||
: t("create product", { capfirst: true })
|
||||
}
|
||||
>
|
||||
<Title order={4}>{t("informations", { capfirst: true })}</Title>
|
||||
<Select
|
||||
label={t("productor", { capfirst: true })}
|
||||
|
||||
@@ -2,7 +2,6 @@ import { ActionIcon, Table, Tooltip } from "@mantine/core";
|
||||
import { t } from "@/config/i18n";
|
||||
import { IconEdit, IconX } from "@tabler/icons-react";
|
||||
import { ProductType, ProductUnit, type Product } from "@/services/resources/products";
|
||||
import { useDeleteProduct } from "@/services/api";
|
||||
import { useNavigate, useSearchParams } from "react-router";
|
||||
|
||||
export type ProductRowProps = {
|
||||
@@ -11,7 +10,6 @@ export type ProductRowProps = {
|
||||
|
||||
export default function ProductRow({ product }: ProductRowProps) {
|
||||
const [searchParams] = useSearchParams();
|
||||
const deleteMutation = useDeleteProduct();
|
||||
const navigate = useNavigate();
|
||||
|
||||
return (
|
||||
@@ -59,8 +57,11 @@ export default function ProductRow({ product }: ProductRowProps) {
|
||||
color="red"
|
||||
size="sm"
|
||||
mr="5"
|
||||
onClick={() => {
|
||||
deleteMutation.mutate(product.id);
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
navigate(
|
||||
`/dashboard/products/${product.id}/delete${searchParams ? `?${searchParams.toString()}` : ""}`,
|
||||
);
|
||||
}}
|
||||
>
|
||||
<IconX />
|
||||
|
||||
@@ -48,6 +48,7 @@ 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 +56,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,
|
||||
@@ -73,7 +74,11 @@ export default function ShipmentModal({
|
||||
<Modal
|
||||
opened={opened}
|
||||
onClose={onClose}
|
||||
title={currentShipment ? t("edit shipment") : t("create shipment")}
|
||||
title={
|
||||
currentShipment
|
||||
? t("edit shipment", { capfirst: true })
|
||||
: t("create shipment", { capfirst: true })
|
||||
}
|
||||
>
|
||||
<TextInput
|
||||
label={t("shipment name", { capfirst: true })}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { ActionIcon, Table, Tooltip } from "@mantine/core";
|
||||
import { useNavigate, useSearchParams } from "react-router";
|
||||
import { useDeleteShipment } from "@/services/api";
|
||||
import { IconEdit, IconX } from "@tabler/icons-react";
|
||||
import { t } from "@/config/i18n";
|
||||
import type { Shipment } from "@/services/resources/shipments";
|
||||
@@ -11,7 +10,6 @@ export type ShipmentRowProps = {
|
||||
|
||||
export default function ShipmentRow({ shipment }: ShipmentRowProps) {
|
||||
const [searchParams] = useSearchParams();
|
||||
const deleteMutation = useDeleteShipment();
|
||||
const navigate = useNavigate();
|
||||
|
||||
return (
|
||||
@@ -20,7 +18,7 @@ export default function ShipmentRow({ shipment }: ShipmentRowProps) {
|
||||
<Table.Td>{shipment.date}</Table.Td>
|
||||
<Table.Td>{`${shipment.form.name} ${shipment.form.season}`}</Table.Td>
|
||||
<Table.Td>
|
||||
<Tooltip label={t("edit productor", { capfirst: true })}>
|
||||
<Tooltip label={t("edit shipment", { capfirst: true })}>
|
||||
<ActionIcon
|
||||
size="sm"
|
||||
mr="5"
|
||||
@@ -34,13 +32,16 @@ export default function ShipmentRow({ shipment }: ShipmentRowProps) {
|
||||
<IconEdit />
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
<Tooltip label={t("remove productor", { capfirst: true })}>
|
||||
<Tooltip label={t("remove shipment", { capfirst: true })}>
|
||||
<ActionIcon
|
||||
color="red"
|
||||
size="sm"
|
||||
mr="5"
|
||||
onClick={() => {
|
||||
deleteMutation.mutate(shipment.id);
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
navigate(
|
||||
`/dashboard/shipments/${shipment.id}/delete${searchParams ? `?${searchParams.toString()}` : ""}`,
|
||||
);
|
||||
}}
|
||||
>
|
||||
<IconX />
|
||||
|
||||
@@ -36,11 +36,20 @@ 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]);
|
||||
|
||||
return (
|
||||
<Modal opened={opened} onClose={onClose} title={t("create user", { capfirst: true })}>
|
||||
<Modal
|
||||
opened={opened}
|
||||
onClose={onClose}
|
||||
title={
|
||||
currentUser
|
||||
? t("edit user", { capfirst: true })
|
||||
: t("create user", { capfirst: true })
|
||||
}
|
||||
>
|
||||
<Title order={4}>{t("informations", { capfirst: true })}</Title>
|
||||
<TextInput
|
||||
label={t("user name", { capfirst: true })}
|
||||
|
||||
@@ -2,7 +2,6 @@ import { ActionIcon, Badge, Box, Table, Tooltip } from "@mantine/core";
|
||||
import { t } from "@/config/i18n";
|
||||
import { IconEdit, IconX } from "@tabler/icons-react";
|
||||
import { type User } from "@/services/resources/users";
|
||||
import { useDeleteUser } from "@/services/api";
|
||||
import { useNavigate, useSearchParams } from "react-router";
|
||||
|
||||
export type UserRowProps = {
|
||||
@@ -11,36 +10,31 @@ export type UserRowProps = {
|
||||
|
||||
export default function UserRow({ user }: UserRowProps) {
|
||||
const [searchParams] = useSearchParams();
|
||||
const deleteMutation = useDeleteUser();
|
||||
const navigate = useNavigate();
|
||||
|
||||
return (
|
||||
<Table.Tr key={user.id}>
|
||||
<Table.Td>{user.name}</Table.Td>
|
||||
<Table.Td>{user.email}</Table.Td>
|
||||
<Table.Td style={{maxWidth: 200}}>
|
||||
<Table.Td style={{ maxWidth: 200 }}>
|
||||
<Box
|
||||
style={{
|
||||
display: 'flex',
|
||||
gap: 4
|
||||
display: "flex",
|
||||
gap: 4,
|
||||
}}
|
||||
>
|
||||
{user.roles.slice(0, 3).map((value) => (
|
||||
<Badge key={value.id} size="xs">
|
||||
{t(value.name, { capfirst: true })}
|
||||
</Badge>
|
||||
))}
|
||||
{
|
||||
user.roles.length > 3 && (
|
||||
<Tooltip
|
||||
label={user.roles.slice(3).map(role=>`${role.name} `)}
|
||||
>
|
||||
{user.roles.slice(0, 3).map((value) => (
|
||||
<Badge key={value.id} size="xs">
|
||||
{t(value.name, { capfirst: true })}
|
||||
</Badge>
|
||||
))}
|
||||
{user.roles.length > 3 && (
|
||||
<Tooltip label={user.roles.slice(3).map((role) => `${role.name} `)}>
|
||||
<Badge size="xs" variant="light">
|
||||
+{user.roles.length - 3}
|
||||
</Badge>
|
||||
</Tooltip>
|
||||
)
|
||||
}
|
||||
)}
|
||||
</Box>
|
||||
</Table.Td>
|
||||
<Table.Td>
|
||||
@@ -63,8 +57,11 @@ export default function UserRow({ user }: UserRowProps) {
|
||||
color="red"
|
||||
size="sm"
|
||||
mr="5"
|
||||
onClick={() => {
|
||||
deleteMutation.mutate(user.id);
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
navigate(
|
||||
`/dashboard/users/${user.id}/delete${searchParams ? `?${searchParams.toString()}` : ""}`,
|
||||
);
|
||||
}}
|
||||
>
|
||||
<IconX />
|
||||
|
||||
@@ -50,8 +50,10 @@ export function Contract() {
|
||||
!value ? `${t("a phone", { capfirst: true })} ${t("is required")}` : null,
|
||||
payment_method: (value) =>
|
||||
!value ? `${t("a payment method", { capfirst: true })} ${t("is required")}` : null,
|
||||
cheques: (value, values) =>
|
||||
values.payment_method === "cheque" && value.some((val) => val.name == "") ? `${t("cheque id", {capfirst: true})} ${t("is required")}` : null,
|
||||
cheques: (value, values) =>
|
||||
values.payment_method === "cheque" && value.some((val) => val.name == "")
|
||||
? `${t("cheque id", { capfirst: true })} ${t("is required")}`
|
||||
: null,
|
||||
},
|
||||
});
|
||||
|
||||
@@ -137,12 +139,13 @@ export function Contract() {
|
||||
const formValues = inputForm.getValues();
|
||||
const contract = {
|
||||
...formValues,
|
||||
cheque_quantity: formValues.payment_method === "cheque" ? formValues.cheque_quantity : 0,
|
||||
cheque_quantity:
|
||||
formValues.payment_method === "cheque" ? formValues.cheque_quantity : 0,
|
||||
form_id: form.id,
|
||||
products: tranformProducts(withDefaultValues(formValues.products)),
|
||||
};
|
||||
await createContractMutation.mutateAsync(contract);
|
||||
window.location.href = '/';
|
||||
window.location.href = "/";
|
||||
} else {
|
||||
const firstErrorField = Object.keys(errors.errors)[0];
|
||||
const ref = inputRefs.current[firstErrorField];
|
||||
@@ -165,7 +168,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,13 +286,13 @@ export function Contract() {
|
||||
ref={(el) => {
|
||||
inputRefs.current.payment_method = el;
|
||||
}}
|
||||
comboboxProps={{
|
||||
withinPortal: false,
|
||||
position: "bottom-start",
|
||||
}}
|
||||
/>
|
||||
{inputForm.values.payment_method === "cheque" ? (
|
||||
<ContractCheque
|
||||
productor={form?.productor}
|
||||
price={price}
|
||||
inputForm={inputForm}
|
||||
/>
|
||||
<ContractCheque productor={form?.productor} price={price} inputForm={inputForm} />
|
||||
) : null}
|
||||
{inputForm.values.payment_method === "transfer" ? (
|
||||
<Text>
|
||||
@@ -316,10 +319,12 @@ export function Contract() {
|
||||
currency: "EUR",
|
||||
}).format(price)}
|
||||
</Text>
|
||||
<Button
|
||||
leftSection={<IconDownload/>}
|
||||
aria-label={t("submit contracts")} onClick={handleSubmit}>
|
||||
{t("submit contract", {capfirst: true})}
|
||||
<Button
|
||||
leftSection={<IconDownload />}
|
||||
aria-label={t("submit contracts")}
|
||||
onClick={handleSubmit}
|
||||
>
|
||||
{t("submit", { capfirst: true })}
|
||||
</Button>
|
||||
</Overlay>
|
||||
</Stack>
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
import { ActionIcon, Group, Loader, ScrollArea, Stack, Table, Title, Tooltip } from "@mantine/core";
|
||||
import { t } from "@/config/i18n";
|
||||
import { useGetAllContractFile, useGetContracts, useGetRecap } from "@/services/api";
|
||||
import {
|
||||
useDeleteContract,
|
||||
useGetAllContractFile,
|
||||
useGetContract,
|
||||
useGetContracts,
|
||||
useGetRecap,
|
||||
} from "@/services/api";
|
||||
import { IconDownload, IconTableExport } from "@tabler/icons-react";
|
||||
import ContractRow from "@/components/Contracts/Row";
|
||||
import { useLocation, useNavigate, useSearchParams } from "react-router";
|
||||
@@ -8,6 +14,7 @@ import { ContractModal } from "@/components/Contracts/Modal";
|
||||
import { useCallback, useMemo } from "react";
|
||||
import { type Contract } from "@/services/resources/contracts";
|
||||
import ContractsFilters from "@/components/Contracts/Filter";
|
||||
import { DeleteModal } from "@/components/DeleteModal";
|
||||
|
||||
export default function Contracts() {
|
||||
const [searchParams, setSearchParams] = useSearchParams();
|
||||
@@ -17,16 +24,29 @@ export default function Contracts() {
|
||||
const getRecapMutation = useGetRecap();
|
||||
const isdownload = location.pathname.includes("/download");
|
||||
const isrecap = location.pathname.includes("/export");
|
||||
const isDelete = location.pathname.includes("/delete");
|
||||
|
||||
const deleteId = useMemo(() => {
|
||||
if (isDelete) {
|
||||
return location.pathname.split("/")[3];
|
||||
}
|
||||
return null;
|
||||
}, [location]);
|
||||
|
||||
const closeModal = useCallback(() => {
|
||||
navigate(`/dashboard/contracts${searchParams ? `?${searchParams.toString()}` : ""}`);
|
||||
}, [navigate, searchParams]);
|
||||
|
||||
const { data: contracts, isPending } = useGetContracts(searchParams);
|
||||
const { data: currentContract } = useGetContract(Number(deleteId), {
|
||||
enabled: !!deleteId,
|
||||
});
|
||||
|
||||
const { data: allContracts } = useGetContracts();
|
||||
const deleteContractMutation = useDeleteContract();
|
||||
|
||||
const forms = useMemo(() => {
|
||||
if (!allContracts) return [];
|
||||
return allContracts
|
||||
?.map((contract: Contract) => contract.form.name)
|
||||
.filter((contract, index, array) => array.indexOf(contract) === index);
|
||||
@@ -55,11 +75,11 @@ export default function Contracts() {
|
||||
);
|
||||
|
||||
const handleDownloadRecap = useCallback(
|
||||
async (id: number) => {
|
||||
async (id: number) => {
|
||||
await getRecapMutation.mutateAsync(id);
|
||||
},
|
||||
[getAllContractFilesMutation],
|
||||
)
|
||||
);
|
||||
|
||||
if (!contracts || isPending)
|
||||
return (
|
||||
@@ -85,9 +105,7 @@ export default function Contracts() {
|
||||
<IconDownload />
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
<Tooltip
|
||||
label={t("download recap", { capfirst: true })}
|
||||
>
|
||||
<Tooltip label={t("download recap", { capfirst: true })}>
|
||||
<ActionIcon
|
||||
disabled={false}
|
||||
onClick={(e) => {
|
||||
@@ -101,7 +119,7 @@ export default function Contracts() {
|
||||
</ActionIcon>
|
||||
</Tooltip>
|
||||
</Group>
|
||||
|
||||
|
||||
<ContractModal
|
||||
opened={isdownload}
|
||||
onClose={closeModal}
|
||||
@@ -112,6 +130,18 @@ export default function Contracts() {
|
||||
onClose={closeModal}
|
||||
handleSubmit={handleDownloadRecap}
|
||||
/>
|
||||
<DeleteModal
|
||||
opened={isDelete}
|
||||
onClose={closeModal}
|
||||
handleSubmit={(id: number) => {
|
||||
deleteContractMutation.mutate(id);
|
||||
}}
|
||||
entityType={"contract"}
|
||||
entity={{
|
||||
name: `${currentContract?.form.name} ${currentContract?.firstname} ${currentContract?.lastname}`,
|
||||
id: currentContract?.id || 0,
|
||||
}}
|
||||
/>
|
||||
</Group>
|
||||
<ContractsFilters
|
||||
forms={forms || []}
|
||||
|
||||
@@ -6,7 +6,7 @@ import { useAuth } from "@/services/auth/AuthProvider";
|
||||
export default function Dashboard() {
|
||||
const navigate = useNavigate();
|
||||
const location = useLocation();
|
||||
const {loggedUser} = useAuth();
|
||||
const { loggedUser } = useAuth();
|
||||
return (
|
||||
<Tabs
|
||||
w={{ base: "100%", md: "80%", lg: "60%" }}
|
||||
@@ -16,17 +16,50 @@ export default function Dashboard() {
|
||||
onChange={(value) => navigate(`/dashboard/${value}`)}
|
||||
>
|
||||
<Tabs.List mb="md">
|
||||
<Tabs.Tab renderRoot={(props) => (<Link to="/dashboard/help" {...props}></Link>)} value="help">{t("help", { capfirst: true })}</Tabs.Tab>
|
||||
<Tabs.Tab renderRoot={(props) => (<Link to="/dashboard/productors" {...props}></Link>)} value="productors">{t("productors", { capfirst: true })}</Tabs.Tab>
|
||||
<Tabs.Tab renderRoot={(props) => (<Link to="/dashboard/products" {...props}></Link>)} value="products">{t("products", { capfirst: true })}</Tabs.Tab>
|
||||
<Tabs.Tab renderRoot={(props) => (<Link to="/dashboard/forms" {...props}></Link>)} value="forms">{t("forms", { capfirst: true })}</Tabs.Tab>
|
||||
<Tabs.Tab renderRoot={(props) => (<Link to="/dashboard/shipments" {...props}></Link>)} value="shipments">{t("shipments", { capfirst: true })}</Tabs.Tab>
|
||||
<Tabs.Tab renderRoot={(props) => (<Link to="/dashboard/contracts" {...props}></Link>)} value="contracts">{t("contracts", { capfirst: true })}</Tabs.Tab>
|
||||
{
|
||||
loggedUser?.user?.roles && loggedUser?.user?.roles?.length > 5 ?
|
||||
<Tabs.Tab renderRoot={(props) => (<Link to="/dashboard/users" {...props}></Link>)} value="users">{t("users", { capfirst: true })}</Tabs.Tab> :
|
||||
null
|
||||
}
|
||||
<Tabs.Tab
|
||||
renderRoot={(props) => <Link to="/dashboard/help" {...props}></Link>}
|
||||
value="help"
|
||||
>
|
||||
{t("help", { capfirst: true })}
|
||||
</Tabs.Tab>
|
||||
<Tabs.Tab
|
||||
renderRoot={(props) => <Link to="/dashboard/productors" {...props}></Link>}
|
||||
value="productors"
|
||||
>
|
||||
{t("productors", { capfirst: true })}
|
||||
</Tabs.Tab>
|
||||
<Tabs.Tab
|
||||
renderRoot={(props) => <Link to="/dashboard/products" {...props}></Link>}
|
||||
value="products"
|
||||
>
|
||||
{t("products", { capfirst: true })}
|
||||
</Tabs.Tab>
|
||||
<Tabs.Tab
|
||||
renderRoot={(props) => <Link to="/dashboard/forms" {...props}></Link>}
|
||||
value="forms"
|
||||
>
|
||||
{t("forms", { capfirst: true })}
|
||||
</Tabs.Tab>
|
||||
<Tabs.Tab
|
||||
renderRoot={(props) => <Link to="/dashboard/shipments" {...props}></Link>}
|
||||
value="shipments"
|
||||
>
|
||||
{t("shipments", { capfirst: true })}
|
||||
</Tabs.Tab>
|
||||
<Tabs.Tab
|
||||
renderRoot={(props) => <Link to="/dashboard/contracts" {...props}></Link>}
|
||||
value="contracts"
|
||||
>
|
||||
{t("contracts", { capfirst: true })}
|
||||
</Tabs.Tab>
|
||||
{loggedUser?.user?.roles && loggedUser?.user?.roles?.length > 5 ? (
|
||||
<Tabs.Tab
|
||||
renderRoot={(props) => <Link to="/dashboard/users" {...props}></Link>}
|
||||
value="users"
|
||||
>
|
||||
{t("users", { capfirst: true })}
|
||||
</Tabs.Tab>
|
||||
) : null}
|
||||
</Tabs.List>
|
||||
<Outlet />
|
||||
</Tabs>
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
import { Stack, Loader, Title, Group, ActionIcon, Tooltip, Table, ScrollArea } from "@mantine/core";
|
||||
import { useCreateForm, useEditForm, useGetForm, useGetReferentForms } from "@/services/api";
|
||||
import {
|
||||
useCreateForm,
|
||||
useDeleteForm,
|
||||
useEditForm,
|
||||
useGetForm,
|
||||
useGetReferentForms,
|
||||
} from "@/services/api";
|
||||
import { t } from "@/config/i18n";
|
||||
import { useLocation, useNavigate, useSearchParams } from "react-router";
|
||||
import { IconPlus } from "@tabler/icons-react";
|
||||
@@ -8,6 +14,7 @@ import FormModal from "@/components/Forms/Modal";
|
||||
import FormRow from "@/components/Forms/Row";
|
||||
import type { Form, FormInputs } from "@/services/resources/forms";
|
||||
import FilterForms from "@/components/Forms/Filter";
|
||||
import { DeleteModal } from "@/components/DeleteModal";
|
||||
|
||||
export function Forms() {
|
||||
const [searchParams, setSearchParams] = useSearchParams();
|
||||
@@ -16,9 +23,10 @@ export function Forms() {
|
||||
|
||||
const isCreate = location.pathname === "/dashboard/forms/create";
|
||||
const isEdit = location.pathname.includes("/edit");
|
||||
const isDelete = location.pathname.includes("/delete");
|
||||
|
||||
const editId = useMemo(() => {
|
||||
if (isEdit) {
|
||||
if (isEdit || isDelete) {
|
||||
return location.pathname.split("/")[3];
|
||||
}
|
||||
return null;
|
||||
@@ -36,12 +44,14 @@ export function Forms() {
|
||||
const { data: allForms } = useGetReferentForms();
|
||||
|
||||
const seasons = useMemo(() => {
|
||||
if (!allForms) return [];
|
||||
return allForms
|
||||
?.map((form: Form) => form.season)
|
||||
.filter((season, index, array) => array.indexOf(season) === index);
|
||||
}, [allForms]);
|
||||
|
||||
const productors = useMemo(() => {
|
||||
if (!allForms) return [];
|
||||
return allForms
|
||||
?.map((form: Form) => form.productor.name)
|
||||
.filter((productor, index, array) => array.indexOf(productor) === index);
|
||||
@@ -49,6 +59,7 @@ export function Forms() {
|
||||
|
||||
const createFormMutation = useCreateForm();
|
||||
const editFormMutation = useEditForm();
|
||||
const deleteFormMutation = useDeleteForm();
|
||||
|
||||
const handleCreateForm = useCallback(
|
||||
async (form: FormInputs) => {
|
||||
@@ -144,6 +155,15 @@ export function Forms() {
|
||||
currentForm={currentForm}
|
||||
handleSubmit={handleEditForm}
|
||||
/>
|
||||
<DeleteModal
|
||||
opened={isDelete}
|
||||
onClose={closeModal}
|
||||
handleSubmit={(id: number) => {
|
||||
deleteFormMutation.mutate(id);
|
||||
}}
|
||||
entityType={"form"}
|
||||
entity={currentForm}
|
||||
/>
|
||||
<ScrollArea type="auto">
|
||||
<Table striped>
|
||||
<Table.Thead>
|
||||
|
||||
@@ -242,10 +242,13 @@ export function Help() {
|
||||
</Text>
|
||||
</Blockquote>
|
||||
</Stack>
|
||||
<Title order={3}>{t("export contracts", {capfirst: true})}</Title>
|
||||
<Title order={3}>{t("export contracts", { capfirst: true })}</Title>
|
||||
<Stack>
|
||||
<Text>
|
||||
{t("to export contracts submissions before sending to the productor go to the contracts section", {capfirst: true})}
|
||||
{t(
|
||||
"to export contracts submissions before sending to the productor go to the contracts section",
|
||||
{ capfirst: true },
|
||||
)}
|
||||
<ActionIcon
|
||||
ml="4"
|
||||
size="xs"
|
||||
@@ -260,21 +263,32 @@ export function Help() {
|
||||
<IconLink />
|
||||
</ActionIcon>
|
||||
</Text>
|
||||
<Text>{t("in this page you can view all contracts submissions, you can remove duplicates submission or download a specific contract", {capfirst: true})}</Text>
|
||||
<Text>
|
||||
{t("you can download all contracts for your form using the export all", {capfirst: true})}{" "}
|
||||
<ActionIcon size="sm">
|
||||
<IconDownload/>
|
||||
</ActionIcon>{" "}
|
||||
{t("button in top right of the page", { section: t("contracts") })}{" "}
|
||||
{t("in the same corner you can download a recap by clicking on the button", {capfirst: true})}{" "}
|
||||
<ActionIcon size="sm">
|
||||
<IconTableExport/>
|
||||
</ActionIcon>{" "}
|
||||
|
||||
{t(
|
||||
"in this page you can view all contracts submissions, you can remove duplicates submission or download a specific contract",
|
||||
{ capfirst: true },
|
||||
)}
|
||||
</Text>
|
||||
<Text>
|
||||
{t("once all contracts downloaded, you can delete the form (to avoid new submissions) and hide it from the home page", {capfirst: true})}
|
||||
{t("you can download all contracts for your form using the export all", {
|
||||
capfirst: true,
|
||||
})}{" "}
|
||||
<ActionIcon size="sm">
|
||||
<IconDownload />
|
||||
</ActionIcon>{" "}
|
||||
{t("button in top right of the page", { section: t("contracts") })}{" "}
|
||||
{t("in the same corner you can download a recap by clicking on the button", {
|
||||
capfirst: true,
|
||||
})}{" "}
|
||||
<ActionIcon size="sm">
|
||||
<IconTableExport />
|
||||
</ActionIcon>{" "}
|
||||
</Text>
|
||||
<Text>
|
||||
{t(
|
||||
"once all contracts downloaded, you can delete the form (to avoid new submissions) and hide it from the home page",
|
||||
{ capfirst: true },
|
||||
)}
|
||||
</Text>
|
||||
</Stack>
|
||||
<Title order={3}>{t("glossary", { capfirst: true })}</Title>
|
||||
|
||||
@@ -14,21 +14,23 @@ export function Home() {
|
||||
useEffect(() => {
|
||||
if (searchParams.get("sessionExpired")) {
|
||||
showNotification({
|
||||
title: t("session expired", {capfirst: true}),
|
||||
message: t("your session has expired please log in again", {capfirst: true}),
|
||||
title: t("session expired", { capfirst: true }),
|
||||
message: t("your session has expired please log in again", { capfirst: true }),
|
||||
color: "red",
|
||||
autoClose: 5000,
|
||||
});
|
||||
}
|
||||
if (searchParams.get("userNotAllowed")) {
|
||||
showNotification({
|
||||
title: t("user not allowed", {capfirst: true}),
|
||||
message: t("your keycloak user has no roles, please contact your administrator", {capfirst: true}),
|
||||
title: t("user not allowed", { capfirst: true }),
|
||||
message: t("your keycloak user has no roles, please contact your administrator", {
|
||||
capfirst: true,
|
||||
}),
|
||||
color: "red",
|
||||
autoClose: 5000,
|
||||
});
|
||||
}
|
||||
}, [searchParams])
|
||||
}, [searchParams]);
|
||||
|
||||
return (
|
||||
<Stack mt="lg">
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
import { Loader } from "@mantine/core";
|
||||
import { useEffect } from "react";
|
||||
import { useSearchParams } from "react-router";
|
||||
|
||||
export function Login() {
|
||||
const [searchParams] = useSearchParams();
|
||||
|
||||
useEffect(() => {
|
||||
const accessToken = searchParams.get("access_token");
|
||||
const idToken = searchParams.get("id_token");
|
||||
const refreshToken = searchParams.get("refresh_token");
|
||||
|
||||
if (accessToken && idToken) {
|
||||
localStorage.setItem("access_token", accessToken);
|
||||
localStorage.setItem("id_token", idToken);
|
||||
localStorage.setItem("refresh_token", refreshToken || "");
|
||||
window.location.href = "/";
|
||||
}
|
||||
}, [searchParams]);
|
||||
|
||||
return <Loader />;
|
||||
}
|
||||
import { Loader } from "@mantine/core";
|
||||
import { useEffect } from "react";
|
||||
import { useSearchParams } from "react-router";
|
||||
|
||||
export function Login() {
|
||||
const [searchParams] = useSearchParams();
|
||||
|
||||
useEffect(() => {
|
||||
const accessToken = searchParams.get("access_token");
|
||||
const idToken = searchParams.get("id_token");
|
||||
const refreshToken = searchParams.get("refresh_token");
|
||||
|
||||
if (accessToken && idToken) {
|
||||
localStorage.setItem("access_token", accessToken);
|
||||
localStorage.setItem("id_token", idToken);
|
||||
localStorage.setItem("refresh_token", refreshToken || "");
|
||||
window.location.href = "/";
|
||||
}
|
||||
}, [searchParams]);
|
||||
|
||||
return <Loader />;
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ import { ActionIcon, Group, Loader, ScrollArea, Stack, Table, Title, Tooltip } f
|
||||
import { t } from "@/config/i18n";
|
||||
import {
|
||||
useCreateProductor,
|
||||
useDeleteProductor,
|
||||
useEditProductor,
|
||||
useGetProductor,
|
||||
useGetProductors,
|
||||
@@ -13,19 +14,21 @@ import { ProductorModal } from "@/components/Productors/Modal";
|
||||
import { useCallback, useMemo } from "react";
|
||||
import type { Productor, ProductorInputs } from "@/services/resources/productors";
|
||||
import ProductorsFilters from "@/components/Productors/Filter";
|
||||
import { DeleteModal } from "@/components/DeleteModal";
|
||||
|
||||
export default function Productors() {
|
||||
const [searchParams, setSearchParams] = useSearchParams();
|
||||
const location = useLocation();
|
||||
const navigate = useNavigate();
|
||||
const { data: productors, isPending } = useGetProductors(searchParams);
|
||||
|
||||
|
||||
const { data: allProductors } = useGetProductors();
|
||||
const isCreate = location.pathname === "/dashboard/productors/create";
|
||||
const isEdit = location.pathname.includes("/edit");
|
||||
const isDelete = location.pathname.includes("/delete");
|
||||
|
||||
const editId = useMemo(() => {
|
||||
if (isEdit) {
|
||||
if (isEdit || isDelete) {
|
||||
return location.pathname.split("/")[3];
|
||||
}
|
||||
return null;
|
||||
@@ -40,12 +43,14 @@ 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);
|
||||
@@ -53,16 +58,17 @@ export default function Productors() {
|
||||
|
||||
const createProductorMutation = useCreateProductor();
|
||||
const editProductorMutation = useEditProductor();
|
||||
const deleteProductorMutation = useDeleteProductor();
|
||||
|
||||
const handleCreateProductor = useCallback(
|
||||
async (productor: ProductorInputs) => {
|
||||
await createProductorMutation.mutateAsync({
|
||||
...productor,
|
||||
payment_methods: productor.payment_methods.map((payment) =>( {
|
||||
payment_methods: productor.payment_methods.map((payment) => ({
|
||||
name: payment.name,
|
||||
details: payment.details,
|
||||
max: payment.max === "" ? null : payment.max
|
||||
}))
|
||||
max: payment.max === "" ? null : payment.max,
|
||||
})),
|
||||
});
|
||||
closeModal();
|
||||
},
|
||||
@@ -76,11 +82,11 @@ export default function Productors() {
|
||||
id: id,
|
||||
productor: {
|
||||
...productor,
|
||||
payment_methods: productor.payment_methods.map((payment) =>( {
|
||||
name: payment.name,
|
||||
details: payment.details,
|
||||
max: payment.max === "" ? null : payment.max
|
||||
}))
|
||||
payment_methods: productor.payment_methods.map((payment) => ({
|
||||
name: payment.name,
|
||||
details: payment.details,
|
||||
max: payment.max === "" ? null : payment.max,
|
||||
})),
|
||||
},
|
||||
});
|
||||
closeModal();
|
||||
@@ -139,6 +145,15 @@ export default function Productors() {
|
||||
currentProductor={currentProductor}
|
||||
handleSubmit={handleEditProductor}
|
||||
/>
|
||||
<DeleteModal
|
||||
opened={isDelete}
|
||||
onClose={closeModal}
|
||||
handleSubmit={(id: number) => {
|
||||
deleteProductorMutation.mutate(id);
|
||||
}}
|
||||
entityType={"productor"}
|
||||
entity={currentProductor}
|
||||
/>
|
||||
</Group>
|
||||
<ProductorsFilters
|
||||
names={names || []}
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
import { ActionIcon, Group, Loader, ScrollArea, Stack, Table, Title, Tooltip } from "@mantine/core";
|
||||
import { t } from "@/config/i18n";
|
||||
import { useCreateProduct, useEditProduct, useGetProduct, useGetProducts } from "@/services/api";
|
||||
import {
|
||||
useCreateProduct,
|
||||
useDeleteProduct,
|
||||
useEditProduct,
|
||||
useGetProduct,
|
||||
useGetProducts,
|
||||
} from "@/services/api";
|
||||
import { IconPlus } from "@tabler/icons-react";
|
||||
import ProductRow from "@/components/Products/Row";
|
||||
import { useLocation, useNavigate, useSearchParams } from "react-router";
|
||||
@@ -12,6 +18,7 @@ import {
|
||||
type ProductInputs,
|
||||
} from "@/services/resources/products";
|
||||
import ProductsFilters from "@/components/Products/Filter";
|
||||
import { DeleteModal } from "@/components/DeleteModal";
|
||||
|
||||
export default function Products() {
|
||||
const [searchParams, setSearchParams] = useSearchParams();
|
||||
@@ -19,9 +26,10 @@ export default function Products() {
|
||||
const navigate = useNavigate();
|
||||
const isCreate = location.pathname === "/dashboard/products/create";
|
||||
const isEdit = location.pathname.includes("/edit");
|
||||
const isDelete = location.pathname.includes("/delete");
|
||||
|
||||
const editId = useMemo(() => {
|
||||
if (isEdit) {
|
||||
if (isEdit || isDelete) {
|
||||
return location.pathname.split("/")[3];
|
||||
}
|
||||
return null;
|
||||
@@ -38,12 +46,14 @@ 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);
|
||||
@@ -51,6 +61,7 @@ export default function Products() {
|
||||
|
||||
const createProductMutation = useCreateProduct();
|
||||
const editProductMutation = useEditProduct();
|
||||
const deleteProductMutation = useDeleteProduct();
|
||||
|
||||
const handleCreateProduct = useCallback(
|
||||
async (product: ProductInputs) => {
|
||||
@@ -130,6 +141,15 @@ export default function Products() {
|
||||
currentProduct={currentProduct}
|
||||
handleSubmit={handleEditProduct}
|
||||
/>
|
||||
<DeleteModal
|
||||
opened={isDelete}
|
||||
onClose={closeModal}
|
||||
handleSubmit={(id: number) => {
|
||||
deleteProductMutation.mutate(id);
|
||||
}}
|
||||
entityType={"product"}
|
||||
entity={currentProduct}
|
||||
/>
|
||||
<ScrollArea type="auto">
|
||||
<Table striped>
|
||||
<Table.Thead>
|
||||
|
||||
@@ -2,6 +2,7 @@ import { ActionIcon, Group, Loader, ScrollArea, Stack, Table, Title, Tooltip } f
|
||||
import { t } from "@/config/i18n";
|
||||
import {
|
||||
useCreateShipment,
|
||||
useDeleteShipment,
|
||||
useEditShipment,
|
||||
useGetShipment,
|
||||
useGetShipments,
|
||||
@@ -17,6 +18,7 @@ import {
|
||||
} from "@/services/resources/shipments";
|
||||
import ShipmentModal from "@/components/Shipments/Modal";
|
||||
import ShipmentsFilters from "@/components/Shipments/Filter";
|
||||
import { DeleteModal } from "@/components/DeleteModal";
|
||||
|
||||
export default function Shipments() {
|
||||
const [searchParams, setSearchParams] = useSearchParams();
|
||||
@@ -25,9 +27,10 @@ export default function Shipments() {
|
||||
|
||||
const isCreate = location.pathname === "/dashboard/shipments/create";
|
||||
const isEdit = location.pathname.includes("/edit");
|
||||
const isDelete = location.pathname.includes("/delete");
|
||||
|
||||
const editId = useMemo(() => {
|
||||
if (isEdit) {
|
||||
if (isEdit || isDelete) {
|
||||
return location.pathname.split("/")[3];
|
||||
}
|
||||
return null;
|
||||
@@ -44,12 +47,14 @@ 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);
|
||||
@@ -57,6 +62,7 @@ export default function Shipments() {
|
||||
|
||||
const createShipmentMutation = useCreateShipment();
|
||||
const editShipmentMutation = useEditShipment();
|
||||
const deleteShipmentMutation = useDeleteShipment();
|
||||
|
||||
const handleCreateShipment = useCallback(
|
||||
async (shipment: ShipmentInputs) => {
|
||||
@@ -129,6 +135,15 @@ export default function Shipments() {
|
||||
currentShipment={currentShipment}
|
||||
handleSubmit={handleEditShipment}
|
||||
/>
|
||||
<DeleteModal
|
||||
opened={isDelete}
|
||||
onClose={closeModal}
|
||||
handleSubmit={(id: number) => {
|
||||
deleteShipmentMutation.mutate(id);
|
||||
}}
|
||||
entityType={"shipment"}
|
||||
entity={currentShipment}
|
||||
/>
|
||||
</Group>
|
||||
<ShipmentsFilters
|
||||
forms={forms || []}
|
||||
@@ -147,7 +162,7 @@ export default function Shipments() {
|
||||
</Table.Tr>
|
||||
</Table.Thead>
|
||||
<Table.Tbody>
|
||||
{shipments.map((shipment) => (
|
||||
{shipments?.map((shipment) => (
|
||||
<ShipmentRow shipment={shipment} key={shipment.id} />
|
||||
))}
|
||||
</Table.Tbody>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { ActionIcon, Group, Loader, ScrollArea, Stack, Table, Title, Tooltip } from "@mantine/core";
|
||||
import { t } from "@/config/i18n";
|
||||
import { useCreateUser, useEditUser, useGetUser, useGetUsers } from "@/services/api";
|
||||
import { useCreateUser, useDeleteUser, useEditUser, useGetUser, useGetUsers } from "@/services/api";
|
||||
import { IconPlus } from "@tabler/icons-react";
|
||||
import UserRow from "@/components/Users/Row";
|
||||
import { useLocation, useNavigate, useSearchParams } from "react-router";
|
||||
@@ -8,6 +8,7 @@ import { UserModal } from "@/components/Users/Modal";
|
||||
import { useCallback, useMemo } from "react";
|
||||
import { type User, type UserInputs } from "@/services/resources/users";
|
||||
import UsersFilters from "@/components/Users/Filter";
|
||||
import { DeleteModal } from "@/components/DeleteModal";
|
||||
|
||||
export default function Users() {
|
||||
const [searchParams, setSearchParams] = useSearchParams();
|
||||
@@ -16,9 +17,10 @@ export default function Users() {
|
||||
|
||||
const isCreate = location.pathname === "/dashboard/users/create";
|
||||
const isEdit = location.pathname.includes("/edit");
|
||||
const isDelete = location.pathname.includes("/delete");
|
||||
|
||||
const editId = useMemo(() => {
|
||||
if (isEdit) {
|
||||
if (isEdit || isDelete) {
|
||||
return location.pathname.split("/")[3];
|
||||
}
|
||||
return null;
|
||||
@@ -36,6 +38,7 @@ 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);
|
||||
@@ -43,6 +46,7 @@ export default function Users() {
|
||||
|
||||
const createUserMutation = useCreateUser();
|
||||
const editUserMutation = useEditUser();
|
||||
const deleteUserMutation = useDeleteUser();
|
||||
|
||||
const handleCreateUser = useCallback(
|
||||
async (user: UserInputs) => {
|
||||
@@ -115,6 +119,15 @@ export default function Users() {
|
||||
currentUser={currentUser}
|
||||
handleSubmit={handleEditUser}
|
||||
/>
|
||||
<DeleteModal
|
||||
opened={isDelete}
|
||||
onClose={closeModal}
|
||||
handleSubmit={(id: number) => {
|
||||
deleteUserMutation.mutate(id);
|
||||
}}
|
||||
entityType={"user"}
|
||||
entity={currentUser}
|
||||
/>
|
||||
</Group>
|
||||
<UsersFilters
|
||||
names={names || []}
|
||||
|
||||
@@ -34,20 +34,26 @@ export const router = createBrowserRouter([
|
||||
{ path: "productors", Component: Productors },
|
||||
{ path: "productors/create", Component: Productors },
|
||||
{ path: "productors/:id/edit", Component: Productors },
|
||||
{ path: "productors/:id/delete", Component: Productors },
|
||||
{ path: "products", Component: Products },
|
||||
{ path: "products/create", Component: Products },
|
||||
{ path: "products/:id/edit", Component: Products },
|
||||
{ path: "products/:id/delete", Component: Products },
|
||||
{ path: "contracts", Component: Contracts },
|
||||
{ path: "contracts/download", Component: Contracts },
|
||||
{ path: "contracts/export", Component: Contracts },
|
||||
{ path: "contracts/:id/delete", Component: Contracts },
|
||||
{ path: "users", Component: Users },
|
||||
{ path: "users/create", Component: Users },
|
||||
{ path: "users/:id/edit", Component: Users },
|
||||
{ path: "users/:id/delete", Component: Users },
|
||||
{ path: "forms", Component: Forms },
|
||||
{ path: "forms/:id/edit", Component: Forms },
|
||||
{ path: "forms/:id/delete", Component: Forms },
|
||||
{ path: "forms/create", Component: Forms },
|
||||
{ path: "shipments", Component: Shipments },
|
||||
{ path: "shipments/:id/edit", Component: Shipments },
|
||||
{ path: "shipments/:id/delete", Component: Shipments },
|
||||
{ path: "shipments/create", Component: Shipments },
|
||||
],
|
||||
},
|
||||
|
||||
@@ -24,6 +24,7 @@ import type { Product, ProductCreate, ProductEditPayload } from "./resources/pro
|
||||
import type { Contract, ContractCreate } from "./resources/contracts";
|
||||
import { notifications } from "@mantine/notifications";
|
||||
import { t } from "@/config/i18n";
|
||||
import type { DeleteDependencies, EntityName } from "./resources/common";
|
||||
|
||||
export async function refreshToken() {
|
||||
return await fetch(`${Config.backend_uri}/auth/refresh`, {method: "POST", credentials: "include"});
|
||||
@@ -37,7 +38,7 @@ export async function fetchWithAuth(input: RequestInfo, options?: RequestInit, r
|
||||
|
||||
if (res.status === 401) {
|
||||
const refresh = await refreshToken();
|
||||
if (refresh.status == 400 || refresh.status == 401) {
|
||||
if (refresh.status !== 200) {
|
||||
if (redirect)
|
||||
window.location.href = `/?sessionExpired=True`;
|
||||
|
||||
@@ -49,6 +50,13 @@ export async function fetchWithAuth(input: RequestInfo, options?: RequestInit, r
|
||||
credentials: "include",
|
||||
...options,
|
||||
});
|
||||
if (newRes.status === 401 || newRes.status === 403) {
|
||||
if (redirect)
|
||||
window.location.href = `/?sessionExpired=True`;
|
||||
const error = new Error("Unauthorized");
|
||||
error.cause = 401
|
||||
throw error;
|
||||
}
|
||||
return newRes;
|
||||
}
|
||||
if (res.status == 403) {
|
||||
@@ -321,6 +329,24 @@ export function useGetForm(
|
||||
});
|
||||
}
|
||||
|
||||
export function useGetDeleteDependencies(
|
||||
entity: EntityName,
|
||||
id?: number,
|
||||
) {
|
||||
return useQuery<DeleteDependencies[]>({
|
||||
queryKey: [`${entity}_delete_preview_${id}`],
|
||||
queryFn: () =>
|
||||
fetchWithAuth(`${Config.backend_uri}/${entity}s/${id}/preview-delete`, {
|
||||
credentials: "include",
|
||||
}).then((res) => {
|
||||
const result = res.json()
|
||||
return result
|
||||
}),
|
||||
enabled: !!id,
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
export function useGetForms(filters?: URLSearchParams): UseQueryResult<Form[], Error> {
|
||||
const queryString = filters?.toString();
|
||||
return useQuery<Form[]>({
|
||||
|
||||
@@ -5,23 +5,19 @@ import type { UserLogged } from "../resources/users";
|
||||
export type Auth = {
|
||||
loggedUser: UserLogged | null;
|
||||
isLoading: boolean;
|
||||
}
|
||||
};
|
||||
|
||||
const AuthContext = createContext<Auth | undefined>(undefined)
|
||||
const AuthContext = createContext<Auth | undefined>(undefined);
|
||||
|
||||
export function AuthProvider({ children }: {children: React.ReactNode}) {
|
||||
const {data: loggedUser, isLoading} = useCurrentUser();
|
||||
export function AuthProvider({ children }: { children: React.ReactNode }) {
|
||||
const { data: loggedUser, isLoading } = useCurrentUser();
|
||||
|
||||
const value: Auth = {
|
||||
loggedUser: loggedUser ?? null,
|
||||
isLoading,
|
||||
};
|
||||
|
||||
return (
|
||||
<AuthContext.Provider value={value}>
|
||||
{children}
|
||||
</AuthContext.Provider>
|
||||
)
|
||||
return <AuthContext.Provider value={value}>{children}</AuthContext.Provider>;
|
||||
}
|
||||
|
||||
export function useAuth(): Auth {
|
||||
@@ -30,4 +26,4 @@ export function useAuth(): Auth {
|
||||
throw new Error("useAuth must be used inside AuthProvider");
|
||||
}
|
||||
return context;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
import { Group, Loader } from "@mantine/core";
|
||||
import { Navigate, Outlet } from "react-router";
|
||||
import { useAuth } from "../AuthProvider";
|
||||
|
||||
export function ProtectedRoute() {
|
||||
const { loggedUser, isLoading } = useAuth();
|
||||
|
||||
if (!loggedUser && isLoading)
|
||||
return (
|
||||
<Group align="center" justify="center" h="80vh" w="100%">
|
||||
<Loader color="pink" />
|
||||
</Group>
|
||||
);
|
||||
|
||||
if (!loggedUser?.logged) {
|
||||
return <Navigate to="/" replace />;
|
||||
}
|
||||
|
||||
return <Outlet />;
|
||||
}
|
||||
import { Group, Loader } from "@mantine/core";
|
||||
import { Navigate, Outlet } from "react-router";
|
||||
import { useAuth } from "../AuthProvider";
|
||||
|
||||
export function ProtectedRoute() {
|
||||
const { loggedUser, isLoading } = useAuth();
|
||||
|
||||
if (!loggedUser && isLoading)
|
||||
return (
|
||||
<Group align="center" justify="center" h="80vh" w="100%">
|
||||
<Loader color="pink" />
|
||||
</Group>
|
||||
);
|
||||
|
||||
if (!loggedUser?.logged) {
|
||||
return <Navigate to="/" replace />;
|
||||
}
|
||||
|
||||
return <Outlet />;
|
||||
}
|
||||
|
||||
16
frontend/src/services/resources/common.ts
Normal file
16
frontend/src/services/resources/common.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
export const ENTITY_NAMES = [
|
||||
'contract',
|
||||
'form',
|
||||
'productor',
|
||||
'product',
|
||||
'shipment',
|
||||
'user',
|
||||
]
|
||||
|
||||
export type EntityName = (typeof ENTITY_NAMES)[number];
|
||||
|
||||
export type DeleteDependencies = {
|
||||
name: string;
|
||||
id: number;
|
||||
type: EntityName;
|
||||
}
|
||||
Reference in New Issue
Block a user