From e0b3193607844809e481a3aa63d1f1e91bbf2b40 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Thu, 18 Nov 2021 14:56:59 +0000 Subject: [PATCH] Preparing for Egg Trainer merge --- .github/workflows/docker.yml | 2 +- configure-script.js | 2 +- package-lock.json | 4 ++-- package.json | 2 +- server/database/models/reports.js | 11 +---------- 5 files changed, 6 insertions(+), 15 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index f72fa8b..e21ed10 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -26,7 +26,7 @@ jobs: docker_image: krgamestudios/chat-server - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v1 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/configure-script.js b/configure-script.js index 3b902c5..c246c83 100644 --- a/configure-script.js +++ b/configure-script.js @@ -76,7 +76,7 @@ services: MYSQL_USER: ${appDBUser} MYSQL_PASSWORD: ${appDBPass} MYSQL_ROOT_PASSWORD: ${dbRootPass} - networks: + networks: - app-network volumes: - ./mysql:/var/lib/mysql diff --git a/package-lock.json b/package-lock.json index d5a0923..9d9e784 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "chat-server", - "version": "1.2.2", + "version": "1.2.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "chat-server", - "version": "1.2.2", + "version": "1.2.3", "license": "ISC", "dependencies": { "cors": "^2.8.5", diff --git a/package.json b/package.json index e4b7f32..b3c4dab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "chat-server", - "version": "1.2.2", + "version": "1.2.3", "description": "An API centric chat server. Uses Sequelize and mariaDB by default.", "main": "server/server.js", "scripts": { diff --git a/server/database/models/reports.js b/server/database/models/reports.js index 353c9bc..f64b351 100644 --- a/server/database/models/reports.js +++ b/server/database/models/reports.js @@ -1,9 +1,7 @@ const Sequelize = require('sequelize'); const sequelize = require('..'); -const chatlog = require('./chatlog'); - -const reports = sequelize.define('reports', { +module.exports = sequelize.define('reports', { index: { type: Sequelize.INTEGER(11), allowNull: false, @@ -17,10 +15,3 @@ const reports = sequelize.define('reports', { allowNull: false }, }); - -chatlog.hasMany(reports, { foreignKey: 'chatlogIndex', foreignKeyConstraint: true }); -reports.belongsTo(chatlog, { foreignKey: 'chatlogIndex' }); - -sequelize.sync(); - -module.exports = reports; \ No newline at end of file