Merge branch 'master' into firetext-inbound-sms

This commit is contained in:
Martyn Inglis
2017-06-05 11:33:53 +01:00
13 changed files with 390 additions and 7 deletions

View File

@@ -2,7 +2,7 @@ from urllib.parse import unquote
import iso8601
from flask import jsonify, Blueprint, current_app, request
from notifications_utils.recipients import normalise_phone_number
from notifications_utils.recipients import validate_and_format_phone_number
from app import statsd_client, firetext_client, mmg_client
from app.dao.services_dao import dao_fetch_services_by_sms_sender
@@ -65,7 +65,7 @@ def format_mmg_datetime(date):
def create_inbound_mmg_sms_object(service, json):
message = format_mmg_message(json['Message'])
user_number = normalise_phone_number(json['MSISDN'])
user_number = validate_and_format_phone_number(json['MSISDN'], international=True)
provider_date = json.get('DateRecieved')
if provider_date: