Merge pull request #373 from roberto/master

Allow user to move emails from trash to inbox

3 files changed, 27 insertions, 1 deletions

diff --git a/service/pixelated/adapter/services/mail_service.py b/service/pixelated/adapter/services/mail_service.py
index 03889f82..656bb4bc 100644
--- a/service/pixelated/adapter/services/mail_service.py
+++ b/service/pixelated/adapter/services/mail_service.py
@@ -97,6 +97,11 @@ class MailService(object):
             trashed_mail = self.mailboxes.move_to_trash(mail_id)
             self.search_engine.index_mail(trashed_mail)
 
+    def recover_mail(self, mail_id):
+        mail = self.mail(mail_id)
+        recovered_mail = self.mailboxes.move_to_inbox(mail_id)
+        self.search_engine.index_mail(recovered_mail)
+
     def delete_permanent(self, mail_id):
         mail = self.mail(mail_id)
         self.search_engine.remove_from_index(mail_id)
diff --git a/service/pixelated/adapter/services/mailboxes.py b/service/pixelated/adapter/services/mailboxes.py
index a7a3a591..e9fe6ce5 100644
--- a/service/pixelated/adapter/services/mailboxes.py
+++ b/service/pixelated/adapter/services/mailboxes.py
@@ -49,8 +49,14 @@ class Mailboxes(object):
         return [self._create_or_get(leap_mailbox_name) for leap_mailbox_name in self.account.mailboxes]
 
     def move_to_trash(self, mail_id):
+        return self._move_to(mail_id, self.trash())
+
+    def move_to_inbox(self, mail_id):
+        return self._move_to(mail_id, self.inbox())
+
+    def _move_to(self, mail_id, mailbox):
         mail = self.querier.mail(mail_id)
-        mail.set_mailbox(self.trash().mailbox_name)
+        mail.set_mailbox(mailbox.mailbox_name)
         mail.save()
         return mail
 
diff --git a/service/pixelated/resources/mails_resource.py b/service/pixelated/resources/mails_resource.py
index c057031a..3822abd3 100644
--- a/service/pixelated/resources/mails_resource.py
+++ b/service/pixelated/resources/mails_resource.py
@@ -53,6 +53,20 @@ class MailsDeleteResource(Resource):
         return respond_json(None, request)
 
 
+class MailsRecoverResource(Resource):
+    isLeaf = True
+
+    def __init__(self, mail_service):
+        Resource.__init__(self)
+        self._mail_service = mail_service
+
+    def render_POST(self, request):
+        idents = json.loads(request.content.read())['idents']
+        for ident in idents:
+            self._mail_service.recover_mail(ident)
+        return respond_json(None, request)
+
+
 class MailsResource(Resource):
 
     def _register_smtp_error_handler(self):
@@ -66,6 +80,7 @@ class MailsResource(Resource):
     def __init__(self, mail_service, draft_service):
         Resource.__init__(self)
         self.putChild('delete', MailsDeleteResource(mail_service))
+        self.putChild('recover', MailsRecoverResource(mail_service))
         self.putChild('read', MailsReadResource(mail_service))
         self.putChild('unread', MailsUnreadResource(mail_service))