Renaming database primary key
This commit is contained in:
@@ -4,7 +4,7 @@ const { chatlog, reports } = require('../database/models');
|
||||
const route = async (req, res) => {
|
||||
const reps = await reports.destroy({
|
||||
where: {
|
||||
chatlogId: req.body.chatlogId
|
||||
chatlogIndex: req.body.chatlogIndex
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -7,14 +7,14 @@ const route = async (req, res) => {
|
||||
model: chatlog,
|
||||
required: true
|
||||
}],
|
||||
order: ['chatlogId']
|
||||
order: ['chatlogIndex']
|
||||
});
|
||||
|
||||
//collate
|
||||
const response = [];
|
||||
for(let i = 0; i < reps.length; i++) {
|
||||
//new chatlog
|
||||
if (response.length == 0 || response[response.length - 1].chatlogId != reps[i].chatlogId) {
|
||||
if (response.length == 0 || response[response.length - 1].chatlogIndex != reps[i].chatlogIndex) {
|
||||
response.push(reps[i]);
|
||||
response[response.length - 1].reporter = [response[response.length - 1].reporter]; //reporters in an array
|
||||
continue;
|
||||
|
||||
@@ -72,7 +72,7 @@ const chat = io => {
|
||||
}
|
||||
},
|
||||
order: [
|
||||
['id', 'DESC']
|
||||
['index', 'DESC']
|
||||
],
|
||||
limit: 50
|
||||
})
|
||||
@@ -140,14 +140,14 @@ const chat = io => {
|
||||
|
||||
socket.on('report', info => {
|
||||
//handle reports of malicious content
|
||||
if (!info.id) {
|
||||
if (!info.index) {
|
||||
return;
|
||||
}
|
||||
|
||||
//report
|
||||
reports.create({
|
||||
reporter: socket.user.username,
|
||||
chatlogId: info.id
|
||||
chatlogIndex: info.index
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -2,7 +2,7 @@ const Sequelize = require('sequelize');
|
||||
const sequelize = require('..');
|
||||
|
||||
module.exports = sequelize.define('chatlog', {
|
||||
id: {
|
||||
index: {
|
||||
type: Sequelize.INTEGER(11),
|
||||
allowNull: false,
|
||||
autoIncrement: true,
|
||||
|
||||
@@ -4,7 +4,7 @@ const sequelize = require('..');
|
||||
const chatlog = require('./chatlog');
|
||||
|
||||
const reports = sequelize.define('reports', {
|
||||
id: {
|
||||
index: {
|
||||
type: Sequelize.INTEGER(11),
|
||||
allowNull: false,
|
||||
autoIncrement: true,
|
||||
@@ -18,7 +18,9 @@ const reports = sequelize.define('reports', {
|
||||
},
|
||||
});
|
||||
|
||||
chatlog.hasMany(reports, { foreignKey: 'chatlogId', foreignKeyConstraint: true });
|
||||
reports.belongsTo(chatlog, { foreignKey: 'chatlogId' });
|
||||
chatlog.hasMany(reports, { foreignKey: 'chatlogIndex', foreignKeyConstraint: true });
|
||||
reports.belongsTo(chatlog, { foreignKey: 'chatlogIndex' });
|
||||
|
||||
sequelize.sync();
|
||||
|
||||
module.exports = reports;
|
||||
Reference in New Issue
Block a user