Исправления

kv/crud.py

@@ -38,8 +38,8 @@ def exec_procedure_wo_result(session, proc_name, params, database: str = None):
 
 
 class PersonalAccountViewSet:
-    def get_turn_over(db: Session, data: schemas.PersonalAccountInit = None):
-        return exec_procedure(db, 'uspGetPersonalAccountTurnOver', **data)
+    def get_turn_over(db: Session, IDPersonalAccount: int = None):
+        return exec_procedure(db, 'uspGetPersonalAccountTurnOver', {'IDPersonalAccount': IDPersonalAccount})
 
     def get_details(db: Session, id: int = None):
         table = get_table("PersonalAccount")
@@ -48,14 +48,14 @@ class PersonalAccountViewSet:
     def get_services(db: Session, IDPersonalAccount: int = None):
         return exec_procedure(db, 'uspGetPersonalAccountServices', {'IDPersonalAccount': IDPersonalAccount})
 
-    def get_debt(db: Session, data: schemas.PersonalAccount = None):
-        return exec_procedure(db, 'uspGetPersonalAccountDebt', **data)
+    def get_debt(db: Session, data: schemas.PersonalAccountInit = None):
+        return exec_procedure(db, 'uspGetPersonalAccountDebt', data.dict())
 
     def get_debts(db: Session, data: schemas.PersonalAccountType = None):
-        return exec_procedure(db, 'uspGetPersonalAccountDebts', **data)
+        return exec_procedure(db, 'uspGetPersonalAccountDebts', data.dict())
 
     def get_financial_account(db: Session, data: schemas.PersonalAccountReportTOFinancialInit = None):
-        return exec_procedure(db, 'uspGetPersonalAccountReportTOFinancialAccount', **data)
+        return exec_procedure(db, 'uspGetPersonalAccountReportTOFinancialAccount', data.dict())
 
 
 """AddressInfoViewSet"""
@@ -77,7 +77,7 @@ class AddressInfoViewSet:
     def get_address_personal_accounts(db: Session, IDAddress: int = None):
         return exec_procedure(db, 'uspGetAddressPersonalAccounts', {'IDAddress': IDAddress})
 
-    def retrieve(db: Session, id: int = None):
+    def get_address_object_details(db: Session, id: int = None):
         return exec_procedure(db, 'uspGetAddressAndObjectDetails', {'ID': id})
 
     def get_metering_devices(db: Session, IDAddress: int = None):
@@ -235,7 +235,7 @@ class ReportViewSet:
 """ReportFilterViewSet"""
 
 
-class ReportFilterViewSet:
+class FilterViewSet:
     """get"""
 
     """post"""
@@ -246,7 +246,7 @@ class ReportFilterViewSet:
     def get_filter_list(db: Session, data: schemas.FilterListInit):
         return exec_procedure(db, 'uspGetFilterList', data.dict())
 
-    def set_report_filter_list(db: Session, data: schemas.ReportFilterSetInit):
+    def set_filter_list(db: Session, data: schemas.FilterSetInit):
         return exec_procedure_wo_result(db, 'uspSetFilterList', data.dict())
 
 
@@ -265,7 +265,7 @@ class AccrualViewSet:
 """WithdrawingViewSet"""
 
 
-class WithdrawingViewSet:
+class RecalculationViewSet:
     """get"""
 
     def get_withdrawing_types(db: Session):

kv/isapi.py

@@ -1,6 +1,6 @@
 from fastapi import Depends, APIRouter
 from requests import Session
-from kv.routers import address, objectvs, payment, personalaccount, reference, report, accrual, reportfilter, turnover, withdrawing
+from kv.routers import address, objectvs, payment, personalaccount, reference, report, accrual, filter, turnover, recalculation
 from kv.database import get_db, get_table
 from typing import List
 from kv import schemas
@@ -35,7 +35,7 @@ async def get_settings(db: Session = Depends(get_db)):
     table = get_table("vSettings")
     return db.query(table).all()
 
-router.include_router(address.router,prefix="/address-info", tags=["AddressInfoViewSet"] )
+router.include_router(address.router,prefix="/address", tags=["AddressViewSet"] )
 
 router.include_router(objectvs.router, prefix="/object", tags=["ObjectViewSet"])
 
