Fix bugs issues

shared/messaging/events.py

@@ -1,14 +1,13 @@
 """
+shared/messaging/events.py
 Event definitions for microservices communication
-- Simple class-based approach to avoid dataclass issues
 """
-
 from datetime import datetime, timezone
 from typing import Dict, Any, Optional
 import uuid
 
 class BaseEvent:
-    """Base event class"""
+    """Base event class - FIXED"""
     def __init__(self, service_name: str, data: Dict[str, Any], event_type: str = "", correlation_id: Optional[str] = None):
         self.service_name = service_name
         self.data = data
@@ -17,17 +16,45 @@ class BaseEvent:
         self.timestamp = datetime.now(timezone.utc)
         self.correlation_id = correlation_id
     
-    def to_dict(self) -> Dict[str, Any]: # Add this method
-        """Converts the event object to a dictionary for JSON serialization."""
+    def to_dict(self) -> Dict[str, Any]:
+        """Converts the event object to a dictionary for JSON serialization - FIXED"""
         return {
             "service_name": self.service_name,
             "data": self.data,
             "event_type": self.event_type,
             "event_id": self.event_id,
-            "timestamp": self.timestamp.isoformat(), # Convert datetime to ISO 8601 string
+            "timestamp": self.timestamp.isoformat(),  # Convert datetime to ISO string
             "correlation_id": self.correlation_id
         }
 
+# Auth Events - FIXED
+class UserRegisteredEvent(BaseEvent):
+    def __init__(self, service_name: str, data: Dict[str, Any], correlation_id: Optional[str] = None):
+        super().__init__(
+            service_name=service_name,
+            data=data,
+            event_type="user.registered",
+            correlation_id=correlation_id
+        )
+
+class UserLoginEvent(BaseEvent):
+    def __init__(self, service_name: str, data: Dict[str, Any], correlation_id: Optional[str] = None):
+        super().__init__(
+            service_name=service_name,
+            data=data,
+            event_type="user.login",
+            correlation_id=correlation_id
+        )
+
+class UserLogoutEvent(BaseEvent):
+    def __init__(self, service_name: str, data: Dict[str, Any], correlation_id: Optional[str] = None):
+        super().__init__(
+            service_name=service_name,
+            data=data,
+            event_type="user.logout",
+            correlation_id=correlation_id
+        )
+
 # Training Events
 class TrainingStartedEvent(BaseEvent):
     def __init__(self, service_name: str, data: Dict[str, Any], correlation_id: Optional[str] = None):
@@ -66,68 +93,12 @@ class ForecastGeneratedEvent(BaseEvent):
             correlation_id=correlation_id
         )
 
-class ForecastRequestedEvent(BaseEvent):
+# Data Events
+class DataImportedEvent(BaseEvent):
     def __init__(self, service_name: str, data: Dict[str, Any], correlation_id: Optional[str] = None):
         super().__init__(
             service_name=service_name,
             data=data,
-            event_type="forecast.requested",
+            event_type="data.imported",
             correlation_id=correlation_id
         )
-
-# User Events
-class UserRegisteredEvent(BaseEvent):
-    def __init__(self, service_name: str, data: Dict[str, Any], correlation_id: Optional[str] = None):
-        super().__init__(
-            service_name=service_name,
-            data=data,
-            event_type="user.registered",
-            correlation_id=correlation_id
-        )
-
-class UserLoginEvent(BaseEvent):
-    def __init__(self, service_name: str, data: Dict[str, Any], correlation_id: Optional[str] = None):
-        super().__init__(
-            service_name=service_name,
-            data=data,
-            event_type="user.login",
-            correlation_id=correlation_id
-        )
-
-# Tenant Events
-class TenantCreatedEvent(BaseEvent):
-    def __init__(self, service_name: str, data: Dict[str, Any], correlation_id: Optional[str] = None):
-        super().__init__(
-            service_name=service_name,
-            data=data,
-            event_type="tenant.created",
-            correlation_id=correlation_id
-        )
-
-class TenantUpdatedEvent(BaseEvent):
-    def __init__(self, service_name: str, data: Dict[str, Any], correlation_id: Optional[str] = None):
-        super().__init__(
-            service_name=service_name,
-            data=data,
-            event_type="tenant.updated",
-            correlation_id=correlation_id
-        )
-
-# Notification Events
-class NotificationSentEvent(BaseEvent):
-    def __init__(self, service_name: str, data: Dict[str, Any], correlation_id: Optional[str] = None):
-        super().__init__(
-            service_name=service_name,
-            data=data,
-            event_type="notification.sent",
-            correlation_id=correlation_id
-        )
-
-class NotificationFailedEvent(BaseEvent):
-    def __init__(self, service_name: str, data: Dict[str, Any], correlation_id: Optional[str] = None):
-        super().__init__(
-            service_name=service_name,
-            data=data,
-            event_type="notification.failed",
-            correlation_id=correlation_id
-        )