imporve features

services/external/app/api/calendar_operations.py

@@ -213,17 +213,17 @@ async def check_is_school_holiday(
     response_model=TenantLocationContextResponse
 )
 async def get_tenant_location_context(
-    tenant_id: UUID = Depends(get_current_user_dep),
+    tenant_id: str = Path(..., description="Tenant ID"),
+    current_user: dict = Depends(get_current_user_dep),
     db: AsyncSession = Depends(get_db)
 ):
     """Get location context for a tenant including school calendar assignment (cached)"""
     try:
-        tenant_id_str = str(tenant_id)
 
         # Check cache first
-        cached = await cache.get_cached_tenant_context(tenant_id_str)
+        cached = await cache.get_cached_tenant_context(tenant_id)
         if cached:
-            logger.debug("Returning cached tenant context", tenant_id=tenant_id_str)
+            logger.debug("Returning cached tenant context", tenant_id=tenant_id)
             return TenantLocationContextResponse(**cached)
 
         # Cache miss - fetch from database
@@ -261,11 +261,16 @@ async def get_tenant_location_context(
 )
 async def create_or_update_tenant_location_context(
     request: TenantLocationContextCreateRequest,
-    tenant_id: UUID = Depends(get_current_user_dep),
+    tenant_id: str = Path(..., description="Tenant ID"),
+    current_user: dict = Depends(get_current_user_dep),
     db: AsyncSession = Depends(get_db)
 ):
     """Create or update tenant location context"""
     try:
+
+        # Convert to UUID for use with repository
+        tenant_uuid = UUID(tenant_id)
+
         repo = CalendarRepository(db)
 
         # Validate calendar_id if provided
@@ -279,7 +284,7 @@ async def create_or_update_tenant_location_context(
 
         # Create or update context
         context_obj = await repo.create_or_update_tenant_location_context(
-            tenant_id=tenant_id,
+            tenant_id=tenant_uuid,
             city_id=request.city_id,
             school_calendar_id=request.school_calendar_id,
             neighborhood=request.neighborhood,
@@ -288,13 +293,13 @@ async def create_or_update_tenant_location_context(
         )
 
         # Invalidate cache since context was updated
-        await cache.invalidate_tenant_context(str(tenant_id))
+        await cache.invalidate_tenant_context(tenant_id)
 
         # Get full context with calendar details
-        context = await repo.get_tenant_with_calendar(tenant_id)
+        context = await repo.get_tenant_with_calendar(tenant_uuid)
 
         # Cache the new context
-        await cache.set_cached_tenant_context(str(tenant_id), context)
+        await cache.set_cached_tenant_context(tenant_id, context)
 
         return TenantLocationContextResponse(**context)
 
@@ -317,13 +322,18 @@ async def create_or_update_tenant_location_context(
     status_code=204
 )
 async def delete_tenant_location_context(
-    tenant_id: UUID = Depends(get_current_user_dep),
+    tenant_id: str = Path(..., description="Tenant ID"),
+    current_user: dict = Depends(get_current_user_dep),
     db: AsyncSession = Depends(get_db)
 ):
     """Delete tenant location context"""
     try:
+
+        # Convert to UUID for use with repository
+        tenant_uuid = UUID(tenant_id)
+
         repo = CalendarRepository(db)
-        deleted = await repo.delete_tenant_location_context(tenant_id)
+        deleted = await repo.delete_tenant_location_context(tenant_uuid)
 
         if not deleted:
             raise HTTPException(
@@ -347,6 +357,97 @@ async def delete_tenant_location_context(
         )
 
 
+# ===== Calendar Suggestion Endpoint =====
+
+@router.post(
+    route_builder.build_base_route("location-context/suggest-calendar")
+)
+async def suggest_calendar_for_tenant(
+    tenant_id: str = Path(..., description="Tenant ID"),
+    current_user: dict = Depends(get_current_user_dep),
+    db: AsyncSession = Depends(get_db)
+):
+    """
+    Suggest an appropriate school calendar for a tenant based on location and POI data.
+
+    This endpoint analyzes:
+    - Tenant's city location
+    - Detected schools nearby (from POI detection)
+    - Available calendars for the city
+    - Bakery-specific heuristics (primary schools = stronger morning rush)
+
+    Returns a suggestion with confidence score and reasoning.
+    Does NOT automatically assign - requires admin approval.
+    """
+    try:
+        from app.utils.calendar_suggester import CalendarSuggester
+        from app.repositories.poi_context_repository import POIContextRepository
+
+        tenant_uuid = UUID(tenant_id)
+
+        # Get tenant's location context
+        calendar_repo = CalendarRepository(db)
+        location_context = await calendar_repo.get_tenant_location_context(tenant_uuid)
+
+        if not location_context:
+            raise HTTPException(
+                status_code=404,
+                detail="Location context not found. Create location context first."
+            )
+
+        city_id = location_context.city_id
+
+        # Get available calendars for city
+        calendars_result = await calendar_repo.get_calendars_by_city(city_id, enabled_only=True)
+        calendars = calendars_result.get("calendars", []) if calendars_result else []
+
+        # Get POI context if available
+        poi_repo = POIContextRepository(db)
+        poi_context = await poi_repo.get_by_tenant_id(tenant_uuid)
+        poi_data = poi_context.to_dict() if poi_context else None
+
+        # Generate suggestion
+        suggester = CalendarSuggester()
+        suggestion = suggester.suggest_calendar_for_tenant(
+            city_id=city_id,
+            available_calendars=calendars,
+            poi_context=poi_data,
+            tenant_data=None  # Could include tenant info if needed
+        )
+
+        # Format for admin display
+        admin_message = suggester.format_suggestion_for_admin(suggestion)
+
+        logger.info(
+            "Calendar suggestion generated",
+            tenant_id=tenant_id,
+            city_id=city_id,
+            suggested_calendar=suggestion.get("suggested_calendar_id"),
+            confidence=suggestion.get("confidence")
+        )
+
+        return {
+            **suggestion,
+            "admin_message": admin_message,
+            "tenant_id": tenant_id,
+            "current_calendar_id": str(location_context.school_calendar_id) if location_context.school_calendar_id else None
+        }
+
+    except HTTPException:
+        raise
+    except Exception as e:
+        logger.error(
+            "Error generating calendar suggestion",
+            tenant_id=tenant_id,
+            error=str(e),
+            exc_info=True
+        )
+        raise HTTPException(
+            status_code=500,
+            detail=f"Error generating calendar suggestion: {str(e)}"
+        )
+
+
 # ===== Helper Endpoints =====
 
 @router.get(