trovesuite 1.0.24__tar.gz → 1.0.25__tar.gz

{trovesuite-1.0.24/src/trovesuite.egg-info → trovesuite-1.0.25}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [tool.poetry]
 name = "trovesuite"
-version = "1.0.24"
+version = "1.0.25"
 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.24"
+version = "1.0.25"
 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.24 → trovesuite-1.0.25}/setup.py

@@ -15,7 +15,7 @@ with open("pyproject.toml", "r", encoding="utf-8") as fh:
 
 setup(
     name="trovesuite",
-    version="1.0.24",
+    version="1.0.25",
     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.24 → trovesuite-1.0.25}/src/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")

{trovesuite-1.0.24 → trovesuite-1.0.25}/src/trovesuite/utils/helper.py

@@ -96,11 +96,12 @@ class Helper:
 
             try:
                 if tenant_id:
-                    # For tenant-specific resource IDs, check shared schema with tenant_id filter
-                    tenant_resource_table = getattr(db_settings, 'CORE_PLATFORM_TENANT_RESOURCE_ID_TABLE', None) or getattr(db_settings, 'CORE_PLATFORM_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,),
                         )
@@ -108,7 +109,7 @@ class Helper:
                         # Fallback: assume no conflict if table not configured
                         resource_exists = 0
                 else:
-                    # For main schema resource IDs
+                    # 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(

{trovesuite-1.0.24 → trovesuite-1.0.25/src/trovesuite.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trovesuite
-Version: 1.0.24
+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