remove old statistics_api_client

now unused - replaced mock fn with detailed_services too

app/__init__.py

@@ -39,7 +39,6 @@ from app.notify_client.api_key_api_client import ApiKeyApiClient
 from app.notify_client.invite_api_client import InviteApiClient
 from app.notify_client.job_api_client import JobApiClient
 from app.notify_client.notification_api_client import NotificationApiClient
-from app.notify_client.statistics_api_client import StatisticsApiClient
 from app.notify_client.status_api_client import StatusApiClient
 from app.notify_client.template_statistics_api_client import TemplateStatisticsApiClient
 from app.notify_client.user_api_client import UserApiClient
@@ -57,7 +56,6 @@ job_api_client = JobApiClient()
 notification_api_client = NotificationApiClient()
 status_api_client = StatusApiClient()
 invite_api_client = InviteApiClient()
-statistics_api_client = StatisticsApiClient()
 template_statistics_client = TemplateStatisticsApiClient()
 events_api_client = EventsApiClient()
 provider_client = ProviderClient()
@@ -86,7 +84,6 @@ def create_app():
     notification_api_client.init_app(application)
     status_api_client.init_app(application)
     invite_api_client.init_app(application)
-    statistics_api_client.init_app(application)
     template_statistics_client.init_app(application)
     events_api_client.init_app(application)
     provider_client.init_app(application)

app/main/views/platform_admin.py

@@ -5,7 +5,7 @@ import pytz
 from flask import render_template
 from flask_login import login_required
 
-from app import statistics_api_client, service_api_client
+from app import service_api_client
 from app.main import main
 from app.utils import user_has_permissions
 from app.statistics_utils import get_formatted_percentage

app/notify_client/statistics_api_client.py

@@ -1,19 +0,0 @@
-from notifications_python_client.base import BaseAPIClient
-
-
-class StatisticsApiClient(BaseAPIClient):
-    def __init__(self, base_url=None, client_id=None, secret=None):
-        super(self.__class__, self).__init__(base_url=base_url or 'base_url',
-                                             client_id=client_id or 'client_id',
-                                             secret=secret or 'secret')
-
-    def init_app(self, app):
-        self.base_url = app.config['API_HOST_NAME']
-        self.client_id = app.config['ADMIN_CLIENT_USER_NAME']
-        self.secret = app.config['ADMIN_CLIENT_SECRET']
-
-    def get_statistics_for_all_services_for_day(self, day):
-        params = {
-            'day': day
-        }
-        return self.get(url='/notifications/statistics', params=params)

tests/app/main/views/test_platform_admin.py

@@ -31,8 +31,7 @@ def test_should_render_platform_admin_page(
     app_,
     platform_admin_user,
     mocker,
-    mock_get_services,
+    mock_get_detailed_services,
-    mock_get_all_service_statistics
 ):
     with app_.test_request_context():
         with app_.test_client() as client:

tests/conftest.py

@@ -96,6 +96,20 @@ def mock_get_detailed_service_for_today(mocker, api_user_active):
     return mocker.patch('app.service_api_client.get_detailed_service_for_today', side_effect=_get)
 
 
+@pytest.fixture(scope='function')
+def mock_get_detailed_services(mocker, fake_uuid):
+    service_one = service_json(SERVICE_ONE_ID, "service_one", [fake_uuid], 1000, True, False)
+    service_one['statistics'] = {
+        'email': {'requested': 0, 'delivered': 0, 'failed': 0},
+        'sms': {'requested': 0, 'delivered': 0, 'failed': 0}
+    }
+    services = {'data': [service_one]}
+
+    return mocker.patch('app.service_api_client.get_services', return_value=services)
+
+
+
+
 @pytest.fixture(scope='function')
 def mock_get_live_service(mocker, api_user_active):
     def _get(service_id):
@@ -215,15 +229,6 @@ def mock_delete_service(mocker, mock_get_service):
         'app.service_api_client.delete_service', side_effect=_delete)
 
 
-@pytest.fixture(scope='function')
-def mock_get_all_service_statistics(mocker):
-    def _create(day):
-        return {'data': []}
-
-    return mocker.patch(
-        'app.statistics_api_client.get_statistics_for_all_services_for_day', side_effect=_create)
-
-
 @pytest.fixture(scope='function')
 def mock_get_service_template(mocker):
     def _get(service_id, template_id, version=None):