Merge branch 'refactor-notifications' of https://github.com/CenterForOpenScience/osf.io into add-new-notifications-data-model

* 'refactor-notifications' of https://github.com/CenterForOpenScience/osf.io:
  fix mail mocking issues for password reset
  mock mail for tests
  re-expose quickfiles migrated logs
  remove logs groups embedding
  remove logs groups embedding

Author: Johnetordoff

addons/boa/tests/test_tasks.py

@@ -8,7 +8,7 @@
 
 from addons.boa import settings as boa_settings
 from addons.boa.boa_error_code import BoaErrorCode
-from addons.boa.tasks import submit_to_boa, handle_boa_error
+from addons.boa.tasks import submit_to_boa, submit_to_boa_async, handle_boa_error
 from osf.models import NotificationType
 from osf_tests.factories import AuthUserFactory, ProjectFactory
 from tests.base import OsfTestCase
@@ -96,7 +96,7 @@ def test_submit_to_boa_async_called(self):
                 new_callable=AsyncMock,
                 return_value=BoaErrorCode.NO_ERROR
         ) as mock_submit_to_boa_async:
-            return_value = submit_to_boa(
+            return_value = await submit_to_boa_async(
                 self.host,
                 self.username,
                 self.password,
@@ -186,7 +186,7 @@ async def test_download_error(self):
                 mock.patch('osf.models.user.OSFUser.get_or_create_cookie', return_value=self.user_cookie), \
                 mock.patch('urllib.request.urlopen', side_effect=http_404), \
                 mock.patch('addons.boa.tasks.handle_boa_error', return_value=None) as mock_handle_boa_error:
-            return_value = submit_to_boa(
+            return_value = await submit_to_boa_async(
                 self.host,
                 self.username,
                 self.password,
@@ -217,7 +217,7 @@ async def test_login_error(self):
                 mock.patch('boaapi.boa_client.BoaClient.login', side_effect=BoaException()) as mock_login, \
                 mock.patch('boaapi.boa_client.BoaClient.close', return_value=None) as mock_close, \
                 mock.patch('addons.boa.tasks.handle_boa_error', return_value=None) as mock_handle_boa_error:
-            return_value = submit_to_boa(
+            return_value = await submit_to_boa_async(
                 self.host,
                 self.username,
                 self.password,
@@ -251,7 +251,7 @@ async def test_data_set_error(self):
                 mock.patch('boaapi.boa_client.BoaClient.get_dataset', side_effect=BoaException()) as mock_get_dataset, \
                 mock.patch('boaapi.boa_client.BoaClient.close', return_value=None) as mock_close, \
                 mock.patch('addons.boa.tasks.handle_boa_error', return_value=None) as mock_handle_boa_error:
-            return_value = submit_to_boa(
+            return_value = await submit_to_boa_async(
                 self.host,
                 self.username,
                 self.password,
@@ -286,7 +286,7 @@ async def test_submit_error(self):
                 mock.patch('boaapi.boa_client.BoaClient.query', side_effect=BoaException()) as mock_query, \
                 mock.patch('boaapi.boa_client.BoaClient.close', return_value=None) as mock_close, \
                 mock.patch('addons.boa.tasks.handle_boa_error', return_value=None) as mock_handle_boa_error:
-            return_value = submit_to_boa(
+            return_value = await submit_to_boa_async(
                 self.host,
                 self.username,
                 self.password,
@@ -324,7 +324,7 @@ async def test_compile_error(self):
                 mock.patch('boaapi.boa_client.BoaClient.close', return_value=None) as mock_close, \
                 mock.patch('asyncio.sleep', new_callable=AsyncMock, return_value=None), \
                 mock.patch('addons.boa.tasks.handle_boa_error', return_value=None) as mock_handle_boa_error:
-            return_value = submit_to_boa(
+            return_value = await submit_to_boa_async(
                 self.host,
                 self.username,
                 self.password,
@@ -362,7 +362,7 @@ async def test_execute_error(self):
                 mock.patch('boaapi.boa_client.BoaClient.close', return_value=None) as mock_close, \
                 mock.patch('asyncio.sleep', new_callable=AsyncMock, return_value=None), \
                 mock.patch('addons.boa.tasks.handle_boa_error', return_value=None) as mock_handle_boa_error:
-            return_value = submit_to_boa(
+            return_value = await submit_to_boa_async(
                 self.host,
                 self.username,
                 self.password,
@@ -399,7 +399,7 @@ async def test_output_error_(self):
                 mock.patch('boaapi.boa_client.BoaClient.close', return_value=None) as mock_close, \
                 mock.patch('asyncio.sleep', new_callable=AsyncMock, return_value=None), \
                 mock.patch('addons.boa.tasks.handle_boa_error', return_value=None) as mock_handle_boa_error:
-            return_value = submit_to_boa(
+            return_value = await submit_to_boa_async(
                 self.host,
                 self.username,
                 self.password,
@@ -437,7 +437,7 @@ async def test_upload_error_conflict(self):
                 mock.patch('boaapi.boa_client.BoaClient.close', return_value=None) as mock_close, \
                 mock.patch('asyncio.sleep', new_callable=AsyncMock, return_value=None), \
                 mock.patch('addons.boa.tasks.handle_boa_error', return_value=None) as mock_handle_boa_error:
-            return_value = submit_to_boa(
+            return_value = await submit_to_boa_async(
                 self.host,
                 self.username,
                 self.password,
@@ -475,7 +475,7 @@ async def test_upload_error_other(self):
                 mock.patch('boaapi.boa_client.BoaClient.close', return_value=None) as mock_close, \
                 mock.patch('asyncio.sleep', new_callable=AsyncMock, return_value=None), \
                 mock.patch('addons.boa.tasks.handle_boa_error', return_value=None) as mock_handle_boa_error:
-            return_value = submit_to_boa(
+            return_value = await submit_to_boa_async(
                 self.host,
                 self.username,
                 self.password,
@@ -506,7 +506,7 @@ async def test_file_too_large_error(self):
         with mock.patch('osf.models.user.OSFUser.objects.get', return_value=self.user), \
                 mock.patch('osf.models.user.OSFUser.get_or_create_cookie', return_value=self.user_cookie), \
                 mock.patch('addons.boa.tasks.handle_boa_error', return_value=None) as mock_handle_boa_error:
-            return_value = submit_to_boa(
+            return_value = await submit_to_boa_async(
                 self.host,
                 self.username,
                 self.password,
@@ -542,7 +542,7 @@ async def test_job_timeout_error(self):
                 mock.patch('boaapi.boa_client.BoaClient.query', return_value=self.mock_job), \
                 mock.patch('boaapi.boa_client.BoaClient.close', return_value=None) as mock_close, \
                 mock.patch('addons.boa.tasks.handle_boa_error', return_value=None) as mock_handle_boa_error:
-            return_value = submit_to_boa(
+            return_value = await submit_to_boa_async(
                 self.host,
                 self.username,
                 self.password,

osf/models/notification.py

@@ -31,8 +31,17 @@ def send(
         """
         if not protocol_type == 'email':
             raise NotImplementedError(f'Protocol type {protocol_type}. Email notifications are only implemented.')
-
         recipient_address = destination_address or self.subscription.user.username
+
+        logging.info(
+            f"Attempting to send Notification:"
+            f"\nto={getattr(self.subscription.user, 'username', destination_address)}"
+            f"\nat={destination_address}"
+            f"\ntype={self.subscription.notification_type}"
+            f"\ncontext={self.event_context}"
+            f"\nemail={email_context}"
+        )
+
         if protocol_type == 'email' and waffle.switch_is_active(features.ENABLE_MAILHOG):
             email.send_email_over_smtp(
                 recipient_address,

osf/models/notification_subscription.py

@@ -71,10 +71,12 @@ def emit(
         """
         logging.info(
             f"Attempting to create Notification:"
-            f"\nto={self.user.username}"
+            f"\nto={getattr(self.user, 'username', destination_address)}"
             f"\ntype={self.notification_type.name}"
             f"\nmessage_frequency={self.message_frequency}"
             f"\ncontext={event_context}"
+            f"\nemail={email_context}"
+
         )
         if self.message_frequency == 'instantly':
             notification = Notification.objects.create(

pytest.ini

@@ -1,5 +1,5 @@
 [pytest]
-addopts = --ds=osf_tests.settings --tb=short --allow-hosts=127.0.0.1,192.168.168.167,localhost
+addopts = --ds=osf_tests.settings --tb=short --reuse-db --allow-hosts=127.0.0.1,192.168.168.167,localhost
 filterwarnings =
     once::UserWarning
     ignore:.*U.*mode is deprecated:DeprecationWarning

tests/test_user_profile_view.py

@@ -7,6 +7,7 @@
 from rest_framework import status as http_status
 
 from addons.github.tests.factories import GitHubAccountFactory
+from conftest import start_mock_send_grid
 from framework.celery_tasks import handlers
 from osf.external.spam import tasks as spam_tasks
 from osf.models import NotableDomain, NotificationType