Исправления

This commit is contained in:
Gitea
2022-06-16 09:38:24 +09:00
parent 21e5ad26f2
commit 8d82068324
12 changed files with 175 additions and 103 deletions

24
kv/routers/filter.py Normal file
View File

@ -0,0 +1,24 @@
import kv.schemas as schemas
import kv.crud as crud
from kv.database import get_db
from sqlalchemy.orm import Session
from fastapi import APIRouter, Depends
from typing import List
router = APIRouter()
"""post"""
@router.post('/get_filter_types', response_model=List[schemas.FilterTypeSerializer])
async def get_filter_types(request: schemas.FilterTypeInit, db: Session = Depends(get_db)):
return crud.FilterViewSet.get_filter_types(db, request)
@router.post('/get_filter_list', response_model=List[schemas.FilterListSerializer])
async def get_filter_list(request: schemas.FilterListInit, db: Session = Depends(get_db)):
return crud.FilterViewSet.get_filter_list(db, request)
@router.post('/set_report_filter_list', response_model=List[schemas.FilterListSerializer])
async def set_report_filter_list(request: schemas.FilterSetInit, db: Session = Depends(get_db)):
return crud.FilterViewSet.set_filter_list(db, request)

View File

@ -29,7 +29,7 @@ async def get_services(IDObject: str, db: Session = Depends(get_db)):
@router.get("/get_addresses/{IDObject}", response_model=List[schemas.ObjectAddressesSerializer])
async def get_addresses(IDObject: str, db: Session = Depends(get_db)):
data = crud.ObjectViewSet.get_addresses(db, id)
data = crud.ObjectViewSet.get_addresses(db, IDObject)
return data

View File

@ -41,7 +41,7 @@ async def get_receipt_calculate(request: schemas.RecieptCalculateInit, db: Sessi
return crud.PaymentViewSet.get_receipt_calculate(db, request)
@router.post('/save_receipt')
@router.post('/save_receipt', response_model=List[schemas.ReceiptSaveSerializer])
async def save_receipt(request: schemas.ReceiptSaveInit, db: Session = Depends(get_db)):
return crud.PaymentViewSet.save_receipt(db, request)

View File

@ -46,6 +46,5 @@ async def get_debts(IDPersonalAccount: int, GetType: bool, db: Session = Depends
@router.post("/get_financial_account", response_model=List[schemas.ReportTOFinancialAccount])
async def get_financial_account(request: schemas.PersonalAccountInit, db: Session = Depends(get_db)):
data = crud.PersonalAccountViewSet.get_financial_account(db, request)
return schemas.ReportTOFinancialAccount(**data)
async def get_financial_account(request: schemas.ReportTOFinancialAccountInit, db: Session = Depends(get_db)):
return crud.PersonalAccountViewSet.get_financial_account(db, request)

View File

@ -32,6 +32,6 @@ async def get_accruals_can_be_recalculated(request: schemas.AccrualsCanBeRecalcu
return crud.RecalculationViewSet.get_accruals_can_be_recalculated(db, request)
@router.post('/save_withdrawing')
async def save_withdrawing(request: schemas.WithdrawingSave, db: Session = Depends(get_db)):
return crud.RecalculationViewSet.save_withdrawing(db, request)
@router.post('/save_recalculation')
async def save_recalculation(request: schemas.RecalculationSave, db: Session = Depends(get_db)):
return crud.RecalculationViewSet.save_recalculation(db, request)