Merge pull request #821 from alphagov/remove-weekly-stats-endpoints

Remove weekly stats endpoints

app/dao/services_dao.py

@@ -224,25 +224,6 @@ def _stats_for_service_query(service_id):
     )
 
 
-@statsd(namespace="dao")
-def dao_fetch_weekly_historical_stats_for_service(service_id):
-    monday_of_notification_week = func.date_trunc('week', NotificationHistory.created_at).label('week_start')
-    return db.session.query(
-        NotificationHistory.notification_type,
-        NotificationHistory.status,
-        monday_of_notification_week,
-        func.count(NotificationHistory.id).label('count')
-    ).filter(
-        NotificationHistory.service_id == service_id
-    ).group_by(
-        NotificationHistory.notification_type,
-        NotificationHistory.status,
-        monday_of_notification_week
-    ).order_by(
-        asc(monday_of_notification_week), NotificationHistory.status
-    ).all()
-
-
 @statsd(namespace="dao")
 def dao_fetch_monthly_historical_stats_for_service(service_id, year):
     monday_of_notification_week = func.date_trunc('week', NotificationHistory.created_at).label('week_start')

app/service/rest.py

@@ -25,7 +25,6 @@ from app.dao.services_dao import (
     dao_remove_user_from_service,
     dao_fetch_stats_for_service,
     dao_fetch_todays_stats_for_service,
-    dao_fetch_weekly_historical_stats_for_service,
     dao_fetch_todays_stats_for_all_services,
     dao_archive_service,
     fetch_stats_by_date_range_for_all_services,
@@ -270,14 +269,6 @@ def get_all_notifications_for_service(service_id):
     ), 200
 
 
-@service_blueprint.route('/<uuid:service_id>/notifications/weekly', methods=['GET'])
-def get_weekly_notification_stats(service_id):
-    service = dao_fetch_service_by_id(service_id)
-    stats = dao_fetch_weekly_historical_stats_for_service(service_id)
-    stats = statistics.format_weekly_notification_stats(stats, service.created_at)
-    return jsonify(data={week.date().isoformat(): statistics for week, statistics in stats.items()})
-
-
 @service_blueprint.route('/<uuid:service_id>/notifications/monthly', methods=['GET'])
 def get_monthly_notification_stats(service_id):
     service = dao_fetch_service_by_id(service_id)

app/service/statistics.py

@@ -15,20 +15,6 @@ def format_statistics(statistics):
     return counts
 
 
-def format_weekly_notification_stats(statistics, service_created_at):
-    preceeding_monday = (service_created_at - timedelta(days=service_created_at.weekday()))
-    # turn a datetime into midnight that day http://stackoverflow.com/a/1937636
-    preceeding_monday_midnight = datetime.combine(preceeding_monday.date(), datetime.min.time())
-    week_dict = {
-        week: create_zeroed_stats_dicts()
-        for week in _weeks_for_range(preceeding_monday_midnight, datetime.utcnow())
-    }
-    for row in statistics:
-        _update_statuses_from_row(week_dict[row.week_start][row.notification_type], row)
-
-    return week_dict
-
-
 def create_zeroed_stats_dicts():
     return {
         template_type: {
@@ -43,11 +29,3 @@ def _update_statuses_from_row(update_dict, row):
         update_dict['delivered'] += row.count
     elif row.status in ('failed', 'technical-failure', 'temporary-failure', 'permanent-failure'):
         update_dict['failed'] += row.count
-
-
-def _weeks_for_range(start, end):
-    """
-    Generator that yields dates from `start` to `end`, in 7 day intervals. End is inclusive.
-    """
-    infinite_date_generator = (start + timedelta(days=i) for i in itertools.count(step=7))
-    return itertools.takewhile(lambda x: x <= end, infinite_date_generator)