From 8245c32224d22fd70d04f16a2e203a67cf4ee81e Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Thu, 14 Jul 2022 16:20:43 +0900
Subject: [PATCH] last

---
 kv/crud.py           |  6 ++--
 kv/routers/report.py |  6 ++--
 kv/schemas.py        | 68 +++++++++++++++++++++++---------------------
 3 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/kv/crud.py b/kv/crud.py
index 93ece82..a6195de 100644
--- a/kv/crud.py
+++ b/kv/crud.py
@@ -226,8 +226,8 @@ class ReportViewSet:
 
     """post"""
 
-    def repayment(db: Session, data: schemas.RentRegisterNoticeInit):
-        return exec_procedure(db, 'uspGetRentRegisterNotices', **data)
+    def get_rent_register_notices(db: Session, data: schemas.RentRegisterNoticeInit):
+        return exec_procedure(db, 'uspGetRentRegisterNotices', data.dict())
 
 
 """AccrualViewSet"""
@@ -388,7 +388,7 @@ class ReferenceViewSet:
         return db.query(tb).with_entities(tb.c["ID"], tb.c["Name"]).all()
 
     def get_address_types(db: Session):
-        tb = get_table('RefAddressType')
+        tb = get_table('RefAddressType', 'General')
         return db.query(tb).with_entities(tb.c["ID"], tb.c["Name"]).all()
 
     """post"""
diff --git a/kv/routers/report.py b/kv/routers/report.py
index 1c85b5a..132d9e7 100644
--- a/kv/routers/report.py
+++ b/kv/routers/report.py
@@ -9,7 +9,7 @@ router = APIRouter()
 """post"""
 
 
-@router.post("/repayment", response_model=List[schemas.RentRegisterNotices])
-async def repayment(request: schemas.RentRegisterNoticeInit, db: Session = Depends(get_db)):
-    data = crud.ReportViewSet.get_details(db, request)
+@router.post("/get_rent_register_notices", response_model=List[schemas.RentRegisterNotices])
+async def get_rent_register_notices(request: schemas.RentRegisterNoticeInit, db: Session = Depends(get_db)):
+    data = crud.ReportViewSet.get_rent_register_notices(db, request)
     return data
diff --git a/kv/schemas.py b/kv/schemas.py
index 3604944..e77a9bc 100644
--- a/kv/schemas.py
+++ b/kv/schemas.py
@@ -62,8 +62,8 @@ class RentRegisterNoticeInit(BaseModel):
     IDUser: int = 1
     IDCashbox: int = 1
     IsRepayment: bool
-    DateBegin: date
-    DateEnd: date
+    DateBegin: str
+    DateEnd: str
 
 
 class ObjectMeteringDeviceAddressInit(BaseModel):
@@ -144,7 +144,9 @@ class RecalculationSave(BaseModel):
     IDUser: int
     IDService: int
     IDType: int
-    Percent: float
+    Percent: float = None
+    IDOldChange: str = None
+    IDNewChange: str = None
     DateBegin: str
     DateEnd: str
 
@@ -326,34 +328,34 @@ class AddressDetailInfoSerializer(BaseModel):
 class AddressDetailsSerializer(BaseModel):
     ID: int
     IDObject: str
-    IDType: int
-    IDImprovementDegree: int
+    IDType: int = None
+    IDImprovementDegree: int = None
     CadastralNumber: Optional[str] = None
     Number: Optional[str] = None
-    Privatization: bool
-    Area: float
-    AreaOwned: float
-    AreaAboveNormal: float
-    AreaAdditional: float
-    RoomsNumber: int
-    PeopleNumber: int
-    PeopleWithoutReg: int
-    PeopleAway: int
-    PeopleDependents: int
-    Glazing: bool
-    IDSystemHotWater: int
-    IDSystemHotWaterPeriodType: int
-    IDSystemColdWater: int
-    IDSystemColdWaterPeriodType: int
-    IDSystemSewerage: int
-    IDSystemSeweragePeriodType: int
-    IDStandartVolume: int
-    MeteringDeviceHeating: bool
-    MeteringDeviceHotWater: bool
-    MeteringDeviceColdWater: bool
-    ActAvailabilityMeteringDeviceInstallIDType: int
-    ActAvailabilityMeteringDeviceInstallHeating: bool
-    ActAvailabilityMeteringDeviceInstallWater: bool
+    Privatization: bool = None
+    Area: float = None
+    AreaOwned: float = None
+    AreaAboveNormal: float = None
+    AreaAdditional: float = None
+    RoomsNumber: int = None
+    PeopleNumber: int = None
+    PeopleWithoutReg: int = None
+    PeopleAway: int = None
+    PeopleDependents: int = None
+    Glazing: bool = None
+    IDSystemHotWater: int = None
+    IDSystemHotWaterPeriodType: int = None
+    IDSystemColdWater: int = None
+    IDSystemColdWaterPeriodType: int = None
+    IDSystemSewerage: int = None
+    IDSystemSeweragePeriodType: int = None
+    IDStandartVolume: int = None
+    MeteringDeviceHeating: bool = None
+    MeteringDeviceHotWater: bool = None
+    MeteringDeviceColdWater: bool = None
+    ActAvailabilityMeteringDeviceInstallIDType: int = None
+    ActAvailabilityMeteringDeviceInstallHeating: bool = None
+    ActAvailabilityMeteringDeviceInstallWater: bool = None
 
 
 class EditAdressInit(AddressDetailsSerializer):
@@ -521,7 +523,7 @@ class FilterTypeSerializer(BaseModel):
 
 
 class FilterListSerializer(BaseModel):
-    ID: int
+    ID: str
     Name: Optional[str] = None
     IsChecked: bool
 
@@ -536,9 +538,9 @@ class RentRegisterNotices(BaseModel):
     Number: Optional[str] = None
     Address: Optional[str] = None
     AccountFullName: Optional[str] = None
-    Amount: float
-    AmountFine: float
-    AmountTotal: float
+    Amount: float = None
+    AmountFine: float = None
+    AmountTotal: float = None
 
 
 class PersonalAccountDebtSerilizer(BaseModel):