update notify service mock

Author: mitchdawson1982

feedback/models.py

@@ -1,8 +1,5 @@
 import uuid
 
-from django.core.validators import EmailValidator, MinLengthValidator
-import uuid
-
 from django.core.validators import EmailValidator, MinLengthValidator
 from django.db import models
 from django.utils.translation import gettext as _

lib/datahub-client/data_platform_catalogue/client/datahub_client.py

@@ -3,33 +3,6 @@
 from importlib.resources import files
 from typing import Sequence
 
-from datahub.configuration.common import ConfigurationError
-from datahub.emitter import mce_builder
-from datahub.emitter.mcp import MetadataChangeProposalWrapper
-from datahub.ingestion.graph.client import DatahubClientConfig, DataHubGraph
-from datahub.ingestion.source.common.subtypes import (
-    DatasetContainerSubTypes,
-    DatasetSubTypes,
-)
-from datahub.metadata import schema_classes
-from datahub.metadata.com.linkedin.pegasus2avro.common import DataPlatformInstance
-from datahub.metadata.schema_classes import (
-    ChangeTypeClass,
-    ContainerClass,
-    ContainerPropertiesClass,
-    DatasetPropertiesClass,
-    DomainPropertiesClass,
-    DomainsClass,
-    OtherSchemaClass,
-    OwnerClass,
-    OwnershipClass,
-    OwnershipTypeClass,
-    SchemaFieldClass,
-    SchemaFieldDataTypeClass,
-    SchemaMetadataClass,
-    SubTypesClass,
-)
-
 from data_platform_catalogue.client.exceptions import (
     AspectDoesNotExist,
     ConnectivityError,
@@ -71,6 +44,32 @@
     SearchResponse,
     SortOption,
 )
+from datahub.configuration.common import ConfigurationError
+from datahub.emitter import mce_builder
+from datahub.emitter.mcp import MetadataChangeProposalWrapper
+from datahub.ingestion.graph.client import DatahubClientConfig, DataHubGraph
+from datahub.ingestion.source.common.subtypes import (
+    DatasetContainerSubTypes,
+    DatasetSubTypes,
+)
+from datahub.metadata import schema_classes
+from datahub.metadata.com.linkedin.pegasus2avro.common import DataPlatformInstance
+from datahub.metadata.schema_classes import (
+    ChangeTypeClass,
+    ContainerClass,
+    ContainerPropertiesClass,
+    DatasetPropertiesClass,
+    DomainPropertiesClass,
+    DomainsClass,
+    OtherSchemaClass,
+    OwnerClass,
+    OwnershipClass,
+    OwnershipTypeClass,
+    SchemaFieldClass,
+    SchemaFieldDataTypeClass,
+    SchemaMetadataClass,
+    SubTypesClass,
+)
 
 logger = logging.getLogger(__name__)
 

lib/datahub-client/tests/client/datahub/test_graphql_helpers.py

@@ -1,7 +1,6 @@
 from datetime import datetime, timezone
 
 import pytest
-
 from data_platform_catalogue.client.graphql_helpers import (
     _make_user_email_from_urn,
     parse_columns,

tests/feedback/test_notify_service.py

@@ -7,7 +7,7 @@
 
 
 @pytest.mark.django_db
-@patch("feedback.service.notifications_client.send_email_notification")
+@patch("feedback.service.notifications_client")
 def test_send_all_notifications(mock_notifications_client):
     data = {
         "reason": "Other",
@@ -23,11 +23,11 @@ def test_send_all_notifications(mock_notifications_client):
 
     send(issue=issue)
 
-    assert mock_notifications_client.call_count == 3
+    assert mock_notifications_client.send_email_notification.call_count == 3
 
 
 @pytest.mark.django_db
-@patch("feedback.service.notifications_client.send_email_notification")
+@patch("feedback.service.notifications_client")
 def test_send_notifications_no_data_owner_email(mock_notifications_client):
     data = {
         "reason": "Other",
@@ -42,11 +42,11 @@ def test_send_notifications_no_data_owner_email(mock_notifications_client):
 
     send(issue=issue)
 
-    assert mock_notifications_client.call_count == 2
+    assert mock_notifications_client.send_email_notification.call_count == 2
 
 
 @pytest.mark.django_db
-@patch("feedback.service.notifications_client.send_email_notification")
+@patch("feedback.service.notifications_client")
 def test_send_all_notifications_no_user_email(mock_notifications_client):
     data = {
         "reason": "Other",
@@ -61,11 +61,11 @@ def test_send_all_notifications_no_user_email(mock_notifications_client):
 
     send(issue=issue)
 
-    assert mock_notifications_client.call_count == 2
+    assert mock_notifications_client.send_email_notification.call_count == 2
 
 
 @pytest.mark.django_db
-@patch("feedback.service.notifications_client.send_email_notification")
+@patch("feedback.service.notifications_client")
 def test_send_all_notifications_no_user_or_data_owner_email(mock_notifications_client):
     data = {
         "reason": "Other",
@@ -79,4 +79,4 @@ def test_send_all_notifications_no_user_or_data_owner_email(mock_notifications_c
 
     send(issue=issue)
 
-    assert mock_notifications_client.call_count == 1
+    assert mock_notifications_client.send_email_notification.call_count == 1