trovesuite 1.0.23__py3-none-any.whl → 1.0.25__py3-none-any.whl

trovesuite/configs/settings.py

@@ -38,13 +38,11 @@ class Settings:
     # SHARED TABLES (core_platform schema)
     # =============================================================================
     CORE_PLATFORM_TENANTS_TABLE = os.getenv("CORE_PLATFORM_TENANTS_TABLE", "core_platform.cp_tenants")
-    CORE_PLATFORM_TENANT_RESOURCE_ID_TABLE = os.getenv("CORE_PLATFORM_TENANT_RESOURCE_ID_TABLE", "core_platform.cp_resource_ids")
     CORE_PLATFORM_SUBSCRIPTIONS_TABLE = os.getenv("CORE_PLATFORM_SUBSCRIPTIONS_TABLE", "core_platform.cp_subscriptions")
     CORE_PLATFORM_APPS_TABLE = os.getenv("CORE_PLATFORM_APPS_TABLE", "core_platform.cp_apps")
     CORE_PLATFORM_USERS_TABLE = os.getenv("CORE_PLATFORM_USERS_TABLE", "core_platform.cp_users")
     CORE_PLATFORM_RESOURCE_TYPES_TABLE = os.getenv("CORE_PLATFORM_RESOURCE_TYPES_TABLE", "core_platform.cp_resource_types")
-    CORE_PLATFORM_RESOURCE_ID_TABLE = os.getenv("CORE_PLATFORM_RESOURCE_ID_TABLE", "core_platform.cp_shared_resource_ids")
-    CORE_PLATFORM_RESOURCES_TABLE = os.getenv("CORE_PLATFORM_RESOURCES_TABLE", "core_platform.resources")
+    CORE_PLATFORM_RESOURCE_ID_TABLE = os.getenv("CORE_PLATFORM_RESOURCE_ID_TABLE", "core_platform.cp_resource_ids")
     CORE_PLATFORM_PERMISSIONS_TABLE = os.getenv("CORE_PLATFORM_PERMISSIONS_TABLE", "core_platform.cp_permissions")
     CORE_PLATFORM_ROLES_TABLE = os.getenv("CORE_PLATFORM_ROLES_TABLE", "core_platform.cp_roles")
     CORE_PLATFORM_ROLE_PERMISSIONS_TABLE = os.getenv("CORE_PLATFORM_ROLE_PERMISSIONS_TABLE", "core_platform.cp_role_permissions")
@@ -69,7 +67,6 @@ class Settings:
     CORE_PLATFORM_LOGIN_SETTINGS_TABLE = os.getenv("CORE_PLATFORM_LOGIN_SETTINGS_TABLE", "core_platform.cp_login_settings")
     CORE_PLATFORM_RESOURCES_TABLE = os.getenv("CORE_PLATFORM_RESOURCES_TABLE", "core_platform.cp_resources")
     CORE_PLATFORM_ASSIGN_ROLES_TABLE = os.getenv("CORE_PLATFORM_ASSIGN_ROLES_TABLE", "core_platform.cp_assign_roles")
-    CORE_PLATFORM_RESOURCE_ID_TABLE = os.getenv("CORE_PLATFORM_RESOURCE_ID_TABLE", "core_platform.cp_resource_ids")
     CORE_PLATFORM_SUBSCRIPTION_HISTORY_TABLE = os.getenv("CORE_PLATFORM_SUBSCRIPTION_HISTORY_TABLE", "core_platform.cp_user_subscription_histories")
     CORE_PLATFORM_RESOURCE_DELETION_CHAT_HISTORY_TABLE = os.getenv("CORE_PLATFORM_RESOURCE_DELETION_CHAT_HISTORY_TABLE", "core_platform.cp_resource_deletion_chat_histories")
     CORE_PLATFORM_USER_GROUPS_TABLE = os.getenv("CORE_PLATFORM_USER_GROUPS_TABLE", "core_platform.cp_user_groups")
@@ -81,6 +78,7 @@ class Settings:
     CORE_PLATFORM_ASSIGN_LOCATIONS_TABLE = os.getenv("CORE_PLATFORM_ASSIGN_LOCATIONS_TABLE", "core_platform.cp_assign_locations")
     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")
 
     # Mail Configurations
     MAIL_SENDER_EMAIL=os.getenv("MAIL_SENDER_EMAIL")

trovesuite/utils/helper.py

@@ -96,12 +96,12 @@ class Helper:
 
             try:
                 if tenant_id:
