Merge branch 'main' of https://github.com/junidy/COP4710Project

backend/rest-test.http

@@ -186,3 +186,10 @@ DELETE {{base}}/comments/{{feedbackId}}
 Authorization: Bearer {{jwtToken}}
 
 # responds 200 OK if successful
+
+### UNIVERSITIES #####################################################
+
+### Get list of all universities
+GET {{base}}/universities
+
+# responds 200 OK if successful

backend/src/endpoints/auth.js

@@ -11,10 +11,10 @@ const jwtSecretKey = process.env.JWT_SECRET_KEY;
 
 // Create a MySQL pool connection
 const pool = createPool({
-  host: 'localhost',
-  user: 'root',
-  password: 'password',
-  database: 'cop4710',
+  host: process.env.DB_HOST || 'localhost',
+  user: process.env.DB_USER || 'root',
+  password: process.env.DB_PASSWORD || 'password',
+  database: process.env.DB_NAME || 'cop4710',
   waitForConnections: true,
   connectionLimit: 10,
   queueLimit: 0

backend/src/endpoints/comments.js

@@ -5,10 +5,13 @@ import jwt from 'jsonwebtoken';
 
 // Database connection setup
 const dbConfig = {
-  host: 'localhost',
-  user: 'root',
-  password: 'password',
-  database: 'cop4710'
+  host: process.env.DB_HOST || 'localhost',
+  user: process.env.DB_USER || 'root',
+  password: process.env.DB_PASSWORD || 'password',
+  database: process.env.DB_NAME || 'cop4710',
+  waitForConnections: true,
+  connectionLimit: 10,
+  queueLimit: 0
 };
 const pool = mysql.createPool(dbConfig);
 

backend/src/endpoints/events.js

@@ -13,10 +13,11 @@ dotenv.config();
 
 const router = express.Router();
 const db = mysql.createPool({
-  host: 'localhost',
-  user: 'root',
-  password: 'password',
-  database: 'cop4710'
+  host: process.env.DB_HOST || 'localhost',
+  port: process.env.DB_PORT || 3306,
+  user: process.env.DB_USER || 'root',
+  password: process.env.DB_PASS || 'password',
+  database: process.env.DB_NAME || 'cop4710'
 });
 const query = promisify(db.query).bind(db);
 

backend/src/endpoints/rsos.js

@@ -8,10 +8,10 @@ dotenv.config();
 
 const router = express.Router();
 const db = mysql.createPool({
-  host: 'localhost',
-  user: 'root',
-  password: 'password',
-  database: 'cop4710'
+  host: process.env.DB_HOST || 'localhost',
+  user: process.env.DB_USER || 'root',
+  password: process.env.DB_PASSWORD || 'password',
+  database: process.env.DB_NAME || 'cop4710'
 });
 const query = promisify(db.query).bind(db);
 

backend/src/endpoints/universities.js

@@ -0,0 +1,33 @@
+import express from 'express';
+import { promisify } from 'util';
+import mysql from 'mysql2';
+
+import dotenv from 'dotenv';
+dotenv.config();
+
+const router = express.Router();
+const db = mysql.createPool({
+    host: process.env.DB_HOST || 'localhost',
+    port: process.env.DB_PORT || 3306,
+    user: process.env.DB_USER || 'root',
+    password: process.env.DB_PASS || 'password',
+    database: process.env.DB_NAME || 'cop4710'
+});
+const query = promisify(db.query).bind(db);
+
+// Return a list of university names
+router.get('/', async (req, res) => {
+    try {
+        const universities = await query('SELECT university_id, name FROM universities');
+        const formattedResponse = universities.map(university => ({
+            id: university.university_id,
+            name: university.name
+        }));
+        res.json(formattedResponse);
+    } catch (error) {
+        console.error(error);
+        res.status(500).json({ error: 'Internal server error' });
+    }
+});
+
+export default router;

backend/src/server.js

@@ -8,6 +8,7 @@ import authRouter from './endpoints/auth.js';
 import commentsRouter from './endpoints/comments.js';
 import rsosRouter from './endpoints/rsos.js';
 import eventsRouter from './endpoints/events.js';
+import universitiesRouter from './endpoints/universities.js';
 
 const app = express();
 
@@ -20,6 +21,7 @@ app.use('/auth', authRouter);
 app.use('/comments', commentsRouter);
 app.use('/rsos', rsosRouter);
 app.use('/events', eventsRouter);
+app.use('/universities', universitiesRouter);
 
 // Catch-all route for unhandled requests
 app.use('*', (req, res) => {