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'),
-	GrantModel = require('../../models/grant.model.js'),
-	CauseModel = require('../../models/cause.model.js'),
-	RegionModel = require('../../models/region.model.js'),
-	OrganizationModel = require('../../models/organization.model.js'),
-	UserModel = require('../../models/user.model.js'),
+	DonorModel = require('../../models/Donor.js/index.js'),
+	GrantModel = require('../../models/Grant.js/index.js'),
+	CauseModel = require('../../models/Cause.js'),
+	RegionModel = require('../../models/Region.js/index.js'),
+	OrganizationModel = require('../../models/Organization.js/index.js'),
+	UserModel = require('../../models/User.js/index.js'),
 	PaymentPlanModel = require('../../models/paymentplan.model'),
-	ChargeModel = require('../../models/charge.model'),
-	GrantsOrganizationsModel = require('../../models/grantsOrganizations.model'),
+	ChargeModel = require('../../models/Charge'),
+	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", 
-	{ replacements: {charity_id} });
+	await db.sequelize.query(
+		'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');