Merge pull request #130 from CodeForBaltimore/seancrim23/issue-121

stoopidJSON · web-flow · commit 82f6702d4636 · 2020-05-01T18:04:16.000-04:00
Many-to-Many entities&lt;-&gt;contacts
diff --git a/sequelize/data/contact.json b/sequelize/data/contact.json
@@ -12,8 +12,7 @@
           "number": "1234567890",
           "isPrimary": true
         }
-      ],
-      "EntityId": "The Leftorium"
+      ]
     },
     {
       "name": "Moe Szyslak",
@@ -28,7 +27,6 @@
           "number": "0987654321",
           "isPrimary": true
         }
-      ],
-      "EntityId": "Moes Tavern"
+      ]
     }
   ]
diff --git a/sequelize/migrations/08-create-demo-entitycontact.js b/sequelize/migrations/08-create-demo-entitycontact.js
@@ -0,0 +1,64 @@
+'use strict';
+module.exports = {
+    up: (queryInterface, Sequelize) => {
+        return Promise.all([
+            queryInterface.createTable('EntityContacts', {
+                id: {
+                    type: Sequelize.UUID,
+                    primaryKey: true,
+                    allowNull: false,
+                    autoIncrement: false,
+                },
+                entityId: {
+                    type: Sequelize.UUID,
+                    references: {
+                        model: 'Entities',
+                        key: 'id',
+                    },
+                    onUpdate: 'CASCADE',
+                    onDelete: 'CASCADE',
+                },
+                contactId: {
+                    type: Sequelize.UUID,
+                    references: {
+                        model: 'Contacts',
+                        key: 'id',
+                    },
+                    onUpdate: 'CASCADE',
+                    onDelete: 'CASCADE',
+                },
+                relationshipTitle: {
+                    type: Sequelize.STRING,
+                    defaultValue: "default",
+                },
+                createdAt: {
+                    allowNull: false,
+                    type: Sequelize.DATE
+                },
+                updatedAt: {
+                    allowNull: false,
+                    type: Sequelize.DATE
+                }
+            }),
+            queryInterface.removeColumn('Contacts', 'EntityId'),
+        ]);
+    },
+    down: (queryInterface, Sequelize) => {
+        return Promise.all([
+            queryInterface.dropTable('EntityContacts'),
+            queryInterface.addColumn(
+                'Contacts',
+                'EntityId',
+                {
+                    type: Sequelize.UUID,
+                    references: {
+                        model: 'Entities',
+                        key: 'id'
+                    },
+                    onUpdate: 'CASCADE',
+                    onDelete: 'SET NULL'
+                }
+              ),
+        ]);
+    }
+};
diff --git a/sequelize/seeders/04-demo-contact.js b/sequelize/seeders/04-demo-contact.js
@@ -12,13 +12,6 @@ module.exports = {
 			element.updatedAt = new Date();
 			element.email = JSON.stringify(element.email);
 			element.phone = JSON.stringify(element.phone);
-
-			if (element.EntityId) {
-				const entityId = await queryInterface.sequelize.query(
-					`SELECT id FROM ${process.env.DATABASE_SCHEMA}."Entities" WHERE name = '${element.EntityId}'`
-				);
-				element.EntityId = entityId[0][0].id;
-			}
 		}
 
 		let i = 0;
@@ -50,10 +43,6 @@ module.exports = {
 			];
 			let name = randomWords();
 
-			let entityId = await queryInterface.sequelize.query(
-				`SELECT id FROM ${process.env.DATABASE_SCHEMA}."Entities" WHERE name = '${entityNames[Math.floor(Math.random() * entityNames.length)]}'`
-			);
-
 			let contact = {
 				id: uuid(),
 				createdAt: new Date(),
@@ -73,10 +62,7 @@ module.exports = {
 				])
 			};
 
-			if(entityId[0][0] !== undefined) contact.EntityId = entityId[0][0].id;
-
 			contacts.push(contact);
-
 			i++;
 		} while (i < 18);
 
diff --git a/sequelize/seeders/05-demo-entitycontact.js b/sequelize/seeders/05-demo-entitycontact.js
@@ -0,0 +1,40 @@
+const uuid = require('uuid4');
+const randomWords = require('random-words');
+const contacts = require('../data/contact.json');
+const entities = require('../data/entity.json')
+
+module.exports = {
+    up: async queryInterface => {
+        let entityContacts = [];
+        let entityContact;
+        let entitiesMutable = entities;
+        let numberOfLinks;
+        let entityToLinkIndex;
+        for (const contact of contacts) {
+            // links between 1 and 4
+            numberOfLinks = Math.floor(Math.random()*4+1)
+            for (let linkIndex=0; linkIndex<=numberOfLinks; linkIndex++) {
+                entityToLinkIndex = Math.floor(Math.random()*entitiesMutable.length)
+                if (entitiesMutable[entityToLinkIndex] != null) {
+                    entityContact = {
+                        id: uuid(),
+                        entityId: entitiesMutable[entityToLinkIndex].id,
+                        contactId: contact.id,
+                        relationshipTitle: randomWords(),
+                        createdAt: new Date(),
+                        updatedAt: new Date(),
+                    };
+                    entityContacts.push(entityContact)
+                    // delete entity from list so it doesn't link twice
+                    entitiesMutable.splice(entityToLinkIndex, 1)
+                } else {
+                    break;
+                }
+            }
+        }
+        return queryInterface.bulkInsert('EntityContacts', entityContacts);
+    },
+    down: queryInterface => {
+        return queryInterface.bulkDelete('EntityContacts', null, {});
+    }
+};
diff --git a/src/models/contact.js b/src/models/contact.js
@@ -1,4 +1,5 @@
 import { UUIDV4 } from "sequelize";
