From 1eef4c3428c3f3a5bbf04031efbfedacb49de5f7 Mon Sep 17 00:00:00 2001
From: Evan Morikawa <evan@evanmorikawa.com>
Date: Thu, 14 Jul 2016 16:36:13 -0700
Subject: [PATCH] Remove logs and rename variables

---
 packages/nylas-api/routes/delta.js            | 13 +------------
 packages/nylas-core/models/account/message.js |  4 ++++
 packages/nylas-core/pubsub-connector.js       |  8 ++++----
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/packages/nylas-api/routes/delta.js b/packages/nylas-api/routes/delta.js
index f94a4841d..2340a5cd1 100644
--- a/packages/nylas-api/routes/delta.js
+++ b/packages/nylas-api/routes/delta.js
@@ -39,12 +39,6 @@ function createOutputStream() {
   const outputStream = require('stream').Readable();
   outputStream._read = () => { return };
   outputStream.pushJSON = (msg) => {
-    try {
-      if (typeof msg === 'string') {
-        const parsed = JSON.parse(msg)
-        console.log(parsed.id, parsed.event, parsed.object, parsed.objectId)
-      }
-    } catch (err) {}
     const jsonMsg = typeof msg === 'string' ? msg : JSON.stringify(msg);
     outputStream.push(jsonMsg);
   }
@@ -65,15 +59,10 @@ function initialTransactions(db, request) {
 
 function inflatedDeltas(db, request) {
   return PubsubConnector.observeDeltas(request.auth.credentials.id)
-    .flatMap((dataValues) => {
-      const flat = [db.Transaction.build(dataValues)]
-      console.log('DV', dataValues)
-      return flat
-    })
+    .flatMap((transactionJSON) => [db.Transaction.build(transactionJSON)])
     .flatMap((objs) => inflateTransactions(db, objs))
 }
 
-
 module.exports = (server) => {
   server.route({
     method: 'GET',
diff --git a/packages/nylas-core/models/account/message.js b/packages/nylas-core/models/account/message.js
index 64fd4b3d3..48b4111ea 100644
--- a/packages/nylas-core/models/account/message.js
+++ b/packages/nylas-core/models/account/message.js
@@ -94,6 +94,10 @@ module.exports = (sequelize, Sequelize) => {
           throw new Error("Message.toJSON called on a message where folder were not eagerly loaded.")
         }
 
+        // When we request messages as a sub-object of a thread, we only
+        // request the `id` field from the database. We still toJSON the
+        // Message though and need to protect `this.date` from null
+        // errors.
         return {
           id: this.id,
           account_id: this.accountId,
diff --git a/packages/nylas-core/pubsub-connector.js b/packages/nylas-core/pubsub-connector.js
index d3da5ed25..78c98d56a 100644
--- a/packages/nylas-core/pubsub-connector.js
+++ b/packages/nylas-core/pubsub-connector.js
@@ -73,8 +73,8 @@ class PubsubConnector {
     return this._observableForChannelOnSharedListener(`account-${accountId}`);
   }
 
-  notifyDelta(accountId, dataValues) {
-    this.broadcastClient().publish(`deltas-${accountId}`, JSON.stringify(dataValues))
+  notifyDelta(accountId, transactionJSON) {
+    this.broadcastClient().publish(`deltas-${accountId}`, JSON.stringify(transactionJSON))
   }
 
   observeAllAccounts() {
@@ -93,8 +93,8 @@ class PubsubConnector {
   observeDeltas(accountId) {
     return Rx.Observable.create((observer) => {
       const sub = this.buildClient();
-      sub.on("message", (channel, dataValuesString) => {
-        observer.onNext(JSON.parse(dataValuesString))
+      sub.on("message", (channel, transactionJSONString) => {
+        observer.onNext(JSON.parse(transactionJSONString))
       })
       sub.subscribe(`deltas-${accountId}`);
       return () => {