Fixing integration tests.

3 files changed, 23 insertions, 9 deletions

diff --git a/service/pixelated/adapter/services/mailbox.py b/service/pixelated/adapter/services/mailbox.py
index a4029d78..a083e8a6 100644
--- a/service/pixelated/adapter/services/mailbox.py
+++ b/service/pixelated/adapter/services/mailbox.py
@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 
+from twisted.internet import defer
+
 
 class Mailbox(object):
 
@@ -30,10 +32,13 @@ class Mailbox(object):
     def mail(self, mail_id):
         return self.querier.mail(mail_id)
 
+    @defer.inlineCallbacks
     def add(self, mail):
-        added_mail = self.querier.create_mail(mail, self.mailbox_name)
+        added_mail = yield self.querier.create_mail(mail, self.mailbox_name)
+
+        import pdb; pdb.set_trace()
         self.search_engine.index_mail(added_mail)
-        return added_mail
+        defer.returnValue(added_mail)
 
     def remove(self, ident):
         mail = self.querier.mail(ident)
diff --git a/service/pixelated/adapter/soledad/soledad_facade_mixin.py b/service/pixelated/adapter/soledad/soledad_facade_mixin.py
index b58bb02f..e5dbb458 100644
--- a/service/pixelated/adapter/soledad/soledad_facade_mixin.py
+++ b/service/pixelated/adapter/soledad/soledad_facade_mixin.py
@@ -15,6 +15,7 @@
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 
 from twisted.internet import defer
+from leap.mail.mailbox_indexer import MailboxIndexer
 
 
 class SoledadDbFacadeMixin(object):
@@ -72,10 +73,15 @@ class SoledadDbFacadeMixin(object):
     def get_mbox(self, mbox):
         return self.soledad.get_from_index('by-type-and-mbox', 'mbox', mbox) if mbox else []
 
+    @defer.inlineCallbacks
     def get_lastuid(self, mbox):
         if isinstance(mbox, str):
-            mbox = self.get_mbox(mbox)[0]
-        return mbox.content['lastuid']
+            mbox = (yield defer.maybeDeferred(self.get_mbox(mbox)))[0]
+
+        indexer = MailboxIndexer(self.soledad)
+        last_uuid = yield indexer.get_last_uid(mbox.content['uuid'])
+
+        defer.returnValue(last_uuid)
 
     def get_search_index_masterkey(self):
         return self.soledad.get_from_index('by-type', 'index_key')
diff --git a/service/pixelated/adapter/soledad/soledad_writer_mixin.py b/service/pixelated/adapter/soledad/soledad_writer_mixin.py
index ed18c0d0..262351cb 100644
--- a/service/pixelated/adapter/soledad/soledad_writer_mixin.py
+++ b/service/pixelated/adapter/soledad/soledad_writer_mixin.py
@@ -33,15 +33,18 @@ class SoledadWriterMixin(SoledadDbFacadeMixin, object):
     def save_mail(self, mail):
         self.put_doc(mail.fdoc)
 
+    @defer.inlineCallbacks
     def create_mail(self, mail, mailbox_name):
-        mbox_doc = self.get_mbox(mailbox_name)[0]
-        uid = self.get_lastuid(mbox_doc)
+        mbox_doc = (yield self.get_mbox(mailbox_name))[0]
+        uid = 1 + (yield self.get_lastuid(mbox_doc))
+
         self.create_docs(mail.get_for_save(next_uid=uid, mailbox=mailbox_name))
 
-        mbox_doc.content['lastuid'] = uid + 1
-        self.put_doc(mbox_doc)
+        # FIXME need to update meta message (mdoc)
+        # mbox_doc.content['lastuid'] = uid + 1
+        # self.put_doc(mbox_doc)
 
-        return self.mail(mail.ident)
+        defer.returnValue((yield self.mail(mail.ident)))
 
     def remove_mail(self, mail):
         # FIX-ME: Must go through all the part_map phash to delete all the cdocs