+import models from './index';
 
 const contact = (sequelize, DataTypes) => {
     // Defining our contact table and setting Contact object.
@@ -17,13 +18,6 @@ const contact = (sequelize, DataTypes) => {
             },
             unique: true
         },
-        EntityId: {
-            type: DataTypes.UUID,
-            references: {
-                model: 'Entity',
-                key: 'id'
-            }
-        },
         name : {
             type: DataTypes.STRING,
             required: true
@@ -44,7 +38,12 @@ const contact = (sequelize, DataTypes) => {
 
     Contact.associate = models => {
         Contact.belongsTo(models.User);
-        Contact.belongsTo(models.Entity);
+        Contact.belongsToMany(models.Entity, {
+            through: "EntityContact",
+            as: "entities",
+            foreignKey: "contactId",
+            otherKey: "entityId"
+        });
     }
 
     Contact.findById = async (id) => {
@@ -71,6 +70,25 @@ const contact = (sequelize, DataTypes) => {
         return contact;
     };
 
+    Contact.findContactWithAssociatedEntities = async (contactId) => {
+        const contactEntities = await Contact.findOne({
+            where: { id: contactId },
+            include: [{
+                model: models.Entity,
+                as: 'entities',
+                required: false,
+                attributes: ["id", "name", "type", "address", "phone", "email", "checkIn", "description", "attributes"],
+                through: {
+                    model: models.EntityContact,
+                    as: 'entityContacts',
+                    attributes: ["relationshipTitle"]
+                }
+            }]
+        });
+
+        return contactEntities;
+    };
+
     return Contact;
 };
 
diff --git a/src/models/entity-contact.js b/src/models/entity-contact.js
@@ -0,0 +1,54 @@
+import { UUIDV4 } from "sequelize";
+
+const entityContact = (sequelize, DataTypes) => {
+    // Defining our EntityContact object.
+    const EntityContact = sequelize.define('EntityContact', {
+            id: {
+                type: DataTypes.UUID,
+                unique: true,
+                primaryKey: true,
+                defaultValue: UUIDV4
+            },
+            entityId: {
+                type: DataTypes.UUID,
+                references: {
+                    model: 'Entity',
+                    key: 'id'
+                }
+            },
+            contactId: {
+                type: DataTypes.UUID,
+                references: {
+                    model: 'Contact',
+                    key: 'id'
+                }
+            },
+            relationshipTitle: {
+                type: DataTypes.STRING,
+                defaultValue: "default",
+            }
+        },
+        {
+            schema: process.env.DATABASE_SCHEMA
+        });
+
+    EntityContact.createIfNew = async (ec) => {
+        let whereQuery = { 
+            entityId: ec.entityId,
+            contactId: ec.contactId,
+        }
+        if (ec.relationshipTitle) {
+            whereQuery.relationshipTitle = ec.relationshipTitle;
+        }
+        const ecObject = await EntityContact.findOne({
+            where: whereQuery
+        });
+        if (!ecObject) {
+            await EntityContact.create(ec)
+        }
+    }
+
+    return EntityContact;
+};
+
+export default entityContact;
diff --git a/src/models/entity.js b/src/models/entity.js
@@ -1,4 +1,5 @@
 import { UUIDV4 } from "sequelize";
+import models from "./index";
 
 const entity = (sequelize, DataTypes) => {
     // Defining our entity table and setting Entity object.
@@ -40,7 +41,12 @@ const entity = (sequelize, DataTypes) => {
     });
 
     Entity.associate = models => {
-        Entity.hasMany(models.Contact);
+        Entity.belongsToMany(models.Contact, {
+            through: "EntityContact",
+            as: "contacts",
+            foreignKey: "entityId",
+            otherKey: "contactId"
+        });
     }
 
     Entity.findById = async (id) => {
@@ -69,6 +75,25 @@ const entity = (sequelize, DataTypes) => {
         return contacts;
     }
 
+    Entity.findEntityWithAssociatedContacts = async (entityId) => {
+        const entityContacts = await Entity.findOne({
+            where: { id: entityId },
+            include: [{
+                model: models.Contact,
+                as: 'contacts',
+                required: false,
+                attributes: ["id", "name", "phone", "email", "attributes", "email"],
+                through: {
+                    model: models.EntityContact,
+                    as: "entityContacts",
+                    attributes: ["relationshipTitle"]
+                }
+            }]
+        });
+
+        return entityContacts;
+    };
+
     return Entity;
 };
 
diff --git a/src/routes/contact.js b/src/routes/contact.js
diff --git a/src/routes/entity.js b/src/routes/entity.js
diff --git a/swagger.json b/swagger.json

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,7 @@`
`12`	`12`	`"number": "1234567890",`
`13`	`13`	`"isPrimary": true`
`14`	`14`	`}`
`15`		`- ],`
`16`		`- "EntityId": "The Leftorium"`
	`15`	`+ ]`
`17`	`16`	`},`
`18`	`17`	`{`
`19`	`18`	`"name": "Moe Szyslak",`
`@@ -28,7 +27,6 @@`
`28`	`27`	`"number": "0987654321",`
`29`	`28`	`"isPrimary": true`
`30`	`29`	`}`
`31`		`- ],`
`32`		`- "EntityId": "Moes Tavern"`
	`30`	`+ ]`
`33`	`31`	`}`
`34`	`32`	`]`