diff --git a/infosys/routers/__pycache__/general.cpython-39.pyc b/infosys/routers/__pycache__/general.cpython-39.pyc index f1bc1db..a08020b 100644 Binary files a/infosys/routers/__pycache__/general.cpython-39.pyc and b/infosys/routers/__pycache__/general.cpython-39.pyc differ diff --git a/infosys/routers/general.py b/infosys/routers/general.py index 03a3121..7838aac 100644 --- a/infosys/routers/general.py +++ b/infosys/routers/general.py @@ -10,18 +10,18 @@ async def test_router(): return {"msg":"router!"} @router.get('/getCities') -def get_cities(db = Depends(general.get_db)): +async def get_cities(db = Depends(general.get_db)): return db.execute("SELECT id,name FROM General.dbo.vCities").fetchall() @router.get('/getCities/region-id={region_id}') -def get_city(region_id: int,db = Depends(general.get_db)): +async def get_city(region_id: int,db = Depends(general.get_db)): return db.execute(f"SELECT id, name FROM General.dbo.vCities WHERE id_region = {region_id}").fetchall() @router.get('/getAddress/city-id={city_id}') -def get_address(city_id: int, db= Depends(general.get_db)): +async def get_address(city_id: int, db= Depends(general.get_db)): return db.execute(f"EXEC General.dbo.getAddress @city_id = {city_id}").fetchall() @router.get('/getRegions') -def get_region(db = Depends(general.get_db)): +async def get_region(db = Depends(general.get_db)): return db.execute("SELECT id, name FROM General.dbo.vRegions").fetchall() \ No newline at end of file diff --git a/kassa/__pycache__/kassa.cpython-39.pyc b/kassa/__pycache__/kassa.cpython-39.pyc index 729ace0..d4924a0 100644 Binary files a/kassa/__pycache__/kassa.cpython-39.pyc and b/kassa/__pycache__/kassa.cpython-39.pyc differ diff --git a/kassa/__pycache__/new.cpython-39.pyc b/kassa/__pycache__/new.cpython-39.pyc index 89271e4..302dd88 100644 Binary files a/kassa/__pycache__/new.cpython-39.pyc and b/kassa/__pycache__/new.cpython-39.pyc differ diff --git a/kassa/kassa.py b/kassa/kassa.py index 353e4af..8724430 100644 --- a/kassa/kassa.py +++ b/kassa/kassa.py @@ -11,5 +11,5 @@ get_db = database.get_db @router.post('/{external_id}') -def insert_doc(request: schemas.Doc, external_id: str, db=Depends(get_db)): +async def insert_doc(request: schemas.Doc, external_id: str, db=Depends(get_db)): return doc.create_doc(db, request, external_id) diff --git a/kassa/new.py b/kassa/new.py index 70cc93a..db6283f 100644 --- a/kassa/new.py +++ b/kassa/new.py @@ -18,6 +18,7 @@ import datetime Base = declarative_base() metadata = Base.metadata +ignore_list = [] class PaymentDetails(Base): __tablename__ = "payment_details" @@ -72,7 +73,7 @@ def get_payment_details(db: Session, engine_class: DBEngine): pd = engine_class.get_table('payment_details') year, month, external_id, is_refund, is_taken = engine_class.get_columns( 'payment_details', ['year','month','external_id', 'is_refund', 'is_taken']) - query = db.query(pd).filter(is_taken == False).with_entities( + query = db.query(pd).filter(is_taken == False).filter(external_id.notin_(ignore_list)).with_entities( external_id, is_refund, is_taken).distinct().order_by(year, month,external_id, desc(is_refund)) return query @@ -116,6 +117,7 @@ def get_payment_details_items(db: Session, engine_class: DBEngine, dict_engine: vats = dict_engine.get_table('payment_object_vat_type') agents = dict_engine.get_table('agents') company = dict_engine.get_table('providers') + payment_type = dict_engine.get_table('payment_type') query = db.query( payment.c.external_id.label('external_id'), services.c.sname.label('name'), @@ -126,11 +128,12 @@ def get_payment_details_items(db: Session, engine_class: DBEngine, dict_engine: payment.c.phone.label('phone'), company.c.inn, payment.c.summa.label('sum'), - case( - (payment.c.payment_method.in_([5, 6, 7]), 3), - (payment.c.payment_method.in_([1, 2, 3]), 2), - (payment.c.payment_method == 4, 1) - ).label("payment_group"), + #case( + # (payment.c.payment_method.in_([5, 6, 7]), 3), + # (payment.c.payment_method.in_([1, 2, 3]), 2), + # (payment.c.payment_method == 4, 1) + #).label("payment_group"), + payment_type.c["name"].label("payment_group"), payment_method.c["name"].label('payment_method'), payment_object.c["name"].label('payment_object'), vats.c["name"].label("vat"), @@ -146,7 +149,8 @@ def get_payment_details_items(db: Session, engine_class: DBEngine, dict_engine: .join(payment_object, payment.c.payment_object == payment_object.c["id"])\ .join(vats, payment.c.vat == vats.c["id"])\ .join(company, payment.c.id_company == company.c["id_provider"])\ - .join(agents, payment.c.supplier_info == agents.c["id_agent"], isouter=True) + .join(agents, payment.c.supplier_info == agents.c["id_agent"], isouter=True)\ + .join(payment_type, payment.c.payments == payment_type.c["id"]) return query diff --git a/kv/__pycache__/crud.cpython-39.pyc b/kv/__pycache__/crud.cpython-39.pyc index faceef2..89608fe 100644 Binary files a/kv/__pycache__/crud.cpython-39.pyc and b/kv/__pycache__/crud.cpython-39.pyc differ diff --git a/kv/__pycache__/schemas.cpython-39.pyc b/kv/__pycache__/schemas.cpython-39.pyc index a6ffd67..8a5392c 100644 Binary files a/kv/__pycache__/schemas.cpython-39.pyc and b/kv/__pycache__/schemas.cpython-39.pyc differ diff --git a/kv/crud.py b/kv/crud.py index 1477176..edbe479 100644 --- a/kv/crud.py +++ b/kv/crud.py @@ -238,14 +238,14 @@ class ReportFilterViewSet: """post""" - def get_report_filter_types(db: Session, data: schemas.UserInit): - return exec_procedure(db, 'uspGetRentRegisterNotices', **data) + def get_filter_types(db: Session, data: schemas.FilterTypeInit): + return exec_procedure(db, 'uspGetFilterTypes', data.dict()) - def get_report_filtered_list(db: Session, data: schemas.ReportFilterInit): - return exec_procedure(db, 'uspGetReportFilterList', **data) + 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): - return exec_procedure_wo_result(db, 'uspSetFilterList', **data) + return exec_procedure_wo_result(db, 'uspSetFilterList', data.dict()) """AccrualViewSet""" diff --git a/kv/routers/__pycache__/accrual.cpython-39.pyc b/kv/routers/__pycache__/accrual.cpython-39.pyc index 254719a..17e235f 100644 Binary files a/kv/routers/__pycache__/accrual.cpython-39.pyc and b/kv/routers/__pycache__/accrual.cpython-39.pyc differ diff --git a/kv/routers/__pycache__/address.cpython-39.pyc b/kv/routers/__pycache__/address.cpython-39.pyc index 52801bf..5cdc9cb 100644 Binary files a/kv/routers/__pycache__/address.cpython-39.pyc and b/kv/routers/__pycache__/address.cpython-39.pyc differ diff --git a/kv/routers/__pycache__/objectvs.cpython-39.pyc b/kv/routers/__pycache__/objectvs.cpython-39.pyc index c368672..83e0436 100644 Binary files a/kv/routers/__pycache__/objectvs.cpython-39.pyc and b/kv/routers/__pycache__/objectvs.cpython-39.pyc differ diff --git a/kv/routers/__pycache__/payment.cpython-39.pyc b/kv/routers/__pycache__/payment.cpython-39.pyc index b010da9..82c853b 100644 Binary files a/kv/routers/__pycache__/payment.cpython-39.pyc and b/kv/routers/__pycache__/payment.cpython-39.pyc differ diff --git a/kv/routers/__pycache__/personalaccount.cpython-39.pyc b/kv/routers/__pycache__/personalaccount.cpython-39.pyc index a1e3188..cabe210 100644 Binary files a/kv/routers/__pycache__/personalaccount.cpython-39.pyc and b/kv/routers/__pycache__/personalaccount.cpython-39.pyc differ diff --git a/kv/routers/__pycache__/reference.cpython-39.pyc b/kv/routers/__pycache__/reference.cpython-39.pyc index 2a30c41..f28a1b3 100644 Binary files a/kv/routers/__pycache__/reference.cpython-39.pyc and b/kv/routers/__pycache__/reference.cpython-39.pyc differ diff --git a/kv/routers/__pycache__/report.cpython-39.pyc b/kv/routers/__pycache__/report.cpython-39.pyc index 507159f..91c357a 100644 Binary files a/kv/routers/__pycache__/report.cpython-39.pyc and b/kv/routers/__pycache__/report.cpython-39.pyc differ diff --git a/kv/routers/__pycache__/reportfilter.cpython-39.pyc b/kv/routers/__pycache__/reportfilter.cpython-39.pyc index 832537d..f80b328 100644 Binary files a/kv/routers/__pycache__/reportfilter.cpython-39.pyc and b/kv/routers/__pycache__/reportfilter.cpython-39.pyc differ diff --git a/kv/routers/__pycache__/turnover.cpython-39.pyc b/kv/routers/__pycache__/turnover.cpython-39.pyc index c2a38d6..df77add 100644 Binary files a/kv/routers/__pycache__/turnover.cpython-39.pyc and b/kv/routers/__pycache__/turnover.cpython-39.pyc differ diff --git a/kv/routers/__pycache__/withdrawing.cpython-39.pyc b/kv/routers/__pycache__/withdrawing.cpython-39.pyc index 0aa84a4..efc6f0d 100644 Binary files a/kv/routers/__pycache__/withdrawing.cpython-39.pyc and b/kv/routers/__pycache__/withdrawing.cpython-39.pyc differ diff --git a/kv/routers/accrual.py b/kv/routers/accrual.py index 780a124..6dbc109 100644 --- a/kv/routers/accrual.py +++ b/kv/routers/accrual.py @@ -9,5 +9,5 @@ router = APIRouter() @router.get("/get_municipals") -def get_municipals(db: Session = Depends(get_db)): +async def get_municipals(db: Session = Depends(get_db)): return crud.AccrualViewSet.get_municipals(db) diff --git a/kv/routers/address.py b/kv/routers/address.py index b176750..33bcdf4 100644 --- a/kv/routers/address.py +++ b/kv/routers/address.py @@ -11,38 +11,38 @@ router = APIRouter() @router.get("/get_details/{id}", response_model=List[schemas.AddressDetailsSerializer]) -def get_details(id: int, db: Session = Depends(get_db)): +async def get_details(id: int, db: Session = Depends(get_db)): data = crud.AddressInfoViewSet.get_details(db, id) return data @router.get("/get_personal_accounts/{IDCity}", response_model=List[schemas.PersonalAccountSerializer]) -def get_personal_accounts(IDCity: int, db: Session = Depends(get_db)): +async def get_personal_accounts(IDCity: int, db: Session = Depends(get_db)): data = crud.AddressInfoViewSet.get_personal_accounts( db, IDCity=IDCity) return data @router.get("/get_addresses/{IDCity}", response_model=List[schemas.AddressesSerializer]) -def get_addresses(IDCity: int, db: Session = Depends(get_db)): +async def get_addresses(IDCity: int, db: Session = Depends(get_db)): data = crud.AddressInfoViewSet.get_addresses(db, IDCity) return data @router.get("/get_address_personal_accounts/{IDAddress}", response_model=List[schemas.AddressPersonalAccounts]) -def get_address_personal_accounts(IDAddress: int, db: Session = Depends(get_db)): +async def get_address_personal_accounts(IDAddress: int, db: Session = Depends(get_db)): data = crud.AddressInfoViewSet.get_address_personal_accounts(db, IDAddress) return data @router.get("/retrieve/{id}", response_model=List[schemas.AddressDetailInfoSerializer]) -def retrieve(id: int, db: Session = Depends(get_db)): +async def retrieve(id: int, db: Session = Depends(get_db)): data = crud.AddressInfoViewSet.retrieve(db, id) return data @router.get("/get_metering_devices/{IDAddress}", response_model=List[schemas.AddressMeteringDevices]) -def get_metering_devices(IDAddress: int, db: Session = Depends(get_db)): +async def get_metering_devices(IDAddress: int, db: Session = Depends(get_db)): data = crud.AddressInfoViewSet.get_metering_devices(db, IDAddress) return data @@ -51,15 +51,15 @@ def get_metering_devices(IDAddress: int, db: Session = Depends(get_db)): @router.post('/edit') -def edit(request: schemas.EditAdressInit, db: Session = Depends(get_db)): +async def edit(request: schemas.EditAdressInit, db: Session = Depends(get_db)): return crud.AddressInfoViewSet.edit(db, request) @router.post('/edit_personal_account') -def edit_personal_account(request: schemas.PersonalAccountDetailsSerializer, db: Session = Depends(get_db)): +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') -def edit_personal_account(request: schemas.PersonalAccountDetailsSerializer, db: Session = Depends(get_db)): +async def edit_personal_account(request: schemas.PersonalAccountDetailsSerializer, db: Session = Depends(get_db)): return crud.AddressInfoViewSet.edit_personal_account(db, request) diff --git a/kv/routers/objectvs.py b/kv/routers/objectvs.py index eb7be97..87b234e 100644 --- a/kv/routers/objectvs.py +++ b/kv/routers/objectvs.py @@ -10,31 +10,31 @@ router = APIRouter() @router.get("/get_details/{IDObject}", response_model=List[schemas.ObjectDetailsSerializer]) -def get_details(IDObject: str, db: Session = Depends(get_db)): +async def get_details(IDObject: str, db: Session = Depends(get_db)): data = crud.ObjectViewSet.get_details(db, IDObject) return data @router.get("/get_municipals/{IDCity}", response_model=List[schemas.ObjectMunicipalsSerializer]) -def get_municipals(IDCity: int, db: Session = Depends(get_db)): +async def get_municipals(IDCity: int, db: Session = Depends(get_db)): data = crud.ObjectViewSet.get_municipals(db, IDCity) return data @router.get("/get_services/{IDObject}", response_model=List[schemas.ObjectServicesSerializer]) -def get_services(IDObject: str, db: Session = Depends(get_db)): +async def get_services(IDObject: str, db: Session = Depends(get_db)): data = crud.ObjectViewSet.get_services(db, IDObject) return data @router.get("/get_addresses/{IDObject}", response_model=List[schemas.ObjectAddressesSerializer]) -def get_addresses(IDObject: str, db: Session = Depends(get_db)): +async def get_addresses(IDObject: str, db: Session = Depends(get_db)): data = crud.ObjectViewSet.get_addresses(db, id) return data @router.get("/get_metering_devices/{IDObject}", response_model=List[schemas.ObjectMeteringDevicesSerializer]) -def get_metering_devices(IDObject: str, db: Session = Depends(get_db)): +async def get_metering_devices(IDObject: str, db: Session = Depends(get_db)): data = crud.ObjectViewSet.get_metering_devices(db, IDObject) return data @@ -43,20 +43,20 @@ def get_metering_devices(IDObject: str, db: Session = Depends(get_db)): @router.post('/edit') -def edit(request: schemas.ObjectDetailsSerializer, db: Session = Depends(get_db)): +async def edit(request: schemas.ObjectDetailsSerializer, db: Session = Depends(get_db)): return crud.ObjectViewSet.edit(db, request) @router.post('/edit_service') -def edit_service(request: schemas.EditObjectServiceInit, db: Session = Depends(get_db)): +async def edit_service(request: schemas.EditObjectServiceInit, db: Session = Depends(get_db)): return crud.ObjectViewSet.edit_service(db, request) @router.post('/edit_temp_metering_device_address') -def edit_temp_metering_device_address(request: schemas.EditTempMeteringDeviceAddressInit, db: Session = Depends(get_db)): +async def edit_temp_metering_device_address(request: schemas.EditTempMeteringDeviceAddressInit, db: Session = Depends(get_db)): return crud.ObjectViewSet.edit_temp_metering_device_address(db, request) @router.post('/add_object') -def add_object(request: schemas.AddObjectInit, db: Session = Depends(get_db)): +async def add_object(request: schemas.AddObjectInit, db: Session = Depends(get_db)): return crud.ObjectViewSet.add_object(db, request) diff --git a/kv/routers/payment.py b/kv/routers/payment.py index bcfd778..63e7f8c 100644 --- a/kv/routers/payment.py +++ b/kv/routers/payment.py @@ -10,25 +10,25 @@ router = APIRouter() @router.get("/get_money_types", response_model=List[schemas.MoneyTypesSerializer]) -def get_money_types(db: Session = Depends(get_db)): +async def get_money_types(db: Session = Depends(get_db)): data = crud.PaymentViewSet.get_money_types(db) return data @router.get("/get_worker_types", response_model=List[schemas.WorkerTypesSerializer]) -def get_worker_types(db: Session = Depends(get_db)): +async def get_worker_types(db: Session = Depends(get_db)): data = crud.PaymentViewSet.get_worker_types(db) return data @router.get("/get_payer_category_types", response_model=List[schemas.PayerCategoryTypesSerializer]) -def get_payer_category_types(db: Session = Depends(get_db)): +async def get_payer_category_types(db: Session = Depends(get_db)): data = crud.PaymentViewSet.get_payer_category_types(db) return data @router.get("/get_services_additional", response_model=List[schemas.ServicesAdditionalSerializer]) -def get_services_additional(db: Session = Depends(get_db)): +async def get_services_additional(db: Session = Depends(get_db)): data = crud.PaymentViewSet.get_services_additional(db) return data @@ -37,20 +37,20 @@ def get_services_additional(db: Session = Depends(get_db)): @router.post('/get_receipt_calculate', response_model=List[schemas.ReceiptCalculatedSerializer]) -def get_receipt_calculate(request: schemas.RecieptCalculateInit, db: Session = Depends(get_db)): +async def get_receipt_calculate(request: schemas.RecieptCalculateInit, db: Session = Depends(get_db)): return crud.PaymentViewSet.get_receipt_calculate(db, request) @router.post('/save_receipt') -def save_receipt(request: schemas.ReceiptSaveInit, db: Session = Depends(get_db)): +async def save_receipt(request: schemas.ReceiptSaveInit, db: Session = Depends(get_db)): return crud.PaymentViewSet.save_receipt(db, request) @router.post('/repayment_info', response_model=List[schemas.RentRepaymentInfoSerializer]) -def repayment_info(request: schemas.RepaymentInfoInit, db: Session = Depends(get_db)): +async def repayment_info(request: schemas.RepaymentInfoInit, db: Session = Depends(get_db)): return crud.PaymentViewSet.repayment_info(db, request) @router.post('/repayment', response_model=List[schemas.RentRepaymentSerializer]) -def repayment(request: schemas.RepaymentInit, db: Session = Depends(get_db)): +async def repayment(request: schemas.RepaymentInit, db: Session = Depends(get_db)): return crud.PaymentViewSet.repayment(db, request) diff --git a/kv/routers/personalaccount.py b/kv/routers/personalaccount.py index fd6af91..41f8441 100644 --- a/kv/routers/personalaccount.py +++ b/kv/routers/personalaccount.py @@ -10,31 +10,31 @@ router = APIRouter() @router.get("/get_details/{id}", response_model=List[schemas.PersonalAccountDetailsSerializer]) -def get_details(id: int, db: Session = Depends(get_db)): +async def get_details(id: int, db: Session = Depends(get_db)): data = crud.PersonalAccountViewSet.get_details(db, id) return data @router.get("/get_turn_over/{IDPersonalAccount}", response_model=List[schemas.TurnOverSerializer]) -def get_turn_over(IDPersonalAccount: int, db: Session = Depends(get_db)): +async def get_turn_over(IDPersonalAccount: int, db: Session = Depends(get_db)): data = crud.PersonalAccountViewSet.get_turn_over(db, IDPersonalAccount) return data @router.get("/get_services/{IDPersonalAccount}", response_model=List[schemas.PersonalAccountTOServicesSerializer]) -def get_services(IDPersonalAccount: int, db: Session = Depends(get_db)): +async def get_services(IDPersonalAccount: int, db: Session = Depends(get_db)): data = crud.PersonalAccountViewSet.get_services(db, IDPersonalAccount) return data @router.get("/get_debt/{IDPersonalAccount}", response_model=List[schemas.PersonalAccountDebtSerilizer]) -def get_debt(IDPersonalAccount: int, db: Session = Depends(get_db)): +async def get_debt(IDPersonalAccount: int, db: Session = Depends(get_db)): data = crud.PersonalAccountViewSet.get_debt(db, IDPersonalAccount) return data @router.get("/get_debts/IDPersonalAccount={IDPersonalAccount},GetType={GetType}", response_model=List[schemas.PersonalAccountDebtsSerializer]) -def get_debts(IDPersonalAccount: int, GetType: bool, db: Session = Depends(get_db)): +async def get_debts(IDPersonalAccount: int, GetType: bool, db: Session = Depends(get_db)): to_data = schemas.PersonalAccountType( IDPersonalAccount=IDPersonalAccount, GetType=GetType) data = crud.PersonalAccountViewSet.get_debts(db, to_data) @@ -45,6 +45,6 @@ def get_debts(IDPersonalAccount: int, GetType: bool, db: Session = Depends(get_d @router.post("/get_financial_account", response_model=List[schemas.ReportTOFinancialAccount]) -def get_financial_account(request: schemas.PersonalAccountInit, db: Session = Depends(get_db)): +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) diff --git a/kv/routers/reference.py b/kv/routers/reference.py index fbbb2f8..25d1ea7 100644 --- a/kv/routers/reference.py +++ b/kv/routers/reference.py @@ -10,162 +10,162 @@ router = APIRouter() @router.get("/get_personal_accounts", response_model=List[schemas.PersonalAccountsSerializer]) -def get_personal_accounts(db: Session = Depends(get_db)): +async def get_personal_accounts(db: Session = Depends(get_db)): data = ReferenceViewSet.get_personal_accounts(db) return data @router.get("/get_objects/{IDCity}", response_model=List[schemas.ObjectsSerializer]) -def get_objects(IDCity: int, db: Session = Depends(get_db)): +async def get_objects(IDCity: int, db: Session = Depends(get_db)): inn = schemas.CityInit(IDCity=IDCity) print(inn) return ReferenceViewSet.get_objects(db, inn) @router.get("/get_services", response_model=List[schemas.CommonTypeSerializer]) -def get_services(db: Session = Depends(get_db)): +async def get_services(db: Session = Depends(get_db)): data = ReferenceViewSet.get_services(db) return data @router.get("/get_provider_types", response_model=List[schemas.ProviderTypeSerializer]) -def get_provider_types(db: Session = Depends(get_db)): +async def get_provider_types(db: Session = Depends(get_db)): data = ReferenceViewSet.get_provider_types(db) return data @router.get("/get_providers", response_model=List[schemas.CommonTypeSerializer]) -def get_providers(db: Session = Depends(get_db)): +async def get_providers(db: Session = Depends(get_db)): data = ReferenceViewSet.get_providers(db) return data @router.get("/get_systems_water", response_model=List[schemas.SystemWater]) -def get_systems_water(db: Session = Depends(get_db)): +async def get_systems_water(db: Session = Depends(get_db)): data = ReferenceViewSet.get_systems_water(db) return data @router.get("/get_systems_water_period_types", response_model=List[schemas.SystemWaterPeriodType]) -def get_systems_water_period_types(db: Session = Depends(get_db)): +async def get_systems_water_period_types(db: Session = Depends(get_db)): data = ReferenceViewSet.get_systems_water_period_types(db) return data @router.get("/get_provider_contracts/{IDPersonalAccount}", response_model=List[schemas.ProviderContractSerializer]) -def get_provider_contracts(IDPersonalAccount: int, db: Session = Depends(get_db)): +async def get_provider_contracts(IDPersonalAccount: int, db: Session = Depends(get_db)): inn = schemas.PAInit(IDPersonalAccount=IDPersonalAccount) data = ReferenceViewSet.get_provider_contracts(db, inn) return data @router.get("/get_providers_utility_services/{IDCity}", response_model=List[schemas.CommonTypeSerializer]) -def get_providers_utility_services(IDCity: int, db: Session = Depends(get_db)): +async def get_providers_utility_services(IDCity: int, db: Session = Depends(get_db)): inn = schemas.CityInit(IDCity=IDCity) data = ReferenceViewSet.get_providers_utility_services(db, inn) return data @router.get("/get_management_companies", response_model=List[schemas.ManagementCompanySerializer]) -def get_management_companies(db: Session = Depends(get_db)): +async def get_management_companies(db: Session = Depends(get_db)): data = ReferenceViewSet.get_management_companies(db) return data @router.get("/get_boilers_by_city/{IDCity}", response_model=List[schemas.CommonTypeUUIDSerializer]) -def get_boilers_by_city(IDCity: int, db: Session = Depends(get_db)): +async def get_boilers_by_city(IDCity: int, db: Session = Depends(get_db)): inn = schemas.CityInit(IDCity=IDCity) data = ReferenceViewSet.get_boilers_by_city(db, inn) return data @router.get("/get_streets_by_city/{IDCity}", response_model=List[schemas.CommonTypeSerializer]) -def get_streets_by_city(IDCity: int, db: Session = Depends(get_db)): +async def get_streets_by_city(IDCity: int, db: Session = Depends(get_db)): inn = schemas.CityInit(IDCity=IDCity) data = ReferenceViewSet.get_streets_by_city(db, inn) return data @router.get("/get_metering_devices_services", response_model=List[schemas.ServicesSerializer]) -def get_metering_devices_services(db: Session = Depends(get_db)): +async def get_metering_devices_services(db: Session = Depends(get_db)): data = ReferenceViewSet.get_metering_devices_services(db) return data @router.get("/get_owhership_types", response_model=List[schemas.OwnershipType]) -def get_owhership_types(db: Session = Depends(get_db)): +async def get_owhership_types(db: Session = Depends(get_db)): data = ReferenceViewSet.get_owhership_types(db) return data @router.get("/get_object_improvement_degree_types", response_model=List[schemas.ImprovementDegreeSerializer]) -def get_object_improvement_degree_types(db: Session = Depends(get_db)): +async def get_object_improvement_degree_types(db: Session = Depends(get_db)): data = ReferenceViewSet.get_object_improvement_degree_types(db) return data @router.get("/get_object_gas_types", response_model=List[schemas.CommonTypeSerializer]) -def get_object_gas_types(db: Session = Depends(get_db)): +async def get_object_gas_types(db: Session = Depends(get_db)): data = ReferenceViewSet.get_object_gas_types(db) return data @router.get("/get_object_heating_types", response_model=List[schemas.CommonTypeSerializer]) -def get_object_heating_types(db: Session = Depends(get_db)): +async def get_object_heating_types(db: Session = Depends(get_db)): data = ReferenceViewSet.get_object_heating_types(db) return data @router.get("/get_object_wiring_types", response_model=List[schemas.CommonTypeSerializer]) -def get_object_wiring_types(db: Session = Depends(get_db)): +async def get_object_wiring_types(db: Session = Depends(get_db)): data = ReferenceViewSet.get_object_wiring_types(db) return data @router.get("/get_object_overlapping_types", response_model=List[schemas.CommonTypeSerializer]) -def get_object_overlapping_types(db: Session = Depends(get_db)): +async def get_object_overlapping_types(db: Session = Depends(get_db)): data = ReferenceViewSet.get_object_overlapping_types(db) return data @router.get("/get_object_wall_material_types", response_model=List[schemas.CommonTypeSerializer]) -def get_object_wall_material_types(db: Session = Depends(get_db)): +async def get_object_wall_material_types(db: Session = Depends(get_db)): data = ReferenceViewSet.get_object_wall_material_types(db) return data @router.get("/get_object_roof_types", response_model=List[schemas.CommonTypeSerializer]) -def get_object_roof_types(db: Session = Depends(get_db)): +async def get_object_roof_types(db: Session = Depends(get_db)): data = ReferenceViewSet.get_object_roof_types(db) return data @router.get("/get_object_foundation_types", response_model=List[schemas.CommonTypeSerializer]) -def get_object_foundation_types(db: Session = Depends(get_db)): +async def get_object_foundation_types(db: Session = Depends(get_db)): data = ReferenceViewSet.get_object_foundation_types(db) return data @router.get("/get_tariffs_population", response_model=List[schemas.CommonTypeSerializer]) -def get_tariffs_population(db: Session = Depends(get_db)): +async def get_tariffs_population(db: Session = Depends(get_db)): data = ReferenceViewSet.get_tariffs_population(db) return data @router.get("/get_tariffs_population", response_model=List[schemas.CommonTypeSerializer]) -def get_tariffs_population(db: Session = Depends(get_db)): +async def get_tariffs_population(db: Session = Depends(get_db)): data = ReferenceViewSet.get_tariffs_population(db) return data @router.get("/get_courts_types", response_model=List[schemas.CommonTypeSerializer]) -def get_courts_types(db: Session = Depends(get_db)): +async def get_courts_types(db: Session = Depends(get_db)): data = ReferenceViewSet.get_courts_types(db) return data @router.get("/get_address_types", response_model=List[schemas.CommonTypeSerializer]) -def get_address_types(db: Session = Depends(get_db)): +async def get_address_types(db: Session = Depends(get_db)): data = ReferenceViewSet.get_address_types(db) return data @@ -174,40 +174,40 @@ def get_address_types(db: Session = Depends(get_db)): @router.post('/get_advanced_search', response_model=List[schemas.AdvancedSearchSerializer]) -def get_advanced_search(request: schemas.AdvancedSearchInit, db: Session = Depends(get_db)): +async def get_advanced_search(request: schemas.AdvancedSearchInit, db: Session = Depends(get_db)): return ReferenceViewSet.edit(db, request) @router.post('/get_metering_devices_types', response_model=List[schemas.MeteringDeviceTypeSerializer]) -def get_metering_devices_types(request: schemas.ServiceIDInit, db: Session = Depends(get_db)): +async def get_metering_devices_types(request: schemas.ServiceIDInit, db: Session = Depends(get_db)): return ReferenceViewSet.get_metering_devices_types(db, request) @router.post('/get_object_metering_devices_types', response_model=List[schemas.CommonTypeSerializer]) -def get_object_metering_devices_types(request: schemas.ObjectMeteringDevicesTypesInit, db: Session = Depends(get_db)): +async def get_object_metering_devices_types(request: schemas.ObjectMeteringDevicesTypesInit, db: Session = Depends(get_db)): return ReferenceViewSet.get_object_metering_devices_types(db, request) @router.post('/get_object_metering_device_addresses', response_model=List[schemas.ObjectMeteringDeviceAddressesSerializer]) -def get_object_metering_device_addresses(request: schemas.AdvancedSearchInit, db: Session = Depends(get_db)): +async def get_object_metering_device_addresses(request: schemas.AdvancedSearchInit, db: Session = Depends(get_db)): return ReferenceViewSet.get_object_metering_device_addresses(db, request) @router.post('/get_object_water_system_volumes', response_model=List[schemas.CommonTypeSerializer]) -def get_object_water_system_volumes(request: schemas.TariffsPopulationInit, db: Session = Depends(get_db)): +async def get_object_water_system_volumes(request: schemas.TariffsPopulationInit, db: Session = Depends(get_db)): return ReferenceViewSet.get_object_water_system_volumes(db, request) @router.post('/get_tariff_population', response_model=List[schemas.TariffPopulationSerializer]) -def get_tariff_population(request: schemas.AdvancedSearchInit, db: Session = Depends(get_db)): +async def get_tariff_population(request: schemas.AdvancedSearchInit, db: Session = Depends(get_db)): return ReferenceViewSet.get_tariff_population(db, request) @router.post('/get_object_tariff_provider', response_model=List[schemas.TariffProviderSerializer]) -def get_object_tariff_provider(request: schemas.TariffProviderInit, db: Session = Depends(get_db)): +async def get_object_tariff_provider(request: schemas.TariffProviderInit, db: Session = Depends(get_db)): return ReferenceViewSet.get_object_tariff_provider(db, request) @router.post('/edit_metering_device') -def edit_metering_device(request: schemas.MeteringDeviceInit, db: Session = Depends(get_db)): +async def edit_metering_device(request: schemas.MeteringDeviceInit, db: Session = Depends(get_db)): return ReferenceViewSet.edit_metering_device(db, request) diff --git a/kv/routers/report.py b/kv/routers/report.py index 6d2bd8f..1c85b5a 100644 --- a/kv/routers/report.py +++ b/kv/routers/report.py @@ -10,6 +10,6 @@ router = APIRouter() @router.post("/repayment", response_model=List[schemas.RentRegisterNotices]) -def repayment(request: schemas.RentRegisterNoticeInit, db: Session = Depends(get_db)): +async def repayment(request: schemas.RentRegisterNoticeInit, db: Session = Depends(get_db)): data = crud.ReportViewSet.get_details(db, request) return data diff --git a/kv/routers/reportfilter.py b/kv/routers/reportfilter.py index 3eae7b8..6e8855a 100644 --- a/kv/routers/reportfilter.py +++ b/kv/routers/reportfilter.py @@ -9,16 +9,16 @@ router = APIRouter() """post""" -@router.post('/get_report_filter_types', response_model=List[schemas.ReportFilterTypeSerializer]) -def get_report_filter_types(request: schemas.UserInit, db: Session = Depends(get_db)): - return crud.ReportFilterViewSet.get_report_filter_types(db, request) +@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) -@router.post('/get_report_filtered_list', response_model=List[schemas.ReportFilterListSerializer]) -def get_report_filtered_list(request: schemas.ReportFilterInit, db: Session = Depends(get_db)): - return crud.ReportFilterViewSet.get_report_filtered_list(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) -@router.post('/set_report_filter_list', response_model=List[schemas.ReportFilterListSerializer]) -def set_report_filter_list(request: schemas.ReportFilterSetInit, db: Session = Depends(get_db)): +@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) diff --git a/kv/routers/turnover.py b/kv/routers/turnover.py index 34b419d..7f6d43a 100644 --- a/kv/routers/turnover.py +++ b/kv/routers/turnover.py @@ -10,10 +10,10 @@ router = APIRouter() @router.post('/make_storno') -def make_storno(request: schemas.StronoInit, db: Session = Depends(get_db)): +async def make_storno(request: schemas.StronoInit, db: Session = Depends(get_db)): return crud.TurnOverViewSet.make_storno(db, request) @router.post('/get_to_archive') -def get_to_archive(request: schemas.ArchiveInit, db: Session = Depends(get_db)): +async def get_to_archive(request: schemas.ArchiveInit, db: Session = Depends(get_db)): return crud.TurnOverViewSet.get_to_archive(db, request) diff --git a/kv/routers/withdrawing.py b/kv/routers/withdrawing.py index a1ba5fb..dfafdac 100644 --- a/kv/routers/withdrawing.py +++ b/kv/routers/withdrawing.py @@ -10,7 +10,7 @@ router = APIRouter() @router.get("/get_withdrawing_types", response_model=List[schemas.WithdrawingTypesSerializer]) -def get_withdrawing_types(db: Session = Depends(get_db)): +async def get_withdrawing_types(db: Session = Depends(get_db)): data = crud.WithdrawingViewSet.get_withdrawing_types(db) return data @@ -19,15 +19,15 @@ def get_withdrawing_types(db: Session = Depends(get_db)): @router.post('/set_report_filter_list', response_model=List[schemas.WithdrawingCheckSerializer]) -def set_report_filter_list(request: schemas.WithdrawingCheckInit, db: Session = Depends(get_db)): +async def set_report_filter_list(request: schemas.WithdrawingCheckInit, db: Session = Depends(get_db)): return crud.WithdrawingViewSet.set_report_filter_list(db, request) @router.post('/get_withdrawing_temp', response_model=List[schemas.WithdrawingTempSerializer]) -def get_withdrawing_temp(request: schemas.WithdrawingTempInit, db: Session = Depends(get_db)): +async def get_withdrawing_temp(request: schemas.WithdrawingTempInit, db: Session = Depends(get_db)): return crud.WithdrawingViewSet.get_withdrawing_temp(db, request) @router.post('/save_withdrawing') -def save_withdrawing(request: schemas.WithdrawingSave, db: Session = Depends(get_db)): +async def save_withdrawing(request: schemas.WithdrawingSave, db: Session = Depends(get_db)): return crud.WithdrawingViewSet.save_withdrawing(db, request) diff --git a/kv/schemas.py b/kv/schemas.py index 780d4bf..a2ace36 100644 --- a/kv/schemas.py +++ b/kv/schemas.py @@ -48,11 +48,17 @@ class AdvancedSearchInit(AccountInit, CityInit): Patronymic: Optional[str] = None -class ReportFilterInit(UserInit): +class FilterTypeInit(UserInit): + IDUser: int + GetType: int + + +class FilterListInit(UserInit): + IDUser: int = 1 IDFilterType: int -class ReportFilterSetInit(ReportFilterInit): +class ReportFilterSetInit(FilterListInit): IDFilterObject: int @@ -484,12 +490,14 @@ class RentRepaymentSerializer(BaseModel): Amount: float -class ReportFilterTypeSerializer(BaseModel): +class FilterTypeSerializer(BaseModel): ID: int Name: Optional[str] = None + IDParent: int = None + OrderField: int -class ReportFilterListSerializer(BaseModel): +class FilterListSerializer(BaseModel): ID: int Name: Optional[str] = None IsChecked: bool