imporve features

2025-11-14 07:23:56 +01:00
parent 9bc048d360
commit a8d8828935
32 changed files with 5436 additions and 271 deletions
--- a/services/forecasting/app/services/forecasting_service.py
+++ b/services/forecasting/app/services/forecasting_service.py
@@ -1056,13 +1056,13 @@ class EnhancedForecastingService:
        - External service is unavailable
        """
        try:
-            # Get tenant's calendar ID
-            calendar_id = await self.data_client.get_tenant_calendar(tenant_id)
+            # Get tenant's calendar information
+            calendar_info = await self.data_client.fetch_tenant_calendar(tenant_id)

-            if calendar_id:
+            if calendar_info:
                # Check school holiday via external service
                is_school_holiday = await self.data_client.check_school_holiday(
-                    calendar_id=calendar_id,
+                    calendar_id=calendar_info["calendar_id"],
                    check_date=date_obj.isoformat(),
                    tenant_id=tenant_id
                )