SDAN-713 Add the ability to add an email address to a Monitoring prof…

…ile (#1159)

assets/monitoring/components/EditMonitoringProfile.jsx

@@ -143,6 +143,15 @@ class EditMonitoringProfile extends React.Component {
                                         onChange={onChange}
                                         error={getError('company')} />
 
+                                    <TextInput
+                                        name='email'
+                                        label={gettext('Email Address')}
+                                        value={item.email || ''}
+                                        onChange={onChange}
+                                        error={getError('email')}
+                                        description={gettext('Optional comma seperated list of email addresses')}
+                                    />
+
                                     <TextAreaInput
                                         name='query'
                                         label={gettext('Query')}

assets/monitoring/reducers.js

@@ -50,6 +50,7 @@ export default function monitoringReducer(state = initialState, action) {
                 name: '',
                 subject: '',
                 description: '',
+                email: '',
                 alert_type: 'full_text',
                 format_type: 'monitoring_pdf',
                 company: '',

newsroom/monitoring/email_alerts.py

@@ -24,6 +24,7 @@
 from .utils import get_monitoring_file, truncate_article_body, get_date_items_dict
 import base64
 import os
+import re
 
 try:
     from urllib.parse import urlparse
@@ -241,13 +242,22 @@ def already_sent(self, item, profile):
 
     def filter_users(self, m, company):
         """
-        return a list of users from the profile that are enabled and belong to the company the profile belongs to.
+        return a list of users email addresses from the profile that are enabled and belong to the company the
+        profile belongs to. It will also add any email addresses that may be associated with the profile if are
+        available and are unique
         :param m:
         :param company:
         :return: List of valid users
         """
-        return [email['email'] for email in [u for u in get_items_by_id([ObjectId(u) for u in m['users']], 'users') if
-                                             u['is_enabled'] and u['company'] == company['_id']]]
+        email_addresses = [email['email'] for email in
+                           [u for u in get_items_by_id([ObjectId(u) for u in m['users']], 'users') if
+                            u['is_enabled'] and u['company'] == company['_id']]]
+        # append any addresses from the profile
+        if m.get('email'):
+            for address in re.split(r'[, ]*', m.get('email')):
+                if m.get('email') not in email_addresses:
+                    email_addresses.append(address)
+        return email_addresses
 
     def send_alerts(self, monitoring_list, created_from, created_from_time, now):
         general_settings = get_settings_collection().find_one(GENERAL_SETTINGS_LOOKUP)

newsroom/monitoring/forms.py

@@ -2,7 +2,9 @@
 from flask_babel import gettext
 from wtforms import StringField, HiddenField, BooleanField, TextAreaField
 from wtforms import SelectField
-from wtforms.validators import DataRequired
+from wtforms.validators import DataRequired, Email, Optional
+from copy import deepcopy
+import re
 
 alert_types = [('full_text', gettext('Full text')), ('linked_text', gettext('Linked extract(s)'))]
 format_types = [('monitoring_pdf', gettext('PDF')), ('monitoring_rtf', gettext('RTF')),
@@ -22,8 +24,18 @@ class Meta:
     alert_type = SelectField(gettext('Alert Type'), choices=alert_types, default='full_text')
     format_type = SelectField(gettext('Format Type'), choices=format_types, default='monitoring_pdf')
     company = StringField(gettext('Company'), validators=[DataRequired()])
+    email = StringField(gettext('Email'), validators=[Optional()], default='')
     is_enabled = BooleanField(gettext('Enabled'), default=True, validators=[])
     always_send = BooleanField(gettext('Always Send'), default=False, validators=[])
     headline_subject = BooleanField(gettext('Use Headline as Subject of emails containing a single item'),
                                     default=False, validators=[])
     query = TextAreaField(gettext('Query'))
+
+    def validate_email(form, field):
+        address_list = re.split(r'[, ]*', field.data)
+        input_data = deepcopy(field.data)
+        for address in address_list:
+            v = Email(message=field.gettext('Invalid email address: ') + address)
+            field.data = address
+            v(form, field)
+        field.data = input_data

newsroom/monitoring/monitoring.py

@@ -22,6 +22,12 @@ class MonitoringResource(newsroom.Resource):
         'company': {
             'type': 'objectid'
         },
+        # Additional email addresses to send the monitoring email to, They do not need to belong to a newsroom user,
+        # they are intended to usually belong to a distribution list of the client company
+        'email': {
+            'type': 'string',
+            'nullable': True
+        },
         'query': {
             'type': 'string'
         },

newsroom/monitoring/views.py

@@ -62,6 +62,9 @@ def process_form_request(updates, request_updates, form):
     if 'keywords' in request_updates:
         updates['keywords'] = request_updates['keywords']
 
+    if 'email' in request_updates:
+        updates['email'] = request_updates.get('email').replace(' ', '')
+
 
 def get_monitoring_for_company(user):
     company = user['company'] if user and user.get('company') else None

tests/test_monitoring.py

@@ -948,3 +948,26 @@ def test_save_only_users_belonging_to_company(client, app):
     }), content_type='application/json')
     m = app.data.find_one('monitoring', None, _id="5db11ec55f627d8aa0b545fb")
     assert m['users'] == [ObjectId("5c53afa45f627d8333220f15")]
+
+
+@mock.patch('newsroom.monitoring.email_alerts.utcnow', mock_utcnow)
+@mock.patch('newsroom.email.send_email', mock_send_email)
+def test_send_profile_email(client, app):
+    test_login_succeeds_for_admin(client)
+    app.data.insert('items', [{
+        '_id': 'foo',
+        'headline': 'product immediate',
+        'products': [{'code': '12345'}],
+        "versioncreated": utcnow(),
+        'byline': 'Testy McTestface',
+        'body_html': '<p>line 1 of the article text\nline 2 of the story\nand a bit more.</p>',
+        'source': 'AAAA'
+    }])
+    m = app.data.find_one('monitoring', None, _id="5db11ec55f627d8aa0b545fb")
+    assert m is not None
+    app.data.update('monitoring', ObjectId("5db11ec55f627d8aa0b545fb"), {'email': '[email protected], [email protected]'}, m)
+    with app.mail.record_messages() as outbox:
+        MonitoringEmailAlerts().run(immediate=True)
+        assert len(outbox) == 1
+        assert '[email protected]' in outbox[0].recipients
+        assert '[email protected]' in outbox[0].recipients