Merge pull request 'Исправил null в логах' (#17) from future/AURORA-1012 into test

Reviewed-on: #17
Reviewed-by: tsygankoviva <tsygankov.itis@gmail.com>
This commit is contained in:
Raykov-MS 2026-05-25 17:53:37 +03:00
commit 47bb32da56
4 changed files with 21 additions and 8 deletions

View File

@ -84,7 +84,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,
@ -93,7 +95,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,
@ -106,7 +110,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,

View File

@ -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"])

View File

@ -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

View File

@ -1,6 +1,6 @@
#
# закоментированы для избежания переполнения бд
#
# # закоментированы для избежания переполнения бд
# from datetime import datetime, timedelta