Merge pull request #804 from alphagov/too-many-messages

Too many messages

app/templates/partials/check/too_many_messages.html

@@ -0,0 +1,26 @@
+<div class="bottom-gutter">
+  {% call banner_wrapper(type='dangerous') %}
+    <h1 class='banner-title'>
+      Too many recipients
+    </h1>
+    <p>
+      You can only send {{ current_service.message_limit }} messages per day
+      {%- if current_service.restricted %}
+        in <a href="{{ url_for('.trial_mode')}}">trial mode</a>
+      {%- endif -%}
+      .
+    </p>
+    <p>
+      {% if statistics.emails_requested or statistics.sms_requested %}
+        You can still send
+        {{ current_service.message_limit - statistics.get('emails_requested', 0) - statistics.get('sms_requested', 0) }}
+        messages today, but
+      {% endif %}
+      ‘{{ original_file_name }}’ contains
+      {{ count_of_recipients }} {{ recipients.recipient_column_header }}
+      {%- if count_of_recipients != 1 -%}
+        {{ 'es' if 'email address' == recipients.recipient_column_header else 's' }}
+      {%- endif %}.
+    </p>
+  {% endcall %}
+</div>

app/templates/views/check.html

@@ -104,35 +104,7 @@
     </div>
 
   {% elif count_of_recipients > (current_service.message_limit - statistics.get('emails_requested', 0) - statistics.get('sms_requested', 0)) %}
-
-    <div class="bottom-gutter">
-      {% call banner_wrapper(type='dangerous') %}
-        <h1 class='banner-title'>
-          Too many recipients
-        </h1>
-        {% if statistics.emails_requested or statistics.sms_requested %}
-          <p>
-            You can only send {{ current_service.message_limit }}
-            messages per day
-            {%- if current_service.restricted %}
-              in <a href="{{ url_for('.trial_mode')}}">trial mode</a>
-            {%- endif -%}
-            .
-          </p>
-        {% endif %}
-        <p>
-          You can still send
-          {{ current_service.message_limit - statistics.get('emails_requested', 0) - statistics.get('sms_requested', 0) }}
-          messages today, but
-          ‘{{ original_file_name }}’ contains
-          {{ count_of_recipients }} {{ recipients.recipient_column_header }}
-          {%- if count_of_recipients != 1 -%}
-            {{ 'es' if 'email address' == recipients.recipient_column_header else 's' }}
-          {%- endif %}
-        </p>
-      {% endcall %}
-    </div>
-
+    {% include "partials/check/too_many_messages.html" %}
   {% else %}
 
     <h1 class="heading-large">

tests/app/main/views/test_send.py

@@ -719,3 +719,54 @@ def test_go_to_dashboard_after_tour(
         assert resp.status_code == 302
         assert resp.location == url_for("main.service_dashboard", service_id=fake_uuid, _external=True)
         mock_delete_service_template.assert_called_once_with(fake_uuid, fake_uuid)
+
+
+@pytest.mark.parametrize('num_already_sent,msg', [
+    (0, '‘valid.csv’ contains 100 phone numbers.'),
+    (1, 'You can still send 49 messages today, but ‘valid.csv’ contains 100 phone numbers.')
+], ids=['none_sent', 'some_sent'])
+def test_check_messages_shows_too_many_messages_errors(
+    mocker,
+    app_,
+    api_user_active,
+    mock_login,
+    mock_get_users_by_service,
+    mock_get_service,
+    mock_get_service_template,
+    mock_has_permissions,
+    fake_uuid,
+    num_already_sent,
+    msg
+):
+    # csv with 100 phone numbers
+    mocker.patch('app.main.views.send.s3download', return_value=',\n'.join(
+        ['phone number'] + ([mock_get_users_by_service(None)[0]._mobile_number]*100)
+    ))
+    mocker.patch('app.statistics_api_client.get_statistics_for_service_for_day', return_value={
+        'day': datetime.today().date().strftime('%Y-%m-%d'),
+        'sms_requested': num_already_sent, 'sms_delivered': num_already_sent, 'sms_failed': 0,
+        'emails_requested': 0, 'emails_delivered': 0, 'emails_failed': 0, 'service': fake_uuid, 'id': fake_uuid
+    })
+
+    with app_.test_request_context(), app_.test_client() as client:
+        client.login(api_user_active)
+        with client.session_transaction() as session:
+            session['upload_data'] = {'original_file_name': 'valid.csv',
+                                      'template_id': fake_uuid,
+                                      'notification_count': 1,
+                                      'valid': True}
+        response = client.get(url_for(
+            'main.check_messages',
+            service_id=fake_uuid,
+            template_type='sms',
+            upload_id=fake_uuid
+        ))
+    assert response.status_code == 200
+    page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
+    assert page.find('h1').text.strip() == 'Too many recipients'
+    assert page.find('div', class_='banner-dangerous').find('a').text.strip() == 'trial mode'
+
+    # remove excess whitespace from element
+    details = page.find('div', class_='banner-dangerous').findAll('p')[1]
+    details = ' '.join([line.strip() for line in details.text.split('\n') if line.strip() != ''])
+    assert details == msg

tests/conftest.py

@@ -57,7 +57,7 @@ def fake_uuid():
 def mock_get_service(mocker, api_user_active):
     def _get(service_id):
         service = service_json(
-            service_id, "Test Service", [api_user_active.id], message_limit=1000,
+            service_id, "Test Service", [api_user_active.id], message_limit=50,
             active=False, restricted=True)
         return {'data': service}