Victor/Folker - review #5 - move code to pixelated_mail and mail_service

2 files changed, 5 insertions, 1 deletions

diff --git a/service/app/adapter/mail_service.py b/service/app/adapter/mail_service.py
index ab9304e0..c8cf5e74 100644
--- a/service/app/adapter/mail_service.py
+++ b/service/app/adapter/mail_service.py
@@ -34,7 +34,9 @@ class MailService:
         
 
     def mails(self, query):
-        return self.mailbox.messages or []
+        mails = self.mailbox.messages or []
+        mails = [PixelatedMail(mail) for mail in mails]
+        return mails
 
     def update_tags(self, mail_id, new_tags):
         mail = self.mail(mail_id)
diff --git a/service/app/adapter/pixelated_mail.py b/service/app/adapter/pixelated_mail.py
index 80ed2401..2f1e14e9 100644
--- a/service/app/adapter/pixelated_mail.py
+++ b/service/app/adapter/pixelated_mail.py
@@ -1,5 +1,6 @@
 from app.tags import Tag
 from app.tags import Tags
+import dateutil.parser as dateparser
 
 
 class PixelatedMail:
@@ -27,6 +28,7 @@ class PixelatedMail:
         self.leap_mail = leap_mail
         self.body = leap_mail.bdoc.content['raw']
         self.headers = self.extract_headers()
+        self.date = dateparser.parse(self.headers['date'])
         self.ident = leap_mail.getUID()
         self.status = self.extract_status()
         self.security_casing = {}