Merge pull request #254 from slco-2016/v4

Resolves bugs related to date, col val types, twilio responses
slco-2016 · Dec 5, 2016 · d6561c9 · d6561c9
2 parents 35dddba + 1d87642
commit d6561c9
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 17 deletions.
diff --git a/app/controllers/voice.js b/app/controllers/voice.js
@@ -33,10 +33,6 @@ module.exports = {
     Organizations.findOneByPhone(toNumber)
     .then((resp) => {
       organizationNumber = resp && resp.phone ? resp.phone : '';
-      console.log('\n\n');console.log('\n\n');
-      console.log('got call');console.log('got call');
-      console.log('got call', resp);
-      console.log('got call - organizationNumber', organizationNumber);
 
       return Communications.findByValue(fromNumber);
     }).then((resp) => {
@@ -61,6 +57,7 @@ module.exports = {
           twilioResponse.dial({callerId: organizationNumber, });
         }
 
+        // this will make the text-to-voice in twilio read the phone number more clearly
         try {
           organizationNumber = organizationNumber.replace(/\D+/g, '');
           organizationNumber = organizationNumber.replace(/(\d{1})(\d{3})(\d{3})(\d{4})/, '$1 ($2) $3-$4');
@@ -86,8 +83,10 @@ module.exports = {
           return message.update({content: req.body.TranscriptionText,});
         });
       }
-    }).then(() => res.send('ok'))
-    .catch(res.error500);
+    }).then(() => {
+      const emptyResponse = twilio.TwimlResponse().toString();
+      res.send(emptyResponse);
+    }).catch(res.error500);
   },
 
   status(req, res) {
@@ -110,7 +109,8 @@ module.exports = {
           return null;
         }
       }).then((notification) => {
-        res.send('ok');
+        const emptyResponse = twilio.TwimlResponse().toString();
+        res.send(emptyResponse);
       }).catch(res.error500);
     }
   },
@@ -239,8 +239,10 @@ module.exports = {
           }
         });
       }
-    }).then(() => res.send('ok'))
-    .catch(res.error500);
+    }).then(() => {
+      const emptyResponse = twilio.TwimlResponse().toString();
+      res.send(emptyResponse);
+    }).catch(res.error500);
   },
 
   new(req, res) {

diff --git a/app/models/capture.js b/app/models/capture.js
@@ -13,6 +13,15 @@ class CaptureBoard {
   static findByOrg (orgId) {
     return new Promise((fulfill, reject) => {
       db('msgs')
+        .select('msgs.msgid',
+                'msgs.convo',
+                'msgs.content',
+                'msgs.inbound',
+                'msgs.created',
+                'convos.subject',
+                'comms.type',
+                'comms.value',
+                'commconns.name')
         .leftJoin('convos', 'msgs.convo', 'convos.convid')
         .leftJoin('comms', 'comms.commid', 'msgs.comm')
         .leftJoin('commconns', 'commconns.commconnid', 'comms.commid')

diff --git a/app/models/notifications.js b/app/models/notifications.js
@@ -9,9 +9,11 @@ const moment = require('moment');
 const momentTz = require('moment-timezone');
 
 const resourceRequire = require('../lib/resourceRequire');
-const OutboundVoiceMessages = resourceRequire('models', 'OutboundVoiceMessages');
+
+const Alerts = resourceRequire('models', 'Alerts');
 const Conversations = resourceRequire('models', 'Conversations');
 const Messages = resourceRequire('models', 'Messages');
+const OutboundVoiceMessages = resourceRequire('models', 'OutboundVoiceMessages');
 const Users = resourceRequire('models', 'Users');
 
 const voice = resourceRequire('lib', 'voice');
@@ -46,8 +48,6 @@ class Notifications extends BaseModel {
   static checkAndSendNotifications () {
     return new Promise((fulfill, reject) => {
       db('notifications')
-        // .select("notifications.*", "comms.type", "comms.value")
-        // .leftJoin("comms", "notifications.comm", "comms.commid")
         .where('send', '<', db.fn.now())
         .andWhere('notifications.sent', false)
         .andWhere('notifications.closed', false)
@@ -65,7 +65,17 @@ class Notifications extends BaseModel {
         } else {
           return this.sendTextorEmailNotification(notification);
         }
-      }).then((resp) => {
+      }).then((notifications) => {
+        return new Promise((fulfill, reject) => {
+          fulfill(notifications);
+        });
+      }).map((notification) => {
+        let targetUserId = notification.cm;
+        let createdByUserId = notification.cm;
+        let subject = 'Notification Sent';
+        let message = `Message subject \"${notification.subject}\" was sent and will appear as a sent message in the conversation stream.`;
+        return Alerts.createForUser(targetUserId, createdByUserId, subject, message);
+      }).then(() => {
         fulfill();
       }).catch(reject);
     });
@@ -77,7 +87,7 @@ class Notifications extends BaseModel {
       .then((ovm) => {
         return voice.processPendingOutboundVoiceMessages(ovm);
       }).then(() => {
-        fulfill();
+        fulfill(notification);
       }).catch(reject);
     });
   };
@@ -103,7 +113,7 @@ class Notifications extends BaseModel {
         sendMethod.then(() => {
           return this.markAsSent(notification.notificationid);
         }).then(() => {
-          fulfill();
+          fulfill(notification);
         }).catch(reject);
 
       }).catch(reject);

diff --git a/migrations/20161205151256_dob_update_in_clients_table.js b/migrations/20161205151256_dob_update_in_clients_table.js
@@ -0,0 +1,16 @@
+
+exports.up = function(knex, Promise) {
+  return Promise.all([
+
+    knex.raw('ALTER TABLE clients ALTER COLUMN dob TYPE date'),
+
+  ]);
+};
+
+exports.down = function(knex, Promise) {
+  return Promise.all([
+
+    knex.raw('ALTER TABLE clients ALTER COLUMN dob TYPE timestamptz'),
+
+  ]);
+};
diff --git a/public/js/app.js b/public/js/app.js
@@ -603,8 +603,6 @@ $(function() {
         }
 
         function buildUserActivityChart(users) {
-          console.log(users);
-
           // Set height based off of remaining users post filter operation
           var height = Math.max(users.length * 30, 100);
           c3.generate({