Refactor db names

backend/api_handler.py

@@ -14,7 +14,7 @@
 from dataall.base.aws.sqs import SqsQueue
 from dataall.base.context import set_context, dispose_context, RequestContext
 from dataall.core.permissions.db import save_permissions_with_tenant
-from dataall.core.permissions.db.tenant_policy import TenantPolicy
+from dataall.core.permissions.db.tenant_policy_repositories import TenantPolicy
 from dataall.base.db import get_engine
 from dataall.core.permissions import permissions
 from dataall.base.loader import load_modules, ImportMode

backend/dataall/core/cognito_groups/api/resolvers.py

@@ -4,8 +4,8 @@
 from dataall.core.cognito_groups.aws.cognito import Cognito
 from dataall.core.cognito_groups.db.cognito_group_models import Group
 from dataall.core.environment.services.environment_service import EnvironmentService
-from dataall.core.organizations.db.organization import Organization
-from dataall.core.permissions.db.tenant_policy import TenantPolicy
+from dataall.core.organizations.db.organization_repositories import Organization
+from dataall.core.permissions.db.tenant_policy_repositories import TenantPolicy
 from dataall.base.db import exceptions
 
 log = logging.getLogger()

backend/dataall/core/environment/api/resolvers.py

@@ -11,15 +11,15 @@
 from dataall.base.aws.parameter_store import ParameterStoreManager
 from dataall.base.aws.sts import SessionHelper
 from dataall.base.utils import Parameter
-from dataall.core.environment.db.models import EnvironmentGroup
+from dataall.core.environment.db.environment_models import EnvironmentGroup
 from dataall.core.environment.services.environment_resource_manager import EnvironmentResourceManager
 from dataall.core.environment.services.environment_service import EnvironmentService
 from dataall.core.environment.api.enums import EnvironmentPermission
-from dataall.core.permissions.db.resource_policy import ResourcePolicy
+from dataall.core.permissions.db.resource_policy_repositories import ResourcePolicy
 from dataall.core.stacks.api import stack_helper
 from dataall.core.stacks.aws.cloudformation import CloudFormation
-from dataall.core.stacks.db.stack import Stack
-from dataall.core.vpc.db.vpc import Vpc
+from dataall.core.stacks.db.stack_repositories import Stack
+from dataall.core.vpc.db.vpc_repositories import Vpc
 from dataall.base.db import exceptions
 from dataall.core.permissions import permissions
 from dataall.core.feature_toggle_checker import is_feature_enabled

backend/dataall/core/environment/cdk/env_role_core_policies/data_policy.py

@@ -3,7 +3,7 @@
 
 from aws_cdk import aws_iam as iam
 
-from dataall.core.environment.db.models import Environment, EnvironmentGroup
+from dataall.core.environment.db.environment_models import Environment, EnvironmentGroup
 
 logger = logging.getLogger()
 

backend/dataall/core/environment/cdk/env_role_core_policies/service_policy.py

@@ -3,7 +3,7 @@
 
 from aws_cdk import aws_iam
 
-from dataall.core.environment.db.models import EnvironmentGroup, Environment
+from dataall.core.environment.db.environment_models import EnvironmentGroup, Environment
 
 logger = logging.getLogger()
 

backend/dataall/core/environment/cdk/environment_stack.py

@@ -21,7 +21,7 @@
 )
 
 from dataall.core.stacks.services.runtime_stacks_tagging import TagsUtil
-from dataall.core.environment.db.models import Environment, EnvironmentGroup
+from dataall.core.environment.db.environment_models import Environment, EnvironmentGroup
 from dataall.core.environment.services.environment_service import EnvironmentService
 from dataall.base.cdkproxy.stacks.manager import stack
 from dataall.core.environment.cdk.pivot_role_stack import PivotRole

backend/dataall/core/environment/db/environment_repositories.py

@@ -1,4 +1,4 @@
-from dataall.core.environment.db.models import EnvironmentParameter, Environment
+from dataall.core.environment.db.environment_models import EnvironmentParameter, Environment
 from sqlalchemy.sql import and_
 
 from dataall.base.db import exceptions

backend/dataall/core/environment/env_permission_checker.py

@@ -1,5 +1,5 @@
 from dataall.base.context import get_context, RequestContext
-from dataall.core.permissions.db.group_policy import GroupPolicy
+from dataall.core.permissions.db.group_policy_repositories import GroupPolicy
 from dataall.base.utils.decorator_utls import process_func
 
 

