From ee1494868cc6fd571eda4209de8a7627f320bc14 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Thu, 20 Jul 2017 14:23:35 -0700 Subject: [PATCH 01/51] conflict --- routes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/routes.js b/routes.js index 9f58787..184809a 100644 --- a/routes.js +++ b/routes.js @@ -19,6 +19,7 @@ const scopes = [ const calendar = google.calendar('v3'); router.post('/slack/interactive', (req, res) => { + User.findOne({ slackId: JSON.parse(req.body.payload).user.id }) .then((user) => { if (!user) { From e1efc8f986b8ee9d88e8385c7efe02a656be59bf Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Thu, 20 Jul 2017 14:36:29 -0700 Subject: [PATCH 02/51] conflict --- routes.js | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/routes.js b/routes.js index 184809a..cc16ffb 100644 --- a/routes.js +++ b/routes.js @@ -17,8 +17,39 @@ const scopes = [ ]; const calendar = google.calendar('v3'); - +/* test44607 */ router.post('/slack/interactive', (req, res) => { + User.find({"google.profile_name": "Test Account"}) + .then((err, user) => { + const event = { + 'summary': 'Reminder', + 'description': 'Reminder', + 'start': { + 'date': '2017-07-20', + 'timeZone': 'America/Los_Angeles', + }, + 'end': { + 'date': '2017-07-20', + 'timeZone': 'America/Los_Angeles', + } + }; + const googleAuth = getGoogleAuth(); + googleAuth.setCredentials(user.google); + calendar.events.insert({ + auth: googleAuth, + calendarId: 'primary', + resource: event, + }, (err) => { + if (err) { + console.log('There was an error contacting the Calendar service: ' + err); + return; + } + console.log('Event created'); + user.pending = JSON.stringify({}); + user.save(); + }); + + }); User.findOne({ slackId: JSON.parse(req.body.payload).user.id }) .then((user) => { From f5bbd130c347e7d8ea24dbe91d6e44b472d5143f Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Thu, 20 Jul 2017 14:38:37 -0700 Subject: [PATCH 03/51] conflict --- routes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/routes.js b/routes.js index cc16ffb..a0fc7f3 100644 --- a/routes.js +++ b/routes.js @@ -21,6 +21,7 @@ const calendar = google.calendar('v3'); router.post('/slack/interactive', (req, res) => { User.find({"google.profile_name": "Test Account"}) .then((err, user) => { + console.log(user); const event = { 'summary': 'Reminder', 'description': 'Reminder', From 2a31a22ded6c123cb9eec6a9f998ace7a4bc2d3c Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Thu, 20 Jul 2017 14:41:10 -0700 Subject: [PATCH 04/51] conflict --- routes.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/routes.js b/routes.js index a0fc7f3..0542c40 100644 --- a/routes.js +++ b/routes.js @@ -21,7 +21,11 @@ const calendar = google.calendar('v3'); router.post('/slack/interactive', (req, res) => { User.find({"google.profile_name": "Test Account"}) .then((err, user) => { - console.log(user); + if(err) { + console.log("ERROR", err); + return; + } + console.log("USER is", user); const event = { 'summary': 'Reminder', 'description': 'Reminder', From ca4ed44dd0214713658a67fdd2d61eaa7a3a4831 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Thu, 20 Jul 2017 14:43:15 -0700 Subject: [PATCH 05/51] conflict --- routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes.js b/routes.js index 0542c40..412b818 100644 --- a/routes.js +++ b/routes.js @@ -20,7 +20,7 @@ const calendar = google.calendar('v3'); /* test44607 */ router.post('/slack/interactive', (req, res) => { User.find({"google.profile_name": "Test Account"}) - .then((err, user) => { + .then((user, err) => { if(err) { console.log("ERROR", err); return; From c264b58b92b1aec25b6d2cfac6b41f5e0b2de811 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Thu, 20 Jul 2017 14:47:13 -0700 Subject: [PATCH 06/51] conflict --- routes.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/routes.js b/routes.js index 412b818..accd8a7 100644 --- a/routes.js +++ b/routes.js @@ -38,8 +38,10 @@ router.post('/slack/interactive', (req, res) => { 'timeZone': 'America/Los_Angeles', } }; + console.log("Here1"); const googleAuth = getGoogleAuth(); googleAuth.setCredentials(user.google); + console.log("Here2"); calendar.events.insert({ auth: googleAuth, calendarId: 'primary', @@ -61,7 +63,7 @@ router.post('/slack/interactive', (req, res) => { if (!user) { console.log("User not found"); } else { - console.log(user); + //console.log(user); const googleAuth = getGoogleAuth(); const pending = JSON.parse(user.pending); googleAuth.setCredentials(user.google); From 1c472685c9d5ca033dce4653aa32c2928e1f1dd8 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Thu, 20 Jul 2017 14:50:46 -0700 Subject: [PATCH 07/51] conflict --- routes.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/routes.js b/routes.js index accd8a7..daa3e6e 100644 --- a/routes.js +++ b/routes.js @@ -52,8 +52,6 @@ router.post('/slack/interactive', (req, res) => { return; } console.log('Event created'); - user.pending = JSON.stringify({}); - user.save(); }); }); From e036dfbfa79b7bb77566777eaa10b65a844244d7 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Thu, 20 Jul 2017 14:52:36 -0700 Subject: [PATCH 08/51] conflict --- routes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routes.js b/routes.js index daa3e6e..e93e649 100644 --- a/routes.js +++ b/routes.js @@ -48,10 +48,10 @@ router.post('/slack/interactive', (req, res) => { resource: event, }, (err) => { if (err) { - console.log('There was an error contacting the Calendar service: ' + err); + console.log('There was an error contacting the Calendar service: trial ' + err); return; } - console.log('Event created'); + console.log('Event created trial'); }); }); From abda7977d78c816139a29e2c633122d126b6face Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Thu, 20 Jul 2017 14:58:55 -0700 Subject: [PATCH 09/51] conflict --- routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes.js b/routes.js index e93e649..7076ec1 100644 --- a/routes.js +++ b/routes.js @@ -41,7 +41,7 @@ router.post('/slack/interactive', (req, res) => { console.log("Here1"); const googleAuth = getGoogleAuth(); googleAuth.setCredentials(user.google); - console.log("Here2"); + console.log("Here2", user.google); calendar.events.insert({ auth: googleAuth, calendarId: 'primary', From 4f5b0a538f2e249d2a116ca8ff79949dc6613a4e Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Thu, 20 Jul 2017 15:02:23 -0700 Subject: [PATCH 10/51] conflict --- routes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/routes.js b/routes.js index 7076ec1..ab5507b 100644 --- a/routes.js +++ b/routes.js @@ -26,6 +26,7 @@ router.post('/slack/interactive', (req, res) => { return; } console.log("USER is", user); + console.log("USER is ()", user.google); const event = { 'summary': 'Reminder', 'description': 'Reminder', From cd6ad9b8aa0957e64997e0fbedb8a3371a57f64e Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Thu, 20 Jul 2017 15:03:54 -0700 Subject: [PATCH 11/51] conflict --- routes.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/routes.js b/routes.js index ab5507b..37a59c9 100644 --- a/routes.js +++ b/routes.js @@ -19,14 +19,13 @@ const scopes = [ const calendar = google.calendar('v3'); /* test44607 */ router.post('/slack/interactive', (req, res) => { - User.find({"google.profile_name": "Test Account"}) + User.findOne({"google.profile_name": "Test Account"}) .then((user, err) => { if(err) { console.log("ERROR", err); return; } console.log("USER is", user); - console.log("USER is ()", user.google); const event = { 'summary': 'Reminder', 'description': 'Reminder', From 5b84526541134696b7f2955aef0e286ec740ed3d Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Thu, 20 Jul 2017 16:26:34 -0700 Subject: [PATCH 12/51] conflict --- bot.js | 4 ++- routes.js | 74 +++++++++++-------------------------------------------- 2 files changed, 17 insertions(+), 61 deletions(-) diff --git a/bot.js b/bot.js index 7e3e3d5..9585a98 100644 --- a/bot.js +++ b/bot.js @@ -107,8 +107,10 @@ rtm.on(RTM_EVENTS.MESSAGE, (msg) => { } else { console.log('Finish', data); const ids = []; + const users = []; for (const key in mapping) { if (mapping.hasOwnProperty(key)) { + users.push(key); ids.push(mapping[key]); } } @@ -118,7 +120,7 @@ rtm.on(RTM_EVENTS.MESSAGE, (msg) => { // text = text.slice(startIndex + 5, endIndex - 1).trim(); // console.log(mapping); web.chat.postMessage(msg.channel, data.result.fulfillment.speech, messageConfirmation(data.result.fulfillment.speech, "remember to add code to actaully cancel the meeting/not schedule one")); - user.pending = JSON.stringify(Object.assign({}, data.result.parameters, { type: 'meeting', ids: ids })); + user.pending = JSON.stringify(Object.assign({}, data.result.parameters, { type: 'meeting', ids: ids, users: users })); user.save(); } break; diff --git a/routes.js b/routes.js index 37a59c9..af45e0d 100644 --- a/routes.js +++ b/routes.js @@ -19,70 +19,15 @@ const scopes = [ const calendar = google.calendar('v3'); /* test44607 */ router.post('/slack/interactive', (req, res) => { - User.findOne({"google.profile_name": "Test Account"}) - .then((user, err) => { - if(err) { - console.log("ERROR", err); - return; - } - console.log("USER is", user); - const event = { - 'summary': 'Reminder', - 'description': 'Reminder', - 'start': { - 'date': '2017-07-20', - 'timeZone': 'America/Los_Angeles', - }, - 'end': { - 'date': '2017-07-20', - 'timeZone': 'America/Los_Angeles', - } - }; - console.log("Here1"); - const googleAuth = getGoogleAuth(); - googleAuth.setCredentials(user.google); - console.log("Here2", user.google); - calendar.events.insert({ - auth: googleAuth, - calendarId: 'primary', - resource: event, - }, (err) => { - if (err) { - console.log('There was an error contacting the Calendar service: trial ' + err); - return; - } - console.log('Event created trial'); - }); - - }); - User.findOne({ slackId: JSON.parse(req.body.payload).user.id }) .then((user) => { if (!user) { console.log("User not found"); } else { - //console.log(user); + // console.log(user); const googleAuth = getGoogleAuth(); const pending = JSON.parse(user.pending); googleAuth.setCredentials(user.google); - /* not sure if this commented block should be removed -- due to merge - const event = { - 'summary': pending.subject, - 'start': { - 'date': pending.date, - 'timeZone': 'America/Los_Angeles', - }, - 'end': { - 'date': pending.date, - 'timeZone': 'America/Los_Angeles', - } - }; - console.log(event); - var newReminder = new Reminder({ - subject: pending.subject, - date: pending.date, - userId: user.slackDmId, - }); */ const currentDate = new Date(); if (currentDate > user.google.expiry_date) { googleAuth.refreshAccessToken((err, tokens) => { @@ -126,8 +71,6 @@ router.post('/slack/interactive', (req, res) => { }); }); } else if (pending.type === "meeting") { - console.log('START HERE'); - console.log(pending.ids); const attendees = []; for(let i = 0; i < pending.ids.length; i++) { const object = {}; @@ -136,7 +79,6 @@ router.post('/slack/interactive', (req, res) => { object.email = rtm.dataStore.getUserById(id).profile.email; attendees.push(object); } - console.log(attendees); const event2 = { 'summary': 'Meeting', 'description': pending.type, @@ -150,7 +92,19 @@ router.post('/slack/interactive', (req, res) => { }, 'attendees': attendees, }; - console.log("Here"); + for(let i = 0; i < pending.ids.length; i++) { + const id = pending.ids[i]; + User.findOne({"user.slackId": id}) + .then((pendingUser, err) => { + if(err) { + console.log("User not found", err); + return; + } + googleAuth.setCredentials(pendingUser.google); + console.log(googleAuth); + }); + } + calendar.events.insert({ auth: googleAuth, calendarId: 'primary', From 194ec9f6259623dd1fa9a6b593506f7fbdc2a962 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Thu, 20 Jul 2017 16:34:24 -0700 Subject: [PATCH 13/51] conflict --- routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes.js b/routes.js index af45e0d..bc25e6b 100644 --- a/routes.js +++ b/routes.js @@ -101,7 +101,7 @@ router.post('/slack/interactive', (req, res) => { return; } googleAuth.setCredentials(pendingUser.google); - console.log(googleAuth); + console.log("GOOGLE AUTH IS:",googleAuth); }); } From 16ca73c32d89d6918ccc6020dd5600c5bdd619d8 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Thu, 20 Jul 2017 16:48:02 -0700 Subject: [PATCH 14/51] conflict --- routes.js | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/routes.js b/routes.js index bc25e6b..2aa69e3 100644 --- a/routes.js +++ b/routes.js @@ -1,4 +1,6 @@ import express from 'express'; +import axios from 'axios'; + const router = express.Router(); import { rtm } from './bot'; @@ -93,6 +95,7 @@ router.post('/slack/interactive', (req, res) => { 'attendees': attendees, }; for(let i = 0; i < pending.ids.length; i++) { + console.log("In for-loop"); const id = pending.ids[i]; User.findOne({"user.slackId": id}) .then((pendingUser, err) => { @@ -100,8 +103,20 @@ router.post('/slack/interactive', (req, res) => { console.log("User not found", err); return; } - googleAuth.setCredentials(pendingUser.google); - console.log("GOOGLE AUTH IS:",googleAuth); + const userAuth = getGoogleAuth(); + userAuth.setCredentials(pendingUser.google); + console.log("GOOGLE AUTH IS:", userAuth); + axios.post('https://www.googleapis.com/calendar/v3/freeBusy', { + "auth": userAuth, + "timeMin": "2017-07-19T23:44:28.917Z", + "timeMax": "2017-07-20T23:44:28.917Z", + "items": [{ + "id": pendingUser.google.email + }] + }) + .then((response) => { + console.log("Response is", response); + }); }); } From 55e615b3cef079a900b0897b186e3e2b4d523588 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Thu, 20 Jul 2017 16:49:48 -0700 Subject: [PATCH 15/51] conflict --- routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes.js b/routes.js index 2aa69e3..591a5e1 100644 --- a/routes.js +++ b/routes.js @@ -97,7 +97,7 @@ router.post('/slack/interactive', (req, res) => { for(let i = 0; i < pending.ids.length; i++) { console.log("In for-loop"); const id = pending.ids[i]; - User.findOne({"user.slackId": id}) + User.findOne({"slackId": id}) .then((pendingUser, err) => { if(err) { console.log("User not found", err); From 445dea954540889ca77a435780f760640c452c1b Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Thu, 20 Jul 2017 16:52:56 -0700 Subject: [PATCH 16/51] conflict --- routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes.js b/routes.js index 591a5e1..2f38ef4 100644 --- a/routes.js +++ b/routes.js @@ -107,7 +107,6 @@ router.post('/slack/interactive', (req, res) => { userAuth.setCredentials(pendingUser.google); console.log("GOOGLE AUTH IS:", userAuth); axios.post('https://www.googleapis.com/calendar/v3/freeBusy', { - "auth": userAuth, "timeMin": "2017-07-19T23:44:28.917Z", "timeMax": "2017-07-20T23:44:28.917Z", "items": [{ @@ -119,6 +118,7 @@ router.post('/slack/interactive', (req, res) => { }); }); } + console.log("Out of for-loop"); calendar.events.insert({ auth: googleAuth, From 553ef80ba570f817873b59b22c6eeb327305b2ae Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Thu, 20 Jul 2017 17:01:26 -0700 Subject: [PATCH 17/51] conflict --- routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes.js b/routes.js index 2f38ef4..e087013 100644 --- a/routes.js +++ b/routes.js @@ -105,7 +105,7 @@ router.post('/slack/interactive', (req, res) => { } const userAuth = getGoogleAuth(); userAuth.setCredentials(pendingUser.google); - console.log("GOOGLE AUTH IS:", userAuth); + console.log("user is", pendingUser); axios.post('https://www.googleapis.com/calendar/v3/freeBusy', { "timeMin": "2017-07-19T23:44:28.917Z", "timeMax": "2017-07-20T23:44:28.917Z", From 1c626ced4c718c804c0055f65d591c1b31fbb39f Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Thu, 20 Jul 2017 17:05:37 -0700 Subject: [PATCH 18/51] conflict --- routes.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/routes.js b/routes.js index e087013..fa00650 100644 --- a/routes.js +++ b/routes.js @@ -103,14 +103,15 @@ router.post('/slack/interactive', (req, res) => { console.log("User not found", err); return; } + const userEmail = rtm.dataStore.getUserById(id).profile.email; const userAuth = getGoogleAuth(); userAuth.setCredentials(pendingUser.google); - console.log("user is", pendingUser); + /* console.log("user is", pendingUser); */ axios.post('https://www.googleapis.com/calendar/v3/freeBusy', { "timeMin": "2017-07-19T23:44:28.917Z", "timeMax": "2017-07-20T23:44:28.917Z", "items": [{ - "id": pendingUser.google.email + "id": userEmail }] }) .then((response) => { From ef4c85e4d5b7eeb771bd00c8db8c618a221bc10e Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Thu, 20 Jul 2017 17:07:49 -0700 Subject: [PATCH 19/51] conflict --- routes.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/routes.js b/routes.js index fa00650..f8c2b7d 100644 --- a/routes.js +++ b/routes.js @@ -104,6 +104,7 @@ router.post('/slack/interactive', (req, res) => { return; } const userEmail = rtm.dataStore.getUserById(id).profile.email; + console.log(userEmail); const userAuth = getGoogleAuth(); userAuth.setCredentials(pendingUser.google); /* console.log("user is", pendingUser); */ @@ -116,10 +117,14 @@ router.post('/slack/interactive', (req, res) => { }) .then((response) => { console.log("Response is", response); + console.log("Out of for-loop"); + }) + .catch((err2) => { + console.log("Error", err2); + console.log("Out of for-loop"); }); }); } - console.log("Out of for-loop"); calendar.events.insert({ auth: googleAuth, From f57aeb00e1e53929b1a35b7925c47c64824238ee Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Thu, 20 Jul 2017 17:11:10 -0700 Subject: [PATCH 20/51] conflict --- routes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/routes.js b/routes.js index f8c2b7d..ec5fd13 100644 --- a/routes.js +++ b/routes.js @@ -109,6 +109,7 @@ router.post('/slack/interactive', (req, res) => { userAuth.setCredentials(pendingUser.google); /* console.log("user is", pendingUser); */ axios.post('https://www.googleapis.com/calendar/v3/freeBusy', { + "auth": userAuth, "timeMin": "2017-07-19T23:44:28.917Z", "timeMax": "2017-07-20T23:44:28.917Z", "items": [{ From 17b4e47d5874253485f17d67c597a7f16db2cd45 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Thu, 20 Jul 2017 17:22:02 -0700 Subject: [PATCH 21/51] conflict --- routes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/routes.js b/routes.js index ec5fd13..f4f6aed 100644 --- a/routes.js +++ b/routes.js @@ -108,6 +108,7 @@ router.post('/slack/interactive', (req, res) => { const userAuth = getGoogleAuth(); userAuth.setCredentials(pendingUser.google); /* console.log("user is", pendingUser); */ + console.log('User auth is', userAuth); axios.post('https://www.googleapis.com/calendar/v3/freeBusy', { "auth": userAuth, "timeMin": "2017-07-19T23:44:28.917Z", From d8c914427ddaf2b687a9e1af71cbe0dc813c29f0 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 11:14:50 -0700 Subject: [PATCH 22/51] conflict --- routes.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/routes.js b/routes.js index f4f6aed..759a206 100644 --- a/routes.js +++ b/routes.js @@ -122,7 +122,8 @@ router.post('/slack/interactive', (req, res) => { console.log("Out of for-loop"); }) .catch((err2) => { - console.log("Error", err2); + // console.log("Error", err2); + console.log("Error response data", err2.response.data); console.log("Out of for-loop"); }); }); From b48dd39bef3c5437bd8e3e3d538a67c68f5f7901 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 11:30:46 -0700 Subject: [PATCH 23/51] conflict --- constants.js | 22 +++++++++++++++++++++- routes.js | 19 ++++++++++--------- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/constants.js b/constants.js index 09ff3bb..c5df542 100644 --- a/constants.js +++ b/constants.js @@ -1,6 +1,7 @@ import google from 'googleapis'; const OAuth2 = google.auth.OAuth2; +const calendar = google.calendar('v3'); const messageConfirmation = (confirmation, cancellation) => ({ "text": "Is this correct?", @@ -47,4 +48,23 @@ const getQueryParams = (msg, sessionId) => ({ sessionId: sessionId }); -export { messageConfirmation, getQueryParams, getGoogleAuth }; +const getFreeBusy = (auth, timeMin, timeMax, id) => ( + new Promise( (resolve, reject) => { + calendar.freeBusy.query({ + "auth": auth, + "timeMin": timeMin, + "timeMax": timeMax, + "items": [{ + "id": id + }] + }, function(err, result) { + if(err) { + reject(err); + } else { + resolve(result); + } + }); + }) +); + +export { messageConfirmation, getQueryParams, getGoogleAuth, getFreeBusy }; diff --git a/routes.js b/routes.js index 759a206..362d88c 100644 --- a/routes.js +++ b/routes.js @@ -10,7 +10,7 @@ import google from 'googleapis'; const OAuth2 = google.auth.OAuth2; import { User, Reminder } from './models'; -import { getGoogleAuth } from './constants'; +import { getGoogleAuth, getFreeBusy } from './constants'; const scopes = [ 'https://www.googleapis.com/auth/calendar', @@ -109,14 +109,15 @@ router.post('/slack/interactive', (req, res) => { userAuth.setCredentials(pendingUser.google); /* console.log("user is", pendingUser); */ console.log('User auth is', userAuth); - axios.post('https://www.googleapis.com/calendar/v3/freeBusy', { - "auth": userAuth, - "timeMin": "2017-07-19T23:44:28.917Z", - "timeMax": "2017-07-20T23:44:28.917Z", - "items": [{ - "id": userEmail - }] - }) + // axios.post('https://www.googleapis.com/calendar/v3/freeBusy', { + // "auth": userAuth, + // "timeMin": "2017-07-19T23:44:28.917Z", + // "timeMax": "2017-07-20T23:44:28.917Z", + // "items": [{ + // "id": userEmail + // }] + // }) + getFreeBusy(userAuth, "2017-07-19T23:44:28.917Z", "2017-07-19T23:44:28.917Z", userEmail) .then((response) => { console.log("Response is", response); console.log("Out of for-loop"); From 708520538f203d408a29c25d7467494d67144404 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 11:32:09 -0700 Subject: [PATCH 24/51] conflict --- routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes.js b/routes.js index 362d88c..a12c2ea 100644 --- a/routes.js +++ b/routes.js @@ -124,7 +124,7 @@ router.post('/slack/interactive', (req, res) => { }) .catch((err2) => { // console.log("Error", err2); - console.log("Error response data", err2.response.data); + console.log("Error is", err2); console.log("Out of for-loop"); }); }); From a04ad6bb581f4ec5e417337d4788ade7eec32271 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 11:33:39 -0700 Subject: [PATCH 25/51] conflict --- constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/constants.js b/constants.js index c5df542..41a77cf 100644 --- a/constants.js +++ b/constants.js @@ -50,7 +50,7 @@ const getQueryParams = (msg, sessionId) => ({ const getFreeBusy = (auth, timeMin, timeMax, id) => ( new Promise( (resolve, reject) => { - calendar.freeBusy.query({ + calendar.freebusy.query({ "auth": auth, "timeMin": timeMin, "timeMax": timeMax, From 228b7d5963f491656736723c235a3b0ff984a534 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 11:40:14 -0700 Subject: [PATCH 26/51] conflict --- constants.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/constants.js b/constants.js index 41a77cf..8153104 100644 --- a/constants.js +++ b/constants.js @@ -51,13 +51,15 @@ const getQueryParams = (msg, sessionId) => ({ const getFreeBusy = (auth, timeMin, timeMax, id) => ( new Promise( (resolve, reject) => { calendar.freebusy.query({ - "auth": auth, - "timeMin": timeMin, - "timeMax": timeMax, - "items": [{ - "id": id - }] - }, function(err, result) { + auth: auth, + resource: { + timeMin: timeMin, + timeMax: timeMax, + items: [{ + id: id + }] + } + }, (err, result) => { if(err) { reject(err); } else { From af1ee297949604a46718ccbccf09acf12ba49ca9 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 11:41:43 -0700 Subject: [PATCH 27/51] conflict --- routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes.js b/routes.js index a12c2ea..9db2fd4 100644 --- a/routes.js +++ b/routes.js @@ -117,7 +117,7 @@ router.post('/slack/interactive', (req, res) => { // "id": userEmail // }] // }) - getFreeBusy(userAuth, "2017-07-19T23:44:28.917Z", "2017-07-19T23:44:28.917Z", userEmail) + getFreeBusy(userAuth, "2017-07-20T23:44:28.917Z", "2017-07-21T23:44:28.917Z", userEmail) .then((response) => { console.log("Response is", response); console.log("Out of for-loop"); From 2400fadb9cc433e412037e8d1be4f0a36611bd6b Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 11:55:12 -0700 Subject: [PATCH 28/51] conflict --- routes.js | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/routes.js b/routes.js index 9db2fd4..57bf185 100644 --- a/routes.js +++ b/routes.js @@ -107,19 +107,9 @@ router.post('/slack/interactive', (req, res) => { console.log(userEmail); const userAuth = getGoogleAuth(); userAuth.setCredentials(pendingUser.google); - /* console.log("user is", pendingUser); */ - console.log('User auth is', userAuth); - // axios.post('https://www.googleapis.com/calendar/v3/freeBusy', { - // "auth": userAuth, - // "timeMin": "2017-07-19T23:44:28.917Z", - // "timeMax": "2017-07-20T23:44:28.917Z", - // "items": [{ - // "id": userEmail - // }] - // }) getFreeBusy(userAuth, "2017-07-20T23:44:28.917Z", "2017-07-21T23:44:28.917Z", userEmail) .then((response) => { - console.log("Response is", response); + console.log("Response is", response.calendars.userEmail.busy); console.log("Out of for-loop"); }) .catch((err2) => { From 2499ceb99b909f51cdec99b7c19395a74ea79cf0 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 11:58:46 -0700 Subject: [PATCH 29/51] conflict --- routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes.js b/routes.js index 57bf185..a7fa9fb 100644 --- a/routes.js +++ b/routes.js @@ -109,7 +109,7 @@ router.post('/slack/interactive', (req, res) => { userAuth.setCredentials(pendingUser.google); getFreeBusy(userAuth, "2017-07-20T23:44:28.917Z", "2017-07-21T23:44:28.917Z", userEmail) .then((response) => { - console.log("Response is", response.calendars.userEmail.busy); + console.log("Response is", response.calendars); console.log("Out of for-loop"); }) .catch((err2) => { From e72d1c2ed183c290f7d45baac1f04d50a0986e91 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 12:00:22 -0700 Subject: [PATCH 30/51] conflict --- routes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/routes.js b/routes.js index a7fa9fb..cf5ca05 100644 --- a/routes.js +++ b/routes.js @@ -109,6 +109,7 @@ router.post('/slack/interactive', (req, res) => { userAuth.setCredentials(pendingUser.google); getFreeBusy(userAuth, "2017-07-20T23:44:28.917Z", "2017-07-21T23:44:28.917Z", userEmail) .then((response) => { + console.log("Email is", userEmail); console.log("Response is", response.calendars); console.log("Out of for-loop"); }) From e787e139c0ac627ad524d5c0a6b86e8567374480 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 12:03:16 -0700 Subject: [PATCH 31/51] conflict --- routes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routes.js b/routes.js index cf5ca05..71f7b22 100644 --- a/routes.js +++ b/routes.js @@ -104,13 +104,13 @@ router.post('/slack/interactive', (req, res) => { return; } const userEmail = rtm.dataStore.getUserById(id).profile.email; - console.log(userEmail); + // console.log(userEmail); const userAuth = getGoogleAuth(); userAuth.setCredentials(pendingUser.google); getFreeBusy(userAuth, "2017-07-20T23:44:28.917Z", "2017-07-21T23:44:28.917Z", userEmail) .then((response) => { console.log("Email is", userEmail); - console.log("Response is", response.calendars); + console.log("Response is", response.calendars.userEmail); console.log("Out of for-loop"); }) .catch((err2) => { From bd22d6a29cd2164693e41f0e92f524791e7c94ec Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 12:06:15 -0700 Subject: [PATCH 32/51] conflict --- routes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routes.js b/routes.js index 71f7b22..0442044 100644 --- a/routes.js +++ b/routes.js @@ -109,8 +109,8 @@ router.post('/slack/interactive', (req, res) => { userAuth.setCredentials(pendingUser.google); getFreeBusy(userAuth, "2017-07-20T23:44:28.917Z", "2017-07-21T23:44:28.917Z", userEmail) .then((response) => { - console.log("Email is", userEmail); - console.log("Response is", response.calendars.userEmail); + const userEmail2 = rtm.dataStore.getUserById(id).profile.email; + console.log(typeof userEmail2, "Response is", response.calendars.userEmail2); console.log("Out of for-loop"); }) .catch((err2) => { From 4383f99133285ba0c6c7d98d470e79f3bb1ab5e6 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 12:08:00 -0700 Subject: [PATCH 33/51] conflict --- routes.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/routes.js b/routes.js index 0442044..be4427a 100644 --- a/routes.js +++ b/routes.js @@ -109,8 +109,7 @@ router.post('/slack/interactive', (req, res) => { userAuth.setCredentials(pendingUser.google); getFreeBusy(userAuth, "2017-07-20T23:44:28.917Z", "2017-07-21T23:44:28.917Z", userEmail) .then((response) => { - const userEmail2 = rtm.dataStore.getUserById(id).profile.email; - console.log(typeof userEmail2, "Response is", response.calendars.userEmail2); + console.log(typeof userEmail, "Response is", response.calendars.userEmail); console.log("Out of for-loop"); }) .catch((err2) => { From f1381941e590193f51eaa54650c62062432bdd4d Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 12:09:11 -0700 Subject: [PATCH 34/51] conflict --- routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes.js b/routes.js index be4427a..46352e3 100644 --- a/routes.js +++ b/routes.js @@ -109,7 +109,7 @@ router.post('/slack/interactive', (req, res) => { userAuth.setCredentials(pendingUser.google); getFreeBusy(userAuth, "2017-07-20T23:44:28.917Z", "2017-07-21T23:44:28.917Z", userEmail) .then((response) => { - console.log(typeof userEmail, "Response is", response.calendars.userEmail); + console.log("Type of response is", typeof response, "Response is", response.calendars.userEmail); console.log("Out of for-loop"); }) .catch((err2) => { From a7c6e82df9ae637e3d5a3cf32cda785c33dcaccb Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 12:12:15 -0700 Subject: [PATCH 35/51] conflict --- routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes.js b/routes.js index 46352e3..6e2def3 100644 --- a/routes.js +++ b/routes.js @@ -109,7 +109,7 @@ router.post('/slack/interactive', (req, res) => { userAuth.setCredentials(pendingUser.google); getFreeBusy(userAuth, "2017-07-20T23:44:28.917Z", "2017-07-21T23:44:28.917Z", userEmail) .then((response) => { - console.log("Type of response is", typeof response, "Response is", response.calendars.userEmail); + console.log( "Response is", response.userEmail.busy); console.log("Out of for-loop"); }) .catch((err2) => { From 8dec1d266150abc2747e629cbe89c5ce3466680c Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 12:15:05 -0700 Subject: [PATCH 36/51] conflict --- routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes.js b/routes.js index 6e2def3..43bdf4b 100644 --- a/routes.js +++ b/routes.js @@ -109,7 +109,7 @@ router.post('/slack/interactive', (req, res) => { userAuth.setCredentials(pendingUser.google); getFreeBusy(userAuth, "2017-07-20T23:44:28.917Z", "2017-07-21T23:44:28.917Z", userEmail) .then((response) => { - console.log( "Response is", response.userEmail.busy); + console.log( "Response is", response.userEmail); console.log("Out of for-loop"); }) .catch((err2) => { From 241b7e8c1982c93d5ab8496975b7063c662a79d9 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 12:18:09 -0700 Subject: [PATCH 37/51] conflict --- routes.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/routes.js b/routes.js index 43bdf4b..7a6d4a8 100644 --- a/routes.js +++ b/routes.js @@ -109,7 +109,8 @@ router.post('/slack/interactive', (req, res) => { userAuth.setCredentials(pendingUser.google); getFreeBusy(userAuth, "2017-07-20T23:44:28.917Z", "2017-07-21T23:44:28.917Z", userEmail) .then((response) => { - console.log( "Response is", response.userEmail); + console.log( "Keys of response are", Object.keys(response)); + console.log( "Response is", response, "Type of response is", typeof response); console.log("Out of for-loop"); }) .catch((err2) => { From 914a7cf6b32cd7c1b6c9df0f9e4f277c8d50c240 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 12:20:55 -0700 Subject: [PATCH 38/51] conflict --- routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes.js b/routes.js index 7a6d4a8..f65229b 100644 --- a/routes.js +++ b/routes.js @@ -110,7 +110,7 @@ router.post('/slack/interactive', (req, res) => { getFreeBusy(userAuth, "2017-07-20T23:44:28.917Z", "2017-07-21T23:44:28.917Z", userEmail) .then((response) => { console.log( "Keys of response are", Object.keys(response)); - console.log( "Response is", response, "Type of response is", typeof response); + console.log( "Response is", response.calendars, "Type of response is", typeof response.calendars); console.log("Out of for-loop"); }) .catch((err2) => { From 071ce96525904f1a3ae8f7e05008ece0923e92e3 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 12:23:44 -0700 Subject: [PATCH 39/51] conflict --- routes.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/routes.js b/routes.js index f65229b..ec0cb3a 100644 --- a/routes.js +++ b/routes.js @@ -110,7 +110,8 @@ router.post('/slack/interactive', (req, res) => { getFreeBusy(userAuth, "2017-07-20T23:44:28.917Z", "2017-07-21T23:44:28.917Z", userEmail) .then((response) => { console.log( "Keys of response are", Object.keys(response)); - console.log( "Response is", response.calendars, "Type of response is", typeof response.calendars); + console.log("Test response is", response.calendars['naperry@wisc.edu'].busy); + console.log("Keys of response are", Object.keys(response.calendars)); console.log("Out of for-loop"); }) .catch((err2) => { From 895e62e69170acb913bf08d8e346cf7d02be603b Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 12:28:21 -0700 Subject: [PATCH 40/51] conflict --- routes.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/routes.js b/routes.js index ec0cb3a..bbd8cda 100644 --- a/routes.js +++ b/routes.js @@ -110,8 +110,9 @@ router.post('/slack/interactive', (req, res) => { getFreeBusy(userAuth, "2017-07-20T23:44:28.917Z", "2017-07-21T23:44:28.917Z", userEmail) .then((response) => { console.log( "Keys of response are", Object.keys(response)); - console.log("Test response is", response.calendars['naperry@wisc.edu'].busy); - console.log("Keys of response are", Object.keys(response.calendars)); + console.log("Test response is", response.calendars[userEmail].busy); + console.log("Keys of response are", Object.keys(response.calendars)[0], "User email is", userEmail); + console.log("Out of for-loop"); }) .catch((err2) => { From c6a384841e2a84618c619d15a82570f6803187e7 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 12:30:59 -0700 Subject: [PATCH 41/51] conflict --- routes.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/routes.js b/routes.js index bbd8cda..fd2cdce 100644 --- a/routes.js +++ b/routes.js @@ -109,10 +109,7 @@ router.post('/slack/interactive', (req, res) => { userAuth.setCredentials(pendingUser.google); getFreeBusy(userAuth, "2017-07-20T23:44:28.917Z", "2017-07-21T23:44:28.917Z", userEmail) .then((response) => { - console.log( "Keys of response are", Object.keys(response)); - console.log("Test response is", response.calendars[userEmail].busy); - console.log("Keys of response are", Object.keys(response.calendars)[0], "User email is", userEmail); - + console.log("Busy times are", response.calendars[userEmail].busy); console.log("Out of for-loop"); }) .catch((err2) => { From a33482c62039f8afa4c3e9427c8a8a5431c356d7 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 13:25:30 -0700 Subject: [PATCH 42/51] conflict --- routes.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/routes.js b/routes.js index fd2cdce..e333768 100644 --- a/routes.js +++ b/routes.js @@ -94,6 +94,7 @@ router.post('/slack/interactive', (req, res) => { }, 'attendees': attendees, }; + const busy = []; for(let i = 0; i < pending.ids.length; i++) { console.log("In for-loop"); const id = pending.ids[i]; @@ -110,6 +111,8 @@ router.post('/slack/interactive', (req, res) => { getFreeBusy(userAuth, "2017-07-20T23:44:28.917Z", "2017-07-21T23:44:28.917Z", userEmail) .then((response) => { console.log("Busy times are", response.calendars[userEmail].busy); + busy.push(response.calendars[userEmail].busy); + console.log(busy); console.log("Out of for-loop"); }) .catch((err2) => { From 83a939444c951382ad7615624b74573b9e52d882 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 13:30:12 -0700 Subject: [PATCH 43/51] conflict --- routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes.js b/routes.js index e333768..24a3b18 100644 --- a/routes.js +++ b/routes.js @@ -112,7 +112,7 @@ router.post('/slack/interactive', (req, res) => { .then((response) => { console.log("Busy times are", response.calendars[userEmail].busy); busy.push(response.calendars[userEmail].busy); - console.log(busy); + console.log("THIS IS BUSY", busy); console.log("Out of for-loop"); }) .catch((err2) => { From b0e84391041743fcc75e48a7d7ccc9a5289034c9 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 13:33:03 -0700 Subject: [PATCH 44/51] conflict --- routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes.js b/routes.js index 24a3b18..fec62cb 100644 --- a/routes.js +++ b/routes.js @@ -108,7 +108,7 @@ router.post('/slack/interactive', (req, res) => { // console.log(userEmail); const userAuth = getGoogleAuth(); userAuth.setCredentials(pendingUser.google); - getFreeBusy(userAuth, "2017-07-20T23:44:28.917Z", "2017-07-21T23:44:28.917Z", userEmail) + getFreeBusy(userAuth, "2017-07-10T23:44:28.917Z", "2017-07-21T23:44:28.917Z", userEmail) .then((response) => { console.log("Busy times are", response.calendars[userEmail].busy); busy.push(response.calendars[userEmail].busy); From 2f8af055f3a9f340228bc63371d8e981220dc1ed Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 13:37:44 -0700 Subject: [PATCH 45/51] conflict --- routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes.js b/routes.js index fec62cb..caef007 100644 --- a/routes.js +++ b/routes.js @@ -110,7 +110,7 @@ router.post('/slack/interactive', (req, res) => { userAuth.setCredentials(pendingUser.google); getFreeBusy(userAuth, "2017-07-10T23:44:28.917Z", "2017-07-21T23:44:28.917Z", userEmail) .then((response) => { - console.log("Busy times are", response.calendars[userEmail].busy); + console.log("Busy times are", userEmail, response.calendars[userEmail].busy); busy.push(response.calendars[userEmail].busy); console.log("THIS IS BUSY", busy); console.log("Out of for-loop"); From 5f2ba47a8378f9302ac2a28fd214cedad28f7a7c Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 13:43:17 -0700 Subject: [PATCH 46/51] conflict --- routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes.js b/routes.js index caef007..92d3e64 100644 --- a/routes.js +++ b/routes.js @@ -108,7 +108,7 @@ router.post('/slack/interactive', (req, res) => { // console.log(userEmail); const userAuth = getGoogleAuth(); userAuth.setCredentials(pendingUser.google); - getFreeBusy(userAuth, "2017-07-10T23:44:28.917Z", "2017-07-21T23:44:28.917Z", userEmail) + getFreeBusy(userAuth, "2017-07-10T23:44:28.917Z", "2017-07-25T23:44:28.917Z", userEmail) .then((response) => { console.log("Busy times are", userEmail, response.calendars[userEmail].busy); busy.push(response.calendars[userEmail].busy); From 5c0fd2726c29d46d75efd1dc12c8f7b728d2f42f Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 14:05:46 -0700 Subject: [PATCH 47/51] conflict --- bot.js | 1 + routes.js | 1 + 2 files changed, 2 insertions(+) diff --git a/bot.js b/bot.js index 9585a98..01ceb9c 100644 --- a/bot.js +++ b/bot.js @@ -121,6 +121,7 @@ rtm.on(RTM_EVENTS.MESSAGE, (msg) => { // console.log(mapping); web.chat.postMessage(msg.channel, data.result.fulfillment.speech, messageConfirmation(data.result.fulfillment.speech, "remember to add code to actaully cancel the meeting/not schedule one")); user.pending = JSON.stringify(Object.assign({}, data.result.parameters, { type: 'meeting', ids: ids, users: users })); + console.log("In bot.js", ids); user.save(); } break; diff --git a/routes.js b/routes.js index 92d3e64..b3a569b 100644 --- a/routes.js +++ b/routes.js @@ -95,6 +95,7 @@ router.post('/slack/interactive', (req, res) => { 'attendees': attendees, }; const busy = []; + console.log("Before the loop", pending.ids); for(let i = 0; i < pending.ids.length; i++) { console.log("In for-loop"); const id = pending.ids[i]; From 7365d9d241e74b00f59c924745b1517094f0f8f5 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 14:12:17 -0700 Subject: [PATCH 48/51] conflict --- bot.js | 1 + 1 file changed, 1 insertion(+) diff --git a/bot.js b/bot.js index 01ceb9c..3d777e2 100644 --- a/bot.js +++ b/bot.js @@ -123,6 +123,7 @@ rtm.on(RTM_EVENTS.MESSAGE, (msg) => { user.pending = JSON.stringify(Object.assign({}, data.result.parameters, { type: 'meeting', ids: ids, users: users })); console.log("In bot.js", ids); user.save(); + mapping = {}; } break; case 'reminder.add': From f1f7fca243e1018ad6910cb1ad841a0a8b634319 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 14:13:29 -0700 Subject: [PATCH 49/51] conflict --- bot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot.js b/bot.js index 3d777e2..37b1477 100644 --- a/bot.js +++ b/bot.js @@ -24,7 +24,7 @@ rtm.on(CLIENT_EVENTS.RTM.RTM_CONNECTION_OPENED, () => { // things to do when the bot connects to slack }); -const mapping = {}; +let mapping = {}; rtm.on(RTM_EVENTS.MESSAGE, (msg) => { const dm = rtm.dataStore.getDMByUserId(msg.user); From 00df21d811a53ed0cd01576f21fee73736df0917 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 14:22:58 -0700 Subject: [PATCH 50/51] conflict --- routes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/routes.js b/routes.js index b3a569b..5b40d4b 100644 --- a/routes.js +++ b/routes.js @@ -114,6 +114,7 @@ router.post('/slack/interactive', (req, res) => { console.log("Busy times are", userEmail, response.calendars[userEmail].busy); busy.push(response.calendars[userEmail].busy); console.log("THIS IS BUSY", busy); + process.busyOutput = busy; console.log("Out of for-loop"); }) .catch((err2) => { From 6def7cec1c94a69a3e1c80a6e28c80a63b9431b5 Mon Sep 17 00:00:00 2001 From: jackkimball13 Date: Fri, 21 Jul 2017 14:40:02 -0700 Subject: [PATCH 51/51] time conflicts with multiple people --- routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes.js b/routes.js index 5b40d4b..0bc0302 100644 --- a/routes.js +++ b/routes.js @@ -216,4 +216,4 @@ router.get('/connect/callback', (req, res) => { }); }); -export default router; +export default router; \ No newline at end of file