demo seed change 3

services/demo_session/app/services/cleanup_service.py

@@ -96,10 +96,9 @@ class DemoCleanupService:
         await self._delete_redis_cache(virtual_tenant_id)
 
         # Delete child tenants if enterprise
-        if session.demo_account_type == "enterprise":
-            child_metadata = session.session_metadata.get("children", [])
-            for child in child_metadata:
-                child_tenant_id = child["virtual_tenant_id"]
+        if session.demo_account_type == "enterprise" and session.session_metadata:
+            child_tenant_ids = session.session_metadata.get("child_tenant_ids", [])
+            for child_tenant_id in child_tenant_ids:
                 await self._delete_from_all_services(child_tenant_id)
 
         duration_ms = int((datetime.now(timezone.utc) - start_time).total_seconds() * 1000)

services/demo_session/app/services/session_manager.py

@@ -209,41 +209,57 @@ class DemoSessionManager:
             logger.warning("Session not found for destruction", session_id=session_id)
             return
 
-        # Update status to DESTROYING
-        await self.repository.update_fields(
-            session_id,
-            status=DemoSessionStatus.DESTROYING
-        )
-
-        # Trigger cleanup across all services
-        cleanup_service = DemoCleanupService(self.db, self.redis)
-        result = await cleanup_service.cleanup_session(session)
-
-        if result["success"]:
-            # Update status to DESTROYED
+        try:
+            # Update status to DESTROYING
             await self.repository.update_fields(
                 session_id,
-                status=DemoSessionStatus.DESTROYED,
-                destroyed_at=datetime.now(timezone.utc)
+                status=DemoSessionStatus.DESTROYING
+            )
+
+            # Trigger cleanup across all services
+            cleanup_service = DemoCleanupService(self.db, self.redis)
+            result = await cleanup_service.cleanup_session(session)
+
+            if result["success"]:
+                # Update status to DESTROYED
+                await self.repository.update_fields(
+                    session_id,
+                    status=DemoSessionStatus.DESTROYED,
+                    destroyed_at=datetime.now(timezone.utc)
+                )
+            else:
+                # Update status to FAILED with error details
+                await self.repository.update_fields(
+                    session_id,
+                    status=DemoSessionStatus.FAILED,
+                    error_details=result["errors"]
+                )
+
+            # Delete Redis data
+            await self.redis.delete_session_data(session_id)
+
+            logger.info(
+                "Session destroyed",
+                session_id=session_id,
+                virtual_tenant_id=str(session.virtual_tenant_id),
+                total_records_deleted=result.get("total_deleted", 0),
+                duration_ms=result.get("duration_ms", 0)
+            )
+
+        except Exception as e:
+            logger.error(
+                "Failed to destroy session",
+                session_id=session_id,
+                error=str(e),
+                exc_info=True
             )
-        else:
             # Update status to FAILED with error details
             await self.repository.update_fields(
                 session_id,
                 status=DemoSessionStatus.FAILED,
-                error_details=result["errors"]
+                error_details=[f"Cleanup failed: {str(e)}"]
             )
-
-        # Delete Redis data
-        await self.redis.delete_session_data(session_id)
-
-        logger.info(
-            "Session destroyed",
-            session_id=session_id,
-            virtual_tenant_id=str(session.virtual_tenant_id),
-            total_records_deleted=result.get("total_deleted", 0),
-            duration_ms=result.get("duration_ms", 0)
-        )
+            raise
 
     async def _check_database_disk_space(self):
         """Check if database has sufficient disk space for demo operations"""