fixing bug in remove_project command

Author: Bogdan Abaev

.DS_Store

@@ -1,12 +1,14 @@
 // This function is ran on AWS Lambda. It is the endpoint 
 // where all Alexa commands are sent. Then, it sends requests
 // to the node app from server folder to process them.
+
 const Alexa = require('ask-sdk-core');
 const request = require('request');
-const host = "http://18.233.168.151:80";
+
+const host = "http://internal-alexaAppELB-464974694.us-east-1.elb.amazonaws.com";
 
 const sendQuery = function(query, handlerInput) {
-  return new Promise((resolve,reject) => {
+  return new Promise(function(resolve,reject) {
     const username = handlerInput.requestEnvelope.session.user.userId;
       request.post({
           headers: {
@@ -36,10 +38,11 @@ const sendQuery = function(query, handlerInput) {
           } else if  (handlerInput.requestEnvelope.request.intent.name == "report"){
             const days = handlerInput.requestEnvelope.request.intent.slots.days.value;
             var temp = `Here is the breakdown of your activities for the last ${days} days:\n`;
+            console.log(output);
             output.forEach((prj) => {
-              temp  += `You spent total of ${prj.totalTime} minutes on ${prj._id}`;
+              temp  += `You spent total of ${prj.totalTime} minutes on ${prj._id}. Among those: `;
               prj.brief.forEach((session)=>{
-                temp += `${session.timeSpent} minutes spent on day ${session.day} `
+                temp += `${session.timeSpent} minutes were spent on day ${session.day}, `
               });
             });
             output = temp;
@@ -51,9 +54,9 @@ const sendQuery = function(query, handlerInput) {
             .withSimpleCard('Got it!!!', output)
             .getResponse());
           }
-      })
-  });
-}
+        });
+      });
+};
 
 
 
