Merge pull request #300 from agiledev-students-fall2023/Sprint/4/spik…

…e/299

Sprint/4/spike/299

back-end/app.js

@@ -7,7 +7,6 @@ import url from "url";
 import path from "path";
 import login from "./src/routes/login.js";
 import studentIssues from "./src/routes/studentIssues.js";
-import studentIssueViewDetails from "./src/routes/studentIssueViewDetails.js";
 import studentIssueUpdate from "./src/routes/studentIssueUpdate.js";
 import adminIssues from "./src/routes/adminIssues.js";
 import adminIssueViewDetails from "./src/routes/adminIssueViewDetails.js";

back-end/package.json

@@ -4,11 +4,11 @@
   "description": "The back-end of your project will live in this directory.",
   "main": "index.js",
   "scripts": {
-    "test": "NODE_ENV=test mocha test/**/*.test.js",
+    "test": "mocha test/**/*.test.js",
     "start": "node server.js",
     "dev": "nodemon server.js",
     "lint": "eslint **/*.js",
-    "coverage": "NODE_ENV=test c8 mocha test/**/*.test.js"
+    "coverage": "c8 mocha test/**/*.test.js"
   },
   "keywords": [],
   "author": "",

back-end/src/controllers/adminIssuesHandler.js

@@ -4,8 +4,8 @@ export async function issueRetrievalHandler(req, res) {
     const { paramName } = req.params;
 
     try {
+        // Check if issues exist for the department
         const issues = await IssueModel.find({ "departments": paramName });
-
         res.json(issues);
     } catch (error) {
         console.error("Error retrieving data:", error.message);

back-end/src/controllers/studentIssueViewDetailsHandler.js

@@ -1,35 +1,29 @@
 import Issue from '../../models/issueModel.js';
 
-// The function retrieves all the issues related to this student
 export async function studentIssueViewDetailsHandler(req, res) {
-  const { paramName } = req.params;
-  const { studentNetID } = req.params;
+  const { paramName } = req.params; // Get the issue index from request params
+  const { studentNetID } = req.params; // Get the studentNetID from request params
 
+  // Check if studentNetID is missing or invalid
   if (!studentNetID) {
     return res.status(400).send("Missing or invalid studentNetID.");
   }
 
+  // Check if paramName (issue index) is missing or invalid
   if (!paramName) {
     return res.status(400).send("Missing or invalid issue index.");
   }
 
   try {
+    // Query the database to find issues that match both studentNetID and index
+    const response = await Issue.find({ studentNetID: studentNetID, index: paramName });
 
-    const response = await Issue.find({ index: paramName });
-
-    // Check if any data is returned for the student
+    // Check if no matching issues are found
     if (!response || response.length === 0) {
-      return res.status(500).send("No issues found for the given studentNetID.");
-    }
-
-    // Check if the specific issue index exists
-    if (response.length === 0) {
-      return res.status(500).send("Issue with the given index not found.");
+      return res.status(500).send("No issues found for the given studentNetID and index.");
     }
-
-    res.json(response); // Send only the data that matches the specific issue index
+    res.json(response);
   } catch (error) {
-    // Log the error and send an appropriate response
     console.error("Error retrieving data:", error.message);
     res.status(500).send("An error occurred while retrieving the data.");
   }

back-end/test/adminIssues.test.js

@@ -0,0 +1,39 @@
+/* eslint-disable */
+import chai, { assert } from "chai";
+import IssueModel from "../models/issueModel.js";
+import chaiHttp from "chai-http";
+import server from "../app.js";
+
+chai.use(chaiHttp);
+
+process.env.NODE_ENV = "test";
+
+// Integration tests for the adminIssues.js file
+describe("Integration Tests for Admin Issue Handler Endpoint", () => {
+    describe("GET /api/issues/admin/:paramName", () => {
+        it("should retrieve all issues for a valid admin user", async () => {
+            const paramName = "admin";
+            const res = await chai
+                .request(server)
+                .get(`/api/issues/admin/${paramName}`);
+            // Check that the response is correct
+            assert.equal(res.status, 200);
+            // Check that the response is an array
+            assert.isArray(res.body);
+            // Check that the response is the same length as the number of issues
+            const userIssues = await IssueModel.find({ "departments": paramName });
+            // Check that the response is the same length as the number of issues of that user
+            assert.equal(res.body.length, userIssues.length);
+        });
+
+        it("should handle errors gracefully for an invalid admin user", async () => {
+            const paramName = "invalid";
+            const res = await chai
+                .request(server)
+                .get(`/api/issues/admin/${paramName}`);
+            assert.equal(res.status, 200);
+            assert.deepEqual(res.body, []);
+        });
+    });
+});
+/* eslint-enable */

back-end/test/login.test.js

@@ -4,6 +4,8 @@ import chaiHttp from "chai-http";
 import server from "../app.js";
 
 chai.use(chaiHttp);
+process.env.NODE_ENV = "test";
+
 // Integration tests for the login.js file
 describe("Integration Tests for Login Endpoints", () => {
   // Check student login