fixed enum imports (now using import from enums/init, not from separate enums/xx files)

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

@@ -8,8 +8,8 @@
 
 from app.api.dependencies import admin_user
 from app.core.correlation import CorrelationContext
-from app.domain.enums.events import EventType
-from app.domain.events.event_models import EventFilter
+from app.domain.enums import EventType
+from app.domain.events import EventFilter
 from app.domain.replay import ReplayFilter
 from app.domain.user import User
 from app.schemas_pydantic.admin_events import (

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

@@ -5,8 +5,8 @@
 from fastapi import APIRouter, Depends, HTTPException, Query
 
 from app.api.dependencies import admin_user
-from app.db.repositories.admin.admin_user_repository import AdminUserRepository
-from app.domain.enums.user import UserRole
+from app.db.repositories import AdminUserRepository
+from app.domain.enums import UserRole
 from app.domain.rate_limit import RateLimitRule, UserRateLimit
 from app.domain.user import User
 from app.domain.user import UserUpdate as DomainUserUpdate

backend/app/api/routes/dlq.py

@@ -5,11 +5,11 @@
 from fastapi import APIRouter, Depends, HTTPException, Query
 
 from app.api.dependencies import current_user
-from app.db.repositories.dlq_repository import DLQRepository
+from app.db.repositories import DLQRepository
 from app.dlq import RetryPolicy
 from app.dlq.manager import DLQManager
 from app.dlq.models import DLQMessageStatus
-from app.domain.enums.events import EventType
+from app.domain.enums import EventType
 from app.schemas_pydantic.common import ErrorResponse
 from app.schemas_pydantic.dlq import (
     DLQBatchRetryResponse,

backend/app/api/routes/events.py

@@ -9,11 +9,8 @@
 from app.api.dependencies import admin_user, current_user
 from app.core.correlation import CorrelationContext
 from app.core.utils import get_client_ip
-from app.domain.enums.common import SortOrder
-from app.domain.enums.events import EventType
-from app.domain.enums.user import UserRole
-from app.domain.events.event_models import EventFilter
-from app.domain.events.typed import BaseEvent, DomainEvent, EventMetadata
+from app.domain.enums import EventType, SortOrder, UserRole
+from app.domain.events import BaseEvent, DomainEvent, EventFilter, EventMetadata
 from app.domain.user import User
 from app.schemas_pydantic.common import ErrorResponse
 from app.schemas_pydantic.events import (

backend/app/api/routes/execution.py

@@ -9,10 +9,8 @@
 from app.api.dependencies import admin_user, current_user
 from app.core.tracing import EventAttributes, add_span_attributes
 from app.core.utils import get_client_ip
-from app.domain.enums.events import EventType
-from app.domain.enums.execution import ExecutionStatus
-from app.domain.enums.user import UserRole
-from app.domain.events.typed import BaseEvent, DomainEvent, EventMetadata
+from app.domain.enums import EventType, ExecutionStatus, UserRole
+from app.domain.events import BaseEvent, DomainEvent, EventMetadata
 from app.domain.exceptions import DomainError
 from app.domain.idempotency import KeyStrategy
 from app.domain.user import User

backend/app/api/routes/notifications.py

@@ -4,7 +4,7 @@
 from dishka.integrations.fastapi import DishkaRoute
 from fastapi import APIRouter, Query, Request, Response
 
-from app.domain.enums.notification import NotificationChannel, NotificationStatus
+from app.domain.enums import NotificationChannel, NotificationStatus
 from app.schemas_pydantic.notification import (
     DeleteNotificationResponse,
     NotificationListResponse,

backend/app/api/routes/replay.py

@@ -5,7 +5,7 @@
 from fastapi import APIRouter, Depends, Query
 
 from app.api.dependencies import admin_user
-from app.domain.enums.replay import ReplayStatus
+from app.domain.enums import ReplayStatus
 from app.domain.replay import ReplayConfig
 from app.schemas_pydantic.replay import (
     CleanupResponse,

backend/app/api/routes/saga.py

@@ -4,7 +4,7 @@
 from dishka.integrations.fastapi import DishkaRoute
 from fastapi import APIRouter, Query, Request
 
-from app.domain.enums.saga import SagaState
+from app.domain.enums import SagaState
 from app.schemas_pydantic.common import ErrorResponse
 from app.schemas_pydantic.saga import (
     SagaCancellationResponse,

backend/app/api/routes/sse.py

@@ -6,7 +6,7 @@
 from app.schemas_pydantic.notification import NotificationResponse
 from app.schemas_pydantic.sse import SSEExecutionEventData
 from app.services.auth_service import AuthService
-from app.services.sse.sse_service import SSEService
+from app.services.sse import SSEService
 
 router = APIRouter(prefix="/events", tags=["sse"], route_class=DishkaRoute)
 

backend/app/api/routes/user_settings.py

@@ -5,11 +5,11 @@
 from fastapi import APIRouter, Depends, Query
 
 from app.api.dependencies import current_user
-from app.domain.user import User
-from app.domain.user.settings_models import (
+from app.domain.user import (
     DomainEditorSettings,
     DomainNotificationSettings,
     DomainUserSettingsUpdate,
+    User,
 )
 from app.schemas_pydantic.user_settings import (
     EditorSettings,

backend/app/core/metrics/execution.py

@@ -1,5 +1,5 @@
 from app.core.metrics.base import BaseMetrics
-from app.domain.enums.execution import ExecutionStatus
+from app.domain.enums import ExecutionStatus
 
 
 class ExecutionMetrics(BaseMetrics):

backend/app/core/middlewares/rate_limit.py

@@ -7,7 +7,7 @@
 
 from app.core.utils import get_client_ip
 from app.domain.rate_limit import RateLimitStatus
-from app.domain.user.user_models import User
+from app.domain.user import User
 from app.services.rate_limit_service import RateLimitService
 from app.settings import Settings
 

backend/app/core/providers.py

@@ -29,26 +29,26 @@
 from app.core.security import SecurityService
 from app.core.tracing import TracerManager
 from app.db.repositories import (
+    AdminEventsRepository,
+    AdminSettingsRepository,
+    AdminUserRepository,
+    DLQRepository,
     EventRepository,
     ExecutionRepository,
     NotificationRepository,
+    ReplayRepository,
+    ResourceAllocationRepository,
     SagaRepository,
     SavedScriptRepository,
     SSERepository,
     UserRepository,
+    UserSettingsRepository,
 )
-from app.db.repositories.admin.admin_events_repository import AdminEventsRepository
-from app.db.repositories.admin.admin_settings_repository import AdminSettingsRepository
-from app.db.repositories.admin.admin_user_repository import AdminUserRepository
-from app.db.repositories.dlq_repository import DLQRepository
-from app.db.repositories.replay_repository import ReplayRepository
-from app.db.repositories.resource_allocation_repository import ResourceAllocationRepository
-from app.db.repositories.user_settings_repository import UserSettingsRepository
 from app.dlq.manager import DLQManager
 from app.dlq.models import RetryPolicy, RetryStrategy
-from app.domain.enums.kafka import KafkaTopic
+from app.domain.enums import KafkaTopic
 from app.domain.rate_limit import RateLimitConfig
-from app.domain.saga.models import SagaConfig
+from app.domain.saga import SagaConfig
 from app.events.core import UnifiedProducer
 from app.services.admin import AdminEventsService, AdminSettingsService, AdminUserService
 from app.services.auth_service import AuthService
@@ -72,8 +72,7 @@
 from app.services.saga import SagaOrchestrator
 from app.services.saga.saga_service import SagaService
 from app.services.saved_script_service import SavedScriptService
-from app.services.sse.redis_bus import SSERedisBus
-from app.services.sse.sse_service import SSEService
+from app.services.sse import SSERedisBus, SSEService
 from app.services.user_settings_service import UserSettingsService
 from app.settings import Settings
 

backend/app/db/docs/dlq.py

@@ -5,7 +5,7 @@
 from pymongo import ASCENDING, DESCENDING, IndexModel
 
 from app.dlq.models import DLQMessageStatus
-from app.domain.events.typed import DomainEvent
+from app.domain.events import DomainEvent
 
 
 class DLQMessageDocument(Document):

backend/app/db/docs/event.py

@@ -6,8 +6,8 @@
 from pydantic import ConfigDict, Field
 from pymongo import ASCENDING, DESCENDING, IndexModel
 
-from app.domain.enums.events import EventType
-from app.domain.events.typed import EventMetadata
+from app.domain.enums import EventType
+from app.domain.events import EventMetadata
 
 
 class EventDocument(Document):

backend/app/db/docs/execution.py

@@ -5,8 +5,7 @@
 from pydantic import BaseModel, ConfigDict, Field
 from pymongo import IndexModel
 
-from app.domain.enums.execution import ExecutionStatus
-from app.domain.enums.storage import ExecutionErrorType
+from app.domain.enums import ExecutionErrorType, ExecutionStatus
 
 
 # Pydantic model required here because Beanie embedded documents must be Pydantic BaseModel subclasses.

backend/app/db/docs/notification.py

@@ -6,11 +6,7 @@
 from pydantic import ConfigDict, Field, field_validator
 from pymongo import ASCENDING, DESCENDING, IndexModel
 
-from app.domain.enums.notification import (
-    NotificationChannel,
-    NotificationSeverity,
-    NotificationStatus,
-)
+from app.domain.enums import NotificationChannel, NotificationSeverity, NotificationStatus
 
 
 class NotificationDocument(Document):

backend/app/db/docs/replay.py

@@ -6,8 +6,7 @@
 from pydantic import BaseModel, ConfigDict, Field
 from pymongo import IndexModel
 
-from app.domain.enums.events import EventType
-from app.domain.enums.replay import ReplayStatus, ReplayTarget, ReplayType
+from app.domain.enums import EventType, ReplayStatus, ReplayTarget, ReplayType
 
 
 class ReplayFilter(BaseModel):

backend/app/db/docs/saga.py

@@ -6,7 +6,7 @@
 from pydantic import ConfigDict, Field
 from pymongo import ASCENDING, IndexModel
 
-from app.domain.enums.saga import SagaState
+from app.domain.enums import SagaState
 
 
 class SagaDocument(Document):

backend/app/db/docs/user.py

@@ -4,7 +4,7 @@
 from beanie import Document, Indexed
 from pydantic import ConfigDict, EmailStr, Field
 
-from app.domain.enums.user import UserRole
+from app.domain.enums import UserRole
 
 
 class UserDocument(Document):

backend/app/db/docs/user_settings.py

@@ -4,8 +4,7 @@
 from beanie import Document, Indexed
 from pydantic import BaseModel, ConfigDict, Field, field_validator
 
-from app.domain.enums.common import Theme
-from app.domain.enums.notification import NotificationChannel
+from app.domain.enums import NotificationChannel, Theme
 
 
 class NotificationSettings(BaseModel):

backend/app/db/repositories/__init__.py

@@ -1,22 +1,28 @@
+from app.db.repositories.admin.admin_events_repository import AdminEventsRepository
 from app.db.repositories.admin.admin_settings_repository import AdminSettingsRepository
 from app.db.repositories.admin.admin_user_repository import AdminUserRepository
+from app.db.repositories.dlq_repository import DLQRepository
 from app.db.repositories.event_repository import EventRepository
 from app.db.repositories.execution_repository import ExecutionRepository
 from app.db.repositories.notification_repository import NotificationRepository
 from app.db.repositories.replay_repository import ReplayRepository
+from app.db.repositories.resource_allocation_repository import ResourceAllocationRepository
 from app.db.repositories.saga_repository import SagaRepository
 from app.db.repositories.saved_script_repository import SavedScriptRepository
 from app.db.repositories.sse_repository import SSERepository
 from app.db.repositories.user_repository import UserRepository
 from app.db.repositories.user_settings_repository import UserSettingsRepository
 
 __all__ = [
+    "AdminEventsRepository",
     "AdminSettingsRepository",
     "AdminUserRepository",
+    "DLQRepository",
     "EventRepository",
     "ExecutionRepository",
     "NotificationRepository",
     "ReplayRepository",
+    "ResourceAllocationRepository",
     "SagaRepository",
     "SavedScriptRepository",
     "SSERepository",

backend/app/db/repositories/admin/admin_events_repository.py

@@ -11,10 +11,8 @@
     ExecutionDocument,
     ReplaySessionDocument,
 )
-from app.domain.admin import ExecutionResultSummary, ReplaySessionData, ReplaySessionStatusDetail
-from app.domain.admin.replay_updates import ReplaySessionUpdate
-from app.domain.enums.events import EventType
-from app.domain.enums.replay import ReplayStatus
+from app.domain.admin import ExecutionResultSummary, ReplaySessionData, ReplaySessionStatusDetail, ReplaySessionUpdate
+from app.domain.enums import EventType, ReplayStatus
 from app.domain.events import (
     DomainEvent,
     DomainEventAdapter,
@@ -28,7 +26,7 @@
     HourlyEventCount,
     UserEventCount,
 )
-from app.domain.replay.models import ReplayFilter, ReplaySessionState
+from app.domain.replay import ReplayFilter, ReplaySessionState
 
 
 class AdminEventsRepository:

backend/app/db/repositories/dlq_repository.py

@@ -18,7 +18,7 @@
     EventTypeStatistic,
     TopicStatistic,
 )
-from app.domain.enums.events import EventType
+from app.domain.enums import EventType
 
 
 class DLQRepository:

backend/app/db/repositories/event_repository.py

@@ -11,7 +11,7 @@
 from app.core.tracing import EventAttributes
 from app.core.tracing.utils import add_span_attributes
 from app.db.docs import EventArchiveDocument, EventDocument
-from app.domain.enums.events import EventType
+from app.domain.enums import EventType
 from app.domain.events import (
     ArchivedEvent,
     DomainEvent,

backend/app/db/repositories/notification_repository.py

@@ -5,8 +5,7 @@
 from beanie.operators import GTE, LTE, ElemMatch, In, NotIn, Or
 
 from app.db.docs import NotificationDocument, NotificationSubscriptionDocument, UserDocument
-from app.domain.enums.notification import NotificationChannel, NotificationStatus
-from app.domain.enums.user import UserRole
+from app.domain.enums import NotificationChannel, NotificationStatus, UserRole
 from app.domain.notification import (
     DomainNotification,
     DomainNotificationCreate,

backend/app/db/repositories/replay_repository.py

@@ -6,9 +6,9 @@
 from beanie.operators import LT, In
 
 from app.db.docs import EventDocument, ReplaySessionDocument
-from app.domain.admin.replay_updates import ReplaySessionUpdate
-from app.domain.enums.replay import ReplayStatus
-from app.domain.replay.models import ReplayFilter, ReplaySessionState
+from app.domain.admin import ReplaySessionUpdate
+from app.domain.enums import ReplayStatus
+from app.domain.replay import ReplayFilter, ReplaySessionState
 
 
 class ReplayRepository:

backend/app/db/repositories/saga_repository.py

@@ -8,7 +8,7 @@
 from monggregate import Pipeline, S
 
 from app.db.docs import ExecutionDocument, SagaDocument
-from app.domain.enums.saga import SagaState
+from app.domain.enums import SagaState
 from app.domain.saga import Saga, SagaFilter, SagaListResult
 
 

backend/app/db/repositories/user_repository.py

@@ -5,7 +5,7 @@
 from beanie.operators import Eq, Or, RegEx
 
 from app.db.docs import UserDocument
-from app.domain.enums.user import UserRole
+from app.domain.enums import UserRole
 from app.domain.user import DomainUserCreate, DomainUserUpdate, User, UserListResult
 
 

backend/app/db/repositories/user_settings_repository.py

@@ -6,8 +6,8 @@
 from beanie.operators import GT, LTE, Eq, In
 
 from app.db.docs import EventDocument, UserSettingsDocument, UserSettingsSnapshotDocument
-from app.domain.enums.events import EventType
-from app.domain.user.settings_models import DomainUserSettings, DomainUserSettingsChangedEvent
+from app.domain.enums import EventType
+from app.domain.user import DomainUserSettings, DomainUserSettingsChangedEvent
 
 
 class UserSettingsRepository:

backend/app/dlq/manager.py

@@ -6,7 +6,7 @@
 
 from app.core.metrics import DLQMetrics
 from app.core.tracing.utils import inject_trace_context
-from app.db.repositories.dlq_repository import DLQRepository
+from app.db.repositories import DLQRepository
 from app.dlq.models import (
     DLQBatchRetryResult,
     DLQMessage,
@@ -16,8 +16,8 @@
     RetryPolicy,
     RetryStrategy,
 )
-from app.domain.enums.kafka import KafkaTopic
-from app.domain.events.typed import (
+from app.domain.enums import KafkaTopic
+from app.domain.events import (
     DLQMessageDiscardedEvent,
     DLQMessageReceivedEvent,
     DLQMessageRetriedEvent,