@@ -64,7 +67,7 @@ const LaunchRequestHandler = {
   },
   handle(handlerInput) {
     const speechText = 'Describe time tracker';
-
+  
     return handlerInput.responseBuilder
       .speak(speechText)
       .reprompt(speechText)
@@ -161,15 +164,34 @@ const startProjectIntentHandler = {
   },
   handle(handlerInput) {
     console.log("Start project");
+    const token = handlerInput.requestEnvelope.context.System.apiAccessToken;
+    const deviceId = handlerInput.requestEnvelope.context.System.device.deviceId;
     const project = handlerInput.requestEnvelope.request.intent.slots.projectName.value;
+    return new Promise((resolve,reject) => {
+    request.get({
+      headers: {
+        "Authorization": `Bearer ${token}`
+      },
+      url: `https://api.amazonalexa.com/v2/devices/${deviceId}/settings/System.timeZone`
+    }, function(err,res) {
+      if (err){
+      resolve(handlerInput.responseBuilder
+              .speak("Something went wrong!")
+              .withSimpleCard('Oops...', "Something broken on our part")
+              .getResponse());      
+      } else {
       var query = `{
-          time(username: "username"){
+          time(username: "username", timeZone: ${res.body}){
           start(projectName: "${project}")
         }
-      }`;
-    return sendQuery(query,handlerInput);
-    }
-  };
+      }`; 
+      resolve(sendQuery(query,handlerInput));
+      }
+    });    
+    })
+
+  }
+};
 
 
 const finishProjectIntentHandler = {
@@ -214,7 +236,7 @@ const lsIntentHandler = {
   },
   handle(handlerInput) {
     console.log("Ls");
-      var query = `{
+      var query =  `{
           time(username: "username"){
           ls
         }
@@ -230,7 +252,7 @@ const currentIntentHandler = {
   },
   handle(handlerInput) {
     console.log("Current project");
-      var query = `{
+      var query =  `{
           time(username: "username"){
           current
         }
@@ -247,18 +269,18 @@ const reportIntentHandler = {
   },
   handle(handlerInput) {
   var query=`{
-    time(username: ${username} ){
-        report(days:${days}){ 
-            _id
-            totalTime
-            brief{
-            timeSpent
-              day
-              month
+        time(username: "username"){
+            report(days: 4){ 
+                _id
+                totalTime
+                 brief{
+                timeSpent
+                day
+                month
+                  }
               }
-        }
-  }
-}`;
+          }
+        }`;
     return sendQuery(query,handlerInput);
     }
   };

alexa_lambda.js

@@ -4,8 +4,7 @@
 const yargs = require('yargs')
 const request = require('request')
 const fs = require('fs');
-//host = "http://localhost:3000";
-host = "http://54.237.77.73:80";
+host = "http://localhost:3000";
 path = "/Users/bogdanabaev/RandomProgramming/node/notes/client/";
 
 
@@ -221,19 +220,7 @@ yargs.command({
 });
 
 
-yargs.command({
-    'command': 'signup <username>',
-    'describe': 'signup',
-    handler: function (argv) {
-        var query = `{
-            signup(username: "${argv.username}")
-        }`;
-        const res = sendQuery(query, argv.username, true);
-        if (res) {
-            fs.writeFileSync(path + '.username.txt', argv.username);
-        }
-    }
-});
+
 
 
 

client/CLI.js

@@ -0,0 +1,82 @@
+// File with helper utility functions used in time tracker implementation.
+
+const mongoUtils = require('./mongoUtils.js');
+const moment = require('moment-timezone');
+
+const subtractDates = function (date, timeZone) {
+    return Math.round((computeTime(timeZone) - date) / 60000);
+}
+
+const getLowerBound = function (timeZone, days) {
+    var d = computeTime(timeZone);
+    d.setDate(d.getDate() - days);
+    const daysAgo = new Date(d);
+    console.log(daysAgo);
+    return daysAgo;
+}
+
+
+const updateLogInDb = (log) => {
+    const db = mongoUtils.getDb();
+
+    db.collection('logs').updateOne({
+        _id: log.id
+    }, {
+            $set: {
+                finish: log.finish,
+                duration: Number(log.duration)
+            }
+        }).then((suc) => console.log(suc))
+        .catch((e) => console.log(e));
+}
+
+
+const nullifyCurrentProject = (username) => {
+    const db = mongoUtils.getDb();
+    db.collection('userData').updateOne({
+        "user.username": username
+    }, {
+            $set: {
+                currentProject: null
+            }
+        }).then((suc) => console.log("current project nulled"))
+        .catch((e) => console.log(e))
+}
+
+const setTimeZone = (username, timeZone) => {
+    const db = mongoUtils.getDb();
+    db.collection('userData').updateOne({
+        "user.username": username
+    }, {
+            $set: {
+                timeZone: timeZone
+            }
+        }).then((suc) => console.log("current project nulled"))
+        .catch((e) => console.log(e))
+}
+
+const insertLogToDb = (log) => {
+    const db = mongoUtils.getDb();
+    const addToCollection = db.collection('logs').insertOne(log);
+
+    addToCollection.then((suc) => {
+    }).catch((e) => console.log(e));
+
+}
+
+const computeTime = function (timeZone) {
+    const now = new Date();
+    var mom = moment.tz(now, timeZone);
+    const date = mom.format().substring(0, 19) + "Z";
+    return new Date(date);
+}
+
+module.exports = {
+    subtractDates:subtractDates,
+    getLowerBound:getLowerBound,
+    updateLogInDb:updateLogInDb,
+    nullifyCurrentProject:nullifyCurrentProject,
+    setTimeZone:setTimeZone,
+    insertLogToDb:insertLogToDb,
+    computeTime:computeTime
+}

server/helpers.js

@@ -132,14 +132,7 @@ class TimeTracker{
         });
     }
 }
-signup=function(username){
-    var outcome = notes.signup(username);
-    return outcome.then((result) => {
-        return(result);
-    }).catch((e) => {
-        return(e)
-    });
-}
+
 
 hello=function(){
     return "Hello!";