From a265871a4212ac1ca5622af753600438a2ac06b6 Mon Sep 17 00:00:00 2001 From: Pea Tyczynska Date: Thu, 6 Dec 2018 11:53:54 +0000 Subject: [PATCH] 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. --- app/models.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/models.py b/app/models.py index 93a9bcd0c..2e48bcdb9 100644 --- a/app/models.py +++ b/app/models.py @@ -1413,6 +1413,12 @@ class Notification(db.Model): else: 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): created_at_in_bst = convert_utc_to_bst(self.created_at) serialized = { @@ -1424,6 +1430,7 @@ class Notification(db.Model): "status": self.formatted_status, "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_email_address": self.get_created_by_email_address(), } return serialized @@ -1454,6 +1461,7 @@ class Notification(db.Model): "subject": self.subject, "created_at": self.created_at.strftime(DATETIME_FORMAT), "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, "completed_at": self.completed_at(), "scheduled_for": (