notfication ms integration

app/auth/controllers/service_partners_router.py

@@ -31,7 +31,7 @@ async def send_service_partners_otp(request: ServiceProfessionalSendOTPRequest):
     2. Verifies service professional exists with this phone in scm_service_partners collection
     3. Validates professional is active
     4. Generates random 6-digit OTP
-    5. Sends OTP via WATI WhatsApp API
+    5. Sends OTP via notification-ms (WhatsApp/SMS)
     6. Stores OTP in Redis with 5-minute expiration
     
     **Security:**

app/auth/controllers/staff_router.py

@@ -35,7 +35,7 @@ async def send_staff_otp(request: StaffSendOTPRequest):
     2. Verifies staff user exists with this phone
     3. Validates user is staff role (not admin)
     4. Generates random 6-digit OTP
-    5. Sends OTP via WATI WhatsApp API
+    5. Sends OTP via notification-ms (WhatsApp/SMS)
     6. Stores OTP in database with 5-minute expiration
     
     **Security:**
@@ -123,7 +123,7 @@ async def staff_login_mobile_otp(
     
     **Security:**
     - Only allows staff/employee roles (not admin/super_admin)
-    - OTP validation via WATI WhatsApp
+    - OTP validation via notification-ms
     - OTP expires in 5 minutes
     - Maximum 3 verification attempts
     - One-time use only

app/auth/services/customer_auth_service.py

@@ -55,7 +55,7 @@ class CustomerAuthService:
     
     async def send_otp(self, mobile: str) -> Tuple[bool, str, int]:
         """
-        Send OTP to customer mobile number via WATI WhatsApp API.
+        Send OTP to customer mobile number via notification-ms.
         
         Args:
             mobile: Customer mobile number
@@ -84,7 +84,6 @@ class CustomerAuthService:
                 "expires_at": expires_at.isoformat(),
                 "attempts": 0,
                 "verified": False,
-                "wati_message_id": None,
                 "delivery_status": "pending"
             }
             
@@ -106,7 +105,6 @@ class CustomerAuthService:
                 otp=otp,
                 expiry_minutes=expiry_minutes,
                 merchant_id=merchant_id or "",
-                template_name=settings.WATI_OTP_TEMPLATE_NAME,
             )
 
             if queued:

app/auth/services/service_partners_auth_service.py

@@ -71,7 +71,7 @@ class ServiceProfessionalAuthService:
     
     async def send_otp(self, phone: str) -> Tuple[bool, str, int]:
         """
-        Send OTP to service professional mobile number via WATI WhatsApp API.
+        Send OTP to service professional mobile number via notification-ms.
         
         Args:
             phone: Service professional mobile number
@@ -116,7 +116,6 @@ class ServiceProfessionalAuthService:
                 "expires_at": expires_at.isoformat(),
                 "attempts": 0,
                 "verified": False,
-                "wati_message_id": None,
                 "delivery_status": "pending"
             }
             
@@ -135,7 +134,6 @@ class ServiceProfessionalAuthService:
                 otp=otp,
                 expiry_minutes=expiry_minutes,
                 merchant_id=merchant_id,
-                template_name=settings.WATI_STAFF_OTP_TEMPLATE_NAME,
             )
 
             if queued:

app/auth/services/staff_auth_service.py

@@ -148,7 +148,6 @@ class StaffAuthService:
                 otp=otp,
                 expiry_minutes=expiry_minutes,
                 merchant_id=staff["merchant_id"],
-                template_name=settings.WATI_STAFF_OTP_TEMPLATE_NAME,
             )
 
             if queued:

app/core/config.py

@@ -57,18 +57,10 @@ class Settings(BaseSettings):
     TWILIO_AUTH_TOKEN: Optional[str] = os.getenv("TWILIO_AUTH_TOKEN")
     TWILIO_PHONE_NUMBER: Optional[str] = os.getenv("TWILIO_PHONE_NUMBER")
 
