diff --git a/app/main/views/platform_admin.py b/app/main/views/platform_admin.py index 2ca78641a..7c883d7e9 100644 --- a/app/main/views/platform_admin.py +++ b/app/main/views/platform_admin.py @@ -18,7 +18,11 @@ def platform_admin(): services = service_api_client.get_services({'detailed': True})['data'] return render_template( 'views/platform-admin.html', - **get_statistics(services) + **get_statistics(sorted( + services, + key=lambda service: service['created_at'], + reverse=True + )) ) @@ -67,5 +71,6 @@ def format_stats_by_service(services): 'delivered': sum(stat['delivered'] for stat in stats), 'failed': sum(stat['failed'] for stat in stats), 'restricted': service['restricted'], - 'research_mode': service['research_mode'] + 'research_mode': service['research_mode'], + 'created_at': service['created_at'] } diff --git a/tests/__init__.py b/tests/__init__.py index d91d80cd0..03fa90167 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -65,7 +65,8 @@ def service_json( 'sms_sender': sms_sender, 'research_mode': research_mode, 'organisation': organisation, - 'branding': branding + 'branding': branding, + 'created_at': str(datetime.utcnow()) } diff --git a/tests/conftest.py b/tests/conftest.py index c884da70e..c7ddc0862 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -84,7 +84,8 @@ def mock_get_detailed_service(mocker, api_user_active): 'statistics': { 'email': {'requested': 0, 'delivered': 0, 'failed': 0}, 'sms': {'requested': 0, 'delivered': 0, 'failed': 0} - } + }, + 'created_at': str(datetime.utcnow()) } }