darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-26 13:18:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Sort broadcasts by start time

Browse Source 
For emails and text messages we sort by the time the user (or API) sent
them.

This makes sense for broadcasts too, since most users will receive the
alert within seconds of it being broadcast.

For alerts that haven’t started yet we can sort by `updated_at`, which
is when the user preparing the broadcast submitted it for approval.
This commit is contained in:
Chris Hill-Scott
2020-10-16 09:02:35 +01:00
parent 74e92e708e
commit e2e04b51fc
4 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/broadcast_message.py
View File

@@ -42,11 +42,13 @@ class BroadcastMessage(JSONModel):
libraries = broadcast_area_libraries
def __lt__(self, other):
return (
self.cancelled_at or self.finishes_at or self.created_at
) < (
other.cancelled_at or other.finishes_at or self.created_at
)
if self.starts_at and other.starts_at:
return self.starts_at < other.starts_at
if self.starts_at and not other.starts_at:
return True
if not self.starts_at and other.starts_at:
return False
return self.updated_at < other.updated_at
@classmethod
def create(cls, *, service_id, template_id):