trovesuite 1.0.26__py3-none-any.whl → 1.0.27__py3-none-any.whl

trovesuite/configs/settings.py

@@ -79,6 +79,7 @@ class Settings:
     CORE_PLATFORM_UNIT_OF_MEASURE_TABLE = os.getenv("CORE_PLATFORM_UNIT_OF_MEASURE_TABLE", "core_platform.cp_unit_of_measures")
     CORE_PLATFORM_CURRENCY = os.getenv("CORE_PLATFORM_CURRENCY", "core_platform.cp_currencies")
     CORE_PLATFORM_THEMES_TABLE = os.getenv("CORE_PLATFORM_THEMES_TABLE", "core_platform.cp_themes")
+    CORE_PLATFORM_NOTIFICATION_EMAIL_CREDENTIALS_TABLE = os.getenv("CORE_PLATFORM_NOTIFICATION_EMAIL_CREDENTIALS_TABLE", "core_platform.cp_notification_email_credentials")
 
     # Mail Configurations
     MAIL_SENDER_EMAIL=os.getenv("MAIL_SENDER_EMAIL")

trovesuite/utils/helper.py

@@ -314,6 +314,75 @@ class Helper:
             # Log the error but don't fail the main operation
             logger.error(f"Failed to log activity: {str(e)}", exc_info=True)
 
+    @staticmethod
+    def get_email_credentials(tenant_id: Optional[str] = None) -> tuple[Optional[str], Optional[str]]:
+        """
+        Get email credentials for sending notifications.
+        If tenant_id is provided and tenant has custom email credentials, use those.
+        Otherwise, fall back to system default credentials.
+        
+        Args:
+            tenant_id: Optional tenant ID to check for tenant-specific credentials
+            
+        Returns:
+            Tuple of (email, password) or (None, None) if not configured
+        """
+        # If tenant_id is provided, check for tenant-specific credentials
+        if tenant_id:
+            try:
+                credentials_table = getattr(db_settings, 'CORE_PLATFORM_NOTIFICATION_EMAIL_CREDENTIALS_TABLE', 'core_platform.cp_notification_email_credentials')
+                tenant_credentials = DatabaseManager.execute_query(
+                    f"""SELECT notification_email, notification_password 
+                        FROM {credentials_table} 
+                        WHERE tenant_id = %s 
+                        AND delete_status = 'NOT_DELETED' 
+                        AND is_active = true""",
+                    (tenant_id,),
+                )
+                
+                if tenant_credentials and len(tenant_credentials) > 0:
+                    tenant_email = tenant_credentials[0].get('notification_email')
+                    tenant_password = tenant_credentials[0].get('notification_password')
+                    
+                    # If tenant has both email and password configured, use them
+                    if tenant_email and tenant_password:
+                        logger.info(
+                            f"Using tenant-specific email credentials for tenant {tenant_id}",
+                            extra={
+                                "extra_fields": {
+                                    "tenant_id": tenant_id,
+                                    "email": tenant_email
+                                }
+                            }
+                        )
+                        return (tenant_email, tenant_password)
+            except Exception as e:
+                logger.warning(
+                    f"Error fetching tenant email credentials for tenant {tenant_id}: {str(e)}",
+                    extra={
+                        "extra_fields": {
+                            "tenant_id": tenant_id,
+                            "error": str(e)
+                        }
+                    }
+                )
+        
+        # Fall back to system default credentials
+        mail_sender_email = getattr(db_settings, 'MAIL_SENDER_EMAIL', None)
+        mail_sender_pwd = getattr(db_settings, 'MAIL_SENDER_PWD', None)
+        
+        if tenant_id:
+            logger.info(
+                f"Using system default email credentials for tenant {tenant_id}",
+                extra={
+                    "extra_fields": {
+                        "tenant_id": tenant_id
+                    }
+                }
+            )
+        
+        return (mail_sender_email, mail_sender_pwd)
+
     @staticmethod
     def send_notification(
         email: str,
@@ -321,8 +390,19 @@ class Helper:
         text_template: str,
         html_template: str,
         variables: Optional[Dict[str, str]] = None,
+        tenant_id: Optional[str] = None,
     ):
-        """Send a dynamic notification email."""
+        """
+        Send a dynamic notification email.
+        
+        Args:
+            email: Recipient email address
+            subject: Email subject
+            text_template: Plain text email template
+            html_template: HTML email template
+            variables: Optional dictionary of variables to format templates
+            tenant_id: Optional tenant ID to use tenant-specific email credentials
+        """
         current_time = Helper.current_date_time()
         cdate = current_time["cdate"]
         ctime = current_time["ctime"]
@@ -345,12 +425,19 @@ class Helper:
         text_message = text_template.format(**safe_variables)
         html_message = html_template.format(**safe_variables)
 
-        # Build email data
-        mail_sender_email = getattr(db_settings, 'MAIL_SENDER_EMAIL', None)
-        mail_sender_pwd = getattr(db_settings, 'MAIL_SENDER_PWD', None)
+        # Get email credentials (tenant-specific or system default)
+        mail_sender_email, mail_sender_pwd = Helper.get_email_credentials(tenant_id)
 
         if not mail_sender_email or not mail_sender_pwd:
