mirror of
https://github.com/GSA/notifications-api.git
synced 2026-09-11 10:28:55 -04:00
Serialize Notification now also returns sender email address
sent_by_email_address field was added because sometimes two people at one institution have the same name and then email address, which is unique, is more useful.
This commit is contained in:
@@ -1413,6 +1413,12 @@ class Notification(db.Model):
|
|||||||
else:
|
else:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
def get_created_by_email_address(self):
|
||||||
|
if self.created_by:
|
||||||
|
return self.created_by.email_address
|
||||||
|
else:
|
||||||
|
return None
|
||||||
|
|
||||||
def serialize_for_csv(self):
|
def serialize_for_csv(self):
|
||||||
created_at_in_bst = convert_utc_to_bst(self.created_at)
|
created_at_in_bst = convert_utc_to_bst(self.created_at)
|
||||||
serialized = {
|
serialized = {
|
||||||
@@ -1424,6 +1430,7 @@ class Notification(db.Model):
|
|||||||
"status": self.formatted_status,
|
"status": self.formatted_status,
|
||||||
"created_at": time.strftime('%A %d %B %Y at %H:%M', created_at_in_bst.timetuple()),
|
"created_at": time.strftime('%A %d %B %Y at %H:%M', created_at_in_bst.timetuple()),
|
||||||
"created_by_name": self.get_created_by_name(),
|
"created_by_name": self.get_created_by_name(),
|
||||||
|
"created_by_email_address": self.get_created_by_email_address(),
|
||||||
}
|
}
|
||||||
|
|
||||||
return serialized
|
return serialized
|
||||||
@@ -1454,6 +1461,7 @@ class Notification(db.Model):
|
|||||||
"subject": self.subject,
|
"subject": self.subject,
|
||||||
"created_at": self.created_at.strftime(DATETIME_FORMAT),
|
"created_at": self.created_at.strftime(DATETIME_FORMAT),
|
||||||
"created_by_name": self.get_created_by_name(),
|
"created_by_name": self.get_created_by_name(),
|
||||||
|
"created_by_email_address": self.get_created_by_email_address(),
|
||||||
"sent_at": self.sent_at.strftime(DATETIME_FORMAT) if self.sent_at else None,
|
"sent_at": self.sent_at.strftime(DATETIME_FORMAT) if self.sent_at else None,
|
||||||
"completed_at": self.completed_at(),
|
"completed_at": self.completed_at(),
|
||||||
"scheduled_for": (
|
"scheduled_for": (
|
||||||
|
|||||||
Reference in New Issue
Block a user