Merge pull request #1423 from alphagov/fix-firetext-inbound-500s

fix 500s when inbound msgs sent from alphanumerics rather than normal…

app/celery/tasks.py

@@ -486,6 +486,7 @@ def send_inbound_sms_to_service(self, inbound_sms_id, service_id):
                                             inbound_id=inbound_sms_id)
     data = {
         "id": str(inbound_sms.id),
+        # TODO: should we be validating and formatting the phone number here?
         "source_number": inbound_sms.user_number,
         "destination_number": inbound_sms.notify_number,
         "message": inbound_sms.content,

app/inbound_sms/inbound_sms_schemas.py

@@ -3,7 +3,7 @@ get_inbound_sms_for_service_schema = {
     "description": "schema for parameters allowed when searching for to field=",
     "type": "object",
     "properties": {
-        "phone_number": {"type": "string", "format": "phone_number"},
+        "phone_number": {"type": "string"},
         "limit": {"type": ["integer", "null"], "minimum": 1}
     }
 }

app/inbound_sms/rest.py

@@ -1,11 +1,10 @@
 from flask import (
     Blueprint,
     jsonify,
-    request,
-    current_app, json)
-from jsonschema import ValidationError
+    request
+)
 
-from notifications_utils.recipients import validate_and_format_phone_number
+from notifications_utils.recipients import try_validate_and_format_phone_number
 
 from app.dao.inbound_sms_dao import (
     dao_get_inbound_sms_for_service,
@@ -26,25 +25,31 @@ inbound_sms = Blueprint(
 register_errors(inbound_sms)
 
 
-@inbound_sms.route('', methods=['POST', 'GET'])
-def get_inbound_sms_for_service(service_id):
-
-    if request.method == 'GET':
-        limit = request.args.get('limit')
-        user_number = request.args.get('user_number')
-
-        if user_number:
-            # we use this to normalise to an international phone number
-            user_number = validate_and_format_phone_number(user_number, international=True)
-
-        results = dao_get_inbound_sms_for_service(service_id, limit, user_number)
-
-        return jsonify(data=[row.serialize() for row in results])
+@inbound_sms.route('', methods=['POST'])
+def post_query_inbound_sms_for_service(service_id):
+    form = validate(request.get_json(), get_inbound_sms_for_service_schema)
+    if 'phone_number' in form:
+        # we use this to normalise to an international phone number - but this may fail if it's an alphanumeric
+        user_number = try_validate_and_format_phone_number(form['phone_number'], international=True)
     else:
-        form = validate(request.get_json(), get_inbound_sms_for_service_schema)
-        results = dao_get_inbound_sms_for_service(service_id, form.get('limit'), form.get('phone_number'))
+        user_number = None
+    results = dao_get_inbound_sms_for_service(service_id, form.get('limit'), user_number)
 
-        return jsonify(data=[row.serialize() for row in results])
+    return jsonify(data=[row.serialize() for row in results])
+
+
+@inbound_sms.route('', methods=['GET'])
+def get_inbound_sms_for_service(service_id):
+    limit = request.args.get('limit')
+    user_number = request.args.get('user_number')
+
+    if user_number:
+        # we use this to normalise to an international phone number - but this may fail if it's an alphanumeric
+        user_number = try_validate_and_format_phone_number(user_number, international=True)
+
+    results = dao_get_inbound_sms_for_service(service_id, limit, user_number)
+
+    return jsonify(data=[row.serialize() for row in results])
 
 
 @inbound_sms.route('/summary')

app/notifications/receive_notifications.py

@@ -2,7 +2,7 @@ from urllib.parse import unquote
 
 import iso8601
 from flask import jsonify, Blueprint, current_app, request, abort
-from notifications_utils.recipients import validate_and_format_phone_number
+from notifications_utils.recipients import try_validate_and_format_phone_number
 
 from app import statsd_client, firetext_client, mmg_client
 from app.celery import tasks
@@ -109,7 +109,11 @@ def format_mmg_datetime(date):
 
 
 def create_inbound_sms_object(service, content, from_number, provider_ref, date_received, provider_name):
-    user_number = validate_and_format_phone_number(from_number, international=True)
+    user_number = try_validate_and_format_phone_number(
+        from_number,
+        international=True,
+        log_msg='Invalid from_number received'
+    )
 
     provider_date = date_received
     if provider_date: