Added time checking function for expired user_roles and added time assigned column to user_roles table

Author: ericwu2205

lib/database/database.js

@@ -27,7 +27,7 @@ class DBuser {
     load_db_login() {
         // Get document, or throw exception on error
         try {
-            const doc = yaml.load(fs.readFileSync("../../config/database.yml"));
+            const doc = yaml.load(fs.readFileSync("./config/database.yml"));
             return doc;
         } catch (e) {
             console.log(e);
@@ -90,14 +90,14 @@ class DBuser {
         const client = await this.pool.connect();
         try {
             if ((await this.check_table("users")) == false) {
-                // console.log("Running create_table")
+                console.log("Running creating user table");
                 await client.query("BEGIN");
                 const query = `CREATE TABLE users (
                     userid INTEGER PRIMARY KEY,
                     joindate DATE NOT NULL,
                     leavedate DATE,
                     userleft BOOLEAN
-                );`;
+                )`;
                 await client.query(query);
                 await client.query("COMMIT");
             }
@@ -112,23 +112,28 @@ class DBuser {
 
     // Creates the user roles table
     async create_table_user_roles() {
-        const client = await this.pool.connect();
+        const client = await this.pool.connect();        
         try {
-            if ((await this.check_table("user_roles")) == false) {
-                // console.log("Running create_table")
-                await client.query("BEGIN");
+            // if ((await this.check_table("user_roles")) == false) {
+
+            await client.query("BEGIN");
                 const query = `CREATE TABLE user_roles (
                     rid INTEGER PRIMARY KEY,
-                    userid INTEGER NOT NULL,
+                    userid BIGINT NOT NULL,
                     role varchar(64),
-                    FOREIGN KEY (userid)
-                    REFERENCES users (userid)
-                );`;
+                    time_assigned TIMESTAMP
+                )`;
                 await client.query(query);
                 await client.query("COMMIT");
-            }
+            // } else {
+                // console.log("Deleting create_user_roles_table");
+                // await client.query("BEGIN");
+                // const query = `DROP TABLE user_roles`;
+                // await client.query(query);
+                // await client.query("COMMIT");
+            // }
         } catch (ex) {
-            console.log(`Something wrong happend ${ex}`);
+            console.log(`Something wrong happende:${ex}`);
         } finally {
             await client.query("ROLLBACK");
             client.release();
@@ -170,12 +175,12 @@ class DBuser {
                 // console.log("Running create_table")
                 await client.query("BEGIN");
                 const query = `CREATE TABLE user_permissions (
-            pid INTEGER PRIMARY KEY,
-            userid INTEGER NOT NULL,
-            permission varchar(64),
-            FOREIGN KEY (userid)
-            REFERENCES users (userid)
-        );`;
+                    pid INTEGER PRIMARY KEY,
+                    userid INTEGER NOT NULL,
+                    permission varchar(64),
+                    FOREIGN KEY (userid)
+                    REFERENCES users (userid)
+                );`;
                 await client.query(query);
                 await client.query("COMMIT");
             }
@@ -250,33 +255,31 @@ class DBuser {
         const client = await this.pool.connect();
         try {
             await client.query("BEGIN");
-
             let query = "SELECT max(rid) from user_roles";
             let result = await client.query(query);
 
             const count = result.rows[0]["max"] + 1;
-            query = "INSERT INTO user_roles (RID, USERID, ROLE) VALUES ($1,$2,$3)";
+            query = "INSERT INTO user_roles (RID, USERID, ROLE, TIME_ASSIGNED) VALUES ($1,$2,$3,NOW())";
             const values = [count, userid, role];
             result = await client.query(query, values);
 
             await client.query("COMMIT");
         } catch (ex) {
-            console.log(`Something wrong happend ${ex}`);
+            console.log(`Something wrong happend when trying to add user role to table ${ex}`);
         } finally {
             await client.query("ROLLBACK");
             client.release();
             // console.log("Client released successfully.")
         }
-    }
+    }    
 
     // Removing a user role
     async remove_user_role(userid, role) {
         const client = await this.pool.connect();
         try {
             await client.query("BEGIN");
             const values = [userid, role];
-            const query = `DELETE FROM user_roles
-        where userid = $1 and role = $2`;
+            const query = `DELETE FROM user_roles where userid = $1 and role = $2`;
             await client.query(query, values);
             await client.query("COMMIT");
         } catch (ex) {
@@ -456,6 +459,31 @@ class DBuser {
             // console.log("Client released successfully.")
         }
     }
+
+    async checkTimeAssigned() {
+        const client = await this.pool.connect();
+        try {
+            // Query to select rows where time_assigned is older than 1 hour
+            const query = `
+                SELECT * FROM user_roles WHERE time_assigned < NOW() - interval '1 year'
+            `;
+            
+            const result = await client.query(query);
+
+            const old_roles = result.rows.map(row => ({
+                role_name: row.role,
+                userid: row.userid
+            }));
+            
+            return old_roles;
+        } catch (error) {
+            console.error(error);
+            return old_roles;
+        } finally {
+            client.release();
+        }
+    }
+
 }
 
 module.exports = {