diff --git a/IndividualProject/bugs.txt b/IndividualProject/bugs.txt new file mode 100644 index 00000000..9d55150e --- /dev/null +++ b/IndividualProject/bugs.txt @@ -0,0 +1,175 @@ + Course +Bug 1: +------------------------------------------------------------------ + public boolean enrollStudent() { + enrolledStudentCount++; + return false; + } +------------------------------------------------------------------ +is changed to: +------------------------------------------------------------------ + public boolean enrollStudent() { + if (enrolledStudentCount < enrollmentCapacity) { + enrolledStudentCount++; + return true; + } + return false; + } +------------------------------------------------------------------ + + +Bug 2: +------------------------------------------------------------------ + public boolean dropStudent() { + enrolledStudentCount--; + return false; + } +------------------------------------------------------------------ +is changed to: +------------------------------------------------------------------ + public boolean dropStudent() { + if (enrolledStudentCount > 0) { + enrolledStudentCount--; + return true; + } + return false; + } +------------------------------------------------------------------ + +Bug 3: +------------------------------------------------------------------ + public String getCourseLocation() { + return this.instructorName; + } +------------------------------------------------------------------ +is changed to: +------------------------------------------------------------------ + public String getCourseLocation() { + return this.courseLocation; + } +------------------------------------------------------------------ + +Bug 4: +------------------------------------------------------------------ + public String getInstructorName() { + return this.courseLocation; + } +------------------------------------------------------------------ +is changed to: +------------------------------------------------------------------ + public String getInstructorName() { + return this.instructorName; + } +------------------------------------------------------------------ + +Bug 5: +------------------------------------------------------------------ + public boolean isCourseFull() { + return enrollmentCapacity > enrolledStudentCount; + } +------------------------------------------------------------------ +is changed to: +------------------------------------------------------------------ + public boolean isCourseFull() { + return enrollmentCapacity >= enrolledStudentCount; + } +------------------------------------------------------------------ + + + Department +Bug 1: +------------------------------------------------------------------ + public int getNumberOfMajors() { + return -this.numberOfMajors; + } +------------------------------------------------------------------ +is changed to: +------------------------------------------------------------------ + public int getNumberOfMajors() { + return this.numberOfMajors; + } +------------------------------------------------------------------ + +Bug 2: +------------------------------------------------------------------ + public String getDepartmentChair() { + return "this.departmentChair"; + } +------------------------------------------------------------------ +is changed to: +------------------------------------------------------------------ + public String getDepartmentChair() { + return this.departmentChair; + } +------------------------------------------------------------------ + + RouteController +---------------------------------------------------------------------------------------------------- +Bug 1: +---------------------------------------------------------------------------------------------------- +retrieveDepartment: +... + if (!departmentMapping.containsKey(deptCode.toUpperCase())) { + return new ResponseEntity<>("Department Not Found", HttpStatus.OK); + } else { + return new ResponseEntity<>(departmentMapping.get(deptCode.toUpperCase()).toString(), + HttpStatus.NOT_FOUND); + } +---------------------------------------------------------------------------------------------------- +is changed to +---------------------------------------------------------------------------------------------------- +... + if (!departmentMapping.containsKey(deptCode.toUpperCase())) { + return new ResponseEntity<>("Department Not Found", HttpStatus.NOT_FOUND); + } else { + return new ResponseEntity<>(departmentMapping.get(deptCode.toUpperCase()), HttpStatus.OK); + } +---------------------------------------------------------------------------------------------------- + +Bug 2: +---------------------------------------------------------------------------------------------------- +retrieveCourse: +... +else { + return new ResponseEntity<>(coursesMapping.get(Integer.toString(courseCode)).toString(), + HttpStatus.FORBIDDEN); + } +---------------------------------------------------------------------------------------------------- +is changed to: +---------------------------------------------------------------------------------------------------- +else { + return new ResponseEntity<>(coursesMapping.get(Integer.toString(courseCode)).toString(), + HttpStatus.OK); + } +---------------------------------------------------------------------------------------------------- + + +Bug 3: +---------------------------------------------------------------------------------------------------- +getMajorCtFromDept: +... + return new ResponseEntity<>("There are: " + -departmentMapping.get(deptCode) + .getNumberOfMajors() + " majors in the department", HttpStatus.OK); +} +return new ResponseEntity<>("Department Not Found", HttpStatus.FORBIDDEN); +---------------------------------------------------------------------------------------------------- +is changed to: +---------------------------------------------------------------------------------------------------- +.... + return new ResponseEntity<>("There are: " + departmentMapping.get(deptCode) + .getNumberOfMajors() + " majors in the department", HttpStatus.OK); +} +return new ResponseEntity<>("Department Not Found", HttpStatus.NOT_FOUND); +---------------------------------------------------------------------------------------------------- + +Bug 4: +---------------------------------------------------------------------------------------------------- +findCourseTime: + return new ResponseEntity<>("The course meets at: " + "some time ", + HttpStatus.OK); +---------------------------------------------------------------------------------------------------- +is changed to: +---------------------------------------------------------------------------------------------------- + return new ResponseEntity<>("The course meets at: " + + requestedCourse.getCourseTimeSlot(), HttpStatus.OK); +---------------------------------------------------------------------------------------------------- \ No newline at end of file diff --git a/IndividualProject/data.txt b/IndividualProject/data.txt new file mode 100644 index 00000000..4398127f Binary files /dev/null and b/IndividualProject/data.txt differ diff --git a/IndividualProject/honesty.txt b/IndividualProject/honesty.txt new file mode 100644 index 00000000..190646eb --- /dev/null +++ b/IndividualProject/honesty.txt @@ -0,0 +1,14 @@ +I, , have read and understood the following: + +CS department's Policies and Procedures on Academic Honesty +The Course Specific Academic Honesty Policies +The assignment specs outlining the consequences of not submitting this pledge and other aspects of the policy +I affirm that I will abide by all the policies stated in the relevant materials from above. I understand that the relevant policies apply to: individual assignments, group projects, and individual examinations. + +I also affirm that I understand that all course materials, with the exception of the individual/group project, are subject to the appropriate copyrights and thus will not post them on any public forum or publicly hosted repository, this includes but is not limited to: GitHub, stackoverflow, chegg etc. + +I also affirm that I will be 100% honest when evaluating the performance of myself and my teammates when prompted by an assignment or member of the teaching staff. + +Finally I affirm that I will not attempt to find any loopholes in these policies for the benefit of myself or others enrolled in the course presently or possibly in the future. + +Signed: \ No newline at end of file diff --git a/IndividualProject/pom.xml b/IndividualProject/pom.xml index 6d87d4c9..9ee6054e 100644 --- a/IndividualProject/pom.xml +++ b/IndividualProject/pom.xml @@ -27,6 +27,11 @@ spring-boot-starter-test test + + jakarta.annotation + jakarta.annotation-api + 2.1.1 + @@ -80,8 +85,8 @@ org.apache.maven.plugins maven-compiler-plugin - 17 - 17 + 7 + 7 diff --git a/IndividualProject/src/main/java/dev/coms4156/project/individualproject/Course.java b/IndividualProject/src/main/java/dev/coms4156/project/individualproject/Course.java index 272c94c9..9b17e4b3 100644 --- a/IndividualProject/src/main/java/dev/coms4156/project/individualproject/Course.java +++ b/IndividualProject/src/main/java/dev/coms4156/project/individualproject/Course.java @@ -1,7 +1,13 @@ package dev.coms4156.project.individualproject; -import java.io.*; - +import java.io.Serial; +import java.io.Serializable; + +/** + * Represents a course within an educational institution. + * This class stores information about the course, including its location, + * instructor name, time slot, and enrollment capacity. + */ public class Course implements Serializable { /** @@ -20,44 +26,56 @@ public Course(String instructorName, String courseLocation, String timeSlot, int this.enrolledStudentCount = 500; } - /** + /** * Enrolls a student in the course if there is space available. * * @return true if the student is successfully enrolled, false otherwise. */ public boolean enrollStudent() { - enrolledStudentCount++; + if (enrolledStudentCount < enrollmentCapacity) { + enrolledStudentCount++; + return true; + } return false; } - /** + /** * Drops a student from the course if a student is enrolled. * * @return true if the student is successfully dropped, false otherwise. */ public boolean dropStudent() { - enrolledStudentCount--; + if (enrolledStudentCount > 0) { + enrolledStudentCount--; + return true; + } return false; } public String getCourseLocation() { - return this.instructorName; + return this.courseLocation; } - public String getInstructorName() { - return this.courseLocation; + return this.instructorName; } - public String getCourseTimeSlot() { return this.courseTimeSlot; } + public int getEnrollmentCapacity() { + return this.enrollmentCapacity; + } + + public int getEnrolledStudentCount() { + return this.enrolledStudentCount; + } public String toString() { - return "\nInstructor: " + instructorName + "; Location: " + courseLocation + "; Time: " + courseTimeSlot; + return "\nInstructor: " + instructorName + "; Location: " + + courseLocation + "; Time: " + courseTimeSlot; } @@ -82,7 +100,7 @@ public void setEnrolledStudentCount(int count) { public boolean isCourseFull() { - return enrollmentCapacity > enrolledStudentCount; + return enrollmentCapacity >= enrolledStudentCount; } @Serial diff --git a/IndividualProject/src/main/java/dev/coms4156/project/individualproject/Department.java b/IndividualProject/src/main/java/dev/coms4156/project/individualproject/Department.java index 4bab0f08..8b16296c 100644 --- a/IndividualProject/src/main/java/dev/coms4156/project/individualproject/Department.java +++ b/IndividualProject/src/main/java/dev/coms4156/project/individualproject/Department.java @@ -1,8 +1,9 @@ package dev.coms4156.project.individualproject; -import java.io.*; -import java.util.*; - +import java.io.Serial; +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; /** * Represents a department within an educational institution. @@ -33,7 +34,7 @@ public Department(String deptCode, HashMap courses, String depar * @return The number of majors. */ public int getNumberOfMajors() { - return -this.numberOfMajors; + return this.numberOfMajors; } /** @@ -42,7 +43,7 @@ public int getNumberOfMajors() { * @return The name of the department chair. */ public String getDepartmentChair() { - return "this.departmentChair"; + return this.departmentChair; } /** @@ -106,7 +107,7 @@ public String toString() { result.append(deptCode).append(" ").append(key).append(": ").append(value.toString()) .append("\n"); } - return "result.toString()"; + return result.toString(); } @Serial diff --git a/IndividualProject/src/main/java/dev/coms4156/project/individualproject/IndividualProjectApplication.java b/IndividualProject/src/main/java/dev/coms4156/project/individualproject/IndividualProjectApplication.java index 80860423..fbce2588 100644 --- a/IndividualProject/src/main/java/dev/coms4156/project/individualproject/IndividualProjectApplication.java +++ b/IndividualProject/src/main/java/dev/coms4156/project/individualproject/IndividualProjectApplication.java @@ -1,302 +1,326 @@ package dev.coms4156.project.individualproject; import jakarta.annotation.PreDestroy; -import java.util.*; -import org.springframework.boot.*; +import java.util.HashMap; +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; /** * Class contains all the startup logic for the application. - * * DO NOT MODIFY ANYTHING BELOW THIS POINT WITH REGARD TO FUNCTIONALITY * YOU MAY MAKE STYLE/REFACTOR MODIFICATIONS AS NEEDED */ @SpringBootApplication public class IndividualProjectApplication implements CommandLineRunner { - /** - * The main launcher for the service all it does - * is make a call to the overridden run method. - * - * @param args A {@code String[]} of any potential - * runtime arguments - */ - public static void main(String[] args) { - SpringApplication.run(IndividualProjectApplication.class, args); - } + /** + * The main launcher for the service all it does + * is make a call to the overridden run method. + * + * @param args A {@code String[]} of any potential + * runtime arguments + */ + public static void main(String[] args) { + SpringApplication.run(IndividualProjectApplication.class, args); + } - /** - * This contains all the setup logic, it will mainly be focused - * on loading up and creating an instance of the database based - * off a saved file or will create a fresh database if the file - * is not present. - * - * @param args A {@code String[]} of any potential runtime args - */ - public void run(String[] args) { - for (String arg : args) { - if (arg.equals("setup")) { - myFileDatabase = new MyFileDatabase(1, "./data.txt"); - resetDataFile(); - System.out.println("System Setup"); - return; - } - } - myFileDatabase = new MyFileDatabase(0, "./data.txt"); - System.out.println("Start up"); - } + /** + * This contains all the setup logic, it will mainly be focused + * on loading up and creating an instance of the database based + * off a saved file or will create a fresh database if the file + * is not present. + * + * @param args A {@code String[]} of any potential runtime args + */ + public void run(String[] args) { + for (String arg : args) { + if (arg.equals("setup")) { + myFileDatabase = new MyFileDatabase(1, "./data.txt"); + resetDataFile(); + System.out.println("System Setup"); + return; + } + } + myFileDatabase = new MyFileDatabase(0, "./data.txt"); + System.out.println("Start up"); + } - /** - * Overrides the database reference, used when testing. - * - * @param testData A {@code MyFileDatabase} object referencing test data. - */ - public static void overrideDatabase(MyFileDatabase testData) { - myFileDatabase = testData; - saveData = false; - } + /** + * Overrides the database reference, used when testing. + * + * @param testData A {@code MyFileDatabase} object referencing test data. + */ + public static void overrideDatabase(MyFileDatabase testData) { + myFileDatabase = testData; + saveData = false; + } - /** - * Allows for data to be reset in event of errors. - */ - public void resetDataFile() { - String[] times = {"11:40-12:55", "4:10-5:25", "10:10-11:25", "2:40-3:55"}; - String[] locations = {"417 IAB", "309 HAV", "301 URIS"}; + /** + * Allows for data to be reset in event of errors. + */ + public void resetDataFile() { + String[] times = {"11:40-12:55", "4:10-5:25", "10:10-11:25", "2:40-3:55"}; + String[] locations = {"417 IAB", "309 HAV", "301 URIS"}; - //data for coms dept - Course coms1004 = new Course("Adam Cannon", locations[0], times[0], 400); - coms1004.setEnrolledStudentCount(249); - Course coms3134 = new Course("Brian Borowski", locations[2], times[1], 250); - coms3134.setEnrolledStudentCount(242); - Course coms3157 = new Course("Jae Lee", locations[0], times[1], 400); - coms3157.setEnrolledStudentCount(311); - Course coms3203 = new Course("Ansaf Salleb-Aouissi", locations[2], times[2], 250); - coms3203.setEnrolledStudentCount(215); - Course coms3261 = new Course("Josh Alman", locations[0], times[3], 150); - coms3261.setEnrolledStudentCount(140); - Course coms3251 = new Course("Tony Dear", "402 CHANDLER", "1:10-3:40", 125); - coms3251.setEnrolledStudentCount(99); - Course coms3827 = new Course("Daniel Rubenstein", "207 Math", times[2], 300); - coms3827.setEnrolledStudentCount(283); - Course coms4156 = new Course("Gail Kaiser", "501 NWC", times[2], 120); - coms4156.setEnrolledStudentCount(109); - HashMap courses = new HashMap<>(); - courses.put("1004", coms1004); - courses.put("3134", coms3134); - courses.put("3157", coms3157); - courses.put("3203", coms3203); - courses.put("3261", coms3261); - courses.put("3251", coms3251); - courses.put("3827", coms3827); - courses.put("4156", coms4156); - Department compSci = new Department("COMS", courses, "Luca Carloni", 2700); - HashMap mapping = new HashMap<>(); - mapping.put("COMS", compSci); + //data for coms dept + Course coms1004 = new Course("Adam Cannon", locations[0], times[0], 400); + coms1004.setEnrolledStudentCount(249); + Course coms3134 = new Course("Brian Borowski", locations[2], times[1], 250); + coms3134.setEnrolledStudentCount(242); + Course coms3157 = new Course("Jae Lee", locations[0], times[1], 400); + coms3157.setEnrolledStudentCount(311); + Course coms3203 = new Course("Ansaf Salleb-Aouissi", locations[2], times[2], 250); + coms3203.setEnrolledStudentCount(215); + Course coms3261 = new Course("Josh Alman", locations[0], times[3], 150); + coms3261.setEnrolledStudentCount(140); + Course coms3251 = new Course("Tony Dear", "402 CHANDLER", "1:10-3:40", 125); + coms3251.setEnrolledStudentCount(99); + Course coms3827 = new Course("Daniel Rubenstein", "207 Math", times[2], 300); + coms3827.setEnrolledStudentCount(283); + Course coms4156 = new Course("Gail Kaiser", "501 NWC", times[2], 120); + coms4156.setEnrolledStudentCount(109); + HashMap courses = new HashMap<>(); + courses.put("1004", coms1004); + courses.put("3134", coms3134); + courses.put("3157", coms3157); + courses.put("3203", coms3203); + courses.put("3261", coms3261); + courses.put("3251", coms3251); + courses.put("3827", coms3827); + courses.put("4156", coms4156); + Department compSci = new Department("COMS", courses, "Luca Carloni", 2700); + HashMap mapping = new HashMap<>(); + mapping.put("COMS", compSci); - //data for econ dept - Course econ1105 = new Course("Waseem Noor", locations[1], times[3], 210); - econ1105.setEnrolledStudentCount(187); - Course econ2257 = new Course("Tamrat Gashaw", "428 PUP", times[2], 125); - econ2257.setEnrolledStudentCount(63); - Course econ3211 = new Course("Murat Yilmaz", "310 FAY", times[1], 96); - econ3211.setEnrolledStudentCount(81); - Course econ3213 = new Course("Miles Leahey", "702 HAM", times[1], 86); - econ3213.setEnrolledStudentCount(77); - Course econ3412 = new Course("Thomas Piskula", "702 HAM", times[0], 86); - econ3412.setEnrolledStudentCount(81); - Course econ4415 = new Course("Evan D Sadler", locations[1], times[2], 110); - econ4415.setEnrolledStudentCount(63); - Course econ4710 = new Course("Matthieu Gomez", "517 HAM", "8:40-9:55", 86); - econ4710.setEnrolledStudentCount(37); - Course econ4840 = new Course("Mark Dean", "142 URIS", times[3], 108); - econ4840.setEnrolledStudentCount(67); + //data for econ dept + Course econ1105 = new Course("Waseem Noor", locations[1], times[3], 210); + econ1105.setEnrolledStudentCount(187); + Course econ2257 = new Course("Tamrat Gashaw", "428 PUP", times[2], 125); + econ2257.setEnrolledStudentCount(63); + Course econ3211 = new Course("Murat Yilmaz", "310 FAY", times[1], 96); + econ3211.setEnrolledStudentCount(81); + Course econ3213 = new Course("Miles Leahey", "702 HAM", times[1], 86); + econ3213.setEnrolledStudentCount(77); + Course econ3412 = new Course("Thomas Piskula", "702 HAM", times[0], 86); + econ3412.setEnrolledStudentCount(81); + Course econ4415 = new Course("Evan D Sadler", locations[1], times[2], 110); + econ4415.setEnrolledStudentCount(63); + Course econ4710 = new Course("Matthieu Gomez", "517 HAM", "8:40-9:55", 86); + econ4710.setEnrolledStudentCount(37); + Course econ4840 = new Course("Mark Dean", "142 URIS", times[3], 108); + econ4840.setEnrolledStudentCount(67); - courses = new HashMap<>(); - courses.put("1105", econ1105); - courses.put("2257", econ2257); - courses.put("3211", econ3211); - courses.put("3213", econ3213); - courses.put("3412", econ3412); - courses.put("4415", econ4415); - courses.put("4710", econ4710); - courses.put("4840", econ4840); + courses = new HashMap<>(); + courses.put("1105", econ1105); + courses.put("2257", econ2257); + courses.put("3211", econ3211); + courses.put("3213", econ3213); + courses.put("3412", econ3412); + courses.put("4415", econ4415); + courses.put("4710", econ4710); + courses.put("4840", econ4840); - Department econ = new Department("ECON", courses, "Michael Woodford", 2345); - mapping.put("ECON", econ); + Department econ = new Department("ECON", courses, + "Michael Woodford", 2345); + mapping.put("ECON", econ); - //data for ieor dept - Course ieor2500 = new Course("Uday Menon", "627 MUDD", times[0], 50); - ieor2500.setEnrolledStudentCount(52); - Course ieor3404 = new Course("Christopher J Dolan", "303 MUDD", times[2], 73); - ieor3404.setEnrolledStudentCount(80); - Course ieor3658 = new Course("Daniel Lacker", "310 FAY", times[2], 96); - ieor3658.setEnrolledStudentCount(87); - Course ieor4102 = new Course("Antonius B Dieker", "209 HAM", times[2], 110); - ieor4102.setEnrolledStudentCount(92); - Course ieor4106 = new Course("Kaizheng Wang", "501 NWC", times[2], 150); - ieor4106.setEnrolledStudentCount(161); - Course ieor4405 = new Course("Yuri Faenza", "517 HAV", times[0], 80); - ieor4405.setEnrolledStudentCount(19); - Course ieor4511 = new Course("Michael Robbins", "633 MUDD", "9:00-11:30", 150); - ieor4511.setEnrolledStudentCount(50); - Course ieor4540 = new Course("Krzysztof M Choromanski", "633 MUDD", "7:10-9:40", 60); - ieor4540.setEnrolledStudentCount(33); + //data for ieor dept + Course ieor2500 = new Course("Uday Menon", "627 MUDD", + times[0], 50); + ieor2500.setEnrolledStudentCount(52); + Course ieor3404 = new Course("Christopher J Dolan", "303 MUDD", + times[2], 73); + ieor3404.setEnrolledStudentCount(80); + Course ieor3658 = new Course("Daniel Lacker", "310 FAY", + times[2], 96); + ieor3658.setEnrolledStudentCount(87); + Course ieor4102 = new Course("Antonius B Dieker", "209 HAM", + times[2], 110); + ieor4102.setEnrolledStudentCount(92); + Course ieor4106 = new Course("Kaizheng Wang", "501 NWC", + times[2], 150); + ieor4106.setEnrolledStudentCount(161); + Course ieor4405 = new Course("Yuri Faenza", "517 HAV", + times[0], 80); + ieor4405.setEnrolledStudentCount(19); + Course ieor4511 = new Course("Michael Robbins", "633 MUDD", + "9:00-11:30", 150); + ieor4511.setEnrolledStudentCount(50); + Course ieor4540 = new Course("Krzysztof M Choromanski", "633 MUDD", + "7:10-9:40", 60); + ieor4540.setEnrolledStudentCount(33); - courses = new HashMap<>(); - courses.put("2500", ieor2500); - courses.put("3404", ieor3404); - courses.put("3658", ieor3658); - courses.put("4102", ieor4102); - courses.put("4106", ieor4106); - courses.put("4405", ieor4405); - courses.put("4511", ieor4511); - courses.put("4540", ieor4540); + courses = new HashMap<>(); + courses.put("2500", ieor2500); + courses.put("3404", ieor3404); + courses.put("3658", ieor3658); + courses.put("4102", ieor4102); + courses.put("4106", ieor4106); + courses.put("4405", ieor4405); + courses.put("4511", ieor4511); + courses.put("4540", ieor4540); - Department ieor = new Department("IEOR", courses, "Jay Sethuraman", 67); - mapping.put("IEOR", ieor); + Department ieor = new Department("IEOR", courses, "Jay Sethuraman", 67); + mapping.put("IEOR", ieor); - //data for chem dept - Course chem1403 = new Course("Ruben M Savizky", locations[1], "6:10-7:25", 120); - chem1403.setEnrolledStudentCount(100); - Course chem1500 = new Course("Joseph C Ulichny", "302 HAV", "6:10-9:50", 46); - chem1500.setEnrolledStudentCount(50); - Course chem2045 = new Course("Luis M Campos", "209 HAV", "1:10-2:25", 50); - chem2045.setEnrolledStudentCount(29); - Course chem2444 = new Course("Christopher Eckdahl", locations[1], times[0], 150); - chem2444.setEnrolledStudentCount(150); - Course chem2494 = new Course("Talha Siddiqui", "202 HAV", "1:10-5:00", 24); - chem2494.setEnrolledStudentCount(18); - Course chem3080 = new Course("Milan Delor", "209 HAV", times[2], 60); - chem3080.setEnrolledStudentCount(18); - Course chem4071 = new Course("Jonathan S Owen", "320 HAV", "8:40-9:55", 42); - chem4071.setEnrolledStudentCount(29); - Course chem4102 = new Course("Dalibor Sames", "320 HAV", times[2], 28); - chem4102.setEnrolledStudentCount(27); + //data for chem dept + Course chem1403 = new Course("Ruben M Savizky", locations[1], "6:10-7:25", 120); + chem1403.setEnrolledStudentCount(100); + Course chem1500 = new Course("Joseph C Ulichny", "302 HAV", "6:10-9:50", 46); + chem1500.setEnrolledStudentCount(50); + Course chem2045 = new Course("Luis M Campos", "209 HAV", "1:10-2:25", 50); + chem2045.setEnrolledStudentCount(29); + Course chem2444 = new Course("Christopher Eckdahl", locations[1], times[0], 150); + chem2444.setEnrolledStudentCount(150); + Course chem2494 = new Course("Talha Siddiqui", "202 HAV", "1:10-5:00", 24); + chem2494.setEnrolledStudentCount(18); + Course chem3080 = new Course("Milan Delor", "209 HAV", times[2], 60); + chem3080.setEnrolledStudentCount(18); + Course chem4071 = new Course("Jonathan S Owen", "320 HAV", "8:40-9:55", 42); + chem4071.setEnrolledStudentCount(29); + Course chem4102 = new Course("Dalibor Sames", "320 HAV", times[2], 28); + chem4102.setEnrolledStudentCount(27); - courses = new HashMap<>(); - courses.put("1403", chem1403); - courses.put("1500", chem1500); - courses.put("2045", chem2045); - courses.put("2444", chem2444); - courses.put("2494", chem2494); - courses.put("3080", chem3080); - courses.put("4071", chem4071); - courses.put("4102", chem4102); + courses = new HashMap<>(); + courses.put("1403", chem1403); + courses.put("1500", chem1500); + courses.put("2045", chem2045); + courses.put("2444", chem2444); + courses.put("2494", chem2494); + courses.put("3080", chem3080); + courses.put("4071", chem4071); + courses.put("4102", chem4102); - Department chem = new Department("CHEM", courses, "Laura J. Kaufman", 250); - mapping.put("CHEM", chem); + Department chem = new Department("CHEM", courses, "Laura J. Kaufman", 250); + mapping.put("CHEM", chem); - //data for phys dept - Course phys1001 = new Course("Szabolcs Marka", "301 PUP", times[3], 150); - phys1001.setEnrolledStudentCount(131); - Course phys1201 = new Course("Eric Raymer", "428 PUP", times[3], 145); - phys1201.setEnrolledStudentCount(130); - Course phys1602 = new Course("Kerstin M Perez", "428 PUP", times[2], 140); - phys1602.setEnrolledStudentCount(77); - Course phys2802 = new Course("Yury Levin", "329 PUP", "10:10-12:00", 60); - phys2802.setEnrolledStudentCount(23); - Course phys3008 = new Course("William A Zajc", "329 PUP", times[2], 75); - phys3008.setEnrolledStudentCount(60); - Course phys4003 = new Course("Frederik Denef", "214 PUP", times[1], 50); - phys4003.setEnrolledStudentCount(19); - Course phys4018 = new Course("James W McIver", "307 PUP", times[3], 30); - phys4018.setEnrolledStudentCount(18); - Course phys4040 = new Course("James C Hill", "214 PUP", times[1], 50); - phys4040.setEnrolledStudentCount(31); + //data for phys dept + Course phys1001 = new Course("Szabolcs Marka", "301 PUP", times[3], 150); + phys1001.setEnrolledStudentCount(131); + Course phys1201 = new Course("Eric Raymer", "428 PUP", times[3], 145); + phys1201.setEnrolledStudentCount(130); + Course phys1602 = new Course("Kerstin M Perez", "428 PUP", times[2], 140); + phys1602.setEnrolledStudentCount(77); + Course phys2802 = new Course("Yury Levin", "329 PUP", "10:10-12:00", 60); + phys2802.setEnrolledStudentCount(23); + Course phys3008 = new Course("William A Zajc", "329 PUP", times[2], 75); + phys3008.setEnrolledStudentCount(60); + Course phys4003 = new Course("Frederik Denef", "214 PUP", times[1], 50); + phys4003.setEnrolledStudentCount(19); + Course phys4018 = new Course("James W McIver", "307 PUP", times[3], 30); + phys4018.setEnrolledStudentCount(18); + Course phys4040 = new Course("James C Hill", "214 PUP", times[1], 50); + phys4040.setEnrolledStudentCount(31); - courses = new HashMap<>(); - courses.put("2802", phys2802); - courses.put("3008", phys3008); - courses.put("4003", phys4003); - courses.put("4018", phys4018); - courses.put("4040", phys4040); - courses.put("1602", phys1602); - courses.put("1001", phys1001); - courses.put("1201", phys1201); + courses = new HashMap<>(); + courses.put("2802", phys2802); + courses.put("3008", phys3008); + courses.put("4003", phys4003); + courses.put("4018", phys4018); + courses.put("4040", phys4040); + courses.put("1602", phys1602); + courses.put("1001", phys1001); + courses.put("1201", phys1201); - Department phys = new Department("PHYS", courses, "Dmitri N. Basov", 43); - mapping.put("PHYS", phys); + Department phys = new Department("PHYS", courses, "Dmitri N. Basov", 43); + mapping.put("PHYS", phys); - //data for elen dept - Course elen1201 = new Course("David G Vallancourt", "301 PUP", times[1], 120); - elen1201.setEnrolledStudentCount(108); - Course elen3082 = new Course("Kenneth Shepard", "1205 MUDD", "4:10-6:40", 32); - elen3082.setEnrolledStudentCount(30); - Course elen3331 = new Course("David G Vallancourt", "203 MATH", times[0], 80); - elen3331.setEnrolledStudentCount(54); - Course elen3401 = new Course("Keren Bergman", "829 MUDD", times[3], 40); - elen3401.setEnrolledStudentCount(25); - Course elen3701 = new Course("Irving Kalet", "333 URIS", times[3], 50); - elen3701.setEnrolledStudentCount(24); - Course elen4510 = new Course("Mohamed Kamaludeen", "903 SSW", "7:00-9:30", 30); - elen4510.setEnrolledStudentCount(22); - Course elen4702 = new Course("Alexei Ashikhmin", "332 URIS", "7:00-9:30", 50); - elen4702.setEnrolledStudentCount(5); - Course elen4830 = new Course("Christine P Hendon", "633 MUDD", "10:10-12:40", 60); - elen4830.setEnrolledStudentCount(22); + //data for elen dept + Course elen1201 = new Course("David G Vallancourt", "301 PUP", times[1], 120); + elen1201.setEnrolledStudentCount(108); + Course elen3082 = new Course("Kenneth Shepard", "1205 MUDD", "4:10-6:40", 32); + elen3082.setEnrolledStudentCount(30); + Course elen3331 = new Course("David G Vallancourt", "203 MATH", times[0], 80); + elen3331.setEnrolledStudentCount(54); + Course elen3401 = new Course("Keren Bergman", "829 MUDD", times[3], 40); + elen3401.setEnrolledStudentCount(25); + Course elen3701 = new Course("Irving Kalet", "333 URIS", times[3], 50); + elen3701.setEnrolledStudentCount(24); + Course elen4510 = new Course("Mohamed Kamaludeen", "903 SSW", "7:00-9:30", 30); + elen4510.setEnrolledStudentCount(22); + Course elen4702 = new Course("Alexei Ashikhmin", "332 URIS", "7:00-9:30", 50); + elen4702.setEnrolledStudentCount(5); + Course elen4830 = new Course("Christine P Hendon", "633 MUDD", "10:10-12:40", 60); + elen4830.setEnrolledStudentCount(22); - courses = new HashMap<>(); - courses.put("1201", elen1201); - courses.put("3082", elen3082); - courses.put("3331", elen3331); - courses.put("3401", elen3401); - courses.put("3701", elen3701); - courses.put("4510", elen4510); - courses.put("4702", elen4702); - courses.put("4830", elen4830); + courses = new HashMap<>(); + courses.put("1201", elen1201); + courses.put("3082", elen3082); + courses.put("3331", elen3331); + courses.put("3401", elen3401); + courses.put("3701", elen3701); + courses.put("4510", elen4510); + courses.put("4702", elen4702); + courses.put("4830", elen4830); - Department elen = new Department("ELEN", courses, "Ioannis Kymissis", 250); - mapping.put("ELEN", elen); + Department elen = new Department("ELEN", courses, "Ioannis Kymissis", 250); + mapping.put("ELEN", elen); - //data for psyc dept - Course psyc1001 = new Course("Patricia G Lindemann", "501 SCH", "1:10-2:25", 200); - psyc1001.setEnrolledStudentCount(191); - Course psyc1610 = new Course("Christopher Baldassano", "200 SCH", times[2], 45); - psyc1610.setEnrolledStudentCount(42); - Course psyc2235 = new Course("Katherine T Fox-Glassman", "501 SCH", times[0], 125); - psyc2235.setEnrolledStudentCount(128); - Course psyc2620 = new Course("Jeffrey M Cohen", "303 URIS", "1:10-3:40", 60); - psyc2620.setEnrolledStudentCount(55); - Course psyc3212 = new Course("Mayron Piccolo", "200 SCH", "2:10-4:00", 15); - psyc3212.setEnrolledStudentCount(15); - Course psyc3445 = new Course("Mariam Aly", "405 SCH", "2:10-4:00", 12); - psyc3445.setEnrolledStudentCount(12); - Course psyc4236 = new Course("Trenton Jerde", "405 SCH", "6:10-8:00", 18); - psyc4236.setEnrolledStudentCount(17); - Course psyc4493 = new Course("Jennifer Blaze", "200 SCH", "2:10-4:00", 15); - psyc4493.setEnrolledStudentCount(9); + //data for psyc dept + Course psyc1001 = new Course("Patricia G Lindemann", "501 SCH", + "1:10-2:25", 200); + psyc1001.setEnrolledStudentCount(191); + Course psyc1610 = new Course("Christopher Baldassano", "200 SCH", + times[2], 45); + psyc1610.setEnrolledStudentCount(42); + Course psyc2235 = new Course("Katherine T Fox-Glassman", "501 SCH", + times[0], 125); + psyc2235.setEnrolledStudentCount(128); + Course psyc2620 = new Course("Jeffrey M Cohen", "303 URIS", + "1:10-3:40", 60); + psyc2620.setEnrolledStudentCount(55); + Course psyc3212 = new Course("Mayron Piccolo", "200 SCH", + "2:10-4:00", 15); + psyc3212.setEnrolledStudentCount(15); + Course psyc3445 = new Course("Mariam Aly", "405 SCH", + "2:10-4:00", 12); + psyc3445.setEnrolledStudentCount(12); + Course psyc4236 = new Course("Trenton Jerde", "405 SCH", + "6:10-8:00", 18); + psyc4236.setEnrolledStudentCount(17); + Course psyc4493 = new Course("Jennifer Blaze", "200 SCH", + "2:10-4:00", 15); + psyc4493.setEnrolledStudentCount(9); - courses = new HashMap<>(); - courses.put("1001", psyc1001); - courses.put("1610", psyc1610); - courses.put("2235", psyc2235); - courses.put("2620", psyc2620); - courses.put("3212", psyc3212); - courses.put("3445", psyc3445); - courses.put("4236", psyc4236); - courses.put("4493", psyc4493); + courses = new HashMap<>(); + courses.put("1001", psyc1001); + courses.put("1610", psyc1610); + courses.put("2235", psyc2235); + courses.put("2620", psyc2620); + courses.put("3212", psyc3212); + courses.put("3445", psyc3445); + courses.put("4236", psyc4236); + courses.put("4493", psyc4493); - Department psyc = new Department("PSYC", courses, "Nim Tottenham", 437); - mapping.put("PSYC", psyc); + Department psyc = new Department("PSYC", courses, "Nim Tottenham", 437); + mapping.put("PSYC", psyc); - myFileDatabase.setMapping(mapping); - } + myFileDatabase.setMapping(mapping); + } - /** - * This contains all the overheading teardown logic, it will - * mainly be focused on saving all the created user data to a - * file, so it will be ready for the next setup. - */ - @PreDestroy - public void onTermination() { - System.out.println("Termination"); - if (saveData) { - myFileDatabase.saveContentsToFile(); - } - } + /** + * This contains all the overheading teardown logic, it will + * mainly be focused on saving all the created user data to a + * file, so it will be ready for the next setup. + */ + @PreDestroy + public void onTermination() { + System.out.println("Termination"); + if (saveData) { + myFileDatabase.saveContentsToFile(); + } + } + public boolean isSaveData() { + return saveData; + } - //Database Instance - public static MyFileDatabase myFileDatabase; - private static boolean saveData = true; + public void setSaveData(boolean newSaveData) { + saveData = newSaveData; + } + + //Database Instance + public static MyFileDatabase myFileDatabase; + private static boolean saveData = true; } diff --git a/IndividualProject/src/main/java/dev/coms4156/project/individualproject/MyFileDatabase.java b/IndividualProject/src/main/java/dev/coms4156/project/individualproject/MyFileDatabase.java index 1f61f893..b11a6233 100644 --- a/IndividualProject/src/main/java/dev/coms4156/project/individualproject/MyFileDatabase.java +++ b/IndividualProject/src/main/java/dev/coms4156/project/individualproject/MyFileDatabase.java @@ -1,7 +1,12 @@ package dev.coms4156.project.individualproject; -import java.io.*; -import java.util.*; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.HashMap; +import java.util.Map; /** * This class represents a file-based database containing department mappings. diff --git a/IndividualProject/src/main/java/dev/coms4156/project/individualproject/RouteController.java b/IndividualProject/src/main/java/dev/coms4156/project/individualproject/RouteController.java index 09f504dc..cca1739c 100644 --- a/IndividualProject/src/main/java/dev/coms4156/project/individualproject/RouteController.java +++ b/IndividualProject/src/main/java/dev/coms4156/project/individualproject/RouteController.java @@ -1,8 +1,13 @@ package dev.coms4156.project.individualproject; import java.util.HashMap; -import org.springframework.http.*; -import org.springframework.web.bind.annotation.*; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** * This class contains all the API routes for the system. @@ -34,14 +39,18 @@ public String index() { @GetMapping(value = "/retrieveDept", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity retrieveDepartment(@RequestParam(value = "deptCode") String deptCode) { try { + if (deptCode == null || deptCode.length() != 4 + || !deptCode.chars().allMatch(Character::isLetter)) { + return new ResponseEntity<>("Invalid Input", HttpStatus.BAD_REQUEST); + } + HashMap departmentMapping; 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) { @@ -64,8 +73,14 @@ public ResponseEntity retrieveDepartment(@RequestParam(value = "deptCode") St * proper response. */ @GetMapping(value = "/retrieveCourse", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity retrieveCourse(@RequestParam(value = "deptCode") String deptCode, @RequestParam(value = "courseCode") int courseCode) { + public ResponseEntity retrieveCourse(@RequestParam(value = "deptCode") String deptCode, + @RequestParam(value = "courseCode") int courseCode) { try { + if (courseCode < 1000 || courseCode > 9999 || deptCode == null || deptCode.length() != 4 + || !deptCode.chars().allMatch(Character::isLetter)) { + return new ResponseEntity<>("Invalid Input", HttpStatus.BAD_REQUEST); + } + boolean doesDepartmentExists = retrieveDepartment(deptCode).getStatusCode() == HttpStatus.OK; if (doesDepartmentExists) { HashMap departmentMapping; @@ -77,7 +92,7 @@ public ResponseEntity retrieveCourse(@RequestParam(value = "deptCode") String return new ResponseEntity<>("Course Not Found", HttpStatus.NOT_FOUND); } else { return new ResponseEntity<>(coursesMapping.get(Integer.toString(courseCode)).toString(), - HttpStatus.FORBIDDEN); + HttpStatus.OK); } } @@ -87,6 +102,46 @@ public ResponseEntity retrieveCourse(@RequestParam(value = "deptCode") String } } + /** + * Displays the details of the requested courses to the user or displays the proper error + * message in response to the request. + * + * @param courseCode A {@code int} representing the courses the user wishes + * to retrieve. + * + * @return A {@code ResponseEntity} object containing either the details of all the + * courses with courseCode and an HTTP 200 response or, an appropriate message + * indicating the proper response. + */ + @GetMapping(value = "/retrieveCourses", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity retrieveCourses(@RequestParam(value = "courseCode") int courseCode) { + try { + if (courseCode < 1000 || courseCode > 9999) { + return new ResponseEntity<>("Invalid Input", HttpStatus.BAD_REQUEST); + } + + HashMap departmentMapping; + departmentMapping = IndividualProjectApplication.myFileDatabase.getDepartmentMapping(); + String result = ""; + HashMap coursesMapping; + for (String deptCode : departmentMapping.keySet()) { + coursesMapping = departmentMapping.get(deptCode).getCourseSelection(); + if (!coursesMapping.containsKey(Integer.toString(courseCode))) { + continue; + } else { + result += coursesMapping.get(Integer.toString(courseCode)).toString(); + } + } + if (result.length() == 0) { + return new ResponseEntity<>("Course NOT FOUND", HttpStatus.NOT_FOUND); + } else { + return new ResponseEntity<>(result, HttpStatus.OK); + } + } catch (Exception e) { + return handleException(e); + } + } + /** * Displays whether the course has at minimum reached its enrollmentCapacity. * @@ -101,8 +156,14 @@ public ResponseEntity retrieveCourse(@RequestParam(value = "deptCode") String * response. */ @GetMapping(value = "/isCourseFull", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity isCourseFull(@RequestParam(value = "deptCode") String deptCode, @RequestParam(value = "courseCode") int courseCode) { + public ResponseEntity isCourseFull(@RequestParam(value = "deptCode") String deptCode, + @RequestParam(value = "courseCode") int courseCode) { try { + if (courseCode < 1000 || courseCode > 9999 || deptCode == null || deptCode.length() != 4 + || !deptCode.chars().allMatch(Character::isLetter)) { + return new ResponseEntity<>("Invalid Input", HttpStatus.BAD_REQUEST); + } + boolean doesCourseExists; doesCourseExists = retrieveCourse(deptCode, courseCode).getStatusCode() == HttpStatus.OK; @@ -136,14 +197,19 @@ public ResponseEntity isCourseFull(@RequestParam(value = "deptCode") String d @GetMapping(value = "/getMajorCountFromDept", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity getMajorCtFromDept(@RequestParam(value = "deptCode") String deptCode) { try { + if (deptCode == null || deptCode.length() != 4 + || !deptCode.chars().allMatch(Character::isLetter)) { + return new ResponseEntity<>("Invalid Input", HttpStatus.BAD_REQUEST); + } + boolean doesDepartmentExists = retrieveDepartment(deptCode).getStatusCode() == HttpStatus.OK; if (doesDepartmentExists) { HashMap departmentMapping; departmentMapping = IndividualProjectApplication.myFileDatabase.getDepartmentMapping(); - return new ResponseEntity<>("There are: " + -departmentMapping.get(deptCode) + return new ResponseEntity<>("There are: " + departmentMapping.get(deptCode) .getNumberOfMajors() + " majors in the department", HttpStatus.OK); } - return new ResponseEntity<>("Department Not Found", HttpStatus.FORBIDDEN); + return new ResponseEntity<>("Department Not Found", HttpStatus.NOT_FOUND); } catch (Exception e) { return handleException(e); } @@ -162,6 +228,11 @@ public ResponseEntity getMajorCtFromDept(@RequestParam(value = "deptCode") St @GetMapping(value = "/idDeptChair", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity identifyDeptChair(@RequestParam(value = "deptCode") String deptCode) { try { + if (deptCode == null || deptCode.length() != 4 + || !deptCode.chars().allMatch(Character::isLetter)) { + return new ResponseEntity<>("Invalid Input", HttpStatus.BAD_REQUEST); + } + boolean doesDepartmentExists = retrieveDepartment(deptCode).getStatusCode() == HttpStatus.OK; if (doesDepartmentExists) { HashMap departmentMapping; @@ -189,8 +260,14 @@ public ResponseEntity identifyDeptChair(@RequestParam(value = "deptCode") Str * proper response. */ @GetMapping(value = "/findCourseLocation", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity findCourseLocation(@RequestParam(value = "deptCode") String deptCode, @RequestParam(value = "courseCode") int courseCode) { + public ResponseEntity findCourseLocation(@RequestParam(value = "deptCode") String deptCode, + @RequestParam(value = "courseCode") int courseCode) { try { + if (courseCode < 1000 || courseCode > 9999 || deptCode == null || deptCode.length() != 4 + || !deptCode.chars().allMatch(Character::isLetter)) { + return new ResponseEntity<>("Invalid Input", HttpStatus.BAD_REQUEST); + } + boolean doesCourseExists; doesCourseExists = retrieveCourse(deptCode, courseCode).getStatusCode() == HttpStatus.OK; @@ -226,8 +303,14 @@ public ResponseEntity findCourseLocation(@RequestParam(value = "deptCode") St * response. */ @GetMapping(value = "/findCourseInstructor", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity findCourseInstructor(@RequestParam(value = "deptCode") String deptCode, @RequestParam(value = "courseCode") int courseCode) { + public ResponseEntity findCourseInstructor(@RequestParam(value = "deptCode") String deptCode, + @RequestParam(value = "courseCode") int courseCode) { try { + if (courseCode < 1000 || courseCode > 9999 || deptCode == null || deptCode.length() != 4 + || !deptCode.chars().allMatch(Character::isLetter)) { + return new ResponseEntity<>("Invalid Input", HttpStatus.BAD_REQUEST); + } + boolean doesCourseExists; doesCourseExists = retrieveCourse(deptCode, courseCode).getStatusCode() == HttpStatus.OK; @@ -263,8 +346,14 @@ public ResponseEntity findCourseInstructor(@RequestParam(value = "deptCode") * indicating the proper response. */ @GetMapping(value = "/findCourseTime", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity findCourseTime(@RequestParam(value = "deptCode") String deptCode, @RequestParam(value = "courseCode") int courseCode) { + public ResponseEntity findCourseTime(@RequestParam(value = "deptCode") String deptCode, + @RequestParam(value = "courseCode") int courseCode) { try { + if (courseCode < 1000 || courseCode > 9999 || deptCode == null || deptCode.length() != 4 + || !deptCode.chars().allMatch(Character::isLetter)) { + return new ResponseEntity<>("Invalid Input", HttpStatus.BAD_REQUEST); + } + boolean doesCourseExists; doesCourseExists = retrieveCourse(deptCode, courseCode).getStatusCode() == HttpStatus.OK; @@ -275,8 +364,8 @@ public ResponseEntity findCourseTime(@RequestParam(value = "deptCode") String coursesMapping = departmentMapping.get(deptCode).getCourseSelection(); Course requestedCourse = coursesMapping.get(Integer.toString(courseCode)); - return new ResponseEntity<>("The course meets at: " + "some time ", - HttpStatus.OK); + return new ResponseEntity<>("The course meets at: " + + requestedCourse.getCourseTimeSlot() + ".", HttpStatus.OK); } else { return new ResponseEntity<>("Course Not Found", HttpStatus.NOT_FOUND); } @@ -297,6 +386,11 @@ public ResponseEntity findCourseTime(@RequestParam(value = "deptCode") String @PatchMapping(value = "/addMajorToDept", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity addMajorToDept(@RequestParam(value = "deptCode") String deptCode) { try { + if (deptCode == null || deptCode.length() != 4 + || !deptCode.chars().allMatch(Character::isLetter)) { + return new ResponseEntity<>("Invalid Input", HttpStatus.BAD_REQUEST); + } + boolean doesDepartmentExists = retrieveDepartment(deptCode).getStatusCode() == HttpStatus.OK; if (doesDepartmentExists) { HashMap departmentMapping; @@ -324,6 +418,11 @@ public ResponseEntity addMajorToDept(@RequestParam(value = "deptCode") String @PatchMapping(value = "/removeMajorFromDept", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity removeMajorFromDept(@RequestParam(value = "deptCode") String deptCode) { try { + if (deptCode == null || deptCode.length() != 4 + || !deptCode.chars().allMatch(Character::isLetter)) { + return new ResponseEntity<>("Invalid Input", HttpStatus.BAD_REQUEST); + } + boolean doesDepartmentExists = retrieveDepartment(deptCode).getStatusCode() == HttpStatus.OK; if (doesDepartmentExists) { HashMap departmentMapping; @@ -351,8 +450,14 @@ public ResponseEntity removeMajorFromDept(@RequestParam(value = "deptCode") S * code in tune with what has happened. */ @PatchMapping(value = "/dropStudentFromCourse", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity dropStudent(@RequestParam(value = "deptCode") String deptCode, @RequestParam(value = "courseCode") int courseCode) { + public ResponseEntity dropStudent(@RequestParam(value = "deptCode") String deptCode, + @RequestParam(value = "courseCode") int courseCode) { try { + if (courseCode < 1000 || courseCode > 9999 || deptCode == null || deptCode.length() != 4 + || !deptCode.chars().allMatch(Character::isLetter)) { + return new ResponseEntity<>("Invalid Input", HttpStatus.BAD_REQUEST); + } + boolean doesCourseExists; doesCourseExists = retrieveCourse(deptCode, courseCode).getStatusCode() == HttpStatus.OK; @@ -378,10 +483,29 @@ public ResponseEntity dropStudent(@RequestParam(value = "deptCode") String de } } - + /** + * Attempts to set enrollment number for the specified course. + * + * @param deptCode A {@code String} representing the department. + * + * @param courseCode A {@code int} representing the course within the department. + * + * @param count A {@code int} representing the number of enrollment of the course + * + * @return A {@code ResponseEntity} object containing an HTTP 200 + * response with an appropriate message or the proper status + * code in tune with what has happened. + */ @PatchMapping(value = "/setEnrollmentCount", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity setEnrollmentCount(@RequestParam(value = "deptCode") String deptCode, @RequestParam(value = "courseCode") int courseCode, @RequestParam(value = "count") int count) { + public ResponseEntity setEnrollmentCount(@RequestParam(value = "deptCode") String deptCode, + @RequestParam(value = "courseCode") int courseCode, + @RequestParam(value = "count") int count) { try { + if (courseCode < 1000 || courseCode > 9999 || deptCode == null || deptCode.length() != 4 + || !deptCode.chars().allMatch(Character::isLetter) || count < 0) { + return new ResponseEntity<>("Invalid Input", HttpStatus.BAD_REQUEST); + } + boolean doesCourseExists; doesCourseExists = retrieveCourse(deptCode, courseCode).getStatusCode() == HttpStatus.OK; @@ -402,6 +526,52 @@ public ResponseEntity setEnrollmentCount(@RequestParam(value = "deptCode") St } } + /** + * Attempts to enroll student from the specified course. + * + * @param deptCode A {@code String} representing the department. + * + * @param courseCode A {@code int} representing the course within the department. + * + * @return A {@code ResponseEntity} object containing an HTTP 200 + * response with an appropriate message or the proper status + * code in tune with what has happened. + */ + @PatchMapping(value = "/enrollStudentInCourse", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity enrollStudentInCourse(@RequestParam(value = "deptCode") String deptCode, + @RequestParam(value = "courseCode") int courseCode) { + try { + if (courseCode < 1000 || courseCode > 9999 || deptCode == null || deptCode.length() != 4 + || !deptCode.chars().allMatch(Character::isLetter)) { + return new ResponseEntity<>("Invalid Input", HttpStatus.BAD_REQUEST); + } + + boolean doesCourseExists; + doesCourseExists = retrieveCourse(deptCode, courseCode).getStatusCode() == HttpStatus.OK; + + if (doesCourseExists) { + HashMap departmentMapping; + departmentMapping = IndividualProjectApplication.myFileDatabase.getDepartmentMapping(); + HashMap coursesMapping; + coursesMapping = departmentMapping.get(deptCode).getCourseSelection(); + + Course requestedCourse = coursesMapping.get(Integer.toString(courseCode)); + int previousEnrollment = requestedCourse.getEnrolledStudentCount(); + boolean isEnrollSuccess = requestedCourse.enrollStudent(); + int afterEnrollment = requestedCourse.getEnrolledStudentCount(); + if (isEnrollSuccess) { + return new ResponseEntity<>("Enrollment Success", HttpStatus.OK); + } else { + return new ResponseEntity<>("Enrollment Failed - Course is full", + HttpStatus.CONFLICT); + } + } else { + return new ResponseEntity<>("Course Not Found", HttpStatus.NOT_FOUND); + } + } catch (Exception e) { + return handleException(e); + } + } /** * Endpoint for changing the time of a course. * This method handles PATCH requests to change the time of a course identified by @@ -415,8 +585,15 @@ public ResponseEntity setEnrollmentCount(@RequestParam(value = "deptCode") St * successful, or an error message if the course is not found */ @PatchMapping(value = "/changeCourseTime", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity changeCourseTime(@RequestParam(value = "deptCode") String deptCode, @RequestParam(value = "courseCode") int courseCode, @RequestParam(value = "time") String time) { + public ResponseEntity changeCourseTime(@RequestParam(value = "deptCode") String deptCode, + @RequestParam(value = "courseCode") int courseCode, + @RequestParam(value = "time") String time) { try { + if (courseCode < 1000 || courseCode > 9999 || deptCode == null || deptCode.length() != 4 + || !deptCode.chars().allMatch(Character::isLetter)) { + return new ResponseEntity<>("Invalid Input", HttpStatus.BAD_REQUEST); + } + boolean doesCourseExists; doesCourseExists = retrieveCourse(deptCode, courseCode).getStatusCode() == HttpStatus.OK; @@ -451,8 +628,15 @@ public ResponseEntity changeCourseTime(@RequestParam(value = "deptCode") Stri * successful, or an error message if the course is not found */ @PatchMapping(value = "/changeCourseTeacher", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity changeCourseTeacher(@RequestParam(value = "deptCode") String deptCode, @RequestParam(value = "courseCode") int courseCode, @RequestParam(value = "teacher") String teacher) { + public ResponseEntity changeCourseTeacher(@RequestParam(value = "deptCode") String deptCode, + @RequestParam(value = "courseCode") int courseCode, + @RequestParam(value = "teacher") String teacher) { try { + if (courseCode < 1000 || courseCode > 9999 || deptCode == null || deptCode.length() != 4 + || !deptCode.chars().allMatch(Character::isLetter)) { + return new ResponseEntity<>("Invalid Input", HttpStatus.BAD_REQUEST); + } + boolean doesCourseExists; doesCourseExists = retrieveCourse(deptCode, courseCode).getStatusCode() == HttpStatus.OK; @@ -473,10 +657,29 @@ public ResponseEntity changeCourseTeacher(@RequestParam(value = "deptCode") S } } - + /** + * Endpoint for changing the location of a course. + * This method handles PATCH requests to change the instructor of a course identified by + * department code and course code. If the course exists, its instructor is updated to the + * provided instructor. + * + * @param deptCode the code of the department containing the course + * @param courseCode the code of the course to change the instructor for + * @param location the location to instruct the course + * + * @return a ResponseEntity with a success message if the operation is + * successful, or an error message if the course is not found + */ @PatchMapping(value = "/changeCourseLocation", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity changeCourseLocation(@RequestParam(value = "deptCode") String deptCode, @RequestParam(value = "courseCode") int courseCode, @RequestParam(value = "location") String location) { + public ResponseEntity changeCourseLocation(@RequestParam(value = "deptCode") String deptCode, + @RequestParam(value = "courseCode") int courseCode, + @RequestParam(value = "location") String location) { try { + if (courseCode < 1000 || courseCode > 9999 || deptCode == null || deptCode.length() != 4 + || !deptCode.chars().allMatch(Character::isLetter)) { + return new ResponseEntity<>("Invalid Input", HttpStatus.BAD_REQUEST); + } + boolean doesCourseExists; doesCourseExists = retrieveCourse(deptCode, courseCode).getStatusCode() == HttpStatus.OK; diff --git a/IndividualProject/src/test/java/dev/coms4156/project/individualproject/CourseUnitTests.java b/IndividualProject/src/test/java/dev/coms4156/project/individualproject/CourseUnitTests.java index 4edd00f9..60038e0b 100644 --- a/IndividualProject/src/test/java/dev/coms4156/project/individualproject/CourseUnitTests.java +++ b/IndividualProject/src/test/java/dev/coms4156/project/individualproject/CourseUnitTests.java @@ -1,28 +1,119 @@ package dev.coms4156.project.individualproject; -import org.junit.jupiter.api.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; -import static org.junit.jupiter.api.Assertions.*; +/** + * This class is a test for Course class. + */ @SpringBootTest @ContextConfiguration public class CourseUnitTests { - @BeforeAll - public static void setupCourseForTesting() { - testCourse = new Course("Griffin Newbold", "417 IAB", "11:40-12:55", 250); + /** The test course instance used for testing. */ + public static Course testCourse; + + /** + * This function create a course before + * each test method run in the class. + */ + @BeforeEach + public void setup() { + testCourse = new Course("Adam Cannon", + "417 IAB", + "11:40-12:55", + 400); + testCourse.setEnrolledStudentCount(240); + } + + @Test + public void enrollStudentTest() { + int expectedResult = 241; + testCourse.enrollStudent(); + assertEquals(expectedResult, testCourse.getEnrolledStudentCount()); + } + + @Test + public void dropStudentTest() { + int expectedResult = 239; + testCourse.dropStudent(); + assertEquals(expectedResult, testCourse.getEnrolledStudentCount()); + } + + @Test + public void getCourseLocationTest() { + String expectedResult = "417 IAB"; + assertEquals(expectedResult, testCourse.getCourseLocation()); + } + + @Test + public void getInstructorNameTest() { + String expectedResult = "Adam Cannon"; + assertEquals(expectedResult, testCourse.getInstructorName()); + } + + @Test + public void getCourseTimeSlotTest() { + String expectedResult = "11:40-12:55"; + assertEquals(expectedResult, testCourse.getCourseTimeSlot()); + } + + @Test + public void getEnrollmentCapacityTest() { + int expectedResult = 400; + assertEquals(expectedResult, testCourse.getEnrollmentCapacity()); } + @Test + public void getEnrolledStudentCountTest() { + int expectedResult = 240; + assertEquals(expectedResult, testCourse.getEnrolledStudentCount()); + } @Test public void toStringTest() { - String expectedResult = "\nInstructor: Griffin Newbold; Location: 417 IAB; Time: 11:40-12:55"; + String expectedResult = "\nInstructor: Adam Cannon; Location: 417 IAB; Time: 11:40-12:55"; assertEquals(expectedResult, testCourse.toString()); } - /** The test course instance used for testing. */ - public static Course testCourse; + @Test + public void reassignInstructorTest() { + String expectedResult = "Jae Lee"; + testCourse.reassignInstructor(expectedResult); + assertEquals(expectedResult, testCourse.getInstructorName()); + } + + @Test + public void reassignLocationTest() { + String expectedResult = "301 URIS"; + testCourse.reassignLocation(expectedResult); + assertEquals(expectedResult, testCourse.getCourseLocation()); + } + + @Test + public void reassignTimeTest() { + String expectedResult = "4:10-5:25"; + testCourse.reassignTime(expectedResult); + assertEquals(expectedResult, testCourse.getCourseTimeSlot()); + } + + @Test + public void setEnrolledStudentCountTest() { + int expectedResult = 380; + testCourse.setEnrolledStudentCount(expectedResult); + assertEquals(expectedResult, testCourse.getEnrolledStudentCount()); + } + + @Test + public void isCourseFullTest() { + testCourse.setEnrolledStudentCount(400); + assertTrue(testCourse.isCourseFull()); + } } diff --git a/IndividualProject/src/test/java/dev/coms4156/project/individualproject/DepartmentUnitTests.java b/IndividualProject/src/test/java/dev/coms4156/project/individualproject/DepartmentUnitTests.java new file mode 100644 index 00000000..197bdfe9 --- /dev/null +++ b/IndividualProject/src/test/java/dev/coms4156/project/individualproject/DepartmentUnitTests.java @@ -0,0 +1,127 @@ +package dev.coms4156.project.individualproject; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.HashMap; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ContextConfiguration; + +/** + * This class is a test for Department class. + */ +@SpringBootTest +@ContextConfiguration +public class DepartmentUnitTests { + /** The test course instance used for testing. */ + public static Department testDepartment; + public static HashMap testCourses; + + /** + * This function create courses and department before + * each test method run in the class. + */ + @BeforeEach + public void setupDepartmentForTesting() { + Course coms1004 = new Course("Adam Cannon", "417 IAB", "11:40-12:55", 400); + coms1004.setEnrolledStudentCount(249); + + testCourses = new HashMap<>(); + testCourses.put("1004", coms1004); + + testDepartment = new Department("COMS", testCourses, "Luca Carloni", 2700); + } + + @Test + public void getNumberOfMajorsTest() { + int expectedResult = 2700; + assertEquals(expectedResult, testDepartment.getNumberOfMajors()); + } + + @Test + public void getDepartmentChairTest() { + String expectedResult = "Luca Carloni"; + assertEquals(expectedResult, testDepartment.getDepartmentChair()); + } + + @Test + public void getCourseSelectionTest() { + HashMap courses = testDepartment.getCourseSelection(); + + // Ensure the course selection is not null + assertNotNull(courses); + + // check if the department contains the expected course + assertTrue(courses.containsKey("1004")); + + // check if the course matched + assertEquals(courses.get("1004"), testCourses.get("1004")); + } + + @Test + public void addPersonToMajorTest() { + int expectedResult = 2701; + testDepartment.addPersonToMajor(); + assertEquals(expectedResult, testDepartment.getNumberOfMajors()); + } + + @Test + public void dropPersonFromMajorTest() { + int expectedResult = 2699; + testDepartment.dropPersonFromMajor(); + assertEquals(expectedResult, testDepartment.getNumberOfMajors()); + } + + @Test + public void addCourseTest() { + Course coms3134 = new Course("Brian Borowski", "301 URIS", + "4:10-5:25", 250); + + testDepartment.addCourse("3134", coms3134); + + HashMap courses = testDepartment.getCourseSelection(); + + // Ensure the course selection is not null + assertNotNull(courses); + + // check if the department contains the course we've just addes + assertTrue(courses.containsKey("3134")); + + // check if the course metched + assertEquals(coms3134, testCourses.get("3134")); + } + + @Test + public void createCourseTest() { + testDepartment.createCourse("3134", "Brian Borowski", + "301 URIS", "4:10-5:25", 250); + + HashMap courses = testDepartment.getCourseSelection(); + + // Ensure the course selection is not null + assertNotNull(courses); + + // check if the department contains the course we've just addes + assertTrue(courses.containsKey("3134")); + + // check if the course metched + Course coms3134 = new Course("Brian Borowski", "301 URIS", + "4:10-5:25", 250); + assertEquals(coms3134.getCourseLocation(), testCourses.get("3134").getCourseLocation()); + assertEquals(coms3134.getInstructorName(), testCourses.get("3134").getInstructorName()); + assertEquals(coms3134.getCourseTimeSlot(), testCourses.get("3134").getCourseTimeSlot());; + assertEquals(coms3134.getEnrollmentCapacity(), testCourses.get("3134").getEnrollmentCapacity()); + assertEquals(coms3134.getEnrolledStudentCount(), + testCourses.get("3134").getEnrolledStudentCount()); + } + + @Test + public void toStringTest() { + String expectedResult = "COMS 1004: \nInstructor: Adam Cannon; Location: 417 IAB; Time: " + + "11:40-12:55\n"; + assertEquals(expectedResult, testDepartment.toString()); + } +} diff --git a/IndividualProject/src/test/java/dev/coms4156/project/individualproject/IndividualProjectApplicationUnitTests.java b/IndividualProject/src/test/java/dev/coms4156/project/individualproject/IndividualProjectApplicationUnitTests.java new file mode 100644 index 00000000..fbaa31fc --- /dev/null +++ b/IndividualProject/src/test/java/dev/coms4156/project/individualproject/IndividualProjectApplicationUnitTests.java @@ -0,0 +1,80 @@ +package dev.coms4156.project.individualproject; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ContextConfiguration; + +/** + * This class is a test for individualProjectApplication class. + */ +@SpringBootTest +@ContextConfiguration +public class IndividualProjectApplicationUnitTests { + /** The test course instance used for testing. */ + public static IndividualProjectApplication application; + + @BeforeEach + public void setupIndividualProjectApplicationForTesting() { + application = new IndividualProjectApplication(); + } + + @Test + public void mainTest() { + String[] args = {}; + application.main(args); + } + + @Test + public void runTest1() { + String[] args = {" ", " ", " ", " ", " ", "setup"}; + application.run(args); + + assertNotNull(application.myFileDatabase); + } + + @Test + public void runTest2() { + String[] args = {}; + application.run(args); + + assertNotNull(application.myFileDatabase); + } + + @Test + public void onTerminationTestWithSaveData() { + application.setSaveData(true); + application.onTermination(); + assertTrue(application.isSaveData()); + } + + @Test + public void onTerminationTestWithoutSaveData() { + application.setSaveData(false); + application.onTermination(); + assertFalse(application.isSaveData()); + } + + @Test + public void overrideDatabaseTest() { + MyFileDatabase mockDatabase = mock(MyFileDatabase.class); + + application.overrideDatabase(mockDatabase); + assertEquals(mockDatabase, application.myFileDatabase); + assertFalse(application.isSaveData()); + } + + @Test + public void resetDataFileTest() { + application.resetDataFile(); + + assertNotNull(IndividualProjectApplication.myFileDatabase); + assertFalse(IndividualProjectApplication.myFileDatabase.getDepartmentMapping().isEmpty()); + } +} diff --git a/IndividualProject/src/test/java/dev/coms4156/project/individualproject/MyFileDatabaseUnitTest.java b/IndividualProject/src/test/java/dev/coms4156/project/individualproject/MyFileDatabaseUnitTest.java new file mode 100644 index 00000000..6247f529 --- /dev/null +++ b/IndividualProject/src/test/java/dev/coms4156/project/individualproject/MyFileDatabaseUnitTest.java @@ -0,0 +1,13 @@ +package dev.coms4156.project.individualproject; + +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ContextConfiguration; + +/** + * This class is a test for MyFileDatabase class. + */ +@SpringBootTest +@ContextConfiguration +public class MyFileDatabaseUnitTest { + +} diff --git a/IndividualProject/src/test/java/dev/coms4156/project/individualproject/RouteControllerUnitTest.java b/IndividualProject/src/test/java/dev/coms4156/project/individualproject/RouteControllerUnitTest.java new file mode 100644 index 00000000..f83a930c --- /dev/null +++ b/IndividualProject/src/test/java/dev/coms4156/project/individualproject/RouteControllerUnitTest.java @@ -0,0 +1,476 @@ +package dev.coms4156.project.individualproject; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MockMvc; + +/** + * This class is a test for RouteController class. + */ + +@WebMvcTest(RouteController.class) +public class RouteControllerUnitTest { + @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection") + @Autowired + private MockMvc mockMvc; + + @Test + public void indexTest() throws Exception { + mockMvc.perform(get("/index") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect((content().string("Welcome, in order to make an API call " + + "direct your browser or Postman to an endpoint " + + "\n\n This can be done using the following format: \n\n http:127.0.0" + + ".1:8080/endpoint?arg=value"))); + } + + @Test + public void retrieveDepartmentFoundTest() throws Exception { + mockMvc.perform(get("/retrieveDept") + .param("deptCode", "COMS") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect((content().json("{}"))); + } + + @Test + public void retrieveDepartmentNotFoundTest() throws Exception { + mockMvc.perform(get("/retrieveDept") + .param("deptCode", "MATH") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Department Not Found"))); + } + + @Test + public void retrieveCourseFoundTest() throws Exception { + mockMvc.perform(get("/retrieveCourse") + .param("deptCode", "COMS") + .param("courseCode", "4156") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect((content().string("\nInstructor: Gail Kaiser; L" + + "ocation: 501 NWC; Time: " + + "10:10-11:25"))); + } + + @Test + public void retrieveCoursesFoundTest() throws Exception { + mockMvc.perform(get("/retrieveCourses") + .param("courseCode", "1001") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect((content().string( + "\nInstructor: Szabolcs Marka; Location: 301 PUP; Time: 2:40-3:55" + + "\nInstructor: Patricia G Lindemann; Location: 501 SCH; Time: 1:10-2:25"))); + } + + @Test + public void retrieveCoursesNotFoundTest() throws Exception { + mockMvc.perform(get("/retrieveCourses") + .param("courseCode", "9999") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Course NOT FOUND"))); + } + + + @Test + public void retrieveCourseNotFoundDepartmentTest() throws Exception { + mockMvc.perform(get("/retrieveCourse") + .param("deptCode", "MATH") + .param("courseCode", "1004") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Department Not Found"))); + } + + @Test + public void retrieveCourseNotFoundCourseTest() throws Exception { + mockMvc.perform(get("/retrieveCourse") + .param("deptCode", "COMS") + .param("courseCode", "9999") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Course Not Found"))); + } + + @Test + public void isCourseFullTest1() throws Exception { + + } + + @Test + public void isCourseFullTest2() throws Exception { + + } + + @Test + public void getMajorCtFromDeptSuccessTest() throws Exception { + mockMvc.perform(get("/getMajorCountFromDept") + .param("deptCode", "ECON") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect((content().string("There are: 2345 majors in the department"))); + } + + @Test + public void getMajorCtFromDeptNotSuccessTest() throws Exception { + mockMvc.perform(get("/getMajorCountFromDept") + .param("deptCode", "MATH") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Department Not Found"))); + } + + @Test + public void identifyDeptChairSuccessTest() throws Exception { + mockMvc.perform(get("/idDeptChair") + .param("deptCode", "COMS") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect((content().string("Luca Carloni is the department chair."))); + } + + @Test + public void identifyDeptChairNotSuccessTest() throws Exception { + mockMvc.perform(get("/idDeptChair") + .param("deptCode", "MATH") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Department Not Found"))); + } + + @Test + public void findCourseLocationSuccessTest() throws Exception { + mockMvc.perform(get("/findCourseLocation") + .param("deptCode", "COMS") + .param("courseCode", "4156") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect((content().string("501 NWC is where the course is located."))); + } + + @Test + public void findCourseLocationNotSuccessTest1() throws Exception { + mockMvc.perform(get("/findCourseLocation") + .param("deptCode", "MATH") + .param("courseCode", "1004") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Course Not Found"))); + } + + @Test + public void findCourseLocationNotSuccessTest2() throws Exception { + mockMvc.perform(get("/findCourseLocation") + .param("deptCode", "COMS") + .param("courseCode", "9999") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Course Not Found"))); + } + + + + @Test + public void findCourseInstructorSuccessTest() throws Exception { + mockMvc.perform(get("/findCourseInstructor") + .param("deptCode", "COMS") + .param("courseCode", "3203") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect((content().string("Ansaf Salleb-Aouissi is the instructor " + + "for the course."))); + } + + @Test + public void findCourseInstructorNotSuccessTest1() throws Exception { + mockMvc.perform(get("/findCourseInstructor") + .param("deptCode", "COMS") + .param("courseCode", "9999") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Course Not Found"))); + } + + @Test + public void findCourseInstructorNotSuccessTest2() throws Exception { + mockMvc.perform(get("/findCourseInstructor") + .param("deptCode", "MATH") + .param("courseCode", "1004") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Course Not Found"))); + } + + + @Test + public void findCourseTimeSuccessTest() throws Exception { + mockMvc.perform(get("/findCourseTime") + .param("deptCode", "COMS") + .param("courseCode", "1004") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect((content().string("The course meets at: 11:40-12:55."))); + } + + @Test + public void findCourseTimeNotSuccessTest1() throws Exception { + mockMvc.perform(get("/findCourseTime") + .param("deptCode", "COMS") + .param("courseCode", "9999") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Course Not Found"))); + } + + @Test + public void findCourseTimeNotSuccessTest2() throws Exception { + mockMvc.perform(get("/findCourseTime") + .param("deptCode", "MATH") + .param("courseCode", "1004") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Course Not Found"))); + } + + @Test + public void addMajorToDeptSuccessTest() throws Exception { + mockMvc.perform(patch("/addMajorToDept") + .param("deptCode", "COMS") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect((content().string("Attribute was updated successfully"))); + } + + @Test + public void addMajorToDeptNotSuccessTest() throws Exception { + mockMvc.perform(patch("/addMajorToDept") + .param("deptCode", "MATH") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Department Not Found"))); + } + + @Test + public void removeMajorFromDeptSuccessTest() throws Exception { + mockMvc.perform(patch("/removeMajorFromDept") + .param("deptCode", "COMS") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect((content().string("Attribute was updated or is at minimum"))); + } + + @Test + public void removeMajorFromDeptNotSuccessTest() throws Exception { + mockMvc.perform(patch("/removeMajorFromDept") + .param("deptCode", "MATH") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Department Not Found"))); + } + + + @Test + public void dropStudentSuccessTest() throws Exception { + mockMvc.perform(patch("/dropStudentFromCourse") + .param("deptCode", "COMS") + .param("courseCode", "1004") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect((content().string("Student has been dropped."))); + } + + @Test + public void dropStudentNotSuccessTest1() throws Exception { + mockMvc.perform(patch("/dropStudentFromCourse") + .param("deptCode", "COMS") + .param("courseCode", "9999") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Course Not Found"))); + } + + @Test + public void dropStudentNotSuccessTest2() throws Exception { + mockMvc.perform(patch("/dropStudentFromCourse") + .param("deptCode", "MATH") + .param("courseCode", "1004") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Course Not Found"))); + } + + + @Test + public void setEnrollmentCountSuccessTest() throws Exception { + mockMvc.perform(patch("/setEnrollmentCount") + .param("deptCode", "COMS") + .param("courseCode", "1004") + .param("count", "10") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect((content().string("Attributed was updated successfully."))); + } + + @Test + public void setEnrollmentCountNotSuccessTest1() throws Exception { + mockMvc.perform(patch("/setEnrollmentCount") + .param("deptCode", "COMS") + .param("courseCode", "9999") + .param("count", "10") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Course Not Found"))); + } + + @Test + public void setEnrollmentCountNotSuccessTest2() throws Exception { + mockMvc.perform(patch("/setEnrollmentCount") + .param("deptCode", "MATH") + .param("courseCode", "1004") + .param("count", "10") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Course Not Found"))); + } + + @Test + public void enrollStudentInCourseSuccessTest() throws Exception { + mockMvc.perform(patch("/enrollStudentInCourse") + .param("deptCode", "COMS") + .param("courseCode", "1004") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect((content().string("Enrollment Success"))); + } + + @Test + public void enrollStudentInCourseNotSuccessTest1() throws Exception { + mockMvc.perform(patch("/enrollStudentInCourse") + .param("deptCode", "MATH") + .param("courseCode", "1004") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Course Not Found"))); + } + + @Test + public void enrollStudentInCourseNotSuccessTest2() throws Exception { + mockMvc.perform(patch("/enrollStudentInCourse") + .param("deptCode", "COMS") + .param("courseCode", "9999") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Course Not Found"))); + } + + @Test + public void changeCourseTimeSuccessTest() throws Exception { + mockMvc.perform(patch("/changeCourseTime") + .param("deptCode", "COMS") + .param("courseCode", "1004") + .param("time", "11:40-12:55") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect((content().string("Attributed was updated successfully."))); + } + + @Test + public void changeCourseTimeNotSuccessTest1() throws Exception { + mockMvc.perform(patch("/changeCourseTime") + .param("deptCode", "COMS") + .param("courseCode", "9999") + .param("time", "4:10-5:25") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Course Not Found"))); + } + + @Test + public void changeCourseTimeNotSuccessTest2() throws Exception { + mockMvc.perform(patch("/changeCourseTime") + .param("deptCode", "MATH") + .param("courseCode", "1004") + .param("time", "4:10-5:25") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Course Not Found"))); + } + + @Test + public void changeCourseTeacherSuccessTest() throws Exception { + mockMvc.perform(patch("/changeCourseTeacher") + .param("deptCode", "COMS") + .param("courseCode", "3261") + .param("teacher", "Josh Alman") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect((content().string("Attributed was updated successfully."))); + } + + @Test + public void changeCourseTeacherNotSuccessTest1() throws Exception { + mockMvc.perform(patch("/changeCourseTeacher") + .param("deptCode", "COMS") + .param("courseCode", "9999") + .param("teacher", "Jae Lee") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Course Not Found"))); + } + + @Test + public void changeCourseTeacherNotSuccessTest2() throws Exception { + mockMvc.perform(patch("/changeCourseTeacher") + .param("deptCode", "MATH") + .param("courseCode", "1004") + .param("teacher", "Jae Lee") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Course Not Found"))); + } + + @Test + public void changeCourseLocationSuccessTest() throws Exception { + mockMvc.perform(patch("/changeCourseLocation") + .param("deptCode", "COMS") + .param("courseCode", "3251") + .param("location", "402 CHANDLER") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect((content().string("Attributed was updated successfully."))); + } + + @Test + public void changeCourseLocationNotSuccessTest1() throws Exception { + mockMvc.perform(patch("/changeCourseLocation") + .param("deptCode", "COMS") + .param("courseCode", "9999") + .param("location", "402 CHANDLER") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Course Not Found"))); + } + + @Test + public void changeCourseLocationNotSuccessTest2() throws Exception { + mockMvc.perform(patch("/changeCourseLocation") + .param("deptCode", "MATH") + .param("courseCode", "1004") + .param("location", "402 CHANDLER") + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) + .andExpect((content().string("Course Not Found"))); + } + +} diff --git a/README.md b/README.md index 93e4ba9b..7954f25b 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,12 @@ # Welcome Students of 4156 Please follow the assignment specifications on Courseworks when completing this project. + +## modification of readme + +if you want to use PMD to analysis the code, you can use the following command: + +1. checking by PMD: +mvn pmd:check +2. generate an HTML report: +mvn pmd:pmd diff --git a/honesty.txt b/honesty.txt new file mode 100644 index 00000000..7854c2b7 --- /dev/null +++ b/honesty.txt @@ -0,0 +1,14 @@ +I, , have read and understood the following: + +CS department's Policies and Procedures on Academic Honesty +The Course Specific Academic Honesty Policies +The assignment specs outlining the consequences of not submitting this pledge and other aspects of the policy +I affirm that I will abide by all the policies stated in the relevant materials from above. I understand that the relevant policies apply to: individual assignments, group projects, and individual examinations. + +I also affirm that I understand that all course materials, with the exception of the individual/group project, are subject to the appropriate copyrights and thus will not post them on any public forum or publicly hosted repository, this includes but is not limited to: GitHub, stackoverflow, chegg etc. + +I also affirm that I will be 100% honest when evaluating the performance of myself and my teammates when prompted by an assignment or member of the teaching staff. + +Finally I affirm that I will not attempt to find any loopholes in these policies for the benefit of myself or others enrolled in the course presently or possibly in the future. + +Signed: \ No newline at end of file