backend/dataall/core/environment/services/environment_service.py

@@ -7,12 +7,12 @@
 
 from dataall.base.context import get_context
 from dataall.core.activity.db.activity_models import Activity
-from dataall.core.environment.db.models import EnvironmentParameter, ConsumptionRole
+from dataall.core.environment.db.environment_models import EnvironmentParameter, ConsumptionRole
 from dataall.core.environment.db.environment_repositories import EnvironmentParameterRepository, EnvironmentRepository
 from dataall.core.environment.services.environment_resource_manager import EnvironmentResourceManager
-from dataall.core.permissions.db.permission import Permission
+from dataall.core.permissions.db.permission_repositories import Permission
 from dataall.core.permissions.db.permission_models import PermissionType
-from dataall.core.permissions.db.resource_policy import ResourcePolicy
+from dataall.core.permissions.db.resource_policy_repositories import ResourcePolicy
 from dataall.core.permissions.permission_checker import has_resource_permission, has_tenant_permission
 from dataall.core.vpc.db.vpc_models import Vpc
 from dataall.base.db.paginator import paginate
@@ -22,11 +22,11 @@
 )
 from dataall.base.db import exceptions
 from dataall.core.permissions import permissions
-from dataall.core.organizations.db.organization import Organization
-from dataall.core.environment.db.models import Environment, EnvironmentGroup
+from dataall.core.organizations.db.organization_repositories import Organization
+from dataall.core.environment.db.environment_models import Environment, EnvironmentGroup
 from dataall.core.environment.api.enums import EnvironmentPermission, EnvironmentType
 
-from dataall.core.stacks.db.keyvaluetag import KeyValueTag
+from dataall.core.stacks.db.keyvaluetag_repositories import KeyValueTag
 from dataall.core.stacks.db.stack_models import Stack
 
 log = logging.getLogger(__name__)

backend/dataall/core/environment/tasks/env_stacks_updater.py

@@ -4,11 +4,11 @@
 import time
 
 from dataall.base.loader import ImportMode, load_modules
-from dataall.core.environment.db.models import Environment
+from dataall.core.environment.db.environment_models import Environment
 from dataall.core.environment.services.environment_service import EnvironmentService
 from dataall.core.environment.services.env_stack_finder import StackFinder
 from dataall.core.stacks.aws.ecs import Ecs
-from dataall.core.stacks.db.stack import Stack
+from dataall.core.stacks.db.stack_repositories import Stack
 from dataall.base.db import get_engine
 from dataall.base.utils import Parameter
 

backend/dataall/core/notifications/api/resolvers.py

@@ -1,7 +1,7 @@
 import logging
 
 from dataall.base.api.context import Context
-from dataall.core.notifications.db.notification import Notification
+from dataall.core.notifications.db.notification_repositories import Notification
 
 log = logging.getLogger(__name__)
 

backend/dataall/core/organizations/api/resolvers.py

@@ -1,7 +1,7 @@
 from dataall.base.api.context import Context
-from dataall.core.environment.db.models import Environment
+from dataall.core.environment.db.environment_models import Environment
 from dataall.core.organizations.api.enums import OrganisationUserRole
-from dataall.core.organizations.db.organization import Organization
+from dataall.core.organizations.db.organization_repositories import Organization
 from dataall.core.organizations.db import organization_models as models
 
 

backend/dataall/core/organizations/db/organization.py → backend/dataall/core/organizations/db/organization_repositories.py

@@ -7,10 +7,10 @@
 from dataall.base.db import exceptions, paginate
 from dataall.core.organizations.db.organization_models import OrganizationGroup, OrganisationUserRole
 from dataall.core.organizations.db import organization_models as models
-from dataall.core.environment.db.models import Environment
+from dataall.core.environment.db.environment_models import Environment
 from dataall.core.permissions.permission_checker import has_resource_permission, has_tenant_permission
 from dataall.base.context import get_context
-from dataall.core.permissions.db.resource_policy import ResourcePolicy
+from dataall.core.permissions.db.resource_policy_repositories import ResourcePolicy
 from dataall.core.activity.db.activity_models import Activity
 
 logger = logging.getLogger(__name__)

backend/dataall/core/permissions/api/resolvers.py

@@ -3,7 +3,7 @@
 
 from dataall.base.aws.sts import SessionHelper
 from dataall.base.aws.parameter_store import ParameterStoreManager