-            logger.error("MAIL_SENDER_EMAIL or MAIL_SENDER_PWD not configured in settings")
+            logger.error(
+                "Email credentials not configured. MAIL_SENDER_EMAIL or MAIL_SENDER_PWD not set in settings",
+                extra={
+                    "extra_fields": {
+                        "tenant_id": tenant_id,
+                        "receiver_email": email
+                    }
+                }
+            )
             return
 
         notification_data = NotificationEmailServiceWriteDto(
@@ -620,6 +707,8 @@ class Helper:
                         "status_color": config["color"],
                         "status_icon": config["icon"],
                         "actor_name": actor_name,
+                    },
+                    tenant_id=tenant_id,
                         "actor_email": actor_email,
                         "message": message_value,
                         "message_text": message_text,

{trovesuite-1.0.26.dist-info → trovesuite-1.0.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trovesuite
-Version: 1.0.26
+Version: 1.0.27
 Summary: TroveSuite services package providing authentication, authorization, notifications, Azure Storage, and other enterprise services for TroveSuite applications
 Home-page: https://dev.azure.com/brightgclt/trovesuite/_git/packages
 Author: Bright Debrah Owusu

{trovesuite-1.0.26.dist-info → trovesuite-1.0.27.dist-info}/RECORD

@@ -8,7 +8,7 @@ trovesuite/auth/auth_write_dto.py,sha256=rdwI7w6-9QZGv1H0PAGrjkLBCzaMHjgPIXeLb9R
 trovesuite/configs/__init__.py,sha256=h1mSZOaZ3kUy1ZMO_m9O9KklsxywM0RfMVZLh9h9WvQ,328
 trovesuite/configs/database.py,sha256=CdPurBNe2_Ymmn0fEkYHFPVaeCunGS1k0x1f3SfNlr4,11400
 trovesuite/configs/logging.py,sha256=mGjR2d4urVNry9l5_aXycMMtcY2RAFIpEL35hw33KZg,9308
-trovesuite/configs/settings.py,sha256=r3wyLdlLtnPzrTPV5Z4BytItLtfvQoP860waAfdecLA,6941
+trovesuite/configs/settings.py,sha256=LvUNqs1Qsuu97b_RGaaphT2FQ4uqiXq_4WJw9OV6TUE,7113
 trovesuite/entities/__init__.py,sha256=Dbl_03Bueyh2vOP2hykd40MmNMrl5nNHSRGP-kqwwNo,160
 trovesuite/entities/health.py,sha256=KaW7yxTQdymIPlnkJJkDqEebBXkD0a7A66i5GgNZLoE,2700
 trovesuite/entities/sh_response.py,sha256=1_sw3PpVaDxWsNiBU0W9YLHZgTFxEj4JJBLBfSY63Ho,1579
@@ -25,10 +25,10 @@ trovesuite/storage/storage_read_dto.py,sha256=o7EVJdwrwVZAaeyGU9O01WMECGVaytkvLR
 trovesuite/storage/storage_service.py,sha256=V7LIePIV6b_iuhm-9x8r4zwpZHgeRPL1YIe5IBnxhco,19768
 trovesuite/storage/storage_write_dto.py,sha256=vl1iCZ93bpFmpvkCrn587QtMtOA_TPDseXSoTuj9RTQ,1355
 trovesuite/utils/__init__.py,sha256=mDZuY77BphvQFYLmcWxjP5Tcq9ZZ3WXJWBKB1v6wzHU,185
-trovesuite/utils/helper.py,sha256=28KjFtiDS4IxuO13QBQUmU4dq9xUJDll9ewWetCrOcc,27061
+trovesuite/utils/helper.py,sha256=2Yc3mAM3zGS04pjtnQ8HeDn2JTE3n3srqZi-yObMxsM,30881
 trovesuite/utils/templates.py,sha256=_92k4-EkqWs-h0LNJxPgorbspmp24kDngS7O3qWIFyQ,20388
-trovesuite-1.0.26.dist-info/licenses/LICENSE,sha256=EJT35ct-Q794JYPdAQy3XNczQGKkU1HzToLeK1YVw2s,1070
-trovesuite-1.0.26.dist-info/METADATA,sha256=NaoWkeiWQCnQ7lxDz_2fbaTalS46OvTlxryyQljljYs,21737
-trovesuite-1.0.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-trovesuite-1.0.26.dist-info/top_level.txt,sha256=GzKhG_-MTaxeHrIgkGkBH_nof2vroGFBrjeHKWUIwNc,11
-trovesuite-1.0.26.dist-info/RECORD,,
+trovesuite-1.0.27.dist-info/licenses/LICENSE,sha256=EJT35ct-Q794JYPdAQy3XNczQGKkU1HzToLeK1YVw2s,1070
+trovesuite-1.0.27.dist-info/METADATA,sha256=iIVdthL_ORuU8QBPTsrkEt2tKwuHAm88x2MCTVunM2U,21737
+trovesuite-1.0.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+trovesuite-1.0.27.dist-info/top_level.txt,sha256=GzKhG_-MTaxeHrIgkGkBH_nof2vroGFBrjeHKWUIwNc,11
+trovesuite-1.0.27.dist-info/RECORD,,