Enum refactoring

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

@@ -5,7 +5,7 @@
 from sqlalchemy.orm import query_expression
 from dataall.base.db import Resource, Base, utils
 
-from dataall.core.environment.api.enums import EnvironmentPermission
+from dataall.core.environment.api.enums import EnvironmentPermission, EnvironmentType
 
 
 class Environment(Resource, Base):
@@ -18,7 +18,7 @@ class Environment(Resource, Base):
     resourcePrefix = Column(String, nullable=False, default='dataall')
 
     validated = Column(Boolean, default=False)
-    environmentType = Column(String, nullable=False, default='Data')
+    environmentType = Column(String, nullable=False, default=EnvironmentType.Data.value)
     isOrganizationDefaultEnvironment = Column(Boolean, default=False)
     EnvironmentDefaultIAMRoleName = Column(String, nullable=False)
     EnvironmentDefaultIAMRoleImported = Column(Boolean, default=False)

backend/dataall/core/organizations/db/organization_models.py

@@ -8,14 +8,6 @@
 from dataall.base.db import Resource, utils
 
 
-class OrganisationUserRole(Enum):
-    Owner = '999'
-    Admin = '900'
-    Member = '100'
-    NotMember = '000'
-    Invited = '800'
-
-
 class Organization(Resource, Base):
     __tablename__ = 'organization'
     organizationUri = Column(

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

@@ -5,7 +5,8 @@
 
 from dataall.core.permissions import permissions
 from dataall.base.db import exceptions, paginate
-from dataall.core.organizations.db.organization_models import OrganizationGroup, OrganisationUserRole
+from dataall.core.organizations.db.organization_models import OrganizationGroup
+from dataall.core.organizations.api.enums import OrganisationUserRole
 from dataall.core.organizations.db import organization_models as models
 from dataall.core.environment.db.environment_models import Environment
 from dataall.core.permissions.permission_checker import has_resource_permission, has_tenant_permission

backend/dataall/modules/dataset_sharing/api/input_types.py

@@ -1,5 +1,5 @@
 from dataall.base.api.constants import *
-from dataall.modules.dataset_sharing.api.enums import ShareableType, ShareSortField
+from dataall.modules.dataset_sharing.common.enums import ShareableType, ShareSortField
 
 
 NewShareObjectInput = gql.InputType(

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

@@ -6,7 +6,7 @@
 from dataall.core.environment.services.environment_service import EnvironmentService
 from dataall.core.organizations.db.organization_repositories import Organization
 from dataall.base.db.exceptions import RequiredParameter
-from dataall.modules.dataset_sharing.api.enums import ShareObjectPermission
+from dataall.modules.dataset_sharing.common.enums import ShareObjectPermission
 from dataall.modules.dataset_sharing.db.share_object_models import ShareObjectItem, ShareObject
 from dataall.modules.dataset_sharing.services.share_item_service import ShareItemService
 from dataall.modules.dataset_sharing.services.share_object_service import ShareObjectService

backend/dataall/modules/dataset_sharing/api/types.py

@@ -1,5 +1,5 @@
 from dataall.base.api import gql
-from dataall.modules.dataset_sharing.api.enums import ShareableType, PrincipalType
+from dataall.modules.dataset_sharing.common.enums import ShareableType, PrincipalType
 from dataall.modules.dataset_sharing.api.resolvers import union_resolver, resolve_shared_item, resolve_dataset, \
     resolve_consumption_data, resolve_existing_shared_items, resolve_share_object_statistics, resolve_principal, \
     resolve_group, list_shareable_objects, resolve_user_role

backend/dataall/modules/dataset_sharing/api/enums.py → backend/dataall/modules/dataset_sharing/common/enums.py

@@ -1,3 +1,4 @@
+
 from dataall.base.api.constants import GraphQLEnumMapper
 
 

backend/dataall/modules/dataset_sharing/db/share_object_models.py

@@ -5,7 +5,7 @@
 from sqlalchemy.orm import query_expression
 
 from dataall.base.db import Base, utils
-from dataall.modules.dataset_sharing.db.enums import ShareObjectStatus, ShareItemStatus
+from ..common.enums import ShareObjectStatus, ShareItemStatus
 
 
 def in_one_month():

backend/dataall/modules/dataset_sharing/db/share_object_repositories.py

@@ -8,7 +8,7 @@
 from dataall.core.environment.services.environment_resource_manager import EnvironmentResource
 from dataall.core.organizations.db.organization_models import Organization
 from dataall.base.db import exceptions, paginate
-from dataall.modules.dataset_sharing.db.enums import ShareObjectActions, ShareObjectStatus, ShareItemActions, \
+from ..common.enums import ShareObjectActions, ShareObjectStatus, ShareItemActions, \
     ShareItemStatus, ShareableType, PrincipalType
 from dataall.modules.dataset_sharing.db.share_object_models import ShareObjectItem, ShareObject
 from dataall.modules.datasets_base.db.dataset_repositories import DatasetRepository

backend/dataall/modules/dataset_sharing/services/data_sharing_service.py

@@ -1,5 +1,8 @@
 import logging
 
+from dataall.base.db import Engine
+from dataall.modules.dataset_sharing.db.share_object_repositories import ShareObjectSM, ShareObjectRepository, \
+    ShareItemSM
 from dataall.modules.dataset_sharing.services.share_processors.lf_process_cross_account_share import \
     ProcessLFCrossAccountShare
 from dataall.modules.dataset_sharing.services.share_processors.lf_process_same_account_share import \
@@ -8,11 +11,7 @@
     ProcessS3AccessPointShare
 from dataall.modules.dataset_sharing.services.share_processors.s3_bucket_process_share import ProcessS3BucketShare
 
-from dataall.base.db import Engine
-from dataall.modules.dataset_sharing.db.enums import (ShareObjectActions, ShareItemStatus, ShareableType,
-                                                      ShareItemActions)
-from dataall.modules.dataset_sharing.db.share_object_repositories import ShareObjectSM, ShareObjectRepository, \
-    ShareItemSM
+from ..common.enums import (ShareObjectActions, ShareItemStatus, ShareableType)
 
 log = logging.getLogger(__name__)
 

backend/dataall/modules/dataset_sharing/services/share_item_service.py

@@ -8,7 +8,7 @@
 from dataall.core.tasks.db.task_models import Task
 from dataall.base.db import utils
 from dataall.base.db.exceptions import ObjectNotFound, UnauthorizedOperation
-from dataall.modules.dataset_sharing.db.enums import ShareObjectActions, ShareableType, ShareItemStatus, \
+from ..common.enums import ShareObjectActions, ShareableType, ShareItemStatus, \
     ShareItemActions
 from dataall.modules.dataset_sharing.db.share_object_models import ShareObjectItem
 from dataall.modules.dataset_sharing.db.share_object_repositories import ShareObjectRepository, ShareObjectSM, ShareItemSM

backend/dataall/modules/dataset_sharing/services/share_notification_service.py

@@ -6,7 +6,7 @@
 from dataall.modules.dataset_sharing.db.share_object_models import ShareObject
 from dataall.modules.datasets_base.db.dataset_models import Dataset
 from dataall.base.context import get_context
-from dataall.modules.dataset_sharing.db.enums import ShareObjectStatus
+from ..common.enums import ShareObjectStatus
 from dataall.modules.notifications.db.notification_repositories import NotificationRepository
 
 log = logging.getLogger(__name__)

backend/dataall/modules/dataset_sharing/services/share_object_service.py

@@ -9,7 +9,7 @@
 from dataall.base.db import utils
 from dataall.base.aws.quicksight import QuicksightClient
 from dataall.base.db.exceptions import UnauthorizedOperation
-from dataall.modules.dataset_sharing.db.enums import ShareObjectActions, ShareableType, ShareItemStatus, \
+from ..common.enums import ShareObjectActions, ShareableType, ShareItemStatus, \
     ShareObjectStatus, PrincipalType
 from dataall.modules.dataset_sharing.db.share_object_models import ShareObjectItem, ShareObject
 from dataall.modules.dataset_sharing.db.share_object_repositories import ShareObjectRepository, ShareObjectSM, ShareItemSM

backend/dataall/modules/dataset_sharing/services/share_processors/lf_process_cross_account_share.py

@@ -1,7 +1,7 @@
 import logging
 
 from dataall.core.environment.db.environment_models import Environment, EnvironmentGroup
-from dataall.modules.dataset_sharing.db.enums import ShareItemStatus, ShareObjectActions, ShareItemActions
+from dataall.modules.dataset_sharing.common.enums import ShareItemStatus, ShareObjectActions, ShareItemActions
 from ..share_managers import LFShareManager
 from dataall.modules.dataset_sharing.aws.ram_client import RamClient
 from dataall.modules.datasets_base.db.dataset_models import DatasetTable, Dataset

backend/dataall/modules/dataset_sharing/services/share_processors/lf_process_same_account_share.py

@@ -1,7 +1,7 @@
 import logging
 
 from dataall.core.environment.db.environment_models import Environment, EnvironmentGroup
-from dataall.modules.dataset_sharing.db.enums import ShareItemStatus, ShareObjectActions, ShareItemActions
+from dataall.modules.dataset_sharing.common.enums import ShareItemStatus, ShareObjectActions, ShareItemActions
 from dataall.modules.dataset_sharing.db.share_object_models import ShareObject
 from dataall.modules.dataset_sharing.db.share_object_repositories import ShareObjectRepository, ShareItemSM
 from ..share_managers import LFShareManager

backend/dataall/modules/dataset_sharing/services/share_processors/s3_access_point_process_share.py

@@ -3,7 +3,7 @@
 from dataall.core.environment.db.environment_models import Environment, EnvironmentGroup
 from dataall.modules.dataset_sharing.services.share_managers import S3AccessPointShareManager
 from dataall.modules.datasets_base.db.dataset_models import DatasetStorageLocation, Dataset
-from dataall.modules.dataset_sharing.db.enums import ShareItemStatus, ShareObjectActions, ShareItemActions
+from dataall.modules.dataset_sharing.common.enums import ShareItemStatus, ShareObjectActions, ShareItemActions
 from dataall.modules.dataset_sharing.db.share_object_models import ShareObject
 from dataall.modules.dataset_sharing.db.share_object_repositories import ShareObjectRepository, ShareItemSM
 

backend/dataall/modules/dataset_sharing/services/share_processors/s3_bucket_process_share.py

@@ -3,7 +3,7 @@
 from dataall.core.environment.db.environment_models import Environment, EnvironmentGroup
 from dataall.modules.dataset_sharing.services.share_managers import S3BucketShareManager
 from dataall.modules.datasets_base.db.dataset_models import Dataset, DatasetBucket
-from dataall.modules.dataset_sharing.db.enums import ShareItemStatus, ShareObjectActions, ShareItemActions
+from dataall.modules.dataset_sharing.common.enums import ShareItemStatus, ShareObjectActions, ShareItemActions
 from dataall.modules.dataset_sharing.db.share_object_models import ShareObject
 from dataall.modules.dataset_sharing.db.share_object_repositories import ShareObjectRepository, ShareItemSM
 

backend/dataall/modules/datasets/api/dataset/__init__.py

@@ -3,8 +3,7 @@
     mutations,
     queries,
     resolvers,
-    types,
-    enums
+    types
 )
 
-__all__ = ['resolvers', 'types', 'input_types', 'queries', 'mutations', 'enums']
+__all__ = ['resolvers', 'types', 'input_types', 'queries', 'mutations']

backend/dataall/modules/datasets/api/dataset/input_types.py

@@ -1,6 +1,6 @@
 from dataall.base.api import gql
 from dataall.base.api.constants import SortDirection
-from dataall.modules.datasets.api.dataset.enums import DatasetSortField
+from dataall.modules.datasets_base.constants.enums import DatasetSortField
 
 
 NewDatasetInput = gql.InputType(

backend/dataall/modules/datasets/api/dataset/resolvers.py

@@ -9,7 +9,7 @@
 from dataall.base.db.exceptions import RequiredParameter, InvalidInput
 from dataall.modules.dataset_sharing.db.share_object_models import ShareObject
 from dataall.modules.datasets_base.db.dataset_models import Dataset
-from dataall.modules.datasets.api.dataset.enums import DatasetRole
+from dataall.modules.datasets_base.constants.enums import DatasetRole
 from dataall.modules.datasets.services.dataset_service import DatasetService
 
 log = logging.getLogger(__name__)
@@ -52,15 +52,15 @@ def resolve_user_role(context: Context, source: Dataset, **kwargs):
                 .first()
             )
             if share and (
-                share.owner == context.username or share.principalId in context.groups
+                    share.owner == context.username or share.principalId in context.groups
             ):
                 return DatasetRole.Shared.value
     return DatasetRole.NoPermission.value
 
 
 @is_feature_enabled('modules.datasets.features.file_uploads')
 def get_file_upload_presigned_url(
-    context, source, datasetUri: str = None, input: dict = None
+        context, source, datasetUri: str = None, input: dict = None
 ):
     return DatasetService.get_file_upload_presigned_url(uri=datasetUri, data=input)
 
@@ -162,7 +162,7 @@ def get_dataset_stack(context: Context, source: Dataset, **kwargs):
 
 
 def delete_dataset(
-    context: Context, source, datasetUri: str = None, deleteFromAWS: bool = False
+        context: Context, source, datasetUri: str = None, deleteFromAWS: bool = False
 ):
     return DatasetService.delete_dataset(uri=datasetUri, delete_from_aws=deleteFromAWS)
 
@@ -175,15 +175,15 @@ def get_dataset_glossary_terms(context: Context, source: Dataset, **kwargs):
 
 
 def list_datasets_created_in_environment(
-    context: Context, source, environmentUri: str = None, filter: dict = None
+        context: Context, source, environmentUri: str = None, filter: dict = None
 ):
     if not filter:
         filter = {}
     return DatasetService.list_datasets_created_in_environment(uri=environmentUri, data=filter)
 
 
 def list_datasets_owned_by_env_group(
-    context, source, environmentUri: str = None, groupUri: str = None, filter: dict = None
+        context, source, environmentUri: str = None, groupUri: str = None, filter: dict = None
 ):
     if not filter:
         filter = {}

backend/dataall/modules/datasets/api/dataset/types.py

@@ -1,5 +1,5 @@
 from dataall.base.api import gql
-from dataall.modules.datasets.api.dataset.enums import DatasetRole
+from dataall.modules.datasets_base.constants.enums import DatasetRole
 from dataall.modules.datasets.api.dataset.resolvers import (
     get_dataset_environment,
     get_dataset_organization,
@@ -15,7 +15,6 @@
 )
 from dataall.core.environment.api.enums import EnvironmentPermission
 
-
 DatasetStatistics = gql.ObjectType(
     name='DatasetStatistics',
     fields=[
@@ -153,7 +152,6 @@
     ],
 )
 
-
 DatasetSearchResult = gql.ObjectType(
     name='DatasetSearchResult',
     fields=[
@@ -169,7 +167,6 @@
     ],
 )
 
-
 GlueCrawler = gql.ObjectType(
     name='GlueCrawler',
     fields=[

backend/dataall/modules/datasets/api/table/enums.py

@@ -1,12 +1,6 @@
 from dataall.base.api.constants import GraphQLEnumMapper
 
 
-class DatasetSortField(GraphQLEnumMapper):
-    created = 'created'
-    updated = 'updated'
-    label = 'label'
-
-
 class DatasetTablePreviewStatus(GraphQLEnumMapper):
     QUEUED = 'QUEUED'
     RUNNING = 'RUNNING'

backend/dataall/modules/datasets/api/table/input_types.py

@@ -1,6 +1,6 @@
 from dataall.base.api import gql
 from dataall.base.api.constants import SortDirection
-from dataall.modules.datasets.api.table.enums import DatasetSortField
+from dataall.modules.datasets_base.constants.enums import DatasetSortField
 
 
 ModifyDatasetTableInput = gql.InputType(

backend/dataall/modules/datasets/services/dataset_column_service.py

@@ -10,7 +10,7 @@
 from dataall.modules.datasets.services.dataset_permissions import UPDATE_DATASET_TABLE
 from dataall.modules.datasets_base.db.dataset_models import DatasetTable, DatasetTableColumn
 from dataall.modules.datasets_base.db.dataset_repositories import DatasetRepository
-from dataall.modules.datasets_base.db.enums import ConfidentialityClassification
+from dataall.modules.datasets_base.constants.enums import ConfidentialityClassification
 from dataall.modules.datasets_base.services.permissions import PREVIEW_DATASET_TABLE
 
 

backend/dataall/modules/datasets/services/dataset_profiling_service.py

@@ -14,7 +14,7 @@
 from dataall.modules.datasets.db.dataset_table_repositories import DatasetTableRepository
 from dataall.modules.datasets.services.dataset_permissions import PROFILE_DATASET_TABLE, GET_DATASET
 from dataall.modules.datasets_base.db.dataset_repositories import DatasetRepository
-from dataall.modules.datasets_base.db.enums import ConfidentialityClassification
+from dataall.modules.datasets_base.constants.enums import ConfidentialityClassification
 from dataall.modules.datasets_base.db.dataset_models import DatasetProfilingRun, DatasetTable
 from dataall.modules.datasets_base.services.permissions import GET_DATASET_TABLE, PREVIEW_DATASET_TABLE
 

backend/dataall/modules/datasets/services/dataset_service.py

@@ -30,7 +30,7 @@
     DELETE_DATASET, MANAGE_DATASETS, UPDATE_DATASET, LIST_ENVIRONMENT_DATASETS, \
     CREATE_DATASET, DATASET_ALL, DATASET_READ, IMPORT_DATASET
 from dataall.modules.datasets_base.db.dataset_repositories import DatasetRepository
-from dataall.modules.datasets_base.db.enums import DatasetRole
+from dataall.modules.datasets_base.constants.enums import DatasetRole
 from dataall.modules.datasets_base.db.dataset_models import Dataset, DatasetTable
 from dataall.modules.datasets_base.services.permissions import DATASET_TABLE_READ