-from dataall.core.permissions.db.tenant_policy import TenantPolicy
+from dataall.core.permissions.db.tenant_policy_repositories import TenantPolicy
 
 log = logging.getLogger(__name__)
 

backend/dataall/core/permissions/db/__init__.py

@@ -1,8 +1,8 @@
 import logging
 
 from dataall.core.permissions.db import permission_models
-from dataall.core.permissions.db.permission import Permission
-from dataall.core.permissions.db.tenant import Tenant
+from dataall.core.permissions.db.permission_repositories import Permission
+from dataall.core.permissions.db.tenant_repositories import Tenant
 
 log = logging.getLogger("Permissions")
 

backend/dataall/core/permissions/db/group_policy.py → backend/dataall/core/permissions/db/group_policy_repositories.py

@@ -1,5 +1,5 @@
-from dataall.core.environment.db.models import EnvironmentGroup
-from dataall.core.permissions.db.resource_policy import ResourcePolicy
+from dataall.core.environment.db.environment_models import EnvironmentGroup
+from dataall.core.permissions.db.resource_policy_repositories import ResourcePolicy
 from dataall.base.db.exceptions import UnauthorizedOperation
 
 

backend/dataall/core/permissions/db/resource_policy.py → backend/dataall/core/permissions/db/resource_policy_repositories.py

@@ -3,7 +3,7 @@
 
 from sqlalchemy.sql import and_
 
-from dataall.core.permissions.db.permission import Permission
+from dataall.core.permissions.db.permission_repositories import Permission
 from dataall.core.permissions.db.permission_models import PermissionType
 from dataall.base.db import exceptions
 from dataall.core.permissions.db import permission_models as models

backend/dataall/core/permissions/db/tenant_policy.py → backend/dataall/core/permissions/db/tenant_policy_repositories.py

@@ -6,8 +6,8 @@
 from dataall.base.db import exceptions, paginate
 from dataall.core.permissions import permissions
 from dataall.core.permissions.db import permission_models as models
-from dataall.core.permissions.db.permission import Permission
-from dataall.core.permissions.db.tenant import Tenant as TenantService
+from dataall.core.permissions.db.permission_repositories import Permission
+from dataall.core.permissions.db.tenant_repositories import Tenant as TenantService
 
 logger = logging.getLogger(__name__)
 

backend/dataall/core/permissions/permission_checker.py

@@ -5,8 +5,8 @@
 from typing import Protocol, Callable
 
 from dataall.base.context import RequestContext, get_context
-from dataall.core.permissions.db.resource_policy import ResourcePolicy
-from dataall.core.permissions.db.tenant_policy import TenantPolicy
+from dataall.core.permissions.db.resource_policy_repositories import ResourcePolicy
+from dataall.core.permissions.db.tenant_policy_repositories import TenantPolicy
 from dataall.base.utils.decorator_utls import process_func
 
 

backend/dataall/core/stacks/api/resolvers.py

@@ -3,14 +3,14 @@
 import os
 
 from dataall.base.api.context import Context
-from dataall.core.environment.db.models import Environment
+from dataall.core.environment.db.environment_models import Environment
 from dataall.core.environment.services.environment_service import EnvironmentService
 from dataall.core.stacks.api import stack_helper
 from dataall.core.stacks.aws.cloudformation import CloudFormation
 from dataall.core.stacks.aws.cloudwatch import CloudWatch
 from dataall.core.stacks.db.stack_models import Stack as StackModel
-from dataall.core.stacks.db.keyvaluetag import KeyValueTag
-from dataall.core.stacks.db.stack import Stack
+from dataall.core.stacks.db.keyvaluetag_repositories import KeyValueTag
+from dataall.core.stacks.db.stack_repositories import Stack
 from dataall.base.db import exceptions
 from dataall.base.utils import Parameter
 

backend/dataall/core/stacks/api/stack_helper.py

@@ -5,9 +5,9 @@
 from dataall.core.tasks.service_handlers import Worker
 from dataall.base.config import config
 from dataall.base.context import get_context
-from dataall.core.environment.db.models import Environment
+from dataall.core.environment.db.environment_models import Environment
 from dataall.core.stacks.aws.ecs import Ecs
-from dataall.core.stacks.db.stack import Stack
+from dataall.core.stacks.db.stack_repositories import Stack
 from dataall.core.stacks.db.stack_models import Stack as StackModel
 from dataall.core.tasks.db.task_models import Task
 from dataall.base.utils import Parameter

