From 076cf8513cd140b78691bc39446742bdd66bdbc9 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Mon, 30 May 2022 12:07:03 +0900
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kv/__pycache__/crud.cpython-39.pyc            | Bin 21126 -> 21137 bytes
 kv/__pycache__/isapi.cpython-39.pyc           | Bin 2223 -> 2202 bytes
 kv/__pycache__/schemas.cpython-39.pyc         | Bin 26647 -> 26807 bytes
 kv/crud.py                                    |  20 +++++++++---------
 kv/isapi.py                                   |   8 +++----
 kv/routers/__pycache__/address.cpython-39.pyc | Bin 2490 -> 2526 bytes
 kv/routers/__pycache__/filter.cpython-39.pyc  | Bin 0 -> 1139 bytes
 .../personalaccount.cpython-39.pyc            | Bin 2146 -> 2193 bytes
 .../__pycache__/recalculation.cpython-39.pyc  | Bin 0 -> 1417 bytes
 kv/routers/address.py                         |   6 +++---
 kv/routers/{reportfilter.py => filter.py}     |   8 +++----
 kv/routers/personalaccount.py                 |   3 ++-
 .../{withdrawing.py => recalculation.py}      |   8 +++----
 kv/schemas.py                                 |  20 ++++++++++++------
 14 files changed, 40 insertions(+), 33 deletions(-)
 create mode 100644 kv/routers/__pycache__/filter.cpython-39.pyc
 create mode 100644 kv/routers/__pycache__/recalculation.cpython-39.pyc
 rename kv/routers/{reportfilter.py => filter.py} (68%)
 rename kv/routers/{withdrawing.py => recalculation.py} (77%)

diff --git a/kv/__pycache__/crud.cpython-39.pyc b/kv/__pycache__/crud.cpython-39.pyc
index 77a007be703a78f79a4c12a29758058951958978..3cf0eee7d62e6044190077af6ca570a06777ab9b 100644
GIT binary patch
delta 3747
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
Ta|kaX{2bvt^>o5xy}thg>SwAp

delta 3512
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
To<n#E;T42A=IMk(`y2lcoHv8{

