From c92b72da6ee9231d2ae0464e1ed256d1a826e861 Mon Sep 17 00:00:00 2001 From: Imdad Ahad Date: Mon, 21 Aug 2017 13:46:16 +0100 Subject: [PATCH] Remove yearly billing data dao methods --- app/dao/notification_usage_dao.py | 83 +-------------- tests/app/dao/test_notification_usage_dao.py | 102 ------------------- 2 files changed, 1 insertion(+), 184 deletions(-) diff --git a/app/dao/notification_usage_dao.py b/app/dao/notification_usage_dao.py index 662857f5a..7542fb0df 100644 --- a/app/dao/notification_usage_dao.py +++ b/app/dao/notification_usage_dao.py @@ -1,4 +1,3 @@ -from collections import namedtuple from datetime import datetime, timedelta from sqlalchemy import Float, Integer @@ -17,41 +16,7 @@ from app.models import ( EMAIL_TYPE ) from app.statsd_decorators import statsd -from app.utils import get_london_month_from_utc_column, convert_utc_to_bst - - -@statsd(namespace="dao") -def get_yearly_billing_data(service_id, year): - start_date, end_date = get_financial_year(year) - rates = get_rates_for_daterange(start_date, end_date, SMS_TYPE) - - if not rates: - return [] - - def get_valid_from(valid_from): - return start_date if valid_from < start_date else valid_from - - result = [] - for r, n in zip(rates, rates[1:]): - result.append( - sms_yearly_billing_data_query( - r.rate, - service_id, - get_valid_from(r.valid_from), - n.valid_from - ) - ) - result.append( - sms_yearly_billing_data_query( - rates[-1].rate, - service_id, - get_valid_from(rates[-1].valid_from), - end_date - ) - ) - - result.append(email_yearly_billing_data_query(service_id, start_date, end_date)) - return sum(result, []) +from app.utils import get_london_month_from_utc_column @statsd(namespace="dao") @@ -112,52 +77,6 @@ def billing_data_filter(notification_type, start_date, end_date, service_id): ] -def email_yearly_billing_data_query(service_id, start_date, end_date, rate=0): - result = db.session.query( - func.count(NotificationHistory.id), - func.count(NotificationHistory.id), - rate_multiplier(), - NotificationHistory.notification_type, - NotificationHistory.international, - cast(rate, Integer()) - ).filter( - *billing_data_filter(EMAIL_TYPE, start_date, end_date, service_id) - ).group_by( - NotificationHistory.notification_type, - rate_multiplier(), - NotificationHistory.international - ).first() - - if not result: - return [(0, 0, 1, EMAIL_TYPE, False, 0)] - else: - return [result] - - -def sms_yearly_billing_data_query(rate, service_id, start_date, end_date): - result = db.session.query( - cast(func.sum(NotificationHistory.billable_units * rate_multiplier()), Integer()), - func.sum(NotificationHistory.billable_units), - rate_multiplier(), - NotificationHistory.notification_type, - NotificationHistory.international, - cast(rate, Float()) - ).filter( - *billing_data_filter(SMS_TYPE, start_date, end_date, service_id) - ).group_by( - NotificationHistory.notification_type, - NotificationHistory.international, - rate_multiplier() - ).order_by( - rate_multiplier() - ).all() - - if not result: - return [(0, 0, 1, SMS_TYPE, False, rate)] - else: - return result - - def get_rates_for_daterange(start_date, end_date, notification_type): rates = Rate.query.filter(Rate.notification_type == notification_type).order_by(Rate.valid_from).all() diff --git a/tests/app/dao/test_notification_usage_dao.py b/tests/app/dao/test_notification_usage_dao.py index 02876e6fb..5cc72d761 100644 --- a/tests/app/dao/test_notification_usage_dao.py +++ b/tests/app/dao/test_notification_usage_dao.py @@ -6,7 +6,6 @@ from freezegun import freeze_time from app.dao.date_util import get_financial_year from app.dao.notification_usage_dao import ( get_rates_for_daterange, - get_yearly_billing_data, get_billing_data_for_month, get_monthly_billing_data ) @@ -103,94 +102,6 @@ def test_get_rates_for_daterange_where_daterange_is_one_month_that_falls_between assert rates[0].rate == 0.175 -def test_get_yearly_billing_data(notify_db, notify_db_session, sample_template, sample_email_template): - set_up_rate(notify_db, datetime(2016, 4, 1), 0.014) - set_up_rate(notify_db, datetime(2016, 6, 1), 0.0158) - set_up_rate(notify_db, datetime(2017, 6, 1), 0.0165) - # previous year - create_notification(template=sample_template, created_at=datetime(2016, 3, 31), sent_at=datetime(2016, 3, 31), - status='sending', billable_units=1) - # current year - create_notification(template=sample_template, created_at=datetime(2016, 4, 2), sent_at=datetime(2016, 4, 2), - status='sending', billable_units=1) - create_notification(template=sample_template, created_at=datetime(2016, 5, 18), sent_at=datetime(2016, 5, 18), - status='sending', billable_units=2) - create_notification(template=sample_template, created_at=datetime(2016, 7, 22), sent_at=datetime(2016, 7, 22), - status='sending', billable_units=3, rate_multiplier=2, international=True, phone_prefix="1") - create_notification(template=sample_template, created_at=datetime(2016, 9, 15), sent_at=datetime(2016, 9, 15), - status='sending', billable_units=4) - create_notification(template=sample_template, created_at=datetime(2017, 3, 31), sent_at=datetime(2017, 3, 31), - status='sending', billable_units=5) - create_notification(template=sample_email_template, created_at=datetime(2016, 9, 15), sent_at=datetime(2016, 9, 15), - status='sending', billable_units=0) - create_notification(template=sample_email_template, created_at=datetime(2017, 3, 31), sent_at=datetime(2017, 3, 31), - status='sending', billable_units=0) - # next year - create_notification(template=sample_template, created_at=datetime(2017, 4, 1), sent_at=datetime(2017, 4, 1), - status='sending', billable_units=6) - results = get_yearly_billing_data(sample_template.service_id, 2016) - assert len(results) == 4 - assert results[0] == (3, 3, 1, 'sms', False, 0.014) - assert results[1] == (9, 9, 1, 'sms', False, 0.0158) - assert results[2] == (6, 3, 2, 'sms', True, 0.0158) - assert results[3] == (2, 2, 1, 'email', False, 0) - - -def test_get_future_yearly_billing_data(notify_db, notify_db_session, sample_template, sample_email_template): - set_up_rate(notify_db, datetime(2017, 4, 1), 0.0158) - - create_notification(template=sample_template, created_at=datetime(2017, 3, 30), sent_at=datetime(2017, 3, 30), - status='sending', billable_units=1) - create_notification(template=sample_template, created_at=datetime(2017, 4, 6), sent_at=datetime(2017, 4, 6), - status='sending', billable_units=1) - create_notification(template=sample_template, created_at=datetime(2017, 4, 6), sent_at=datetime(2017, 4, 6), - status='sending', billable_units=1) - - results = get_yearly_billing_data(sample_template.service_id, 2018) - assert len(results) == 2 - assert results[0] == (0, 0, 1, 'sms', False, 0.0158) - - -def test_get_yearly_billing_data_with_one_rate(notify_db, notify_db_session, sample_template): - set_up_rate(notify_db, datetime(2016, 4, 1), 0.014) - # previous year - create_notification(template=sample_template, created_at=datetime(2016, 3, 31), sent_at=datetime(2016, 3, 31), - status='sending', billable_units=1) - # current year - create_notification(template=sample_template, created_at=datetime(2016, 4, 2), sent_at=datetime(2016, 4, 2), - status='sending', billable_units=1) - create_notification(template=sample_template, created_at=datetime(2016, 5, 18), sent_at=datetime(2016, 5, 18), - status='sending', billable_units=2) - create_notification(template=sample_template, created_at=datetime(2016, 7, 22), sent_at=datetime(2016, 7, 22), - status='sending', billable_units=3) - create_notification(template=sample_template, created_at=datetime(2016, 9, 15), sent_at=datetime(2016, 9, 15), - status='sending', billable_units=4) - create_notification(template=sample_template, created_at=datetime(2017, 3, 31, 22, 59, 59), - sent_at=datetime(2017, 3, 31), status='sending', billable_units=5) - # next year - create_notification(template=sample_template, created_at=datetime(2017, 3, 31, 23, 00, 00), - sent_at=datetime(2017, 3, 31), status='sending', billable_units=6) - create_notification(template=sample_template, created_at=datetime(2017, 4, 1), sent_at=datetime(2017, 4, 1), - status='sending', billable_units=7) - results = get_yearly_billing_data(sample_template.service_id, 2016) - assert len(results) == 2 - assert results[0] == (15, 15, 1, 'sms', False, 0.014) - assert results[1] == (0, 0, 1, 'email', False, 0) - - -def test_get_yearly_billing_data_with_no_sms_notifications(notify_db, notify_db_session, sample_email_template): - set_up_rate(notify_db, datetime(2016, 4, 1), 0.014) - create_notification(template=sample_email_template, created_at=datetime(2016, 7, 31), sent_at=datetime(2016, 3, 31), - status='sending', billable_units=0) - create_notification(template=sample_email_template, created_at=datetime(2016, 10, 2), sent_at=datetime(2016, 4, 2), - status='sending', billable_units=0) - - results = get_yearly_billing_data(sample_email_template.service_id, 2016) - assert len(results) == 2 - assert results[0] == (0, 0, 1, 'sms', False, 0.014) - assert results[1] == (2, 2, 1, 'email', False, 0) - - def test_get_monthly_billing_data(notify_db, notify_db_session, sample_template, sample_email_template): set_up_rate(notify_db, datetime(2016, 4, 1), 0.014) # previous year @@ -271,19 +182,6 @@ def set_up_rate(notify_db, start_date, value): notify_db.session.add(rate) -def test_get_yearly_billing_data_for_start_date_before_rate_returns_empty( - sample_template -): - create_rate(datetime(2016, 4, 1), 0.014, SMS_TYPE) - - results = get_yearly_billing_data( - service_id=sample_template.service_id, - year=2015 - ) - - assert not results - - @freeze_time("2016-05-01") def test_get_billing_data_for_month_where_start_date_before_rate_returns_empty( sample_template