Изменен ИС ЖКХ РС

isjkhrs/routers/general.py

@@ -27,17 +27,4 @@ async def get_address(city_id: int, db= Depends(general.get_db)):
 
 @router.get('/getRegions')
 async def get_region(db = Depends(general.get_db)):
-    return db.execute("SELECT id, name FROM General.dbo.vRegions").fetchall()
-
-@router.post('/get_filter_types', response_model=List[schemas.FilterTypeSerializer])
-async def get_filter_types(request: schemas.FilterTypeInit, db: Session = Depends(general.get_db)):
-    return db.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(general.get_db)):
-    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.FilterSetInit, db: Session = Depends(general.get_db)):
-    return crud.FilterViewSet.set_filter_list(db, request)
+    return db.execute("SELECT id, name FROM General.dbo.vRegions").fetchall()

isjkhrs/routers/isjkhrsto.py

@@ -0,0 +1,22 @@
+from fastapi import APIRouter, Depends
+from kv.database import get_db
+import isjkhrs.crud as crud
+from sqlalchemy.orm import Session
+from typing import List
+import isjkhrs.schemas as schemas
+
+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.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.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.FilterSetInit, db: Session = Depends(get_db)):
+    return crud.FilterViewSet.set_filter_list(db, request)