Feat: Refactor notifications from core to modules

backend/api_handler.py

@@ -115,7 +115,6 @@ def handler(event, context):
 
     if 'authorizer' in event['requestContext']:
         username = event['requestContext']['authorizer']['claims']['email']
-        email_id = event['requestContext']['authorizer']['claims']['email']
         try:
             groups = get_groups(event['requestContext']['authorizer']['claims'])
             with ENGINE.scoped_session() as session:
@@ -138,14 +137,13 @@ def handler(event, context):
             print(f'Error managing groups due to: {e}')
             groups = []
 
-        set_context(RequestContext(ENGINE, username, email_id, groups))
+        set_context(RequestContext(ENGINE, username, groups))
 
         app_context = {
             'engine': ENGINE,
             'username': username,
             'groups': groups,
-            'schema': SCHEMA,
-            'emailId': email_id,
+            'schema': SCHEMA
         }
 
     else:

backend/dataall/base/aws/cognito.py

@@ -15,8 +15,6 @@ def __init__(self):
     def get_user_emailids_from_group(self, groupName):
         try:
             envname = os.getenv('envname', 'local')
-            if envname == 'local' or envname == 'dkrcompose':
-                raise Exception('Cognito is not supported in local dev environment')
             parameter_path = f'/dataall/{envname}/cognito/userpool'
             ssm = boto3.client('ssm', region_name=os.getenv('AWS_REGION', 'eu-west-1'))
             user_pool_id = ssm.get_parameter(Name=parameter_path)['Parameter']['Value']
@@ -29,6 +27,10 @@ def get_user_emailids_from_group(self, groupName):
             group_email_ids.extend([x['Value'] for x in attributes if x['Name'] == 'email'])
 
         except Exception as e:
+            envname = os.getenv('envname', 'local')
+            if envname in ['local', 'dkrcompose']:
+                log.error('Local development environment does not support Cognito')
+                return ['[email protected]']
             log.error(
                 f'Failed to get email ids for Cognito group {groupName} due to {e}'
             )

backend/dataall/base/aws/ses.py

@@ -51,5 +51,9 @@ def send_email(self, toList, message, subject):
                 }
             )
         except Exception as e:
+            envname = os.getenv('envname', 'local')
+            if envname in ['local', 'dkrcompose']:
+                log.error('Local development environment does not support SES notifications')
+                return True
             log.error(f'Error while sending email {e})')
             raise e

backend/dataall/base/context.py

@@ -22,7 +22,6 @@ class RequestContext:
     """Contains API for every graphql request"""
     db_engine: Engine
     username: str
-    email_id: str
     groups: List[str]
 
 

backend/dataall/core/__init__.py

@@ -2,7 +2,6 @@
 from dataall.core import (
     permissions,
     stacks,
-    notifications,
     cognito_groups,
     environment,
     organizations,

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

@@ -1,9 +1,8 @@
 from dataall.base.api import gql
-from dataall.core.notifications.db.notification_models import Notification
 from dataall.core.permissions.db.permission_models import PermissionType
 
 
-def resolve_enum(context, source: Notification):
+def resolve_enum(context, source: PermissionType):
     return source.type.name if source.type else PermissionType.TENANT.name
 
 

backend/dataall/modules/dataset_sharing/__init__.py

@@ -17,7 +17,8 @@ def is_supported(modes: Set[ImportMode]) -> bool:
 
     @staticmethod
     def depends_on() -> List[Type['ModuleInterface']]:
-        return [DatasetBaseModuleInterface]
+        from dataall.modules.notifications import NotificationsModuleInterface
+        return [DatasetBaseModuleInterface, NotificationsModuleInterface]
 
     def __init__(self):
         from dataall.modules.dataset_sharing import api
@@ -35,7 +36,8 @@ def is_supported(modes: List[ImportMode]):
 
     @staticmethod
     def depends_on() -> List[Type['ModuleInterface']]:
-        return [DatasetBaseModuleInterface]
+        from dataall.modules.notifications import NotificationsModuleInterface
+        return [DatasetBaseModuleInterface, NotificationsModuleInterface]
 
     def __init__(self):
         import dataall.modules.dataset_sharing.handlers

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

@@ -63,7 +63,11 @@ def revoke_items_share_object(uri, revoked_uris):
                 resource_uri=dataset.datasetUri,
             )
 
-            ShareNotificationService.notify_share_object_rejection(session, context.username, context.email_id, dataset, share)
+            ShareNotificationService(
+                session=session,
+                dataset=dataset,
+                share=share
+            ).notify_share_object_rejection(email_id=context.username)
 
             revoke_share_task: Task = Task(
                 action='ecs.share.revoke',