Merge pull request #682 from alphagov/remove-provider_statistics

Remove provider_statistics_dao.get_provider_statistics

app/celery/provider_tasks.py

@@ -1,6 +1,4 @@
 from datetime import datetime
-from monotonic import monotonic
-from urllib.parse import urljoin
 
 from flask import current_app
 from notifications_utils.recipients import (
@@ -143,6 +141,7 @@ def send_email_to_provider(self, service_id, notification_id):
                 send_email_response.apply_async(
                     (provider.get_name(), reference, notification.to), queue='research-mode'
                 )
+                notification.billable_units = 0
             else:
                 from_address = '"{}" <{}@{}>'.format(service.name, service.email_from,
                                                      current_app.config['NOTIFY_EMAIL_DOMAIN'])

app/dao/provider_statistics_dao.py

@@ -1,9 +1,7 @@
-from sqlalchemy import func, cast, Float, case
+from sqlalchemy import func
 
 from app import db
 from app.models import (
-    ProviderStatistics,
-    ProviderDetails,
     NotificationHistory,
     SMS_TYPE,
     EMAIL_TYPE,
@@ -12,15 +10,6 @@ from app.models import (
 )
 
 
-def get_provider_statistics(service, **kwargs):
-    query = ProviderStatistics.query.filter_by(service=service)
-    if 'providers' in kwargs:
-        providers = ProviderDetails.query.filter(ProviderDetails.identifier.in_(kwargs['providers'])).all()
-        provider_ids = [provider.id for provider in providers]
-        query = query.filter(ProviderStatistics.provider_id.in_(provider_ids))
-    return query
-
-
 def get_fragment_count(service_id):
     shared_filters = [
         NotificationHistory.service_id == service_id,