Merge pull request #181 from CodeForBaltimore/revjtanton/issue-132

Issue 180 Adding contact-direct check-in

Author: stoopidJSON

Bmore-Responsive.postman_collection.json

@@ -6,22 +6,22 @@ An API to drive disaster and emergency response systems.
 <!-- TOC -->
 
 - [Bmore Responsive](#bmore-responsive)
-    - [Documentation](#documentation)
-        - [API Spec](#api-spec)
-        - [Database Documentation](#database-documentation)
-        - [Infrastructure and Deployment](#infrastructure-and-deployment)
+  - [Documentation](#documentation)
+    - [API Spec](#api-spec)
+    - [Database Documentation](#database-documentation)
+    - [Infrastructure and Deployment](#infrastructure-and-deployment)
 - [Setup](#setup)
-    - [Node and Express setup](#node-and-express-setup)
-    - [Environment variables](#environment-variables)
-        - [Example .env](#example-env)
-    - [PostgreSQL](#postgresql)
-        - [Sequelize](#sequelize)
-    - [Docker](#docker)
-        - [docker-compose](#docker-compose)
+  - [Node and Express setup](#node-and-express-setup)
+  - [Environment variables](#environment-variables)
+    - [Example .env](#example-env)
+  - [PostgreSQL](#postgresql)
+    - [Sequelize](#sequelize)
+  - [Docker](#docker)
+    - [docker-compose](#docker-compose)
 - [Using this product](#using-this-product)
-    - [Testing](#testing)
+  - [Testing](#testing)
 - [Sources and Links](#sources-and-links)
-    - [Contributors ✨](#contributors-)
+  - [Contributors ✨](#contributors-)
 
 <!-- /TOC -->
 
@@ -86,6 +86,8 @@ The various variables are defined as follows:
 - `SMTP_PORT` = _optional_ port number for the SMTP server used to send notification emails
 - `SMTP_USER` = _optional_ username for the SMTP server used to send notification emails
 - `SMTP_PASSWORD` = _optional_ password for the SMTP server used to send notification emails
+- `URL` = _optional_ the URL for your front-end application
+- `TEST_EMAIL` = _optional_ the email you wish to send tests to
 - `BYPASS_LOGIN` = _optional_  Allows you to hit the endpoints locally without having to login. If you wish to bypass the login process during local dev, set this to `true`.
 
 _We do not recommend using the default options for PostgreSQL. The above values are provided as examples. It is more secure to create your own credentials._
@@ -104,6 +106,8 @@ JWT_KEY=test123
 DATABASE_URL=postgres://postgres:postgres@localhost:5432/postgres
 DATABASE_SCHEMA=public
 BYPASS_LOGIN=true
+URL=http://localhost:8080
+[email protected]
 ```
 
 ## PostgreSQL

README.md

@@ -0,0 +1,19 @@
+<h1>{{ emailTitle }}</h1>
+
+<p>{{ emailContents }}</p>
+
+<table width="100%" cellspacing="0" cellpadding="0">
+  <tr>
+      <td>
+          <table cellspacing="0" cellpadding="0">
+              <tr>
+                  <td style="border-radius: 2px;" bgcolor="#ED2939">
+                      <a href="{{ entityLink }}" target="_blank" style="padding: 8px 12px; border: 1px solid #ED2939;border-radius: 2px;font-family: Helvetica, Arial, sans-serif;font-size: 14px; color: #ffffff;text-decoration: none;font-weight:bold;display: inline-block;">
+                          Check In            
+                      </a>
+                  </td>
+              </tr>
+          </table>
+      </td>
+  </tr>
+</table>

mail_templates/contact_check_in_html.njk

@@ -0,0 +1,5 @@
+{{ emailTitle }}
+
+{{ emailContents }}
+
+{{ entityLink }}

mail_templates/contact_check_in_text.njk

@@ -0,0 +1,7 @@
+site_name: Project Template
+theme: 
+    name: readthedocs
+plugins:
+    - swagger
+extra:
+    swagger_url: 'https://raw.githubusercontent.com/CodeForBaltimore/Bmore-Responsive/master/swagger.json'

mkdocs.yml

@@ -1,6 +1,6 @@
 {
   "name": "bmore-responsive",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "An API-driven CRM (Civic Relationship Management) system.",
   "main": "src/index.js",
   "directories": {
@@ -40,6 +40,7 @@
     "casbin": "4.5.0",
     "casbin-sequelize-adapter": "2.1.0",
     "chai": "4.2.0",
+    "complexity": "0.0.6",
     "cors": "2.8.5",
     "crypto": "1.0.1",
     "dotenv": "8.2.0",

package-lock.json

@@ -3,7 +3,7 @@ publiccodeYmlVersion: "0.2"
 name: Bmore-Responsive
 url: "https://github.com/CodeForBaltimore/Bmore-Responsive.git"
 landingUrl: "https://github.com/CodeForBaltimore/Bmore-Responsive"
-softwareVersion: "1.1.2"   
+softwareVersion: "1.2.0"   
 releaseDate: "2020-04-06"
 platforms:
   - web

package.json

@@ -19,30 +19,61 @@ const transporter = nodemailer.createTransport({
  * @param {string} text  plain text of the email
  */
 const sendMail = async (to, subject, html, text) => {
-  let info = await transporter.sendMail({
-    from: `"Healthcare Roll Call" <${process.env.SMTP_USER}>`, // sender address
-    to, // list of receivers
-    subject, // Subject line
-    text, // plain text body
-    html // html body
-  });
-  console.log("Email sent: %s", info.messageId);
+  try {
+    let info = await transporter.sendMail({
+      from: `"Healthcare Roll Call" <${process.env.SMTP_USER}>`, // sender address
+      to, // list of receivers
+      subject, // Subject line
+      text, // plain text body
+      html // html body
+    });
+    console.log("Email sent: %s", info.messageId);
+  } catch (e) {
+    console.error(e);
+  }
 };
 
 /**
  * Send a forgot password email.
  * @param {string} userEmail email address of the user we're sending to
  * @param {string} resetPasswordToken temporary token for the reset password link
+ * 
+ * @returns {Boolean}
  */
 const sendForgotPassword = async (userEmail, resetPasswordToken) => {
-  const emailResetLink = `https://healthcarerollcall.org/reset/${resetPasswordToken}`;
-  await sendMail(
-    userEmail,
-    "Password Reset - Healthcare Roll Call",
-    nunjucks.render("forgot_password_html.njk", { emailResetLink }),
-    nunjucks.render("forgot_password_text.njk", { emailResetLink })
-  );
-  return true;
+  try {
+    const emailResetLink = `https://healthcarerollcall.org/reset/${resetPasswordToken}`;
+    await sendMail(
+      userEmail,
+      "Password Reset - Healthcare Roll Call",
+      nunjucks.render("forgot_password_html.njk", { emailResetLink }),
+      nunjucks.render("forgot_password_text.njk", { emailResetLink })
+    );
+    return true;
+  } catch (e) {
+    console.error(e);
+    return false;
+  }
 };
 
-export default { sendForgotPassword };
+const sendContactCheckInEmail = async (info) => {
+  try {
+    if (process.env.NODE_ENV === 'production' || process.env.TEST_EMAIL !== undefined && process.env.TEST_EMAIL === info.email) {
+      const entityLink = `${process.env.URL}/checkin/${info.entityId}?token=${info.token}`;
+      const emailTitle = `${info.entityName} Check In`;
+      const emailContents = `Hello ${info.name}! It is time to update the status of ${info.entityName}. Please click the link below to check in.`
+      await sendMail(
+        info.email,
+        emailTitle,
+        nunjucks.render("contact_check_in_html.njk", { emailTitle, emailContents, entityLink }),
+        nunjucks.render("contact_check_in_text.njk", { emailTitle, emailContents, entityLink })
+      );
+      console.log(info.email)
+      return true;
+    }
+  } catch (e) {
+    console.error(e);
+  }
+}
+
+export default { sendForgotPassword, sendContactCheckInEmail };

publiccode.yml

@@ -48,6 +48,14 @@ const entityContact = (sequelize, DataTypes) => {
         }
     }
 
+    EntityContact.findByEntityId = async (entityId) => {
+        const entries = await EntityContact.findAll({
+            where: {entityId}
+        });
+
+        return entries;
+    }
+
     return EntityContact;
 };