Merge pull request #2303 from alphagov/ft-status-template-statistics

Change template statistics endpoint to use fact_notification_status_dao

tests/app/notifications/test_process_notification.py

@@ -1,13 +1,11 @@
 import datetime
 import uuid
-from unittest.mock import call
 
 import pytest
 from boto3.exceptions import Boto3Error
 from sqlalchemy.exc import SQLAlchemyError
 from freezegun import freeze_time
 from collections import namedtuple
-from flask import current_app
 
 from app.models import (
     Notification,
@@ -25,7 +23,6 @@ from app.notifications.process_notifications import (
     simulated_recipient
 )
 from notifications_utils.recipients import validate_and_format_phone_number, validate_and_format_email_address
-from app.utils import cache_key_for_service_template_counter
 from app.v2.errors import BadRequestError
 from tests.app.conftest import sample_api_key as create_api_key
 
@@ -172,8 +169,6 @@ def test_persist_notification_with_optionals(sample_job, sample_api_key, mocker)
     assert Notification.query.count() == 0
     assert NotificationHistory.query.count() == 0
     mocked_redis = mocker.patch('app.notifications.process_notifications.redis_store.get')
-    mock_service_template_cache = mocker.patch(
-        'app.notifications.process_notifications.redis_store.get_all_from_hash')
     n_id = uuid.uuid4()
     created_at = datetime.datetime(2016, 11, 11, 16, 8, 18)
     persist_notification(
@@ -200,7 +195,6 @@ def test_persist_notification_with_optionals(sample_job, sample_api_key, mocker)
     assert persisted_notification.job_row_number == 10
     assert persisted_notification.created_at == created_at
     mocked_redis.assert_called_once_with(str(sample_job.service_id) + "-2016-01-01-count")
-    mock_service_template_cache.assert_called_once_with(cache_key_for_service_template_counter(sample_job.service_id))
     assert persisted_notification.client_reference == "ref from client"
     assert persisted_notification.reference is None
     assert persisted_notification.international is False
@@ -213,7 +207,6 @@ def test_persist_notification_with_optionals(sample_job, sample_api_key, mocker)
 @freeze_time("2016-01-01 11:09:00.061258")
 def test_persist_notification_doesnt_touch_cache_for_old_keys_that_dont_exist(sample_template, sample_api_key, mocker):
     mock_incr = mocker.patch('app.notifications.process_notifications.redis_store.incr')
-    mock_incr_hash_value = mocker.patch('app.notifications.process_notifications.redis_store.increment_hash_value')
     mocker.patch('app.notifications.process_notifications.redis_store.get', return_value=None)
     mocker.patch('app.notifications.process_notifications.redis_store.get_all_from_hash', return_value=None)
 
@@ -229,16 +222,11 @@ def test_persist_notification_doesnt_touch_cache_for_old_keys_that_dont_exist(sa
         reference="ref"
     )
     mock_incr.assert_not_called()
-    mock_incr_hash_value.assert_called_once_with(
-        "service-{}-template-usage-2016-01-01".format(sample_template.service_id),
-        sample_template.id
-    )
 
 
 @freeze_time("2016-01-01 11:09:00.061258")
 def test_persist_notification_increments_cache_if_key_exists(sample_template, sample_api_key, mocker):
     mock_incr = mocker.patch('app.notifications.process_notifications.redis_store.incr')
-    mock_incr_hash_value = mocker.patch('app.notifications.process_notifications.redis_store.increment_hash_value')
     mocker.patch('app.notifications.process_notifications.redis_store.get', return_value=1)
     mocker.patch('app.notifications.process_notifications.redis_store.get_all_from_hash',
                  return_value={sample_template.id, 1})
@@ -255,10 +243,6 @@ def test_persist_notification_increments_cache_if_key_exists(sample_template, sa
         reference="ref2")
 
     mock_incr.assert_called_once_with(str(sample_template.service_id) + "-2016-01-01-count", )
-    assert mock_incr_hash_value.mock_calls == [
-        call("{}-template-counter-limit-7-days".format(sample_template.service_id), sample_template.id),
-        call("service-{}-template-usage-2016-01-01".format(sample_template.service_id), sample_template.id),
-    ]
 
 
 @pytest.mark.parametrize((
@@ -517,44 +501,6 @@ def test_persist_letter_notification_finds_correct_postage(
     assert persisted_notification.postage == expected_postage
 
 
-@pytest.mark.parametrize('utc_time, day_in_key', [
-    ('2016-01-01 23:00:00', '2016-01-01'),
-    ('2016-06-01 22:59:00', '2016-06-01'),
-    ('2016-06-01 23:00:00', '2016-06-02'),
-])
-def test_persist_notification_increments_and_expires_redis_template_usage(
-    utc_time,
-    day_in_key,
-    sample_template,
-    sample_api_key,
-    mocker
-):
-    mock_incr_hash_value = mocker.patch('app.notifications.process_notifications.redis_store.increment_hash_value')
-    mock_expire = mocker.patch('app.notifications.process_notifications.redis_store.expire')
-    mocker.patch('app.notifications.process_notifications.redis_store.get', return_value=None)
-    mocker.patch('app.notifications.process_notifications.redis_store.get_all_from_hash', return_value=None)
-
-    with freeze_time(utc_time):
-        persist_notification(
-            template_id=sample_template.id,
-            template_version=sample_template.version,
-            recipient='+447111111122',
-            service=sample_template.service,
-            personalisation={},
-            notification_type='sms',
-            api_key_id=sample_api_key.id,
-            key_type=sample_api_key.key_type,
-        )
-    mock_incr_hash_value.assert_called_once_with(
-        'service-{}-template-usage-{}'.format(str(sample_template.service_id), day_in_key),
-        sample_template.id
-    )
-    mock_expire.assert_called_once_with(
-        'service-{}-template-usage-{}'.format(str(sample_template.service_id), day_in_key),
-        current_app.config['EXPIRE_CACHE_EIGHT_DAYS']
-    )
-
-
 def test_persist_notification_with_billable_units_stores_correct_info(
     sample_template,
 ):