Merge pull request #1195 from alphagov/imdad-refactor-remove-unused-billing-code

Remove unused billing usage code

app/dao/monthly_billing_dao.py

@@ -1,7 +1,5 @@
 from datetime import datetime
 
-from sqlalchemy import func
-
 
 from app import db
 from app.dao.dao_utils import transactional

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()
 

app/service/rest.py

@@ -458,43 +458,6 @@ def get_monthly_template_stats(service_id):
         raise InvalidRequest('Year must be a number', status_code=400)
 
 
-@service_blueprint.route('/<uuid:service_id>/yearly-usage')
-def get_yearly_billing_usage(service_id):
-    try:
-        year = int(request.args.get('year'))
-        results = notification_usage_dao.get_yearly_billing_data(service_id, year)
-        json_result = [{
-            "credits": x[0],
-            "billing_units": x[1],
-            "rate_multiplier": x[2],
-            "notification_type": x[3],
-            "international": x[4],
-            "rate": x[5]
-        } for x in results]
-        return json.dumps(json_result)
-
-    except TypeError:
-        return jsonify(result='error', message='No valid year provided'), 400
-
-
-@service_blueprint.route('/<uuid:service_id>/monthly-usage')
-def get_yearly_monthly_usage(service_id):
-    try:
-        year = int(request.args.get('year'))
-        results = notification_usage_dao.get_monthly_billing_data(service_id, year)
-        json_results = [{
-            "month": x[0],
-            "billing_units": x[1],
-            "rate_multiplier": x[2],
-            "international": x[3],
-            "notification_type": x[4],
-            "rate": x[5]
-        } for x in results]
-        return json.dumps(json_results)
-    except TypeError:
-        return jsonify(result='error', message='No valid year provided'), 400
-
-
 @service_blueprint.route('/<uuid:service_id>/inbound-api', methods=['POST'])
 def create_service_inbound_api(service_id):
     data = request.get_json()