decreasing count on tag and tag shortcut when email is read. we were

decreasing only tags that were also in the read mail, but we have also
to look at the mailbox and compare that to the tags in the case of
default tags #95

2 files changed, 8 insertions, 2 deletions

diff --git a/service/pixelated/adapter/mail.py b/service/pixelated/adapter/mail.py
index 513a07d8..5cafa36a 100644
--- a/service/pixelated/adapter/mail.py
+++ b/service/pixelated/adapter/mail.py
@@ -52,6 +52,10 @@ class Mail:
         return self.fdoc.content.get('flags')
 
     @property
+    def mailbox_name(self):
+        return self.fdoc.content.get('mbox')
+
+    @property
     def _mime_multipart(self):
         if self._mime:
             return self._mime
@@ -75,7 +79,8 @@ class Mail:
             'tags': list(self.tags),
             'status': list(self.status),
             'security_casing': {},
-            'body': self.body
+            'body': self.body,
+            'mailbox': self.mailbox_name.lower()
         }
 
 
diff --git a/service/pixelated/adapter/mail_service.py b/service/pixelated/adapter/mail_service.py
index e908feb7..cc03ab3a 100644
--- a/service/pixelated/adapter/mail_service.py
+++ b/service/pixelated/adapter/mail_service.py
@@ -35,7 +35,8 @@ class MailService:
         if len(reserved_words):
             raise ValueError('None of the following words can be used as tags: ' + ' '.join(reserved_words))
         mail = self.mail(mail_id)
-        return mail.update_tags(set(new_tags))
+        mail.update_tags(set(new_tags))
+        return mail
 
     def mail(self, mail_id):
         return self.mailboxes.mail(mail_id)