Merge branch 'master' into stronger-2fa-security

app/config.py

@@ -49,6 +49,7 @@ class Config(object):
     # URL of redis instance
     REDIS_URL = os.getenv('REDIS_URL')
     REDIS_ENABLED = os.getenv('REDIS_ENABLED') == '1'
+    EXPIRE_CACHE_IN_SECONDS = 600
 
     # Performance platform
     PERFORMANCE_PLATFORM_ENABLED = os.getenv('PERFORMANCE_PLATFORM_ENABLED') == '1'

app/dao/templates_dao.py

@@ -1,6 +1,7 @@
 import uuid
 
-from sqlalchemy import (asc, desc)
+from sqlalchemy import desc
+from sqlalchemy.sql.expression import bindparam
 
 from app import db
 from app.models import (Template, TemplateHistory)
@@ -56,3 +57,26 @@ def dao_get_template_versions(service_id, template_id):
     ).order_by(
         desc(TemplateHistory.version)
     ).all()
+
+
+def dao_get_templates_for_cache(cache):
+    if not cache or len(cache) == 0:
+        return []
+
+    # First create a subquery that is a union select of the cache values
+    # Then join templates to the subquery
+    cache_queries = [
+        db.session.query(bindparam("template_id" + str(i),
+                                   uuid.UUID(template_id.decode())).label('template_id'),
+                         bindparam("count" + str(i), int(count.decode())).label('count'))
+        for i, (template_id, count) in enumerate(cache)]
+    cache_subq = cache_queries[0].union(*cache_queries[1:]).subquery()
+    query = db.session.query(Template.id.label('template_id'),
+                             Template.template_type,
+                             Template.name,
+                             cache_subq.c.count.label('count')
+                             ).join(cache_subq,
+                                    Template.id == cache_subq.c.template_id
+                                    ).order_by(Template.name)
+
+    return query.all()

app/notifications/process_notifications.py

@@ -8,7 +8,7 @@ from notifications_utils.clients import redis
 from app.dao.notifications_dao import dao_create_notification, dao_delete_notifications_and_history_by_id
 from app.models import SMS_TYPE, Notification, KEY_TYPE_TEST, EMAIL_TYPE
 from app.v2.errors import BadRequestError, SendNotificationToQueueError
-from app.utils import get_template_instance
+from app.utils import get_template_instance, cache_key_for_service_template_counter
 
 
 def create_content_for_notification(template, personalisation):
@@ -62,7 +62,10 @@ def persist_notification(template_id,
     )
     if not simulated:
         dao_create_notification(notification)
-        redis_store.incr(redis.daily_limit_cache_key(service.id))
+        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.notification_type, notification.id, notification.created_at)
         )

app/template_statistics/rest.py

@@ -1,14 +1,17 @@
 from flask import (
     Blueprint,
     jsonify,
-    request
-)
+    request,
+    current_app)
 
+from app import redis_store
 from app.dao.notifications_dao import (
     dao_get_template_usage,
     dao_get_last_template_usage)
+from app.dao.templates_dao import dao_get_templates_for_cache
 
-from app.schemas import notifications_filter_schema, NotificationWithTemplateSchema, notification_with_template_schema
+from app.schemas import notification_with_template_schema
+from app.utils import cache_key_for_service_template_counter
 
 template_statistics = Blueprint('template-statistics',
                                 __name__,
@@ -30,7 +33,11 @@ def get_template_statistics_for_service_by_day(service_id):
             raise InvalidRequest(message, status_code=400)
     else:
         limit_days = None
-    stats = dao_get_template_usage(service_id, limit_days=limit_days)
+
+    if limit_days == 7:
+        stats = get_template_statistics_for_7_days(limit_days, service_id)
+    else:
+        stats = dao_get_template_usage(service_id, limit_days=limit_days)
 
     def serialize(data):
         return {
@@ -52,3 +59,15 @@ def get_template_statistics_for_template_id(service_id, template_id):
         raise InvalidRequest(errors, status_code=404)
     data = notification_with_template_schema.dump(notification).data
     return jsonify(data=data)
+
+
+def get_template_statistics_for_7_days(limit_days, service_id):
+    cache_key = cache_key_for_service_template_counter(service_id)
+    template_stats_by_id = redis_store.get_all_from_hash(cache_key)
+    if not template_stats_by_id:
+        stats = dao_get_template_usage(service_id, limit_days=limit_days)
+        cache_values = dict([(x.template_id, x.count) for x in stats])
+        redis_store.set_hash_and_expire(cache_key, cache_values, current_app.config.get('EXPIRE_CACHE_IN_SECONDS', 600))
+    else:
+        stats = dao_get_templates_for_cache(template_stats_by_id.items())
+    return stats

app/utils.py

@@ -63,3 +63,7 @@ def get_london_month_from_utc_column(column):
         "month",
         func.timezone("Europe/London", func.timezone("UTC", column))
     )
+
+
+def cache_key_for_service_template_counter(service_id, limit_days=7):
+    return "{}-template-counter-limit-{}-days".format(service_id, limit_days)