From ac3832a91860f182b40d4831019b3792ff7ecb04 Mon Sep 17 00:00:00 2001 From: Pea Tyczynska Date: Tue, 15 Jan 2019 14:46:40 +0000 Subject: [PATCH] Remove old redis template cache --- app/notifications/process_notifications.py | 4 +--- app/utils.py | 4 ---- tests/app/notifications/test_process_notification.py | 6 ------ 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/app/notifications/process_notifications.py b/app/notifications/process_notifications.py index c71fb1631..8afc5859b 100644 --- a/app/notifications/process_notifications.py +++ b/app/notifications/process_notifications.py @@ -35,7 +35,7 @@ from app.dao.notifications_dao import ( from app.dao.templates_dao import dao_get_template_by_id from app.v2.errors import BadRequestError -from app.utils import cache_key_for_service_template_counter, get_template_instance +from app.utils import get_template_instance def create_content_for_notification(template, personalisation): @@ -120,8 +120,6 @@ def persist_notification( if key_type != KEY_TYPE_TEST: if redis_store.get(redis.daily_limit_cache_key(service.id)): redis_store.incr(redis.daily_limit_cache_key(service.id)) - if redis_store.get_all_from_hash(cache_key_for_service_template_counter(service.id)): - redis_store.increment_hash_value(cache_key_for_service_template_counter(service.id), template_id) current_app.logger.info( "{} {} created at {}".format(notification_type, notification_id, notification_created_at) diff --git a/app/utils.py b/app/utils.py index 25bbab968..d8916341f 100644 --- a/app/utils.py +++ b/app/utils.py @@ -68,10 +68,6 @@ def get_london_month_from_utc_column(column): ) -def cache_key_for_service_template_counter(service_id, limit_days=7): - return "{}-template-counter-limit-{}-days".format(service_id, limit_days) - - def get_public_notify_type_text(notify_type, plural=False): from app.models import (SMS_TYPE, UPLOAD_DOCUMENT, PRECOMPILED_LETTER) notify_type_text = notify_type diff --git a/tests/app/notifications/test_process_notification.py b/tests/app/notifications/test_process_notification.py index 5d02d7bee..9ab89c162 100644 --- a/tests/app/notifications/test_process_notification.py +++ b/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