working changes to use sequelize auto index

app/config/associate.js

@@ -1,6 +1,6 @@
 module.exports = models => {
 	const {
-		Donor,
+		donor,
 		Grant,
 		Cause,
 		Region,
@@ -10,8 +10,9 @@ module.exports = models => {
 		GrantsOrganizations,
 		Project
 	} = models;
+	console.log(models);
 
-	Donor.hasMany(Grant, { foreignKey: 'donor_id' });
+	donor.hasMany(Grant, { foreignKey: 'donor_id' });
 
 	Grant.belongsToMany(Organization, {
 		through: 'grants_organizations',
@@ -20,13 +21,4 @@ module.exports = models => {
 	});
 
 	Grant.hasMany(Charge, { foreignKey: 'grant_id' });
-
-	Donor.hasMany(PaymentPlan, {
-		foreignKey: 'subscription_id',
-		sourceKey: 'subscription_id'
-	});
-
-	Grant.hasOne(PaymentPlan, {
-		foreignKey: 'grant_id'
-	});
 };

app/config/db.config.js

@@ -1,13 +1,13 @@
 const Sequelize = require('sequelize'),
-	DonorModel = require('../../models/donor.model.js'),
+	DonorModel = require('../../models/Donor.js/index.js'),
-	GrantModel = require('../../models/grant.model.js'),
+	GrantModel = require('../../models/Grant.js/index.js'),
-	CauseModel = require('../../models/cause.model.js'),
+	CauseModel = require('../../models/Cause.js'),
-	RegionModel = require('../../models/region.model.js'),
+	RegionModel = require('../../models/Region.js/index.js'),
-	OrganizationModel = require('../../models/organization.model.js'),
+	OrganizationModel = require('../../models/Organization.js/index.js'),
-	UserModel = require('../../models/user.model.js'),
+	UserModel = require('../../models/User.js/index.js'),
 	PaymentPlanModel = require('../../models/paymentplan.model'),
-	ChargeModel = require('../../models/charge.model'),
+	ChargeModel = require('../../models/Charge'),
-	GrantsOrganizationsModel = require('../../models/grantsOrganizations.model'),
+	GrantsOrganizationsModel = require('../../models/Grant_Organization'),
 	associate = require('./associate');
 
 const connection_uri = process.env.JAWSDB_MARIA_URL;

app/controllers/admin/organization.controller.js

@@ -1,4 +1,4 @@
-const db = require('../../config/db.config.js'),
+const db = require('../../../models'),
 	errorMaker = require('../../helpers/error.maker');
 
 const { Grant, Cause, Region, Organization } = db;
@@ -7,8 +7,10 @@ const { Grant, Cause, Region, Organization } = db;
 exports.verifyOrg = async (req, res, next) => {
 	const charity_id = req.params.charity_id;
 
-	await db.sequelize.query("UPDATE organizations SET verified = 1 WHERE id = :charity_id", 
+	await db.sequelize.query(
-	{ replacements: {charity_id} });
+		'UPDATE organizations SET verified = 1 WHERE id = :charity_id',
+		{ replacements: { charity_id } }
+	);
 
-	return res.status(200).json({ message: "Successfully verified charity" });
+	return res.status(200).json({ message: 'Successfully verified charity' });
 };

app/controllers/auth.controller.js

@@ -1,4 +1,4 @@
-const db = require('../config/db.config.js'),
+const db = require('../../models'),
 	bcrypt = require('bcrypt-nodejs'),
 	jwt = require('jsonwebtoken'),
 	errorMaker = require('../helpers/error.maker'),

app/controllers/donor/donor.controller.js

@@ -1,4 +1,4 @@
-const db = require('../../config/db.config.js'),
+const db = require('../../../models'),
 	bcrypt = require('bcrypt-nodejs'),
 	errorMaker = require('../../helpers/error.maker'),
 	uuidv4 = require('uuid/v4');

app/controllers/donor/grant.controller.js

@@ -1,4 +1,4 @@
-const db = require('../../config/db.config.js'),
+const db = require('../../../models'),
 	errorMaker = require('../../helpers/error.maker');
 
 const stripe = require('./stripe.controller');

app/controllers/donor/organization.controller.js

@@ -1,4 +1,4 @@
-const db = require('../../config/db.config.js'),
+const db = require('../../../models'),
 	errorMaker = require('../../helpers/error.maker');
 
 const { Grant, Cause, Region, Organization } = db;

app/controllers/donor/stripe.controller.js

@@ -1,4 +1,4 @@
-const db = require('../../config/db.config.js'),
+const db = require('../../../models'),
 	errorMaker = require('../../helpers/error.maker');
 
 const stripe = require('stripe')(process.env.STRIPE_KEY);

app/controllers/organization/cause.controller.js

@@ -1,4 +1,4 @@
-const db = require('../../config/db.config.js'),
+const db = require('../../../models'),
 	errorMaker = require('../../helpers/error.maker');
 
 const { Grant, Cause, Region, Organization } = db;

app/controllers/organization/organization.controller.js

@@ -1,4 +1,4 @@
-const db = require('../../config/db.config.js'),
+const db = require('../../../models'),
 	bcrypt = require('bcrypt-nodejs'),
 	errorMaker = require('../../helpers/error.maker'),
 	uuidv4 = require('uuid/v4');

app/controllers/organization/region.controller.js

@@ -1,4 +1,4 @@
-const db = require('../../config/db.config.js'),
+const db = require('../../../models'),
 	errorMaker = require('../../helpers/error.maker');
 
 const { Grant, Cause, Region, Organization } = db;

app/controllers/public/cause.controller.js

@@ -1,4 +1,4 @@
-const db = require('../../config/db.config.js'),
+const db = require('../../../models'),
 	errorMaker = require('../../helpers/error.maker'),
 	textCleaner = require('../../helpers/text_cleaner');
 

app/controllers/public/organization.controller.js

@@ -1,4 +1,4 @@
-const db = require('../../config/db.config.js'),
+const db = require('../../../models'),
 	errorMaker = require('../../helpers/error.maker');
 
 const { Grant, Cause, Region, Organization } = db;

app/controllers/public/region.controller.js

@@ -1,4 +1,4 @@
-const db = require('../../config/db.config.js'),
+const db = require('../../../models'),
 	errorMaker = require('../../helpers/error.maker'),
 	textCleaner = require('../../helpers/text_cleaner');
 

app/controllers/public/user.controller.js

@@ -1,4 +1,4 @@
-const db = require('../../config/db.config.js'),
+const db = require('../../../models'),
 	errorMaker = require('../../helpers/error.maker');
 
 const { Grant, Cause, Region, Organization, User } = db;

app/controllers/sendgrid.controller.js

@@ -1,4 +1,4 @@
-const db = require('../config/db.config.js'),
+const db = require('../../models'),
 	errorMaker = require('../helpers/error.maker');
 
 const sgMail = require('@sendgrid/mail');

models/Cause.js

@@ -1,5 +1,5 @@
 module.exports = (sequelize, DataTypes) => {
-	const Cause = sequelize.define('causes', {
+	const Cause = sequelize.define('Cause', {
 		id: {
 			type: DataTypes.INTEGER,
 			primaryKey: true,

models/Charge.js

@@ -1,6 +1,6 @@
 'use strict';
 module.exports = (sequelize, DataTypes) => {
-	const Charge = sequelize.define('charges', {
+	const Charge = sequelize.define('Charge', {
 		id: { type: DataTypes.UUID, primaryKey: true, allowNull: false },
 		description: DataTypes.STRING,
 		amount: DataTypes.INTEGER

models/Donor.js

@@ -1,5 +1,5 @@
 module.exports = (sequelize, DataTypes) => {
-	const Donor = sequelize.define('donors', {
+	const Donor = sequelize.define('Donor', {
 		id: {
 			type: DataTypes.UUID,
 			allowNull: false,
@@ -44,5 +44,12 @@ module.exports = (sequelize, DataTypes) => {
 		zip: DataTypes.STRING(10),
 		country: DataTypes.STRING
 	});
+
+	Donor.associate = models => {
+		Donor.hasMany(models.Grant, {
+			foreignKey: 'donor_id'
+		});
+	};
+
 	return Donor;
 };

models/Grant.js

@@ -1,5 +1,5 @@
 module.exports = (sequelize, DataTypes) => {
-	const Grant = sequelize.define('grants', {
+	const Grant = sequelize.define('Grant', {
 		id: {
 			type: DataTypes.INTEGER,
 			primaryKey: true,
@@ -27,5 +27,16 @@ module.exports = (sequelize, DataTypes) => {
 			allowNull: false
 		}
 	});
+
+	Grant.associate = models => {
+		Grant.belongsToMany(models.Organization, {
+			through: 'grants_organizations',
+			foreignKey: 'grant_id',
+			otherKey: 'organization_id'
+		});
+
+		Grant.hasMany(models.Charge, { foreignKey: 'grant_id' });
+	};
+
 	return Grant;
 };

models/Grant_Organization.js

@@ -1,5 +1,5 @@
 module.exports = (sequelize, DataTypes) => {
-	const GrantsOrganizations = sequelize.define('grants_organizations', {
+	const GrantsOrganizations = sequelize.define('Grants_Organizations', {
 		id: {
 			type: DataTypes.INTEGER,
 			primaryKey: true,

models/Organization.js

@@ -1,8 +1,8 @@
-const Cause = require('./cause.model'),
+const Cause = require('./Cause'),
-	Region = require('./region.model');
+	Region = require('./Region');
 
 module.exports = (sequelize, DataTypes) => {
-	const Organization = sequelize.define('organizations', {
+	const Organization = sequelize.define('Organization', {
 		id: {
 			type: DataTypes.UUID,
 			allowNull: false,

models/Project.js

@@ -1,11 +1,11 @@
 'use strict';
 
-const Organization = require('./organization.model'),
+const Organization = require('./Organization'),
-	Cause = require('./cause.model'),
+	Cause = require('./Cause'),
-	Region = require('./region.model');
+	Region = require('./Region');
 
 module.exports = (sequelize, DataTypes) => {
-	const Project = sequelize.define('projects', {
+	const Project = sequelize.define('Project', {
 		id: {
 			type: DataTypes.INTEGER,
 			primaryKey: true,
@@ -21,23 +21,27 @@ module.exports = (sequelize, DataTypes) => {
 		},
 
 		description: DataTypes.STRING,
+		isComplete: {
+			type: DataTypes.BOOLEAN,
+			defaultValue: false
+		},
 
-		cause: {
+		// cause: {
-			type: DataTypes.STRING,
+		// 	type: DataTypes.STRING,
-			allowNull: false,
+		// 	allowNull: false,
-			references: {
+		// 	references: {
-				model: Cause(sequelize, DataTypes),
+		// 		model: Cause(sequelize, DataTypes),
-				key: 'name'
+		// 		key: 'name'
-			}
+		// 	}
-		},
+		// },
-		region: {
+		// region: {
-			type: DataTypes.STRING,
+		// 	type: DataTypes.STRING,
-			allowNull: false,
+		// 	allowNull: false,
-			references: {
+		// 	references: {
-				model: Region(sequelize, DataTypes),
+		// 		model: Region(sequelize, DataTypes),
-				key: 'name'
+		// 		key: 'name'
-			}
+		// 	}
-		},
+		// },
 		organization_id: {
 			type: DataTypes.UUID,
 			allowNull: false,

models/Region.js

@@ -1,5 +1,5 @@
 module.exports = (sequelize, DataTypes) => {
-	const Region = sequelize.define('regions', {
+	const Region = sequelize.define('Region', {
 		id: {
 			type: DataTypes.INTEGER,
 			primaryKey: true,

models/User.js

@@ -1,6 +1,6 @@
 'use strict';
 module.exports = (sequelize, DataTypes) => {
-	const User = sequelize.define('users', {
+	const User = sequelize.define('User', {
 		id: {
 			type: DataTypes.INTEGER,
 			primaryKey: true,

models/paymentplan.model.js

@@ -1,25 +0,0 @@
-'use strict';
-module.exports = (sequelize, DataTypes) => {
-	const PaymentPlan = sequelize.define('payment_plans', {
-		id: {
-			type: DataTypes.INTEGER,
-			primaryKey: true,
-			autoIncrement: true
-		},
-		plan_id: {
-			unique: true,
-			type: DataTypes.UUID,
-			allowNull: false
-		},
-		amount: {
-			type: DataTypes.INTEGER,
-			allowNull: false
-		},
-		sub_item_id: {
-			type: DataTypes.UUID,
-			unique: true
-		}
-	});
-
-	return PaymentPlan;
-};