Skip to content

User schema(db) #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MikeSewell wants to merge 16 commits into from
Closed

User schema(db) #116

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6691225
updated readme
MikeSewell Mar 3, 2018
e2d1395
updated readme
MikeSewell Mar 3, 2018
45e72ef
added send msg to new user on join
MikeSewell Mar 4, 2018
40b66aa
added welcome reply
MikeSewell Mar 4, 2018
fe11524
Updated welcome to utilize username from code review
MikeSewell Mar 5, 2018
77ae034
fixcode break with author
MikeSewell Mar 5, 2018
37de62a
Added new user schema
MikeSewell Mar 6, 2018
48dda25
added config folder
MikeSewell Mar 7, 2018
8f72e80
changed user table back to members table
MikeSewell Mar 7, 2018
b544359
added uuid back to members table
MikeSewell Mar 7, 2018
095c0c2
changed messages to messagesCount
MikeSewell Mar 7, 2018
deb82fb
updated with migration files to add current tables with up destroying…
MikeSewell Mar 7, 2018
01d3435
added fields to member schema
MikeSewell Mar 9, 2018
f7ce53d
removed files and code that came over with another branch
MikeSewell Mar 13, 2018
ec7217e
removed files and code that came over with another branch
MikeSewell Mar 13, 2018
7c60475
Merge branch 'dev' into UserSchema(db)
krogers78 Mar 13, 2018
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
changed user table back to members table
  • Loading branch information
@MikeSewell
MikeSewell committed Mar 7, 2018
commit 8f72e806253232a5a903fadf0426f7aef23087b4
4 changes: 2 additions & 2 deletions db/migrations/20180306015519-create-user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module.exports = {
up: (queryInterface, Sequelize) =>
queryInterface.createTable('Users', {
queryInterface.createTable('Member', {
id: {
allowNull: false,
autoIncrement: true,
Expand Down Expand Up @@ -35,5 +35,5 @@ module.exports = {
defaultValue: Sequelize.fn('now'),
},
}),
down: (queryInterface, Sequelize) => queryInterface.dropTable('Users'),
down: (queryInterface, Sequelize) => queryInterface.dropTable('Member'),
};
12 changes: 5 additions & 7 deletions db/models/user.js → db/models/member.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
const utils = require('apex-util');

module.exports = (sequelize, DataTypes) => {
const User = sequelize.define('User', {
discorduser: DataTypes.STRING,
const Member = sequelize.define('Member', { discorduser: DataTypes.STRING,
email: DataTypes.STRING,
points: DataTypes.STRING,
messages: DataTypes.INTEGER,
verified: DataTypes.BOOLEAN,
}, {});
User.associate = (models) => {
verified: DataTypes.BOOLEAN }, {});
Member.associate = (models) => {
// associations can be defined here
utils.log('member models/user :', models, 3);
utils.log('member models/member :', models, 3);
};
return User;
return Member;
};