more fixes

Author: HardMax71

backend/app/events/metadata.py

@@ -1,15 +1,36 @@
-from app.events.metadata import AvroEventMetadata
+from app.infrastructure.kafka.events.metadata import AvroEventMetadata
 
 
-def test_metadata_helpers():
-    m = AvroEventMetadata(service_name="s", service_version="1")
+def test_to_dict() -> None:
+    m = AvroEventMetadata(service_name="svc", service_version="1.0")
     d = m.to_dict()
-    assert d["service_name"] == "s"
-    m2 = AvroEventMetadata.from_dict({"service_name": "a", "service_version": "2", "user_id": "u"})
-    assert m2.user_id == "u"
-    m3 = m.with_correlation("cid")
-    assert m3.correlation_id == "cid"
-    m4 = m.with_user("u2")
-    assert m4.user_id == "u2"
-    assert m.ensure_correlation_id().correlation_id
+    assert d["service_name"] == "svc"
+    assert d["service_version"] == "1.0"
+
+
+def test_from_dict() -> None:
+    m = AvroEventMetadata.from_dict({"service_name": "a", "service_version": "2", "user_id": "u"})
+    assert m.service_name == "a"
+    assert m.service_version == "2"
+    assert m.user_id == "u"
+
+
+def test_with_correlation() -> None:
+    m = AvroEventMetadata(service_name="svc", service_version="1")
+    m2 = m.with_correlation("cid")
+    assert m2.correlation_id == "cid"
+    assert m2.service_name == m.service_name  # preserves other fields
 
+
+def test_with_user() -> None:
+    m = AvroEventMetadata(service_name="svc", service_version="1")
+    m2 = m.with_user("u1")
+    assert m2.user_id == "u1"
+
+
+def test_ensure_correlation_id() -> None:
+    m = AvroEventMetadata(service_name="svc", service_version="1")
+    # ensure_correlation_id returns self if correlation_id already present
+    same = m.ensure_correlation_id()
+    assert same.correlation_id == m.correlation_id
+    assert m.ensure_correlation_id().correlation_id

backend/tests/unit/events/test_metadata_model.py

@@ -37,7 +37,7 @@ async def compensate(self, context: SagaContext) -> bool:  # noqa: ARG002
 
 @pytest.mark.asyncio
 async def test_context_adders() -> None:
-    from app.infrastructure.kafka.events.metadata import EventMetadata
+    from app.infrastructure.kafka.events.metadata import AvroEventMetadata
     from app.infrastructure.kafka.events.base import BaseEvent
     from app.domain.enums.events import EventType
 
@@ -46,7 +46,7 @@ class E(BaseEvent):
         topic = None  # type: ignore[assignment]
 
     ctx = SagaContext("s1", "e1")
-    evt = E(metadata=EventMetadata(service_name="t", service_version="1"))
+    evt = E(metadata=AvroEventMetadata(service_name="t", service_version="1"))
     ctx.add_event(evt)
     assert len(ctx.events) == 1
     comp = _DummyComp()