diff --git a/app.js b/app.js index c1a245e..6ca51a1 100644 --- a/app.js +++ b/app.js @@ -11,6 +11,7 @@ var messagesRouter = require('./routes/message'); var app = express(); const db = require('./models'); +db.sequelize.sync({ force: true }); // view engine setup app.set('views', path.join(__dirname, 'views')); diff --git a/database/socialbot.db b/database/socialbot.db index cd7fbfd..c6d7517 100644 Binary files a/database/socialbot.db and b/database/socialbot.db differ diff --git a/migrations/20220206215318-create-user.js b/migrations/20220207180916-create-user.js similarity index 100% rename from migrations/20220206215318-create-user.js rename to migrations/20220207180916-create-user.js diff --git a/migrations/20220206215334-create-message.js b/migrations/20220207180926-create-message.js similarity index 91% rename from migrations/20220206215334-create-message.js rename to migrations/20220207180926-create-message.js index b74e510..fe25652 100644 --- a/migrations/20220206215334-create-message.js +++ b/migrations/20220207180926-create-message.js @@ -8,9 +8,6 @@ module.exports = { primaryKey: true, type: Sequelize.INTEGER }, - owner: { - type: Sequelize.INTEGER - }, body: { type: Sequelize.STRING }, diff --git a/models/index.js b/models/index.js index 8d1cf2f..42d548f 100644 --- a/models/index.js +++ b/models/index.js @@ -24,8 +24,8 @@ fs db[model.name] = model; }); -db.Message.belongsTo(db.User, {foreignKey: "id", as: "messages"}); -db.User.hasMany(db.Message, {oreignKey: "id", as: "owner"}); + db.User.hasMany(db.Message, {foreignKey: 'UserId'}); + db.Message.belongsTo(db.User); Object.keys(db).forEach(modelName => { if (db[modelName].associate) { diff --git a/models/message.js b/models/message.js index 0ca2721..3218cf1 100644 --- a/models/message.js +++ b/models/message.js @@ -1,5 +1,4 @@ 'use strict'; -const User = require('./user').User; const { Model } = require('sequelize'); @@ -15,7 +14,6 @@ module.exports = (sequelize, DataTypes) => { } } Message.init({ - owner: DataTypes.INTEGER, body: DataTypes.STRING }, { sequelize, diff --git a/models/relations.js.old b/models/relations.js.old deleted file mode 100644 index 83b0288..0000000 --- a/models/relations.js.old +++ /dev/null @@ -1,5 +0,0 @@ -const Message = require('./message').Message; -const User = require('./user').User; - -Message.belongsTo(User, {foreignKey: "id", as: "messages"}); -User.hasMany(Message, {oreignKey: "id", as: "owner"}); diff --git a/models/user.js b/models/user.js index 39d32bd..402c6a1 100644 --- a/models/user.js +++ b/models/user.js @@ -1,5 +1,4 @@ 'use strict'; -const Message = require('./message'); const { Model } = require('sequelize'); @@ -23,10 +22,4 @@ module.exports = (sequelize, DataTypes) => { modelName: 'User', }); return User; -}; - -// const Message = require('./message').Message; - -// Message.belongsTo(User, {foreignKey: "id", as: "messages"}); -// User.hasMany(Message, {oreignKey: "id", as: "owner"}); - +}; \ No newline at end of file diff --git a/routes/message.js b/routes/message.js index 81802a0..03b2b72 100644 --- a/routes/message.js +++ b/routes/message.js @@ -2,11 +2,16 @@ var express = require('express'); const db = require('../models'); var router = express.Router(); var Message = db.Message; - +var User = db.User; /* GET users listing. */ router.get('/', async function(req, res, next) { var messages = await Message.findAll(); res.send(messages); }); +router.get('/new', async function(req, res, next) { + var message = await Message.create({'body':'My First Message', UserId:3}); + res.send(message); +}); + module.exports = router;