Feat/integ tests notifications

backend/dataall/modules/notifications/api/mutations.py

@@ -1,5 +1,5 @@
 from dataall.base.api import gql
-from .resolvers import delete, mark_as_read
+from .resolvers import mark_as_read
 
 
 markNotificationAsRead = gql.MutationField(
@@ -10,10 +10,3 @@
     type=gql.Boolean,
     resolver=mark_as_read,
 )
-
-deleteNotification = gql.MutationField(
-    name='deleteNotification',
-    args=[gql.Argument(name='notificationUri', type=gql.String)],
-    type=gql.Boolean,
-    resolver=delete,
-)

backend/dataall/modules/notifications/api/queries.py

@@ -1,7 +1,5 @@
 from dataall.base.api import gql
 from .resolvers import (
-    count_deleted_notifications,
-    count_read_notifications,
     count_unread_notifications,
     list_my_notifications,
 )
@@ -21,17 +19,3 @@
     type=gql.Integer,
     resolver=count_unread_notifications,
 )
-
-# Not used in frontend
-countReadNotifications = gql.QueryField(
-    name='countReadNotifications',
-    type=gql.Integer,
-    resolver=count_read_notifications,
-)
-
-# Not used in frontend
-countDeletedNotifications = gql.QueryField(
-    name='countDeletedNotifications',
-    type=gql.Integer,
-    resolver=count_deleted_notifications,
-)

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

@@ -48,23 +48,3 @@ def count_unread_notifications(context: Context, source):
         return NotificationRepository.count_unread_notifications(
             session=session, username=get_context().username, groups=get_context().groups
         )
-
-
-def count_deleted_notifications(context: Context, source):
-    with _session() as session:
-        return NotificationRepository.count_deleted_notifications(
-            session=session, username=get_context().username, groups=get_context().groups
-        )
-
-
-def count_read_notifications(context: Context, source):
-    with _session() as session:
-        return NotificationRepository.count_read_notifications(
-            session=session, username=get_context().username, groups=get_context().groups
-        )
-
-
-def delete(context: Context, source, notificationUri):
-    _required_uri(notificationUri)
-    with _session() as session:
-        return NotificationRepository.delete_notification(session=session, notificationUri=notificationUri)

backend/dataall/modules/notifications/db/notification_repositories.py

@@ -66,38 +66,9 @@ def count_unread_notifications(session, username, groups):
         )
         return int(count)
 
-    @staticmethod
-    def count_read_notifications(session, username, groups):
-        count = (
-            session.query(func.count(models.Notification.notificationUri))
-            .filter(or_(models.Notification.recipient == username, models.Notification.recipient.in_(groups)))
-            .filter(models.Notification.is_read == True)
-            .filter(models.Notification.deleted.is_(None))
-            .scalar()
-        )
-        return int(count)
-
-    @staticmethod
-    def count_deleted_notifications(session, username, groups):
-        count = (
-            session.query(func.count(models.Notification.notificationUri))
-            .filter(or_(models.Notification.recipient == username, models.Notification.recipient.in_(groups)))
-            .filter(models.Notification.deleted.isnot(None))
-            .scalar()
-        )
-        return int(count)
-
     @staticmethod
     def read_notification(session, notificationUri):
         notification = session.query(models.Notification).get(notificationUri)
         notification.is_read = True
         session.commit()
         return True
-
-    @staticmethod
-    def delete_notification(session, notificationUri):
-        notification = session.query(models.Notification).get(notificationUri)
-        if notification:
-            notification.deleted = datetime.now()
-            session.commit()
-        return True

frontend/src/services/graphql/Notification/index.js

@@ -1,6 +1,3 @@
-export * from './archiveNotification';
-export * from './countDeletedNotifications';
-export * from './countReadNotifications';
 export * from './countUnreadNotifications';
 export * from './listNotifications';
 export * from './markAsRead';

tests_new/integration_tests/conftest.py

