Merge pull request #738 from microsoft/psl-bug-28621

fix: updated the initialize team logic

Author: Roopan-Microsoft

src/backend/common/utils/utils_af.py

@@ -17,27 +17,40 @@
 
 async def find_first_available_team(team_service: TeamService, user_id: str) -> str:
     """
-    Check teams in priority order (4 to 1) and return the first available team ID.
-    Priority: RFP (4) -> Retail (3) -> Marketing (2) -> HR (1)
+    Check teams in priority order and return the first available team ID.
+    First tries default teams in priority order, then falls back to any available team.
+    Priority: RFP (4) -> Retail (3) -> Marketing (2) -> HR (1) -> Any available team
     """
+    # Standard team priority order
     team_priority_order = [
         "00000000-0000-0000-0000-000000000004",  # RFP
         "00000000-0000-0000-0000-000000000003",  # Retail
         "00000000-0000-0000-0000-000000000002",  # Marketing
         "00000000-0000-0000-0000-000000000001",  # HR
     ]
 
+    # First, check standard teams in priority order
     for team_id in team_priority_order:
         try:
             team_config = await team_service.get_team_configuration(team_id, user_id)
             if team_config is not None:
-                print(f"Found available team: {team_id}")
+                print(f"Found available standard team: {team_id}")
                 return team_id
         except Exception as e:
             print(f"Error checking team {team_id}: {str(e)}")
             continue
 
-    print("No teams found in priority order")
+    # If no standard teams found, check for any available teams
+    try:
+        all_teams = await team_service.get_all_team_configurations()
+        if all_teams:
+            first_team = all_teams[0]
+            print(f"Found available custom team: {first_team.team_id}")
+            return first_team.team_id
+    except Exception as e:
+        print(f"Error checking for any available teams: {str(e)}")
+
+    print("No teams found in database")
     return None
 
 

src/backend/v4/api/router.py

@@ -119,33 +119,47 @@ async def init_team(
         memory_store = await DatabaseFactory.get_database(user_id=user_id)
         team_service = TeamService(memory_store)
 
-        # Find the first available team from 4 to 1, or use HR as fallback
         init_team_id = await find_first_available_team(team_service, user_id)
-        if not init_team_id:
-            init_team_id = "00000000-0000-0000-0000-000000000001"  # HR fallback
-            print("No available teams found, using HR fallback")
-        else:
-            print(f"Using first available team: {init_team_id}")
 
+        # Get current team if user has one
         user_current_team = await memory_store.get_current_team(user_id=user_id)
-        if not user_current_team:
-            print("User has no current team, setting to default:", init_team_id)
+
+        # If no teams available and no current team, return empty state to allow custom team upload
+        if not init_team_id and not user_current_team:
+            print("No teams found in database. System ready for custom team upload.")
+            return {
+                "status": "No teams configured. Please upload a team configuration to get started.",
+                "team_id": None,
+                "team": None,
+                "requires_team_upload": True,
+            }
+
+        # Use current team if available, otherwise use found team
+        if user_current_team:
+            init_team_id = user_current_team.team_id
+            print(f"Using user's current team: {init_team_id}")
+        elif init_team_id:
+            print(f"Using first available team: {init_team_id}")
             user_current_team = await team_service.handle_team_selection(
                 user_id=user_id, team_id=init_team_id
             )
             if user_current_team:
                 init_team_id = user_current_team.team_id
-        else:
-            init_team_id = user_current_team.team_id
+
         # Verify the team exists and user has access to it
         team_configuration = await team_service.get_team_configuration(
             init_team_id, user_id
         )
         if team_configuration is None:
-            raise HTTPException(
-                status_code=404,
-                detail=f"Team configuration '{init_team_id}' not found or access denied",
-            )
+            # If team doesn't exist, clear current team and return empty state
+            await memory_store.delete_current_team(user_id)
+            print(f"Team configuration '{init_team_id}' not found. Cleared current team.")
+            return {
+                "status": "Current team configuration not found. Please select or upload a team configuration.",
+                "team_id": None,
+                "team": None,
+                "requires_team_upload": True,
+            }
 
         # Set as current team in memory
         team_config.set_current_team(

src/frontend/src/pages/HomePage.tsx

@@ -35,6 +35,7 @@ const HomePage: React.FC = () => {
                 // Call the backend init_team endpoint (takes ~20 seconds)
                 const initResponse = await TeamService.initializeTeam();
 
+                // Handle successful team initialization
                 if (initResponse.data?.status === 'Request started successfully' && initResponse.data?.team_id) {
                     console.log('Team initialization completed:', initResponse.data?.team_id);
 
@@ -54,12 +55,10 @@ const HomePage: React.FC = () => {
                             "success"
                         );
                     } else {
-                        // Fallback: if we can't find the specific team, use HR team or first available
+                        // Fallback: if we can't find the specific team, use first available
                         console.log('Specific team not found, using default selection logic');
-                        const hrTeam = teams.find(team => team.name === "Human Resources Team");
-                        const defaultTeam = hrTeam || teams[0];
-
-                        if (defaultTeam) {
+                        if (teams.length > 0) {
+                            const defaultTeam = teams[0];
                             setSelectedTeam(defaultTeam);
                             TeamService.storageTeam(defaultTeam);
                             showToast(
@@ -68,15 +67,23 @@ const HomePage: React.FC = () => {
                             );
                         }
                     }
-
+                }
+                // Handle case when no teams are configured
+                else if (initResponse.data?.requires_team_upload) {
+                    console.log('No teams configured. User needs to upload a team configuration.');
+                    setSelectedTeam(null);
+                    showToast(
+                        "Welcome! Please upload a team configuration file to get started.",
+                        "info"
+                    );
                 }
 
             } catch (error) {
                 console.error('Error initializing team from backend:', error);
-                showToast("Team initialization failed", "warning");
-
-                // Fallback to the old client-side method
+                showToast("Team initialization failed. You can still upload a custom team configuration.", "info");
 
+                // Don't block the user - allow them to upload custom teams
+                setSelectedTeam(null);
             } finally {
                 setIsLoadingTeam(false);
             }
@@ -125,12 +132,19 @@ const HomePage: React.FC = () => {
                             "success"
                         );
                     }
-
+                } else if (initResponse.data?.requires_team_upload) {
+                    // Handle case when no teams are available
+                    setSelectedTeam(null);
+                    showToast(
+                        "No teams are configured. Please upload a team configuration to continue.",
+                        "info"
+                    );
                 } else {
                     throw new Error('Invalid response from init_team endpoint');
                 }
             } catch (error) {
                 console.error('Error setting current team:', error);
+                showToast("Error switching team. Please try again.", "warning");
             } finally {
                 setIsLoadingTeam(false);
             }

src/frontend/src/services/TeamService.tsx

@@ -27,7 +27,9 @@ export class TeamService {
         success: boolean;
         data?: {
             status: string;
-            team_id: string;
+            team_id?: string;
+            team?: any;
+            requires_team_upload?: boolean;
         };
         error?: string;
     }> {