last

kv/routers/address.py

@@ -12,38 +12,38 @@ router = APIRouter()
 
 @router.get("/get_details/{id}", response_model=List[schemas.AddressDetailsSerializer])
 async def get_details(id: int, db: Session = Depends(get_db)):
-    data = crud.AddressInfoViewSet.get_details(db, id)
+    data = crud.AddressViewSet.get_details(db, id)
     return data
 
 
 @router.get("/get_personal_accounts/{IDCity}", response_model=List[schemas.PersonalAccountSerializer])
 async def get_personal_accounts(IDCity: int, db: Session = Depends(get_db)):
-    data = crud.AddressInfoViewSet.get_personal_accounts(
+    data = crud.AddressViewSet.get_personal_accounts(
         db, IDCity=IDCity)
     return data
 
 
 @router.get("/get_addresses/{IDCity}", response_model=List[schemas.AddressesSerializer])
 async def get_addresses(IDCity: int, db: Session = Depends(get_db)):
-    data = crud.AddressInfoViewSet.get_addresses(db, IDCity)
+    data = crud.AddressViewSet.get_addresses(db, IDCity)
     return data
 
 
 @router.get("/get_address_personal_accounts/{IDAddress}", response_model=List[schemas.AddressPersonalAccounts])
 async def get_address_personal_accounts(IDAddress: int, db: Session = Depends(get_db)):
-    data = crud.AddressInfoViewSet.get_address_personal_accounts(db, IDAddress)
+    data = crud.AddressViewSet.get_address_personal_accounts(db, IDAddress)
     return data
 
 
 @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)
+    data = crud.AddressViewSet.get_address_object_details(db, id)
     return data
 
 
 @router.get("/get_metering_devices/{IDAddress}", response_model=List[schemas.AddressMeteringDevices])
 async def get_metering_devices(IDAddress: int, db: Session = Depends(get_db)):
-    data = crud.AddressInfoViewSet.get_metering_devices(db, IDAddress)
+    data = crud.AddressViewSet.get_metering_devices(db, IDAddress)
     return data
 
 
@@ -52,14 +52,8 @@ async def get_metering_devices(IDAddress: int, db: Session = Depends(get_db)):
 
 @router.post('/edit')
 async def edit(request: schemas.EditAdressInit, db: Session = Depends(get_db)):
-    return crud.AddressInfoViewSet.edit(db, request)
+    return crud.AddressViewSet.edit(db, request)
 
 
-@router.post('/edit_personal_account')
-async def edit_personal_account(request: schemas.PersonalAccountDetailsSerializer, db: Session = Depends(get_db)):
-    return crud.AddressInfoViewSet.edit_personal_account(db, request)
 
 
-@router.post('/edit_personal_account')
-async def edit_personal_account(request: schemas.PersonalAccountDetailsSerializer, db: Session = Depends(get_db)):
-    return crud.AddressInfoViewSet.edit_personal_account(db, request)

kv/routers/objectvs.py

@@ -43,7 +43,7 @@ async def get_metering_devices(IDObject: str, db: Session = Depends(get_db)):
 
 
 @router.post('/edit')
-async def edit(request: schemas.ObjectDetailsSerializer, db: Session = Depends(get_db)):
+async def edit(request: schemas.ObjectEditInit, db: Session = Depends(get_db)):
     return crud.ObjectViewSet.edit(db, request)
 
 

kv/routers/personalaccount.py

@@ -48,3 +48,7 @@ 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.ReportTOFinancialAccountInit, db: Session = Depends(get_db)):
     return crud.PersonalAccountViewSet.get_financial_account(db, request)
+
+@router.post('/edit')
+async def edit(request: schemas.PersonalAccountDetailsInit, db: Session = Depends(get_db)):
+    return crud.PersonalAccountViewSet.edit(db, request)

kv/routers/reference.py

@@ -194,7 +194,7 @@ async def get_object_metering_device_addresses(request: schemas.AdvancedSearchIn
 
 
 @router.post('/get_object_water_system_volumes', response_model=List[schemas.CommonTypeSerializer])
-async def get_object_water_system_volumes(request: schemas.TariffsPopulationInit, db: Session = Depends(get_db)):
+async def get_object_water_system_volumes(request: schemas.ObjectWaterSystemVolumesInit, db: Session = Depends(get_db)):
     return ReferenceViewSet.get_object_water_system_volumes(db, request)