@@ -47,10 +47,10 @@ router.include_router(reference.router, prefix="/reference", tags=["ReferenceVie
 
 router.include_router(report.router, prefix="/report", tags=["ReportViewSet"])
 
-router.include_router(reportfilter.router, prefix="/reportfilter", tags=["ReportFilterViewSet"])
+router.include_router(filter.router, prefix="/filter", tags=["FilterViewSet"])
 
 router.include_router(turnover.router, prefix="/turnover", tags=["TurnOverViewSet"])
 
-router.include_router(withdrawing.router, prefix="/withdrawing", tags=["WithdrawingViewSet"])
+router.include_router(recalculation.router, prefix="/recalculation", tags=["RecalculationViewSet"])
 
 router.include_router(accrual.router,prefix="/accrual", tags=["AccrualViewSet"])

kv/routers/address.py

@@ -35,9 +35,9 @@ async def get_address_personal_accounts(IDAddress: int, db: Session = Depends(ge
     return data
 
 
-@router.get("/retrieve/{id}", response_model=List[schemas.AddressDetailInfoSerializer])
-async def retrieve(id: int, db: Session = Depends(get_db)):
-    data = crud.AddressInfoViewSet.retrieve(db, id)
+@router.get("/get_address_object_details/{id}", response_model=List[schemas.AddressDetailInfoSerializer])
+async def get_address_object_details(id: int, db: Session = Depends(get_db)):
+    data = crud.AddressInfoViewSet.get_address_object_details(db, id)
     return data
 
 

kv/routers/filter.py

@@ -11,14 +11,14 @@ router = APIRouter()
 
 @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.ReportFilterViewSet.get_filter_types(db, request)
+    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.ReportFilterViewSet.get_filter_list(db, request)
+    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.ReportFilterSetInit, db: Session = Depends(get_db)):
-    return crud.ReportFilterViewSet.set_report_filter_list(db, request)
+async def set_report_filter_list(request: schemas.FilterSetInit, db: Session = Depends(get_db)):
+    return crud.FilterViewSet.set_filter_list(db, request)

kv/routers/personalaccount.py

@@ -29,7 +29,8 @@ async def get_services(IDPersonalAccount: int, db: Session = Depends(get_db)):
 
 @router.get("/get_debt/{IDPersonalAccount}", response_model=List[schemas.PersonalAccountDebtSerilizer])
 async def get_debt(IDPersonalAccount: int, db: Session = Depends(get_db)):
-    data = crud.PersonalAccountViewSet.get_debt(db, IDPersonalAccount)
+    body = schemas.PersonalAccountInit( IDPersonalAccount = IDPersonalAccount)
+    data = crud.PersonalAccountViewSet.get_debt(db, body)
     return data
 
 

kv/routers/recalculation.py

@@ -11,7 +11,7 @@ router = APIRouter()
 
 @router.get("/get_withdrawing_types", response_model=List[schemas.WithdrawingTypesSerializer])
 async def get_withdrawing_types(db: Session = Depends(get_db)):
-    data = crud.WithdrawingViewSet.get_withdrawing_types(db)
+    data = crud.RecalculationViewSet.get_withdrawing_types(db)
     return data
 
 
@@ -20,14 +20,14 @@ async def get_withdrawing_types(db: Session = Depends(get_db)):
 
 @router.post('/set_report_filter_list', response_model=List[schemas.WithdrawingCheckSerializer])
 async def set_report_filter_list(request: schemas.WithdrawingCheckInit, db: Session = Depends(get_db)):
-    return crud.WithdrawingViewSet.set_report_filter_list(db, request)
+    return crud.RecalculationViewSet.set_report_filter_list(db, request)
 
 
 @router.post('/get_withdrawing_temp', response_model=List[schemas.WithdrawingTempSerializer])
 async def get_withdrawing_temp(request: schemas.WithdrawingTempInit, db: Session = Depends(get_db)):
-    return crud.WithdrawingViewSet.get_withdrawing_temp(db, request)
+    return crud.RecalculationViewSet.get_withdrawing_temp(db, request)
 
 
 @router.post('/save_withdrawing')
 async def save_withdrawing(request: schemas.WithdrawingSave, db: Session = Depends(get_db)):
-    return crud.WithdrawingViewSet.save_withdrawing(db, request)
+    return crud.RecalculationViewSet.save_withdrawing(db, request)

kv/schemas.py

@@ -54,12 +54,12 @@ class FilterTypeInit(BaseModel):
     NeedClear: bool
 
 
-class FilterListInit(UserInit):
+class FilterListInit(BaseModel):
     IDUser: int = 1
     IDFilterType: int
 
 
-class ReportFilterSetInit(FilterListInit):
+class FilterSetInit(FilterListInit):
     IDFilterObject: int
 
 
@@ -95,10 +95,16 @@ class PAInit(BaseModel):
     IDPersonalAccount: int
 
 
-class PersonalAccountInit(CashboxInit):
+
+class PersonalAccountInit(BaseModel):
     IDPersonalAccount: int
 
 
+class PAwUCInit(CashboxInit, PersonalAccountInit):
+    pass
+
+
+
 class GetTypeInit(BaseModel):
     GetType: bool
 
@@ -291,7 +297,7 @@ class AddressDetailInfoSerializer(BaseModel):
     MeteringDeviceColdWater: bool
     IDFias: Optional[str] = None
     FloorNumber: int
-    FullArea: float
+    FullArea: float = None
     ObjectMeteringDeviceHeating: bool
     ObjectMeteringDeviceEl: bool
     ObjectMeteringDeviceGas: bool
@@ -439,14 +445,14 @@ class PersonalAccountTOServicesSerializer(BaseModel):
     ServiceName: Optional[str] = None
     ServiceSecondName: Optional[str] = None
     ProviderName: Optional[str] = None
-    DateBegin: datetime
-    DateEnd: datetime
+    DateBegin: Optional[str] = None
+    DateEnd: Optional[str] = None
     Spor: int
     Por: int
     IDTariffPopulation: int
     Tariff: float
     TariffProvider: float
-    StandartVolume: float
+    StandartVolume: float = None
     Volume: float
     AmountSaldo: float
     AmountAccrued: float