Merge pull request #319 from joshglazer/188-v2

Enhancement to Entity Email Api Endpoint

Author: blakenan-bellese

src/routes/contact.js

@@ -154,35 +154,52 @@ router.post('/send', async (req, res) => {
   try {
     /** @todo allow for passing entity and contact arrays */
     const emails = []
-    const {entityIds, contactIds, relationshipTitle} = req.body
+    const {entityIds, contactIds, relationshipTitle, entityType} = req.body
 
     if (entityIds === undefined && contactIds === undefined) {
-      const whereClause = (relationshipTitle !== undefined) ? {where: {relationshipTitle}} : {}
-      const associations = await models.EntityContact.findAll(whereClause)
+      const whereClause = {
+        include: [{
+          model: models.Entity,
+          as: 'entities',
+          required: true,
+          through: {
+            model: models.EntityContact,
+            as: 'entityContacts',
+          }
+        }]
+      }
+
+      if (relationshipTitle) {
+        whereClause.include[0].through.where = {relationshipTitle: relationshipTitle}
+      }
+
+      if (entityType) {
+        whereClause.include[0].where = {type:  entityType}
+      }
+
+      const contacts = await models.Contact.findAll(whereClause)
 
-      if (associations.length < 1) {
+      if (contacts.length < 1) {
         response.setCode(400)
         response.setMessage('No contacts to email')
         return res.status(response.getCode()).send(response.getMessage())
       }
 
-      for (const association of associations) {
-        const contact = await models.Contact.findById(association.contactId)
-
-        if (contact.email !== null) {
-          const entity = await models.Entity.findById(association.entityId)
-          // short-lived temporary token that only lasts one hour
-          const temporaryToken = await utils.getToken(contact.id, contact.email[0].address, 'contact')
-
-          emails.push({
-            email: contact.email[0].address,
-            name: contact.name,
-            entityName: entity.name,
-            entityId: association.entityId,
-            entityType: entity.type,
-            relationshipTitle: association.relationshipTitle,
-            token: temporaryToken
-          })
+      for (const contact of contacts) {
+        for (const entity of contact.entities) {
+          if (contact.email !== null) {
+            // short-lived temporary token that only lasts one hour
+            const temporaryToken = await utils.getToken(contact.id, contact.email[0].address, 'contact')
+            emails.push({
+              email: contact.email[0].address,
+              name: contact.name,
+              entityName: entity.name,
+              entityId: entity.id,
+              entityType: entity.type,
+              relationshipTitle: entity.entityContacts.dataValues.relationshipTitle,
+              token: temporaryToken
+            })
+          }
         }
       }
     }

swagger.json

@@ -1447,6 +1447,27 @@
                       "type": "string",
                       "example": "Primary Contact"
                     }
+                  },
+                  "contactIds": {
+                    "type": "array",
+                    "description": "A list of contact IDs to email",
+                    "items": {
+                      "type": "string",
+                      "example": "ba262fa3-38d9-4c88-b49b-ab306349124a"
+                    }
+                  },
+                  "entityIds": {
+                    "type": "array",
+                    "description": "A list of entity (facility) IDs, the associated contacts will receive emails.",
+                    "items": {
+                      "type": "string",
+                      "example": "ba262fa3-38d9-4c88-b49b-ab306349124a"
+                    }
+                  },
+                  "entityType": {
+                    "type": "string",
+                    "description": "A list of entity (facility) types, the associated contacts will receive emails.",
+                    "example": "Assisted Living Facility"
                   }
                 }
               }