Completed the test and debugging

Author: dale1213

IndividualProject/src/main/java/dev/coms4156/project/individualproject/Course.java

@@ -35,8 +35,13 @@ public Course(String instructorName, String courseLocation, String timeSlot, int
    * @return true if the student is successfully enrolled, false otherwise.
    */
   public boolean enrollStudent() {
-    enrolledStudentCount++;
-    return false;
+    if (enrolledStudentCount < enrollmentCapacity) {
+      enrolledStudentCount++;
+      return true;
+    }
+    else {
+      return false;
+    }
   }
 
   /**
@@ -45,8 +50,13 @@ public boolean enrollStudent() {
    * @return true if the student is successfully dropped, false otherwise.
    */
   public boolean dropStudent() {
-    enrolledStudentCount--;
-    return false;
+    if (enrolledStudentCount > 0) {
+      enrolledStudentCount--;
+      return true;
+    }
+    else {
+      return false;
+    }
   }
 
 
@@ -92,7 +102,7 @@ public void setEnrolledStudentCount(int count) {
 
 
   public boolean isCourseFull() {
-    return enrollmentCapacity < enrolledStudentCount;
+    return enrollmentCapacity <= enrolledStudentCount;
   }
 
   @Serial

IndividualProject/src/main/java/dev/coms4156/project/individualproject/RouteController.java

@@ -43,10 +43,10 @@ public ResponseEntity<?> retrieveDepartment(@RequestParam(value = "deptCode") St
       departmentMapping = IndividualProjectApplication.myFileDatabase.getDepartmentMapping();
 
       if (!departmentMapping.containsKey(deptCode.toUpperCase())) {
-        return new ResponseEntity<>("Department Not Found", HttpStatus.OK);
+        return new ResponseEntity<>("Department Not Found", HttpStatus.NOT_FOUND);
       } else {
-        return new ResponseEntity<>(departmentMapping.get(deptCode.toUpperCase()).toString(),
-            HttpStatus.NOT_FOUND);
+        return new ResponseEntity<>(departmentMapping.get(deptCode.toUpperCase()),
+            HttpStatus.OK);
       }
 
     } catch (Exception e) {
@@ -84,8 +84,8 @@ public ResponseEntity<?> retrieveCourse(
         if (!coursesMapping.containsKey(Integer.toString(courseCode))) {
           return new ResponseEntity<>("Course Not Found", HttpStatus.NOT_FOUND);
         } else {
-          return new ResponseEntity<>(coursesMapping.get(Integer.toString(courseCode)).toString(),
-              HttpStatus.FORBIDDEN);
+          return new ResponseEntity<>(coursesMapping.get(Integer.toString(courseCode)),
+              HttpStatus.OK);
         }
 
       }
@@ -124,7 +124,12 @@ public ResponseEntity<?> isCourseFull(
         coursesMapping = departmentMapping.get(deptCode).getCourseSelection();
 
         Course requestedCourse = coursesMapping.get(Integer.toString(courseCode));
-        return new ResponseEntity<>(requestedCourse.isCourseFull(), HttpStatus.OK);
+        
+        HashMap<String, Boolean> jsonResponseConverter = new HashMap<>();
+        jsonResponseConverter.put("isFull", requestedCourse.isCourseFull());
+
+        return new ResponseEntity<>(jsonResponseConverter, HttpStatus.OK);
+        
       } else {
         return new ResponseEntity<>("Course Not Found", HttpStatus.NOT_FOUND);
       }
@@ -151,8 +156,10 @@ public ResponseEntity<?> getMajorCtFromDept(@RequestParam(value = "deptCode") St
       if (doesDepartmentExists) {
         HashMap<String, Department> departmentMapping;
         departmentMapping = IndividualProjectApplication.myFileDatabase.getDepartmentMapping();
-        return new ResponseEntity<>("There are: " + -departmentMapping.get(deptCode)
-            .getNumberOfMajors() + " majors in the department", HttpStatus.OK);
+        
+        return new ResponseEntity<>("{\"majorCt\": " + 
+        departmentMapping.get(deptCode).getNumberOfMajors() + "}",
+            HttpStatus.OK);
       }
       return new ResponseEntity<>("Department Not Found", HttpStatus.FORBIDDEN);
     } catch (Exception e) {
@@ -177,8 +184,9 @@ public ResponseEntity<?> identifyDeptChair(@RequestParam(value = "deptCode") Str
       if (doesDepartmentExists) {
         HashMap<String, Department> departmentMapping;
         departmentMapping = IndividualProjectApplication.myFileDatabase.getDepartmentMapping();
-        return new ResponseEntity<>(departmentMapping.get(deptCode).getDepartmentChair() + " is "
-            + "the department chair.", HttpStatus.OK);
+        return new ResponseEntity<>("{\"departmentChair\": \"" + 
+        departmentMapping.get(deptCode).getDepartmentChair() + "\"}",
+                 HttpStatus.OK);
       }
       return new ResponseEntity<>("Department Not Found", HttpStatus.NOT_FOUND);
     } catch (Exception e) {
@@ -215,8 +223,8 @@ public ResponseEntity<?> findCourseLocation(
         coursesMapping = departmentMapping.get(deptCode).getCourseSelection();
 
         Course requestedCourse = coursesMapping.get(Integer.toString(courseCode));
-        return new ResponseEntity<>(requestedCourse.getCourseLocation() + " is where the course "
-            + "is located.", HttpStatus.OK);
+        return new ResponseEntity<>("{\"location\": \"" + requestedCourse.getCourseLocation() + "\"}", 
+        HttpStatus.OK);
       } else {
         return new ResponseEntity<>("Course Not Found", HttpStatus.NOT_FOUND);
       }
@@ -255,8 +263,11 @@ public ResponseEntity<?> findCourseInstructor(
         coursesMapping = departmentMapping.get(deptCode).getCourseSelection();
 
         Course requestedCourse = coursesMapping.get(Integer.toString(courseCode));
-        return new ResponseEntity<>(requestedCourse.getInstructorName() + " is the instructor for"
-            + " the course.", HttpStatus.OK);
+        HashMap<String, String> response = new HashMap<>();
+        response.put("instructor", requestedCourse.getInstructorName());
+
+        return new ResponseEntity<>(response, HttpStatus.OK);
+        
       } else {
         return new ResponseEntity<>("Course Not Found", HttpStatus.NOT_FOUND);
       }
@@ -295,8 +306,10 @@ public ResponseEntity<?> findCourseTime(
         coursesMapping = departmentMapping.get(deptCode).getCourseSelection();
 
         Course requestedCourse = coursesMapping.get(Integer.toString(courseCode));
-        return new ResponseEntity<>("The course meets at: " + "some time ",
-            HttpStatus.OK);
+        HashMap<String, String> response = new HashMap<>();
+        response.put("time", requestedCourse.getCourseTimeSlot());
+
+        return new ResponseEntity<>(response, HttpStatus.OK);
       } else {
         return new ResponseEntity<>("Course Not Found", HttpStatus.NOT_FOUND);
       }

IndividualProject/src/test/java/dev/coms4156/project/individualproject/CourseUnitTests.java

@@ -81,14 +81,14 @@ public void setEnrolledStudentCountTest() {
 
   @Test
   public void enrollStudentTest() {
-    testCourse.setEnrolledStudentCount(250);
+    testCourse.setEnrolledStudentCount(249);
     testCourse.enrollStudent();
     assertEquals(true, testCourse.isCourseFull());
   }
 
   @Test
   public void dropStudentTest() {
-    testCourse.setEnrolledStudentCount(251);
+    testCourse.setEnrolledStudentCount(250);
     testCourse.dropStudent();
     assertEquals(false, testCourse.isCourseFull());
   }

IndividualProject/src/test/java/dev/coms4156/project/individualproject/MyFileDatabaseUnitTest.java

@@ -57,8 +57,21 @@ public void setMappingTest() {
 
     @Test
     public void toStringTest() {
-        System.out.println(testMyFileDatabase.toString());
-        assertEquals(0, 0);
+        HashMap<String, Department> currentMapping = testMyFileDatabase.getDepartmentMapping();
+
+        Course testCourse = new Course("Griffin Newbold", "417 IAB", "11:40-12:55", 250);
+        HashMap<String, Course> testCourses = new HashMap<String, Course>();
+        testCourses.put("4156", testCourse);
+
+        Department testDepartment = new Department("COMS", testCourses, "Griffin Newbold", 2700);
+        HashMap<String, Department> testDepartmentMapping = new HashMap<String, Department>();
+        testDepartmentMapping.put("COMS", testDepartment);
+
+        testMyFileDatabase.setMapping(testDepartmentMapping);
+
+        assertEquals("For the COMS department: \nCOMS 4156: \nInstructor: Griffin Newbold; Location: 417 IAB; Time: 11:40-12:55\n", testMyFileDatabase.toString());
+
+        testMyFileDatabase.setMapping(currentMapping);
     }
 
     @Test