dashboard layout and widget

app/dashboard/constants.py

@@ -30,7 +30,7 @@ class DashboardStatus(str, Enum):
 
 # MongoDB Collections
 DASHBOARD_USER_LAYOUTS_COLLECTION = "dashboard_user_layouts"
-WIDGET_CATALOG_COLLECTION = "bloom_dashboard_widgets"
+WIDGET_CATALOG_COLLECTION = "dashboard_widgets"
 
 # Chart Widget IDs and Handlers
 CHART_WIDGET_IDS = {

app/dashboard/controllers/dashboard_router.py

@@ -26,14 +26,14 @@ async def get_dashboard_layout(
     _: TokenUser = Depends(require_scm_permission("dashboard", "view"))
 ):
     """
-    Get dashboard layout for merchant+role+associate combination.
+    Get dashboard layout for merchant+role combination.
     Returns layout or empty with status true if no layout exists.
     """
     try:
         layout_doc = await DashboardService.get_layout(
             merchant_id=current_user.merchant_id,
             role_id=current_user.role,
-            associate_id=getattr(current_user, 'associate_id', None)
+            user_id=getattr(current_user, 'user_id', None)
         )
         
         if layout_doc:
@@ -80,7 +80,7 @@ async def update_dashboard_layout(
             merchant_id=current_user.merchant_id,
             role_id=current_user.role,
             layout_data=layout_data,
-            associate_id=getattr(current_user, 'associate_id', None),
+            user_id=getattr(current_user, 'user_id', None),
             updated_by=current_user.user_id
         )
         
@@ -121,7 +121,7 @@ async def update_widget_positions(
             merchant_id=current_user.merchant_id,
             role_id=current_user.role,
             position_updates=positions_data.items,
-            associate_id=getattr(current_user, 'associate_id', None),
+            user_id=getattr(current_user, 'user_id', None),
             updated_by=current_user.user_id
         )
         
@@ -168,7 +168,7 @@ async def create_dashboard_widget(
             merchant_id=current_user.merchant_id,
             role_id=current_user.role,
             widget_request=widget_data,
-            associate_id=getattr(current_user, 'associate_id', None),
+            user_id=getattr(current_user, 'user_id', None),
             updated_by=current_user.user_id
         )
         
@@ -213,7 +213,7 @@ async def delete_dashboard_widget(
             merchant_id=current_user.merchant_id,
             role_id=current_user.role,
             widget_id=widget_id,
-            associate_id=getattr(current_user, 'associate_id', None),
+            user_id=getattr(current_user, 'user_id', None),
             updated_by=current_user.user_id
         )
         
@@ -257,7 +257,7 @@ async def reset_dashboard_layout(
         deleted = await DashboardService.reset_layout(
             merchant_id=current_user.merchant_id,
             role_id=current_user.role,
-            associate_id=getattr(current_user, 'associate_id', None)
+            user_id=getattr(current_user, 'user_id', None)
         )
         
         logger.info(f"Dashboard layout reset", extra={
@@ -333,4 +333,6 @@ async def list_dashboard_layouts(
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
             detail="Error retrieving dashboard layouts"
-        )
+        )
+    
+    

app/dashboard/controllers/widget_router.py

@@ -9,14 +9,14 @@ from app.core.schemas import StatusResponse
 from app.dashboard.schemas.widget_schemas import (
     ChartWidgetRequest, ChartWidgetResponse, ChartListRequest,
     TableWidgetRequest, TableWidgetResponse, TableListRequest,
-    KPIStatsRequest, KPIStatsResponse, IndividualKPIRequest, 
+    KPIStatsRequest, KPIStatsResponse, IndividualKPIRequest,
     IndividualKPIResponse, KPIListRequest
 )
 from app.dependencies.auth import get_current_user, TokenUser
 from app.dependencies.scm_permissions import require_scm_permission
 from app.dashboard.services.widget_data_service import WidgetDataService
 from app.dashboard.constants import (
-    CHART_WIDGET_IDS, TABLE_WIDGET_IDS, KPI_WIDGET_IDS, 
+    CHART_WIDGET_IDS, TABLE_WIDGET_IDS, KPI_WIDGET_IDS,
     is_valid_widget_id, WIDGET_CATALOG_COLLECTION
 )
 from app.nosql import get_database
@@ -30,11 +30,9 @@ async def require_widget_access(widget_id: str, current_user: TokenUser) -> Toke
     """Check if user has access to specific widget via access_roles.widget_access."""
     try:
         db = get_database()
-        access_roles_collection = db["access_roles"]
-        
+        access_roles_collection = db["scm_access_roles"]
         # Find user's role permissions
         role_doc = await access_roles_collection.find_one({
-            "merchant_id": current_user.merchant_id,
             "role_id": current_user.role
         })
         
@@ -302,7 +300,6 @@ async def list_chart_widgets(
         # Build query filters
         query = {
             "type": "chart",
-            "status": "active"
         }
         
         # Add request filters
@@ -310,8 +307,8 @@ async def list_chart_widgets(
             query.update(request.filters)
         
         if request.widget_types:
-            query["widget_type"] = {"$in": request.widget_types}
-        
+            query["type"] = {"$in": request.widget_types}
+       
         if request.categories:
             query["category"] = {"$in": request.categories}
         
@@ -374,8 +371,7 @@ async def list_table_widgets(
         
         # Build query filters
         query = {
-            "type": "table",
-            "status": "active"
+            "type": "table"
         }
         
         # Add request filters
@@ -383,8 +379,8 @@ async def list_table_widgets(
             query.update(request.filters)
         
         if request.widget_types:
-            query["widget_type"] = {"$in": request.widget_types}
-        
+            query["type"] = {"$in": request.widget_types}
+       
         if request.categories:
             query["category"] = {"$in": request.categories}
         
@@ -447,8 +443,7 @@ async def list_kpi_widgets(
         
         # Build query filters
         query = {
-            "type": "kpi",
-            "status": "active"
+            "type": "kpi"
         }
         
         # Add request filters

app/dashboard/services/dashboard_service.py

@@ -27,7 +27,7 @@ class DashboardService:
     async def get_layout(
         merchant_id: str, 
         role_id: str, 
-        associate_id: Optional[str] = None
+        user_id: Optional[str] = None
     ) -> Optional[Dict[str, Any]]:
         """
         Get dashboard layout for merchant+role+associate combination.
@@ -43,11 +43,11 @@ class DashboardService:
                 "role_id": role_id
             }
             
-            # Add associate_id if provided (for personal layouts)
-            if associate_id:
-                query["associate_id"] = associate_id
+            # Add user_id if provided (for personal layouts)
+            if user_id:
+                query["user_id"] = user_id
             else:
-                query["associate_id"] = {"$exists": False}
+                query["user_id"] = {"$exists": False}
             
             layout_doc = await collection.find_one(query)
             
@@ -55,14 +55,14 @@ class DashboardService:
                 logger.info(f"Layout found", extra={
                     "merchant_id": merchant_id,
                     "role_id": role_id,
-                    "associate_id": associate_id,
+                    "user_id": user_id,
                     "widget_count": len(layout_doc.get("widgets", []))
                 })
             else:
                 logger.info(f"No layout found", extra={
                     "merchant_id": merchant_id,
                     "role_id": role_id,
-                    "associate_id": associate_id
+                    "user_id": user_id
                 })
             
             return layout_doc
@@ -76,7 +76,7 @@ class DashboardService:
         merchant_id: str,
         role_id: str,
         layout_data: DashboardLayoutCreate,
-        associate_id: Optional[str] = None,
+        user_id: Optional[str] = None,
         updated_by: Optional[str] = None
     ) -> Dict[str, Any]:
         """
@@ -93,8 +93,8 @@ class DashboardService:
                 "role_id": role_id
             }
             
-            if associate_id:
-                query["associate_id"] = associate_id
+            if user_id:
+                query["user_id"] = user_id
             
             # Hydrate widget data_config from catalog
             widgets_with_config = []
@@ -141,7 +141,7 @@ class DashboardService:
             logger.info(f"Layout {'created' if result.upserted_id else 'updated'}", extra={
                 "merchant_id": merchant_id,
                 "role_id": role_id,
-                "associate_id": associate_id,
+                "user_id": user_id,
                 "widget_count": len(widgets_with_config),
                 "upserted": bool(result.upserted_id)
             })
@@ -157,7 +157,7 @@ class DashboardService:
         merchant_id: str,
         role_id: str,
         position_updates: List[WidgetPositionUpdate],
-        associate_id: Optional[str] = None,
+        user_id: Optional[str] = None,
         updated_by: Optional[str] = None
     ) -> Dict[str, Any]:
         """
@@ -174,8 +174,8 @@ class DashboardService:
                 "role_id": role_id
             }
             
-            if associate_id:
-                query["associate_id"] = associate_id
+            if user_id:
+                query["user_id"] = user_id
             
             # Get current layout
             current_layout = await collection.find_one(query)
@@ -214,7 +214,7 @@ class DashboardService:
             logger.info(f"Widget positions updated", extra={
                 "merchant_id": merchant_id,
                 "role_id": role_id,
-                "associate_id": associate_id,
+                "user_id": user_id,
                 "updates_count": len(position_updates)
             })
             
@@ -229,7 +229,7 @@ class DashboardService:
         merchant_id: str,
         role_id: str,
         widget_request: CreateWidgetRequest,
-        associate_id: Optional[str] = None,
+        user_id: Optional[str] = None,
         updated_by: Optional[str] = None
     ) -> Dict[str, Any]:
         """
@@ -246,8 +246,8 @@ class DashboardService:
                 "role_id": role_id
             }
             
-            if associate_id:
-                query["associate_id"] = associate_id
+            if user_id:
+                query["user_id"] = user_id
             
             # Get current layout or create new one
             current_layout = await collection.find_one(query)
@@ -258,7 +258,7 @@ class DashboardService:
                     grid_settings=None  # Will use defaults
                 )
                 return await DashboardService.create_or_update_layout(
-                    merchant_id, role_id, layout_data, associate_id, updated_by
+                    merchant_id, role_id, layout_data, user_id, updated_by
                 )
             
             # Add widget to existing layout
@@ -293,7 +293,7 @@ class DashboardService:
             logger.info(f"Widget added to layout", extra={
                 "merchant_id": merchant_id,
                 "role_id": role_id,
-                "associate_id": associate_id,
+                "user_id": user_id,
                 "widget_id": widget_request.widget_id,
                 "widget_type": widget_request.type
             })
@@ -309,7 +309,7 @@ class DashboardService:
         merchant_id: str,
         role_id: str,
         widget_id: str,
-        associate_id: Optional[str] = None,
+        user_id: Optional[str] = None,
         updated_by: Optional[str] = None
     ) -> Dict[str, Any]:
         """
@@ -326,8 +326,8 @@ class DashboardService:
                 "role_id": role_id
             }
             
-            if associate_id:
-                query["associate_id"] = associate_id
+            if user_id:
+                query["user_id"] = user_id
             
             # Get current layout
             current_layout = await collection.find_one(query)
@@ -355,7 +355,7 @@ class DashboardService:
             logger.info(f"Widget removed from layout", extra={
                 "merchant_id": merchant_id,
                 "role_id": role_id,
-                "associate_id": associate_id,
+                "user_id": user_id,
                 "widget_id": widget_id
             })
             
@@ -369,7 +369,7 @@ class DashboardService:
     async def reset_layout(
         merchant_id: str,
         role_id: str,
-        associate_id: Optional[str] = None
+        user_id: Optional[str] = None
     ) -> bool:
         """
         Delete layout for merchant+role+associate combination.
@@ -385,17 +385,17 @@ class DashboardService:
                 "role_id": role_id
             }
             
-            if associate_id:
-                query["associate_id"] = associate_id
+            if user_id:
+                query["user_id"] = user_id
             else:
-                query["associate_id"] = {"$exists": False}
+                query["user_id"] = {"$exists": False}
             
             result = await collection.delete_one(query)
             
             logger.info(f"Layout reset", extra={
                 "merchant_id": merchant_id,
                 "role_id": role_id,
-                "associate_id": associate_id,
+                "user_id": user_id,
                 "deleted": result.deleted_count > 0
             })
             

app/dashboard/services/widget_data_service.py

@@ -4,6 +4,7 @@ Handles data aggregation and retrieval for dashboard widgets.
 """
 from datetime import datetime, timedelta
 from typing import Optional, List, Dict, Any
+import json
 from sqlalchemy import text
 from app.core.logging import get_logger
 from app.sql import async_session
@@ -41,9 +42,10 @@ class WidgetDataService:
             if use_cache:
                 cached_data = await cache_service.get(cache_key)
                 if cached_data:
-                    cached_data["cached"] = True
-                    return cached_data
-            
+                    data = json.loads(cached_data)
+                    data["cached"] = True
+                    return data
+           
             # Get widget configuration
             widget_config = get_widget_config(widget_id)
             if not widget_config:
@@ -64,8 +66,8 @@ class WidgetDataService:
             # Cache the result
             if use_cache:
                 ttl = get_cache_ttl_for_widget(widget_id)
-                await cache_service.set(cache_key, data, ttl)
-            
+                await cache_service.set(cache_key, json.dumps(data), ttl)
+           
             return data
             
         except Exception as e:
@@ -94,9 +96,10 @@ class WidgetDataService:
             if use_cache:
                 cached_data = await cache_service.get(cache_key)
                 if cached_data:
-                    cached_data["cached"] = True
-                    return cached_data
-            
+                    data = json.loads(cached_data)
+                    data["cached"] = True
+                    return data
+               
             # Get widget configuration
             widget_config = get_widget_config(widget_id)
             if not widget_config:
@@ -117,8 +120,8 @@ class WidgetDataService:
             # Cache the result
             if use_cache:
                 ttl = get_cache_ttl_for_widget(widget_id)
-                await cache_service.set(cache_key, data, ttl)
-            
+                await cache_service.set(cache_key, json.dumps(data), ttl)
+           
             return data
             
         except Exception as e:
@@ -143,8 +146,8 @@ class WidgetDataService:
             if use_cache:
                 cached_data = await cache_service.get(cache_key)
                 if cached_data:
-                    return cached_data
-            
+                    return json.loads(cached_data)
+           
             # Get KPI data (mock for now)
             kpis = {}
             charts = {} if include_charts else None
@@ -199,8 +202,8 @@ class WidgetDataService:
             # Cache the result
             if use_cache:
                 ttl = get_cache_ttl_for_widget("kpi_stats")
-                await cache_service.set(cache_key, data, ttl)
-            
+                await cache_service.set(cache_key, json.dumps(data), ttl)
+           
             return data
             
         except Exception as e:

app/main.py

@@ -8,6 +8,7 @@ from fastapi.responses import JSONResponse
 from fastapi.exceptions import RequestValidationError
 from jose import JWTError
 from pymongo.errors import PyMongoError, ConnectionFailure, OperationFailure
+from app.cache import close_redis_connection, connect_to_redis
 from app.core.logging import get_logger, setup_logging
 from app.core.config import settings
 
@@ -86,7 +87,7 @@ async def startup_event():
     logger.info("Starting SCM Microservice")
     await connect_to_mongo()
     await connect_to_database()
-    
+    await connect_to_redis()
     # Start sync workers
     try:
         from app.superadmin.sync_service import get_sync_management_service
@@ -115,6 +116,7 @@ async def shutdown_event():
     
     await close_mongo_connection()
     await disconnect_from_database()
+    await close_redis_connection()
     logger.info("SCM Microservice shut down successfully")