@@ -16,6 +16,7 @@
     'integration_tests.core.organizations.global_conftest',
     'integration_tests.core.environment.global_conftest',
     'integration_tests.modules.s3_datasets.global_conftest',
+    'integration_tests.modules.share_base.global_conftest',
 ]
 
 

tests_new/integration_tests/modules/notifications/conftest.py

@@ -0,0 +1,22 @@
+import pytest
+
+from tests_new.integration_tests.modules.share_base.queries import (
+    submit_share_object,
+    add_share_item,
+    get_share_object,
+    remove_shared_item,
+)
+
+
+@pytest.fixture(scope='module')
+def session_share_1_notifications(client5, session_share_1):
+    share_item_uri = None
+    try:
+        updated_share = get_share_object(client5, session_share_1.shareUri)
+        item_to_add = updated_share['items'].nodes[0]
+        share_item_uri = add_share_item(client5, session_share_1.shareUri, item_to_add.itemUri, item_to_add.itemType)
+        submit_share_object(client5, session_share_1.shareUri)
+        yield session_share_1
+    finally:
+        if share_item_uri:
+            remove_shared_item(client5, share_item_uri)

tests_new/integration_tests/modules/notifications/queries.py

@@ -0,0 +1,56 @@
+# TODO: This file will be replaced by using the SDK directly
+
+
+def mark_notification_read(client, uri):
+    query = {
+        'operationName': 'markNotificationAsRead',
+        'variables': {'notificationUri': uri},
+        'query': """
+            mutation markNotificationAsRead($notificationUri: String!) {
+              markNotificationAsRead(notificationUri: $notificationUri)
+            }
+                """,
+    }
+    response = client.query(query=query)
+    return response.data.markNotificationAsRead
+
+
+def list_notifications(client, filter={}):
+    query = {
+        'operationName': 'listNotifications',
+        'variables': {'filter': filter},
+        'query': """
+            query listNotifications($filter: NotificationFilter) {
+              listNotifications(filter: $filter) {
+                count
+                page
+                pages
+                hasNext
+                hasPrevious
+                nodes {
+                  notificationUri
+                  message
+                  type
+                  is_read
+                  target_uri
+                }
+              }
+            }
+                """,
+    }
+    response = client.query(query=query)
+    return response.data.listNotifications
+
+
+def count_unread_notifications(client):
+    query = {
+        'operationName': 'countUnreadNotifications',
+        'variables': {},
+        'query': """
+            query countUnreadNotifications {
+              countUnreadNotifications
+            }
+                """,
+    }
+    response = client.query(query=query)
+    return response.data.countUnreadNotifications

tests_new/integration_tests/modules/notifications/test_notifications.py

@@ -0,0 +1,34 @@
+from assertpy import assert_that
+
+from integration_tests.errors import GqlError
+from integration_tests.modules.notifications.queries import (
+    list_notifications,
+    count_unread_notifications,
+    mark_notification_read,
+)
+
+
+def test_list_notification(client1):
+    assert_that(list_notifications(client1)).contains_key('page', 'pages', 'nodes', 'count')
+    assert_that(list_notifications(client1, filter={'read': True})).contains_key('page', 'pages', 'nodes', 'count')
+    assert_that(list_notifications(client1, filter={'unread': True})).contains_key('page', 'pages', 'nodes', 'count')
+    assert_that(list_notifications(client1, filter={'archived': True})).contains_key('page', 'pages', 'nodes', 'count')
+
+
+def test_count_unread_notification(client1):
+    assert_that(count_unread_notifications(client1)).is_greater_than_or_equal_to(0)
+
+
+def test_read_notification_invalid(client1):
+    assert_that(mark_notification_read).raises(GqlError).when_called_with(client1, '').contains(
+        'RequiredParameter', 'URI'
+    )
+
+
+def test_read_notification(client1, session_share_1_notifications):
+    count_unread = count_unread_notifications(client1)
+
+    response = list_notifications(client1)
+    mark_notification_read(client1, response.nodes[0].notificationUri)
+
+    assert_that(count_unread_notifications(client1)).is_equal_to(count_unread - 1)