Merge branch 'master' of https://github.com/alphagov/notifications-api into vb-free-sms-limit-history

tests/app/dao/test_service_sms_sender_dao.py

@@ -1,4 +1,12 @@
-from app.dao.service_sms_sender_dao import insert_or_update_service_sms_sender
+import uuid
+
+import pytest
+from sqlalchemy.exc import SQLAlchemyError
+
+from app.dao.service_sms_sender_dao import (
+    insert_or_update_service_sms_sender,
+    dao_add_sms_sender_for_service,
+    dao_update_service_sms_sender, dao_get_service_sms_senders_by_id, dao_get_sms_senders_by_service_id)
 from app.models import ServiceSmsSender
 from tests.app.db import create_service
 
@@ -27,3 +35,113 @@ def test_create_service_inserts_new_service_sms_sender(notify_db_session):
     assert len(service_sms_senders) == 1
     assert service_sms_senders[0].sms_sender == 'new_sms'
     assert service_sms_senders[0].is_default
+
+
+def test_dao_get_service_sms_senders_id(notify_db_session):
+    service = create_service(sms_sender='first_sms')
+    second_sender = dao_add_sms_sender_for_service(service_id=service.id,
+                                                   sms_sender='second',
+                                                   is_default=False,
+                                                   inbound_number_id=None)
+    result = dao_get_service_sms_senders_by_id(service_id=service.id,
+                                               service_sms_sender_id=second_sender.id)
+    assert result.sms_sender == "second"
+    assert not result.is_default
+
+
+def test_dao_get_service_sms_senders_id_raise_exception_when_not_found(notify_db_session):
+    service = create_service()
+    with pytest.raises(expected_exception=SQLAlchemyError):
+        dao_get_service_sms_senders_by_id(service_id=service.id,
+                                          service_sms_sender_id=uuid.uuid4())
+
+
+def test_dao_get_sms_senders_by_service_id(notify_db_session):
+    service = create_service(sms_sender='first_sms')
+    second_sender = dao_add_sms_sender_for_service(service_id=service.id,
+                                                   sms_sender='second',
+                                                   is_default=False,
+                                                   inbound_number_id=None)
+    results = dao_get_sms_senders_by_service_id(service_id=service.id)
+    assert len(results) == 2
+    for x in results:
+        if x.is_default:
+            assert x.sms_sender == 'first_sms'
+        else:
+            assert x == second_sender
+
+
+def test_dao_add_sms_sender_for_service(notify_db_session):
+    service = create_service(sms_sender="first_sms")
+    new_sms_sender = dao_add_sms_sender_for_service(service_id=service.id,
+                                                    sms_sender='new_sms',
+                                                    is_default=False,
+                                                    inbound_number_id=None)
+
+    service_sms_senders = ServiceSmsSender.query.order_by(ServiceSmsSender.created_at).all()
+    assert len(service_sms_senders) == 2
+    assert service_sms_senders[0].sms_sender == 'first_sms'
+    assert service_sms_senders[0].is_default
+    assert service_sms_senders[1] == new_sms_sender
+
+
+def test_dao_add_sms_sender_for_service_switches_default(notify_db_session):
+    service = create_service(sms_sender="first_sms")
+    new_sms_sender = dao_add_sms_sender_for_service(service_id=service.id,
+                                                    sms_sender='new_sms',
+                                                    is_default=True,
+                                                    inbound_number_id=None)
+
+    service_sms_senders = ServiceSmsSender.query.order_by(ServiceSmsSender.created_at).all()
+    assert len(service_sms_senders) == 2
+    assert service_sms_senders[0].sms_sender == 'first_sms'
+    assert not service_sms_senders[0].is_default
+    assert service_sms_senders[1] == new_sms_sender
+
+
+def test_dao_update_service_sms_sender(notify_db_session):
+    service = create_service(sms_sender='first_sms')
+    service_sms_senders = ServiceSmsSender.query.filter_by(service_id=service.id).all()
+    assert len(service_sms_senders) == 1
+    sms_sender_to_update = service_sms_senders[0]
+
+    dao_update_service_sms_sender(service_id=service.id,
+                                  service_sms_sender_id=sms_sender_to_update.id,
+                                  is_default=True,
+                                  sms_sender="updated")
+    sms_senders = ServiceSmsSender.query.filter_by(service_id=service.id).all()
+    assert len(sms_senders) == 1
+    assert sms_senders[0].is_default
+    assert sms_senders[0].sms_sender == 'updated'
+    assert not sms_senders[0].inbound_number_id
+
+
+def test_dao_update_service_sms_sender_switches_default(notify_db_session):
+    service = create_service(sms_sender='first_sms')
+    sms_sender = dao_add_sms_sender_for_service(service_id=service.id,
+                                                sms_sender='new_sms',
+                                                is_default=False,
+                                                inbound_number_id=None)
+    dao_update_service_sms_sender(service_id=service.id,
+                                  service_sms_sender_id=sms_sender.id,
+                                  is_default=True,
+                                  sms_sender="updated")
+    sms_senders = ServiceSmsSender.query.filter_by(service_id=service.id).order_by(ServiceSmsSender.created_at).all()
+    assert len(sms_senders) == 2
+    assert sms_senders[0].sms_sender == 'first_sms'
+    assert not sms_senders[0].is_default
+    assert sms_senders[1].sms_sender == 'updated'
+    assert sms_senders[1].is_default
+
+
+def test_dao_update_service_sms_sender_raises_exception_when_no_default_after_update(notify_db_session):
+    service = create_service(sms_sender='first_sms')
+    sms_sender = dao_add_sms_sender_for_service(service_id=service.id,
+                                                sms_sender='new_sms',
+                                                is_default=True,
+                                                inbound_number_id=None)
+    with pytest.raises(expected_exception=Exception) as e:
+        dao_update_service_sms_sender(service_id=service.id,
+                                      service_sms_sender_id=sms_sender.id,
+                                      is_default=False,
+                                      sms_sender="updated")

