REFACTOR ALL APIs fix 1

services/demo_session/app/api/demo_operations.py

@@ -50,7 +50,7 @@ async def extend_demo_session(
             "status": session.status.value,
             "created_at": session.created_at,
             "expires_at": session.expires_at,
-            "demo_config": session.metadata.get("demo_config", {}),
+            "demo_config": session.session_metadata.get("demo_config", {}),
             "session_token": session_token
         }
 

services/demo_session/app/api/demo_sessions.py

@@ -82,7 +82,7 @@ async def create_demo_session(
             "status": session.status.value,
             "created_at": session.created_at,
             "expires_at": session.expires_at,
-            "demo_config": session.metadata.get("demo_config", {}),
+            "demo_config": session.session_metadata.get("demo_config", {}),
             "session_token": session_token
         }
 

services/demo_session/app/models/demo_session.py

@@ -59,6 +59,7 @@ class DemoSession(Base):
         return {
             "id": str(self.id),
             "session_id": self.session_id,
+            "user_id": str(self.user_id) if self.user_id else None,
             "virtual_tenant_id": str(self.virtual_tenant_id),
             "base_demo_tenant_id": str(self.base_demo_tenant_id),
             "demo_account_type": self.demo_account_type,

services/demo_session/app/services/session_manager.py

@@ -73,7 +73,7 @@ class DemoSessionManager:
             last_activity_at=datetime.now(timezone.utc),
             data_cloned=False,
             redis_populated=False,
-            metadata={
+            session_metadata={
                 "demo_config": demo_config,
                 "extension_count": 0
             }
@@ -133,7 +133,7 @@ class DemoSessionManager:
             raise ValueError(f"Cannot extend {session.status.value} session")
 
         # Check extension limit
-        extension_count = session.metadata.get("extension_count", 0)
+        extension_count = session.session_metadata.get("extension_count", 0)
         if extension_count >= settings.DEMO_SESSION_MAX_EXTENSIONS:
             raise ValueError(f"Maximum extensions ({settings.DEMO_SESSION_MAX_EXTENSIONS}) reached")
 
@@ -144,7 +144,7 @@ class DemoSessionManager:
 
         session.expires_at = new_expires_at
         session.last_activity_at = datetime.now(timezone.utc)
-        session.metadata["extension_count"] = extension_count + 1
+        session.session_metadata["extension_count"] = extension_count + 1
 
         await self.db.commit()
         await self.db.refresh(session)