api/src/api/v1/websocket.py

@@ -14,8 +14,6 @@ from sqlalchemy.exc import IntegrityError
 from fastapi import APIRouter, WebSocket, WebSocketDisconnect, status
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from src.services.rf_project_report_service import RfProjectReportService
-from src.services.rf_project_report_line_service import RfProjectReportLineService
 from src.repository.user_repository import UserRepository
 from src.services.budget_line_service import BudgetLineService
 from src.api.v1.deps import get_user_by_token
@@ -492,8 +490,7 @@ class FormEventProcess:
 class ProjectEventProcess:
     def __init__(self, db: AsyncSession):
         self.project_service: ProjectService = ProjectService(db)
-        self.prl_service: RfProjectReportLineService = RfProjectReportLineService(db)
-        self.pr_service: RfProjectReportService = RfProjectReportService(db)
+        self.bf_service: BudgetFormService = BudgetFormService(db)
         self.user_service: UserService = UserService(db)
 
     async def process(
@@ -576,16 +573,11 @@ class ProjectEventProcess:
                 expense_item_id: Optional[int] = None
             }
         """
-        project_report = await self.pr_service.get(
-            year=year,
-            report_type=report_type,
-            project_id=project_id,
-        )
-        if not project_report:
+        project = await self.project_service.get(project_id=project_id, user=user)
+        if not project:
             return None
-        
-        ids = await self.prl_service.get_ids(project_report_id=project_report.id)
-        result = await self.project_service.add_form3_line(
+
+        return await self.project_service.add_form3_line(
             project_id=project_id,
             year=year,
             report_type=report_type,
@@ -593,16 +585,6 @@ class ProjectEventProcess:
             user=user,
         )
 
-        final_result = {
-            "data": result,
-            "new_line_id": None,
-        }
-        for el in result:
-            if el[3]["line_id"] and el[3]["line_id"] not in ids:
-                final_result["new_line_id"] = el[3]["line_id"]
-                return final_result
-        return final_result
-
     async def __del_row(
             self, 
             event_data: dict, 
@@ -613,7 +595,7 @@ class ProjectEventProcess:
     ) -> list[tuple]:
         """
             data = {
-                "row_id": int,
+                "line_id": int,
             }
         """
         project = await self.project_service.get(project_id=project_id, user=user)
@@ -624,7 +606,7 @@ class ProjectEventProcess:
             project_id=project_id,
             year=year,
             report_type=report_type,
-            line_id=event_data["row_id"],
+            line_id=event_data["line_id"],
             user=user,
         )
 
@@ -794,7 +776,6 @@ async def process_websocket(
                 async with get_db_session(user_id=user_id) as db:
                     processor = processor_cls(db)
                     t0 = time.perf_counter()
-                    data_old = data.copy()
                     data["result"] = await processor.process(
                         event_data=data, 
                         user_id=user_id,
@@ -808,7 +789,7 @@ async def process_websocket(
                         "time_ms": f"{db_ms:.2f}", 
                         "event": data.get("event"),
                     }
-                    extra.update(data_old)
+                    extra.update(data)
                     logger.info(
                         f"db_time: {extra}", 
                         extra=extra,

api/src/repository/budget_line_repository.py

@@ -12,7 +12,7 @@ class BudgetLineRepository:
         query = select(BudgetLine).where(BudgetLine.id == budget_line_id).limit(1)
         return (await self.db.execute(query)).scalar_one_or_none()
 
-    async def get_list(self, budget_line_ids: list[int]) -> list[BudgetLine]:
+    async def get_list(self, budget_line_ids: list[int]) -> BudgetLine | None:
         query = select(BudgetLine).where(BudgetLine.id.in_(budget_line_ids))
         return (await self.db.execute(query)).scalars().all()
 

api/src/repository/rf_project_report_line_repository.py

@@ -1,39 +0,0 @@
-from sqlalchemy import select
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from src.db.models.rf_project_report_line import RfProjectReportLine
-
-
-
-class RfProjectReportLineRepository:
-    def __init__(self, db: AsyncSession):
-        self.db = db
-
-    async def get(self, line_id: int) -> RfProjectReportLine | None:
-        query = select(
-            RfProjectReportLine
-        ).where(
-            RfProjectReportLine.id == line_id
-        ).limit(1)
-        return (await self.db.execute(query)).scalar_one_or_none()
-
-    async def get_list(self, line_ids: list[int]) -> list[RfProjectReportLine]:
-        query = select(
-            RfProjectReportLine
-        ).where(
-            RfProjectReportLine.id.in_(line_ids)
-        )
-        return (await self.db.execute(query)).scalars().all()
-
-    async def get_ids(
-            self,
-            project_report_id: int,
-    ) -> list[int]:
-        
-        query = select(
-            RfProjectReportLine.id
-        ).where(
-            RfProjectReportLine.rf_project_report_id == project_report_id
-        )
-        return (await self.db.execute(query)).scalars().all()
-        

api/src/repository/rf_project_report_repository.py

@@ -1,33 +0,0 @@
-from sqlalchemy import select
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from src.db.models.rf_project_report import RfProjectReport
-
-
-
-class RfProjectReportRepository:
-    def __init__(self, db: AsyncSession):
-        self.db = db
-
-    async def get(
-            self, 
-            report_id: int | None = None,
-            year: int | None = None,
-            report_type: str | None = None,
-            project_id: int | None = None,
-    ) -> RfProjectReport | None:
-        assert report_id is not None or all((el is not None for el in (year, report_type, project_id)))
-        query = select(
-            RfProjectReport
-        )
-        if report_id is not None:
-            query = query.where(RfProjectReport.id == report_id)
-        else:
-            query = query.where(
-                RfProjectReport.year == year,
-                RfProjectReport.report_type == report_type,
-                RfProjectReport.project_id == project_id
-            )
-        
-        query = query.limit(1)
-        return (await self.db.execute(query)).scalar_one_or_none()

api/src/services/rf_project_report_line_service.py

@@ -1,34 +0,0 @@
-
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from src.db.models.rf_project_report_line import RfProjectReportLine
-from src.repository.rf_project_report_line_repository import RfProjectReportLineRepository
-from src.db.models.app_user import AppUser
-
-
-
-
-class RfProjectReportLineService:
-    def __init__(self, db: AsyncSession):
-        self.db = db
-        self.prl_repo = RfProjectReportLineRepository(db)
-
-    async def get(
-            self, 
-            user: AppUser, 
-            line_id: int,
-    ) -> RfProjectReportLine | None:
-        return await self.prl_repo.get(line_id=line_id)
-
-    async def get_list(
-            self, 
-            user: AppUser, 
-            line_ids: list[int],
-    ) -> list[RfProjectReportLine]:
-        return await self.prl_repo.get_list(line_ids=line_ids)
-
-    async def get_ids(
-            self,
-            project_report_id: int,
-    ) -> list[int]:
-        return await self.prl_repo.get_ids(project_report_id=project_report_id)

api/src/services/rf_project_report_service.py

@@ -1,31 +0,0 @@
-
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from src.db.models.rf_project_report import RfProjectReport
-from src.repository.rf_project_report_repository import RfProjectReportRepository
-from src.db.models.rf_project_report_line import RfProjectReportLine
-from src.repository.rf_project_report_line_repository import RfProjectReportLineRepository
-from src.db.models.app_user import AppUser
-
-
-
-
-class RfProjectReportService:
-    def __init__(self, db: AsyncSession):
-        self.db = db
-        self.pr_repo = RfProjectReportRepository(db)
-
-    async def get(
-            self, 
-            user: AppUser| None = None, 
-            report_id: int | None = None,
-            year: int | None = None,
-            report_type: str | None = None,
-            project_id: int | None = None,
-    ) -> RfProjectReport | None:
-        return await self.pr_repo.get(
-            report_id=report_id,
-            year=year,
-            report_type=report_type,
-            project_id=project_id,
-        )