Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
updated with migration files to add current tables with up destroying…
… database
  • Loading branch information
MikeSewell committed Mar 7, 2018
commit deb82fb952931391ca07dde6f20a2d38d1637496
Empty file modified db/config/.gitkeep
100644 → 100755
Empty file.
21 changes: 7 additions & 14 deletions db/migrations/20180306015519-create-user.js → ...igrations/20170920201305-create-member.js
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,31 +1,24 @@


module.exports = {
up: (queryInterface, Sequelize) =>
queryInterface.createTable('Members', {
up: (queryInterface, Sequelize) => queryInterface.createTable('Members', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER,
type: Sequelize.INTEGER
},
discorduser: {
type: Sequelize.STRING,
},
uuid: {
type: Sequelize.STRING,
type: Sequelize.STRING
},
email: {
type: Sequelize.STRING,
type: Sequelize.STRING
},
points: {
type: Sequelize.INTEGER,
},
messagesCount: {
type: Sequelize.INTEGER,
uuid: {
type: Sequelize.STRING
},
verified: {
type: Sequelize.BOOLEAN,
type: Sequelize.BOOLEAN
},
createdAt: {
allowNull: false,
Expand Down
15 changes: 15 additions & 0 deletions db/migrations/20170922200530-toggleApproval.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
'use strict';

module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.addColumn('Members', 'processed', {
type: Sequelize.BOOLEAN,
defaultValue: 0,
allowNull: false
});
},

down: (queryInterface, Sequelize) => {
return queryInterface.removeColumn('Members', 'processed');
}
};
9 changes: 9 additions & 0 deletions db/migrations/add-column-memberCount.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
'use strict';

module.exports = {
up: (queryInterface, Sequelize) => queryInterface.addColumn("Members", "messagesCount", {
type: Sequelize.INTEGER,
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this column matter as per my previous comments about not needing to count the messages, but rather apply a point transformation onto the user's point total upon a message being sent

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We wanted to track who has sent the most messages as well. Of course, this won't start tracking until the merge. But as a reward, we want to track message count.

}),

down: (queryInterface, Sequelize) => queryInterface.removeColumn("Members", "messagesCount"),
};
11 changes: 11 additions & 0 deletions db/migrations/add-column-points.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
'use strict';

module.exports = {
up: (queryInterface, Sequelize) =>
queryInterface.addColumn('Members', 'points', {
type: Sequelize.INTEGER,
}),

down: (queryInterface, Sequelize) =>
queryInterface.removeColumn('Members', 'points'),
};
14 changes: 8 additions & 6 deletions db/models/index.js
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@


const fs = require('fs');
const path = require('path');
const Sequelize = require('sequelize');

const basename = path.basename(__filename);
const basename = path.basename(module.filename);
const env = process.env.NODE_ENV || 'development';
const config = require(path.join(__dirname, '/../config/config.json'))[env];

const db = {};

let sequelize;

if (config.use_env_variable) {
sequelize = new Sequelize(process.env[config.use_env_variable], config);
sequelize = new Sequelize(process.env[config.use_env_variable]);
} else {
sequelize = new Sequelize(config.database, config.username, config.password, config);
}

fs
.readdirSync(__dirname)
.filter(file => (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js'))
.forEach((file) => {
.filter(file => {
return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js');
})
.forEach(file => {
const model = sequelize.import(path.join(__dirname, file));
db[model.name] = model;
});
Expand Down
19 changes: 11 additions & 8 deletions db/models/member.js
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
const utils = require('apex-util');


module.exports = (sequelize, DataTypes) => {
const Member = sequelize.define('Member', {
discorduser: DataTypes.STRING,
email: DataTypes.STRING,
points: DataTypes.STRING,
messagesCount: DataTypes.INTEGER,
verified: DataTypes.BOOLEAN }, {});
Member.associate = (models) => {
// associations can be defined here
utils.log('member models/member :', models, 3);
};
uuid: DataTypes.STRING,
verified: DataTypes.BOOLEAN,
}, {
classMethods: {
associate: (models) => {
// associations can be defined here
console.log(models);
},
},
});
return Member;
};
18 changes: 18 additions & 0 deletions db/seeders/20170921151505-test-data.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
'use strict';

const uuidv4 = require('uuid/v4');

module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.bulkInsert('Members', [{
discorduser: '226894986262740993',
email: 'chapman@apextion.com',
uuid: uuidv4(),
verified: 0,
}], {});
},

down: (queryInterface, Sequelize) => {
return queryInterface.bulkDelete('Members', null, {});
}
};
9 changes: 9 additions & 0 deletions db/test_data.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const models = require('../models');
const uuidv4 = require('uuid/v4');

models.Member.create({
discorduser: '@fsafas',
email: 'fasfasaf@apextion.com',
uuid: uuidv4(),
verified: 1
}).then(console.log).catch(console.error);