remove trailing
All checks were successful
Deploy Amap / deploy (push) Successful in 8s

This commit is contained in:
2026-02-20 01:59:33 +01:00
parent c67e59d5db
commit b05276eeeb
8 changed files with 39 additions and 40 deletions

View File

@@ -69,7 +69,7 @@ def create_occasional_dict(contract_products: list[models.ContractProduct]):
)
return result
@router.post('/')
@router.post('')
async def create_contract(
contract: models.ContractCreate,
session: Session = Depends(get_session),
@@ -107,7 +107,7 @@ async def create_contract(
}
)
@router.get('/', response_model=list[models.ContractPublic])
@router.get('', response_model=list[models.ContractPublic])
def get_contracts(
forms: list[str] = Query([]),
session: Session = Depends(get_session),
@@ -115,7 +115,7 @@ def get_contracts(
):
return service.get_all(session, user, forms)
@router.get('/{id}/file')
@router.get('{id}/file')
def get_contract_file(
id: int,
session: Session = Depends(get_session),
@@ -135,7 +135,7 @@ def get_contract_file(
}
)
@router.get('/{form_id}/files')
@router.get('{form_id}/files')
def get_contract_files(
form_id: int,
session: Session = Depends(get_session),
@@ -160,7 +160,7 @@ def get_contract_files(
}
)
@router.get('/{form_id}/recap')
@router.get('{form_id}/recap')
def get_contract_recap(
form_id: int,
session: Session = Depends(get_session),
@@ -179,7 +179,7 @@ def get_contract_recap(
}
)
@router.get('/{id}', response_model=models.ContractPublic)
@router.get('{id}', response_model=models.ContractPublic)
def get_contract(id: int, session: Session = Depends(get_session), user: models.User = Depends(get_current_user)):
if not service.is_allowed(session, user, id):
raise HTTPException(status_code=403, detail=messages.notallowed)
@@ -188,7 +188,7 @@ def get_contract(id: int, session: Session = Depends(get_session), user: models.
raise HTTPException(status_code=404, detail=messages.notfound)
return result
@router.delete('/{id}', response_model=models.ContractPublic)
@router.delete('{id}', response_model=models.ContractPublic)
def delete_contract(id: int, session: Session = Depends(get_session), user: models.User = Depends(get_current_user)):
if not service.is_allowed(session, user, id):
raise HTTPException(status_code=403, detail=messages.notallowed)

View File

@@ -8,7 +8,7 @@ from src.auth.auth import get_current_user
router = APIRouter(prefix='/forms')
@router.get('/', response_model=list[models.FormPublic])
@router.get('', response_model=list[models.FormPublic])
async def get_forms(
seasons: list[str] = Query([]),
productors: list[str] = Query([]),
@@ -17,14 +17,14 @@ async def get_forms(
):
return service.get_all(session, seasons, productors, current_season)
@router.get('/{id}', response_model=models.FormPublic)
@router.get('{id}', response_model=models.FormPublic)
async def get_form(id: int, session: Session = Depends(get_session)):
result = service.get_one(session, id)
if result is None:
raise HTTPException(status_code=404, detail=messages.notfound)
return result
@router.post('/', response_model=models.FormPublic)
@router.post('', response_model=models.FormPublic)
async def create_form(
form: models.FormCreate,
user: models.User = Depends(get_current_user),
@@ -32,7 +32,7 @@ async def create_form(
):
return service.create_one(session, form)
@router.put('/{id}', response_model=models.FormPublic)
@router.put('{id}', response_model=models.FormPublic)
async def update_form(
id: int, form: models.FormUpdate,
user: models.User = Depends(get_current_user),
@@ -43,7 +43,7 @@ async def update_form(
raise HTTPException(status_code=404, detail=messages.notfound)
return result
@router.delete('/{id}', response_model=models.FormPublic)
@router.delete('{id}', response_model=models.FormPublic)
async def delete_form(
id: int,
user: models.User = Depends(get_current_user),

View File

@@ -13,9 +13,9 @@ from src.auth.auth import router as auth_router
from src.shipments.shipments import router as shipment_router
from src.settings import settings
from src.database import engine, create_all_tables
app = FastAPI()
app.add_middleware(
CORSMiddleware,
allow_origins=[
@@ -27,7 +27,6 @@ app.add_middleware(
expose_headers=['x-nbpage', 'Content-Disposition']
)
app.include_router(template_router, prefix="/api")
app.include_router(contracts_router, prefix="/api")
app.include_router(forms_router, prefix="/api")

View File

@@ -8,7 +8,7 @@ from src.auth.auth import get_current_user
router = APIRouter(prefix='/productors')
@router.get('/', response_model=list[models.ProductorPublic])
@router.get('', response_model=list[models.ProductorPublic])
def get_productors(
names: list[str] = Query([]),
types: list[str] = Query([]),
@@ -17,7 +17,7 @@ def get_productors(
):
return service.get_all(session, names, types)
@router.get('/{id}', response_model=models.ProductorPublic)
@router.get('{id}', response_model=models.ProductorPublic)
def get_productor(
id: int,
user: models.User = Depends(get_current_user),
@@ -28,7 +28,7 @@ def get_productor(
raise HTTPException(status_code=404, detail=messages.notfound)
return result
@router.post('/', response_model=models.ProductorPublic)
@router.post('', response_model=models.ProductorPublic)
def create_productor(
productor: models.ProductorCreate,
user: models.User = Depends(get_current_user),
@@ -36,7 +36,7 @@ def create_productor(
):
return service.create_one(session, productor)
@router.put('/{id}', response_model=models.ProductorPublic)
@router.put('{id}', response_model=models.ProductorPublic)
def update_productor(
id: int, productor: models.ProductorUpdate,
user: models.User = Depends(get_current_user),
@@ -47,7 +47,7 @@ def update_productor(
raise HTTPException(status_code=404, detail=messages.notfound)
return result
@router.delete('/{id}', response_model=models.ProductorPublic)
@router.delete('{id}', response_model=models.ProductorPublic)
def delete_productor(
id: int,
user: models.User = Depends(get_current_user),

View File

@@ -7,7 +7,7 @@ import src.products.service as service
from src.auth.auth import get_current_user
router = APIRouter(prefix='/products')
#user=Depends(get_current_user)
@router.get('/', response_model=list[models.ProductPublic], )
@router.get('', response_model=list[models.ProductPublic], )
def get_products(
user: models.User = Depends(get_current_user),
session: Session = Depends(get_session),
@@ -22,7 +22,7 @@ def get_products(
types,
)
@router.get('/{id}', response_model=models.ProductPublic)
@router.get('{id}', response_model=models.ProductPublic)
def get_product(
id: int,
user: models.User = Depends(get_current_user),
@@ -33,7 +33,7 @@ def get_product(
raise HTTPException(status_code=404, detail=messages.notfound)
return result
@router.post('/', response_model=models.ProductPublic)
@router.post('', response_model=models.ProductPublic)
def create_product(
product: models.ProductCreate,
user: models.User = Depends(get_current_user),
@@ -41,7 +41,7 @@ def create_product(
):
return service.create_one(session, product)
@router.put('/{id}', response_model=models.ProductPublic)
@router.put('{id}', response_model=models.ProductPublic)
def update_product(
id: int, product: models.ProductUpdate,
user: models.User = Depends(get_current_user),
@@ -52,7 +52,7 @@ def update_product(
raise HTTPException(status_code=404, detail=messages.notfound)
return result
@router.delete('/{id}', response_model=models.ProductPublic)
@router.delete('{id}', response_model=models.ProductPublic)
def delete_product(
id: int,
user: models.User = Depends(get_current_user),

View File

@@ -8,7 +8,7 @@ from src.auth.auth import get_current_user
router = APIRouter(prefix='/shipments')
@router.get('/', response_model=list[models.ShipmentPublic], )
@router.get('', response_model=list[models.ShipmentPublic], )
def get_shipments(
session: Session = Depends(get_session),
names: list[str] = Query([]),
@@ -22,7 +22,7 @@ def get_shipments(
forms,
)
@router.get('/{id}', response_model=models.ShipmentPublic)
@router.get('{id}', response_model=models.ShipmentPublic)
def get_shipment(
id: int,
user: models.User = Depends(get_current_user),
@@ -33,7 +33,7 @@ def get_shipment(
raise HTTPException(status_code=404, detail=messages.notfound)
return result
@router.post('/', response_model=models.ShipmentPublic)
@router.post('', response_model=models.ShipmentPublic)
def create_shipment(
shipment: models.ShipmentCreate,
user: models.User = Depends(get_current_user),
@@ -41,7 +41,7 @@ def create_shipment(
):
return service.create_one(session, shipment)
@router.put('/{id}', response_model=models.ShipmentPublic)
@router.put('{id}', response_model=models.ShipmentPublic)
def update_shipment(
id: int, shipment: models.ShipmentUpdate,
user: models.User = Depends(get_current_user),
@@ -52,7 +52,7 @@ def update_shipment(
raise HTTPException(status_code=404, detail=messages.notfound)
return result
@router.delete('/{id}', response_model=models.ShipmentPublic)
@router.delete('{id}', response_model=models.ShipmentPublic)
def delete_shipment(
id: int,
user: models.User = Depends(get_current_user),

View File

@@ -8,14 +8,14 @@ from src.auth.auth import get_current_user
router = APIRouter(prefix='/templates')
@router.get('/', response_model=list[models.TemplatePublic])
@router.get('', response_model=list[models.TemplatePublic])
def get_templates(
user: models.User = Depends(get_current_user),
session: Session = Depends(get_session)
):
return service.get_all(session)
@router.get('/{id}', response_model=models.TemplatePublic)
@router.get('{id}', response_model=models.TemplatePublic)
def get_template(
id: int,
user: models.User = Depends(get_current_user),
@@ -26,7 +26,7 @@ def get_template(
raise HTTPException(status_code=404, detail=messages.notfound)
return result
@router.post('/', response_model=models.TemplatePublic)
@router.post('', response_model=models.TemplatePublic)
def create_template(
template: models.TemplateCreate,
user: models.User = Depends(get_current_user),
@@ -34,7 +34,7 @@ def create_template(
):
return service.create_one(session, template)
@router.put('/{id}', response_model=models.TemplatePublic)
@router.put('{id}', response_model=models.TemplatePublic)
def update_template(
id: int, template: models.TemplateUpdate,
user: models.User = Depends(get_current_user),
@@ -45,7 +45,7 @@ def update_template(
raise HTTPException(status_code=404, detail=messages.notfound)
return result
@router.delete('/{id}', response_model=models.TemplatePublic)
@router.delete('{id}', response_model=models.TemplatePublic)
def delete_template(
id: int,
user: models.User = Depends(get_current_user),

View File

@@ -8,7 +8,7 @@ from src.auth.auth import get_current_user
router = APIRouter(prefix='/users')
@router.get('/', response_model=list[models.UserPublic])
@router.get('', response_model=list[models.UserPublic])
def get_users(
session: Session = Depends(get_session),
user: models.User = Depends(get_current_user),
@@ -21,14 +21,14 @@ def get_users(
emails,
)
@router.get('/roles', response_model=list[models.ContractType])
@router.get('roles', response_model=list[models.ContractType])
def get_roles(
user: models.User = Depends(get_current_user),
session: Session = Depends(get_session)
):
return service.get_roles(session)
@router.get('/{id}', response_model=models.UserPublic)
@router.get('{id}', response_model=models.UserPublic)
def get_users(
id: int,
user: models.User = Depends(get_current_user),
@@ -39,7 +39,7 @@ def get_users(
raise HTTPException(status_code=404, detail=messages.notfound)
return result
@router.post('/', response_model=models.UserPublic)
@router.post('', response_model=models.UserPublic)
def create_user(
user: models.UserCreate,
logged_user: models.User = Depends(get_current_user),
@@ -47,7 +47,7 @@ def create_user(
):
return service.create_one(session, user)
@router.put('/{id}', response_model=models.UserPublic)
@router.put('{id}', response_model=models.UserPublic)
def update_user(
id: int,
user: models.UserUpdate,
@@ -59,7 +59,7 @@ def update_user(
raise HTTPException(status_code=404, detail=messages.notfound)
return result
@router.delete('/{id}', response_model=models.UserPublic)
@router.delete('{id}', response_model=models.UserPublic)
def delete_user(
id: int,
user: models.User = Depends(get_current_user),