company based templates

app/services/dispatcher.py

@@ -36,24 +36,12 @@ class NotificationDispatcher:
     ) -> Optional[Dict[str, Any]]:
         """
         Fetch notification_channels and notification_templates from scm_merchant_settings.
-        First tries merchant_id-specific settings, then falls back to merchant_type='company'.
+        Always uses the company-level settings doc (merchant_type='company').
         Returns dict with both keys, or None if not found.
         """
         db = get_database()
         projection = {"_id": 0, "notification_channels": 1, "notification_templates": 1}
 
-        doc = await db[settings.MERCHANT_SETTINGS_COLLECTION].find_one(
-            {"merchant_id": merchant_id},
-            projection,
-        )
-        if doc:
-            return doc
-
-        # Fallback: use company-level settings (merchant_type = "company")
-        logger.info(
-            "No merchant settings found for merchant_id, falling back to company-level settings",
-            extra={"event": "merchant_settings_fallback", "merchant_id": merchant_id},
-        )
         company_doc = await db[settings.MERCHANT_SETTINGS_COLLECTION].find_one(
             {"merchant_type": "company"},
             projection,
@@ -146,14 +134,14 @@ class NotificationDispatcher:
                     "$set": {
                         "status": NotificationStatus.FAILED.value,
                         "channel_results": {
-                            "error": f"No notification_channels config found for merchant {merchant_id} and no company-level fallback exists"
+                            "error": "No company-level notification_channels config found (merchant_type=company)"
                         },
                         "updated_at": datetime.utcnow(),
                     }
                 },
             )
             logger.error(
-                "Dispatch failed: merchant settings not found and no company fallback",
+                "Dispatch failed: company-level merchant settings not found",
                 extra={
                     "event": "notification_dispatch_failure",
                     "notification_id": nid,