sonarqube fixes

Author: Max Azatian

backend/app/api/dependencies.py

@@ -7,7 +7,7 @@
 
 
 @inject
-async def CurrentUser(
+async def current_user(
     request: Request,
     auth_service: FromDishka[AuthService]
 ) -> UserResponse:
@@ -16,7 +16,7 @@ async def CurrentUser(
 
 
 @inject
-async def AdminUser(
+async def admin_user(
     request: Request,
     auth_service: FromDishka[AuthService]
 ) -> UserResponse:

backend/app/api/routes/admin/events.py

@@ -7,7 +7,7 @@
 from fastapi.encoders import jsonable_encoder
 from fastapi.responses import StreamingResponse
 
-from app.api.dependencies import AdminUser
+from app.api.dependencies import admin_user
 from app.core.correlation import CorrelationContext
 from app.domain.enums.events import EventType
 from app.infrastructure.mappers import (
@@ -36,7 +36,7 @@
     prefix="/admin/events",
     tags=["admin-events"],
     route_class=DishkaRoute,
-    dependencies=[Depends(AdminUser)]
+    dependencies=[Depends(admin_user)]
 )
 
 
@@ -172,7 +172,7 @@ async def get_replay_status(
 @router.delete("/{event_id}")
 async def delete_event(
         event_id: str,
-        admin: Annotated[UserResponse, Depends(AdminUser)],
+        admin: Annotated[UserResponse, Depends(admin_user)],
         service: FromDishka[AdminEventsService]
 ) -> EventDeleteResponse:
     try:

backend/app/api/routes/admin/settings.py

@@ -5,7 +5,7 @@
 from fastapi import APIRouter, Depends, HTTPException
 from pydantic import ValidationError
 
-from app.api.dependencies import AdminUser
+from app.api.dependencies import admin_user
 from app.infrastructure.mappers import SettingsMapper
 from app.schemas_pydantic.admin_settings import SystemSettings
 from app.schemas_pydantic.user import UserResponse
@@ -15,13 +15,13 @@
     prefix="/admin/settings",
     tags=["admin", "settings"],
     route_class=DishkaRoute,
-    dependencies=[Depends(AdminUser)]
+    dependencies=[Depends(admin_user)]
 )
 
 
 @router.get("/", response_model=SystemSettings)
 async def get_system_settings(
-        admin: Annotated[UserResponse, Depends(AdminUser)],
+        admin: Annotated[UserResponse, Depends(admin_user)],
         service: FromDishka[AdminSettingsService],
 ) -> SystemSettings:
     try:
@@ -35,7 +35,7 @@ async def get_system_settings(
 
 @router.put("/", response_model=SystemSettings)
 async def update_system_settings(
-        admin: Annotated[UserResponse, Depends(AdminUser)],
+        admin: Annotated[UserResponse, Depends(admin_user)],
         settings: SystemSettings,
         service: FromDishka[AdminSettingsService],
 ) -> SystemSettings:
@@ -68,7 +68,7 @@ async def update_system_settings(
 
 @router.post("/reset", response_model=SystemSettings)
 async def reset_system_settings(
-        admin: Annotated[UserResponse, Depends(AdminUser)],
+        admin: Annotated[UserResponse, Depends(admin_user)],
         service: FromDishka[AdminSettingsService],
 ) -> SystemSettings:
     try:

backend/app/api/routes/admin/users.py

@@ -4,7 +4,7 @@
 from dishka.integrations.fastapi import DishkaRoute
 from fastapi import APIRouter, Depends, HTTPException, Query
 
-from app.api.dependencies import AdminUser
+from app.api.dependencies import admin_user
 from app.db.repositories.admin.admin_user_repository import AdminUserRepository
 from app.domain.rate_limit import UserRateLimit
 from app.domain.user import (
@@ -28,13 +28,13 @@
     prefix="/admin/users",
     tags=["admin", "users"],
     route_class=DishkaRoute,
-    dependencies=[Depends(AdminUser)]
+    dependencies=[Depends(admin_user)]
 )
 
 
 @router.get("/", response_model=UserListResponse)
 async def list_users(
-        admin: Annotated[UserResponse, Depends(AdminUser)],
+        admin: Annotated[UserResponse, Depends(admin_user)],
         admin_user_service: FromDishka[AdminUserService],
         rate_limit_service: FromDishka[RateLimitService],
         limit: int = Query(default=100, le=1000),
@@ -72,7 +72,7 @@ async def list_users(
 
 @router.post("/", response_model=UserResponse)
 async def create_user(
-        admin: Annotated[UserResponse, Depends(AdminUser)],
+        admin: Annotated[UserResponse, Depends(admin_user)],
         user_data: UserCreate,
         admin_user_service: FromDishka[AdminUserService],
 ) -> UserResponse:
@@ -88,7 +88,7 @@ async def create_user(
 
 @router.get("/{user_id}", response_model=UserResponse)
 async def get_user(
-        admin: Annotated[UserResponse, Depends(AdminUser)],
+        admin: Annotated[UserResponse, Depends(admin_user)],
         user_id: str,
         admin_user_service: FromDishka[AdminUserService],
 ) -> UserResponse:
@@ -102,7 +102,7 @@ async def get_user(
 
 @router.get("/{user_id}/overview", response_model=AdminUserOverview)
 async def get_user_overview(
-        admin: Annotated[UserResponse, Depends(AdminUser)],
+        admin: Annotated[UserResponse, Depends(admin_user)],
         user_id: str,
         admin_user_service: FromDishka[AdminUserService],
 ) -> AdminUserOverview:
@@ -117,7 +117,7 @@ async def get_user_overview(
 
 @router.put("/{user_id}", response_model=UserResponse)
 async def update_user(
-        admin: Annotated[UserResponse, Depends(AdminUser)],
+        admin: Annotated[UserResponse, Depends(admin_user)],
         user_id: str,
         user_update: UserUpdate,
         user_repo: FromDishka[AdminUserRepository],
@@ -149,7 +149,7 @@ async def update_user(
 
 @router.delete("/{user_id}")
 async def delete_user(
-        admin: Annotated[UserResponse, Depends(AdminUser)],
+        admin: Annotated[UserResponse, Depends(admin_user)],
         user_id: str,
         admin_user_service: FromDishka[AdminUserService],
         cascade: bool = Query(default=True, description="Cascade delete user's data"),
@@ -169,7 +169,7 @@ async def delete_user(
 
 @router.post("/{user_id}/reset-password", response_model=MessageResponse)
 async def reset_user_password(
-        admin: Annotated[UserResponse, Depends(AdminUser)],
+        admin: Annotated[UserResponse, Depends(admin_user)],
         admin_user_service: FromDishka[AdminUserService],
         user_id: str,
         password_request: PasswordResetRequest,
@@ -184,7 +184,7 @@ async def reset_user_password(
 
 @router.get("/{user_id}/rate-limits")
 async def get_user_rate_limits(
-        admin: Annotated[UserResponse, Depends(AdminUser)],
+        admin: Annotated[UserResponse, Depends(admin_user)],
         admin_user_service: FromDishka[AdminUserService],
         user_id: str,
 ) -> dict:
@@ -193,7 +193,7 @@ async def get_user_rate_limits(
 
 @router.put("/{user_id}/rate-limits")
 async def update_user_rate_limits(
-        admin: Annotated[UserResponse, Depends(AdminUser)],
+        admin: Annotated[UserResponse, Depends(admin_user)],
         admin_user_service: FromDishka[AdminUserService],
         user_id: str,
         rate_limit_config: UserRateLimit,
@@ -205,7 +205,7 @@ async def update_user_rate_limits(
 
 @router.post("/{user_id}/rate-limits/reset")
 async def reset_user_rate_limits(
-        admin: Annotated[UserResponse, Depends(AdminUser)],
+        admin: Annotated[UserResponse, Depends(admin_user)],
         admin_user_service: FromDishka[AdminUserService],
         user_id: str,
 ) -> MessageResponse:

backend/app/api/routes/dlq.py

@@ -5,7 +5,7 @@
 from dishka.integrations.fastapi import DishkaRoute
 from fastapi import APIRouter, Depends, HTTPException, Query
 
-from app.api.dependencies import CurrentUser
+from app.api.dependencies import current_user
 from app.db.repositories.dlq_repository import DLQRepository
 from app.dlq import RetryPolicy
 from app.dlq.manager import DLQManager
@@ -26,7 +26,7 @@
     prefix="/dlq",
     tags=["Dead Letter Queue"],
     route_class=DishkaRoute,
-    dependencies=[Depends(CurrentUser)]
+    dependencies=[Depends(current_user)]
 )
 
 
@@ -170,7 +170,7 @@ async def discard_dlq_message(
         dlq_manager: FromDishka[DLQManager],
         reason: str = Query(..., description="Reason for discarding")
 ) -> MessageResponse:
-    message_data = await repository.get_message_for_retry(event_id)
+    message_data = await repository.get_message_by_id(event_id)
     if not message_data:
         raise HTTPException(status_code=404, detail="Message not found")
 

backend/app/api/routes/events.py

@@ -6,7 +6,7 @@
 from dishka.integrations.fastapi import DishkaRoute
 from fastapi import APIRouter, Depends, HTTPException, Query, Request
 
-from app.api.dependencies import AdminUser, CurrentUser
+from app.api.dependencies import admin_user, current_user
 from app.core.correlation import CorrelationContext
 from app.core.logging import logger
 from app.core.utils import get_client_ip
@@ -39,7 +39,7 @@
             response_model=EventListResponse)
 async def get_execution_events(
         execution_id: str,
-        current_user: Annotated[UserResponse, Depends(CurrentUser)],
+        current_user: Annotated[UserResponse, Depends(current_user)],
         event_service: FromDishka[EventService],
         include_system_events: bool = Query(
             False,
@@ -70,7 +70,7 @@ async def get_execution_events(
 
 @router.get("/user", response_model=EventListResponse)
 async def get_user_events(
-        current_user: Annotated[UserResponse, Depends(CurrentUser)],
+        current_user: Annotated[UserResponse, Depends(current_user)],
         event_service: FromDishka[EventService],
         event_types: List[str] | None = Query(None),
         start_time: datetime | None = Query(None),
@@ -104,7 +104,7 @@ async def get_user_events(
 
 @router.post("/query", response_model=EventListResponse)
 async def query_events(
-        current_user: Annotated[UserResponse, Depends(CurrentUser)],
+        current_user: Annotated[UserResponse, Depends(current_user)],
         filter_request: EventFilterRequest,
         event_service: FromDishka[EventService],
 ) -> EventListResponse:
@@ -149,7 +149,7 @@ async def query_events(
 @router.get("/correlation/{correlation_id}", response_model=EventListResponse)
 async def get_events_by_correlation(
         correlation_id: str,
-        current_user: Annotated[UserResponse, Depends(CurrentUser)],
+        current_user: Annotated[UserResponse, Depends(current_user)],
         event_service: FromDishka[EventService],
         include_all_users: bool = Query(
             False,
@@ -179,7 +179,7 @@ async def get_events_by_correlation(
 
 @router.get("/current-request", response_model=EventListResponse)
 async def get_current_request_events(
-        current_user: Annotated[UserResponse, Depends(CurrentUser)],
+        current_user: Annotated[UserResponse, Depends(current_user)],
         event_service: FromDishka[EventService],
         limit: int = Query(100, ge=1, le=1000),
 ) -> EventListResponse:
@@ -215,7 +215,7 @@ async def get_current_request_events(
 
 @router.get("/statistics", response_model=EventStatistics)
 async def get_event_statistics(
-        current_user: Annotated[UserResponse, Depends(CurrentUser)],
+        current_user: Annotated[UserResponse, Depends(current_user)],
         event_service: FromDishka[EventService],
         start_time: datetime | None = Query(
             None,
@@ -250,7 +250,7 @@ async def get_event_statistics(
 @router.get("/{event_id}", response_model=EventResponse)
 async def get_event(
         event_id: str,
-        current_user: Annotated[UserResponse, Depends(CurrentUser)],
+        current_user: Annotated[UserResponse, Depends(current_user)],
         event_service: FromDishka[EventService]
 ) -> EventResponse:
     """Get a specific event by ID"""
@@ -267,7 +267,7 @@ async def get_event(
 
 @router.post("/publish", response_model=PublishEventResponse)
 async def publish_custom_event(
-        admin: Annotated[UserResponse, Depends(AdminUser)],
+        admin: Annotated[UserResponse, Depends(admin_user)],
         event_request: PublishEventRequest,
         request: Request,
         event_service: FromDishka[KafkaEventService]
@@ -301,7 +301,7 @@ async def publish_custom_event(
 
 @router.post("/aggregate", response_model=List[Dict[str, Any]])
 async def aggregate_events(
-        current_user: Annotated[UserResponse, Depends(CurrentUser)],
+        current_user: Annotated[UserResponse, Depends(current_user)],
         aggregation: EventAggregationRequest,
         event_service: FromDishka[EventService],
 ) -> List[Dict[str, Any]]:
@@ -317,7 +317,7 @@ async def aggregate_events(
 
 @router.get("/types/list", response_model=List[str])
 async def list_event_types(
-        current_user: Annotated[UserResponse, Depends(CurrentUser)],
+        current_user: Annotated[UserResponse, Depends(current_user)],
         event_service: FromDishka[EventService]
 ) -> List[str]:
     event_types = await event_service.list_event_types(
@@ -330,7 +330,7 @@ async def list_event_types(
 @router.delete("/{event_id}", response_model=DeleteEventResponse)
 async def delete_event(
         event_id: str,
-        admin: Annotated[UserResponse, Depends(AdminUser)],
+        admin: Annotated[UserResponse, Depends(admin_user)],
         event_service: FromDishka[EventService],
 ) -> DeleteEventResponse:
     result = await event_service.delete_event_with_archival(
@@ -360,7 +360,7 @@ async def delete_event(
 @router.post("/replay/{aggregate_id}", response_model=ReplayAggregateResponse)
 async def replay_aggregate_events(
         aggregate_id: str,
-        admin: Annotated[UserResponse, Depends(AdminUser)],
+        admin: Annotated[UserResponse, Depends(admin_user)],
         event_service: FromDishka[EventService],
         kafka_event_service: FromDishka[KafkaEventService],
         target_service: str | None = Query(