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

app/dao/service_sms_sender_dao.py

@@ -1,3 +1,5 @@
+from sqlalchemy import desc
+
 from app import db
 from app.dao.dao_utils import transactional
 from app.models import ServiceSmsSender
@@ -32,3 +34,78 @@ def insert_service_sms_sender(service, sms_sender):
                                       is_default=True
                                       )
     db.session.add(new_sms_sender)
+
+
+def dao_get_service_sms_senders_by_id(service_id, service_sms_sender_id):
+    return ServiceSmsSender.query.filter_by(
+        id=service_sms_sender_id,
+        service_id=service_id
+    ).one()
+
+
+def dao_get_sms_senders_by_service_id(service_id):
+    return ServiceSmsSender.query.filter_by(service_id=service_id).order_by(desc(ServiceSmsSender.is_default)).all()
+
+
+@transactional
+def dao_add_sms_sender_for_service(service_id, sms_sender, is_default, inbound_number_id=None):
+    old_default = _get_existing_default(service_id=service_id)
+    if is_default:
+        _reset_old_default_to_false(old_default)
+    else:
+        _raise_when_no_default(old_default)
+
+    new_sms_sender = ServiceSmsSender(
+        service_id=service_id,
+        sms_sender=sms_sender,
+        is_default=is_default,
+        inbound_number_id=inbound_number_id
+    )
+
+    db.session.add(new_sms_sender)
+    return new_sms_sender
+
+
+@transactional
+def dao_update_service_sms_sender(service_id, service_sms_sender_id, is_default, sms_sender=None):
+    old_default = _get_existing_default(service_id)
+    if is_default:
+        _reset_old_default_to_false(old_default)
+    else:
+        if old_default.id == service_sms_sender_id:
+            raise Exception("You must have at least one SMS sender as the default")
+
+    sms_sender_to_update = ServiceSmsSender.query.get(service_sms_sender_id)
+    sms_sender_to_update.is_default = is_default
+    if not sms_sender_to_update.inbound_number_id and sms_sender:
+        sms_sender_to_update.sms_sender = sms_sender
+    db.session.add(sms_sender_to_update)
+    return sms_sender_to_update
+
+
+def _get_existing_default(service_id):
+    sms_senders = dao_get_sms_senders_by_service_id(service_id=service_id)
+    if sms_senders:
+        old_default = [x for x in sms_senders if x.is_default]
+        if len(old_default) == 1:
+            return old_default[0]
+        else:
+            raise Exception(
+                "There should only be one default sms sender for each service. Service {} has {}".format(
+                    service_id,
+                    len(old_default)
+                )
+            )
+    return None
+
+
+def _reset_old_default_to_false(old_default):
+    if old_default:
+        old_default.is_default = False
+        db.session.add(old_default)
+
+
+def _raise_when_no_default(old_default):
+    # check that the update is not updating the only default to false
+    if not old_default:
+        raise Exception("You must have at least one SMS sender as the default.", 400)

app/dao/services_dao.py

@@ -35,11 +35,19 @@ from app.models import (
     JobStatistics,
     SMS_TYPE,
     EMAIL_TYPE,
-    ServiceSmsSender)
+    INTERNATIONAL_SMS_TYPE,
+    ServiceSmsSender,
+)
 from app.service.statistics import format_monthly_template_notification_stats
 from app.statsd_decorators import statsd
 from app.utils import get_london_month_from_utc_column, get_london_midnight_in_utc
 
+DEFAULT_SERVICE_PERMISSIONS = [
+    SMS_TYPE,
+    EMAIL_TYPE,
+    INTERNATIONAL_SMS_TYPE,
+]
+
 
 def dao_fetch_all_services(only_active=False):
     query = Service.query.order_by(
@@ -146,13 +154,16 @@ def dao_fetch_service_by_id_and_user(service_id, user_id):
 
 @transactional
 @version_class(Service)
-def dao_create_service(service, user, service_id=None, service_permissions=[SMS_TYPE, EMAIL_TYPE]):
+def dao_create_service(service, user, service_id=None, service_permissions=None):
     # the default property does not appear to work when there is a difference between the sqlalchemy schema and the
     # db schema (ie: during a migration), so we have to set sms_sender manually here. After the GOVUK sms_sender
     # migration is completed, this code should be able to be removed.
     if not service.sms_sender:
         service.sms_sender = current_app.config['FROM_NUMBER']
 
+    if service_permissions is None:
+        service_permissions = DEFAULT_SERVICE_PERMISSIONS
+
     from app.dao.permissions_dao import permission_dao
     service.users.append(user)
     permission_dao.add_default_service_permissions_for_user(user, service)
@@ -412,6 +423,35 @@ def fetch_stats_by_date_range_for_all_services(start_date, end_date, include_fro
     return query.all()
 
 
+@statsd(namespace='dao')
+def fetch_aggregate_stats_by_date_range_for_all_services(start_date, end_date, include_from_test_key=True):
+    start_date = get_london_midnight_in_utc(start_date)
+    end_date = get_london_midnight_in_utc(end_date + timedelta(days=1))
+    table = NotificationHistory
+
+    if start_date >= datetime.utcnow() - timedelta(days=7):
+        table = Notification
+
+    query = db.session.query(
+        table.notification_type,
+        table.status,
+        func.count(table.id).label('count')
+    ).filter(
+        table.created_at >= start_date,
+        table.created_at < end_date
+    ).group_by(
+        table.notification_type,
+        table.status
+    ).order_by(
+        table.notification_type
+    )
+
+    if not include_from_test_key:
+        query = query.filter(table.key_type != KEY_TYPE_TEST)
+
+    return query.all()
+
+
 @transactional
 @version_class(Service)
 @version_class(ApiKey)