-    # WATI WhatsApp template names (credentials are per-merchant in notification-ms)
-    WATI_OTP_TEMPLATE_NAME: str = os.getenv("WATI_OTP_TEMPLATE_NAME", "cust_otp")
-    WATI_STAFF_OTP_TEMPLATE_NAME: str = os.getenv("WATI_STAFF_OTP_TEMPLATE_NAME", "staff_otp_login")
-
-    # SMTP Configuration (email is routed through notification-ms per-merchant)
-    # Kept as optional stubs so existing env files don't cause validation errors
-    SMTP_HOST: Optional[str] = None
-    SMTP_PORT: int = 587
-    SMTP_USERNAME: Optional[str] = None
-    SMTP_PASSWORD: Optional[str] = None
-    SMTP_FROM_EMAIL: Optional[str] = None
-    SMTP_USE_TLS: bool = True
+    # Notification template names (resolved by notification-ms dispatcher)
+    NOTIFICATION_TEMPLATE_OTP_VERIFICATION: str = os.getenv("NOTIFICATION_TEMPLATE_OTP_VERIFICATION", "otp")
+    NOTIFICATION_TEMPLATE_CREDENTIALS: str = os.getenv("NOTIFICATION_TEMPLATE_CREDENTIALS", "otp")
+    NOTIFICATION_TEMPLATE_PASSWORD_RESET: str = os.getenv("NOTIFICATION_TEMPLATE_PASSWORD_RESET", "otp")
 
     # Logging
     LOG_LEVEL: str = os.getenv("LOG_LEVEL", "INFO")

app/system_users/services/service.py

@@ -932,7 +932,6 @@ class SystemUserService:
                         name=user.first_name or user.username,
                         new_password=reset_link,
                         merchant_id=user.merchant_id or "",
-                        template_name="password_reset_link",
                     )
                     logger.info(f"Password reset notification queued for {user.phone}")
                 except Exception as nq_err:
@@ -991,7 +990,6 @@ class SystemUserService:
                 otp=otp,
                 expiry_minutes=expiry_minutes,
                 merchant_id=user.merchant_id or "",
-                template_name="otp",
             )
 
             if queued:

app/utils/notification_queue.py

@@ -3,26 +3,33 @@ Notification queue utility for auth-ms.
 Creates notification docs in MongoDB (notifications collection) and pushes
 notification_id to Redis queue for the notification-ms worker to consume.
 
-Uses the same queue name and doc shape as notification-ms so the worker
-picks them up seamlessly.
-
-Templates are company-level. merchant_name is passed as a variable
-in template_data for rendering (if applicable).
+auth-ms does NOT handle WATI/SMTP directly — all delivery is delegated to
+notification-ms which resolves per-merchant channel credentials.
 """
 import json
 import uuid
 from datetime import datetime
 from typing import Optional, Dict, Any, List
+from enum import Enum
 from app.core.logging import get_logger
+from app.core.config import settings
 from app.cache import cache_service
 from app.nosql import get_database
 
 logger = get_logger(__name__)
 
-QUEUE_NAME = "notifications:queue"
+NOTIFICATION_QUEUE_NAME = "notifications:queue"
 COLLECTION = "notifications"
 
 
+class NotificationChannel(str, Enum):
+    """Supported notification channels."""
+    WHATSAPP = "whatsapp"
+    SMS = "sms"
+    EMAIL = "email"
+    PUSH = "push"
+
+
 class NotificationQueue:
     """
     Enqueues notifications via MongoDB + Redis so notification-ms worker
@@ -36,9 +43,9 @@ class NotificationQueue:
         channels: List[str],
         template_name: str,
         template_data: Dict[str, Any],
-        merchant_id: str,
+        merchant_id: str = "",
         merchant_name: str = "",
-        priority: str = "high",
+        priority: str = "normal",
         source: str = "auth-ms",
         metadata: Optional[Dict[str, Any]] = None,
     ) -> bool:
@@ -74,15 +81,16 @@ class NotificationQueue:
             await db[COLLECTION].insert_one(doc)
 
             redis_client = cache_service.get_client()
