darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-23 15:57:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3159 from alphagov/fix-event-sorting

Browse Source 
Fix sorting of events
This commit is contained in:
Chris Hill-Scott
2019-10-23 15:14:02 +01:00
committed by GitHub
parent d7b99c733d 0185270308
commit cc6ab01c9b
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/main/views/history.py
View File

@@ -1,4 +1,5 @@
from collections import defaultdict from collections import defaultdict
from operator import attrgetter
from flask import render_template, request from flask import render_template, request
@@ -36,7 +37,7 @@ def _chunk_events_by_day(events):
days = defaultdict(list) days = defaultdict(list)
for event in events: for event in sorted(events, key=attrgetter('time'), reverse=True):
days[format_date_numeric(event.time)].append(event) days[format_date_numeric(event.time)].append(event)
return sorted(days.items(), reverse=True) return sorted(days.items(), reverse=True)

14
tests/app/main/views/test_history.py
View File

@@ -9,8 +9,10 @@ from tests.conftest import SERVICE_ONE_ID, normalize_spaces
( (
'12 December', '12 December',
( (
'Test User 1:13pm '
'Renamed this service from ‘Before lunch’ to ‘After lunch’ '
'Test User 12:12pm ' 'Test User 12:12pm '
'Renamed this service from ‘Example service’ to ‘Real service’' 'Renamed this service from ‘Example service’ to ‘Before lunch’'
), ),
), ),
( (
@@ -32,6 +34,8 @@ from tests.conftest import SERVICE_ONE_ID, normalize_spaces
( (
'Test User 11:10am ' 'Test User 11:10am '
'Created an API key called ‘Good key’ ' 'Created an API key called ‘Good key’ '
'Test User 10:09am '
'Created an API key called ‘Key event returned in non-chronological order’ '
'Unknown 2:01am ' 'Unknown 2:01am '
'Created this service and called it ‘Example service’' 'Created this service and called it ‘Example service’'
), ),
@@ -56,7 +60,9 @@ from tests.conftest import SERVICE_ONE_ID, normalize_spaces
'10 October 2010', '10 October 2010',
( (
'Test User 11:10am ' 'Test User 11:10am '
'Created an API key called ‘Good key’' 'Created an API key called ‘Good key’ '
'Test User 10:09am '
'Created an API key called ‘Key event returned in non-chronological order’'
), ),
), ),
]), ]),
@@ -64,8 +70,10 @@ from tests.conftest import SERVICE_ONE_ID, normalize_spaces
( (
'12 December', '12 December',
( (
'Test User 1:13pm '
'Renamed this service from ‘Before lunch’ to ‘After lunch’ '
'Test User 12:12pm ' 'Test User 12:12pm '
'Renamed this service from ‘Example service’ to ‘Real service’' 'Renamed this service from ‘Example service’ to ‘Before lunch’'
), ),
), ),
( (

14
tests/conftest.py
View File

@@ -3514,11 +3514,17 @@ def mock_get_service_history(mocker):
'created_by_id': uuid4(), 'created_by_id': uuid4(),
}, },
{ {
'name': 'Real service', 'name': 'Before lunch',
'created_at': '2010-10-10T01:01:01.000000Z', 'created_at': '2010-10-10T01:01:01.000000Z',
'updated_at': '2012-12-12T12:12:12.000000Z', 'updated_at': '2012-12-12T12:12:12.000000Z',
'created_by_id': sample_uuid(), 'created_by_id': sample_uuid(),
}, },
{
'name': 'After lunch',
'created_at': '2010-10-10T01:01:01.000000Z',
'updated_at': '2012-12-12T13:13:13.000000Z',
'created_by_id': sample_uuid(),
},
], ],
'api_key_history': [ 'api_key_history': [
{ {
@@ -3539,6 +3545,12 @@ def mock_get_service_history(mocker):
'created_at': '2011-11-11T11:11:11.000000Z', 'created_at': '2011-11-11T11:11:11.000000Z',
'created_by_id': sample_uuid(), 'created_by_id': sample_uuid(),
}, },
{
'name': 'Key event returned in non-chronological order',
'updated_at': None,
'created_at': '2010-10-10T09:09:09.000000Z',
'created_by_id': sample_uuid(),
},
], ],
'events': [], 'events': [],
}) })