Merge pull request #83 from CodeForBaltimore/HOTFIX-db-string

fix: Allows DB URL or individual values in .env

Author: stoopidJSON

sequelize/data/entity.json

@@ -1,6 +1,7 @@
 [
     {
       "name": "The Leftorium",
+      "type": "Test",
       "address": {
         "street": [
           "123 Anyplace St."
@@ -17,6 +18,7 @@
     },
     {
       "name": "Moes Tavern",
+      "type": "Test",
       "address": {
         "street": [
           "123 Anyplace St."

sequelize/migrations/04-create-demo-entity.js

@@ -11,7 +11,10 @@ module.exports = {
             name : {
                 type: Sequelize.STRING,
                 required: true
-            },
+			},
+			type : {
+				type: Sequelize.STRING
+			},
             address: {
                 type: Sequelize.JSON,
 			},

sequelize/seeders/03-demo-entity.js

@@ -15,8 +15,7 @@ module.exports = {
 			element.phone = JSON.stringify(element.phone);
 			element.address = JSON.stringify(element.address);
 		}
-
-		let i = 0;
+		
 		const entityNames = [
 			"Springfield Bowlorama",
 			"Springfield Nuclear Power Plant",
@@ -34,6 +33,7 @@ module.exports = {
 				createdAt: new Date(),
 				updatedAt: new Date(),
 				name: name,
+				type: "Test",
 				address: JSON.stringify({
 				  street: [
 					`123 ${randomWords()} St.`
@@ -50,31 +50,6 @@ module.exports = {
 			});
 		}
 
-		// do {
-		// 	let name = randomWords();
-		// 	entities.push({
-		// 		id: uuid(),
-		// 		createdAt: new Date(),
-		// 		updatedAt: new Date(),
-		// 		name: name.charAt(0).toUpperCase() + name.slice(1),
-		// 		address: JSON.stringify({
-		// 		  street: [
-		// 			"123 Anyplace St."
-		// 		  ],
-		// 		  city: "Baltimore",
-		// 		  state: "MD",
-		// 		  zip: "12345",
-		// 		  latlng: [
-		// 			39.296399,
-		// 			-76.607842
-		// 		  ]
-		// 		}),
-		// 		description: randomWords(5)
-		// 	});
-		// 	i++;
-		// } while (i < 26);
-
-
 		return queryInterface.bulkInsert('Entities', entities);
 	},
 	down: queryInterface => {

src/models/entity.js

@@ -13,6 +13,9 @@ const entity = (sequelize, DataTypes) => {
             type: DataTypes.STRING,
             required: true
         },
+        type : {
+            type: DataTypes.STRING
+        },
         address: {
             type: DataTypes.JSON,
         },

src/models/index.js

@@ -3,9 +3,17 @@ import path from 'path';
 import fs from 'fs';
 import _ from 'lodash';
 
+let dbUrl;
+
+if (process.env.DATABASE_URL) {
+	dbUrl = process.env.DATABASE_URL;
+} else {
+	dbUrl = `postgres://${process.env.DATABASE_USERNAME}:${process.env.DATABASE_PASSWORD}@${process.env.DATABASE_HOST}:${process.env.DATABASE_PORT}/${process.env.DATABASE_NAME}`;
+}
+
 // Initializes the database.
 const sequelize = new Sequelize(
-	process.env.DATABASE_URL,
+	dbUrl,
 	{
 		dialect: 'postgres'
 	}