From 1b9b8db04de62b0cf9b775a887e8dc0b5417b3e0 Mon Sep 17 00:00:00 2001 From: C4 Patino Date: Wed, 30 Mar 2022 14:59:11 -0500 Subject: [PATCH] Merge development (#13) * Added direct join functionality * Completed CreateUser test suite * Removed non-essential imports * Reordered test functions * Login test suite completed * Completed Logout test suite * Completed RequestReset test suite * Completed ResetPassword test suite * Completed UpdateUserDetails test suite * Completed SetAudio test suite * Fixed UpdateUserDetials suite * GetUserDetails test suite complete * Completed ResetPassword test suite * Completed GetMemberOrgs test suite * Completed GetOwnedOrgs test suite * AddOrgMember test suite added * Created CreateOrg test suite * Modified AddOrgMember suite * Delete Org test suite completed * Completed GetOrg test suite * Completed RemoveOrgMember test suite * Completed UpdateOrgDetails test suite * Changed oackage,json files * Switched project over to workspaces * Test build script completed * Fixed config.json missing on workflow run * Completed test-build.js.yml * Completed test-build.js.yml * Completed test-build.js.yml * Test build completed * Completed test-build.js.yml * Added touch server * Touched test-build.js.yml * Reworked workflows and automated test suite (#7) Reworked workflows and automated test suite (#7) * Configured new js file and isolated database files in db folder (#10) * Changed config.js and isolated db * Configured new js file and isolated database files in db folder * Removed .env files from config (#11) --- .github/workflows/build-release.yml | 7 +------ .github/workflows/test-build.yml | 6 ------ .gitignore | 1 - .sequelizerc | 8 ++++++++ package.json | 3 ++- server/app.js | 2 +- server/bin/www | 4 ++-- server/db/config/config.js | 17 +++++++++++++++++ .../20220310033702-create-organization.js | 0 .../migrations/20220310033941-create-user.js | 0 .../20220310041303-create-reset-request.js | 0 .../migrations/20220310041542-create-token.js | 0 .../20220310044559-association-org-owner.js | 0 .../20220310044806-association-org-members.js | 0 .../20220310045155-association-reset-request.js | 0 .../20220310045317-association-token.js | 0 server/{ => db}/models/Organization.js | 0 server/{ => db}/models/ResetRequest.js | 0 server/{ => db}/models/Token.js | 0 server/{ => db}/models/User.js | 0 server/{ => db}/models/index.js | 2 +- server/middleware/basicAuth.js | 2 +- server/middleware/checkKnownOrg.js | 2 +- server/middleware/checkKnownUser.js | 2 +- server/middleware/tokenAuth.js | 2 +- server/package.json | 7 +++++++ server/routes/auth/CreateUser.js | 2 +- server/routes/auth/GetUserDetails.js | 2 +- server/routes/auth/Login.js | 2 +- server/routes/auth/RequestReset.js | 6 ++---- server/routes/auth/ResetPassword.js | 2 +- server/routes/auth/UpdateUserDetails.js | 2 +- server/routes/org/AddOrgMember.js | 2 +- server/routes/org/DeleteOrg.js | 2 +- server/routes/org/GetOrg.js | 2 +- server/routes/org/RemoveOrgMember.js | 2 +- server/tests/auth/CreateUser.test.js | 3 +-- server/tests/auth/GetMemberOrgs.test.js | 3 +-- server/tests/auth/GetOwnedOrgs.test.js | 3 +-- server/tests/auth/GetUserDetails.test.js | 3 +-- server/tests/auth/Login.test.js | 3 +-- server/tests/auth/Logout.test.js | 3 +-- server/tests/auth/RequestReset.test.js | 3 +-- server/tests/auth/ResetPassword.test.js | 3 +-- server/tests/auth/SetAudio.test.js | 3 +-- server/tests/auth/UpdateUserDetails.test.js | 3 +-- server/tests/org/AddOrgMember.test.js | 3 +-- server/tests/org/CreateOrg.test.js | 3 +-- server/tests/org/DeleteOrg.test.js | 3 +-- server/tests/org/GetOrg.test.js | 3 +-- server/tests/org/RemoveOrgMember.test.js | 3 +-- server/tests/org/UpdateOrgDetails.test.js | 3 +-- server/tests/utils.js | 2 +- 53 files changed, 71 insertions(+), 68 deletions(-) create mode 100644 .sequelizerc create mode 100644 server/db/config/config.js rename server/{ => db}/migrations/20220310033702-create-organization.js (100%) rename server/{ => db}/migrations/20220310033941-create-user.js (100%) rename server/{ => db}/migrations/20220310041303-create-reset-request.js (100%) rename server/{ => db}/migrations/20220310041542-create-token.js (100%) rename server/{ => db}/migrations/20220310044559-association-org-owner.js (100%) rename server/{ => db}/migrations/20220310044806-association-org-members.js (100%) rename server/{ => db}/migrations/20220310045155-association-reset-request.js (100%) rename server/{ => db}/migrations/20220310045317-association-token.js (100%) rename server/{ => db}/models/Organization.js (100%) rename server/{ => db}/models/ResetRequest.js (100%) rename server/{ => db}/models/Token.js (100%) rename server/{ => db}/models/User.js (100%) rename server/{ => db}/models/index.js (93%) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index a0f2729..85cd7e5 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -6,6 +6,7 @@ name: Build release assets on: push: branches: [main] + workflow_dispatch: jobs: build: @@ -18,12 +19,6 @@ jobs: env: DOTENV: '${{ secrets.DOTENV }}' run: echo "$DOTENV" >> .env - - name: Write config.json to config - env: - CONFIG_JSON: '${{ secrets.CONFIG_JSON }}' - run: | - mkdir ./server/config - echo "$CONFIG_JSON" >> ./server/config/config.json - name: Use Node.js 16.x uses: actions/setup-node@v2 with: diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index 1821013..b05c818 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -20,12 +20,6 @@ jobs: env: DOTENV: '${{ secrets.DOTENV }}' run: echo "$DOTENV" >> .env - - name: Write config.json to config - env: - CONFIG_JSON: '${{ secrets.CONFIG_JSON }}' - run: | - mkdir ./server/config - echo "$CONFIG_JSON" >> ./server/config/config.json - name: Use Node.js 16.x uses: actions/setup-node@v2 with: diff --git a/.gitignore b/.gitignore index d71b55d..49a3626 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,6 @@ TODO ### Sqlite ### *.sqlite3 -**/config/ ### Git ### # Created by git for backups. To disable backups in Git: diff --git a/.sequelizerc b/.sequelizerc new file mode 100644 index 0000000..85089ea --- /dev/null +++ b/.sequelizerc @@ -0,0 +1,8 @@ +const path = require('path'); + +module.exports = { + config: path.resolve('server', 'db', 'config', 'config.js'), + 'models-path': path.resolve('server', 'db', 'models'), + 'seeders-path': path.resolve('server', 'db', 'seeders'), + 'migrations-path': path.resolve('server', 'db', 'migrations'), +}; diff --git a/package.json b/package.json index 3c14722..4b3c448 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,9 @@ "dev": "npm run server", "dist": "npm run package", "test": "npm run test -w server", - "env": "npm run env --ws && touch test_db.sqlite3", + "env": "npm run env --ws && touch db.sqlite3", "package": "tar -czf ./dist.tar.gz ./.github ./.vscode ./client ./node_modules ./server .env .gitignore LICENSE package-lock.json package.json README.md", + "pretest": "npm run env", "predev": "npm run build", "predist": "npm ci && npm run build", "prebuild": "npm run env" diff --git a/server/app.js b/server/app.js index da7171e..31b383e 100644 --- a/server/app.js +++ b/server/app.js @@ -15,7 +15,7 @@ var app = express(); app.set('views', path.join(__dirname, 'views')); app.set('view engine', 'jade'); -if (process.env.LOGGER == 'true') { +if (process.env.NODE_ENV != 'test') { app.use(logger('dev')); } app.use(express.json()); diff --git a/server/bin/www b/server/bin/www index 4429ded..d9560f9 100644 --- a/server/bin/www +++ b/server/bin/www @@ -3,12 +3,12 @@ /** * Module dependencies. */ -var app = require('../app'); var debug = require('debug')('server:server'); var http = require('http'); require('dotenv').config(); -var { sequelize } = require('../models/index'); +var app = require('../app'); +var { sequelize } = require('../db/models/index'); /** * Get port from environment and store in Express. diff --git a/server/db/config/config.js b/server/db/config/config.js new file mode 100644 index 0000000..b4f7fab --- /dev/null +++ b/server/db/config/config.js @@ -0,0 +1,17 @@ +module.exports = { + production: { + username: process.env.DB_USERNAME, + password: process.env.DB_PASSWORD, + database: process.env.DB_NAME, + host: process.env.DB_HOST, + dialect: 'mysql', + }, + test: { + dialect: 'sqlite', + storage: '../../db.sqlite3', + }, + development: { + dialect: 'sqlite', + storage: '../../db.sqlite3', + }, +}; diff --git a/server/migrations/20220310033702-create-organization.js b/server/db/migrations/20220310033702-create-organization.js similarity index 100% rename from server/migrations/20220310033702-create-organization.js rename to server/db/migrations/20220310033702-create-organization.js diff --git a/server/migrations/20220310033941-create-user.js b/server/db/migrations/20220310033941-create-user.js similarity index 100% rename from server/migrations/20220310033941-create-user.js rename to server/db/migrations/20220310033941-create-user.js diff --git a/server/migrations/20220310041303-create-reset-request.js b/server/db/migrations/20220310041303-create-reset-request.js similarity index 100% rename from server/migrations/20220310041303-create-reset-request.js rename to server/db/migrations/20220310041303-create-reset-request.js diff --git a/server/migrations/20220310041542-create-token.js b/server/db/migrations/20220310041542-create-token.js similarity index 100% rename from server/migrations/20220310041542-create-token.js rename to server/db/migrations/20220310041542-create-token.js diff --git a/server/migrations/20220310044559-association-org-owner.js b/server/db/migrations/20220310044559-association-org-owner.js similarity index 100% rename from server/migrations/20220310044559-association-org-owner.js rename to server/db/migrations/20220310044559-association-org-owner.js diff --git a/server/migrations/20220310044806-association-org-members.js b/server/db/migrations/20220310044806-association-org-members.js similarity index 100% rename from server/migrations/20220310044806-association-org-members.js rename to server/db/migrations/20220310044806-association-org-members.js diff --git a/server/migrations/20220310045155-association-reset-request.js b/server/db/migrations/20220310045155-association-reset-request.js similarity index 100% rename from server/migrations/20220310045155-association-reset-request.js rename to server/db/migrations/20220310045155-association-reset-request.js diff --git a/server/migrations/20220310045317-association-token.js b/server/db/migrations/20220310045317-association-token.js similarity index 100% rename from server/migrations/20220310045317-association-token.js rename to server/db/migrations/20220310045317-association-token.js diff --git a/server/models/Organization.js b/server/db/models/Organization.js similarity index 100% rename from server/models/Organization.js rename to server/db/models/Organization.js diff --git a/server/models/ResetRequest.js b/server/db/models/ResetRequest.js similarity index 100% rename from server/models/ResetRequest.js rename to server/db/models/ResetRequest.js diff --git a/server/models/Token.js b/server/db/models/Token.js similarity index 100% rename from server/models/Token.js rename to server/db/models/Token.js diff --git a/server/models/User.js b/server/db/models/User.js similarity index 100% rename from server/models/User.js rename to server/db/models/User.js diff --git a/server/models/index.js b/server/db/models/index.js similarity index 93% rename from server/models/index.js rename to server/db/models/index.js index de73e4d..e7a31a0 100644 --- a/server/models/index.js +++ b/server/db/models/index.js @@ -4,7 +4,7 @@ const path = require('path'); const Sequelize = require('sequelize'); const basename = path.basename(__filename); const env = process.env.NODE_ENV; -const config = require(__dirname + '/../config/config.json')[env]; +const config = require('../config/config')[env]; const db = {}; const sequelize = new Sequelize({ diff --git a/server/middleware/basicAuth.js b/server/middleware/basicAuth.js index 71c8bd8..c1bbe45 100644 --- a/server/middleware/basicAuth.js +++ b/server/middleware/basicAuth.js @@ -1,5 +1,5 @@ const forge = require('node-forge'); -const { User } = require('../models/index'); +const { User } = require('../db/models/index'); async function basicAuth(req, res, next) { const email = req.body.email; diff --git a/server/middleware/checkKnownOrg.js b/server/middleware/checkKnownOrg.js index 718f6ae..532a12b 100644 --- a/server/middleware/checkKnownOrg.js +++ b/server/middleware/checkKnownOrg.js @@ -1,4 +1,4 @@ -const { Organization } = require('../models/index'); +const { Organization } = require('../db/models/index'); async function GetOrg(req, res, next) { const user = req.user; diff --git a/server/middleware/checkKnownUser.js b/server/middleware/checkKnownUser.js index a8ae6a1..dce5c70 100644 --- a/server/middleware/checkKnownUser.js +++ b/server/middleware/checkKnownUser.js @@ -1,4 +1,4 @@ -const { User } = require('../models/index'); +const { User } = require('../db/models/index'); async function checkKnownUser(req, res, next) { const user = req.user; diff --git a/server/middleware/tokenAuth.js b/server/middleware/tokenAuth.js index 2f1593b..034fc7b 100644 --- a/server/middleware/tokenAuth.js +++ b/server/middleware/tokenAuth.js @@ -1,4 +1,4 @@ -const { Token } = require('../models/index'); +const { Token } = require('../db/models/index'); async function tokenAuth(req, res, next) { const token = req.query.token || req.body.token; diff --git a/server/package.json b/server/package.json index 2584dd1..9da1ac3 100644 --- a/server/package.json +++ b/server/package.json @@ -4,7 +4,11 @@ "private": true, "scripts": { "start": "nodemon ./bin/www", +<<<<<<< HEAD + "test": "jest -i", +======= "test": "jest -i --verbose --detectOpenHandles", +>>>>>>> origin/main "env": "cp ../.env .env" }, "dependencies": { @@ -29,5 +33,8 @@ "jest": "^27.5.1", "nodemon": "^2.0.15", "supertest": "^6.2.2" + }, + "jest": { + "slowTestThreshold": 10 } } diff --git a/server/routes/auth/CreateUser.js b/server/routes/auth/CreateUser.js index eb5d5d3..65d4d33 100644 --- a/server/routes/auth/CreateUser.js +++ b/server/routes/auth/CreateUser.js @@ -1,5 +1,5 @@ const forge = require('node-forge'); -const { User, Organization } = require('../../models/index'); +const { User, Organization } = require('../../db/models/index'); async function CreateUser(req, res, next) { const body = req.body; diff --git a/server/routes/auth/GetUserDetails.js b/server/routes/auth/GetUserDetails.js index 2d12488..537c07e 100644 --- a/server/routes/auth/GetUserDetails.js +++ b/server/routes/auth/GetUserDetails.js @@ -1,4 +1,4 @@ -const { User } = require('../../models/index'); +const { User } = require('../../db/models/index'); async function GetUserDetails(req, res, next) { const user = req.user; diff --git a/server/routes/auth/Login.js b/server/routes/auth/Login.js index 322e19f..e907571 100644 --- a/server/routes/auth/Login.js +++ b/server/routes/auth/Login.js @@ -1,4 +1,4 @@ -const { Token } = require('../../models/index'); +const { Token } = require('../../db/models/index'); async function Login(req, res, next) { const user = req.user; diff --git a/server/routes/auth/RequestReset.js b/server/routes/auth/RequestReset.js index b369685..b28ec9a 100644 --- a/server/routes/auth/RequestReset.js +++ b/server/routes/auth/RequestReset.js @@ -1,7 +1,7 @@ -const { v4: uuidv4 } = require('uuid'); const { CourierClient } = require('@trycourier/courier'); +require('dotenv').config(); -const { User, ResetRequest } = require('../../models/index'); +const { User, ResetRequest } = require('../../db/models/index'); async function RequestReset(req, res, next) { try { @@ -15,8 +15,6 @@ async function RequestReset(req, res, next) { return res.status(500).send('Whoops something went wrong'); } - console.log(process.env.COURIER_AUTH_TOKEN); - const courier = CourierClient({ authorizationToken: process.env.COURIER_AUTH_TOKEN, }); diff --git a/server/routes/auth/ResetPassword.js b/server/routes/auth/ResetPassword.js index c79b7f7..a7a7a92 100644 --- a/server/routes/auth/ResetPassword.js +++ b/server/routes/auth/ResetPassword.js @@ -1,5 +1,5 @@ const forge = require('node-forge'); -const { ResetRequest } = require('../../models/index'); +const { ResetRequest } = require('../../db/models/index'); async function ResetPassword(req, res, next) { reqID = req.params.id; diff --git a/server/routes/auth/UpdateUserDetails.js b/server/routes/auth/UpdateUserDetails.js index 6048e35..d038d53 100644 --- a/server/routes/auth/UpdateUserDetails.js +++ b/server/routes/auth/UpdateUserDetails.js @@ -1,5 +1,5 @@ const { Op } = require('sequelize'); -const { User } = require('../../models/index'); +const { User } = require('../../db/models/index'); async function UpdateUserDetails(req, res, next) { const { token, ...body } = req.body; diff --git a/server/routes/org/AddOrgMember.js b/server/routes/org/AddOrgMember.js index 90cfcd4..fd08f81 100644 --- a/server/routes/org/AddOrgMember.js +++ b/server/routes/org/AddOrgMember.js @@ -1,4 +1,4 @@ -const { Organization } = require('../../models/index'); +const { Organization } = require('../../db/models/index'); async function AddOrgMember(req, res, next) { const user = req.user; diff --git a/server/routes/org/DeleteOrg.js b/server/routes/org/DeleteOrg.js index 15382a3..5ffa2b3 100644 --- a/server/routes/org/DeleteOrg.js +++ b/server/routes/org/DeleteOrg.js @@ -1,4 +1,4 @@ -const { Organization } = require('../../models/index'); +const { Organization } = require('../../db/models/index'); async function DeleteOrg(req, res, next) { const user = req.user; diff --git a/server/routes/org/GetOrg.js b/server/routes/org/GetOrg.js index 8622d96..cf6a095 100644 --- a/server/routes/org/GetOrg.js +++ b/server/routes/org/GetOrg.js @@ -1,4 +1,4 @@ -const { Organization } = require('../../models/index'); +const { Organization } = require('../../db/models/index'); async function GetOrg(req, res, next) { const user = req.user; diff --git a/server/routes/org/RemoveOrgMember.js b/server/routes/org/RemoveOrgMember.js index 3469de0..5cacc20 100644 --- a/server/routes/org/RemoveOrgMember.js +++ b/server/routes/org/RemoveOrgMember.js @@ -1,4 +1,4 @@ -const { Organization } = require('../../models/index'); +const { Organization } = require('../../db/models/index'); async function RemoveOrgMember(req, res, next) { const user = req.user; diff --git a/server/tests/auth/CreateUser.test.js b/server/tests/auth/CreateUser.test.js index 0513a37..51a124c 100644 --- a/server/tests/auth/CreateUser.test.js +++ b/server/tests/auth/CreateUser.test.js @@ -1,7 +1,6 @@ -require('dotenv').config(); const supertest = require('supertest'); -var { sequelize, Organization } = require('../../models/index'); +var { sequelize, Organization } = require('../../db/models/index'); const app = require('../../app'); const { createTestUser, createTestOrg } = require('../utils'); diff --git a/server/tests/auth/GetMemberOrgs.test.js b/server/tests/auth/GetMemberOrgs.test.js index 47aaa26..3b5a5af 100644 --- a/server/tests/auth/GetMemberOrgs.test.js +++ b/server/tests/auth/GetMemberOrgs.test.js @@ -1,7 +1,6 @@ -require('dotenv').config(); const supertest = require('supertest'); -var { sequelize } = require('../../models/index'); +var { sequelize } = require('../../db/models/index'); const app = require('../../app'); const { createTestOrg, createTestUser } = require('../utils'); diff --git a/server/tests/auth/GetOwnedOrgs.test.js b/server/tests/auth/GetOwnedOrgs.test.js index 2883703..9f98e37 100644 --- a/server/tests/auth/GetOwnedOrgs.test.js +++ b/server/tests/auth/GetOwnedOrgs.test.js @@ -1,7 +1,6 @@ -require('dotenv').config(); const supertest = require('supertest'); -var { sequelize, Token } = require('../../models/index'); +var { sequelize, Token } = require('../../db/models/index'); const app = require('../../app'); const { createTestUser } = require('../utils'); diff --git a/server/tests/auth/GetUserDetails.test.js b/server/tests/auth/GetUserDetails.test.js index 80c3aa9..0d1c827 100644 --- a/server/tests/auth/GetUserDetails.test.js +++ b/server/tests/auth/GetUserDetails.test.js @@ -1,7 +1,6 @@ -require('dotenv').config(); const supertest = require('supertest'); -var { sequelize, Token } = require('../../models/index'); +var { sequelize, Token } = require('../../db/models/index'); const app = require('../../app'); const { createTestToken, createTestUser } = require('../utils'); diff --git a/server/tests/auth/Login.test.js b/server/tests/auth/Login.test.js index 601fd32..06158db 100644 --- a/server/tests/auth/Login.test.js +++ b/server/tests/auth/Login.test.js @@ -1,7 +1,6 @@ -require('dotenv').config(); const supertest = require('supertest'); -var { sequelize, Token } = require('../../models/index'); +var { sequelize, Token } = require('../../db/models/index'); const app = require('../../app'); const { createTestUser } = require('../utils'); diff --git a/server/tests/auth/Logout.test.js b/server/tests/auth/Logout.test.js index 4e3eae9..f68de51 100644 --- a/server/tests/auth/Logout.test.js +++ b/server/tests/auth/Logout.test.js @@ -1,7 +1,6 @@ -require('dotenv').config(); const supertest = require('supertest'); -var { sequelize, Token } = require('../../models/index'); +var { sequelize, Token } = require('../../db/models/index'); const app = require('../../app'); const { createTestToken } = require('../utils'); diff --git a/server/tests/auth/RequestReset.test.js b/server/tests/auth/RequestReset.test.js index 103e228..47a510a 100644 --- a/server/tests/auth/RequestReset.test.js +++ b/server/tests/auth/RequestReset.test.js @@ -1,7 +1,6 @@ -require('dotenv').config(); const supertest = require('supertest'); -var { sequelize } = require('../../models/index'); +var { sequelize } = require('../../db/models/index'); const app = require('../../app'); const { createTestUser } = require('../utils'); diff --git a/server/tests/auth/ResetPassword.test.js b/server/tests/auth/ResetPassword.test.js index d0842de..e5e94ae 100644 --- a/server/tests/auth/ResetPassword.test.js +++ b/server/tests/auth/ResetPassword.test.js @@ -1,7 +1,6 @@ -require('dotenv').config(); const supertest = require('supertest'); -var { sequelize } = require('../../models/index'); +var { sequelize } = require('../../db/models/index'); const app = require('../../app'); const { createTestResetRequest } = require('../utils'); diff --git a/server/tests/auth/SetAudio.test.js b/server/tests/auth/SetAudio.test.js index 90b7609..245d490 100644 --- a/server/tests/auth/SetAudio.test.js +++ b/server/tests/auth/SetAudio.test.js @@ -1,7 +1,6 @@ -require('dotenv').config(); const supertest = require('supertest'); -var { sequelize } = require('../../models/index'); +var { sequelize } = require('../../db/models/index'); const app = require('../../app'); describe('SetAudio', function () { diff --git a/server/tests/auth/UpdateUserDetails.test.js b/server/tests/auth/UpdateUserDetails.test.js index fd7b934..c07f8d8 100644 --- a/server/tests/auth/UpdateUserDetails.test.js +++ b/server/tests/auth/UpdateUserDetails.test.js @@ -1,7 +1,6 @@ -require('dotenv').config(); const supertest = require('supertest'); -var { sequelize } = require('../../models/index'); +var { sequelize } = require('../../db/models/index'); const app = require('../../app'); const { createTestToken, createTestUser } = require('../utils'); diff --git a/server/tests/org/AddOrgMember.test.js b/server/tests/org/AddOrgMember.test.js index 8ed63e4..eac9c7b 100644 --- a/server/tests/org/AddOrgMember.test.js +++ b/server/tests/org/AddOrgMember.test.js @@ -1,7 +1,6 @@ -require('dotenv').config(); const supertest = require('supertest'); -var { sequelize } = require('../../models/index'); +var { sequelize } = require('../../db/models/index'); const app = require('../../app'); const { createTestOrg, createTestUser, createTestToken } = require('../utils'); diff --git a/server/tests/org/CreateOrg.test.js b/server/tests/org/CreateOrg.test.js index 0204d6f..d31dc22 100644 --- a/server/tests/org/CreateOrg.test.js +++ b/server/tests/org/CreateOrg.test.js @@ -1,7 +1,6 @@ -require('dotenv').config(); const supertest = require('supertest'); -var { sequelize, Token } = require('../../models/index'); +var { sequelize, Token } = require('../../db/models/index'); const app = require('../../app'); const { createTestUser } = require('../utils'); diff --git a/server/tests/org/DeleteOrg.test.js b/server/tests/org/DeleteOrg.test.js index 8126d82..352a36c 100644 --- a/server/tests/org/DeleteOrg.test.js +++ b/server/tests/org/DeleteOrg.test.js @@ -1,7 +1,6 @@ -require('dotenv').config(); const supertest = require('supertest'); -var { sequelize, Organization } = require('../../models/index'); +var { sequelize, Organization } = require('../../db/models/index'); const app = require('../../app'); const { createTestUser, createTestOrg } = require('../utils'); diff --git a/server/tests/org/GetOrg.test.js b/server/tests/org/GetOrg.test.js index 4b89660..e519ade 100644 --- a/server/tests/org/GetOrg.test.js +++ b/server/tests/org/GetOrg.test.js @@ -1,7 +1,6 @@ -require('dotenv').config(); const supertest = require('supertest'); -var { sequelize, Organization } = require('../../models/index'); +var { sequelize, Organization } = require('../../db/models/index'); const app = require('../../app'); const { createTestUser, createTestOrg } = require('../utils'); diff --git a/server/tests/org/RemoveOrgMember.test.js b/server/tests/org/RemoveOrgMember.test.js index 825c853..dd52163 100644 --- a/server/tests/org/RemoveOrgMember.test.js +++ b/server/tests/org/RemoveOrgMember.test.js @@ -1,7 +1,6 @@ -require('dotenv').config(); const supertest = require('supertest'); -var { sequelize } = require('../../models/index'); +var { sequelize } = require('../../db/models/index'); const app = require('../../app'); const { createTestUser, createTestOrg } = require('../utils'); diff --git a/server/tests/org/UpdateOrgDetails.test.js b/server/tests/org/UpdateOrgDetails.test.js index 47db1bf..27b3666 100644 --- a/server/tests/org/UpdateOrgDetails.test.js +++ b/server/tests/org/UpdateOrgDetails.test.js @@ -1,7 +1,6 @@ -require('dotenv').config(); const supertest = require('supertest'); -var { sequelize, Organization } = require('../../models/index'); +var { sequelize, Organization } = require('../../db/models/index'); const app = require('../../app'); const { createTestUser, createTestOrg, createTestToken } = require('../utils'); diff --git a/server/tests/utils.js b/server/tests/utils.js index 5b674ad..bba0e67 100644 --- a/server/tests/utils.js +++ b/server/tests/utils.js @@ -1,5 +1,5 @@ const forge = require('node-forge'); -const { User, Organization } = require('../models/index'); +const { User, Organization } = require('../db/models/index'); async function createTestUser(firstName, lastName, password) { const hashedPassword = forge.md.sha512