trovesuite 1.0.16__tar.gz → 1.0.18__tar.gz

{trovesuite-1.0.16/src/trovesuite.egg-info → trovesuite-1.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trovesuite
-Version: 1.0.16
+Version: 1.0.18
 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.16 → trovesuite-1.0.18}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [tool.poetry]
 name = "trovesuite"
-version = "1.0.16"
+version = "1.0.18"
 description = "TroveSuite services package providing authentication, authorization, notifications, Azure Storage, and other enterprise services for TroveSuite applications"
 authors = ["brightgclt <brightgclt@gmail.com>"]
 license = "MIT"
@@ -58,7 +58,7 @@ Documentation = "https://dev.azure.com/brightgclt/trovesuite/_git/packages"
 
 [project]
 name = "trovesuite"
-version = "1.0.16"
+version = "1.0.18"
 description = "TroveSuite services package providing authentication, authorization, notifications, Azure Storage, and other enterprise services for TroveSuite applications"
 readme = "README.md"
 license = {text = "MIT"}

{trovesuite-1.0.16 → trovesuite-1.0.18}/setup.py

@@ -15,7 +15,7 @@ with open("pyproject.toml", "r", encoding="utf-8") as fh:
 
 setup(
     name="trovesuite",
-    version="1.0.16",
+    version="1.0.18",
     author="Bright Debrah Owusu",
     author_email="owusu.debrah@deladetech.com",
     description="TroveSuite services package providing authentication, authorization, notifications, and other enterprise services for TroveSuite applications",

{trovesuite-1.0.16 → trovesuite-1.0.18}/src/trovesuite/auth/auth_service.py

@@ -98,8 +98,9 @@ class AuthService:
 
             # 1️⃣ Get all groups the user belongs to
             user_groups = DatabaseManager.execute_query(
-                f"""SELECT group_id FROM "{tenant_id}".{db_settings.TENANT_USER_GROUPS_TABLE}
-                    WHERE delete_status = 'NOT_DELETED' AND is_active = true AND user_id = %s""",(user_id,),
+                f"""SELECT group_id FROM {db_settings.TENANT_USER_GROUPS_TABLE}
+                    WHERE tenant_id = %s AND delete_status = 'NOT_DELETED' AND is_active = true AND user_id = %s""",
+                (tenant_id, user_id,),
             )
 
             # 2️⃣ Prepare list of group_ids
@@ -110,20 +111,20 @@ class AuthService:
                 login_settings_details = DatabaseManager.execute_query(
                     f"""SELECT user_id, group_id, is_suspended, can_always_login,
                     is_multi_factor_enabled, is_login_before, working_days,
-                    login_on, logout_on FROM "{tenant_id}".{db_settings.TENANT_LOGIN_SETTINGS_TABLE}
-                    WHERE (delete_status = 'NOT_DELETED' AND is_active = true )
+                    login_on, logout_on FROM {db_settings.TENANT_LOGIN_SETTINGS_TABLE}
+                    WHERE tenant_id = %s AND (delete_status = 'NOT_DELETED' AND is_active = true )
                     AND (user_id = %s OR group_id = ANY(%s))
                     ORDER BY user_id NULLS LAST
                     LIMIT 1""",
-                    (user_id, group_ids),
+                    (tenant_id, user_id, group_ids),
                 )
             else:
                 login_settings_details = DatabaseManager.execute_query(
                     f"""SELECT user_id, group_id, is_suspended, can_always_login,
                     is_multi_factor_enabled, is_login_before, working_days,
-                    login_on, logout_on FROM "{tenant_id}".{db_settings.TENANT_LOGIN_SETTINGS_TABLE}
-                    WHERE (delete_status = 'NOT_DELETED' AND is_active = true ) AND user_id = %s""",
-                    (user_id,),
+                    login_on, logout_on FROM {db_settings.TENANT_LOGIN_SETTINGS_TABLE}
+                    WHERE tenant_id = %s AND (delete_status = 'NOT_DELETED' AND is_active = true ) AND user_id = %s""",
+                    (tenant_id, user_id,),
                 )
 
             if not login_settings_details or len(login_settings_details) == 0:
@@ -202,13 +203,13 @@ class AuthService:
                     f"""
                         SELECT DISTINCT ON (group_id, user_id, role_id)
                             group_id, user_id, role_id, resource_type
-                        FROM "{tenant_id}".{db_settings.TENANT_ASSIGN_ROLES_TABLE}
-                        WHERE delete_status = 'NOT_DELETED'
+                        FROM {db_settings.TENANT_ASSIGN_ROLES_TABLE}
+                        WHERE tenant_id = %s AND delete_status = 'NOT_DELETED'
                         AND is_active = true
                         AND (user_id = %s OR group_id = ANY(%s))
                         ORDER BY group_id, user_id, role_id;
                     """,
-                    (user_id, group_ids),
+                    (tenant_id, user_id, group_ids),
                 )
             else:
                 # No groups, just check roles for user
@@ -216,13 +217,13 @@ class AuthService:
                     f"""
                         SELECT DISTINCT ON (user_id, role_id)
                             user_id, role_id, resource_type
-                        FROM "{tenant_id}".{db_settings.TENANT_ASSIGN_ROLES_TABLE}
-                        WHERE delete_status = 'NOT_DELETED'
+                        FROM {db_settings.TENANT_ASSIGN_ROLES_TABLE}
+                        WHERE tenant_id = %s AND delete_status = 'NOT_DELETED'
                         AND is_active = true
                         AND user_id = %s
                         ORDER BY user_id, role_id;
                     """,
-                    (user_id,),
+                    (tenant_id, user_id,),
                 )
 
             # ✅ NEW: Get system-level roles from main.system_user_groups and main.system_assign_roles
@@ -301,7 +302,6 @@ class AuthService:
                 error="Authorization check failed due to an internal error"
             )
 
-
     @staticmethod
     def check_permission(users_data: list, action=None, resource_type=None) -> bool:
         """

trovesuite-1.0.18/src/trovesuite/configs/settings.py

@@ -0,0 +1,101 @@
+import os
+class Settings:
+
+    # Database URL
+    DATABASE_URL: str = os.getenv("DATABASE_URL")
+
+    DB_USER: str = os.getenv("DB_USER")
+    DB_HOST: str = os.getenv("DB_HOST")
+    DB_NAME: str = os.getenv("DB_NAME")
+    DB_PORT: str = os.getenv("DB_PORT")
+    DB_PASSWORD: str = os.getenv("DB_PASSWORD")
+    
+    # Application settings
+    DEBUG: bool = os.getenv("DEBUG", "True").lower() in ("true",1)
+    APP_NAME: str = os.getenv("APP_NAME", "Python Template API")
+    APP_VERSION: str = os.getenv("APP_VERSION", "1.0.0")
+    
+    # Logging settings
+    LOG_LEVEL: str = os.getenv("LOG_LEVEL", "INFO")
+    LOG_FORMAT: str = os.getenv("LOG_FORMAT", "detailed")  # detailed, json, simple
+    LOG_TO_FILE: bool = os.getenv("LOG_TO_FILE", "False").lower() in ("true", 1)
+    LOG_MAX_SIZE: int = int(os.getenv("LOG_MAX_SIZE", "10485760"))  # 10MB
+    LOG_BACKUP_COUNT: int = int(os.getenv("LOG_BACKUP_COUNT", "5"))
+    LOG_DIR: str = os.getenv("LOG_DIR", "logs")
+        
+   # Security settings
+    ALGORITHM: str = os.getenv("ALGORITHM")
+    SECRET_KEY: str = os.getenv("SECRET_KEY")
+    ENVIRONMENT: str = os.getenv("ENVIRONMENT")
+    ACCESS_TOKEN_EXPIRE_MINUTES: int = int(os.getenv("ACCESS_TOKEN_EXPIRE_MINUTES", "120"))
+    
+    # =============================================================================
+    # SHARED TABLES (main schema)
+    # =============================================================================
+    MAIN_TENANTS_TABLE = os.getenv("MAIN_TENANTS_TABLE", "main.tenants")
+    MAIN_TENANT_RESOURCE_ID_TABLE = os.getenv("MAIN_TENANT_RESOURCE_ID_TABLE", "main.tenant_resource_ids")
+    MAIN_SUBSCRIPTIONS_TABLE = os.getenv("MAIN_SUBSCRIPTIONS_TABLE", "main.subscriptions")
+    MAIN_APPS_TABLE = os.getenv("MAIN_APPS_TABLE", "main.apps")
+    MAIN_USERS_TABLE = os.getenv("MAIN_USERS_TABLE", "main.users")
+    MAIN_RESOURCE_TYPES_TABLE = os.getenv("MAIN_RESOURCE_TYPES_TABLE", "main.resource_types")
+    MAIN_RESOURCE_ID_TABLE = os.getenv("MAIN_RESOURCE_ID_TABLE", "main.resource_ids")
+    MAIN_RESOURCES_TABLE = os.getenv("MAIN_RESOURCES_TABLE", "main.resources")
+    MAIN_PERMISSIONS_TABLE = os.getenv("MAIN_PERMISSIONS_TABLE", "main.permissions")
+    MAIN_ROLES_TABLE = os.getenv("MAIN_ROLES_TABLE", "main.roles")
+    MAIN_ROLE_PERMISSIONS_TABLE = os.getenv("MAIN_ROLE_PERMISSIONS_TABLE", "main.role_permissions")
+    MAIN_USER_SUBSCRIPTIONS_TABLE = os.getenv("MAIN_USER_SUBSCRIPTIONS_TABLE", "main.user_subscriptions")
+    MAIN_USER_SUBSCRIPTION_HISTORY_TABLE = os.getenv("MAIN_USER_SUBSCRIPTION_HISTORY_TABLE", "main.user_subscription_history")
+    MAIN_OTP = os.getenv("MAIN_OTP", "main.otps")
+    MAIN_PASSWORD_POLICY = os.getenv("MAIN_PASSWORD_POLICY", "main.password_policies")
+    MAIN_MULTI_FACTOR_SETTINGS = os.getenv("MAIN_MULTI_FACTOR_SETTINGS", "main.multi_factor_settings")
+    MAIN_USER_LOGIN_TRACKING = os.getenv("MAIN_USER_LOGIN_TRACKING", "main.user_login_tracking")
+    MAIN_ENTERPRISE_SUBSCRIPTIONS_TABLE = os.getenv("MAIN_ENTERPRISE_SUBSCRIPTIONS_TABLE", "main.enterprise_subscriptions")
+    MAIN_CHANGE_PASSWORD_POLICY_TABLE = os.getenv("MAIN_CHANGE_PASSWORD_POLICY_TABLE", "main.change_password_policy")
+
+    # System-level tables
+    MAIN_SYSTEM_GROUPS_TABLE = os.getenv("MAIN_SYSTEM_GROUPS_TABLE", "main.system_groups")
+    MAIN_SYSTEM_USER_GROUPS_TABLE = os.getenv("MAIN_SYSTEM_USER_GROUPS_TABLE", "main.system_user_groups")
+    MAIN_SYSTEM_ASSIGN_ROLES_TABLE = os.getenv("MAIN_SYSTEM_ASSIGN_ROLES_TABLE", "main.system_assign_roles")
+    
+    # =============================================================================
+    # TENANT-SPECIFIC TABLES (now in main schema with tenant_id)
+    # =============================================================================
+    # NOTE: These tables have been migrated from separate tenant schemas to main schema.
+    # All tables now include tenant_id column for multi-tenant isolation.
+    # =============================================================================
+    TENANT_SUBSCRIPTIONS_TABLE = os.getenv("TENANT_SUBSCRIPTIONS_TABLE", "main.tenant_subscriptions")
+    TENANT_GROUPS_TABLE = os.getenv("TENANT_GROUPS_TABLE", "main.tenant_groups")
+    TENANT_LOGIN_SETTINGS_TABLE = os.getenv("TENANT_LOGIN_SETTINGS_TABLE", "main.tenant_login_settings")
+    TENANT_RESOURCES_TABLE = os.getenv("TENANT_RESOURCES_TABLE", "main.tenant_resources")
+    TENANT_ASSIGN_ROLES_TABLE = os.getenv("TENANT_ASSIGN_ROLES_TABLE", "main.tenant_assign_roles")
+    TENANT_RESOURCE_ID_TABLE = os.getenv("TENANT_RESOURCE_ID_TABLE", "main.tenant_resource_ids")
+    TENANT_SUBSCRIPTION_HISTORY_TABLE = os.getenv("TENANT_SUBSCRIPTION_HISTORY_TABLE", "main.tenant_subscription_histories")
+    TENANT_RESOURCE_DELETION_CHAT_HISTORY_TABLE = os.getenv("TENANT_RESOURCE_DELETION_CHAT_HISTORY_TABLE", "main.tenant_resource_deletion_chat_histories")
+    TENANT_USER_GROUPS_TABLE = os.getenv("TENANT_USER_GROUPS_TABLE", "main.tenant_user_groups")
+    TENANT_ACTIVITY_LOGS_TABLE = os.getenv("TENANT_ACTIVITY_LOGS_TABLE", "main.tenant_activity_logs")
+    TENANT_ORGANIZATIONS_TABLE = os.getenv("TENANT_ORGANIZATIONS_TABLE", "main.tenant_organizations")
+    TENANT_BUSINESSES_TABLE = os.getenv("TENANT_BUSINESSES_TABLE", "main.tenant_businesses")
+    TENANT_BUSINESS_APPS_TABLE = os.getenv("TENANT_BUSINESS_APPS_TABLE", "main.tenant_business_apps")
+    TENANT_LOCATIONS_TABLE = os.getenv("TENANT_LOCATIONS_TABLE", "main.tenant_locations")
+    TENANT_ASSIGN_LOCATIONS_TABLE = os.getenv("TENANT_ASSIGN_LOCATIONS_TABLE", "main.tenant_assign_locations")
+    TENANT_UNIT_OF_MEASURE_TABLE = os.getenv("TENANT_UNIT_OF_MEASURE_TABLE", "main.tenant_unit_of_measure")
+    TENANT_CURRENCY = os.getenv("TENANT_CURRENCY", "main.tenant_currency")
+
+    # Mail Configurations
+    MAIL_SENDER_EMAIL=os.getenv("MAIL_SENDER_EMAIL")
+    MAIL_SENDER_PWD=os.getenv("MAIL_SENDER_PWD")
+
+    # Application Configurations
+    APP_URL=os.getenv("APP_URL", "https://trovesuite.com")
+    USER_ASSIGNED_MANAGED_IDENTITY=os.getenv("USER_ASSIGNED_MANAGED_IDENTITY")
+
+    @property
+    def database_url(self) -> str:
+        if self.DATABASE_URL:
+            return self.DATABASE_URL
+
+        port = int(self.DB_PORT) if self.DB_PORT else 5432
+        return f"postgresql://{self.DB_USER}:{self.DB_PASSWORD}@{self.DB_HOST}:{port}/{self.DB_NAME}"
+
+# Global settings instance
+db_settings = Settings()

{trovesuite-1.0.16 → trovesuite-1.0.18}/src/trovesuite/utils/helper.py

@@ -96,14 +96,14 @@ class Helper:
 
             try:
                 if tenant_id:
-                    # For tenant-specific resource IDs, check tenant schema
+                    # For tenant-specific resource IDs, check shared schema with tenant_id filter
                     # Note: TENANT_RESOURCE_ID_TABLE needs to be defined in settings
                     tenant_resource_table = getattr(db_settings, 'TENANT_RESOURCE_ID_TABLE', None)
                     if tenant_resource_table:
                         resource_exists = DatabaseManager.execute_scalar(
-                            f"""SELECT COUNT(1) FROM "{tenant_id}".{tenant_resource_table}
-                            WHERE id = %s""",
-                            (candidate,),
+                            f"""SELECT COUNT(1) FROM {tenant_resource_table}
+                            WHERE tenant_id = %s AND id = %s""",
+                            (tenant_id, candidate,),
                         )
                     else:
                         # Fallback: assume no conflict if table not configured
@@ -289,10 +289,10 @@ class Helper:
             logger.debug(f"Activity log values - performed_by_email: {performed_by_email}, performed_by_contact: {performed_by_contact}, performed_by_fullname: {performed_by_fullname}")
 
             result = DatabaseManager.execute_update(
-                f"""INSERT INTO "{tenant_id}".{tenant_activity_logs_table}
-                    (id, action, resource_type, old_data, new_data, description, performed_by_email, performed_by_contact, performed_by_fullname, cdate, ctime, cdatetime)
-                    VALUES (%s, %s, NULLIF(%s, '')::text, %s::jsonb, %s::jsonb, %s, %s, %s, %s, %s, %s, %s)""",
-                (log_id, action, resource_type, old_json, new_json, description, performed_by_email, performed_by_contact, performed_by_fullname, cdate, ctime, cdatetime),
+                f"""INSERT INTO {tenant_activity_logs_table}
+                    (id, tenant_id, action, resource_type, old_data, new_data, description, performed_by_email, performed_by_contact, performed_by_fullname, cdate, ctime, cdatetime)
+                    VALUES (%s, %s, %s, NULLIF(%s, '')::text, %s::jsonb, %s::jsonb, %s, %s, %s, %s, %s, %s, %s)""",
+                (log_id, tenant_id, action, resource_type, old_json, new_json, description, performed_by_email, performed_by_contact, performed_by_fullname, cdate, ctime, cdatetime),
             )
 
             logger.info(f"Activity logged successfully. Rows affected: {result}")
@@ -301,9 +301,9 @@ class Helper:
             if result > 0:
                 verify_data = DatabaseManager.execute_query(
                     f"""SELECT performed_by_email, performed_by_contact, performed_by_fullname
-                    FROM "{tenant_id}".{tenant_activity_logs_table}
-                    WHERE id = %s""",
-                    (log_id,)
+                    FROM {tenant_activity_logs_table}
+                    WHERE tenant_id = %s AND id = %s""",
+                    (tenant_id, log_id,)
                 )
                 if verify_data:
                     logger.debug(f"Verification - Inserted activity log data: {verify_data[0]}")
@@ -416,8 +416,8 @@ class Helper:
             # Get table names from settings with fallbacks
             main_users_table = getattr(db_settings, 'MAIN_USERS_TABLE', 'main.users')
             main_roles_table = getattr(db_settings, 'MAIN_ROLES_TABLE', 'main.roles')
-            tenant_assign_roles_table = getattr(db_settings, 'TENANT_ASSIGN_ROLES_TABLE', 'assign_roles')
-            tenant_user_groups_table = getattr(db_settings, 'TENANT_USER_GROUPS_TABLE', 'user_groups')
+            tenant_assign_roles_table = getattr(db_settings, 'TENANT_ASSIGN_ROLES_TABLE', 'main.tenant_assign_roles')
+            tenant_user_groups_table = getattr(db_settings, 'TENANT_USER_GROUPS_TABLE', 'main.tenant_user_groups')
 
             # Query to get users with admin roles - both direct and through groups
             query = f"""
@@ -430,9 +430,10 @@ class Helper:
                     -- Direct role assignment
                     u.id IN (
                         SELECT ar.user_id
-                        FROM "{tenant_id}".{tenant_assign_roles_table} ar
+                        FROM {tenant_assign_roles_table} ar
                         INNER JOIN {main_roles_table} r ON ar.role_id = r.id
-                        WHERE ar.delete_status = 'NOT_DELETED'
+                        WHERE ar.tenant_id = %s
+                        AND ar.delete_status = 'NOT_DELETED'
                         AND ar.is_active = true
                         AND r.delete_status = 'NOT_DELETED'
                         AND r.is_active = true
@@ -443,10 +444,12 @@ class Helper:
                     -- Group-based role assignment
                     u.id IN (
                         SELECT ug.user_id
-                        FROM "{tenant_id}".{tenant_user_groups_table} ug
-                        INNER JOIN "{tenant_id}".{tenant_assign_roles_table} ar ON ug.group_id = ar.group_id
+                        FROM {tenant_user_groups_table} ug
+                        INNER JOIN {tenant_assign_roles_table} ar ON ug.group_id = ar.group_id
                         INNER JOIN {main_roles_table} r ON ar.role_id = r.id
-                        WHERE ug.delete_status = 'NOT_DELETED'
+                        WHERE ug.tenant_id = %s
+                        AND ar.tenant_id = %s
+                        AND ug.delete_status = 'NOT_DELETED'
                         AND ug.is_active = true
                         AND ar.delete_status = 'NOT_DELETED'
                         AND ar.is_active = true
@@ -458,7 +461,7 @@ class Helper:
                 )
             """
 
-            results = DatabaseManager.execute_query(query)
+            results = DatabaseManager.execute_query(query, (tenant_id, tenant_id, tenant_id,))
 
             admin_users = []
             if results:

{trovesuite-1.0.16 → trovesuite-1.0.18/src/trovesuite.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trovesuite
-Version: 1.0.16
+Version: 1.0.18
 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.16/src/trovesuite/configs/settings.py

@@ -1,62 +0,0 @@
-import os
-class Settings:
-
-    # Database URL
-    DATABASE_URL: str = os.getenv("DATABASE_URL")
-
-    DB_USER: str = os.getenv("DB_USER")
-    DB_HOST: str = os.getenv("DB_HOST")
-    DB_NAME: str = os.getenv("DB_NAME")
-    DB_PORT: str = os.getenv("DB_PORT")
-    DB_PASSWORD: str = os.getenv("DB_PASSWORD")
-
-    # Application settings
-    APP_NAME: str = os.getenv("APP_NAME", "Python Template API")
-    DEBUG: bool = os.getenv("DEBUG", "True").lower() in ("true",1)
-    APP_VERSION: str = os.getenv("APP_VERSION", "1.0.0")
-    
-    # Logging settings
-    LOG_LEVEL: str = os.getenv("LOG_LEVEL", "INFO")
-    LOG_FORMAT: str = os.getenv("LOG_FORMAT", "detailed")  # detailed, json, simple
-    LOG_TO_FILE: bool = os.getenv("LOG_TO_FILE", "False").lower() in ("true", 1)
-    LOG_MAX_SIZE: int = int(os.getenv("LOG_MAX_SIZE", "10485760"))  # 10MB
-    LOG_BACKUP_COUNT: int = int(os.getenv("LOG_BACKUP_COUNT", "5"))
-    LOG_DIR: str = os.getenv("LOG_DIR", "logs")
-        
-   # Security settings
-    ENVIRONMENT: str = os.getenv("ENVIRONMENT")
-    ALGORITHM: str = os.getenv("ALGORITHM")
-    SECRET_KEY: str = os.getenv("SECRET_KEY")
-    ACCESS_TOKEN_EXPIRE_MINUTES: int = int(os.getenv("ACCESS_TOKEN_EXPIRE_MINUTES", "120"))
-    
-    # =============================================================================
-    # SHARED TABLES (main schema)
-    # =============================================================================
-    MAIN_TENANTS_TABLE = os.getenv("MAIN_TENANTS_TABLE", "main.tenants")
-    MAIN_ROLE_PERMISSIONS_TABLE = os.getenv("MAIN_ROLE_PERMISSIONS_TABLE", "main.role_permissions")
-    MAIN_USER_SUBSCRIPTIONS_TABLE = os.getenv("MAIN_USER_SUBSCRIPTIONS_TABLE", "main.user_subscriptions")
-    MAIN_USER_SUBSCRIPTION_HISTORY_TABLE = os.getenv("MAIN_USER_SUBSCRIPTION_HISTORY_TABLE", "main.user_subscription_history")
-    MAIN_SUBSCRIPTIONS_TABLE = os.getenv("MAIN_SUBSCRIPTIONS_TABLE", "main.subscriptions")
-
-    # System-level tables
-    MAIN_SYSTEM_GROUPS_TABLE = os.getenv("MAIN_SYSTEM_GROUPS_TABLE", "main.system_groups")
-    MAIN_SYSTEM_USER_GROUPS_TABLE = os.getenv("MAIN_SYSTEM_USER_GROUPS_TABLE", "main.system_user_groups")
-    MAIN_SYSTEM_ASSIGN_ROLES_TABLE = os.getenv("MAIN_SYSTEM_ASSIGN_ROLES_TABLE", "main.system_assign_roles")
-
-    # =============================================================================
-    # TENANT-SPECIFIC TABLES (tenant schemas)
-    # =============================================================================
-    TENANT_LOGIN_SETTINGS_TABLE = os.getenv("TENANT_LOGIN_SETTINGS_TABLE")
-    TENANT_ASSIGN_ROLES_TABLE = os.getenv("TENANT_ASSIGN_ROLES_TABLE")
-    TENANT_USER_GROUPS_TABLE = os.getenv("TENANT_USER_GROUPS_TABLE")
-
-    @property
-    def database_url(self) -> str:
-        if self.DATABASE_URL:
-            return self.DATABASE_URL
-
-        port = int(self.DB_PORT) if self.DB_PORT else 5432
-        return f"postgresql://{self.DB_USER}:{self.DB_PASSWORD}@{self.DB_HOST}:{port}/{self.DB_NAME}"
-
-# Global settings instance
-db_settings = Settings()