Transition more queries to Sequelize Raw Queries and fix up a majorit…

…y of the tests to not fail

index.js

@@ -1,6 +1,6 @@
 import { API_PORT } from "./config.js";
 import app, { activateApiRouter } from "./src/app.js";
-import database from "./src/database/database.js";
+import * as database from "./src/database/database.js";
 
 app.listen(API_PORT, () => {
 	console.log("Server Active");

jest-global-setup.js

@@ -4,7 +4,7 @@ import { fileURLToPath } from "url";
 import { v4 as uuidv4 } from "uuid";
 import { _globalTeardown } from "./jest-global-teardown.js";
 import * as CONFIG from "./config.js";
-import database from "./src/database/database.js";
+import {start as databaseStart} from "./src/database/database.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -21,7 +21,7 @@ export default async function globalSetup() {
 	await _setupNonce();
 
 	// Creates tables
-	await database.start();
+	await databaseStart();
 	// All tests can now instantiate their own data with createUser() and createSession()
 	// Tests may import convenience methods from testUtils.js
 }

jest-global-teardown.js

@@ -1,7 +1,7 @@
 import fs from "fs";
 import path from "path";
 import { fileURLToPath } from "url";
-import database from "./src/database/database.js";
+import {start as databaseStart, end as databaseEnd, _dropTables} from "./src/database/database.js";
 
 export default async function globalTeardown() {
 	// TODO: Tear down the test environment in its entirety
@@ -22,10 +22,10 @@ export async function _globalTeardown(nonceDir, nonceFile = "") {
 
 	// TODO: Take a snapshot of the database
 	// Tears down the test database
-	await database.start(true);
-	await database._dropTables();
+	await databaseStart(true);
+	await _dropTables();
 	if(global.setupUsed || global.teardownOnly) {
-		await database.end();
+		await databaseEnd();
 	}
 
 	_clearNonce(nonceDir, nonceFile);

jest-setup.js

@@ -1,6 +1,6 @@
 import * as matchers from "jest-extended";
 import * as testUtils from "./src/utils/testUtils.js";
-import database from "./src/database/database.js";
+import * as database from "./src/database/database.js";
 
 global._utils = testUtils;
 

package.json

@@ -25,6 +25,7 @@
 		"dotenv": "^16.4.5",
 		"express": "^4.21.0",
 		"mysql2": "^3.11.3",
+		"sequelize": "^6.37.4",
 		"uuid": "^10.0.0"
 	},
 	"devDependencies": {

setup/setup-mysql.sql

@@ -16,4 +16,6 @@ CREATE USER 'INSERT_API_USER_NAME_HERE'@'localhost' IDENTIFIED BY 'INSERT_API_US
     -- Select from Tables
     -- Insert to Tables
     -- Update to Tables
-    -- Delete from Tables
+    -- Delete from Tables
+GRANT ALL PRIVILEGES ON `INSERT_DATABASE_NAME_HERE`.* TO 'INSERT_API_USER_NAME_HERE'@'localhost';
+FLUSH PRIVILEGES;

src/database/__mocks__/database-interface.js

@@ -1,5 +1,5 @@
 const { TESTING } = require("../../../config.js");
-const actualDatabase = require("../database.js").default;
+const actualDatabaseStart = require("../database.js").start;
 const actualDBI = jest.requireActual("../database-interface.js");
 const mockedDBI = jest.createMockFromModule("../database-interface.js");
 
@@ -14,7 +14,7 @@ mockedDBI.setupTestingDatabase = async () => {
 		throw new Error("Refusing to connect to Production DB in testing");
 	}
 	Object.assign(mockedDBI, actualDBI);
-	await actualDatabase.start();
+	await actualDatabaseStart();
 }
 
 module.exports = mockedDBI;