-            redis_client.lpush(QUEUE_NAME, json.dumps({"notification_id": notification_id}))
+            redis_client.lpush(
+                NOTIFICATION_QUEUE_NAME,
+                json.dumps({"notification_id": notification_id}),
+            )
 
             logger.info(
                 "Notification queued",
                 extra={
-                    "event": "enqueued",
                     "notification_id": notification_id,
-                    "template_name": template_name,
-                    "queue": QUEUE_NAME,
+                    "template": template_name,
                     "channels": channels,
                     "recipient": recipient,
                 },
@@ -93,7 +101,7 @@ class NotificationQueue:
             logger.error(
                 "Notification queue failed",
                 exc_info=True,
-                extra={"event": "enqueue_failure", "template_name": template_name, "recipient": recipient},
+                extra={"template": template_name, "recipient": recipient},
             )
             return False
 
@@ -106,17 +114,17 @@ class NotificationQueue:
         expiry_minutes: int = 5,
         merchant_id: str = "",
         merchant_name: str = "",
-        template_name: str = "otp_verification",
-        channels: Optional[List[str]] = None,
+        channels: Optional[List[NotificationChannel]] = None,
+        template_name: Optional[str] = None,
     ) -> bool:
-        """Queue OTP notification via WhatsApp + SMS."""
+        """Queue OTP notification. Delivery handled by notification-ms."""
         if channels is None:
-            channels = ["whatsapp", "sms"]
+            channels = [NotificationChannel.WHATSAPP, NotificationChannel.SMS]
 
         return await NotificationQueue._enqueue(
             recipient=recipient,
-            channels=channels,
-            template_name=template_name,
+            channels=[ch.value for ch in channels],
+            template_name=template_name or settings.NOTIFICATION_TEMPLATE_OTP_VERIFICATION,
             template_data={
                 "otp": otp,
                 "expiry_minutes": str(expiry_minutes),
@@ -128,28 +136,27 @@ class NotificationQueue:
         )
 
     @staticmethod
-    async def send_welcome_credentials(
+    async def send_credentials(
         recipient: str,
-        employee_name: str,
+        name: str,
         username: str,
         password: str,
         merchant_id: str = "",
         merchant_name: str = "",
-        template_name: str = "welcome_credentials",
-        channels: Optional[List[str]] = None,
+        channels: Optional[List[NotificationChannel]] = None,
+        template_name: Optional[str] = None,
     ) -> bool:
-        """Queue welcome credentials notification via WhatsApp + SMS."""
+        """Queue welcome credentials notification. Delivery handled by notification-ms."""
         if channels is None:
-            channels = ["whatsapp", "sms"]
+            channels = [NotificationChannel.WHATSAPP, NotificationChannel.SMS]
 
         return await NotificationQueue._enqueue(
             recipient=recipient,
-            channels=channels,
-            template_name=template_name,
+            channels=[ch.value for ch in channels],
+            template_name=template_name or settings.NOTIFICATION_TEMPLATE_CREDENTIALS,
             template_data={
-                "name": employee_name,
-                "username": username,
-                "password": password,
+                "otp": password,
+                "expiry_minutes": "0",
                 "merchant_name": merchant_name,
             },
             merchant_id=merchant_id,
@@ -164,25 +171,20 @@ class NotificationQueue:
         new_password: str,
         merchant_id: str = "",
         merchant_name: str = "",
-        template_name: str = "otp",
-        channels: Optional[List[str]] = None,
+        channels: Optional[List[NotificationChannel]] = None,
+        template_name: Optional[str] = None,
     ) -> bool:
-        """Queue password reset notification via WhatsApp + SMS.
-
-        Uses the 'otp' template key (maps to staff_otp_login in WATI and sms_otp_temp
-        for SMS via merchant settings) with new_password as the 'otp' parameter.
-        The dispatcher resolves the correct per-channel template from merchant settings.
-        """
+        """Queue password reset notification. Delivery handled by notification-ms."""
         if channels is None:
-            channels = ["whatsapp", "sms"]
+            channels = [NotificationChannel.WHATSAPP, NotificationChannel.SMS]
 
         return await NotificationQueue._enqueue(
             recipient=recipient,
-            channels=channels,
-            template_name=template_name,
+            channels=[ch.value for ch in channels],
+            template_name=template_name or settings.NOTIFICATION_TEMPLATE_PASSWORD_RESET,
             template_data={
                 "otp": new_password,
-                "expiry_minutes": "0",  # not applicable for password reset
+                "expiry_minutes": "0",
                 "merchant_name": merchant_name,
             },
             merchant_id=merchant_id,