From 370d7905eb5aabab2ec983196d6a488d3c45ac05 Mon Sep 17 00:00:00 2001
From: Kayne Ruse <kayneruse@gmail.com>
Date: Fri, 23 Apr 2021 21:20:22 +1000
Subject: [PATCH] Renaming database primary key

---
 server/admin/reports-delete.js    | 2 +-
 server/admin/reports.js           | 4 ++--
 server/chat/index.js              | 6 +++---
 server/database/models/chatlog.js | 2 +-
 server/database/models/reports.js | 8 +++++---
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/server/admin/reports-delete.js b/server/admin/reports-delete.js
index 4a29ea1..7f52937 100644
--- a/server/admin/reports-delete.js
+++ b/server/admin/reports-delete.js
@@ -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
 		}
 	});
 
diff --git a/server/admin/reports.js b/server/admin/reports.js
index 7370f2d..8d2705a 100644
--- a/server/admin/reports.js
+++ b/server/admin/reports.js
@@ -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;
diff --git a/server/chat/index.js b/server/chat/index.js
index de4be2a..09a5edd 100644
--- a/server/chat/index.js
+++ b/server/chat/index.js
@@ -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
 			});
 		});
 	});
diff --git a/server/database/models/chatlog.js b/server/database/models/chatlog.js
index 081a317..c694c7b 100644
--- a/server/database/models/chatlog.js
+++ b/server/database/models/chatlog.js
@@ -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,
diff --git a/server/database/models/reports.js b/server/database/models/reports.js
index d4239b6..353c9bc 100644
--- a/server/database/models/reports.js
+++ b/server/database/models/reports.js
@@ -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;
\ No newline at end of file