syncbackMessageActions refactor

packages/nylas-core/models/account/syncback-request.js

@@ -1,7 +1,11 @@
 module.exports = (sequelize, Sequelize) => {
   const SyncbackRequest = sequelize.define('SyncbackRequest', {
     type: Sequelize.STRING,
-    status: Sequelize.STRING,
+    status: {
+      type: Sequelize.ENUM("NEW", "SUCCEEDED", "FAILED"),
+      defaultValue: "NEW",
+      allowNull: false,
+    },
     error: {
       type: Sequelize.STRING,
       get: function get() {

packages/nylas-core/pubsub-connector.js

@@ -55,7 +55,7 @@ class PubsubConnector {
   }
 
   notify({accountId, type, data}) {
-    this.broadcastClient().publish(`channel-${accountId}`, {type, data});
+    this.broadcastClient().publish(`channel-${accountId}`, JSON.stringify({type, data}));
   }
 
   observe(accountId) {

packages/nylas-sync/sync-worker.js

@@ -40,14 +40,15 @@ class SyncWorker {
     this._conn = null
   }
 
-  _onMessage(msg = {}) {
+  _onMessage(msg) {
-    switch(msg.type) {
+    const {type, data} = JSON.parse(msg)
+    switch(type) {
       case MessageTypes.ACCOUNT_UPDATED:
         this._onAccountUpdated(); break;
       case MessageTypes.SYNCBACK_REQUESTED:
         this.syncNow(); break;
       default:
-        throw new Error(`Invalid message: ${JSON.stringify(msg)}`)
+        throw new Error(`Invalid message: ${msg}`)
     }
   }
 
@@ -121,20 +122,11 @@ class SyncWorker {
     return this._conn.connect();
   }
 
-  fetchCategoryList() {
-    return this._conn.runOperation(new FetchCategoryList())
-  }
-
   syncbackMessageActions() {
-    return this._getAccount((account) =>
+    const where = {where: {status: "NEW"}, limit: 100};
-      Promise.each(this._db.SyncbackRequest.findAll().then((reqs = []) =>
+    return this._db.SyncbackRequest.findAll(where)
-        reqs.map((request) => {
+      .map((req) => SyncbackTaskFactory.create(this._account, req))
-          const task = SyncbackTaskFactory.create(account, request);
+      .each(this._conn.runOperation)
-          if (!task) return Promise.reject("No Task")
-          return this._conn.runOperation(task)
-        })
-      ))
-    )
   }
 
   syncAllCategories() {
@@ -163,7 +155,7 @@ class SyncWorker {
   }
 
   performSync() {
-    return this.fetchCategoryList()
+    return this._conn.runOperation(new FetchCategoryList())
     .then(() => this.syncbackMessageActions())
     .then(() => this.syncAllCategories())
   }

packages/nylas-sync/syncback-task-factory.js

@@ -4,12 +4,14 @@
  */
 class SyncbackTaskFactory {
   static create(account, syncbackRequest) {
-    if (syncbackRequest.type === "MoveToFolder") {
+    let Task = null;
-      // TODO: Know it's IMAP from the account object.
+    switch(syncbackRequest.type) {
-      const Task = require('./syncback_tasks/move-to-folder.imap');
+      case "MoveToFolder":
-      return new Task(account, syncbackRequest)
+        Task = require('./syncback_tasks/move-to-folder.imap'); break;
+      default:
+        throw new Error(`Invalid Task Type: ${syncbackRequest.type}`)
     }
-    return null
+    return new Task(account, syncbackRequest)
   }
 }
 

packages/nylas-sync/syncback_tasks/move-to-folder.imap.js

@@ -9,6 +9,8 @@ class MoveToFolderIMAP {
   }
 
   run(db, imap) {
+    console.log("RUNNING MOVE TO FOLDER IMAP");
+    return Promise.resolve();
   }
 }
 module.exports = MoveToFolderIMAP