add inbound sms table

tests/app/dao/test_services_dao.py

@@ -25,7 +25,8 @@ from app.dao.services_dao import (
     fetch_stats_by_date_range_for_all_services,
     dao_suspend_service,
     dao_resume_service,
-    dao_fetch_active_users_for_service
+    dao_fetch_active_users_for_service,
+    dao_fetch_services_by_sms_sender
 )
 from app.dao.service_permissions_dao import dao_add_service_permission, dao_remove_service_permission
 from app.dao.users_dao import save_model_user
@@ -948,3 +949,13 @@ def test_dao_fetch_active_users_for_service_returns_active_only(notify_db, notif
     users = dao_fetch_active_users_for_service(service.id)
 
     assert len(users) == 1
+
+
+def test_dao_fetch_services_by_sms_sender(notify_db_session):
+    foo1 = create_service(service_name='a', sms_sender='foo')
+    foo2 = create_service(service_name='b', sms_sender='foo')
+    bar = create_service(service_name='c', sms_sender='bar')
+
+    services = dao_fetch_services_by_sms_sender('foo')
+
+    assert {foo1.id, foo2.id} == {x.id for x in services}

tests/app/db.py

@@ -39,14 +39,20 @@ def create_user(mobile_number="+447700900986", email="notify@digital.cabinet-off
 
 
 def create_service(
-        user=None, service_name="Sample service", service_id=None, restricted=False,
-        service_permissions=[EMAIL_TYPE, SMS_TYPE]):
+    user=None,
+    service_name="Sample service",
+    service_id=None,
+    restricted=False,
+    service_permissions=[EMAIL_TYPE, SMS_TYPE],
+    sms_sender='testing'
+):
     service = Service(
         name=service_name,
         message_limit=1000,
         restricted=restricted,
         email_from=service_name.lower().replace(' ', '.'),
-        created_by=user or create_user()
+        created_by=user or create_user(),
+        sms_sender=sms_sender
     )
     dao_create_service(service, service.created_by, service_id, service_permissions=service_permissions)
     return service

tests/app/notifications/test_receive_notification.py

@@ -1,14 +1,23 @@
+from datetime import datetime
+
+import pytest
 from flask import json
+import freezegun
+
+from app.notifications.receive_notifications import (
+    format_message,
+    create_inbound_sms_object
+)
 
 
-def test_receive_notification_returns_received_to_mmg(client):
+def test_receive_notification_returns_received_to_mmg(client, sample_service):
     data = {"ID": "1234",
             "MSISDN": "447700900855",
             "Message": "Some message to notify",
             "Trigger": "Trigger?",
-            "Number": "40604",
+            "Number": "testing",
             "Channel": "SMS",
-            "DateReceived": "2012-06-27-12:33:00"
+            "DateReceived": "2012-06-27 12:33:00"
             }
     response = client.post(path='/notifications/sms/receive/mmg',
                            data=json.dumps(data),
@@ -16,3 +25,35 @@ def test_receive_notification_returns_received_to_mmg(client):
 
     assert response.status_code == 200
     assert response.get_data(as_text=True) == 'RECEIVED'
+
+
+@pytest.mark.parametrize('message, expected_output', [
+    ('abc', 'abc'),
+    ('', ''),
+    ('lots+of+words', 'lots of words'),
+    ('%F0%9F%93%A9+%F0%9F%93%A9+%F0%9F%93%A9', '📩 📩 📩'),
+    ('x+%2B+y', 'x + y')
+])
+def test_format_message(message, expected_output):
+    assert format_message(message) == expected_output
+
+
+def test_create_inbound_sms_object(sample_service):
+    sample_service.sms_sender = 'foo'
+    data = {
+        'Message': 'hello+there+%F0%9F%93%A9',
+        'Number': 'foo',
+        'MSISDN': '07700 900 001',
+        'DateReceived': '2017-01-02 03:04:05',
+        'ID': 'bar',
+    }
+
+    inbound_sms = create_inbound_sms_object(sample_service, data)
+
+    assert inbound_sms.service_id == sample_service.id
+    assert inbound_sms.notify_number == 'foo'
+    assert inbound_sms.user_number == '7700900001'
+    assert inbound_sms.provider_date == datetime(2017, 1, 2, 3, 4, 5)
+    assert inbound_sms.provider_reference == 'bar'
+    assert inbound_sms._content != 'hello there 📩'
+    assert inbound_sms.content == 'hello there 📩'