Add functionality to start and stop service

src/db/actions/checkAndToggleUserActiveState.js

@@ -0,0 +1,23 @@
+const checkUserActivity = require('./checkUserActivity.js');
+const toggleUserActivity = require('./toggleUserActivity.js');
+
+const checkAndToggleUserActiveState = async ({ phoneNumber, directive }) => {
+  const isUserActive = await checkUserActivity({ phoneNumber });
+
+  const alreadyAtDesiredState = `Your account is already ${isUserActive ? 'active' : 'inactive'}.`;
+  const switchedState = `Your account has been set to ${isUserActive ? 'inactive' : 'active'}.`;
+
+  // if account's is_active field should be updated
+  const shouldToggleActivityLevel = (directive === 'START' && !isUserActive) || (directive === 'STOP' && isUserActive);
+
+  if (shouldToggleActivityLevel) {
+    // toggle the is_active field and return message informing of the state update
+    await toggleUserActivity({ phoneNumber });
+    return switchedState;
+  }
+
+  // else return message saying that the update was unneccessary
+  return alreadyAtDesiredState;
+};
+
+module.exports = checkAndToggleUserActiveState;

src/db/actions/checkUserActivity.js

@@ -0,0 +1,11 @@
+const sendQuery = require('../util/sendQuery');
+
+const checkUserActivity = async ({ phoneNumber }) => {
+  const query = 'SELECT is_active FROM users WHERE phone_number = $1;';
+  const values = [phoneNumber];
+
+  const [response] = await sendQuery({ query, values });
+  return response;
+};
+
+module.exports = checkUserActivity;

src/db/actions/createNewUser.js

