From 514d490d2f6146ff82c8b5aefc4b081e8c03c396 Mon Sep 17 00:00:00 2001
From: Nicholas Staples <nicholas.staples@solution-tribute.com>
Date: Fri, 1 Apr 2016 11:12:44 +0100
Subject: [PATCH] No limit for live services.

---
 app/notifications/rest.py            |  2 +-
 tests/app/conftest.py                |  5 ++++
 tests/app/notifications/test_rest.py | 38 ++++++++++++++++++++++++++--
 tests/conftest.py                    |  1 +
 4 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/app/notifications/rest.py b/app/notifications/rest.py
index 2c1598410..3e536b4ed 100644
--- a/app/notifications/rest.py
+++ b/app/notifications/rest.py
@@ -321,7 +321,7 @@ def send_notification(notification_type):
         total_sms_count = service_stats.sms_requested
         total_email_count = service_stats.emails_requested
 
-        if total_email_count + total_sms_count >= service.limit:
+        if (total_email_count + total_sms_count >= service.limit) and service.restricted:
             return jsonify(result="error", message='Exceeded send limits ({}) for today'.format(service.limit)), 429
 
     notification, errors = (
diff --git a/tests/app/conftest.py b/tests/app/conftest.py
index e79b5fe76..d99314af0 100644
--- a/tests/app/conftest.py
+++ b/tests/app/conftest.py
@@ -334,6 +334,11 @@ def mock_celery_email_registration_verification(mocker):
     return mocker.patch('app.celery.tasks.email_registration_verification.apply_async')
 
 
+@pytest.fixture(scope='function')
+def mock_celery_send_email(mocker):
+    return mocker.patch('app.celery.tasks.send_email.apply_async')
+
+
 @pytest.fixture(scope='function')
 def mock_encryption(mocker):
     return mocker.patch('app.encryption.encrypt', return_value="something_encrypted")
diff --git a/tests/app/notifications/test_rest.py b/tests/app/notifications/test_rest.py
index ceec614d2..d255180a5 100644
--- a/tests/app/notifications/test_rest.py
+++ b/tests/app/notifications/test_rest.py
@@ -877,7 +877,7 @@ def test_should_block_api_call_if_over_day_limit(notify_db, notify_db_session, n
             mocker.patch('app.celery.tasks.send_email.apply_async')
             mocker.patch('app.encryption.encrypt', return_value="something_encrypted")
 
-            service = create_sample_service(notify_db, notify_db_session, limit=1)
+            service = create_sample_service(notify_db, notify_db_session, limit=1, restricted=True)
             email_template = create_sample_email_template(notify_db, notify_db_session, service=service)
             create_sample_notification(
                 notify_db, notify_db_session, template=email_template, service=service, created_at=datetime.utcnow()
@@ -905,6 +905,40 @@ def test_should_block_api_call_if_over_day_limit(notify_db, notify_db_session, n
             assert 'Exceeded send limits (1) for today' in json_resp['message']
 
 
+def test_no_limit_for_live_service(notify_api,
+                                   notify_db,
+                                   notify_db_session,
+                                   mock_celery_send_email,
+                                   sample_service,
+                                   sample_email_template,
+                                   sample_notification):
+    with notify_api.test_request_context():
+        with notify_api.test_client() as client:
+
+            sample_service.limit = 1
+            notify_db.session.add(sample_service)
+            notify_db.session.commit()
+
+            data = {
+                'to': 'ok@ok.com',
+                'template': sample_email_template.id
+            }
+
+            auth_header = create_authorization_header(
+                request_body=json.dumps(data),
+                path='/notifications/email',
+                method='POST',
+                service_id=sample_service.id
+            )
+
+            response = client.post(
+                path='/notifications/email',
+                data=json.dumps(data),
+                headers=[('Content-Type', 'application/json'), auth_header])
+
+            assert response.status_code == 201
+
+
 @freeze_time("2016-01-01 12:00:00.061258")
 def test_should_block_api_call_if_over_day_limit_regardless_of_type(notify_db, notify_db_session, notify_api, mocker):
     with notify_api.test_request_context():
@@ -912,7 +946,7 @@ def test_should_block_api_call_if_over_day_limit_regardless_of_type(notify_db, n
             mocker.patch('app.celery.tasks.send_sms.apply_async')
             mocker.patch('app.encryption.encrypt', return_value="something_encrypted")
 
-            service = create_sample_service(notify_db, notify_db_session, limit=1)
+            service = create_sample_service(notify_db, notify_db_session, limit=1, restricted=True)
             email_template = create_sample_email_template(notify_db, notify_db_session, service=service)
             sms_template = create_sample_template(notify_db, notify_db_session, service=service)
             create_sample_notification(
diff --git a/tests/conftest.py b/tests/conftest.py
index 55d72a2f2..1908447f0 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -45,6 +45,7 @@ def notify_db(notify_api, request):
         db.get_engine(notify_api).dispose()
 
     request.addfinalizer(teardown)
+    return db
 
 
 @pytest.fixture(scope='function')