bugfix dbcrud

backend/app/db/cruddb/__init__.py

@@ -0,0 +1,2 @@
+from app.db.cruddb.dbuser import dbuser
+from app.db.cruddb.dbdomain import dbdomain

backend/app/db/cruddb/crudbase.py

@@ -3,10 +3,9 @@ from sqlalchemy.orm import Session
 from sqlalchemy.orm.query import Query
 from typing import Type, List, Optional
 from app.core.common import  ApiReturnPage
-from fastapi_pagination.ext.sqlalchemy import paginate
 from sqlalchemy import and_ ,or_
 from pydantic import BaseModel
-from .. import models, schemas
+from app.db import models
 
 class crudbase:
     def __init__(self, model: Type[models.Base]):
@@ -62,8 +61,8 @@ class crudbase:
                     query = query.order_by(asc(column))
         return query
     
-    def get_all(self, db: Session) -> ApiReturnPage[models.Base]:
-        return paginate(db.query(self.model))
+    def get_all(self, db: Session) -> Query:
+        return db.query(self.model)
        
 
     def get(self, db: Session, item_id: int) -> Optional[models.Base]:

backend/app/db/cruddb/dbdomain.py

@@ -36,7 +36,7 @@ class dbdomain(crudbase):
         super().__init__(model=models.Domain)
     
     def get_domains(self,db: Session)-> ApiReturnPage[models.Base]:
-        return super().get_all(db)
+        return paginate(super().get_all(db))
     
     def get_domains_by_owner(self,db: Session,ownerid:int)-> ApiReturnPage[models.Base]:
         return paginate( super().get_by_conditions(db,{"ownerid":ownerid}))

backend/app/db/cruddb/dbuser.py

@@ -35,7 +35,7 @@ class dbuser(crudbase):
         return super().get_by_conditions(db,{"email":email}).first()
 
     def get_users(self,db: Session) -> ApiReturnPage[models.Base]:
-        return paginate(super().get_all())
+        return paginate(super().get_all(db))
 
     def get_users_not_admin(self,db: Session) -> ApiReturnPage[models.Base]:
         return paginate(super().get_by_conditions(db,{"is_superuser":False}))
@@ -79,7 +79,7 @@ class dbuser(crudbase):
         return db_user
     
     def get_permissions(self,db: Session,user_id: int) -> t.List[schemas.Permission]:
-        return dbpermission.get_by_conditions(db).all()
+        return dbpermission.get_all(db).all()
 
     def get_user_permissions(self,db: Session,user_id: int) -> t.List[schemas.Permission]:
         permissions =[]