@@ -5,7 +5,7 @@ const getCurrentTimestamp = require('../../util/getCurrentTimestamp');
 const createNewUser = async ({ phoneNumber }) => {
   const createdAt = getCurrentTimestamp();
 
-  const query = 'INSERT INTO users (phone_number, is_active, created_at) VALUES ($1, $2, $3) RETURNING phone_number;';
+  const query = 'INSERT INTO users (phone_number, is_active, created_at, modified_at) VALUES ($1, $2, $3, $3) RETURNING phone_number;';
   const values = [phoneNumber, true, createdAt];
 
   try {

src/db/actions/fetchRandomNoteId.js

@@ -4,8 +4,9 @@ const getRandomInt = require('../../util/getRandomInt');
 
 const fetchRandomNoteId = async () => {
   const { rows } = await db.query(
+    // TODO: add check to see if the user that saved the message has is_active to true
     `
-      SELECT * FROM notes
+      SELECT id FROM notes
         WHERE 
           date_part('day', last_called) < date_part('day', NOW())
           OR date_part('day', created_at) < date_part('day', NOW())

src/db/actions/insertNewMessage.js

@@ -6,11 +6,10 @@ const fetchUser = require('./fetchUser');
 const createNewUser = require('./createNewUser');
 
 const insertNewMessage = async ({
-  phoneString,
+  phoneNumber,
   message,
 }) => {
   const createdAt = getCurrentTimestamp();
-  const phoneNumber = parseInt(phoneString.slice(2), 10);
 
   let user = await fetchUser({ phoneNumber });
 
@@ -22,8 +21,14 @@ const insertNewMessage = async ({
   const values = [message, user.phone_number, createdAt];
 
   return db.query(query, values)
-    .then(res => console.log(res))
-    .catch(err => console.error(err));
+    .then((res) => {
+      console.log(res);
+      return res;
+    })
+    .catch((err) => {
+      console.error(err);
+      return err;
+    });
 };
 
 module.exports = insertNewMessage;

src/db/actions/sendMessage.js

@@ -3,7 +3,7 @@ const db = require('../../db');
 const fetchRandomNoteId = require('./fetchRandomNoteId');
 const updateLastCalled = require('./updateLastCalled');
 
-const createMessage = require('../../lib/twilio/createMessage');
+const twilioSendMessage = require('../../lib/twilio/twilioSendMessage');
 
 const sendMessage = async () => {
   const randomId = await fetchRandomNoteId();
@@ -14,8 +14,10 @@ const sendMessage = async () => {
 
     const { rows: [{ phone_number: phoneNumber, message }] } = await db.query(query, values);
 
-    createMessage({ to: phoneNumber, message });
+    // send sms message to user phone number
+    twilioSendMessage({ to: phoneNumber, message });
 
+    // update the last_called field for the notes message
     updateLastCalled(randomId);
   }
 };

src/db/actions/toggleUserActivity.js

@@ -0,0 +1,19 @@
+const db = require('../index');
+
+const getCurrentTimestamp = require('../../util/getCurrentTimestamp');
+
+const toggleUserActivity = async ({ phoneNumber }) => {
+  const modifiedAt = getCurrentTimestamp();
+
+  const query = 'UPDATE users SET is_active = NOT is_active, modified_at = $2 WHERE phone_number = $1 RETURNING phone_number;';
+  const values = [phoneNumber, modifiedAt];
+
+  try {
+    const { rows } = await db.query(query, values);
+    return rows[0];
+  } catch (err) {
+    console.error(err);
+  }
+};
+
+module.exports = toggleUserActivity;

src/db/actions/updateLastCalled.js

@@ -5,7 +5,7 @@ const getCurrentTimestamp = require('../../util/getCurrentTimestamp');
 const updateLastCalled = async (notesId) => {
   const lastCalled = getCurrentTimestamp();
 
-  const query = 'UPDATE notes SET last_called = $1 WHERE id = $2 RETURNING id';
+  const query = 'UPDATE notes SET last_called = $1 WHERE id = $2 RETURNING id;';
   const values = [lastCalled, notesId];
 
   const { rows: [{ id }] } = await db.query(query, values);

src/db/schema.sql

@@ -7,7 +7,8 @@ CREATE DATABASE note_reminder;
 CREATE TABLE users (
   phone_number BIGINT PRIMARY KEY,
   is_active BOOL NOT NULL DEFAULT FALSE,
-  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  modified_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 
 CREATE TABLE notes (

src/db/util/sendQuery.js

@@ -0,0 +1,12 @@
+const db = require('../index');
+
+const sendQuery = async ({ query, values }) => {
+  try {
+    const { rows } = await db.query(query, values);
+    return rows;
+  } catch (err) {
+    console.error(err);
+  }
+};
+
+module.exports = sendQuery;

src/lib/twilio/createMessage.js → src/lib/twilio/twilioSendMessage.js

@@ -7,7 +7,7 @@ const {
   TWILIO_VERIFIED_NUMBER,
 } = require('../../../secrets/local.js');
 
-const twilioCreateMessage = async ({
+const twilioSendMessage = async ({
   to,
   message,
 }) => {
@@ -20,4 +20,4 @@ const twilioCreateMessage = async ({
     .catch(error => console.error(`Message was not sent: error: ${error}`));
 };
 
-module.exports = twilioCreateMessage;
+module.exports = twilioSendMessage;

src/server/actions/routeMessage.js

@@ -0,0 +1,31 @@
+const insertNewMessage = require('../../db/actions/insertNewMessage');
+const checkAndToggleUserActiveState = require('../../db/actions/checkAndToggleUserActiveState');
+
+const sendMessage = require('../../lib/twilio/twilioSendMessage');
+
+const routeMessage = async ({
+  phoneString,
+  message,
+}) => {
+  const phoneNumber = parseInt(phoneString.slice(2), 10);
+  let responseMessage = '';
+
+  // if incoming message is a directive to stop or start activity
+  const messageUpperCase = message.toUpperCase();
+  const isDirective = messageUpperCase === 'STOP' || messageUpperCase === 'START';
+
+  if (isDirective) {
+    // respond with appropriate action and response message
+    responseMessage = await checkAndToggleUserActiveState({
+      phoneNumber,
+      directive: messageUpperCase,
+    });
+  } else {
+    const insertResponse = await insertNewMessage({ phoneNumber, message });
+    responseMessage = insertResponse.rowCount ? 'Message was successfully saved!' : 'There was an error saving your message.';
+  }
+
+  sendMessage({ to: phoneNumber, message: responseMessage });
+};
+
+module.exports = routeMessage;

src/server/start.js

@@ -1,19 +1,22 @@
 const app = require('./index.js');
 
-const insertNewMessage = require('../db/actions/insertNewMessage');
+const routeMessage = require('./actions/routeMessage');
 
 // start cron-jobs
 require('./cron');
 
 const PORT = process.env.PORT || 3000;
 
 // TODO: break endpoints into a separate routes file
-app.post('/sms', ({
-  body: {
-    From: phoneString,
-    Body: message,
-  },
-}) => insertNewMessage({ phoneString, message }));
+app.post(
+  '/sms',
+  async ({
+    body: {
+      From: phoneString,
+      Body: message,
+    },
+  }) => routeMessage({ phoneString, message }),
+);
 
 app.listen(
   PORT,