fix

Author: rifcrat

modal_backend/routes/groups.py

@@ -2,6 +2,7 @@
 from fastapi import APIRouter, Depends
 from fastapi_sqlalchemy import db
 
+from modal_backend.models.db import Group
 from modal_backend.schemas.models import GroupGet, GroupPost
 from modal_backend.settings import Settings, get_settings
 from modal_backend.utils.services import GroupService
@@ -29,5 +30,5 @@ async def get_groups(user=Depends(UnionAuth())) -> list[GroupGet]:
     """
     Получает список всех групп
     """
-    groups = await GroupService.get_groups(db)
+    groups = Group.query(session=db.session).all()
     return [GroupGet.model_validate(group) for group in groups]

modal_backend/routes/services.py

@@ -2,6 +2,7 @@
 from fastapi import APIRouter, Depends
 from fastapi_sqlalchemy import db
 
+from modal_backend.models.db import Service
 from modal_backend.schemas.models import ServiceGet, ServicePost
 from modal_backend.settings import Settings, get_settings
 from modal_backend.utils.services import ServiceManager
@@ -18,7 +19,7 @@ async def get_services(
     """
     Получить список всех сервисов.
     """
-    services = await ServiceManager.get_services(db)
+    services = Service.query(session=db.session).all()
     return [ServiceGet.model_validate(service) for service in services]
 
 

modal_backend/utils/services.py

@@ -53,10 +53,6 @@ class ServiceManager:
     Сервис для работы с логикой Service и базой данных
     """
 
-    @classmethod
-    async def get_services(cls, db: Session):
-        return Service.query(session=db.session).all()
-
     @classmethod
     async def create_service(cls, db: Session, service_id: int, name: str):
         service = Service.query(session=db.session).filter(Service.service_id == service_id).first()
@@ -78,7 +74,3 @@ async def create_group(cls, db: Session, group_id: int, name: str):
             raise AlreadyExists(Group, group_id)
         new_group = Group.create(session=db.session, group_id=group_id, name=name)
         return new_group
-
-    @classmethod
-    async def get_groups(cls, db: Session):
-        return Group.query(session=db.session).all()