From d14d39cd275e7e4c1f0b57dae3729084c626ae7b Mon Sep 17 00:00:00 2001 From: Raykov-MS Date: Fri, 22 May 2026 18:02:06 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20null=20=D0=B2=20=D0=BB=D0=BE=D0=B3=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/src/api/v1/deps.py | 12 +++++++++--- api/src/api/v1/form_phases.py | 5 ++++- api/src/api/v1/users.py | 6 +++++- .../integration/test_audit_events_integration.py | 6 +++--- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/api/src/api/v1/deps.py b/api/src/api/v1/deps.py index 79e62d8..4acfa95 100644 --- a/api/src/api/v1/deps.py +++ b/api/src/api/v1/deps.py @@ -79,7 +79,9 @@ async def get_current_active_user_with_set_db( return current_user -def require_admin(current_user: AppUser = Depends(get_current_active_user)) -> AppUser: +def require_admin( + current_user: AppUser = Depends(get_current_active_user_with_set_db), +) -> AppUser: if current_user.role_id != UserRoleEnum.ADMIN: raise HTTPException( status_code=status.HTTP_403_FORBIDDEN, @@ -88,7 +90,9 @@ def require_admin(current_user: AppUser = Depends(get_current_active_user)) -> A return current_user -def require_executor(current_user: AppUser = Depends(get_current_active_user)) -> AppUser: +def require_executor( + current_user: AppUser = Depends(get_current_active_user_with_set_db), +) -> AppUser: if current_user.role_id not in [ UserRoleEnum.ADMIN, UserRoleEnum.EXECUTOR_DFIP, @@ -101,7 +105,9 @@ def require_executor(current_user: AppUser = Depends(get_current_active_user)) - return current_user -def require_executor_dfip(current_user: AppUser = Depends(get_current_active_user)) -> AppUser: +def require_executor_dfip( + current_user: AppUser = Depends(get_current_active_user_with_set_db), +) -> AppUser: if current_user.role_id not in [UserRoleEnum.ADMIN, UserRoleEnum.EXECUTOR_DFIP]: raise HTTPException( status_code=status.HTTP_403_FORBIDDEN, diff --git a/api/src/api/v1/form_phases.py b/api/src/api/v1/form_phases.py index bb71a37..6ea8ade 100644 --- a/api/src/api/v1/form_phases.py +++ b/api/src/api/v1/form_phases.py @@ -11,7 +11,10 @@ from src.domain.schemas import ( ) from src.services.budget_form_service import BudgetFormService from src.services.form_phase_service import FormPhaseService -from src.api.v1.deps import get_current_active_user_with_set_db, require_admin +from src.api.v1.deps import ( + get_current_active_user_with_set_db, + require_admin, +) from src.db.session import get_db router = APIRouter(prefix="/stages", tags=["stages"]) diff --git a/api/src/api/v1/users.py b/api/src/api/v1/users.py index 0570173..acc1a35 100644 --- a/api/src/api/v1/users.py +++ b/api/src/api/v1/users.py @@ -1,7 +1,11 @@ from fastapi import APIRouter, Depends, HTTPException, status from sqlalchemy.ext.asyncio import AsyncSession -from src.api.v1.deps import get_current_active_user, require_admin, require_executor_dfip +from src.api.v1.deps import ( + get_current_active_user, + require_admin, + require_executor_dfip, +) from src.db.session import get_db from src.db.models.app_user import AppUser from src.domain.schemas import User as UserSchema diff --git a/api/tests/integration/test_audit_events_integration.py b/api/tests/integration/test_audit_events_integration.py index e806cd4..3b9bfb2 100644 --- a/api/tests/integration/test_audit_events_integration.py +++ b/api/tests/integration/test_audit_events_integration.py @@ -1,6 +1,6 @@ -# -# закоментированы для избежания переполнения бд -# + +# # закоментированы для избежания переполнения бд + # from datetime import datetime, timedelta