diff --git a/kv/__pycache__/isapi.cpython-39.pyc b/kv/__pycache__/isapi.cpython-39.pyc
index ca87bd2fc481d7289b43b5d932b69e4c4dde1269..143b8d76564303f187b3622605ec066ac741b96b 100644
GIT binary patch
delta 134
zcmZ24I7^T>k(ZZ?0SE+M^d_Zm<P~L7U`xx)DM>B5#ZgjPl$T!yWbqcICMV`3m*ymv
zWaj5>c4OjX5#rEKOi3w9EiR7YbA&J^XR)p3V%LZ0j^drH&8{WKr;nmFN+bxyq<nS<
FMgUZdERO&H

delta 155
zcmbOwxL%Mqk(ZZ?0SIo2Hzzf0<P~L7;VDWj$S*2M%giZBExN@~Qd*RkUj}4xmuHq_
zq!cBVXXd4Ec4FdWk>=G;Oi3w9EiTs0%uCCU5^{v_Jb|3av23fwc=eHuiV_Y28$4Nv
UT}z5bAIY>Rp>QOlqu3o70nq9-U;qFB

diff --git a/kv/__pycache__/schemas.cpython-39.pyc b/kv/__pycache__/schemas.cpython-39.pyc
index 65d37a5c612b74095ae5b5d470a3c7bcac4dee51..d3287bade53eac27b65f6b15b5ddc75f3ba635b6 100644
GIT binary patch
delta 5237
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

delta 5309
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
JqpZdE{SO(J!FK=v

diff --git a/kv/crud.py b/kv/crud.py
index b8aff43..c2df0da 100644
--- a/kv/crud.py
+++ b/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):
diff --git a/kv/isapi.py b/kv/isapi.py
index 95dd355..cfd5fef 100644
--- a/kv/isapi.py
+++ b/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"])
diff --git a/kv/routers/__pycache__/address.cpython-39.pyc b/kv/routers/__pycache__/address.cpython-39.pyc
index 5cdc9cb83849edec6be6224899619640ba5094c4..ca940f0250fb9d692a0b36bb5203ca772b756cad 100644
GIT binary patch
delta 92
zcmdlbd{3A+k(ZZ?0SJC;_9t!K$m_zYprD_gS`wd_l2VjfTpXXDl$DxX5}%S<l9-uO
XtY4j(GWkEVv$Pa$HJewn^0NQ{pXDIS

delta 52
zcmca7yi1rjk(ZZ?0SMfMnv&`_^185c@#z<(mK0^CmZeV4Wp(G|fblk;XXR%B0Bq_H
A9smFU

diff --git a/kv/routers/__pycache__/filter.cpython-39.pyc b/kv/routers/__pycache__/filter.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..5f9f9d695ff334f287d96150e20ec80921f6f363
GIT binary patch
literal 1139
zcmb_b!EVz)5Z!g`IC1R6X-f(cR}PjSy(5G`Af!rFg$UwcMT(s4q&T%>ch?C@)LXgs
z4>-UvzX5--CnO{!et{FS>!d`K9*|gT#xvu$J8x&kk>@!C*S+tT!_O5$zA0yWS?D}L
z5noX;!e~NL8d6%?Mp_9g+BOn1wL(kVm86>5p{;E*sipO>o;snUeJg3CZs<}1^$QYu
z;7yvW3NFw|>keV|r2!6D7j#T9;)Bg<9}HG!&U=i7ZH;bd^v*T(?i%efPowuVx_JZo
z)*9VnzD9Q#?UA7U18+%=11hU0Pz=}*ExQLo#Mv}3Wc}&O!&lj?050w4ki(P-1eiy$
zD3<L5wPPG7_;pY$a!{X|97LW?1q{-RL9#NW&EaeYqL2m~jtrG;y_9XDd_fUSR0WyP
zkH$GYC!dTSS<&O5BFzz>G3mX~S>D9(t_Owm|4htlxP3)<3tvC)KYQ5Ec{YJjA^HON
zJRZS=D9`(+^FG&i5&e>NH(zj-*hLYVnxXxrzkRg?FZ(aVc>|9NDqNk)Jyf!_#aErC
z>1wj2@)fd;O38+ZvX}b@0&C16&-hiT{{tU&=(=$?@sXXsXYOoK+(kRsm(J<DD@Jc2
zjfAwX3=FE?=`zR$dMqlUVT27)m6lC$mPCo#wdiI%<@hTSX^$gOM0w2BTyXU#$|_D)
zJU!u6?UenKW}e|d?UhsU8b_}OJdTohiF4Zg9X*`Jg>L8udW6Nl4pmVNRVCld8qS%H
msXK19N=+D7{gSmuIN`Gd9#izhZB#BTA0OXUYlq%7OZf$ZDjaeE

literal 0
HcmV?d00001

diff --git a/kv/routers/__pycache__/personalaccount.cpython-39.pyc b/kv/routers/__pycache__/personalaccount.cpython-39.pyc
index cabe2103ec8a1d8303f655b925fcb23ad0769e5e..a72624847dcbb60800cba3841bf1ce16eea26919 100644
GIT binary patch
delta 318
zcmaDPFj0^<k(ZZ?0SF{j`;*c(@;b4Yu>g4>d>Dv}<$y#9Ll$EVLkeRrV=Yq&Qx@|A
zmKw$yriDzk%r(rx44O=Snv6w)lcQPXLp<{`ONzLGT8emp#4V2W)ROp=)T9zkmLfrr
zC?`miB`H6pvWO4F=Z6ylAeK0g09jbf1|%4mco_K@i^L~yWm(EC3FK?C7Ks9>$(gK1
zjFOY*u&PN)1G%a|TnzRB6AL5De>Ntd9_h)qStl@xPR?OdV3e8M%O<NP3shwQQVH@H
z14s=>L{t72S9Y0RadJj#Zenqf=;RA*pBcp`A7R%L0~vjbr69k!qzL4qA~6slJ6VLo
Not;gHQHD#15db+AJKX>P

delta 238
zcmbOz_(*^^k(ZZ?0SE$wnv#?^@;b3h=3zE9<Va5~iBCyQDk%~M$`$d$2>}pG6iCPc
zaWM;!U|`~7EE1jkgJmhB*yL6g`N=z36@jeVtZI^yKv@-#I<O5)EQ~Dw*+8l#CrhzS
zU=*LcnoWUGYVsL2Sv6^(Dt(YjxQQSUP5E0~*=2gg$r-7+iN!_Yllj>{Gm1`T=Fn0D
y8GVbTAiubzNCw0d4oEF3&d*ECaZFCmFU>3Q%*!k(lAi3$;m*z~#3;ih#0UU<l`+-;

diff --git a/kv/routers/__pycache__/recalculation.cpython-39.pyc b/kv/routers/__pycache__/recalculation.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..bdaa4fa8b0d907be939a6705175e9e20bd10db70
GIT binary patch
literal 1417
zcmbtU%TC)s6rHi1I1lHY@DftjSriuRs;X*5yFjW?MNlhQks`-)0S7xaGfof@UC}Ln
zzyg+hM?a#{Y%5jjFLc#A6ACV5$3!!^cjnC8*SYp8l@h`6;n(HxhegOwrDR7AmA5zr
zp@cBPXh<UJQaYE7$aGCD8=)2D+?<xpFdx~jtz|1LL`An4mE4lnb747hT!#`UUJ$ne
zl~I-D!2vp|trBKm8c>4V1wEi(v%(c+MOONTx?4wNgOxS1`3OlzEkrw42CJ~DMz=M(
zrqP`z=%qV!oi#Li87kKe*1Vzjw&`f)4%1?7jag;1N4lNgDmS}bD)Wbs4%iSSy9Yu9
z@wjWq;=4~fd+{U%F75Y_z?caHSRVtC&XzXSjng1KV%$3o#)pISECF?1<sg!HEMO4D
z3_{#7*wDvx-wy*N6X$oFqK->SM)cY^CpYvfJx9lG>2BAQmd__lw)epILVpr^DSGue
zfYTnNva{H_!3+4Dw3wHAw}e+w`LnhCs-N(91b!;|0{ArW;iZ=({o`q$>*z$EXKidG
zXWYS?Y6>I~A%;Ws&TM&8VALFvn5Tn-AjH%RLQKc4A#DyP6A-EPz*iyu8%kEs=x~)w
zci~bD*ys^n#I3H$6>)hP7rC_92v@1nG0m5nQk%GRa0+eF(E6<Nv^WqY&vUB%B;)wx
zLYG?T&RWJLrOz6h!ka>tFwb+R{`k3tuC&qgi;OEu@2<(x@pMD@M-X{J+V=u(D#qzT
z$TDh*MMDoMqjD>&;v_^O;;pldm`7YOSlS1kNWCQBs=!=*U1S~`0sDdHwK8XzG%<T}
z?aM>E?5l3+0S~+|m;u-Hl2#In|6$ul;2%H0WIOYOKHC`wsV=%)%^dAxZ8Eo7kB;;u
zRTf#xob<3jTxBT3F-2Fdh$aiKv7IL&yiuJj)^Ty@{8z{Se6C4X3Qf9hsac?Z0W&^f
AKL7v#

literal 0
HcmV?d00001

diff --git a/kv/routers/address.py b/kv/routers/address.py
index 33bcdf4..4caaaf7 100644
--- a/kv/routers/address.py
+++ b/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
 
 
diff --git a/kv/routers/reportfilter.py b/kv/routers/filter.py
similarity index 68%
rename from kv/routers/reportfilter.py
rename to kv/routers/filter.py
index 6e8855a..fdd9c0f 100644
--- a/kv/routers/reportfilter.py
+++ b/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)
diff --git a/kv/routers/personalaccount.py b/kv/routers/personalaccount.py
index 41f8441..7cff2a0 100644
--- a/kv/routers/personalaccount.py
+++ b/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
 
 
diff --git a/kv/routers/withdrawing.py b/kv/routers/recalculation.py
similarity index 77%
rename from kv/routers/withdrawing.py
rename to kv/routers/recalculation.py
index dfafdac..66b358d 100644
--- a/kv/routers/withdrawing.py
+++ b/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)
diff --git a/kv/schemas.py b/kv/schemas.py
index f0826d4..1b9b42e 100644
--- a/kv/schemas.py
+++ b/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