tests/app/dao/test_services_dao.py

@@ -57,6 +57,7 @@ from app.models import (
     KEY_TYPE_TEST,
     EMAIL_TYPE,
     SMS_TYPE,
+    INTERNATIONAL_SMS_TYPE,
     LETTER_TYPE,
     SERVICE_PERMISSION_TYPES
 )
@@ -260,25 +261,30 @@ def test_create_service_returns_service_with_default_permissions(service_factory
     service = service_factory.get('testing', email_from='testing')
 
     service = dao_fetch_service_by_id(service.id)
-    assert len(service.permissions) == 2
-    assert set([SMS_TYPE, EMAIL_TYPE]) == set(p.permission for p in service.permissions)
+    _assert_service_permissions(service.permissions, (
+        SMS_TYPE, EMAIL_TYPE, INTERNATIONAL_SMS_TYPE,
+    ))
 
 
-@pytest.mark.parametrize("permission_to_remove, permission_remaining",
-                         [(SMS_TYPE, EMAIL_TYPE),
-                          (EMAIL_TYPE, SMS_TYPE)])
+@pytest.mark.parametrize("permission_to_remove, permission_remaining", [
+    (SMS_TYPE, EMAIL_TYPE),
+    (EMAIL_TYPE, SMS_TYPE),
+])
 def test_remove_permission_from_service_by_id_returns_service_with_correct_permissions(
-        sample_service, permission_to_remove, permission_remaining):
+    sample_service, permission_to_remove, permission_remaining
+):
     dao_remove_service_permission(service_id=sample_service.id, permission=permission_to_remove)
 
     service = dao_fetch_service_by_id(sample_service.id)
