Preparing for Egg Trainer merge

I've also included a migration file in the tools directory

.github/workflows/docker.yml

@@ -26,7 +26,7 @@ jobs:
           docker_image: krgamestudios/news-server
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "news-server",
-  "version": "1.2.2",
+  "version": "1.3.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "news-server",
-      "version": "1.2.2",
+      "version": "1.3.1",
       "license": "ISC",
       "dependencies": {
         "cors": "^2.8.5",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "news-server",
-  "version": "1.2.3",
+  "version": "1.3.1",
   "description": "An API centric news server. Uses Sequelize and mariaDB by default.",
   "main": "server/server.js",
   "scripts": {

server/database/models/revisions.js

@@ -1,8 +1,6 @@
 const Sequelize = require('sequelize');
 const sequelize = require('..');
 
-const articles = require('./articles');
-
 const revisions = sequelize.define('revisions', {
 	title: {
 		type: Sequelize.TEXT,
@@ -17,12 +15,15 @@ const revisions = sequelize.define('revisions', {
 	body: {
 		type: Sequelize.TEXT,
 		defaultValue: ''
+	},
+
+	originalIndex: {
+		type: Sequelize.INTEGER(11),
+		default: null
 	}
 });
 
 //relationships
-articles.hasOne(revisions, { as: 'original' });
-
 sequelize.sync();
 
 module.exports = revisions;

tools/migrations/version-1.3.0.sql

@@ -0,0 +1,6 @@
+use news;
+ALTER TABLE revisions CHANGE COLUMN id `index` INTEGER(11) UNIQUE NOT NULL AUTO_INCREMENT;
+
+ALTER TABLE revisions DROP FOREIGN KEY revisions_ibfk_1;
+
+ALTER TABLE revisions CHANGE COLUMN originalIndex originalIndex INTEGER(11);