Merge branch 'macae-v3-dev-v2-vip' into psl-waf-macaev3

Author: Roopan-Microsoft

src/backend/app_kernel.py

@@ -73,7 +73,7 @@
     allow_origins=[
         "http://localhost:3000",    # Add this for local development
         "https://localhost:3000",   # Add this if using HTTPS locally
-        "http://127.0.0.1:3000",
+        "https://127.0.0.1:3000",
         "http://127.0.0.1:3001",
     ],  # Allow all origins for development; restrict in production
     allow_credentials=True,
@@ -598,9 +598,7 @@ async def approve_step_endpoint(
 @app.get("/api/plans")
 async def get_plans(
     request: Request,
-    session_id: Optional[str] = Query(None),
     plan_id: Optional[str] = Query(None),
-    team_id: Optional[str] = Query(None),
 ):
     """
     Retrieve plans for the current user.
@@ -673,20 +671,7 @@ async def get_plans(
 
     # # Initialize memory context
     memory_store = await DatabaseFactory.get_database(user_id=user_id)
-    if session_id:
-        plan = await memory_store.get_plan_by_session(session_id=session_id)
-        if not plan:
-            track_event_if_configured(
-                "GetPlanBySessionNotFound",
-                {"status_code": 400, "detail": "Plan not found"},
-            )
-            raise HTTPException(status_code=404, detail="Plan not found")
 
-        # Use get_steps_by_plan to match the original implementation
-        steps = await memory_store.get_steps_by_plan(plan_id=plan.id)
-        plan_with_steps = PlanWithSteps(**plan.model_dump(), steps=steps)
-        plan_with_steps.update_step_counts()
-        return [plan_with_steps]
     if plan_id:
         plan = await memory_store.get_plan_by_plan_id(plan_id=plan_id)
         if not plan:
@@ -712,7 +697,11 @@ async def get_plans(
 
         return [plan_with_steps, formatted_messages]
 
-    all_plans = await memory_store.get_all_plans()
+    current_team = await memory_store.get_current_team(user_id=user_id)
+    if not current_team:
+      return []
+    
+    all_plans = await memory_store.get_all_plans_by_team_id(team_id=current_team.id)
     # Fetch steps for all plans concurrently
     steps_for_all_plans = await asyncio.gather(
         *[memory_store.get_steps_by_plan(plan_id=plan.id) for plan in all_plans]

src/backend/common/database/cosmosdb.py

@@ -259,6 +259,16 @@ async def get_all_plans(self) -> List[Plan]:
         ]
         return await self.query_items(query, parameters, Plan)
 
+    async def get_all_plans_by_team_id(self, team_id: str) -> List[Plan]:
+        """Retrieve all plans for a specific team."""
+        query = "SELECT * FROM c WHERE c.team_id=@team_id AND c.data_type=@data_type and c.user_id=@user_id"
+        parameters = [
+            {"name": "@user_id", "value": self.user_id},
+            {"name": "@team_id", "value": team_id},
+            {"name": "@data_type", "value": "plan"},
+        ]
+        return await self.query_items(query, parameters, Plan)
+
     # Step Operations
     async def add_step(self, step: Step) -> None:
         """Add a step to CosmosDB."""
@@ -434,23 +444,22 @@ async def update_team(self, team: TeamConfiguration) -> None:
         """
         await self.update_item(team)
 
-    async def get_current_team(self, user_id: str, team_id: str) -> UserCurrentTeam:
+    async def get_current_team(self, user_id: str) -> Optional[UserCurrentTeam]:
         """Retrieve the current team for a user."""
         await self._ensure_initialized()
         if self.container is None:
             return None
 
-        query = "SELECT * FROM c WHERE c.user_id=@user_id AND c.is_default=true"
+        query = "SELECT * FROM c WHERE c.data_type=@data_type AND c.user_id=@user_id"
         parameters = [
+            {"name": "@data_type", "value": "user_current_team"},
             {"name": "@user_id", "value": user_id},
-            {"name": "@team_id", "value": team_id},
         ]
 
-        items = self.container.query_items(query=query, parameters=parameters)
-        async for item in items:
-            return UserCurrentTeam(**item)
+        # Get the appropriate model class
+        teams = await self.query_items(query, parameters, UserCurrentTeam)
+        return teams[0] if teams else None
 
-        return None
     async def set_current_team(self, current_team: UserCurrentTeam) -> None:
         """Set the current team for a user."""
         await self._ensure_initialized()

src/backend/common/database/database_base.py

@@ -106,7 +106,10 @@ async def get_plan(self, plan_id: str) -> Optional[Plan]:
     async def get_all_plans(self) -> List[Plan]:
         """Retrieve all plans for the user."""
         pass
-
+    @abstractmethod
+    async def get_all_plans_by_team_id(self, team_id: str) -> List[Plan]:
+        """Retrieve all plans for a specific team."""
+        pass
     @abstractmethod
     async def get_data_by_type_and_session_id(
         self, data_type: str, session_id: str
@@ -192,7 +195,7 @@ async def get_steps_for_plan(self, plan_id: str) -> List[Step]:
         pass
 
     @abstractmethod
-    async def get_current_team(self, user_id: str, team_id: str) -> UserCurrentTeam:
+    async def get_current_team(self, user_id: str) -> Optional[UserCurrentTeam]:
         """Retrieve the current team for a user."""
         pass
 

src/backend/common/models/messages_kernel.py

@@ -119,7 +119,7 @@ class Plan(BaseDataModel):
     team_id: Optional[str] = None
     human_clarification_request: Optional[str] = None
     human_clarification_response: Optional[str] = None
-
+    
 
 class Step(BaseDataModel):
     """Represents an individual step (task) within a plan."""