From b9378a2356f93b831b214bae350e1d5899722d57 Mon Sep 17 00:00:00 2001 From: Robbie Antenesse Date: Sat, 7 Dec 2019 22:41:13 -0700 Subject: [PATCH] Move getSequelizeModels to sequelize folder --- server/index.js | 2 +- server/{getSequelizeModels.js => sequelize/getModels.js} | 4 ++-- setup-database.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename server/{getSequelizeModels.js => sequelize/getModels.js} (98%) diff --git a/server/index.js b/server/index.js index 25db404..d85541b 100644 --- a/server/index.js +++ b/server/index.js @@ -102,5 +102,5 @@ fastify.listen(fastify.siteConfig.port, function (err, address) { } fastify.decorate('canEmail', typeof fastify.nodemailer !== 'undefined'); - fastify.decorate('models', require('./getSequelizeModels')(fastify.sequelize)); + fastify.decorate('models', require('./sequelize/getModels')(fastify.sequelize)); }); \ No newline at end of file diff --git a/server/getSequelizeModels.js b/server/sequelize/getModels.js similarity index 98% rename from server/getSequelizeModels.js rename to server/sequelize/getModels.js index 8268ee7..d3cdbaf 100644 --- a/server/getSequelizeModels.js +++ b/server/sequelize/getModels.js @@ -1,6 +1,6 @@ const Sequelize = require('sequelize'); -function getSequelizeModels (sequelize) { +function getModels (sequelize) { const User = sequelize.define('user', { id: { type: Sequelize.INTEGER, @@ -360,4 +360,4 @@ function getSequelizeModels (sequelize) { } } -module.exports = getSequelizeModels; \ No newline at end of file +module.exports = getModels; \ No newline at end of file diff --git a/setup-database.js b/setup-database.js index bfe2ed7..40ee53d 100644 --- a/setup-database.js +++ b/setup-database.js @@ -2,7 +2,7 @@ const path = require('path'); const Sequelize = require('sequelize'); -const getSequelizeModels = require('./server/getSequelizeModels'); +const getModels = require('./server/sequelize/getModels'); const force = typeof process.argv[2] !== 'undefined' && process.argv[2] === 'force'; let siteConfig; try { @@ -37,7 +37,7 @@ switch (siteConfig.db_engine) { const sequelize = new Sequelize(sequelizeConfig); -const Models = getSequelizeModels(sequelize); +const Models = getModels(sequelize); sequelize.sync({ force }).then(() => { const promises = [ // Default status types to use in Statuses