Added total time for all user statuses endpoint and patched tests to …

…run successfully!
malee31 · Dec 9, 2024 · c00230b · c00230b
1 parent b31c358
commit c00230b
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 16 deletions.
diff --git a/src/database/database-interface.js b/src/database/database-interface.js
@@ -1,8 +1,8 @@
 import { makeNewApiKey } from "../utils/apiKey.js";
 import { TESTING } from "../../config.js";
+import db, { ApiKey, Session, SessionAssociation, User } from "./database.js";
+import sequelize, { Op } from "sequelize";
 import tableNames from "./table-names.js";
-import db, { ApiKey, Session, User } from "./database.js";
-import { Op, QueryTypes, col } from "sequelize";
 
 // This file acts as an abstraction layer between the database and the code for easy compatibility with any database
 // This file should contain methods to interact and manipulate database information
@@ -99,18 +99,38 @@ export async function getAllUsers() {
 
 export async function getAllUsersWithStatus() {
 	const users = await User.findAll({
-		attributes: ["id", "first_name", "last_name"],
+		attributes: [
+			"id",
+			"first_name",
+			"last_name",
+			[
+				// Note the wrapping parentheses in the call below!
+				sequelize.literal(`(
+                    SELECT SUM(endTime)
+                    FROM ${tableNames.sessions} AS Sessions
+                    WHERE User.password = Sessions.password
+                    AND Sessions.endTime IS NOT NULL
+                )`),
+				"total_end",
+			],
+			[
+				// Note the wrapping parentheses in the call below!
+				sequelize.literal(`(
+                    SELECT SUM(startTime)
+                    FROM ${tableNames.sessions} AS Sessions
+                    WHERE User.password = Sessions.password
+                    AND Sessions.endTime IS NOT NULL
+                )`),
+				"total_start",
+			]
+		],
 		include: [{
 			model: Session,
-			association: User.hasMany(Session, {
-				as: "session_data",
-				sourceKey: "session",
-				foreignKey: "session_id"
-			}),
+			association: SessionAssociation,
 			attributes: ["session_id", "startTime", "endTime"],
 			where: {
 				password: {
-					[Op.eq]: col('User.password')
+					[Op.eq]: "User.password"
 				}
 			},
 			required: false  // This is effectively the Sequelize equivalent of a `LEFT JOIN` in SQL
@@ -133,6 +153,12 @@ export async function getAllUsersWithStatus() {
 			userStatus.session = null;
 		}
 
+		userStatus.total_sessions = 0;
+		if(userStatus["total_start"] && userStatus["total_end"]) {
+			userStatus.total_sessions = userStatus["total_end"] - userStatus["total_start"];
+		}
+		delete userStatus["total_start"];
+		delete userStatus["total_end"];
 		delete userStatus[`session_data.session_id`];
 		delete userStatus[`session_data.startTime`];
 		delete userStatus[`session_data.endTime`];

diff --git a/src/database/database.js b/src/database/database.js
@@ -12,7 +12,7 @@
  */
 
 // Configure SQL credentials from environment variables
-import { Sequelize, DataTypes, Model } from "sequelize";
+import { DataTypes, Model, Sequelize } from "sequelize";
 import tableNames from "./table-names.js";
 import { MYSQL_DATABASE, MYSQL_HOST, MYSQL_PASSWORD, MYSQL_USER, PRODUCTION, TESTING } from "../../config.js";
 
@@ -114,7 +114,7 @@ User.init({
 		type: DataTypes.INTEGER,
 		references: {
 			model: Session,
-			key: "session_id"
+			key: "session_id",
 		},
 		defaultValue: null,
 		onDelete: "CASCADE"
@@ -125,6 +125,13 @@ User.init({
 	timestamps: false
 });
 
+export const SessionAssociation = User.hasMany(Session, {
+	as: "session_data",
+	foreignKey: "session_id",
+	sourceKey: "session",
+	constraints: false
+});
+
 // Generates tables if they do not exist
 // WARNING: Will not modify tables with an updated schema if they already exist
 async function createTables() {
@@ -136,12 +143,12 @@ async function createTables() {
 
 // Purges all tables and data
 // Restarting the server should regenerate new tables using createTables()
-async function dropTables() {
+async function dropTables(logging = true) {
 	// All logging turned on for this extremely destructive action
 	await sequelize.drop({
 		cascade: true,
 		benchmark: true,
-		logging: console.info
+		logging: logging ? console.info : false
 	});
 }
 

diff --git a/src/routes/users/users.js b/src/routes/users/users.js
@@ -35,7 +35,6 @@ usersRouter.get("/", async (req, res) => {
 
 usersRouter.get("/status", async (req, res) => {
 	// List all user data with statuses
-	// TODO: Join with sessions
 	const allUsers = await getAllUsersWithStatus();
 	return res.status(200).send({
 		ok: true,

diff --git a/src/utils/testUtils.js b/src/utils/testUtils.js
@@ -109,8 +109,8 @@ export async function insertTestSession(_testSessionObj) {
 export async function associateSession(password, sessionId) {
 	// TODO: Check for errors and success
 	const [_, sessionAffectedRows] = await db.query(`UPDATE ${tableNames.users}
-                                                  SET session = ?
-                                                  WHERE password = ?`, {
+                                                     SET session = ?
+                                                     WHERE password = ?`, {
 		type: QueryTypes.UPDATE,
 		replacements: [sessionId, password]
 	});