more fixes

Author: HardMax71

backend/app/infrastructure/mappers/__init__.py

@@ -14,19 +14,16 @@
 from .rate_limit_mapper import (
     RateLimitConfigMapper,
     RateLimitRuleMapper,
-    RateLimitStatusMapper,
     UserRateLimitMapper,
 )
 from .replay_api_mapper import ReplayApiMapper
 from .replay_mapper import ReplayApiMapper as AdminReplayApiMapper
 from .replay_mapper import (
     ReplayQueryMapper,
-    ReplaySessionDataMapper,
     ReplaySessionMapper,
     ReplayStateMapper,
 )
 from .saga_mapper import (
-    SagaEventMapper,
     SagaFilterMapper,
     SagaInstanceMapper,
     SagaMapper,
@@ -52,13 +49,11 @@
     "RateLimitRuleMapper",
     "UserRateLimitMapper",
     "RateLimitConfigMapper",
-    "RateLimitStatusMapper",
     # Replay
     "ReplayApiMapper",
     "AdminReplayApiMapper",
     "ReplaySessionMapper",
     "ReplayQueryMapper",
-    "ReplaySessionDataMapper",
     "ReplayStateMapper",
     # Saved scripts
     "SavedScriptMapper",
@@ -69,6 +64,5 @@
     # Saga
     "SagaMapper",
     "SagaFilterMapper",
-    "SagaEventMapper",
     "SagaInstanceMapper",
 ]

backend/app/infrastructure/mappers/rate_limit_mapper.py

@@ -1,5 +1,4 @@
 import json
-from dataclasses import asdict
 from datetime import datetime, timezone
 from typing import Any, Dict
 
@@ -8,7 +7,6 @@
     RateLimitAlgorithm,
     RateLimitConfig,
     RateLimitRule,
-    RateLimitStatus,
     UserRateLimit,
 )
 
@@ -124,9 +122,3 @@ def model_validate_json(json_str: str | bytes) -> RateLimitConfig:
     def model_dump_json(config: RateLimitConfig) -> str:
         """Pydantic-compatible method for serialization to JSON."""
         return json.dumps(RateLimitConfigMapper.to_dict(config))
-
-
-class RateLimitStatusMapper:
-    @staticmethod
-    def to_dict(status: RateLimitStatus) -> Dict[str, Any]:
-        return asdict(status)

backend/app/infrastructure/mappers/replay_mapper.py

@@ -4,7 +4,6 @@
 from app.domain.admin import (
     ReplayQuery,
     ReplaySession,
-    ReplaySessionData,
     ReplaySessionFields,
     ReplaySessionStatusDetail,
     ReplaySessionStatusInfo,
@@ -150,30 +149,6 @@ def to_mongodb_query(query: ReplayQuery) -> dict[str, Any]:
         return mongo_query
 
 
-class ReplaySessionDataMapper:
-    @staticmethod
-    def to_dict(data: ReplaySessionData) -> dict[str, Any]:
-        result = {
-            "dry_run": data.dry_run,
-            "total_events": data.total_events,
-            "replay_correlation_id": data.replay_correlation_id,
-            "query": data.query,
-        }
-
-        if data.dry_run and data.events_preview:
-            result["events_preview"] = [
-                {
-                    "event_id": e.event_id,
-                    "event_type": e.event_type,
-                    "timestamp": e.timestamp,
-                    "aggregate_id": e.aggregate_id,
-                }
-                for e in data.events_preview
-            ]
-
-        return result
-
-
 class ReplayApiMapper:
     """API-level mapper for converting replay requests to domain queries."""
 

backend/app/infrastructure/mappers/saga_mapper.py

@@ -2,8 +2,6 @@
 
 from app.domain.enums.saga import SagaState
 from app.domain.saga.models import Saga, SagaFilter, SagaInstance
-from app.infrastructure.kafka.events.metadata import AvroEventMetadata as EventMetadata
-from app.infrastructure.kafka.events.saga import SagaCancelledEvent
 
 
 class SagaMapper:
@@ -139,37 +137,6 @@ def to_mongo(instance: SagaInstance) -> dict[str, Any]:
         }
 
 
-class SagaEventMapper:
-    """Maps saga domain objects to typed Kafka events."""
-
-    @staticmethod
-    def to_cancelled_event(
-        instance: SagaInstance,
-        *,
-        user_id: str | None = None,
-        service_name: str = "saga-orchestrator",
-        service_version: str = "1.0.0",
-    ) -> SagaCancelledEvent:
-        cancelled_by = user_id or instance.context_data.get("user_id") or "system"
-        metadata = EventMetadata(
-            service_name=service_name,
-            service_version=service_version,
-            user_id=cancelled_by,
-        )
-
-        return SagaCancelledEvent(
-            saga_id=instance.saga_id,
-            saga_name=instance.saga_name,
-            execution_id=instance.execution_id,
-            reason=instance.error_message or "User requested cancellation",
-            completed_steps=instance.completed_steps,
-            compensated_steps=instance.compensated_steps,
-            cancelled_at=instance.completed_at,
-            cancelled_by=cancelled_by,
-            metadata=metadata,
-        )
-
-
 class SagaFilterMapper:
     """Maps saga filters to MongoDB queries."""
 

backend/tests/unit/infrastructure/mappers/test_admin_mapper.py

@@ -1,7 +1,6 @@
-import pytest
 from datetime import datetime, timezone
 
-from app.infrastructure.mappers import AuditLogMapper, SettingsMapper, UserMapper
+import pytest
 from app.domain.admin import (
     AuditAction,
     AuditLogEntry,
@@ -11,10 +10,10 @@
     SystemSettings,
 )
 from app.domain.user import User as DomainAdminUser
