krgamestudios/chat-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renaming database primary key

Browse Source
This commit is contained in:
Kayne Ruse
2021-04-23 21:20:22 +10:00
parent 0e88c9e64c
commit 370d7905eb
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/admin/reports-delete.js
+1 -1
View File
@@ -4,7 +4,7 @@ const { chatlog, reports } = require('../database/models');
const route = async (req, res) => { const route = async (req, res) => {
const reps = await reports.destroy({ const reps = await reports.destroy({
where: { where: {
chatlogId: req.body.chatlogId chatlogIndex: req.body.chatlogIndex
} }
}); });
server/admin/reports.js
+2 -2
View File
@@ -7,14 +7,14 @@ const route = async (req, res) => {
model: chatlog, model: chatlog,
required: true required: true
}], }],
order: ['chatlogId'] order: ['chatlogIndex']
}); });
//collate //collate
const response = []; const response = [];
for(let i = 0; i < reps.length; i++) { for(let i = 0; i < reps.length; i++) {
//new chatlog //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.push(reps[i]);
response[response.length - 1].reporter = [response[response.length - 1].reporter]; //reporters in an array response[response.length - 1].reporter = [response[response.length - 1].reporter]; //reporters in an array
continue; continue;
server/chat/index.js
+3 -3
View File
@@ -72,7 +72,7 @@ const chat = io => {
} }
}, },
order: [ order: [
['id', 'DESC'] ['index', 'DESC']
], ],
limit: 50 limit: 50
}) })
@@ -140,14 +140,14 @@ const chat = io => {
socket.on('report', info => { socket.on('report', info => {
//handle reports of malicious content //handle reports of malicious content
if (!info.id) { if (!info.index) {
return; return;
} }
//report //report
reports.create({ reports.create({
reporter: socket.user.username, reporter: socket.user.username,
chatlogId: info.id chatlogIndex: info.index
}); });
}); });
}); });
server/database/models/chatlog.js
+1 -1
View File
@@ -2,7 +2,7 @@ const Sequelize = require('sequelize');
const sequelize = require('..'); const sequelize = require('..');
module.exports = sequelize.define('chatlog', { module.exports = sequelize.define('chatlog', {
id: { index: {
type: Sequelize.INTEGER(11), type: Sequelize.INTEGER(11),
allowNull: false, allowNull: false,
autoIncrement: true, autoIncrement: true,
server/database/models/reports.js
+5 -3
View File
@@ -4,7 +4,7 @@ const sequelize = require('..');
const chatlog = require('./chatlog'); const chatlog = require('./chatlog');
const reports = sequelize.define('reports', { const reports = sequelize.define('reports', {
id: { index: {
type: Sequelize.INTEGER(11), type: Sequelize.INTEGER(11),
allowNull: false, allowNull: false,
autoIncrement: true, autoIncrement: true,
@@ -18,7 +18,9 @@ const reports = sequelize.define('reports', {
}, },
}); });
chatlog.hasMany(reports, { foreignKey: 'chatlogId', foreignKeyConstraint: true }); chatlog.hasMany(reports, { foreignKey: 'chatlogIndex', foreignKeyConstraint: true });
reports.belongsTo(chatlog, { foreignKey: 'chatlogId' }); reports.belongsTo(chatlog, { foreignKey: 'chatlogIndex' });
sequelize.sync();
module.exports = reports; module.exports = reports;