Finishing coverage on contacts

Author: stoopidJSON

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/CodeForBaltimore/Bmore-Responsive.svg?branch=master)](https://travis-ci.org/CodeForBaltimore/Bmore-Responsive) [![codecov](https://codecov.io/gh/CodeForBaltimore/Bmore-Responsive/branch/master/graph/badge.svg)](https://codecov.io/gh/CodeForBaltimore/Bmore-Responsive)
+[![Build Status](https://travis-ci.org/CodeForBaltimore/Bmore-Responsive.svg?branch=master)](https://travis-ci.org/CodeForBaltimore/Bmore-Responsive) [![codecov](https://codecov.io/gh/CodeForBaltimore/Bmore-Responsive/branch/master/graph/badge.svg)](https://codecov.io/gh/CodeForBaltimore/Bmore-Responsive) [![GitHub release](https://img.shields.io/github/release/Naereen/StrapDown.js.svg)](https://github.com/CodeForBaltimore/Bmore-Responsive/releases) [![Open Source Love svg1](https://badges.frapsoft.com/os/v1/open-source.svg?v=103)](https://github.com/ellerbrock/open-source-badges/)
 
 # Bmore Responsive
 A simple, flexible API to support emergency response coordination.  Sample use cases include:
@@ -15,154 +15,6 @@ Bmore-Responsive provides the following primary features via a secure REST API:
 - User account and role management to enable secure authentication and authorization
 - Export of any data via CSV
 
-<<TODO: Conclude with reference to QuickStart and/or Wiki>>
-
-
-
-
-## --- Old README content below, Refactored version above ----
-
-<!-- TOC -->
-
-- [Bmore Responsive](#bmore-responsive)
-  - [--- Old README content below, Refactored version above ----](#----old-readme-content-below-refactored-version-above-----)
-- [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)
-- [Using this product](#using-this-product)
-  - [Testing](#testing)
-- [Sources and Links](#sources-and-links)
-  - [Contributors ✨](#contributors-)
-
-<!-- /TOC -->
-
-
-
-# Setup
-This setup section will focus on setting up the local dev environment. For more detailed instructions for how to deploy this to a production environment please see the section above this one :point_up:
-
-To work on this project you should have:
--   [Node.js](https://nodejs.org/en/)
--   [PostgreSQL](https://www.postgresql.org/) (can be in Docker)
--   [Docker](https://www.docker.com/) (optional)
--   [Terraform](https://www.terraform.io/) (optional, for AWS deploy)
-Once you have the prerequisite software installed you can proceed to setup this application.
-
-A `Dockerfile` and `docker-compose` file have been included for convenience, however this may not be the best local development setup for this project. For more information on how to use Docker with this project, please see the [docker section](#docker).
-
-## Node and Express setup
-This application is designed to work as an API driven by Express. To setup your environment first you must install all required dependencies by running the following command from the root of your project directory:
-```
-npm install
-```
-Once all dependencies are installed you will need to setup some environment variables to interact with your database and application.
-
-## Environment variables
-You will need to set some local environment variables to run this application. This is true even if you're using Docker.
-```
-touch .env
-echo 'NODE_ENV=local
-PORT=<your port>
-DATABASE_SCHEMA=<your database schema>
-JWT_KEY=<your secret JWT seed phrase or key>
-DATABASE_URL=<your db connection string>
-' >> ./.env
-```
-The `DATABASE_URL` is not a very clear var name, and the string is broken down as `postgres://username:password@host:port/database_name`
-
-An example of the `DATABASE_URL` would be `DATABASE_URL=postgres://postgres:postgres@localhost:5432/postgres`
-
-The various variables are defined as follows:
-- `NODE_ENV` = The label for your environment.
-- `PORT` = The local port you wish to run on. Defaults to `3000`.
-- `DATABASE_URL` = The URL string for your db connection. For example: `postgres://user:[email protected]:5432/dbname`
-- `DATABASE_SCHEMA` = Your local database schema. Postgres default is `public`.
-- `JWT_KEY` = A secret value to generate JWT's locally.
-- `URL` = The API URL
-- `DATABASE_USERNAME` = _optional for local dev_ Your database username.
-- `DATABASE_PASSWORD` = _optional for local dev_ Your database password.
-- `DATABASE_HOST` = _optional for local dev_ Your database host.
-- `DATABASE_PORT` = _optional for local dev_ Your database port.
-- `SMTP_HOST` = _optional_ hostname for the SMTP server used to send notification emails
-- `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._
-
-**Warning**: If you are running Docker Toolbox instead of Docker Desktop (likely meaning you are running Windows 10 Home, not Professional) you will need to change your `.env` to reflect Docker running on a VM:
-- `DATABASE_HOST`: The IP address Docker is running on. You can find this by running `docker-machine ip` but it's usually `192.168.99.100` instead of `localhost`
-- `DATABASE_URL`: This will need to be adjusted as well, for example `DATABASE_URL=postgres://postgres:postgres@localhost:5432/postgres` would become `DATABASE_URL=postgres://postgres:[email protected]:5432/postgres`
-
-### Example .env
-To make this easier included below is an example `.env` file using all default values. ***We highly recommend*** you use custom values, but this should clarify what is needed for this to run.
-
-```
-NODE_ENV=development
-PORT=3000
-JWT_KEY=test123
-DATABASE_URL=postgres://postgres:postgres@localhost:5432/postgres
-DATABASE_SCHEMA=public
-BYPASS_LOGIN=true
-URL=http://localhost:8080
-[email protected]
-```
-
-## PostgreSQL
-***You will need a PostgreSQL database running locally to run this application locally.*** You may setup PostgreSQL however you wish, however we recommend using Docker using the instructions found here: https://hub.docker.com/_/postgres
-
-If you are using Docker you may spin up your database layer by running this command:
-```
-docker run -d -e POSTGRES_PASSWORD=<your chosen password> -p 5432:5432 postgres
-```
-
-If you're running a database in another way then we trust you can sort it out on your own because you're awesome :sunglasses:
-
-### Sequelize
-To properly start the application the database needs to be built by Sequlize ahead of time. To do that run the following commands
-1. You must create your database tables without running the application by running `npm run db-create` first.
-2. _optional_ You can now seed your database if you wish by running `npm run db-seed`.
-
-Example `/migrations` and `/seeders` scripts have been supplied. You can rollback your all seeded data at any time by running `npm run db-unseed` and delete all created tables with `npm run db-delete`.
-
-## Docker
-You can build and run the application in Docker locally by running the following commands:
-```
-docker build -t bmoreres .
-docker run -d -p 3000:3000 --env-file=.env bmoreres
-```
-Note that `DATABASE_URL` host location will be different depending on what OS you're using. On Mac it is `docker.for.mac.host.internal` and on Windows it is `docker.for.win.host.internal` if using `docker-compose` it will be `db`. Please see [Example .env](#example-env) for more information.
-
-Alternatively you can manually set the environment variables and not use a `.env` file by setting the following vars:
-```
--e NODE_ENV=development
--e PORT=3000
--e JWT_KEY=<your JWT phrase>
--e DATABASE_URL=<your connection string>
--e DATABASE_DATABASE_SCHEMA=<your database schema>
-```
-
-### docker-compose
-To use the `docker-compose.yml` file included you will first need to set [environment variables](#environment-variables). You **MUST** set your `DATABASE_HOST` to `db` to use the `docker-compose` solution. It is not recommended to use `docker-compose` for any reason other than to test a solution for a separate front-end component.
-
-# Using this product
-You may use this product to create and manage users for your front-end.
-
-To run the application--after the above steps are completed--run `npm start`.
-
-## Testing
-To test your code you may write test cases to `./index.spec.js` and then run the tests with `npm test`.
-
-To check your linting you may run `npm run lint` and to format and automatically fix your formatting run `npm run format`.
-
 # Sources and Links
 We are also building a front-end application called [Healthcare Rollcall](https://github.com/CodeForBaltimore/Healthcare-Rollcall) to interact with this backend API. To view that project, or to contribute to it, please visit the repo here: https://github.com/CodeForBaltimore/Healthcare-Rollcall
 

docs/SlowStart.md

@@ -24,6 +24,10 @@ If you want to deploy to AWS, we have included a `terraform` option. For more in
 
 <TODO: Consider migrating terraform docs to be here or do some sort of INCLUDE to reuse the content>  
 
+## SMTP
+
+To send emails with the system you will need to setup your SMTP sever and set the relevant `SMTP_*` variables. For testing we recommend using [Ethereal](https://ethereal.email/)
+
 ## Running in Docker
 
 You can build and run the application in Docker locally by running the following commands:

src/email/index.js

@@ -57,19 +57,17 @@ const sendForgotPassword = async (userEmail, resetPasswordToken) => {
 
 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.FRONT_END_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 })
-      )
-      
-      return true
-    }
+    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 })
+    )
+
+    return true
   } catch (e) {
     console.error(e)
   }

src/routes/contact.js

@@ -298,25 +298,36 @@ router.post('/link/:contact_id', async (req, res) => {
           id: req.params.contact_id
         }
       })
+
+      let i=0
       for (const entity of req.body.entities) {
         const entityToLink = await models.Entity.findOne({
           where: {
             id: entity.id
           }
         })
 
-        const ec = {
-          entityId: entityToLink.id,
-          contactId: contact.id,
-        }
-
-        if (entity.title) {
-          ec.relationshipTitle = contact.title
+        if (contact !== null && entityToLink !== null) {
+          const ec = {
+            entityId: entityToLink.id,
+            contactId: contact.id,
+          }
+  
+          if (entity.title) {
+            ec.relationshipTitle = contact.title
+          }
+  
+          await models.EntityContact.createIfNew(ec)
+          i++
         }
+      }
 
-        await models.EntityContact.createIfNew(ec)
+      if (i > 0) {
+        response.setMessage(`Linking successful/already exists for contact with ID ${contact.id}`)
+      } else {
+        response.setCode(400)
+        response.setMessage('Bad entities or contact id')
       }
-      response.setMessage(`Linking successful/already exists for contact with ID ${contact.id}`)
     } else {
       response.setCode(400)
     }
@@ -338,24 +349,34 @@ router.post('/unlink/:contact_id', async (req, res) => {
           id: req.params.contact_id
         }
       })
+
+      let i=0
       for (const entity of req.body.entities) {
         const entityToUnLink = await models.Entity.findOne({
           where: {
             id: entity.id
           }
         })
 
-        // ideally only one of these should exist
-        const ec = await models.EntityContact.findOne({
-          where: {
-            entityId: entityToUnLink.id,
-            contactId: contact.id
-          }
-        })
-
-        await ec.destroy()
+        if (contact !== null && entityToUnLink !== null) {
+          // ideally only one of these should exist
+          const ec = await models.EntityContact.findOne({
+            where: {
+              entityId: entityToUnLink.id,
+              contactId: contact.id
+            }
+          })
+  
+          await ec.destroy()
+          i++
+        }
+      }
+      if (i > 0) {
+        response.setMessage(`Unlinking successful for contact with ID ${contact.id}`)
+      } else {
+        response.setCode(400)
+        response.setMessage('Bad link sent')
       }
-      response.setMessage(`Unlinking successful for contact with ID ${contact.id}`)
     } else {
       response.setCode(400)
     }

src/routes/user.js

@@ -152,7 +152,6 @@ router.post('/', utils.authMiddleware, async (req, res) => {
 					await e.addRoleForUser(email.toLowerCase(), role)
 				}
 			}
-
 
 			response.setMessage(user.email + ' created')
 		} else {