From 82c16b35798537302fecbf40ed76b0051e23ddb3 Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Mon, 23 Nov 2015 18:38:50 -0300 Subject: Simplify controller logic on PUT draft It was checking for mail existence, but thats redundant since its also checking if draft_id was being sent. Also, its service responsibility to ensure operation consistency, not the controller. --Issue #512 --- service/pixelated/adapter/mailstore/leap_mailstore.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'service/pixelated/adapter/mailstore/leap_mailstore.py') diff --git a/service/pixelated/adapter/mailstore/leap_mailstore.py b/service/pixelated/adapter/mailstore/leap_mailstore.py index 4348347e..f59034b8 100644 --- a/service/pixelated/adapter/mailstore/leap_mailstore.py +++ b/service/pixelated/adapter/mailstore/leap_mailstore.py @@ -289,9 +289,8 @@ class LeapMailStore(MailStore): @defer.inlineCallbacks def delete_mail(self, mail_id): message = yield self._fetch_msg_from_soledad(mail_id) - message_wrapper = message.get_wrapper() - if message_wrapper.mdoc.doc_id: - yield message_wrapper.delete(self.soledad) + if message and message.get_wrapper().mdoc.doc_id: + yield message.get_wrapper().delete(self.soledad) @defer.inlineCallbacks def get_mailbox_mail_ids(self, mailbox_name): -- cgit v1.2.3