Исправил null в логах

This commit is contained in:
Raykov-MS 2026-05-22 18:02:06 +03:00
parent d8e260cc5b
commit d14d39cd27
4 changed files with 21 additions and 8 deletions

View File

@ -79,7 +79,9 @@ async def get_current_active_user_with_set_db(
return current_user 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: if current_user.role_id != UserRoleEnum.ADMIN:
raise HTTPException( raise HTTPException(
status_code=status.HTTP_403_FORBIDDEN, 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 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 [ if current_user.role_id not in [
UserRoleEnum.ADMIN, UserRoleEnum.ADMIN,
UserRoleEnum.EXECUTOR_DFIP, UserRoleEnum.EXECUTOR_DFIP,
@ -101,7 +105,9 @@ def require_executor(current_user: AppUser = Depends(get_current_active_user)) -
return current_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]: if current_user.role_id not in [UserRoleEnum.ADMIN, UserRoleEnum.EXECUTOR_DFIP]:
raise HTTPException( raise HTTPException(
status_code=status.HTTP_403_FORBIDDEN, 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.budget_form_service import BudgetFormService
from src.services.form_phase_service import FormPhaseService 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 from src.db.session import get_db
router = APIRouter(prefix="/stages", tags=["stages"]) router = APIRouter(prefix="/stages", tags=["stages"])

View File

@ -1,7 +1,11 @@
from fastapi import APIRouter, Depends, HTTPException, status from fastapi import APIRouter, Depends, HTTPException, status
from sqlalchemy.ext.asyncio import AsyncSession 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.session import get_db
from src.db.models.app_user import AppUser from src.db.models.app_user import AppUser
from src.domain.schemas import User as UserSchema from src.domain.schemas import User as UserSchema

View File

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