Merge pull request #16 from profcomff/get_group_handler

added group.get handler

Author: petrCher

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
@@ -22,3 +23,12 @@ async def create_group(group: GroupPost, user=Depends(UnionAuth(scopes=["modal.g
     """
     new_group = await GroupService.create_group(db, **group.model_dump())
     return GroupGet.model_validate(new_group)
+
+
+@group.get("", response_model=list[GroupGet])
+async def get_groups(user=Depends(UnionAuth())) -> list[GroupGet]:
+    """
+    Получает список всех групп
+    """
+    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()
@@ -67,7 +63,7 @@ async def create_service(cls, db: Session, service_id: int, name: str):
 
 
 class GroupService:
-    """ "
+    """
     Сервис для работы с логикой Group и базой данных
     """