Fix onboarding process not getting the subcription plan

shared/clients/__init__.py

@@ -5,6 +5,7 @@ Provides easy access to all service clients
 """
 
 from .base_service_client import BaseServiceClient, ServiceAuthenticator
+from .auth_client import AuthServiceClient
 from .training_client import TrainingServiceClient
 from .sales_client import SalesServiceClient
 from .external_client import ExternalServiceClient
@@ -209,7 +210,8 @@ def get_service_clients(config: BaseServiceSettings = None, service_name: str =
 # Export all classes for direct import
 __all__ = [
     'BaseServiceClient',
-    'ServiceAuthenticator', 
+    'ServiceAuthenticator',
+    'AuthServiceClient',
     'TrainingServiceClient',
     'SalesServiceClient',
     'ExternalServiceClient',
@@ -222,7 +224,7 @@ __all__ = [
     'ServiceClients',
     'get_training_client',
     'get_sales_client',
-    'get_external_client', 
+    'get_external_client',
     'get_forecast_client',
     'get_inventory_client',
     'get_orders_client',

shared/clients/auth_client.py

@@ -0,0 +1,134 @@
+# shared/clients/auth_client.py
+"""
+Auth Service Client for Inter-Service Communication
+Provides methods to interact with the authentication/onboarding service
+"""
+
+from typing import Optional, Dict, Any, List
+import structlog
+
+from shared.clients.base_service_client import BaseServiceClient
+from shared.config.base import BaseServiceSettings
+
+logger = structlog.get_logger()
+
+
+class AuthServiceClient(BaseServiceClient):
+    """Client for interacting with the Auth Service"""
+
+    def __init__(self, config: BaseServiceSettings):
+        super().__init__("auth", config)
+
+    def get_service_base_path(self) -> str:
+        """Return the base path for auth service APIs"""
+        return "/api/v1/users"
+
+    async def get_user_onboarding_progress(self, user_id: str) -> Optional[Dict[str, Any]]:
+        """
+        Get user's onboarding progress including step data
+
+        Args:
+            user_id: User ID to fetch progress for
+
+        Returns:
+            Dict with user progress including steps with data, or None if failed
+        """
+        try:
+            # Use the service endpoint that accepts user_id as parameter
+            result = await self.get(f"/{user_id}/onboarding/progress")
+
+            if result:
+                logger.info("Retrieved user onboarding progress",
+                           user_id=user_id,
+                           current_step=result.get("current_step"))
+                return result
+            else:
+                logger.warning("No onboarding progress found",
+                             user_id=user_id)
+                return None
+
+        except Exception as e:
+            logger.error("Failed to get user onboarding progress",
+                        user_id=user_id,
+                        error=str(e))
+            return None
+
+    async def get_user_step_data(self, user_id: str, step_name: str) -> Optional[Dict[str, Any]]:
+        """
+        Get data for a specific onboarding step
+
+        Args:
+            user_id: User ID
+            step_name: Name of the step (e.g., "user_registered")
+
+        Returns:
+            Step data dictionary or None if not found
+        """
+        try:
+            progress = await self.get_user_onboarding_progress(user_id)
+
+            if not progress:
+                logger.warning("No progress data returned",
+                             user_id=user_id)
+                return None
+
+            logger.debug("Retrieved progress data",
+                        user_id=user_id,
+                        steps_count=len(progress.get("steps", [])),
+                        current_step=progress.get("current_step"))
+
+            # Find the specific step
+            for step in progress.get("steps", []):
+                if step.get("step_name") == step_name:
+                    step_data = step.get("data", {})
+                    logger.info("Found step data",
+                               user_id=user_id,
+                               step_name=step_name,
+                               data_keys=list(step_data.keys()) if step_data else [],
+                               has_subscription_plan="subscription_plan" in step_data)
+                    return step_data
+
+            logger.warning("Step not found in progress",
+                         user_id=user_id,
+                         step_name=step_name,
+                         available_steps=[s.get("step_name") for s in progress.get("steps", [])])
+            return None
+
+        except Exception as e:
+            logger.error("Failed to get step data",
+                        user_id=user_id,
+                        step_name=step_name,
+                        error=str(e))
+            return None
+
+    async def get_subscription_plan_from_registration(self, user_id: str) -> str:
+        """
+        Get the subscription plan selected during user registration
+
+        Args:
+            user_id: User ID
+
+        Returns:
+            Plan name (e.g., "starter", "professional", "enterprise") or "starter" as default
+        """
+        try:
+            step_data = await self.get_user_step_data(user_id, "user_registered")
+
+            if step_data and "subscription_plan" in step_data:
+                plan = step_data["subscription_plan"]
+                logger.info("Retrieved subscription plan from registration",
+                           user_id=user_id,
+                           plan=plan)
+                return plan
+            else:
+                logger.info("No subscription plan in registration data, using default",
+                           user_id=user_id,
+                           default_plan="starter")
+                return "starter"
+
+        except Exception as e:
+            logger.warning("Failed to retrieve subscription plan, using default",
+                         user_id=user_id,
+                         error=str(e),
+                         default_plan="starter")
+            return "starter"