From 5493c4cef72b3db87a0dde62e45a9d8efcd826e3 Mon Sep 17 00:00:00 2001 From: Arjun Patel Date: Thu, 3 Jan 2019 14:42:15 -0800 Subject: [PATCH] Building two models and figuring out structure --- models/Campaigns.js | 28 +++++++++++++++++++++++++++ models/Donors.js | 28 +++++++++++++++++++++++++++ models/dbconnection.js | 0 sequelize.js | 43 ++++++++++++++++++++++++++++++++++++++++++ server.js | 16 +++++++++++++--- 5 files changed, 112 insertions(+), 3 deletions(-) create mode 100644 models/Campaigns.js create mode 100644 models/Donors.js delete mode 100644 models/dbconnection.js create mode 100644 sequelize.js diff --git a/models/Campaigns.js b/models/Campaigns.js new file mode 100644 index 0000000..4c97489 --- /dev/null +++ b/models/Campaigns.js @@ -0,0 +1,28 @@ +module.exports = (sequelize, DataTypes) => { + const Campaigns = sequelize.define('campaigns', { + id: { + type: DataTypes.INTEGER, + primaryKey: true, + autoIncrement: true + }, + first_name: DataTypes.STRING, + middle_name: DataTypes.STRING, + last_name: DataTypes.STRING, + email: DataTypes.STRING, + phone: DataTypes.STRING, + address: DataTypes.STRING, + city: DataTypes.STRING, + state: DataTypes.STRING, + country: DataTypes.STRING, + }, + { + freezeTableName: true, + } + ); + + Campaigns.associate = (models) => { + Campaigns.belongsTo(models.donors); + }; + + return Campaigns; +} \ No newline at end of file diff --git a/models/Donors.js b/models/Donors.js new file mode 100644 index 0000000..5226d4e --- /dev/null +++ b/models/Donors.js @@ -0,0 +1,28 @@ +module.exports = (sequelize, DataTypes) => { + const Donors = sequelize.define('donors', { + id: { + type: DataTypes.INTEGER, + primaryKey: true, + autoIncrement: true + }, + first_name: DataTypes.STRING, + middle_name: DataTypes.STRING, + last_name: DataTypes.STRING, + email: DataTypes.STRING, + phone: DataTypes.STRING, + address: DataTypes.STRING, + city: DataTypes.STRING, + state: DataTypes.STRING, + country: DataTypes.STRING, + }, + { + freezeTableName: true, + } + ); + + Donors.associate = (models) => { + Donors.hasMany(models.campaigns); + }; + + return Donors; +} \ No newline at end of file diff --git a/models/dbconnection.js b/models/dbconnection.js deleted file mode 100644 index e69de29..0000000 diff --git a/sequelize.js b/sequelize.js new file mode 100644 index 0000000..8557d55 --- /dev/null +++ b/sequelize.js @@ -0,0 +1,43 @@ +const Sequelize = require('sequelize'), + DonorsModel = require('./models/Donors.js'), + CampaignsModel = require('./models/Campaigns.js'); + + +const host = 'am1shyeyqbxzy8gc.cbetxkdyhwsb.us-east-1.rds.amazonaws.com', + username = 'fyro63k2989tyibh', + password = 'ykjkyenyvxig208z', + port = '3306', + database = 'n0j9gxnf4ijr7g8t'; + +const sequelize = new Sequelize( + database, + username, + password, + { + host: host, + dialect: 'mysql', + operatorsAliases: false, + + // research for pool/connections + pool: { + max: 5, + min: 0, + acquire: 30000, + idle: 10000 + } + } +); + +//creating tables from external files +const Donors = DonorsModel(sequelize, Sequelize); +const Campaigns = CampaignsModel(sequelize, Sequelize); + +sequelize.sync({ force: true }) + .then(() => { + console.log(`Database & tables created!`) + }) + +module.exports = { + Donors, + Campaigns +} \ No newline at end of file diff --git a/server.js b/server.js index d1d5172..ef2eaab 100644 --- a/server.js +++ b/server.js @@ -2,8 +2,8 @@ const express = require('express'), app = express(), router = express.Router(), - port = process.env.PORT || 4200; - + port = process.env.PORT || 4200, + sequelize = require('./sequelize.js'); //define a route, usually this would be a bunch of routes imported from another file router.get('/', function (req, res, next) { @@ -17,4 +17,14 @@ router.get('/', function (req, res, next) { app.listen(port); //log to console to let us know it's working -console.log('Ucharify API server started on: ' + port); \ No newline at end of file +console.log('Ucharify API server started on: ' + port); + +// //verify connection to db +// sequelize +// .authenticate() +// .then(() => { +// console.log('Connection has been established successfully.'); +// }) +// .catch(err => { +// console.error('Unable to connect to the database:', err); +// });