-    assert len(service.permissions) == 1
-    assert service.permissions[0].permission == permission_remaining
+    _assert_service_permissions(service.permissions, (
+        permission_remaining, INTERNATIONAL_SMS_TYPE,
+    ))
 
 
 def test_removing_all_permission_returns_service_with_no_permissions(sample_service):
     dao_remove_service_permission(service_id=sample_service.id, permission=SMS_TYPE)
     dao_remove_service_permission(service_id=sample_service.id, permission=EMAIL_TYPE)
+    dao_remove_service_permission(service_id=sample_service.id, permission=INTERNATIONAL_SMS_TYPE)
 
     service = dao_fetch_service_by_id(sample_service.id)
     assert len(service.permissions) == 0
@@ -298,14 +304,16 @@ def test_create_service_by_id_adding_and_removing_letter_returns_service_without
     dao_add_service_permission(service_id=service.id, permission=LETTER_TYPE)
 
     service = dao_fetch_service_by_id(service.id)
-    assert len(service.permissions) == 3
-    assert set([SMS_TYPE, EMAIL_TYPE, LETTER_TYPE]) == set([p.permission for p in service.permissions])
+    _assert_service_permissions(service.permissions, (
+        SMS_TYPE, EMAIL_TYPE, LETTER_TYPE, INTERNATIONAL_SMS_TYPE,
+    ))
 
     dao_remove_service_permission(service_id=service.id, permission=LETTER_TYPE)
     service = dao_fetch_service_by_id(service.id)
 
-    assert len(service.permissions) == 2
-    assert set([SMS_TYPE, EMAIL_TYPE]) == set([p.permission for p in service.permissions])
+    _assert_service_permissions(service.permissions, (
+        SMS_TYPE, EMAIL_TYPE, INTERNATIONAL_SMS_TYPE,
+    ))
 
 
 def test_create_service_creates_a_history_record_with_current_data(sample_user):
@@ -382,7 +390,10 @@ def test_update_service_permission_creates_a_history_record_with_current_data(sa
     service_from_db = Service.query.first()
 
     assert service_from_db.version == 2
-    assert LETTER_TYPE in [p.permission for p in service_from_db.permissions]
+
+    _assert_service_permissions(service.permissions, (
+        SMS_TYPE, EMAIL_TYPE, INTERNATIONAL_SMS_TYPE, LETTER_TYPE,
+    ))
 
     permission = [p for p in service.permissions if p.permission == 'sms'][0]
     service.permissions.remove(permission)
@@ -393,7 +404,9 @@ def test_update_service_permission_creates_a_history_record_with_current_data(sa
 
     service_from_db = Service.query.first()
     assert service_from_db.version == 3
-    assert SMS_TYPE not in [p.permission for p in service_from_db.permissions]
+    _assert_service_permissions(service.permissions, (
+        EMAIL_TYPE, INTERNATIONAL_SMS_TYPE, LETTER_TYPE,
+    ))
 
     assert len(Service.get_history_model().query.filter_by(name='service_name').all()) == 3
     assert Service.get_history_model().query.filter_by(name='service_name').all()[2].version == 3
@@ -431,7 +444,7 @@ def test_delete_service_and_associated_objects(notify_db,
                                                sample_permission,
                                                sample_provider_statistics):
     # Default service permissions of Email and SMS
-    assert ServicePermission.query.count() == 2
+    assert ServicePermission.query.count() == 3
 
     delete_service_and_all_associated_db_objects(sample_service)
     assert NotificationStatistics.query.count() == 0
@@ -949,3 +962,9 @@ def test_dao_allocating_inbound_number_shows_on_service(notify_db_session, sampl
     dao_set_inbound_number_to_service(service.id, inbound_numbers[0])
 
     assert service.inbound_number.number == inbound_numbers[0].number
+
+
+def _assert_service_permissions(service_permissions, expected):
+
+    assert len(service_permissions) == len(expected)
+    assert set(expected) == set(p.permission for p in service_permissions)