-from app.domain.user import UserRole, UserUpdate, UserCreation
+from app.domain.user import UserCreation, UserRole, UserUpdate
+from app.infrastructure.mappers import AuditLogMapper, SettingsMapper, UserMapper
 from app.schemas_pydantic.user import User as ServiceUser
 
-
 pytestmark = pytest.mark.unit
 
 

backend/tests/unit/infrastructure/mappers/test_event_mapper_extended.py

@@ -3,11 +3,9 @@
 from datetime import datetime, timezone
 
 import pytest
-
 from app.domain.events.event_models import (
     ArchivedEvent,
     Event,
-    EventExportRow,
     EventFields,
     EventFilter,
 )

backend/tests/unit/infrastructure/mappers/test_infra_event_mapper.py

@@ -1,7 +1,6 @@
 from datetime import datetime, timezone
 
 import pytest
-
 from app.domain.events.event_models import (
     Event,
     EventSummary,

backend/tests/unit/infrastructure/mappers/test_rate_limit_mapper.py

@@ -1,19 +1,16 @@
 from datetime import datetime, timedelta, timezone
 
 import pytest
-
 from app.domain.rate_limit.rate_limit_models import (
     EndpointGroup,
     RateLimitAlgorithm,
     RateLimitConfig,
     RateLimitRule,
-    RateLimitStatus,
     UserRateLimit,
 )
 from app.infrastructure.mappers import (
     RateLimitConfigMapper,
     RateLimitRuleMapper,
-    RateLimitStatusMapper,
     UserRateLimitMapper,
 )
 
@@ -36,7 +33,7 @@ def test_user_rate_limit_mapper_roundtrip_and_dates() -> None:
     assert u2.user_id == "u1" and len(u2.rules) == 1 and isinstance(u2.created_at, datetime)
 
     # from string timestamps
-    d["created_at"] = now.isoformat();
+    d["created_at"] = now.isoformat()
     d["updated_at"] = (now + timedelta(seconds=1)).isoformat()
     u3 = UserRateLimitMapper.from_dict(d)
     assert u3.created_at <= u3.updated_at
@@ -53,9 +50,3 @@ def test_config_mapper_roundtrip_and_json() -> None:
     js = RateLimitConfigMapper.model_dump_json(cfg)
     c3 = RateLimitConfigMapper.model_validate_json(js)
     assert isinstance(c3, RateLimitConfig) and c3.global_enabled is False
-
-
-def test_status_mapper_to_dict() -> None:
-    s = RateLimitStatus(allowed=True, limit=10, remaining=5, reset_at=datetime.now(timezone.utc))
-    d = RateLimitStatusMapper.to_dict(s)
-    assert d["allowed"] is True and d["limit"] == 10

backend/tests/unit/infrastructure/mappers/test_rate_limit_mapper_extended.py

@@ -3,19 +3,16 @@
 from datetime import datetime, timezone
 
 import pytest
-
 from app.domain.rate_limit import (
     EndpointGroup,
     RateLimitAlgorithm,
     RateLimitConfig,
     RateLimitRule,
-    RateLimitStatus,
     UserRateLimit,
 )
 from app.infrastructure.mappers.rate_limit_mapper import (
     RateLimitConfigMapper,
     RateLimitRuleMapper,
-    RateLimitStatusMapper,
     UserRateLimitMapper,
 )
 
@@ -322,42 +319,3 @@ def test_model_dump_json(self):
         assert data["default_rules"][0]["endpoint_pattern"] == "/test"
         assert data["global_enabled"] is True
         assert data["redis_ttl"] == 3600
-
-
-class TestRateLimitStatusMapper:
-    """Test RateLimitStatusMapper."""
-
-    def test_to_dict(self):
-        """Test converting RateLimitStatus to dict using asdict."""
-        status = RateLimitStatus(
-            allowed=True,
-            limit=100,
-            remaining=75,
-            reset_at=datetime(2024, 1, 1, 12, 0, 0, tzinfo=timezone.utc),
-            retry_after=None,
-        )
-
-        result = RateLimitStatusMapper.to_dict(status)
-
-        assert result["allowed"] is True
-        assert result["limit"] == 100
-        assert result["remaining"] == 75
-        assert result["reset_at"] == status.reset_at
-        assert result["retry_after"] is None
-
-    def test_to_dict_with_retry_after(self):
-        """Test converting RateLimitStatus with retry_after set."""
-        status = RateLimitStatus(
-            allowed=False,
-            limit=100,
-            remaining=0,
-            reset_at=datetime(2024, 1, 1, 12, 5, 0, tzinfo=timezone.utc),
-            retry_after=300,  # 5 minutes
-        )
-
-        result = RateLimitStatusMapper.to_dict(status)
-
-        assert result["allowed"] is False
-        assert result["limit"] == 100
-        assert result["remaining"] == 0
-        assert result["retry_after"] == 300

backend/tests/unit/infrastructure/mappers/test_replay_api_mapper.py

@@ -3,9 +3,8 @@
 from datetime import datetime, timezone
 
 import pytest
-
 from app.domain.enums.events import EventType
-from app.domain.enums.replay import ReplayStatus, ReplayType, ReplayTarget
+from app.domain.enums.replay import ReplayStatus, ReplayTarget, ReplayType
 from app.domain.replay import ReplayConfig, ReplayFilter, ReplaySessionState
 from app.infrastructure.mappers.replay_api_mapper import ReplayApiMapper
 from app.schemas_pydantic.replay import ReplayRequest
@@ -389,4 +388,4 @@ def test_cleanup_to_response(self):
         )
 
         assert response.removed_sessions == 5
-        assert response.message == "Cleaned up 5 old sessions"
+        assert response.message == "Cleaned up 5 old sessions"