Merge pull request #1445 from alphagov/inbound-sms-number-shown-bug

Put the inbound number on the invite page

app/main/views/dashboard.py

@@ -18,7 +18,8 @@ from app import (
     billing_api_client,
     job_api_client,
     service_api_client,
-    template_statistics_client
+    template_statistics_client,
+    inbound_number_client,
 )
 from app.statistics_utils import get_formatted_percentage, add_rate_to_job
 from app.utils import (
@@ -175,11 +176,17 @@ def get_inbox_partials(service_id):
         }:
             messages_to_show.append(message)
 
+    if not inbound_messages:
+        inbound_number = inbound_number_client.get_inbound_sms_number_for_service(service_id)['data']['number']
+    else:
+        inbound_number = None
+
     return {'messages': render_template(
         'views/dashboard/_inbox_messages.html',
         messages=messages_to_show,
         count_of_messages=len(inbound_messages),
         count_of_users=len(messages_to_show),
+        inbound_number=inbound_number,
     )}
 
 

app/main/views/service_settings.py

@@ -394,6 +394,7 @@ def service_set_international_sms(service_id):
 def service_set_inbound_sms(service_id):
     return render_template(
         'views/service-settings/set-inbound-sms.html',
+        inbound_number=inbound_number_client.get_inbound_sms_number_for_service(service_id)['data']['number'],
     )
 
 

app/templates/views/dashboard/_inbox_messages.html

@@ -6,7 +6,7 @@
     messages,
     caption="Inbox",
     caption_visible=False,
-    empty_message='When users text your service’s phone number ({}) you’ll see the messages here'.format(current_service.sms_sender),
+    empty_message='When users text your service’s phone number ({}) you’ll see the messages here'.format(inbound_number),
     field_headings=[
       'From',
       'First two lines of message'

app/templates/views/service-settings/set-inbound-sms.html

@@ -13,7 +13,7 @@
       <h1 class="heading-large">Receive text messages</h1>
       {% if 'inbound_sms' in current_service.permissions %}
         <p>
-          Your service can receive text messages sent to {{ current_service.sms_sender }}.
+          Your service can receive text messages sent to {{ inbound_number }}.
         </p>
         <p>
           If you want to turn this feature off,

tests/app/main/views/test_dashboard.py

@@ -176,6 +176,7 @@ def test_empty_inbox(
     mock_get_template_statistics,
     mock_get_usage,
     mock_get_inbound_sms_with_no_messages,
+    mock_get_inbound_number_for_service,
 ):
 
     service_one['permissions'] = ['inbound_sms']
@@ -185,7 +186,7 @@ def test_empty_inbox(
 
     assert response.status_code == 200
     assert normalize_spaces(page.select('tbody tr')) == (
-        'When users text your service’s phone number (GOVUK) you’ll see the messages here'
+        'When users text your service’s phone number (0781239871) you’ll see the messages here'
     )
 
 
@@ -210,6 +211,7 @@ def test_anyone_can_see_inbox(
     service_one,
     mocker,
     mock_get_inbound_sms_with_no_messages,
+    mock_get_inbound_number_for_service,
 ):
 
     service_one['permissions'] = ['inbound_sms']

tests/app/main/views/test_service_settings.py

@@ -1296,28 +1296,61 @@ def test_cant_resume_active_service(
     assert 'Resume service' not in {a.text for a in page.find_all('a', class_='button')}
 
 
-@pytest.mark.parametrize('endpoint, expected_p', [
+@pytest.mark.parametrize('endpoint, permissions, expected_p', [
     (
-            'main.service_set_international_sms',
-            (
-                    'Sending text messages to international phone numbers is '
-                    'an invitation‑only feature.'
-            )
+        'main.service_set_international_sms',
+        ['sms'],
+        (
+            'Sending text messages to international phone numbers is '
+            'an invitation‑only feature.'
+        )
     ),
     (
-            'main.service_set_letters',
-            (
-                    'Using GOV.UK Notify to send letters is an invitation‑only '
-                    'feature.'
-            )
+        'main.service_set_international_sms',
+        ['sms', 'international_sms'],
+        (
+            'Your service can send text messages to international phone numbers.'
+        )
+    ),
+    (
+        'main.service_set_letters',
+        [],
+        (
+            'Using GOV.UK Notify to send letters is an invitation‑only '
+            'feature.'
+        )
+    ),
+    (
+        'main.service_set_letters',
+        ['letter'],
+        (
+            'Your service can send letters.'
+        )
+    ),
+    (
+        'main.service_set_inbound_sms',
+        ['sms'],
+        (
+            'Receiving text messages from your users is an invitation‑only feature.'
+        )
+    ),
+    (
+        'main.service_set_inbound_sms',
+        ['sms', 'inbound_sms'],
+        (
+            'Your service can receive text messages sent to 0781239871.'
+        )
     ),
 ])
 def test_invitation_pages(
-        logged_in_client,
-        service_one,
-        endpoint,
-        expected_p,
+    logged_in_client,
+    service_one,
+    mock_get_inbound_number_for_service,
+    endpoint,
+    permissions,
+    expected_p,
 ):
+    service_one['permissions'] = permissions
     response = logged_in_client.get(url_for(endpoint, service_id=service_one['id']))
 
     assert response.status_code == 200