fix mails import for merge and add assert

Author: Johnetordoff

admin_tests/users/test_views.py

@@ -105,7 +105,7 @@ def test_correct_view_permissions(self):
             response = views.ResetPasswordView.as_view()(request, guid=guid)
 
         assert len(notifications['emits']) == 1
-        assert notifications['emits'][0]['type'] == NotificationType.Type.USER_PASSWORD_RESET
+        assert notifications['emits'][0]['type'] == NotificationType.Type.USER_FORGOT_PASSWORD
         self.assertEqual(response.status_code, 302)
 
 

api/users/services.py

@@ -15,8 +15,10 @@ def send_password_reset_email(user, email, verification_type='password', institu
     user.save()
 
     reset_link = furl(settings.DOMAIN).add(path=f'resetpassword/{user._id}/{user.verification_key_v2["token"]}').url
+    notification_type = NotificationType.Type.USER_FORGOT_PASSWORD_INSTITUTION if institutional \
+        else NotificationType.Type.USER_FORGOT_PASSWORD
 
-    NotificationType.Type.USER_FORGOT_PASSWORD.instance.emit(
+    notification_type.instance.emit(
         destination_address=email,
         event_context={
             'reset_link': reset_link,