-                    # 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:
+                    # For tenant-specific resource IDs, use CORE_PLATFORM_RESOURCE_ID_TABLE
+                    # This table has tenant_id column for filtering
+                    resource_table = getattr(db_settings, 'CORE_PLATFORM_RESOURCE_ID_TABLE', None)
+                    if resource_table:
                         resource_exists = DatabaseManager.execute_scalar(
-                            f"""SELECT COUNT(1) FROM {tenant_resource_table}
+                            f"""SELECT COUNT(1) FROM {resource_table}
                             WHERE tenant_id = %s AND id = %s""",
                             (tenant_id, candidate,),
                         )
@@ -109,8 +109,8 @@ class Helper:
                         # Fallback: assume no conflict if table not configured
                         resource_exists = 0
                 else:
-                    # For main schema resource IDs
-                    main_resource_table = getattr(db_settings, 'MAIN_RESOURCE_ID_TABLE', None)
+                    # For main/shared schema resource IDs (no tenant_id)
+                    main_resource_table = getattr(db_settings, 'CORE_PLATFORM_RESOURCE_ID_TABLE', None)
                     if main_resource_table:
                         resource_exists = DatabaseManager.execute_scalar(
                             f"""SELECT COUNT(1) FROM {main_resource_table}
@@ -236,9 +236,9 @@ class Helper:
 
         try:
             # Check if table name is set
-            tenant_activity_logs_table = getattr(db_settings, 'TENANT_ACTIVITY_LOGS_TABLE', None)
+            tenant_activity_logs_table = getattr(db_settings, 'CORE_PLATFORM_ACTIVITY_LOGS_TABLE', None)
             if not tenant_activity_logs_table:
-                logger.error("TENANT_ACTIVITY_LOGS_TABLE is not configured in settings")
+                logger.error("CORE_PLATFORM_ACTIVITY_LOGS_TABLE is not configured in settings")
                 return
 
             log_id = Helper.generate_unique_identifier(prefix="alog")
@@ -263,7 +263,7 @@ class Helper:
             if user_id:
                 try:
                     logger.debug(f"Fetching user information for user_id={user_id}")
-                    main_users_table = getattr(db_settings, 'MAIN_USERS_TABLE', 'main.cp_users')
+                    main_users_table = getattr(db_settings, 'CORE_PLATFORM_USERS_TABLE', 'core_platform.cp_users')
                     user_data = DatabaseManager.execute_query(
                         f"""SELECT email, contact, fullname
                         FROM {main_users_table}
@@ -414,10 +414,10 @@ class Helper:
         """
         try:
             # 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', 'main.tenant_assign_roles')
-            tenant_user_groups_table = getattr(db_settings, 'TENANT_USER_GROUPS_TABLE', 'main.tenant_user_groups')
+            main_users_table = getattr(db_settings, 'CORE_PLATFORM_USERS_TABLE', 'core_platform.cp_users')
+            main_roles_table = getattr(db_settings, 'CORE_PLATFORM_ROLES_TABLE', 'core_platform.cp_roles')
+            tenant_assign_roles_table = getattr(db_settings, 'CORE_PLATFORM_ASSIGN_ROLES_TABLE', 'core_platform.cp_assign_roles')
+            tenant_user_groups_table = getattr(db_settings, 'CORE_PLATFORM_USER_GROUPS_TABLE', 'core_platform.cp_user_groups')
 
             # Query to get users with admin roles - both direct and through groups
             query = f"""
@@ -568,7 +568,7 @@ class Helper:
             actor_email = "no-reply@trovesuite.com"
 
             if actor_user_id:
-                main_users_table = getattr(db_settings, 'MAIN_USERS_TABLE', 'main.cp_users')
+                main_users_table = getattr(db_settings, 'CORE_PLATFORM_USERS_TABLE', 'core_platform.cp_users')
                 actor_details = DatabaseManager.execute_query(
                     f"""SELECT fullname, email
                         FROM {main_users_table}

{trovesuite-1.0.23.dist-info → trovesuite-1.0.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trovesuite
-Version: 1.0.23
+Version: 1.0.25
 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.23.dist-info → trovesuite-1.0.25.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=IPSu8fXjxyYeJ3bFknJG06Qm2L2ub6Ht19xhKv8g7nA,11731
 trovesuite/configs/logging.py,sha256=mGjR2d4urVNry9l5_aXycMMtcY2RAFIpEL35hw33KZg,9308
-trovesuite/configs/settings.py,sha256=2S1zPHJiYWaK6xT-tnZBfT2gJ-C0O6qXMtVQt_Xtyi4,7200
+trovesuite/configs/settings.py,sha256=r3wyLdlLtnPzrTPV5Z4BytItLtfvQoP860waAfdecLA,6941
 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=NySt18kl4Dc78tN5HiB7SpsCH5DWy3QvG1AMtl-ASBM,26951
+trovesuite/utils/helper.py,sha256=28KjFtiDS4IxuO13QBQUmU4dq9xUJDll9ewWetCrOcc,27061
 trovesuite/utils/templates.py,sha256=_92k4-EkqWs-h0LNJxPgorbspmp24kDngS7O3qWIFyQ,20388
-trovesuite-1.0.23.dist-info/licenses/LICENSE,sha256=EJT35ct-Q794JYPdAQy3XNczQGKkU1HzToLeK1YVw2s,1070
-trovesuite-1.0.23.dist-info/METADATA,sha256=jkuPAVvbn9wDBw_R2Yvk-m7HlhaN7NSnBHpiGQjLXYw,21737
-trovesuite-1.0.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-trovesuite-1.0.23.dist-info/top_level.txt,sha256=GzKhG_-MTaxeHrIgkGkBH_nof2vroGFBrjeHKWUIwNc,11
-trovesuite-1.0.23.dist-info/RECORD,,
+trovesuite-1.0.25.dist-info/licenses/LICENSE,sha256=EJT35ct-Q794JYPdAQy3XNczQGKkU1HzToLeK1YVw2s,1070
+trovesuite-1.0.25.dist-info/METADATA,sha256=nO2O8YvC6rbuh8vClhrEUdrSn6RaYI9es6NjVLEv0oE,21737
+trovesuite-1.0.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+trovesuite-1.0.25.dist-info/top_level.txt,sha256=GzKhG_-MTaxeHrIgkGkBH_nof2vroGFBrjeHKWUIwNc,11
+trovesuite-1.0.25.dist-info/RECORD,,