backend/dataall/core/stacks/db/keyvaluetag.py → backend/dataall/core/stacks/db/keyvaluetag_repositories.py

@@ -1,9 +1,9 @@
 import logging
 
 from dataall.base.context import get_context
-from dataall.core.permissions.db.resource_policy import ResourcePolicy
+from dataall.core.permissions.db.resource_policy_repositories import ResourcePolicy
 from dataall.core.stacks.db import stack_models as models
-from dataall.core.stacks.db.target_type import TargetType
+from dataall.core.stacks.db.target_type_repositories import TargetType
 from dataall.base.db import exceptions
 
 logger = logging.getLogger(__name__)

backend/dataall/core/stacks/db/stack.py → backend/dataall/core/stacks/db/stack_repositories.py

@@ -1,10 +1,10 @@
 import logging
 
 from dataall.base.context import get_context
-from dataall.core.environment.db.models import Environment
-from dataall.core.permissions.db.resource_policy import ResourcePolicy
+from dataall.core.environment.db.environment_models import Environment
+from dataall.core.permissions.db.resource_policy_repositories import ResourcePolicy
 from dataall.core.stacks.db import stack_models as models
-from dataall.core.stacks.db.target_type import TargetType
+from dataall.core.stacks.db.target_type_repositories import TargetType
 from dataall.base.db import exceptions
 from dataall.base.utils.naming_convention import (
     NamingConventionService,

backend/dataall/core/stacks/handlers/stack_handlers.py

@@ -8,7 +8,7 @@
 from dataall.core.stacks.aws.cloudformation import CloudFormation
 from dataall.core.stacks.aws.ecs import Ecs
 from dataall.core.stacks.db import stack_models as models
-from dataall.core.stacks.db.stack import Stack
+from dataall.core.stacks.db.stack_repositories import Stack
 from dataall.core.tasks.db.task_models import Task
 from dataall.base.utils import Parameter
 

backend/dataall/core/stacks/services/runtime_stacks_tagging.py

@@ -5,10 +5,10 @@
 from aws_cdk import Stack, Tags
 
 from dataall.base import db
-from dataall.core.environment.db.models import Environment
+from dataall.core.environment.db.environment_models import Environment
 from dataall.core.environment.services.environment_service import EnvironmentService
-from dataall.core.organizations.db.organization import Organization
-from dataall.core.stacks.db.keyvaluetag import KeyValueTag
+from dataall.core.organizations.db.organization_repositories import Organization
+from dataall.core.stacks.db.keyvaluetag_repositories import KeyValueTag
 from dataall.core.stacks.db.stack_models import KeyValueTag as KeyValueTagModel
 
 

backend/dataall/core/vpc/api/resolvers.py

@@ -1,7 +1,7 @@
 import logging
 
 from dataall.base.api.context import Context
-from dataall.core.vpc.db.vpc import Vpc
+from dataall.core.vpc.db.vpc_repositories import Vpc
 
 log = logging.getLogger(__name__)
 

backend/dataall/core/vpc/db/vpc.py → backend/dataall/core/vpc/db/vpc_repositories.py

@@ -10,7 +10,7 @@
 from dataall.core.permissions.permission_checker import has_resource_permission, has_tenant_permission
 from dataall.base.context import get_context
 from dataall.core.activity.db.activity_models import Activity
-from dataall.core.permissions.db.resource_policy import ResourcePolicy
+from dataall.core.permissions.db.resource_policy_repositories import ResourcePolicy
 
 log = logging.getLogger(__name__)
 

backend/dataall/modules/catalog/api/resolvers.py

@@ -5,7 +5,7 @@
 from dataall.modules.catalog.api.enums import GlossaryRole
 from dataall.modules.catalog.api.registry import GlossaryRegistry
 from dataall.base.api.context import Context
-from dataall.modules.catalog.db.glossary import Glossary
+from dataall.modules.catalog.db.glossary_repositories import Glossary
 from dataall.modules.catalog.db.glossary_models import TermLink, GlossaryNode
 from dataall.base.db import paginate, exceptions
 

backend/dataall/modules/dashboards/__init__.py

@@ -3,8 +3,8 @@
 from typing import Set, List, Type
 
 from dataall.core.environment.services.environment_resource_manager import EnvironmentResourceManager
-from dataall.modules.dashboards.db.dashboard_repository import DashboardRepository
-from dataall.modules.dashboards.db.models import Dashboard
+from dataall.modules.dashboards.db.dashboard_repositories import DashboardRepository
+from dataall.modules.dashboards.db.dashboard_models import Dashboard
 from dataall.base.loader import ImportMode, ModuleInterface
 
 

backend/dataall/modules/dashboards/api/resolvers.py

@@ -1,11 +1,11 @@
 from dataall.base.api.context import Context
-from dataall.modules.catalog.db.glossary import Glossary
-from dataall.core.organizations.db.organization import Organization
-from dataall.modules.vote.db.vote import Vote
+from dataall.modules.catalog.db.glossary_repositories import Glossary
+from dataall.core.organizations.db.organization_repositories import Organization
+from dataall.modules.vote.db.vote_repositories import Vote
 from dataall.base.db.exceptions import RequiredParameter
 from dataall.modules.dashboards.api.enums import DashboardRole
-from dataall.modules.dashboards.db.dashboard_repository import DashboardRepository
-from dataall.modules.dashboards.db.models import Dashboard
+from dataall.modules.dashboards.db.dashboard_repositories import DashboardRepository
+from dataall.modules.dashboards.db.dashboard_models import Dashboard
 from dataall.modules.dashboards.services.dashboard_quicksight_service import DashboardQuicksightService
 from dataall.modules.dashboards.services.dashboard_service import DashboardService
 from dataall.modules.dashboards.services.dashboard_share_service import DashboardShareService

backend/dataall/modules/dashboards/db/dashboard_repository.py → backend/dataall/modules/dashboards/db/dashboard_repositories.py

@@ -6,7 +6,7 @@
 from dataall.core.environment.services.environment_resource_manager import EnvironmentResource
 from dataall.core.environment.services.environment_service import EnvironmentService
 from dataall.base.db import exceptions, paginate
-from dataall.modules.dashboards.db.models import DashboardShare, DashboardShareStatus, Dashboard
+from dataall.modules.dashboards.db.dashboard_models import DashboardShare, DashboardShareStatus, Dashboard
 
 logger = logging.getLogger(__name__)
 

backend/dataall/modules/dashboards/indexers/dashboard_indexer.py

@@ -1,11 +1,11 @@
 import logging
 
 from dataall.core.environment.services.environment_service import EnvironmentService
-from dataall.core.organizations.db.organization import Organization
-from dataall.modules.vote.db.vote import Vote
+from dataall.core.organizations.db.organization_repositories import Organization
+from dataall.modules.vote.db.vote_repositories import Vote
 from dataall.modules.dashboards import DashboardRepository
 from dataall.modules.catalog.indexers.base_indexer import BaseIndexer
-from dataall.modules.dashboards.db.models import Dashboard
+from dataall.modules.dashboards.db.dashboard_models import Dashboard
 
 log = logging.getLogger(__name__)
 

backend/dataall/modules/dashboards/services/dashboard_quicksight_service.py

@@ -4,7 +4,7 @@
 from dataall.base.aws.sts import SessionHelper
 from dataall.base.context import get_context
 from dataall.core.environment.services.environment_service import EnvironmentService
-from dataall.core.permissions.db.tenant_policy import TenantPolicy
+from dataall.core.permissions.db.tenant_policy_repositories import TenantPolicy
 from dataall.core.permissions.permission_checker import has_resource_permission
 from dataall.base.db.exceptions import UnauthorizedOperation, TenantUnauthorized, AWSResourceNotFound
 from dataall.core.permissions.permissions import TENANT_ALL

backend/dataall/modules/dashboards/services/dashboard_service.py

@@ -2,10 +2,10 @@
 from dataall.core.activity.db.activity_models import Activity
 from dataall.core.environment.env_permission_checker import has_group_permission
 from dataall.core.environment.services.environment_service import EnvironmentService
-from dataall.modules.catalog.db.glossary import Glossary
-from dataall.core.permissions.db.resource_policy import ResourcePolicy
+from dataall.modules.catalog.db.glossary_repositories import Glossary
+from dataall.core.permissions.db.resource_policy_repositories import ResourcePolicy
 from dataall.core.permissions.permission_checker import has_tenant_permission, has_resource_permission
-from dataall.modules.vote.db.vote import Vote
+from dataall.modules.vote.db.vote_repositories import Vote
 from dataall.base.db.exceptions import UnauthorizedOperation
 from dataall.modules.dashboards import DashboardRepository, Dashboard
 from dataall.modules.dashboards.aws.dashboard_quicksight_client import DashboardQuicksightClient