:information_source: **Note:** These instructions only provide a starting point for testers to work on;
-testers are expected to do more *exploratory* testing.
+ Use case resumes at step 2.
-
+**UC08: Searching for a student**
+
+**MSS**
-### Launch and shutdown
+1. User enters a command to find all students that match the given search parameter (name, school, year).
+2. **Reeve** displays all students matching the criteria.
-1. Initial launch
+ Use case ends.
- 1. Download the jar file and copy into an empty folder
+**Extensions**
- 1. Double-click the jar file Expected: Shows the GUI with a set of sample contacts. The window size may not be optimum.
+* 1a. User provides input with invalid data into the search parameter.
+ * 1a1. **Reeve** displays erroneous field and expected format.
-1. Saving window preferences
+ Use case resumes at step 1.
+* 1b. User provides input without a search parameter.
+ * 1a1. **Reeve** displays a message indicating a search parameter was not provided.
- 1. Resize the window to an optimum size. Move the window to a different location. Close the window.
+ Use case resumes at step 1.
+* 1c. No students match the given criteria.
+ * 1c1. **Reeve** displays a message indicating no match found.
- 1. Re-launch the app by double-clicking the jar file.
+:information_source: These instructions only provide a starting point for testers to work on;
+testers are expected to do more *exploratory* testing.
+
+
+
+### F.1 Launching **Reeve**
+
+1. Initial launch
+
+ 1. Download the jar file and copy into an empty folder
+
+ 1. Double-click the jar file Expected: Shows the GUI with a set of sample students. The window size may not be optimum.
+
+2. Saving window preferences
+
+ 1. Resize the window to an optimum size. Move the window to a different location. Close the window.
+
+ 1. Re-launch the app by double-clicking the jar file.
+
+:information_source: You **cannot** add duplicates of a student. Each student is uniquely identified by his/her `NAME`, `PHONE`, `SCHOOL` and `YEAR`.
+
+
+
+
-Format: `add n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS [t/TAG]…`
+:information_source: `LAST_PAYMENT_DATE` **cannot** be a future date (i.e. cannot be later than the current date)
+
+
+
+
+
+:information_source: The specified `END_TIME` for the `CLASS_TIME` field **should not** be before the `START_TIME` (e.g. `1300-1200` is invalid).
-
:bulb: **Tip:**
-A person can have any number of tags (including 0)
Examples:
-* `add n/John Doe p/98765432 e/johnd@example.com a/John street, block 123, #01-01`
-* `add n/Betsy Crowe t/friend e/betsycrowe@example.com a/Newgate Prison p/1234567 t/criminal`
+* Suppose you want to add a student without any additional details.
+ * You can use something like `add n/Brendan Tan p/93211234 s/Commonwealth Secondary School y/pri 6 v/Blk 33 West Coast Rd #21-214 t/5 1430-1630 f/25 d/10/10/2020`.
+ * You should see a screen similar to the one shown below (Figure 6).
-### Listing all persons : `list`
+ 
+
Figure 6: After entering add command
-Shows a list of all persons in the address book.
+* Also, if you want to add a student with multiple additional details.
+ * You can use something like `add n/John Doe p/98765432 s/Woodlands Secondary School y/s 2 v/347 Woodlands Ave 3, Singapore 730347 t/1 1200-1400 f/30 d/24/09/2020 a/Likes chocolates a/Needs help with Algebra`
+
+#### 3.3.2 Listing all students: `list`
+
+You can view the list of all students in **Reeve** sorted by name.
Format: `list`
-### Editing a person : `edit`
+
+
+:information_source: You will need to use this if you wish to view the full student list after using commands such as `find`, `overdue` and `schedule`.
-Edits an existing person in the address book.
+
+
+#### 3.3.3 Editing a student: `edit` (By: Vaishak)
+
+You can edit an existing student in **Reeve** if you need to update his/her particulars.
-Format: `edit INDEX [n/NAME] [p/PHONE] [e/EMAIL] [a/ADDRESS] [t/TAG]…`
+Format: `edit STUDENT_INDEX [n/NAME] [p/PHONE] [s/SCHOOL] [y/YEAR] [v/CLASS_VENUE] [t/CLASS_TIME] [f/FEE] [d/LAST_PAYMENT_DATE]`
-* Edits the person at the specified `INDEX`. The index refers to the index number shown in the displayed person list. The index **must be a positive integer** 1, 2, 3, …
+* Edits the student at the specified `STUDENT_INDEX`. The `STUDENT_INDEX` refers to the index number shown in the displayed student list. The `STUDENT_INDEX` **must be a positive integer** 1, 2, 3, …
* At least one of the optional fields must be provided.
* Existing values will be updated to the input values.
-* When editing tags, the existing tags of the person will be removed i.e adding of tags is not cumulative.
-* You can remove all the person’s tags by typing `t/` without
- specifying any tags after it.
+* The format of `CLASS_TIME`, `YEAR` and `LAST_PAYMENT_DATE` follows that as stated in the [add command section](#331-adding-a-student-add-by-hogan).
+
+
+
+:information_source: If using this command after `find`, the edited student may no longer satisfy the search criteria depending on the field changed.
+In that case the student will be hidden from view and can be viewed again using `list` or `find`.
+
+
+
+:warning: You cannot add / edit additional details with this command.
+
+
Examples:
-* `edit 1 p/91234567 e/johndoe@example.com` Edits the phone number and email address of the 1st person to be `91234567` and `johndoe@example.com` respectively.
-* `edit 2 n/Betsy Crower t/` Edits the name of the 2nd person to be `Betsy Crower` and clears all existing tags.
+* `edit 1 n/Arthur p/98727030 s/Meridian Junior College` edits the name, phone number and school of the 1st student to be `Arthur`, `98727030` and `Meridian Junior College` respectively.
+
+Expected outcome:
+The following figure (Figure 7) shows the expected outcome after executing the above example.
-### Locating persons by name: `find`
+
+
Figure 7: After entering edit command
-Finds persons whose names contain any of the given keywords.
+#### 3.3.4 Locating students: `find` (By: Choon Siong)
-Format: `find KEYWORD [MORE_KEYWORDS]`
+You can search for students who satisfy the given search criteria.
+
+Format: `find [n/NAME] [s/SCHOOL] [y/YEAR]`
* The search is case-insensitive. e.g `hans` will match `Hans`
-* The order of the keywords does not matter. e.g. `Hans Bo` will match `Bo Hans`
-* Only the name is searched.
-* Only full words will be matched e.g. `Han` will not match `Hans`
-* Persons matching at least one keyword will be returned (i.e. `OR` search).
- e.g. `Hans Bo` will return `Hans Gruber`, `Bo Yang`
+* At least one of the optional fields must be provided.
+* The order of the optional fields do not matter. e.g `n/Hans s/River Valley` is the same as `s/River Valley n/Hans`
+* For the name criteria, only students with a name that contains **any full keyword** specified will be matched.
+* For the school criteria, only students with a school that contains **all keywords** specified will be matched.
+* For the year criteria, only students with the **same year** will be matched. (See below for more elaboration for format of year)
+* Only students matching all criteria specified will be returned (i.e `AND` search).
+
+Examples:
+* `find n/Alex david` matches `Alex David`, `alex david` and `Alex david`.
+* `find n/Alex david` does not match `Alexis Davinder`.
+* `find s/yishun sec` matches `Yishun Secondary School`, `Yishun Town Secondary School` and `Yishun Sec`.
+* `find s/yishun secondary` matches `Yishun Secondary School` and `Yishun Town Secondary School` but not `Yishun Sec`.
+* `find n/alex s/yishun y/sec 3` searches for all students who match all of `n/alex`, `s/yishun` and `y/sec 3`.
+
+#### 3.3.5 Deleting a student: `delete`
+
+You can delete a specified student from **Reeve** to allow you to get rid of any unwanted student data.
+
+Format: `delete STUDENT_INDEX`
+
+* Deletes the student at the specified `STUDENT_INDEX`.
+* `STUDENT_INDEX` refers to the index number shown in the displayed students list.
+
+
+
+:information_source: `STUDENT_INDEX` **must be a positive integer** 1, 2, 3, …
+
+
Examples:
-* `find John` returns `john` and `John Doe`
-* `find alex david` returns `Alex Yeoh`, `David Li`
- 
+* `list` followed by `delete 2` deletes the 2nd student in **Reeve**.
+* `find n/Betsy` followed by `delete 1` deletes the 1st student in the results of the `find` command.
-### Deleting a person : `delete`
+#### 3.3.6 Sorting the list of students: `sort` (By: Choon Siong)
-Deletes the specified person from the address book.
+You can sort your student list by a specified means of comparison. The means of comparison must be the student's name, class time or year.
+This is useful in situations where you want to look at your student list differently for various reasons.
-Format: `delete INDEX`
+Format: `sort COMPARISON_MEANS`
-* Deletes the person at the specified `INDEX`.
-* The index refers to the index number shown in the displayed person list.
-* The index **must be a positive integer** 1, 2, 3, …
+* The valid options for `COMPARISON_MEANS` are `name`, `classTime` or `year`.
+* Only one option for the means of comparison can be specified.
+* The means of comparison is case-sensitive when being specified
+* means of comparison:
+ * `name`: Sorts students by their name in case-insensitive alphabetical order. This is useful when you want to search through your student list easily.
+ * `classTime`: Sorts students by the day of their class followed by its time. This is useful when you want to look at your student list in order of upcoming classes.
+ * `year` Sorts students by their year with `Primary 1` coming first and `JC 2` last. This is useful when you want to group students by their year.
Examples:
-* `list` followed by `delete 2` deletes the 2nd person in the address book.
-* `find Betsy` followed by `delete 1` deletes the 1st person in the results of the `find` command.
+* `sort name` to sort students by their name in alphabetical order
-### Clearing all entries : `clear`
+#### 3.3.7 Finding students with overdue fees: `overdue` (By: Ying Gao)
-Clears all entries from the address book.
+You can find all students whose date of last payment is more than a month ago.
+
+Format: `overdue`
+
+* Students tutored for free (i.e. `FEE` = $0.00) will not be displayed.
+* If all students have paid their fees within the past month, no students will be displayed.
+
+
+
+:warning: If you use `edit` to update a student's last payment date to within a month from now, the student will be hidden from the list as his payment is no longer outstanding.
+You can always view his particulars again using `list` or `find`. The same also applies if you edit his fee to $0.00.
+
+
+
+Expected outcome:
+
+The following figure (Figure 8) shows the expected result after entering the command `overdue`.
+
+
+
Figure 8: After entering overdue command
+
+#### 3.3.8 Managing details for a student: `detail` (By: Vaishak)
+
+You can add, edit or delete a detail for a specified student.
+
+General Format: `detail COMMAND_WORD STUDENT_INDEX PARAMETERS`
+
+* The `COMMAND_WORD` field accepts either `add`, `edit` or `delete`.
+* The command affects the student at the specified `STUDENT_INDEX`.
+* The format of `PARAMETERS` varies with each `COMMAND_WORD` as explained below.
+
+
+
+:information_source: `STUDENT_INDEX` **must be a positive integer** 1, 2, 3, …
+
+
+
+#### 3.3.8.1 Adding a detail: `detail add`
+
+You can add a detail to a specified student in **Reeve**.
+
+Format: `detail add STUDENT_INDEX t/DETAIL_TEXT`
+
+* Adds the detail to the student at the specified `STUDENT_INDEX`.
+
+Examples:
+* `detail add 1 t/Smart` adds the "Smart" detail to the 1st student in **Reeve**.
+
+Expected outcome:
+The following figure (Figure 9) shows the expected outcome after executing the above example.
+
+
+
Figure 9: After entering add detail command
+
+#### 3.3.8.2 Editing a detail: `detail edit`
+
+You can edit an existing detail for a specified student in **Reeve**.
+
+Format: `detail edit STUDENT_INDEX i/DETAIL_INDEX t/DETAIL_TEXT`
+
+* Edits the detail at the specified `DETAIL_INDEX` for the student at the specified `STUDENT_INDEX`.
+* `DETAIL_INDEX` refers to the index of the detail to edit, within the detail field of the student.
+* There has to be a valid detail at the `DETAIL_INDEX` provided.
+
+Examples:
+* `detail edit 1 i/2 t/Handsome` edits the 2nd detail for the 1st student in **Reeve**, to "Handsome".
+
+Expected outcome:
+The following figure (Figure 10) shows the expected outcome after executing the above example.
+
+
+
Figure 10: After entering edit detail command
+
+#### 3.3.8.3 Deleting a detail: `detail delete`
+
+You can delete an existing detail to a specified student in **Reeve**.
+
+Format: `detail delete STUDENT_INDEX i/DETAIL_INDEX`
+
+* Deletes the detail at the specified `DETAIL_INDEX` for the student at the specified `STUDENT_INDEX`.
+* `DETAIL_INDEX` refers to the index of the detail to delete, within the detail field of the student.
+* There has to be a valid detail at the `DETAIL_INDEX` provided.
+
+Examples:
+* `detail delete 1 i/1` deletes the 1st detail for the 1st student in **Reeve**.
+
+Expected outcome:
+The following figure (Figure 11) shows the expected outcome after executing the above example.
+
+
+
Figure 11: After entering delete detail command
+
+#### 3.3.9 Viewing lesson schedule: `schedule` (By: Alex Chua)
+
+You can view your classes on a timetable in either a daily or weekly format.
+
+Format: `schedule m/VIEW_MODE d/DATE_TO_VIEW`
+
+* Displays a timetable view of your classes with the corresponding student's name tagged to it.
+* `DATE_TO_VIEW` refers to the date you wish to view the lesson schedule of.
+* The format of `DATE_TO_VIEW` is `dd/mm/yy or dd/mm/yyyy` (e.g. both 3/2/20 and 3/2/2020 are acceptable).
+* `VIEW_MODE` refers to the mode where you would like the schedule to be rendered on screen.
+ It accepts either `weekly` or `daily` as inputs and is case-insensitive.
+
+Example:
+
+Suppose you have multiple classes in the coming week of 2nd November 2020 and you want to plan for them ahead.
+
+Instead of scrolling through your student details to find out who you have classes with,
+you can simply type `schedule m/weekly d/02/11/2020` to view them in a visual interface.
+
+To view schedule:
+
+1. Type `schedule m/weekly d/02/11/2020` into the command box as shown in Figure 12 . Press `Enter` to execute the command.
+
+ 
+
Figure 12: Shows the schedule command input keyed into the command box
+
+2. The schedule panel, as labelled in Figure 13, will appear with all your classes for the week of 2nd November 2020 populated.
+
+ 
+
Figure 13: Shows the schedule panel in the weekly format
+
+3. You can easily view your classes for the week. The Date bar labelled in Figure 14 below shows the day of the week as well as the date for your reference.
+ The Time bar in Figure 14 shows the time in 24-hour clock format with 1-hour intervals.
+ The Classes labelled in Figure 14 are colored brown to match the color of **Reeve** for a better visual experience.
+ Furthermore, the name of the student that you are tutoring during that slot will be labelled for you to identify classes easily.
+ The red bar in Figure 14 indicates your current time.
+ With the date, time and name of student shown in one view, you could plan your classes without a hassle.
+
+ 
+
Figure 14: Shows various component of your schedule
+
+
+:information_source: You could also click on the **Schedule** tab in the **Menu** to open or close the schedule.
+Viewing it this way would open up your schedule of the current week in the weekly format.
+You could use this as quick way to open up schedule for the current week.
+
+
+
+:warning: A class duration of less than an hour may not be shown fully on the schedule.
+
+
+#### 3.3.10 Clearing all entries: `clear`
+
+If you ever need to clear all existing data in **Reeve**, you can do so using this command.
Format: `clear`
-### Exiting the program : `exit`
+
-Exits the program.
+### 3.4 Features for Managing Student Academic Details
-Format: `exit`
+**Reeve's** student academics features allows you to keep track of key academic details of each of your students such as questions, exams and etc.
+Thereafter, you will be able to view, edit or delete these details of each student.
+
+#### 3.4.1 Recording questions from a student: `question` (By: Ying Gao)
+
+You can add, resolve or remove questions to/from a specified student in **Reeve**.
+
+General Format: `question COMMAND_WORD STUDENT_INDEX DETAILS`
+
+* The `COMMAND_WORD` field accepts either `add`, `solve` or `delete`.
+* The command affects the student at the specified `STUDENT_INDEX`, which is his/her position on the list.
+* The format of `DETAILS` varies with each command word as explained below.
+
+
+
+:information_source: `STUDENT_INDEX` **must be a positive integer** 1, 2, 3, …
+
+
+
+##### 3.4.1.1 Adding a question: `question add`
+
+If a student asks you a difficult question, you can record it in **Reeve** and find the answer to it after the lesson.
+
+Format: `question add STUDENT_INDEX t/QUESTION_TEXT`
+
+* This records a new unresolved question to the student at the specified `STUDENT_INDEX`.
+* The `QUESTION_TEXT` field refers to the question the student raised, and can be a full sentence.
+
+
+
+:information_source: `QUESTION_TEXT` must not be empty.
+
+
-### Saving the data
+Example:
+* `question add 1 t/How do birds fly?` records "How do birds fly?" as a question from the 1st student in **Reeve**.
-AddressBook data are saved in the hard disk automatically after any command that changes the data. There is no need to save manually.
+Expected outcome:
+
+The following figure (Figure 15) shows the result of recording "How do I pass CS2101?" as a new question from Bernice Yu.
+
+
+
Figure 15: After entering add question command
+
+##### 3.4.1.2 Resolving a question: `question solve`
+
+After finding the solution to the question, you can mark the student's question as resolved.
+
+Format: `question solve STUDENT_INDEX i/QUESTION_INDEX t/SOLUTION_TEXT`
+
+* This resolves the question from the student at the specified `STUDENT_INDEX`
+* This resolves the question at the `QUESTION_INDEX`. The `QUESTION_INDEX` refers to the position of the question in the student's list of questions.
+
+
+:information_source: `QUESTION_INDEX` **must be a positive integer** 1, 2, 3, …
+
-### Archiving data files `[coming in v2.0]`
+
+:information_source: `SOLUTION_TEXT` must not be empty.
+
+
+
+:information_source: You can only resolve unanswered questions (i.e. questions with a cross symbol next to it).
+
+
+Example:
+* `question solve 1 i/1 t/Read a book.` marks the 1st question of the 1st student in **Reeve** as answered.
+
+Expected outcome:
+
+The following figure (Figure 16) shows the result of resolving Bernice's second question.
+
+
+
Figure 16: After entering solve question command
+
+##### 3.4.1.3 Deleting a question: `question delete`
+
+If you do not need a student's question anymore, you can delete it.
+
+Format: `question delete STUDENT_INDEX i/QUESTION_INDEX`
+
+* This deletes the question at the specified `QUESTION_INDEX`.
+
+
+
+:information_source: `QUESTION_INDEX` **must be a positive integer** 1, 2, 3, …
+
+
+
+Example:
+* `question delete 1 i/1` deletes the 1st question of the 1st student in **Reeve**.
+
+Expected outcome:
+
+The following figure (Figure 17) shows the result of deleting Bernice's second question.
+
+
+
Figure 17: After entering delete question command
+
+#### 3.4.2 Recording exams of a student: `exam` (By: Hogan)
+
+You can add or delete an exam record to/from a specified student. You can then view the exam statistics of a student in the form of a
+score percentage to exam date line graph. This helps you to keep track of your students academic progress allowing you to take note of those who are
+not doing too well.
+
+General Format: `exam COMMAND_WORD_EXAM STUDENT_INDEX PARAMETERS`
+
+* The `COMMAND_WORD_EXAM` field accepts either `add`, `delete` or `stats`.
+* The command can affect the student at the specified `STUDENT_INDEX`.
+* `STUDENT_INDEX` refers to the index number shown in the displayed students list.
+* The format of `PARAMETERS` varies with each command word as explained in the following subsections.
+
+
+
+:information_source: `STUDENT_INDEX` **must be a positive integer** 1, 2, 3, …
+
+
+
+##### 3.4.2.1 Adding an exam record to a student: `exam add`
+
+You can add an exam record to a specified student in **Reeve** to keep track of your students' academic progress.
+
+Format: `exam add STUDENT_INDEX n/EXAM_NAME d/EXAM_DATE s/EXAM_SCORE`
+
+* Adds the given exam record to the student at the specified `STUDENT_INDEX`.
+* The format of `EXAM_DATE` is `dd/mm/yy or dd/mm/yyyy` (e.g. both 3/2/20 and 3/2/2020 are acceptable).
+* The format of `EXAM_SCORE` is as follows:
+ * `MARKS/TOTAL_SCORE` where `MARKS` and `TOTAL_SCORE` are non-negative numbers.
+ * `MARKS` has to be less than or equal to `TOTAL_SCORE` (e.g. 30/50).
+
+
+
+:information_source: Scores and score percentages will be rounded off to two decimal places.
+
+
+
+
+
+:warning: You **cannot** add duplicates of an exam record to a student. Each exam record is uniquely identified by its `EXAM_NAME`.
+
+
+
+Example:
+* Suppose you want to add an exam record to a student to monitor his academic progress.
+ * You can use `exam add 1 n/Mid Year 2020 d/08/12/2020 s/40/60` to add a new exam record to the first student in the displayed student list on the main panel
+ with exam name `Mid Year 2020`, exam date `08/12/2020` and score `40/60` so that you can keep track of this particular exam record.
+ * You should see a screen similar to the one below (Figure 18) after entering the above command.
+
+ 
+
Figure 18: After entering add exam command
+
+##### 3.4.2.2 Deleting an exam record for a student: `exam delete`
+
+You can delete a specific exam record from a specified student in **Reeve** to remove any unwanted exam record data.
+
+Format: `exam delete STUDENT_INDEX i/EXAM_INDEX`
+
+* Deletes the exam at `EXAM_INDEX` in the specified student's exam records list.
+* The specified exam record is chosen based on `EXAM_INDEX`.
+* The `EXAM_INDEX` refers to the index number shown in the displayed student's exam records list.
+
+
+
+:information_source: `EXAM_INDEX` **must be a positive integer** 1, 2, 3, …
+
+
-_{explain the feature here}_
+Example:
+* Suppose you have an outdated exam record or an exam record with wrong details such as the exam date or score and you wish to remove this exam record.
+ * For instance, if your current list looks similar to the figure below (Figure 19).
---------------------------------------------------------------------------------------------------------------------
+ 
+
Figure 19: Before entering delete exam command
-## FAQ
+ * You can use `exam delete 1 i/1` to delete the first exam record of the first student in the displayed student list on the main panel.
+ * You should see that you have successfully deleted the first exam record of the first student as shown below (Figure 20) after entering the above command.
-**Q**: How do I transfer my data to another Computer?
-**A**: Install the app in the other computer and overwrite the empty data file it creates with the file that contains the data of your previous AddressBook home folder.
+ 
+
Figure 20: After entering delete exam command
---------------------------------------------------------------------------------------------------------------------
+##### 3.4.2.3 Viewing exam statistics of a student: `exam stats`
-## Command summary
+To gauge how any of your students are doing with their examinations, this command allows you to view a graphical
+representation of all recorded examinations of a student in the form of a exam score percentage to exam date line graph.
+
+Format: `exam stats STUDENT_INDEX`
+
+* Views exam statistics of the student at the specified `INDEX`.
+
+
+
+:information_source: Exam records are arranged in order of increasing date.
+
+
+
+Examples:
+* Suppose you are trying to view the exam statistics of a particular student to view his academic progress so far in terms of his exam scores.
+ * You can use `exam stats 1` to view the exam statistics of the first student in the displayed student list on the main panel.
+ * You should see a screen similar to the one below (Figure 21) when the above command is entered.
+
+ 
+
Figure 21: Before entering exam stats command
+
+
+
+:information_source: If you are editing the exams of a student, you will have to enter the `exam stats` command again to get the updated statistics.
+
+
+
+#### 3.4.3 Recording attendance of a student: `attendance` (By: Vaishak)
+
+You can add or delete an attendance record to/from a specified student.
+
+General Format: `attendance COMMAND_WORD STUDENT_INDEX PARAMETERS`
+
+* The `COMMAND_WORD` field accepts either `add` or `delete`.
+* The command affects the student at the specified `STUDENT_INDEX`.
+* `STUDENT_INDEX` **must be a positive integer** 1, 2, 3, …
+* The format of `PARAMETERS` varies with each command word as explained below.
+
+##### 3.4.3.1 Adding an attendance record to a student: `attendance add`
+
+You can add an attendance record to a specified student in **Reeve**.
+
+Format: `attendance add STUDENT_INDEX d/LESSON_DATE a/ATTENDANCE_STATUS [f/FEEDBACK]`
+
+* Adds the given attendance record to the student at the specified `STUDENT_INDEX`.
+* There can only be one attendance record for every `LESSON_DATE`.
+* The format of `LESSON_DATE` is `dd/mm/yy or dd/mm/yyyy` (e.g. both 3/2/20 and 3/2/2020 are acceptable).
+* `ATTENDANCE_STATUS` can only be either "present" or "absent".
+
+Examples:
+* `attendance add 1 d/31/10/2020 a/absent` adds to the 1st student in **Reeve** a new attendance record for a
+lesson on 31 Oct 2020, where he was absent, and the tutor has no feedback for him.
+
+Expected outcome:
+The following figure (Figure 22) shows the expected outcome after executing the above example.
+
+
+
Figure 22: After entering add attendance command
+
+##### 3.4.3.2 Deleting an attendance record for a student: `attendance delete`
+
+You can delete a specific attendance record from a specified student in **Reeve**.
+
+Format: `attendance delete STUDENT_INDEX d/ATTENDANCE_DATE`
+
+* Deletes the attendance record with the given `ATTENDANCE_DATE` in the specified student.
+* The specified student is chosen based on `STUDENT_INDEX` of **Reeve**.
+
+Example:
+* `attendance delete 1 d/06/05/2010` deletes the attendance with the date 6 Apr 2020 from the 1st student in the displayed students list in **Reeve**.
+
+Expected outcome:
+The following figure (Figure 23) shows the expected outcome after executing the above example.
+
+
+
Figure 23: After entering delete attendance command
+
+
+
+### 3.5 Notebook feature (By: Choon Siong)
+
+You can store notes containing small amounts of information inside the notebook. This is useful when you want to store information or details that is not related to any student and cannot do so anywhere else in **Reeve**.
+You should see the notes on the bottom right hand side of **Reeve** similar to the display shown below (Figure 24).
+
+
+
Figure 24: Location of notes panel
+
+#### 3.5.1 Adding a note `note add`
+
+You can add a note to the notebook for the information you want to store.
+
+Format: `note add t/TITLE d/DESCRIPTION`
+
+* `TITLE` is any string of up to 15 characters.
+* `DESCRIPTION` is any string of up to 80 characters.
+
+Example:
+* You have just collected a stack of practice papers from your students and want to do something else before marking them but are scared you might forget.
+
+ * You can use `note add t/things to do d/mark practice papers` to add a new note with title `things to do` and description `mark practice papers` so that you can remind yourself later.
+
+ * You should see a screen similar to the screen below (Figure 25) when the above command is entered.
+
+ 
+
Figure 25: After entering add note command
+
+#### 3.5.2 Editing a note `note edit`
+
+You can edit a note that is inside the notebook to update the information inside.
+
+Format: `note edit NOTE_INDEX [t/TITLE] [d/DESCRIPTION]`
+
+* Edits the note at the specified `NOTE_INDEX`
+
+Example:
+* You left a note to mark practice papers earlier and have just finished marking them. Now, before you take a break,
+ you want to remind yourself to review the marking before you can give it back to your students.
+ * Assuming the previous note was the first note, you can use `note edit 1 d/review marking`
+ to change the note to remind yourself to review the marking.
+
+#### 3.5.3 Deleting a note `note delete`
+
+You can delete a note from the notebook when the information is no longer needed.
+
+Format: `note delete NOTE_INDEX`
+
+* Deletes the note at the specified `NOTE_INDEX`
+
+Example:
+* Your first note was to remind yourself to grab a cup of coffee. Now that you have bought your cup of coffee, the note is no longer needed.
+ * You can use `note delete 1` to delete the note.
+
+
+
+## 4. Command summary
+
+This following table (Table 2) provides a summary of all the commands in **Reeve**.
+
+Table 2: Summary of commands in **Reeve**
Action | Format, Examples
--------|------------------
-**Add** | `add n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS [t/TAG]…`
e.g., `add n/James Ho p/22224444 e/jamesho@example.com a/123, Clementi Rd, 1234665 t/friend t/colleague`
+**Add Student** | `add n/NAME p/PHONE s/SCHOOL y/YEAR v/CLASS_VENUE t/CLASS_TIME f/FEE d/LAST_PAYMENT_DATE [a/ADDITIONAL_DETAILS]...`
e.g. `add n/John Doe p/98765432 s/Woodlands Secondary School y/Secondary 2 v/347 Woodlands Ave 3, Singapore 730347 t/1 1200-1400 f/30 d/24/09/2020 a/Likes chocolates a/Needs help with Algebra`
+**Edit Student** | `edit STUDENT_INDEX [n/NAME] [p/PHONE] [s/SCHOOL] [y/YEAR] [v/CLASS_VENUE] [t/CLASS_TIME] [f/FEE] [d/LAST_PAYMENT_DATE]`
e.g. `edit 1 n/Arthur p/98727030 s/Meridian Junior College`
+**Find Student** | `find [n/NAME] [s/SCHOOL] [y/YEAR]`
e.g. `find n/alex s/yishun`
+**List Students** | `list`
+**Delete Student** | `delete STUDENT_INDEX`
e.g. `delete 3`
+**Sort Students** | `sort COMPARISON_MEANS`
e.g. `sort year`
+**Overdue** | `overdue unpaid`
+**Add Detail** | `detail add STUDENT_INDEX t/DETAIL_TEXT`
e.g. `detail add 1 t/Smart`
+**Edit Detail** | `detail edit STUDENT_INDEX i/DETAIL_INDEX t/DETAIL_TEXT`
e.g. `detail edit 1 i/2 t/Handsome`
+**Delete Detail** | `detail delete STUDENT_INDEX i/DETAIL_INDEX`
e.g. `detail delete 1 i/3`
**Clear** | `clear`
-**Delete** | `delete INDEX`
e.g., `delete 3`
-**Edit** | `edit INDEX [n/NAME] [p/PHONE_NUMBER] [e/EMAIL] [a/ADDRESS] [t/TAG]…`
e.g.,`edit 2 n/James Lee e/jameslee@example.com`
-**Find** | `find KEYWORD [MORE_KEYWORDS]`
e.g., `find James Jake`
-**List** | `list`
+**Add Question** | `question add STUDENT_INDEX t/QUESTION`
e.g. `question add 1 t/How do birds fly?`
+**Resolve Question** | `question solve STUDENT_INDEX i/QUESTION_INDEX t/SOLUTION`
e.g. `question solve 1 i/1 t/Read a book.`
+**Delete Question** | `question delete STUDENT_INDEX i/QUESTION_INDEX`
e.g. `question delete 1 i/1`
+**Add Exam** | `exam add STUDENT_INDEX n/EXAM_NAME d/EXAM_DATE s/EXAM_SCORE`
e.g. `exam add 1 n/Mid Year 2020 d/08/12/2020 s/40/60`
+**Delete Exam** | `exam delete STUDENT_INDEX i/EXAM_INDEX`
e.g. `exam delete 2 i/5`
+**Exam Stats** | `exam stats STUDENT_INDEX`
e.g. `exam stats 1`
+**Add Attendance** | `attendance add STUDENT_INDEX d/LESSON_DATE a/ATTENDANCE_STATUS [f/FEEDBACK]`
e.g. `attendance add 2 d/08/12/2020 a/present f/attentive`
+**Delete Attendance** | `attendance delete STUDENT_INDEX d/ATTENDANCE_DATE`
e.g. `attendance delete 1 d/19/04/2020`
+**Schedule View** | `schedule m/VIEW_MODE d/DATE_TO_VIEW`
e.g. `schedule m/weekly d/02/11/2020`
+**Toggle View** | `toggle`
+**Add Note** | `note add t/TITLE d/DESCRIPTION`
e.g. `note add t/things to do d/buy coffee`
+**Edit Note** | `note edit NOTE_INDEX [t/title] [d/DESCRIPTION]`
e.g. `note edit 1 d/mark practice papers`
+**Delete Note** | `note delete NOTE_INDEX`
e.g. `note delete 1`
**Help** | `help`
+**Exit** | `exit`
+
+
+
+## 5. Glossary
+
+The following table (Table 3) provides the definitions of the various terms used in this User Guide.
+
+Table 3: Glossary of terms
+
+Term | Definition
+--------|------------------
+Administrative Details | Details such as class venue, class time, tuition fee, last payment date and other details
+Academic Details | Details such as questions, exam records and attendance records
+Detail | Any miscellaneous information regarding a student
+Exam Record | A record of an exam which includes its name, date and the student's score
+Index | Position of an item in a list (1, 2 3 etc)
+
+
+
+## 6. FAQ
+This section provides the answers to Frequently Asked Questions (FAQ) by users.
+
+1. How do I transfer my data to another Computer?
+Install the app in the other computer and overwrite the empty data file it creates with the file that contains the data of your previous **Reeve** home folder.
+
+2. Do I have to manually save my data?
+**Reeve** automatically saves data in the hard disk automatically after any command that changes the data. There is no need to save manually.
+
+3. How do I view the full details of my student?
+Type `toggle` and press `Enter`, your student's full details will be displayed.
+To hide the full details of students, type `toggle` and press `Enter` again.
+
+4. Where can I find the file that contains my student's data?
+Your student's data file can be found in the same file as the application.
+
+5. How can I set the application window to a fix size whenever I open it?
+**Reeve** automatically save your preferred window size when you close it.
+Hence, you could adjust the window size to your preferred one before closing **Reeve**.
+**Reeve** will automatically open according to this size.
+
+6. I forgot what are the various commands and their format, where can I find the list of commands?
+Simply enter the `help` command, and you will be directed the list of commands.
+
+7. I accidentally deleted all my data, is there a way to recover my past data?
+Unfortunately, **Reeve** currently does not support a backup feature and is unable to recover any deleted data. The backup feature will be coming soon.
+In the meantime, we advise you to refrain from accidentally clearing all data, you could perhaps create a backup `json` from time to time.
+
diff --git a/docs/_config.yml b/docs/_config.yml
index 6bd245d8f4e..b80bfc4490f 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,4 +1,4 @@
-title: "AB-3"
+title: "Reeve"
theme: minima
header_pages:
@@ -8,7 +8,7 @@ header_pages:
markdown: kramdown
-repository: "se-edu/addressbook-level3"
+repository: "AY2021S1-CS2103T-W15-2/tp"
github_icon: "images/github-icon.png"
plugins:
diff --git a/docs/diagrams/AcademicClassDiagram.puml b/docs/diagrams/AcademicClassDiagram.puml
new file mode 100644
index 00000000000..6ccdcf64651
--- /dev/null
+++ b/docs/diagrams/AcademicClassDiagram.puml
@@ -0,0 +1,24 @@
+@startuml
+!include style.puml
+skinparam arrowThickness 1.1
+skinparam arrowColor MODEL_COLOR
+skinparam classBackgroundColor MODEL_COLOR
+
+Package Academic {
+Class Academic
+abstract Class Question
+Class UnsolvedQuestion
+Class SolvedQuestion
+Class Exam
+Class Attendance
+}
+
+
+Academic *--> "*" Question
+Academic *--> "*" Exam
+Academic *--> "*" Attendance
+Question <|-- UnsolvedQuestion
+Question <|-down- SolvedQuestion
+
+Question -[hidden]left- Attendance
+@enduml
diff --git a/docs/diagrams/AddAttendanceActivityDiagram.puml b/docs/diagrams/AddAttendanceActivityDiagram.puml
new file mode 100644
index 00000000000..9e221edb885
--- /dev/null
+++ b/docs/diagrams/AddAttendanceActivityDiagram.puml
@@ -0,0 +1,29 @@
+@startuml
+!include style.puml
+
+start
+:User executes add Attendance command;
+:Parses the command;
+if() then([command is valid])
+ if() then([student index is valid])
+ :Add Attendance to Student <$rake>;
+ else([student index is invalid])
+ :Display invalid student index error message;
+ endif
+else ([command is invalid - missing or invalid parameters])
+ :Display parse error message;
+endif
+stop
+
+partition "Activity: Add Attendance to Student" {
+ start
+ if() then([valid attendance date])
+ :Create student copy with added attendance;
+ :Replace student with modified copy;
+ :Display success message;
+ else([duplicate attendance date])
+ :Display duplicate attendance date error;
+ endif
+ stop
+}
+@enduml
diff --git a/docs/diagrams/AddAttendanceSequenceDiagram.puml b/docs/diagrams/AddAttendanceSequenceDiagram.puml
new file mode 100644
index 00000000000..7be7d80d181
--- /dev/null
+++ b/docs/diagrams/AddAttendanceSequenceDiagram.puml
@@ -0,0 +1,78 @@
+@startuml
+!include style.puml
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":ReeveParser" as ReeveParser LOGIC_COLOR
+participant ":AttendanceCommandParser" as AttendanceCommandParser LOGIC_COLOR
+participant "a:AddAttendanceCommand" as AddAttendanceCommand LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant "updatedStudent:Student" as Student MODEL_COLOR
+participant ":Model" as Model MODEL_COLOR
+end box
+
+[-> LogicManager : execute(...)
+activate LogicManager
+
+LogicManager -> ReeveParser : parseCommand(...)
+activate ReeveParser
+
+create AttendanceCommandParser
+ReeveParser -> AttendanceCommandParser : AttendanceCommandParser()
+activate AttendanceCommandParser
+
+AttendanceCommandParser --> ReeveParser
+deactivate AttendanceCommandParser
+
+ReeveParser -> AttendanceCommandParser : parse(...)
+activate AttendanceCommandParser
+
+create AddAttendanceCommand
+AttendanceCommandParser -> AddAttendanceCommand : AddAttendanceCommand(...)
+activate AddAttendanceCommand
+
+AddAttendanceCommand --> AttendanceCommandParser : a
+deactivate AddAttendanceCommand
+
+AttendanceCommandParser --> ReeveParser : a
+deactivate AttendanceCommandParser
+
+AttendanceCommandParser -[hidden]> ReeveParser
+destroy AttendanceCommandParser
+
+ReeveParser --> LogicManager : a
+deactivate ReeveParser
+
+LogicManager -> AddAttendanceCommand : execute(...)
+activate AddAttendanceCommand
+
+AddAttendanceCommand -> AddAttendanceCommand : updateStudentAttendance(...)
+activate AddAttendanceCommand
+
+create Student
+AddAttendanceCommand -> Student : Student(...)
+activate Student
+
+Student --> AddAttendanceCommand : updatedStudent
+deactivate Student
+
+AddAttendanceCommand --> AddAttendanceCommand : updatedStudent
+deactivate AddAttendanceCommand
+
+AddAttendanceCommand -> Model : setStudent(student, updatedStudent)
+activate Model
+
+Model --> AddAttendanceCommand
+deactivate Model
+
+AddAttendanceCommand --> LogicManager : result
+deactivate AddAttendanceCommand
+
+AddAttendanceCommand -[hidden]> LogicManager
+destroy AddAttendanceCommand
+
+[<-- LogicManager : result
+deactivate LogicManager
+@enduml
diff --git a/docs/diagrams/AddDetailActivityDiagram.puml b/docs/diagrams/AddDetailActivityDiagram.puml
new file mode 100644
index 00000000000..64d17862ae0
--- /dev/null
+++ b/docs/diagrams/AddDetailActivityDiagram.puml
@@ -0,0 +1,17 @@
+@startuml
+start
+:User executes add detail command;
+:Parses the command;
+if() then([command is valid])
+ if() then([student index is valid])
+ :Create student copy with added detail;
+ :Replace student with modified copy;
+ :Display success message;
+ else([student index is invalid])
+ :Display invalid student index error message;
+ endif
+else ([command is invalid - missing or invalid parameters])
+ :Display parse error message;
+endif
+stop
+@enduml
diff --git a/docs/diagrams/AddDetailSequenceDiagram.puml b/docs/diagrams/AddDetailSequenceDiagram.puml
new file mode 100644
index 00000000000..a786aeda1ba
--- /dev/null
+++ b/docs/diagrams/AddDetailSequenceDiagram.puml
@@ -0,0 +1,78 @@
+@startuml
+!include style.puml
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":ReeveParser" as ReeveParser LOGIC_COLOR
+participant ":DetailCommandParser" as DetailCommandParser LOGIC_COLOR
+participant "a:AddDetailCommand" as AddDetailCommand LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant "updatedStudent:Student" as Student MODEL_COLOR
+participant ":Model" as Model MODEL_COLOR
+end box
+
+[-> LogicManager : execute(...)
+activate LogicManager
+
+LogicManager -> ReeveParser : parseCommand(...)
+activate ReeveParser
+
+create DetailCommandParser
+ReeveParser -> DetailCommandParser : DetailCommandParser()
+activate DetailCommandParser
+
+DetailCommandParser --> ReeveParser
+deactivate DetailCommandParser
+
+ReeveParser -> DetailCommandParser : parse(...)
+activate DetailCommandParser
+
+create AddDetailCommand
+DetailCommandParser -> AddDetailCommand : AddDetailCommand(...)
+activate AddDetailCommand
+
+AddDetailCommand --> DetailCommandParser : a
+deactivate AddDetailCommand
+
+DetailCommandParser --> ReeveParser : a
+deactivate DetailCommandParser
+
+DetailCommandParser -[hidden]> ReeveParser
+destroy DetailCommandParser
+
+ReeveParser --> LogicManager : a
+deactivate ReeveParser
+
+LogicManager -> AddDetailCommand : execute(...)
+activate AddDetailCommand
+
+AddDetailCommand -> AddDetailCommand : updateStudentDetail(...)
+activate AddDetailCommand
+
+create Student
+AddDetailCommand -> Student : Student(...)
+activate Student
+
+Student --> AddDetailCommand : updatedStudent
+deactivate Student
+
+AddDetailCommand --> AddDetailCommand : updatedStudent
+deactivate AddDetailCommand
+
+AddDetailCommand -> Model : setStudent(student, updatedStudent)
+activate Model
+
+Model --> AddDetailCommand
+deactivate Model
+
+AddDetailCommand --> LogicManager : result
+deactivate AddDetailCommand
+
+AddDetailCommand -[hidden]> LogicManager
+destroy AddDetailCommand
+
+[<-- LogicManager : result
+deactivate LogicManager
+@enduml
diff --git a/docs/diagrams/AddQuestionActivityDiagram.puml b/docs/diagrams/AddQuestionActivityDiagram.puml
new file mode 100644
index 00000000000..758d694668c
--- /dev/null
+++ b/docs/diagrams/AddQuestionActivityDiagram.puml
@@ -0,0 +1,33 @@
+@startuml
+!include style.puml
+
+start
+:User executes add question command;
+:Parses the command;
+if () then ([command is valid])
+ :Execute AddQuestionCommand;
+ if () then ([student exists])
+ :Add question to student <$rake>;
+ else ([else])
+ :Display invalid student error message;
+ endif
+else ([else])
+ :Display parse error message;
+endif
+stop
+
+
+partition "Activity: Add question to student" {
+ start
+ if () then ([else])
+ :Create student copy;
+ :Add question to student copy;
+ :Replace student with modified copy;
+ :Display success message;
+ else ([has duplicate question])
+ :Display duplicate question error message;
+ endif
+ stop
+}
+
+@enduml
diff --git a/docs/diagrams/AddQuestionSequenceDiagram.puml b/docs/diagrams/AddQuestionSequenceDiagram.puml
new file mode 100644
index 00000000000..295f58fef85
--- /dev/null
+++ b/docs/diagrams/AddQuestionSequenceDiagram.puml
@@ -0,0 +1,74 @@
+@startuml
+!include style.puml
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":ReeveParser" as ReeveParser LOGIC_COLOR
+participant ":QuestionCommandParser" as QuestionCommandParser LOGIC_COLOR
+participant "a:AddQuestionCommand" as AddQuestionCommand LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant ":Model" as Model MODEL_COLOR
+participant "student:Student" as Student MODEL_COLOR
+end box
+
+[-> LogicManager : execute(...)
+activate LogicManager
+
+LogicManager -> ReeveParser : parseCommand(...)
+activate ReeveParser
+
+create QuestionCommandParser
+ReeveParser -> QuestionCommandParser
+activate QuestionCommandParser
+
+QuestionCommandParser --> ReeveParser
+deactivate QuestionCommandParser
+
+ReeveParser -> QuestionCommandParser : parse(...)
+activate QuestionCommandParser
+
+create AddQuestionCommand
+QuestionCommandParser -> AddQuestionCommand
+activate AddQuestionCommand
+
+AddQuestionCommand --> QuestionCommandParser : a
+deactivate AddQuestionCommand
+
+QuestionCommandParser --> ReeveParser : a
+deactivate QuestionCommandParser
+
+QuestionCommandParser -[hidden]-> ReeveParser
+destroy QuestionCommandParser
+
+ReeveParser --> LogicManager : a
+deactivate ReeveParser
+
+LogicManager -> AddQuestionCommand : execute()
+activate AddQuestionCommand
+
+AddQuestionCommand -> Student : addQuestion(q)
+activate Student
+
+Student --> AddQuestionCommand : copy
+deactivate Student
+
+AddQuestionCommand -> Model : setStudent(student, copy)
+activate Model
+
+Model --> AddQuestionCommand
+deactivate Model
+
+Student -[hidden]-> Model
+destroy Student
+
+AddQuestionCommand --> LogicManager : result
+deactivate AddQuestionCommand
+
+AddQuestionCommand -[hidden]-> LogicManager
+destroy AddQuestionCommand
+
+[<-- LogicManager
+deactivate LogicManager
+@enduml
diff --git a/docs/diagrams/AddStudentActivityDiagram.puml b/docs/diagrams/AddStudentActivityDiagram.puml
new file mode 100644
index 00000000000..a521dabea0c
--- /dev/null
+++ b/docs/diagrams/AddStudentActivityDiagram.puml
@@ -0,0 +1,21 @@
+@startuml
+start
+:User executes add student command;
+:Parses the command;
+if () then ([command is valid])
+ :Add command is executed;
+ if() then ([student already exists])
+ :Display duplicate student error message;
+ else ([student is unique])
+ if() then ([Student's class time clashes])
+ :Display class time clash error message;
+ else ([Student's class time does not clash])
+ :Add student into student list;
+ :Display add student success message;
+ endif
+ endif
+else ([command is invalid - missing or invalid arguments])
+ :Display parse error message;
+endif
+stop
+@enduml
diff --git a/docs/diagrams/AddStudentSequenceDiagram.puml b/docs/diagrams/AddStudentSequenceDiagram.puml
new file mode 100644
index 00000000000..e0315e3534a
--- /dev/null
+++ b/docs/diagrams/AddStudentSequenceDiagram.puml
@@ -0,0 +1,70 @@
+@startuml
+!include style.puml
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":ReeveParser" as ReeveParser LOGIC_COLOR
+participant ":AddCommandParser" as AddCommandParser LOGIC_COLOR
+participant "a:AddCommand" as AddCommand LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant ":Model" as Model MODEL_COLOR
+end box
+
+[-> LogicManager : execute(input)
+activate LogicManager
+
+LogicManager -> ReeveParser : parseCommand(input)
+activate ReeveParser
+
+create AddCommandParser
+ReeveParser -> AddCommandParser
+activate AddCommandParser
+AddCommandParser --> ReeveParser
+deactivate AddCommandParser
+
+ReeveParser -> AddCommandParser : parse(input)
+activate AddCommandParser
+create AddCommand
+AddCommandParser -> AddCommand
+activate AddCommand
+
+AddCommand --> AddCommandParser : a
+deactivate AddCommand
+
+AddCommandParser --> ReeveParser : a
+deactivate AddCommandParser
+AddCommandParser -[hidden]-> ReeveParser
+destroy AddCommandParser
+
+ReeveParser --> LogicManager : a
+deactivate ReeveParser
+
+LogicManager -> AddCommand : execute(model)
+activate AddCommand
+
+AddCommand -> Model : hasStudent(toAdd)
+activate Model
+
+Model --> AddCommand
+deactivate Model
+
+AddCommand -> Model : isClashingClassTime(toAdd)
+activate Model
+
+Model --> AddCommand
+deactivate Model
+
+AddCommand -> Model : addStudent(toAdd)
+
+AddCommand --> LogicManager : result
+deactivate AddCommand
+
+AddCommand -[hidden]-> LogicManager
+destroy AddCommand
+
+[<-- LogicManager
+deactivate LogicManager
+
+@enduml
diff --git a/docs/diagrams/AdminClassDiagram.puml b/docs/diagrams/AdminClassDiagram.puml
new file mode 100644
index 00000000000..d8d0bcc8c55
--- /dev/null
+++ b/docs/diagrams/AdminClassDiagram.puml
@@ -0,0 +1,22 @@
+@startuml
+!include style.puml
+skinparam arrowThickness 1.1
+skinparam arrowColor MODEL_COLOR
+skinparam classBackgroundColor MODEL_COLOR
+
+Package Admin {
+Class Admin
+Class ClassVenue
+Class ClassTime
+Class Fee
+Class PaymentDate
+Class Details
+}
+
+Admin *--> ClassVenue
+Admin *--> ClassTime
+Admin *--> Fee
+Admin *--> PaymentDate
+Admin *--> "*" Details
+
+@enduml
diff --git a/docs/diagrams/ArchitectureSequenceDiagram.puml b/docs/diagrams/ArchitectureSequenceDiagram.puml
index ef81d18c337..3918305f6c7 100644
--- a/docs/diagrams/ArchitectureSequenceDiagram.puml
+++ b/docs/diagrams/ArchitectureSequenceDiagram.puml
@@ -19,7 +19,7 @@ activate model MODEL_COLOR
model -[MODEL_COLOR]-> logic
deactivate model
-logic -[LOGIC_COLOR]> storage : saveAddressBook(addressBook)
+logic -[LOGIC_COLOR]> storage : saveAddressBook(reeve)
activate storage STORAGE_COLOR
storage -[STORAGE_COLOR]> storage : Save to file
diff --git a/docs/diagrams/DeleteAttendanceActivityDiagram.puml b/docs/diagrams/DeleteAttendanceActivityDiagram.puml
new file mode 100644
index 00000000000..72a8b93a215
--- /dev/null
+++ b/docs/diagrams/DeleteAttendanceActivityDiagram.puml
@@ -0,0 +1,29 @@
+@startuml
+!include style.puml
+
+start
+:User executes delete Attendance command;
+:Parses the command;
+if() then([command is valid])
+ if() then([student index is valid])
+ :Delete Attendance from Student <$rake>;
+ else([student index is invalid])
+ :Display invalid student index error message;
+ endif
+else ([command is invalid - missing or invalid parameters])
+ :Display parse error message;
+endif
+stop
+
+partition "Activity: Delete Attendance from Student" {
+ start
+ if() then([valid attendance date])
+ :Create student copy with deleted attendance;
+ :Replace student with modified copy;
+ :Display success message;
+ else([invalid attendance date])
+ :Display invalid attendance date error;
+ endif
+ stop
+}
+@enduml
diff --git a/docs/diagrams/DeleteAttendanceSequenceDiagram.puml b/docs/diagrams/DeleteAttendanceSequenceDiagram.puml
new file mode 100644
index 00000000000..3d24d315a30
--- /dev/null
+++ b/docs/diagrams/DeleteAttendanceSequenceDiagram.puml
@@ -0,0 +1,78 @@
+@startuml
+!include style.puml
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":ReeveParser" as ReeveParser LOGIC_COLOR
+participant ":AttendanceCommandParser" as AttendanceCommandParser LOGIC_COLOR
+participant "d:DeleteAttendanceCommand" as DeleteAttendanceCommand LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant "updatedStudent:Student" as Student MODEL_COLOR
+participant ":Model" as Model MODEL_COLOR
+end box
+
+[-> LogicManager : execute(...)
+activate LogicManager
+
+LogicManager -> ReeveParser : parseCommand(...)
+activate ReeveParser
+
+create AttendanceCommandParser
+ReeveParser -> AttendanceCommandParser : AttendanceCommandParser()
+activate AttendanceCommandParser
+
+AttendanceCommandParser --> ReeveParser
+deactivate AttendanceCommandParser
+
+ReeveParser -> AttendanceCommandParser : parse(...)
+activate AttendanceCommandParser
+
+create DeleteAttendanceCommand
+AttendanceCommandParser -> DeleteAttendanceCommand : DeleteAttendanceCommand(...)
+activate DeleteAttendanceCommand
+
+DeleteAttendanceCommand --> AttendanceCommandParser : d
+deactivate DeleteAttendanceCommand
+
+AttendanceCommandParser --> ReeveParser : d
+deactivate AttendanceCommandParser
+
+AttendanceCommandParser -[hidden]> ReeveParser
+destroy AttendanceCommandParser
+
+ReeveParser --> LogicManager : d
+deactivate ReeveParser
+
+LogicManager -> DeleteAttendanceCommand : execute(...)
+activate DeleteAttendanceCommand
+
+DeleteAttendanceCommand -> DeleteAttendanceCommand : updateStudentAttendance(...)
+activate DeleteAttendanceCommand
+
+create Student
+DeleteAttendanceCommand -> Student : Student(...)
+activate Student
+
+Student --> DeleteAttendanceCommand : updatedStudent
+deactivate Student
+
+DeleteAttendanceCommand --> DeleteAttendanceCommand : updatedStudent
+deactivate DeleteAttendanceCommand
+
+DeleteAttendanceCommand -> Model : setStudent(student, updatedStudent)
+activate Model
+
+Model --> DeleteAttendanceCommand
+deactivate Model
+
+DeleteAttendanceCommand --> LogicManager : result
+deactivate DeleteAttendanceCommand
+
+DeleteAttendanceCommand -[hidden]> LogicManager
+destroy DeleteAttendanceCommand
+
+[<-- LogicManager : result
+deactivate LogicManager
+@enduml
diff --git a/docs/diagrams/DeleteDetailActivityDiagram.puml b/docs/diagrams/DeleteDetailActivityDiagram.puml
new file mode 100644
index 00000000000..49e4ceb38a9
--- /dev/null
+++ b/docs/diagrams/DeleteDetailActivityDiagram.puml
@@ -0,0 +1,30 @@
+@startuml
+!include style.puml
+
+start
+:User executes delete detail command;
+:Parses the command;
+if() then([command is valid])
+ if() then([student index is valid])
+ :Delete Detail from Student <$rake>;
+ else([student index is invalid])
+ :Display invalid student index error message;
+ endif
+else ([command is invalid - missing or invalid parameters])
+ :Display parse error message;
+endif
+stop
+
+partition "Activity: Delete Detail from Student" {
+ start
+ if() then([detail index is valid])
+ :Create student copy with removed detail;
+ :Replace student with modified copy;
+ :Display success message;
+ else([detail index is invalid])
+ :Display invalid detail index error message;
+ endif
+ stop
+
+}
+@enduml
diff --git a/docs/diagrams/DeleteDetailSequenceDiagram.puml b/docs/diagrams/DeleteDetailSequenceDiagram.puml
new file mode 100644
index 00000000000..d46eebc60cb
--- /dev/null
+++ b/docs/diagrams/DeleteDetailSequenceDiagram.puml
@@ -0,0 +1,78 @@
+@startuml
+!include style.puml
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":ReeveParser" as ReeveParser LOGIC_COLOR
+participant ":DetailCommandParser" as DetailCommandParser LOGIC_COLOR
+participant "d:DeleteDetailCommand" as DeleteDetailCommand LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant "updatedStudent:Student" as Student MODEL_COLOR
+participant ":Model" as Model MODEL_COLOR
+end box
+
+[-> LogicManager : execute(...)
+activate LogicManager
+
+LogicManager -> ReeveParser : parseCommand(...)
+activate ReeveParser
+
+create DetailCommandParser
+ReeveParser -> DetailCommandParser : DetailCommandParser()
+activate DetailCommandParser
+
+DetailCommandParser --> ReeveParser
+deactivate DetailCommandParser
+
+ReeveParser -> DetailCommandParser : parse(...)
+activate DetailCommandParser
+
+create DeleteDetailCommand
+DetailCommandParser -> DeleteDetailCommand : DeleteDetailCommand(...)
+activate DeleteDetailCommand
+
+DeleteDetailCommand --> DetailCommandParser : d
+deactivate DeleteDetailCommand
+
+DetailCommandParser --> ReeveParser : d
+deactivate DetailCommandParser
+
+DetailCommandParser -[hidden]> ReeveParser
+destroy DetailCommandParser
+
+ReeveParser --> LogicManager : d
+deactivate ReeveParser
+
+LogicManager -> DeleteDetailCommand : execute(...)
+activate DeleteDetailCommand
+
+DeleteDetailCommand -> DeleteDetailCommand : updateStudentDetail(...)
+activate DeleteDetailCommand
+
+create Student
+DeleteDetailCommand -> Student : Student(...)
+activate Student
+
+Student --> DeleteDetailCommand : updatedStudent
+deactivate Student
+
+DeleteDetailCommand --> DeleteDetailCommand : updatedStudent
+deactivate DeleteDetailCommand
+
+DeleteDetailCommand -> Model : setStudent(student, updatedStudent)
+activate Model
+
+Model --> DeleteDetailCommand
+deactivate Model
+
+DeleteDetailCommand --> LogicManager : result
+deactivate DeleteDetailCommand
+
+DeleteDetailCommand -[hidden]> LogicManager
+destroy DeleteDetailCommand
+
+[<-- LogicManager : result
+deactivate LogicManager
+@enduml
diff --git a/docs/diagrams/DeleteQuestionActivityDiagram.puml b/docs/diagrams/DeleteQuestionActivityDiagram.puml
new file mode 100644
index 00000000000..93671b18c88
--- /dev/null
+++ b/docs/diagrams/DeleteQuestionActivityDiagram.puml
@@ -0,0 +1,33 @@
+@startuml
+!include style.puml
+
+start
+:User executes delete question command;
+:Parses the command;
+if () then ([command is valid])
+ :Execute DeleteQuestionCommand;
+ if () then ([student exists])
+ :Delete question from student <$rake>;
+
+ else ([else])
+ :Display invalid student error message;
+ endif
+else ([command is invalid])
+ :Display parse error message;
+endif
+stop
+
+partition "Activitiy: Delete question from student" {
+start
+if () then ([question exists])
+ :Create student copy;
+ :Delete question from student copy;
+ :Replace student with modified copy;
+ :Display success message;
+else ([else])
+ :Display invalid question error message;
+endif
+stop
+}
+
+@enduml
diff --git a/docs/diagrams/DeleteQuestionSequenceDiagram.puml b/docs/diagrams/DeleteQuestionSequenceDiagram.puml
new file mode 100644
index 00000000000..7cde0f6c883
--- /dev/null
+++ b/docs/diagrams/DeleteQuestionSequenceDiagram.puml
@@ -0,0 +1,74 @@
+@startuml
+!include style.puml
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":ReeveParser" as ReeveParser LOGIC_COLOR
+participant ":QuestionCommandParser" as QuestionCommandParser LOGIC_COLOR
+participant "d:DeleteQuestionCommand" as DeleteQuestionCommand LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant ":Model" as Model MODEL_COLOR
+participant "student:Student" as Student MODEL_COLOR
+end box
+
+[-> LogicManager : execute(...)
+activate LogicManager
+
+LogicManager -> ReeveParser : parseCommand(...)
+activate ReeveParser
+
+create QuestionCommandParser
+ReeveParser -> QuestionCommandParser
+activate QuestionCommandParser
+
+QuestionCommandParser --> ReeveParser
+deactivate QuestionCommandParser
+
+ReeveParser -> QuestionCommandParser : parse(...)
+activate QuestionCommandParser
+
+create DeleteQuestionCommand
+QuestionCommandParser -> DeleteQuestionCommand
+activate DeleteQuestionCommand
+
+DeleteQuestionCommand --> QuestionCommandParser : s
+deactivate DeleteQuestionCommand
+
+QuestionCommandParser --> ReeveParser : s
+deactivate QuestionCommandParser
+
+QuestionCommandParser -[hidden]-> ReeveParser
+destroy QuestionCommandParser
+
+ReeveParser --> LogicManager : s
+deactivate ReeveParser
+
+LogicManager -> DeleteQuestionCommand : execute()
+activate DeleteQuestionCommand
+
+DeleteQuestionCommand -> Student : deleteQuestion(...)
+activate Student
+
+Student --> DeleteQuestionCommand : copy
+deactivate Student
+
+DeleteQuestionCommand -> Model : setStudent(student, copy)
+activate Model
+
+Model --> DeleteQuestionCommand
+deactivate Model
+
+Student -[hidden]-> Model
+destroy Student
+
+DeleteQuestionCommand --> LogicManager : result
+deactivate DeleteQuestionCommand
+
+DeleteQuestionCommand -[hidden]-> LogicManager
+destroy DeleteQuestionCommand
+
+[<-- LogicManager
+deactivate LogicManager
+@enduml
diff --git a/docs/diagrams/DeleteSequenceDiagram.puml b/docs/diagrams/DeleteSequenceDiagram.puml
index 1dc2311b245..7aae9b9c00e 100644
--- a/docs/diagrams/DeleteSequenceDiagram.puml
+++ b/docs/diagrams/DeleteSequenceDiagram.puml
@@ -3,7 +3,7 @@
box Logic LOGIC_COLOR_T1
participant ":LogicManager" as LogicManager LOGIC_COLOR
-participant ":AddressBookParser" as AddressBookParser LOGIC_COLOR
+participant ":ReeveParser" as ReeveParser LOGIC_COLOR
participant ":DeleteCommandParser" as DeleteCommandParser LOGIC_COLOR
participant "d:DeleteCommand" as DeleteCommand LOGIC_COLOR
participant ":CommandResult" as CommandResult LOGIC_COLOR
@@ -16,17 +16,17 @@ end box
[-> LogicManager : execute("delete 1")
activate LogicManager
-LogicManager -> AddressBookParser : parseCommand("delete 1")
-activate AddressBookParser
+LogicManager -> ReeveParser : parseCommand("delete 1")
+activate ReeveParser
create DeleteCommandParser
-AddressBookParser -> DeleteCommandParser
+ReeveParser -> DeleteCommandParser
activate DeleteCommandParser
-DeleteCommandParser --> AddressBookParser
+DeleteCommandParser --> ReeveParser
deactivate DeleteCommandParser
-AddressBookParser -> DeleteCommandParser : parse("1")
+ReeveParser -> DeleteCommandParser : parse("1")
activate DeleteCommandParser
create DeleteCommand
@@ -36,19 +36,19 @@ activate DeleteCommand
DeleteCommand --> DeleteCommandParser : d
deactivate DeleteCommand
-DeleteCommandParser --> AddressBookParser : d
+DeleteCommandParser --> ReeveParser : d
deactivate DeleteCommandParser
'Hidden arrow to position the destroy marker below the end of the activation bar.
-DeleteCommandParser -[hidden]-> AddressBookParser
+DeleteCommandParser -[hidden]-> ReeveParser
destroy DeleteCommandParser
-AddressBookParser --> LogicManager : d
-deactivate AddressBookParser
+ReeveParser --> LogicManager : d
+deactivate ReeveParser
LogicManager -> DeleteCommand : execute()
activate DeleteCommand
-DeleteCommand -> Model : deletePerson(1)
+DeleteCommand -> Model : deleteStudent(1)
activate Model
Model --> DeleteCommand
diff --git a/docs/diagrams/EditDetailActivityDiagram.puml b/docs/diagrams/EditDetailActivityDiagram.puml
new file mode 100644
index 00000000000..b23104a81ed
--- /dev/null
+++ b/docs/diagrams/EditDetailActivityDiagram.puml
@@ -0,0 +1,29 @@
+@startuml
+!include style.puml
+
+start
+:User executes edit detail command;
+:Parses the command;
+if() then([command is valid])
+ if() then([student index is valid])
+ :Edit Detail in Student <$rake>;
+ else([student index is invalid])
+ :Display invalid student index error message;
+ endif
+else ([command is invalid - missing or invalid parameters])
+ :Display parse error message;
+endif
+stop
+
+partition "Activity: Edit Detail in Student" {
+ start
+ if() then([detail index is valid])
+ :Create student copy with updated detail;
+ :Replace student with modified copy;
+ :Display success message;
+ else([detail index is invalid])
+ :Display invalid detail index error message;
+ endif
+ stop
+}
+@enduml
diff --git a/docs/diagrams/EditDetailSequenceDiagram.puml b/docs/diagrams/EditDetailSequenceDiagram.puml
new file mode 100644
index 00000000000..6caa7dc1de0
--- /dev/null
+++ b/docs/diagrams/EditDetailSequenceDiagram.puml
@@ -0,0 +1,78 @@
+@startuml
+!include style.puml
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":ReeveParser" as ReeveParser LOGIC_COLOR
+participant ":DetailCommandParser" as DetailCommandParser LOGIC_COLOR
+participant "e:EditDetailCommand" as EditDetailCommand LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant "updatedStudent:Student" as Student MODEL_COLOR
+participant ":Model" as Model MODEL_COLOR
+end box
+
+[-> LogicManager : execute(...)
+activate LogicManager
+
+LogicManager -> ReeveParser : parseCommand(...)
+activate ReeveParser
+
+create DetailCommandParser
+ReeveParser -> DetailCommandParser : DetailCommandParser()
+activate DetailCommandParser
+
+DetailCommandParser --> ReeveParser
+deactivate DetailCommandParser
+
+ReeveParser -> DetailCommandParser : parse(...)
+activate DetailCommandParser
+
+create EditDetailCommand
+DetailCommandParser -> EditDetailCommand : EditDetailCommand(...)
+activate EditDetailCommand
+
+EditDetailCommand --> DetailCommandParser : e
+deactivate EditDetailCommand
+
+DetailCommandParser --> ReeveParser : e
+deactivate DetailCommandParser
+
+DetailCommandParser -[hidden]> ReeveParser
+destroy DetailCommandParser
+
+ReeveParser --> LogicManager : e
+deactivate ReeveParser
+
+LogicManager -> EditDetailCommand : execute(...)
+activate EditDetailCommand
+
+EditDetailCommand -> EditDetailCommand : updateStudentDetail(...)
+activate EditDetailCommand
+
+create Student
+EditDetailCommand -> Student : Student(...)
+activate Student
+
+Student --> EditDetailCommand : updatedStudent
+deactivate Student
+
+EditDetailCommand --> EditDetailCommand : updatedStudent
+deactivate EditDetailCommand
+
+EditDetailCommand -> Model : setStudent(student, updatedStudent)
+activate Model
+
+Model --> EditDetailCommand
+deactivate Model
+
+EditDetailCommand --> LogicManager : result
+deactivate EditDetailCommand
+
+EditDetailCommand -[hidden]> LogicManager
+destroy EditDetailCommand
+
+[<-- LogicManager : result
+deactivate LogicManager
+@enduml
diff --git a/docs/diagrams/EditStudentActivityDiagram.puml b/docs/diagrams/EditStudentActivityDiagram.puml
new file mode 100644
index 00000000000..48b149b9c6e
--- /dev/null
+++ b/docs/diagrams/EditStudentActivityDiagram.puml
@@ -0,0 +1,36 @@
+@startuml
+!include style.puml
+
+start
+:User executes edit student command;
+:Parses the command;
+if() then ([command is valid])
+ if() then ([there are edited student fields])
+ :Edit command is executed <$rake>;
+ else ([else])
+ :Display no edits made message;
+ endif
+else ([command is invalid - missing or invalid parameters])
+ :Display parse error message;
+endif
+stop
+
+partition "Activity: Edit command is executed" {
+ start
+ if() then ([student index is invalid])
+ :Display invalid student index error message;
+ else ([student index is valid])
+ if() then ([edited student is unique])
+ if() then ([class time is new and clashes])
+ :Display invalid class time error;
+ else ([else])
+ :Replace student with edited student in student list;
+ :Display success message;
+ endif
+ else ([edited student already exists])
+ :Display duplicate student error message;
+ endif
+ endif
+ stop
+}
+@enduml
diff --git a/docs/diagrams/EditStudentSequenceDiagram.puml b/docs/diagrams/EditStudentSequenceDiagram.puml
new file mode 100644
index 00000000000..8ab5b6bdc5a
--- /dev/null
+++ b/docs/diagrams/EditStudentSequenceDiagram.puml
@@ -0,0 +1,78 @@
+@startuml
+!include style.puml
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":ReeveParser" as ReeveParser LOGIC_COLOR
+participant ":EditCommandParser" as EditCommandParser LOGIC_COLOR
+participant "command:EditCommand" as Command LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant ":Model" as Model MODEL_COLOR
+participant "editedStudent:Student" as Student MODEL_COLOR
+end box
+
+[-> LogicManager : execute(...)
+activate LogicManager
+
+LogicManager -> ReeveParser : parseCommand(...)
+activate ReeveParser
+
+create EditCommandParser
+ReeveParser -> EditCommandParser : EditCommandParser()
+activate EditCommandParser
+
+EditCommandParser --> ReeveParser
+deactivate EditCommandParser
+
+ReeveParser -> EditCommandParser : parse(...)
+activate EditCommandParser
+
+create Command
+EditCommandParser -> Command : EditCommand(...)
+activate Command
+
+Command --> EditCommandParser : command
+deactivate Command
+
+EditCommandParser --> ReeveParser : command
+deactivate EditCommandParser
+
+EditCommandParser -[hidden]> ReeveParser
+destroy EditCommandParser
+
+ReeveParser --> LogicManager : command
+deactivate ReeveParser
+
+LogicManager -> Command : execute(...)
+activate Command
+
+Command -> Command : createEditedStudent(...)
+activate Command
+
+create Student
+Command -> Student : Student(...)
+activate Student
+
+Student --> Command : editedStudent
+deactivate Student
+
+Command --> Command : editedStudent
+deactivate Command
+
+Command -> Model : setStudent(studentToEdit, editedStudent)
+activate Model
+
+Model --> Command
+deactivate Model
+
+Command --> LogicManager : result
+deactivate Command
+
+Command -[hidden]-> LogicManager
+destroy Command
+
+[<-- LogicManager : result
+deactivate LogicManager
+@enduml
diff --git a/docs/diagrams/ExamCommandClassDiagram.puml b/docs/diagrams/ExamCommandClassDiagram.puml
new file mode 100644
index 00000000000..ae20ef87686
--- /dev/null
+++ b/docs/diagrams/ExamCommandClassDiagram.puml
@@ -0,0 +1,27 @@
+@startuml
+!include style.puml
+skinparam arrowThickness 1.1
+skinparam arrowColor UI_COLOR_T4
+skinparam classBackgroundColor UI_COLOR
+
+abstract class "{abstract}\nCommand" {
+}
+
+abstract class "{abstract}\nExamCommand" {
+}
+
+class AddExamCommand {
+}
+
+class DeleteExamCommand {
+}
+
+class ExamStatsCommand {
+}
+
+AddExamCommand --up|> "{abstract}\nExamCommand"
+DeleteExamCommand --up|> "{abstract}\nExamCommand"
+ExamStatsCommand --up|> "{abstract}\nExamCommand"
+"{abstract}\nExamCommand" --up|> "{abstract}\nCommand"
+
+@enduml
diff --git a/docs/diagrams/ExamStatsActivityDiagram.puml b/docs/diagrams/ExamStatsActivityDiagram.puml
new file mode 100644
index 00000000000..3c754bfef58
--- /dev/null
+++ b/docs/diagrams/ExamStatsActivityDiagram.puml
@@ -0,0 +1,18 @@
+@startuml
+start
+:User executes exam stats command;
+:Parses the command;
+if () then ([command is valid])
+ :Exam stats command is executed;
+ if() then ([student index exceeds student list])
+ :Display index out of bounds error message;
+ else ([student index within student list])
+ :Get student from student list;
+ :Get exams from student;
+ :Display exam statistics window of student;
+ endif
+else ([command is invalid - missing or invalid arguments])
+ :Display parse error message;
+endif
+stop
+@enduml
diff --git a/docs/diagrams/ExamStatsSequenceDiagram.puml b/docs/diagrams/ExamStatsSequenceDiagram.puml
new file mode 100644
index 00000000000..21eba327e03
--- /dev/null
+++ b/docs/diagrams/ExamStatsSequenceDiagram.puml
@@ -0,0 +1,71 @@
+@startuml
+!include style.puml
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":ReeveParser" as ReeveParser LOGIC_COLOR
+participant ":ExamCommandParser" as ExamCommandParser LOGIC_COLOR
+participant "a:ExamStatsCommand" as ExamStatsCommand LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant ":Model" as Model MODEL_COLOR
+participant "sortedStudents:SortedList" as SortedList MODEL_COLOR
+end box
+
+[-> LogicManager : execute("exam stats 1")
+activate LogicManager
+
+LogicManager -> ReeveParser : parseCommand("exam stats 1")
+activate ReeveParser
+
+create ExamCommandParser
+ReeveParser -> ExamCommandParser
+activate ExamCommandParser
+
+ExamCommandParser --> ReeveParser
+deactivate ExamCommandParser
+
+ReeveParser -> ExamCommandParser : parse("stats 1")
+activate ExamCommandParser
+
+
+create ExamStatsCommand
+ExamCommandParser -> ExamStatsCommand
+activate ExamStatsCommand
+
+ExamStatsCommand --> ExamCommandParser : a
+deactivate ExamStatsCommand
+
+ExamCommandParser --> ReeveParser : a
+deactivate ExamCommandParser
+
+ExamCommandParser -[hidden]-> ReeveParser
+destroy ExamCommandParser
+
+ReeveParser --> LogicManager : a
+deactivate ReeveParser
+
+LogicManager -> ExamStatsCommand : execute()
+activate ExamStatsCommand
+
+ExamStatsCommand -> Model : getSortedStudentList()
+activate Model
+
+Model -> SortedList : get(1)
+activate SortedList
+
+SortedList -> Model
+deactivate SortedList
+
+Model -> ExamStatsCommand
+deactivate Model
+
+ExamStatsCommand --> LogicManager : result
+deactivate ExamStatsCommand
+
+ExamStatsCommand -[hidden]-> LogicManager
+destroy ExamStatsCommand
+
+[<-- LogicManager
+deactivate LogicManager
+@enduml
diff --git a/docs/diagrams/FindCommandActivityDiagram.puml b/docs/diagrams/FindCommandActivityDiagram.puml
new file mode 100644
index 00000000000..043d39e888b
--- /dev/null
+++ b/docs/diagrams/FindCommandActivityDiagram.puml
@@ -0,0 +1,15 @@
+@startuml
+start
+:User executes find command;
+:Parses the command;
+if () then ([command is valid])
+ :Obtain list of predicates;
+ :Combines predicates;
+ :Update Reeve model;
+
+else ([command has no or invalid parameters])
+ :Show parse error message;
+
+endif
+stop
+@enduml
diff --git a/docs/diagrams/FindCommandPartialSequenceDiagram.puml b/docs/diagrams/FindCommandPartialSequenceDiagram.puml
new file mode 100644
index 00000000000..bfede03b47f
--- /dev/null
+++ b/docs/diagrams/FindCommandPartialSequenceDiagram.puml
@@ -0,0 +1,34 @@
+@startuml
+!include ./style.puml
+
+box "Logic" LOGIC_COLOR_T1
+
+Participant "command:FindCommand" as fc LOGIC_COLOR
+Participant ":FindStudentDescriptor" as fcd LOGIC_COLOR
+Participant "result:CommandResult" as res LOGIC_COLOR
+
+
+[-> fc : execute(model)
+activate fc
+fc -> fcd++: getPredicates()
+fcd -> fcd: getNamePredicate()
+fcd -> fcd: getSchoolPredicate()
+fcd -> fcd: getYearPredicate()
+return consolidatedPredicates
+
+end box
+
+box "Model" MODEL_COLOR_T1
+Participant "model:Model" as model MODEL_COLOR
+
+fc -> model: updateFilteredPersonList(consolidatedPredicates)
+
+fc -> model: getFilteredPersonList()
+create res
+fc -> res ++
+return result
+return result
+
+end box
+
+@enduml
diff --git a/docs/diagrams/FindCommandSequenceDiagram.puml b/docs/diagrams/FindCommandSequenceDiagram.puml
new file mode 100644
index 00000000000..37d64bc118e
--- /dev/null
+++ b/docs/diagrams/FindCommandSequenceDiagram.puml
@@ -0,0 +1,50 @@
+@startuml
+!include ./style.puml
+
+box "Logic" LOGIC_COLOR_T1
+
+Participant ":LogicManager" as logic LOGIC_COLOR
+Participant ":ReeveParser" as rp LOGIC_COLOR
+Participant ":FindCommandParser" as fcp LOGIC_COLOR
+Participant "d:FindStudentDescriptor" as fcd LOGIC_COLOR
+Participant "command:FindCommand" as fc LOGIC_COLOR
+
+
+[-> logic : execute()
+activate logic
+logic -> rp ++: parseCommand(commandText)
+create fcp
+rp -> fcp ++:
+return
+rp -> fcp ++: parse(args)
+create fcd
+fcp -> fcd ++:
+return d
+
+create fc
+fcp -> fc ++: new FindCommand(d)
+return command
+return command
+return command
+destroy fcp
+
+logic -> fc ++: execute(model)
+fc -> fcd++: getPredicates()
+return predicates
+
+end box
+
+box "Model" MODEL_COLOR_T1
+
+Participant ":Model" as model MODEL_COLOR
+
+fc -> model++: updateFilteredStudentList(predicates)
+return
+return result
+return
+destroy fc
+destroy fcd
+
+end box
+
+@enduml
diff --git a/docs/diagrams/JsonSerializableNotebookClassDiagram.puml b/docs/diagrams/JsonSerializableNotebookClassDiagram.puml
new file mode 100644
index 00000000000..4af4ad44228
--- /dev/null
+++ b/docs/diagrams/JsonSerializableNotebookClassDiagram.puml
@@ -0,0 +1,9 @@
+@startuml
+!include style.puml
+skinparam arrowThickness 1.1
+skinparam arrowColor STORAGE_COLOR
+skinparam classBackgroundColor STORAGE_COLOR
+
+JsonSerializableNotebook *-down-> "*" JsonAdaptedNote
+
+@enduml
diff --git a/docs/diagrams/JsonSerializableReeveClassDiagram.puml b/docs/diagrams/JsonSerializableReeveClassDiagram.puml
new file mode 100644
index 00000000000..9863667464b
--- /dev/null
+++ b/docs/diagrams/JsonSerializableReeveClassDiagram.puml
@@ -0,0 +1,15 @@
+@startuml
+!include style.puml
+skinparam arrowThickness 1.1
+skinparam arrowColor STORAGE_COLOR
+skinparam classBackgroundColor STORAGE_COLOR
+
+JsonSerializableReeve *-down-> "*" JsonAdaptedStudent
+JsonAdaptedStudent -down-> "1" JsonAdaptedAcademic
+JsonAdaptedStudent -right-> "1" JsonAdaptedAdmin
+JsonAdaptedAdmin -down-> "*" JsonAdaptedDetail
+JsonAdaptedAcademic -down-> "*" JsonAdaptedQuestion
+JsonAdaptedAcademic -down-> "*" JsonAdaptedExam
+JsonAdaptedAcademic -down-> "*" JsonAdaptedAttendance
+
+@enduml
diff --git a/docs/diagrams/LogicClassDiagram.puml b/docs/diagrams/LogicClassDiagram.puml
index 016ef33e2e2..d12d69d48e7 100644
--- a/docs/diagrams/LogicClassDiagram.puml
+++ b/docs/diagrams/LogicClassDiagram.puml
@@ -8,7 +8,7 @@ package Logic {
package Parser {
Interface Parser <
>
-Class AddressBookParser
+Class ReeveParser
Class XYZCommandParser
Class CliSyntax
Class ParserUtil
@@ -35,8 +35,8 @@ Class HiddenOutside #FFFFFF
HiddenOutside ..> Logic
LogicManager .up.|> Logic
-LogicManager -->"1" AddressBookParser
-AddressBookParser .left.> XYZCommandParser: creates >
+LogicManager -->"1" ReeveParser
+ReeveParser .left.> XYZCommandParser: creates >
XYZCommandParser ..> XYZCommand : creates >
XYZCommandParser ..|> Parser
diff --git a/docs/diagrams/ModelClassDiagram.puml b/docs/diagrams/ModelClassDiagram.puml
index e85a00d4107..367eda694af 100644
--- a/docs/diagrams/ModelClassDiagram.puml
+++ b/docs/diagrams/ModelClassDiagram.puml
@@ -4,53 +4,77 @@ skinparam arrowThickness 1.1
skinparam arrowColor MODEL_COLOR
skinparam classBackgroundColor MODEL_COLOR
-Package Model <>{
-Interface ReadOnlyAddressBook <>
+Package Model <> {
+
+Interface ReadOnlyReeve <>
Interface Model <>
Interface ObservableList <>
-Class AddressBook
-Class ReadOnlyAddressBook
+Class Reeve
+Class ReadOnlyReeve
Class Model
Class ModelManager
Class UserPrefs
Class ReadOnlyUserPrefs
-Package Person {
-Class Person
-Class Address
-Class Email
-Class Name
-Class Phone
-Class UniquePersonList
+
+Package Notes <> {
+Class Notebook
+Class Note
+Class NotesList
+Class ReadOnlyNotebook
+}
+
+Package Schedule <> {
+Class Scheduler
+Class SchedulePrefs
}
-Package Tag {
-Class Tag
+Package Student {
+Class Student
+Class School
+Class Year
+Class Name
+Class Phone
+Class UniqueStudentList
+Class Academic
+Class Admin
}
}
Class HiddenOutside #FFFFFF
HiddenOutside ..> Model
-AddressBook .up.|> ReadOnlyAddressBook
+Reeve .right.|> ReadOnlyReeve
ModelManager .up.|> Model
-Model .right.> ObservableList
-ModelManager o--> "1" AddressBook
-ModelManager o-left-> "1" UserPrefs
-UserPrefs .up.|> ReadOnlyUserPrefs
-
-AddressBook *--> "1" UniquePersonList
-UniquePersonList o--> "*" Person
-Person *--> Name
-Person *--> Phone
-Person *--> Email
-Person *--> Address
-Person *--> "*" Tag
+Model .left.> ObservableList
+ModelManager o-down-> "1" Reeve
+ModelManager o-up-> "1" UserPrefs
+UserPrefs .left.|> ReadOnlyUserPrefs
+
+ModelManager o--> "1" Notebook
+ModelManager ..> Note
+
+Notebook *--> "1" NotesList
+Notebook .left.|> ReadOnlyNotebook
+NotesList o--> "*" Note
+
+ModelManager o-up------> "1" Scheduler
+ModelManager o-right-> "1" SchedulePrefs
+Scheduler ..> Student
+
+Reeve *--> "1" UniqueStudentList
+UniqueStudentList o--> "*" Student
+Student *--> "1" Name
+Student *--> "1" Phone
+Student *--> "1" School
+Student *--> "1" Year
+Student *--> "1" Admin
+Student *--> "1" Academic
Name -[hidden]right-> Phone
-Phone -[hidden]right-> Address
-Address -[hidden]right-> Email
+Phone -[hidden]right-> School
+School -[hidden]right-> Year
+ModelManager-[hidden]- UniqueStudentList
-ModelManager -->"1" Person : filtered list
@enduml
diff --git a/docs/diagrams/NoteCommandClassDiagram.puml b/docs/diagrams/NoteCommandClassDiagram.puml
new file mode 100644
index 00000000000..10fdde74994
--- /dev/null
+++ b/docs/diagrams/NoteCommandClassDiagram.puml
@@ -0,0 +1,27 @@
+@startuml
+!include style.puml
+skinparam arrowThickness 1.1
+skinparam arrowColor UI_COLOR_T4
+skinparam classBackgroundColor UI_COLOR
+
+abstract class "{abstract}\nCommand" {
+}
+
+abstract class "{abstract}\nNoteCommand" {
+}
+
+class AddNoteCommand {
+}
+
+class EditNoteCommand {
+}
+
+class DeleteNoteCommand {
+}
+
+AddNoteCommand --up|> "{abstract}\nNoteCommand"
+EditNoteCommand --up|> "{abstract}\nNoteCommand"
+DeleteNoteCommand --up|> "{abstract}\nNoteCommand"
+"{abstract}\nNoteCommand" --up|> "{abstract}\nCommand"
+
+@enduml
diff --git a/docs/diagrams/OverdueActivityDiagram.puml b/docs/diagrams/OverdueActivityDiagram.puml
new file mode 100644
index 00000000000..65136d45619
--- /dev/null
+++ b/docs/diagrams/OverdueActivityDiagram.puml
@@ -0,0 +1,8 @@
+@startuml
+start
+:User executes overdue command;
+:Parse the command;
+:Filter list of students by those who have not paid their fees in the past month;
+:Display filtered list;
+stop
+@enduml
diff --git a/docs/diagrams/OverdueSequenceDiagram.puml b/docs/diagrams/OverdueSequenceDiagram.puml
new file mode 100644
index 00000000000..053b22852e1
--- /dev/null
+++ b/docs/diagrams/OverdueSequenceDiagram.puml
@@ -0,0 +1,47 @@
+@startuml
+!include style.puml
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":ReeveParser" as ReeveParser LOGIC_COLOR
+participant "o:OverdueCommand" as Command LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant ":Model" as Model MODEL_COLOR
+end box
+
+[-> LogicManager : execute("overdue")
+activate LogicManager
+
+LogicManager -> ReeveParser : parseCommand("overdue")
+activate ReeveParser
+
+create Command
+ReeveParser -> Command
+activate Command
+
+Command --> ReeveParser : o
+deactivate Command
+
+ReeveParser --> LogicManager : o
+deactivate ReeveParser
+
+LogicManager -> Command : execute()
+activate Command
+
+Command -> Model : updateFilteredStudentList()
+activate Model
+
+Model --> Command
+deactivate Model
+
+Command --> LogicManager : result
+deactivate Command
+
+Command -[hidden]-> LogicManager
+destroy Command
+
+[<-- LogicManager
+deactivate LogicManager
+@enduml
diff --git a/docs/diagrams/ScheduleActivityDiagram.puml b/docs/diagrams/ScheduleActivityDiagram.puml
new file mode 100644
index 00000000000..b0bc2d2a34e
--- /dev/null
+++ b/docs/diagrams/ScheduleActivityDiagram.puml
@@ -0,0 +1,17 @@
+@startuml
+start
+:User executes ScheduleViewCommand;
+:Parses the command;
+if () then ([command is valid])
+ :ScheduleViewCommand executed;
+ : set the schedule view date;
+ : set the schedule view mode;
+ : get student data;
+ : translate student's class time to events;
+
+else ([command is invalid - missing or invalid arguments])
+ :Display parse error message;
+endif
+:Return result to user;
+stop
+@enduml
diff --git a/docs/diagrams/ScheduleSequenceDiagram.puml b/docs/diagrams/ScheduleSequenceDiagram.puml
new file mode 100644
index 00000000000..413a4fe8fa1
--- /dev/null
+++ b/docs/diagrams/ScheduleSequenceDiagram.puml
@@ -0,0 +1,54 @@
+@startuml
+!include style.puml
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":ScheduleViewCommand" as ScheduleCommand LOGIC_COLOR
+participant ":CommandResult" as CommandResult LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant ":Model" as Model MODEL_COLOR
+participant ":SchedulePrefs" as SchedulePrefs MODEL_COLOR
+participant ":Scheduler" as Scheduler MODEL_COLOR
+end box
+
+LogicManager -> ScheduleCommand : execute(Model)
+activate ScheduleCommand
+
+ScheduleCommand -> Model : setViewDate(LocalDate)
+
+Model -> SchedulePrefs : setViewDate(LocalDate)
+
+ScheduleCommand -> Model : setViewMode(ScheduleViewMode)
+Model -> SchedulePrefs : setViewMode(ScheduleViewMode)
+
+ScheduleCommand -> Model : updateFilteredStudentList(Predicate)
+
+ScheduleCommand -> Model : updateClassTimesToEvent()
+activate Model
+
+Model -> Scheduler : mapClassTimesToLessonEvent(List)
+activate Scheduler
+
+Scheduler -> Scheduler : resetData(List)
+Scheduler -[hidden]-> Scheduler
+Scheduler --> Model
+deactivate Scheduler
+
+Model --> ScheduleCommand
+deactivate Model
+
+create CommandResult
+ScheduleCommand -> CommandResult
+activate CommandResult
+CommandResult --> ScheduleCommand : result
+deactivate CommandResult
+
+ScheduleCommand --> LogicManager : result
+deactivate ScheduleCommand
+
+LogicManager -[hidden]-> ScheduleCommand
+destroy ScheduleCommand
+
+@enduml
diff --git a/docs/diagrams/SolveQuestionActivityDiagram.puml b/docs/diagrams/SolveQuestionActivityDiagram.puml
new file mode 100644
index 00000000000..afb90a55be2
--- /dev/null
+++ b/docs/diagrams/SolveQuestionActivityDiagram.puml
@@ -0,0 +1,32 @@
+@startuml
+!include style.puml
+
+start
+:User executes solve question command;
+:Parses the command;
+if () then ([command is valid])
+ :Execute SolveQuestionCommand;
+ if () then ([student exists])
+ :Solve question from student <$rake>;
+ else ([else])
+ :Display invalid student error message;
+ endif
+else ([command is invalid])
+ :Display parse error message;
+endif
+stop
+
+partition "Activity: Solve question from student" {
+ start
+ if () then ([question exists])
+ :Create student copy;
+ :Create solved version of question;
+ :Set the student copy's question to the solved version;
+ :Replace student with modified copy;
+ :Display success message;
+ else ([else])
+ :Display invalid question error message;
+ endif
+ stop
+}
+@enduml
diff --git a/docs/diagrams/SolveQuestionSequenceDiagram.puml b/docs/diagrams/SolveQuestionSequenceDiagram.puml
new file mode 100644
index 00000000000..7b1bf175e71
--- /dev/null
+++ b/docs/diagrams/SolveQuestionSequenceDiagram.puml
@@ -0,0 +1,74 @@
+@startuml
+!include style.puml
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":ReeveParser" as ReeveParser LOGIC_COLOR
+participant ":QuestionCommandParser" as QuestionCommandParser LOGIC_COLOR
+participant "s:SolveQuestionCommand" as SolveQuestionCommand LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant ":Model" as Model MODEL_COLOR
+participant "student:Student" as Student MODEL_COLOR
+end box
+
+[-> LogicManager : execute(...)
+activate LogicManager
+
+LogicManager -> ReeveParser : parseCommand(...)
+activate ReeveParser
+
+create QuestionCommandParser
+ReeveParser -> QuestionCommandParser
+activate QuestionCommandParser
+
+QuestionCommandParser --> ReeveParser
+deactivate QuestionCommandParser
+
+ReeveParser -> QuestionCommandParser : parse(...)
+activate QuestionCommandParser
+
+create SolveQuestionCommand
+QuestionCommandParser -> SolveQuestionCommand
+activate SolveQuestionCommand
+
+SolveQuestionCommand --> QuestionCommandParser : s
+deactivate SolveQuestionCommand
+
+QuestionCommandParser --> ReeveParser : s
+deactivate QuestionCommandParser
+
+QuestionCommandParser -[hidden]-> ReeveParser
+destroy QuestionCommandParser
+
+ReeveParser --> LogicManager : s
+deactivate ReeveParser
+
+LogicManager -> SolveQuestionCommand : execute()
+activate SolveQuestionCommand
+
+SolveQuestionCommand -> Student : setQuestion(q)
+activate Student
+
+Student --> SolveQuestionCommand : copy
+deactivate Student
+
+SolveQuestionCommand -> Model : setStudent(student, copy)
+activate Model
+
+Model --> SolveQuestionCommand
+deactivate Model
+
+Student -[hidden]-> Model
+destroy Student
+
+SolveQuestionCommand --> LogicManager : result
+deactivate SolveQuestionCommand
+
+SolveQuestionCommand -[hidden]-> LogicManager
+destroy SolveQuestionCommand
+
+[<-- LogicManager
+deactivate LogicManager
+@enduml
diff --git a/docs/diagrams/SortCommandActivityDiagram.puml b/docs/diagrams/SortCommandActivityDiagram.puml
new file mode 100644
index 00000000000..f4485d43de5
--- /dev/null
+++ b/docs/diagrams/SortCommandActivityDiagram.puml
@@ -0,0 +1,18 @@
+@startuml
+start
+:User executes sort command;
+:Parses the command;
+if () then ([command is valid])
+ :Check the comparison means against the supported comparison means of comparators;
+ if () then ([comparison means matches a supported means])
+ :Create a new comparator based on matched comparison means;
+ :Update Reeve model with the comparator given;
+ :Display sort success message;
+ else ([comparison means does not match any supported means])
+ : Throw CommandException;
+ endif
+else ([command has no or invalid parameters])
+ :Show parse error message;
+endif
+stop
+@enduml
diff --git a/docs/diagrams/SortCommandSequenceDiagram.puml b/docs/diagrams/SortCommandSequenceDiagram.puml
new file mode 100644
index 00000000000..c9ac9450b98
--- /dev/null
+++ b/docs/diagrams/SortCommandSequenceDiagram.puml
@@ -0,0 +1,38 @@
+@startuml
+!include ./style.puml
+
+box "Logic" LOGIC_COLOR_T1
+
+Participant ":LogicManager" as logic LOGIC_COLOR
+Participant ":ReeveParser" as parser LOGIC_COLOR
+Participant ":SortCommandParser" as commandParser LOGIC_COLOR
+Participant "command:SortCommand" as command LOGIC_COLOR
+
+[-> logic : execute()
+activate logic
+logic -> parser ++: parseCommand(commandText)
+create commandParser
+parser -> commandParser ++:
+return
+parser -> commandParser ++: parse(args)
+create command
+commandParser -> command ++: args
+return command
+return command
+return command
+destroy commandParser
+
+
+logic -> command ++: execute(model)
+
+endbox
+box "Model" MODEL_COLOR_T1
+Participant "model:Model" as model MODEL_COLOR
+ command -> model++: updateSortedStudentList(comparator)
+ return
+return
+return
+destroy command
+end box
+
+@enduml
diff --git a/docs/diagrams/StorageClassDiagram.puml b/docs/diagrams/StorageClassDiagram.puml
index 6adb2e156bf..a78ec9a1d38 100644
--- a/docs/diagrams/StorageClassDiagram.puml
+++ b/docs/diagrams/StorageClassDiagram.puml
@@ -6,19 +6,22 @@ skinparam classBackgroundColor STORAGE_COLOR
Interface Storage <>
Interface UserPrefsStorage <>
-Interface AddressBookStorage <>
+Interface ReeveStorage <>
+Interface NotebookStorage <>
Class StorageManager
Class JsonUserPrefsStorage
-Class JsonAddressBookStorage
+Class JsonReeveStorage
+Class JsonNotebookStorage
StorageManager .left.|> Storage
-StorageManager o-right-> UserPrefsStorage
-StorageManager o--> AddressBookStorage
+StorageManager o--> ReeveStorage
+StorageManager o--> NotebookStorage
+StorageManager o-down-> UserPrefsStorage
-JsonUserPrefsStorage .left.|> UserPrefsStorage
-JsonAddressBookStorage .left.|> AddressBookStorage
-JsonAddressBookStorage .down.> JsonSerializableAddressBookStorage
-JsonSerializableAddressBookStorage .right.> JsonSerializablePerson
-JsonSerializablePerson .right.> JsonAdaptedTag
+JsonUserPrefsStorage .up.|> UserPrefsStorage
+JsonReeveStorage .up.|> ReeveStorage
+JsonReeveStorage .down.> JsonSerializableReeve
+JsonNotebookStorage .up.|> NotebookStorage
+JsonNotebookStorage .down.> JsonSerializableNotebook
@enduml
diff --git a/docs/diagrams/ToggleStudentCardSequenceDiagram.puml b/docs/diagrams/ToggleStudentCardSequenceDiagram.puml
new file mode 100644
index 00000000000..c23be3a3a6d
--- /dev/null
+++ b/docs/diagrams/ToggleStudentCardSequenceDiagram.puml
@@ -0,0 +1,43 @@
+@startuml
+!include style.puml
+
+box UI UI_COLOR_T1
+participant ":MainWindow" as MainWindow UI_COLOR
+end box
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":ReeveParser" as ReeveParser LOGIC_COLOR
+participant "a:ToggleStudentCardCommand" as ToggleStudentCardCommand LOGIC_COLOR
+end box
+
+[-> MainWindow : executeCommand("toggle")
+activate MainWindow
+
+MainWindow -> LogicManager : execute("toggle")
+activate LogicManager
+
+LogicManager -> ReeveParser : parseCommand("toggle")
+activate ReeveParser
+
+create ToggleStudentCardCommand
+ReeveParser -> ToggleStudentCardCommand
+activate ToggleStudentCardCommand
+
+ToggleStudentCardCommand --> ReeveParser
+deactivate ToggleStudentCardCommand
+
+ReeveParser --> LogicManager
+deactivate ReeveParser
+
+LogicManager --> MainWindow
+deactivate LogicManager
+
+MainWindow -> MainWindow : handleAcademicPanel()
+activate MainWindow
+deactivate MainWindow
+
+[<-- MainWindow
+deactivate MainWindow
+
+@enduml
diff --git a/docs/diagrams/UiClassDiagram.puml b/docs/diagrams/UiClassDiagram.puml
index 92746f9fcf7..c1cc5ee6a61 100644
--- a/docs/diagrams/UiClassDiagram.puml
+++ b/docs/diagrams/UiClassDiagram.puml
@@ -11,10 +11,14 @@ Class UiManager
Class MainWindow
Class HelpWindow
Class ResultDisplay
-Class PersonListPanel
-Class PersonCard
+Class StudentListPanel
+Class StudentAdminCard
+Class StudentAcademicCard
Class StatusBarFooter
Class CommandBox
+Class NoteBook
+Class NoteTile
+Class ExamStatsWindow
}
package Model <> {
@@ -30,31 +34,41 @@ HiddenOutside ..> Ui
UiManager .left.|> Ui
UiManager -down-> MainWindow
+
MainWindow --> HelpWindow
MainWindow *-down-> CommandBox
MainWindow *-down-> ResultDisplay
-MainWindow *-down-> PersonListPanel
+MainWindow *-down-> StudentListPanel
MainWindow *-down-> StatusBarFooter
+MainWindow *-down-> NoteBook
+MainWindow ..> ExamStatsWindow
+
+StudentListPanel --> StudentAdminCard
+StudentListPanel --> StudentAcademicCard
-PersonListPanel -down-> PersonCard
+NoteBook --> NoteTile
-MainWindow -left-|> UiPart
+NoteBook -right-|> UiPart
ResultDisplay --|> UiPart
CommandBox --|> UiPart
-PersonListPanel --|> UiPart
-PersonCard --|> UiPart
+StudentListPanel --|> UiPart
+StudentAdminCard --|> UiPart
+StudentAcademicCard --|> UiPart
StatusBarFooter --|> UiPart
HelpWindow -down-|> UiPart
+MainWindow -|> UiPart
+NoteTile--|> UiPart
+
+NoteTile ..> Model
+StudentAcademicCard ..> Model
+StudentAdminCard ..> Model
-PersonCard ..> Model
UiManager -right-> Logic
MainWindow -left-> Logic
-PersonListPanel -[hidden]left- HelpWindow
HelpWindow -[hidden]left- CommandBox
CommandBox -[hidden]left- ResultDisplay
-ResultDisplay -[hidden]left- StatusBarFooter
+StatusBarFooter -[hidden]left- ResultDisplay
-MainWindow -[hidden]-|> UiPart
@enduml
diff --git a/docs/diagrams/style.puml b/docs/diagrams/style.puml
index fad8b0adeaa..bd83a44b0ac 100644
--- a/docs/diagrams/style.puml
+++ b/docs/diagrams/style.puml
@@ -70,6 +70,25 @@ skinparam Shadowing false
skinparam DefaultTextAlignment center
skinparam packageStyle Rectangle
+sprite $rake {
+ 0000000000000000
+ 0000000FF0000000
+ 0000000FF0000000
+ 0000000FF0000000
+ 0000000FF0000000
+ 0000000FF0000000
+ 0000000FF0000000
+ 000FFFFFFFFFF000
+ 000FFEEFFFFFF000
+ 000FF00FF00FF000
+ 000FF00FF00FF000
+ 000FF00FF00FF000
+ 000FF00FF00FF000
+ 000FF00FF00FF000
+ 000FF00FF00FF000
+ 0000000000000000
+}
+
hide footbox
hide members
hide circle
diff --git a/docs/diagrams/tracing/LogicSequenceDiagram.puml b/docs/diagrams/tracing/LogicSequenceDiagram.puml
index fdcbe1c0ccc..56fc24eadcd 100644
--- a/docs/diagrams/tracing/LogicSequenceDiagram.puml
+++ b/docs/diagrams/tracing/LogicSequenceDiagram.puml
@@ -13,7 +13,7 @@ create ecp
abp -> ecp
abp -> ecp ++: parse(arguments)
create ec
-ecp -> ec ++: index, editPersonDescriptor
+ecp -> ec ++: index, editStudentDescriptor
ec --> ecp --
ecp --> abp --: command
abp --> logic --: command
diff --git a/docs/images/AcademicClassDiagram.png b/docs/images/AcademicClassDiagram.png
new file mode 100644
index 00000000000..f62ef35b70a
Binary files /dev/null and b/docs/images/AcademicClassDiagram.png differ
diff --git a/docs/images/AddAttendanceActivityDiagram.png b/docs/images/AddAttendanceActivityDiagram.png
new file mode 100644
index 00000000000..60042e3358e
Binary files /dev/null and b/docs/images/AddAttendanceActivityDiagram.png differ
diff --git a/docs/images/AddAttendanceExpectedOutcome.png b/docs/images/AddAttendanceExpectedOutcome.png
new file mode 100644
index 00000000000..1c4df947ecf
Binary files /dev/null and b/docs/images/AddAttendanceExpectedOutcome.png differ
diff --git a/docs/images/AddAttendanceSequenceDiagram.png b/docs/images/AddAttendanceSequenceDiagram.png
new file mode 100644
index 00000000000..5a0e5b665b0
Binary files /dev/null and b/docs/images/AddAttendanceSequenceDiagram.png differ
diff --git a/docs/images/AddCommandExpectedOutcomeUG.png b/docs/images/AddCommandExpectedOutcomeUG.png
new file mode 100644
index 00000000000..517b16321e8
Binary files /dev/null and b/docs/images/AddCommandExpectedOutcomeUG.png differ
diff --git a/docs/images/AddDetailActivityDiagram.png b/docs/images/AddDetailActivityDiagram.png
new file mode 100644
index 00000000000..66b956e0eb9
Binary files /dev/null and b/docs/images/AddDetailActivityDiagram.png differ
diff --git a/docs/images/AddDetailExpectedOutcome.png b/docs/images/AddDetailExpectedOutcome.png
new file mode 100644
index 00000000000..4d525416ae3
Binary files /dev/null and b/docs/images/AddDetailExpectedOutcome.png differ
diff --git a/docs/images/AddDetailSequenceDiagram.png b/docs/images/AddDetailSequenceDiagram.png
new file mode 100644
index 00000000000..102fd3c7b34
Binary files /dev/null and b/docs/images/AddDetailSequenceDiagram.png differ
diff --git a/docs/images/AddExamCommandExpectedOutcomeUG.png b/docs/images/AddExamCommandExpectedOutcomeUG.png
new file mode 100644
index 00000000000..b56c04f6bef
Binary files /dev/null and b/docs/images/AddExamCommandExpectedOutcomeUG.png differ
diff --git a/docs/images/AddQuestionActivityDiagram.png b/docs/images/AddQuestionActivityDiagram.png
new file mode 100644
index 00000000000..7003ba50f3d
Binary files /dev/null and b/docs/images/AddQuestionActivityDiagram.png differ
diff --git a/docs/images/AddQuestionSequenceDiagram.png b/docs/images/AddQuestionSequenceDiagram.png
new file mode 100644
index 00000000000..d9da60030fb
Binary files /dev/null and b/docs/images/AddQuestionSequenceDiagram.png differ
diff --git a/docs/images/AddStudentActivityDiagram.png b/docs/images/AddStudentActivityDiagram.png
new file mode 100644
index 00000000000..9b284460f8c
Binary files /dev/null and b/docs/images/AddStudentActivityDiagram.png differ
diff --git a/docs/images/AddStudentSequenceDiagram.png b/docs/images/AddStudentSequenceDiagram.png
new file mode 100644
index 00000000000..b701235a665
Binary files /dev/null and b/docs/images/AddStudentSequenceDiagram.png differ
diff --git a/docs/images/AdminClassDiagram.png b/docs/images/AdminClassDiagram.png
new file mode 100644
index 00000000000..c58320da0e6
Binary files /dev/null and b/docs/images/AdminClassDiagram.png differ
diff --git a/docs/images/DeleteAttendanceActivityDiagram.png b/docs/images/DeleteAttendanceActivityDiagram.png
new file mode 100644
index 00000000000..52323c52e3f
Binary files /dev/null and b/docs/images/DeleteAttendanceActivityDiagram.png differ
diff --git a/docs/images/DeleteAttendanceExpectedOutcome.png b/docs/images/DeleteAttendanceExpectedOutcome.png
new file mode 100644
index 00000000000..f46b3d72fa2
Binary files /dev/null and b/docs/images/DeleteAttendanceExpectedOutcome.png differ
diff --git a/docs/images/DeleteAttendanceSequenceDiagram.png b/docs/images/DeleteAttendanceSequenceDiagram.png
new file mode 100644
index 00000000000..6736ccc68ed
Binary files /dev/null and b/docs/images/DeleteAttendanceSequenceDiagram.png differ
diff --git a/docs/images/DeleteDetailActivityDiagram.png b/docs/images/DeleteDetailActivityDiagram.png
new file mode 100644
index 00000000000..69a0e74f225
Binary files /dev/null and b/docs/images/DeleteDetailActivityDiagram.png differ
diff --git a/docs/images/DeleteDetailExpectedOutcome.png b/docs/images/DeleteDetailExpectedOutcome.png
new file mode 100644
index 00000000000..130ccae7c19
Binary files /dev/null and b/docs/images/DeleteDetailExpectedOutcome.png differ
diff --git a/docs/images/DeleteDetailSequenceDiagram.png b/docs/images/DeleteDetailSequenceDiagram.png
new file mode 100644
index 00000000000..e9c99e52bfd
Binary files /dev/null and b/docs/images/DeleteDetailSequenceDiagram.png differ
diff --git a/docs/images/DeleteExamExpectedOutcomeAfter.png b/docs/images/DeleteExamExpectedOutcomeAfter.png
new file mode 100644
index 00000000000..a337b80a816
Binary files /dev/null and b/docs/images/DeleteExamExpectedOutcomeAfter.png differ
diff --git a/docs/images/DeleteExamExpectedOutcomeBefore.png b/docs/images/DeleteExamExpectedOutcomeBefore.png
new file mode 100644
index 00000000000..e12104ffbf2
Binary files /dev/null and b/docs/images/DeleteExamExpectedOutcomeBefore.png differ
diff --git a/docs/images/DeleteQuestionActivityDiagram.png b/docs/images/DeleteQuestionActivityDiagram.png
new file mode 100644
index 00000000000..fc9331cd560
Binary files /dev/null and b/docs/images/DeleteQuestionActivityDiagram.png differ
diff --git a/docs/images/DeleteQuestionSequenceDiagram.png b/docs/images/DeleteQuestionSequenceDiagram.png
new file mode 100644
index 00000000000..746a4ac55c7
Binary files /dev/null and b/docs/images/DeleteQuestionSequenceDiagram.png differ
diff --git a/docs/images/EditCommandExpectedOutcome.png b/docs/images/EditCommandExpectedOutcome.png
new file mode 100644
index 00000000000..31c13a8d836
Binary files /dev/null and b/docs/images/EditCommandExpectedOutcome.png differ
diff --git a/docs/images/EditDetailActivityDiagram.png b/docs/images/EditDetailActivityDiagram.png
new file mode 100644
index 00000000000..91a99ae33bc
Binary files /dev/null and b/docs/images/EditDetailActivityDiagram.png differ
diff --git a/docs/images/EditDetailExpectedOutcome.png b/docs/images/EditDetailExpectedOutcome.png
new file mode 100644
index 00000000000..e7d779189f7
Binary files /dev/null and b/docs/images/EditDetailExpectedOutcome.png differ
diff --git a/docs/images/EditDetailSequenceDiagram.png b/docs/images/EditDetailSequenceDiagram.png
new file mode 100644
index 00000000000..607e3c87263
Binary files /dev/null and b/docs/images/EditDetailSequenceDiagram.png differ
diff --git a/docs/images/EditStudentActivityDiagram.png b/docs/images/EditStudentActivityDiagram.png
new file mode 100644
index 00000000000..fdca3c7b98d
Binary files /dev/null and b/docs/images/EditStudentActivityDiagram.png differ
diff --git a/docs/images/EditStudentSequenceDiagram.png b/docs/images/EditStudentSequenceDiagram.png
new file mode 100644
index 00000000000..126b70274dd
Binary files /dev/null and b/docs/images/EditStudentSequenceDiagram.png differ
diff --git a/docs/images/ExamCommandClassDiagram.png b/docs/images/ExamCommandClassDiagram.png
new file mode 100644
index 00000000000..a71bedeca1f
Binary files /dev/null and b/docs/images/ExamCommandClassDiagram.png differ
diff --git a/docs/images/ExamStatsActivityDiagram.png b/docs/images/ExamStatsActivityDiagram.png
new file mode 100644
index 00000000000..6d76fdd4668
Binary files /dev/null and b/docs/images/ExamStatsActivityDiagram.png differ
diff --git a/docs/images/ExamStatsCommandExpectedOutcomeUG.png b/docs/images/ExamStatsCommandExpectedOutcomeUG.png
new file mode 100644
index 00000000000..68425915c39
Binary files /dev/null and b/docs/images/ExamStatsCommandExpectedOutcomeUG.png differ
diff --git a/docs/images/ExamStatsSequenceDiagram.png b/docs/images/ExamStatsSequenceDiagram.png
new file mode 100644
index 00000000000..f7768830fd0
Binary files /dev/null and b/docs/images/ExamStatsSequenceDiagram.png differ
diff --git a/docs/images/FindCommandActivityDiagram.png b/docs/images/FindCommandActivityDiagram.png
new file mode 100644
index 00000000000..7cf0f7175de
Binary files /dev/null and b/docs/images/FindCommandActivityDiagram.png differ
diff --git a/docs/images/FindCommandSequenceDiagram.png b/docs/images/FindCommandSequenceDiagram.png
new file mode 100644
index 00000000000..bde57a5c2d8
Binary files /dev/null and b/docs/images/FindCommandSequenceDiagram.png differ
diff --git a/docs/images/JsonSerializableNotebookClassDiagram.png b/docs/images/JsonSerializableNotebookClassDiagram.png
new file mode 100644
index 00000000000..37ee825f59e
Binary files /dev/null and b/docs/images/JsonSerializableNotebookClassDiagram.png differ
diff --git a/docs/images/JsonSerializableReeveClassDiagram.png b/docs/images/JsonSerializableReeveClassDiagram.png
new file mode 100644
index 00000000000..6f3768b17f3
Binary files /dev/null and b/docs/images/JsonSerializableReeveClassDiagram.png differ
diff --git a/docs/images/LogicClassDiagram.png b/docs/images/LogicClassDiagram.png
index b9e853cef12..34cb82b819e 100644
Binary files a/docs/images/LogicClassDiagram.png and b/docs/images/LogicClassDiagram.png differ
diff --git a/docs/images/ModelClassDiagram.png b/docs/images/ModelClassDiagram.png
index 280064118cf..68affcb4689 100644
Binary files a/docs/images/ModelClassDiagram.png and b/docs/images/ModelClassDiagram.png differ
diff --git a/docs/images/NoteCommandClassDiagram.png b/docs/images/NoteCommandClassDiagram.png
new file mode 100644
index 00000000000..5b1c70b80ac
Binary files /dev/null and b/docs/images/NoteCommandClassDiagram.png differ
diff --git a/docs/images/OverdueActivityDiagram.png b/docs/images/OverdueActivityDiagram.png
new file mode 100644
index 00000000000..d4f75857d89
Binary files /dev/null and b/docs/images/OverdueActivityDiagram.png differ
diff --git a/docs/images/OverdueExpectedOutcome.png b/docs/images/OverdueExpectedOutcome.png
new file mode 100644
index 00000000000..a188977c6a3
Binary files /dev/null and b/docs/images/OverdueExpectedOutcome.png differ
diff --git a/docs/images/OverdueSequenceDiagram.png b/docs/images/OverdueSequenceDiagram.png
new file mode 100644
index 00000000000..ca6316e3795
Binary files /dev/null and b/docs/images/OverdueSequenceDiagram.png differ
diff --git a/docs/images/QuestionAddExpectedOutcome.png b/docs/images/QuestionAddExpectedOutcome.png
new file mode 100644
index 00000000000..3bee401febc
Binary files /dev/null and b/docs/images/QuestionAddExpectedOutcome.png differ
diff --git a/docs/images/QuestionDeleteExpectedOutcome.png b/docs/images/QuestionDeleteExpectedOutcome.png
new file mode 100644
index 00000000000..656b0341179
Binary files /dev/null and b/docs/images/QuestionDeleteExpectedOutcome.png differ
diff --git a/docs/images/QuestionSolveExpectedOutcome.png b/docs/images/QuestionSolveExpectedOutcome.png
new file mode 100644
index 00000000000..17dc49cca87
Binary files /dev/null and b/docs/images/QuestionSolveExpectedOutcome.png differ
diff --git a/docs/images/ReeveLayout.png b/docs/images/ReeveLayout.png
new file mode 100644
index 00000000000..59e3a0da751
Binary files /dev/null and b/docs/images/ReeveLayout.png differ
diff --git a/docs/images/ScheduleActivityDiagram.png b/docs/images/ScheduleActivityDiagram.png
new file mode 100644
index 00000000000..b5c115dd916
Binary files /dev/null and b/docs/images/ScheduleActivityDiagram.png differ
diff --git a/docs/images/ScheduleSequenceDiagram.png b/docs/images/ScheduleSequenceDiagram.png
new file mode 100644
index 00000000000..d4c594cb32f
Binary files /dev/null and b/docs/images/ScheduleSequenceDiagram.png differ
diff --git a/docs/images/ScheduleStep1.png b/docs/images/ScheduleStep1.png
new file mode 100644
index 00000000000..27ecfc873a3
Binary files /dev/null and b/docs/images/ScheduleStep1.png differ
diff --git a/docs/images/ScheduleStep2.png b/docs/images/ScheduleStep2.png
new file mode 100644
index 00000000000..64ad635de07
Binary files /dev/null and b/docs/images/ScheduleStep2.png differ
diff --git a/docs/images/ScheduleStep3.png b/docs/images/ScheduleStep3.png
new file mode 100644
index 00000000000..f77be387beb
Binary files /dev/null and b/docs/images/ScheduleStep3.png differ
diff --git a/docs/images/SolveQuestionActivityDiagram.png b/docs/images/SolveQuestionActivityDiagram.png
new file mode 100644
index 00000000000..26152f2fffa
Binary files /dev/null and b/docs/images/SolveQuestionActivityDiagram.png differ
diff --git a/docs/images/SolveQuestionSequenceDiagram.png b/docs/images/SolveQuestionSequenceDiagram.png
new file mode 100644
index 00000000000..b4875dd3d89
Binary files /dev/null and b/docs/images/SolveQuestionSequenceDiagram.png differ
diff --git a/docs/images/SortCommandActivityDiagram.png b/docs/images/SortCommandActivityDiagram.png
new file mode 100644
index 00000000000..7a6e2c599d9
Binary files /dev/null and b/docs/images/SortCommandActivityDiagram.png differ
diff --git a/docs/images/SortCommandSequenceDiagram.png b/docs/images/SortCommandSequenceDiagram.png
new file mode 100644
index 00000000000..d57b0ac2769
Binary files /dev/null and b/docs/images/SortCommandSequenceDiagram.png differ
diff --git a/docs/images/StorageClassDiagram.png b/docs/images/StorageClassDiagram.png
index d87c1216820..b3dd2452fe1 100644
Binary files a/docs/images/StorageClassDiagram.png and b/docs/images/StorageClassDiagram.png differ
diff --git a/docs/images/ToggleCommandExpectedOutcomeAfterUG.png b/docs/images/ToggleCommandExpectedOutcomeAfterUG.png
new file mode 100644
index 00000000000..a43e64f5710
Binary files /dev/null and b/docs/images/ToggleCommandExpectedOutcomeAfterUG.png differ
diff --git a/docs/images/ToggleCommandExpectedOutcomeBeforeUG.png b/docs/images/ToggleCommandExpectedOutcomeBeforeUG.png
new file mode 100644
index 00000000000..e3bde7997d0
Binary files /dev/null and b/docs/images/ToggleCommandExpectedOutcomeBeforeUG.png differ
diff --git a/docs/images/ToggleStudentCardSequenceDiagram.png b/docs/images/ToggleStudentCardSequenceDiagram.png
new file mode 100644
index 00000000000..e74b4791651
Binary files /dev/null and b/docs/images/ToggleStudentCardSequenceDiagram.png differ
diff --git a/docs/images/Ui.png b/docs/images/Ui.png
index 5bd77847aa2..4a92bf8851a 100644
Binary files a/docs/images/Ui.png and b/docs/images/Ui.png differ
diff --git a/docs/images/UiClassDiagram.png b/docs/images/UiClassDiagram.png
index 7b4b3dbea45..b9921e94abb 100644
Binary files a/docs/images/UiClassDiagram.png and b/docs/images/UiClassDiagram.png differ
diff --git a/docs/images/alexcqy.png b/docs/images/alexcqy.png
new file mode 100644
index 00000000000..92c2ccbe9d2
Binary files /dev/null and b/docs/images/alexcqy.png differ
diff --git a/docs/images/csiongn.png b/docs/images/csiongn.png
new file mode 100644
index 00000000000..44ded74e87c
Binary files /dev/null and b/docs/images/csiongn.png differ
diff --git a/docs/images/helpMessage.png b/docs/images/helpMessage.png
index b1f70470137..7fc57af18c0 100644
Binary files a/docs/images/helpMessage.png and b/docs/images/helpMessage.png differ
diff --git a/docs/images/hogantan.png b/docs/images/hogantan.png
new file mode 100644
index 00000000000..f43b16a1898
Binary files /dev/null and b/docs/images/hogantan.png differ
diff --git a/docs/images/screenshots/AddingNote.png b/docs/images/screenshots/AddingNote.png
new file mode 100644
index 00000000000..e8001c49d88
Binary files /dev/null and b/docs/images/screenshots/AddingNote.png differ
diff --git a/docs/images/screenshots/Notes.png b/docs/images/screenshots/Notes.png
new file mode 100644
index 00000000000..0afdd4e3d1b
Binary files /dev/null and b/docs/images/screenshots/Notes.png differ
diff --git a/docs/images/stoptakingallthenames.png b/docs/images/stoptakingallthenames.png
new file mode 100644
index 00000000000..7d41739d9b0
Binary files /dev/null and b/docs/images/stoptakingallthenames.png differ
diff --git a/docs/images/vaishakanand.png b/docs/images/vaishakanand.png
new file mode 100644
index 00000000000..df235c9a285
Binary files /dev/null and b/docs/images/vaishakanand.png differ
diff --git a/docs/index.md b/docs/index.md
index 7601dbaad0d..e5338c410b5 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,19 +1,20 @@
---
layout: page
-title: AddressBook Level-3
+title: Reeve
---
-[](https://github.com/se-edu/addressbook-level3/actions)
-[](https://codecov.io/gh/se-edu/addressbook-level3)
+[](https://github.com/AY2021S1-CS2103T-W15-2/tp)
+[](https://codecov.io/gh/AY2021S1-CS2103T-W15-2/tp)
-**AddressBook is a desktop application for managing your contact details.** While it has a GUI, most of the user interactions happen using a CLI (Command Line Interface).
+**Reeve** is a desktop application for **private tutors to better manage both administrative and academic details of their students**, optimised for use via a **Command Line Interface (CLI)** for receiving inputs while still having the benefits of a **Graphical User Interface (GUI)** for displaying information.
-* If you are interested in using AddressBook, head over to the [_Quick Start_ section of the **User Guide**](UserGuide.html#quick-start).
-* If you are interested about developing AddressBook, the [**Developer Guide**](DeveloperGuide.html) is a good place to start.
+* Interested in using Reeve? Head over to the [_Quick Start_ section of the **User Guide**](UserGuide.html#2-quick-start)!
+* Interested in developing Reeve? The [**Developer Guide**](DeveloperGuide.html) is a good place to start!
**Acknowledgements**
* Libraries used: [JavaFX](https://openjfx.io/), [Jackson](https://github.com/FasterXML/jackson), [JUnit5](https://github.com/junit-team/junit5)
+* This project is based on the AddressBook-Level3 project created by the [SE-EDU initiative](https://se-education.org).
diff --git a/docs/team/alexcqy.md b/docs/team/alexcqy.md
new file mode 100644
index 00000000000..28c4d270d42
--- /dev/null
+++ b/docs/team/alexcqy.md
@@ -0,0 +1,43 @@
+---
+layout: page
+title: Alex's Project Portfolio Page
+---
+
+## Project: Reeve
+
+Reeve is a desktop companion application for one-on-one private tutors designed to help them better manage their students' academic and administrative needs.
+The user interacts with it using a CLI, and it has a GUI created with JavaFX. It is written in Java, and has about 10 kLoC.
+
+Given below are my contributions to the project.
+
+* **Feature added**: Added the **schedule** feature to **Reeve**.
+ * What it does: Allows user to view classes on a timetable, rendered as a graphical user interface, either weekly or daily based on a date given.
+ * Justification: This feature helps tutor to plan for their schedule and lessons either for the week or day. As is gives a whole view of the lessons ahead.
+ * Highlights: This enhancement uses the current data and maps them to an entity that allows meaningful information to be shown.
+ The implementation was challenging as it required integration of an external library with the current structure of the project.
+ Care have also been given to maintain the data integrity of the current system.
+ * Credits: This feature uses the **[JFXtras](https://jfxtras.org/)** library which includes , [jfxtras-agenda](https://jfxtras.org/doc/8.0/jfxtras-agenda/index.html), [jfxtras-icalendarfx](https://jfxtras.org/doc/8.0/jfxtras-icalendarfx/index.html), [jfxtras-icalendaragenda](https://jfxtras.org/doc/8.0/jfxtras-icalendaragenda/index.html).
+
+* **Other enhancements**:
+ * Added the `Name` and `Year` fields in the `Student` class.
+ * Updated json storage to be compatible with `Student` object.
+ * Updated the `add` command for users to add `Student` object. This allows user to add a `Student`'s academic and admin fields.
+
+* **Code contribution**: [RepoSense link](https://nus-cs2103-ay2021s1.github.io/tp-dashboard/#breakdown=true&search=alexcqy)
+
+* **Project management**:
+ * Helped to plan project base structure.
+ * Laid out plans for `Student`, `Academic` and `Admin`.
+
+* **Documentation**:
+ * User Guide:
+ * Added description for the feature `schedule` ([\#205](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/205)).
+ * Added a visuals and description for users to understand the application interface.
+ * Developer Guide:
+ * Added implementation details of the `schedule`.
+ * Updated design section for `Model` and `Ui` component.
+
+* **Community**:
+ * PRs reviewed (with non-trivial review comments): ([#62](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/62), [#68](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/68))
+ * Reported bugs and suggestions for other teams in the class (examples: [#1](https://github.com/AlexCQY/ped/issues/1), [#2](https://github.com/AlexCQY/ped/issues/2), )
+
diff --git a/docs/team/csiongn.md b/docs/team/csiongn.md
new file mode 100644
index 00000000000..5277353bef8
--- /dev/null
+++ b/docs/team/csiongn.md
@@ -0,0 +1,41 @@
+---
+layout: page
+title: Ng Choon Siong's Project Portfolio Page
+---
+
+## PROJECT: Reeve
+
+Reeve is a desktop companion application for one-on-one private tutors designed to help them better manage their students' academic and administrative needs.
+The user interacts with it using a CLI, and it has a GUI created with JavaFX. It is written in Java, and has about 10 kLoC.
+
+## Summary of Contributions
+
+* **Major enhancement implemented**:
+ * Developed the **notebook** feature of **Reeve**.
+
+ * What it does: **Reeve's notebook** allows tutors to keep track of notes containing small amounts of information unrelated to students .
+ * Justification: This feature is important for a private tutor as there are times when there is information relating to tutoring that needs to be stored but it is not related to any student. This helps to make Reeve a one stop location for storing all kinds of information.
+ * Highlights: This involved substantial work integrating with the existing modified GUI as the notes panel needed to be of a fixed size after resizing while not overlapping with any other sections. The code, while adapted from address book code, also needed integration with Reeve to ensure proper reading and writing to storage when the program is run.
+* **Other enhancements implemented**:
+ * **Created `sort` command** to allow sorting of the student list by name, class time or year of study. ([\#112](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/112))
+ * Justification: This feature is important as it allows private tutors to navigate through the list of students better depending on the needs of the tutor.
+ * **Enhanced `find` command** to allow searching by multiple criteria and **added support** for searching by name, school and year of study. ([\#60](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/60))
+* **Code contribution**: [RepoSense link](https://nus-cs2103-ay2021s1.github.io/tp-dashboard/#breakdown=true&search=csiongn)
+* **Other contributions**:
+ * **Substantially reworked the structure of `Year` class** for better input validation and management. ([\#96](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/96))
+ * Helped to **rename Address Book references to Reeve** ([\#67](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/67))
+* **Project management**:
+ * Reminded team of deliverables.
+
+* **Documentation**:
+ * User Guide:
+ * Updated documentation for the command `find` ([\#38](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/38) and [\#60](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/60))
+ * Added documentation for the command `sort` ([\#130](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/130))
+ * Added documentation for notebook feature ([\#228](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/228))
+ * Developer Guide:
+ * Added implementation details of the `find` and `sort` and command ([\#250](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/250))
+ * Added implementation details of the notebook ([\#250](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/250))
+ * Added use cases and user stories ([\#250](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/250))
+* **Community**:
+ * PRs reviewed (with non-trivial review comments): [\#194](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/194)
+ * Reported bugs and suggestions for other teams in the class (examples: [1](https://github.com/csiongn/ped/issues/1), [2](https://github.com/csiongn/ped/issues/2), [3](https://github.com/csiongn/ped/issues/3))
diff --git a/docs/team/hogantan.md b/docs/team/hogantan.md
new file mode 100644
index 00000000000..69564ee6310
--- /dev/null
+++ b/docs/team/hogantan.md
@@ -0,0 +1,69 @@
+---
+layout: page
+title: Hogan Tan Shao Han's Project Portfolio Page
+---
+
+## Project: Reeve
+
+## Overview
+
+Reeve is a desktop companion application for one-on-one private tutors designed to help them better manage their students' academic and administrative needs.
+The user interacts with it using a CLI, and it has a GUI created with JavaFX. It is written in Java, and has about 10 kLoC.
+
+## Summary of Contributions
+
+* **Major enhancement implemented**: developed the **exam feature** of **Reeve** under academic features.
+ * What it does: Allows the user to add/delete examination records to a particular student. It also allows users to view the exam statistics of a particular student.
+
+ * Justification: This feature is crucial for a private tutor as it allows the private tutor to monitor his/her students' academic progress.
+ In other words, his/she will be able to track each individual students' academic performance. As a result, the private tutor will be able to not only keep track of which students need more help while also gauging his/her capability as a teacher.
+
+ * Highlights: Since this is a new feature with its own set of commands, the implementation required modifying the base student class which was quite tricky given that most other
+ commands were tied to the base student class. Also the addition of opening a new window via a GUI also brings in many considerations to take into account when implementing such as
+ design considerations.
+
+* **Major enhancement implemented**: developed the **GUI** of **Reeve**.
+ * What it does: This feature provides a pleasant interaction between User and **Reeve** by strategically deciding how to display information to users.
+
+ * Justification: In most products, a well-developed UI/UX is imperative in not only landing a good first impression from potential users but it also keeps users interested in using the product.
+
+ * Highlights: This enhancement saw a big change from the original AddressBook3 interface in terms of color choice, placement of the various UI components, etc.
+ Colours of each component in the application were carefully chosen to create a visually pleasing interface. Arrangement of UI components had to be arranged in a way
+ that would be easy and intuitive for users to understand and get used to.
+
+* **Major enhancement implemented**: developed the **toggle feature** of **Reeve**.
+ * What it does: Allows the user to toggle in between displaying administrative and academic details of students.
+
+ * Justification: As aforementioned above, a well-developed UI/UX is imperative to users, hence this feature ensures that the
+ display of student inform is kept clean and neat without much cluttering.
+
+ * Highlights: This enhancement saw a need to consider various UI/UX considerations as well in order to make the feature
+ intuitive and convenient for users as well as easy to understand.
+
+* **Minor enhancement implemented**:
+ * Updated `add` command which allows users to add students along with their administrative details.
+
+* **Code contribution**: [RepoSense link](https://nus-cs2103-ay2021s1.github.io/tp-dashboard/#breakdown=true&search=W15-2&sort=groupTitle&sortWithin=title&since=2020-08-14&timeframe=commit&mergegroup=&groupSelect=groupByRepos&checkedFileTypes=docs~functional-code~test-code~other&tabOpen=true&tabType=authorship&tabAuthor=StopTakingAllTheNames&tabRepo=AY2021S1-CS2103T-W15-2%2Ftp%5Bmaster%5D&authorshipIsMergeGroup=false&authorshipFileTypes=docs~functional-code~test-code~other)
+
+* **Project management**:
+ * Set soft and hard deadlines for milestones `v1.1` - `v1.4`.
+ * Reminded team of deliverables for each week.
+ * Maintained issue tracker.
+ * Maintained product website and README. ([\#63](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/63))([\#108](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/108))
+
+* **Enhancements to existing features**:
+ * Laid down the structure of the student class. ([\#42](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/42))
+ * Updated the add command to accommodate student class. ([\#62](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/62))
+ * Updated the GUI color scheme and layout. ([\#76](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/76), [\#81](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/81) and [\#233](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/233))
+ * Updated UG and DG structure and flow. ([\#126](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/126) and [\#231](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/231))
+
+* **Documentation**:
+ * User Guide:
+ * Added documentation for the features `add` ([\#82](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/82)), `exam` ([\#117](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/117) and [\#141](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/141)) and `toggle` ([\#134](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/134)).
+ * Added introduction and prefaces to various sections ([\#126](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/126))
+ * Developer Guide:
+ * Added implementation details of the `add` ([\#100](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/100)), `exam` ([\#225](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/225)) `toggle` ([\#225](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/225)) features.
+
+* **Community**:
+ * PRs reviewed (with non-trivial review comments): [\#77](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/77), [\#79](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/79), [\#102](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/102)
+ * Reported bugs and suggestions for other teams in the class (examples: [1](https://github.com/hogantan/ped/issues/3), [2](https://github.com/hogantan/ped/issues/4), [3](https://github.com/hogantan/ped/issues/10))
diff --git a/docs/team/stoptakingallthenames.md b/docs/team/stoptakingallthenames.md
new file mode 100644
index 00000000000..2a158e9c3bc
--- /dev/null
+++ b/docs/team/stoptakingallthenames.md
@@ -0,0 +1,53 @@
+---
+layout: page
+title: Ong Ying Gao's Project Portfolio Page
+---
+
+## Project: Reeve
+
+Reeve is a desktop companion application for one-on-one private tutors designed to help them better manage their students' academic and administrative needs.
+The user interacts with it using a CLI, and it has a GUI created with JavaFX. It is written in Java, and has about 10 kLoC.
+
+Given below are my contributions to the project.
+
+* **Feature Addition**: Added the ability to record and manage questions from students.
+ * What it does: Allows the user to log questions from students, resolve them and delete them when no longer needed.
+ * Justification: This helps tutors significantly as it allows them to keep track of questions from their students and gives them time to resolve them.
+ Furthermore, the ability to record the solution allows tutors to use it to answer future similar questions from students.
+ * Highlights: Since this is a new feature with its own set of commands, the implementation required modifying almost every module. Some existing commands had to be altered as well.
+ Almost all new functional code had accompanying test cases, resulting in 1697 new lines of code with 84.50% coverage.
+
+* **Feature Addition**: Added the ability to store tuition fee payment data and find all students with overdue fees.
+ * Highlights: In order to implement monitoring of payment dates, I had to create a more manual approach to parsing strings into dates
+ as the `parse()` method in the LocalDate API was too lenient (allowing inputs such as `31/2/2020`).
+
+* **Code contribution**: [RepoSense link](https://nus-cs2103-ay2021s1.github.io/tp-dashboard/#breakdown=true&search=stoptakingallthenames)
+
+* **Project management**:
+ * Managed releases `v1.2` to `v1.4` (3 releases) on GitHub.
+ * Set up Github repo and issue tracker.
+ * Maintained issue tracker.
+
+
+
+* **Enhancements to existing features**:
+ * Wrote additional tests for existing and new features to increase coverage ([\#75](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/75)).
+ * Enhanced code quality to ensure adherence to abstraction levels, improve defensiveness and reduce coupling ([\#103](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/103)
+ and [\#194](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/194)).
+ * Added utility and classes methods to minimise code duplication ([\#211](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/211) and [\#213](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/213)).
+
+* **Documentation**:
+ * User Guide:
+ * Documented the `overdue` ([\#79](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/79)) and `question` ([\#71](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/71)) features.
+ * Did cosmetic tweaks to existing documentation of features: ([\#140](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/140) and [\#212](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/212)).
+ * Developer Guide:
+ * Added implementation details of the `overdue` ([\#105](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/105)) and `question` ([\#103](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/103))
+ features.
+ * Included sequence and activity diagrams for the above features.
+
+* **Community**:
+ * Reviewed PRs (with non-trivial review comments): [\#60](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/60), [\#62](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/62),
+ [\#68](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/68), [\#214](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/214)
+ * Reported bugs and suggestions for other teams in the class (examples: [1](https://github.com/StopTakingAllTheNames/ped/issues/1),
+ [2](https://github.com/StopTakingAllTheNames/ped/issues/5), [3](https://github.com/StopTakingAllTheNames/ped/issues/2))
+ * Contributed to forum discussions (examples: [1](https://github.com/nus-cs2103-AY2021S1/forum/issues/390), [2](https://github.com/nus-cs2103-AY2021S1/forum/issues/393))
diff --git a/docs/team/vaishakanand.md b/docs/team/vaishakanand.md
new file mode 100644
index 00000000000..59572c11d0b
--- /dev/null
+++ b/docs/team/vaishakanand.md
@@ -0,0 +1,47 @@
+---
+layout: page
+title: Vaishak's Project Portfolio Page
+---
+
+## Project: Reeve
+
+Reeve is a desktop companion application for one-on-one private tutors designed to help them better manage their students' academic and administrative needs.
+The user interacts with it using a CLI, and it has a GUI created with JavaFX. It is written in Java, and has about 10 kLoC.
+
+## Summary of Contributions
+
+* **New Feature implemented**: Added the **details** feature to **Reeve**.
+ * What it does: Allows the user to add, edit or delete any additional details to a student.
+ * Justification: This feature would help tutors significantly as it allows them to add details that have not been
+ covered by the other fields, to students. This gives the tutor some flexibility to customise each student as he / she
+ sees fit.
+
+* **New Feature implemented**: Added the **attendance** feature to **Reeve**.
+ * What it does: Allows the user to track (add or delete) the attendance of students in lessons.
+ * Justification: An attendance tracking feature helps to ease one of a tutor's many required tasks. This is helps them
+ by greatly simplifying the process of taking and storing the attendance of the tutor's many students.
+
+* **Other Enhancements implemented**:
+ * Added the `Academic` class to restructure `Student`.
+ * Added the `ClassTime` and `ClassVenue` that are required fields in `Student`.
+ * Adapted the `edit` command to work with the new structure of `Student` in **Reeve**.
+
+* **Code contribution**: [RepoSense link](https://nus-cs2103-ay2021s1.github.io/tp-dashboard/#breakdown=true&search=vaishakanand)
+
+* **Project management**:
+ * Managed releases `v1.1` - `v1.4` on GitHub
+ * Helped to remind team of various deliverables
+
+* **Documentation**:
+ * User Guide:
+ * Added documentation for the features `edit` ([\#37](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/37)) , `detail` ([\#102](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/102)) and `attendance` ([\#129](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/129)).
+ * Added Table of Contents ([\#129](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/129)).
+ * Updated the order, and content of Command summary ([\#147](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/147))
+ * Added Figure numbering, and image centering to make User Guide look nicer ([\#262](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/262))
+ * Developer Guide:
+ * Added implementation details of the `edit` ([\#113](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/113)), `detail` ([\#229](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/229)) and `attendance` ([\#229](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/229)) features.
+ * Added Figure numbering, and image centering ([\#268](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/268))
+
+* **Community**:
+ * Reviewed PRs (with non-trivial review comments): [\#71](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/71), [\#77](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/77), [\#56](https://github.com/AY2021S1-CS2103T-W15-2/tp/pull/56)
+ * Reported bugs and suggestions for other teams in the class (examples: [1](https://github.com/VaishakAnand/ped/issues/5), [2](https://github.com/VaishakAnand/ped/issues/2), [3](https://github.com/VaishakAnand/ped/issues/3))
diff --git a/docs/tutorials/AddRemark.md b/docs/tutorials/AddRemark.md
index 6907e29456c..fdf5b89881b 100644
--- a/docs/tutorials/AddRemark.md
+++ b/docs/tutorials/AddRemark.md
@@ -28,7 +28,7 @@ package seedu.address.logic.commands;
import seedu.address.model.Model;
/**
- * Changes the remark of an existing person in the address book.
+ * Changes the remark of an existing student in the address book.
*/
public class RemarkCommand extends Command {
@@ -64,8 +64,8 @@ Following the convention in other commands, we add relevant messages as constant
**`RemarkCommand.java`:**
``` java
- public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the remark of the person identified "
- + "by the index number used in the last person listing. "
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the remark of the student identified "
+ + "by the index number used in the last student listing. "
+ "Existing remark will be overwritten by the input.\n"
+ "Parameters: INDEX (must be a positive integer) "
+ "r/ [REMARK]\n"
@@ -99,8 +99,8 @@ public class RemarkCommand extends Command {
private final String remark;
/**
- * @param index of the person in the filtered person list to edit the remark
- * @param remark of the person to be updated to
+ * @param index of the student in the filtered student list to edit the remark
+ * @param remark of the student to be updated to
*/
public RemarkCommand(Index index, String remark) {
requireAllNonNull(index, remark);
@@ -222,11 +222,11 @@ If you are stuck, check out the sample
## Add `Remark` to the model
-Now that we have all the information that we need, let’s lay the groundwork for propagating the remarks added into the in-memory storage of person data. We achieve that by working with the `Person` model. Each field in a Person is implemented as a separate class (e.g. a `Name` object represents the person’s name). That means we should add a `Remark` class so that we can use a `Remark` object to represent a remark given to a person.
+Now that we have all the information that we need, let’s lay the groundwork for propagating the remarks added into the in-memory storage of student data. We achieve that by working with the `Person` model. Each field in a Person is implemented as a separate class (e.g. a `Name` object represents the student’s name). That means we should add a `Remark` class so that we can use a `Remark` object to represent a remark given to a student.
### Add a new `Remark` class
-Create a new `Remark` in `seedu.address.model.person`. Since a `Remark` is a field that is similar to `Address`, we can reuse a significant bit of code.
+Create a new `Remark` in `seedu.address.model.student`. Since a `Remark` is a field that is similar to `Address`, we can reuse a significant bit of code.
A copy-paste and search-replace later, you should have something like [this](https://github.com/se-edu/addressbook-level3/commit/4516e099699baa9e2d51801bd26f016d812dedcc#diff-af2f075d24dfcd333876f0fbce321f25). Note how `Remark` has no constrains and thus does not require input
validation.
@@ -237,7 +237,7 @@ Let’s change `RemarkCommand` and `RemarkCommandParser` to use the new `Remark`
## Add a placeholder element for remark to the UI
-Without getting too deep into `fxml`, let’s go on a 5 minute adventure to get some placeholder text to show up for each person.
+Without getting too deep into `fxml`, let’s go on a 5 minute adventure to get some placeholder text to show up for each student.
Simply add the following to [`seedu.address.ui.PersonCard`](https://github.com/se-edu/addressbook-level3/commit/850b78879582f38accb05dd20c245963c65ea599#diff-0c6b6abcfac8c205e075294f25e851fe).
@@ -308,9 +308,9 @@ Just add [this one line of code!](https://github.com/se-edu/addressbook-level3/c
**`PersonCard.java`:**
``` java
-public PersonCard(Person person, int displayedIndex) {
+public PersonCard(Person student, int displayedIndex) {
//...
- remark.setText(person.getRemark().value);
+ remark.setText(student.getRemark().value);
}
```
@@ -340,23 +340,23 @@ save it with `Model#setPerson()`.
throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
}
- Person personToEdit = lastShownList.get(index.getZeroBased());
- Person editedPerson = new Person(personToEdit.getName(), personToEdit.getPhone(), personToEdit.getEmail(),
- personToEdit.getAddress(), remark, personToEdit.getTags());
+ Person studentToEdit = lastShownList.get(index.getZeroBased());
+ Person editedStudent = new Person(studentToEdit.getName(), studentToEdit.getPhone(), studentToEdit.getEmail(),
+ studentToEdit.getAddress(), remark, studentToEdit.getTags());
- model.setPerson(personToEdit, editedPerson);
+ model.setPerson(studentToEdit, editedStudent);
model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
- return new CommandResult(generateSuccessMessage(editedPerson));
+ return new CommandResult(generateSuccessMessage(editedStudent));
}
/**
* Generates a command execution success message based on whether the remark is added to or removed from
- * {@code personToEdit}.
+ * {@code studentToEdit}.
*/
- private String generateSuccessMessage(Person personToEdit) {
+ private String generateSuccessMessage(Person studentToEdit) {
String message = !remark.value.isEmpty() ? MESSAGE_ADD_REMARK_SUCCESS : MESSAGE_DELETE_REMARK_SUCCESS;
- return String.format(message, personToEdit);
+ return String.format(message, studentToEdit);
}
```
diff --git a/docs/tutorials/RemovingFields.md b/docs/tutorials/RemovingFields.md
index aa8e0baaad9..41b18f0512c 100644
--- a/docs/tutorials/RemovingFields.md
+++ b/docs/tutorials/RemovingFields.md
@@ -20,7 +20,7 @@ Fortunately, IntelliJ IDEA provides a robust refactoring tool that can identify
### Assisted refactoring
-The `address` field in `Person` is actually an instance of the `seedu.address.model.person.Address` class. Since removing the `Address` class will break the application, we start by identifying `Address`'s usages. This allows us to see code that depends on `Address` to function properly and edit them on a case-by-case basis. Right-click the `Address` class and select `Refactor` \> `Safe Delete` through the menu.
+The `address` field in `Person` is actually an instance of the `seedu.address.model.student.Address` class. Since removing the `Address` class will break the application, we start by identifying `Address`'s usages. This allows us to see code that depends on `Address` to function properly and edit them on a case-by-case basis. Right-click the `Address` class and select `Refactor` \> `Safe Delete` through the menu.
@@ -75,7 +75,7 @@ private Label address;
...
addressBookOptional;
- ReadOnlyAddressBook initialData;
+ Optional addressBookOptional;
+ Optional notebookOptional;
+ ReadOnlyReeve initialData;
+ ReadOnlyNotebook initialNotebook;
+
try {
addressBookOptional = storage.readAddressBook();
+
if (!addressBookOptional.isPresent()) {
- logger.info("Data file not found. Will be starting with a sample AddressBook");
+ logger.info("Data file not found. Will be starting with a sample Reeve");
}
initialData = addressBookOptional.orElseGet(SampleDataUtil::getSampleAddressBook);
+
} catch (DataConversionException e) {
- logger.warning("Data file not in the correct format. Will be starting with an empty AddressBook");
- initialData = new AddressBook();
+ logger.warning("Data file not in the correct format. Will be starting with an empty Reeve");
+ initialData = new Reeve();
} catch (IOException e) {
- logger.warning("Problem while reading from the file. Will be starting with an empty AddressBook");
- initialData = new AddressBook();
+ logger.warning("Problem while reading from the file. Will be starting with an empty Reeve");
+ initialData = new Reeve();
+ }
+
+ try {
+ notebookOptional = storage.readNotebook();
+ if (!notebookOptional.isPresent()) {
+ logger.info("Data file for notebook not found. Will be starting with a sample Notebook");
+ }
+ initialNotebook = notebookOptional.orElseGet(SampleDataUtil::getSampleNotebook);
+ } catch (DataConversionException e) {
+ logger.warning("Data file not in the correct format. Will be starting with an empty Notebook");
+ initialNotebook = new Notebook();
+ } catch (IOException e) {
+ logger.warning("Problem while reading from the file. Will be starting with an empty Notebook");
+ initialNotebook = new Notebook();
}
- return new ModelManager(initialData, userPrefs);
+ return new ModelManager(initialData, userPrefs, initialNotebook);
}
private void initLogging(Config config) {
@@ -167,13 +193,13 @@ protected UserPrefs initPrefs(UserPrefsStorage storage) {
@Override
public void start(Stage primaryStage) {
- logger.info("Starting AddressBook " + MainApp.VERSION);
+ logger.info("Starting Reeve " + MainApp.VERSION);
ui.start(primaryStage);
}
@Override
public void stop() {
- logger.info("============================ [ Stopping Address Book ] =============================");
+ logger.info("============================ [ Stopping Reeve ] =============================");
try {
storage.saveUserPrefs(model.getUserPrefs());
} catch (IOException e) {
diff --git a/src/main/java/seedu/address/commons/core/Messages.java b/src/main/java/seedu/address/commons/core/Messages.java
index 1deb3a1e469..beebd3e3d63 100644
--- a/src/main/java/seedu/address/commons/core/Messages.java
+++ b/src/main/java/seedu/address/commons/core/Messages.java
@@ -7,7 +7,10 @@ public class Messages {
public static final String MESSAGE_UNKNOWN_COMMAND = "Unknown command";
public static final String MESSAGE_INVALID_COMMAND_FORMAT = "Invalid command format! \n%1$s";
- public static final String MESSAGE_INVALID_PERSON_DISPLAYED_INDEX = "The person index provided is invalid";
- public static final String MESSAGE_PERSONS_LISTED_OVERVIEW = "%1$d persons listed!";
+ public static final String MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX = "There is no student at the given index!";
+ public static final String MESSAGE_STUDENTS_LISTED_OVERVIEW = "%1$d students listed!";
+ public static final String MESSAGE_CLASHING_LESSON = "You have another lesson that clashes with this lesson!";
+ public static final String MESSAGE_STUDENTS_SORTED = "Students sorted by %1$s!";
+ public static final String MESSAGE_INVALID_NOTE_DISPLAYED_INDEX = "There is no note at the given index!";
}
diff --git a/src/main/java/seedu/address/commons/util/DateUtil.java b/src/main/java/seedu/address/commons/util/DateUtil.java
new file mode 100644
index 00000000000..a4d1b60b3a0
--- /dev/null
+++ b/src/main/java/seedu/address/commons/util/DateUtil.java
@@ -0,0 +1,101 @@
+package seedu.address.commons.util;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.time.DateTimeException;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Helper functions for handling dates
+ */
+public class DateUtil {
+
+ public static final String DATE_CONSTRAINTS = "Dates should be a valid date in the form dd/mm/yyyy, "
+ + "and should not be blank";
+
+ public static final Pattern DATE_PATTERN =
+ Pattern.compile("(?[0-9]{1,2})(/)(?[0-9]{1,2})(/)(?[0-9]{2}|[0-9]{4})");
+
+ // Input format for dates
+ public static final DateTimeFormatter FORMAT_IN = DateTimeFormatter.ofPattern("d/M/yyyy");
+ // Output format for printing
+ public static final DateTimeFormatter FORMAT_OUT = DateTimeFormatter.ofPattern("dd MMM yyyy");
+
+ public static final String TODAY = LocalDate.now().format(FORMAT_IN);
+
+ /**
+ * Returns true if the input string provided is a valid date format.
+ */
+ public static boolean isValidDate(String test) {
+ requireNonNull(test);
+ try {
+ parseToDate(test);
+ return true;
+ } catch (IllegalArgumentException e) {
+ return false;
+ }
+ }
+
+ /**
+ * Attempts to parse a given input string into a valid {@code LocalDate} object.
+ * This is the more stringent method of date parsing, and can be used for validating inputs.
+ *
+ * @throws IllegalArgumentException if input string is not a valid date.
+ */
+ public static LocalDate parseToDate(String input) {
+ requireNonNull(input);
+
+ Matcher matcher = DATE_PATTERN.matcher(input);
+ if (!matcher.matches()) {
+ throw new IllegalArgumentException(DATE_CONSTRAINTS);
+ }
+
+ String day = matcher.group("day");
+ String month = matcher.group("month");
+ String year = matcher.group("year");
+ return convertToDate(day, month, year);
+ }
+
+ /**
+ * Returns a "dd MMM yyyy" representation of a date.
+ * This is for displaying in a GUI. For example, "21/3/2020" will be formatted as "21 Mar 2020".
+ */
+ public static String print(LocalDate date) {
+ requireNonNull(date);
+ return date.format(FORMAT_OUT);
+ }
+
+ /**
+ * Returns a String representing the date in "d/M/yyyy" form.
+ * This is to facilitate saving date objects as strings to be parsed again in future.
+ */
+ public static String getInputFormat(LocalDate date) {
+ requireNonNull(date);
+ return date.format(FORMAT_IN);
+ }
+
+ /**
+ * Converts a given day, month and year into a {@code LocalDate} object.
+ * This is a stricter version of using {@code LocalDate.parse()} since it does not allow inputs such as
+ * 31 Feb to be parsed.
+ *
+ * @throws IllegalArgumentException if inputs do not form a valid date.
+ */
+ private static LocalDate convertToDate(String day, String month, String year) {
+ requireAllNonNull(day, month, year);
+
+ int dayInt = Integer.parseInt(day);
+ int monthInt = Integer.parseInt(month);
+ int yearInt = year.length() == 2 ? Integer.parseInt("20" + year) : Integer.parseInt(year);
+
+ try {
+ return LocalDate.of(yearInt, monthInt, dayInt);
+ } catch (DateTimeException e) {
+ throw new IllegalArgumentException(DATE_CONSTRAINTS);
+ }
+ }
+}
diff --git a/src/main/java/seedu/address/commons/util/StringUtil.java b/src/main/java/seedu/address/commons/util/StringUtil.java
index 61cc8c9a1cb..13430a27ed1 100644
--- a/src/main/java/seedu/address/commons/util/StringUtil.java
+++ b/src/main/java/seedu/address/commons/util/StringUtil.java
@@ -12,6 +12,35 @@
*/
public class StringUtil {
+ /**
+ * Returns true if the {@code sentence} contains the {@code word}.
+ * Ignores case and doesn't require a full word match.
+ *
+ * containsIgnoreCase("ABc def", "abc") == true
+ * containsIgnoreCase("ABc def", "DEF") == true
+ * containsIgnoreCase("ABc def", "AB") == true
+ *
+ * @param sentence cannot be null
+ * @param word cannot be null, cannot be empty, must be a single word
+ */
+ public static boolean containsIgnoreCase(String sentence, String word) {
+ requireNonNull(sentence);
+ requireNonNull(word);
+
+ String preppedWord = word.trim().toLowerCase();
+ checkArgument(!preppedWord.isEmpty(), "Word parameter cannot be empty");
+ checkArgument(preppedWord.split("\\s+").length == 1, "Word parameter should be a single word");
+
+ String preppedSentence = sentence.toLowerCase();
+ String[] wordsInPreppedSentence = preppedSentence.split("\\s+");
+ if (wordsInPreppedSentence.length == 0 || preppedSentence.equals("")) {
+ return false;
+ }
+
+ return Arrays.stream(wordsInPreppedSentence)
+ .anyMatch(sentenceWord -> sentenceWord.contains(preppedWord));
+ }
+
/**
* Returns true if the {@code sentence} contains the {@code word}.
* Ignores case, but a full word match is required.
diff --git a/src/main/java/seedu/address/logic/Logic.java b/src/main/java/seedu/address/logic/Logic.java
index 92cd8fa605a..d71ebddeec2 100644
--- a/src/main/java/seedu/address/logic/Logic.java
+++ b/src/main/java/seedu/address/logic/Logic.java
@@ -1,14 +1,18 @@
package seedu.address.logic;
import java.nio.file.Path;
+import java.time.LocalDateTime;
import javafx.collections.ObservableList;
+import jfxtras.icalendarfx.components.VEvent;
import seedu.address.commons.core.GuiSettings;
import seedu.address.logic.commands.CommandResult;
import seedu.address.logic.commands.exceptions.CommandException;
import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.person.Person;
+import seedu.address.model.ReadOnlyReeve;
+import seedu.address.model.notes.ReadOnlyNotebook;
+import seedu.address.model.schedule.ScheduleViewMode;
+import seedu.address.model.student.Student;
/**
* API of the Logic component
@@ -26,12 +30,20 @@ public interface Logic {
/**
* Returns the AddressBook.
*
- * @see seedu.address.model.Model#getAddressBook()
+ * @see seedu.address.model.Model#getReeve()
*/
- ReadOnlyAddressBook getAddressBook();
+ ReadOnlyReeve getAddressBook();
+
+ /**
+ * Returns the notebook.
+ */
+ ReadOnlyNotebook getNotebook();
/** Returns an unmodifiable view of the filtered list of persons */
- ObservableList getFilteredPersonList();
+ ObservableList getFilteredPersonList();
+
+ /** Returns an unmodifiable view of the sorted list of students */
+ ObservableList getSortedStudentList();
/**
* Returns the user prefs' address book file path.
@@ -47,4 +59,20 @@ public interface Logic {
* Set the user prefs' GUI settings.
*/
void setGuiSettings(GuiSettings guiSettings);
+
+ /**
+ * Returns the preferred schedule view on a particular date and time.
+ */
+ LocalDateTime getScheduleViewDateTime();
+
+ /**
+ * Returns the preferred view mode, either week or day view.
+ */
+ ScheduleViewMode getScheduleViewMode();
+
+ /**
+ * Returns unmodifiable view of VEvent lesson.
+ */
+ ObservableList getVEventList();
+
}
diff --git a/src/main/java/seedu/address/logic/LogicManager.java b/src/main/java/seedu/address/logic/LogicManager.java
index 9d9c6d15bdc..8933b00da30 100644
--- a/src/main/java/seedu/address/logic/LogicManager.java
+++ b/src/main/java/seedu/address/logic/LogicManager.java
@@ -2,19 +2,23 @@
import java.io.IOException;
import java.nio.file.Path;
+import java.time.LocalDateTime;
import java.util.logging.Logger;
import javafx.collections.ObservableList;
+import jfxtras.icalendarfx.components.VEvent;
import seedu.address.commons.core.GuiSettings;
import seedu.address.commons.core.LogsCenter;
import seedu.address.logic.commands.Command;
import seedu.address.logic.commands.CommandResult;
import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.logic.parser.AddressBookParser;
+import seedu.address.logic.parser.ReeveParser;
import seedu.address.logic.parser.exceptions.ParseException;
import seedu.address.model.Model;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.person.Person;
+import seedu.address.model.ReadOnlyReeve;
+import seedu.address.model.notes.ReadOnlyNotebook;
+import seedu.address.model.schedule.ScheduleViewMode;
+import seedu.address.model.student.Student;
import seedu.address.storage.Storage;
/**
@@ -26,7 +30,7 @@ public class LogicManager implements Logic {
private final Model model;
private final Storage storage;
- private final AddressBookParser addressBookParser;
+ private final ReeveParser reeveParser;
/**
* Constructs a {@code LogicManager} with the given {@code Model} and {@code Storage}.
@@ -34,7 +38,7 @@ public class LogicManager implements Logic {
public LogicManager(Model model, Storage storage) {
this.model = model;
this.storage = storage;
- addressBookParser = new AddressBookParser();
+ reeveParser = new ReeveParser();
}
@Override
@@ -42,11 +46,12 @@ public CommandResult execute(String commandText) throws CommandException, ParseE
logger.info("----------------[USER COMMAND][" + commandText + "]");
CommandResult commandResult;
- Command command = addressBookParser.parseCommand(commandText);
+ Command command = reeveParser.parseCommand(commandText);
commandResult = command.execute(model);
try {
- storage.saveAddressBook(model.getAddressBook());
+ storage.saveAddressBook(model.getReeve());
+ storage.saveNotebook(model.getNotebook());
} catch (IOException ioe) {
throw new CommandException(FILE_OPS_ERROR_MESSAGE + ioe, ioe);
}
@@ -55,13 +60,23 @@ public CommandResult execute(String commandText) throws CommandException, ParseE
}
@Override
- public ReadOnlyAddressBook getAddressBook() {
- return model.getAddressBook();
+ public ReadOnlyReeve getAddressBook() {
+ return model.getReeve();
}
@Override
- public ObservableList getFilteredPersonList() {
- return model.getFilteredPersonList();
+ public ReadOnlyNotebook getNotebook() {
+ return model.getNotebook();
+ }
+
+ @Override
+ public ObservableList getFilteredPersonList() {
+ return model.getSortedStudentList();
+ }
+
+ @Override
+ public ObservableList getSortedStudentList() {
+ return model.getSortedStudentList();
}
@Override
@@ -78,4 +93,19 @@ public GuiSettings getGuiSettings() {
public void setGuiSettings(GuiSettings guiSettings) {
model.setGuiSettings(guiSettings);
}
+
+ @Override
+ public LocalDateTime getScheduleViewDateTime() {
+ return model.getScheduleViewDateTime();
+ }
+
+ @Override
+ public ScheduleViewMode getScheduleViewMode() {
+ return model.getScheduleViewMode();
+ }
+
+ @Override
+ public ObservableList getVEventList() {
+ return model.getLessonEventsList();
+ }
}
diff --git a/src/main/java/seedu/address/logic/commands/AddAttendanceCommand.java b/src/main/java/seedu/address/logic/commands/AddAttendanceCommand.java
new file mode 100644
index 00000000000..6ed368ffcaf
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/AddAttendanceCommand.java
@@ -0,0 +1,105 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ATTENDANCE_DATE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ATTENDANCE_FEEDBACK;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ATTENDANCE_STATUS;
+
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.academic.Attendance;
+
+public class AddAttendanceCommand extends AttendanceCommand {
+
+ public static final String COMMAND_WORD = "add";
+ public static final String MESSAGE_USAGE = AttendanceCommand.COMMAND_WORD + " " + COMMAND_WORD
+ + ": Adds an attendance record to the specified student.\n\n"
+ + "Parameters: INDEX (must be a positive integer) "
+ + PREFIX_ATTENDANCE_DATE + "LESSON_DATE " + PREFIX_ATTENDANCE_STATUS + "ATTENDANCE_STATUS "
+ + "[" + PREFIX_ATTENDANCE_FEEDBACK + "FEEDBACK]\n\n"
+ + "Example: " + AttendanceCommand.COMMAND_WORD + " " + COMMAND_WORD + " 2 "
+ + PREFIX_ATTENDANCE_DATE + "14/02/2020 " + PREFIX_ATTENDANCE_STATUS + "present "
+ + PREFIX_ATTENDANCE_FEEDBACK + "attentive";
+
+ public static final String MESSAGE_SUCCESS = "Attendance added for %s: %s";
+ public static final String MESSAGE_INVALID_ATTENDANCE_DATE =
+ "There is already an existing attendance for the entered date! Please use another date, or delete the "
+ + "existing attendance before adding a new one.";
+
+ private static Logger logger = Logger.getLogger("Add Attendance Log");
+
+ private final Index index;
+ private final Attendance attendanceToAdd;
+
+ /**
+ * Creates an AddAttendanceCommand to add the specified {@code Attendance} to the student
+ * at the specified {@code Index}.
+ */
+ public AddAttendanceCommand(Index index, Attendance attendanceToAdd) {
+ requireAllNonNull(index, attendanceToAdd);
+ this.index = index;
+ this.attendanceToAdd = attendanceToAdd;
+ }
+
+ /**
+ * Executes the command and returns the result message.
+ *
+ * @param model {@code Model} which the command should operate on.
+ * @return feedback message of the operation result for display
+ * @throws CommandException If an error occurs during command execution.
+ */
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+ logger.log(Level.INFO, "Beginning command execution");
+
+ List lastShownList = model.getSortedStudentList();
+ if (index.getZeroBased() >= lastShownList.size()) {
+ logger.log(Level.WARNING, "Invalid student index input error");
+ throw new CommandException(Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ Student studentToAddAttendance = lastShownList.get(index.getZeroBased());
+ if (studentToAddAttendance.containsAttendance(attendanceToAdd)) {
+ logger.log(Level.WARNING, "Invalid attendance date error");
+ throw new CommandException(MESSAGE_INVALID_ATTENDANCE_DATE);
+ }
+
+ List updatedAttendance = updateAttendanceList(studentToAddAttendance.getAttendance());
+ Student updatedStudent = updateStudentAttendance(studentToAddAttendance, updatedAttendance);
+
+ model.setStudent(studentToAddAttendance, updatedStudent);
+ logger.log(Level.INFO, "Execution complete");
+
+ return new CommandResult(String.format(MESSAGE_SUCCESS, updatedStudent.getName(), attendanceToAdd));
+ }
+
+ private List updateAttendanceList(List attendanceList) {
+ assert attendanceList.stream().noneMatch(attendanceToAdd::isSameAttendance);
+
+ attendanceList.add(attendanceToAdd);
+ return attendanceList;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ if (!(obj instanceof AddAttendanceCommand)) {
+ return false;
+ }
+
+ AddAttendanceCommand other = (AddAttendanceCommand) obj;
+ return index.equals(other.index) && attendanceToAdd.equals(other.attendanceToAdd);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/AddCommand.java b/src/main/java/seedu/address/logic/commands/AddCommand.java
index 71656d7c5c8..d5dcd7cbe85 100644
--- a/src/main/java/seedu/address/logic/commands/AddCommand.java
+++ b/src/main/java/seedu/address/logic/commands/AddCommand.java
@@ -1,15 +1,20 @@
package seedu.address.logic.commands;
import static java.util.Objects.requireNonNull;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_DETAILS;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_FEE;
import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_PAYMENT;
import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SCHOOL;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TIME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_VENUE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_YEAR;
+import seedu.address.commons.core.Messages;
import seedu.address.logic.commands.exceptions.CommandException;
import seedu.address.model.Model;
-import seedu.address.model.person.Person;
+import seedu.address.model.student.Student;
/**
* Adds a person to the address book.
@@ -18,43 +23,55 @@ public class AddCommand extends Command {
public static final String COMMAND_WORD = "add";
- public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a person to the address book. "
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a student to Reeve.\n\n"
+ "Parameters: "
+ PREFIX_NAME + "NAME "
+ PREFIX_PHONE + "PHONE "
- + PREFIX_EMAIL + "EMAIL "
- + PREFIX_ADDRESS + "ADDRESS "
- + "[" + PREFIX_TAG + "TAG]...\n"
+ + PREFIX_SCHOOL + "SCHOOL "
+ + PREFIX_YEAR + "YEAR "
+ + PREFIX_VENUE + "CLASS_VENUE "
+ + PREFIX_TIME + "CLASS_TIME "
+ + "[" + PREFIX_FEE + "FEE] "
+ + "[" + PREFIX_PAYMENT + "LAST_PAYMENT_DATE] "
+ + "[" + PREFIX_DETAILS + "ADDITIONAL_DETAILS]\n\n"
+ "Example: " + COMMAND_WORD + " "
+ PREFIX_NAME + "John Doe "
+ PREFIX_PHONE + "98765432 "
- + PREFIX_EMAIL + "johnd@example.com "
- + PREFIX_ADDRESS + "311, Clementi Ave 2, #02-25 "
- + PREFIX_TAG + "friends "
- + PREFIX_TAG + "owesMoney";
+ + PREFIX_SCHOOL + "Woodlands Secondary School "
+ + PREFIX_YEAR + "Secondary 2 "
+ + PREFIX_VENUE + "347 Woodlands Ave 3, Singapore 730347 "
+ + PREFIX_TIME + "1 1200-1400 "
+ + PREFIX_FEE + "30 "
+ + PREFIX_PAYMENT + "24/09/2020 "
+ + PREFIX_DETAILS + "Details here ";
- public static final String MESSAGE_SUCCESS = "New person added: %1$s";
- public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the address book";
+ public static final String MESSAGE_SUCCESS = "New student added:\n%1$s";
+ public static final String MESSAGE_DUPLICATE_STUDENT = "This student already exists in Reeve\n\n "
+ + "A student is uniquely identified by his/her NAME, PHONE, SCHOOL and YEAR";
- private final Person toAdd;
+ private final Student toAdd;
/**
- * Creates an AddCommand to add the specified {@code Person}
+ * Creates an AddCommand to add the specified {@code Student}
*/
- public AddCommand(Person person) {
- requireNonNull(person);
- toAdd = person;
+ public AddCommand(Student student) {
+ requireNonNull(student);
+ toAdd = student;
}
@Override
public CommandResult execute(Model model) throws CommandException {
requireNonNull(model);
- if (model.hasPerson(toAdd)) {
- throw new CommandException(MESSAGE_DUPLICATE_PERSON);
+ if (model.hasStudent(toAdd)) {
+ throw new CommandException(MESSAGE_DUPLICATE_STUDENT);
}
- model.addPerson(toAdd);
+ if (model.hasClashingClassTimeWith(toAdd)) {
+ throw new CommandException(Messages.MESSAGE_CLASHING_LESSON);
+ }
+
+ model.addStudent(toAdd);
return new CommandResult(String.format(MESSAGE_SUCCESS, toAdd));
}
diff --git a/src/main/java/seedu/address/logic/commands/AddDetailCommand.java b/src/main/java/seedu/address/logic/commands/AddDetailCommand.java
new file mode 100644
index 00000000000..19c3248770b
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/AddDetailCommand.java
@@ -0,0 +1,89 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TEXT;
+
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.admin.Detail;
+
+public class AddDetailCommand extends DetailCommand {
+
+ public static final String COMMAND_WORD = "add";
+ public static final String MESSAGE_USAGE = DetailCommand.COMMAND_WORD + " " + COMMAND_WORD
+ + ": adds a Detail to the specified student.\n\n"
+ + "Parameters: STUDENT_INDEX (must be a positive integer) "
+ + PREFIX_TEXT + "DETAIL\n\n"
+ + "Example: " + DetailCommand.COMMAND_WORD + " " + COMMAND_WORD + " 2 "
+ + PREFIX_TEXT + "Eats sweets in class";
+
+ public static final String MESSAGE_SUCCESS = "New detail added to %s: %s";
+
+ private static Logger logger = Logger.getLogger("Add Detail Log");
+
+ private final Index index;
+ private final Detail detailToAdd;
+
+ /**
+ * Creates an AddDetailCommand to add the specified {@code Detail} to the student
+ * at the specified {@code Index}.
+ */
+ public AddDetailCommand(Index index, Detail detailToAdd) {
+ requireAllNonNull(index, detailToAdd);
+ this.index = index;
+ this.detailToAdd = detailToAdd;
+ }
+
+ /**
+ * Executes the command and returns the result message.
+ *
+ * @param model {@code Model} which the command should operate on.
+ * @return feedback message of the operation result for display
+ * @throws CommandException If an error occurs during command execution.
+ */
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ assert(index != null && detailToAdd != null);
+ requireNonNull(model);
+ logger.log(Level.INFO, "Beginning command execution");
+
+ List lastShownList = model.getSortedStudentList();
+ if (index.getZeroBased() >= lastShownList.size()) {
+ logger.log(Level.WARNING, "Invalid student index input error");
+ throw new CommandException(Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ Student studentToAddDetail = lastShownList.get(index.getZeroBased());
+
+ List details = studentToAddDetail.getDetails();
+ details.add(detailToAdd);
+
+ Student updatedStudent = super.updateStudentDetail(studentToAddDetail, details);
+
+ model.setStudent(studentToAddDetail, updatedStudent);
+ logger.log(Level.INFO, "Execution complete");
+ return new CommandResult(String.format(MESSAGE_SUCCESS, updatedStudent.getName(), detailToAdd));
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ if (!(obj instanceof AddDetailCommand)) {
+ return false;
+ }
+
+ AddDetailCommand other = (AddDetailCommand) obj;
+ return index.equals(other.index) && detailToAdd.equals(other.detailToAdd);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/AddExamCommand.java b/src/main/java/seedu/address/logic/commands/AddExamCommand.java
new file mode 100644
index 00000000000..3cefa9cf00c
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/AddExamCommand.java
@@ -0,0 +1,93 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_EXAM_DATE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_EXAM_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SCORE;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.academic.exam.Exam;
+
+/**
+ * Adds an exam to a student.
+ */
+public class AddExamCommand extends ExamCommand {
+ public static final String COMMAND_WORD = "add";
+
+ public static final String MESSAGE_USAGE = ExamCommand.COMMAND_WORD + " " + COMMAND_WORD
+ + ": Adds an exam to a student.\n\n"
+ + "Parameters: INDEX (must be a positive integer) "
+ + PREFIX_EXAM_NAME + "EXAM_NAME "
+ + PREFIX_EXAM_DATE + "EXAM_DATE "
+ + PREFIX_SCORE + "SCORE \n\n"
+ + "Example: "
+ + ExamCommand.COMMAND_WORD + " "
+ + COMMAND_WORD + " 1 "
+ + PREFIX_EXAM_NAME
+ + " End of Year Examination 2020 "
+ + PREFIX_EXAM_DATE + "7/11/2020 "
+ + PREFIX_SCORE + "50/100 ";
+
+ public static final String MESSAGE_EXAM_ADDED_SUCCESS = "New exam added to %1$s: %2$s";
+ public static final String MESSAGE_DUPLICATE_EXAM = "%1$s already exists under %2$s";
+
+ private final Index index;
+ private final Exam toAdd;
+
+
+ /**
+ * Creates an AddExamCommand to add the specified {@code Exam} to a specified student based on index.
+ */
+ public AddExamCommand(Index index, Exam exam) {
+ requireAllNonNull(index, exam);
+ this.index = index;
+ toAdd = exam;
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+ List lastShownList = model.getSortedStudentList();
+
+ if (index.getZeroBased() >= lastShownList.size()) {
+ throw new CommandException(Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ Student selectedStudent = lastShownList.get(index.getZeroBased());
+
+ if (selectedStudent.getExams().contains(toAdd)) {
+ throw new CommandException(String.format(MESSAGE_DUPLICATE_EXAM,
+ toAdd.getName(), selectedStudent.getName()));
+ }
+
+ ArrayList exams = new ArrayList<>(selectedStudent.getExams());
+ exams.add(toAdd);
+ Student updatedStudent = new Student(selectedStudent.getName(), selectedStudent.getPhone(),
+ selectedStudent.getSchool(), selectedStudent.getYear(), selectedStudent.getAdmin(),
+ selectedStudent.getQuestions(), exams, selectedStudent.getAttendance());
+ model.setStudent(selectedStudent, updatedStudent);
+ return new CommandResult(String.format(MESSAGE_EXAM_ADDED_SUCCESS, updatedStudent.getName(), toAdd));
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ if (!(obj instanceof AddExamCommand)) {
+ return false;
+ }
+
+ AddExamCommand other = (AddExamCommand) obj;
+ return index.equals(other.index) && toAdd.equals(other.toAdd);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/AddQuestionCommand.java b/src/main/java/seedu/address/logic/commands/AddQuestionCommand.java
new file mode 100644
index 00000000000..08b7fb01ce5
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/AddQuestionCommand.java
@@ -0,0 +1,89 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TEXT;
+
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.academic.question.UnsolvedQuestion;
+
+/**
+ * Adds an unresolved question to a student at the displayed index in Reeve.
+ */
+public class AddQuestionCommand extends QuestionCommand {
+
+ public static final String MESSAGE_SUCCESS = "New question added to student %1$s: %2$s";
+ public static final String MESSAGE_DUPLICATE_QUESTION = "This student has already asked this question";
+ public static final String COMMAND_WORD = "add";
+
+ public static final String MESSAGE_USAGE = QuestionCommand.COMMAND_WORD + " " + COMMAND_WORD
+ + ": Adds a new unresolved question to a student.\n\n"
+ + "Parameters: INDEX (must be a positive integer) "
+ + PREFIX_TEXT + "QUESTION_TEXT\n\n"
+ + "Example: "
+ + QuestionCommand.COMMAND_WORD + " " + COMMAND_WORD
+ + " 1 " + PREFIX_TEXT + "How do birds fly?";
+
+ private static Logger logger = Logger.getLogger("Add Question Log");
+
+ private final Index index;
+ private final UnsolvedQuestion questionToAdd;
+
+ /**
+ * Creates an AddQuestionCommand to add the specified {@code Question} to the student
+ * at the specified {@code Index}.
+ */
+ public AddQuestionCommand(Index index, UnsolvedQuestion questionToAdd) {
+ requireAllNonNull(index, questionToAdd);
+
+ this.index = index;
+ this.questionToAdd = questionToAdd;
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ assert (index != null) && (questionToAdd != null);
+ requireNonNull(model);
+ logger.log(Level.INFO, "Beginning command execution");
+
+ List lastShownList = model.getSortedStudentList();
+ if (index.getZeroBased() >= lastShownList.size()) {
+ logger.log(Level.WARNING, "Handling non-existent student error");
+ throw new CommandException(Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ Student asker = lastShownList.get(index.getZeroBased());
+ if (asker.containsQuestion(questionToAdd)) {
+ logger.log(Level.WARNING, "Handling duplicate question error");
+ throw new CommandException(MESSAGE_DUPLICATE_QUESTION);
+ }
+
+ Student replacement = asker.addQuestion(questionToAdd);
+ model.setStudent(asker, replacement);
+ logger.log(Level.INFO, "Execution complete");
+ return new CommandResult(String.format(MESSAGE_SUCCESS, replacement.getName(), questionToAdd));
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ if (!(obj instanceof AddQuestionCommand)) {
+ return false;
+ }
+
+ AddQuestionCommand other = (AddQuestionCommand) obj;
+ return index.equals(other.index) && questionToAdd.equals(other.questionToAdd);
+ }
+
+}
diff --git a/src/main/java/seedu/address/logic/commands/AttendanceCommand.java b/src/main/java/seedu/address/logic/commands/AttendanceCommand.java
new file mode 100644
index 00000000000..a10771057c2
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/AttendanceCommand.java
@@ -0,0 +1,33 @@
+package seedu.address.logic.commands;
+
+import java.util.List;
+
+import seedu.address.model.student.Student;
+import seedu.address.model.student.academic.Attendance;
+
+public abstract class AttendanceCommand extends Command {
+
+ public static final String COMMAND_WORD = "attendance";
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds or deletes an attendance record "
+ + "from a student in Reeve.\n\n"
+ + "SUPPORTED COMMANDS: add, delete";
+
+ /**
+ * Creates a new Student, with the provided attendance.
+ * @param studentToAddAttendance student to add attendance to.
+ * @param attendanceList new list of additional attendanceList.
+ * @return updated Student.
+ */
+ protected Student updateStudentAttendance(Student studentToAddAttendance, List attendanceList) {
+ Student updatedStudent = new Student(
+ studentToAddAttendance.getName(),
+ studentToAddAttendance.getPhone(),
+ studentToAddAttendance.getSchool(),
+ studentToAddAttendance.getYear(),
+ studentToAddAttendance.getAdmin(),
+ studentToAddAttendance.getQuestions(),
+ studentToAddAttendance.getExams(),
+ attendanceList);
+ return updatedStudent;
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/ClearCommand.java b/src/main/java/seedu/address/logic/commands/ClearCommand.java
index 9c86b1fa6e4..b7c536b2446 100644
--- a/src/main/java/seedu/address/logic/commands/ClearCommand.java
+++ b/src/main/java/seedu/address/logic/commands/ClearCommand.java
@@ -2,8 +2,9 @@
import static java.util.Objects.requireNonNull;
-import seedu.address.model.AddressBook;
import seedu.address.model.Model;
+import seedu.address.model.Reeve;
+
/**
* Clears the address book.
@@ -11,13 +12,13 @@
public class ClearCommand extends Command {
public static final String COMMAND_WORD = "clear";
- public static final String MESSAGE_SUCCESS = "Address book has been cleared!";
+ public static final String MESSAGE_SUCCESS = "Reeve has been cleared!";
@Override
public CommandResult execute(Model model) {
requireNonNull(model);
- model.setAddressBook(new AddressBook());
+ model.setReeve(new Reeve());
return new CommandResult(MESSAGE_SUCCESS);
}
}
diff --git a/src/main/java/seedu/address/logic/commands/CommandResult.java b/src/main/java/seedu/address/logic/commands/CommandResult.java
index 92f900b7916..0315df0e348 100644
--- a/src/main/java/seedu/address/logic/commands/CommandResult.java
+++ b/src/main/java/seedu/address/logic/commands/CommandResult.java
@@ -1,9 +1,12 @@
package seedu.address.logic.commands;
+import static java.util.Objects.isNull;
import static java.util.Objects.requireNonNull;
import java.util.Objects;
+import seedu.address.model.student.Student;
+
/**
* Represents the result of a command execution.
*/
@@ -12,18 +15,45 @@ public class CommandResult {
private final String feedbackToUser;
/** Help information should be shown to the user. */
- private final boolean showHelp;
+ private final boolean shouldShowHelp;
/** The application should exit. */
- private final boolean exit;
+ private final boolean shouldExit;
+
+ /** Schedule should be shown to user. */
+ private final boolean shouldShowSchedule;
+
+ /** The application should toggle between admin and academic student cards. */
+ private final boolean toggleStudentCard;
+
+ /** Exam stats of selected student should be shown to the user. */
+ private final Student selectedStudent;
+
+ /**
+ * Constructs a {@code CommandResult} with the specified fields.
+ */
+ public CommandResult(String feedbackToUser, boolean shouldShowHelp, boolean shouldExit,
+ boolean shouldShowSchedule, boolean toggleStudentCard) {
+ this.feedbackToUser = requireNonNull(feedbackToUser);
+ this.shouldShowHelp = shouldShowHelp;
+ this.shouldExit = shouldExit;
+ this.shouldShowSchedule = shouldShowSchedule;
+ this.toggleStudentCard = toggleStudentCard;
+ this.selectedStudent = null;
+ }
/**
* Constructs a {@code CommandResult} with the specified fields.
*/
- public CommandResult(String feedbackToUser, boolean showHelp, boolean exit) {
+ public CommandResult(String feedbackToUser, boolean shouldShowHelp, boolean shouldExit,
+ boolean toggleStudentCard, Student student) {
+
this.feedbackToUser = requireNonNull(feedbackToUser);
- this.showHelp = showHelp;
- this.exit = exit;
+ this.shouldShowHelp = shouldShowHelp;
+ this.shouldExit = shouldExit;
+ this.toggleStudentCard = toggleStudentCard;
+ this.shouldShowSchedule = false;
+ this.selectedStudent = student;
}
/**
@@ -31,19 +61,43 @@ public CommandResult(String feedbackToUser, boolean showHelp, boolean exit) {
* and other fields set to their default value.
*/
public CommandResult(String feedbackToUser) {
- this(feedbackToUser, false, false);
+ this(feedbackToUser, false, false, false, null);
+ }
+
+ /**
+ * Constructs a {@code CommandResult} with the specified {@code feedbackToUser} and {@code student},
+ * and other fields set to their default value.
+ */
+ public CommandResult(String feedbackToUser, Student student) {
+ this(feedbackToUser, false, false, false, student);
}
public String getFeedbackToUser() {
return feedbackToUser;
}
- public boolean isShowHelp() {
- return showHelp;
+ public Student getSelectedStudent() {
+ return selectedStudent;
+ }
+
+ public boolean isShouldShowHelp() {
+ return shouldShowHelp;
}
- public boolean isExit() {
- return exit;
+ public boolean isShouldExit() {
+ return shouldExit;
+ }
+
+ public boolean isShouldShowSchedule() {
+ return shouldShowSchedule;
+ }
+
+ public boolean isToggleStudentCard() {
+ return toggleStudentCard;
+ }
+
+ public boolean isExamStats() {
+ return !isNull(selectedStudent);
}
@Override
@@ -58,14 +112,23 @@ public boolean equals(Object other) {
}
CommandResult otherCommandResult = (CommandResult) other;
- return feedbackToUser.equals(otherCommandResult.feedbackToUser)
- && showHelp == otherCommandResult.showHelp
- && exit == otherCommandResult.exit;
+ boolean result = feedbackToUser.equals(otherCommandResult.feedbackToUser)
+ && shouldShowHelp == otherCommandResult.shouldShowHelp
+ && shouldExit == otherCommandResult.shouldExit
+ && toggleStudentCard == otherCommandResult.toggleStudentCard;
+ if (selectedStudent != null) {
+ result = result && selectedStudent.equals(otherCommandResult.selectedStudent);
+ }
+ return result;
}
@Override
public int hashCode() {
- return Objects.hash(feedbackToUser, showHelp, exit);
+ return Objects.hash(feedbackToUser, shouldShowHelp, shouldExit, toggleStudentCard, selectedStudent);
}
+ @Override
+ public String toString() {
+ return this.feedbackToUser;
+ }
}
diff --git a/src/main/java/seedu/address/logic/commands/DeleteAttendanceCommand.java b/src/main/java/seedu/address/logic/commands/DeleteAttendanceCommand.java
new file mode 100644
index 00000000000..8d5de321e5e
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/DeleteAttendanceCommand.java
@@ -0,0 +1,113 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ATTENDANCE_DATE;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.stream.Stream;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.academic.Attendance;
+
+public class DeleteAttendanceCommand extends AttendanceCommand {
+
+ public static final String COMMAND_WORD = "delete";
+ public static final String MESSAGE_USAGE = AttendanceCommand.COMMAND_WORD + " " + COMMAND_WORD
+ + ": Deletes the attendance record from the specified student "
+ + "matching the given lesson date. \n\n"
+ + "Parameters: INDEX (must be a positive integer) "
+ + PREFIX_ATTENDANCE_DATE + "LESSON_DATE\n\n"
+ + "Example: " + AttendanceCommand.COMMAND_WORD + " " + COMMAND_WORD + " 2 "
+ + PREFIX_ATTENDANCE_DATE + "14/02/2020";
+
+ public static final String MESSAGE_SUCCESS = "Attendance deleted for %s for the date of %s";
+ public static final String MESSAGE_INVALID_ATTENDANCE_DATE = "There is no existing attendance for the entered date";
+
+ private static Logger logger = Logger.getLogger("Delete Attendance Log");
+
+ private final Index index;
+ private final LocalDate attendanceDate;
+
+ /**
+ * Creates a DeleteAttendanceCommand to delete the specified {@code Attendance} to the student
+ * at the specified {@code Index}.
+ */
+ public DeleteAttendanceCommand(Index index, LocalDate attendanceDate) {
+ requireAllNonNull(index, attendanceDate);
+ this.index = index;
+ this.attendanceDate = attendanceDate;
+ }
+
+ /**
+ * Executes the command and returns the result message.
+ *
+ * @param model {@code Model} which the command should operate on.
+ * @return feedback message of the operation result for display
+ * @throws CommandException If an error occurs during command execution.
+ */
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+ logger.log(Level.INFO, "Beginning command execution");
+
+ List lastShownList = model.getSortedStudentList();
+ if (index.getZeroBased() >= lastShownList.size()) {
+ logger.log(Level.WARNING, "Invalid student index input error");
+ throw new CommandException(Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+ Student studentToDeleteAttendance = lastShownList.get(index.getZeroBased());
+
+ List updatedAttendance = updateAttendanceList(studentToDeleteAttendance.getAttendance());
+ Student updatedStudent = updateStudentAttendance(studentToDeleteAttendance, updatedAttendance);
+
+ model.setStudent(studentToDeleteAttendance, updatedStudent);
+ logger.log(Level.INFO, "Execution complete");
+
+ return new CommandResult(String.format(MESSAGE_SUCCESS, updatedStudent.getName(), getUserInputDateString()));
+ }
+
+ private List updateAttendanceList(List attendanceList) throws CommandException {
+ boolean containsAttendanceAtDate = attendanceList.stream()
+ .anyMatch(attendance -> attendance.getLessonDate().equals(attendanceDate));
+
+ if (!containsAttendanceAtDate) {
+ logger.log(Level.WARNING, "Invalid attendance date error");
+ throw new CommandException(MESSAGE_INVALID_ATTENDANCE_DATE);
+ }
+
+ Stream matchingAttendance = attendanceList.stream()
+ .filter(attendance -> attendance.getLessonDate().equals(attendanceDate));
+ Attendance attendanceToDelete = matchingAttendance.findFirst().get();
+ attendanceList.remove(attendanceToDelete);
+
+ return attendanceList;
+ }
+
+ private String getUserInputDateString() {
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("d/M/yyyy");
+ return attendanceDate.format(formatter);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ if (!(obj instanceof DeleteAttendanceCommand)) {
+ return false;
+ }
+
+ DeleteAttendanceCommand other = (DeleteAttendanceCommand) obj;
+ return index.equals(other.index) && attendanceDate.equals(other.attendanceDate);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/DeleteCommand.java b/src/main/java/seedu/address/logic/commands/DeleteCommand.java
index 02fd256acba..20c6a3519c7 100644
--- a/src/main/java/seedu/address/logic/commands/DeleteCommand.java
+++ b/src/main/java/seedu/address/logic/commands/DeleteCommand.java
@@ -8,21 +8,21 @@
import seedu.address.commons.core.index.Index;
import seedu.address.logic.commands.exceptions.CommandException;
import seedu.address.model.Model;
-import seedu.address.model.person.Person;
+import seedu.address.model.student.Student;
/**
- * Deletes a person identified using it's displayed index from the address book.
+ * Deletes a student identified using it's displayed index from Reeve.
*/
public class DeleteCommand extends Command {
public static final String COMMAND_WORD = "delete";
public static final String MESSAGE_USAGE = COMMAND_WORD
- + ": Deletes the person identified by the index number used in the displayed person list.\n"
+ + ": Deletes the student identified by the index number used in the displayed student list.\n"
+ "Parameters: INDEX (must be a positive integer)\n"
+ "Example: " + COMMAND_WORD + " 1";
- public static final String MESSAGE_DELETE_PERSON_SUCCESS = "Deleted Person: %1$s";
+ public static final String MESSAGE_DELETE_STUDENT_SUCCESS = "Deleted Student: %1$s";
private final Index targetIndex;
@@ -33,15 +33,15 @@ public DeleteCommand(Index targetIndex) {
@Override
public CommandResult execute(Model model) throws CommandException {
requireNonNull(model);
- List lastShownList = model.getFilteredPersonList();
+ List lastShownList = model.getSortedStudentList();
if (targetIndex.getZeroBased() >= lastShownList.size()) {
- throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+ throw new CommandException(Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
}
- Person personToDelete = lastShownList.get(targetIndex.getZeroBased());
- model.deletePerson(personToDelete);
- return new CommandResult(String.format(MESSAGE_DELETE_PERSON_SUCCESS, personToDelete));
+ Student studentToDelete = lastShownList.get(targetIndex.getZeroBased());
+ model.deleteStudent(studentToDelete);
+ return new CommandResult(String.format(MESSAGE_DELETE_STUDENT_SUCCESS, studentToDelete));
}
@Override
diff --git a/src/main/java/seedu/address/logic/commands/DeleteDetailCommand.java b/src/main/java/seedu/address/logic/commands/DeleteDetailCommand.java
new file mode 100644
index 00000000000..da87fe66a93
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/DeleteDetailCommand.java
@@ -0,0 +1,96 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_INDEX;
+
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.admin.Detail;
+
+public class DeleteDetailCommand extends DetailCommand {
+
+ public static final String COMMAND_WORD = "delete";
+ public static final String MESSAGE_USAGE = DetailCommand.COMMAND_WORD + " " + COMMAND_WORD
+ + ": deletes a Detail in the specified student\n\n"
+ + "Parameters: STUDENT_INDEX (must be a positive integer) "
+ + PREFIX_INDEX + "DETAIL_INDEX (must be a positive integer)\n\n"
+ + "Example: " + DetailCommand.COMMAND_WORD + " " + COMMAND_WORD + " 2 "
+ + PREFIX_INDEX + "1";
+
+ public static final String MESSAGE_SUCCESS = "Detail removed from %s: %s";
+ public static final String MESSAGE_BAD_DETAIL_INDEX = "There is no detail at this index";
+
+ private static Logger logger = Logger.getLogger("Delete Detail Log");
+
+ private final Index studentIndex;
+ private final Index detailIndex;
+
+ /**
+ * Constructs a DeleteQuestionCommand to remove a specified {@code Question} from a {@code Student}.
+ * @param studentIndex
+ * @param detailIndex
+ */
+ public DeleteDetailCommand(Index studentIndex, Index detailIndex) {
+ requireAllNonNull(studentIndex, detailIndex);
+ this.studentIndex = studentIndex;
+ this.detailIndex = detailIndex;
+ }
+
+ /**
+ * Executes the command and returns the result message.
+ *
+ * @param model {@code Model} which the command should operate on.
+ * @return feedback message of the operation result for display
+ * @throws CommandException If an error occurs during command execution.
+ */
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ assert(studentIndex != null && detailIndex != null);
+ requireNonNull(model);
+ logger.log(Level.INFO, "Beginning command execution");
+
+ List lastShownList = model.getSortedStudentList();
+ if (studentIndex.getZeroBased() >= lastShownList.size()) {
+ logger.log(Level.WARNING, "Invalid student index input error");
+ throw new CommandException(Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ Student studentToDeleteDetail = lastShownList.get(studentIndex.getZeroBased());
+ if (detailIndex.getZeroBased() >= studentToDeleteDetail.getDetails().size()) {
+ logger.log(Level.WARNING, "Invalid detail index input error");
+ throw new CommandException(MESSAGE_BAD_DETAIL_INDEX);
+ }
+
+ List details = studentToDeleteDetail.getDetails();
+ Detail removedDetail = details.remove(detailIndex.getZeroBased());
+
+ Student updatedStudent = super.updateStudentDetail(studentToDeleteDetail, details);
+
+ model.setStudent(studentToDeleteDetail, updatedStudent);
+
+ logger.log(Level.INFO, "Execution complete");
+ return new CommandResult(String.format(MESSAGE_SUCCESS, updatedStudent.getName(), removedDetail));
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ if (!(obj instanceof DeleteDetailCommand)) {
+ return false;
+ }
+
+ DeleteDetailCommand other = (DeleteDetailCommand) obj;
+ return studentIndex.equals(other.studentIndex) && detailIndex.equals(other.detailIndex);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/DeleteExamCommand.java b/src/main/java/seedu/address/logic/commands/DeleteExamCommand.java
new file mode 100644
index 00000000000..fe2bf7d1b4a
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/DeleteExamCommand.java
@@ -0,0 +1,87 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_EXAM_INDEX;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.academic.exam.Exam;
+
+/**
+ * Deletes an exam from a student.
+ */
+public class DeleteExamCommand extends ExamCommand {
+
+ public static final String COMMAND_WORD = "delete";
+
+ public static final String MESSAGE_USAGE = ExamCommand.COMMAND_WORD + " " + COMMAND_WORD
+ + ": Deletes an exam from a student.\n\n"
+ + "Parameters: INDEX (must be a positive integer) "
+ + PREFIX_EXAM_INDEX
+ + "EXAM_INDEX (must be a positive integer) \n\n"
+ + "Example: "
+ + ExamCommand.COMMAND_WORD
+ + " " + COMMAND_WORD + " 2 "
+ + PREFIX_EXAM_INDEX
+ + "1";
+
+ public static final String MESSAGE_EXAM_DELETED_SUCCESS = "Exam deleted from %1$s: %2$s";
+ public static final String MESSAGE_MISSING_EXAM_INDEX = "There is no exam at this index";
+
+ private final Index studentIndex;
+ private final Index examIndex;
+
+ /**
+ * Creates an AddExamCommand to delete the specified {@code Exam} of a specified student based on index.
+ */
+ public DeleteExamCommand(Index studentIndex, Index examIndex) {
+ requireAllNonNull(studentIndex, examIndex);
+ this.studentIndex = studentIndex;
+ this.examIndex = examIndex;
+ }
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ assert(studentIndex != null && examIndex != null);
+ requireNonNull(model);
+
+ List lastShownList = model.getSortedStudentList();
+ if (studentIndex.getZeroBased() >= lastShownList.size()) {
+ throw new CommandException(Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ Student studentToDeleteExam = lastShownList.get(studentIndex.getZeroBased());
+
+ if (examIndex.getZeroBased() >= studentToDeleteExam.getExams().size()) {
+ throw new CommandException(MESSAGE_MISSING_EXAM_INDEX);
+ }
+
+ ArrayList exams = new ArrayList<>(studentToDeleteExam.getExams());
+ Exam removedExam = exams.remove(examIndex.getZeroBased());
+
+ Student updatedStudent = super.updateStudentExam(studentToDeleteExam, exams);
+
+ model.setStudent(studentToDeleteExam, updatedStudent);
+ return new CommandResult(String.format(MESSAGE_EXAM_DELETED_SUCCESS, updatedStudent.getName(), removedExam));
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ if (!(obj instanceof DeleteExamCommand)) {
+ return false;
+ }
+
+ DeleteExamCommand other = (DeleteExamCommand) obj;
+ return studentIndex.equals(other.studentIndex) && examIndex.equals(other.examIndex);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/DeleteQuestionCommand.java b/src/main/java/seedu/address/logic/commands/DeleteQuestionCommand.java
new file mode 100644
index 00000000000..1b77ce2b0f1
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/DeleteQuestionCommand.java
@@ -0,0 +1,89 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_INDEX;
+
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.academic.question.Question;
+
+/**
+ * Deletes a specified question of a student at the displayed index in Reeve.
+ */
+public class DeleteQuestionCommand extends QuestionCommand {
+
+ public static final String MESSAGE_SUCCESS = "Question removed from %1$s: %2$s";
+ public static final String MESSAGE_BAD_QUESTION_INDEX = "There is no question at this index";
+ public static final String COMMAND_WORD = "delete";
+
+ public static final String MESSAGE_USAGE = QuestionCommand.COMMAND_WORD + " " + COMMAND_WORD
+ + ": Deletes a question from a student.\n\n"
+ + "Parameters: INDEX (must be a positive integer) "
+ + PREFIX_INDEX + "QUESTION_INDEX\n\n"
+ + "Example: "
+ + QuestionCommand.COMMAND_WORD + " " + COMMAND_WORD + " 1 " + PREFIX_INDEX + "1";
+
+ private static Logger logger = Logger.getLogger("Delete Question Log");
+
+ private final Index studentIndex;
+ private final Index questionIndex;
+
+ /**
+ * Constructs a DeleteQuestionCommand to remove a specified {@code Question} from a {@code Student}.
+ */
+ public DeleteQuestionCommand(Index studentIndex, Index questionIndex) {
+ requireAllNonNull(studentIndex, questionIndex);
+ this.studentIndex = studentIndex;
+ this.questionIndex = questionIndex;
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ assert (studentIndex != null) && (questionIndex != null);
+ requireNonNull(model);
+ logger.log(Level.INFO, "Beginning command execution");
+
+ List lastShownList = model.getSortedStudentList();
+ if (studentIndex.getZeroBased() >= lastShownList.size()) {
+ logger.log(Level.WARNING, "Handling non-existent student error");
+ throw new CommandException(Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ Student asker = lastShownList.get(studentIndex.getZeroBased());
+ if (questionIndex.getZeroBased() >= asker.getQuestions().size()) {
+ logger.log(Level.WARNING, "Handling non-existent question error");
+ throw new CommandException(MESSAGE_BAD_QUESTION_INDEX);
+ }
+
+ Question deleted = asker.getQuestions().get(questionIndex.getZeroBased());
+ Student replacement = asker.deleteQuestion(deleted);
+
+ model.setStudent(asker, replacement);
+ logger.log(Level.INFO, "Execution complete");
+ return new CommandResult(String.format(MESSAGE_SUCCESS, replacement.getName(), deleted));
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ if (!(obj instanceof DeleteQuestionCommand)) {
+ return false;
+ }
+
+ DeleteQuestionCommand other = (DeleteQuestionCommand) obj;
+ return studentIndex.equals(other.studentIndex)
+ && questionIndex.equals(other.questionIndex);
+ }
+
+}
diff --git a/src/main/java/seedu/address/logic/commands/DetailCommand.java b/src/main/java/seedu/address/logic/commands/DetailCommand.java
new file mode 100644
index 00000000000..18bc2a5d541
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/DetailCommand.java
@@ -0,0 +1,37 @@
+package seedu.address.logic.commands;
+
+import java.util.List;
+
+import seedu.address.model.student.Student;
+import seedu.address.model.student.admin.Detail;
+
+public abstract class DetailCommand extends Command {
+
+ public static final String COMMAND_WORD = "detail";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds, edits or deletes a Detail "
+ + "from a student in Reeve.\n\n"
+ + "SUPPORTED COMMANDS: add, edit, delete";
+
+ /**
+ * Creates a new Student, with the provided detail.
+ * @param studentToAddDetail student to add detail to.
+ * @param details new list of details.
+ * @return updated Student.
+ */
+ protected Student updateStudentDetail(Student studentToAddDetail, List details) {
+ Student updatedStudent = new Student(
+ studentToAddDetail.getName(),
+ studentToAddDetail.getPhone(),
+ studentToAddDetail.getSchool(),
+ studentToAddDetail.getYear(),
+ studentToAddDetail.getClassVenue(),
+ studentToAddDetail.getClassTime(),
+ studentToAddDetail.getFee(),
+ studentToAddDetail.getPaymentDate(),
+ details,
+ studentToAddDetail.getAcademic());
+
+ return updatedStudent;
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/EditCommand.java b/src/main/java/seedu/address/logic/commands/EditCommand.java
index 7e36114902f..b262675d269 100644
--- a/src/main/java/seedu/address/logic/commands/EditCommand.java
+++ b/src/main/java/seedu/address/logic/commands/EditCommand.java
@@ -1,105 +1,169 @@
package seedu.address.logic.commands;
import static java.util.Objects.requireNonNull;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_FEE;
import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_PAYMENT;
import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
-import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SCHOOL;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TIME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_VENUE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_YEAR;
-import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
import java.util.Optional;
-import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import seedu.address.commons.core.Messages;
import seedu.address.commons.core.index.Index;
import seedu.address.commons.util.CollectionUtil;
import seedu.address.logic.commands.exceptions.CommandException;
import seedu.address.model.Model;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
+import seedu.address.model.student.Name;
+import seedu.address.model.student.Phone;
+import seedu.address.model.student.School;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.Year;
+import seedu.address.model.student.academic.Academic;
+import seedu.address.model.student.admin.ClassTime;
+import seedu.address.model.student.admin.ClassVenue;
+import seedu.address.model.student.admin.Fee;
+import seedu.address.model.student.admin.PaymentDate;
/**
- * Edits the details of an existing person in the address book.
+ * Edits the details of an existing student in Reeve.
*/
public class EditCommand extends Command {
public static final String COMMAND_WORD = "edit";
- public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the details of the person identified "
- + "by the index number used in the displayed person list. "
- + "Existing values will be overwritten by the input values.\n"
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the details of the student identified "
+ + "by the index number used in the displayed student list. "
+ + "Existing values will be overwritten by the input values.\n\n"
+ "Parameters: INDEX (must be a positive integer) "
+ "[" + PREFIX_NAME + "NAME] "
+ "[" + PREFIX_PHONE + "PHONE] "
- + "[" + PREFIX_EMAIL + "EMAIL] "
- + "[" + PREFIX_ADDRESS + "ADDRESS] "
- + "[" + PREFIX_TAG + "TAG]...\n"
+ + "[" + PREFIX_SCHOOL + "SCHOOL] "
+ + "[" + PREFIX_YEAR + "YEAR] "
+ + "[" + PREFIX_VENUE + "CLASS_VENUE] "
+ + "[" + PREFIX_TIME + "CLASS_TIME] "
+ + "[" + PREFIX_FEE + "FEE] "
+ + "[" + PREFIX_PAYMENT + "PAYMENT_DATE]\n\n"
+ "Example: " + COMMAND_WORD + " 1 "
+ PREFIX_PHONE + "91234567 "
- + PREFIX_EMAIL + "johndoe@example.com";
+ + PREFIX_VENUE + "Anderson Junior College "
+ + PREFIX_TIME + "2 1300-1400";
- public static final String MESSAGE_EDIT_PERSON_SUCCESS = "Edited Person: %1$s";
+ public static final String MESSAGE_EDIT_PERSON_SUCCESS = "Edited Student:\n%1$s";
public static final String MESSAGE_NOT_EDITED = "At least one field to edit must be provided.";
- public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the address book.";
+ public static final String MESSAGE_DUPLICATE_PERSON = "This student already exists in Reeve.";
+
+ private static Logger logger = Logger.getLogger("Edit Student Log");
private final Index index;
- private final EditPersonDescriptor editPersonDescriptor;
+ private final EditStudentDescriptor editStudentDescriptor;
+ private final EditAdminDescriptor editAdminDescriptor;
/**
- * @param index of the person in the filtered person list to edit
- * @param editPersonDescriptor details to edit the person with
+ * @param index of the student in the sorted student list to edit
+ * @param editStudentDescriptor details to edit the student with
+ * @param editAdminDescriptor admin details to edit the student with
*/
- public EditCommand(Index index, EditPersonDescriptor editPersonDescriptor) {
+ public EditCommand(Index index, EditStudentDescriptor editStudentDescriptor,
+ EditAdminDescriptor editAdminDescriptor) {
requireNonNull(index);
- requireNonNull(editPersonDescriptor);
+ requireNonNull(editStudentDescriptor);
this.index = index;
- this.editPersonDescriptor = new EditPersonDescriptor(editPersonDescriptor);
+ this.editStudentDescriptor = new EditStudentDescriptor(editStudentDescriptor);
+ this.editAdminDescriptor = new EditAdminDescriptor(editAdminDescriptor);
}
@Override
public CommandResult execute(Model model) throws CommandException {
requireNonNull(model);
- List lastShownList = model.getFilteredPersonList();
+ logger.log(Level.INFO, "Beginning command execution");
+ List lastShownList = model.getSortedStudentList();
if (index.getZeroBased() >= lastShownList.size()) {
- throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+ logger.log(Level.WARNING, "Invalid student index input error");
+ throw new CommandException(Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
}
- Person personToEdit = lastShownList.get(index.getZeroBased());
- Person editedPerson = createEditedPerson(personToEdit, editPersonDescriptor);
+ Student studentToEdit = lastShownList.get(index.getZeroBased());
+ Student editedStudent = createEditedStudent(studentToEdit, editStudentDescriptor, editAdminDescriptor);
+
+ checkForDuplicateStudent(model, studentToEdit, editedStudent);
+ checkForClashingClassTime(model, studentToEdit, editedStudent);
+
+ model.setStudent(studentToEdit, editedStudent);
+ logger.log(Level.INFO, "Execution complete");
+
+ return new CommandResult(String.format(MESSAGE_EDIT_PERSON_SUCCESS, editedStudent));
+ }
+
+ private void checkForDuplicateStudent(Model model, Student studentToEdit, Student editedStudent)
+ throws CommandException {
+ boolean isChangesMadeToStudent = !studentToEdit.isSameStudent(editedStudent);
+ boolean isEditedStudentDuplicate = model.hasStudent(editedStudent);
+ boolean isDuplicateStudentAdded = isChangesMadeToStudent && isEditedStudentDuplicate;
- if (!personToEdit.isSamePerson(editedPerson) && model.hasPerson(editedPerson)) {
+ if (isDuplicateStudentAdded) {
+ logger.log(Level.WARNING, "Duplicate student input error");
throw new CommandException(MESSAGE_DUPLICATE_PERSON);
}
+ }
+
+ private void checkForClashingClassTime(Model model, Student studentToEdit, Student editedStudent)
+ throws CommandException {
+ ClassTime studentToEditClassTime = studentToEdit.getAdmin().getClassTime();
+ ClassTime editedStudentClassTime = editedStudent.getAdmin().getClassTime();
- model.setPerson(personToEdit, editedPerson);
- model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
- return new CommandResult(String.format(MESSAGE_EDIT_PERSON_SUCCESS, editedPerson));
+ boolean isClassTimeChanged = !(editedStudentClassTime.equals(studentToEditClassTime));
+ boolean isStudentTimeClashWithOthers = model.hasClashingClassTimeWith(editedStudent);
+ boolean isNewClassTimeClashing = isClassTimeChanged && isStudentTimeClashWithOthers;
+
+ if (isNewClassTimeClashing) {
+ logger.log(Level.WARNING, "Clashing class time input error");
+ throw new CommandException(Messages.MESSAGE_CLASHING_LESSON);
+ }
}
/**
- * Creates and returns a {@code Person} with the details of {@code personToEdit}
- * edited with {@code editPersonDescriptor}.
+ * Creates and returns a {@code Student} with the details of {@code studenttoEdit}
+ * edited with {@code editStudentDescriptor} and {@code editAdminDescriptor}.
*/
- private static Person createEditedPerson(Person personToEdit, EditPersonDescriptor editPersonDescriptor) {
- assert personToEdit != null;
-
- Name updatedName = editPersonDescriptor.getName().orElse(personToEdit.getName());
- Phone updatedPhone = editPersonDescriptor.getPhone().orElse(personToEdit.getPhone());
- Email updatedEmail = editPersonDescriptor.getEmail().orElse(personToEdit.getEmail());
- Address updatedAddress = editPersonDescriptor.getAddress().orElse(personToEdit.getAddress());
- Set updatedTags = editPersonDescriptor.getTags().orElse(personToEdit.getTags());
-
- return new Person(updatedName, updatedPhone, updatedEmail, updatedAddress, updatedTags);
+ private static Student createEditedStudent(Student studentToEdit, EditStudentDescriptor editStudentDescriptor,
+ EditAdminDescriptor editAdminDescriptor) {
+ assert studentToEdit != null;
+
+ Name updatedName = editStudentDescriptor.getName().orElse(studentToEdit.getName());
+ Phone updatedPhone = editStudentDescriptor.getPhone().orElse(studentToEdit.getPhone());
+ School updatedSchool = editStudentDescriptor.getSchool().orElse(studentToEdit.getSchool());
+ Year updatedYear = editStudentDescriptor.getYear().orElse(studentToEdit.getYear());
+
+ // Academic should not be edited through this command
+ Academic academic = studentToEdit.getAcademic();
+
+ if (editAdminDescriptor.isAnyFieldEdited()) {
+ ClassTime updatedClassTime = editAdminDescriptor.getClassTime()
+ .orElse(studentToEdit.getClassTime());
+ ClassVenue updatedClassVenue = editAdminDescriptor.getClassVenue()
+ .orElse(studentToEdit.getClassVenue());
+ Fee updatedFee = editAdminDescriptor.getFee()
+ .orElse(studentToEdit.getFee());
+ PaymentDate updatedPaymentDate = editAdminDescriptor.getPaymentDate()
+ .orElse(studentToEdit.getPaymentDate());
+
+ // Details cannot be edited through this channel
+ return new Student(updatedName, updatedPhone, updatedSchool, updatedYear,
+ updatedClassVenue, updatedClassTime, updatedFee, updatedPaymentDate, studentToEdit.getDetails(),
+ academic);
+ } else {
+ return new Student(updatedName, updatedPhone, updatedSchool, updatedYear, studentToEdit.getAdmin(),
+ academic);
+ }
}
@Override
@@ -117,39 +181,38 @@ public boolean equals(Object other) {
// state check
EditCommand e = (EditCommand) other;
return index.equals(e.index)
- && editPersonDescriptor.equals(e.editPersonDescriptor);
+ && editStudentDescriptor.equals(e.editStudentDescriptor)
+ && editAdminDescriptor.equals(e.editAdminDescriptor);
}
/**
- * Stores the details to edit the person with. Each non-empty field value will replace the
- * corresponding field value of the person.
+ * Stores the details to edit the student with. Each non-empty field value will replace the
+ * corresponding field value of the student.
*/
- public static class EditPersonDescriptor {
+ public static class EditStudentDescriptor {
+
private Name name;
private Phone phone;
- private Email email;
- private Address address;
- private Set tags;
+ private School school;
+ private Year year;
- public EditPersonDescriptor() {}
+ public EditStudentDescriptor() {}
/**
* Copy constructor.
- * A defensive copy of {@code tags} is used internally.
*/
- public EditPersonDescriptor(EditPersonDescriptor toCopy) {
+ public EditStudentDescriptor(EditStudentDescriptor toCopy) {
setName(toCopy.name);
setPhone(toCopy.phone);
- setEmail(toCopy.email);
- setAddress(toCopy.address);
- setTags(toCopy.tags);
+ setSchool(toCopy.school);
+ setYear(toCopy.year);
}
/**
* Returns true if at least one field is edited.
*/
public boolean isAnyFieldEdited() {
- return CollectionUtil.isAnyNonNull(name, phone, email, address, tags);
+ return CollectionUtil.isAnyNonNull(name, phone, school, year);
}
public void setName(Name name) {
@@ -168,37 +231,100 @@ public Optional getPhone() {
return Optional.ofNullable(phone);
}
- public void setEmail(Email email) {
- this.email = email;
+ public void setSchool(School school) {
+ this.school = school;
}
- public Optional getEmail() {
- return Optional.ofNullable(email);
+ public Optional getSchool() {
+ return Optional.ofNullable(school);
}
- public void setAddress(Address address) {
- this.address = address;
+ public void setYear(Year year) {
+ this.year = year;
}
- public Optional getAddress() {
- return Optional.ofNullable(address);
+ public Optional getYear() {
+ return Optional.ofNullable(year);
}
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof EditStudentDescriptor)) {
+ return false;
+ }
+
+ // state check
+ EditStudentDescriptor e = (EditStudentDescriptor) other;
+
+ return getName().equals(e.getName())
+ && getPhone().equals(e.getPhone())
+ && getSchool().equals(e.getSchool())
+ && getYear().equals(e.getYear());
+ }
+ }
+
+ public static class EditAdminDescriptor {
+
+ private ClassTime time;
+ private ClassVenue venue;
+ private Fee fee;
+ private PaymentDate paymentDate;
+
+ public EditAdminDescriptor() {}
+
/**
- * Sets {@code tags} to this object's {@code tags}.
- * A defensive copy of {@code tags} is used internally.
+ * Copy constructor.
*/
- public void setTags(Set tags) {
- this.tags = (tags != null) ? new HashSet<>(tags) : null;
+ public EditAdminDescriptor(EditAdminDescriptor toCopy) {
+ setTime(toCopy.time);
+ setVenue(toCopy.venue);
+ setFee(toCopy.fee);
+ setPaymentDate(toCopy.paymentDate);
}
/**
- * Returns an unmodifiable tag set, which throws {@code UnsupportedOperationException}
- * if modification is attempted.
- * Returns {@code Optional#empty()} if {@code tags} is null.
+ * Returns true if at least one field is edited.
*/
- public Optional> getTags() {
- return (tags != null) ? Optional.of(Collections.unmodifiableSet(tags)) : Optional.empty();
+ public boolean isAnyFieldEdited() {
+ return CollectionUtil.isAnyNonNull(time, venue, fee, paymentDate);
+ }
+
+ public void setTime(ClassTime time) {
+ this.time = time;
+ }
+
+ public Optional getClassTime() {
+ return Optional.ofNullable(time);
+ }
+
+ public void setVenue(ClassVenue venue) {
+ this.venue = venue;
+ }
+
+ public Optional getClassVenue() {
+ return Optional.ofNullable(venue);
+ }
+
+ public void setFee(Fee fee) {
+ this.fee = fee;
+ }
+
+ public Optional getFee() {
+ return Optional.ofNullable(fee);
+ }
+
+ public void setPaymentDate(PaymentDate paymentDate) {
+ this.paymentDate = paymentDate;
+ }
+
+ public Optional getPaymentDate() {
+ return Optional.ofNullable(paymentDate);
}
@Override
@@ -209,18 +335,18 @@ public boolean equals(Object other) {
}
// instanceof handles nulls
- if (!(other instanceof EditPersonDescriptor)) {
+ if (!(other instanceof EditAdminDescriptor)) {
return false;
}
// state check
- EditPersonDescriptor e = (EditPersonDescriptor) other;
+ EditAdminDescriptor e = (EditAdminDescriptor) other;
- return getName().equals(e.getName())
- && getPhone().equals(e.getPhone())
- && getEmail().equals(e.getEmail())
- && getAddress().equals(e.getAddress())
- && getTags().equals(e.getTags());
+ return getClassVenue().equals(e.getClassVenue())
+ && getClassTime().equals(e.getClassTime())
+ && getFee().equals(e.getFee())
+ && getPaymentDate().equals(e.getPaymentDate());
}
}
+
}
diff --git a/src/main/java/seedu/address/logic/commands/EditDetailCommand.java b/src/main/java/seedu/address/logic/commands/EditDetailCommand.java
new file mode 100644
index 00000000000..7666c18a0b6
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/EditDetailCommand.java
@@ -0,0 +1,104 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_INDEX;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TEXT;
+
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.admin.Detail;
+
+public class EditDetailCommand extends DetailCommand {
+
+ public static final String COMMAND_WORD = "edit";
+ public static final String MESSAGE_USAGE = DetailCommand.COMMAND_WORD + " " + COMMAND_WORD
+ + ": edits a Detail in the specified student.\n\n"
+ + "Parameters: STUDENT_INDEX (must be a positive integer) "
+ + PREFIX_INDEX + "DETAIL_INDEX (must be a positive integer) "
+ + PREFIX_TEXT + "DETAIL\n\n"
+ + "Example: " + DetailCommand.COMMAND_WORD + " " + COMMAND_WORD + " 2 "
+ + PREFIX_INDEX + "1 "
+ + PREFIX_TEXT + "Eats sweets in class";
+
+ public static final String MESSAGE_SUCCESS = "Detail edited for %s: %s";
+ public static final String MESSAGE_BAD_DETAIL_INDEX = "There is no detail at this index, for this student.";
+
+ private static Logger logger = Logger.getLogger("Edit Detail Log");
+
+ private final Index studentIndex;
+ private final Index detailIndex;
+ private final Detail detailToAdd;
+
+ /**
+ * Constructs a DeleteQuestionCommand to remove a specified {@code Question} from a {@code Student}.
+ * @param studentIndex
+ * @param detailIndex
+ * @param detailToAdd
+ */
+ public EditDetailCommand(Index studentIndex, Index detailIndex, Detail detailToAdd) {
+ requireAllNonNull(studentIndex, detailIndex, detailToAdd);
+ this.studentIndex = studentIndex;
+ this.detailIndex = detailIndex;
+ this.detailToAdd = detailToAdd;
+ }
+
+ /**
+ * Executes the command and returns the result message.
+ *
+ * @param model {@code Model} which the command should operate on.
+ * @return feedback message of the operation result for display
+ * @throws CommandException If an error occurs during command execution.
+ */
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ assert(studentIndex != null && detailIndex != null && detailToAdd != null);
+ requireNonNull(model);
+ logger.log(Level.INFO, "Beginning command execution");
+
+ List lastShownList = model.getSortedStudentList();
+ if (studentIndex.getZeroBased() >= lastShownList.size()) {
+ logger.log(Level.WARNING, "Invalid student index input error");
+ throw new CommandException(Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ Student studentToEditDetail = lastShownList.get(studentIndex.getZeroBased());
+
+ if (detailIndex.getZeroBased() >= studentToEditDetail.getDetails().size()) {
+ logger.log(Level.WARNING, "Invalid detail index input error");
+ throw new CommandException(MESSAGE_BAD_DETAIL_INDEX);
+ }
+
+ List details = studentToEditDetail.getDetails();
+ details.set(detailIndex.getZeroBased(), detailToAdd);
+
+ Student updatedStudent = super.updateStudentDetail(studentToEditDetail, details);
+
+ model.setStudent(studentToEditDetail, updatedStudent);
+
+ logger.log(Level.INFO, "Execution complete");
+ return new CommandResult(String.format(MESSAGE_SUCCESS, updatedStudent.getName(), detailToAdd));
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ if (!(obj instanceof EditDetailCommand)) {
+ return false;
+ }
+
+ EditDetailCommand other = (EditDetailCommand) obj;
+ return studentIndex.equals(other.studentIndex) && detailIndex.equals(other.detailIndex)
+ && detailToAdd.equals(other.detailToAdd);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/ExamCommand.java b/src/main/java/seedu/address/logic/commands/ExamCommand.java
new file mode 100644
index 00000000000..6ed2232477f
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/ExamCommand.java
@@ -0,0 +1,30 @@
+package seedu.address.logic.commands;
+
+import java.util.ArrayList;
+
+import seedu.address.model.student.Student;
+import seedu.address.model.student.academic.exam.Exam;
+
+/**
+ * Abstract class of exam commands such as AddExam and DeleteExam.
+ */
+public abstract class ExamCommand extends Command {
+ public static final String COMMAND_WORD = "exam";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds, deletes an exam "
+ + "or view exam statistics of student "
+ + "to/from a student in Reeve.\n\n"
+ + "SUPPORTED COMMANDS: add, delete, stats";
+
+ /**
+ * Updates a specific students exam list when an exam is being added or deleted.
+ * @param studentToUpdate selected student to be be updated.
+ * @param exams the updated array list of exams.
+ * @return selected student with the updated exams.
+ */
+ public Student updateStudentExam(Student studentToUpdate, ArrayList exams) {
+ return new Student(studentToUpdate.getName(), studentToUpdate.getPhone(),
+ studentToUpdate.getSchool(), studentToUpdate.getYear(), studentToUpdate.getAdmin(),
+ studentToUpdate.getQuestions(), exams, studentToUpdate.getAttendance());
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/ExamStatsCommand.java b/src/main/java/seedu/address/logic/commands/ExamStatsCommand.java
new file mode 100644
index 00000000000..5bd554edfc3
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/ExamStatsCommand.java
@@ -0,0 +1,61 @@
+package seedu.address.logic.commands;
+
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.util.List;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.student.Student;
+
+public class ExamStatsCommand extends ExamCommand {
+
+ public static final String COMMAND_WORD = "stats";
+
+ public static final String MESSAGE_USAGE = ExamCommand.COMMAND_WORD + " " + COMMAND_WORD
+ + ": Shows exam stats of specified student.\n\n"
+ + "Parameters: INDEX (must be a positive integer) \n\n"
+ + "Example: "
+ + ExamCommand.COMMAND_WORD
+ + " " + COMMAND_WORD + " 2 ";
+
+ public static final String MESSAGE_EXAM_STATS_SUCCESS = "Opened exam statistics";
+
+ private final Index studentIndex;
+
+
+ /**
+ * Creates an AddExamCommand to delete the specified {@code Exam} of a specified student based on index.
+ */
+ public ExamStatsCommand(Index studentIndex) {
+ requireAllNonNull(studentIndex);
+ this.studentIndex = studentIndex;
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ List lastShownList = model.getSortedStudentList();
+ if (studentIndex.getZeroBased() >= lastShownList.size()) {
+ throw new CommandException(Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ Student studentToShow = lastShownList.get(studentIndex.getZeroBased());
+ return new CommandResult(MESSAGE_EXAM_STATS_SUCCESS, studentToShow);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ if (!(obj instanceof ExamStatsCommand)) {
+ return false;
+ }
+
+ ExamStatsCommand other = (ExamStatsCommand) obj;
+ return studentIndex.equals(other.studentIndex);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/ExitCommand.java b/src/main/java/seedu/address/logic/commands/ExitCommand.java
index 3dd85a8ba90..d755ce8d850 100644
--- a/src/main/java/seedu/address/logic/commands/ExitCommand.java
+++ b/src/main/java/seedu/address/logic/commands/ExitCommand.java
@@ -13,7 +13,7 @@ public class ExitCommand extends Command {
@Override
public CommandResult execute(Model model) {
- return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true);
+ return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true, false, null);
}
}
diff --git a/src/main/java/seedu/address/logic/commands/FindCommand.java b/src/main/java/seedu/address/logic/commands/FindCommand.java
index d6b19b0a0de..d514c8cc8b8 100644
--- a/src/main/java/seedu/address/logic/commands/FindCommand.java
+++ b/src/main/java/seedu/address/logic/commands/FindCommand.java
@@ -1,42 +1,160 @@
package seedu.address.logic.commands;
import static java.util.Objects.requireNonNull;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SCHOOL;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_YEAR;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Predicate;
import seedu.address.commons.core.Messages;
+import seedu.address.commons.util.CollectionUtil;
import seedu.address.model.Model;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
+import seedu.address.model.student.NameContainsKeywordsPredicate;
+import seedu.address.model.student.SchoolContainsKeywordsPredicate;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.YearMatchPredicate;
+
/**
- * Finds and lists all persons in address book whose name contains any of the argument keywords.
+ * Finds and lists all persons in Reeve by a certain criteria.
* Keyword matching is case insensitive.
*/
public class FindCommand extends Command {
public static final String COMMAND_WORD = "find";
- public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all persons whose names contain any of "
- + "the specified keywords (case-insensitive) and displays them as a list with index numbers.\n"
- + "Parameters: KEYWORD [MORE_KEYWORDS]...\n"
- + "Example: " + COMMAND_WORD + " alice bob charlie";
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Given a non-empty list of filter criteria, "
+ + "finds all persons whose fields match or contain keywords (if applicable, case-insensitive) "
+ + "of each of the filter criteria and displays them as a list with index numbers.\n"
+ + "Parameters: "
+ + " [" + PREFIX_NAME + "NAME]"
+ + " [" + PREFIX_SCHOOL + "SCHOOL]"
+ + " [" + PREFIX_YEAR + "YEAR]\n\n"
+ + "Example: " + COMMAND_WORD + " "
+ + PREFIX_NAME + "Alex "
+ + PREFIX_SCHOOL + "Yishun "
+ + PREFIX_YEAR + "Secondary 2";
+
+ public static final String FIELD_NOT_GIVEN = "At least one field to search by must be provided.";
- private final NameContainsKeywordsPredicate predicate;
- public FindCommand(NameContainsKeywordsPredicate predicate) {
- this.predicate = predicate;
+ private final FindStudentDescriptor findStudentDescriptor;
+
+ /**
+ * @param findStudentDescriptor Details we use to filter Reeve with
+ */
+ public FindCommand(FindStudentDescriptor findStudentDescriptor) {
+ requireNonNull(findStudentDescriptor);
+ this.findStudentDescriptor = findStudentDescriptor;
}
@Override
public CommandResult execute(Model model) {
requireNonNull(model);
- model.updateFilteredPersonList(predicate);
+ List> predicates = findStudentDescriptor.getPredicates();
+ assert predicates.size() > 0;
+ Predicate consolidatedPredicate = student -> true;
+ for (Predicate currentPredicate : predicates) {
+ consolidatedPredicate = consolidatedPredicate.and(currentPredicate);
+ }
+ model.updateFilteredStudentList(consolidatedPredicate);
return new CommandResult(
- String.format(Messages.MESSAGE_PERSONS_LISTED_OVERVIEW, model.getFilteredPersonList().size()));
+ String.format(Messages.MESSAGE_STUDENTS_LISTED_OVERVIEW, model.getSortedStudentList().size()));
}
@Override
public boolean equals(Object other) {
return other == this // short circuit if same object
|| (other instanceof FindCommand // instanceof handles nulls
- && predicate.equals(((FindCommand) other).predicate)); // state check
+ && findStudentDescriptor.equals(((FindCommand) other).findStudentDescriptor)); // state check
+ }
+
+ /**
+ * Stores the details to find students with. Each non-empty field will be used to
+ * filter the list of students in Reeve.
+ */
+ public static class FindStudentDescriptor {
+ private NameContainsKeywordsPredicate namePredicate;
+ private SchoolContainsKeywordsPredicate schoolPredicate;
+ private YearMatchPredicate yearPredicate;
+
+ public FindStudentDescriptor() {}
+
+ /**
+ * Copy constructor.
+ * A defensive copy of {@code tags} is used internally.
+ */
+ public FindStudentDescriptor(FindCommand.FindStudentDescriptor toCopy) {
+ setNamePredicate(toCopy.namePredicate);
+ setSchoolPredicate(toCopy.schoolPredicate);
+ setYearPredicate(toCopy.yearPredicate);
+ }
+
+ /**
+ * Returns true if at least one predicate is present.
+ */
+ public boolean isAnyPredicatePresent() {
+ return CollectionUtil.isAnyNonNull(namePredicate, schoolPredicate, yearPredicate);
+ }
+
+ /**
+ * Returns list of available predicates
+ */
+ public List> getPredicates() {
+ assert isAnyPredicatePresent();
+ List> predicates = new ArrayList<>();
+ getNamePredicate().ifPresent(predicates::add);
+ getSchoolPredicate().ifPresent(predicates::add);
+ getYearPredicate().ifPresent(predicates::add);
+ return predicates;
+ }
+
+ public Optional getNamePredicate() {
+ return Optional.ofNullable(namePredicate);
+ }
+
+ public void setNamePredicate(NameContainsKeywordsPredicate namePredicate) {
+ this.namePredicate = namePredicate;
+ }
+
+ public Optional getSchoolPredicate() {
+ return Optional.ofNullable(schoolPredicate);
+ }
+
+ public void setSchoolPredicate(SchoolContainsKeywordsPredicate schoolPredicate) {
+ this.schoolPredicate = schoolPredicate;
+ }
+
+ public Optional getYearPredicate() {
+ return Optional.ofNullable(yearPredicate);
+ }
+
+ public void setYearPredicate(YearMatchPredicate yearPredicate) {
+ this.yearPredicate = yearPredicate;
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof FindCommand.FindStudentDescriptor)) {
+ return false;
+ }
+
+ // state check
+ FindCommand.FindStudentDescriptor e = (FindCommand.FindStudentDescriptor) other;
+
+ return getNamePredicate().equals(e.getNamePredicate())
+ && getSchoolPredicate().equals(e.getSchoolPredicate())
+ && getYearPredicate().equals(e.getYearPredicate());
+ }
}
}
diff --git a/src/main/java/seedu/address/logic/commands/HelpCommand.java b/src/main/java/seedu/address/logic/commands/HelpCommand.java
index bf824f91bd0..cca5cd03ac5 100644
--- a/src/main/java/seedu/address/logic/commands/HelpCommand.java
+++ b/src/main/java/seedu/address/logic/commands/HelpCommand.java
@@ -16,6 +16,6 @@ public class HelpCommand extends Command {
@Override
public CommandResult execute(Model model) {
- return new CommandResult(SHOWING_HELP_MESSAGE, true, false);
+ return new CommandResult(SHOWING_HELP_MESSAGE, true, false, false, null);
}
}
diff --git a/src/main/java/seedu/address/logic/commands/ListCommand.java b/src/main/java/seedu/address/logic/commands/ListCommand.java
index 84be6ad2596..c320ddcec5f 100644
--- a/src/main/java/seedu/address/logic/commands/ListCommand.java
+++ b/src/main/java/seedu/address/logic/commands/ListCommand.java
@@ -1,24 +1,26 @@
package seedu.address.logic.commands;
import static java.util.Objects.requireNonNull;
-import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
+import static seedu.address.model.Model.COMPARATOR_NAME;
+import static seedu.address.model.Model.PREDICATE_SHOW_ALL_STUDENTS;
import seedu.address.model.Model;
/**
- * Lists all persons in the address book to the user.
+ * Lists all students in Reeve to the user.
*/
public class ListCommand extends Command {
public static final String COMMAND_WORD = "list";
- public static final String MESSAGE_SUCCESS = "Listed all persons";
+ public static final String MESSAGE_SUCCESS = "Listed all students";
@Override
public CommandResult execute(Model model) {
requireNonNull(model);
- model.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
+ model.updateFilteredStudentList(PREDICATE_SHOW_ALL_STUDENTS);
+ model.updateSortedStudentList(COMPARATOR_NAME);
return new CommandResult(MESSAGE_SUCCESS);
}
}
diff --git a/src/main/java/seedu/address/logic/commands/OverdueCommand.java b/src/main/java/seedu/address/logic/commands/OverdueCommand.java
new file mode 100644
index 00000000000..acb88313495
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/OverdueCommand.java
@@ -0,0 +1,23 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.core.Messages.MESSAGE_STUDENTS_LISTED_OVERVIEW;
+
+import seedu.address.model.Model;
+import seedu.address.model.student.admin.OverdueFeePredicate;
+
+/**
+ * Finds and lists all students who have not paid their fees in more than a month.
+ */
+public class OverdueCommand extends Command {
+
+ public static final String COMMAND_WORD = "overdue";
+
+ @Override
+ public CommandResult execute(Model model) {
+ requireNonNull(model);
+ model.updateFilteredStudentList(new OverdueFeePredicate());
+ return new CommandResult(String.format(MESSAGE_STUDENTS_LISTED_OVERVIEW,
+ model.getSortedStudentList().size()));
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/QuestionCommand.java b/src/main/java/seedu/address/logic/commands/QuestionCommand.java
new file mode 100644
index 00000000000..f3815984093
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/QuestionCommand.java
@@ -0,0 +1,10 @@
+package seedu.address.logic.commands;
+
+public abstract class QuestionCommand extends Command {
+
+ public static final String COMMAND_WORD = "question";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds, resolves or deletes a question "
+ + "from a student in Reeve.\n\n"
+ + "SUPPORTED COMMANDS: add, solve, delete";
+}
diff --git a/src/main/java/seedu/address/logic/commands/ScheduleCommand.java b/src/main/java/seedu/address/logic/commands/ScheduleCommand.java
new file mode 100644
index 00000000000..14c643feebe
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/ScheduleCommand.java
@@ -0,0 +1,14 @@
+package seedu.address.logic.commands;
+
+
+/**
+ * Finds and list all students with classes on a given date.
+ * This is also the schedule of the user on that particular date.
+ */
+public abstract class ScheduleCommand extends Command {
+
+ public static final String COMMAND_WORD = "schedule";
+
+ public static final String COMMAND_SUCCESS_MESSAGE = "Here is your schedule";
+
+}
diff --git a/src/main/java/seedu/address/logic/commands/ScheduleViewCommand.java b/src/main/java/seedu/address/logic/commands/ScheduleViewCommand.java
new file mode 100644
index 00000000000..634559b32e9
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/ScheduleViewCommand.java
@@ -0,0 +1,64 @@
+package seedu.address.logic.commands;
+
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import static seedu.address.model.Model.PREDICATE_SHOW_ALL_STUDENTS;
+
+import java.time.LocalDate;
+
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.schedule.ScheduleViewMode;
+
+public class ScheduleViewCommand extends ScheduleCommand {
+ public static final String COMMAND_WORD = "schedule";
+ public static final String MESSAGE_INVALID_VIEW_MODE = "Invalid view mode!";
+ public static final String MESSAGE_CONSTRAINTS = "Input date should be in the form dd/mm/yyyy, "
+ + "and should not be blank";
+ public static final String MESSAGE_USAGE = COMMAND_WORD
+ + "m/[weekly / daily]"
+ + "d/[dd/mm/yyyy]\n"
+ + "Example: schedule m/weekly d/2/11/2020";
+
+ private final LocalDate viewDate;
+ private final ScheduleViewMode viewMode;
+
+ /**
+ * Creates a command to view schedule.
+ * @param scheduleViewMode mode to view either weekly or daily.
+ * @param viewDate the date to view.
+ */
+ public ScheduleViewCommand(ScheduleViewMode scheduleViewMode, LocalDate viewDate) {
+ super();
+ requireAllNonNull(scheduleViewMode, viewDate);
+ this.viewMode = scheduleViewMode;
+ this.viewDate = viewDate;
+ }
+
+ /**
+ * Execute and returns CommandResult for UI.
+ * UI will then change according to the view mode and date.
+ * @throws CommandException for invalid view modes or invalid date format
+ */
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ model.setScheduleViewDate(viewDate);
+ model.setScheduleViewMode(viewMode);
+ model.updateFilteredStudentList(PREDICATE_SHOW_ALL_STUDENTS);
+ model.updateClassTimesToEvent();
+ return new CommandResult(COMMAND_SUCCESS_MESSAGE, false, false, true, false);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true; // short circuit if same object
+ }
+
+ if (obj instanceof ScheduleViewCommand) {
+ ScheduleViewCommand other = (ScheduleViewCommand) obj;
+ return other.viewDate.equals(viewDate) && other.viewMode.equals(viewMode);
+ }
+ return false;
+
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/SolveQuestionCommand.java b/src/main/java/seedu/address/logic/commands/SolveQuestionCommand.java
new file mode 100644
index 00000000000..f4c54217738
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/SolveQuestionCommand.java
@@ -0,0 +1,109 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_INDEX;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TEXT;
+
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.academic.question.Question;
+import seedu.address.model.student.academic.question.SolvedQuestion;
+
+/**
+ * Resolves a specified question of a student at the displayed index in Reeve.
+ */
+public class SolveQuestionCommand extends QuestionCommand {
+
+ public static final String MESSAGE_SUCCESS = "%1$s's question resolved: %2$s";
+ public static final String MESSAGE_SOLVED_QUESTION = "This question was already solved";
+ public static final String MESSAGE_BAD_QUESTION_INDEX = "There is no question at this index";
+ public static final String COMMAND_WORD = "solve";
+
+ public static final String MESSAGE_USAGE = QuestionCommand.COMMAND_WORD + " " + COMMAND_WORD
+ + ": Resolves a question from a student.\n\n"
+ + "Parameters: INDEX (must be a positive integer) "
+ + PREFIX_INDEX + "QUESTION_INDEX "
+ + PREFIX_TEXT + "QUESTION_TEXT\n\n"
+ + "Example: "
+ + QuestionCommand.COMMAND_WORD + " " + COMMAND_WORD + " 1 "
+ + PREFIX_INDEX + "1 " + PREFIX_TEXT + "Read your textbook.";
+
+ private static Logger logger = Logger.getLogger("Solve Question Log");
+
+ private final Index studentIndex;
+ private final Index questionIndex;
+ private final String solution;
+
+ /**
+ * Constructs a SolveQuestionCommand to mark a specified {@code Question} as solved.
+ */
+ public SolveQuestionCommand(Index studentIndex, Index questionIndex, String solution) {
+ requireAllNonNull(studentIndex, questionIndex, solution);
+ this.studentIndex = studentIndex;
+ this.questionIndex = questionIndex;
+ this.solution = solution;
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ assert (studentIndex != null) && (questionIndex != null) && (solution != null);
+ requireNonNull(model);
+ logger.log(Level.INFO, "Beginning command execution");
+
+ List lastShownList = model.getSortedStudentList();
+ if (studentIndex.getZeroBased() >= lastShownList.size()) {
+ logger.log(Level.WARNING, "Handling non-existent student error");
+ throw new CommandException(Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ Student asker = lastShownList.get(studentIndex.getZeroBased());
+ checkQuestionIndex(asker);
+
+ Question target = asker.getQuestions().get(questionIndex.getZeroBased());
+ Question solved = new SolvedQuestion(target.question, solution);
+ Student replacement = asker.setQuestion(target, solved);
+
+ model.setStudent(asker, replacement);
+ logger.log(Level.INFO, "Execution complete");
+ return new CommandResult(String.format(MESSAGE_SUCCESS, replacement.getName(), solved));
+ }
+
+ /***
+ * Checks if the question at the specified index exists or has already been solved.
+ */
+ private void checkQuestionIndex(Student asker) throws CommandException {
+ if (questionIndex.getZeroBased() >= asker.getQuestions().size()) {
+ logger.log(Level.WARNING, "Handling non-existent question error");
+ throw new CommandException(MESSAGE_BAD_QUESTION_INDEX);
+ }
+ if (asker.getQuestions().get(questionIndex.getZeroBased()).isResolved()) {
+ logger.log(Level.WARNING, "Handling solved question error");
+ throw new CommandException(MESSAGE_SOLVED_QUESTION);
+ }
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ if (!(obj instanceof SolveQuestionCommand)) {
+ return false;
+ }
+
+ SolveQuestionCommand other = (SolveQuestionCommand) obj;
+ return studentIndex.equals(other.studentIndex)
+ && questionIndex.equals(other.questionIndex)
+ && solution.equals(other.solution);
+ }
+
+}
diff --git a/src/main/java/seedu/address/logic/commands/SortCommand.java b/src/main/java/seedu/address/logic/commands/SortCommand.java
new file mode 100644
index 00000000000..609f79e25ee
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/SortCommand.java
@@ -0,0 +1,74 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.Arrays;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.student.NameComparator;
+import seedu.address.model.student.YearComparator;
+import seedu.address.model.student.admin.ClassTimeComparator;
+
+public class SortCommand extends Command {
+
+ public static final String COMMAND_WORD = "sort";
+
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Sorts the list of students in Reeve by a given"
+ + " sorting method.\n\n"
+ + "Supported sorting methods: \n"
+ + NameComparator.USAGE + "\n"
+ + ClassTimeComparator.USAGE + "\n"
+ + YearComparator.USAGE + "\n\n"
+ + "Example: " + COMMAND_WORD + " " + YearComparator.COMPARISON_MEANS;
+
+ public static final String[] SUPPORTED_COMPARISON_MEANS = new String[] {NameComparator.COMPARISON_MEANS,
+ ClassTimeComparator.COMPARISON_MEANS, YearComparator.COMPARISON_MEANS};
+
+ private final String comparisonMeans;
+
+ /**
+ * @param comparisonMeans Means that we use to sort students in reeve
+ */
+ public SortCommand(String comparisonMeans) {
+ requireNonNull(comparisonMeans);
+ this.comparisonMeans = comparisonMeans;
+ }
+
+ public static boolean isValidComparisonMeans(String means) {
+ return Arrays.asList(SUPPORTED_COMPARISON_MEANS).contains(means);
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ switch (comparisonMeans) {
+
+ case NameComparator.COMPARISON_MEANS:
+ model.updateSortedStudentList(new NameComparator());
+ break;
+
+ case ClassTimeComparator.COMPARISON_MEANS:
+ model.updateSortedStudentList(new ClassTimeComparator());
+ break;
+
+ case YearComparator.COMPARISON_MEANS:
+ model.updateSortedStudentList(new YearComparator());
+ break;
+
+ default:
+ assert false; //shouldn't reach default branch
+ throw new CommandException("Shouldn't be called");
+ }
+
+ return new CommandResult(
+ String.format(Messages.MESSAGE_STUDENTS_SORTED, comparisonMeans));
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof SortCommand // instanceof handles nulls
+ && comparisonMeans.equals(((SortCommand) other).comparisonMeans)); // state check
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/ToggleStudentCardCommand.java b/src/main/java/seedu/address/logic/commands/ToggleStudentCardCommand.java
new file mode 100644
index 00000000000..97e7caf5fa3
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/ToggleStudentCardCommand.java
@@ -0,0 +1,16 @@
+package seedu.address.logic.commands;
+
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+
+public class ToggleStudentCardCommand extends Command {
+
+ public static final String COMMAND_WORD = "toggle";
+
+ public static final String MESSAGE_TOGGLE_SUCCESS = "Display has been toggled";
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ return new CommandResult(MESSAGE_TOGGLE_SUCCESS, false, false, true, null);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/notes/AddNoteCommand.java b/src/main/java/seedu/address/logic/commands/notes/AddNoteCommand.java
new file mode 100644
index 00000000000..a08712a6df6
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/notes/AddNoteCommand.java
@@ -0,0 +1,56 @@
+package seedu.address.logic.commands.notes;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_DESCRIPTION;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TITLE;
+
+import seedu.address.logic.commands.CommandResult;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.notes.note.Note;
+
+public class AddNoteCommand extends NoteCommand {
+ public static final String COMMAND_WORD = "add";
+
+ public static final String MESSAGE_USAGE = NoteCommand.COMMAND_WORD + " " + COMMAND_WORD
+ + ": Adds a note to the notebook.\n\n"
+ + "Parameters: "
+ + PREFIX_TITLE + "TITLE "
+ + PREFIX_DESCRIPTION + "DESCRIPTION\n\n"
+ + "Example: " + NoteCommand.COMMAND_WORD + " " + COMMAND_WORD + " "
+ + PREFIX_TITLE + "things to do "
+ + PREFIX_DESCRIPTION + "get coffee";
+
+
+ public static final String MESSAGE_SUCCESS = "New note added:\n%1$s";
+ public static final String MESSAGE_DUPLICATE_NOTE = "This note already exists in the notebook";
+
+ private final Note toAdd;
+
+ /**
+ * Creates an AddCommand to add the specified {@code Note}
+ */
+ public AddNoteCommand(Note note) {
+ requireNonNull(note);
+ toAdd = note;
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+
+ if (model.hasNote(toAdd)) {
+ throw new CommandException(MESSAGE_DUPLICATE_NOTE);
+ }
+
+ model.addNote(toAdd);
+ return new CommandResult(String.format(MESSAGE_SUCCESS, toAdd));
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof AddNoteCommand // instanceof handles nulls
+ && toAdd.equals(((AddNoteCommand) other).toAdd));
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/notes/DeleteNoteCommand.java b/src/main/java/seedu/address/logic/commands/notes/DeleteNoteCommand.java
new file mode 100644
index 00000000000..6f92672887a
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/notes/DeleteNoteCommand.java
@@ -0,0 +1,54 @@
+package seedu.address.logic.commands.notes;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.List;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.CommandResult;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.notes.note.Note;
+
+/**
+ * Deletes a student identified using it's displayed index from Reeve.
+ */
+public class DeleteNoteCommand extends NoteCommand {
+
+ public static final String COMMAND_WORD = "delete";
+
+ public static final String MESSAGE_USAGE = NoteCommand.COMMAND_WORD + " " + COMMAND_WORD
+ + ": Deletes the note identified by the index number used in the displayed notebook.\n\n"
+ + "Parameters: INDEX (must be a positive integer)\n\n"
+ + "Example: " + NoteCommand.COMMAND_WORD + " " + COMMAND_WORD + " 1";
+
+ public static final String MESSAGE_DELETE_NOTE_SUCCESS = "Deleted Note: %1$s";
+
+ private final Index targetIndex;
+
+ public DeleteNoteCommand(Index targetIndex) {
+ this.targetIndex = targetIndex;
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+ List lastShownList = model.getNotebook().getNotesList();
+
+ if (targetIndex.getZeroBased() >= lastShownList.size()) {
+ throw new CommandException(Messages.MESSAGE_INVALID_NOTE_DISPLAYED_INDEX);
+ }
+
+ Note noteToDelete = lastShownList.get(targetIndex.getZeroBased());
+ model.deleteNote(noteToDelete);
+ return new CommandResult(String.format(MESSAGE_DELETE_NOTE_SUCCESS, noteToDelete));
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof DeleteNoteCommand // instanceof handles nulls
+ && targetIndex.equals(((DeleteNoteCommand) other).targetIndex)); // state check
+ }
+}
diff --git a/src/main/java/seedu/address/logic/commands/notes/EditNoteCommand.java b/src/main/java/seedu/address/logic/commands/notes/EditNoteCommand.java
new file mode 100644
index 00000000000..3b551a6196c
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/notes/EditNoteCommand.java
@@ -0,0 +1,170 @@
+package seedu.address.logic.commands.notes;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_DESCRIPTION;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TITLE;
+
+import java.util.List;
+import java.util.Optional;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.commons.util.CollectionUtil;
+import seedu.address.logic.commands.CommandResult;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.notes.note.Description;
+import seedu.address.model.notes.note.Note;
+import seedu.address.model.notes.note.Title;
+
+/**
+ * Edits the details of an existing note in the notebook
+ */
+public class EditNoteCommand extends NoteCommand {
+
+ public static final String COMMAND_WORD = "edit";
+
+ public static final String MESSAGE_USAGE = NoteCommand.COMMAND_WORD + " " + COMMAND_WORD
+ + ": Edits the details of the note at the specified index. "
+ + "Existing values will be overwritten by the input values.\n\n"
+ + "Parameters: INDEX (must be a positive integer) "
+ + "[" + PREFIX_TITLE + "TITLE] "
+ + "[" + PREFIX_DESCRIPTION + "DESCRIPTION]\n\n"
+ + "Example: " + NoteCommand.COMMAND_WORD + " " + COMMAND_WORD + " 1 "
+ + PREFIX_DESCRIPTION + " mark exam papers";
+
+ public static final String MESSAGE_EDIT_NOTE_SUCCESS = "Edited Note:\n%1$s";
+ public static final String MESSAGE_NOT_EDITED = "At least one field to edit must be provided.";
+ public static final String MESSAGE_DUPLICATE_NOTE = "This note already exists in the notebook.";
+
+
+ private final Index index;
+ private final EditNoteCommand.EditNoteDescriptor editNoteDescriptor;
+
+ /**
+ * @param index of the note in the student list to edit
+ * @param editNoteDescriptor details to edit the student with
+ */
+ public EditNoteCommand(Index index, EditNoteCommand.EditNoteDescriptor editNoteDescriptor) {
+ requireNonNull(index);
+ requireNonNull(editNoteDescriptor);
+
+ this.index = index;
+ this.editNoteDescriptor = new EditNoteCommand.EditNoteDescriptor(editNoteDescriptor);
+ }
+
+ @Override
+ public CommandResult execute(Model model) throws CommandException {
+ requireNonNull(model);
+ List lastShownList = model.getNotebook().getNotesList();
+
+ if (index.getZeroBased() >= lastShownList.size()) {
+ throw new CommandException(Messages.MESSAGE_INVALID_NOTE_DISPLAYED_INDEX);
+ }
+
+ Note noteToEdit = lastShownList.get(index.getZeroBased());
+ Note editedNote = createEditedNote(noteToEdit, editNoteDescriptor);
+
+ if (!noteToEdit.isSameNote(editedNote) && model.hasNote(editedNote)) {
+ throw new CommandException(MESSAGE_DUPLICATE_NOTE);
+ }
+
+ model.setNote(noteToEdit, editedNote);
+ return new CommandResult(String.format(MESSAGE_EDIT_NOTE_SUCCESS, editedNote));
+ }
+
+ /**
+ * Creates and returns a {@code Note} with the details of {@code noteToEdit}
+ * edited with {@code editNoteDescriptor}.
+ */
+ private static Note createEditedNote(Note noteToEdit, EditNoteCommand.EditNoteDescriptor editNoteDescriptor) {
+ assert noteToEdit != null;
+
+ Title updatedTitle = editNoteDescriptor.getTitle().orElse(noteToEdit.getTitle());
+ Description updatedDescription = editNoteDescriptor.getDescription().orElse(noteToEdit.getDescription());
+
+ return new Note(updatedTitle, updatedDescription);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof EditNoteCommand)) {
+ return false;
+ }
+
+ // state check
+ EditNoteCommand e = (EditNoteCommand) other;
+ return index.equals(e.index)
+ && editNoteDescriptor.equals(e.editNoteDescriptor);
+ }
+
+ /**
+ * Stores the details to edit the note with. Each non-empty field value will replace the
+ * corresponding field value of the note.
+ */
+ public static class EditNoteDescriptor {
+
+ private Title title;
+ private Description description;
+
+ public EditNoteDescriptor() {}
+
+ /**
+ * Copy constructor.
+ */
+ public EditNoteDescriptor(EditNoteCommand.EditNoteDescriptor toCopy) {
+ setTitle(toCopy.title);
+ setDescription(toCopy.description);
+ }
+
+ /**
+ * Returns true if at least one field is edited.
+ */
+ public boolean isAnyFieldEdited() {
+ return CollectionUtil.isAnyNonNull(title, description);
+ }
+
+ public void setTitle(Title title) {
+ this.title = title;
+ }
+
+ public Optional getTitle() {
+ return Optional.ofNullable(title);
+ }
+
+ public void setDescription(Description description) {
+ this.description = description;
+ }
+
+ public Optional<Description> getDescription() {
+ return Optional.ofNullable(description);
+ }
+
+
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof EditNoteCommand.EditNoteDescriptor)) {
+ return false;
+ }
+
+ // state check
+ EditNoteCommand.EditNoteDescriptor e = (EditNoteCommand.EditNoteDescriptor) other;
+
+ return getTitle().equals(e.getTitle())
+ && getDescription().equals(e.getDescription());
+ }
+ }
+
+}
diff --git a/src/main/java/seedu/address/logic/commands/notes/NoteCommand.java b/src/main/java/seedu/address/logic/commands/notes/NoteCommand.java
new file mode 100644
index 00000000000..3e39a8ef5a3
--- /dev/null
+++ b/src/main/java/seedu/address/logic/commands/notes/NoteCommand.java
@@ -0,0 +1,15 @@
+package seedu.address.logic.commands.notes;
+
+import seedu.address.logic.commands.Command;
+
+/**
+ * Represents a note command with hidden internal logic and the ability to be executed.
+ */
+public abstract class NoteCommand extends Command {
+
+ public static final String COMMAND_WORD = "note";
+ public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds, edits or deletes a note "
+ + "in Reeve.\n\n"
+ + "SUPPORTED COMMANDS: add, edit, delete";
+
+}
diff --git a/src/main/java/seedu/address/logic/parser/AddCommandParser.java b/src/main/java/seedu/address/logic/parser/AddCommandParser.java
index 3b8bfa035e8..d9432d71814 100644
--- a/src/main/java/seedu/address/logic/parser/AddCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/AddCommandParser.java
@@ -1,28 +1,44 @@
package seedu.address.logic.parser;
import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static seedu.address.commons.util.DateUtil.TODAY;
+import static seedu.address.logic.parser.CliSyntax.ALL_PREFIXES;
+import static seedu.address.logic.parser.CliSyntax.COMPULSORY_PREFIXES;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_DETAILS;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_FEE;
import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_PAYMENT;
import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SCHOOL;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TIME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_VENUE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_YEAR;
+import static seedu.address.model.student.admin.Fee.FREE_OF_CHARGE;
-import java.util.Set;
-import java.util.stream.Stream;
+import java.util.ArrayList;
+import java.util.List;
import seedu.address.logic.commands.AddCommand;
import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
+import seedu.address.model.student.Name;
+import seedu.address.model.student.Phone;
+import seedu.address.model.student.School;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.Year;
+import seedu.address.model.student.academic.Attendance;
+import seedu.address.model.student.academic.exam.Exam;
+import seedu.address.model.student.academic.question.Question;
+import seedu.address.model.student.admin.ClassTime;
+import seedu.address.model.student.admin.ClassVenue;
+import seedu.address.model.student.admin.Detail;
+import seedu.address.model.student.admin.Fee;
+import seedu.address.model.student.admin.PaymentDate;
+
/**
* Parses input arguments and creates a new AddCommand object
*/
-public class AddCommandParser implements Parser<AddCommand> {
+public class AddCommandParser extends PrefixDependentParser<AddCommand> {
/**
* Parses the given {@code String} of arguments in the context of the AddCommand
@@ -31,30 +47,31 @@ public class AddCommandParser implements Parser<AddCommand> {
*/
public AddCommand parse(String args) throws ParseException {
ArgumentMultimap argMultimap =
- ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS, PREFIX_TAG);
+ ArgumentTokenizer.tokenize(args, ALL_PREFIXES);
- if (!arePrefixesPresent(argMultimap, PREFIX_NAME, PREFIX_ADDRESS, PREFIX_PHONE, PREFIX_EMAIL)
+ if (!areRequiredPrefixesPresent(argMultimap, COMPULSORY_PREFIXES)
|| !argMultimap.getPreamble().isEmpty()) {
throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));
}
Name name = ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get());
Phone phone = ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get());
- Email email = ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get());
- Address address = ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get());
- Set<Tag> tagList = ParserUtil.parseTags(argMultimap.getAllValues(PREFIX_TAG));
-
- Person person = new Person(name, phone, email, address, tagList);
+ School school = ParserUtil.parseSchool(argMultimap.getValue(PREFIX_SCHOOL).get());
+ Year year = ParserUtil.parseYear(argMultimap.getValue(PREFIX_YEAR).get());
+ ClassVenue classVenue = ParserUtil.parseClassVenue(argMultimap.getValue(PREFIX_VENUE).get());
+ ClassTime classTime = ParserUtil.parseClassTime(argMultimap.getValue(PREFIX_TIME).get());
- return new AddCommand(person);
- }
+ Fee fee = ParserUtil.parseFee(argMultimap.getValue(PREFIX_FEE).orElse(FREE_OF_CHARGE));
+ PaymentDate paymentDate = ParserUtil.parsePaymentDate(argMultimap.getValue(PREFIX_PAYMENT).orElse(TODAY));
+ List<Detail> detailList =
+ ParserUtil.parseDetails(argMultimap.getAllValues(PREFIX_DETAILS));
- /**
- * Returns true if none of the prefixes contains empty {@code Optional} values in the given
- * {@code ArgumentMultimap}.
- */
- private static boolean arePrefixesPresent(ArgumentMultimap argumentMultimap, Prefix... prefixes) {
- return Stream.of(prefixes).allMatch(prefix -> argumentMultimap.getValue(prefix).isPresent());
+ List<Question> questions = new ArrayList<>();
+ ArrayList<Exam> exams = new ArrayList<>();
+ List<Attendance> attendanceList = new ArrayList<>();
+ Student student = new Student(name, phone, school, year,
+ classVenue, classTime, fee, paymentDate, detailList,
+ questions, exams, attendanceList);
+ return new AddCommand(student);
}
-
}
diff --git a/src/main/java/seedu/address/logic/parser/AttendanceCommandParser.java b/src/main/java/seedu/address/logic/parser/AttendanceCommandParser.java
new file mode 100644
index 00000000000..574bcb852d0
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/AttendanceCommandParser.java
@@ -0,0 +1,112 @@
+package seedu.address.logic.parser;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CliSyntax.ATTENDANCE_COMMAND_COMPULSORY_PREFIXES;
+import static seedu.address.logic.parser.CliSyntax.ATTENDANCE_COMMAND_PREFIXES;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ATTENDANCE_DATE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ATTENDANCE_FEEDBACK;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ATTENDANCE_STATUS;
+import static seedu.address.logic.parser.ReeveParser.BASIC_COMMAND_FORMAT;
+
+import java.time.LocalDate;
+import java.util.Optional;
+import java.util.regex.Matcher;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.AddAttendanceCommand;
+import seedu.address.logic.commands.AttendanceCommand;
+import seedu.address.logic.commands.DeleteAttendanceCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.student.academic.Attendance;
+import seedu.address.model.student.academic.Feedback;
+
+public class AttendanceCommandParser extends PrefixDependentParser<AttendanceCommand> {
+
+ private static final String ERROR_ADD_ATTENDANCE =
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddAttendanceCommand.MESSAGE_USAGE);
+ private static final String ERROR_DEL_ATTENDANCE =
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteAttendanceCommand.MESSAGE_USAGE);
+
+ @Override
+ public AttendanceCommand parse(String userInput) throws ParseException {
+ final Matcher matcher = BASIC_COMMAND_FORMAT.matcher(userInput.trim());
+ if (!matcher.matches()) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AttendanceCommand.MESSAGE_USAGE));
+ }
+
+ final String commandWord = matcher.group("commandWord");
+ final String arguments = matcher.group("arguments");
+
+ switch (commandWord) {
+
+ case AddAttendanceCommand.COMMAND_WORD:
+ return parseAddAttendanceCommand(arguments);
+
+ case DeleteAttendanceCommand.COMMAND_WORD:
+ return parseDeleteAttendanceCommand(arguments);
+
+ default:
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AttendanceCommand.MESSAGE_USAGE));
+ }
+ }
+
+ private AddAttendanceCommand parseAddAttendanceCommand(String args) throws ParseException {
+ ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, ATTENDANCE_COMMAND_PREFIXES);
+
+ if (!areRequiredPrefixesPresent(argMultimap, ATTENDANCE_COMMAND_COMPULSORY_PREFIXES)) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ AddAttendanceCommand.MESSAGE_USAGE));
+ }
+
+ Index index;
+ Attendance attendance;
+ try {
+ index = ParserUtil.parseIndex(argMultimap.getPreamble());
+ LocalDate attendanceDate =
+ ParserUtil.parseDate(argMultimap.getValue(PREFIX_ATTENDANCE_DATE).get());
+ boolean isStudentPresent = ParserUtil.parseAttendanceStatus(
+ argMultimap.getValue(PREFIX_ATTENDANCE_STATUS).get());
+ attendance = getAttendance(argMultimap, attendanceDate, isStudentPresent);
+ } catch (ParseException pe) {
+ throw new ParseException(ERROR_ADD_ATTENDANCE, pe);
+ }
+
+ return new AddAttendanceCommand(index, attendance);
+ }
+
+ private Attendance getAttendance(ArgumentMultimap argMultiMap, LocalDate date, boolean isPresent)
+ throws ParseException {
+ Optional<String> feedbackValue = argMultiMap.getValue(PREFIX_ATTENDANCE_FEEDBACK);
+
+ if (feedbackValue.isEmpty()) {
+ return new Attendance(date, isPresent);
+ }
+
+ try {
+ Feedback feedback = ParserUtil.parseFeedback(feedbackValue.get());
+ return new Attendance(date, isPresent, feedback);
+ } catch (ParseException pe) {
+ throw new ParseException(ERROR_ADD_ATTENDANCE, pe);
+ }
+ }
+
+ private DeleteAttendanceCommand parseDeleteAttendanceCommand(String args) throws ParseException {
+ ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, ATTENDANCE_COMMAND_PREFIXES);
+
+ if (!areRequiredPrefixesPresent(argMultimap, PREFIX_ATTENDANCE_DATE)) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ DeleteAttendanceCommand.MESSAGE_USAGE));
+ }
+
+ Index index;
+ LocalDate lessonDate;
+ try {
+ index = ParserUtil.parseIndex(argMultimap.getPreamble());
+ lessonDate = ParserUtil.parseDate(argMultimap.getValue(PREFIX_ATTENDANCE_DATE).get());
+ } catch (ParseException pe) {
+ throw new ParseException(ERROR_DEL_ATTENDANCE, pe);
+ }
+
+ return new DeleteAttendanceCommand(index, lessonDate);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/parser/CliSyntax.java b/src/main/java/seedu/address/logic/parser/CliSyntax.java
index 75b1a9bf119..965af68757a 100644
--- a/src/main/java/seedu/address/logic/parser/CliSyntax.java
+++ b/src/main/java/seedu/address/logic/parser/CliSyntax.java
@@ -8,8 +8,57 @@ public class CliSyntax {
/* Prefix definitions */
public static final Prefix PREFIX_NAME = new Prefix("n/");
public static final Prefix PREFIX_PHONE = new Prefix("p/");
- public static final Prefix PREFIX_EMAIL = new Prefix("e/");
- public static final Prefix PREFIX_ADDRESS = new Prefix("a/");
- public static final Prefix PREFIX_TAG = new Prefix("t/");
+ public static final Prefix PREFIX_SCHOOL = new Prefix("s/");
+ public static final Prefix PREFIX_YEAR = new Prefix("y/");
+ public static final Prefix PREFIX_VENUE = new Prefix("v/");
+ public static final Prefix PREFIX_TIME = new Prefix("t/");
+ public static final Prefix PREFIX_FEE = new Prefix("f/");
+ public static final Prefix PREFIX_PAYMENT = new Prefix("d/");
+ public static final Prefix PREFIX_DETAILS = new Prefix("a/");
+
+ /* Prefix for detail and question commands */
+ public static final Prefix PREFIX_INDEX = new Prefix("i/");
+ public static final Prefix PREFIX_TEXT = new Prefix("t/");
+
+ /* Prefix for exam commands */
+ public static final Prefix PREFIX_EXAM_NAME = new Prefix("n/");
+ public static final Prefix PREFIX_EXAM_DATE = new Prefix("d/");
+ public static final Prefix PREFIX_SCORE = new Prefix("s/");
+ public static final Prefix PREFIX_EXAM_INDEX = new Prefix("i/");
+
+ /* Prefix for attendance commands */
+ public static final Prefix PREFIX_ATTENDANCE_DATE = new Prefix("d/");
+ public static final Prefix PREFIX_ATTENDANCE_STATUS = new Prefix("a/");
+ public static final Prefix PREFIX_ATTENDANCE_FEEDBACK = new Prefix("f/");
+
+ /* Prefix for Notebook */
+ public static final Prefix PREFIX_TITLE = new Prefix("t/");
+ public static final Prefix PREFIX_DESCRIPTION = new Prefix("d/");
+
+ /* Prefix for Schedule */
+ public static final Prefix PREFIX_VIEW_MODE = new Prefix("m/");
+ public static final Prefix PREFIX_VIEW_DATE = new Prefix("d/");
+
+ public static final Prefix[] COMPULSORY_PREFIXES = new Prefix[] {PREFIX_NAME, PREFIX_PHONE,
+ PREFIX_SCHOOL, PREFIX_YEAR, PREFIX_VENUE, PREFIX_TIME};
+
+ public static final Prefix[] ALL_NOTE_PREFIXES = new Prefix[] {PREFIX_TITLE, PREFIX_DESCRIPTION};
+
+ public static final Prefix[] ALL_PREFIXES = new Prefix[] {PREFIX_NAME, PREFIX_PHONE, PREFIX_SCHOOL,
+ PREFIX_YEAR, PREFIX_VENUE, PREFIX_TIME, PREFIX_FEE, PREFIX_PAYMENT, PREFIX_DETAILS};
+
+ public static final Prefix[] FIND_SUPPORTED_PREFIXES =
+ new Prefix[] {PREFIX_NAME, PREFIX_SCHOOL, PREFIX_YEAR};
+
+ public static final Prefix[] COMMAND_PREFIXES = new Prefix[] {PREFIX_INDEX, PREFIX_TEXT};
+
+ public static final Prefix[] EXAM_COMMAND_PREFIXES =
+ new Prefix[] {PREFIX_EXAM_NAME, PREFIX_EXAM_DATE, PREFIX_SCORE};
+
+ public static final Prefix[] ATTENDANCE_COMMAND_PREFIXES =
+ new Prefix[] {PREFIX_ATTENDANCE_DATE, PREFIX_ATTENDANCE_STATUS, PREFIX_ATTENDANCE_FEEDBACK};
+
+ public static final Prefix[] ATTENDANCE_COMMAND_COMPULSORY_PREFIXES =
+ new Prefix[] {PREFIX_ATTENDANCE_DATE, PREFIX_ATTENDANCE_STATUS};
}
diff --git a/src/main/java/seedu/address/logic/parser/DetailCommandParser.java b/src/main/java/seedu/address/logic/parser/DetailCommandParser.java
new file mode 100644
index 00000000000..536f5b90f4d
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/DetailCommandParser.java
@@ -0,0 +1,128 @@
+package seedu.address.logic.parser;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.commands.DetailCommand.MESSAGE_USAGE;
+import static seedu.address.logic.parser.CliSyntax.COMMAND_PREFIXES;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_INDEX;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TEXT;
+import static seedu.address.logic.parser.ReeveParser.BASIC_COMMAND_FORMAT;
+
+import java.util.regex.Matcher;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.AddDetailCommand;
+import seedu.address.logic.commands.DeleteDetailCommand;
+import seedu.address.logic.commands.DetailCommand;
+import seedu.address.logic.commands.EditDetailCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.student.admin.Detail;
+
+public class DetailCommandParser extends PrefixDependentParser<DetailCommand> {
+
+ /**
+ * Parses user input into command for execution.
+ *
+ * @param userInput full user input string
+ * @return the command based on the user input
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public DetailCommand parse(String userInput)
+ throws ParseException {
+
+ final Matcher matcher = BASIC_COMMAND_FORMAT.matcher(userInput.trim());
+ if (!matcher.matches()) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, MESSAGE_USAGE));
+ }
+
+ final String commandWord = matcher.group("commandWord");
+ final String arguments = matcher.group("arguments");
+
+ switch (commandWord) {
+
+ case AddDetailCommand.COMMAND_WORD:
+ return parseAddDetailCommand(arguments);
+
+ case DeleteDetailCommand.COMMAND_WORD:
+ return parseDeleteDetailCommand(arguments);
+
+ case EditDetailCommand.COMMAND_WORD:
+ return parseEditDetailCommand(arguments);
+
+ default:
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, MESSAGE_USAGE));
+ }
+ }
+
+ //@@author VaishakAnand
+ private AddDetailCommand parseAddDetailCommand(String args) throws ParseException {
+ ArgumentMultimap argMultimap =
+ ArgumentTokenizer.tokenize(args, PREFIX_TEXT);
+
+ if (!areRequiredPrefixesPresent(argMultimap, PREFIX_TEXT)) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ AddDetailCommand.MESSAGE_USAGE));
+ }
+
+ Index index;
+ try {
+ index = ParserUtil.parseIndex(argMultimap.getPreamble());
+ } catch (ParseException pe) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ AddDetailCommand.MESSAGE_USAGE), pe);
+ }
+
+ Detail detail = ParserUtil.parseDetail(argMultimap
+ .getValue(PREFIX_TEXT).get());
+
+ return new AddDetailCommand(index, detail);
+ }
+
+ private DeleteDetailCommand parseDeleteDetailCommand(String args) throws ParseException {
+ ArgumentMultimap argMultimap =
+ ArgumentTokenizer.tokenize(args, PREFIX_INDEX);
+
+ if (!areRequiredPrefixesPresent(argMultimap, PREFIX_INDEX)) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ DeleteDetailCommand.MESSAGE_USAGE));
+ }
+
+ Index studentIndex;
+ Index detailIndex;
+ try {
+ studentIndex = ParserUtil.parseIndex(argMultimap.getPreamble());
+ detailIndex = ParserUtil.parseIndex(argMultimap.getValue(PREFIX_INDEX).get());
+ } catch (ParseException pe) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ DeleteDetailCommand.MESSAGE_USAGE), pe);
+ }
+
+ return new DeleteDetailCommand(studentIndex, detailIndex);
+ }
+
+ private EditDetailCommand parseEditDetailCommand(String args) throws ParseException {
+ ArgumentMultimap argMultimap =
+ ArgumentTokenizer.tokenize(args, COMMAND_PREFIXES);
+
+ if (!areRequiredPrefixesPresent(argMultimap, COMMAND_PREFIXES)) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ EditDetailCommand.MESSAGE_USAGE));
+ }
+
+ Index studentIndex;
+ Index detailIndex;
+ try {
+ studentIndex = ParserUtil.parseIndex(argMultimap.getPreamble());
+ detailIndex = ParserUtil.parseIndex(argMultimap.getValue(PREFIX_INDEX).get());
+ } catch (ParseException pe) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ EditDetailCommand.MESSAGE_USAGE), pe);
+ }
+
+ Detail detail = ParserUtil.parseDetail(argMultimap
+ .getValue(PREFIX_TEXT).get());
+
+ return new EditDetailCommand(studentIndex, detailIndex, detail);
+ }
+ //@@author
+
+}
diff --git a/src/main/java/seedu/address/logic/parser/EditCommandParser.java b/src/main/java/seedu/address/logic/parser/EditCommandParser.java
index 845644b7dea..618c90af02e 100644
--- a/src/main/java/seedu/address/logic/parser/EditCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/EditCommandParser.java
@@ -2,22 +2,21 @@
import static java.util.Objects.requireNonNull;
import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static seedu.address.logic.parser.CliSyntax.ALL_PREFIXES;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_FEE;
import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_PAYMENT;
import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Optional;
-import java.util.Set;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SCHOOL;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TIME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_VENUE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_YEAR;
import seedu.address.commons.core.index.Index;
import seedu.address.logic.commands.EditCommand;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
+import seedu.address.logic.commands.EditCommand.EditAdminDescriptor;
+import seedu.address.logic.commands.EditCommand.EditStudentDescriptor;
import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.tag.Tag;
/**
* Parses input arguments and creates a new EditCommand object
@@ -32,8 +31,7 @@ public class EditCommandParser implements Parser<EditCommand> {
public EditCommand parse(String args) throws ParseException {
requireNonNull(args);
ArgumentMultimap argMultimap =
- ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS, PREFIX_TAG);
-
+ ArgumentTokenizer.tokenize(args, ALL_PREFIXES);
Index index;
try {
@@ -42,41 +40,66 @@ public EditCommand parse(String args) throws ParseException {
throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE), pe);
}
- EditPersonDescriptor editPersonDescriptor = new EditPersonDescriptor();
+ EditStudentDescriptor editStudentDescriptor = this.parseStudent(argMultimap);
+ EditAdminDescriptor editAdminDescriptor = this.parseAdmin(argMultimap);
+
+ if (!editStudentDescriptor.isAnyFieldEdited() && !editAdminDescriptor.isAnyFieldEdited()) {
+ throw new ParseException(EditCommand.MESSAGE_NOT_EDITED);
+ }
+
+ return new EditCommand(index, editStudentDescriptor, editAdminDescriptor);
+ }
+
+ /**
+ * Parses given input student fields into discernible values.
+ * @param argMultimap Tokenized input by user.
+ * @return EditStudentDescriptor with parsed values to edit.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ private EditStudentDescriptor parseStudent(ArgumentMultimap argMultimap) throws ParseException {
+ EditStudentDescriptor editStudentDescriptor = new EditStudentDescriptor();
+
if (argMultimap.getValue(PREFIX_NAME).isPresent()) {
- editPersonDescriptor.setName(ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get()));
+ editStudentDescriptor.setName(ParserUtil.parseName(argMultimap.getValue(PREFIX_NAME).get()));
}
if (argMultimap.getValue(PREFIX_PHONE).isPresent()) {
- editPersonDescriptor.setPhone(ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get()));
- }
- if (argMultimap.getValue(PREFIX_EMAIL).isPresent()) {
- editPersonDescriptor.setEmail(ParserUtil.parseEmail(argMultimap.getValue(PREFIX_EMAIL).get()));
+ editStudentDescriptor.setPhone(ParserUtil.parsePhone(argMultimap.getValue(PREFIX_PHONE).get()));
}
- if (argMultimap.getValue(PREFIX_ADDRESS).isPresent()) {
- editPersonDescriptor.setAddress(ParserUtil.parseAddress(argMultimap.getValue(PREFIX_ADDRESS).get()));
+
+ if (argMultimap.getValue(PREFIX_SCHOOL).isPresent()) {
+ editStudentDescriptor.setSchool(ParserUtil.parseSchool(argMultimap.getValue(PREFIX_SCHOOL).get()));
}
- parseTagsForEdit(argMultimap.getAllValues(PREFIX_TAG)).ifPresent(editPersonDescriptor::setTags);
- if (!editPersonDescriptor.isAnyFieldEdited()) {
- throw new ParseException(EditCommand.MESSAGE_NOT_EDITED);
+ if (argMultimap.getValue(PREFIX_YEAR).isPresent()) {
+ editStudentDescriptor.setYear(ParserUtil.parseYear(argMultimap.getValue(PREFIX_YEAR).get()));
}
- return new EditCommand(index, editPersonDescriptor);
+ return editStudentDescriptor;
}
/**
- * Parses {@code Collection<String> tags} into a {@code Set<Tag>} if {@code tags} is non-empty.
- * If {@code tags} contain only one element which is an empty string, it will be parsed into a
- * {@code Set<Tag>} containing zero tags.
+ * Parses given input admin fields into discernible values.
+ * @param argMultimap Tokenized input by user.
+ * @return EditAdminDescriptor with parsed values to edit.
+ * @throws ParseException if the user input does not conform the expected format
*/
- private Optional<Set<Tag>> parseTagsForEdit(Collection<String> tags) throws ParseException {
- assert tags != null;
+ private EditAdminDescriptor parseAdmin(ArgumentMultimap argMultimap) throws ParseException {
+ EditAdminDescriptor editAdminDescriptor = new EditAdminDescriptor();
- if (tags.isEmpty()) {
- return Optional.empty();
+ if (argMultimap.getValue(PREFIX_TIME).isPresent()) {
+ editAdminDescriptor.setTime(ParserUtil.parseClassTime(argMultimap.getValue(PREFIX_TIME).get()));
+ }
+ if (argMultimap.getValue(PREFIX_VENUE).isPresent()) {
+ editAdminDescriptor.setVenue(ParserUtil.parseClassVenue(argMultimap.getValue(PREFIX_VENUE).get()));
+ }
+ if (argMultimap.getValue(PREFIX_FEE).isPresent()) {
+ editAdminDescriptor.setFee(ParserUtil.parseFee(argMultimap.getValue(PREFIX_FEE).get()));
}
- Collection<String> tagSet = tags.size() == 1 && tags.contains("") ? Collections.emptySet() : tags;
- return Optional.of(ParserUtil.parseTags(tagSet));
+ if (argMultimap.getValue(PREFIX_PAYMENT).isPresent()) {
+ editAdminDescriptor.setPaymentDate(ParserUtil.parsePaymentDate(argMultimap.getValue(PREFIX_PAYMENT).get()));
+ }
+
+ return editAdminDescriptor;
}
}
diff --git a/src/main/java/seedu/address/logic/parser/ExamCommandParser.java b/src/main/java/seedu/address/logic/parser/ExamCommandParser.java
new file mode 100644
index 00000000000..026b8ee9ae7
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/ExamCommandParser.java
@@ -0,0 +1,135 @@
+package seedu.address.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.commands.ExamCommand.MESSAGE_USAGE;
+import static seedu.address.logic.parser.CliSyntax.EXAM_COMMAND_PREFIXES;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_EXAM_DATE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_EXAM_INDEX;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_EXAM_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SCORE;
+import static seedu.address.logic.parser.ReeveParser.BASIC_COMMAND_FORMAT;
+
+import java.time.LocalDate;
+import java.util.regex.Matcher;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.AddExamCommand;
+import seedu.address.logic.commands.DeleteExamCommand;
+import seedu.address.logic.commands.ExamCommand;
+import seedu.address.logic.commands.ExamStatsCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.student.academic.exam.Exam;
+import seedu.address.model.student.academic.exam.Score;
+
+/**
+ * Parses input arguments and creates a new ExamCommand object.
+ */
+public class ExamCommandParser extends PrefixDependentParser<ExamCommand> {
+
+ private static final String ERROR_ADD_EXAM =
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddExamCommand.MESSAGE_USAGE);
+ private static final String ERROR_DEL_EXAM =
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteExamCommand.MESSAGE_USAGE);
+
+ //@@author hogantan
+ /**
+ * Parses the given {@code String} of arguments in the context of the ExamCommand
+ * and returns an ExamCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format.
+ */
+ public ExamCommand parse(String args) throws ParseException {
+
+ final Matcher matcher = BASIC_COMMAND_FORMAT.matcher(args.trim());
+ if (!matcher.matches()) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ MESSAGE_USAGE));
+ }
+
+ final String commandWord = matcher.group("commandWord");
+ final String arguments = matcher.group("arguments");
+
+ switch (commandWord) {
+
+ case AddExamCommand.COMMAND_WORD:
+ return parseAddExamCommand(arguments);
+
+ case DeleteExamCommand.COMMAND_WORD:
+ return parseDelExamCommand(arguments);
+
+ case ExamStatsCommand.COMMAND_WORD:
+ return parseExamStatsCommand(arguments);
+
+ default:
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ MESSAGE_USAGE));
+ }
+ }
+
+ /**
+ * Parses the given {@code String} of arguments in the context of the AddExamCommand
+ * and returns an AddExamCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format.
+ */
+ private AddExamCommand parseAddExamCommand(String args) throws ParseException {
+ requireNonNull(args);
+ ArgumentMultimap argMultimap =
+ ArgumentTokenizer.tokenize(args, EXAM_COMMAND_PREFIXES);
+
+ if (!areRequiredPrefixesPresent(argMultimap, EXAM_COMMAND_PREFIXES)) {
+ throw new ParseException(ERROR_ADD_EXAM);
+ }
+
+ Index index;
+
+ try {
+ index = ParserUtil.parseIndex(argMultimap.getPreamble());
+ } catch (ParseException pe) {
+ throw new ParseException(ERROR_ADD_EXAM, pe);
+ }
+
+ String examName = ParserUtil.parseExamName(argMultimap.getValue(PREFIX_EXAM_NAME).get());
+ LocalDate examDate = ParserUtil.parseDate(argMultimap.getValue(PREFIX_EXAM_DATE).get());
+ Score score = ParserUtil.parseScore(argMultimap.getValue(PREFIX_SCORE).get().trim());
+
+ Exam exam = new Exam(examName, examDate, score);
+ return new AddExamCommand(index, exam);
+ }
+
+ /**
+ * Parses the given {@code String} of arguments in the context of the DeleteExamCommand
+ * and returns an DeleteExamCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format.
+ */
+ private DeleteExamCommand parseDelExamCommand(String args) throws ParseException {
+ ArgumentMultimap argMultimap =
+ ArgumentTokenizer.tokenize(args, PREFIX_EXAM_INDEX);
+
+ if (!areRequiredPrefixesPresent(argMultimap, PREFIX_EXAM_INDEX)) {
+ throw new ParseException(ERROR_DEL_EXAM);
+ }
+
+ Index studentIndex;
+ Index examIndex;
+
+ try {
+ studentIndex = ParserUtil.parseIndex(argMultimap.getPreamble());
+ examIndex = ParserUtil.parseIndex(argMultimap.getValue(PREFIX_EXAM_INDEX).get());
+ } catch (ParseException pe) {
+ throw new ParseException(ERROR_DEL_EXAM, pe);
+ }
+
+ return new DeleteExamCommand(studentIndex, examIndex);
+ }
+
+ private ExamStatsCommand parseExamStatsCommand(String args) throws ParseException {
+ try {
+ Index index = ParserUtil.parseIndex(args);
+ return new ExamStatsCommand(index);
+ } catch (ParseException pe) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, ExamStatsCommand.MESSAGE_USAGE), pe);
+ }
+ }
+ //@@author
+}
diff --git a/src/main/java/seedu/address/logic/parser/FindCommandParser.java b/src/main/java/seedu/address/logic/parser/FindCommandParser.java
index 4fb71f23103..bf4bab25781 100644
--- a/src/main/java/seedu/address/logic/parser/FindCommandParser.java
+++ b/src/main/java/seedu/address/logic/parser/FindCommandParser.java
@@ -1,12 +1,21 @@
package seedu.address.logic.parser;
+import static java.util.Objects.requireNonNull;
import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CliSyntax.FIND_SUPPORTED_PREFIXES;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SCHOOL;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_YEAR;
-import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
import seedu.address.logic.commands.FindCommand;
import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
+import seedu.address.model.student.NameContainsKeywordsPredicate;
+import seedu.address.model.student.SchoolContainsKeywordsPredicate;
+import seedu.address.model.student.Year;
+import seedu.address.model.student.YearMatchPredicate;
/**
* Parses input arguments and creates a new FindCommand object
@@ -19,15 +28,48 @@ public class FindCommandParser implements Parser<FindCommand> {
* @throws ParseException if the user input does not conform the expected format
*/
public FindCommand parse(String args) throws ParseException {
- String trimmedArgs = args.trim();
- if (trimmedArgs.isEmpty()) {
- throw new ParseException(
- String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindCommand.MESSAGE_USAGE));
+ requireNonNull(args);
+ ArgumentMultimap argMultimap =
+ ArgumentTokenizer.tokenize(args, FIND_SUPPORTED_PREFIXES);
+
+ if (!anyPrefixesPresent(argMultimap, FIND_SUPPORTED_PREFIXES)
+ || !argMultimap.getPreamble().isEmpty()) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindCommand.MESSAGE_USAGE));
}
- String[] nameKeywords = trimmedArgs.split("\\s+");
+ FindCommand.FindStudentDescriptor findStudentDescriptor = new FindCommand.FindStudentDescriptor();
+
+ if (argMultimap.getValue(PREFIX_NAME).isPresent()) {
+ String name = argMultimap.getValue(PREFIX_NAME).get();
+ String[] nameKeywords = name.split("\\s+");
+ List<String> nameKeywordsList = List.of(nameKeywords);
+ findStudentDescriptor.setNamePredicate(new NameContainsKeywordsPredicate(nameKeywordsList));
+ }
+ if (argMultimap.getValue(PREFIX_SCHOOL).isPresent()) {
+ String school = argMultimap.getValue(PREFIX_SCHOOL).get();
+ String[] schoolKeywords = school.split("\\s+");
+ List<String> schoolKeywordsList = List.of(schoolKeywords);
+ findStudentDescriptor.setSchoolPredicate(new SchoolContainsKeywordsPredicate(schoolKeywordsList));
+ }
+ if (argMultimap.getValue(PREFIX_YEAR).isPresent()) {
+ String stringYear = argMultimap.getValue(PREFIX_YEAR).get();
+ Year year = ParserUtil.parseYear(stringYear);
+ findStudentDescriptor.setYearPredicate(new YearMatchPredicate(year));
+ }
- return new FindCommand(new NameContainsKeywordsPredicate(Arrays.asList(nameKeywords)));
+ if (!findStudentDescriptor.isAnyPredicatePresent()) {
+ throw new ParseException(FindCommand.FIELD_NOT_GIVEN);
+ }
+
+ return new FindCommand(findStudentDescriptor);
+ }
+
+ /**
+ * Returns true if not all of the prefixes contains empty {@code Optional} values in the given
+ * {@code ArgumentMultimap}.
+ */
+ private boolean anyPrefixesPresent(ArgumentMultimap argumentMultimap, Prefix... prefixes) {
+ return Stream.of(prefixes).anyMatch(prefix -> argumentMultimap.getValue(prefix).isPresent());
}
}
diff --git a/src/main/java/seedu/address/logic/parser/Parser.java b/src/main/java/seedu/address/logic/parser/Parser.java
index d6551ad8e3f..73673a7ae3f 100644
--- a/src/main/java/seedu/address/logic/parser/Parser.java
+++ b/src/main/java/seedu/address/logic/parser/Parser.java
@@ -13,4 +13,5 @@ public interface Parser<T extends Command> {
* @throws ParseException if {@code userInput} does not conform the expected format
*/
T parse(String userInput) throws ParseException;
+
}
diff --git a/src/main/java/seedu/address/logic/parser/ParserUtil.java b/src/main/java/seedu/address/logic/parser/ParserUtil.java
index b117acb9c55..2758f713112 100644
--- a/src/main/java/seedu/address/logic/parser/ParserUtil.java
+++ b/src/main/java/seedu/address/logic/parser/ParserUtil.java
@@ -2,18 +2,35 @@
import static java.util.Objects.requireNonNull;
+import java.time.LocalDate;
+import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.List;
import seedu.address.commons.core.index.Index;
+import seedu.address.commons.util.DateUtil;
import seedu.address.commons.util.StringUtil;
+import seedu.address.logic.commands.ScheduleViewCommand;
import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
+import seedu.address.model.notes.note.Description;
+import seedu.address.model.notes.note.Title;
+import seedu.address.model.schedule.ScheduleViewMode;
+import seedu.address.model.student.Name;
+import seedu.address.model.student.Phone;
+import seedu.address.model.student.School;
+import seedu.address.model.student.Year;
+import seedu.address.model.student.academic.Attendance;
+import seedu.address.model.student.academic.Feedback;
+import seedu.address.model.student.academic.exam.Exam;
+import seedu.address.model.student.academic.exam.Score;
+import seedu.address.model.student.academic.question.Question;
+import seedu.address.model.student.academic.question.SolvedQuestion;
+import seedu.address.model.student.academic.question.UnsolvedQuestion;
+import seedu.address.model.student.admin.ClassTime;
+import seedu.address.model.student.admin.ClassVenue;
+import seedu.address.model.student.admin.Detail;
+import seedu.address.model.student.admin.Fee;
+import seedu.address.model.student.admin.PaymentDate;
/**
* Contains utility methods used for parsing strings in the various *Parser classes.
@@ -25,6 +42,7 @@ public class ParserUtil {
/**
* Parses {@code oneBasedIndex} into an {@code Index} and returns it. Leading and trailing whitespaces will be
* trimmed.
+ *
* @throws ParseException if the specified index is invalid (not non-zero unsigned integer).
*/
public static Index parseIndex(String oneBasedIndex) throws ParseException {
@@ -66,59 +84,286 @@ public static Phone parsePhone(String phone) throws ParseException {
}
/**
- * Parses a {@code String address} into an {@code Address}.
+ * Parses a {@code String school} into a {@code School}.
+ * Leading and trailing whitespaces will be trimmed.
+ *
+ * @throws ParseException if the given {@code phone} is invalid.
+ */
+ public static School parseSchool(String school) throws ParseException {
+ requireNonNull(school);
+ String trimmedSchool = school.trim();
+ if (!School.isValidSchool(trimmedSchool)) {
+ throw new ParseException(School.MESSAGE_CONSTRAINTS);
+ }
+ return new School(trimmedSchool);
+ }
+
+ /**
+ * Parses a {@code String year} into a {@code Year}.
+ * Leading and trailing whitespaces will be trimmed.
+ *
+ * @throws ParseException if the given {@code year} is invalid.
+ */
+ public static Year parseYear(String year) throws ParseException {
+ requireNonNull(year);
+ String trimmedYear = year.trim();
+ if (!Year.isValidYear(trimmedYear)) {
+ throw new ParseException(Year.MESSAGE_CONSTRAINTS);
+ }
+ return new Year(trimmedYear);
+ }
+
+ /**
+ * Parses a {@code String question} into an {@code UnsolvedQuestion}.
+ */
+ public static UnsolvedQuestion parseQuestion(String question) throws ParseException {
+ requireNonNull(question);
+ String trimmedQuestion = question.trim();
+ if (!Question.isValidQuestion(trimmedQuestion)) {
+ throw new ParseException(Question.MESSAGE_CONSTRAINTS);
+ }
+ return new UnsolvedQuestion(trimmedQuestion);
+ }
+
+ /**
+ * Parses a {@code String solution} a trimmed {@code solution}.
+ */
+ public static String parseSolution(String solution) throws ParseException {
+ requireNonNull(solution);
+ String trimmedSolution = solution.trim();
+ if (!SolvedQuestion.isValidSolution(trimmedSolution)) {
+ throw new ParseException(SolvedQuestion.MESSAGE_SOLUTION_CONSTRAINTS);
+ }
+ return trimmedSolution;
+ }
+
+ /**
+ * Parses a {@code String venue} into a {@code ClassVenue}.
+ * Leading and trailing whitespaces will be trimmed.
+ *
+ * @throws ParseException if the given {@code venue} is invalid.
+ */
+ public static ClassVenue parseClassVenue(String venue) throws ParseException {
+ requireNonNull(venue);
+ String trimmedVenue = venue.trim();
+ if (!ClassVenue.isValidClassVenue(trimmedVenue)) {
+ throw new ParseException(ClassVenue.MESSAGE_CONSTRAINTS);
+ }
+ return new ClassVenue(trimmedVenue);
+ }
+
+ /**
+ * Parses a {@code String time} into a {@code ClassTime}.
+ * Leading and trailing whitespaces will be trimmed.
+ *
+ * @throws ParseException if the given {@code time} is invalid.
+ */
+ public static ClassTime parseClassTime(String time) throws ParseException {
+ requireNonNull(time);
+ String trimmedTime = time.trim();
+ if (!ClassTime.isValidClassTime(trimmedTime)) {
+ throw new ParseException(ClassTime.MESSAGE_CONSTRAINTS);
+ } else if (!ClassTime.isValidStartAndEndTime(trimmedTime)) {
+ throw new ParseException(ClassTime.TIME_CONSTRAINTS);
+ }
+ return new ClassTime(trimmedTime);
+ }
+
+ /**
+ * Parses a {@code String fee} into a {@code Fee}.
+ * Leading and trailing whitespaces will be trimmed.
+ *
+ * @throws ParseException if the given {@code fee} is invalid.
+ */
+ public static Fee parseFee(String fee) throws ParseException {
+ requireNonNull(fee);
+ String trimmedFee = fee.trim();
+ if (!Fee.isValidFee(trimmedFee)) {
+ throw new ParseException(Fee.MESSAGE_CONSTRAINTS);
+ }
+ return new Fee(trimmedFee);
+ }
+
+ /**
+ * Parses a {@code String paymentDate} into a {@code PaymentDate}.
+ * Leading and trailing whitespaces will be trimmed.
+ *
+ * @throws ParseException if the given {@code paymentDate} is invalid.
+ */
+ public static PaymentDate parsePaymentDate(String paymentDate) throws ParseException {
+ requireNonNull(paymentDate);
+ String trimmedPaymentDate = paymentDate.trim();
+ if (!PaymentDate.isValidDate(trimmedPaymentDate)) {
+ throw new ParseException(PaymentDate.MESSAGE_CONSTRAINTS);
+ }
+ return new PaymentDate(trimmedPaymentDate);
+ }
+
+ /**
+ * Parses a {@code String detail} into a {@code Detail}.
* Leading and trailing whitespaces will be trimmed.
*
- * @throws ParseException if the given {@code address} is invalid.
+ * @throws ParseException if the given {@code detail} is invalid.
*/
- public static Address parseAddress(String address) throws ParseException {
- requireNonNull(address);
- String trimmedAddress = address.trim();
- if (!Address.isValidAddress(trimmedAddress)) {
- throw new ParseException(Address.MESSAGE_CONSTRAINTS);
+ public static Detail parseDetail(String detail) throws ParseException {
+ requireNonNull(detail);
+ String trimmedDetail = detail.trim();
+ if (!Detail.isValidDetail(trimmedDetail)) {
+ throw new ParseException(Detail.MESSAGE_CONSTRAINTS);
}
- return new Address(trimmedAddress);
+ return new Detail(trimmedDetail);
}
/**
- * Parses a {@code String email} into an {@code Email}.
+ * Parses {@code Collection<String> details} into a {@code List<Detail>}.
+ */
+ public static List<Detail> parseDetails(Collection<String> details)
+ throws ParseException {
+ requireNonNull(details);
+ final List<Detail> detailSet = new ArrayList<>();
+ for (String detail : details) {
+ detailSet.add(parseDetail(detail));
+ }
+ return detailSet;
+ }
+
+ /**
+ * Parses a {@code String title} into a {@code Title}.
* Leading and trailing whitespaces will be trimmed.
*
- * @throws ParseException if the given {@code email} is invalid.
+ * @throws ParseException if the given {@code title} is invalid.
*/
- public static Email parseEmail(String email) throws ParseException {
- requireNonNull(email);
- String trimmedEmail = email.trim();
- if (!Email.isValidEmail(trimmedEmail)) {
- throw new ParseException(Email.MESSAGE_CONSTRAINTS);
+ public static Title parseTitle(String title) throws ParseException {
+ requireNonNull(title);
+ String trimmedTitle = title.trim();
+ if (!Title.isValidTitle(trimmedTitle)) {
+ throw new ParseException(Title.MESSAGE_CONSTRAINTS);
}
- return new Email(trimmedEmail);
+ return new Title(trimmedTitle);
}
/**
- * Parses a {@code String tag} into a {@code Tag}.
+ * Parses a {@code String description} into a {@code Description}.
* Leading and trailing whitespaces will be trimmed.
*
- * @throws ParseException if the given {@code tag} is invalid.
+ * @throws ParseException if the given {@code description} is invalid.
*/
- public static Tag parseTag(String tag) throws ParseException {
- requireNonNull(tag);
- String trimmedTag = tag.trim();
- if (!Tag.isValidTagName(trimmedTag)) {
- throw new ParseException(Tag.MESSAGE_CONSTRAINTS);
+ public static Description parseDescription(String description) throws ParseException {
+ requireNonNull(description);
+ String trimmedDescription = description.trim();
+ if (!Description.isValidDescription(trimmedDescription)) {
+ throw new ParseException(Description.MESSAGE_CONSTRAINTS);
}
- return new Tag(trimmedTag);
+ return new Description(trimmedDescription);
}
/**
- * Parses {@code Collection<String> tags} into a {@code Set<Tag>}.
+ * Parses {@code String input} into a {@code ScheduleViewMode}.
+ * Case of the input string is ignored.
+ *
+ * @throws ParseException if the given {@code string} is of a valid view mode.
*/
- public static Set<Tag> parseTags(Collection<String> tags) throws ParseException {
- requireNonNull(tags);
- final Set<Tag> tagSet = new HashSet<>();
- for (String tagName : tags) {
- tagSet.add(parseTag(tagName));
+ public static ScheduleViewMode parseViewMode(String input) throws ParseException {
+
+ if (input.equalsIgnoreCase(ScheduleViewMode.DAILY.name())) {
+ return ScheduleViewMode.DAILY;
+ }
+
+ if (input.equalsIgnoreCase(ScheduleViewMode.WEEKLY.name())) {
+ return ScheduleViewMode.WEEKLY;
}
- return tagSet;
+ throw new ParseException(ScheduleViewCommand.MESSAGE_INVALID_VIEW_MODE);
}
+
+ /**
+ * Parses a {@code String dateToViewSchedule} into a {@code LocalDate}.
+ * Leading and trailing whitespaces will be trimmed.
+ *
+ * @throws ParseException when input string does not follow the format
+ */
+ public static LocalDate parseViewDate(String dateToViewSchedule) throws ParseException {
+ requireNonNull(dateToViewSchedule);
+ try {
+ return parseDate(dateToViewSchedule);
+ } catch (ParseException e) {
+ throw new ParseException(ScheduleViewCommand.MESSAGE_CONSTRAINTS);
+ }
+
+ }
+
+ /**
+ * Parses a {@code String examName} into a {@code Exam} format {@code String}.
+ * Leading and trailing whitespaces will be trimmed.
+ *
+ * @throws ParseException if the given {@code examName} is invalid.
+ */
+ public static String parseExamName(String examName) throws ParseException {
+ requireNonNull(examName);
+ String trimmedExamName = examName.trim();
+ if (!Exam.isValidExamName(trimmedExamName)) {
+ throw new ParseException(Exam.MESSAGE_CONSTRAINTS);
+ }
+ return trimmedExamName;
+ }
+
+ /**
+ * Parses a {@code String score} into a {@code Score}.
+ * Leading and trailing whitespaces will be trimmed.
+ *
+ * @throws ParseException if the given {@code score} is invalid.
+ */
+ public static Score parseScore(String score) throws ParseException {
+ requireNonNull(score);
+ String trimmedScore = score.trim();
+ if (!Score.isValidExamScore(trimmedScore)) {
+ throw new ParseException(Score.MESSAGE_CONSTRAINTS);
+ }
+ return new Score(trimmedScore);
+ }
+
+ /**
+ * Parses a {@code String attendanceStatus} into a {@code boolean}.
+ * Leading and trailing whitespaces will be trimmed, and case is ignored.
+ *
+ * @throws ParseException if the given {@code attendanceStatus} is invalid.
+ */
+ public static boolean parseAttendanceStatus(String attendanceStatus) throws ParseException {
+ requireNonNull(attendanceStatus);
+ String formattedStatus = attendanceStatus.trim().toLowerCase();
+ if (!Attendance.isValidStatus(formattedStatus)) {
+ throw new ParseException(Attendance.STATUS_CONSTRAINTS);
+ }
+ return formattedStatus.equals(Attendance.PRESENT_STATUS);
+ }
+
+ /**
+ * Parses a {@code String score} into a {@code Feedback}.
+ * Leading and trailing whitespaces will be trimmed.
+ *
+ * @throws ParseException if the given {@code feedback} is invalid.
+ */
+ public static Feedback parseFeedback(String feedback) throws ParseException {
+ requireNonNull(feedback);
+ String trimmedFeedback = feedback.trim();
+ if (!Feedback.isValidFeedback(trimmedFeedback)) {
+ throw new ParseException(Feedback.MESSAGE_CONSTRAINTS);
+ }
+ return new Feedback(trimmedFeedback);
+ }
+
+ /**
+ * Parses a {@code String date} into a {@code LocalDate}.
+ * Leading and trailing whitespaces will be trimmed.
+ *
+ * @throws ParseException if the given {@code date} is not a valid date.
+ */
+ public static LocalDate parseDate(String date) throws ParseException {
+ requireNonNull(date);
+ String trimmedDate = date.trim();
+ if (!DateUtil.isValidDate(trimmedDate)) {
+ throw new ParseException(DateUtil.DATE_CONSTRAINTS);
+ }
+ return DateUtil.parseToDate(trimmedDate);
+ }
+
}
diff --git a/src/main/java/seedu/address/logic/parser/PrefixDependentParser.java b/src/main/java/seedu/address/logic/parser/PrefixDependentParser.java
new file mode 100644
index 00000000000..f0aadfa3d52
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/PrefixDependentParser.java
@@ -0,0 +1,20 @@
+package seedu.address.logic.parser;
+
+import java.util.stream.Stream;
+
+import seedu.address.logic.commands.Command;
+
+/**
+ * Represents a {@code Parser} that makes use of Prefixes in {@link CliSyntax}.
+ */
+public abstract class PrefixDependentParser<T extends Command> implements Parser<T> {
+
+ /**
+ * Returns true if none of the prefixes contains empty {@code Optional} values in the given
+ * {@code ArgumentMultimap}.
+ */
+ protected boolean areRequiredPrefixesPresent(ArgumentMultimap argumentMultimap, Prefix... prefixes) {
+ return Stream.of(prefixes).allMatch(prefix -> argumentMultimap.getValue(prefix).isPresent());
+ }
+
+}
diff --git a/src/main/java/seedu/address/logic/parser/QuestionCommandParser.java b/src/main/java/seedu/address/logic/parser/QuestionCommandParser.java
new file mode 100644
index 00000000000..6df950d9626
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/QuestionCommandParser.java
@@ -0,0 +1,131 @@
+package seedu.address.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CliSyntax.COMMAND_PREFIXES;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_INDEX;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TEXT;
+import static seedu.address.logic.parser.ReeveParser.BASIC_COMMAND_FORMAT;
+
+import java.util.regex.Matcher;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.AddQuestionCommand;
+import seedu.address.logic.commands.DeleteQuestionCommand;
+import seedu.address.logic.commands.QuestionCommand;
+import seedu.address.logic.commands.SolveQuestionCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.student.academic.question.UnsolvedQuestion;
+
+/**
+ * Parses input arguments and creates a QuestionCommand.
+ */
+public class QuestionCommandParser extends PrefixDependentParser<QuestionCommand> {
+
+ private static final String MESSAGE_INVALID_COMMAND =
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, QuestionCommand.MESSAGE_USAGE);
+ private static final String MESSAGE_INVALID_ADD_COMMAND =
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddQuestionCommand.MESSAGE_USAGE);
+ private static final String MESSAGE_INVALID_SOLVE_COMMAND =
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, SolveQuestionCommand.MESSAGE_USAGE);
+ private static final String MESSAGE_INVALID_DEL_COMMAND =
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteQuestionCommand.MESSAGE_USAGE);
+
+ /**
+ * Parses the given {@code String} in the context of a QuestionCommand
+ * and returns a QuestionCommand for execution.
+ *
+ * @throws ParseException if the user input does not conform to the expected format.
+ */
+ @Override
+ public QuestionCommand parse(String userInput) throws ParseException {
+ requireNonNull(userInput);
+
+ Matcher matcher = BASIC_COMMAND_FORMAT.matcher(userInput.trim());
+ if (!matcher.matches()) {
+ throw new ParseException(MESSAGE_INVALID_COMMAND);
+ }
+
+ String commandWord = matcher.group("commandWord");
+ String arguments = matcher.group("arguments");
+
+ switch (commandWord) {
+
+ case AddQuestionCommand.COMMAND_WORD:
+ return parseAddQuestionCommand(arguments);
+
+ case DeleteQuestionCommand.COMMAND_WORD:
+ return parseDeleteQuestionCommand(arguments);
+
+ case SolveQuestionCommand.COMMAND_WORD:
+ return parseSolveQuestionCommand(arguments);
+
+ default:
+ throw new ParseException(MESSAGE_INVALID_COMMAND);
+ }
+ }
+
+ //======Parsers=====//
+
+ private AddQuestionCommand parseAddQuestionCommand(String input) throws ParseException {
+ ArgumentMultimap argMultimap =
+ ArgumentTokenizer.tokenize(input, PREFIX_TEXT);
+
+ if (!areRequiredPrefixesPresent(argMultimap, PREFIX_TEXT)) {
+ throw new ParseException(MESSAGE_INVALID_ADD_COMMAND);
+ }
+
+ Index studentIndex;
+ try {
+ studentIndex = ParserUtil.parseIndex(argMultimap.getPreamble());
+ } catch (ParseException pe) {
+ throw new ParseException(MESSAGE_INVALID_ADD_COMMAND, pe);
+ }
+
+ UnsolvedQuestion questionToAdd = ParserUtil.parseQuestion(argMultimap.getValue(PREFIX_TEXT).get());
+
+ return new AddQuestionCommand(studentIndex, questionToAdd);
+ }
+
+ private SolveQuestionCommand parseSolveQuestionCommand(String input) throws ParseException {
+ ArgumentMultimap argMultimap =
+ ArgumentTokenizer.tokenize(input, COMMAND_PREFIXES);
+
+ if (!areRequiredPrefixesPresent(argMultimap, COMMAND_PREFIXES)) {
+ throw new ParseException(MESSAGE_INVALID_SOLVE_COMMAND);
+ }
+
+ Index studentIndex;
+ Index questionIndex;
+ try {
+ studentIndex = ParserUtil.parseIndex(argMultimap.getPreamble());
+ questionIndex = ParserUtil.parseIndex(argMultimap.getValue(PREFIX_INDEX).get());
+ } catch (ParseException pe) {
+ throw new ParseException(MESSAGE_INVALID_SOLVE_COMMAND, pe);
+ }
+
+ String solution = ParserUtil.parseSolution(argMultimap.getValue(PREFIX_TEXT).get());
+ return new SolveQuestionCommand(studentIndex, questionIndex, solution);
+ }
+
+ private DeleteQuestionCommand parseDeleteQuestionCommand(String input) throws ParseException {
+ ArgumentMultimap argMultimap =
+ ArgumentTokenizer.tokenize(input, PREFIX_INDEX);
+
+ if (!areRequiredPrefixesPresent(argMultimap, PREFIX_INDEX)) {
+ throw new ParseException(MESSAGE_INVALID_DEL_COMMAND);
+ }
+
+ Index studentIndex;
+ Index questionIndex;
+ try {
+ studentIndex = ParserUtil.parseIndex(argMultimap.getPreamble());
+ questionIndex = ParserUtil.parseIndex(argMultimap.getValue(PREFIX_INDEX).get());
+ } catch (ParseException pe) {
+ throw new ParseException(MESSAGE_INVALID_DEL_COMMAND, pe);
+ }
+
+ return new DeleteQuestionCommand(studentIndex, questionIndex);
+ }
+
+}
diff --git a/src/main/java/seedu/address/logic/parser/AddressBookParser.java b/src/main/java/seedu/address/logic/parser/ReeveParser.java
similarity index 60%
rename from src/main/java/seedu/address/logic/parser/AddressBookParser.java
rename to src/main/java/seedu/address/logic/parser/ReeveParser.java
index 1e466792b46..bb140b03ae4 100644
--- a/src/main/java/seedu/address/logic/parser/AddressBookParser.java
+++ b/src/main/java/seedu/address/logic/parser/ReeveParser.java
@@ -7,25 +7,35 @@
import java.util.regex.Pattern;
import seedu.address.logic.commands.AddCommand;
+import seedu.address.logic.commands.AttendanceCommand;
import seedu.address.logic.commands.ClearCommand;
import seedu.address.logic.commands.Command;
import seedu.address.logic.commands.DeleteCommand;
+import seedu.address.logic.commands.DetailCommand;
import seedu.address.logic.commands.EditCommand;
+import seedu.address.logic.commands.ExamCommand;
import seedu.address.logic.commands.ExitCommand;
import seedu.address.logic.commands.FindCommand;
import seedu.address.logic.commands.HelpCommand;
import seedu.address.logic.commands.ListCommand;
+import seedu.address.logic.commands.OverdueCommand;
+import seedu.address.logic.commands.QuestionCommand;
+import seedu.address.logic.commands.ScheduleCommand;
+import seedu.address.logic.commands.SortCommand;
+import seedu.address.logic.commands.ToggleStudentCardCommand;
+import seedu.address.logic.commands.notes.NoteCommand;
import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.logic.parser.notes.NotebookParser;
/**
* Parses user input.
*/
-public class AddressBookParser {
+public class ReeveParser {
/**
* Used for initial separation of command word and args.
*/
- private static final Pattern BASIC_COMMAND_FORMAT = Pattern.compile("(?<commandWord>\\S+)(?<arguments>.*)");
+ public static final Pattern BASIC_COMMAND_FORMAT = Pattern.compile("(?<commandWord>\\S+)(?<arguments>.*)");
/**
* Parses user input into command for execution.
@@ -42,6 +52,7 @@ public Command parseCommand(String userInput) throws ParseException {
final String commandWord = matcher.group("commandWord");
final String arguments = matcher.group("arguments");
+
switch (commandWord) {
case AddCommand.COMMAND_WORD:
@@ -59,6 +70,9 @@ public Command parseCommand(String userInput) throws ParseException {
case FindCommand.COMMAND_WORD:
return new FindCommandParser().parse(arguments);
+ case QuestionCommand.COMMAND_WORD:
+ return new QuestionCommandParser().parse(arguments);
+
case ListCommand.COMMAND_WORD:
return new ListCommand();
@@ -68,6 +82,30 @@ public Command parseCommand(String userInput) throws ParseException {
case HelpCommand.COMMAND_WORD:
return new HelpCommand();
+ case ScheduleCommand.COMMAND_WORD:
+ return new ScheduleCommandParser().parse(arguments);
+
+ case OverdueCommand.COMMAND_WORD:
+ return new OverdueCommand();
+
+ case SortCommand.COMMAND_WORD:
+ return new SortCommandParser().parse(arguments);
+
+ case DetailCommand.COMMAND_WORD:
+ return new DetailCommandParser().parse(arguments);
+
+ case ExamCommand.COMMAND_WORD:
+ return new ExamCommandParser().parse(arguments);
+
+ case AttendanceCommand.COMMAND_WORD:
+ return new AttendanceCommandParser().parse(arguments);
+
+ case ToggleStudentCardCommand.COMMAND_WORD:
+ return new ToggleStudentCardCommand();
+
+ case NoteCommand.COMMAND_WORD:
+ return new NotebookParser().parse(arguments);
+
default:
throw new ParseException(MESSAGE_UNKNOWN_COMMAND);
}
diff --git a/src/main/java/seedu/address/logic/parser/ScheduleCommandParser.java b/src/main/java/seedu/address/logic/parser/ScheduleCommandParser.java
new file mode 100644
index 00000000000..0523fc14456
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/ScheduleCommandParser.java
@@ -0,0 +1,46 @@
+package seedu.address.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_VIEW_DATE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_VIEW_MODE;
+
+import java.time.LocalDate;
+
+import seedu.address.logic.commands.ScheduleCommand;
+import seedu.address.logic.commands.ScheduleViewCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.schedule.ScheduleViewMode;
+
+/**
+ * Parses input arguments and creates a new ScheduleCommand object.
+ */
+public class ScheduleCommandParser extends PrefixDependentParser<ScheduleCommand> {
+
+ /**
+ * Parses the given String and returns a ScheduleCommand with the view mode and viewDateTime.
+ *
+ * @throws ParseException if the user input does not conform the expected date format.
+ */
+ @Override
+ public ScheduleCommand parse(String args) throws ParseException {
+ requireNonNull(args);
+ ArgumentMultimap argMultimap =
+ ArgumentTokenizer.tokenize(args, PREFIX_VIEW_MODE, PREFIX_VIEW_DATE);
+
+
+ if (!areRequiredPrefixesPresent(argMultimap, PREFIX_VIEW_MODE, PREFIX_VIEW_DATE)) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ ScheduleViewCommand.MESSAGE_USAGE));
+ }
+
+ String viewDateTimeString = argMultimap.getValue(PREFIX_VIEW_DATE).get();
+ LocalDate viewDate = (ParserUtil.parseViewDate(viewDateTimeString));
+
+ String viewModeString = argMultimap.getValue(PREFIX_VIEW_MODE).get();
+ ScheduleViewMode viewMode = (ParserUtil.parseViewMode(viewModeString));
+
+ return new ScheduleViewCommand(viewMode, viewDate);
+ }
+
+}
diff --git a/src/main/java/seedu/address/logic/parser/SortCommandParser.java b/src/main/java/seedu/address/logic/parser/SortCommandParser.java
new file mode 100644
index 00000000000..36a546c66b9
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/SortCommandParser.java
@@ -0,0 +1,28 @@
+package seedu.address.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+
+import seedu.address.logic.commands.SortCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+
+/**
+ * Parses input arguments and creates a new SortCommand object
+ */
+public class SortCommandParser implements Parser<SortCommand> {
+
+ /**
+ * Parses the given {@code String} of arguments in the context of the SortCommand
+ * and returns a SortCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public SortCommand parse(String args) throws ParseException {
+ requireNonNull(args);
+ String trimmedArgs = args.trim();
+ if (trimmedArgs.isEmpty() || !SortCommand.isValidComparisonMeans(trimmedArgs)) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, SortCommand.MESSAGE_USAGE));
+ }
+ return new SortCommand(trimmedArgs);
+ }
+}
diff --git a/src/main/java/seedu/address/logic/parser/notes/AddNoteCommandParser.java b/src/main/java/seedu/address/logic/parser/notes/AddNoteCommandParser.java
new file mode 100644
index 00000000000..e69cbfe15c6
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/notes/AddNoteCommandParser.java
@@ -0,0 +1,43 @@
+package seedu.address.logic.parser.notes;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CliSyntax.ALL_NOTE_PREFIXES;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_DESCRIPTION;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TITLE;
+
+import seedu.address.logic.commands.notes.AddNoteCommand;
+import seedu.address.logic.parser.ArgumentMultimap;
+import seedu.address.logic.parser.ArgumentTokenizer;
+import seedu.address.logic.parser.ParserUtil;
+import seedu.address.logic.parser.PrefixDependentParser;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.notes.note.Description;
+import seedu.address.model.notes.note.Note;
+import seedu.address.model.notes.note.Title;
+
+/**
+ * Parses input arguments and creates a new AddCommand object
+ */
+public class AddNoteCommandParser extends PrefixDependentParser<AddNoteCommand> {
+
+ /**
+ * Parses the given {@code String} of arguments in the context of the AddNOteCommand
+ * and returns an AddNoteCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public AddNoteCommand parse(String args) throws ParseException {
+ ArgumentMultimap argMultimap =
+ ArgumentTokenizer.tokenize(args, ALL_NOTE_PREFIXES);
+
+ if (!areRequiredPrefixesPresent(argMultimap, ALL_NOTE_PREFIXES)
+ || !argMultimap.getPreamble().isEmpty()) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddNoteCommand.MESSAGE_USAGE));
+ }
+
+ Title title = ParserUtil.parseTitle(argMultimap.getValue(PREFIX_TITLE).get());
+ Description description = ParserUtil.parseDescription(argMultimap.getValue(PREFIX_DESCRIPTION).get());
+ Note note = new Note(title, description);
+ return new AddNoteCommand(note);
+ }
+
+}
diff --git a/src/main/java/seedu/address/logic/parser/notes/DeleteNoteCommandParser.java b/src/main/java/seedu/address/logic/parser/notes/DeleteNoteCommandParser.java
new file mode 100644
index 00000000000..b341f67a664
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/notes/DeleteNoteCommandParser.java
@@ -0,0 +1,30 @@
+package seedu.address.logic.parser.notes;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.notes.DeleteNoteCommand;
+import seedu.address.logic.parser.Parser;
+import seedu.address.logic.parser.ParserUtil;
+import seedu.address.logic.parser.exceptions.ParseException;
+
+/**
+ * Parses input arguments and creates a new DeleteNoteCommand object
+ */
+public class DeleteNoteCommandParser implements Parser<DeleteNoteCommand> {
+
+ /**
+ * Parses the given {@code String} of arguments in the context of the DeleteNoteCommand
+ * and returns a DeleteNoteCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public DeleteNoteCommand parse(String args) throws ParseException {
+ try {
+ Index index = ParserUtil.parseIndex(args);
+ return new DeleteNoteCommand(index);
+ } catch (ParseException pe) {
+ throw new ParseException(
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteNoteCommand.MESSAGE_USAGE), pe);
+ }
+ }
+}
diff --git a/src/main/java/seedu/address/logic/parser/notes/EditNoteCommandParser.java b/src/main/java/seedu/address/logic/parser/notes/EditNoteCommandParser.java
new file mode 100644
index 00000000000..059351dce97
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/notes/EditNoteCommandParser.java
@@ -0,0 +1,69 @@
+package seedu.address.logic.parser.notes;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CliSyntax.ALL_NOTE_PREFIXES;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_DESCRIPTION;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TITLE;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.notes.EditNoteCommand;
+import seedu.address.logic.commands.notes.EditNoteCommand.EditNoteDescriptor;
+import seedu.address.logic.parser.ArgumentMultimap;
+import seedu.address.logic.parser.ArgumentTokenizer;
+import seedu.address.logic.parser.Parser;
+import seedu.address.logic.parser.ParserUtil;
+import seedu.address.logic.parser.exceptions.ParseException;
+
+/**
+ * Parses input arguments and creates a new EditNoteCommand object
+ */
+public class EditNoteCommandParser implements Parser<EditNoteCommand> {
+
+ /**
+ * Parses the given {@code String} of arguments in the context of the EditNoteCommand
+ * and returns an EditCommand object for execution.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public EditNoteCommand parse(String args) throws ParseException {
+ requireNonNull(args);
+ ArgumentMultimap argMultimap =
+ ArgumentTokenizer.tokenize(args, ALL_NOTE_PREFIXES);
+ Index index;
+
+ try {
+ index = ParserUtil.parseIndex(argMultimap.getPreamble());
+ } catch (ParseException pe) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditNoteCommand.MESSAGE_USAGE), pe);
+ }
+
+ EditNoteDescriptor editNoteDescriptor = this.parseNote(argMultimap);
+
+ if (!editNoteDescriptor.isAnyFieldEdited()) {
+ throw new ParseException(EditNoteCommand.MESSAGE_NOT_EDITED);
+ }
+
+ return new EditNoteCommand(index, editNoteDescriptor);
+ }
+
+ /**
+ * Parses given input note fields into discernible values.
+ * @param argMultimap Tokenized input by user.
+ * @return EditNoteDescriptor with parsed values to edit.
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ private EditNoteCommand.EditNoteDescriptor parseNote(ArgumentMultimap argMultimap) throws ParseException {
+ EditNoteDescriptor editNoteDescriptor = new EditNoteDescriptor();
+
+ if (argMultimap.getValue(PREFIX_TITLE).isPresent()) {
+ editNoteDescriptor.setTitle(ParserUtil.parseTitle(argMultimap.getValue(PREFIX_TITLE).get()));
+ }
+ if (argMultimap.getValue(PREFIX_DESCRIPTION).isPresent()) {
+ editNoteDescriptor.setDescription(ParserUtil.parseDescription(
+ argMultimap.getValue(PREFIX_DESCRIPTION).get()));
+ }
+
+ return editNoteDescriptor;
+ }
+
+}
diff --git a/src/main/java/seedu/address/logic/parser/notes/NotebookParser.java b/src/main/java/seedu/address/logic/parser/notes/NotebookParser.java
new file mode 100644
index 00000000000..a0727a7c630
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/notes/NotebookParser.java
@@ -0,0 +1,55 @@
+package seedu.address.logic.parser.notes;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import seedu.address.logic.commands.notes.AddNoteCommand;
+import seedu.address.logic.commands.notes.DeleteNoteCommand;
+import seedu.address.logic.commands.notes.EditNoteCommand;
+import seedu.address.logic.commands.notes.NoteCommand;
+import seedu.address.logic.parser.Parser;
+import seedu.address.logic.parser.exceptions.ParseException;
+
+public class NotebookParser implements Parser<NoteCommand> {
+
+ /**
+ * Used for initial separation of note command word and args.
+ */
+ private static final Pattern BASIC_NOTE_COMMAND_FORMAT =
+ Pattern.compile("(?<noteCommandWord>\\S+)(?<arguments>.*)");
+
+ /**
+ * Parses user input into specific note command for execution.
+ *
+ * @param userInput full user input string
+ * @return the command based on the user input
+ * @throws ParseException if the user input does not conform the expected format
+ */
+ public NoteCommand parse(String userInput) throws ParseException {
+ final Matcher matcher = BASIC_NOTE_COMMAND_FORMAT.matcher(userInput.trim());
+ if (!matcher.matches()) {
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, NoteCommand.MESSAGE_USAGE));
+ }
+
+ final String commandWord = matcher.group("noteCommandWord");
+ final String arguments = matcher.group("arguments");
+
+ switch (commandWord) {
+
+ case AddNoteCommand.COMMAND_WORD:
+ return new AddNoteCommandParser().parse(arguments);
+
+ case EditNoteCommand.COMMAND_WORD:
+ return new EditNoteCommandParser().parse(arguments);
+
+ case DeleteNoteCommand.COMMAND_WORD:
+ return new DeleteNoteCommandParser().parse(arguments);
+
+ default:
+ throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, NoteCommand.MESSAGE_USAGE));
+ }
+ }
+
+}
diff --git a/src/main/java/seedu/address/model/AddressBook.java b/src/main/java/seedu/address/model/AddressBook.java
deleted file mode 100644
index 1a943a0781a..00000000000
--- a/src/main/java/seedu/address/model/AddressBook.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package seedu.address.model;
-
-import static java.util.Objects.requireNonNull;
-
-import java.util.List;
-
-import javafx.collections.ObservableList;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.UniquePersonList;
-
-/**
- * Wraps all data at the address-book level
- * Duplicates are not allowed (by .isSamePerson comparison)
- */
-public class AddressBook implements ReadOnlyAddressBook {
-
- private final UniquePersonList persons;
-
- /*
- * The 'unusual' code block below is a non-static initialization block, sometimes used to avoid duplication
- * between constructors. See https://docs.oracle.com/javase/tutorial/java/javaOO/initial.html
- *
- * Note that non-static init blocks are not recommended to use. There are other ways to avoid duplication
- * among constructors.
- */
- {
- persons = new UniquePersonList();
- }
-
- public AddressBook() {}
-
- /**
- * Creates an AddressBook using the Persons in the {@code toBeCopied}
- */
- public AddressBook(ReadOnlyAddressBook toBeCopied) {
- this();
- resetData(toBeCopied);
- }
-
- //// list overwrite operations
-
- /**
- * Replaces the contents of the person list with {@code persons}.
- * {@code persons} must not contain duplicate persons.
- */
- public void setPersons(List<Person> persons) {
- this.persons.setPersons(persons);
- }
-
- /**
- * Resets the existing data of this {@code AddressBook} with {@code newData}.
- */
- public void resetData(ReadOnlyAddressBook newData) {
- requireNonNull(newData);
-
- setPersons(newData.getPersonList());
- }
-
- //// person-level operations
-
- /**
- * Returns true if a person with the same identity as {@code person} exists in the address book.
- */
- public boolean hasPerson(Person person) {
- requireNonNull(person);
- return persons.contains(person);
- }
-
- /**
- * Adds a person to the address book.
- * The person must not already exist in the address book.
- */
- public void addPerson(Person p) {
- persons.add(p);
- }
-
- /**
- * Replaces the given person {@code target} in the list with {@code editedPerson}.
- * {@code target} must exist in the address book.
- * The person identity of {@code editedPerson} must not be the same as another existing person in the address book.
- */
- public void setPerson(Person target, Person editedPerson) {
- requireNonNull(editedPerson);
-
- persons.setPerson(target, editedPerson);
- }
-
- /**
- * Removes {@code key} from this {@code AddressBook}.
- * {@code key} must exist in the address book.
- */
- public void removePerson(Person key) {
- persons.remove(key);
- }
-
- //// util methods
-
- @Override
- public String toString() {
- return persons.asUnmodifiableObservableList().size() + " persons";
- // TODO: refine later
- }
-
- @Override
- public ObservableList<Person> getPersonList() {
- return persons.asUnmodifiableObservableList();
- }
-
- @Override
- public boolean equals(Object other) {
- return other == this // short circuit if same object
- || (other instanceof AddressBook // instanceof handles nulls
- && persons.equals(((AddressBook) other).persons));
- }
-
- @Override
- public int hashCode() {
- return persons.hashCode();
- }
-}
diff --git a/src/main/java/seedu/address/model/Model.java b/src/main/java/seedu/address/model/Model.java
index d54df471c1f..16d6e7b49a4 100644
--- a/src/main/java/seedu/address/model/Model.java
+++ b/src/main/java/seedu/address/model/Model.java
@@ -1,18 +1,35 @@
package seedu.address.model;
import java.nio.file.Path;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Comparator;
import java.util.function.Predicate;
import javafx.collections.ObservableList;
+import jfxtras.icalendarfx.components.VEvent;
import seedu.address.commons.core.GuiSettings;
-import seedu.address.model.person.Person;
+import seedu.address.model.notes.ReadOnlyNotebook;
+import seedu.address.model.notes.note.Note;
+import seedu.address.model.schedule.ReadOnlyEvent;
+import seedu.address.model.schedule.ScheduleViewMode;
+import seedu.address.model.student.NameComparator;
+import seedu.address.model.student.Student;
/**
* The API of the Model component.
*/
public interface Model {
- /** {@code Predicate} that always evaluate to true */
- Predicate<Person> PREDICATE_SHOW_ALL_PERSONS = unused -> true;
+
+ /**
+ * {@code Predicate} that always evaluate to true
+ */
+ Predicate<Student> PREDICATE_SHOW_ALL_STUDENTS = unused -> true;
+
+ /**
+ * An instance of {@code NameComparator}
+ */
+ Comparator<Student> COMPARATOR_NAME = new NameComparator();
/**
* Replaces user prefs data with the data in {@code userPrefs}.
@@ -47,41 +64,123 @@ public interface Model {
/**
* Replaces address book data with the data in {@code addressBook}.
*/
- void setAddressBook(ReadOnlyAddressBook addressBook);
+ void setReeve(ReadOnlyReeve reeve);
- /** Returns the AddressBook */
- ReadOnlyAddressBook getAddressBook();
+ /**
+ * Returns the AddressBook
+ */
+ ReadOnlyReeve getReeve();
/**
* Returns true if a person with the same identity as {@code person} exists in the address book.
*/
- boolean hasPerson(Person person);
+ boolean hasStudent(Student student);
/**
* Deletes the given person.
* The person must exist in the address book.
*/
- void deletePerson(Person target);
+ void deleteStudent(Student target);
/**
* Adds the given person.
* {@code person} must not already exist in the address book.
*/
- void addPerson(Person person);
+ void addStudent(Student student);
/**
* Replaces the given person {@code target} with {@code editedPerson}.
* {@code target} must exist in the address book.
* The person identity of {@code editedPerson} must not be the same as another existing person in the address book.
*/
- void setPerson(Person target, Person editedPerson);
+ void setStudent(Student target, Student editedStudent);
/** Returns an unmodifiable view of the filtered person list */
- ObservableList<Person> getFilteredPersonList();
+ ObservableList<Student> getFilteredStudentList();
+
+
+ // =========== schedule ================================================================================
+
+ /**
+ * Returns the current schedule.
+ */
+ ReadOnlyEvent getSchedule();
+
+ /**
+ * Gets the current schedule viewing date time.
+ */
+ LocalDateTime getScheduleViewDateTime();
+
+ /**
+ * Set the viewing date time of the schedule.
+ */
+ void setScheduleViewDate(LocalDate targetDate);
+
+ /**
+ * Returns the current schedule view mode
+ */
+ ScheduleViewMode getScheduleViewMode();
+
+ /**
+ * Sets the schedule view mode to either week view or day view.
+ */
+ void setScheduleViewMode(ScheduleViewMode viewMode);
+
+ /**
+ * Returns the VEvent list used for jfxtras iCalendar.
+ */
+ ObservableList<VEvent> getVEventList();
+
+ void updateFilteredStudentList(Predicate<Student> predicate);
+
+ /**
+ * Returns an unmodifiable view of the sorted person list
+ */
+ ObservableList<Student> getSortedStudentList();
+
+ /**
+ * Sorts the internal list in reeve by the given {@code comparator}
+ */
+ void updateSortedStudentList(Comparator<? super Student> cmp);
+
+ void updateClassTimesToEvent();
+
+ ObservableList<VEvent> getLessonEventsList();
+
+ boolean hasClashingClassTimeWith(Student toCheck);
+
+ /**
+ * Replaces notebook data with the data in {@code notebook}.
+ */
+ void setNotebook(ReadOnlyNotebook notebook);
/**
- * Updates the filter of the filtered person list to filter by the given {@code predicate}.
- * @throws NullPointerException if {@code predicate} is null.
+ * Returns the Notebook
*/
- void updateFilteredPersonList(Predicate<Person> predicate);
+ ReadOnlyNotebook getNotebook();
+
+ /**
+ * Returns true if a note with the same title as {@code note} exists in the notebook.
+ */
+ boolean hasNote(Note note);
+
+ /**
+ * Deletes the given note.
+ * The note must exist in the notebook.
+ */
+ void deleteNote(Note target);
+
+ /**
+ * Adds the given note.
+ * {@code note} must not already exist in the notebook.
+ */
+ void addNote(Note note);
+
+ /**
+ * Replaces the given note {@code target} with {@code editedNote}.
+ * {@code target} must exist in the notebook.
+ * The person identity of {@code editedNote} must not be the same as another existing person in the notebook.
+ */
+ void setNote(Note target, Note editedNote);
+
}
diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java
index 0650c954f5c..817c096a02e 100644
--- a/src/main/java/seedu/address/model/ModelManager.java
+++ b/src/main/java/seedu/address/model/ModelManager.java
@@ -4,14 +4,27 @@
import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
import java.nio.file.Path;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Comparator;
import java.util.function.Predicate;
import java.util.logging.Logger;
import javafx.collections.ObservableList;
import javafx.collections.transformation.FilteredList;
+import javafx.collections.transformation.SortedList;
+import jfxtras.icalendarfx.components.VEvent;
import seedu.address.commons.core.GuiSettings;
import seedu.address.commons.core.LogsCenter;
-import seedu.address.model.person.Person;
+import seedu.address.model.notes.Notebook;
+import seedu.address.model.notes.ReadOnlyNotebook;
+import seedu.address.model.notes.note.Note;
+import seedu.address.model.schedule.ReadOnlyEvent;
+import seedu.address.model.schedule.SchedulePrefs;
+import seedu.address.model.schedule.ScheduleViewMode;
+import seedu.address.model.schedule.Scheduler;
+import seedu.address.model.student.NameComparator;
+import seedu.address.model.student.Student;
/**
* Represents the in-memory model of the address book data.
@@ -19,26 +32,35 @@
public class ModelManager implements Model {
private static final Logger logger = LogsCenter.getLogger(ModelManager.class);
- private final AddressBook addressBook;
+ private final Reeve reeve;
private final UserPrefs userPrefs;
- private final FilteredList<Person> filteredPersons;
+ private final FilteredList<Student> filteredStudents;
+ private final Scheduler scheduler;
+ private final SchedulePrefs schedulePrefs;
+ private final SortedList<Student> sortedStudents;
+ private final Notebook notebook;
/**
- * Initializes a ModelManager with the given addressBook and userPrefs.
+ * Initializes a ModelManager with the given addressBook, userPrefs and notebook.
*/
- public ModelManager(ReadOnlyAddressBook addressBook, ReadOnlyUserPrefs userPrefs) {
+ public ModelManager(ReadOnlyReeve addressBook, ReadOnlyUserPrefs userPrefs, ReadOnlyNotebook notebook) {
super();
requireAllNonNull(addressBook, userPrefs);
- logger.fine("Initializing with address book: " + addressBook + " and user prefs " + userPrefs);
+ logger.fine("Initializing with reeve: " + addressBook + " , user prefs " + userPrefs + "and "
+ + "notebook: " + notebook);
- this.addressBook = new AddressBook(addressBook);
+ this.reeve = new Reeve(addressBook);
this.userPrefs = new UserPrefs(userPrefs);
- filteredPersons = new FilteredList<>(this.addressBook.getPersonList());
+ filteredStudents = new FilteredList<>(this.reeve.getStudentList());
+ this.scheduler = new Scheduler();
+ this.schedulePrefs = new SchedulePrefs(ScheduleViewMode.WEEKLY, LocalDate.now());
+ sortedStudents = new SortedList<>(this.filteredStudents, new NameComparator());
+ this.notebook = new Notebook(notebook);
}
public ModelManager() {
- this(new AddressBook(), new UserPrefs());
+ this(new Reeve(), new UserPrefs(), new Notebook());
}
//=========== UserPrefs ==================================================================================
@@ -79,56 +101,139 @@ public void setAddressBookFilePath(Path addressBookFilePath) {
//=========== AddressBook ================================================================================
@Override
- public void setAddressBook(ReadOnlyAddressBook addressBook) {
- this.addressBook.resetData(addressBook);
+ public void setReeve(ReadOnlyReeve reeve) {
+ this.reeve.resetData(reeve);
}
@Override
- public ReadOnlyAddressBook getAddressBook() {
- return addressBook;
+ public ReadOnlyReeve getReeve() {
+ return reeve;
}
@Override
- public boolean hasPerson(Person person) {
- requireNonNull(person);
- return addressBook.hasPerson(person);
+ public boolean hasStudent(Student student) {
+ requireNonNull(student);
+ return reeve.hasStudent(student);
}
@Override
- public void deletePerson(Person target) {
- addressBook.removePerson(target);
+ public void deleteStudent(Student target) {
+ reeve.removeStudent(target);
}
@Override
- public void addPerson(Person person) {
- addressBook.addPerson(person);
- updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
+ public void addStudent(Student student) {
+ reeve.addStudent(student);
+ updateFilteredStudentList(PREDICATE_SHOW_ALL_STUDENTS);
}
@Override
- public void setPerson(Person target, Person editedPerson) {
- requireAllNonNull(target, editedPerson);
-
- addressBook.setPerson(target, editedPerson);
+ public void setStudent(Student target, Student editedStudent) {
+ requireAllNonNull(target, editedStudent);
+ reeve.setStudent(target, editedStudent);
}
- //=========== Filtered Person List Accessors =============================================================
+ //=========== Filtered Student List Accessors =============================================================
/**
- * Returns an unmodifiable view of the list of {@code Person} backed by the internal list of
+ * Returns an unmodifiable view of the list of {@code Student} backed by the internal list of
* {@code versionedAddressBook}
*/
@Override
- public ObservableList<Person> getFilteredPersonList() {
- return filteredPersons;
+ public ObservableList<Student> getFilteredStudentList() {
+ return filteredStudents;
}
@Override
- public void updateFilteredPersonList(Predicate<Person> predicate) {
+ public void updateFilteredStudentList(Predicate<Student> predicate) {
requireNonNull(predicate);
- filteredPersons.setPredicate(predicate);
+ filteredStudents.setPredicate(predicate);
+ }
+
+ //=========== schedule ================================================================================
+
+ @Override
+ public ReadOnlyEvent getSchedule() {
+ return scheduler;
+ }
+
+ @Override
+ public LocalDateTime getScheduleViewDateTime() {
+ return schedulePrefs.getViewDate();
+ }
+
+ @Override
+ public void setScheduleViewDate(LocalDate viewDate) {
+ schedulePrefs.setViewDate(viewDate);
+ }
+
+ @Override
+ public ScheduleViewMode getScheduleViewMode() {
+ return schedulePrefs.getViewMode();
+ }
+
+ @Override
+ public void setScheduleViewMode(ScheduleViewMode viewMode) {
+ schedulePrefs.setViewMode(viewMode);
}
+ @Override
+ public ObservableList<VEvent> getVEventList() {
+ return scheduler.getVEvents();
+ }
+
+ //=========== Sorted Student List Accessors ===============================================================
+
+ /**
+ * Returns an unmodifiable view of the list of {@code Student} backed by the internal list of
+ * {@code versionedAddressBook}
+ */
+ @Override
+ public ObservableList<Student> getSortedStudentList() {
+ return sortedStudents;
+ }
+
+ @Override
+ public void updateSortedStudentList(Comparator<? super Student> comparator) {
+ requireNonNull(comparator);
+ sortedStudents.setComparator(comparator);
+ }
+
+ //=========== Notebook =====================================================================================
+
+ @Override
+ public void setNotebook(ReadOnlyNotebook notebook) {
+ this.notebook.resetData(notebook);
+ }
+
+ @Override
+ public ReadOnlyNotebook getNotebook() {
+ return notebook;
+ }
+
+ @Override
+ public boolean hasNote(Note note) {
+ requireNonNull(note);
+ return notebook.hasNote(note);
+ }
+
+ @Override
+ public void deleteNote(Note target) {
+ notebook.removeNote(target);
+ }
+
+ @Override
+ public void addNote(Note note) {
+ notebook.addNote(note);
+ }
+
+ @Override
+ public void setNote(Note target, Note editedNote) {
+ requireAllNonNull(target, editedNote);
+ notebook.setNote(target, editedNote);
+ }
+
+
@Override
public boolean equals(Object obj) {
// short circuit if same object
@@ -143,9 +248,26 @@ public boolean equals(Object obj) {
// state check
ModelManager other = (ModelManager) obj;
- return addressBook.equals(other.addressBook)
+ return reeve.equals(other.reeve)
&& userPrefs.equals(other.userPrefs)
- && filteredPersons.equals(other.filteredPersons);
+ && filteredStudents.equals(other.filteredStudents)
+ && notebook.equals(other.notebook);
+ }
+
+ @Override
+ public void updateClassTimesToEvent() {
+ scheduler.mapClassTimesToLessonEvent(reeve.getStudentList());
+ }
+
+ @Override
+ public ObservableList<VEvent> getLessonEventsList() {
+ updateClassTimesToEvent();
+ return scheduler.getVEvents();
}
+ @Override
+ public boolean hasClashingClassTimeWith(Student toCheck) {
+ return reeve.hasClashingClassTimeWith(toCheck);
+ }
}
+
diff --git a/src/main/java/seedu/address/model/ReadOnlyAddressBook.java b/src/main/java/seedu/address/model/ReadOnlyReeve.java
similarity index 67%
rename from src/main/java/seedu/address/model/ReadOnlyAddressBook.java
rename to src/main/java/seedu/address/model/ReadOnlyReeve.java
index 6ddc2cd9a29..e8bbe48ca91 100644
--- a/src/main/java/seedu/address/model/ReadOnlyAddressBook.java
+++ b/src/main/java/seedu/address/model/ReadOnlyReeve.java
@@ -1,17 +1,17 @@
package seedu.address.model;
import javafx.collections.ObservableList;
-import seedu.address.model.person.Person;
+import seedu.address.model.student.Student;
/**
* Unmodifiable view of an address book
*/
-public interface ReadOnlyAddressBook {
+public interface ReadOnlyReeve {
/**
* Returns an unmodifiable view of the persons list.
* This list will not contain any duplicate persons.
*/
- ObservableList<Person> getPersonList();
+ ObservableList<Student> getStudentList();
}
diff --git a/src/main/java/seedu/address/model/ReadOnlyUserPrefs.java b/src/main/java/seedu/address/model/ReadOnlyUserPrefs.java
index befd58a4c73..c4dd1eb7724 100644
--- a/src/main/java/seedu/address/model/ReadOnlyUserPrefs.java
+++ b/src/main/java/seedu/address/model/ReadOnlyUserPrefs.java
@@ -13,4 +13,8 @@ public interface ReadOnlyUserPrefs {
Path getAddressBookFilePath();
+ Path getScheduleFilePath();
+
+ Path getNotebookFilePath();
+
}
diff --git a/src/main/java/seedu/address/model/Reeve.java b/src/main/java/seedu/address/model/Reeve.java
new file mode 100644
index 00000000000..e0eaca13ff6
--- /dev/null
+++ b/src/main/java/seedu/address/model/Reeve.java
@@ -0,0 +1,128 @@
+package seedu.address.model;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.List;
+
+import javafx.collections.ObservableList;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.UniqueStudentList;
+
+/**
+ * Wraps all data at the Reeve level
+ * Duplicates are not allowed (by .isSameStudent comparison)
+ */
+public class Reeve implements ReadOnlyReeve {
+
+ private final UniqueStudentList students;
+
+ /*
+ * The 'unusual' code block below is a non-static initialization block, sometimes used to avoid duplication
+ * between constructors. See https://docs.oracle.com/javase/tutorial/java/javaOO/initial.html
+ *
+ * Note that non-static init blocks are not recommended to use. There are other ways to avoid duplication
+ * among constructors.
+ */
+ {
+ students = new UniqueStudentList();
+ }
+
+ public Reeve() {}
+
+ /**
+ * Creates a Reeve using the Students in the {@code toBeCopied}
+ */
+ public Reeve(ReadOnlyReeve toBeCopied) {
+ this();
+ resetData(toBeCopied);
+ }
+
+ //// list overwrite operations
+
+ /**
+ * Replaces the contents of the student list with {@code students}.
+ * {@code students} must not contain duplicate students.
+ */
+ public void setStudents(List<Student> students) {
+ this.students.setStudents(students);
+ }
+
+ /**
+ * Resets the existing data of this {@code Reeve} with {@code newData}.
+ */
+ public void resetData(ReadOnlyReeve newData) {
+ requireNonNull(newData);
+
+ setStudents(newData.getStudentList());
+ }
+
+ //// student-level operations
+
+ /**
+ * Returns true if a student with the same identity as {@code student} exists in Reeve.
+ */
+ public boolean hasStudent(Student student) {
+ requireNonNull(student);
+ return students.contains(student);
+ }
+
+ /**
+ * Adds a student to Reeve.
+ * The student must not already exist in Reeve.
+ */
+ public void addStudent(Student p) {
+ students.add(p);
+ }
+
+ /**
+ * Replaces the given student {@code target} in the list with {@code editedStudent}.
+ * {@code target} must exist in Reeve.
+ * The student identity of {@code editedStudent} must not be the same as another existing student
+ * in Reeve.
+ */
+ public void setStudent(Student target, Student editedStudent) {
+ requireNonNull(editedStudent);
+
+ students.setStudent(target, editedStudent);
+ }
+
+ /**
+ * Removes {@code key} from this {@code Reeve}.
+ * {@code key} must exist in Reeve.
+ */
+ public void removeStudent(Student key) {
+ students.remove(key);
+ }
+
+ /**
+ * Returns true if the given student clashes with another student's lesson time.
+ */
+ public boolean hasClashingClassTimeWith(Student test) {
+ return students.hasClashingClassTimeWith(test);
+ }
+
+ //// util methods
+
+ @Override
+ public String toString() {
+ return students.asUnmodifiableObservableList().size() + " students";
+ // TODO: refine later
+ }
+
+ @Override
+ public ObservableList<Student> getStudentList() {
+ return students.asUnmodifiableObservableList();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof Reeve // instanceof handles nulls
+ && students.equals(((Reeve) other).students));
+ }
+
+ @Override
+ public int hashCode() {
+ return students.hashCode();
+ }
+}
diff --git a/src/main/java/seedu/address/model/UserPrefs.java b/src/main/java/seedu/address/model/UserPrefs.java
index 25a5fd6eab9..549c845a53f 100644
--- a/src/main/java/seedu/address/model/UserPrefs.java
+++ b/src/main/java/seedu/address/model/UserPrefs.java
@@ -15,6 +15,8 @@ public class UserPrefs implements ReadOnlyUserPrefs {
private GuiSettings guiSettings = new GuiSettings();
private Path addressBookFilePath = Paths.get("data" , "addressbook.json");
+ private Path scheduleFilePath = Paths.get("data", "schedule.json");
+ private Path notebookFilePath = Paths.get("data", "notebook.json");
/**
* Creates a {@code UserPrefs} with default values.
@@ -36,6 +38,8 @@ public void resetData(ReadOnlyUserPrefs newUserPrefs) {
requireNonNull(newUserPrefs);
setGuiSettings(newUserPrefs.getGuiSettings());
setAddressBookFilePath(newUserPrefs.getAddressBookFilePath());
+ setScheduleFilePath(newUserPrefs.getScheduleFilePath());
+ setNotebookFilePath(newUserPrefs.getNotebookFilePath());
}
public GuiSettings getGuiSettings() {
@@ -56,6 +60,24 @@ public void setAddressBookFilePath(Path addressBookFilePath) {
this.addressBookFilePath = addressBookFilePath;
}
+ public Path getScheduleFilePath() {
+ return scheduleFilePath;
+ }
+
+ public void setScheduleFilePath(Path scheduleFilePath) {
+ requireNonNull(scheduleFilePath);
+ this.scheduleFilePath = scheduleFilePath;
+ }
+
+ public Path getNotebookFilePath() {
+ return notebookFilePath;
+ }
+
+ public void setNotebookFilePath(Path notebookFilePath) {
+ requireNonNull(notebookFilePath);
+ this.notebookFilePath = notebookFilePath;
+ }
+
@Override
public boolean equals(Object other) {
if (other == this) {
@@ -68,12 +90,13 @@ public boolean equals(Object other) {
UserPrefs o = (UserPrefs) other;
return guiSettings.equals(o.guiSettings)
- && addressBookFilePath.equals(o.addressBookFilePath);
+ && addressBookFilePath.equals(o.addressBookFilePath)
+ && scheduleFilePath.equals(o.scheduleFilePath);
}
@Override
public int hashCode() {
- return Objects.hash(guiSettings, addressBookFilePath);
+ return Objects.hash(guiSettings, addressBookFilePath, scheduleFilePath);
}
@Override
@@ -81,6 +104,8 @@ public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("Gui Settings : " + guiSettings);
sb.append("\nLocal data file location : " + addressBookFilePath);
+ sb.append("\nSchedule data file location : " + scheduleFilePath);
+ sb.append("\nNotebook data file location: " + notebookFilePath);
return sb.toString();
}
diff --git a/src/main/java/seedu/address/model/notes/Notebook.java b/src/main/java/seedu/address/model/notes/Notebook.java
new file mode 100644
index 00000000000..b890917c554
--- /dev/null
+++ b/src/main/java/seedu/address/model/notes/Notebook.java
@@ -0,0 +1,120 @@
+package seedu.address.model.notes;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.List;
+
+import javafx.collections.ObservableList;
+import seedu.address.model.notes.note.Note;
+
+/**
+ * Wraps all data at the Notebook level
+ * Duplicates are not allowed (by .isSameNote comparison)
+ */
+public class Notebook implements ReadOnlyNotebook {
+
+ private final NotesList notes;
+
+ /*
+ * The 'unusual' code block below is a non-static initialization block, sometimes used to avoid duplication
+ * between constructors. See https://docs.oracle.com/javase/tutorial/java/javaOO/initial.html
+ *
+ * Note that non-static init blocks are not recommended to use. There are other ways to avoid duplication
+ * among constructors.
+ */
+ {
+ notes = new NotesList();
+ }
+
+ public Notebook() {}
+
+ /**
+ * Creates a Reeve using the Notes in the {@code toBeCopied}
+ */
+ public Notebook(ReadOnlyNotebook toBeCopied) {
+ this();
+ resetData(toBeCopied);
+ }
+
+ //// list overwrite operations
+
+ /**
+ * Replaces the contents of the notes list with {@code notes}.
+ * {@code notes} must not contain duplicate notes.
+ */
+ public void setNotes(List<Note> notes) {
+ this.notes.setNotes(notes);
+ }
+
+ /**
+ * Resets the existing data of this {@code Notebook} with {@code newData}.
+ */
+ public void resetData(ReadOnlyNotebook newData) {
+ requireNonNull(newData);
+
+ setNotes(newData.getNotesList());
+ }
+
+ //// Note-level operations
+
+ /**
+ * Returns true if a note has the same title as a {@code note} that already exists in the notebook.
+ */
+ public boolean hasNote(Note note) {
+ requireNonNull(note);
+ return notes.contains(note);
+ }
+
+ /**
+ * Adds a note to the notebook.
+ * The note must not have the same title as another note in the notebook.
+ */
+ public void addNote(Note p) {
+ notes.add(p);
+ }
+
+ /**
+ * Replaces the given note {@code target} in the list with {@code editedNote}.
+ * {@code target} must exist in Reeve.
+ * The title of {@code editedNote} must not be the same as another existing note
+ * in the notebook.
+ */
+ public void setNote(Note target, Note editedNote) {
+ requireNonNull(editedNote);
+
+ notes.setNote(target, editedNote);
+ }
+
+ /**
+ * Removes {@code key} from this {@code Reeve}.
+ * {@code key} must exist in Reeve.
+ */
+ public void removeNote(Note key) {
+ notes.remove(key);
+ }
+
+ //// util methods
+
+ @Override
+ public String toString() {
+ return notes.asUnmodifiableObservableList().size() + " notes";
+ // TODO: refine later
+ }
+
+ @Override
+ public ObservableList<Note> getNotesList() {
+ return notes.asUnmodifiableObservableList();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof Notebook // instanceof handles nulls
+ && notes.equals(((Notebook) other).notes));
+ }
+
+ @Override
+ public int hashCode() {
+ return notes.hashCode();
+ }
+}
diff --git a/src/main/java/seedu/address/model/person/UniquePersonList.java b/src/main/java/seedu/address/model/notes/NotesList.java
similarity index 59%
rename from src/main/java/seedu/address/model/person/UniquePersonList.java
rename to src/main/java/seedu/address/model/notes/NotesList.java
index 0fee4fe57e6..c2377d1b353 100644
--- a/src/main/java/seedu/address/model/person/UniquePersonList.java
+++ b/src/main/java/seedu/address/model/notes/NotesList.java
@@ -1,4 +1,4 @@
-package seedu.address.model.person;
+package seedu.address.model.notes;
import static java.util.Objects.requireNonNull;
import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
@@ -8,8 +8,9 @@
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
-import seedu.address.model.person.exceptions.DuplicatePersonException;
-import seedu.address.model.person.exceptions.PersonNotFoundException;
+import seedu.address.model.notes.note.Note;
+import seedu.address.model.notes.note.exceptions.DuplicateNoteException;
+import seedu.address.model.notes.note.exceptions.NoteNotFoundException;
/**
* A list of persons that enforces uniqueness between its elements and does not allow nulls.
@@ -20,30 +21,30 @@
*
* Supports a minimal set of list operations.
*
- * @see Person#isSamePerson(Person)
+ * @see Note#isSameNote(Note)
*/
-public class UniquePersonList implements Iterable<Person> {
+public class NotesList implements Iterable<Note> {
- private final ObservableList<Person> internalList = FXCollections.observableArrayList();
- private final ObservableList<Person> internalUnmodifiableList =
+ private final ObservableList<Note> internalList = FXCollections.observableArrayList();
+ private final ObservableList<Note> internalUnmodifiableList =
FXCollections.unmodifiableObservableList(internalList);
/**
* Returns true if the list contains an equivalent person as the given argument.
*/
- public boolean contains(Person toCheck) {
+ public boolean contains(Note toCheck) {
requireNonNull(toCheck);
- return internalList.stream().anyMatch(toCheck::isSamePerson);
+ return internalList.stream().anyMatch(toCheck::isSameNote);
}
/**
* Adds a person to the list.
* The person must not already exist in the list.
*/
- public void add(Person toAdd) {
+ public void add(Note toAdd) {
requireNonNull(toAdd);
if (contains(toAdd)) {
- throw new DuplicatePersonException();
+ throw new DuplicateNoteException();
}
internalList.add(toAdd);
}
@@ -53,33 +54,33 @@ public void add(Person toAdd) {
* {@code target} must exist in the list.
* The person identity of {@code editedPerson} must not be the same as another existing person in the list.
*/
- public void setPerson(Person target, Person editedPerson) {
- requireAllNonNull(target, editedPerson);
+ public void setNote(Note target, Note editedNote) {
+ requireAllNonNull(target, editedNote);
int index = internalList.indexOf(target);
if (index == -1) {
- throw new PersonNotFoundException();
+ throw new NoteNotFoundException();
}
- if (!target.isSamePerson(editedPerson) && contains(editedPerson)) {
- throw new DuplicatePersonException();
+ if (!target.isSameNote(editedNote) && contains(editedNote)) {
+ throw new DuplicateNoteException();
}
- internalList.set(index, editedPerson);
+ internalList.set(index, editedNote);
}
/**
* Removes the equivalent person from the list.
* The person must exist in the list.
*/
- public void remove(Person toRemove) {
+ public void remove(Note toRemove) {
requireNonNull(toRemove);
if (!internalList.remove(toRemove)) {
- throw new PersonNotFoundException();
+ throw new NoteNotFoundException();
}
}
- public void setPersons(UniquePersonList replacement) {
+ public void setNotes(NotesList replacement) {
requireNonNull(replacement);
internalList.setAll(replacement.internalList);
}
@@ -88,32 +89,32 @@ public void setPersons(UniquePersonList replacement) {
* Replaces the contents of this list with {@code persons}.
* {@code persons} must not contain duplicate persons.
*/
- public void setPersons(List<Person> persons) {
- requireAllNonNull(persons);
- if (!personsAreUnique(persons)) {
- throw new DuplicatePersonException();
+ public void setNotes(List<Note> notes) {
+ requireAllNonNull(notes);
+ if (!notesAreUnique(notes)) {
+ throw new DuplicateNoteException();
}
- internalList.setAll(persons);
+ internalList.setAll(notes);
}
/**
* Returns the backing list as an unmodifiable {@code ObservableList}.
*/
- public ObservableList<Person> asUnmodifiableObservableList() {
+ public ObservableList<Note> asUnmodifiableObservableList() {
return internalUnmodifiableList;
}
@Override
- public Iterator<Person> iterator() {
+ public Iterator<Note> iterator() {
return internalList.iterator();
}
@Override
public boolean equals(Object other) {
return other == this // short circuit if same object
- || (other instanceof UniquePersonList // instanceof handles nulls
- && internalList.equals(((UniquePersonList) other).internalList));
+ || (other instanceof NotesList // instanceof handles nulls
+ && internalList.equals(((NotesList) other).internalList));
}
@Override
@@ -124,10 +125,10 @@ public int hashCode() {
/**
* Returns true if {@code persons} contains only unique persons.
*/
- private boolean personsAreUnique(List<Person> persons) {
- for (int i = 0; i < persons.size() - 1; i++) {
- for (int j = i + 1; j < persons.size(); j++) {
- if (persons.get(i).isSamePerson(persons.get(j))) {
+ private boolean notesAreUnique(List<Note> notes) {
+ for (int i = 0; i < notes.size() - 1; i++) {
+ for (int j = i + 1; j < notes.size(); j++) {
+ if (notes.get(i).isSameNote(notes.get(j))) {
return false;
}
}
diff --git a/src/main/java/seedu/address/model/notes/ReadOnlyNotebook.java b/src/main/java/seedu/address/model/notes/ReadOnlyNotebook.java
new file mode 100644
index 00000000000..1b596c44123
--- /dev/null
+++ b/src/main/java/seedu/address/model/notes/ReadOnlyNotebook.java
@@ -0,0 +1,17 @@
+package seedu.address.model.notes;
+
+import javafx.collections.ObservableList;
+import seedu.address.model.notes.note.Note;
+
+/**
+ * Unmodifiable view of a notebook
+ */
+public interface ReadOnlyNotebook {
+
+ /**
+ * Returns an unmodifiable view of the list of notes.
+ * This list will not contain any duplicate notes.
+ */
+ ObservableList<Note> getNotesList();
+
+}
diff --git a/src/main/java/seedu/address/model/notes/note/Description.java b/src/main/java/seedu/address/model/notes/note/Description.java
new file mode 100644
index 00000000000..da111d5f461
--- /dev/null
+++ b/src/main/java/seedu/address/model/notes/note/Description.java
@@ -0,0 +1,58 @@
+package seedu.address.model.notes.note;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.AppUtil.checkArgument;
+
+/**
+ * Represents a Note's description in the notebook
+ * Guarantees: immutable; is valid as declared in {@link #isValidDescription(String)}
+ */
+public class Description {
+
+ public static final String MESSAGE_CONSTRAINTS =
+ "Description must not be more than 80 characters";
+
+ /*
+ * The first character of the description must not be a whitespace,
+ * otherwise " " (a blank string) becomes a valid input.
+ */
+ public static final String VALIDATION_REGEX = "^(\\S.{0,79})";
+
+ public final String description;
+
+ /**
+ * Constructs a {@code Description}.
+ *
+ * @param description A valid description.
+ */
+ public Description(String description) {
+ requireNonNull(description);
+ checkArgument(isValidDescription(description), MESSAGE_CONSTRAINTS);
+ this.description = description;
+ }
+
+ /**
+ * Returns true if a given string is a valid description.
+ */
+ public static boolean isValidDescription(String test) {
+ return test.matches(VALIDATION_REGEX);
+ }
+
+ @Override
+ public String toString() {
+ return description;
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof Description // instanceof handles nulls
+ && description.equals(((Description) other).description)); // state check
+ }
+
+ @Override
+ public int hashCode() {
+ return description.hashCode();
+ }
+
+}
diff --git a/src/main/java/seedu/address/model/notes/note/Note.java b/src/main/java/seedu/address/model/notes/note/Note.java
new file mode 100644
index 00000000000..ca58ffff180
--- /dev/null
+++ b/src/main/java/seedu/address/model/notes/note/Note.java
@@ -0,0 +1,89 @@
+package seedu.address.model.notes.note;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.util.Objects;
+
+/**
+ * Represents a Note in the notebook.
+ * Guarantees: details are present and not null, field values are validated, immutable.
+ */
+public class Note {
+
+ private final Title title;
+ private final Description description;
+
+ /**
+ * title and description must be present and not null.
+ */
+ public Note(Title title, Description description) {
+ requireAllNonNull(title, description);
+ this.title = title;
+ this.description = description;
+ }
+
+ private Note(Note copy) {
+ requireNonNull(copy);
+ this.title = copy.title;
+ this.description = copy.description;
+ }
+
+ public Title getTitle() {
+ return title;
+ }
+
+ public Description getDescription() {
+ return description;
+ }
+
+ /**
+ * Returns true if both note of the same title have at least one other identity field that is the same.
+ * This defines a weaker notion of equality between two notes.
+ */
+ public boolean isSameNote(Note otherNote) {
+ if (otherNote == this) {
+ return true;
+ }
+
+ return otherNote != null
+ && otherNote.getTitle().toString().toLowerCase().equals(getTitle().toString().toLowerCase());
+ }
+
+ /**
+ * Returns true if both note have the same title and description.
+ * This defines a stronger notion of equality between two notes.
+ */
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+
+ if (!(other instanceof Note)) {
+ return false;
+ }
+
+ Note otherNote = (Note) other;
+ return otherNote.getTitle().equals(getTitle())
+ && otherNote.getDescription().equals(getDescription());
+ }
+
+ @Override
+ public int hashCode() {
+ // use this method for custom fields hashing instead of implementing your own
+ return Objects.hash(title, description);
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder builder = new StringBuilder();
+ builder.append("Title: ")
+ .append(getTitle())
+ .append("\nDescription: ")
+ .append(getDescription());
+
+ return builder.toString();
+ }
+
+}
diff --git a/src/main/java/seedu/address/model/notes/note/Title.java b/src/main/java/seedu/address/model/notes/note/Title.java
new file mode 100644
index 00000000000..19effffd8f0
--- /dev/null
+++ b/src/main/java/seedu/address/model/notes/note/Title.java
@@ -0,0 +1,58 @@
+package seedu.address.model.notes.note;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.AppUtil.checkArgument;
+
+/**
+ * Represents a Note's title in the notebook
+ * Guarantees: immutable; is valid as declared in {@link #isValidTitle(String)}
+ */
+public class Title {
+
+ public static final String MESSAGE_CONSTRAINTS =
+ "Title not be more than 15 characters";
+
+ /*
+ * The first character of the title must not be a whitespace,
+ * otherwise " " (a blank string) becomes a valid input.
+ */
+ public static final String VALIDATION_REGEX = "^(\\S.{0,14})";
+
+ public final String title;
+
+ /**
+ * Constructs a {@code Title}.
+ *
+ * @param title A valid title.
+ */
+ public Title(String title) {
+ requireNonNull(title);
+ checkArgument(isValidTitle(title), MESSAGE_CONSTRAINTS);
+ this.title = title;
+ }
+
+ /**
+ * Returns true if a given string is a valid title.
+ */
+ public static boolean isValidTitle(String test) {
+ return test.matches(VALIDATION_REGEX);
+ }
+
+ @Override
+ public String toString() {
+ return title;
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof Title // instanceof handles nulls
+ && title.equals(((Title) other).title)); // state check
+ }
+
+ @Override
+ public int hashCode() {
+ return title.hashCode();
+ }
+
+}
diff --git a/src/main/java/seedu/address/model/notes/note/exceptions/DuplicateNoteException.java b/src/main/java/seedu/address/model/notes/note/exceptions/DuplicateNoteException.java
new file mode 100644
index 00000000000..b5ef7116d5c
--- /dev/null
+++ b/src/main/java/seedu/address/model/notes/note/exceptions/DuplicateNoteException.java
@@ -0,0 +1,11 @@
+package seedu.address.model.notes.note.exceptions;
+
+/**
+ * Signals that the operation will result in duplicate Notes (Notes are considered duplicates if they have the same
+ * title).
+ */
+public class DuplicateNoteException extends RuntimeException {
+ public DuplicateNoteException() {
+ super("Operation would result in duplicate notes");
+ }
+}
diff --git a/src/main/java/seedu/address/model/notes/note/exceptions/NoteNotFoundException.java b/src/main/java/seedu/address/model/notes/note/exceptions/NoteNotFoundException.java
new file mode 100644
index 00000000000..abd9c719789
--- /dev/null
+++ b/src/main/java/seedu/address/model/notes/note/exceptions/NoteNotFoundException.java
@@ -0,0 +1,6 @@
+package seedu.address.model.notes.note.exceptions;
+
+/**
+ * Signals that the operation is unable to find the specified note.
+ */
+public class NoteNotFoundException extends RuntimeException {}
diff --git a/src/main/java/seedu/address/model/person/Address.java b/src/main/java/seedu/address/model/person/Address.java
deleted file mode 100644
index 60472ca22a0..00000000000
--- a/src/main/java/seedu/address/model/person/Address.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package seedu.address.model.person;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.AppUtil.checkArgument;
-
-/**
- * Represents a Person's address in the address book.
- * Guarantees: immutable; is valid as declared in {@link #isValidAddress(String)}
- */
-public class Address {
-
- public static final String MESSAGE_CONSTRAINTS = "Addresses can take any values, and it should not be blank";
-
- /*
- * The first character of the address must not be a whitespace,
- * otherwise " " (a blank string) becomes a valid input.
- */
- public static final String VALIDATION_REGEX = "[^\\s].*";
-
- public final String value;
-
- /**
- * Constructs an {@code Address}.
- *
- * @param address A valid address.
- */
- public Address(String address) {
- requireNonNull(address);
- checkArgument(isValidAddress(address), MESSAGE_CONSTRAINTS);
- value = address;
- }
-
- /**
- * Returns true if a given string is a valid email.
- */
- public static boolean isValidAddress(String test) {
- return test.matches(VALIDATION_REGEX);
- }
-
- @Override
- public String toString() {
- return value;
- }
-
- @Override
- public boolean equals(Object other) {
- return other == this // short circuit if same object
- || (other instanceof Address // instanceof handles nulls
- && value.equals(((Address) other).value)); // state check
- }
-
- @Override
- public int hashCode() {
- return value.hashCode();
- }
-
-}
diff --git a/src/main/java/seedu/address/model/person/Email.java b/src/main/java/seedu/address/model/person/Email.java
deleted file mode 100644
index a5bbe0b6a5f..00000000000
--- a/src/main/java/seedu/address/model/person/Email.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package seedu.address.model.person;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.AppUtil.checkArgument;
-
-/**
- * Represents a Person's email in the address book.
- * Guarantees: immutable; is valid as declared in {@link #isValidEmail(String)}
- */
-public class Email {
-
- private static final String SPECIAL_CHARACTERS = "!#$%&'*+/=?`{|}~^.-";
- public static final String MESSAGE_CONSTRAINTS = "Emails should be of the format local-part@domain "
- + "and adhere to the following constraints:\n"
- + "1. The local-part should only contain alphanumeric characters and these special characters, excluding "
- + "the parentheses, (" + SPECIAL_CHARACTERS + ") .\n"
- + "2. This is followed by a '@' and then a domain name. "
- + "The domain name must:\n"
- + " - be at least 2 characters long\n"
- + " - start and end with alphanumeric characters\n"
- + " - consist of alphanumeric characters, a period or a hyphen for the characters in between, if any.";
- // alphanumeric and special characters
- private static final String LOCAL_PART_REGEX = "^[\\w" + SPECIAL_CHARACTERS + "]+";
- private static final String DOMAIN_FIRST_CHARACTER_REGEX = "[^\\W_]"; // alphanumeric characters except underscore
- private static final String DOMAIN_MIDDLE_REGEX = "[a-zA-Z0-9.-]*"; // alphanumeric, period and hyphen
- private static final String DOMAIN_LAST_CHARACTER_REGEX = "[^\\W_]$";
- public static final String VALIDATION_REGEX = LOCAL_PART_REGEX + "@"
- + DOMAIN_FIRST_CHARACTER_REGEX + DOMAIN_MIDDLE_REGEX + DOMAIN_LAST_CHARACTER_REGEX;
-
- public final String value;
-
- /**
- * Constructs an {@code Email}.
- *
- * @param email A valid email address.
- */
- public Email(String email) {
- requireNonNull(email);
- checkArgument(isValidEmail(email), MESSAGE_CONSTRAINTS);
- value = email;
- }
-
- /**
- * Returns if a given string is a valid email.
- */
- public static boolean isValidEmail(String test) {
- return test.matches(VALIDATION_REGEX);
- }
-
- @Override
- public String toString() {
- return value;
- }
-
- @Override
- public boolean equals(Object other) {
- return other == this // short circuit if same object
- || (other instanceof Email // instanceof handles nulls
- && value.equals(((Email) other).value)); // state check
- }
-
- @Override
- public int hashCode() {
- return value.hashCode();
- }
-
-}
diff --git a/src/main/java/seedu/address/model/person/Person.java b/src/main/java/seedu/address/model/person/Person.java
deleted file mode 100644
index 557a7a60cd5..00000000000
--- a/src/main/java/seedu/address/model/person/Person.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package seedu.address.model.person;
-
-import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import seedu.address.model.tag.Tag;
-
-/**
- * Represents a Person in the address book.
- * Guarantees: details are present and not null, field values are validated, immutable.
- */
-public class Person {
-
- // Identity fields
- private final Name name;
- private final Phone phone;
- private final Email email;
-
- // Data fields
- private final Address address;
- private final Set<Tag> tags = new HashSet<>();
-
- /**
- * Every field must be present and not null.
- */
- public Person(Name name, Phone phone, Email email, Address address, Set<Tag> tags) {
- requireAllNonNull(name, phone, email, address, tags);
- this.name = name;
- this.phone = phone;
- this.email = email;
- this.address = address;
- this.tags.addAll(tags);
- }
-
- public Name getName() {
- return name;
- }
-
- public Phone getPhone() {
- return phone;
- }
-
- public Email getEmail() {
- return email;
- }
-
- public Address getAddress() {
- return address;
- }
-
- /**
- * Returns an immutable tag set, which throws {@code UnsupportedOperationException}
- * if modification is attempted.
- */
- public Set<Tag> getTags() {
- return Collections.unmodifiableSet(tags);
- }
-
- /**
- * Returns true if both persons of the same name have at least one other identity field that is the same.
- * This defines a weaker notion of equality between two persons.
- */
- public boolean isSamePerson(Person otherPerson) {
- if (otherPerson == this) {
- return true;
- }
-
- return otherPerson != null
- && otherPerson.getName().equals(getName())
- && (otherPerson.getPhone().equals(getPhone()) || otherPerson.getEmail().equals(getEmail()));
- }
-
- /**
- * Returns true if both persons have the same identity and data fields.
- * This defines a stronger notion of equality between two persons.
- */
- @Override
- public boolean equals(Object other) {
- if (other == this) {
- return true;
- }
-
- if (!(other instanceof Person)) {
- return false;
- }
-
- Person otherPerson = (Person) other;
- return otherPerson.getName().equals(getName())
- && otherPerson.getPhone().equals(getPhone())
- && otherPerson.getEmail().equals(getEmail())
- && otherPerson.getAddress().equals(getAddress())
- && otherPerson.getTags().equals(getTags());
- }
-
- @Override
- public int hashCode() {
- // use this method for custom fields hashing instead of implementing your own
- return Objects.hash(name, phone, email, address, tags);
- }
-
- @Override
- public String toString() {
- final StringBuilder builder = new StringBuilder();
- builder.append(getName())
- .append(" Phone: ")
- .append(getPhone())
- .append(" Email: ")
- .append(getEmail())
- .append(" Address: ")
- .append(getAddress())
- .append(" Tags: ");
- getTags().forEach(builder::append);
- return builder.toString();
- }
-
-}
diff --git a/src/main/java/seedu/address/model/person/exceptions/PersonNotFoundException.java b/src/main/java/seedu/address/model/person/exceptions/PersonNotFoundException.java
deleted file mode 100644
index fa764426ca7..00000000000
--- a/src/main/java/seedu/address/model/person/exceptions/PersonNotFoundException.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package seedu.address.model.person.exceptions;
-
-/**
- * Signals that the operation is unable to find the specified person.
- */
-public class PersonNotFoundException extends RuntimeException {}
diff --git a/src/main/java/seedu/address/model/schedule/Event.java b/src/main/java/seedu/address/model/schedule/Event.java
new file mode 100644
index 00000000000..3c5b744ef1b
--- /dev/null
+++ b/src/main/java/seedu/address/model/schedule/Event.java
@@ -0,0 +1,103 @@
+package seedu.address.model.schedule;
+
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.time.LocalDateTime;
+import java.util.Objects;
+
+/**
+ * An Event object that encompass the the various fields that an event can contain. These includes event name, start
+ * time, end time, description, and recurrence type of the event.
+ * This will be mapped to iCalendarFx's VEvent to be displayed in the iCalendar graphical user interface.
+ */
+public class Event {
+
+ protected String eventName;
+ protected LocalDateTime eventStartDateTime;
+ protected LocalDateTime eventEndDateTime;
+ protected String uniqueIdentifier; // uid for iCalendarAgenda use
+ protected EventRecurrence recurrence;
+
+ /**
+ * Creates an Event object that will be link to the user's schedule.
+ *
+ * @param eventName
+ * @param eventStartDateTime
+ * @param eventEndDateTime
+ * @param uniqueIdentifier
+ * @param recurrence
+ */
+ public Event(String eventName, LocalDateTime eventStartDateTime, LocalDateTime eventEndDateTime,
+ String uniqueIdentifier, EventRecurrence recurrence) {
+ requireAllNonNull(eventName, eventStartDateTime, eventEndDateTime, uniqueIdentifier, recurrence);
+ this.eventName = eventName;
+ this.eventStartDateTime = eventStartDateTime;
+ this.eventEndDateTime = eventEndDateTime;
+ this.uniqueIdentifier = uniqueIdentifier;
+ this.recurrence = recurrence;
+ }
+
+ public String getEventName() {
+ return eventName;
+ }
+
+ public LocalDateTime getEventStartDateTime() {
+ return eventStartDateTime;
+ }
+
+ public LocalDateTime getEventEndDateTime() {
+ return eventEndDateTime;
+ }
+
+ public String getUniqueIdentifier() {
+ return uniqueIdentifier;
+ }
+
+ public EventRecurrence getRecurrence() {
+ return recurrence;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(eventName, eventStartDateTime, eventEndDateTime, uniqueIdentifier, recurrence);
+ }
+
+ /**
+ * Returns true if both events has the same data fields
+ *
+ * @param obj the event to be compared
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+
+ if (!(obj instanceof Event)) {
+ return false;
+ }
+
+ Event otherEvent = (Event) obj;
+ return otherEvent.eventName.equals(eventName)
+ && otherEvent.eventStartDateTime.equals(eventStartDateTime)
+ && otherEvent.eventEndDateTime.equals(eventEndDateTime)
+ && otherEvent.uniqueIdentifier.equals(uniqueIdentifier)
+ && otherEvent.recurrence.equals(recurrence);
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder builder = new StringBuilder();
+ builder.append("Event: ")
+ .append(eventName)
+ .append("\n")
+ .append("StartDateTime: ")
+ .append(eventStartDateTime)
+ .append("\n")
+ .append("EndDateTime: ")
+ .append(eventEndDateTime);
+
+ return builder.toString();
+ }
+
+}
diff --git a/src/main/java/seedu/address/model/schedule/EventRecurrence.java b/src/main/java/seedu/address/model/schedule/EventRecurrence.java
new file mode 100644
index 00000000000..58bfcf15436
--- /dev/null
+++ b/src/main/java/seedu/address/model/schedule/EventRecurrence.java
@@ -0,0 +1,57 @@
+package seedu.address.model.schedule;
+
+import seedu.address.logic.parser.exceptions.ParseException;
+
+public enum EventRecurrence {
+ DAILY("daily", "FREQ=DAILY;INTERVAL=1"),
+ WEEKLY("weekly", "FREQ=WEEKLY;INTERVAL=1"),
+ NONE("none", "FREQ=YEARLY;INTERVAL=1");
+
+ public static final String INCORRECT_EVENT_RECURRENCE_MESSAGE = "Event recurrence is incorrect";
+ public static final String INCORRECT_EVENT_RECURRENCE_RULE_MESSAGE = "Recurrence rule is incorrect";
+
+ private String recurrenceString;
+ private String vEventRecurRule;
+
+
+ EventRecurrence(String recurrenceString, String vEventRecurRule) {
+ this.recurrenceString = recurrenceString;
+ this.vEventRecurRule = vEventRecurRule;
+ }
+
+ /**
+ * Given a string input, checks if it matches any Recurrence type.
+ * String input will be compared to the filed recurrenceString.
+ * @throws ParseException if no matching EventRecurrence can be found.
+ */
+ public static EventRecurrence checkWhichRecurrence(String input) throws ParseException {
+ assert input != null;
+ String formattedInput = input.trim().toLowerCase();
+
+ for (EventRecurrence type: EventRecurrence.values()) {
+ if (type.recurrenceString.equals(formattedInput)) {
+ return type;
+ }
+ }
+ throw new ParseException(INCORRECT_EVENT_RECURRENCE_MESSAGE);
+ }
+
+ /**
+ * Given a string input, checks which recurrence rule it refers to.
+ * @return EventRecurrence with the matching rule
+ * @throws ParseException if no matching recurrence rule can be found.
+ */
+ public static EventRecurrence checkWhichRecurRule(String input) throws ParseException {
+ assert input != null;
+ for (EventRecurrence type: EventRecurrence.values()) {
+ if (type.vEventRecurRule.equals(input)) {
+ return type;
+ }
+ }
+ throw new ParseException(INCORRECT_EVENT_RECURRENCE_RULE_MESSAGE);
+ }
+
+ public String getVEventRecurRule() {
+ return this.vEventRecurRule;
+ }
+}
diff --git a/src/main/java/seedu/address/model/schedule/LessonEvent.java b/src/main/java/seedu/address/model/schedule/LessonEvent.java
new file mode 100644
index 00000000000..20a6a2f5f40
--- /dev/null
+++ b/src/main/java/seedu/address/model/schedule/LessonEvent.java
@@ -0,0 +1,76 @@
+package seedu.address.model.schedule;
+
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjuster;
+import java.time.temporal.TemporalAdjusters;
+
+import seedu.address.model.student.Student;
+import seedu.address.model.student.admin.Admin;
+import seedu.address.model.student.admin.ClassTime;
+
+public class LessonEvent extends Event {
+
+ public static final DateTimeFormatter VIEW_DATE_FORMAT = DateTimeFormatter.ofPattern("d/M/yyyy");
+
+ /**
+ * Creates an Lesson Event object that will be link to the user's schedule.
+ * This is based on the student's admin class time.
+ * @param eventName
+ * @param eventStartDateTime
+ * @param eventEndDateTime
+ * @param uniqueIdentifier
+ * @param recurrence
+ */
+ private LessonEvent(String eventName, LocalDateTime eventStartDateTime, LocalDateTime eventEndDateTime,
+ String uniqueIdentifier, EventRecurrence recurrence) {
+ super(eventName, eventStartDateTime, eventEndDateTime, uniqueIdentifier, recurrence);
+ }
+
+ /**
+ * Creates a lesson event based on the student class time.
+ * @param student student where lesson event is created for.
+ * @param dateTimeCreated time the student is added to reeve.
+ */
+ public static LessonEvent createLessonEvent(Student student, LocalDateTime dateTimeCreated) {
+ Admin studentAdmin = student.getAdmin();
+ ClassTime classTime = studentAdmin.getClassTime();
+ String studentName = student.getName().fullName;
+
+ DayOfWeek classDayOfWeek = classTime.dayOfWeek;
+ LocalDateTime lessonStart = computeLessonStartDate(dateTimeCreated, classDayOfWeek);
+
+ LocalTime classTimeStart = classTime.startTime;
+ LocalTime classTimeEnd = classTime.endTime;
+
+ LocalDate lessonDate = lessonStart.toLocalDate();
+ LocalDateTime lessonEventDateTimeStart = LocalDateTime.of(lessonDate, classTimeStart);
+ LocalDateTime lessonEventDateTimeEnd = LocalDateTime.of(lessonDate, classTimeEnd);
+
+ String uid = UniqueIdentifierGenerator.generateUid(studentName,
+ lessonEventDateTimeStart.toString(), lessonEventDateTimeEnd.toString());
+
+ return new LessonEvent(studentName, lessonEventDateTimeStart, lessonEventDateTimeEnd,
+ uid, EventRecurrence.WEEKLY);
+ }
+
+ /**
+ * This method adjust the date where the student is added and outputs the correct date for the first lesson.
+ * @param dateCreated date where student is added.
+ * @param classDay day where the student attends lesson.
+ */
+ public static LocalDateTime computeLessonStartDate(LocalDateTime dateCreated, DayOfWeek classDay) {
+ requireAllNonNull(dateCreated, classDay);
+ TemporalAdjuster adjuster = TemporalAdjusters.nextOrSame(classDay);
+ if (dateCreated.isBefore(LocalDateTime.now())) {
+ TemporalAdjuster adjustToNextWeek = TemporalAdjusters.next(classDay);
+ return LocalDateTime.from(adjustToNextWeek.adjustInto(dateCreated));
+ }
+ return LocalDateTime.from(adjuster.adjustInto(dateCreated));
+ }
+}
diff --git a/src/main/java/seedu/address/model/schedule/Mapper.java b/src/main/java/seedu/address/model/schedule/Mapper.java
new file mode 100644
index 00000000000..1c205526cf8
--- /dev/null
+++ b/src/main/java/seedu/address/model/schedule/Mapper.java
@@ -0,0 +1,90 @@
+package seedu.address.model.schedule;
+
+import static java.util.Objects.requireNonNull;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+import jfxtras.icalendarfx.components.VEvent;
+import seedu.address.logic.parser.exceptions.ParseException;
+
+/**
+ * Mapper class that maps Events to VEvents and vice versa.
+ */
+public class Mapper {
+
+ /**
+ * Maps a local Event object to a VEvent for Jfxtras calendar
+ */
+ public static VEvent mapEventToVEvent(Event event) {
+ requireNonNull(event);
+ VEvent vEvent = new VEvent()
+ .withSummary(event.getEventName())
+ .withDateTimeStart(event.getEventStartDateTime())
+ .withDateTimeEnd(event.getEventEndDateTime())
+ .withUniqueIdentifier(event.getUniqueIdentifier());
+ if (!(event.getRecurrence() == null) || !event.getRecurrence().equals(EventRecurrence.NONE)) {
+ vEvent.setRecurrenceRule(event.getRecurrence().getVEventRecurRule());
+ }
+ if (event.getRecurrence().getVEventRecurRule() == "") {
+ vEvent.setRecurrenceRule(EventRecurrence.NONE.getVEventRecurRule());
+ }
+
+ return vEvent;
+ }
+
+ /**
+ * Maps a List of Event to VEvent
+ * @param events the events to be mapped
+ */
+ public static List<VEvent> mapListOfEventsToVEvent(List<Event> events) {
+ List<VEvent> vEvents = new ArrayList<>();
+ for (Event event: events) {
+ vEvents.add(mapEventToVEvent(event));
+ }
+ return vEvents;
+ }
+
+ /**
+ * Maps a VEvent from jfxtras calendar to local Event object
+ */
+ public static Event mapVEventToEvent(VEvent vEvent) {
+ requireNonNull(vEvent);
+ String eventName = vEvent.getSummary().getValue();
+ LocalDateTime eventStartDateTime = LocalDateTime.from(vEvent.getDateTimeStart().getValue());
+ LocalDateTime eventEndDateTime = LocalDateTime.from(vEvent.getDateTimeEnd().getValue());
+ String uniqueIdentifier = vEvent.getUniqueIdentifier().getValue();
+
+ EventRecurrence recurrence;
+ try {
+ if (vEvent.getRecurrenceRule().getValue() == null) {
+ recurrence = EventRecurrence.NONE;
+ } else {
+ recurrence = EventRecurrence.checkWhichRecurRule(vEvent.getRecurrenceRule()
+ .getValue().toString());
+ }
+ } catch (ParseException e) {
+ recurrence = EventRecurrence.NONE;
+ }
+
+ return new Event(eventName, eventStartDateTime, eventEndDateTime,
+ uniqueIdentifier, recurrence);
+ }
+
+ /**
+ * Maps a list of VEvent to Event.
+ * @param vEvents the VEvents to be mapped
+ */
+ public static List<Event> mapListOfVEventsToEvent(List<VEvent> vEvents) {
+ List<Event> events = new ArrayList<>();
+ for (VEvent vEvent: vEvents) {
+ events.add(mapVEventToEvent(vEvent));
+ }
+
+ return events;
+ }
+
+
+
+}
diff --git a/src/main/java/seedu/address/model/schedule/ReadOnlyEvent.java b/src/main/java/seedu/address/model/schedule/ReadOnlyEvent.java
new file mode 100644
index 00000000000..6651d179f9c
--- /dev/null
+++ b/src/main/java/seedu/address/model/schedule/ReadOnlyEvent.java
@@ -0,0 +1,15 @@
+package seedu.address.model.schedule;
+
+import java.util.List;
+
+/**
+ * Unmodifiable view of an Schedule comprising of VEvents
+ */
+public interface ReadOnlyEvent {
+
+ /**
+ * Returns an unmodifiable view of the Event list.
+ * This list will not contain any duplicate Events.
+ */
+ List<Event> getEventsList();
+}
diff --git a/src/main/java/seedu/address/model/schedule/ReadOnlyVEvent.java b/src/main/java/seedu/address/model/schedule/ReadOnlyVEvent.java
new file mode 100644
index 00000000000..de6ba3ba782
--- /dev/null
+++ b/src/main/java/seedu/address/model/schedule/ReadOnlyVEvent.java
@@ -0,0 +1,15 @@
+package seedu.address.model.schedule;
+
+import javafx.collections.ObservableList;
+import jfxtras.icalendarfx.components.VEvent;
+
+/**
+An unmodifiable view
+ */
+public interface ReadOnlyVEvent {
+ /**
+ * Returns an unmodifiable view of the VEvents list.
+ * This list will not contain any duplicate VEvents.
+ */
+ ObservableList<VEvent> getVEvents();
+}
diff --git a/src/main/java/seedu/address/model/schedule/SchedulePrefs.java b/src/main/java/seedu/address/model/schedule/SchedulePrefs.java
new file mode 100644
index 00000000000..001515c0ff2
--- /dev/null
+++ b/src/main/java/seedu/address/model/schedule/SchedulePrefs.java
@@ -0,0 +1,70 @@
+package seedu.address.model.schedule;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+public class SchedulePrefs {
+ private static final LocalTime DEFAULT_TIME = LocalTime.of(12, 0);
+ private ScheduleViewMode viewMode;
+ private LocalDateTime viewDateTime;
+
+ /**
+ * Creates a schedule preferences which encompass the user's preferred view mode and view date time.
+ * @param viewMode
+ * @param viewDate
+ */
+ public SchedulePrefs(ScheduleViewMode viewMode, LocalDate viewDate) {
+ requireAllNonNull(viewMode, viewDate);
+ this.viewMode = viewMode;
+ this.viewDateTime = LocalDateTime.of(viewDate, DEFAULT_TIME);
+ }
+
+ public ScheduleViewMode getViewMode() {
+ return viewMode;
+ }
+
+ public void setViewMode(ScheduleViewMode viewMode) {
+ requireNonNull(viewMode);
+ this.viewMode = viewMode;
+ }
+
+ public LocalDateTime getViewDate() {
+ return viewDateTime;
+ }
+
+ public void setViewDate(LocalDate viewDate) {
+ requireNonNull(viewDate);
+ this.viewDateTime = LocalDateTime.of(viewDate, DEFAULT_TIME);
+ }
+
+ /**
+ * Returns true if both SchedulePrefs have the same identity and data fields.
+ */
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+
+ if (!(other instanceof SchedulePrefs)) {
+ return false;
+ }
+
+ SchedulePrefs otherPrefs = (SchedulePrefs) other;
+ return otherPrefs.getViewDate().equals(getViewDate())
+ && otherPrefs.getViewMode().equals(getViewMode());
+ }
+
+ /**
+ * Formats the event schedule pref object into a printable string format
+ * @return a string representation of the event schedule prefs object
+ */
+ @Override
+ public String toString() {
+ return viewMode.name() + "_" + viewDateTime.toLocalDate().toString();
+ }
+}
diff --git a/src/main/java/seedu/address/model/schedule/ScheduleViewMode.java b/src/main/java/seedu/address/model/schedule/ScheduleViewMode.java
new file mode 100644
index 00000000000..8e41be1bd84
--- /dev/null
+++ b/src/main/java/seedu/address/model/schedule/ScheduleViewMode.java
@@ -0,0 +1,9 @@
+package seedu.address.model.schedule;
+
+/**
+ * View mode for the jfxtras icalendar
+ */
+public enum ScheduleViewMode {
+ DAILY,
+ WEEKLY;
+}
diff --git a/src/main/java/seedu/address/model/schedule/Scheduler.java b/src/main/java/seedu/address/model/schedule/Scheduler.java
new file mode 100644
index 00000000000..ad788a18d8a
--- /dev/null
+++ b/src/main/java/seedu/address/model/schedule/Scheduler.java
@@ -0,0 +1,128 @@
+package seedu.address.model.schedule;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import jfxtras.icalendarfx.components.VEvent;
+import seedu.address.model.student.Student;
+
+/**
+ * This class provides the basic functionalities of event operations.
+ * Mapping of local Event to jfxtras's VEvent is contained here.
+ */
+public class Scheduler implements ReadOnlyEvent, ReadOnlyVEvent {
+
+ private final ObservableList<VEvent> internalList = FXCollections.observableArrayList();
+ private final ObservableList<VEvent> internalUnmodifiableList =
+ FXCollections.unmodifiableObservableList(internalList);
+
+ public Scheduler() {}
+
+ /**
+ * Creates a Scheduler using the list of events in the {@code lstOfEvents}
+ */
+ public Scheduler(List<Event> lstOfEvents) {
+ requireNonNull(lstOfEvents);
+ resetData(lstOfEvents);
+ }
+
+
+ /** Replaces the contents of this list with {@code vEvents}.
+ * {@code vEvents} must not contain duplicate VEvent.
+ */
+ public void setVEvents(List<VEvent> vEvents) {
+ requireAllNonNull(vEvents);
+ this.internalList.setAll(vEvents);
+ }
+
+ /**
+ * Resets the existing data of this {@code Scheduler} with {@code newData}.
+ */
+ public void resetData(List<Event> newData) {
+ requireNonNull(newData);
+ setVEvents(Mapper.mapListOfEventsToVEvent(newData));
+ }
+
+ /**
+ * Adds a {@code eventToAdd} to Scheduler.
+ * The {@code eventToAdd} must not already exist in Scheduler.
+ */
+ public void addEvent(Event eventToAdd) {
+ requireNonNull(eventToAdd);
+ internalList.add(Mapper.mapEventToVEvent(eventToAdd));
+ }
+
+ /**
+ * Adds a list of events to the scheduler's list
+ * @param lst
+ */
+ public void addListOfEvents(List<Event> lst) {
+ requireNonNull(lst);
+ resetData(lst);
+ }
+
+ @Override
+ public String toString() {
+ return internalUnmodifiableList.size() + " Lessons in Schedule";
+ }
+
+ @Override
+ public ObservableList<VEvent> getVEvents() {
+ return this.internalUnmodifiableList;
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true; // short circuit if same object
+ }
+
+ if (!(other instanceof Scheduler)) {
+ return false;
+ }
+
+ Scheduler otherScheduler = (Scheduler) other;
+ ObservableList<VEvent> otherList = otherScheduler.getVEvents();
+ if (otherList.size() != this.internalList.size()) {
+ return false;
+ }
+
+ return (new HashSet<>(otherList).equals(new HashSet<>(this.internalList)));
+ }
+
+ @Override
+ public int hashCode() {
+ return internalList.hashCode();
+ }
+
+ @Override
+ public List<Event> getEventsList() {
+ return Mapper.mapListOfVEventsToEvent(this.internalList);
+ }
+
+ /**
+ * Given a list of students, creates a list of Lesson events based on class time
+ * @param studentList
+ */
+ public void mapClassTimesToLessonEvent(List<Student> studentList) {
+ List<Event> listOfEvents = new ArrayList<>();
+ for (Student student: studentList) {
+ LocalDate date = student.getAdmin().getPaymentDate().lastPaid;
+
+ // date of lesson event will be recorded from latest payment date onwards
+ LocalDateTime ld = LocalDateTime.of(date, LocalTime.now());
+ listOfEvents.add(LessonEvent.createLessonEvent(student, ld));
+ }
+ this.resetData(listOfEvents);
+ }
+
+}
diff --git a/src/main/java/seedu/address/model/schedule/UniqueIdentifierGenerator.java b/src/main/java/seedu/address/model/schedule/UniqueIdentifierGenerator.java
new file mode 100644
index 00000000000..a5ba0dfbad6
--- /dev/null
+++ b/src/main/java/seedu/address/model/schedule/UniqueIdentifierGenerator.java
@@ -0,0 +1,26 @@
+package seedu.address.model.schedule;
+
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.time.LocalDateTime;
+
+/**
+ * A utility for generating unique identifier strings for Event as used by VEvent.
+ */
+public class UniqueIdentifierGenerator {
+ /**
+ * Generates a unique string identifier for the Events object as required by VEvent.
+ */
+ public static String generateUid(String eventName, String eventStartDateTime, String eventEndDateTime) {
+ requireAllNonNull(eventName, eventStartDateTime, eventEndDateTime);
+ StringBuilder builder = new StringBuilder();
+ builder.append(LocalDateTime.now().toString())
+ .append("/")
+ .append(eventName)
+ .append("/")
+ .append(eventStartDateTime)
+ .append("/")
+ .append(eventEndDateTime);
+ return builder.toString();
+ }
+}
diff --git a/src/main/java/seedu/address/model/schedule/exceptions/ClashEventException.java b/src/main/java/seedu/address/model/schedule/exceptions/ClashEventException.java
new file mode 100644
index 00000000000..68626a01be4
--- /dev/null
+++ b/src/main/java/seedu/address/model/schedule/exceptions/ClashEventException.java
@@ -0,0 +1,11 @@
+package seedu.address.model.schedule.exceptions;
+
+/**
+ * Signals that the operation will result in clashing Events (Events are considered clash if they have the same
+ * startDateTime and same endDateTime).
+ */
+public class ClashEventException extends RuntimeException {
+ public ClashEventException() {
+ super("Operation would result in clashing events time");
+ }
+}
diff --git a/src/main/java/seedu/address/model/schedule/exceptions/DuplicateEventException.java b/src/main/java/seedu/address/model/schedule/exceptions/DuplicateEventException.java
new file mode 100644
index 00000000000..9351d700d0a
--- /dev/null
+++ b/src/main/java/seedu/address/model/schedule/exceptions/DuplicateEventException.java
@@ -0,0 +1,11 @@
+package seedu.address.model.schedule.exceptions;
+
+/**
+ * Signals that the operation will result in duplicate Events (Events are considered duplicates if they have the same
+ * identity).
+ */
+public class DuplicateEventException extends RuntimeException {
+ public DuplicateEventException() {
+ super("Operation would result in duplicate event");
+ }
+}
diff --git a/src/main/java/seedu/address/model/schedule/exceptions/EventNotFoundException.java b/src/main/java/seedu/address/model/schedule/exceptions/EventNotFoundException.java
new file mode 100644
index 00000000000..9eb2aaca581
--- /dev/null
+++ b/src/main/java/seedu/address/model/schedule/exceptions/EventNotFoundException.java
@@ -0,0 +1,14 @@
+package seedu.address.model.schedule.exceptions;
+
+/**
+ * Signals that the operation is unable to find the specified Event.
+ */
+public class EventNotFoundException extends RuntimeException {
+ public EventNotFoundException() {
+ }
+
+ @Override
+ public String getMessage() {
+ return "Event cannot be found";
+ }
+}
diff --git a/src/main/java/seedu/address/model/person/Name.java b/src/main/java/seedu/address/model/student/Name.java
similarity index 94%
rename from src/main/java/seedu/address/model/person/Name.java
rename to src/main/java/seedu/address/model/student/Name.java
index 79244d71cf7..dbb3974d72f 100644
--- a/src/main/java/seedu/address/model/person/Name.java
+++ b/src/main/java/seedu/address/model/student/Name.java
@@ -1,10 +1,10 @@
-package seedu.address.model.person;
+package seedu.address.model.student;
import static java.util.Objects.requireNonNull;
import static seedu.address.commons.util.AppUtil.checkArgument;
/**
- * Represents a Person's name in the address book.
+ * Represents a Student's name in the Reeve.
* Guarantees: immutable; is valid as declared in {@link #isValidName(String)}
*/
public class Name {
@@ -38,7 +38,6 @@ public static boolean isValidName(String test) {
return test.matches(VALIDATION_REGEX);
}
-
@Override
public String toString() {
return fullName;
diff --git a/src/main/java/seedu/address/model/student/NameComparator.java b/src/main/java/seedu/address/model/student/NameComparator.java
new file mode 100644
index 00000000000..34a4ef53bce
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/NameComparator.java
@@ -0,0 +1,18 @@
+package seedu.address.model.student;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.Comparator;
+
+public class NameComparator implements Comparator<Student> {
+
+ public static final String COMPARISON_MEANS = "name";
+ public static final String USAGE = COMPARISON_MEANS + ": Sorts students by their name (case insensitive)";
+
+ @Override
+ public int compare(Student o1, Student o2) {
+ requireNonNull(o1);
+ requireNonNull(o2);
+ return o1.getName().fullName.toLowerCase().compareTo(o2.getName().fullName.toLowerCase());
+ }
+}
diff --git a/src/main/java/seedu/address/model/person/NameContainsKeywordsPredicate.java b/src/main/java/seedu/address/model/student/NameContainsKeywordsPredicate.java
similarity index 82%
rename from src/main/java/seedu/address/model/person/NameContainsKeywordsPredicate.java
rename to src/main/java/seedu/address/model/student/NameContainsKeywordsPredicate.java
index c9b5868427c..90f54cfc602 100644
--- a/src/main/java/seedu/address/model/person/NameContainsKeywordsPredicate.java
+++ b/src/main/java/seedu/address/model/student/NameContainsKeywordsPredicate.java
@@ -1,4 +1,4 @@
-package seedu.address.model.person;
+package seedu.address.model.student;
import java.util.List;
import java.util.function.Predicate;
@@ -8,17 +8,17 @@
/**
* Tests that a {@code Person}'s {@code Name} matches any of the keywords given.
*/
-public class NameContainsKeywordsPredicate implements Predicate<Person> {
- private final List<String> keywords;
+public class NameContainsKeywordsPredicate implements Predicate<Student> {
+ public final List<String> keywords;
public NameContainsKeywordsPredicate(List<String> keywords) {
this.keywords = keywords;
}
@Override
- public boolean test(Person person) {
+ public boolean test(Student student) {
return keywords.stream()
- .anyMatch(keyword -> StringUtil.containsWordIgnoreCase(person.getName().fullName, keyword));
+ .anyMatch(keyword -> StringUtil.containsWordIgnoreCase(student.getName().fullName, keyword));
}
@Override
diff --git a/src/main/java/seedu/address/model/person/Phone.java b/src/main/java/seedu/address/model/student/Phone.java
similarity index 93%
rename from src/main/java/seedu/address/model/person/Phone.java
rename to src/main/java/seedu/address/model/student/Phone.java
index 872c76b382f..cf9635b9c5f 100644
--- a/src/main/java/seedu/address/model/person/Phone.java
+++ b/src/main/java/seedu/address/model/student/Phone.java
@@ -1,15 +1,14 @@
-package seedu.address.model.person;
+package seedu.address.model.student;
import static java.util.Objects.requireNonNull;
import static seedu.address.commons.util.AppUtil.checkArgument;
/**
- * Represents a Person's phone number in the address book.
+ * Represents a Student's phone number in Reeve.
* Guarantees: immutable; is valid as declared in {@link #isValidPhone(String)}
*/
public class Phone {
-
public static final String MESSAGE_CONSTRAINTS =
"Phone numbers should only contain numbers, and it should be at least 3 digits long";
public static final String VALIDATION_REGEX = "\\d{3,}";
diff --git a/src/main/java/seedu/address/model/student/School.java b/src/main/java/seedu/address/model/student/School.java
new file mode 100644
index 00000000000..d70eed56c9c
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/School.java
@@ -0,0 +1,60 @@
+package seedu.address.model.student;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.AppUtil.checkArgument;
+
+/**
+ * Represents a Student's school in Reeve.
+ * Guarantees: immutable; is valid as declared in {@link #isValidSchool(String)}
+ */
+public class School {
+
+ public static final String MESSAGE_CONSTRAINTS =
+ "School name can take any values, and should not be blank";
+
+ /*
+ * School names must have at least 1 alphabet with spaces in between allowed.
+ * First character cannot be empty string if not empty string becomes valid school.
+ */
+ public static final String VALIDATION_REGEX = "[^\\s].*";
+
+ public final String school;
+
+ /**
+ * Constructs a {@code Name}.
+ *
+ * @param school A valid school.
+ */
+ public School(String school) {
+ requireNonNull(school);
+ checkArgument(isValidSchool(school), MESSAGE_CONSTRAINTS);
+ this.school = school;
+ }
+
+ /**
+ * Returns true if a given string is a valid name.
+ */
+ public static boolean isValidSchool(String test) {
+ return test.matches(VALIDATION_REGEX);
+ }
+
+
+ @Override
+ public String toString() {
+ return school;
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof School // instanceof handles nulls
+ && school.equals(((School) other).school)); // state check
+ }
+
+ @Override
+ public int hashCode() {
+ return school.hashCode();
+ }
+
+}
+
diff --git a/src/main/java/seedu/address/model/student/SchoolContainsKeywordsPredicate.java b/src/main/java/seedu/address/model/student/SchoolContainsKeywordsPredicate.java
new file mode 100644
index 00000000000..4463baf1c7e
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/SchoolContainsKeywordsPredicate.java
@@ -0,0 +1,35 @@
+package seedu.address.model.student;
+
+import java.util.List;
+import java.util.function.Predicate;
+
+import seedu.address.commons.util.StringUtil;
+
+/**
+ * Tests that a {@code Student}'s {@code School} matches any of the keywords given.
+ */
+public class SchoolContainsKeywordsPredicate implements Predicate<Student> {
+ public final List<String> keywords;
+
+ public SchoolContainsKeywordsPredicate(List<String> keywords) {
+ this.keywords = keywords;
+ }
+
+ @Override
+ public boolean test(Student student) {
+ if (this.keywords.size() < 1) {
+ return false;
+ }
+ return keywords.stream()
+ .map(String::toLowerCase)
+ .allMatch(keyword -> StringUtil.containsIgnoreCase(student.getSchool().school, keyword));
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof SchoolContainsKeywordsPredicate // instanceof handles nulls
+ && keywords.equals(((SchoolContainsKeywordsPredicate) other).keywords)); // state check
+ }
+
+}
diff --git a/src/main/java/seedu/address/model/student/SchoolType.java b/src/main/java/seedu/address/model/student/SchoolType.java
new file mode 100644
index 00000000000..12b896f7e28
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/SchoolType.java
@@ -0,0 +1,41 @@
+package seedu.address.model.student;
+
+import java.util.Map;
+
+public enum SchoolType {
+
+ PRIMARY {
+ @Override
+ public String toString() {
+ return "Primary";
+ }
+ },
+ SECONDARY {
+ @Override
+ public String toString() {
+ return "Secondary";
+ }
+ },
+ JC {
+ @Override
+ public String toString() {
+ return "JC";
+ }
+ };
+
+ public static final Map<String, SchoolType> LOOKUP_TABLE = Map.ofEntries(
+ Map.entry("pri", PRIMARY),
+ Map.entry("primary", PRIMARY),
+ Map.entry("p", PRIMARY),
+ Map.entry("sec", SECONDARY),
+ Map.entry("secondary", SECONDARY),
+ Map.entry("s", SECONDARY),
+ Map.entry("jc", JC),
+ Map.entry("j", JC)
+ );
+
+ public static boolean isValidSchoolType(String schoolType) {
+ return LOOKUP_TABLE.containsKey(schoolType.toLowerCase());
+ }
+
+}
diff --git a/src/main/java/seedu/address/model/student/Student.java b/src/main/java/seedu/address/model/student/Student.java
new file mode 100644
index 00000000000..7371cbc691a
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/Student.java
@@ -0,0 +1,302 @@
+package seedu.address.model.student;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.util.List;
+import java.util.Objects;
+
+import seedu.address.model.student.academic.Academic;
+import seedu.address.model.student.academic.Attendance;
+import seedu.address.model.student.academic.exam.Exam;
+import seedu.address.model.student.academic.question.Question;
+import seedu.address.model.student.admin.Admin;
+import seedu.address.model.student.admin.ClassTime;
+import seedu.address.model.student.admin.ClassVenue;
+import seedu.address.model.student.admin.Detail;
+import seedu.address.model.student.admin.Fee;
+import seedu.address.model.student.admin.PaymentDate;
+
+/**
+ * Represents a Student in Reeve.
+ * Guarantees: details are present and not null, field values are validated, immutable.
+ */
+public class Student {
+
+ private final Name name;
+ private final Phone phone;
+ private final School school;
+ private final Year year;
+ private final Admin admin;
+ private final Academic academic;
+
+ /**
+ * alternate constructor where admin and academic details need not be changed
+ */
+ public Student(Name name, Phone phone, School school, Year year,
+ Admin admin, Academic academic) {
+ requireAllNonNull(name, phone, school, year, admin, academic);
+ this.name = name;
+ this.phone = phone;
+ this.school = school;
+ this.year = year;
+ this.admin = admin;
+ this.academic = academic;
+ }
+
+ /**
+ * default constructor for when all fields are added
+ */
+ public Student(Name name, Phone phone, School school, Year year,
+ ClassVenue venue, ClassTime time, Fee fee, PaymentDate date, List<Detail> details,
+ List<Question> questions, List<Exam> exams, List<Attendance> attendances) {
+ requireAllNonNull(name, phone, school, year, venue, time, fee, date, details, questions, exams, attendances);
+ this.name = name;
+ this.phone = phone;
+ this.school = school;
+ this.year = year;
+ this.admin = new Admin(venue, time, fee, date, details);
+ this.academic = new Academic(questions, attendances, exams);
+ }
+
+ /**
+ * alternate constructor for when admin need not be changed
+ */
+ public Student(Name name, Phone phone, School school, Year year, Admin admin,
+ List<Question> questions, List<Exam> exams, List<Attendance> attendances) {
+ requireAllNonNull(name, phone, school, year, admin, questions, exams, attendances);
+ this.name = name;
+ this.phone = phone;
+ this.school = school;
+ this.year = year;
+ this.admin = admin;
+ this.academic = new Academic(questions, attendances, exams);
+ }
+
+ /**
+ * alternate constructor for when academic need not be changed
+ */
+ public Student(Name name, Phone phone, School school, Year year,
+ ClassVenue venue, ClassTime time, Fee fee, PaymentDate date, List<Detail> details,
+ Academic academic) {
+ requireAllNonNull(name, phone, school, year, venue, time, fee, date, details, academic);
+ this.name = name;
+ this.phone = phone;
+ this.school = school;
+ this.year = year;
+ this.admin = new Admin(venue, time, fee, date, details);
+ this.academic = academic;
+ }
+
+ public Name getName() {
+ return name;
+ }
+
+ public Phone getPhone() {
+ return phone;
+ }
+
+ public School getSchool() {
+ return school;
+ }
+
+ public Year getYear() {
+ return year;
+ }
+
+ /**
+ * Returns true if both student of the same name have at least one other identity field that is the same.
+ * This defines a weaker notion of equality between two students.
+ */
+ public boolean isSameStudent(Student otherStudent) {
+ if (otherStudent == this) {
+ return true;
+ }
+
+ return otherStudent != null
+ && otherStudent.getName().toString().toLowerCase().equals(getName().toString().toLowerCase())
+ && otherStudent.getPhone().equals(getPhone())
+ && otherStudent.getSchool().toString().toLowerCase().equals(getSchool().toString().toLowerCase())
+ && otherStudent.getYear().equals(getYear());
+ }
+
+ /**
+ * Returns true if the given student has a lesson time that clashes with this student.
+ */
+ public boolean hasClashingClassTimeWith(Student otherStudent) {
+ return admin.hasClashingClassTime(otherStudent.admin);
+ }
+
+ /**
+ * Returns true if both student have the same identity and data fields.
+ * This defines a stronger notion of equality between two students.
+ */
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+
+ if (!(other instanceof Student)) {
+ return false;
+ }
+
+ Student otherStudent = (Student) other;
+ return otherStudent.getName().equals(getName())
+ && otherStudent.getPhone().equals(getPhone())
+ && otherStudent.getSchool().equals(getSchool())
+ && otherStudent.getYear().equals(getYear())
+ && otherStudent.getAdmin().equals(getAdmin())
+ && otherStudent.getAcademic().equals(getAcademic())
+ && otherStudent.getQuestions().equals(getQuestions())
+ && otherStudent.getExams().equals(getExams())
+ && otherStudent.getAcademic().equals(getAcademic());
+ }
+
+ @Override
+ public int hashCode() {
+ // use this method for custom fields hashing instead of implementing your own
+ return Objects.hash(name, phone, school, year, admin, academic);
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder builder = new StringBuilder();
+ builder.append("Name: ")
+ .append(getName())
+ .append("\nPhone: ")
+ .append(getPhone())
+ .append("\nSchool: ")
+ .append(getSchool())
+ .append("\nYear: ")
+ .append(getYear())
+ .append(getAdmin())
+ .append(getAcademic());
+
+ return builder.toString();
+ }
+
+ //==============QUESTION OPERATIONS==============//
+
+ /**
+ * Returns true if there is an existing {@code Question} in the question list that has the same question.
+ */
+ public boolean containsQuestion(Question question) {
+ return academic.containsQuestion(question);
+ }
+
+ /**
+ * Creates a new student object with a newly added question at the end of the questions list.
+ * The newly added question must not already be present in the list.
+ * This operation preserves the immutability of the Student class.
+ */
+ public Student addQuestion(Question question) {
+ assert !containsQuestion(question);
+ requireNonNull(question);
+ return new Student(name, phone, school, year, admin, academic.addQuestion(question));
+ }
+
+ /**
+ * Creates a new student object with a modified question replacing the previous question in the list.
+ * The question to be replaced must be already present in the list, and the replacement must be absent.
+ * This operation preserves the immutability of the Student class.
+ */
+ public Student setQuestion(Question target, Question newQuestion) {
+ assert getQuestions().contains(target) && !getQuestions().contains(newQuestion);
+ requireAllNonNull(target, newQuestion);
+
+ return new Student(name, phone, school, year, admin, academic.setQuestion(target, newQuestion));
+ }
+
+ /**
+ * Creates a new student object with the specified question removed from the list.
+ * The question to delete must already be in the list.
+ * This operation preserves the immutability of the Student class.
+ */
+ public Student deleteQuestion(Question target) {
+ assert getQuestions().contains(target);
+ requireNonNull(target);
+
+ return new Student(name, phone, school, year, admin, academic.deleteQuestion(target));
+ }
+
+ //==============ATTENDANCE OPERATIONS==============//
+
+ /**
+ * Returns true if there is an existing {@code Attendance} in the attendance list that shares the same date.
+ */
+ public boolean containsAttendance(Attendance attendance) {
+ return academic.containsAttendance(attendance);
+ }
+
+ //==============ADMIN ACCESSORS==============//
+ public Admin getAdmin() {
+ return admin;
+ }
+
+ public Fee getFee() {
+ return admin.getFee();
+ }
+
+ public PaymentDate getPaymentDate() {
+ return admin.getPaymentDate();
+ }
+
+ public ClassVenue getClassVenue() {
+ return admin.getClassVenue();
+ }
+
+ public ClassTime getClassTime() {
+ return admin.getClassTime();
+ }
+
+ public List<Detail> getDetails() {
+ return admin.getDetails();
+ }
+
+ public String getFormattedDetails() {
+ return admin.getFormattedDetails();
+ }
+
+ //==============ACADEMIC ACCESSORS==============//
+ public Academic getAcademic() {
+ return academic;
+ }
+
+ public List<Question> getQuestions() {
+ return academic.getQuestions();
+ }
+
+ public List<Attendance> getAttendance() {
+ return academic.getAttendance();
+ }
+
+ public List<Exam> getExams() {
+ return academic.getExams();
+ }
+
+ /**
+ * Get Question of student formatted for GUI use.
+ * @return formatted questions.
+ */
+ public String getFormattedQuestions() {
+ return academic.getFormattedQuestions();
+ }
+
+ /**
+ * Get Attendance of student formatted for GUI use.
+ * @return formatted exams.
+ */
+ public String getFormattedAttendance() {
+ return academic.getFormattedAttendance();
+ }
+
+ /**
+ * Get exams of student formatted for GUI use.
+ * @return formatted exams.
+ */
+ public String getFormattedExams() {
+ return academic.getFormattedExams();
+ }
+
+}
diff --git a/src/main/java/seedu/address/model/student/UniqueStudentList.java b/src/main/java/seedu/address/model/student/UniqueStudentList.java
new file mode 100644
index 00000000000..90af4ac483a
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/UniqueStudentList.java
@@ -0,0 +1,144 @@
+package seedu.address.model.student;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.util.Iterator;
+import java.util.List;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import seedu.address.model.student.exceptions.DuplicateStudentException;
+import seedu.address.model.student.exceptions.StudentNotFoundException;
+
+/**
+ * A list of persons that enforces uniqueness between its elements and does not allow nulls.
+ * A person is considered unique by comparing using {@code Person#isSamePerson(Person)}. As such, adding and updating of
+ * persons uses Person#isSamePerson(Person) for equality so as to ensure that the person being added or updated is
+ * unique in terms of identity in the UniquePersonList. However, the removal of a person uses Person#equals(Object) so
+ * as to ensure that the person with exactly the same fields will be removed.
+ *
+ * Supports a minimal set of list operations.
+ *
+ * @see Student#isSameStudent(Student)
+ */
+public class UniqueStudentList implements Iterable<Student> {
+
+ private final ObservableList<Student> internalList = FXCollections.observableArrayList();
+ private final ObservableList<Student> internalUnmodifiableList =
+ FXCollections.unmodifiableObservableList(internalList);
+
+ /**
+ * Returns true if the list contains an equivalent person as the given argument.
+ */
+ public boolean contains(Student toCheck) {
+ requireNonNull(toCheck);
+ return internalList.stream().anyMatch(toCheck::isSameStudent);
+ }
+
+ /**
+ * Adds a person to the list.
+ * The person must not already exist in the list.
+ */
+ public void add(Student toAdd) {
+ requireNonNull(toAdd);
+ if (contains(toAdd)) {
+ throw new DuplicateStudentException();
+ }
+ internalList.add(toAdd);
+ }
+
+ /**
+ * Replaces the person {@code target} in the list with {@code editedPerson}.
+ * {@code target} must exist in the list.
+ * The person identity of {@code editedPerson} must not be the same as another existing person in the list.
+ */
+ public void setStudent(Student target, Student editedStudent) {
+ requireAllNonNull(target, editedStudent);
+
+ int index = internalList.indexOf(target);
+ if (index == -1) {
+ throw new StudentNotFoundException();
+ }
+
+ if (!target.isSameStudent(editedStudent) && contains(editedStudent)) {
+ throw new DuplicateStudentException();
+ }
+
+ internalList.set(index, editedStudent);
+ }
+
+ /**
+ * Removes the equivalent person from the list.
+ * The person must exist in the list.
+ */
+ public void remove(Student toRemove) {
+ requireNonNull(toRemove);
+ if (!internalList.remove(toRemove)) {
+ throw new StudentNotFoundException();
+ }
+ }
+
+ public void setStudents(UniqueStudentList replacement) {
+ requireNonNull(replacement);
+ internalList.setAll(replacement.internalList);
+ }
+
+ /**
+ * Replaces the contents of this list with {@code persons}.
+ * {@code persons} must not contain duplicate persons.
+ */
+ public void setStudents(List<Student> students) {
+ requireAllNonNull(students);
+ if (!studentsAreUnique(students)) {
+ throw new DuplicateStudentException();
+ }
+
+ internalList.setAll(students);
+ }
+
+ /**
+ * Returns true if the student to be added has a class time that clashes with the other students.
+ */
+ public boolean hasClashingClassTimeWith(Student test) {
+ return internalList.stream().anyMatch(test::hasClashingClassTimeWith);
+ }
+
+ /**
+ * Returns the backing list as an unmodifiable {@code ObservableList}.
+ */
+ public ObservableList<Student> asUnmodifiableObservableList() {
+ return internalUnmodifiableList;
+ }
+
+ @Override
+ public Iterator<Student> iterator() {
+ return internalList.iterator();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof UniqueStudentList // instanceof handles nulls
+ && internalList.equals(((UniqueStudentList) other).internalList));
+ }
+
+ @Override
+ public int hashCode() {
+ return internalList.hashCode();
+ }
+
+ /**
+ * Returns true if {@code persons} contains only unique persons.
+ */
+ private boolean studentsAreUnique(List<Student> students) {
+ for (int i = 0; i < students.size() - 1; i++) {
+ for (int j = i + 1; j < students.size(); j++) {
+ if (students.get(i).isSameStudent(students.get(j))) {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+}
diff --git a/src/main/java/seedu/address/model/student/Year.java b/src/main/java/seedu/address/model/student/Year.java
new file mode 100644
index 00000000000..207165ff133
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/Year.java
@@ -0,0 +1,74 @@
+package seedu.address.model.student;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.AppUtil.checkArgument;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class Year {
+
+ public static final String MESSAGE_CONSTRAINTS =
+ "Year should contain the type of school and a number representing the level. The type "
+ + "of school can only be one of \"secondary\", \"Secondary\", \"sec\", \"Sec\", \"s\", \"S\" "
+ + "\"primary\", \"Primary\", \"pri\", \"Pri\", \"p\", \"P\", \"j\", \"J\", \"JC\", \"Jc\", \"jc\""
+ + " and the level must be valid for the type of school.";
+
+ public static final String VALIDATION_REGEX = "((secondary|sec|s|Secondary|Sec|S)\\s*([1-5])|"
+ + "(primary|pri|p|Primary|Pri|P)\\s*([1-6])|(jc|Jc|j|J|JC)\\s*([1-2]))\\s*";
+
+ /**
+ * Used for separation of year into school type and level.
+ */
+ private static final Pattern YEAR_FORMAT = Pattern.compile("(?<school>[^\\d\\s]+)\\s*(?<level>\\d)");
+
+ public final SchoolType schoolType;
+ public final Integer level;
+
+ /**
+ * Constructs a {@code Year}.
+ */
+ public Year(String year) {
+ requireNonNull(year);
+ checkArgument(isValidYear(year), MESSAGE_CONSTRAINTS);
+
+ final Matcher matcher = getMatcher(year);
+ String schoolTypeString = matcher.group("school").trim().toLowerCase();
+ String levelString = matcher.group("level").trim().toLowerCase();
+
+ this.schoolType = parseSchoolType(schoolTypeString);
+ this.level = Integer.parseInt(levelString);
+ }
+
+ private static Matcher getMatcher(String year) {
+ Matcher matcher = YEAR_FORMAT.matcher(year);
+ boolean matches = matcher.matches();
+ assert matches; // this should only be reached if the input matches the regex in the first place
+ return matcher;
+ }
+
+ private static SchoolType parseSchoolType(String schoolTypeString) {
+ assert SchoolType.isValidSchoolType(schoolTypeString); // if it passes Year regex it should pass SchoolType's
+ return SchoolType.LOOKUP_TABLE.get(schoolTypeString);
+ }
+
+ /**
+ * Returns true if a given string is a valid year.
+ */
+ public static boolean isValidYear(String test) {
+ return test.matches(VALIDATION_REGEX);
+ }
+
+ @Override
+ public String toString() {
+ return String.format("%s %s", this.schoolType, this.level);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof Year // instanceof handles nulls
+ && schoolType.equals(((Year) other).schoolType)) // state check
+ && level.equals(((Year) other).level);
+ }
+}
diff --git a/src/main/java/seedu/address/model/student/YearComparator.java b/src/main/java/seedu/address/model/student/YearComparator.java
new file mode 100644
index 00000000000..d97d4357b94
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/YearComparator.java
@@ -0,0 +1,27 @@
+package seedu.address.model.student;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.Comparator;
+
+public class YearComparator implements Comparator<Student> {
+
+ public static final String COMPARISON_MEANS = "year";
+ public static final String USAGE = COMPARISON_MEANS + ": Sorts students by the year they are in school, "
+ + "with Primary 1 coming first and JC 2 coming last.";
+
+ @Override
+ public int compare(Student o1, Student o2) {
+ requireNonNull(o1);
+ requireNonNull(o2);
+ Year year1 = o1.getYear();
+ Year year2 = o2.getYear();
+ assert year1 != null;
+ assert year2 != null;
+ if (year1.schoolType.compareTo(year2.schoolType) == 0) {
+ return year1.level.compareTo(year2.level);
+ } else {
+ return year1.schoolType.compareTo(year2.schoolType);
+ }
+ }
+}
diff --git a/src/main/java/seedu/address/model/student/YearMatchPredicate.java b/src/main/java/seedu/address/model/student/YearMatchPredicate.java
new file mode 100644
index 00000000000..79a63704d95
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/YearMatchPredicate.java
@@ -0,0 +1,30 @@
+package seedu.address.model.student;
+
+import java.util.function.Predicate;
+
+/**
+ * Tests that a {@code Student}'s {@code Year} matches the given year.
+ */
+public class YearMatchPredicate implements Predicate<Student> {
+
+ // Attributes
+ public final Year year;
+
+ // Constructor
+ public YearMatchPredicate(Year year) {
+ this.year = year;
+ }
+
+ @Override
+ public boolean test(Student student) {
+ return this.year.equals(student.getYear());
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof YearMatchPredicate // instanceof handles nulls
+ && this.year.equals(((YearMatchPredicate) other).year)); // state check
+ }
+
+}
diff --git a/src/main/java/seedu/address/model/student/academic/Academic.java b/src/main/java/seedu/address/model/student/academic/Academic.java
new file mode 100644
index 00000000000..bb87518d3a1
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/academic/Academic.java
@@ -0,0 +1,212 @@
+package seedu.address.model.student.academic;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import seedu.address.model.student.academic.exam.Exam;
+import seedu.address.model.student.academic.question.Question;
+
+/**
+ * Represents all academic details of a Student in Reeve.
+ * Consists of questions, exams and attendance.
+ */
+public class Academic {
+
+ private final List<Question> questions = new ArrayList<>();
+ private final List<Attendance> attendance = new ArrayList<>();
+ private final List<Exam> exams = new ArrayList<>();
+
+ /**
+ * Builds an Academic object.
+ * @param attendance list of attendance for student.
+ */
+ public Academic(List<Question> questions, List<Attendance> attendance, List<Exam> exams) {
+ requireAllNonNull(questions, attendance, exams);
+ this.questions.addAll(questions);
+ this.attendance.addAll(attendance);
+ this.exams.addAll(exams);
+ }
+
+ private Academic(Academic copy) {
+ this.questions.addAll(copy.questions);
+ this.attendance.addAll(copy.attendance);
+ this.exams.addAll(copy.exams);
+ }
+
+ public List<Question> getQuestions() {
+ return new ArrayList<>(questions);
+ }
+
+ public List<Attendance> getAttendance() {
+ return new ArrayList<>(attendance);
+ }
+
+ public List<Exam> getExams() {
+ return new ArrayList<>(exams);
+ }
+
+ //@@author VaishakAnand
+ /**
+ * Get Question of student formatted for GUI use.
+ * @return formatted questions.
+ */
+ public String getFormattedQuestions() {
+ String result = "";
+ int index = 1;
+ for (Question question : questions) {
+ result = result + index + ". " + question.toString() + "\n";
+ index++;
+ }
+ return result;
+ }
+
+ /**
+ * Get Attendance of student formatted for GUI use.
+ * @return formatted exams.
+ */
+ public String getFormattedAttendance() {
+ String result = "";
+ int index = 1;
+ for (Attendance singleAttendance : attendance) {
+ result = result + index + ". " + singleAttendance + "\n";
+ index++;
+ }
+ return result;
+ }
+ //@@author
+
+ //@@author hogantan
+ /**
+ * Get exams of student formatted for GUI use.
+ * @return formatted exams.
+ */
+ public String getFormattedExams() {
+ String result = "";
+ int index = 1;
+ for (Exam exam : exams) {
+ result = result + index + "." + exam.toString() + "\n";
+ index++;
+ }
+ return result;
+ }
+ //@@author
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(attendance);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ if (!(obj instanceof Academic)) {
+ return false;
+ }
+
+ Academic other = (Academic) obj;
+ return other.getAttendance().equals(getAttendance())
+ && other.getExams().equals(getExams())
+ && other.getQuestions().equals(getQuestions());
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder builder = new StringBuilder();
+
+ if (!questions.isEmpty()) {
+ builder.append("\nQuestions:\n");
+ String questionList = questions.stream()
+ .map(Question::toString)
+ .collect(Collectors.joining("\n"));
+ builder.append(questionList);
+ }
+
+ if (!exams.isEmpty()) {
+ builder.append("\nExams:\n");
+ String examList = exams.stream()
+ .map(detail -> String.format("- %s", detail))
+ .collect(Collectors.joining("\n"));
+ builder.append(examList);
+ }
+
+ if (!attendance.isEmpty()) {
+ builder.append("\nAttendance:\n");
+ String detailList = attendance.stream()
+ .map(detail -> String.format("- %s", detail))
+ .collect(Collectors.joining("\n"));
+ builder.append(detailList);
+ }
+
+ return builder.toString();
+ }
+
+ //==============QUESTION OPERATIONS==============//
+
+ /**
+ * Returns true if there is an existing {@code Question} in the question list that has the same question.
+ */
+ public boolean containsQuestion(Question question) {
+ return questions.stream().anyMatch(question::isSameQuestion);
+ }
+
+ /**
+ * Creates a new academic object with a newly added question at the end of the questions list.
+ * The newly added question must not already be present in the list.
+ * This operation preserves the immutability of the academic class.
+ */
+ public Academic addQuestion(Question question) {
+ assert !containsQuestion(question);
+ requireNonNull(question);
+
+ Academic replacement = new Academic(this);
+ replacement.questions.add(question);
+ return replacement;
+ }
+
+ /**
+ * Creates a new academic object with a modified question replacing the previous question in the list.
+ * The question to be replaced must be already present in the list, and the replacement must be absent.
+ * This operation preserves the immutability of the Academic class.
+ */
+ public Academic setQuestion(Question target, Question newQuestion) {
+ assert questions.contains(target) && !questions.contains(newQuestion);
+ requireAllNonNull(target, newQuestion);
+
+ Academic replacement = new Academic(this);
+ int location = replacement.questions.indexOf(target);
+ replacement.questions.set(location, newQuestion);
+ return replacement;
+ }
+
+ /**
+ * Creates a new academic object with the specified question removed from the list.
+ * The question to delete must already be in the list.
+ * This operation preserves the immutability of the Academic class.
+ */
+ public Academic deleteQuestion(Question target) {
+ assert questions.contains(target);
+ requireNonNull(target);
+
+ Academic replacement = new Academic(this);
+ replacement.questions.remove(target);
+ return replacement;
+ }
+
+ //==============ATTENDANCE OPERATIONS==============//
+
+ /**
+ * Returns true if there is an existing {@code Attendance} in the attendance list that shares the same date.
+ */
+ public boolean containsAttendance(Attendance other) {
+ return attendance.stream().anyMatch(other::isSameAttendance);
+ }
+
+}
diff --git a/src/main/java/seedu/address/model/student/academic/Attendance.java b/src/main/java/seedu/address/model/student/academic/Attendance.java
new file mode 100644
index 00000000000..70feeaec50f
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/academic/Attendance.java
@@ -0,0 +1,103 @@
+package seedu.address.model.student.academic;
+
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import static seedu.address.commons.util.DateUtil.getInputFormat;
+import static seedu.address.commons.util.DateUtil.print;
+
+import java.time.LocalDate;
+import java.util.Optional;
+
+/**
+ * Represents a Student's attendance in a lesson.
+ * Guarantees: immutable
+ */
+public class Attendance {
+
+ public static final String STATUS_CONSTRAINTS =
+ "Attendance status should be either 'present' or 'absent'.";
+
+ public static final String PRESENT_STATUS = "present";
+ public static final String ABSENT_STATUS = "absent";
+
+ private final LocalDate lessonDate;
+ private final boolean isPresent;
+ private final Optional<Feedback> feedback;
+
+ /**
+ * Constructs a {@code Attendance} object.
+ * @param date date of lesson
+ * @param isPresent whether student was present for lesson
+ * @param feedback feedback for lesson
+ */
+ public Attendance(LocalDate date, boolean isPresent, Feedback feedback) {
+ requireAllNonNull(date, feedback);
+
+ this.lessonDate = date;
+ this.isPresent = isPresent;
+ this.feedback = Optional.of(feedback);
+ }
+
+ /**
+ * Constructs a {@code Attendance} object.
+ * @param date date of lesson
+ * @param isPresent whether student was present for lesson
+ */
+ public Attendance(LocalDate date, boolean isPresent) {
+ requireAllNonNull(date);
+
+ this.lessonDate = date;
+ this.isPresent = isPresent;
+ this.feedback = Optional.empty();
+ }
+
+ public static boolean isValidStatus(String status) {
+ return status.equals(PRESENT_STATUS) || status.equals(ABSENT_STATUS);
+ }
+
+ public LocalDate getLessonDate() {
+ return lessonDate;
+ }
+
+ /**
+ * Returns true if the given date matches the lesson date of an Attendance object.
+ * This is a weaker notion of equality between Attendance objects.
+ */
+ public boolean isSameAttendance(Attendance date) {
+ return lessonDate.equals(date.lessonDate);
+ }
+
+ public String getUserInputDate() {
+ return getInputFormat(lessonDate);
+ }
+
+ public boolean isStudentPresent() {
+ return isPresent;
+ }
+
+ public Optional<Feedback> getFeedback() {
+ return feedback;
+ }
+
+ @Override
+ public String toString() {
+ String feedback = getFeedback().map(fdb -> String.format("[%1$s]", fdb)).orElse("");
+ return String.format("(%2$s) %1$s %3$s",
+ print(lessonDate), (isStudentPresent() ? "\u2713" : "\u2718"), feedback);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ if (!(obj instanceof Attendance)) {
+ return false;
+ }
+
+ Attendance other = (Attendance) obj;
+ return other.getLessonDate().equals(getLessonDate())
+ && other.isStudentPresent() == isStudentPresent()
+ && other.getFeedback().equals(getFeedback());
+ }
+}
diff --git a/src/main/java/seedu/address/model/student/academic/Feedback.java b/src/main/java/seedu/address/model/student/academic/Feedback.java
new file mode 100644
index 00000000000..cb31396b3e2
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/academic/Feedback.java
@@ -0,0 +1,49 @@
+package seedu.address.model.student.academic;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.AppUtil.checkArgument;
+
+public class Feedback {
+
+ public static final String MESSAGE_CONSTRAINTS = "Feedback should be alphanumeric";
+ public static final String VALIDATION_REGEX = "^[\\s]*[a-zA-Z0-9][a-zA-Z0-9\\s]*$";
+
+ private String feedback;
+
+ /**
+ * Constructs a {@code Feedback} object.
+ * @param feedback feedback for student.
+ */
+ public Feedback(String feedback) {
+ requireNonNull(feedback);
+ checkArgument(isValidFeedback(feedback), MESSAGE_CONSTRAINTS);
+
+ this.feedback = feedback;
+ }
+
+ /**
+ * Returns true if a given string is a valid feedback.
+ */
+ public static boolean isValidFeedback(String test) {
+ return test.matches(VALIDATION_REGEX);
+ }
+
+ @Override
+ public String toString() {
+ return this.feedback;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ if (!(obj instanceof Feedback)) {
+ return false;
+ }
+
+ Feedback other = (Feedback) obj;
+ return other.feedback.equals(feedback);
+ }
+}
diff --git a/src/main/java/seedu/address/model/student/academic/exam/Exam.java b/src/main/java/seedu/address/model/student/academic/exam/Exam.java
new file mode 100644
index 00000000000..1068afbec32
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/academic/exam/Exam.java
@@ -0,0 +1,89 @@
+package seedu.address.model.student.academic.exam;
+
+import static seedu.address.commons.util.AppUtil.checkArgument;
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+import static seedu.address.commons.util.DateUtil.getInputFormat;
+import static seedu.address.commons.util.DateUtil.print;
+
+import java.time.LocalDate;
+import java.util.Objects;
+
+/**
+ * Represents an Exam in Reeve that can be assigned to a {@code Student}.
+ */
+public class Exam {
+
+ public static final String MESSAGE_CONSTRAINTS = "Exam names can take any values, and "
+ + "should not be should not be blank.";
+
+ /*
+ * Exam names must have at least 1 alphabet with spaces in between allowed.
+ * First character cannot be empty string if not empty string becomes valid school.
+ */
+ public static final String VALIDATION_REGEX = "[^\\s].*";
+
+ private final String examName;
+ private final LocalDate examDate;
+ private final Score score;
+
+ /**
+ * Constructs a {@code Exam}.
+ *
+ * @param examName name of exam.
+ * @param examDate date of exam.
+ * @param score score obtained.
+ */
+ public Exam(String examName, LocalDate examDate, Score score) {
+ requireAllNonNull(examName, examDate, score);
+ checkArgument(isValidExamName(examName), MESSAGE_CONSTRAINTS);
+
+ this.examName = examName;
+ this.examDate = examDate;
+ this.score = score;
+ }
+
+ public static boolean isValidExamName(String test) {
+ return test.matches(VALIDATION_REGEX);
+ }
+
+ public String getName() {
+ return examName;
+ }
+
+ public LocalDate getDate() {
+ return examDate;
+ }
+
+ public Score getScore() {
+ return score;
+ }
+
+ public String getUserInputDate() {
+ return getInputFormat(examDate);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(examName, examDate, score);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ if (!(obj instanceof Exam)) {
+ return false;
+ }
+
+ Exam other = (Exam) obj;
+ return other.getName().equals(getName());
+ }
+
+ @Override
+ public String toString() {
+ return " " + examName + "\n\t- Date: " + print(examDate) + "\n\t- Score: "
+ + score + " (" + score.getScorePercentage() + "%)";
+ }
+}
diff --git a/src/main/java/seedu/address/model/student/academic/exam/Score.java b/src/main/java/seedu/address/model/student/academic/exam/Score.java
new file mode 100644
index 00000000000..6045c490d07
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/academic/exam/Score.java
@@ -0,0 +1,85 @@
+package seedu.address.model.student.academic.exam;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.AppUtil.checkArgument;
+
+/**
+ * Represents an exam's score in an Exam.
+ * Guarantees: immutable; is valid as declared in {@link #isValidExamScore(String)}
+ */
+public class Score {
+
+ public static final String MESSAGE_CONSTRAINTS =
+ "Scores should be in the form x/y, where x and y are both non-negative numbers and x has to be less than "
+ + "or equal to y.";
+
+ public final double marksObtained;
+ public final double totalMarks;
+ public final String examScore;
+
+ /**
+ * Constructs a {@code Score}.
+ *
+ * @param score A valid exam score.
+ */
+ public Score(String score) {
+ requireNonNull(score);
+ checkArgument(isValidExamScore(score), MESSAGE_CONSTRAINTS);
+ String[] splitScore = score.split("/");
+ marksObtained = Math.round(Double.parseDouble(splitScore[0]) * 100.0) / 100.0;
+ totalMarks = Math.round(Double.parseDouble(splitScore[1]) * 100.0) / 100.0;
+ examScore = marksObtained + "/" + totalMarks;
+ }
+
+ /**
+ * Returns true if a given string is a valid score.
+ */
+ public static boolean isValidExamScore(String score) {
+ String[] splitScore = score.split("/");
+
+ if (splitScore.length != 2) {
+ return false;
+ }
+
+ double marksObtained;
+ double totalMarks;
+
+ try {
+ marksObtained = Double.parseDouble(splitScore[0]);
+ totalMarks = Double.parseDouble(splitScore[1]);
+ } catch (NumberFormatException e) {
+ return false;
+ }
+
+ if (marksObtained < 0 || totalMarks < 0) {
+ return false;
+ }
+
+ return marksObtained <= totalMarks;
+ }
+
+ /**
+ * Get percentage converted score.
+ * @return score in terms of percentage.
+ */
+ public double getScorePercentage() {
+ return (Math.round((marksObtained / totalMarks) * 10000.0) / 100.0);
+ }
+
+ @Override
+ public String toString() {
+ return examScore;
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof Score // instanceof handles nulls
+ && examScore.equals(((Score) other).examScore)); // state check
+ }
+
+ @Override
+ public int hashCode() {
+ return examScore.hashCode();
+ }
+}
diff --git a/src/main/java/seedu/address/model/student/academic/question/Question.java b/src/main/java/seedu/address/model/student/academic/question/Question.java
new file mode 100644
index 00000000000..b3cffa92c95
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/academic/question/Question.java
@@ -0,0 +1,53 @@
+package seedu.address.model.student.academic.question;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.AppUtil.checkArgument;
+
+/**
+ * Represents a question a Student has for a tutor in Reeve.
+ */
+public abstract class Question {
+
+ public static final String MESSAGE_CONSTRAINTS =
+ "Questions should at least contain a non-whitespace character";
+
+ public static final String VALIDATION_REGEX = "[^\\s].*";
+
+ public final String question;
+
+ /**
+ * Constructs a new Question object. This is the default constructor for adding
+ * a new unresolved Question to a student.
+ */
+ public Question(String question) {
+ requireNonNull(question);
+ checkArgument(isValidQuestion(question), MESSAGE_CONSTRAINTS);
+ this.question = question;
+ }
+
+ /**
+ * Returns true if the given String is valid.
+ */
+ public static boolean isValidQuestion(String test) {
+ return test.matches(VALIDATION_REGEX);
+ }
+
+ /**
+ * Returns true if both questions are the same, regardless of resolution status.
+ * This is a weaker notion of equality between questions.
+ */
+ public boolean isSameQuestion(Question other) {
+ return question.equals(other.question);
+ }
+
+ @Override
+ public String toString() {
+ return question;
+ }
+
+ /**
+ * Returns true if the question has been resolved by the tutor.
+ */
+ public abstract boolean isResolved();
+
+}
diff --git a/src/main/java/seedu/address/model/student/academic/question/SolvedQuestion.java b/src/main/java/seedu/address/model/student/academic/question/SolvedQuestion.java
new file mode 100644
index 00000000000..63b9765ac1d
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/academic/question/SolvedQuestion.java
@@ -0,0 +1,71 @@
+package seedu.address.model.student.academic.question;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.AppUtil.checkArgument;
+
+import java.util.Objects;
+
+/**
+ * Represents a student's question in Reeve that the tutor has resolved.
+ */
+public class SolvedQuestion extends Question {
+
+ public static final String MESSAGE_SOLUTION_CONSTRAINTS =
+ "Solutions should at least contain a non-whitespace character";
+
+ private static final String STATUS = "(\u2713)";
+
+ public final String solution;
+
+ /**
+ * Constructs a SolvedQuestion object.
+ */
+ public SolvedQuestion(String question, String solution) {
+ super(question);
+ requireNonNull(solution);
+ checkArgument(isValidSolution(solution), MESSAGE_SOLUTION_CONSTRAINTS);
+ this.solution = solution;
+ }
+
+ /**
+ * Returns true if the given String is valid.
+ */
+ public static boolean isValidSolution(String test) {
+ return test.matches(VALIDATION_REGEX);
+ }
+
+ /**
+ * Returns true if both questions are solved and have similar details.
+ * This is a stronger notion of equality between questions.
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) { // short circuit if same object
+ return true;
+ }
+
+ if (!(obj instanceof SolvedQuestion)) { // instanceof handles nulls
+ return false;
+ }
+
+ // state check
+ SolvedQuestion other = (SolvedQuestion) obj;
+ return question.equals(other.question) && solution.equals(other.solution);
+ }
+
+ @Override
+ public String toString() {
+ return String.format("%1$s %2$s [%3$s]", STATUS, super.toString(), solution);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(question, solution);
+ }
+
+ @Override
+ public boolean isResolved() {
+ return true;
+ }
+
+}
diff --git a/src/main/java/seedu/address/model/student/academic/question/UnsolvedQuestion.java b/src/main/java/seedu/address/model/student/academic/question/UnsolvedQuestion.java
new file mode 100644
index 00000000000..dff01220586
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/academic/question/UnsolvedQuestion.java
@@ -0,0 +1,51 @@
+package seedu.address.model.student.academic.question;
+
+/**
+ * Represents an unsolved question a student has for a tutor in Reeve.
+ */
+public class UnsolvedQuestion extends Question {
+
+ private static final String STATUS = "(\u2718)";
+
+ /**
+ * Constructs a new UnsolvedQuestion object.
+ */
+ public UnsolvedQuestion(String question) {
+ super(question);
+ }
+
+ /**
+ * Returns true if both questions are unsolved and have similar details.
+ * This is a stronger notion of equality between questions.
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) { // short circuit if same object
+ return true;
+ }
+
+ if (!(obj instanceof UnsolvedQuestion)) { // instanceof handles nulls
+ return false;
+ }
+
+ // state check
+ UnsolvedQuestion other = (UnsolvedQuestion) obj;
+ return question.equals(other.question);
+ }
+
+ @Override
+ public String toString() {
+ return String.format("%1$s %2$s", STATUS, super.toString());
+ }
+
+ @Override
+ public int hashCode() {
+ return question.hashCode();
+ }
+
+ @Override
+ public boolean isResolved() {
+ return false;
+ }
+
+}
diff --git a/src/main/java/seedu/address/model/student/admin/Admin.java b/src/main/java/seedu/address/model/student/admin/Admin.java
new file mode 100644
index 00000000000..709fdf6c9e1
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/admin/Admin.java
@@ -0,0 +1,121 @@
+package seedu.address.model.student.admin;
+
+import static seedu.address.commons.util.CollectionUtil.requireAllNonNull;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * Represents all administrative details of a Student in Reeve.
+ * Consists of the lesson venue, time, monthly fees, last paid date and additional notes.
+ * Guarantees: details are present and non-null, all fields are validated and immutable.
+ */
+public class Admin {
+
+ private final ClassVenue classVenue;
+ private final ClassTime classTime;
+ private final Fee fee;
+ private final PaymentDate paymentDate;
+ private final List<Detail> details = new ArrayList<>();
+
+ /**
+ * venue, time, fee, date and details are not null.
+ */
+ public Admin(ClassVenue venue, ClassTime time, Fee fee, PaymentDate date,
+ List<Detail> details) {
+ requireAllNonNull(venue, time, fee, date, details);
+ this.classVenue = venue;
+ this.classTime = time;
+ this.fee = fee;
+ this.paymentDate = date;
+ this.details.addAll(details);
+ }
+
+ public ClassVenue getClassVenue() {
+ return classVenue;
+ }
+
+ public ClassTime getClassTime() {
+ return classTime;
+ }
+
+ public Fee getFee() {
+ return fee;
+ }
+
+ public PaymentDate getPaymentDate() {
+ return paymentDate;
+ }
+
+ public List<Detail> getDetails() {
+ return new ArrayList<>(details);
+ }
+
+ /**
+ * Returns true if the given Admin objects have a clash in class time.
+ */
+ public boolean hasClashingClassTime(Admin other) {
+ return classTime.clashesWith(other.classTime);
+ }
+
+ /**
+ * Get details of student formatted for GUI use.
+ * @return formatted details.
+ */
+ public String getFormattedDetails() {
+ String result = "";
+ int index = 1;
+ for (Detail detail: details) {
+ result = result + index + ". " + detail.toString() + "\n";
+ index++;
+ }
+ return result;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(classVenue, classTime, fee, paymentDate, details);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ if (!(obj instanceof Admin)) {
+ return false;
+ }
+
+ Admin other = (Admin) obj;
+ return other.getClassVenue().equals(getClassVenue())
+ && other.getClassTime().equals(getClassTime())
+ && other.getFee().equals(getFee())
+ && other.getPaymentDate().equals(getPaymentDate())
+ && other.getDetails().equals(getDetails());
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder builder = new StringBuilder();
+ builder.append("\nClass Venue: ")
+ .append(classVenue)
+ .append("\nLesson Times: ")
+ .append(classTime)
+ .append("\nFee: ")
+ .append(fee)
+ .append("\nLast Paid: ")
+ .append(paymentDate);
+
+ if (!details.isEmpty()) {
+ builder.append("\nDetails:\n");
+ String detailList = details.stream()
+ .map(detail -> String.format("- %s", detail))
+ .collect(Collectors.joining("\n"));
+ builder.append(detailList);
+ }
+ return builder.toString();
+ }
+}
diff --git a/src/main/java/seedu/address/model/student/admin/ClassTime.java b/src/main/java/seedu/address/model/student/admin/ClassTime.java
new file mode 100644
index 00000000000..8ad7601ca3e
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/admin/ClassTime.java
@@ -0,0 +1,159 @@
+package seedu.address.model.student.admin;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.AppUtil.checkArgument;
+
+import java.time.DayOfWeek;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.TextStyle;
+import java.util.Locale;
+import java.util.Objects;
+
+/**
+ * Represents a ClassTime in Reeve.
+ * Guarantees: immutable; is valid as declared in {@link #isValidClassTime(String)}
+ */
+public class ClassTime implements Comparable<ClassTime> {
+ public static final String MESSAGE_CONSTRAINTS = "Class Time should follow the following format:\n"
+ + "DAY_OF_WEEK START_TIME-END_TIME (no space between time fields)\n"
+ + "DAY_OF_WEEK: Integer (positive) from 1-7 representing Mon-Sun\n"
+ + "START_TIME/END_TIME: Time in 24hr clock\n"
+ + "e.g 1 1200-1300: Monday, 12pm to 1pm";
+ public static final String TIME_CONSTRAINTS = "End time should always be after Start time";
+
+ /*
+ * The first character of the address must not be a whitespace,
+ * otherwise " " (a blank string) becomes a valid input.
+ */
+ //@@author VaishakAnand-reused
+ //Reused from https://examples.javacodegeeks.com/core-java/util/regex/matcher/validate-time-in-24-hours-
+ //format-with-java-regular-expression-example/ with minor modifications
+ public static final String TIME_VALIDATION = "([01]?[0-9]|2[0-3])[0-5][0-9]";
+ //@@author
+ public static final String VALIDATION_REGEX = "([1-7])[\\s]" + TIME_VALIDATION + "-" + TIME_VALIDATION;
+ public static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern("HHm");
+ public static final DateTimeFormatter OUTPUT = DateTimeFormatter.ofPattern("HHmm");
+
+ public final DayOfWeek dayOfWeek;
+ public final LocalTime startTime;
+ public final LocalTime endTime;
+
+
+ /**
+ * Constructs a {@code ClassTime}.
+ *
+ * @param inputTime A valid ClassTime.
+ */
+ public ClassTime(String inputTime) {
+ requireNonNull(inputTime);
+ checkArgument(isValidClassTime(inputTime), MESSAGE_CONSTRAINTS);
+ checkArgument(isValidStartAndEndTime(inputTime), TIME_CONSTRAINTS);
+ this.dayOfWeek = extractDay(inputTime);
+ this.startTime = extractStartTime(inputTime);
+ this.endTime = extractEndTime(inputTime);
+ }
+
+ /**
+ * Returns true if a given string is a valid name.
+ */
+ public static boolean isValidClassTime(String test) {
+ return test.matches(VALIDATION_REGEX);
+ }
+
+ private static DayOfWeek extractDay(String input) {
+ char day = input.charAt(0);
+ return DayOfWeek.of(Integer.parseInt(String.valueOf(day)));
+ }
+
+ private static LocalTime extractStartTime(String input) {
+ String startTime = input.substring(2, 6);
+ return LocalTime.parse(startTime, TIME_FORMATTER);
+ }
+
+ private static LocalTime extractEndTime(String input) {
+ String endTime = input.substring(7);
+ return LocalTime.parse(endTime, TIME_FORMATTER);
+ }
+
+ public boolean isSameDay(DayOfWeek otherDay) {
+ return this.dayOfWeek.equals(otherDay);
+ }
+
+ /**
+ * Checks if input end time is after start time.
+ * @param input Start and end times input by user.
+ * @return True if times are valid, False if otherwise.
+ */
+ public static boolean isValidStartAndEndTime(String input) {
+ LocalTime startTime = extractStartTime(input);
+ LocalTime endTime = extractEndTime(input);
+
+ return endTime.isAfter(startTime);
+ }
+
+ /**
+ * Returns true if the two ClassTimes clash.
+ */
+ public boolean clashesWith(ClassTime other) {
+ if (!dayOfWeek.equals(other.dayOfWeek)) {
+ return false;
+ }
+ return endTime.isAfter(other.startTime) && startTime.isBefore(other.endTime);
+ }
+
+ /**
+ * Converts a {@code classTime} object back to a user input string
+ */
+ public String convertClassTimeToUserInputString() {
+ String startTimeString = this.startTime.format(OUTPUT);
+ String endTimeString = this.endTime.format(OUTPUT);
+ int dayOfWeek = this.dayOfWeek.getValue();
+ final StringBuilder builder = new StringBuilder();
+ builder.append(dayOfWeek)
+ .append(" ")
+ .append(startTimeString)
+ .append("-")
+ .append(endTimeString);
+ return builder.toString();
+ }
+
+ @Override
+ public String toString() {
+ String dayDisplayName = dayOfWeek.getDisplayName(TextStyle.FULL, Locale.ENGLISH);
+ return String.format("%1$s (%2$s - %3$s)",
+ dayDisplayName,
+ this.startTime.format(OUTPUT),
+ this.endTime.format(OUTPUT));
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof ClassTime // instanceof handles nulls
+ && dayOfWeek.equals(((ClassTime) other).dayOfWeek)
+ && startTime.equals(((ClassTime) other).startTime)
+ && endTime.equals(((ClassTime) other).endTime)); // state check
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(dayOfWeek, startTime, endTime);
+ }
+
+ @Override
+ public int compareTo(ClassTime o) {
+ // same dayOfWeek => need to compare specific time
+ if (this.dayOfWeek.equals(o.dayOfWeek)) {
+
+ if (this.startTime.isBefore(o.startTime)) {
+ return -1; // start time is earlier
+ }
+ // Here we are assuming there are no overlapping classTimes
+ // i.e. there are no clash
+ return 1; // start time is later
+
+ }
+ return this.dayOfWeek.getValue() - o.dayOfWeek.getValue();
+ }
+}
diff --git a/src/main/java/seedu/address/model/student/admin/ClassTimeComparator.java b/src/main/java/seedu/address/model/student/admin/ClassTimeComparator.java
new file mode 100644
index 00000000000..013f3cb6be4
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/admin/ClassTimeComparator.java
@@ -0,0 +1,29 @@
+package seedu.address.model.student.admin;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.Comparator;
+
+import seedu.address.model.student.Student;
+
+public class ClassTimeComparator implements Comparator<Student> {
+
+ public static final String COMPARISON_MEANS = "classTime";
+ public static final String USAGE = COMPARISON_MEANS + ": Sorts students by the day followed "
+ + "by time of their class";
+
+ @Override
+ public int compare(Student o1, Student o2) {
+ requireNonNull(o1);
+ requireNonNull(o2);
+ ClassTime classTime1 = o1.getAdmin().getClassTime();
+ ClassTime classTime2 = o2.getAdmin().getClassTime();
+ assert classTime1 != null;
+ assert classTime2 != null;
+ if (classTime1.dayOfWeek.compareTo(classTime2.dayOfWeek) == 0) {
+ return classTime1.startTime.compareTo(classTime2.startTime);
+ } else {
+ return classTime1.dayOfWeek.compareTo(classTime2.dayOfWeek);
+ }
+ }
+}
diff --git a/src/main/java/seedu/address/model/student/admin/ClassVenue.java b/src/main/java/seedu/address/model/student/admin/ClassVenue.java
new file mode 100644
index 00000000000..a22995a86cb
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/admin/ClassVenue.java
@@ -0,0 +1,57 @@
+package seedu.address.model.student.admin;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.AppUtil.checkArgument;
+
+/**
+ * Represents a Student's class venue in Reeve.
+ * Guarantees: immutable; is valid as declared in {@link #isValidClassVenue(String)}
+ */
+public class ClassVenue {
+
+ public static final String MESSAGE_CONSTRAINTS = "Class Venues can take any values, and it should not be blank";
+
+ /*
+ * The first character of the class venue must not be a whitespace,
+ * otherwise " " (a blank string) becomes a valid input.
+ */
+ public static final String VALIDATION_REGEX = "[^\\s].*";
+
+ public final String venue;
+
+ /**
+ * Constructs an {@code ClassVenue}.
+ *
+ * @param classVenue A valid classVenue.
+ */
+ public ClassVenue(String classVenue) {
+ requireNonNull(classVenue);
+ checkArgument(isValidClassVenue(classVenue), MESSAGE_CONSTRAINTS);
+ venue = classVenue;
+ }
+
+ /**
+ * Returns true if a given string is a valid classVenue.
+ */
+ public static boolean isValidClassVenue(String test) {
+ return test.matches(VALIDATION_REGEX);
+ }
+
+ @Override
+ public String toString() {
+ return venue;
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof ClassVenue // instanceof handles nulls
+ && venue.equals(((ClassVenue) other).venue)); // state check
+ }
+
+ @Override
+ public int hashCode() {
+ return venue.hashCode();
+ }
+
+}
diff --git a/src/main/java/seedu/address/model/student/admin/Detail.java b/src/main/java/seedu/address/model/student/admin/Detail.java
new file mode 100644
index 00000000000..35b213409c8
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/admin/Detail.java
@@ -0,0 +1,53 @@
+package seedu.address.model.student.admin;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.AppUtil.checkArgument;
+
+/**
+ * Represents a detail in Reeve.
+ * Guarantees: immutable; detail is valid as declared in {@link #isValidDetail(String)}
+ */
+public class Detail {
+
+ public static final String MESSAGE_CONSTRAINTS = "Details should be alphanumeric";
+ public static final String VALIDATION_REGEX = "^[\\s]*[a-zA-Z0-9][a-zA-Z0-9\\s]*$";
+
+ public final String detail;
+
+ /**
+ * Constructs a {@code Detail}.
+ *
+ * @param detail A valid detail.
+ */
+ public Detail(String detail) {
+ requireNonNull(detail);
+ checkArgument(isValidDetail(detail), MESSAGE_CONSTRAINTS);
+ this.detail = detail;
+ }
+
+ /**
+ * Returns true if a given string is a valid detail.
+ */
+ public static boolean isValidDetail(String test) {
+ return test.matches(VALIDATION_REGEX);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ return other == this // short circuit if same object
+ || (other instanceof Detail // instanceof handles nulls
+ && detail.equals(((Detail) other).detail)); // state check
+ }
+
+ @Override
+ public int hashCode() {
+ return detail.hashCode();
+ }
+
+ /**
+ * Format state as text for viewing.
+ */
+ public String toString() {
+ return detail;
+ }
+}
diff --git a/src/main/java/seedu/address/model/student/admin/Fee.java b/src/main/java/seedu/address/model/student/admin/Fee.java
new file mode 100644
index 00000000000..d5af1745484
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/admin/Fee.java
@@ -0,0 +1,61 @@
+package seedu.address.model.student.admin;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.AppUtil.checkArgument;
+
+/**
+ * Represents a Student's monthly tuition fees.
+ * Guarantees: immutable; is valid as declared in
+ */
+public class Fee {
+
+ public static final String MESSAGE_CONSTRAINTS =
+ "Fees should strictly contain only digits up to 2 decimal points, and be in SGD";
+
+ public static final String VALIDATION_REGEX = "[0-9]+((\\.[0-9]{1,2})?)";
+
+ public static final String FREE_OF_CHARGE = "0";
+
+ public final double amount;
+
+ /**
+ * Constructs a {@code Fee}.
+ */
+ public Fee(String amount) {
+ requireNonNull(amount);
+ checkArgument(isValidFee(amount), MESSAGE_CONSTRAINTS);
+ this.amount = Double.parseDouble(amount);
+ }
+
+ /**
+ * Returns true if the given string is in the correct format.
+ */
+ public static boolean isValidFee(String test) {
+ return test.matches(VALIDATION_REGEX);
+ }
+
+ /**
+ * Converts a Fee object to a the original user input string
+ */
+ public String convertFeeToUserInputString() {
+ return String.valueOf(amount);
+ }
+
+ @Override
+ public String toString() {
+ return String.format("$%.2f", amount);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return (this == obj)
+ || (obj instanceof Fee)
+ && amount == ((Fee) obj).amount;
+ }
+
+ @Override
+ public int hashCode() {
+ return Double.hashCode(amount);
+ }
+
+}
diff --git a/src/main/java/seedu/address/model/student/admin/OverdueFeePredicate.java b/src/main/java/seedu/address/model/student/admin/OverdueFeePredicate.java
new file mode 100644
index 00000000000..5a9f52478dc
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/admin/OverdueFeePredicate.java
@@ -0,0 +1,30 @@
+package seedu.address.model.student.admin;
+
+import java.time.LocalDate;
+import java.util.function.Predicate;
+
+import seedu.address.model.student.Student;
+
+/**
+ * Tests that a {@code Student}'s {@code PaymentDate} is more than a month earlier than the current date.
+ */
+public class OverdueFeePredicate implements Predicate<Student> {
+
+ private final LocalDate currentDate;
+
+ /**
+ * Constructs a new OverdueFeePredicate.
+ */
+ public OverdueFeePredicate() {
+ currentDate = LocalDate.now();
+ }
+
+ /**
+ * Returns true if the student's date of last payment is more than one month from the current date.
+ */
+ @Override
+ public boolean test(Student student) {
+ return student.getPaymentDate().lastPaid.isBefore(currentDate.minusMonths(1))
+ && student.getAdmin().getFee().amount > 0;
+ }
+}
diff --git a/src/main/java/seedu/address/model/student/admin/PaymentDate.java b/src/main/java/seedu/address/model/student/admin/PaymentDate.java
new file mode 100644
index 00000000000..a0fb71ba96f
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/admin/PaymentDate.java
@@ -0,0 +1,66 @@
+package seedu.address.model.student.admin;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.AppUtil.checkArgument;
+import static seedu.address.commons.util.DateUtil.getInputFormat;
+import static seedu.address.commons.util.DateUtil.parseToDate;
+import static seedu.address.commons.util.DateUtil.print;
+
+import java.time.LocalDate;
+
+/**
+ * Represents the last time a Student paid his tuition fees.
+ * Guarantees: immutable; is valid as declared in {@link #isValidDate(String)}
+ */
+public class PaymentDate {
+
+ public static final String MESSAGE_CONSTRAINTS = "Payment dates should be a valid date in the form dd/mm/yy, "
+ + "should not be blank, "
+ + "and should not be future-dated";
+
+ public final LocalDate lastPaid;
+
+ /**
+ * Constructs a {@code PaymentDate}.
+ *
+ * @param lastPaid A valid payment date.
+ */
+ public PaymentDate(String lastPaid) {
+ requireNonNull(lastPaid);
+ checkArgument(isValidDate(lastPaid), MESSAGE_CONSTRAINTS);
+ this.lastPaid = parseToDate(lastPaid);
+ }
+
+ /**
+ * Returns true if a given string is in the correct date format.
+ */
+ public static boolean isValidDate(String test) {
+ try {
+ return !parseToDate(test).isAfter(LocalDate.now());
+ } catch (IllegalArgumentException e) {
+ return false;
+ }
+ }
+
+ public String getUserInputDate() {
+ return getInputFormat(lastPaid);
+ }
+
+ @Override
+ public String toString() {
+ return print(lastPaid);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return (this == obj) // short circuit if same object
+ || (obj instanceof PaymentDate) // instanceof handles nulls
+ && lastPaid.equals(((PaymentDate) obj).lastPaid); // state check
+ }
+
+ @Override
+ public int hashCode() {
+ return lastPaid.hashCode();
+ }
+
+}
diff --git a/src/main/java/seedu/address/model/person/exceptions/DuplicatePersonException.java b/src/main/java/seedu/address/model/student/exceptions/DuplicateStudentException.java
similarity index 57%
rename from src/main/java/seedu/address/model/person/exceptions/DuplicatePersonException.java
rename to src/main/java/seedu/address/model/student/exceptions/DuplicateStudentException.java
index d7290f59442..be126bcd35a 100644
--- a/src/main/java/seedu/address/model/person/exceptions/DuplicatePersonException.java
+++ b/src/main/java/seedu/address/model/student/exceptions/DuplicateStudentException.java
@@ -1,11 +1,11 @@
-package seedu.address.model.person.exceptions;
+package seedu.address.model.student.exceptions;
/**
* Signals that the operation will result in duplicate Persons (Persons are considered duplicates if they have the same
* identity).
*/
-public class DuplicatePersonException extends RuntimeException {
- public DuplicatePersonException() {
+public class DuplicateStudentException extends RuntimeException {
+ public DuplicateStudentException() {
super("Operation would result in duplicate persons");
}
}
diff --git a/src/main/java/seedu/address/model/student/exceptions/StudentNotFoundException.java b/src/main/java/seedu/address/model/student/exceptions/StudentNotFoundException.java
new file mode 100644
index 00000000000..03722c20ccf
--- /dev/null
+++ b/src/main/java/seedu/address/model/student/exceptions/StudentNotFoundException.java
@@ -0,0 +1,6 @@
+package seedu.address.model.student.exceptions;
+
+/**
+ * Signals that the operation is unable to find the specified person.
+ */
+public class StudentNotFoundException extends RuntimeException {}
diff --git a/src/main/java/seedu/address/model/tag/Tag.java b/src/main/java/seedu/address/model/tag/Tag.java
deleted file mode 100644
index b0ea7e7dad7..00000000000
--- a/src/main/java/seedu/address/model/tag/Tag.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package seedu.address.model.tag;
-
-import static java.util.Objects.requireNonNull;
-import static seedu.address.commons.util.AppUtil.checkArgument;
-
-/**
- * Represents a Tag in the address book.
- * Guarantees: immutable; name is valid as declared in {@link #isValidTagName(String)}
- */
-public class Tag {
-
- public static final String MESSAGE_CONSTRAINTS = "Tags names should be alphanumeric";
- public static final String VALIDATION_REGEX = "\\p{Alnum}+";
-
- public final String tagName;
-
- /**
- * Constructs a {@code Tag}.
- *
- * @param tagName A valid tag name.
- */
- public Tag(String tagName) {
- requireNonNull(tagName);
- checkArgument(isValidTagName(tagName), MESSAGE_CONSTRAINTS);
- this.tagName = tagName;
- }
-
- /**
- * Returns true if a given string is a valid tag name.
- */
- public static boolean isValidTagName(String test) {
- return test.matches(VALIDATION_REGEX);
- }
-
- @Override
- public boolean equals(Object other) {
- return other == this // short circuit if same object
- || (other instanceof Tag // instanceof handles nulls
- && tagName.equals(((Tag) other).tagName)); // state check
- }
-
- @Override
- public int hashCode() {
- return tagName.hashCode();
- }
-
- /**
- * Format state as text for viewing.
- */
- public String toString() {
- return '[' + tagName + ']';
- }
-
-}
diff --git a/src/main/java/seedu/address/model/util/SampleDataUtil.java b/src/main/java/seedu/address/model/util/SampleDataUtil.java
index 1806da4facf..a0d3b7b41a6 100644
--- a/src/main/java/seedu/address/model/util/SampleDataUtil.java
+++ b/src/main/java/seedu/address/model/util/SampleDataUtil.java
@@ -1,60 +1,170 @@
package seedu.address.model.util;
+import static seedu.address.commons.util.DateUtil.parseToDate;
+
+import java.time.LocalDateTime;
import java.util.Arrays;
-import java.util.Set;
+import java.util.List;
import java.util.stream.Collectors;
-import seedu.address.model.AddressBook;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
+import seedu.address.model.ReadOnlyReeve;
+import seedu.address.model.Reeve;
+import seedu.address.model.notes.Notebook;
+import seedu.address.model.notes.ReadOnlyNotebook;
+import seedu.address.model.notes.note.Description;
+import seedu.address.model.notes.note.Note;
+import seedu.address.model.notes.note.Title;
+import seedu.address.model.schedule.Event;
+import seedu.address.model.schedule.EventRecurrence;
+import seedu.address.model.schedule.ReadOnlyEvent;
+import seedu.address.model.schedule.Scheduler;
+import seedu.address.model.student.Name;
+import seedu.address.model.student.Phone;
+import seedu.address.model.student.School;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.Year;
+import seedu.address.model.student.academic.Attendance;
+import seedu.address.model.student.academic.Feedback;
+import seedu.address.model.student.academic.exam.Exam;
+import seedu.address.model.student.academic.exam.Score;
+import seedu.address.model.student.academic.question.Question;
+import seedu.address.model.student.academic.question.SolvedQuestion;
+import seedu.address.model.student.academic.question.UnsolvedQuestion;
+import seedu.address.model.student.admin.ClassTime;
+import seedu.address.model.student.admin.ClassVenue;
+import seedu.address.model.student.admin.Detail;
+import seedu.address.model.student.admin.Fee;
+import seedu.address.model.student.admin.PaymentDate;
/**
- * Contains utility methods for populating {@code AddressBook} with sample data.
+ * Contains utility methods for populating {@code Reeve} with sample data.
*/
public class SampleDataUtil {
- public static Person[] getSamplePersons() {
- return new Person[] {
- new Person(new Name("Alex Yeoh"), new Phone("87438807"), new Email("alexyeoh@example.com"),
- new Address("Blk 30 Geylang Street 29, #06-40"),
- getTagSet("friends")),
- new Person(new Name("Bernice Yu"), new Phone("99272758"), new Email("berniceyu@example.com"),
- new Address("Blk 30 Lorong 3 Serangoon Gardens, #07-18"),
- getTagSet("colleagues", "friends")),
- new Person(new Name("Charlotte Oliveiro"), new Phone("93210283"), new Email("charlotte@example.com"),
- new Address("Blk 11 Ang Mo Kio Street 74, #11-04"),
- getTagSet("neighbours")),
- new Person(new Name("David Li"), new Phone("91031282"), new Email("lidavid@example.com"),
- new Address("Blk 436 Serangoon Gardens Street 26, #16-43"),
- getTagSet("family")),
- new Person(new Name("Irfan Ibrahim"), new Phone("92492021"), new Email("irfan@example.com"),
- new Address("Blk 47 Tampines Street 20, #17-35"),
- getTagSet("classmates")),
- new Person(new Name("Roy Balakrishnan"), new Phone("92624417"), new Email("royb@example.com"),
- new Address("Blk 45 Aljunied Street 85, #11-31"),
- getTagSet("colleagues"))
+ public static Student[] getSamplePersons() {
+ //Sample Exams
+ Exam sampleExam1 = new Exam("CA2", parseToDate("13/3/2020"), new Score("34/50"));
+ Exam sampleExam2 = new Exam("End of Year 2020", parseToDate("13/3/2020"), new Score("50/50"));
+ Exam sampleExam3 = new Exam("Mid Year 2020", parseToDate("13/3/2020"), new Score("26/50"));
+
+ return new Student[]{
+ new Student(new Name("Alex Yeoh"), new Phone("87438807"),
+ new School("NUS High School"), new Year("Sec 4"),
+ new ClassVenue("Blk 30 Geylang Street 29, #06-40"),
+ new ClassTime("1 1400-1500"), new Fee("430"),
+ new PaymentDate("23/4/19"), getDetailList("clever"),
+ getQuestions("How do birds fly?"), getExams(sampleExam1, sampleExam2),
+ getAttendance(new Attendance(parseToDate("06/05/2010"), true,
+ new Feedback("attentive")))),
+ new Student(new Name("Bernice Yu"), new Phone("99272758"),
+ new School("Montford Secondary School"), new Year("Sec 4"),
+ new ClassVenue("Blk 30 Lorong 3 Serangoon Gardens, #07-18"),
+ new ClassTime("1 1500-1600"), new Fee("50"),
+ new PaymentDate("30/6/20"), getDetailList(),
+ getSolvedQuestions("Read your textbook", "Explain heat flow."), getExams(),
+ getAttendance(new Attendance(parseToDate("06/05/2010"), false,
+ new Feedback("was sick")))),
+ new Student(new Name("Charlotte Oliveiro"), new Phone("93210283"),
+ new School("Raffles Girls School"), new Year("Sec 3"),
+ new ClassVenue("Blk 11 Ang Mo Kio Street 74, #11-04"),
+ new ClassTime("2 1900-2030"), new Fee("680"),
+ new PaymentDate("1/12/19"), getDetailList(),
+ getQuestions(), getExams(sampleExam3),
+ getAttendance(new Attendance(parseToDate("06/05/2010"), true,
+ new Feedback("prepared well")))),
+ new Student(new Name("David Li"), new Phone("91031282"),
+ new School("Anderson Primary School"), new Year("P2"),
+ new ClassVenue("Blk 436 Serangoon Gardens Street 26, #16-43"),
+ new ClassTime("6 0800-0950"), new Fee("12"),
+ new PaymentDate("24/7/20"), getDetailList("friend"),
+ getQuestions("How do birds fly?", "Explain heat flow."), getExams(),
+ getAttendance(new Attendance(parseToDate("06/05/2010"), false,
+ new Feedback("productive session")))),
+ new Student(new Name("Irfan Ibrahim"), new Phone("92492021"),
+ new School("National Junior College"), new Year("J1"),
+ new ClassVenue("Blk 47 Tampines Street 20, #17-35"),
+ new ClassTime("3 1300-1400"), new Fee("0"),
+ new PaymentDate("7/4/20"), getDetailList("clever", "friend"),
+ getQuestions(), getExams(),
+ getAttendance(new Attendance(parseToDate("06/05/2010"), true,
+ new Feedback("studied through christmas")))),
+ new Student(new Name("Roy Balakrishnan"), new Phone("92624417"),
+ new School("Catholic High School"), new Year("J2"),
+ new ClassVenue("Blk 45 Aljunied Street 85, #11-31"),
+ new ClassTime("4 2000-2130"), new Fee("38"),
+ new PaymentDate("19/12/19"), getDetailList("rude"),
+ getQuestions(), getExams(sampleExam2, sampleExam3),
+ getAttendance(new Attendance(parseToDate("06/05/2010"), false,
+ new Feedback("unprepared"))))
};
}
- public static ReadOnlyAddressBook getSampleAddressBook() {
- AddressBook sampleAb = new AddressBook();
- for (Person samplePerson : getSamplePersons()) {
- sampleAb.addPerson(samplePerson);
+ public static Note[] getSampleNotes() {
+ return new Note[] {
+ new Note(new Title("Finish tp"), new Description("It's week 11!!")),
+ new Note(new Title("Mug for finals"), new Description("or die during reading week :(")),
+ new Note(new Title("relax"), new Description("Eat, watch youtube, go USS"))
+ };
+ }
+
+ public static ReadOnlyReeve getSampleAddressBook() {
+ Reeve sampleAb = new Reeve();
+ for (Student sampleStudent : getSamplePersons()) {
+ sampleAb.addStudent(sampleStudent);
}
return sampleAb;
}
+ public static ReadOnlyEvent getSampleSchedule() {
+ Event event = new Event("Lesson event", LocalDateTime.parse("2020-12-03T10:15:30"),
+ LocalDateTime.parse("2020-12-03T10:17:30"),
+ "uidAliceLesson", EventRecurrence.WEEKLY);
+ List<Event> lst = Arrays.asList(event);
+ return new Scheduler(lst);
+ }
+
+ public static ReadOnlyNotebook getSampleNotebook() {
+ Notebook sampleNotebook = new Notebook();
+ for (Note sampleNote : getSampleNotes()) {
+ sampleNotebook.addNote(sampleNote);
+ }
+ return sampleNotebook;
+ }
+
/**
- * Returns a tag set containing the list of strings given.
+ * Returns a {@code Detail} list containing the list of given strings.
*/
- public static Set<Tag> getTagSet(String... strings) {
+ public static List<Detail> getDetailList(String... strings) {
return Arrays.stream(strings)
- .map(Tag::new)
- .collect(Collectors.toSet());
+ .map(Detail::new)
+ .collect(Collectors.toList());
}
+ /**
+ * Returns a {@code Question} list containing the list of given strings.
+ */
+ public static List<Question> getQuestions(String... strings) {
+ return Arrays.stream(strings)
+ .map(UnsolvedQuestion::new)
+ .collect(Collectors.toList());
+ }
+
+ /**
+ * Returns a list of solved {@code Questions} containing the given strings.
+ */
+ public static List<Question> getSolvedQuestions(String solution, String... strings) {
+ return Arrays.stream(strings)
+ .map(string -> new SolvedQuestion(string, solution))
+ .collect(Collectors.toList());
+ }
+
+ public static List<Exam> getExams(Exam... exams) {
+ return Arrays.asList(exams);
+ }
+
+ /**
+ * Returns a {@code Attendance} list containing the list of given attendences.
+ */
+ public static List<Attendance> getAttendance(Attendance... attendances) {
+ return Arrays.asList(attendances);
+ }
}
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedAcademic.java b/src/main/java/seedu/address/storage/JsonAdaptedAcademic.java
new file mode 100644
index 00000000000..a647bf5bf98
--- /dev/null
+++ b/src/main/java/seedu/address/storage/JsonAdaptedAcademic.java
@@ -0,0 +1,79 @@
+package seedu.address.storage;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.academic.Academic;
+import seedu.address.model.student.academic.Attendance;
+import seedu.address.model.student.academic.exam.Exam;
+import seedu.address.model.student.academic.question.Question;
+
+public class JsonAdaptedAcademic {
+
+ private final List<JsonAdaptedQuestion> questions = new ArrayList<>();
+ private final List<JsonAdaptedAttendance> attendanceList = new ArrayList<>();
+ private final List<JsonAdaptedExam> exams = new ArrayList<>();
+
+ /**
+ * Constructs a {@code JsonAdaptedAcademic} with academic details.
+ */
+ @JsonCreator
+ public JsonAdaptedAcademic(@JsonProperty("questions") List<JsonAdaptedQuestion> questions,
+ @JsonProperty("attendanceList") List<JsonAdaptedAttendance> attendanceList,
+ @JsonProperty("exams") List<JsonAdaptedExam> exams) {
+ if (questions != null) {
+ this.questions.addAll(questions);
+ }
+ if (attendanceList != null) {
+ this.attendanceList.addAll(attendanceList);
+ }
+ if (exams != null) {
+ this.exams.addAll(exams);
+ }
+ }
+
+ /**
+ * Converts a given {@code Academic} into this class for Jackson use.
+ */
+ public JsonAdaptedAcademic(Student source) {
+ questions.addAll(source.getQuestions().stream()
+ .map(JsonAdaptedQuestion::new)
+ .collect(Collectors.toList()));
+ attendanceList.addAll(source.getAttendance().stream()
+ .map(JsonAdaptedAttendance::new)
+ .collect(Collectors.toList()));
+ exams.addAll(source.getExams().stream()
+ .map(JsonAdaptedExam::new)
+ .collect(Collectors.toList()));
+ }
+
+ /**
+ * Converts this Jackson-friendly adapted admin object into the model's {@code Admin} object.
+ *
+ * @throws IllegalValueException if there were any data constraints violated in the adapted admin.
+ */
+ public Academic toModelType() throws IllegalValueException {
+ List<Question> modelQuestions = new ArrayList<>();
+ for (JsonAdaptedQuestion question : questions) {
+ modelQuestions.add(question.toModelType());
+ }
+
+ List<Attendance> modelAttendance = new ArrayList<>();
+ for (JsonAdaptedAttendance attendance : attendanceList) {
+ modelAttendance.add(attendance.toModelType());
+ }
+
+ List<Exam> modelExams = new ArrayList<>();
+ for (JsonAdaptedExam exam : exams) {
+ modelExams.add(exam.toModelType());
+ }
+
+ return new Academic(modelQuestions, modelAttendance, modelExams);
+ }
+}
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedAdmin.java b/src/main/java/seedu/address/storage/JsonAdaptedAdmin.java
new file mode 100644
index 00000000000..742ee75466f
--- /dev/null
+++ b/src/main/java/seedu/address/storage/JsonAdaptedAdmin.java
@@ -0,0 +1,115 @@
+package seedu.address.storage;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.admin.Admin;
+import seedu.address.model.student.admin.ClassTime;
+import seedu.address.model.student.admin.ClassVenue;
+import seedu.address.model.student.admin.Detail;
+import seedu.address.model.student.admin.Fee;
+import seedu.address.model.student.admin.PaymentDate;
+
+
+/**
+ * Jackson-friendly version of {@link Admin}.
+ */
+public class JsonAdaptedAdmin {
+
+ public static final String MISSING_ADMIN_FIELD_MESSAGE_FORMAT = "Student's %s field is missing!";
+
+ private final String classVenue;
+ private final String classTime;
+ private final String fee;
+ private final String paymentDate;
+ private final List<JsonAdaptedDetail> additionalDetails = new ArrayList<>();
+
+ /**
+ * Constructs a {@code JsonAdaptedAdmin} with admin details
+ */
+ @JsonCreator
+ public JsonAdaptedAdmin(@JsonProperty("classVenue") String classVenue,
+ @JsonProperty("classTime") String classTime,
+ @JsonProperty("fee") String fee,
+ @JsonProperty("paymentDate") String paymentDate,
+ @JsonProperty("details") List<JsonAdaptedDetail> additionalDetails) {
+ this.classVenue = classVenue;
+ this.classTime = classTime;
+ this.fee = fee;
+ this.paymentDate = paymentDate;
+ if (additionalDetails != null) {
+ this.additionalDetails.addAll(additionalDetails);
+ }
+ }
+
+ /**
+ * Converts a given {@code Admin} into this class for Jackson use.
+ */
+ public JsonAdaptedAdmin(Student student) {
+ this.classVenue = student.getClassVenue().toString();
+ this.classTime = student.getClassTime().convertClassTimeToUserInputString();
+ this.fee = student.getFee().convertFeeToUserInputString();
+ this.paymentDate = student.getPaymentDate().getUserInputDate();
+ additionalDetails.addAll(student.getDetails().stream()
+ .map(JsonAdaptedDetail::new)
+ .collect(Collectors.toList()));
+ }
+
+ /**
+ * Converts this Jackson-friendly adapted admin object into the model's {@code Admin} object.
+ *
+ * @throws IllegalValueException if there were any data constraints violated in the adapted admin.
+ */
+ public Admin toModelType() throws IllegalValueException {
+
+ final List<Detail> details = new ArrayList<>();
+ for (JsonAdaptedDetail additionalDetail : additionalDetails) {
+ details.add(additionalDetail.toModelType());
+ }
+
+ if (classVenue == null) {
+ throw new IllegalValueException(String.format(MISSING_ADMIN_FIELD_MESSAGE_FORMAT,
+ ClassVenue.class.getSimpleName()));
+ }
+ if (!ClassVenue.isValidClassVenue(classVenue)) {
+ throw new IllegalValueException(ClassVenue.MESSAGE_CONSTRAINTS);
+ }
+ final ClassVenue modelClassVenue = new ClassVenue(classVenue);
+
+ if (classTime == null) {
+ throw new IllegalValueException(String.format(MISSING_ADMIN_FIELD_MESSAGE_FORMAT,
+ ClassTime.class.getSimpleName()));
+ }
+ if (!ClassTime.isValidClassTime(classTime)) {
+ throw new IllegalValueException(ClassTime.MESSAGE_CONSTRAINTS);
+ }
+ final ClassTime modelClassTime = new ClassTime(classTime);
+
+ if (fee == null) {
+ throw new IllegalValueException(String.format(MISSING_ADMIN_FIELD_MESSAGE_FORMAT,
+ Fee.class.getSimpleName()));
+ }
+ if (!Fee.isValidFee(fee)) {
+ throw new IllegalValueException(Fee.MESSAGE_CONSTRAINTS);
+ }
+ final Fee modelFee = new Fee(fee);
+
+ if (paymentDate == null) {
+ throw new IllegalValueException(String.format(MISSING_ADMIN_FIELD_MESSAGE_FORMAT,
+ PaymentDate.class.getSimpleName()));
+ }
+ if (!PaymentDate.isValidDate(paymentDate)) {
+ throw new IllegalValueException(PaymentDate.MESSAGE_CONSTRAINTS);
+ }
+ final PaymentDate modelPaymentDate = new PaymentDate(paymentDate);
+
+ final List<Detail> modelDetails = new ArrayList<>(details);
+ return new Admin(modelClassVenue, modelClassTime , modelFee, modelPaymentDate, modelDetails);
+ }
+}
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedAttendance.java b/src/main/java/seedu/address/storage/JsonAdaptedAttendance.java
new file mode 100644
index 00000000000..f8fa5845080
--- /dev/null
+++ b/src/main/java/seedu/address/storage/JsonAdaptedAttendance.java
@@ -0,0 +1,98 @@
+package seedu.address.storage;
+
+import java.time.LocalDate;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.commons.util.DateUtil;
+import seedu.address.model.student.academic.Attendance;
+import seedu.address.model.student.academic.Feedback;
+
+public class JsonAdaptedAttendance {
+
+ public static final String MISSING_ATTENDANCE_FIELD_MESSAGE_FORMAT = "Attendance's %s field is missing!";
+ public static final String INVALID_ATTENDANCE_STATUS_MESSAGE = "attendanceStatus field can only accept "
+ + "either \"present\" or \"absent\" (case-sensitive)";
+
+ private static final String PRESENT = "present";
+ private static final String ABSENT = "absent";
+
+ private final String date;
+ private final String attendanceStatus;
+ private final String feedback;
+
+ /**
+ * Constructs a {@code JsonAdaptedExam} with the given {@code exam}.
+ */
+ @JsonCreator
+ public JsonAdaptedAttendance(@JsonProperty("date") String date,
+ @JsonProperty("attendanceStatus") String attendanceStatus,
+ @JsonProperty("feedback") String feedback) {
+ this.date = date;
+ this.attendanceStatus = attendanceStatus;
+ this.feedback = feedback;
+ }
+
+ /**
+ * Converts a given {@code Exam} into this class for Jackson use.
+ */
+ public JsonAdaptedAttendance(Attendance source) {
+ this.date = source.getUserInputDate();
+ this.attendanceStatus = source.isStudentPresent() ? PRESENT : ABSENT;
+ this.feedback = source.getFeedback().map(Feedback::toString).orElse("");
+ }
+
+ /**
+ * Converts this Jackson-friendly adapted attendance object into the model's {@code Attendance} object.
+ *
+ * @throws IllegalValueException if there were any data constraints violated in the adapted detail.
+ */
+ public Attendance toModelType() throws IllegalValueException {
+ LocalDate modelDate = toModelDate();
+ boolean isPresent = toModelPresence();
+
+ if (feedback == null) {
+ throw new IllegalValueException(String.format(MISSING_ATTENDANCE_FIELD_MESSAGE_FORMAT, "feedback"));
+ }
+ if (feedback.isEmpty()) {
+ return new Attendance(modelDate, isPresent);
+ }
+
+ Feedback modelFeedback = toModelFeedback();
+ return new Attendance(modelDate, isPresent, modelFeedback);
+ }
+
+ private LocalDate toModelDate() throws IllegalValueException {
+ if (date == null || date.isEmpty()) {
+ throw new IllegalValueException(String.format(MISSING_ATTENDANCE_FIELD_MESSAGE_FORMAT, "date"));
+ }
+ if (!DateUtil.isValidDate(date)) {
+ throw new IllegalValueException("Invalid date format");
+ }
+ return DateUtil.parseToDate(date);
+ }
+
+ private boolean toModelPresence() throws IllegalValueException {
+ if (attendanceStatus == null) {
+ throw new IllegalValueException(String.format(MISSING_ATTENDANCE_FIELD_MESSAGE_FORMAT, "status"));
+ }
+ if (!isValidAttendanceStatus()) {
+ throw new IllegalValueException(INVALID_ATTENDANCE_STATUS_MESSAGE);
+ }
+ return attendanceStatus.equals(PRESENT);
+ }
+
+ private Feedback toModelFeedback() throws IllegalValueException {
+ if (!Feedback.isValidFeedback(feedback)) {
+ throw new IllegalValueException(Feedback.MESSAGE_CONSTRAINTS);
+ }
+ return new Feedback(feedback);
+ }
+
+ private boolean isValidAttendanceStatus() {
+ return attendanceStatus.equals(PRESENT) || attendanceStatus.equals(ABSENT);
+ }
+
+}
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedDetail.java b/src/main/java/seedu/address/storage/JsonAdaptedDetail.java
new file mode 100644
index 00000000000..26cbc7ceb81
--- /dev/null
+++ b/src/main/java/seedu/address/storage/JsonAdaptedDetail.java
@@ -0,0 +1,48 @@
+package seedu.address.storage;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.model.student.admin.Detail;
+
+/**
+ * Jackson-friendly version of {@link Detail}.
+ */
+class JsonAdaptedDetail {
+
+ private final String detail;
+
+ /**
+ * Constructs a {@code JsonAdaptedDetail} with the given {@code detail}.
+ */
+ @JsonCreator
+ public JsonAdaptedDetail(String detail) {
+ this.detail = detail;
+ }
+
+ /**
+ * Converts a given {@code Detail} into this class for Jackson use.
+ */
+ public JsonAdaptedDetail(Detail source) {
+ detail = source.detail;
+ }
+
+ @JsonValue
+ public String getDetail() {
+ return detail;
+ }
+
+ /**
+ * Converts this Jackson-friendly adapted detail object into the model's {@code Detail} object.
+ *
+ * @throws IllegalValueException if there were any data constraints violated in the adapted detail.
+ */
+ public Detail toModelType() throws IllegalValueException {
+ if (!Detail.isValidDetail(detail)) {
+ throw new IllegalValueException(Detail.MESSAGE_CONSTRAINTS);
+ }
+ return new Detail(detail);
+ }
+
+}
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedExam.java b/src/main/java/seedu/address/storage/JsonAdaptedExam.java
new file mode 100644
index 00000000000..805e30ff90b
--- /dev/null
+++ b/src/main/java/seedu/address/storage/JsonAdaptedExam.java
@@ -0,0 +1,80 @@
+package seedu.address.storage;
+
+import java.time.LocalDate;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.commons.util.DateUtil;
+import seedu.address.model.student.academic.exam.Exam;
+import seedu.address.model.student.academic.exam.Score;
+
+
+/**
+ * Jackson-friendly version of {@link Exam}.
+ */
+public class JsonAdaptedExam {
+
+ public static final String MISSING_EXAM_FIELD_MESSAGE_FORMAT = "Exam's %s field is missing!";
+
+ private final String examName;
+ private final String examDate;
+ private final String score;
+
+ /**
+ * Constructs a {@code JsonAdaptedExam} with the given {@code exam}.
+ */
+ @JsonCreator
+ public JsonAdaptedExam(@JsonProperty("examName") String examName,
+ @JsonProperty("examDate") String examDate,
+ @JsonProperty("score") String score) {
+ this.examName = examName;
+ this.examDate = examDate;
+ this.score = score;
+ }
+
+ /**
+ * Converts a given {@code Exam} into this class for Jackson use.
+ */
+ public JsonAdaptedExam(Exam source) {
+ this.examName = source.getName();
+ this.examDate = source.getUserInputDate();
+ this.score = source.getScore().toString();
+ }
+
+ /**
+ * Converts this Jackson-friendly adapted exam object into the model's {@code Exam} object.
+ *
+ * @throws IllegalValueException if there were any data constraints violated in the adapted detail.
+ */
+ public Exam toModelType() throws IllegalValueException {
+ if (examName == null || examName.isEmpty()) {
+ throw new IllegalValueException(String.format(MISSING_EXAM_FIELD_MESSAGE_FORMAT,
+ "Exam Name"));
+ }
+ if (!Exam.isValidExamName(examName)) {
+ throw new IllegalValueException(Exam.MESSAGE_CONSTRAINTS);
+ }
+
+ if (examDate == null || examDate.isEmpty()) {
+ throw new IllegalValueException(String.format(MISSING_EXAM_FIELD_MESSAGE_FORMAT,
+ "Exam Date"));
+ }
+ if (!DateUtil.isValidDate(examDate)) {
+ throw new IllegalValueException("Invalid date format");
+ }
+ LocalDate modelDate = DateUtil.parseToDate(examDate);
+
+ if (score == null || score.isEmpty()) {
+ throw new IllegalValueException(String.format(MISSING_EXAM_FIELD_MESSAGE_FORMAT,
+ "Exam Date"));
+ }
+ if (!Score.isValidExamScore(score)) {
+ throw new IllegalValueException(Score.MESSAGE_CONSTRAINTS);
+ }
+ Score modelScore = new Score(score);
+
+ return new Exam(examName, modelDate, modelScore);
+ }
+}
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedPerson.java b/src/main/java/seedu/address/storage/JsonAdaptedPerson.java
deleted file mode 100644
index a6321cec2ea..00000000000
--- a/src/main/java/seedu/address/storage/JsonAdaptedPerson.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package seedu.address.storage;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import seedu.address.commons.exceptions.IllegalValueException;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-
-/**
- * Jackson-friendly version of {@link Person}.
- */
-class JsonAdaptedPerson {
-
- public static final String MISSING_FIELD_MESSAGE_FORMAT = "Person's %s field is missing!";
-
- private final String name;
- private final String phone;
- private final String email;
- private final String address;
- private final List<JsonAdaptedTag> tagged = new ArrayList<>();
-
- /**
- * Constructs a {@code JsonAdaptedPerson} with the given person details.
- */
- @JsonCreator
- public JsonAdaptedPerson(@JsonProperty("name") String name, @JsonProperty("phone") String phone,
- @JsonProperty("email") String email, @JsonProperty("address") String address,
- @JsonProperty("tagged") List<JsonAdaptedTag> tagged) {
- this.name = name;
- this.phone = phone;
- this.email = email;
- this.address = address;
- if (tagged != null) {
- this.tagged.addAll(tagged);
- }
- }
-
- /**
- * Converts a given {@code Person} into this class for Jackson use.
- */
- public JsonAdaptedPerson(Person source) {
- name = source.getName().fullName;
- phone = source.getPhone().value;
- email = source.getEmail().value;
- address = source.getAddress().value;
- tagged.addAll(source.getTags().stream()
- .map(JsonAdaptedTag::new)
- .collect(Collectors.toList()));
- }
-
- /**
- * Converts this Jackson-friendly adapted person object into the model's {@code Person} object.
- *
- * @throws IllegalValueException if there were any data constraints violated in the adapted person.
- */
- public Person toModelType() throws IllegalValueException {
- final List<Tag> personTags = new ArrayList<>();
- for (JsonAdaptedTag tag : tagged) {
- personTags.add(tag.toModelType());
- }
-
- if (name == null) {
- throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Name.class.getSimpleName()));
- }
- if (!Name.isValidName(name)) {
- throw new IllegalValueException(Name.MESSAGE_CONSTRAINTS);
- }
- final Name modelName = new Name(name);
-
- if (phone == null) {
- throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Phone.class.getSimpleName()));
- }
- if (!Phone.isValidPhone(phone)) {
- throw new IllegalValueException(Phone.MESSAGE_CONSTRAINTS);
- }
- final Phone modelPhone = new Phone(phone);
-
- if (email == null) {
- throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Email.class.getSimpleName()));
- }
- if (!Email.isValidEmail(email)) {
- throw new IllegalValueException(Email.MESSAGE_CONSTRAINTS);
- }
- final Email modelEmail = new Email(email);
-
- if (address == null) {
- throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Address.class.getSimpleName()));
- }
- if (!Address.isValidAddress(address)) {
- throw new IllegalValueException(Address.MESSAGE_CONSTRAINTS);
- }
- final Address modelAddress = new Address(address);
-
- final Set<Tag> modelTags = new HashSet<>(personTags);
- return new Person(modelName, modelPhone, modelEmail, modelAddress, modelTags);
- }
-
-}
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedQuestion.java b/src/main/java/seedu/address/storage/JsonAdaptedQuestion.java
new file mode 100644
index 00000000000..5954b1c1b35
--- /dev/null
+++ b/src/main/java/seedu/address/storage/JsonAdaptedQuestion.java
@@ -0,0 +1,104 @@
+package seedu.address.storage;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.model.student.academic.question.Question;
+import seedu.address.model.student.academic.question.SolvedQuestion;
+import seedu.address.model.student.academic.question.UnsolvedQuestion;
+
+/**
+ * Jackson-friendly version of {@code Question}.
+ */
+public class JsonAdaptedQuestion {
+
+ public static final String MISSING_QUESTION_FIELD_MESSAGE_FORMAT = "Question's %s field is missing!";
+ public static final String INVALID_RESOLUTION_STATUS_MESSAGE = "isResolved field can only accept "
+ + "either \"solved\" or \"unsolved\" (case-sensitive)";
+
+ private static final String RESOLVED = "solved";
+ private static final String UNSOLVED = "unsolved";
+
+ private final String status;
+ private final String question;
+ private final String solution;
+
+ /**
+ * Constructs a {@code JsonAdaptedQuestion} with the given {@code question}.
+ */
+ @JsonCreator
+ public JsonAdaptedQuestion(@JsonProperty("status") String status, @JsonProperty("question") String question,
+ @JsonProperty("solution") String solution) {
+ this.status = status;
+ this.question = question;
+ this.solution = solution;
+ }
+
+ /**
+ * Converts a given {@code Question} into this class for Jackson use.
+ */
+ public JsonAdaptedQuestion(Question source) {
+ boolean isResolved = source.isResolved();
+ this.status = isResolved ? RESOLVED : UNSOLVED;
+ this.question = source.question;
+ if (isResolved) {
+ SolvedQuestion solved = (SolvedQuestion) source;
+ this.solution = solved.solution;
+ } else {
+ this.solution = "";
+ }
+ }
+
+ /**
+ * Converts this Jackson-friendly adapted question object into the model's {@code Question} object.
+ *
+ * @throws IllegalValueException if there were any data constraints violated in the adapted detail.
+ */
+ public Question toModelType() throws IllegalValueException {
+ if (status == null) {
+ throw new IllegalValueException(String.format(MISSING_QUESTION_FIELD_MESSAGE_FORMAT, "status"));
+ }
+ if (!isValidResolutionStatus()) {
+ throw new IllegalValueException(INVALID_RESOLUTION_STATUS_MESSAGE);
+ }
+
+ return isResolved() ? createModelSolved() : createModelUnsolved();
+ }
+
+ private UnsolvedQuestion createModelUnsolved() throws IllegalValueException {
+ checkQuestion();
+ return new UnsolvedQuestion(question);
+ }
+
+ private SolvedQuestion createModelSolved() throws IllegalValueException {
+ checkQuestion();
+
+ if (solution == null || solution.isEmpty()) {
+ throw new IllegalValueException(String.format(MISSING_QUESTION_FIELD_MESSAGE_FORMAT, "solution"));
+ }
+ if (!SolvedQuestion.isValidSolution(solution)) {
+ throw new IllegalValueException(SolvedQuestion.MESSAGE_SOLUTION_CONSTRAINTS);
+ }
+
+ return new SolvedQuestion(question, solution);
+ }
+
+ private void checkQuestion() throws IllegalValueException {
+ if (question == null || question.isEmpty()) {
+ throw new IllegalValueException(String.format(MISSING_QUESTION_FIELD_MESSAGE_FORMAT, "body"));
+ }
+ if (!Question.isValidQuestion(question)) {
+ throw new IllegalValueException(Question.MESSAGE_CONSTRAINTS);
+ }
+ }
+
+ private boolean isValidResolutionStatus() {
+ return status.equals(RESOLVED) || status.equals(UNSOLVED);
+ }
+
+ private boolean isResolved() {
+ return status.equals(RESOLVED);
+ }
+
+}
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedStudent.java b/src/main/java/seedu/address/storage/JsonAdaptedStudent.java
new file mode 100644
index 00000000000..f32cac6b649
--- /dev/null
+++ b/src/main/java/seedu/address/storage/JsonAdaptedStudent.java
@@ -0,0 +1,135 @@
+package seedu.address.storage;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.model.student.Name;
+import seedu.address.model.student.Phone;
+import seedu.address.model.student.School;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.Year;
+import seedu.address.model.student.academic.Academic;
+import seedu.address.model.student.admin.Admin;
+
+/**
+ * Jackson-friendly version of {@link Student}.
+ */
+class JsonAdaptedStudent {
+
+ public static final String MISSING_FIELD_MESSAGE_FORMAT = "Student's %s field is missing!";
+
+ private final String name;
+ private final String phone;
+ private final String school;
+ private final String year;
+
+ @JsonProperty("admin")
+ private final JsonAdaptedAdmin jsonAdaptedAdmin;
+
+ @JsonProperty("academic")
+ private final JsonAdaptedAcademic jsonAdaptedAcademic;
+
+ /**
+ * Constructs a {@code JsonAdaptedStudent} with the given student details.
+ */
+ @JsonCreator
+ public JsonAdaptedStudent(@JsonProperty("name") String name, @JsonProperty("phone") String phone,
+ @JsonProperty("school") String school, @JsonProperty("year") String year,
+ @JsonProperty("admin") JsonAdaptedAdmin admin,
+ @JsonProperty("academic") JsonAdaptedAcademic academic) {
+ this.name = name;
+ this.phone = phone;
+ this.school = school;
+ this.year = year;
+ this.jsonAdaptedAdmin = admin;
+ this.jsonAdaptedAcademic = academic;
+ }
+
+ /**
+ * Converts a given {@code Student} into this class for Jackson use.
+ */
+ public JsonAdaptedStudent(Student source) {
+ name = source.getName().fullName;
+ phone = source.getPhone().value;
+ school = source.getSchool().school;
+ year = String.valueOf(source.getYear().toString());
+ jsonAdaptedAdmin = new JsonAdaptedAdmin(source);
+ jsonAdaptedAcademic = new JsonAdaptedAcademic(source);
+ }
+
+ /**
+ * Converts this Jackson-friendly adapted person object into the model's {@code Person} object.
+ *
+ * @throws IllegalValueException if there were any data constraints violated in the adapted person.
+ */
+ public Student toModelType() throws IllegalValueException {
+ final Name modelName = getModelName();
+ final Phone modelPhone = getModelPhone();
+ final School modelSchool = getModelSchool();
+ final Year modelYear = getModelYear();
+ final Admin modelAdmin = getModelAdmin();
+ final Academic modelAcademic = getModelAcademic();
+
+ return new Student(modelName, modelPhone, modelSchool, modelYear, modelAdmin, modelAcademic);
+ }
+
+ private Name getModelName() throws IllegalValueException {
+ if (name == null) {
+ throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Name.class.getSimpleName()));
+ }
+ if (!Name.isValidName(name)) {
+ throw new IllegalValueException(Name.MESSAGE_CONSTRAINTS);
+ }
+ return new Name(name);
+ }
+
+ private Phone getModelPhone() throws IllegalValueException {
+ if (phone == null) {
+ throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Phone.class.getSimpleName()));
+ }
+ if (!Phone.isValidPhone(phone)) {
+ throw new IllegalValueException(Phone.MESSAGE_CONSTRAINTS);
+ }
+ return new Phone(phone);
+ }
+
+ private School getModelSchool() throws IllegalValueException {
+ if (school == null) {
+ throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT,
+ School.class.getSimpleName()));
+ }
+ if (!School.isValidSchool(school)) {
+ throw new IllegalValueException(School.MESSAGE_CONSTRAINTS);
+ }
+ return new School(school);
+ }
+
+ private Year getModelYear() throws IllegalValueException {
+ if (year == null) {
+ throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT,
+ Year.class.getSimpleName()));
+ }
+ if (!Year.isValidYear(year)) {
+ throw new IllegalValueException(Year.MESSAGE_CONSTRAINTS);
+ }
+ return new Year(year);
+ }
+
+ private Admin getModelAdmin() throws IllegalValueException {
+ if (jsonAdaptedAdmin == null) {
+ throw new IllegalValueException(
+ String.format(MISSING_FIELD_MESSAGE_FORMAT, Admin.class.getSimpleName()));
+ }
+ return jsonAdaptedAdmin.toModelType();
+ }
+
+ private Academic getModelAcademic() throws IllegalValueException {
+ if (jsonAdaptedAcademic == null) {
+ throw new IllegalValueException(
+ String.format(MISSING_FIELD_MESSAGE_FORMAT, Academic.class.getSimpleName()));
+ }
+ return jsonAdaptedAcademic.toModelType();
+ }
+
+}
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedTag.java b/src/main/java/seedu/address/storage/JsonAdaptedTag.java
deleted file mode 100644
index 0df22bdb754..00000000000
--- a/src/main/java/seedu/address/storage/JsonAdaptedTag.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package seedu.address.storage;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-import seedu.address.commons.exceptions.IllegalValueException;
-import seedu.address.model.tag.Tag;
-
-/**
- * Jackson-friendly version of {@link Tag}.
- */
-class JsonAdaptedTag {
-
- private final String tagName;
-
- /**
- * Constructs a {@code JsonAdaptedTag} with the given {@code tagName}.
- */
- @JsonCreator
- public JsonAdaptedTag(String tagName) {
- this.tagName = tagName;
- }
-
- /**
- * Converts a given {@code Tag} into this class for Jackson use.
- */
- public JsonAdaptedTag(Tag source) {
- tagName = source.tagName;
- }
-
- @JsonValue
- public String getTagName() {
- return tagName;
- }
-
- /**
- * Converts this Jackson-friendly adapted tag object into the model's {@code Tag} object.
- *
- * @throws IllegalValueException if there were any data constraints violated in the adapted tag.
- */
- public Tag toModelType() throws IllegalValueException {
- if (!Tag.isValidTagName(tagName)) {
- throw new IllegalValueException(Tag.MESSAGE_CONSTRAINTS);
- }
- return new Tag(tagName);
- }
-
-}
diff --git a/src/main/java/seedu/address/storage/JsonAddressBookStorage.java b/src/main/java/seedu/address/storage/JsonReeveStorage.java
similarity index 61%
rename from src/main/java/seedu/address/storage/JsonAddressBookStorage.java
rename to src/main/java/seedu/address/storage/JsonReeveStorage.java
index dfab9daaa0d..8c758b43581 100644
--- a/src/main/java/seedu/address/storage/JsonAddressBookStorage.java
+++ b/src/main/java/seedu/address/storage/JsonReeveStorage.java
@@ -12,18 +12,18 @@
import seedu.address.commons.exceptions.IllegalValueException;
import seedu.address.commons.util.FileUtil;
import seedu.address.commons.util.JsonUtil;
-import seedu.address.model.ReadOnlyAddressBook;
+import seedu.address.model.ReadOnlyReeve;
/**
* A class to access AddressBook data stored as a json file on the hard disk.
*/
-public class JsonAddressBookStorage implements AddressBookStorage {
+public class JsonReeveStorage implements ReeveStorage {
- private static final Logger logger = LogsCenter.getLogger(JsonAddressBookStorage.class);
+ private static final Logger logger = LogsCenter.getLogger(JsonReeveStorage.class);
private Path filePath;
- public JsonAddressBookStorage(Path filePath) {
+ public JsonReeveStorage(Path filePath) {
this.filePath = filePath;
}
@@ -32,7 +32,7 @@ public Path getAddressBookFilePath() {
}
@Override
- public Optional<ReadOnlyAddressBook> readAddressBook() throws DataConversionException {
+ public Optional<ReadOnlyReeve> readAddressBook() throws DataConversionException {
return readAddressBook(filePath);
}
@@ -42,17 +42,17 @@ public Optional<ReadOnlyAddressBook> readAddressBook() throws DataConversionExce
* @param filePath location of the data. Cannot be null.
* @throws DataConversionException if the file is not in the correct format.
*/
- public Optional<ReadOnlyAddressBook> readAddressBook(Path filePath) throws DataConversionException {
+ public Optional<ReadOnlyReeve> readAddressBook(Path filePath) throws DataConversionException {
requireNonNull(filePath);
- Optional<JsonSerializableAddressBook> jsonAddressBook = JsonUtil.readJsonFile(
- filePath, JsonSerializableAddressBook.class);
- if (!jsonAddressBook.isPresent()) {
+ Optional<JsonSerializableReeve> jsonReeve = JsonUtil.readJsonFile(
+ filePath, JsonSerializableReeve.class);
+ if (!jsonReeve.isPresent()) {
return Optional.empty();
}
try {
- return Optional.of(jsonAddressBook.get().toModelType());
+ return Optional.of(jsonReeve.get().toModelType());
} catch (IllegalValueException ive) {
logger.info("Illegal values found in " + filePath + ": " + ive.getMessage());
throw new DataConversionException(ive);
@@ -60,21 +60,21 @@ public Optional<ReadOnlyAddressBook> readAddressBook(Path filePath) throws DataC
}
@Override
- public void saveAddressBook(ReadOnlyAddressBook addressBook) throws IOException {
+ public void saveAddressBook(ReadOnlyReeve addressBook) throws IOException {
saveAddressBook(addressBook, filePath);
}
/**
- * Similar to {@link #saveAddressBook(ReadOnlyAddressBook)}.
+ * Similar to {@link #saveAddressBook(ReadOnlyReeve)}.
*
* @param filePath location of the data. Cannot be null.
*/
- public void saveAddressBook(ReadOnlyAddressBook addressBook, Path filePath) throws IOException {
+ public void saveAddressBook(ReadOnlyReeve addressBook, Path filePath) throws IOException {
requireNonNull(addressBook);
requireNonNull(filePath);
FileUtil.createIfMissing(filePath);
- JsonUtil.saveJsonFile(new JsonSerializableAddressBook(addressBook), filePath);
+ JsonUtil.saveJsonFile(new JsonSerializableReeve(addressBook), filePath);
}
}
diff --git a/src/main/java/seedu/address/storage/JsonSerializableAddressBook.java b/src/main/java/seedu/address/storage/JsonSerializableAddressBook.java
deleted file mode 100644
index 5efd834091d..00000000000
--- a/src/main/java/seedu/address/storage/JsonSerializableAddressBook.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package seedu.address.storage;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonRootName;
-
-import seedu.address.commons.exceptions.IllegalValueException;
-import seedu.address.model.AddressBook;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.person.Person;
-
-/**
- * An Immutable AddressBook that is serializable to JSON format.
- */
-@JsonRootName(value = "addressbook")
-class JsonSerializableAddressBook {
-
- public static final String MESSAGE_DUPLICATE_PERSON = "Persons list contains duplicate person(s).";
-
- private final List<JsonAdaptedPerson> persons = new ArrayList<>();
-
- /**
- * Constructs a {@code JsonSerializableAddressBook} with the given persons.
- */
- @JsonCreator
- public JsonSerializableAddressBook(@JsonProperty("persons") List<JsonAdaptedPerson> persons) {
- this.persons.addAll(persons);
- }
-
- /**
- * Converts a given {@code ReadOnlyAddressBook} into this class for Jackson use.
- *
- * @param source future changes to this will not affect the created {@code JsonSerializableAddressBook}.
- */
- public JsonSerializableAddressBook(ReadOnlyAddressBook source) {
- persons.addAll(source.getPersonList().stream().map(JsonAdaptedPerson::new).collect(Collectors.toList()));
- }
-
- /**
- * Converts this address book into the model's {@code AddressBook} object.
- *
- * @throws IllegalValueException if there were any data constraints violated.
- */
- public AddressBook toModelType() throws IllegalValueException {
- AddressBook addressBook = new AddressBook();
- for (JsonAdaptedPerson jsonAdaptedPerson : persons) {
- Person person = jsonAdaptedPerson.toModelType();
- if (addressBook.hasPerson(person)) {
- throw new IllegalValueException(MESSAGE_DUPLICATE_PERSON);
- }
- addressBook.addPerson(person);
- }
- return addressBook;
- }
-
-}
diff --git a/src/main/java/seedu/address/storage/JsonSerializableReeve.java b/src/main/java/seedu/address/storage/JsonSerializableReeve.java
new file mode 100644
index 00000000000..2842b7c48fe
--- /dev/null
+++ b/src/main/java/seedu/address/storage/JsonSerializableReeve.java
@@ -0,0 +1,60 @@
+package seedu.address.storage;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.model.ReadOnlyReeve;
+import seedu.address.model.Reeve;
+import seedu.address.model.student.Student;
+
+/**
+ * An Immutable Reeve that is serializable to JSON format.
+ */
+@JsonRootName(value = "reeve")
+class JsonSerializableReeve {
+
+ public static final String MESSAGE_DUPLICATE_STUDENT = "Student list contains duplicate student(s).";
+
+ private final List<JsonAdaptedStudent> students = new ArrayList<>();
+
+ /**
+ * Constructs a {@code JsonSerializableReeve} with the given students.
+ */
+ @JsonCreator
+ public JsonSerializableReeve(@JsonProperty("students") List<JsonAdaptedStudent> students) {
+ this.students.addAll(students);
+ }
+
+ /**
+ * Converts a given {@code ReadOnlyReeve} into this class for Jackson use.
+ *
+ * @param source future changes to this will not affect the created {@code JsonSerializableReeve}.
+ */
+ public JsonSerializableReeve(ReadOnlyReeve source) {
+ students.addAll(source.getStudentList().stream().map(JsonAdaptedStudent::new).collect(Collectors.toList()));
+ }
+
+ /**
+ * Converts this address book into the model's {@code Reeve} object.
+ *
+ * @throws IllegalValueException if there were any data constraints violated.
+ */
+ public Reeve toModelType() throws IllegalValueException {
+ Reeve reeve = new Reeve();
+ for (JsonAdaptedStudent jsonAdaptedStudent : students) {
+ Student student = jsonAdaptedStudent.toModelType();
+ if (reeve.hasStudent(student)) {
+ throw new IllegalValueException(MESSAGE_DUPLICATE_STUDENT);
+ }
+ reeve.addStudent(student);
+ }
+ return reeve;
+ }
+
+}
diff --git a/src/main/java/seedu/address/storage/AddressBookStorage.java b/src/main/java/seedu/address/storage/ReeveStorage.java
similarity index 51%
rename from src/main/java/seedu/address/storage/AddressBookStorage.java
rename to src/main/java/seedu/address/storage/ReeveStorage.java
index 4599182b3f9..50e3624b6af 100644
--- a/src/main/java/seedu/address/storage/AddressBookStorage.java
+++ b/src/main/java/seedu/address/storage/ReeveStorage.java
@@ -5,12 +5,13 @@
import java.util.Optional;
import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.model.ReadOnlyAddressBook;
+import seedu.address.model.ReadOnlyReeve;
+import seedu.address.model.Reeve;
/**
- * Represents a storage for {@link seedu.address.model.AddressBook}.
+ * Represents a storage for {@link Reeve}.
*/
-public interface AddressBookStorage {
+public interface ReeveStorage {
/**
* Returns the file path of the data file.
@@ -18,28 +19,28 @@ public interface AddressBookStorage {
Path getAddressBookFilePath();
/**
- * Returns AddressBook data as a {@link ReadOnlyAddressBook}.
+ * Returns AddressBook data as a {@link ReadOnlyReeve}.
* Returns {@code Optional.empty()} if storage file is not found.
* @throws DataConversionException if the data in storage is not in the expected format.
* @throws IOException if there was any problem when reading from the storage.
*/
- Optional<ReadOnlyAddressBook> readAddressBook() throws DataConversionException, IOException;
+ Optional<ReadOnlyReeve> readAddressBook() throws DataConversionException, IOException;
/**
* @see #getAddressBookFilePath()
*/
- Optional<ReadOnlyAddressBook> readAddressBook(Path filePath) throws DataConversionException, IOException;
+ Optional<ReadOnlyReeve> readAddressBook(Path filePath) throws DataConversionException, IOException;
/**
- * Saves the given {@link ReadOnlyAddressBook} to the storage.
+ * Saves the given {@link ReadOnlyReeve} to the storage.
* @param addressBook cannot be null.
* @throws IOException if there was any problem writing to the file.
*/
- void saveAddressBook(ReadOnlyAddressBook addressBook) throws IOException;
+ void saveAddressBook(ReadOnlyReeve addressBook) throws IOException;
/**
- * @see #saveAddressBook(ReadOnlyAddressBook)
+ * @see #saveAddressBook(ReadOnlyReeve)
*/
- void saveAddressBook(ReadOnlyAddressBook addressBook, Path filePath) throws IOException;
+ void saveAddressBook(ReadOnlyReeve addressBook, Path filePath) throws IOException;
}
diff --git a/src/main/java/seedu/address/storage/Storage.java b/src/main/java/seedu/address/storage/Storage.java
index beda8bd9f11..ba08f15e766 100644
--- a/src/main/java/seedu/address/storage/Storage.java
+++ b/src/main/java/seedu/address/storage/Storage.java
@@ -5,14 +5,16 @@
import java.util.Optional;
import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.model.ReadOnlyAddressBook;
+import seedu.address.model.ReadOnlyReeve;
import seedu.address.model.ReadOnlyUserPrefs;
import seedu.address.model.UserPrefs;
+import seedu.address.model.notes.ReadOnlyNotebook;
+import seedu.address.storage.notes.NotebookStorage;
/**
* API of the Storage component
*/
-public interface Storage extends AddressBookStorage, UserPrefsStorage {
+public interface Storage extends ReeveStorage, NotebookStorage, UserPrefsStorage {
@Override
Optional<UserPrefs> readUserPrefs() throws DataConversionException, IOException;
@@ -24,9 +26,15 @@ public interface Storage extends AddressBookStorage, UserPrefsStorage {
Path getAddressBookFilePath();
@Override
- Optional<ReadOnlyAddressBook> readAddressBook() throws DataConversionException, IOException;
+ Optional<ReadOnlyReeve> readAddressBook() throws DataConversionException, IOException;
@Override
- void saveAddressBook(ReadOnlyAddressBook addressBook) throws IOException;
+ void saveAddressBook(ReadOnlyReeve addressBook) throws IOException;
+
+ @Override
+ Optional<ReadOnlyNotebook> readNotebook() throws DataConversionException, IOException;
+
+ @Override
+ void saveNotebook(ReadOnlyNotebook notebook) throws IOException;
}
diff --git a/src/main/java/seedu/address/storage/StorageManager.java b/src/main/java/seedu/address/storage/StorageManager.java
index 79868290974..4b49bf93317 100644
--- a/src/main/java/seedu/address/storage/StorageManager.java
+++ b/src/main/java/seedu/address/storage/StorageManager.java
@@ -7,9 +7,11 @@
import seedu.address.commons.core.LogsCenter;
import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.model.ReadOnlyAddressBook;
+import seedu.address.model.ReadOnlyReeve;
import seedu.address.model.ReadOnlyUserPrefs;
import seedu.address.model.UserPrefs;
+import seedu.address.model.notes.ReadOnlyNotebook;
+import seedu.address.storage.notes.NotebookStorage;
/**
* Manages storage of AddressBook data in local storage.
@@ -17,15 +19,18 @@
public class StorageManager implements Storage {
private static final Logger logger = LogsCenter.getLogger(StorageManager.class);
- private AddressBookStorage addressBookStorage;
+ private ReeveStorage reeveStorage;
+ private NotebookStorage notebookStorage;
private UserPrefsStorage userPrefsStorage;
/**
* Creates a {@code StorageManager} with the given {@code AddressBookStorage} and {@code UserPrefStorage}.
*/
- public StorageManager(AddressBookStorage addressBookStorage, UserPrefsStorage userPrefsStorage) {
+ public StorageManager(ReeveStorage reeveStorage, UserPrefsStorage userPrefsStorage,
+ NotebookStorage notebookStorage) {
super();
- this.addressBookStorage = addressBookStorage;
+ this.reeveStorage = reeveStorage;
+ this.notebookStorage = notebookStorage;
this.userPrefsStorage = userPrefsStorage;
}
@@ -51,29 +56,58 @@ public void saveUserPrefs(ReadOnlyUserPrefs userPrefs) throws IOException {
@Override
public Path getAddressBookFilePath() {
- return addressBookStorage.getAddressBookFilePath();
+ return reeveStorage.getAddressBookFilePath();
}
@Override
- public Optional<ReadOnlyAddressBook> readAddressBook() throws DataConversionException, IOException {
- return readAddressBook(addressBookStorage.getAddressBookFilePath());
+ public Optional<ReadOnlyReeve> readAddressBook() throws DataConversionException, IOException {
+ return readAddressBook(reeveStorage.getAddressBookFilePath());
}
@Override
- public Optional<ReadOnlyAddressBook> readAddressBook(Path filePath) throws DataConversionException, IOException {
+ public Optional<ReadOnlyReeve> readAddressBook(Path filePath) throws DataConversionException, IOException {
logger.fine("Attempting to read data from file: " + filePath);
- return addressBookStorage.readAddressBook(filePath);
+ return reeveStorage.readAddressBook(filePath);
}
@Override
- public void saveAddressBook(ReadOnlyAddressBook addressBook) throws IOException {
- saveAddressBook(addressBook, addressBookStorage.getAddressBookFilePath());
+ public void saveAddressBook(ReadOnlyReeve reeve) throws IOException {
+ saveAddressBook(reeve, reeveStorage.getAddressBookFilePath());
}
@Override
- public void saveAddressBook(ReadOnlyAddressBook addressBook, Path filePath) throws IOException {
+ public void saveAddressBook(ReadOnlyReeve reeve, Path filePath) throws IOException {
logger.fine("Attempting to write to data file: " + filePath);
- addressBookStorage.saveAddressBook(addressBook, filePath);
+ reeveStorage.saveAddressBook(reeve, filePath);
+ }
+
+ // ================ Notebook methods ==============================
+
+ @Override
+ public Path getNotebookFilePath() {
+ return notebookStorage.getNotebookFilePath();
+ }
+
+ @Override
+ public Optional<ReadOnlyNotebook> readNotebook() throws DataConversionException, IOException {
+ return readNotebook(notebookStorage.getNotebookFilePath());
+ }
+
+ @Override
+ public Optional<ReadOnlyNotebook> readNotebook(Path filePath) throws DataConversionException, IOException {
+ logger.fine("Attempting to read data from notebook file: " + filePath);
+ return notebookStorage.readNotebook(filePath);
+ }
+
+ @Override
+ public void saveNotebook(ReadOnlyNotebook notebook) throws IOException {
+ saveNotebook(notebook, notebookStorage.getNotebookFilePath());
+ }
+
+ @Override
+ public void saveNotebook(ReadOnlyNotebook notebook, Path filePath) throws IOException {
+ logger.fine("Attempting to write to notebook data file: " + filePath);
+ notebookStorage.saveNotebook(notebook, filePath);
}
}
diff --git a/src/main/java/seedu/address/storage/notes/JsonAdaptedNote.java b/src/main/java/seedu/address/storage/notes/JsonAdaptedNote.java
new file mode 100644
index 00000000000..1d1e26b33aa
--- /dev/null
+++ b/src/main/java/seedu/address/storage/notes/JsonAdaptedNote.java
@@ -0,0 +1,66 @@
+package seedu.address.storage.notes;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.model.notes.note.Description;
+import seedu.address.model.notes.note.Note;
+import seedu.address.model.notes.note.Title;
+import seedu.address.model.student.Student;
+
+/**
+ * Jackson-friendly version of {@link Student}.
+ */
+class JsonAdaptedNote {
+
+ public static final String MISSING_FIELD_MESSAGE_FORMAT = "Note's %s field is missing!";
+
+ private final String title;
+ private final String description;
+
+ /**
+ * Constructs a {@code JsonAdaptedNote} with the given student details.
+ */
+ @JsonCreator
+ public JsonAdaptedNote(@JsonProperty("title") String title, @JsonProperty("description") String description) {
+ this.title = title;
+ this.description = description;
+ }
+
+ /**
+ * Converts a given {@code Note} into this class for Jackson use.
+ */
+ public JsonAdaptedNote(Note source) {
+ title = source.getTitle().title;
+ description = source.getDescription().description;
+ }
+
+ /**
+ * Converts this Jackson-friendly adapted note object into the model's {@code Note} object.
+ *
+ * @throws IllegalValueException if there were any data constraints violated in the adapted note.
+ */
+ public Note toModelType() throws IllegalValueException {
+
+ if (title == null) {
+ throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT, Title.class.getSimpleName()));
+ }
+ if (!Title.isValidTitle(title)) {
+ throw new IllegalValueException(Title.MESSAGE_CONSTRAINTS);
+ }
+ final Title modelTitle = new Title(title);
+
+ if (description == null) {
+ throw new IllegalValueException(String.format(MISSING_FIELD_MESSAGE_FORMAT,
+ Description.class.getSimpleName()));
+ }
+ if (!Description.isValidDescription(description)) {
+ throw new IllegalValueException(Description.MESSAGE_CONSTRAINTS);
+ }
+ final Description modelDescription = new Description(description);
+
+ return new Note(modelTitle, modelDescription);
+ }
+
+}
diff --git a/src/main/java/seedu/address/storage/notes/JsonNotebookStorage.java b/src/main/java/seedu/address/storage/notes/JsonNotebookStorage.java
new file mode 100644
index 00000000000..67aeedda76d
--- /dev/null
+++ b/src/main/java/seedu/address/storage/notes/JsonNotebookStorage.java
@@ -0,0 +1,80 @@
+package seedu.address.storage.notes;
+
+import static java.util.Objects.requireNonNull;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.logging.Logger;
+
+import seedu.address.commons.core.LogsCenter;
+import seedu.address.commons.exceptions.DataConversionException;
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.commons.util.FileUtil;
+import seedu.address.commons.util.JsonUtil;
+import seedu.address.model.notes.ReadOnlyNotebook;
+
+/**
+ * A class to access Notebook data stored as a json file on the hard disk.
+ */
+public class JsonNotebookStorage implements NotebookStorage {
+
+ private static final Logger logger = LogsCenter.getLogger(JsonNotebookStorage.class);
+
+ private Path filePath;
+
+ public JsonNotebookStorage(Path filePath) {
+ this.filePath = filePath;
+ }
+
+ public Path getNotebookFilePath() {
+ return filePath;
+ }
+
+ @Override
+ public Optional<ReadOnlyNotebook> readNotebook() throws DataConversionException, IOException {
+ return readNotebook(filePath);
+ }
+
+ /**
+ * Similar to {@link #readNotebook()}.
+ *
+ * @param filePath location of the data. Cannot be null.
+ * @throws DataConversionException if the file is not in the correct format.
+ */
+ public Optional<ReadOnlyNotebook> readNotebook(Path filePath) throws DataConversionException {
+ requireNonNull(filePath);
+
+ Optional<JsonSerializableNotebook> jsonNotebook = JsonUtil.readJsonFile(
+ filePath, JsonSerializableNotebook.class);
+ if (!jsonNotebook.isPresent()) {
+ return Optional.empty();
+ }
+
+ try {
+ return Optional.of(jsonNotebook.get().toModelType());
+ } catch (IllegalValueException ive) {
+ logger.info("Illegal values found in " + filePath + ": " + ive.getMessage());
+ throw new DataConversionException(ive);
+ }
+ }
+
+ @Override
+ public void saveNotebook(ReadOnlyNotebook notebook) throws IOException {
+ saveNotebook(notebook, filePath);
+ }
+
+ /**
+ * Similar to {@link #saveNotebook(ReadOnlyNotebook)}.
+ *
+ * @param filePath location of the data. Cannot be null.
+ */
+ public void saveNotebook(ReadOnlyNotebook notebook, Path filePath) throws IOException {
+ requireNonNull(notebook);
+ requireNonNull(filePath);
+
+ FileUtil.createIfMissing(filePath);
+ JsonUtil.saveJsonFile(new JsonSerializableNotebook(notebook), filePath);
+ }
+
+}
diff --git a/src/main/java/seedu/address/storage/notes/JsonSerializableNotebook.java b/src/main/java/seedu/address/storage/notes/JsonSerializableNotebook.java
new file mode 100644
index 00000000000..48cdbf352f3
--- /dev/null
+++ b/src/main/java/seedu/address/storage/notes/JsonSerializableNotebook.java
@@ -0,0 +1,61 @@
+package seedu.address.storage.notes;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.model.notes.Notebook;
+import seedu.address.model.notes.ReadOnlyNotebook;
+import seedu.address.model.notes.note.Note;
+
+/**
+ * An Immutable Notebook that is serializable to JSON format.
+ */
+@JsonRootName(value = "notebook")
+public class JsonSerializableNotebook {
+
+ public static final String MESSAGE_DUPLICATE_NOTE = "Notebook contains duplicate note(s).";
+
+ private final List<JsonAdaptedNote> notes = new ArrayList<>();
+
+ /**
+ * Constructs a {@code JsonSerializableNotebook} with the given students.
+ */
+ @JsonCreator
+ public JsonSerializableNotebook(@JsonProperty("notes") List<JsonAdaptedNote> notes) {
+ this.notes.addAll(notes);
+ }
+
+ /**
+ * Converts a given {@code ReadOnlyNotebook} into this class for Jackson use.
+ *
+ * @param source future changes to this will not affect the created {@code JsonSerializableNotebook}.
+ */
+ public JsonSerializableNotebook(ReadOnlyNotebook source) {
+ notes.addAll(source.getNotesList().stream().map(JsonAdaptedNote::new).collect(Collectors.toList()));
+ }
+
+ /**
+ * Converts this notebook into the model's {@code Notebook} object.
+ *
+ * @throws IllegalValueException if there were any data constraints violated.
+ */
+ public Notebook toModelType() throws IllegalValueException {
+ Notebook notebook = new Notebook();
+ for (JsonAdaptedNote jsonAdaptedNote : notes) {
+ Note note = jsonAdaptedNote.toModelType();
+ if (notebook.hasNote(note)) {
+ throw new IllegalValueException(MESSAGE_DUPLICATE_NOTE);
+ }
+ notebook.addNote(note);
+ }
+ return notebook;
+ }
+
+}
+
diff --git a/src/main/java/seedu/address/storage/notes/NotebookStorage.java b/src/main/java/seedu/address/storage/notes/NotebookStorage.java
new file mode 100644
index 00000000000..d9f6a0a0eca
--- /dev/null
+++ b/src/main/java/seedu/address/storage/notes/NotebookStorage.java
@@ -0,0 +1,41 @@
+package seedu.address.storage.notes;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Optional;
+
+import seedu.address.commons.exceptions.DataConversionException;
+import seedu.address.model.notes.ReadOnlyNotebook;
+
+public interface NotebookStorage {
+
+ /**
+ * Returns the file path of the data file for the notebook.
+ */
+ Path getNotebookFilePath();
+
+ /**
+ * Returns Notebook data as a {@link seedu.address.model.notes.ReadOnlyNotebook}.
+ * Returns {@code Optional.empty()} if storage file is not found.
+ * @throws DataConversionException if the data in storage is not in the expected format.
+ * @throws IOException if there was any problem when reading from the storage.
+ */
+ Optional<ReadOnlyNotebook> readNotebook() throws DataConversionException, IOException;
+
+ /**
+ * @see #getNotebookFilePath()
+ */
+ Optional<ReadOnlyNotebook> readNotebook(Path filePath) throws DataConversionException, IOException;
+
+ /**
+ * Saves the given {@link ReadOnlyNotebook} to the storage.
+ * @param notebook cannot be null.
+ * @throws IOException if there was any problem writing to the file.
+ */
+ void saveNotebook(ReadOnlyNotebook notebook) throws IOException;
+
+ /**
+ * @see #saveNotebook(ReadOnlyNotebook)
+ */
+ void saveNotebook(ReadOnlyNotebook notebook, Path filePath) throws IOException;
+}
diff --git a/src/main/java/seedu/address/ui/ExamStatsWindow.java b/src/main/java/seedu/address/ui/ExamStatsWindow.java
new file mode 100644
index 00000000000..7bd716fdd4a
--- /dev/null
+++ b/src/main/java/seedu/address/ui/ExamStatsWindow.java
@@ -0,0 +1,83 @@
+package seedu.address.ui;
+
+import java.time.format.DateTimeFormatter;
+import java.util.Comparator;
+import java.util.List;
+import java.util.logging.Logger;
+
+import javafx.fxml.FXML;
+import javafx.scene.chart.LineChart;
+import javafx.scene.chart.XYChart;
+import javafx.stage.Stage;
+import seedu.address.commons.core.LogsCenter;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.academic.exam.Exam;
+
+public class ExamStatsWindow extends UiPart<Stage> {
+
+ private static final Logger logger = LogsCenter.getLogger(ExamStatsWindow.class);
+ private static final String FXML = "ExamStatsWindow.fxml";
+ private static final String lineChartTitle = "Exam Statistics of ";
+
+ @FXML
+ private LineChart<String, Number> lineChart;
+
+ /**
+ * Creates a new HelpWindow.
+ *
+ * @param root Stage to use as the root of the HelpWindow.
+ */
+ public ExamStatsWindow(Stage root) {
+ super(FXML, root);
+ }
+
+ /**
+ * Creates a new HelpWindow.
+ */
+ public ExamStatsWindow(Student student) {
+ this(new Stage());
+ lineChart.setTitle(lineChartTitle + student.getName().toString());
+ fillLineChart(student);
+ }
+
+ /**
+ * Shows the exam stats window.
+ * @throws IllegalStateException
+ * <ul>
+ * <li>
+ * if this method is called on a thread other than the JavaFX Application Thread.
+ * </li>
+ * <li>
+ * if this method is called during animation or layout processing.
+ * </li>
+ * <li>
+ * if this method is called on the primary stage.
+ * </li>
+ * <li>
+ * if {@code dialogStage} is already showing.
+ * </li>
+ * </ul>
+ */
+ public void show() {
+ logger.fine("Showing exam stats page of student.");
+ getRoot().show();
+ getRoot().centerOnScreen();
+ }
+
+ private void fillLineChart(Student student) {
+ XYChart.Series<String, Number> series = new XYChart.Series<>();
+ series.setName("Exam Score");
+ List<Exam> exams = student.getExams();
+ exams.sort(new Comparator<Exam>() {
+ @Override
+ public int compare(Exam exam1, Exam exam2) {
+ return exam1.getDate().compareTo(exam2.getDate());
+ }
+ });
+ for (Exam exam : exams) {
+ series.getData().add(new XYChart.Data<>(exam.getDate().format(DateTimeFormatter.ofPattern("dd MMM yyyy")),
+ exam.getScore().getScorePercentage()));
+ }
+ lineChart.getData().add(series);
+ }
+}
diff --git a/src/main/java/seedu/address/ui/HelpWindow.java b/src/main/java/seedu/address/ui/HelpWindow.java
index 9a665915949..91e59199315 100644
--- a/src/main/java/seedu/address/ui/HelpWindow.java
+++ b/src/main/java/seedu/address/ui/HelpWindow.java
@@ -15,7 +15,7 @@
*/
public class HelpWindow extends UiPart<Stage> {
- public static final String USERGUIDE_URL = "https://se-education.org/addressbook-level3/UserGuide.html";
+ public static final String USERGUIDE_URL = "https://ay2021s1-cs2103t-w15-2.github.io/tp/UserGuide.html";
public static final String HELP_MESSAGE = "Refer to the user guide: " + USERGUIDE_URL;
private static final Logger logger = LogsCenter.getLogger(HelpWindow.class);
diff --git a/src/main/java/seedu/address/ui/MainWindow.java b/src/main/java/seedu/address/ui/MainWindow.java
index 9106c3aa6e5..5f6db7be567 100644
--- a/src/main/java/seedu/address/ui/MainWindow.java
+++ b/src/main/java/seedu/address/ui/MainWindow.java
@@ -8,6 +8,7 @@
import javafx.scene.control.TextInputControl;
import javafx.scene.input.KeyCombination;
import javafx.scene.input.KeyEvent;
+import javafx.scene.layout.GridPane;
import javafx.scene.layout.StackPane;
import javafx.stage.Stage;
import seedu.address.commons.core.GuiSettings;
@@ -16,6 +17,8 @@
import seedu.address.logic.commands.CommandResult;
import seedu.address.logic.commands.exceptions.CommandException;
import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.schedule.ScheduleViewMode;
+import seedu.address.model.student.Student;
/**
* The Main Window. Provides the basic application layout containing
@@ -31,9 +34,11 @@ public class MainWindow extends UiPart<Stage> {
private Logic logic;
// Independent Ui parts residing in this Ui container
- private PersonListPanel personListPanel;
+ private StudentListPanel studentListPanel;
private ResultDisplay resultDisplay;
+ private Notebook notebook;
private HelpWindow helpWindow;
+ private SchedulePanel schedulePanel;
@FXML
private StackPane commandBoxPlaceholder;
@@ -44,16 +49,20 @@ public class MainWindow extends UiPart<Stage> {
@FXML
private StackPane personListPanelPlaceholder;
+ @FXML
+ private StackPane notebookPlaceholder;
+
@FXML
private StackPane resultDisplayPlaceholder;
@FXML
- private StackPane statusbarPlaceholder;
+ private GridPane displayGridPane;
/**
* Creates a {@code MainWindow} with the given {@code Stage} and {@code Logic}.
*/
public MainWindow(Stage primaryStage, Logic logic) {
+
super(FXML, primaryStage);
// Set dependencies
@@ -66,6 +75,7 @@ public MainWindow(Stage primaryStage, Logic logic) {
setAccelerators();
helpWindow = new HelpWindow();
+
}
public Stage getPrimaryStage() {
@@ -110,14 +120,17 @@ private void setAccelerator(MenuItem menuItem, KeyCombination keyCombination) {
* Fills up all the placeholders of this window.
*/
void fillInnerParts() {
- personListPanel = new PersonListPanel(logic.getFilteredPersonList());
- personListPanelPlaceholder.getChildren().add(personListPanel.getRoot());
+ schedulePanel = new SchedulePanel(logic.getVEventList());
+ personListPanelPlaceholder.getChildren().add(schedulePanel.getRoot());
+
+ studentListPanel = new StudentListPanel(logic.getSortedStudentList());
+ personListPanelPlaceholder.getChildren().add(studentListPanel.getRoot());
resultDisplay = new ResultDisplay();
resultDisplayPlaceholder.getChildren().add(resultDisplay.getRoot());
- StatusBarFooter statusBarFooter = new StatusBarFooter(logic.getAddressBookFilePath());
- statusbarPlaceholder.getChildren().add(statusBarFooter.getRoot());
+ notebook = new Notebook(logic.getNotebook().getNotesList());
+ notebookPlaceholder.getChildren().add(notebook.getRoot());
CommandBox commandBox = new CommandBox(this::executeCommand);
commandBoxPlaceholder.getChildren().add(commandBox.getRoot());
@@ -163,8 +176,51 @@ private void handleExit() {
primaryStage.hide();
}
- public PersonListPanel getPersonListPanel() {
- return personListPanel;
+ /**
+ * Opens the schedule with updated events.
+ */
+ @FXML
+ private void handleSchedule() {
+ schedulePanel.updateSchedule(logic.getVEventList());
+ if (logic.getScheduleViewMode().equals(ScheduleViewMode.WEEKLY)) {
+ schedulePanel.setWeekView();
+ }
+ if (logic.getScheduleViewMode().equals(ScheduleViewMode.DAILY)) {
+ schedulePanel.setDayView();
+ }
+ schedulePanel.setDisplayedDateTime(logic.getScheduleViewDateTime());
+ schedulePanel.getRoot().toFront();
+ }
+
+ /**
+ * Closes the schedule.
+ */
+ public void closeSchedule() {
+ schedulePanel.getRoot().toBack();
+ }
+
+ /**
+ * Toggle the display of student cards in the student list panel between admin and academic.
+ */
+ public void handleAcademicPanel() {
+ studentListPanel.toggleState();
+ }
+
+ /**
+ * Opens the exam stats window or focuses on it if it's already opened.
+ */
+ @FXML
+ public void handleExamStats(Student student) {
+ ExamStatsWindow examStatsWindow = new ExamStatsWindow(student);
+ examStatsWindow.show();
+ }
+
+ public StudentListPanel getStudentListPanel() {
+ return studentListPanel;
+ }
+
+ public Notebook getNotebookPanel() {
+ return notebook;
}
/**
@@ -178,14 +234,31 @@ private CommandResult executeCommand(String commandText) throws CommandException
logger.info("Result: " + commandResult.getFeedbackToUser());
resultDisplay.setFeedbackToUser(commandResult.getFeedbackToUser());
- if (commandResult.isShowHelp()) {
+ if (commandResult.isShouldShowHelp()) {
handleHelp();
}
- if (commandResult.isExit()) {
+ if (commandResult.isShouldExit()) {
handleExit();
}
+ // this is to open schedule when schedule command is called
+ if (commandResult.isShouldShowSchedule()) {
+ handleSchedule();
+ return commandResult;
+ }
+
+ // closes schedule if other command is called
+ closeSchedule();
+
+ if (commandResult.isToggleStudentCard()) {
+ handleAcademicPanel();
+ }
+
+ if (commandResult.isExamStats()) {
+ handleExamStats(commandResult.getSelectedStudent());
+ }
+
return commandResult;
} catch (CommandException | ParseException e) {
logger.info("Invalid command: " + commandText);
diff --git a/src/main/java/seedu/address/ui/NoteTile.java b/src/main/java/seedu/address/ui/NoteTile.java
new file mode 100644
index 00000000000..785bf153975
--- /dev/null
+++ b/src/main/java/seedu/address/ui/NoteTile.java
@@ -0,0 +1,62 @@
+package seedu.address.ui;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Region;
+
+/**
+ * An UI component that displays information of a {@code Note}.
+ */
+public class NoteTile extends UiPart<Region> {
+
+ private static final String FXML = "NoteTile.fxml";
+
+ /**
+ * Note: Certain keywords such as "location" and "resources" are reserved keywords in JavaFX.
+ * As a consequence, UI elements' variable names cannot be set to such keywords
+ * or an exception will be thrown by JavaFX during runtime.
+ *
+ * @see <a href="https://github.com/se-edu/addressbook-level4/issues/336">The issue on AddressBook level 4</a>
+ */
+
+ public final seedu.address.model.notes.note.Note note;
+
+ @FXML
+ private HBox cardPane;
+ @FXML
+ private Label title;
+ @FXML
+ private Label id;
+ @FXML
+ private Label description;
+
+ /**
+ * Creates a {@code PersonCode} with the given {@code Person} and index to display.
+ */
+ public NoteTile(seedu.address.model.notes.note.Note note, int displayedIndex) {
+ super(FXML);
+ this.note = note;
+ id.setText(displayedIndex + ". ");
+ title.setText(note.getTitle().title);
+ description.setText(note.getDescription().description);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof NoteTile)) {
+ return false;
+ }
+
+ // state check
+ NoteTile card = (NoteTile) other;
+ return id.getText().equals(card.id.getText())
+ && note.equals(card.note);
+ }
+}
diff --git a/src/main/java/seedu/address/ui/Notebook.java b/src/main/java/seedu/address/ui/Notebook.java
new file mode 100644
index 00000000000..b874f4683a4
--- /dev/null
+++ b/src/main/java/seedu/address/ui/Notebook.java
@@ -0,0 +1,49 @@
+package seedu.address.ui;
+
+import java.util.logging.Logger;
+
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+import javafx.scene.layout.Region;
+import seedu.address.commons.core.LogsCenter;
+import seedu.address.model.notes.note.Note;
+
+/**
+ * Panel containing the list of persons.
+ */
+public class Notebook extends UiPart<Region> {
+ private static final String FXML = "Notebook.fxml";
+ private final Logger logger = LogsCenter.getLogger(Notebook.class);
+
+ @FXML
+ private ListView<Note> notebook;
+
+ /**
+ * Creates a {@code PersonListPanel} with the given {@code ObservableList}.
+ */
+ public Notebook(ObservableList<Note> notes) {
+ super(FXML);
+ notebook.setItems(notes);
+ notebook.setCellFactory(listView -> new NoteCell());
+ }
+
+ /**
+ * Custom {@code ListCell} that displays the graphics of a {@code Note} using a {@code NoteTile}.
+ */
+ class NoteCell extends ListCell<Note> {
+ @Override
+ protected void updateItem(Note note, boolean empty) {
+ super.updateItem(note, empty);
+
+ if (empty || note == null) {
+ setGraphic(null);
+ setText(null);
+ } else {
+ setGraphic(new NoteTile(note, getIndex() + 1).getRoot());
+ }
+ }
+ }
+
+}
diff --git a/src/main/java/seedu/address/ui/PersonListPanel.java b/src/main/java/seedu/address/ui/PersonListPanel.java
deleted file mode 100644
index f4c501a897b..00000000000
--- a/src/main/java/seedu/address/ui/PersonListPanel.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package seedu.address.ui;
-
-import java.util.logging.Logger;
-
-import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
-import javafx.scene.control.ListCell;
-import javafx.scene.control.ListView;
-import javafx.scene.layout.Region;
-import seedu.address.commons.core.LogsCenter;
-import seedu.address.model.person.Person;
-
-/**
- * Panel containing the list of persons.
- */
-public class PersonListPanel extends UiPart<Region> {
- private static final String FXML = "PersonListPanel.fxml";
- private final Logger logger = LogsCenter.getLogger(PersonListPanel.class);
-
- @FXML
- private ListView<Person> personListView;
-
- /**
- * Creates a {@code PersonListPanel} with the given {@code ObservableList}.
- */
- public PersonListPanel(ObservableList<Person> personList) {
- super(FXML);
- personListView.setItems(personList);
- personListView.setCellFactory(listView -> new PersonListViewCell());
- }
-
- /**
- * Custom {@code ListCell} that displays the graphics of a {@code Person} using a {@code PersonCard}.
- */
- class PersonListViewCell extends ListCell<Person> {
- @Override
- protected void updateItem(Person person, boolean empty) {
- super.updateItem(person, empty);
-
- if (empty || person == null) {
- setGraphic(null);
- setText(null);
- } else {
- setGraphic(new PersonCard(person, getIndex() + 1).getRoot());
- }
- }
- }
-
-}
diff --git a/src/main/java/seedu/address/ui/SchedulePanel.java b/src/main/java/seedu/address/ui/SchedulePanel.java
new file mode 100644
index 00000000000..e02d71f9bd2
--- /dev/null
+++ b/src/main/java/seedu/address/ui/SchedulePanel.java
@@ -0,0 +1,104 @@
+package seedu.address.ui;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Locale;
+import java.util.logging.Logger;
+
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.Region;
+import jfxtras.icalendarfx.VCalendar;
+import jfxtras.icalendarfx.components.VEvent;
+import jfxtras.internal.scene.control.skin.agenda.AgendaDaySkin;
+import jfxtras.internal.scene.control.skin.agenda.AgendaWeekSkin;
+import jfxtras.scene.control.agenda.icalendar.ICalendarAgenda;
+import seedu.address.commons.core.LogsCenter;
+
+/**
+ * Panel containing the schedule.
+ */
+public class SchedulePanel extends UiPart<Region> {
+
+ private static final String FXML = "SchedulePanel.fxml";
+ private static final Locale UK = Locale.UK;
+ private final VCalendar vCalendar;
+ private final ICalendarAgenda agenda;
+ private final Logger logger = LogsCenter.getLogger(SchedulePanel.class);
+
+ @FXML
+ private BorderPane borderPane;
+
+ /**
+ * Creates a {@code UiPart<Region>} wrapping an ICalendar.
+ * This is to be shown on the main panel of the app.
+ * @param list list of VEvents that are to displayed.
+ */
+ public SchedulePanel(ObservableList<VEvent> list) {
+ super(FXML);
+ this.vCalendar = new VCalendar();
+ vCalendar.setVEvents(list);
+ this.agenda = new ICalendarAgenda(this.vCalendar);
+ init(this.agenda);
+ borderPane.setStyle("-fx-background-color: #ffffff;");
+ borderPane.setCenter(agenda);
+ }
+
+ /**
+ * Initialises the schedule panel. Default view is the weekly view.
+ */
+ public void init(ICalendarAgenda agenda) {
+ agenda.setLocale(UK);
+ setWeekView();
+ disableUserGraphicsForICalendar(this.agenda);
+ }
+
+ /**
+ * Disables the graphical feature of iCalendar.
+ * @param agenda the settings for the iCalendar.
+ */
+ public void disableUserGraphicsForICalendar(ICalendarAgenda agenda) {
+ agenda.setAllowResize(false);
+ agenda.setAllowDragging(false);
+ agenda.setOnMousePressed(null);
+ agenda.setOnTouchPressed(null);
+ agenda.setEditAppointmentCallback(null);
+ agenda.setAppointmentChangedCallback(null);
+ agenda.setNewAppointmentCallback(null);
+ agenda.setNewAppointmentDrawnCallback(null);
+ agenda.setOnMouseClicked(null);
+ agenda.setSelectedOneAppointmentCallback(param -> null);
+ }
+
+ /**
+ * Sets the iCalendar to weekly view.
+ */
+ public void setWeekView() {
+ AgendaWeekSkin weekSkin = new AgendaWeekSkin(this.agenda);
+ agenda.setSkin(weekSkin);
+ }
+ /**
+ * Sets the iCalendar to a daily view.
+ */
+ public void setDayView() {
+ AgendaDaySkin dailySkin = new AgendaDaySkin(this.agenda);
+ agenda.setSkin(dailySkin);
+ }
+
+ /**
+ * Changes panel to show time interval.
+ * @param localDateTime local date and time.
+ */
+ public void setDisplayedDateTime(LocalDateTime localDateTime) {
+ this.agenda.setDisplayedLocalDateTime(localDateTime);
+ }
+
+ /**
+ * Updates the iCalendarAgenda to propagate changes to internal VEvents.
+ */
+ public void updateSchedule(List<VEvent> newData) {
+ this.vCalendar.setVEvents(newData);
+ }
+
+}
diff --git a/src/main/java/seedu/address/ui/PersonCard.java b/src/main/java/seedu/address/ui/StudentAcademicCard.java
similarity index 54%
rename from src/main/java/seedu/address/ui/PersonCard.java
rename to src/main/java/seedu/address/ui/StudentAcademicCard.java
index 7fc927bc5d9..e53cea22590 100644
--- a/src/main/java/seedu/address/ui/PersonCard.java
+++ b/src/main/java/seedu/address/ui/StudentAcademicCard.java
@@ -1,20 +1,17 @@
package seedu.address.ui;
-import java.util.Comparator;
-
import javafx.fxml.FXML;
import javafx.scene.control.Label;
-import javafx.scene.layout.FlowPane;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Region;
-import seedu.address.model.person.Person;
+import seedu.address.model.student.Student;
/**
* An UI component that displays information of a {@code Person}.
*/
-public class PersonCard extends UiPart<Region> {
+public class StudentAcademicCard extends UiPart<Region> {
- private static final String FXML = "PersonListCard.fxml";
+ private static final String FXML = "StudentAcademicListCard.fxml";
/**
* Note: Certain keywords such as "location" and "resources" are reserved keywords in JavaFX.
@@ -24,7 +21,7 @@ public class PersonCard extends UiPart<Region> {
* @see <a href="https://github.com/se-edu/addressbook-level4/issues/336">The issue on AddressBook level 4</a>
*/
- public final Person person;
+ public final Student student;
@FXML
private HBox cardPane;
@@ -35,26 +32,30 @@ public class PersonCard extends UiPart<Region> {
@FXML
private Label phone;
@FXML
- private Label address;
+ private Label school;
+ @FXML
+ private Label year;
+ @FXML
+ private Label questions;
@FXML
- private Label email;
+ private Label exams;
@FXML
- private FlowPane tags;
+ private Label attendance;
/**
* Creates a {@code PersonCode} with the given {@code Person} and index to display.
*/
- public PersonCard(Person person, int displayedIndex) {
+ public StudentAcademicCard(Student student, int displayedIndex) {
super(FXML);
- this.person = person;
+ this.student = student;
id.setText(displayedIndex + ". ");
- name.setText(person.getName().fullName);
- phone.setText(person.getPhone().value);
- address.setText(person.getAddress().value);
- email.setText(person.getEmail().value);
- person.getTags().stream()
- .sorted(Comparator.comparing(tag -> tag.tagName))
- .forEach(tag -> tags.getChildren().add(new Label(tag.tagName)));
+ name.setText(student.getName().fullName);
+ phone.setText("Phone: " + student.getPhone().value);
+ school.setText("School: " + student.getSchool().school);
+ year.setText("Year: " + student.getYear());
+ questions.setText("Questions:\n" + student.getFormattedQuestions());
+ exams.setText("Examinations: \n" + student.getFormattedExams());
+ attendance.setText("Attendance:\n" + student.getFormattedAttendance());
}
@Override
@@ -65,13 +66,13 @@ public boolean equals(Object other) {
}
// instanceof handles nulls
- if (!(other instanceof PersonCard)) {
+ if (!(other instanceof StudentAcademicCard)) {
return false;
}
// state check
- PersonCard card = (PersonCard) other;
+ StudentAcademicCard card = (StudentAcademicCard) other;
return id.getText().equals(card.id.getText())
- && person.equals(card.person);
+ && student.equals(card.student);
}
}
diff --git a/src/main/java/seedu/address/ui/StudentAdminCard.java b/src/main/java/seedu/address/ui/StudentAdminCard.java
new file mode 100644
index 00000000000..f270d6f1528
--- /dev/null
+++ b/src/main/java/seedu/address/ui/StudentAdminCard.java
@@ -0,0 +1,84 @@
+package seedu.address.ui;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Region;
+import seedu.address.model.student.Student;
+
+/**
+ * An UI component that displays information of a {@code Student}.
+ */
+public class StudentAdminCard extends UiPart<Region> {
+
+ private static final String FXML = "StudentAdminListCard.fxml";
+
+ /**
+ * Note: Certain keywords such as "location" and "resources" are reserved keywords in JavaFX.
+ * As a consequence, UI elements' variable names cannot be set to such keywords
+ * or an exception will be thrown by JavaFX during runtime.
+ *
+ * @see <a href="https://github.com/se-edu/addressbook-level4/issues/336">The issue on AddressBook level 4</a>
+ */
+
+ public final Student student;
+
+ @FXML
+ private HBox cardPane;
+ @FXML
+ private Label name;
+ @FXML
+ private Label id;
+ @FXML
+ private Label phone;
+ @FXML
+ private Label school;
+ @FXML
+ private Label year;
+ @FXML
+ private Label venue;
+ @FXML
+ private Label time;
+ @FXML
+ private Label fee;
+ @FXML
+ private Label payment;
+ @FXML
+ private Label details;
+
+ /**
+ * Creates a {@code PersonCode} with the given {@code Person} and index to display.
+ */
+ public StudentAdminCard(Student student, int displayedIndex) {
+ super(FXML);
+ this.student = student;
+ id.setText(displayedIndex + ". ");
+ name.setText(student.getName().fullName);
+ phone.setText("Phone: " + student.getPhone().value);
+ school.setText("School: " + student.getSchool().school);
+ year.setText("Year: " + student.getYear());
+ venue.setText("Class Venue: " + student.getClassVenue().venue);
+ time.setText("Class Time: " + student.getClassTime().toString());
+ fee.setText("Fee: " + student.getFee().toString());
+ payment.setText("Last Payment Date: " + student.getPaymentDate().toString());
+ details.setText("Details: \n" + student.getFormattedDetails());
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ // short circuit if same object
+ if (other == this) {
+ return true;
+ }
+
+ // instanceof handles nulls
+ if (!(other instanceof StudentAdminCard)) {
+ return false;
+ }
+
+ // state check
+ StudentAdminCard card = (StudentAdminCard) other;
+ return id.getText().equals(card.id.getText())
+ && student.equals(card.student);
+ }
+}
diff --git a/src/main/java/seedu/address/ui/StudentListPanel.java b/src/main/java/seedu/address/ui/StudentListPanel.java
new file mode 100644
index 00000000000..0bbd414ee3f
--- /dev/null
+++ b/src/main/java/seedu/address/ui/StudentListPanel.java
@@ -0,0 +1,63 @@
+package seedu.address.ui;
+
+import java.util.logging.Logger;
+
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+import javafx.scene.layout.Region;
+import seedu.address.commons.core.LogsCenter;
+import seedu.address.model.student.Student;
+
+/**
+ * Panel containing the list of persons.
+ */
+public class StudentListPanel extends UiPart<Region> {
+ private static final String FXML = "StudentListPanel.fxml";
+ private final Logger logger = LogsCenter.getLogger(StudentListPanel.class);
+ private boolean state;
+
+ @FXML
+ private ListView<Student> personListView;
+
+ /**
+ * Creates a {@code PersonListPanel} with the given {@code ObservableList}.
+ */
+ public StudentListPanel(ObservableList<Student> studentList) {
+ super(FXML);
+ personListView.setItems(studentList);
+ personListView.setCellFactory(listView -> new StudentListViewCell());
+ state = true;
+ }
+
+ /**
+ * Toggles between StudentAdminCard and StudentAcademicCard.
+ */
+ public void toggleState() {
+ state = !state;
+ personListView.refresh(); //To show immediate result of toggle
+ }
+
+ /**
+ * Custom {@code ListCell} that displays the graphics of a {@code Person} using a {@code PersonCard}.
+ */
+ class StudentListViewCell extends ListCell<Student> {
+ @Override
+ protected void updateItem(Student student, boolean empty) {
+ super.updateItem(student, empty);
+
+ if (empty || student == null) {
+ setGraphic(null);
+ setText(null);
+ } else {
+ if (state) {
+ setGraphic(new StudentAdminCard(student, getIndex() + 1).getRoot());
+ } else {
+ setGraphic(new StudentAcademicCard(student, getIndex() + 1).getRoot());
+ }
+ }
+ }
+ }
+
+}
diff --git a/src/main/resources/images/exam_stats_icon.png b/src/main/resources/images/exam_stats_icon.png
new file mode 100644
index 00000000000..b5b8e5d18f9
Binary files /dev/null and b/src/main/resources/images/exam_stats_icon.png differ
diff --git a/src/main/resources/view/CommandBox.fxml b/src/main/resources/view/CommandBox.fxml
index 09f6d6fe9e4..49eef3cbd61 100644
--- a/src/main/resources/view/CommandBox.fxml
+++ b/src/main/resources/view/CommandBox.fxml
@@ -3,7 +3,6 @@
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.StackPane?>
-<StackPane styleClass="stack-pane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
- <TextField fx:id="commandTextField" onAction="#handleCommandEntered" promptText="Enter command here..."/>
+<StackPane minHeight="40.0" styleClass="stack-pane" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
+ <TextField fx:id="commandTextField" minHeight="40.0" onAction="#handleCommandEntered" promptText="Enter command here..." />
</StackPane>
-
diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css
index 36e6b001cd8..3ebb4f5beb9 100644
--- a/src/main/resources/view/DarkTheme.css
+++ b/src/main/resources/view/DarkTheme.css
@@ -1,6 +1,6 @@
.background {
- -fx-background-color: derive(#1d1d1d, 20%);
- background-color: #383838; /* Used in the default.html file */
+ -fx-background-color: derive(#663B25, 20%);
+ background-color: #663B25; /* Used in the default.html file */
}
.label {
@@ -40,9 +40,9 @@
}
.table-view {
- -fx-base: #1d1d1d;
- -fx-control-inner-background: #1d1d1d;
- -fx-background-color: #1d1d1d;
+ -fx-base: #663B25;
+ -fx-control-inner-background: #663B25;
+ -fx-background-color: #663B25;
-fx-table-cell-border-color: transparent;
-fx-table-header-border-color: transparent;
-fx-padding: 5;
@@ -77,34 +77,34 @@
}
.split-pane:horizontal .split-pane-divider {
- -fx-background-color: derive(#1d1d1d, 20%);
+ -fx-background-color: derive(#663B25, 20%);
-fx-border-color: transparent transparent transparent #4d4d4d;
}
.split-pane {
-fx-border-radius: 1;
-fx-border-width: 1;
- -fx-background-color: derive(#1d1d1d, 20%);
+ -fx-background-color: derive(#663B25, 20%);
}
.list-view {
-fx-background-insets: 0;
-fx-padding: 0;
- -fx-background-color: derive(#1d1d1d, 20%);
+ -fx-background-color: derive(#663B25, 20%);
}
.list-cell {
-fx-label-padding: 0 0 0 0;
-fx-graphic-text-gap : 0;
- -fx-padding: 0 0 0 0;
+ -fx-padding: 5 5 5 5;
}
.list-cell:filled:even {
- -fx-background-color: #3c3e3f;
+ -fx-background-color: #d09a7b;
}
.list-cell:filled:odd {
- -fx-background-color: #515658;
+ -fx-background-color: #d09a7b;
}
.list-cell:filled:selected {
@@ -117,7 +117,7 @@
}
.list-cell .label {
- -fx-text-fill: white;
+ -fx-text-fill: black;
}
.cell_big_label {
@@ -133,24 +133,30 @@
}
.stack-pane {
- -fx-background-color: derive(#1d1d1d, 20%);
+ -fx-background-color: #D09A7B;
}
.pane-with-border {
- -fx-background-color: derive(#1d1d1d, 20%);
- -fx-border-color: derive(#1d1d1d, 10%);
- -fx-border-top-width: 1px;
+ -fx-background-color: derive(#663B25, 20%);
+ -fx-border-color: black;
+ -fx-border-width: 1;
+}
+
+.pane-with-border2 {
+ -fx-background-color: #C38059;
+ -fx-border-color: black;
+ -fx-border-width: 1;
}
.status-bar {
- -fx-background-color: derive(#1d1d1d, 30%);
+ -fx-background-color: derive(#663B25, 30%);
}
.result-display {
-fx-background-color: transparent;
-fx-font-family: "Segoe UI Light";
-fx-font-size: 13pt;
- -fx-text-fill: white;
+ -fx-text-fill: black;
}
.result-display .label {
@@ -165,8 +171,8 @@
}
.status-bar-with-border {
- -fx-background-color: derive(#1d1d1d, 30%);
- -fx-border-color: derive(#1d1d1d, 25%);
+ -fx-background-color: derive(#663B25, 30%);
+ -fx-border-color: derive(#663B25, 25%);
-fx-border-width: 1px;
}
@@ -175,17 +181,17 @@
}
.grid-pane {
- -fx-background-color: derive(#1d1d1d, 30%);
- -fx-border-color: derive(#1d1d1d, 30%);
+ -fx-background-color: derive(#663B25, 30%);
+ -fx-border-color: derive(#663B25, 30%);
-fx-border-width: 1px;
}
.grid-pane .stack-pane {
- -fx-background-color: derive(#1d1d1d, 30%);
+ -fx-background-color: derive(#663B25, 30%);
}
.context-menu {
- -fx-background-color: derive(#1d1d1d, 50%);
+ -fx-background-color: derive(#663B25, 50%);
}
.context-menu .label {
@@ -193,12 +199,12 @@
}
.menu-bar {
- -fx-background-color: derive(#1d1d1d, 20%);
+ -fx-background-color: derive(#663B25, 20%);
}
.menu-bar .label {
- -fx-font-size: 14pt;
- -fx-font-family: "Segoe UI Light";
+ -fx-font-size: 11pt;
+ -fx-font-family: "Segoe UI";
-fx-text-fill: white;
-fx-opacity: 0.9;
}
@@ -217,7 +223,7 @@
-fx-border-color: #e2e2e2;
-fx-border-width: 2;
-fx-background-radius: 0;
- -fx-background-color: #1d1d1d;
+ -fx-background-color: #663B25;
-fx-font-family: "Segoe UI", Helvetica, Arial, sans-serif;
-fx-font-size: 11pt;
-fx-text-fill: #d8d8d8;
@@ -230,7 +236,7 @@
.button:pressed, .button:default:hover:pressed {
-fx-background-color: white;
- -fx-text-fill: #1d1d1d;
+ -fx-text-fill: #663B25;
}
.button:focused {
@@ -243,7 +249,7 @@
.button:disabled, .button:default:disabled {
-fx-opacity: 0.4;
- -fx-background-color: #1d1d1d;
+ -fx-background-color: #663B25;
-fx-text-fill: white;
}
@@ -257,11 +263,11 @@
}
.dialog-pane {
- -fx-background-color: #1d1d1d;
+ -fx-background-color: #663B25;
}
.dialog-pane > *.button-bar > *.container {
- -fx-background-color: #1d1d1d;
+ -fx-background-color: #663B25;
}
.dialog-pane > *.label.content {
@@ -271,7 +277,7 @@
}
.dialog-pane:header *.header-panel {
- -fx-background-color: derive(#1d1d1d, 25%);
+ -fx-background-color: derive(#663B25, 25%);
}
.dialog-pane:header *.header-panel *.label {
@@ -282,11 +288,11 @@
}
.scroll-bar {
- -fx-background-color: derive(#1d1d1d, 20%);
+ -fx-background-color: derive(#663B25, 20%);
}
.scroll-bar .thumb {
- -fx-background-color: derive(#1d1d1d, 50%);
+ -fx-background-color: derive(#663B25, 50%);
-fx-background-insets: 3;
}
@@ -318,14 +324,15 @@
}
#commandTextField {
- -fx-background-color: transparent #383838 transparent #383838;
+ -fx-background-color: transparent #663B25 transparent #663B25;
-fx-background-insets: 0;
- -fx-border-color: #383838 #383838 #ffffff #383838;
+ -fx-border-color: black;
-fx-border-insets: 0;
- -fx-border-width: 1;
- -fx-font-family: "Segoe UI Light";
+ -fx-border-width: 2;
+ -fx-font-family: "Segoe UI";
-fx-font-size: 13pt;
- -fx-text-fill: white;
+ -fx-text-fill: black;
+ -fx-prompt-text-fill: #494949;
}
#filterField, #personListPanel, #personWebpage {
@@ -333,7 +340,7 @@
}
#resultDisplay .content {
- -fx-background-color: transparent, #383838, transparent, #383838;
+ -fx-background-color: transparent, #D09A7B, transparent, #D09A7B;
-fx-background-radius: 0;
}
diff --git a/src/main/resources/view/ExamStatsWindow.fxml b/src/main/resources/view/ExamStatsWindow.fxml
new file mode 100644
index 00000000000..ebd74662cf1
--- /dev/null
+++ b/src/main/resources/view/ExamStatsWindow.fxml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.Scene?>
+<?import javafx.scene.chart.CategoryAxis?>
+<?import javafx.scene.chart.LineChart?>
+<?import javafx.scene.chart.NumberAxis?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.stage.Stage?>
+
+<?import javafx.scene.image.Image?>
+<fx:root title="ExamStats" type="Stage" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
+ <icons>
+ <Image url="@/images/exam_stats_icon.png" />
+ </icons>
+ <scene>
+ <Scene>
+ <VBox>
+ <children>
+ <LineChart fx:id="lineChart" legendVisible="false" VBox.vgrow="NEVER">
+ <xAxis>
+ <CategoryAxis label=" Exam Date" />
+ </xAxis>
+ <yAxis>
+ <NumberAxis label="Score Percentage (%)" side="LEFT" />
+ </yAxis>
+ </LineChart>
+ </children>
+ </VBox>
+ </Scene>
+ </scene>
+</fx:root>
diff --git a/src/main/resources/view/Extensions.css b/src/main/resources/view/Extensions.css
index bfe82a85964..4ee39a79028 100644
--- a/src/main/resources/view/Extensions.css
+++ b/src/main/resources/view/Extensions.css
@@ -5,7 +5,7 @@
.list-cell:empty {
/* Empty cells will not have alternating colours */
- -fx-background: #383838;
+ -fx-background: #663B25;
}
.tag-selector {
diff --git a/src/main/resources/view/HelpWindow.fxml b/src/main/resources/view/HelpWindow.fxml
index fa0fb54d9f4..a6a5d4c4e39 100644
--- a/src/main/resources/view/HelpWindow.fxml
+++ b/src/main/resources/view/HelpWindow.fxml
@@ -6,9 +6,10 @@
<?import javafx.scene.control.Label?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.text.Font?>
<?import javafx.stage.Stage?>
-<fx:root resizable="false" title="Help" type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/11" xmlns:fx="http://javafx.com/fxml/1">
+<fx:root resizable="false" title="Help" type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
<icons>
<Image url="@/images/help_icon.png" />
</icons>
@@ -20,6 +21,9 @@
<HBox.margin>
<Insets right="5.0" />
</HBox.margin>
+ <font>
+ <Font size="11.0" />
+ </font>
</Label>
<Button fx:id="copyButton" mnemonicParsing="false" onAction="#copyUrl" text="Copy URL">
<HBox.margin>
diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
index a431648f6c0..ec622cf7509 100644
--- a/src/main/resources/view/MainWindow.fxml
+++ b/src/main/resources/view/MainWindow.fxml
@@ -6,55 +6,79 @@
<?import javafx.scene.control.Menu?>
<?import javafx.scene.control.MenuBar?>
<?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.SplitPane?>
<?import javafx.scene.image.Image?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?>
+<?import javafx.stage.Stage?>
-<fx:root type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
- title="Address App" minWidth="450" minHeight="600" onCloseRequest="#handleExit">
- <icons>
- <Image url="@/images/address_book_32.png" />
- </icons>
- <scene>
- <Scene>
- <stylesheets>
- <URL value="@DarkTheme.css" />
- <URL value="@Extensions.css" />
- </stylesheets>
-
- <VBox>
- <MenuBar fx:id="menuBar" VBox.vgrow="NEVER">
- <Menu mnemonicParsing="false" text="File">
- <MenuItem mnemonicParsing="false" onAction="#handleExit" text="Exit" />
- </Menu>
- <Menu mnemonicParsing="false" text="Help">
- <MenuItem fx:id="helpMenuItem" mnemonicParsing="false" onAction="#handleHelp" text="Help" />
- </Menu>
- </MenuBar>
-
- <StackPane VBox.vgrow="NEVER" fx:id="commandBoxPlaceholder" styleClass="pane-with-border">
- <padding>
- <Insets top="5" right="10" bottom="5" left="10" />
- </padding>
- </StackPane>
-
- <StackPane VBox.vgrow="NEVER" fx:id="resultDisplayPlaceholder" styleClass="pane-with-border"
- minHeight="100" prefHeight="100" maxHeight="100">
- <padding>
- <Insets top="5" right="10" bottom="5" left="10" />
- </padding>
- </StackPane>
-
- <VBox fx:id="personList" styleClass="pane-with-border" minWidth="340" prefWidth="340" VBox.vgrow="ALWAYS">
- <padding>
- <Insets top="10" right="10" bottom="10" left="10" />
- </padding>
- <StackPane fx:id="personListPanelPlaceholder" VBox.vgrow="ALWAYS"/>
- </VBox>
-
- <StackPane fx:id="statusbarPlaceholder" VBox.vgrow="NEVER" />
- </VBox>
- </Scene>
- </scene>
+<fx:root minHeight="650.0" minWidth="1100.0" onCloseRequest="#handleExit" title="Reeve" type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
+ <icons>
+ <Image url="@/images/address_book_32.png" />
+ </icons>
+ <scene>
+ <Scene>
+ <stylesheets>
+ <URL value="@DarkTheme.css" />
+ <URL value="@Notes.css" />
+ <URL value="@Extensions.css" />
+ </stylesheets>
+ <VBox>
+ <MenuBar fx:id="menuBar" VBox.vgrow="NEVER">
+ <Menu mnemonicParsing="false" text="File">
+ <MenuItem mnemonicParsing="false" onAction="#handleExit" text="Exit" />
+ </Menu>
+ <Menu mnemonicParsing="false" text="Schedule">
+ <items>
+ <MenuItem mnemonicParsing="false" onAction="#handleSchedule" text="Open" />
+ <MenuItem mnemonicParsing="false" onAction="#closeSchedule" text="Close" />
+ </items>
+ </Menu>
+ <Menu mnemonicParsing="false" text="Help">
+ <MenuItem fx:id="helpMenuItem" mnemonicParsing="false" onAction="#handleHelp" text="Help" />
+ </Menu>
+ </MenuBar>
+ <GridPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" VBox.vgrow="ALWAYS">
+ <columnConstraints>
+ <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+ <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+ </columnConstraints>
+ <rowConstraints>
+ <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+ </rowConstraints>
+ <children>
+ <StackPane fx:id="personListPanelPlaceholder" styleClass="pane-with-border" GridPane.vgrow="ALWAYS" />
+ <GridPane alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" GridPane.columnIndex="1" GridPane.vgrow="ALWAYS">
+ <children>
+ <StackPane fx:id="notebookPlaceholder" maxHeight="155.0" maxWidth="1.7976931348623157E308" minHeight="155.0" prefHeight="155.0" styleClass="pane-with-border" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1">
+ <padding>
+ <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+ </padding>
+ </StackPane>
+ <StackPane fx:id="resultDisplayPlaceholder" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="pane-with-border" GridPane.hgrow="ALWAYS" GridPane.vgrow="ALWAYS">
+ <padding>
+ <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+ </padding>
+ </StackPane>
+ </children>
+ <columnConstraints>
+ <ColumnConstraints />
+ </columnConstraints>
+ <rowConstraints>
+ <RowConstraints />
+ <RowConstraints />
+ </rowConstraints>
+ </GridPane>
+ </children>
+ </GridPane>
+ <StackPane fx:id="commandBoxPlaceholder" styleClass="pane-with-border" VBox.vgrow="NEVER">
+ <padding>
+ <Insets bottom="5" left="10" right="10" top="5" />
+ </padding>
+ </StackPane>
+ </VBox>
+ </Scene>
+ </scene>
</fx:root>
diff --git a/src/main/resources/view/NoteTile.fxml b/src/main/resources/view/NoteTile.fxml
new file mode 100644
index 00000000000..f653e17fc44
--- /dev/null
+++ b/src/main/resources/view/NoteTile.fxml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.VBox?>
+
+<VBox maxHeight="120.0" maxWidth="150.0" minHeight="120.0" minWidth="150.0" prefHeight="120.0" prefWidth="150.0" styleClass="note-cell" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
+ <padding>
+ <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+ </padding>
+ <children>
+ <HBox>
+ <children>
+ <Label fx:id="id" alignment="TOP_CENTER" styleClass="cell_big_label" textAlignment="CENTER">
+ <minWidth>
+ <Region fx:constant="USE_PREF_SIZE" />
+ </minWidth>
+ </Label>
+ <Label fx:id="title" alignment="TOP_CENTER" styleClass="cell_big_label" text="\$first" />
+ </children>
+ </HBox>
+ <Label fx:id="description" styleClass="cell_small_label" text="\\$description" wrapText="true">
+ <opaqueInsets>
+ <Insets />
+ </opaqueInsets>
+ <VBox.margin>
+ <Insets top="2.0" />
+ </VBox.margin>
+ </Label>
+ </children>
+</VBox>
diff --git a/src/main/resources/view/Notebook.fxml b/src/main/resources/view/Notebook.fxml
new file mode 100644
index 00000000000..26478c76a96
--- /dev/null
+++ b/src/main/resources/view/Notebook.fxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.layout.VBox?>
+
+<VBox prefHeight="100.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <ListView fx:id="notebook" maxHeight="145.0" maxWidth="1.7976931348623157E308" minHeight="145.0" orientation="HORIZONTAL" prefHeight="145.0" style="-fx-background-color: #663B25;" VBox.vgrow="NEVER">
+ <VBox.margin>
+ <Insets />
+ </VBox.margin></ListView>
+ </children>
+</VBox>
diff --git a/src/main/resources/view/Notes.css b/src/main/resources/view/Notes.css
new file mode 100644
index 00000000000..0ae3cca4aef
--- /dev/null
+++ b/src/main/resources/view/Notes.css
@@ -0,0 +1,3 @@
+.note-cell {
+ -fx-background-color: #e8d37d;
+}
diff --git a/src/main/resources/view/PersonListCard.fxml b/src/main/resources/view/PersonListCard.fxml
deleted file mode 100644
index f08ea32ad55..00000000000
--- a/src/main/resources/view/PersonListCard.fxml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.FlowPane?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Region?>
-<?import javafx.scene.layout.VBox?>
-
-<HBox id="cardPane" fx:id="cardPane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
- <GridPane HBox.hgrow="ALWAYS">
- <columnConstraints>
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10" prefWidth="150" />
- </columnConstraints>
- <VBox alignment="CENTER_LEFT" minHeight="105" GridPane.columnIndex="0">
- <padding>
- <Insets top="5" right="5" bottom="5" left="15" />
- </padding>
- <HBox spacing="5" alignment="CENTER_LEFT">
- <Label fx:id="id" styleClass="cell_big_label">
- <minWidth>
- <!-- Ensures that the label text is never truncated -->
- <Region fx:constant="USE_PREF_SIZE" />
- </minWidth>
- </Label>
- <Label fx:id="name" text="\$first" styleClass="cell_big_label" />
- </HBox>
- <FlowPane fx:id="tags" />
- <Label fx:id="phone" styleClass="cell_small_label" text="\$phone" />
- <Label fx:id="address" styleClass="cell_small_label" text="\$address" />
- <Label fx:id="email" styleClass="cell_small_label" text="\$email" />
- </VBox>
- </GridPane>
-</HBox>
diff --git a/src/main/resources/view/PersonListPanel.fxml b/src/main/resources/view/PersonListPanel.fxml
deleted file mode 100644
index 8836d323cc5..00000000000
--- a/src/main/resources/view/PersonListPanel.fxml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.ListView?>
-<?import javafx.scene.layout.VBox?>
-
-<VBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
- <ListView fx:id="personListView" VBox.vgrow="ALWAYS" />
-</VBox>
diff --git a/src/main/resources/view/ResultDisplay.fxml b/src/main/resources/view/ResultDisplay.fxml
index 58d5ad3dc56..436409608da 100644
--- a/src/main/resources/view/ResultDisplay.fxml
+++ b/src/main/resources/view/ResultDisplay.fxml
@@ -3,7 +3,6 @@
<?import javafx.scene.control.TextArea?>
<?import javafx.scene.layout.StackPane?>
-<StackPane fx:id="placeHolder" styleClass="pane-with-border" xmlns="http://javafx.com/javafx/8"
- xmlns:fx="http://javafx.com/fxml/1">
- <TextArea fx:id="resultDisplay" editable="false" styleClass="result-display"/>
+<StackPane fx:id="placeHolder" styleClass="pane-with-border" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
+ <TextArea fx:id="resultDisplay" editable="false" minHeight="315.0" styleClass="result-display" wrapText="true" />
</StackPane>
diff --git a/src/main/resources/view/SchedulePanel.fxml b/src/main/resources/view/SchedulePanel.fxml
new file mode 100644
index 00000000000..428eb192edd
--- /dev/null
+++ b/src/main/resources/view/SchedulePanel.fxml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.VBox?>
+
+<VBox xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
+ <BorderPane fx:id="borderPane" maxWidth="Infinity" VBox.vgrow="ALWAYS" />
+</VBox>
diff --git a/src/main/resources/view/StudentAcademicListCard.fxml b/src/main/resources/view/StudentAcademicListCard.fxml
new file mode 100644
index 00000000000..29003e6c518
--- /dev/null
+++ b/src/main/resources/view/StudentAcademicListCard.fxml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+
+<HBox id="cardPane" fx:id="cardPane" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
+ <GridPane HBox.hgrow="ALWAYS">
+ <columnConstraints>
+ <ColumnConstraints hgrow="SOMETIMES" minWidth="10" prefWidth="150" />
+ </columnConstraints>
+ <VBox alignment="CENTER_LEFT" minHeight="105" styleClass="pane-with-border2" GridPane.columnIndex="0">
+ <padding>
+ <Insets bottom="5" left="15" right="5" top="5" />
+ </padding>
+ <HBox alignment="CENTER_LEFT" spacing="5">
+ <Label fx:id="id" styleClass="cell_big_label">
+ <minWidth>
+ <!-- Ensures that the label text is never truncated -->
+ <Region fx:constant="USE_PREF_SIZE" />
+ </minWidth>
+ </Label>
+ <Label fx:id="name" styleClass="cell_big_label" text="\$first" />
+ </HBox>
+ <Label fx:id="phone" styleClass="cell_small_label" text="\$phone" wrapText="true" />
+ <Label fx:id="school" styleClass="cell_small_label" text="\$school" wrapText="true" />
+ <Label fx:id="year" styleClass="cell_small_label" text="\$year" wrapText="true" />
+ <Label fx:id="questions" styleClass="cell_small_label" text="\$questions" wrapText="true" />
+ <Label fx:id="exams" styleClass="cell_small_label" text="\$exams" wrapText="true" />
+ <Label fx:id="attendance" styleClass="cell_small_label" text="\$attendance" wrapText="true" />
+ </VBox>
+ <rowConstraints>
+ <RowConstraints />
+ </rowConstraints>
+ </GridPane>
+</HBox>
diff --git a/src/main/resources/view/StudentAdminListCard.fxml b/src/main/resources/view/StudentAdminListCard.fxml
new file mode 100644
index 00000000000..6dbb0e9b34a
--- /dev/null
+++ b/src/main/resources/view/StudentAdminListCard.fxml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+
+<HBox id="cardPane" fx:id="cardPane" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
+ <GridPane HBox.hgrow="ALWAYS">
+ <columnConstraints>
+ <ColumnConstraints hgrow="SOMETIMES" minWidth="10" prefWidth="150" />
+ </columnConstraints>
+ <VBox alignment="CENTER_LEFT" minHeight="105" styleClass="pane-with-border2" GridPane.columnIndex="0">
+ <padding>
+ <Insets bottom="5" left="15" right="5" top="5" />
+ </padding>
+ <HBox alignment="CENTER_LEFT" spacing="5">
+ <Label fx:id="id" styleClass="cell_big_label">
+ <minWidth>
+ <!-- Ensures that the label text is never truncated -->
+ <Region fx:constant="USE_PREF_SIZE" />
+ </minWidth>
+ </Label>
+ <Label fx:id="name" styleClass="cell_big_label" text="\$first" />
+ </HBox>
+ <Label fx:id="phone" styleClass="cell_small_label" text="\$phone" wrapText="true" />
+ <Label fx:id="school" styleClass="cell_small_label" text="\$school" wrapText="true" />
+ <Label fx:id="year" styleClass="cell_small_label" text="\$year" wrapText="true" />
+ <Label fx:id="venue" styleClass="cell_small_label" text="\$venue" wrapText="true" />
+ <Label fx:id="time" styleClass="cell_small_label" text="\$time" wrapText="true" />
+ <Label fx:id="fee" styleClass="cell_small_label" text="\$fee" wrapText="true" />
+ <Label fx:id="payment" styleClass="cell_small_label" text="\$payment" wrapText="true" />
+ <Label fx:id="details" styleClass="cell_small_label" text="\$details" wrapText="true" />
+ </VBox>
+ <rowConstraints>
+ <RowConstraints />
+ </rowConstraints>
+ </GridPane>
+</HBox>
diff --git a/src/main/resources/view/StudentListPanel.fxml b/src/main/resources/view/StudentListPanel.fxml
new file mode 100644
index 00000000000..e1a22bab8ea
--- /dev/null
+++ b/src/main/resources/view/StudentListPanel.fxml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.layout.VBox?>
+
+<VBox xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
+ <ListView fx:id="personListView" style="-fx-background-color: #663B25;" VBox.vgrow="ALWAYS" />
+</VBox>
diff --git a/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json b/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json
deleted file mode 100644
index 6a4d2b7181c..00000000000
--- a/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "persons": [ {
- "name": "Valid Person",
- "phone": "9482424",
- "email": "hans@example.com",
- "address": "4th street"
- }, {
- "name": "Person With Invalid Phone Field",
- "phone": "948asdf2424",
- "email": "hans@example.com",
- "address": "4th street"
- } ]
-}
diff --git a/src/test/data/JsonAddressBookStorageTest/invalidAndValidStudentReeve.json b/src/test/data/JsonAddressBookStorageTest/invalidAndValidStudentReeve.json
new file mode 100644
index 00000000000..ba982cdfeba
--- /dev/null
+++ b/src/test/data/JsonAddressBookStorageTest/invalidAndValidStudentReeve.json
@@ -0,0 +1,77 @@
+{
+ "students": [ {
+ "name": "Valid Student",
+ "phone": "9482424",
+ "school": "NUS High School",
+ "year": "JC 2",
+ "admin" : {
+ "classVenue": "Kent Ridge Road",
+ "classTime": "1 1500-1700",
+ "fee": "12.01",
+ "paymentDate": "20/12/2020",
+ "details": ["He's valid"]
+ },
+ "academic" : {
+ "questions": [{
+ "status" : "unsolved",
+ "question" : "What is Newton's Second Law?",
+ "solution" : ""
+ }, {
+ "status" : "unsolved",
+ "question" : "How do you inverse a matrix?",
+ "solution" : ""
+ }],
+ "attendanceList" : [ {
+ "date" : "14/04/1998",
+ "attendanceStatus" : "present",
+ "feedback" : "sleepy during lesson"
+ }],
+ "exams" : [ {
+ "examName" : "End of Year Examination 2020",
+ "examDate" : "7/11/2020",
+ "score" : "50/100"
+ }, {
+ "examName" : "Mid Year Examination 2020",
+ "examDate" : "25/7/2020",
+ "score" : "20/30"
+ }]
+ }
+ }, {
+ "name": "Student With Invalid Phone Field",
+ "phone": "948asdf2424",
+ "school": "NUS High School",
+ "year": "JC 2",
+ "admin": {
+ "classVenue": "Kent Ridge Road",
+ "classTime": "1 1500-1700",
+ "fee": "12.01",
+ "paymentDate": "20/12/2020",
+ "details": ["He's valid"]
+ },
+ "academic" : {
+ "questions": [{
+ "status" : "unsolved",
+ "question" : "What is Newton's Second Law?",
+ "solution" : ""
+ }, {
+ "status" : "unsolved",
+ "question" : "How do you inverse a matrix?",
+ "solution" : ""
+ }],
+ "attendanceList" : [ {
+ "date" : "14/04/1998",
+ "attendanceStatus" : "present",
+ "feedback" : "sleepy during lesson"
+ }],
+ "exams" : [ {
+ "examName" : "End of Year Examination 2020",
+ "examDate" : "7/11/2020",
+ "score" : "50/100"
+ }, {
+ "examName" : "Mid Year Examination 2020",
+ "examDate" : "25/7/2020",
+ "score" : "20/30"
+ }]
+ }
+ } ]
+}
diff --git a/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json b/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json
deleted file mode 100644
index ccd21f7d1a9..00000000000
--- a/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "persons": [ {
- "name": "Person with invalid name field: Ha!ns Mu@ster",
- "phone": "9482424",
- "email": "hans@example.com",
- "address": "4th street"
- } ]
-}
diff --git a/src/test/data/JsonAddressBookStorageTest/invalidStudentReeve.json b/src/test/data/JsonAddressBookStorageTest/invalidStudentReeve.json
new file mode 100644
index 00000000000..7f923585732
--- /dev/null
+++ b/src/test/data/JsonAddressBookStorageTest/invalidStudentReeve.json
@@ -0,0 +1,32 @@
+{
+ "students": [ {
+ "name": "Student with invalid name field: Ha!ns Mu@ster",
+ "phone": "9482424",
+ "school": "NUS High School",
+ "year": "JC 2",
+ "admin" : {
+ "classVenue": "SoC",
+ "classTime": "3 1512-1722",
+ "fee": "21.03",
+ "paymentDate": "21/03/2020",
+ "details": ["Just update if you going use for test:)"]
+ },
+ "academic": {
+ "questions": [{
+ "status" : "solved",
+ "question" : "How do birds fly?",
+ "solution" : "They don't"
+ }],
+ "attendanceList" : [{
+ "date" : "23-9-2019",
+ "attendanceStatus" : "present",
+ "feedback" : ""
+ }],
+ "exams" : [ {
+ "examName" : "End of Year",
+ "examDate" : "23/9/2019",
+ "score" : "10/50"
+ }]
+ }
+ } ]
+}
diff --git a/src/test/data/JsonNotebookStorageTest/invalidAndValidNoteNotebook.json b/src/test/data/JsonNotebookStorageTest/invalidAndValidNoteNotebook.json
new file mode 100644
index 00000000000..ba54e5e1cbe
--- /dev/null
+++ b/src/test/data/JsonNotebookStorageTest/invalidAndValidNoteNotebook.json
@@ -0,0 +1,9 @@
+{
+ "Notes": [ {
+ "title" : "Note with invalid title: more than 15 characters",
+ "description" : "tp, cs2101 presentation, finals"
+ }, {
+ "Title": "Valid note",
+ "Description": "hihi",
+ } ]
+}
diff --git a/src/test/data/JsonNotebookStorageTest/invalidNoteNotebook.json b/src/test/data/JsonNotebookStorageTest/invalidNoteNotebook.json
new file mode 100644
index 00000000000..c14f28a352a
--- /dev/null
+++ b/src/test/data/JsonNotebookStorageTest/invalidNoteNotebook.json
@@ -0,0 +1,6 @@
+{
+ "notes" : [ {
+ "title" : "Note with invalid title: more than 15 characters",
+ "description" : "tp, cs2101 presentation, finals"
+ } ]
+}
diff --git a/src/test/data/JsonNotebookStorageTest/notJsonFormatNotebook.json b/src/test/data/JsonNotebookStorageTest/notJsonFormatNotebook.json
new file mode 100644
index 00000000000..a1097343b5d
--- /dev/null
+++ b/src/test/data/JsonNotebookStorageTest/notJsonFormatNotebook.json
@@ -0,0 +1 @@
+not json format!
diff --git a/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
deleted file mode 100644
index 48831cc7674..00000000000
--- a/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "persons": [ {
- "name": "Alice Pauline",
- "phone": "94351253",
- "email": "alice@example.com",
- "address": "123, Jurong West Ave 6, #08-111",
- "tagged": [ "friends" ]
- }, {
- "name": "Alice Pauline",
- "phone": "94351253",
- "email": "pauline@example.com",
- "address": "4th street"
- } ]
-}
diff --git a/src/test/data/JsonSerializableAddressBookTest/duplicateStudentReeve.json b/src/test/data/JsonSerializableAddressBookTest/duplicateStudentReeve.json
new file mode 100644
index 00000000000..5561035301e
--- /dev/null
+++ b/src/test/data/JsonSerializableAddressBookTest/duplicateStudentReeve.json
@@ -0,0 +1,77 @@
+{
+ "students": [ {
+ "name": "Alice Pauline",
+ "phone": "94351253",
+ "school": "Anderson Secondary",
+ "year": "Secondary 3",
+ "admin" : {
+ "classVenue": "123, Jurong West Ave 6, #08-111",
+ "classTime": "5 1500-1700",
+ "fee": "21.00",
+ "paymentDate": "21/05/2020",
+ "details": ["owesMoney", "friends"]
+ },
+ "academic" : {
+ "questions": [ {
+ "status" : "unsolved",
+ "question" : "What is Newton's Second Law?",
+ "solution" : ""
+ }, {
+ "status" : "unsolved",
+ "question" : "How do you inverse a matrix?",
+ "solution" : ""
+ }],
+ "attendanceList" : [ {
+ "date" : "14/04/1998",
+ "attendanceStatus" : "present",
+ "feedback" : "sleepy during lesson"
+ }],
+ "exams" : [ {
+ "examName" : "End of Year Examination 2020",
+ "examDate" : "7/11/2020",
+ "score" : "50/100"
+ }, {
+ "examName" : "Mid Year Examination 2020",
+ "examDate" : "25/7/2020",
+ "score" : "20/30"
+ }]
+ }
+ }, {
+ "name": "Alice Pauline",
+ "phone": "94351253",
+ "school": "Anderson Secondary",
+ "year": "Secondary 3",
+ "admin" : {
+ "classVenue": "123, Jurong West Ave 6, #08-111",
+ "classTime": "5 1500-1700",
+ "fee": "21.00",
+ "paymentDate": "21/05/2020",
+ "details": ["owesMoney", "friends"]
+ },
+ "academic" : {
+ "questions": [ {
+ "status" : "unsolved",
+ "question" : "What is Newton's Second Law?",
+ "solution" : ""
+ }, {
+ "status" : "unsolved",
+ "question" : "How do you inverse a matrix?",
+ "solution" : ""
+ }],
+ "attendanceList" : [ {
+ "date" : "14/04/1998",
+ "attendanceStatus" : "present",
+ "feedback" : "sleepy during lesson"
+ }],
+ "exams" : [ {
+ "examName" : "End of Year Examination 2020",
+ "examDate" : "7/11/2020",
+ "score" : "50/100"
+ }, {
+ "examName" : "Mid Year Examination 2020",
+ "examDate" : "25/7/2020",
+ "score" : "20/30"
+ }]
+ }
+ } ]
+}
diff --git a/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json
deleted file mode 100644
index ad3f135ae42..00000000000
--- a/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "persons": [ {
- "name": "Hans Muster",
- "phone": "9482424",
- "email": "invalid@email!3e",
- "address": "4th street"
- } ]
-}
diff --git a/src/test/data/JsonSerializableAddressBookTest/invalidStudentReeve.json b/src/test/data/JsonSerializableAddressBookTest/invalidStudentReeve.json
new file mode 100644
index 00000000000..b601501bbf3
--- /dev/null
+++ b/src/test/data/JsonSerializableAddressBookTest/invalidStudentReeve.json
@@ -0,0 +1,32 @@
+{
+ "students": [ {
+ "name": "Hans Muster",
+ "phone": "9482424!invalid",
+ "school": "NUS High School",
+ "year": "JC 2",
+ "admin" : {
+ "classVenue": "123, Jurong West Ave 6, #08-111",
+ "classTime": "1 1500-1700",
+ "fee": "21.00",
+ "paymentDate": "21/05/2020",
+ "details": ["Clever"]
+ },
+ "academic": {
+ "questions": [ {
+ "status" : "unsolved",
+ "question" : " ",
+ "solution" : ""
+ } ],
+ "attendanceList" : [{
+ "date" : "14/04/1998",
+ "attendanceStatus" : "present",
+ "feedback" : "sleepy during lesson"
+ }],
+ "exams" : [ {
+ "examName" : "End of Year Examination 2020",
+ "examDate" : "7/11/2020",
+ "score" : "50/100"
+ }]
+ }
+ } ]
+}
diff --git a/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
deleted file mode 100644
index f10eddee12e..00000000000
--- a/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "_comment": "AddressBook save file which contains the same Person values as in TypicalPersons#getTypicalAddressBook()",
- "persons" : [ {
- "name" : "Alice Pauline",
- "phone" : "94351253",
- "email" : "alice@example.com",
- "address" : "123, Jurong West Ave 6, #08-111",
- "tagged" : [ "friends" ]
- }, {
- "name" : "Benson Meier",
- "phone" : "98765432",
- "email" : "johnd@example.com",
- "address" : "311, Clementi Ave 2, #02-25",
- "tagged" : [ "owesMoney", "friends" ]
- }, {
- "name" : "Carl Kurz",
- "phone" : "95352563",
- "email" : "heinz@example.com",
- "address" : "wall street",
- "tagged" : [ ]
- }, {
- "name" : "Daniel Meier",
- "phone" : "87652533",
- "email" : "cornelia@example.com",
- "address" : "10th street",
- "tagged" : [ "friends" ]
- }, {
- "name" : "Elle Meyer",
- "phone" : "9482224",
- "email" : "werner@example.com",
- "address" : "michegan ave",
- "tagged" : [ ]
- }, {
- "name" : "Fiona Kunz",
- "phone" : "9482427",
- "email" : "lydia@example.com",
- "address" : "little tokyo",
- "tagged" : [ ]
- }, {
- "name" : "George Best",
- "phone" : "9482442",
- "email" : "anna@example.com",
- "address" : "4th street",
- "tagged" : [ ]
- } ]
-}
diff --git a/src/test/data/JsonSerializableAddressBookTest/typicalStudentsReeve.json b/src/test/data/JsonSerializableAddressBookTest/typicalStudentsReeve.json
new file mode 100644
index 00000000000..40a10f2a49e
--- /dev/null
+++ b/src/test/data/JsonSerializableAddressBookTest/typicalStudentsReeve.json
@@ -0,0 +1,263 @@
+{
+ "_comment": "AddressBook save file which contains the same Student values as in TypicalStudents#getTypicalAddressBook()",
+ "students" : [ {
+ "name": "Alice Pauline",
+ "phone": "94351253",
+ "school": "Anderson Secondary",
+ "year": "Secondary 3",
+ "admin" : {
+ "classVenue": "123, Jurong West Ave 6, #08-111",
+ "classTime": "5 1500-1700",
+ "fee": "21.00",
+ "paymentDate": "21/05/2020",
+ "details": ["owesMoney", "friends"]
+ },
+ "academic" : {
+ "questions": [ {
+ "status" : "unsolved",
+ "question" : "What is Newton's Second Law?",
+ "solution" : ""
+ }, {
+ "status" : "unsolved",
+ "question" : "How do you inverse a matrix?",
+ "solution" : ""
+ }],
+ "attendanceList" : [ {
+ "date" : "14/04/1998",
+ "attendanceStatus" : "present",
+ "feedback" : "sleepy during lesson"
+ }],
+ "exams" : [ {
+ "examName" : "End of Year Examination 2020",
+ "examDate" : "7/11/2020",
+ "score" : "50/100"
+ }, {
+ "examName" : "Mid Year Examination 2020",
+ "examDate" : "25/7/2020",
+ "score" : "20/30"
+ }]
+ }
+ }, {
+ "name" : "Benson Meier",
+ "phone" : "98765432",
+ "school": "Pei Hwa Secondary",
+ "year": "Secondary 2",
+ "admin" : {
+ "classVenue": "311, Clementi Ave 2, #02-25",
+ "classTime": "2 1230-1430",
+ "fee": "21.00",
+ "paymentDate": "21/05/2020",
+ "details": [ "owesMoney", "friends" ]
+ },
+ "academic" : {
+ "questions": [ {
+ "status" : "unsolved",
+ "question" : "What is Newton's Second Law?",
+ "solution" : ""
+ }, {
+ "status" : "unsolved",
+ "question" : "How do you inverse a matrix?",
+ "solution" : ""
+ }],
+ "attendanceList" : [ {
+ "date" : "14/04/1998",
+ "attendanceStatus" : "present",
+ "feedback" : "sleepy during lesson"
+ }],
+ "exams" : [ {
+ "examName" : "CA2",
+ "examDate" : "19/9/2020",
+ "score" : "73/100"
+ }, {
+ "examName" : "CA1",
+ "examDate" : "2/3/2020",
+ "score" : "21/40"
+ }]
+ }
+ }, {
+ "name" : "Carl Kurz",
+ "phone" : "95352563",
+ "school": "Catholic High",
+ "year": "Secondary 5",
+ "admin" : {
+ "classVenue": "311, Clementi Ave 2, #02-25",
+ "classTime": "1 1500-1700",
+ "fee": "450.50",
+ "paymentDate": "21/05/2020",
+ "details": [ "owesMoney", "friends" ]
+ },
+ "academic" : {
+ "questions": [ {
+ "status" : "unsolved",
+ "question" : "What is Newton's Second Law?",
+ "solution" : ""
+ }, {
+ "status" : "unsolved",
+ "question" : "How do you inverse a matrix?",
+ "solution" : ""
+ } ],
+ "attendanceList" : [ {
+ "date" : "14/04/1998",
+ "attendanceStatus" : "present",
+ "feedback" : "sleepy during lesson"
+ }],
+ "exams" : [ {
+ "examName" : "End of Year Examination 2020",
+ "examDate" : "7/11/2020",
+ "score" : "50/100"
+ }, {
+ "examName" : "Mid Year Examination 2020",
+ "examDate" : "25/7/2020",
+ "score" : "20/30"
+ }]
+ }
+ }, {
+ "name" : "Daniel Meier",
+ "phone" : "87652533",
+ "school": "Methodist Girls School",
+ "year": "Secondary 1",
+ "admin" : {
+ "classVenue": "311, Clementi Ave 2, #02-25",
+ "classTime": "1 1700-1900",
+ "fee": "21.00",
+ "paymentDate": "28/2/2018",
+ "details": [ "owesMoney", "friends" ]
+ },
+ "academic" : {
+ "questions": [ {
+ "status" : "unsolved",
+ "question" : "What is Newton's Second Law?",
+ "solution" : ""
+ }, {
+ "status" : "unsolved",
+ "question" : "How do you inverse a matrix?",
+ "solution" : ""
+ } ],
+ "attendanceList" : [ {
+ "date" : "14/04/1998",
+ "attendanceStatus" : "present",
+ "feedback" : "sleepy during lesson"
+ }],
+ "exams" : [ {
+ "examName" : "End of Year Examination 2020",
+ "examDate" : "7/11/2020",
+ "score" : "50/100"
+ }, {
+ "examName" : "Mid Year Examination 2020",
+ "examDate" : "25/7/2020",
+ "score" : "20/30"
+ }]
+ }
+ }, {
+ "name" : "Elle Meyer",
+ "phone" : "9482224",
+ "school": "River Valley High",
+ "year": "JC 2",
+ "admin" : {
+ "classVenue": "311, Clementi Ave 2, #02-25",
+ "classTime": "1 1900-2100",
+ "fee": "21.00",
+ "paymentDate": "21/05/2020",
+ "details": [ "owesMoney", "friends" ]
+ },
+ "academic" : {
+ "questions": [ {
+ "status" : "solved",
+ "question" : "What is Newton's Second Law?",
+ "solution" : "Read your textbook"
+ }, {
+ "status" : "solved",
+ "question" : "How do you inverse a matrix?",
+ "solution" : "Read your textbook"
+ } ],
+ "attendanceList" : [ {
+ "date" : "14/04/1998",
+ "attendanceStatus" : "present",
+ "feedback" : "sleepy during lesson"
+ }],
+ "exams" : [ {
+ "examName" : "End of Year Examination 2020",
+ "examDate" : "7/11/2020",
+ "score" : "50/100"
+ }, {
+ "examName" : "Mid Year Examination 2020",
+ "examDate" : "25/7/2020",
+ "score" : "20/30"
+ }]
+ }
+ }, {
+ "name" : "Fiona Kunz",
+ "phone" : "9482427",
+ "school": "Raffles Girls School",
+ "year": "Secondary 2",
+ "admin" : {
+ "classVenue": "311, Clementi Ave 2, #02-25",
+ "classTime": "3 1200-1430",
+ "fee": "21.00",
+ "paymentDate": "21/05/2020",
+ "details": [ "owesMoney", "friends" ]
+ },
+ "academic" : {
+ "questions": [ {
+ "status" : "unsolved",
+ "question" : "What is Newton's Second Law?",
+ "solution" : ""
+ }, {
+ "status" : "unsolved",
+ "question" : "How do you inverse a matrix?",
+ "solution" : ""
+ } ],
+ "attendanceList" : [ {
+ "date" : "14/04/1998",
+ "attendanceStatus" : "present",
+ "feedback" : "sleepy during lesson"
+ }],
+ "exams" : [ {
+ "examName" : "End of Year Examination 2020",
+ "examDate" : "7/11/2020",
+ "score" : "50/100"
+ }, {
+ "examName" : "Mid Year Examination 2020",
+ "examDate" : "25/7/2020",
+ "score" : "20/30"
+ }]
+ }
+ }, {
+ "name" : "George Best",
+ "phone" : "9482442",
+ "school": "Montford Secondary",
+ "year": "Secondary 4",
+ "admin" : {
+ "classVenue": "311, Clementi Ave 2, #02-25",
+ "classTime": "2 1000-1130",
+ "fee": "21.00",
+ "paymentDate": "21/05/2020",
+ "details": [ "owesMoney", "friends" ]
+ },
+ "academic" : {
+ "questions": [ {
+ "status" : "unsolved",
+ "question" : "What is Newton's Second Law?",
+ "solution" : ""
+ }, {
+ "status" : "unsolved",
+ "question" : "How do you inverse a matrix?",
+ "solution" : ""
+ } ],
+ "attendanceList" : [ {
+ "date" : "14/04/1998",
+ "attendanceStatus" : "present",
+ "feedback" : "sleepy during lesson"
+ }],
+ "exams" : [ {
+ "examName" : "End of Year Examination 2020",
+ "examDate" : "7/11/2020",
+ "score" : "50/100"
+ }, {
+ "examName" : "Mid Year Examination 2020",
+ "examDate" : "25/7/2020",
+ "score" : "20/30"
+ }]
+ }
+ } ]
+}
diff --git a/src/test/data/JsonSerializableNotebookTest/duplicateNoteNotebook.json b/src/test/data/JsonSerializableNotebookTest/duplicateNoteNotebook.json
new file mode 100644
index 00000000000..f027e8ad503
--- /dev/null
+++ b/src/test/data/JsonSerializableNotebookTest/duplicateNoteNotebook.json
@@ -0,0 +1,12 @@
+{
+ "notes" : [ {
+ "title" : "to do",
+ "description" : "tp, cs2101 presentation, finals"
+ }, {
+ "title" : "to do",
+ "description" : "eat, sleep, code"
+ }, {
+ "title" : "events",
+ "description" : "briefings, presentation, finals"
+ } ]
+}
diff --git a/src/test/data/JsonSerializableNotebookTest/invalidNoteNotebook.json b/src/test/data/JsonSerializableNotebookTest/invalidNoteNotebook.json
new file mode 100644
index 00000000000..d9cb8508d84
--- /dev/null
+++ b/src/test/data/JsonSerializableNotebookTest/invalidNoteNotebook.json
@@ -0,0 +1,12 @@
+{
+ "notes" : [ {
+ "title" : "todos",
+ "description" : "tp, cs2101 presentation, finals"
+ }, {
+ "title" : "todos",
+ "description" : "eat, sleep, code"
+ }, {
+ "title" : "events",
+ "description" : "briefings, presentation, finals"
+ } ]
+}
diff --git a/src/test/data/JsonSerializableNotebookTest/typicalNotesNotebook.json b/src/test/data/JsonSerializableNotebookTest/typicalNotesNotebook.json
new file mode 100644
index 00000000000..98b4167d052
--- /dev/null
+++ b/src/test/data/JsonSerializableNotebookTest/typicalNotesNotebook.json
@@ -0,0 +1,13 @@
+{
+ "_comment": "Notebook save file which contains the same Note values as in TypicalNotes#getTypicalNotebook()",
+ "notes" : [ {
+ "title" : "W10 blues",
+ "description" : "why must i do cs2103"
+ }, {
+ "title" : "Graduation :(",
+ "description" : "write cards for people"
+ }, {
+ "title" : "JY!!!",
+ "description" : "Cafeine is good..."
+ } ]
+}
diff --git a/src/test/java/seedu/address/commons/util/DateUtilTest.java b/src/test/java/seedu/address/commons/util/DateUtilTest.java
new file mode 100644
index 00000000000..695b40f9793
--- /dev/null
+++ b/src/test/java/seedu/address/commons/util/DateUtilTest.java
@@ -0,0 +1,84 @@
+package seedu.address.commons.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.time.LocalDate;
+
+import org.junit.jupiter.api.Test;
+
+public class DateUtilTest {
+
+ @Test
+ public void isValidDate_format() {
+ // d-M-yy
+ assertTrue(DateUtil.isValidDate("2/9/20"));
+ assertTrue(DateUtil.isValidDate("2/09/20"));
+ assertTrue(DateUtil.isValidDate("02/9/20"));
+ assertTrue(DateUtil.isValidDate("02/09/20"));
+
+ // d-M-yyyy
+ assertTrue(DateUtil.isValidDate("2/9/2020"));
+ assertTrue(DateUtil.isValidDate("2/09/2020"));
+ assertTrue(DateUtil.isValidDate("02/9/2020"));
+ assertTrue(DateUtil.isValidDate("02/09/2020"));
+
+ // invalid format
+ assertFalse(DateUtil.isValidDate("")); // blank
+ assertFalse(DateUtil.isValidDate("abc")); // not even a date
+ assertFalse(DateUtil.isValidDate("2-9-20")); // d-M-yy format
+ assertFalse(DateUtil.isValidDate("2.9.20")); // d.M.yy format
+ assertFalse(DateUtil.isValidDate("2/9/2")); // d/M/y format
+ assertFalse(DateUtil.isValidDate("2020/9/2")); // yyyy-M-d format
+ }
+
+ @Test
+ public void isValidDate_date() {
+ assertTrue(DateUtil.isValidDate("1/10/20"));
+ assertTrue(DateUtil.isValidDate("31/10/20"));
+ assertTrue(DateUtil.isValidDate("28/2/19"));
+ assertTrue(DateUtil.isValidDate("29/2/20"));
+ assertTrue(DateUtil.isValidDate("30/11/20"));
+
+ assertFalse(DateUtil.isValidDate("0/10/20"));
+ assertFalse(DateUtil.isValidDate("32/10/20"));
+ assertFalse(DateUtil.isValidDate("29/2/19"));
+ assertFalse(DateUtil.isValidDate("30/2/20"));
+ assertFalse(DateUtil.isValidDate("31/11/20"));
+ }
+
+ @Test
+ public void parseToDate_invalidArgument_throwsException() {
+ String invalidFormat = " ";
+ String invalidDate = "32/3/2020";
+
+ assertThrows(IllegalArgumentException.class, () -> DateUtil.parseToDate(invalidFormat));
+ assertThrows(IllegalArgumentException.class, () -> DateUtil.parseToDate(invalidDate));
+ }
+
+ @Test
+ public void parseToDate_validArgument_success() {
+ String validDate = "28/2/2020";
+ LocalDate expected = LocalDate.parse(validDate, DateUtil.FORMAT_IN);
+ assertEquals(expected, DateUtil.parseToDate(validDate));
+
+ validDate = "28/2/20";
+ assertEquals(expected, DateUtil.parseToDate(validDate));
+ }
+
+ @Test
+ public void print() {
+ LocalDate validDate = DateUtil.parseToDate("28/2/20");
+ String expected = validDate.format(DateUtil.FORMAT_OUT);
+ assertEquals(expected, DateUtil.print(validDate));
+ }
+
+ @Test
+ public void getUserInput() {
+ LocalDate validDate = DateUtil.parseToDate("28/2/20");
+ String expected = validDate.format(DateUtil.FORMAT_IN);
+ assertEquals(expected, DateUtil.getInputFormat(validDate));
+ }
+}
diff --git a/src/test/java/seedu/address/commons/util/StringUtilTest.java b/src/test/java/seedu/address/commons/util/StringUtilTest.java
index c56d407bf3f..e303404b86e 100644
--- a/src/test/java/seedu/address/commons/util/StringUtilTest.java
+++ b/src/test/java/seedu/address/commons/util/StringUtilTest.java
@@ -123,6 +123,54 @@ public void containsWordIgnoreCase_validInputs_correctResult() {
assertTrue(StringUtil.containsWordIgnoreCase("AAA bBb ccc bbb", "bbB"));
}
+ /*
+ * Valid equivalence partitions for word:
+ * - any word
+ * - word containing symbols/numbers
+ * - word with leading/trailing spaces
+ *
+ * Valid equivalence partitions for sentence:
+ * - empty string
+ * - one word
+ * - multiple words
+ * - sentence with extra spaces
+ *
+ * Possible scenarios returning true:
+ * - matches first word in sentence
+ * - last word in sentence
+ * - middle word in sentence
+ * - matches multiple words
+ * - query word matches part of a sentence word
+
+ *
+ * Possible scenarios returning false:
+ * - sentence word matches part of the query word
+ *
+ * The test method below tries to verify all above with a reasonably low number of test cases.
+ */
+
+ @Test
+ public void containsIgnoreCase_validInputs_correctResult() {
+
+ // Empty sentence
+ assertFalse(StringUtil.containsIgnoreCase("", "abc")); // Boundary case
+ assertFalse(StringUtil.containsIgnoreCase(" ", "123"));
+
+ // Matches a partial word
+ assertTrue(StringUtil.containsIgnoreCase("aaa bbb ccc", "bb")); // sentence contains word
+ assertFalse(StringUtil.containsIgnoreCase("aaa bbb ccc", "bbbb")); // Query word bigger than sentence word
+
+ // Matches word in the sentence, different upper/lower case letters
+ assertTrue(StringUtil.containsIgnoreCase("aaa bBb ccc", "Bbb")); // First word (boundary case)
+ assertTrue(StringUtil.containsIgnoreCase("aaa bBb ccc@1", "CCc@1")); // Last word (boundary case)
+ assertTrue(StringUtil.containsIgnoreCase(" AAA bBb ccc ", "aaa")); // Sentence has extra spaces
+ assertTrue(StringUtil.containsIgnoreCase("Aaa", "aaa")); // Only one word in sentence (boundary case)
+ assertTrue(StringUtil.containsIgnoreCase("aaa bbb ccc", " ccc ")); // Leading/trailing spaces
+
+ // Matches multiple words in sentence
+ assertTrue(StringUtil.containsIgnoreCase("AAA bBb ccc bbb", "bbB"));
+ }
+
//---------------- Tests for getDetails --------------------------------------
/*
diff --git a/src/test/java/seedu/address/logic/LogicManagerTest.java b/src/test/java/seedu/address/logic/LogicManagerTest.java
index ad923ac249a..7d2fee37060 100644
--- a/src/test/java/seedu/address/logic/LogicManagerTest.java
+++ b/src/test/java/seedu/address/logic/LogicManagerTest.java
@@ -1,14 +1,19 @@
package seedu.address.logic;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX;
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX;
import static seedu.address.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
-import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.ADDITIONAL_DETAILS_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.CLASS_TIME_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.CLASS_VENUE_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.FEE_DESC_AMY;
import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.PAYMENT_DATE_DESC_AMY;
import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.SCHOOL_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.YEAR_DESC_AMY;
import static seedu.address.testutil.Assert.assertThrows;
-import static seedu.address.testutil.TypicalPersons.AMY;
+import static seedu.address.testutil.TypicalStudents.AMY;
import java.io.IOException;
import java.nio.file.Path;
@@ -24,13 +29,14 @@
import seedu.address.logic.parser.exceptions.ParseException;
import seedu.address.model.Model;
import seedu.address.model.ModelManager;
-import seedu.address.model.ReadOnlyAddressBook;
+import seedu.address.model.ReadOnlyReeve;
import seedu.address.model.UserPrefs;
-import seedu.address.model.person.Person;
-import seedu.address.storage.JsonAddressBookStorage;
+import seedu.address.model.student.Student;
+import seedu.address.storage.JsonReeveStorage;
import seedu.address.storage.JsonUserPrefsStorage;
import seedu.address.storage.StorageManager;
-import seedu.address.testutil.PersonBuilder;
+import seedu.address.storage.notes.JsonNotebookStorage;
+import seedu.address.testutil.StudentBuilder;
public class LogicManagerTest {
private static final IOException DUMMY_IO_EXCEPTION = new IOException("dummy exception");
@@ -43,10 +49,11 @@ public class LogicManagerTest {
@BeforeEach
public void setUp() {
- JsonAddressBookStorage addressBookStorage =
- new JsonAddressBookStorage(temporaryFolder.resolve("addressBook.json"));
+ JsonReeveStorage addressBookStorage =
+ new JsonReeveStorage(temporaryFolder.resolve("addressBook.json"));
JsonUserPrefsStorage userPrefsStorage = new JsonUserPrefsStorage(temporaryFolder.resolve("userPrefs.json"));
- StorageManager storage = new StorageManager(addressBookStorage, userPrefsStorage);
+ JsonNotebookStorage notebookStorage = new JsonNotebookStorage(temporaryFolder.resolve("notebook.json"));
+ StorageManager storage = new StorageManager(addressBookStorage, userPrefsStorage, notebookStorage);
logic = new LogicManager(model, storage);
}
@@ -59,7 +66,7 @@ public void execute_invalidCommandFormat_throwsParseException() {
@Test
public void execute_commandExecutionError_throwsCommandException() {
String deleteCommand = "delete 9";
- assertCommandException(deleteCommand, MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+ assertCommandException(deleteCommand, MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
}
@Test
@@ -71,19 +78,23 @@ public void execute_validCommand_success() throws Exception {
@Test
public void execute_storageThrowsIoException_throwsCommandException() {
// Setup LogicManager with JsonAddressBookIoExceptionThrowingStub
- JsonAddressBookStorage addressBookStorage =
- new JsonAddressBookIoExceptionThrowingStub(temporaryFolder.resolve("ioExceptionAddressBook.json"));
+ JsonReeveStorage addressBookStorage =
+ new JsonReeveIoExceptionThrowingStub(temporaryFolder.resolve("ioExceptionAddressBook.json"));
JsonUserPrefsStorage userPrefsStorage =
new JsonUserPrefsStorage(temporaryFolder.resolve("ioExceptionUserPrefs.json"));
- StorageManager storage = new StorageManager(addressBookStorage, userPrefsStorage);
+ JsonNotebookStorage notebookStorage =
+ new JsonNotebookStorage(temporaryFolder.resolve("notebook.json"));
+ StorageManager storage = new StorageManager(addressBookStorage, userPrefsStorage, notebookStorage);
logic = new LogicManager(model, storage);
// Execute add command
- String addCommand = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY
- + ADDRESS_DESC_AMY;
- Person expectedPerson = new PersonBuilder(AMY).withTags().build();
+ String addCommand = AddCommand.COMMAND_WORD + NAME_DESC_AMY + PHONE_DESC_AMY + SCHOOL_DESC_AMY
+ + YEAR_DESC_AMY + CLASS_VENUE_DESC_AMY + CLASS_TIME_DESC_AMY + FEE_DESC_AMY + PAYMENT_DATE_DESC_AMY
+ + ADDITIONAL_DETAILS_DESC_AMY;
+ Student expectedStudent = new StudentBuilder(AMY)
+ .withQuestions().withExams().withAttendances().build();
ModelManager expectedModel = new ModelManager();
- expectedModel.addPerson(expectedPerson);
+ expectedModel.addStudent(expectedStudent);
String expectedMessage = LogicManager.FILE_OPS_ERROR_MESSAGE + DUMMY_IO_EXCEPTION;
assertCommandFailure(addCommand, CommandException.class, expectedMessage, expectedModel);
}
@@ -93,6 +104,11 @@ public void getFilteredPersonList_modifyList_throwsUnsupportedOperationException
assertThrows(UnsupportedOperationException.class, () -> logic.getFilteredPersonList().remove(0));
}
+ @Test
+ public void getSortedPersonList_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, () -> logic.getSortedStudentList().remove(0));
+ }
+
/**
* Executes the command and confirms that
* - no exceptions are thrown <br>
@@ -129,7 +145,7 @@ private void assertCommandException(String inputCommand, String expectedMessage)
*/
private void assertCommandFailure(String inputCommand, Class<? extends Throwable> expectedException,
String expectedMessage) {
- Model expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
+ Model expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), model.getNotebook());
assertCommandFailure(inputCommand, expectedException, expectedMessage, expectedModel);
}
@@ -143,19 +159,20 @@ private void assertCommandFailure(String inputCommand, Class<? extends Throwable
private void assertCommandFailure(String inputCommand, Class<? extends Throwable> expectedException,
String expectedMessage, Model expectedModel) {
assertThrows(expectedException, expectedMessage, () -> logic.execute(inputCommand));
+ expectedModel.equals(model);
assertEquals(expectedModel, model);
}
/**
* A stub class to throw an {@code IOException} when the save method is called.
*/
- private static class JsonAddressBookIoExceptionThrowingStub extends JsonAddressBookStorage {
- private JsonAddressBookIoExceptionThrowingStub(Path filePath) {
+ private static class JsonReeveIoExceptionThrowingStub extends JsonReeveStorage {
+ private JsonReeveIoExceptionThrowingStub(Path filePath) {
super(filePath);
}
@Override
- public void saveAddressBook(ReadOnlyAddressBook addressBook, Path filePath) throws IOException {
+ public void saveAddressBook(ReadOnlyReeve addressBook, Path filePath) throws IOException {
throw DUMMY_IO_EXCEPTION;
}
}
diff --git a/src/test/java/seedu/address/logic/commands/AddAttendanceCommandTest.java b/src/test/java/seedu/address/logic/commands/AddAttendanceCommandTest.java
new file mode 100644
index 00000000000..0f3671b88be
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/AddAttendanceCommandTest.java
@@ -0,0 +1,153 @@
+package seedu.address.logic.commands;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX;
+import static seedu.address.logic.commands.AddAttendanceCommand.MESSAGE_INVALID_ATTENDANCE_DATE;
+import static seedu.address.logic.commands.CommandTestUtil.ATTENDANCE_DATE_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.ATTENDANCE_DATE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.StudentBuilder.DEFAULT_ATTENDANCE;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
+import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
+import static seedu.address.testutil.TypicalStudents.ALICE;
+import static seedu.address.testutil.TypicalStudents.BENSON;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
+
+import java.time.LocalDate;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.commons.util.DateUtil;
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.academic.Attendance;
+import seedu.address.model.student.academic.Feedback;
+import seedu.address.testutil.StudentBuilder;
+
+public class AddAttendanceCommandTest {
+
+ private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+ private final Attendance validAttendance = new Attendance(ATTENDANCE_DATE_AMY, true,
+ new Feedback("sleepy"));
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ Index testIndex = INDEX_FIRST_PERSON;
+
+ // both arguments null
+ assertThrows(NullPointerException.class, () ->
+ new AddAttendanceCommand(null, null));
+
+ // one argument null
+ assertThrows(NullPointerException.class, () ->
+ new AddAttendanceCommand(testIndex, null));
+ assertThrows(NullPointerException.class, () ->
+ new AddAttendanceCommand(null, validAttendance));
+ }
+
+ @Test
+ public void execute_validIndexUnfilteredList_success() {
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student clone = new StudentBuilder(asker).withAttendances().build();
+ AddAttendanceCommand addAttendanceCommand =
+ new AddAttendanceCommand(INDEX_FIRST_PERSON, validAttendance);
+ Student expectedStudent = new StudentBuilder(ALICE).withAttendances(validAttendance).build();
+ model.setStudent(asker, clone);
+
+ String expectedMessage = String.format(AddAttendanceCommand.MESSAGE_SUCCESS, clone.getName(),
+ validAttendance);
+
+ ModelManager expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), model.getNotebook());
+ expectedModel.setStudent(clone, expectedStudent);
+
+ assertCommandSuccess(addAttendanceCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidIndexUnfilteredList_throwsCommandException() {
+ Index outOfBounds = Index.fromOneBased(model.getSortedStudentList().size() + 1);
+ AddAttendanceCommand command =
+ new AddAttendanceCommand(outOfBounds, validAttendance);
+
+ assertCommandFailure(command, model, MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_duplicateAttendanceDateUnfilteredList_throwsCommandException() {
+ LocalDate dateToDuplicate = DateUtil.parseToDate("14/04/1998");
+ Attendance invalidAttendance = new Attendance(dateToDuplicate, true,
+ new Feedback("sleepy"));
+ AddAttendanceCommand command = new AddAttendanceCommand(INDEX_SECOND_PERSON, invalidAttendance);
+
+ assertCommandFailure(command, model, AddAttendanceCommand.MESSAGE_INVALID_ATTENDANCE_DATE);
+ }
+
+ @Test
+ public void execute_validIndexFilteredList_throwsCommandException() {
+ showPersonAtIndex(model, INDEX_SECOND_PERSON);
+
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student clone = new StudentBuilder(asker).withAttendances().build();
+
+ model.setStudent(asker, clone);
+
+ AddAttendanceCommand command = new AddAttendanceCommand(INDEX_FIRST_PERSON, validAttendance);
+ Student expectedStudent = new StudentBuilder(BENSON).withAttendances(validAttendance).build();
+
+ String expectedMessage = String.format(AddAttendanceCommand.MESSAGE_SUCCESS, clone.getName(),
+ validAttendance);
+
+ ModelManager expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), model.getNotebook());
+ expectedModel.setStudent(clone, expectedStudent);
+ showPersonAtIndex(expectedModel, INDEX_SECOND_PERSON);
+
+ assertCommandSuccess(command, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidIndexFilteredList_throwsCommandException() {
+ showPersonAtIndex(model, INDEX_SECOND_PERSON);
+
+ Index outOfBounds = INDEX_SECOND_PERSON;
+ AddAttendanceCommand command =
+ new AddAttendanceCommand(outOfBounds, validAttendance);
+
+ assertCommandFailure(command, model, MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_attendanceAlreadyExists_throwsCommandException() {
+ AddAttendanceCommand command = new AddAttendanceCommand(INDEX_FIRST_PERSON, DEFAULT_ATTENDANCE);
+
+ assertCommandFailure(command, model, MESSAGE_INVALID_ATTENDANCE_DATE);
+ }
+
+ @Test
+ public void equals() {
+ AddAttendanceCommand addAttendanceCommand = new AddAttendanceCommand(INDEX_FIRST_PERSON, validAttendance);
+
+ // same object -> return true;
+ assertTrue(addAttendanceCommand.equals(addAttendanceCommand));
+
+ // different object -> return false;
+ assertFalse(addAttendanceCommand.equals("hello"));
+
+ // same fields -> return true;
+ assertTrue(addAttendanceCommand.equals(new AddAttendanceCommand(INDEX_FIRST_PERSON, validAttendance)));
+
+ // different index -> return false;
+ assertFalse(addAttendanceCommand.equals(new AddAttendanceCommand(INDEX_SECOND_PERSON, validAttendance)));
+
+ // different attendance -> return false;
+ Attendance altAttendance = new Attendance(ATTENDANCE_DATE_BOB, false, new Feedback("sleepy"));
+ assertFalse(addAttendanceCommand.equals(new AddAttendanceCommand(INDEX_FIRST_PERSON, altAttendance)));
+ }
+}
diff --git a/src/test/java/seedu/address/logic/commands/AddCommandIntegrationTest.java b/src/test/java/seedu/address/logic/commands/AddCommandIntegrationTest.java
index cb8714bb055..9ad2c1abe67 100644
--- a/src/test/java/seedu/address/logic/commands/AddCommandIntegrationTest.java
+++ b/src/test/java/seedu/address/logic/commands/AddCommandIntegrationTest.java
@@ -2,7 +2,8 @@
import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -10,8 +11,8 @@
import seedu.address.model.Model;
import seedu.address.model.ModelManager;
import seedu.address.model.UserPrefs;
-import seedu.address.model.person.Person;
-import seedu.address.testutil.PersonBuilder;
+import seedu.address.model.student.Student;
+import seedu.address.testutil.StudentBuilder;
/**
* Contains integration tests (interaction with the Model) for {@code AddCommand}.
@@ -22,24 +23,24 @@ public class AddCommandIntegrationTest {
@BeforeEach
public void setUp() {
- model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+ model = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
}
@Test
public void execute_newPerson_success() {
- Person validPerson = new PersonBuilder().build();
+ Student validStudent = new StudentBuilder().build();
- Model expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
- expectedModel.addPerson(validPerson);
+ Model expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), getTypicalNotebook());
+ expectedModel.addStudent(validStudent);
- assertCommandSuccess(new AddCommand(validPerson), model,
- String.format(AddCommand.MESSAGE_SUCCESS, validPerson), expectedModel);
+ assertCommandSuccess(new AddCommand(validStudent), model,
+ String.format(AddCommand.MESSAGE_SUCCESS, validStudent), expectedModel);
}
@Test
public void execute_duplicatePerson_throwsCommandException() {
- Person personInList = model.getAddressBook().getPersonList().get(0);
- assertCommandFailure(new AddCommand(personInList), model, AddCommand.MESSAGE_DUPLICATE_PERSON);
+ Student studentInList = model.getReeve().getStudentList().get(0);
+ assertCommandFailure(new AddCommand(studentInList), model, AddCommand.MESSAGE_DUPLICATE_STUDENT);
}
}
diff --git a/src/test/java/seedu/address/logic/commands/AddCommandTest.java b/src/test/java/seedu/address/logic/commands/AddCommandTest.java
index 5865713d5dd..e6e6bbfb3ab 100644
--- a/src/test/java/seedu/address/logic/commands/AddCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/AddCommandTest.java
@@ -1,27 +1,28 @@
package seedu.address.logic.commands;
-import static java.util.Objects.requireNonNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
+import static seedu.address.testutil.TypicalStudents.AMY;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
-import java.nio.file.Path;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.function.Predicate;
import org.junit.jupiter.api.Test;
-import javafx.collections.ObservableList;
-import seedu.address.commons.core.GuiSettings;
+import seedu.address.commons.core.Messages;
import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.model.AddressBook;
import seedu.address.model.Model;
-import seedu.address.model.ReadOnlyAddressBook;
-import seedu.address.model.ReadOnlyUserPrefs;
-import seedu.address.model.person.Person;
-import seedu.address.testutil.PersonBuilder;
+import seedu.address.model.ModelManager;
+import seedu.address.model.ModelStub;
+import seedu.address.model.ModelStubAcceptingStudentAdded;
+import seedu.address.model.ModelStubWithStudent;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.student.Student;
+import seedu.address.testutil.StudentBuilder;
public class AddCommandTest {
@@ -32,28 +33,40 @@ public void constructor_nullPerson_throwsNullPointerException() {
@Test
public void execute_personAcceptedByModel_addSuccessful() throws Exception {
- ModelStubAcceptingPersonAdded modelStub = new ModelStubAcceptingPersonAdded();
- Person validPerson = new PersonBuilder().build();
+ ModelStubAcceptingStudentAdded modelStub = new ModelStubAcceptingStudentAdded();
+ Student validStudent = new StudentBuilder().build();
- CommandResult commandResult = new AddCommand(validPerson).execute(modelStub);
+ CommandResult commandResult = new AddCommand(validStudent).execute(modelStub);
- assertEquals(String.format(AddCommand.MESSAGE_SUCCESS, validPerson), commandResult.getFeedbackToUser());
- assertEquals(Arrays.asList(validPerson), modelStub.personsAdded);
+ assertEquals(String.format(AddCommand.MESSAGE_SUCCESS, validStudent), commandResult.getFeedbackToUser());
+ assertEquals(Arrays.asList(validStudent), modelStub.personsAdded);
}
@Test
public void execute_duplicatePerson_throwsCommandException() {
- Person validPerson = new PersonBuilder().build();
- AddCommand addCommand = new AddCommand(validPerson);
- ModelStub modelStub = new ModelStubWithPerson(validPerson);
+ Student validStudent = new StudentBuilder().build();
+ AddCommand addCommand = new AddCommand(validStudent);
+ ModelStub modelStub = new ModelStubWithStudent(validStudent);
- assertThrows(CommandException.class, AddCommand.MESSAGE_DUPLICATE_PERSON, () -> addCommand.execute(modelStub));
+ assertThrows(CommandException.class, AddCommand.MESSAGE_DUPLICATE_STUDENT, () -> addCommand.execute(modelStub));
+ }
+
+ @Test
+ public void execute_clashingClassTime_throwsCommandException() {
+ Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+ String clashTime = model.getSortedStudentList()
+ .get(INDEX_FIRST_PERSON.getZeroBased())
+ .getClassTime()
+ .convertClassTimeToUserInputString();
+ Student clashingStudent = new StudentBuilder(AMY).withClassTime(clashTime).build();
+ AddCommand command = new AddCommand(clashingStudent);
+ assertThrows(CommandException.class, Messages.MESSAGE_CLASHING_LESSON, () -> command.execute(model));
}
@Test
public void equals() {
- Person alice = new PersonBuilder().withName("Alice").build();
- Person bob = new PersonBuilder().withName("Bob").build();
+ Student alice = new StudentBuilder().withName("Alice").build();
+ Student bob = new StudentBuilder().withName("Bob").build();
AddCommand addAliceCommand = new AddCommand(alice);
AddCommand addBobCommand = new AddCommand(bob);
@@ -74,121 +87,4 @@ public void equals() {
assertFalse(addAliceCommand.equals(addBobCommand));
}
- /**
- * A default model stub that have all of the methods failing.
- */
- private class ModelStub implements Model {
- @Override
- public void setUserPrefs(ReadOnlyUserPrefs userPrefs) {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public ReadOnlyUserPrefs getUserPrefs() {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public GuiSettings getGuiSettings() {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public void setGuiSettings(GuiSettings guiSettings) {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public Path getAddressBookFilePath() {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public void setAddressBookFilePath(Path addressBookFilePath) {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public void addPerson(Person person) {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public void setAddressBook(ReadOnlyAddressBook newData) {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public ReadOnlyAddressBook getAddressBook() {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public boolean hasPerson(Person person) {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public void deletePerson(Person target) {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public void setPerson(Person target, Person editedPerson) {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public ObservableList<Person> getFilteredPersonList() {
- throw new AssertionError("This method should not be called.");
- }
-
- @Override
- public void updateFilteredPersonList(Predicate<Person> predicate) {
- throw new AssertionError("This method should not be called.");
- }
- }
-
- /**
- * A Model stub that contains a single person.
- */
- private class ModelStubWithPerson extends ModelStub {
- private final Person person;
-
- ModelStubWithPerson(Person person) {
- requireNonNull(person);
- this.person = person;
- }
-
- @Override
- public boolean hasPerson(Person person) {
- requireNonNull(person);
- return this.person.isSamePerson(person);
- }
- }
-
- /**
- * A Model stub that always accept the person being added.
- */
- private class ModelStubAcceptingPersonAdded extends ModelStub {
- final ArrayList<Person> personsAdded = new ArrayList<>();
-
- @Override
- public boolean hasPerson(Person person) {
- requireNonNull(person);
- return personsAdded.stream().anyMatch(person::isSamePerson);
- }
-
- @Override
- public void addPerson(Person person) {
- requireNonNull(person);
- personsAdded.add(person);
- }
-
- @Override
- public ReadOnlyAddressBook getAddressBook() {
- return new AddressBook();
- }
- }
-
}
diff --git a/src/test/java/seedu/address/logic/commands/AddDetailCommandTest.java b/src/test/java/seedu/address/logic/commands/AddDetailCommandTest.java
new file mode 100644
index 00000000000..7e39de0807b
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/AddDetailCommandTest.java
@@ -0,0 +1,133 @@
+package seedu.address.logic.commands;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
+import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
+import static seedu.address.testutil.TypicalStudents.ALICE;
+import static seedu.address.testutil.TypicalStudents.BENSON;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.admin.Detail;
+import seedu.address.testutil.StudentBuilder;
+
+public class AddDetailCommandTest {
+
+ //@@author VaishakAnand
+ private static final String TEST_DETAIL = "eats flies";
+
+ private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ Index testIndex = INDEX_FIRST_PERSON;
+
+ // both arguments null
+ assertThrows(NullPointerException.class, () ->
+ new AddDetailCommand(null, null));
+
+ // one argument null
+ assertThrows(NullPointerException.class, () ->
+ new AddDetailCommand(testIndex, null));
+ assertThrows(NullPointerException.class, () ->
+ new AddDetailCommand(null, new Detail(TEST_DETAIL)));
+ }
+
+ @Test
+ public void execute_validIndexUnfilteredList_success() {
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student clone = new StudentBuilder(asker).withDetails().build();
+ Detail detail = new Detail(TEST_DETAIL);
+ AddDetailCommand addDetailCommand =
+ new AddDetailCommand(INDEX_FIRST_PERSON, detail);
+ Student expectedStudent = new StudentBuilder(ALICE).withDetails(TEST_DETAIL).build();
+ model.setStudent(asker, clone);
+
+ String expectedMessage = String.format(AddDetailCommand.MESSAGE_SUCCESS, clone.getName(),
+ detail);
+
+ ModelManager expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), getTypicalNotebook());
+ expectedModel.setStudent(clone, expectedStudent);
+
+ assertCommandSuccess(addDetailCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidIndexUnfilteredList_throwsCommandException() {
+ Index outOfBounds = Index.fromOneBased(model.getSortedStudentList().size() + 1);
+ AddDetailCommand command = new AddDetailCommand(outOfBounds,
+ new Detail(TEST_DETAIL));
+
+ assertCommandFailure(command, model, MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_validIndexFilteredList_success() {
+ showPersonAtIndex(model, INDEX_SECOND_PERSON);
+
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Detail detail = new Detail(TEST_DETAIL);
+ Student clone = new StudentBuilder(asker).withDetails().build();
+ model.setStudent(asker, clone);
+
+ AddDetailCommand command = new AddDetailCommand(INDEX_FIRST_PERSON, detail);
+ Student expectedStudent = new StudentBuilder(BENSON).withDetails(TEST_DETAIL).build();
+
+ String expectedMessage = String.format(AddDetailCommand.MESSAGE_SUCCESS,
+ clone.getName(), detail);
+
+ ModelManager expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), getTypicalNotebook());
+ expectedModel.setStudent(clone, expectedStudent);
+ showPersonAtIndex(expectedModel, INDEX_SECOND_PERSON);
+
+ assertCommandSuccess(command, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidIndexFilteredList_throwsCommandException() {
+ showPersonAtIndex(model, INDEX_SECOND_PERSON);
+
+ Index outOfBounds = INDEX_SECOND_PERSON;
+ Detail detail = new Detail(TEST_DETAIL);
+ AddDetailCommand invalidCommand = new AddDetailCommand(outOfBounds, detail);
+
+ assertCommandFailure(invalidCommand, model, MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void equals() {
+ Detail testDetail = new Detail(TEST_DETAIL);
+ AddDetailCommand addDetailCommand =
+ new AddDetailCommand(INDEX_FIRST_PERSON, testDetail);
+
+ // same object -> return true;
+ assertTrue(addDetailCommand.equals(addDetailCommand));
+
+ // different object -> return false;
+ assertFalse(addDetailCommand.equals("hello"));
+
+ // same fields -> return true;
+ assertTrue(addDetailCommand.equals(new AddDetailCommand(INDEX_FIRST_PERSON, testDetail)));
+
+ // different index -> return false;
+ assertFalse(addDetailCommand.equals(new AddDetailCommand(INDEX_SECOND_PERSON, testDetail)));
+
+ // different detail -> return false;
+ Detail altDetail = new Detail("he watches birds");
+ assertFalse(addDetailCommand.equals(new AddDetailCommand(INDEX_FIRST_PERSON, altDetail)));
+ }
+
+}
diff --git a/src/test/java/seedu/address/logic/commands/AddExamCommandTest.java b/src/test/java/seedu/address/logic/commands/AddExamCommandTest.java
new file mode 100644
index 00000000000..49a4ddb9e82
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/AddExamCommandTest.java
@@ -0,0 +1,139 @@
+package seedu.address.logic.commands;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX;
+import static seedu.address.commons.util.DateUtil.parseToDate;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
+import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
+import static seedu.address.testutil.TypicalStudents.ALICE;
+import static seedu.address.testutil.TypicalStudents.BENSON;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.academic.exam.Exam;
+import seedu.address.model.student.academic.exam.Score;
+import seedu.address.testutil.StudentBuilder;
+
+/**
+ * Contains integration tests (interaction with the Model, AddExamCommand and DeleteExamCommand)
+ * and unit tests for ExamCommand
+ */
+public class AddExamCommandTest {
+
+ private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+ private Exam dummyExam = new Exam("Mid Year 2020", parseToDate("26/7/2020"), new Score("26/50"));
+
+ @Test
+ public void constructors_null_throwsNullPointerException() {
+
+ // both arguments null
+ assertThrows(NullPointerException.class, () ->
+ new AddExamCommand(null, null));
+
+ assertThrows(NullPointerException.class, () ->
+ new DeleteExamCommand(null, null));
+
+ // one argument null
+ assertThrows(NullPointerException.class, () ->
+ new AddExamCommand(INDEX_FIRST_PERSON, null));
+ assertThrows(NullPointerException.class, () ->
+ new AddExamCommand(null, dummyExam));
+
+ assertThrows(NullPointerException.class, () ->
+ new DeleteExamCommand(null, INDEX_FIRST_PERSON));
+ assertThrows(NullPointerException.class, () ->
+ new DeleteExamCommand(INDEX_FIRST_PERSON, null));
+ }
+
+ @Test
+ public void execute_validIndexUnfilteredList_success() {
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student clone = new StudentBuilder(asker).withExams().build();
+ AddExamCommand addExamCommand =
+ new AddExamCommand(INDEX_FIRST_PERSON, dummyExam);
+ Student expectedStudent = new StudentBuilder(ALICE).withExams(dummyExam).build();
+ model.setStudent(asker, clone);
+
+ String expectedMessage = String.format(AddExamCommand.MESSAGE_EXAM_ADDED_SUCCESS, expectedStudent.getName(),
+ dummyExam);
+
+ ModelManager expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), model.getNotebook());
+ expectedModel.setStudent(clone, expectedStudent);
+
+ assertCommandSuccess(addExamCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidIndexUnfilteredList_throwsCommandException() {
+ Index outOfBounds = Index.fromOneBased(model.getSortedStudentList().size() + 1);
+ AddExamCommand command = new AddExamCommand(outOfBounds,
+ dummyExam);
+
+ assertCommandFailure(command, model, MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_validIndexFilteredList_success() {
+ showPersonAtIndex(model, INDEX_SECOND_PERSON);
+
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student clone = new StudentBuilder(asker).withExams().build();
+ model.setStudent(asker, clone);
+
+ AddExamCommand command = new AddExamCommand(INDEX_FIRST_PERSON, dummyExam);
+ Student expectedStudent = new StudentBuilder(BENSON).withExams(dummyExam).build();
+
+ String expectedMessage = String.format(AddExamCommand.MESSAGE_EXAM_ADDED_SUCCESS,
+ expectedStudent.getName(), dummyExam);
+
+ ModelManager expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), model.getNotebook());
+ expectedModel.setStudent(clone, expectedStudent);
+ showPersonAtIndex(expectedModel, INDEX_SECOND_PERSON);
+
+ assertCommandSuccess(command, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidIndexFilteredList_throwsCommandException() {
+ showPersonAtIndex(model, INDEX_SECOND_PERSON);
+
+ Index outOfBounds = INDEX_SECOND_PERSON;
+ AddExamCommand invalidCommand = new AddExamCommand(outOfBounds, dummyExam);
+
+ assertCommandFailure(invalidCommand, model, MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void equals() {
+ AddExamCommand addExamCommand =
+ new AddExamCommand(INDEX_FIRST_PERSON, dummyExam);
+
+ // same object -> return true;
+ assertEquals(addExamCommand, addExamCommand);
+
+ // different object -> return false;
+ assertNotEquals("hello", addExamCommand);
+
+ // same fields -> return true;
+ assertEquals(addExamCommand, new AddExamCommand(INDEX_FIRST_PERSON, dummyExam));
+
+ // different index -> return false;
+ assertNotEquals(addExamCommand, new AddExamCommand(INDEX_SECOND_PERSON, dummyExam));
+
+ // different exam -> return false;
+ Exam altExam = new Exam("Alt Exam", parseToDate("12/12/2020"), new Score("1/1"));
+ assertNotEquals(addExamCommand, new AddExamCommand(INDEX_FIRST_PERSON, altExam));
+ }
+}
diff --git a/src/test/java/seedu/address/logic/commands/AddQuestionCommandTest.java b/src/test/java/seedu/address/logic/commands/AddQuestionCommandTest.java
new file mode 100644
index 00000000000..5dd7c08e880
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/AddQuestionCommandTest.java
@@ -0,0 +1,149 @@
+package seedu.address.logic.commands;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX;
+import static seedu.address.logic.commands.AddQuestionCommand.MESSAGE_DUPLICATE_QUESTION;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.StudentBuilder.DEFAULT_SOLUTION;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
+import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
+import static seedu.address.testutil.TypicalStudents.ALICE;
+import static seedu.address.testutil.TypicalStudents.BENSON;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.academic.question.UnsolvedQuestion;
+import seedu.address.testutil.StudentBuilder;
+
+public class AddQuestionCommandTest {
+
+ private static final String TEST_QUESTION = "What is 1 + 1?";
+
+ private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ Index testIndex = INDEX_FIRST_PERSON;
+
+ // both arguments null
+ assertThrows(NullPointerException.class, () -> new AddQuestionCommand(null, null));
+
+ // one argument null
+ assertThrows(NullPointerException.class, () -> new AddQuestionCommand(testIndex, null));
+ assertThrows(NullPointerException.class, () -> new AddQuestionCommand(null,
+ new UnsolvedQuestion(TEST_QUESTION)));
+ }
+
+ @Test
+ public void execute_validIndexUnfilteredList_success() {
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student clone = new StudentBuilder(asker).withQuestions().build();
+ UnsolvedQuestion question = new UnsolvedQuestion(TEST_QUESTION);
+ AddQuestionCommand addQuestionCommand = new AddQuestionCommand(INDEX_FIRST_PERSON, question);
+ Student expectedStudent = new StudentBuilder(ALICE).withQuestions(TEST_QUESTION).build();
+ model.setStudent(asker, clone);
+
+ String expectedMessage = String.format(AddQuestionCommand.MESSAGE_SUCCESS,
+ clone.getName(), question);
+
+ ModelManager expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), getTypicalNotebook());
+ expectedModel.setStudent(clone, expectedStudent);
+
+ assertCommandSuccess(addQuestionCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidIndexUnfilteredList_throwsCommandException() {
+ Index outOfBounds = Index.fromOneBased(model.getSortedStudentList().size() + 1);
+ UnsolvedQuestion question = new UnsolvedQuestion(TEST_QUESTION);
+ AddQuestionCommand invalidCommand = new AddQuestionCommand(outOfBounds, question);
+
+ assertCommandFailure(invalidCommand, model, MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_unsolvedQuestionAlreadyExists_throwsCommandException() {
+ Student asker = new StudentBuilder(ALICE).withQuestions(TEST_QUESTION).build();
+ model.setStudent(model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased()), asker);
+
+ AddQuestionCommand invalidCommand = new AddQuestionCommand(INDEX_FIRST_PERSON,
+ new UnsolvedQuestion(TEST_QUESTION));
+
+ assertCommandFailure(invalidCommand, model, MESSAGE_DUPLICATE_QUESTION);
+ }
+
+ @Test
+ public void execute_solvedQuestionAlreadyExists_throwsCommandException() {
+ Student asker = new StudentBuilder(ALICE).withSolved(DEFAULT_SOLUTION, TEST_QUESTION).build();
+ model.setStudent(model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased()), asker);
+
+ AddQuestionCommand invalidCommand = new AddQuestionCommand(INDEX_FIRST_PERSON,
+ new UnsolvedQuestion(TEST_QUESTION));
+
+ assertCommandFailure(invalidCommand, model, MESSAGE_DUPLICATE_QUESTION);
+ }
+
+ @Test
+ public void execute_validIndexFilteredList_success() {
+ showPersonAtIndex(model, INDEX_SECOND_PERSON);
+
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ UnsolvedQuestion question = new UnsolvedQuestion(TEST_QUESTION);
+ Student clone = new StudentBuilder(asker).withQuestions().build();
+ model.setStudent(asker, clone);
+
+ AddQuestionCommand addQuestionCommand = new AddQuestionCommand(INDEX_FIRST_PERSON, question);
+ Student expectedStudent = new StudentBuilder(BENSON).withQuestions(TEST_QUESTION).build();
+
+ String expectedMessage = String.format(AddQuestionCommand.MESSAGE_SUCCESS,
+ expectedStudent.getName(), question);
+
+ ModelManager expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), getTypicalNotebook());
+ expectedModel.setStudent(clone, expectedStudent);
+ showPersonAtIndex(expectedModel, INDEX_SECOND_PERSON);
+
+ assertCommandSuccess(addQuestionCommand, model, expectedMessage, expectedModel);
+
+ }
+
+ @Test
+ public void execute_invalidIndexFilteredList_throwsCommandException() {
+ showPersonAtIndex(model, INDEX_SECOND_PERSON);
+
+ UnsolvedQuestion question = new UnsolvedQuestion(TEST_QUESTION);
+ AddQuestionCommand invalidCommand = new AddQuestionCommand(INDEX_SECOND_PERSON, question);
+
+ assertCommandFailure(invalidCommand, model, MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void equals() {
+ UnsolvedQuestion testQuestion = new UnsolvedQuestion(TEST_QUESTION);
+ AddQuestionCommand addQuestionCommand = new AddQuestionCommand(INDEX_FIRST_PERSON, testQuestion);
+
+ // same object -> return true;
+ assertTrue(addQuestionCommand.equals(addQuestionCommand));
+
+ // same fields -> return true;
+ assertTrue(addQuestionCommand.equals(new AddQuestionCommand(INDEX_FIRST_PERSON, testQuestion)));
+
+ // different index -> return false;
+ assertFalse(addQuestionCommand.equals(new AddQuestionCommand(INDEX_SECOND_PERSON, testQuestion)));
+
+ // different question -> return false;
+ UnsolvedQuestion altQuestion = new UnsolvedQuestion("Why do birds fly?");
+ assertFalse(addQuestionCommand.equals(new AddQuestionCommand(INDEX_FIRST_PERSON, altQuestion)));
+ }
+
+}
diff --git a/src/test/java/seedu/address/logic/commands/ClearCommandTest.java b/src/test/java/seedu/address/logic/commands/ClearCommandTest.java
index 80d9110c03a..8fa6d592691 100644
--- a/src/test/java/seedu/address/logic/commands/ClearCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/ClearCommandTest.java
@@ -1,13 +1,14 @@
package seedu.address.logic.commands;
import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
import org.junit.jupiter.api.Test;
-import seedu.address.model.AddressBook;
import seedu.address.model.Model;
import seedu.address.model.ModelManager;
+import seedu.address.model.Reeve;
import seedu.address.model.UserPrefs;
public class ClearCommandTest {
@@ -22,9 +23,9 @@ public void execute_emptyAddressBook_success() {
@Test
public void execute_nonEmptyAddressBook_success() {
- Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
- Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs());
- expectedModel.setAddressBook(new AddressBook());
+ Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+ Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+ expectedModel.setReeve(new Reeve());
assertCommandSuccess(new ClearCommand(), model, ClearCommand.MESSAGE_SUCCESS, expectedModel);
}
diff --git a/src/test/java/seedu/address/logic/commands/CommandResultTest.java b/src/test/java/seedu/address/logic/commands/CommandResultTest.java
index 4f3eb46e9ef..620119fb2e2 100644
--- a/src/test/java/seedu/address/logic/commands/CommandResultTest.java
+++ b/src/test/java/seedu/address/logic/commands/CommandResultTest.java
@@ -7,6 +7,9 @@
import org.junit.jupiter.api.Test;
+import seedu.address.model.student.Student;
+import seedu.address.testutil.StudentBuilder;
+
public class CommandResultTest {
@Test
public void equals() {
@@ -14,7 +17,9 @@ public void equals() {
// same values -> returns true
assertTrue(commandResult.equals(new CommandResult("feedback")));
- assertTrue(commandResult.equals(new CommandResult("feedback", false, false)));
+
+ assertTrue(commandResult.equals(new CommandResult("feedback", false, false,
+ false, null)));
// same object -> returns true
assertTrue(commandResult.equals(commandResult));
@@ -29,10 +34,13 @@ public void equals() {
assertFalse(commandResult.equals(new CommandResult("different")));
// different showHelp value -> returns false
- assertFalse(commandResult.equals(new CommandResult("feedback", true, false)));
+ assertFalse(commandResult.equals(new CommandResult("feedback", true, false, false, null)));
// different exit value -> returns false
- assertFalse(commandResult.equals(new CommandResult("feedback", false, true)));
+ assertFalse(commandResult.equals(new CommandResult("feedback", false, true, false, null)));
+
+ // different toggle value -> returns false
+ assertFalse(commandResult.equals(new CommandResult("feedback", false, false, true, null)));
}
@Test
@@ -46,9 +54,127 @@ public void hashcode() {
assertNotEquals(commandResult.hashCode(), new CommandResult("different").hashCode());
// different showHelp value -> returns different hashcode
- assertNotEquals(commandResult.hashCode(), new CommandResult("feedback", true, false).hashCode());
+ assertNotEquals(commandResult.hashCode(), new CommandResult("feedback", true, false, false, null).hashCode());
// different exit value -> returns different hashcode
- assertNotEquals(commandResult.hashCode(), new CommandResult("feedback", false, true).hashCode());
+ assertNotEquals(commandResult.hashCode(), new CommandResult("feedback", false, true, false, null).hashCode());
+
+ // different toggle value -> returns different hashcode
+ assertNotEquals(commandResult.hashCode(), new CommandResult("feedback", false, false, true, null).hashCode());
+
+ // different toggle value -> returns different hashcode
+ Student dummyStudent = new StudentBuilder().withName("Alice").build();
+ assertNotEquals(commandResult.hashCode(), new CommandResult("feedback", false,
+ false, false, dummyStudent).hashCode());
+ }
+
+ @Test
+ public void getFeedbackToUser() {
+ // different feedback input -> returns different feedback
+ assertNotEquals("feedback", new CommandResult("heya").getFeedbackToUser());
+ // same feedback input -> returns same feedback
+ assertEquals("feedback", new CommandResult("feedback").getFeedbackToUser());
+ }
+
+ @Test
+ public void getSelectedStudent() {
+ Student dummyStudent = new StudentBuilder().withName("Alice").build();
+ Student dummyStudentTwo = new StudentBuilder().withName("Timothy").build();
+
+ // different students -> returns different student
+ assertNotEquals(dummyStudent, new CommandResult("feedback", dummyStudentTwo)
+ .getSelectedStudent());
+ // same students -> returns same student
+ assertEquals(dummyStudent, new CommandResult("feedback", dummyStudent).getSelectedStudent());
+
+ // different students -> returns different student
+ assertNotEquals(dummyStudentTwo, new CommandResult("feedback", false,
+ false, false, dummyStudent).getSelectedStudent());
+ // same students -> returns same student
+ assertEquals(dummyStudent, new CommandResult("feedback", false,
+ false, false, dummyStudent).getSelectedStudent());
+ }
+
+ @Test
+ public void isShowHelp() {
+ // no showHelp input -> default is false -> returns false
+ assertNotEquals(true, new CommandResult("feedback").isShouldShowHelp());
+ // no showHelp input -> default is false -> returns false
+ assertEquals(false, new CommandResult("feedback").isShouldShowHelp());
+
+ Student dummyStudent = new StudentBuilder().withName("Alice").build();
+ // different showHelp -> returns different showHelp
+ assertNotEquals(true, new CommandResult("feedback", false,
+ false, false, dummyStudent).isShouldShowHelp());
+ // same showHelp -> returns same showHelp
+ assertEquals(true, new CommandResult("feedback", true,
+ false, false, dummyStudent).isShouldShowHelp());
+ }
+
+ @Test
+ public void isExit() {
+ // no exit input -> default is false -> returns false
+ assertNotEquals(true, new CommandResult("feedback").isShouldExit());
+ // no exit input -> default is false -> returns false
+ assertEquals(false, new CommandResult("feedback").isShouldExit());
+
+ Student dummyStudent = new StudentBuilder().withName("Alice").build();
+ // different exit -> returns different exit
+ assertNotEquals(true, new CommandResult("feedback", false,
+ false, false, dummyStudent).isShouldExit());
+ // same exit -> returns same exit
+ assertEquals(true, new CommandResult("feedback", false,
+ true, false, dummyStudent).isShouldExit());
+ }
+
+ @Test
+ public void isSchedule() {
+ // no showSchedule input -> default is false -> returns false
+ assertNotEquals(true, new CommandResult("feedback").isShouldShowSchedule());
+ // no showSchedule input -> default is false -> returns false
+ assertEquals(false, new CommandResult("feedback").isShouldShowSchedule());
+
+ // different showSchedule -> returns different showSchedule
+ assertNotEquals(true, new CommandResult("feedback", false,
+ false, false, false).isShouldShowSchedule());
+ // same showSchedule -> returns same showSchedule
+ assertEquals(true, new CommandResult("feedback", false,
+ false, true, false).isShouldShowSchedule());
+ }
+
+ @Test
+ public void isToggleStudentCard() {
+ // no toggleStudentCard input -> default is false -> returns false
+ assertNotEquals(true, new CommandResult("feedback").isToggleStudentCard());
+ // no toggleStudentCard input -> default is false -> returns false
+ assertEquals(false, new CommandResult("feedback").isToggleStudentCard());
+
+ // different toggleStudentCard -> returns different toggleStudentCard
+ assertNotEquals(true, new CommandResult("feedback", false,
+ false, false, false).isToggleStudentCard());
+ // same toggleStudentCard -> returns same toggleStudentCard
+ assertEquals(true, new CommandResult("feedback", false,
+ false, false, true).isToggleStudentCard());
+ }
+
+ @Test
+ public void isExamStats() {
+ // no student input -> isExamStats should be false
+ assertNotEquals(true, new CommandResult("feedback").isExamStats());
+ assertEquals(false, new CommandResult("feedback").isExamStats());
+
+ Student dummyStudent = new StudentBuilder().withName("Alice").build();
+
+ // student input -> isExamStats should be true
+ assertNotEquals(false, new CommandResult("feedback", false,
+ false, false, dummyStudent).isExamStats());
+ assertEquals(true, new CommandResult("feedback", false,
+ false, false, dummyStudent).isExamStats());
+ }
+
+ @Test
+ public void toString_test() {
+ assertNotEquals("heya", new CommandResult("feedback").toString());
+ assertEquals("feedback", new CommandResult("feedback").toString());
}
}
diff --git a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
index 643a1d08069..ecbda6eb503 100644
--- a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
+++ b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
@@ -2,24 +2,41 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
+import static seedu.address.commons.util.DateUtil.parseToDate;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ATTENDANCE_DATE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ATTENDANCE_FEEDBACK;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ATTENDANCE_STATUS;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_DESCRIPTION;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_DETAILS;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_EXAM_DATE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_EXAM_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_FEE;
import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_PAYMENT;
import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SCHOOL;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SCORE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TEXT;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TIME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TITLE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_VENUE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_YEAR;
import static seedu.address.testutil.Assert.assertThrows;
+import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import seedu.address.commons.core.index.Index;
import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.model.AddressBook;
+import seedu.address.logic.commands.notes.EditNoteCommand;
import seedu.address.model.Model;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
-import seedu.address.model.person.Person;
-import seedu.address.testutil.EditPersonDescriptorBuilder;
+import seedu.address.model.Reeve;
+import seedu.address.model.student.NameContainsKeywordsPredicate;
+import seedu.address.model.student.Student;
+import seedu.address.testutil.EditStudentDescriptorBuilder;
+import seedu.address.testutil.notes.EditNoteDescriptorBuilder;
/**
* Contains helper methods for testing commands.
@@ -30,43 +47,130 @@ public class CommandTestUtil {
public static final String VALID_NAME_BOB = "Bob Choo";
public static final String VALID_PHONE_AMY = "11111111";
public static final String VALID_PHONE_BOB = "22222222";
- public static final String VALID_EMAIL_AMY = "amy@example.com";
- public static final String VALID_EMAIL_BOB = "bob@example.com";
- public static final String VALID_ADDRESS_AMY = "Block 312, Amy Street 1";
- public static final String VALID_ADDRESS_BOB = "Block 123, Bobby Street 3";
- public static final String VALID_TAG_HUSBAND = "husband";
- public static final String VALID_TAG_FRIEND = "friend";
+ public static final String VALID_SCHOOL_AMY = "NUS High School";
+ public static final String VALID_SCHOOL_BOB = "Hwa Chong Institution";
+ public static final String VALID_YEAR_AMY = "Secondary 2";
+ public static final String VALID_YEAR_BOB = "Secondary 4";
+ public static final String VALID_CLASS_TIME_AMY = "2 1500-1600";
+ public static final String VALID_CLASS_TIME_BOB = "5 0900-1100";
+ public static final String VALID_CLASS_VENUE_AMY = "347 Woodlands Ave 3, Singapore 730347";
+ public static final String VALID_CLASS_VENUE_BOB = "347 Woodlands Ave 3, Singapore 730347";
+ public static final String VALID_FEE_AMY = "40";
+ public static final String VALID_FEE_BOB = "55";
+ public static final String VALID_PAYMENT_DATE_AMY = "27/10/2020";
+ public static final String VALID_PAYMENT_DATE_BOB = "10/09/2020";
+ public static final String VALID_ADDITIONAL_DETAILS_AMY = "Clever";
+ public static final String VALID_ADDITIONAL_DETAILS_BOB = "Hardworking";
+ public static final String VALID_QUESTION_AMY = "How is current calculated from resistance?";
+ public static final String VALID_QUESTION_BOB = "What is hemoglobin?";
+ public static final String VALID_EXAM_NAME_AMY = "Mid Year 2020";
+ public static final String VALID_EXAM_NAME_BOB = "End of Year 2020";
+ public static final String VALID_EXAM_DATE_AMY = "26/7/2020";
+ public static final String VALID_EXAM_DATE_BOB = "5/11/2020";
+ public static final String VALID_EXAM_SCORE_AMY = "26/50";
+ public static final String VALID_EXAM_SCORE_BOB = "50/50";
+ public static final String VALID_ATTENDANCE_DATE_AMY = "27/10/2020";
+ public static final String VALID_ATTENDANCE_DATE_BOB = "19/4/2009";
+ public static final String VALID_ATTENDANCE_STATUS_AMY = "present";
+ public static final String VALID_ATTENDANCE_STATUS_BOB = "absent";
+ public static final String VALID_ATTENDANCE_FEEDBACK_AMY = "attentive";
+ public static final String VALID_ATTENDANCE_FEEDBACK_BOB = "sick";
+ public static final String VALID_TITLE = "W10 blues";
+ public static final String VALID_DESCRIPTION = "why must i do cs2103";
+ public static final String VALID_TITLE_GRADUATION = "Graduation :(";
+ public static final String VALID_DESCRIPTION_GRADUATION = "write cards for people";
+ public static final String VALID_TITLE_RANDOM = "HEHEHEHE";
+ public static final String VALID_DESCRIPTION_RANDOM = ":)";
public static final String NAME_DESC_AMY = " " + PREFIX_NAME + VALID_NAME_AMY;
public static final String NAME_DESC_BOB = " " + PREFIX_NAME + VALID_NAME_BOB;
public static final String PHONE_DESC_AMY = " " + PREFIX_PHONE + VALID_PHONE_AMY;
public static final String PHONE_DESC_BOB = " " + PREFIX_PHONE + VALID_PHONE_BOB;
- public static final String EMAIL_DESC_AMY = " " + PREFIX_EMAIL + VALID_EMAIL_AMY;
- public static final String EMAIL_DESC_BOB = " " + PREFIX_EMAIL + VALID_EMAIL_BOB;
- public static final String ADDRESS_DESC_AMY = " " + PREFIX_ADDRESS + VALID_ADDRESS_AMY;
- public static final String ADDRESS_DESC_BOB = " " + PREFIX_ADDRESS + VALID_ADDRESS_BOB;
- public static final String TAG_DESC_FRIEND = " " + PREFIX_TAG + VALID_TAG_FRIEND;
- public static final String TAG_DESC_HUSBAND = " " + PREFIX_TAG + VALID_TAG_HUSBAND;
+ public static final String SCHOOL_DESC_AMY = " " + PREFIX_SCHOOL + VALID_SCHOOL_AMY;
+ public static final String SCHOOL_DESC_BOB = " " + PREFIX_SCHOOL + VALID_SCHOOL_BOB;
+ public static final String YEAR_DESC_AMY = " " + PREFIX_YEAR + VALID_YEAR_AMY;
+ public static final String YEAR_DESC_BOB = " " + PREFIX_YEAR + VALID_YEAR_BOB;
+
+ public static final String CLASS_VENUE_DESC_AMY = " " + PREFIX_VENUE + VALID_CLASS_VENUE_AMY;
+ public static final String CLASS_VENUE_DESC_BOB = " " + PREFIX_VENUE + VALID_CLASS_VENUE_BOB;
+ public static final String CLASS_TIME_DESC_AMY = " " + PREFIX_TIME + VALID_CLASS_TIME_AMY;
+ public static final String CLASS_TIME_DESC_BOB = " " + PREFIX_TIME + VALID_CLASS_TIME_BOB;
+ public static final String FEE_DESC_AMY = " " + PREFIX_FEE + VALID_FEE_AMY;
+ public static final String FEE_DESC_BOB = " " + PREFIX_FEE + VALID_FEE_BOB;
+ public static final String PAYMENT_DATE_DESC_AMY = " " + PREFIX_PAYMENT + VALID_PAYMENT_DATE_AMY;
+ public static final String PAYMENT_DATE_DESC_BOB = " " + PREFIX_PAYMENT + VALID_PAYMENT_DATE_BOB;
+ public static final String ADDITIONAL_DETAILS_DESC_AMY = " " + PREFIX_DETAILS + VALID_ADDITIONAL_DETAILS_AMY;
+ public static final String ADDITIONAL_DETAILS_DESC_BOB = " " + PREFIX_DETAILS + VALID_ADDITIONAL_DETAILS_BOB;
+
+ public static final String QUESTION_DESC_AMY = " " + PREFIX_TEXT + VALID_QUESTION_AMY;
+ public static final String ADDITIONAL_DETAIL_DESC_AMY = " " + PREFIX_TEXT + VALID_ADDITIONAL_DETAILS_AMY;
+
+ public static final String TITLE_DESC_EXISTENTIAL_CRISIS = " " + PREFIX_TITLE + VALID_TITLE;
+ public static final String DESCRIPTION_DESC_EXISTENTIAL_CRISIS = " "
+ + PREFIX_DESCRIPTION + VALID_DESCRIPTION;
+ public static final String TITLE_DESC_GRADUATION = " " + PREFIX_TITLE + VALID_TITLE_GRADUATION;
+ public static final String DESCRIPTION_DESC_GRADUATION = " "
+ + PREFIX_DESCRIPTION + VALID_DESCRIPTION_GRADUATION;
+
+ public static final String QUESTION_MATH = "What is 1 + 1?";
+ public static final String QUESTION_PHYSICS = "How does Newton's Second Law work?";
+ public static final String QUESTION_EMO = "What is the point of life?";
+ public static final String[] TEST_QUESTIONS =
+ new String[] {QUESTION_MATH, QUESTION_PHYSICS, QUESTION_EMO};
+
+ public static final String EXAM_DESC_AMY = " " + PREFIX_EXAM_NAME + VALID_EXAM_NAME_AMY + " "
+ + PREFIX_EXAM_DATE + VALID_EXAM_DATE_AMY + " "
+ + PREFIX_SCORE + VALID_EXAM_SCORE_AMY;
+ public static final String EXAM_DESC_BOB = " " + PREFIX_EXAM_NAME + VALID_EXAM_NAME_BOB + " "
+ + PREFIX_EXAM_DATE + VALID_EXAM_DATE_BOB + " "
+ + PREFIX_SCORE + VALID_EXAM_SCORE_BOB;
+
+ public static final LocalDate EXAM_DATE_AMY = parseToDate(VALID_EXAM_DATE_AMY);
+ public static final LocalDate EXAM_DATE_BOB = parseToDate(VALID_EXAM_DATE_BOB);
+
+ public static final String ATTENDANCE_DESC_WITH_FEEDBACK_AMY = " "
+ + PREFIX_ATTENDANCE_DATE + VALID_ATTENDANCE_DATE_AMY + " "
+ + PREFIX_ATTENDANCE_STATUS + VALID_ATTENDANCE_STATUS_AMY + " "
+ + PREFIX_ATTENDANCE_FEEDBACK + VALID_ATTENDANCE_FEEDBACK_AMY;
+ public static final String ATTENDANCE_DESC_AMY = " " + PREFIX_ATTENDANCE_DATE + VALID_ATTENDANCE_DATE_AMY + " "
+ + PREFIX_ATTENDANCE_STATUS + VALID_ATTENDANCE_STATUS_AMY;
+ public static final String ATTENDANCE_DESC_BOB = " " + PREFIX_ATTENDANCE_DATE + VALID_ATTENDANCE_DATE_BOB + " "
+ + PREFIX_ATTENDANCE_STATUS + VALID_ATTENDANCE_STATUS_BOB;
+
+ public static final LocalDate ATTENDANCE_DATE_AMY = parseToDate(VALID_ATTENDANCE_DATE_AMY);
+ public static final LocalDate ATTENDANCE_DATE_BOB = parseToDate(VALID_ATTENDANCE_DATE_BOB);
public static final String INVALID_NAME_DESC = " " + PREFIX_NAME + "James&"; // '&' not allowed in names
public static final String INVALID_PHONE_DESC = " " + PREFIX_PHONE + "911a"; // 'a' not allowed in phones
- public static final String INVALID_EMAIL_DESC = " " + PREFIX_EMAIL + "bob!yahoo"; // missing '@' symbol
- public static final String INVALID_ADDRESS_DESC = " " + PREFIX_ADDRESS; // empty string not allowed for addresses
- public static final String INVALID_TAG_DESC = " " + PREFIX_TAG + "hubby*"; // '*' not allowed in tags
+ public static final String INVALID_SCHOOL_DESC = " " + PREFIX_SCHOOL; // empty string not allowed for schools
+ public static final String INVALID_YEAR_DESC = " " + PREFIX_YEAR + "$4"; // '$' not allowed in year
+ public static final String INVALID_VENUE_DESC = " " + PREFIX_VENUE + ""; // only empty venues are not allowed
+ public static final String INVALID_TIME_DESC = " " + PREFIX_TIME + "1 @100"; // '@' not allowed in times
+ public static final String INVALID_FEE_DESC = " " + PREFIX_FEE + "$20"; // '$' allowed for schools
+ // 'alphabets' not allowed in payment date
+ public static final String INVALID_PAYMENT_DESC = " " + PREFIX_PAYMENT + "alphabets";
+
+ public static final String INVALID_TITLE_DESC = " " + PREFIX_TITLE + "BABABANBNANABBABABSNBA";
+ public static final String INVALID_DESCRIPTION_DESC = " " + PREFIX_DESCRIPTION
+ + "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer dapibus sapienar";
public static final String PREAMBLE_WHITESPACE = "\t \r \n";
public static final String PREAMBLE_NON_EMPTY = "NonEmptyPreamble";
- public static final EditCommand.EditPersonDescriptor DESC_AMY;
- public static final EditCommand.EditPersonDescriptor DESC_BOB;
+ public static final EditCommand.EditStudentDescriptor DESC_AMY;
+ public static final EditCommand.EditStudentDescriptor DESC_BOB;
+ public static final EditNoteCommand.EditNoteDescriptor DESC_NOTE_TODO;
+ public static final EditNoteCommand.EditNoteDescriptor DESC_NOTE_EVENTS;
static {
- DESC_AMY = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY)
- .withPhone(VALID_PHONE_AMY).withEmail(VALID_EMAIL_AMY).withAddress(VALID_ADDRESS_AMY)
- .withTags(VALID_TAG_FRIEND).build();
- DESC_BOB = new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB)
- .withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB).withAddress(VALID_ADDRESS_BOB)
- .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build();
+ DESC_AMY = new EditStudentDescriptorBuilder().withName(VALID_NAME_AMY)
+ .withPhone(VALID_PHONE_AMY).build();
+ DESC_BOB = new EditStudentDescriptorBuilder().withName(VALID_NAME_BOB)
+ .withPhone(VALID_PHONE_BOB).build();
+ DESC_NOTE_TODO = new EditNoteDescriptorBuilder().withTitle("todo")
+ .withDescription("watch youtube").build();
+ DESC_NOTE_EVENTS = new EditNoteDescriptorBuilder().withTitle("events")
+ .withDescription("attend practical exam").build();
}
/**
@@ -104,25 +208,25 @@ public static void assertCommandSuccess(Command command, Model actualModel, Stri
public static void assertCommandFailure(Command command, Model actualModel, String expectedMessage) {
// we are unable to defensively copy the model for comparison later, so we can
// only do so by copying its components.
- AddressBook expectedAddressBook = new AddressBook(actualModel.getAddressBook());
- List<Person> expectedFilteredList = new ArrayList<>(actualModel.getFilteredPersonList());
+ Reeve expectedReeve = new Reeve(actualModel.getReeve());
+ List<Student> expectedFilteredList = new ArrayList<>(actualModel.getSortedStudentList());
assertThrows(CommandException.class, expectedMessage, () -> command.execute(actualModel));
- assertEquals(expectedAddressBook, actualModel.getAddressBook());
- assertEquals(expectedFilteredList, actualModel.getFilteredPersonList());
+ assertEquals(expectedReeve, actualModel.getReeve());
+ assertEquals(expectedFilteredList, actualModel.getSortedStudentList());
}
/**
* Updates {@code model}'s filtered list to show only the person at the given {@code targetIndex} in the
* {@code model}'s address book.
*/
public static void showPersonAtIndex(Model model, Index targetIndex) {
- assertTrue(targetIndex.getZeroBased() < model.getFilteredPersonList().size());
+ assertTrue(targetIndex.getZeroBased() < model.getSortedStudentList().size());
- Person person = model.getFilteredPersonList().get(targetIndex.getZeroBased());
- final String[] splitName = person.getName().fullName.split("\\s+");
- model.updateFilteredPersonList(new NameContainsKeywordsPredicate(Arrays.asList(splitName[0])));
+ Student student = model.getSortedStudentList().get(targetIndex.getZeroBased());
+ final String[] splitName = student.getName().fullName.split("\\s+");
+ model.updateFilteredStudentList(new NameContainsKeywordsPredicate(Arrays.asList(splitName[0])));
- assertEquals(1, model.getFilteredPersonList().size());
+ assertEquals(1, model.getSortedStudentList().size());
}
}
diff --git a/src/test/java/seedu/address/logic/commands/DeleteAttendanceCommandTest.java b/src/test/java/seedu/address/logic/commands/DeleteAttendanceCommandTest.java
new file mode 100644
index 00000000000..e55adc447fe
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/DeleteAttendanceCommandTest.java
@@ -0,0 +1,161 @@
+package seedu.address.logic.commands;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
+import static seedu.address.logic.commands.DeleteAttendanceCommand.MESSAGE_INVALID_ATTENDANCE_DATE;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
+import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
+import static seedu.address.testutil.TypicalStudents.ALICE;
+import static seedu.address.testutil.TypicalStudents.BENSON;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
+
+import java.time.LocalDate;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.academic.Attendance;
+import seedu.address.model.student.academic.Feedback;
+import seedu.address.testutil.StudentBuilder;
+
+public class DeleteAttendanceCommandTest {
+
+ private static Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+ private static final Index TEST_INDEX_FIRST_STUDENT = INDEX_FIRST_PERSON;
+ private static final LocalDate TEST_DATE = model.getFilteredStudentList().get(0)
+ .getAttendance().get(0).getLessonDate();
+ private static final String USER_INPUT_DATE = model.getFilteredStudentList().get(0)
+ .getAttendance().get(0).getUserInputDate();
+ private final Attendance validAttendance = new Attendance(TEST_DATE, true,
+ new Feedback("sleepy"));
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+
+ // both arguments null
+ assertThrows(NullPointerException.class, () ->
+ new DeleteAttendanceCommand(null, null));
+
+ // one argument null
+ assertThrows(NullPointerException.class, () ->
+ new DeleteAttendanceCommand(null, TEST_DATE));
+ assertThrows(NullPointerException.class, () ->
+ new DeleteAttendanceCommand(TEST_INDEX_FIRST_STUDENT, null));
+ }
+
+ @Test
+ public void execute_validStudentIndexUnfilteredList_success() {
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student clone = new StudentBuilder(asker).withAttendances(validAttendance).build();
+ DeleteAttendanceCommand deleteAttendanceCommand =
+ new DeleteAttendanceCommand(TEST_INDEX_FIRST_STUDENT, TEST_DATE);
+ Student expectedStudent = new StudentBuilder(ALICE).withAttendances().build();
+ model.setStudent(asker, clone);
+
+ String expectedMessage = String.format(DeleteAttendanceCommand.MESSAGE_SUCCESS,
+ clone.getName(), USER_INPUT_DATE);
+
+ ModelManager expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), model.getNotebook());
+ expectedModel.setStudent(clone, expectedStudent);
+
+ assertCommandSuccess(deleteAttendanceCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidStudentIndexUnfilteredList_throwsCommandException() {
+ Index outOfBoundsStudentIndex = Index.fromOneBased(model.getSortedStudentList().size() + 1);
+ DeleteAttendanceCommand command = new DeleteAttendanceCommand(outOfBoundsStudentIndex,
+ TEST_DATE);
+ assertCommandFailure(command, model, MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_invalidDateUnfilteredList_throwsCommandException() {
+ LocalDate invalidDate = TEST_DATE.plusDays(1);
+ DeleteAttendanceCommand invalidCommand = new DeleteAttendanceCommand(TEST_INDEX_FIRST_STUDENT,
+ invalidDate);
+
+ assertCommandFailure(invalidCommand, model, MESSAGE_INVALID_ATTENDANCE_DATE);
+ }
+
+ @Test
+ public void execute_validStudentIndexFilteredList_success() {
+ Model newModel = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+ showPersonAtIndex(newModel, INDEX_SECOND_PERSON);
+
+ Student asker = newModel.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student clone = new StudentBuilder(asker).withAttendances(validAttendance).build();
+ newModel.setStudent(asker, clone);
+
+ DeleteAttendanceCommand command = new DeleteAttendanceCommand(INDEX_FIRST_PERSON,
+ TEST_DATE);
+ Student expectedStudent = new StudentBuilder(BENSON).withAttendances().build();
+
+ String expectedMessage = String.format(DeleteAttendanceCommand.MESSAGE_SUCCESS,
+ clone.getName(), USER_INPUT_DATE);
+
+ ModelManager expectedModel = new ModelManager(newModel.getReeve(), new UserPrefs(), newModel.getNotebook());
+ expectedModel.setStudent(clone, expectedStudent);
+ showPersonAtIndex(expectedModel, INDEX_SECOND_PERSON);
+
+ assertCommandSuccess(command, newModel, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidStudentIndexFilteredList_throwsCommandException() {
+ showPersonAtIndex(model, INDEX_SECOND_PERSON);
+
+ Index outOfBoundsStudentIndex = INDEX_SECOND_PERSON;
+ DeleteAttendanceCommand invalidCommand = new DeleteAttendanceCommand(outOfBoundsStudentIndex,
+ TEST_DATE);
+
+ assertCommandFailure(invalidCommand, model, MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_invalidDateFilteredList_throwsCommandException() {
+ Model newModel = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+ showPersonAtIndex(newModel, INDEX_SECOND_PERSON);
+
+ LocalDate invalidDate = TEST_DATE.minusMonths(1);
+ DeleteAttendanceCommand invalidCommand =
+ new DeleteAttendanceCommand(TEST_INDEX_FIRST_STUDENT, invalidDate);
+
+ assertCommandFailure(invalidCommand, newModel, MESSAGE_INVALID_ATTENDANCE_DATE);
+ }
+
+ @Test
+ public void equals() {
+ DeleteAttendanceCommand deleteAttendanceCommand =
+ new DeleteAttendanceCommand(INDEX_FIRST_PERSON, TEST_DATE);
+
+ // same object -> return true;
+ assertTrue(deleteAttendanceCommand.equals(deleteAttendanceCommand));
+
+ // different object -> return false;
+ assertFalse(deleteAttendanceCommand.equals("hello"));
+
+ // same fields -> return true;
+ assertTrue(deleteAttendanceCommand.equals(new DeleteAttendanceCommand(INDEX_FIRST_PERSON,
+ TEST_DATE)));
+
+ // different student index -> return false;
+ assertFalse(deleteAttendanceCommand.equals(new DeleteAttendanceCommand(INDEX_SECOND_PERSON,
+ TEST_DATE)));
+
+ // different date -> return false;
+ LocalDate altDate = TEST_DATE.plusDays(1);
+ assertFalse(deleteAttendanceCommand.equals(new DeleteAttendanceCommand(INDEX_FIRST_PERSON,
+ altDate)));
+ }
+}
diff --git a/src/test/java/seedu/address/logic/commands/DeleteCommandTest.java b/src/test/java/seedu/address/logic/commands/DeleteCommandTest.java
index 0f77d8295f6..aedca809938 100644
--- a/src/test/java/seedu/address/logic/commands/DeleteCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/DeleteCommandTest.java
@@ -7,7 +7,8 @@
import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
import org.junit.jupiter.api.Test;
@@ -16,7 +17,7 @@
import seedu.address.model.Model;
import seedu.address.model.ModelManager;
import seedu.address.model.UserPrefs;
-import seedu.address.model.person.Person;
+import seedu.address.model.student.Student;
/**
* Contains integration tests (interaction with the Model, UndoCommand and RedoCommand) and unit tests for
@@ -24,40 +25,40 @@
*/
public class DeleteCommandTest {
- private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+ private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
@Test
public void execute_validIndexUnfilteredList_success() {
- Person personToDelete = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student studentToDelete = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
DeleteCommand deleteCommand = new DeleteCommand(INDEX_FIRST_PERSON);
- String expectedMessage = String.format(DeleteCommand.MESSAGE_DELETE_PERSON_SUCCESS, personToDelete);
+ String expectedMessage = String.format(DeleteCommand.MESSAGE_DELETE_STUDENT_SUCCESS, studentToDelete);
- ModelManager expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
- expectedModel.deletePerson(personToDelete);
+ ModelManager expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), getTypicalNotebook());
+ expectedModel.deleteStudent(studentToDelete);
assertCommandSuccess(deleteCommand, model, expectedMessage, expectedModel);
}
@Test
public void execute_invalidIndexUnfilteredList_throwsCommandException() {
- Index outOfBoundIndex = Index.fromOneBased(model.getFilteredPersonList().size() + 1);
+ Index outOfBoundIndex = Index.fromOneBased(model.getSortedStudentList().size() + 1);
DeleteCommand deleteCommand = new DeleteCommand(outOfBoundIndex);
- assertCommandFailure(deleteCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+ assertCommandFailure(deleteCommand, model, Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
}
@Test
public void execute_validIndexFilteredList_success() {
showPersonAtIndex(model, INDEX_FIRST_PERSON);
- Person personToDelete = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student studentToDelete = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
DeleteCommand deleteCommand = new DeleteCommand(INDEX_FIRST_PERSON);
- String expectedMessage = String.format(DeleteCommand.MESSAGE_DELETE_PERSON_SUCCESS, personToDelete);
+ String expectedMessage = String.format(DeleteCommand.MESSAGE_DELETE_STUDENT_SUCCESS, studentToDelete);
- Model expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
- expectedModel.deletePerson(personToDelete);
+ Model expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), getTypicalNotebook());
+ expectedModel.deleteStudent(studentToDelete);
showNoPerson(expectedModel);
assertCommandSuccess(deleteCommand, model, expectedMessage, expectedModel);
@@ -69,11 +70,11 @@ public void execute_invalidIndexFilteredList_throwsCommandException() {
Index outOfBoundIndex = INDEX_SECOND_PERSON;
// ensures that outOfBoundIndex is still in bounds of address book list
- assertTrue(outOfBoundIndex.getZeroBased() < model.getAddressBook().getPersonList().size());
+ assertTrue(outOfBoundIndex.getZeroBased() < model.getReeve().getStudentList().size());
DeleteCommand deleteCommand = new DeleteCommand(outOfBoundIndex);
- assertCommandFailure(deleteCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+ assertCommandFailure(deleteCommand, model, Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
}
@Test
@@ -102,8 +103,8 @@ public void equals() {
* Updates {@code model}'s filtered list to show no one.
*/
private void showNoPerson(Model model) {
- model.updateFilteredPersonList(p -> false);
+ model.updateFilteredStudentList(p -> false);
- assertTrue(model.getFilteredPersonList().isEmpty());
+ assertTrue(model.getSortedStudentList().isEmpty());
}
}
diff --git a/src/test/java/seedu/address/logic/commands/DeleteDetailCommandTest.java b/src/test/java/seedu/address/logic/commands/DeleteDetailCommandTest.java
new file mode 100644
index 00000000000..7cb2b2257e2
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/DeleteDetailCommandTest.java
@@ -0,0 +1,160 @@
+package seedu.address.logic.commands;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
+import static seedu.address.logic.commands.DeleteDetailCommand.MESSAGE_BAD_DETAIL_INDEX;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
+import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
+import static seedu.address.testutil.TypicalStudents.ALICE;
+import static seedu.address.testutil.TypicalStudents.BENSON;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.admin.Detail;
+import seedu.address.testutil.StudentBuilder;
+
+public class DeleteDetailCommandTest {
+
+ //@@author VaishakAnand
+ private static final Index TEST_INDEX_FIRST_STUDENT = INDEX_FIRST_PERSON;
+ private static final Index TEST_INDEX_SECOND_STUDENT = INDEX_SECOND_PERSON;
+ private static final Index TEST_INDEX_FIRST_DETAIL = INDEX_FIRST_PERSON;
+ private static final Index TEST_INDEX_SECOND_DETAIL = INDEX_SECOND_PERSON;
+ private static final String TEST_DETAIL = "eats flies";
+
+ private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+
+ // both arguments null
+ assertThrows(NullPointerException.class, () ->
+ new DeleteDetailCommand(null, null));
+
+ // one argument null
+ assertThrows(NullPointerException.class, () ->
+ new DeleteDetailCommand(null, TEST_INDEX_FIRST_STUDENT));
+ assertThrows(NullPointerException.class, () ->
+ new DeleteDetailCommand(TEST_INDEX_FIRST_STUDENT, null));
+ }
+
+ @Test
+ public void execute_validStudentIndexUnfilteredList_success() {
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student clone = new StudentBuilder(asker).withDetails(TEST_DETAIL).build();
+ Detail detail = new Detail(TEST_DETAIL);
+ DeleteDetailCommand deleteDetailCommand =
+ new DeleteDetailCommand(TEST_INDEX_FIRST_STUDENT, TEST_INDEX_FIRST_DETAIL);
+ Student expectedStudent = new StudentBuilder(ALICE).withDetails().build();
+ model.setStudent(asker, clone);
+
+ String expectedMessage = String.format(DeleteDetailCommand.MESSAGE_SUCCESS,
+ clone.getName(), detail);
+
+ ModelManager expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), getTypicalNotebook());
+ expectedModel.setStudent(clone, expectedStudent);
+
+ assertCommandSuccess(deleteDetailCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidStudentIndexUnfilteredList_throwsCommandException() {
+ Index outOfBoundsStudentIndex = Index.fromOneBased(model.getSortedStudentList().size() + 1);
+ DeleteDetailCommand command = new DeleteDetailCommand(outOfBoundsStudentIndex,
+ TEST_INDEX_FIRST_DETAIL);
+ assertCommandFailure(command, model, MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_invalidDetailIndexUnfilteredList_throwsCommandException() {
+ Index outOfBoundsDetailIndex =
+ Index.fromOneBased(model.getSortedStudentList().get(0).getDetails().size() + 1);
+ DeleteDetailCommand invalidCommand = new DeleteDetailCommand(TEST_INDEX_FIRST_STUDENT,
+ outOfBoundsDetailIndex);
+
+ assertCommandFailure(invalidCommand, model, MESSAGE_BAD_DETAIL_INDEX);
+ }
+
+ @Test
+ public void execute_validStudentIndexFilteredList_throwsCommandException() {
+ showPersonAtIndex(model, INDEX_SECOND_PERSON);
+
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Detail detail = new Detail(TEST_DETAIL);
+ Student clone = new StudentBuilder(asker).withDetails(TEST_DETAIL).build();
+ model.setStudent(asker, clone);
+
+ DeleteDetailCommand command = new DeleteDetailCommand(INDEX_FIRST_PERSON,
+ TEST_INDEX_FIRST_DETAIL);
+ Student expectedStudent = new StudentBuilder(BENSON).withDetails().build();
+
+ String expectedMessage = String.format(DeleteDetailCommand.MESSAGE_SUCCESS,
+ clone.getName(), detail);
+
+ ModelManager expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), getTypicalNotebook());
+ expectedModel.setStudent(clone, expectedStudent);
+ showPersonAtIndex(expectedModel, INDEX_SECOND_PERSON);
+
+ assertCommandSuccess(command, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidStudentIndexFilteredList_throwsCommandException() {
+ showPersonAtIndex(model, INDEX_SECOND_PERSON);
+
+ Index outOfBoundsStudentIndex = INDEX_SECOND_PERSON;
+ DeleteDetailCommand invalidCommand = new DeleteDetailCommand(outOfBoundsStudentIndex,
+ TEST_INDEX_FIRST_DETAIL);
+
+ assertCommandFailure(invalidCommand, model, MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_invalidDetailIndexFilteredList_throwsCommandException() {
+ showPersonAtIndex(model, INDEX_SECOND_PERSON);
+
+ Index outOfBoundsDetailIndex =
+ Index.fromOneBased(model.getSortedStudentList().get(0).getDetails().size() + 1);
+ DeleteDetailCommand invalidCommand =
+ new DeleteDetailCommand(TEST_INDEX_FIRST_STUDENT, outOfBoundsDetailIndex);
+
+ assertCommandFailure(invalidCommand, model, MESSAGE_BAD_DETAIL_INDEX);
+ }
+
+ @Test
+ public void equals() {
+ DeleteDetailCommand deleteDetailCommand =
+ new DeleteDetailCommand(INDEX_FIRST_PERSON, TEST_INDEX_FIRST_DETAIL);
+
+ // same object -> return true;
+ assertTrue(deleteDetailCommand.equals(deleteDetailCommand));
+
+ // different object -> return false;
+ assertFalse(deleteDetailCommand.equals("hello"));
+
+ // same fields -> return true;
+ assertTrue(deleteDetailCommand.equals(new DeleteDetailCommand(INDEX_FIRST_PERSON,
+ TEST_INDEX_FIRST_DETAIL)));
+
+ // different student index -> return false;
+ assertFalse(deleteDetailCommand.equals(new DeleteDetailCommand(INDEX_SECOND_PERSON,
+ TEST_INDEX_FIRST_DETAIL)));
+
+ // different detail index -> return false;
+ Detail altDetail = new Detail("he watches birds");
+ assertFalse(deleteDetailCommand.equals(new DeleteDetailCommand(INDEX_FIRST_PERSON,
+ TEST_INDEX_SECOND_DETAIL)));
+ }
+}
diff --git a/src/test/java/seedu/address/logic/commands/DeleteExamCommandTest.java b/src/test/java/seedu/address/logic/commands/DeleteExamCommandTest.java
new file mode 100644
index 00000000000..9b97acc9418
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/DeleteExamCommandTest.java
@@ -0,0 +1,153 @@
+package seedu.address.logic.commands;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX;
+import static seedu.address.commons.util.DateUtil.parseToDate;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
+import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
+import static seedu.address.testutil.TypicalStudents.ALICE;
+import static seedu.address.testutil.TypicalStudents.BENSON;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.academic.exam.Exam;
+import seedu.address.model.student.academic.exam.Score;
+import seedu.address.testutil.StudentBuilder;
+
+public class DeleteExamCommandTest {
+ private static final Index TEST_INDEX_FIRST_EXAM = INDEX_FIRST_PERSON;
+ private static final Index TEST_INDEX_SECOND_EXAM = INDEX_SECOND_PERSON;
+
+ private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+ private Exam dummyExam = new Exam("Mid Year 2020", parseToDate("26/7/2020"), new Score("26/50"));
+
+ @Test
+ public void constructors_null_throwsNullPointerException() {
+
+ // both arguments null
+ assertThrows(NullPointerException.class, () ->
+ new DeleteExamCommand(null, null));
+
+ // one argument null
+ assertThrows(NullPointerException.class, () ->
+ new DeleteExamCommand(null, INDEX_FIRST_PERSON));
+ assertThrows(NullPointerException.class, () ->
+ new DeleteExamCommand(INDEX_FIRST_PERSON, null));
+ }
+
+ @Test
+ public void execute_validStudentIndexUnfilteredList_success() {
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student clone = new StudentBuilder(asker).withExams(dummyExam).build();
+ DeleteExamCommand deleteExamCommand =
+ new DeleteExamCommand(INDEX_FIRST_PERSON, TEST_INDEX_FIRST_EXAM);
+ Student expectedStudent = new StudentBuilder(ALICE).withExams().build();
+ model.setStudent(asker, clone);
+
+ String expectedMessage = String.format(DeleteExamCommand.MESSAGE_EXAM_DELETED_SUCCESS,
+ expectedStudent.getName(), dummyExam);
+
+ ModelManager expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), model.getNotebook());
+ expectedModel.setStudent(clone, expectedStudent);
+
+ assertCommandSuccess(deleteExamCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidStudentIndexUnfilteredList_throwsCommandException() {
+ Index outOfBoundsStudentIndex = Index.fromOneBased(model.getSortedStudentList().size() + 1);
+ DeleteExamCommand command = new DeleteExamCommand(outOfBoundsStudentIndex,
+ TEST_INDEX_FIRST_EXAM);
+ assertCommandFailure(command, model, MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_invalidExamIndexUnfilteredList_throwsCommandException() {
+ Index outOfBoundsExamIndex = Index.fromOneBased(model.getSortedStudentList().get(0).getExams().size() + 1);
+ DeleteExamCommand invalidCommand = new DeleteExamCommand(INDEX_FIRST_PERSON,
+ outOfBoundsExamIndex);
+
+ assertCommandFailure(invalidCommand, model, DeleteExamCommand.MESSAGE_MISSING_EXAM_INDEX);
+ }
+
+ @Test
+ public void execute_validStudentIndexFilteredList_success() {
+ showPersonAtIndex(model, INDEX_SECOND_PERSON);
+
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student clone = new StudentBuilder(asker).withExams(dummyExam).build();
+ model.setStudent(asker, clone);
+
+ DeleteExamCommand command = new DeleteExamCommand(INDEX_FIRST_PERSON,
+ TEST_INDEX_FIRST_EXAM);
+ Student expectedStudent = new StudentBuilder(BENSON).withExams().build();
+
+ String expectedMessage = String.format(DeleteExamCommand.MESSAGE_EXAM_DELETED_SUCCESS,
+ clone.getName(), dummyExam);
+
+ ModelManager expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), model.getNotebook());
+ expectedModel.setStudent(clone, expectedStudent);
+ showPersonAtIndex(expectedModel, INDEX_SECOND_PERSON);
+
+ assertCommandSuccess(command, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidStudentIndexFilteredList_throwsCommandException() {
+ showPersonAtIndex(model, INDEX_SECOND_PERSON);
+
+ Index outOfBoundsStudentIndex = INDEX_SECOND_PERSON;
+ DeleteExamCommand invalidCommand = new DeleteExamCommand(outOfBoundsStudentIndex,
+ TEST_INDEX_FIRST_EXAM);
+
+ assertCommandFailure(invalidCommand, model, MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_invalidExamIndexFilteredList_throwsCommandException() {
+ showPersonAtIndex(model, INDEX_SECOND_PERSON);
+
+ Index outOfBoundsExamIndex = Index.fromOneBased(model.getSortedStudentList().get(0).getExams().size() + 1);
+ DeleteExamCommand invalidCommand = new DeleteExamCommand(TEST_INDEX_FIRST_EXAM,
+ outOfBoundsExamIndex);
+
+ assertCommandFailure(invalidCommand, model, DeleteExamCommand.MESSAGE_MISSING_EXAM_INDEX);
+ }
+
+ @Test
+ public void equals() {
+ DeleteExamCommand deleteExamCommand =
+ new DeleteExamCommand(INDEX_FIRST_PERSON, TEST_INDEX_FIRST_EXAM);
+
+ // same object -> return true;
+ assertEquals(deleteExamCommand, deleteExamCommand);
+
+ // different object -> return false;
+ assertNotEquals("hello", deleteExamCommand);
+
+ // same fields -> return true;
+ assertEquals(deleteExamCommand, new DeleteExamCommand(INDEX_FIRST_PERSON,
+ TEST_INDEX_FIRST_EXAM));
+
+ // different student index -> return false;
+ assertFalse(deleteExamCommand.equals(new DeleteExamCommand(INDEX_SECOND_PERSON,
+ TEST_INDEX_FIRST_EXAM)));
+
+ // different exam index -> return false;
+ assertFalse(deleteExamCommand.equals(new DeleteExamCommand(INDEX_FIRST_PERSON,
+ TEST_INDEX_SECOND_EXAM)));
+ }
+}
diff --git a/src/test/java/seedu/address/logic/commands/DeleteQuestionCommandTest.java b/src/test/java/seedu/address/logic/commands/DeleteQuestionCommandTest.java
new file mode 100644
index 00000000000..53122239e2f
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/DeleteQuestionCommandTest.java
@@ -0,0 +1,154 @@
+package seedu.address.logic.commands;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX;
+import static seedu.address.logic.commands.CommandTestUtil.TEST_QUESTIONS;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
+import static seedu.address.logic.commands.DeleteQuestionCommand.MESSAGE_BAD_QUESTION_INDEX;
+import static seedu.address.logic.commands.DeleteQuestionCommand.MESSAGE_SUCCESS;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.StudentBuilder.DEFAULT_SOLUTION;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
+import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.academic.question.Question;
+import seedu.address.testutil.StudentBuilder;
+
+public class DeleteQuestionCommandTest {
+
+ private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ Index questionIndex = Index.fromOneBased(1);
+
+ // both null
+ assertThrows(NullPointerException.class, () -> new DeleteQuestionCommand(null, null));
+
+ // one null
+ assertThrows(NullPointerException.class, () -> new DeleteQuestionCommand(null, questionIndex));
+ assertThrows(NullPointerException.class, () -> new DeleteQuestionCommand(INDEX_FIRST_PERSON, null));
+ }
+
+ @Test
+ public void execute_validIndicesUnsolved_success() {
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student clone = new StudentBuilder(asker).withQuestions(TEST_QUESTIONS).build();
+ model.setStudent(asker, clone);
+
+ Index questionIndex = Index.fromOneBased(1);
+ Question removed = clone.getQuestions().get(questionIndex.getZeroBased());
+
+ Student expected = deleteQuestion(questionIndex, clone);
+ Model expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), getTypicalNotebook());
+ expectedModel.setStudent(clone, expected);
+
+ DeleteQuestionCommand command = new DeleteQuestionCommand(INDEX_FIRST_PERSON, questionIndex);
+ String expectedMessage = String.format(MESSAGE_SUCCESS, expected.getName(), removed);
+ assertCommandSuccess(command, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_validIndicesSolved_success() {
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student clone = new StudentBuilder(asker).withSolved(DEFAULT_SOLUTION, TEST_QUESTIONS).build();
+ model.setStudent(asker, clone);
+
+ Index questionIndex = Index.fromOneBased(2);
+ Question removed = clone.getQuestions().get(questionIndex.getZeroBased());
+
+ Student expected = deleteQuestion(questionIndex, clone);
+ Model expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), getTypicalNotebook());
+ expectedModel.setStudent(clone, expected);
+
+ DeleteQuestionCommand command = new DeleteQuestionCommand(INDEX_FIRST_PERSON, questionIndex);
+ String expectedMessage = String.format(MESSAGE_SUCCESS, expected.getName(), removed);
+ assertCommandSuccess(command, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_validIndicesFilteredList_success() {
+ showPersonAtIndex(model, INDEX_FIRST_PERSON);
+
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student clone = new StudentBuilder(asker).withSolved(DEFAULT_SOLUTION, TEST_QUESTIONS).build();
+ model.setStudent(asker, clone);
+ Index questionIndex = Index.fromOneBased(2);
+ Question removed = clone.getQuestions().get(questionIndex.getZeroBased());
+
+ Student expected = deleteQuestion(questionIndex, clone);
+ Model expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), getTypicalNotebook());
+ expectedModel.setStudent(clone, expected);
+ showPersonAtIndex(expectedModel, INDEX_FIRST_PERSON);
+
+ DeleteQuestionCommand command = new DeleteQuestionCommand(INDEX_FIRST_PERSON, questionIndex);
+ String expectedMessage = String.format(MESSAGE_SUCCESS, expected.getName(), removed);
+ assertCommandSuccess(command, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidStudentUnfilteredList_throwsCommandException() {
+ Index outOfBounds = Index.fromZeroBased(model.getSortedStudentList().size());
+ Index question = Index.fromZeroBased(0);
+ DeleteQuestionCommand invalidCommand = new DeleteQuestionCommand(outOfBounds, question);
+ assertCommandFailure(invalidCommand, model, MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_invalidStudentFilteredList_throwsCommandException() {
+ showPersonAtIndex(model, INDEX_FIRST_PERSON);
+
+ Index question = Index.fromZeroBased(0);
+ DeleteQuestionCommand invalidCommand = new DeleteQuestionCommand(INDEX_SECOND_PERSON, question);
+ assertCommandFailure(invalidCommand, model, MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_invalidQuestionIndex_success() {
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student clone = new StudentBuilder(asker).withSolved(DEFAULT_SOLUTION, TEST_QUESTIONS).build();
+ model.setStudent(asker, clone);
+
+ Index questionIndex = Index.fromZeroBased(TEST_QUESTIONS.length);
+ DeleteQuestionCommand command = new DeleteQuestionCommand(INDEX_FIRST_PERSON, questionIndex);
+
+ assertCommandFailure(command, model, MESSAGE_BAD_QUESTION_INDEX);
+ }
+
+ @Test
+ public void equals() {
+ Index question = Index.fromOneBased(1);
+ DeleteQuestionCommand command = new DeleteQuestionCommand(INDEX_FIRST_PERSON, question);
+
+ // same obj -> return true
+ assertTrue(command.equals(command));
+
+ // same fields -> return true
+ assertTrue(command.equals(new DeleteQuestionCommand(INDEX_FIRST_PERSON, question)));
+
+ // different fields -> return false
+ assertFalse(command.equals(new DeleteQuestionCommand(INDEX_SECOND_PERSON, question)));
+ assertFalse(command.equals(new DeleteQuestionCommand(INDEX_FIRST_PERSON, Index.fromOneBased(2))));
+ }
+
+ private Student deleteQuestion(Index index, Student toCopy) {
+ List<Question> questions = toCopy.getQuestions();
+ questions.remove(index.getZeroBased());
+ return new Student(toCopy.getName(), toCopy.getPhone(), toCopy.getSchool(), toCopy.getYear(),
+ toCopy.getAdmin(), questions, toCopy.getExams(), toCopy.getAttendance());
+ }
+}
diff --git a/src/test/java/seedu/address/logic/commands/EditCommandTest.java b/src/test/java/seedu/address/logic/commands/EditCommandTest.java
index 1c27530fa99..fa1e60fc892 100644
--- a/src/test/java/seedu/address/logic/commands/EditCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/EditCommandTest.java
@@ -4,79 +4,88 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import static seedu.address.logic.commands.CommandTestUtil.DESC_AMY;
import static seedu.address.logic.commands.CommandTestUtil.DESC_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_FEE_BOB;
import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_SCHOOL_BOB;
import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
import org.junit.jupiter.api.Test;
import seedu.address.commons.core.Messages;
import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
-import seedu.address.model.AddressBook;
+import seedu.address.logic.commands.EditCommand.EditAdminDescriptor;
+import seedu.address.logic.commands.EditCommand.EditStudentDescriptor;
import seedu.address.model.Model;
import seedu.address.model.ModelManager;
+import seedu.address.model.Reeve;
import seedu.address.model.UserPrefs;
-import seedu.address.model.person.Person;
-import seedu.address.testutil.EditPersonDescriptorBuilder;
-import seedu.address.testutil.PersonBuilder;
+import seedu.address.model.student.Student;
+import seedu.address.testutil.EditAdminDescriptorBuilder;
+import seedu.address.testutil.EditStudentDescriptorBuilder;
+import seedu.address.testutil.StudentBuilder;
/**
- * Contains integration tests (interaction with the Model, UndoCommand and RedoCommand) and unit tests for EditCommand.
+ * Contains integration tests (interaction with the Model) and unit tests for EditCommand.
*/
public class EditCommandTest {
- private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+ private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
@Test
public void execute_allFieldsSpecifiedUnfilteredList_success() {
- Person editedPerson = new PersonBuilder().build();
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder(editedPerson).build();
- EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON, descriptor);
+ Student editedStudent = new StudentBuilder().build();
+ EditStudentDescriptor editStudentDescriptor = new EditStudentDescriptorBuilder(editedStudent).build();
+ EditAdminDescriptor editAdminDescriptor = new EditAdminDescriptorBuilder(editedStudent).build();
+ EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON, editStudentDescriptor, editAdminDescriptor);
- String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedPerson);
+ String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedStudent);
+
+ Model expectedModel = new ModelManager(new Reeve(model.getReeve()), new UserPrefs(), getTypicalNotebook());
+ expectedModel.setStudent(model.getFilteredStudentList().get(INDEX_FIRST_PERSON.getZeroBased()), editedStudent);
- Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
- expectedModel.setPerson(model.getFilteredPersonList().get(0), editedPerson);
assertCommandSuccess(editCommand, model, expectedMessage, expectedModel);
}
@Test
public void execute_someFieldsSpecifiedUnfilteredList_success() {
- Index indexLastPerson = Index.fromOneBased(model.getFilteredPersonList().size());
- Person lastPerson = model.getFilteredPersonList().get(indexLastPerson.getZeroBased());
+ Index indexLastPerson = Index.fromOneBased(model.getSortedStudentList().size());
+ Student lastStudent = model.getSortedStudentList().get(indexLastPerson.getZeroBased());
- PersonBuilder personInList = new PersonBuilder(lastPerson);
- Person editedPerson = personInList.withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB)
- .withTags(VALID_TAG_HUSBAND).build();
+ StudentBuilder personInList = new StudentBuilder(lastStudent);
+ Student editedStudent = personInList.withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB).withFee(VALID_FEE_BOB)
+ .build();
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB)
- .withPhone(VALID_PHONE_BOB).withTags(VALID_TAG_HUSBAND).build();
- EditCommand editCommand = new EditCommand(indexLastPerson, descriptor);
+ EditStudentDescriptor editStudentDescriptor = new EditStudentDescriptorBuilder().withName(VALID_NAME_BOB)
+ .withPhone(VALID_PHONE_BOB).build();
+ EditAdminDescriptor editAdminDescriptor = new EditAdminDescriptorBuilder(editedStudent).withFee(VALID_FEE_BOB)
+ .build();
+ EditCommand editCommand = new EditCommand(indexLastPerson, editStudentDescriptor, editAdminDescriptor);
- String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedPerson);
+ String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedStudent);
- Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
- expectedModel.setPerson(lastPerson, editedPerson);
+ Model expectedModel = new ModelManager(new Reeve(model.getReeve()), new UserPrefs(), getTypicalNotebook());
+ expectedModel.setStudent(lastStudent, editedStudent);
assertCommandSuccess(editCommand, model, expectedMessage, expectedModel);
}
@Test
public void execute_noFieldSpecifiedUnfilteredList_success() {
- EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON, new EditPersonDescriptor());
- Person editedPerson = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
+ EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON, new EditStudentDescriptor(),
+ new EditAdminDescriptor());
+ Student editedStudent = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
- String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedPerson);
+ String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedStudent);
- Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
+ Model expectedModel = new ModelManager(new Reeve(model.getReeve()), new UserPrefs(), getTypicalNotebook());
assertCommandSuccess(editCommand, model, expectedMessage, expectedModel);
}
@@ -85,24 +94,28 @@ public void execute_noFieldSpecifiedUnfilteredList_success() {
public void execute_filteredList_success() {
showPersonAtIndex(model, INDEX_FIRST_PERSON);
- Person personInFilteredList = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
- Person editedPerson = new PersonBuilder(personInFilteredList).withName(VALID_NAME_BOB).build();
+ Student studentInSortedList = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student editedStudent = new StudentBuilder(studentInSortedList).withSchool(VALID_SCHOOL_BOB)
+ .withFee(VALID_FEE_BOB).build();
EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON,
- new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB).build());
+ new EditStudentDescriptorBuilder().withSchool(VALID_SCHOOL_BOB).build(),
+ new EditAdminDescriptorBuilder().withFee(VALID_FEE_BOB).build());
- String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedPerson);
+ String expectedMessage = String.format(EditCommand.MESSAGE_EDIT_PERSON_SUCCESS, editedStudent);
- Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs());
- expectedModel.setPerson(model.getFilteredPersonList().get(0), editedPerson);
+ Model expectedModel = new ModelManager(new Reeve(model.getReeve()), new UserPrefs(), getTypicalNotebook());
+ expectedModel.setStudent(studentInSortedList, editedStudent);
+ showPersonAtIndex(expectedModel, INDEX_FIRST_PERSON);
assertCommandSuccess(editCommand, model, expectedMessage, expectedModel);
}
@Test
public void execute_duplicatePersonUnfilteredList_failure() {
- Person firstPerson = model.getFilteredPersonList().get(INDEX_FIRST_PERSON.getZeroBased());
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder(firstPerson).build();
- EditCommand editCommand = new EditCommand(INDEX_SECOND_PERSON, descriptor);
+ Student firstStudent = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ EditStudentDescriptor editStudentDescriptor = new EditStudentDescriptorBuilder(firstStudent).build();
+ EditAdminDescriptor editAdminDescriptor = new EditAdminDescriptorBuilder(firstStudent).build();
+ EditCommand editCommand = new EditCommand(INDEX_SECOND_PERSON, editStudentDescriptor, editAdminDescriptor);
assertCommandFailure(editCommand, model, EditCommand.MESSAGE_DUPLICATE_PERSON);
}
@@ -112,20 +125,23 @@ public void execute_duplicatePersonFilteredList_failure() {
showPersonAtIndex(model, INDEX_FIRST_PERSON);
// edit person in filtered list into a duplicate in address book
- Person personInList = model.getAddressBook().getPersonList().get(INDEX_SECOND_PERSON.getZeroBased());
+ Student studentInList = model.getReeve().getStudentList().get(INDEX_SECOND_PERSON.getZeroBased());
EditCommand editCommand = new EditCommand(INDEX_FIRST_PERSON,
- new EditPersonDescriptorBuilder(personInList).build());
+ new EditStudentDescriptorBuilder(studentInList).build(),
+ new EditAdminDescriptorBuilder(studentInList).build());
assertCommandFailure(editCommand, model, EditCommand.MESSAGE_DUPLICATE_PERSON);
}
@Test
public void execute_invalidPersonIndexUnfilteredList_failure() {
- Index outOfBoundIndex = Index.fromOneBased(model.getFilteredPersonList().size() + 1);
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB).build();
- EditCommand editCommand = new EditCommand(outOfBoundIndex, descriptor);
+ Index outOfBoundIndex = Index.fromOneBased(model.getSortedStudentList().size() + 1);
+ EditStudentDescriptor editStudentDescriptor = new EditStudentDescriptorBuilder()
+ .withName(VALID_NAME_BOB).build();
+ EditAdminDescriptor editAdminDescriptor = new EditAdminDescriptorBuilder().build();
+ EditCommand editCommand = new EditCommand(outOfBoundIndex, editStudentDescriptor, editAdminDescriptor);
- assertCommandFailure(editCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+ assertCommandFailure(editCommand, model, Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
}
/**
@@ -137,21 +153,37 @@ public void execute_invalidPersonIndexFilteredList_failure() {
showPersonAtIndex(model, INDEX_FIRST_PERSON);
Index outOfBoundIndex = INDEX_SECOND_PERSON;
// ensures that outOfBoundIndex is still in bounds of address book list
- assertTrue(outOfBoundIndex.getZeroBased() < model.getAddressBook().getPersonList().size());
+ assertTrue(outOfBoundIndex.getZeroBased() < model.getReeve().getStudentList().size());
EditCommand editCommand = new EditCommand(outOfBoundIndex,
- new EditPersonDescriptorBuilder().withName(VALID_NAME_BOB).build());
+ new EditStudentDescriptorBuilder().withName(VALID_NAME_BOB).build(),
+ new EditAdminDescriptorBuilder().build());
+
+ assertCommandFailure(editCommand, model, Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_clashingClassTimeUnfilteredList_failure() {
+ String clash = getClassTimeInputString();
+ assertEditClassTimeFailure(clash);
+ }
- assertCommandFailure(editCommand, model, Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
+ @Test
+ public void execute_clashingClassTimeFilteredList_failure() {
+ String clash = getClassTimeInputString();
+ showPersonAtIndex(model, INDEX_FIRST_PERSON);
+ assertEditClassTimeFailure(clash);
}
@Test
public void equals() {
- final EditCommand standardCommand = new EditCommand(INDEX_FIRST_PERSON, DESC_AMY);
+ final EditCommand standardCommand = new EditCommand(INDEX_FIRST_PERSON, DESC_AMY,
+ new EditAdminDescriptorBuilder().build());
// same values -> returns true
- EditPersonDescriptor copyDescriptor = new EditPersonDescriptor(DESC_AMY);
- EditCommand commandWithSameValues = new EditCommand(INDEX_FIRST_PERSON, copyDescriptor);
+ EditStudentDescriptor copyStudentDescriptor = new EditStudentDescriptor(DESC_AMY);
+ EditCommand commandWithSameValues = new EditCommand(INDEX_FIRST_PERSON, copyStudentDescriptor,
+ new EditAdminDescriptorBuilder().build());
assertTrue(standardCommand.equals(commandWithSameValues));
// same object -> returns true
@@ -164,10 +196,29 @@ public void equals() {
assertFalse(standardCommand.equals(new ClearCommand()));
// different index -> returns false
- assertFalse(standardCommand.equals(new EditCommand(INDEX_SECOND_PERSON, DESC_AMY)));
+ assertFalse(standardCommand.equals(new EditCommand(INDEX_SECOND_PERSON, DESC_AMY,
+ new EditAdminDescriptorBuilder().build())));
// different descriptor -> returns false
- assertFalse(standardCommand.equals(new EditCommand(INDEX_FIRST_PERSON, DESC_BOB)));
+ assertFalse(standardCommand.equals(new EditCommand(INDEX_FIRST_PERSON, DESC_BOB,
+ new EditAdminDescriptorBuilder().build())));
+ }
+
+ /**
+ * Tests that a class time clash error is thrown.
+ */
+ private void assertEditClassTimeFailure(String classTimeInput) {
+ EditStudentDescriptor descriptor = new EditStudentDescriptorBuilder().build();
+ EditAdminDescriptor adminDescriptor = new EditAdminDescriptorBuilder().withTime(classTimeInput).build();
+ EditCommand command = new EditCommand(INDEX_FIRST_PERSON, descriptor, adminDescriptor);
+
+ assertCommandFailure(command, model, Messages.MESSAGE_CLASHING_LESSON);
+ }
+
+ private String getClassTimeInputString() {
+ return model.getSortedStudentList().get(INDEX_SECOND_PERSON.getZeroBased())
+ .getClassTime()
+ .convertClassTimeToUserInputString();
}
}
diff --git a/src/test/java/seedu/address/logic/commands/EditDetailCommandTest.java b/src/test/java/seedu/address/logic/commands/EditDetailCommandTest.java
new file mode 100644
index 00000000000..6d6e44a9b60
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/EditDetailCommandTest.java
@@ -0,0 +1,183 @@
+package seedu.address.logic.commands;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
+import static seedu.address.logic.commands.EditDetailCommand.MESSAGE_BAD_DETAIL_INDEX;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
+import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
+import static seedu.address.testutil.TypicalStudents.ALICE;
+import static seedu.address.testutil.TypicalStudents.BENSON;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.admin.Detail;
+import seedu.address.testutil.StudentBuilder;
+
+public class EditDetailCommandTest {
+
+ //@@author VaishakAnand
+ private static final Index TEST_INDEX_FIRST_STUDENT = INDEX_FIRST_PERSON;
+ private static final Index TEST_INDEX_SECOND_STUDENT = INDEX_SECOND_PERSON;
+ private static final Index TEST_INDEX_FIRST_DETAIL = INDEX_FIRST_PERSON;
+ private static final Index TEST_INDEX_SECOND_DETAIL = INDEX_SECOND_PERSON;
+ private static final String TEST_CORRECT_DETAIL = "eats flies";
+ private static final String TEST_WRONG_DETAIL = "drinks flies";
+
+ private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+
+ // all 3 arguments null
+ assertThrows(NullPointerException.class, () ->
+ new EditDetailCommand(null, null, null));
+
+ // 2 arguments null
+ assertThrows(NullPointerException.class, () ->
+ new EditDetailCommand(TEST_INDEX_FIRST_STUDENT, null, null));
+ assertThrows(NullPointerException.class, () ->
+ new EditDetailCommand(null, TEST_INDEX_FIRST_DETAIL, null));
+ assertThrows(NullPointerException.class, () ->
+ new EditDetailCommand(null,
+ null, new Detail(TEST_CORRECT_DETAIL)));
+
+ // 1 argument null
+ assertThrows(NullPointerException.class, () ->
+ new EditDetailCommand(TEST_INDEX_FIRST_STUDENT, TEST_INDEX_FIRST_DETAIL, null));
+ assertThrows(NullPointerException.class, () ->
+ new EditDetailCommand(TEST_INDEX_FIRST_STUDENT,
+ null, new Detail(TEST_CORRECT_DETAIL)));
+ assertThrows(NullPointerException.class, () ->
+ new EditDetailCommand(null,
+ TEST_INDEX_FIRST_DETAIL, new Detail(TEST_CORRECT_DETAIL)));
+ }
+
+ @Test
+ public void execute_validStudentIndexUnfilteredList_success() {
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student clone = new StudentBuilder(asker).withDetails(TEST_WRONG_DETAIL).build();
+ Detail detail = new Detail(TEST_CORRECT_DETAIL);
+ EditDetailCommand editDetailCommand = new EditDetailCommand(
+ TEST_INDEX_FIRST_STUDENT, TEST_INDEX_FIRST_DETAIL, detail);
+ Student expectedStudent = new StudentBuilder(ALICE).withDetails(TEST_CORRECT_DETAIL).build();
+ model.setStudent(asker, clone);
+
+ String expectedMessage = String.format(EditDetailCommand.MESSAGE_SUCCESS,
+ clone.getName(), detail);
+
+ ModelManager expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), getTypicalNotebook());
+ expectedModel.setStudent(clone, expectedStudent);
+
+ assertCommandSuccess(editDetailCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidStudentIndexUnfilteredList_throwsCommandException() {
+ Index outOfBoundsStudentIndex = Index.fromOneBased(model.getSortedStudentList().size() + 1);
+ Detail detail = new Detail(TEST_CORRECT_DETAIL);
+ EditDetailCommand invalidCommand = new EditDetailCommand(
+ outOfBoundsStudentIndex, TEST_INDEX_FIRST_DETAIL, detail);
+
+ assertCommandFailure(invalidCommand, model, MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_invalidDetailIndexUnfilteredList_throwsCommandException() {
+ Index outOfBoundsDetailIndex =
+ Index.fromOneBased(model.getSortedStudentList().get(0).getDetails().size() + 1);
+ Detail detail = new Detail(TEST_CORRECT_DETAIL);
+ EditDetailCommand invalidCommand = new EditDetailCommand(
+ TEST_INDEX_FIRST_STUDENT, outOfBoundsDetailIndex, detail);
+
+ assertCommandFailure(invalidCommand, model, MESSAGE_BAD_DETAIL_INDEX);
+ }
+
+ @Test
+ public void execute_validStudentIndexFilteredList_success() {
+ showPersonAtIndex(model, INDEX_SECOND_PERSON);
+
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student clone = new StudentBuilder(asker).withDetails(TEST_WRONG_DETAIL).build();
+ Detail detail = new Detail(TEST_CORRECT_DETAIL);
+ EditDetailCommand editDetailCommand = new EditDetailCommand(
+ TEST_INDEX_FIRST_STUDENT, TEST_INDEX_FIRST_DETAIL, detail);
+ Student expectedStudent = new StudentBuilder(BENSON).withDetails(TEST_CORRECT_DETAIL).build();
+ model.setStudent(asker, clone);
+
+ String expectedMessage = String.format(EditDetailCommand.MESSAGE_SUCCESS,
+ clone.getName(), detail);
+
+ ModelManager expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), getTypicalNotebook());
+ expectedModel.setStudent(clone, expectedStudent);
+ showPersonAtIndex(expectedModel, INDEX_SECOND_PERSON);
+
+ assertCommandSuccess(editDetailCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidStudentIndexFilteredList_throwsCommandException() {
+ showPersonAtIndex(model, INDEX_SECOND_PERSON);
+
+ Index outOfBoundsStudentIndex = Index.fromOneBased(model.getSortedStudentList().size() + 1);
+ Detail detail = new Detail(TEST_CORRECT_DETAIL);
+ EditDetailCommand invalidCommand = new EditDetailCommand(
+ outOfBoundsStudentIndex, TEST_INDEX_FIRST_DETAIL, detail);
+
+ assertCommandFailure(invalidCommand, model, MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_invalidDetailIndexFilteredList_throwsCommandException() {
+ showPersonAtIndex(model, INDEX_SECOND_PERSON);
+
+ Index outOfBoundsDetailIndex =
+ Index.fromOneBased(model.getSortedStudentList().get(0).getDetails().size() + 1);
+ Detail detail = new Detail(TEST_CORRECT_DETAIL);
+ EditDetailCommand invalidCommand = new EditDetailCommand(
+ TEST_INDEX_FIRST_STUDENT, outOfBoundsDetailIndex, detail);
+
+ assertCommandFailure(invalidCommand, model, MESSAGE_BAD_DETAIL_INDEX);
+ }
+
+ @Test
+ public void equals() {
+ Detail testDetail = new Detail(TEST_CORRECT_DETAIL);
+ EditDetailCommand editDetailCommand =
+ new EditDetailCommand(TEST_INDEX_FIRST_STUDENT, TEST_INDEX_FIRST_DETAIL, testDetail);
+
+ // same object -> return true;
+ assertTrue(editDetailCommand.equals(editDetailCommand));
+
+ // different object -> return false;
+ assertFalse(editDetailCommand.equals("hello"));
+
+ // same fields -> return true;
+ assertTrue(editDetailCommand.equals(new EditDetailCommand(TEST_INDEX_FIRST_STUDENT,
+ TEST_INDEX_FIRST_DETAIL, testDetail)));
+
+ // different student index -> return false;
+ assertFalse(editDetailCommand.equals(new EditDetailCommand(TEST_INDEX_SECOND_STUDENT,
+ TEST_INDEX_FIRST_DETAIL, testDetail)));
+
+ // different detail index -> return false;
+ assertFalse(editDetailCommand.equals(new EditDetailCommand(TEST_INDEX_FIRST_STUDENT,
+ TEST_INDEX_SECOND_DETAIL, testDetail)));
+
+ // different detail -> return false;
+ assertFalse(editDetailCommand.equals(new EditDetailCommand(TEST_INDEX_FIRST_STUDENT,
+ TEST_INDEX_FIRST_DETAIL, new Detail(TEST_WRONG_DETAIL))));
+ }
+
+}
diff --git a/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java b/src/test/java/seedu/address/logic/commands/EditStudentDescriptorTest.java
similarity index 56%
rename from src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java
rename to src/test/java/seedu/address/logic/commands/EditStudentDescriptorTest.java
index e0288792e72..2edb103f991 100644
--- a/src/test/java/seedu/address/logic/commands/EditPersonDescriptorTest.java
+++ b/src/test/java/seedu/address/logic/commands/EditStudentDescriptorTest.java
@@ -4,23 +4,22 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import static seedu.address.logic.commands.CommandTestUtil.DESC_AMY;
import static seedu.address.logic.commands.CommandTestUtil.DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_SCHOOL_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_YEAR_AMY;
import org.junit.jupiter.api.Test;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
-import seedu.address.testutil.EditPersonDescriptorBuilder;
+import seedu.address.logic.commands.EditCommand.EditStudentDescriptor;
+import seedu.address.testutil.EditStudentDescriptorBuilder;
-public class EditPersonDescriptorTest {
+public class EditStudentDescriptorTest {
@Test
public void equals() {
// same values -> returns true
- EditPersonDescriptor descriptorWithSameValues = new EditPersonDescriptor(DESC_AMY);
+ EditStudentDescriptor descriptorWithSameValues = new EditStudentDescriptor(DESC_AMY);
assertTrue(DESC_AMY.equals(descriptorWithSameValues));
// same object -> returns true
@@ -36,23 +35,20 @@ public void equals() {
assertFalse(DESC_AMY.equals(DESC_BOB));
// different name -> returns false
- EditPersonDescriptor editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withName(VALID_NAME_BOB).build();
+ EditStudentDescriptor editedAmy = new EditStudentDescriptorBuilder(DESC_AMY).withName(VALID_NAME_BOB).build();
assertFalse(DESC_AMY.equals(editedAmy));
// different phone -> returns false
- editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withPhone(VALID_PHONE_BOB).build();
+ editedAmy = new EditStudentDescriptorBuilder(DESC_AMY).withPhone(VALID_PHONE_BOB).build();
assertFalse(DESC_AMY.equals(editedAmy));
- // different email -> returns false
- editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withEmail(VALID_EMAIL_BOB).build();
+ // different school -> returns false
+ editedAmy = new EditStudentDescriptorBuilder(DESC_AMY).withSchool(VALID_SCHOOL_BOB).build();
assertFalse(DESC_AMY.equals(editedAmy));
- // different address -> returns false
- editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withAddress(VALID_ADDRESS_BOB).build();
- assertFalse(DESC_AMY.equals(editedAmy));
-
- // different tags -> returns false
- editedAmy = new EditPersonDescriptorBuilder(DESC_AMY).withTags(VALID_TAG_HUSBAND).build();
+ // different year -> returns false
+ editedAmy = new EditStudentDescriptorBuilder(DESC_AMY)
+ .withYear(VALID_YEAR_AMY).build();
assertFalse(DESC_AMY.equals(editedAmy));
}
}
diff --git a/src/test/java/seedu/address/logic/commands/ExamStatsCommandTest.java b/src/test/java/seedu/address/logic/commands/ExamStatsCommandTest.java
new file mode 100644
index 00000000000..9bd5396b527
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/ExamStatsCommandTest.java
@@ -0,0 +1,59 @@
+package seedu.address.logic.commands;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
+import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.student.Student;
+import seedu.address.testutil.StudentBuilder;
+
+public class ExamStatsCommandTest {
+ private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+
+ @Test
+ public void execute_examStats_success() {
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student clone = new StudentBuilder(asker).build();
+
+ CommandResult expectedCommandResult =
+ new CommandResult(ExamStatsCommand.MESSAGE_EXAM_STATS_SUCCESS, false,
+ false, false, clone);
+ ModelManager expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), model.getNotebook());
+
+ assertCommandSuccess(new ExamStatsCommand(INDEX_FIRST_PERSON), model, expectedCommandResult, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidStudentIndexUnfilteredList_throwsCommandException() {
+ Index outOfBoundsStudentIndex = Index.fromOneBased(model.getSortedStudentList().size() + 1);
+ ExamStatsCommand command = new ExamStatsCommand(outOfBoundsStudentIndex);
+
+ assertCommandFailure(command, model, MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void equals() {
+ ExamStatsCommand testExamStatsCommand = new ExamStatsCommand(INDEX_FIRST_PERSON);
+
+ // same object -> return true;
+ assertTrue(testExamStatsCommand.equals(testExamStatsCommand));
+
+ // same index -> return true;
+ assertTrue(testExamStatsCommand.equals(new ExamStatsCommand(INDEX_FIRST_PERSON)));
+
+ // different index -> return false;
+ assertFalse(testExamStatsCommand.equals(new ExamStatsCommand(INDEX_SECOND_PERSON)));
+ }
+}
diff --git a/src/test/java/seedu/address/logic/commands/ExitCommandTest.java b/src/test/java/seedu/address/logic/commands/ExitCommandTest.java
index 9533c473875..19442f05612 100644
--- a/src/test/java/seedu/address/logic/commands/ExitCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/ExitCommandTest.java
@@ -14,7 +14,7 @@ public class ExitCommandTest {
@Test
public void execute_exit_success() {
- CommandResult expectedCommandResult = new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true);
+ CommandResult expectedCommandResult = new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, false, true, false, null);
assertCommandSuccess(new ExitCommand(), model, expectedCommandResult, expectedModel);
}
}
diff --git a/src/test/java/seedu/address/logic/commands/FindCommandTest.java b/src/test/java/seedu/address/logic/commands/FindCommandTest.java
index 9b15db28bbb..7217816902e 100644
--- a/src/test/java/seedu/address/logic/commands/FindCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/FindCommandTest.java
@@ -3,29 +3,39 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.commons.core.Messages.MESSAGE_PERSONS_LISTED_OVERVIEW;
+import static seedu.address.commons.core.Messages.MESSAGE_STUDENTS_LISTED_OVERVIEW;
import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.testutil.TypicalPersons.CARL;
-import static seedu.address.testutil.TypicalPersons.ELLE;
-import static seedu.address.testutil.TypicalPersons.FIONA;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalStudents.CARL;
+import static seedu.address.testutil.TypicalStudents.ELLE;
+import static seedu.address.testutil.TypicalStudents.FIONA;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.List;
+import java.util.function.Predicate;
import org.junit.jupiter.api.Test;
+import seedu.address.logic.parser.exceptions.ParseException;
import seedu.address.model.Model;
import seedu.address.model.ModelManager;
import seedu.address.model.UserPrefs;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
+import seedu.address.model.student.NameContainsKeywordsPredicate;
+import seedu.address.model.student.SchoolContainsKeywordsPredicate;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.Year;
+import seedu.address.model.student.YearMatchPredicate;
+import seedu.address.testutil.FindStudentDescriptorBuilder;
/**
* Contains integration tests (interaction with the Model) for {@code FindCommand}.
*/
public class FindCommandTest {
- private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
- private Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+ private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+ private Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
@Test
public void equals() {
@@ -34,14 +44,19 @@ public void equals() {
NameContainsKeywordsPredicate secondPredicate =
new NameContainsKeywordsPredicate(Collections.singletonList("second"));
- FindCommand findFirstCommand = new FindCommand(firstPredicate);
- FindCommand findSecondCommand = new FindCommand(secondPredicate);
+ FindCommand.FindStudentDescriptor firstDescriptor =
+ new FindStudentDescriptorBuilder().withNamePredicate(firstPredicate).build();
+ FindCommand.FindStudentDescriptor secondDescriptor =
+ new FindStudentDescriptorBuilder().withNamePredicate(secondPredicate).build();
+
+ FindCommand findFirstCommand = new FindCommand(firstDescriptor);
+ FindCommand findSecondCommand = new FindCommand(secondDescriptor);
// same object -> returns true
assertTrue(findFirstCommand.equals(findFirstCommand));
// same values -> returns true
- FindCommand findFirstCommandCopy = new FindCommand(firstPredicate);
+ FindCommand findFirstCommandCopy = new FindCommand(firstDescriptor);
assertTrue(findFirstCommand.equals(findFirstCommandCopy));
// different types -> returns false
@@ -56,28 +71,95 @@ public void equals() {
@Test
public void execute_zeroKeywords_noPersonFound() {
- String expectedMessage = String.format(MESSAGE_PERSONS_LISTED_OVERVIEW, 0);
- NameContainsKeywordsPredicate predicate = preparePredicate(" ");
- FindCommand command = new FindCommand(predicate);
- expectedModel.updateFilteredPersonList(predicate);
+ String expectedMessage = String.format(MESSAGE_STUDENTS_LISTED_OVERVIEW, 0);
+ NameContainsKeywordsPredicate predicate = prepareNamePredicate(" ");
+ expectedModel.updateFilteredStudentList(predicate);
+
+ FindCommand command = new FindCommand(new FindStudentDescriptorBuilder()
+ .withNamePredicate(predicate).build());
assertCommandSuccess(command, model, expectedMessage, expectedModel);
- assertEquals(Collections.emptyList(), model.getFilteredPersonList());
+ assertEquals(Collections.emptyList(), model.getSortedStudentList());
}
@Test
public void execute_multipleKeywords_multiplePersonsFound() {
- String expectedMessage = String.format(MESSAGE_PERSONS_LISTED_OVERVIEW, 3);
- NameContainsKeywordsPredicate predicate = preparePredicate("Kurz Elle Kunz");
- FindCommand command = new FindCommand(predicate);
- expectedModel.updateFilteredPersonList(predicate);
+ String expectedMessage = String.format(MESSAGE_STUDENTS_LISTED_OVERVIEW, 3);
+ NameContainsKeywordsPredicate predicate = prepareNamePredicate("Kurz Elle Kunz");
+ expectedModel.updateFilteredStudentList(predicate);
+
+ FindCommand command = new FindCommand(new FindStudentDescriptorBuilder()
+ .withNamePredicate(predicate).build());
+
+ assertCommandSuccess(command, model, expectedMessage, expectedModel);
+ assertEquals(Arrays.asList(CARL, ELLE, FIONA), model.getSortedStudentList());
+ }
+
+ @Test
+ public void execute_multiplePredicates_oneStudentsFound() throws ParseException {
+ String expectedMessage = String.format(MESSAGE_STUDENTS_LISTED_OVERVIEW, 1);
+ NameContainsKeywordsPredicate namePredicate = prepareNamePredicate("Kurz Elle Kunz");
+ SchoolContainsKeywordsPredicate schoolPredicate = prepareSchoolPredicate("Girls School");
+ YearMatchPredicate yearMatchPredicate = prepareYearPredicate("Sec 2");
+ List<Predicate<Student>> predicates = Arrays.asList(namePredicate,
+ schoolPredicate, yearMatchPredicate);
+ Predicate<Student> consolidatedPredicates = consolidatePredicates(predicates);
+ expectedModel.updateFilteredStudentList(consolidatedPredicates);
+
+ FindCommand.FindStudentDescriptor descriptor = new FindStudentDescriptorBuilder()
+ .withNamePredicate(namePredicate).withSchoolPredicate(schoolPredicate)
+ .withYearPredicate(yearMatchPredicate).build();
+ FindCommand command = new FindCommand(descriptor);
+
+ assertCommandSuccess(command, model, expectedMessage, expectedModel);
+ assertEquals(Arrays.asList(FIONA), model.getSortedStudentList());
+ }
+
+ @Test
+ public void execute_multiplePredicates_noStudentFound() throws ParseException {
+ String expectedMessage = String.format(MESSAGE_STUDENTS_LISTED_OVERVIEW, 0);
+ NameContainsKeywordsPredicate namePredicate = prepareNamePredicate("Kurz Elle Kunz");
+ SchoolContainsKeywordsPredicate schoolPredicate = prepareSchoolPredicate("Girls School");
+ YearMatchPredicate yearMatchPredicate = prepareYearPredicate("Sec 3");
+ List<Predicate<Student>> predicates = Arrays.asList(namePredicate,
+ schoolPredicate, yearMatchPredicate);
+ Predicate<Student> consolidatedPredicates = consolidatePredicates(predicates);
+ expectedModel.updateFilteredStudentList(consolidatedPredicates);
+
+ FindCommand.FindStudentDescriptor descriptor = new FindStudentDescriptorBuilder()
+ .withNamePredicate(namePredicate).withSchoolPredicate(schoolPredicate)
+ .withYearPredicate(yearMatchPredicate).build();
+ FindCommand command = new FindCommand(descriptor);
+
assertCommandSuccess(command, model, expectedMessage, expectedModel);
- assertEquals(Arrays.asList(CARL, ELLE, FIONA), model.getFilteredPersonList());
+ assertEquals(new ArrayList<>(), model.getSortedStudentList());
}
/**
* Parses {@code userInput} into a {@code NameContainsKeywordsPredicate}.
*/
- private NameContainsKeywordsPredicate preparePredicate(String userInput) {
+ private NameContainsKeywordsPredicate prepareNamePredicate(String userInput) {
return new NameContainsKeywordsPredicate(Arrays.asList(userInput.split("\\s+")));
}
+
+ /**
+ * Parses {@code userInput} into a {@code SchoolContainsKeywordsPredicate}.
+ */
+ private SchoolContainsKeywordsPredicate prepareSchoolPredicate(String userInput) {
+ return new SchoolContainsKeywordsPredicate(Arrays.asList(userInput.split("\\s+")));
+ }
+
+ /**
+ * Parses {@code userInput} into a {@code YearMatchPredicate}.
+ */
+ private YearMatchPredicate prepareYearPredicate(String year) throws ParseException {
+ return new YearMatchPredicate(new Year(year));
+ }
+
+ /**
+ * Parses {@code List<Predicate<Student>>} into a single {@code Predicate<Student>}.
+ */
+ private Predicate<Student> consolidatePredicates(List<Predicate<Student>> predicates) {
+ Predicate<Student> identity = student -> true; // identity: returns the same predicate when composed with it
+ return predicates.stream().reduce(identity, Predicate::and); // consolidates all predicates
+ }
}
diff --git a/src/test/java/seedu/address/logic/commands/HelpCommandTest.java b/src/test/java/seedu/address/logic/commands/HelpCommandTest.java
index 4904fc4352e..75d8f049870 100644
--- a/src/test/java/seedu/address/logic/commands/HelpCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/HelpCommandTest.java
@@ -14,7 +14,7 @@ public class HelpCommandTest {
@Test
public void execute_help_success() {
- CommandResult expectedCommandResult = new CommandResult(SHOWING_HELP_MESSAGE, true, false);
+ CommandResult expectedCommandResult = new CommandResult(SHOWING_HELP_MESSAGE, true, false, false, null);
assertCommandSuccess(new HelpCommand(), model, expectedCommandResult, expectedModel);
}
}
diff --git a/src/test/java/seedu/address/logic/commands/ListCommandTest.java b/src/test/java/seedu/address/logic/commands/ListCommandTest.java
index 435ff1f7275..7d3b12b0d42 100644
--- a/src/test/java/seedu/address/logic/commands/ListCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/ListCommandTest.java
@@ -3,7 +3,8 @@
import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -22,8 +23,8 @@ public class ListCommandTest {
@BeforeEach
public void setUp() {
- model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
- expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs());
+ model = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+ expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), getTypicalNotebook());
}
@Test
diff --git a/src/test/java/seedu/address/logic/commands/OverdueCommandTest.java b/src/test/java/seedu/address/logic/commands/OverdueCommandTest.java
new file mode 100644
index 00000000000..07017f0acc8
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/OverdueCommandTest.java
@@ -0,0 +1,124 @@
+package seedu.address.logic.commands;
+
+import static seedu.address.commons.core.Messages.MESSAGE_STUDENTS_LISTED_OVERVIEW;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.model.student.admin.Fee.FREE_OF_CHARGE;
+import static seedu.address.testutil.StudentBuilder.DEFAULT_FEE;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.Reeve;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.admin.OverdueFeePredicate;
+import seedu.address.testutil.StudentBuilder;
+
+public class OverdueCommandTest {
+
+ private static final DateTimeFormatter FORMAT = DateTimeFormatter.ofPattern("d/M/yy");
+
+ @Test
+ public void execute_positiveFee() {
+ // one student with overdue fees
+ int studentsWhoHaveNotPaid = 1;
+ Model model = getDateAdjustedModel(studentsWhoHaveNotPaid);
+ String expectedMessage = String.format(MESSAGE_STUDENTS_LISTED_OVERVIEW, studentsWhoHaveNotPaid);
+ Model expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), getTypicalNotebook());
+
+ expectedModel.updateFilteredStudentList(new OverdueFeePredicate());
+
+ assertCommandSuccess(new OverdueCommand(), model, expectedMessage, expectedModel);
+
+ // multiple students with overdue fees
+ studentsWhoHaveNotPaid = 3;
+ model = getDateAdjustedModel(studentsWhoHaveNotPaid);
+ expectedMessage = String.format(MESSAGE_STUDENTS_LISTED_OVERVIEW, studentsWhoHaveNotPaid);
+ expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), getTypicalNotebook());
+
+ expectedModel.updateFilteredStudentList(new OverdueFeePredicate());
+
+ assertCommandSuccess(new OverdueCommand(), model, expectedMessage, expectedModel);
+
+ // no students with overdue fees
+ studentsWhoHaveNotPaid = 0;
+ model = getDateAdjustedModel(studentsWhoHaveNotPaid);
+ expectedMessage = String.format(MESSAGE_STUDENTS_LISTED_OVERVIEW, studentsWhoHaveNotPaid);
+ expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), getTypicalNotebook());
+
+ expectedModel.updateFilteredStudentList(new OverdueFeePredicate());
+
+ assertCommandSuccess(new OverdueCommand(), model, expectedMessage, expectedModel);
+
+ }
+
+ @Test
+ public void execute_freeFee() {
+ int freeloaders = 0;
+ Model model = getFeeAdjustedModel(freeloaders);
+ int studentsWhoHaveNotPaid = model.getSortedStudentList().size() - freeloaders;
+ String expectedMessage = String.format(MESSAGE_STUDENTS_LISTED_OVERVIEW, studentsWhoHaveNotPaid);
+ Model expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), model.getNotebook());
+ expectedModel.updateFilteredStudentList(new OverdueFeePredicate());
+ assertCommandSuccess(new OverdueCommand(), model, expectedMessage, expectedModel);
+
+ freeloaders = 3;
+ model = getFeeAdjustedModel(freeloaders);
+ studentsWhoHaveNotPaid = model.getSortedStudentList().size() - freeloaders;
+ expectedMessage = String.format(MESSAGE_STUDENTS_LISTED_OVERVIEW, studentsWhoHaveNotPaid);
+ expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), model.getNotebook());
+ expectedModel.updateFilteredStudentList(new OverdueFeePredicate());
+ assertCommandSuccess(new OverdueCommand(), model, expectedMessage, expectedModel);
+
+ }
+
+ /**
+ * Returns a Model with {@code limit} number of students with overdue fees.
+ */
+ private static Model getDateAdjustedModel(int oneBasedLimit) {
+ Reeve reeve = getTypicalAddressBook();
+ int size = reeve.getStudentList().size();
+ for (int i = 0; i < size; i++) {
+ Student toReplace = reeve.getStudentList().get(i);
+ LocalDate date;
+ if (i < oneBasedLimit) {
+ date = LocalDate.now().minusMonths(1).minusDays(1);
+ } else {
+ date = LocalDate.now().minusMonths(1).plusDays(1);
+ }
+ Student replacement = new StudentBuilder(toReplace).withPaymentDate(date.format(FORMAT)).build();
+ reeve.setStudent(toReplace, replacement);
+ }
+ return new ModelManager(reeve, new UserPrefs(), getTypicalNotebook());
+ }
+
+ /**
+ * Returns a Model with {@code limit} number of students with no fees.
+ */
+ private static Model getFeeAdjustedModel(int oneBasedLimit) {
+ Reeve reeve = getTypicalAddressBook();
+ int size = reeve.getStudentList().size();
+ String date = LocalDate.now().minusMonths(1).minusDays(1).format(FORMAT);
+
+ for (int i = 0; i < size; i++) {
+ Student toReplace = reeve.getStudentList().get(i);
+ String fee;
+ if (i < oneBasedLimit) {
+ fee = FREE_OF_CHARGE;
+ } else {
+ fee = DEFAULT_FEE;
+ }
+ Student replacement = new StudentBuilder(toReplace).withFee(fee).withPaymentDate(date).build();
+ reeve.setStudent(toReplace, replacement);
+ }
+ return new ModelManager(reeve, new UserPrefs(), getTypicalNotebook());
+
+ }
+
+}
diff --git a/src/test/java/seedu/address/logic/commands/ScheduleViewCommandTest.java b/src/test/java/seedu/address/logic/commands/ScheduleViewCommandTest.java
new file mode 100644
index 00000000000..16069852215
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/ScheduleViewCommandTest.java
@@ -0,0 +1,33 @@
+package seedu.address.logic.commands;
+
+import java.time.LocalDate;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.schedule.ScheduleViewMode;
+
+public class ScheduleViewCommandTest {
+
+ private Model model = new ModelManager();
+
+
+ @Test
+ public void execute_validViewModeAndDate_success() {
+ ScheduleViewMode validViewMode = ScheduleViewMode.WEEKLY;
+ LocalDate validDateTime = LocalDate.parse("2020-12-03");
+
+ ScheduleViewCommand scheduleViewCommand = new ScheduleViewCommand(validViewMode, validDateTime);
+
+ Model expectedModel = new ModelManager();
+ expectedModel.setScheduleViewDate(validDateTime);
+ expectedModel.setScheduleViewMode(validViewMode);
+
+ CommandTestUtil.assertCommandSuccess(scheduleViewCommand, model,
+ ScheduleCommand.COMMAND_SUCCESS_MESSAGE, expectedModel);
+ }
+
+
+
+}
diff --git a/src/test/java/seedu/address/logic/commands/SolveQuestionCommandTest.java b/src/test/java/seedu/address/logic/commands/SolveQuestionCommandTest.java
new file mode 100644
index 00000000000..e2893141aab
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/SolveQuestionCommandTest.java
@@ -0,0 +1,185 @@
+package seedu.address.logic.commands;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX;
+import static seedu.address.logic.commands.CommandTestUtil.TEST_QUESTIONS;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
+import static seedu.address.logic.commands.SolveQuestionCommand.MESSAGE_BAD_QUESTION_INDEX;
+import static seedu.address.logic.commands.SolveQuestionCommand.MESSAGE_SOLVED_QUESTION;
+import static seedu.address.logic.commands.SolveQuestionCommand.MESSAGE_SUCCESS;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.StudentBuilder.DEFAULT_SOLUTION;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
+import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.academic.question.Question;
+import seedu.address.model.student.academic.question.SolvedQuestion;
+import seedu.address.model.student.academic.question.UnsolvedQuestion;
+import seedu.address.testutil.StudentBuilder;
+
+public class SolveQuestionCommandTest {
+
+ private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+
+ @Test
+ void constructor_null_throwsNullPointerException() {
+ String validSolution = "Solution.";
+
+ // all fields null
+ assertThrows(NullPointerException.class, () -> new SolveQuestionCommand(null, null, null));
+
+ // one null field
+ assertThrows(NullPointerException.class, () -> new SolveQuestionCommand(null,
+ INDEX_FIRST_PERSON, validSolution));
+ assertThrows(NullPointerException.class, () -> new SolveQuestionCommand(INDEX_FIRST_PERSON,
+ null, validSolution));
+ assertThrows(NullPointerException.class, () -> new SolveQuestionCommand(INDEX_FIRST_PERSON,
+ INDEX_FIRST_PERSON, null));
+
+ // two null fields
+ assertThrows(NullPointerException.class, () -> new SolveQuestionCommand(INDEX_FIRST_PERSON,
+ null, null));
+ assertThrows(NullPointerException.class, () -> new SolveQuestionCommand(null,
+ INDEX_FIRST_PERSON, null));
+ assertThrows(NullPointerException.class, () -> new SolveQuestionCommand(null,
+ null, validSolution));
+ }
+
+ @Test
+ void execute_validIndexUnfilteredList_success() {
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student clone = new StudentBuilder(asker).withQuestions(TEST_QUESTIONS).build();
+ model.setStudent(asker, clone);
+
+ Index question = Index.fromOneBased(1);
+ Student expectedStudent = getAnsweredStudent(question, clone);
+ Question solved = expectedStudent.getQuestions().get(question.getZeroBased());
+ String expectedMessage = String.format(MESSAGE_SUCCESS,
+ expectedStudent.getName(), solved);
+
+
+ SolveQuestionCommand solveCommand = new SolveQuestionCommand(INDEX_FIRST_PERSON, question, DEFAULT_SOLUTION);
+ ModelManager expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), model.getNotebook());
+ expectedModel.setStudent(clone, expectedStudent);
+
+ assertCommandSuccess(solveCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ void execute_invalidStudentIndexUnfilteredList_throwsCommandException() {
+ Index outOfBounds = Index.fromOneBased(model.getSortedStudentList().size() + 1);
+ Index question = Index.fromOneBased(1);
+ SolveQuestionCommand solveCommand = new SolveQuestionCommand(outOfBounds, question, DEFAULT_SOLUTION);
+ assertCommandFailure(solveCommand, model, MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_validIndexFilteredList_success() {
+ showPersonAtIndex(model, INDEX_SECOND_PERSON);
+
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student clone = new StudentBuilder(asker).withQuestions(TEST_QUESTIONS).build();
+ model.setStudent(asker, clone);
+
+ Index question = Index.fromOneBased(2);
+ Student expectedStudent = getAnsweredStudent(question, clone);
+ Question solved = expectedStudent.getQuestions().get(question.getZeroBased());
+ String expectedMessage = String.format(MESSAGE_SUCCESS,
+ expectedStudent.getName(), solved);
+
+ SolveQuestionCommand solveCommand = new SolveQuestionCommand(INDEX_FIRST_PERSON, question, DEFAULT_SOLUTION);
+ ModelManager expectedModel = new ModelManager(model.getReeve(), new UserPrefs(), model.getNotebook());
+ expectedModel.setStudent(clone, expectedStudent);
+ showPersonAtIndex(expectedModel, INDEX_SECOND_PERSON);
+
+ assertCommandSuccess(solveCommand, model, expectedMessage, expectedModel);
+
+ }
+
+ @Test
+ public void execute_invalidStudentIndexFilteredList_throwsCommandException() {
+ showPersonAtIndex(model, INDEX_SECOND_PERSON);
+
+ Index question = Index.fromOneBased(1);
+ SolveQuestionCommand solveCommand = new SolveQuestionCommand(INDEX_SECOND_PERSON, question, DEFAULT_SOLUTION);
+ assertCommandFailure(solveCommand, model, MESSAGE_INVALID_STUDENT_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void execute_invalidQuestionIndex_throwsCommandException() {
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student clone = new StudentBuilder(asker).withQuestions(TEST_QUESTIONS).build();
+ model.setStudent(asker, clone);
+
+ Index outOfBounds = Index.fromOneBased(TEST_QUESTIONS.length + 1);
+ SolveQuestionCommand solveCommand = new SolveQuestionCommand(INDEX_FIRST_PERSON, outOfBounds, DEFAULT_SOLUTION);
+ assertCommandFailure(solveCommand, model, MESSAGE_BAD_QUESTION_INDEX);
+ }
+
+ @Test
+ public void execute_alreadySolvedQuestion_throwsCommandException() {
+ Student asker = model.getSortedStudentList().get(INDEX_FIRST_PERSON.getZeroBased());
+ Student clone = new StudentBuilder(asker).withSolved(DEFAULT_SOLUTION, TEST_QUESTIONS).build();
+ model.setStudent(asker, clone);
+
+ Index question = Index.fromOneBased(1);
+ SolveQuestionCommand solveCommand = new SolveQuestionCommand(INDEX_FIRST_PERSON, question, DEFAULT_SOLUTION);
+ assertCommandFailure(solveCommand, model, MESSAGE_SOLVED_QUESTION);
+ }
+
+ @Test
+ public void equals() {
+ Index question = Index.fromOneBased(1);
+ SolveQuestionCommand command = new SolveQuestionCommand(INDEX_FIRST_PERSON,
+ question, DEFAULT_SOLUTION);
+
+ // same object -> true
+ assertTrue(command.equals(command));
+
+ // same fields -> true
+ assertTrue(command.equals(new SolveQuestionCommand(INDEX_FIRST_PERSON, question, DEFAULT_SOLUTION)));
+
+ // different questionIndex -> false
+ assertFalse(command.equals(new SolveQuestionCommand(INDEX_FIRST_PERSON, Index.fromOneBased(2),
+ DEFAULT_SOLUTION)));
+
+ // different studentIndex -> false
+ assertFalse(command.equals(new SolveQuestionCommand(INDEX_SECOND_PERSON, question, DEFAULT_SOLUTION)));
+
+ // different solution -> false
+ assertFalse(command.equals(new SolveQuestionCommand(INDEX_SECOND_PERSON, question, "Dummy solution")));
+
+ // different class -> false
+ assertFalse(command.equals(new OverdueCommand()));
+ }
+
+ private Student getAnsweredStudent(Index index, Student toCopy) {
+ List<Question> questions = new ArrayList<>();
+ for (int i = 0; i < toCopy.getQuestions().size(); i++) {
+ Question toAdd;
+ if (i == index.getZeroBased()) {
+ toAdd = new SolvedQuestion(TEST_QUESTIONS[i], DEFAULT_SOLUTION);
+ } else {
+ toAdd = new UnsolvedQuestion(TEST_QUESTIONS[i]);
+ }
+ questions.add(toAdd);
+ }
+ return new Student(toCopy.getName(), toCopy.getPhone(), toCopy.getSchool(), toCopy.getYear(),
+ toCopy.getAdmin(), questions, toCopy.getExams(), toCopy.getAttendance());
+ }
+}
diff --git a/src/test/java/seedu/address/logic/commands/SortCommandTest.java b/src/test/java/seedu/address/logic/commands/SortCommandTest.java
new file mode 100644
index 00000000000..19fa669ffeb
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/SortCommandTest.java
@@ -0,0 +1,84 @@
+package seedu.address.logic.commands;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static seedu.address.commons.core.Messages.MESSAGE_STUDENTS_SORTED;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.testutil.TypicalStudents.ALICE;
+import static seedu.address.testutil.TypicalStudents.BENSON;
+import static seedu.address.testutil.TypicalStudents.CARL;
+import static seedu.address.testutil.TypicalStudents.DANIEL;
+import static seedu.address.testutil.TypicalStudents.ELLE;
+import static seedu.address.testutil.TypicalStudents.FIONA;
+import static seedu.address.testutil.TypicalStudents.GEORGE;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
+
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.student.NameComparator;
+import seedu.address.model.student.YearComparator;
+import seedu.address.model.student.admin.ClassTimeComparator;
+
+/**
+ * Contains integration tests (interaction with the Model) for {@code SortCommand}.
+ */
+public class SortCommandTest {
+ private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+
+ private SortCommand sortByName = new SortCommand("name");
+ private SortCommand sortByNameDuplicate = new SortCommand("name");
+ private SortCommand sortByClassTime = new SortCommand("classTime");
+ private SortCommand sortByYear = new SortCommand("year");
+
+ @Test
+ public void equals() {
+ assertEquals(sortByName, sortByNameDuplicate);
+ assertNotEquals(sortByName, sortByClassTime);
+ assertNotEquals(sortByName, sortByYear);
+ }
+
+ @Test
+ public void constructor_invalidComparisonMeans_throwException() {
+ assertThrows(NullPointerException.class, () -> new SortCommand(null));
+ }
+
+ @Test
+ public void execute_sortByName_sorted() {
+ Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+ expectedModel.updateSortedStudentList(new NameComparator());
+ String expectedMessage = String.format(MESSAGE_STUDENTS_SORTED, "name");
+
+ SortCommand command = new SortCommand("name");
+ assertCommandSuccess(command, model, expectedMessage, expectedModel);
+ assertEquals(Arrays.asList(ALICE, BENSON, CARL, DANIEL, ELLE, FIONA, GEORGE), model.getSortedStudentList());
+ }
+
+ @Test
+ public void execute_sortByClassTime_sorted() {
+ Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+ expectedModel.updateSortedStudentList(new ClassTimeComparator());
+ String expectedMessage = String.format(MESSAGE_STUDENTS_SORTED, "classTime");
+
+ SortCommand command = new SortCommand("classTime");
+ assertCommandSuccess(command, model, expectedMessage, expectedModel);
+ assertEquals(Arrays.asList(CARL, DANIEL, ELLE, GEORGE, BENSON, FIONA, ALICE), model.getSortedStudentList());
+ }
+
+ @Test
+ public void execute_sortByYear_sorted() {
+ Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+ expectedModel.updateSortedStudentList(new YearComparator());
+ String expectedMessage = String.format(MESSAGE_STUDENTS_SORTED, "year");
+
+ SortCommand command = new SortCommand("year");
+ assertCommandSuccess(command, model, expectedMessage, expectedModel);
+ assertEquals(Arrays.asList(DANIEL, BENSON, FIONA, ALICE, GEORGE, CARL, ELLE), model.getSortedStudentList());
+ }
+}
diff --git a/src/test/java/seedu/address/logic/commands/ToggleStudentCardCommandTest.java b/src/test/java/seedu/address/logic/commands/ToggleStudentCardCommandTest.java
new file mode 100644
index 00000000000..c1ef6955a03
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/ToggleStudentCardCommandTest.java
@@ -0,0 +1,21 @@
+package seedu.address.logic.commands;
+
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+
+public class ToggleStudentCardCommandTest {
+ private Model model = new ModelManager();
+ private Model expectedModel = new ModelManager();
+
+ @Test
+ public void execute_toggle_success() {
+ CommandResult expectedCommandResult =
+ new CommandResult(ToggleStudentCardCommand.MESSAGE_TOGGLE_SUCCESS, false,
+ false, true, null);
+ assertCommandSuccess(new ToggleStudentCardCommand(), model, expectedCommandResult, expectedModel);
+ }
+}
diff --git a/src/test/java/seedu/address/logic/commands/notes/AddNoteCommandTest.java b/src/test/java/seedu/address/logic/commands/notes/AddNoteCommandTest.java
new file mode 100644
index 00000000000..597a50d54b9
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/notes/AddNoteCommandTest.java
@@ -0,0 +1,77 @@
+package seedu.address.logic.commands.notes;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import java.util.Collections;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.logic.commands.CommandResult;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.ModelStub;
+import seedu.address.model.ModelStubAcceptingNoteAdded;
+import seedu.address.model.ModelStubWithNote;
+import seedu.address.model.notes.note.Note;
+import seedu.address.testutil.notes.NoteBuilder;
+
+public class AddNoteCommandTest {
+
+ @Test
+ public void constructor_nullPerson_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new AddNoteCommand(null));
+ }
+
+ @Test
+ public void execute_personAcceptedByModel_addSuccessful() throws Exception {
+ ModelStubAcceptingNoteAdded modelStub = new ModelStubAcceptingNoteAdded();
+ Note validNote = new NoteBuilder().build();
+
+ CommandResult commandResult = new AddNoteCommand(validNote).execute(modelStub);
+
+ assertEquals(String.format(AddNoteCommand.MESSAGE_SUCCESS, validNote), commandResult.getFeedbackToUser());
+ assertEquals(Collections.singletonList(validNote), modelStub.notesAdded);
+ }
+
+ @Test
+ public void execute_duplicatePerson_throwsCommandException() {
+ Note validNote = new NoteBuilder().build();
+ AddNoteCommand addNoteCommand = new AddNoteCommand(validNote);
+ ModelStub modelStub = new ModelStubWithNote(validNote);
+
+ assertThrows(CommandException.class,
+ AddNoteCommand.MESSAGE_DUPLICATE_NOTE, () -> addNoteCommand.execute(modelStub));
+ }
+
+ @Test
+ public void equals() {
+ Note thingsToDo = new NoteBuilder().withTitle("things to do").withDescription("finish marking").build();
+ Note events = new NoteBuilder().withTitle("things to do").withDescription("meet benedict").build();
+ Note friends = new NoteBuilder().withTitle("meeting").withDescription("meet benedict").build();
+
+ AddNoteCommand addThingsToDoCommand = new AddNoteCommand(thingsToDo);
+ AddNoteCommand addEventsCommand = new AddNoteCommand(events);
+ AddNoteCommand addMeetingFriendsCommand = new AddNoteCommand(friends);
+
+ // same object -> returns true
+ assertEquals(addEventsCommand, addEventsCommand);
+
+ // same values -> returns true
+ AddNoteCommand addThingsToDoCommandCopy = new AddNoteCommand(thingsToDo);
+ assertEquals(addThingsToDoCommandCopy, addThingsToDoCommand);
+
+ // different types -> returns false
+ assertNotEquals(addThingsToDoCommand, 1);
+
+ // null -> returns false
+ assertNotEquals(addThingsToDoCommand, null);
+
+ // different title -> returns true
+ assertNotEquals(addThingsToDoCommand, addMeetingFriendsCommand);
+
+ // different description -> returns false
+ assertNotEquals(addEventsCommand, addThingsToDoCommand);
+ }
+
+}
diff --git a/src/test/java/seedu/address/logic/commands/notes/DeleteNoteCommandTest.java b/src/test/java/seedu/address/logic/commands/notes/DeleteNoteCommandTest.java
new file mode 100644
index 00000000000..aa344b48701
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/notes/DeleteNoteCommandTest.java
@@ -0,0 +1,73 @@
+package seedu.address.logic.commands.notes;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
+import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.commons.core.index.Index;
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.notes.note.Note;
+
+/**
+ * Contains integration tests (interaction with the Model) and unit tests for
+ * {@code DeleteNoteCommand}.
+ */
+public class DeleteNoteCommandTest {
+
+ private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+
+ @Test
+ public void execute_validIndex_success() {
+ Note noteToDelete = model.getNotebook().getNotesList().get(INDEX_FIRST.getZeroBased());
+ DeleteNoteCommand deleteNoteCommand = new DeleteNoteCommand(INDEX_FIRST);
+
+ String expectedMessage = String.format(DeleteNoteCommand.MESSAGE_DELETE_NOTE_SUCCESS, noteToDelete);
+
+ ModelManager expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs(),
+ model.getNotebook());
+ expectedModel.deleteNote(noteToDelete);
+
+ assertCommandSuccess(deleteNoteCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_invalidIndex_throwsCommandException() {
+ Index outOfBoundIndex = Index.fromOneBased(model.getNotebook().getNotesList().size() + 1);
+ DeleteNoteCommand deleteNoteCommand = new DeleteNoteCommand(outOfBoundIndex);
+
+ assertCommandFailure(deleteNoteCommand, model, Messages.MESSAGE_INVALID_NOTE_DISPLAYED_INDEX);
+ }
+
+ @Test
+ public void equals() {
+ DeleteNoteCommand deleteFirstCommand = new DeleteNoteCommand(INDEX_FIRST);
+ DeleteNoteCommand deleteSecondCommand = new DeleteNoteCommand(INDEX_SECOND);
+
+ // same object -> returns true
+ assertEquals(deleteFirstCommand, deleteFirstCommand);
+
+ // same values -> returns true
+ DeleteNoteCommand deleteFirstCommandCopy = new DeleteNoteCommand(INDEX_FIRST_PERSON);
+ assertEquals(deleteFirstCommandCopy, deleteFirstCommand);
+
+ // different types -> returns false
+ assertNotEquals(deleteFirstCommand, 1);
+
+ // null -> returns false
+ assertNotEquals(deleteFirstCommand, null);
+
+ // different person -> returns false
+ assertNotEquals(deleteSecondCommand, deleteFirstCommand);
+ }
+}
diff --git a/src/test/java/seedu/address/logic/commands/notes/EditNoteCommandTest.java b/src/test/java/seedu/address/logic/commands/notes/EditNoteCommandTest.java
new file mode 100644
index 00000000000..f8abe262451
--- /dev/null
+++ b/src/test/java/seedu/address/logic/commands/notes/EditNoteCommandTest.java
@@ -0,0 +1,113 @@
+package seedu.address.logic.commands.notes;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static seedu.address.logic.commands.CommandTestUtil.DESC_NOTE_EVENTS;
+import static seedu.address.logic.commands.CommandTestUtil.DESC_NOTE_TODO;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_DESCRIPTION_RANDOM;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_TITLE_RANDOM;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST;
+import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.ClearCommand;
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.notes.Notebook;
+import seedu.address.model.notes.note.Note;
+import seedu.address.testutil.notes.EditNoteDescriptorBuilder;
+import seedu.address.testutil.notes.NoteBuilder;
+
+/**
+ * Contains integration tests (interaction with the Model) and unit tests for EditNoteCommand.
+ */
+public class EditNoteCommandTest {
+
+ private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs(), getTypicalNotebook());
+
+ @Test
+ public void execute_allFieldsSpecified_success() {
+ Note editedNote = new NoteBuilder().build();
+ EditNoteCommand.EditNoteDescriptor editNoteDescriptor =
+ new EditNoteDescriptorBuilder(editedNote).build();
+ EditNoteCommand editNoteCommand = new EditNoteCommand(INDEX_FIRST, editNoteDescriptor);
+
+ String expectedMessage = String.format(EditNoteCommand.MESSAGE_EDIT_NOTE_SUCCESS, editedNote);
+
+ Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs(), model.getNotebook());
+ expectedModel.setNote(model.getNotebook().getNotesList().get(INDEX_FIRST.getZeroBased()), editedNote);
+
+ assertCommandSuccess(editNoteCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_someFieldsSpecified_success() {
+ Index indexLastNote = Index.fromOneBased(model.getNotebook().getNotesList().size());
+ Note lastNote = model.getNotebook().getNotesList().get(indexLastNote.getZeroBased());
+
+ NoteBuilder noteInList = new NoteBuilder(lastNote);
+ Note editedNote = noteInList.withTitle(VALID_TITLE_RANDOM)
+ .withDescription(VALID_DESCRIPTION_RANDOM).build();
+
+ EditNoteCommand.EditNoteDescriptor editNoteDescriptor = new EditNoteDescriptorBuilder()
+ .withTitle(VALID_TITLE_RANDOM).withDescription(VALID_DESCRIPTION_RANDOM).build();
+
+ EditNoteCommand editNoteCommand = new EditNoteCommand(indexLastNote, editNoteDescriptor);
+
+ String expectedMessage = String.format(EditNoteCommand.MESSAGE_EDIT_NOTE_SUCCESS,
+ editedNote);
+
+ Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs(),
+ new Notebook(model.getNotebook()));
+ expectedModel.setNote(lastNote, editedNote);
+
+ assertCommandSuccess(editNoteCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void execute_noFieldSpecified_success() {
+ EditNoteCommand editNoteCommand = new EditNoteCommand(INDEX_FIRST,
+ new EditNoteCommand.EditNoteDescriptor());
+ Note editedNote = model.getNotebook().getNotesList().get(INDEX_FIRST.getZeroBased());
+
+ String expectedMessage = String.format(EditNoteCommand.MESSAGE_EDIT_NOTE_SUCCESS, editedNote);
+
+ Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs(),
+ new Notebook(model.getNotebook()));
+
+ assertCommandSuccess(editNoteCommand, model, expectedMessage, expectedModel);
+ }
+
+ @Test
+ public void equals() {
+ final EditNoteCommand standardCommand = new EditNoteCommand(INDEX_FIRST, DESC_NOTE_TODO);
+
+ // same values -> returns true
+ EditNoteCommand.EditNoteDescriptor copyNoteDescriptor =
+ new EditNoteCommand.EditNoteDescriptor(DESC_NOTE_TODO);
+ EditNoteCommand commandWithSameValues = new EditNoteCommand(INDEX_FIRST, copyNoteDescriptor);
+
+ assertEquals(commandWithSameValues, standardCommand);
+
+ // same object -> returns true
+ assertEquals(standardCommand, standardCommand);
+
+ // null -> returns false
+ assertNotEquals(standardCommand, null);
+
+ // different types -> returns false
+ assertNotEquals(new ClearCommand(), standardCommand);
+
+ // different index -> returns false
+ assertNotEquals(new EditNoteCommand(INDEX_SECOND, DESC_NOTE_TODO), standardCommand);
+
+ // different descriptor -> returns false
+ assertNotEquals(new EditNoteCommand(INDEX_FIRST, DESC_NOTE_EVENTS), standardCommand);
+ }
+}
diff --git a/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java b/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java
index 5cf487d7ebb..d6e78ba8f66 100644
--- a/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java
@@ -1,85 +1,158 @@
package seedu.address.logic.parser;
import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_ADDRESS_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_EMAIL_DESC;
+import static seedu.address.commons.util.DateUtil.TODAY;
+import static seedu.address.logic.commands.CommandTestUtil.ADDITIONAL_DETAILS_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.ADDITIONAL_DETAILS_DESC_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.CLASS_TIME_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.CLASS_TIME_DESC_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.CLASS_VENUE_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.CLASS_VENUE_DESC_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.FEE_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.FEE_DESC_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.INVALID_FEE_DESC;
import static seedu.address.logic.commands.CommandTestUtil.INVALID_NAME_DESC;
+import static seedu.address.logic.commands.CommandTestUtil.INVALID_PAYMENT_DESC;
import static seedu.address.logic.commands.CommandTestUtil.INVALID_PHONE_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_TAG_DESC;
+import static seedu.address.logic.commands.CommandTestUtil.INVALID_SCHOOL_DESC;
+import static seedu.address.logic.commands.CommandTestUtil.INVALID_TIME_DESC;
+import static seedu.address.logic.commands.CommandTestUtil.INVALID_VENUE_DESC;
+import static seedu.address.logic.commands.CommandTestUtil.INVALID_YEAR_DESC;
import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY;
import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.PAYMENT_DATE_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.PAYMENT_DATE_DESC_BOB;
import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY;
import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_BOB;
import static seedu.address.logic.commands.CommandTestUtil.PREAMBLE_NON_EMPTY;
import static seedu.address.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE;
-import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_FRIEND;
-import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_FRIEND;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
+import static seedu.address.logic.commands.CommandTestUtil.SCHOOL_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.SCHOOL_DESC_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDITIONAL_DETAILS_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDITIONAL_DETAILS_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.YEAR_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.YEAR_DESC_BOB;
import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
-import static seedu.address.testutil.TypicalPersons.AMY;
-import static seedu.address.testutil.TypicalPersons.BOB;
+import static seedu.address.model.student.admin.Fee.FREE_OF_CHARGE;
+import static seedu.address.testutil.TypicalStudents.AMY;
+import static seedu.address.testutil.TypicalStudents.BOB;
import org.junit.jupiter.api.Test;
import seedu.address.logic.commands.AddCommand;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-import seedu.address.testutil.PersonBuilder;
+import seedu.address.model.student.Name;
+import seedu.address.model.student.Phone;
+import seedu.address.model.student.School;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.Year;
+import seedu.address.model.student.admin.ClassTime;
+import seedu.address.model.student.admin.ClassVenue;
+import seedu.address.model.student.admin.Fee;
+import seedu.address.model.student.admin.PaymentDate;
+import seedu.address.testutil.StudentBuilder;
public class AddCommandParserTest {
private AddCommandParser parser = new AddCommandParser();
@Test
public void parse_allFieldsPresent_success() {
- Person expectedPerson = new PersonBuilder(BOB).withTags(VALID_TAG_FRIEND).build();
+ Student expectedStudent = new StudentBuilder(BOB).withQuestions()
+ .withExams().withAttendances().build();
// whitespace only preamble
- assertParseSuccess(parser, PREAMBLE_WHITESPACE + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
- + ADDRESS_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedPerson));
+ assertParseSuccess(parser, PREAMBLE_WHITESPACE + NAME_DESC_BOB + PHONE_DESC_BOB
+ + SCHOOL_DESC_BOB + YEAR_DESC_BOB + CLASS_VENUE_DESC_BOB + CLASS_TIME_DESC_BOB + FEE_DESC_BOB
+ + PAYMENT_DATE_DESC_BOB + ADDITIONAL_DETAILS_DESC_BOB, new AddCommand(expectedStudent));
// multiple names - last name accepted
- assertParseSuccess(parser, NAME_DESC_AMY + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
- + ADDRESS_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedPerson));
+ assertParseSuccess(parser, NAME_DESC_AMY + NAME_DESC_BOB + PHONE_DESC_BOB + SCHOOL_DESC_BOB
+ + YEAR_DESC_BOB + CLASS_VENUE_DESC_BOB + CLASS_TIME_DESC_BOB + FEE_DESC_BOB
+ + PAYMENT_DATE_DESC_BOB + ADDITIONAL_DETAILS_DESC_BOB, new AddCommand(expectedStudent));
// multiple phones - last phone accepted
- assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_AMY + PHONE_DESC_BOB + EMAIL_DESC_BOB
- + ADDRESS_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedPerson));
-
- // multiple emails - last email accepted
- assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_AMY + EMAIL_DESC_BOB
- + ADDRESS_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedPerson));
+ assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_AMY + PHONE_DESC_BOB + SCHOOL_DESC_BOB
+ + YEAR_DESC_BOB + CLASS_VENUE_DESC_BOB + CLASS_TIME_DESC_BOB + FEE_DESC_BOB
+ + PAYMENT_DATE_DESC_BOB + ADDITIONAL_DETAILS_DESC_BOB, new AddCommand(expectedStudent));
+
+ // multiple emails - last school accepted
+ assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB + SCHOOL_DESC_AMY + SCHOOL_DESC_BOB
+ + YEAR_DESC_BOB + CLASS_VENUE_DESC_BOB + CLASS_TIME_DESC_BOB + FEE_DESC_BOB
+ + PAYMENT_DATE_DESC_BOB + ADDITIONAL_DETAILS_DESC_BOB, new AddCommand(expectedStudent));
+
+ // multiple years - last year accepted
+ assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB + SCHOOL_DESC_BOB
+ + YEAR_DESC_AMY + YEAR_DESC_BOB + CLASS_VENUE_DESC_BOB + CLASS_TIME_DESC_BOB + FEE_DESC_BOB
+ + PAYMENT_DATE_DESC_BOB + ADDITIONAL_DETAILS_DESC_BOB, new AddCommand(expectedStudent));
+
+ //multiple venues - last venue accepted
+ assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB + SCHOOL_DESC_BOB
+ + YEAR_DESC_BOB + CLASS_VENUE_DESC_AMY + CLASS_VENUE_DESC_BOB + CLASS_TIME_DESC_BOB + FEE_DESC_BOB
+ + PAYMENT_DATE_DESC_BOB + ADDITIONAL_DETAILS_DESC_BOB, new AddCommand(expectedStudent));
+
+ //multiple times - last time accepted
+ assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB + SCHOOL_DESC_BOB
+ + YEAR_DESC_BOB + CLASS_VENUE_DESC_BOB + CLASS_TIME_DESC_AMY + CLASS_TIME_DESC_BOB + FEE_DESC_BOB
+ + PAYMENT_DATE_DESC_BOB + ADDITIONAL_DETAILS_DESC_BOB, new AddCommand(expectedStudent));
+
+ //multiple fees - last fee accepted
+ assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB + SCHOOL_DESC_BOB
+ + YEAR_DESC_BOB + CLASS_VENUE_DESC_BOB + CLASS_TIME_DESC_BOB + FEE_DESC_AMY + FEE_DESC_BOB
+ + PAYMENT_DATE_DESC_BOB + ADDITIONAL_DETAILS_DESC_BOB, new AddCommand(expectedStudent));
+
+ //multiple payment dates - last date accepted
+ assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB + SCHOOL_DESC_BOB
+ + YEAR_DESC_BOB + CLASS_VENUE_DESC_BOB + CLASS_TIME_DESC_BOB + FEE_DESC_BOB + PAYMENT_DATE_DESC_AMY
+ + PAYMENT_DATE_DESC_BOB + ADDITIONAL_DETAILS_DESC_BOB, new AddCommand(expectedStudent));
+
+ //multiple details - all details accepted
+ expectedStudent = new StudentBuilder(BOB)
+ .withDetails(VALID_ADDITIONAL_DETAILS_BOB, VALID_ADDITIONAL_DETAILS_AMY)
+ .withQuestions()
+ .withExams().withAttendances()
+ .build();
+ assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB + SCHOOL_DESC_BOB
+ + YEAR_DESC_BOB + CLASS_VENUE_DESC_BOB + CLASS_TIME_DESC_BOB + FEE_DESC_BOB + PAYMENT_DATE_DESC_AMY
+ + PAYMENT_DATE_DESC_BOB + ADDITIONAL_DETAILS_DESC_BOB + ADDITIONAL_DETAILS_DESC_AMY,
+ new AddCommand(expectedStudent));
+ }
- // multiple addresses - last address accepted
- assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_AMY
- + ADDRESS_DESC_BOB + TAG_DESC_FRIEND, new AddCommand(expectedPerson));
+ @Test
+ public void parse_allFieldsMissing_success() {
+ Student expectedStudent = new StudentBuilder(AMY)
+ .withQuestions().withDetails().withFee(FREE_OF_CHARGE).withPaymentDate(TODAY)
+ .withExams().withAttendances().build();
+ assertParseSuccess(parser, NAME_DESC_AMY + PHONE_DESC_AMY + SCHOOL_DESC_AMY + YEAR_DESC_AMY
+ + CLASS_VENUE_DESC_AMY + CLASS_TIME_DESC_AMY,
+ new AddCommand(expectedStudent));
- // multiple tags - all accepted
- Person expectedPersonMultipleTags = new PersonBuilder(BOB).withTags(VALID_TAG_FRIEND, VALID_TAG_HUSBAND)
- .build();
- assertParseSuccess(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB
- + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, new AddCommand(expectedPersonMultipleTags));
}
@Test
- public void parse_optionalFieldsMissing_success() {
- // zero tags
- Person expectedPerson = new PersonBuilder(AMY).withTags().build();
- assertParseSuccess(parser, NAME_DESC_AMY + PHONE_DESC_AMY + EMAIL_DESC_AMY + ADDRESS_DESC_AMY,
- new AddCommand(expectedPerson));
+ public void parse_optionalFieldsPresent_success() {
+ // payment date present
+ Student expectedStudent = new StudentBuilder(AMY)
+ .withQuestions().withDetails().withFee(FREE_OF_CHARGE)
+ .withExams().withAttendances().build();
+ assertParseSuccess(parser, NAME_DESC_AMY + PHONE_DESC_AMY + SCHOOL_DESC_AMY + YEAR_DESC_AMY
+ + CLASS_VENUE_DESC_AMY + CLASS_TIME_DESC_AMY + PAYMENT_DATE_DESC_AMY,
+ new AddCommand(expectedStudent));
+
+ // fee present
+ expectedStudent = new StudentBuilder(AMY)
+ .withQuestions().withDetails().withPaymentDate(TODAY)
+ .withExams().withAttendances().build();
+ assertParseSuccess(parser, NAME_DESC_AMY + PHONE_DESC_AMY + SCHOOL_DESC_AMY + YEAR_DESC_AMY
+ + CLASS_VENUE_DESC_AMY + CLASS_TIME_DESC_AMY + FEE_DESC_AMY,
+ new AddCommand(expectedStudent));
+
+ // details present
+ expectedStudent = new StudentBuilder(AMY)
+ .withQuestions().withFee(FREE_OF_CHARGE).withPaymentDate(TODAY)
+ .withExams().withAttendances().build();
+ assertParseSuccess(parser, NAME_DESC_AMY + PHONE_DESC_AMY + SCHOOL_DESC_AMY + YEAR_DESC_AMY
+ + CLASS_VENUE_DESC_AMY + CLASS_TIME_DESC_AMY + ADDITIONAL_DETAILS_DESC_AMY,
+ new AddCommand(expectedStudent));
}
@Test
@@ -87,55 +160,86 @@ public void parse_compulsoryFieldMissing_failure() {
String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE);
// missing name prefix
- assertParseFailure(parser, VALID_NAME_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB,
- expectedMessage);
+ assertParseFailure(parser, PHONE_DESC_BOB + SCHOOL_DESC_BOB
+ + YEAR_DESC_BOB + CLASS_VENUE_DESC_BOB + CLASS_TIME_DESC_BOB + FEE_DESC_BOB
+ + PAYMENT_DATE_DESC_BOB, expectedMessage);
// missing phone prefix
- assertParseFailure(parser, NAME_DESC_BOB + VALID_PHONE_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB,
- expectedMessage);
+ assertParseFailure(parser, NAME_DESC_BOB + SCHOOL_DESC_BOB
+ + YEAR_DESC_BOB + CLASS_VENUE_DESC_BOB + CLASS_TIME_DESC_BOB + FEE_DESC_BOB
+ + PAYMENT_DATE_DESC_BOB, expectedMessage);
+
+ // missing school prefix
+ assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + YEAR_DESC_BOB
+ + CLASS_VENUE_DESC_BOB + CLASS_TIME_DESC_BOB + FEE_DESC_BOB + PAYMENT_DATE_DESC_BOB, expectedMessage);
- // missing email prefix
- assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + VALID_EMAIL_BOB + ADDRESS_DESC_BOB,
- expectedMessage);
+ // missing year prefix
+ assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + SCHOOL_DESC_BOB
+ + CLASS_VENUE_DESC_BOB + CLASS_TIME_DESC_BOB + FEE_DESC_BOB + PAYMENT_DATE_DESC_BOB, expectedMessage);
- // missing address prefix
- assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + VALID_ADDRESS_BOB,
- expectedMessage);
+ // missing venue prefix
+ assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + SCHOOL_DESC_BOB
+ + YEAR_DESC_BOB + CLASS_TIME_DESC_BOB + FEE_DESC_BOB + PAYMENT_DATE_DESC_BOB, expectedMessage);
+
+ //missing time prefix
+ assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + SCHOOL_DESC_BOB
+ + YEAR_DESC_BOB + CLASS_VENUE_DESC_BOB + FEE_DESC_BOB + PAYMENT_DATE_DESC_BOB, expectedMessage);
// all prefixes missing
- assertParseFailure(parser, VALID_NAME_BOB + VALID_PHONE_BOB + VALID_EMAIL_BOB + VALID_ADDRESS_BOB,
- expectedMessage);
+ assertParseFailure(parser, "", expectedMessage);
}
@Test
public void parse_invalidValue_failure() {
// invalid name
- assertParseFailure(parser, INVALID_NAME_DESC + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB
- + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Name.MESSAGE_CONSTRAINTS);
+ assertParseFailure(parser, INVALID_NAME_DESC + PHONE_DESC_BOB + SCHOOL_DESC_BOB + YEAR_DESC_BOB
+ + CLASS_VENUE_DESC_BOB + CLASS_TIME_DESC_BOB + FEE_DESC_BOB + PAYMENT_DATE_DESC_BOB,
+ Name.MESSAGE_CONSTRAINTS);
// invalid phone
- assertParseFailure(parser, NAME_DESC_BOB + INVALID_PHONE_DESC + EMAIL_DESC_BOB + ADDRESS_DESC_BOB
- + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Phone.MESSAGE_CONSTRAINTS);
-
- // invalid email
- assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + INVALID_EMAIL_DESC + ADDRESS_DESC_BOB
- + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Email.MESSAGE_CONSTRAINTS);
-
- // invalid address
- assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + INVALID_ADDRESS_DESC
- + TAG_DESC_HUSBAND + TAG_DESC_FRIEND, Address.MESSAGE_CONSTRAINTS);
-
- // invalid tag
- assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB + ADDRESS_DESC_BOB
- + INVALID_TAG_DESC + VALID_TAG_FRIEND, Tag.MESSAGE_CONSTRAINTS);
+ assertParseFailure(parser, NAME_DESC_BOB + INVALID_PHONE_DESC + SCHOOL_DESC_BOB + YEAR_DESC_BOB
+ + CLASS_VENUE_DESC_BOB + CLASS_TIME_DESC_BOB + FEE_DESC_BOB + PAYMENT_DATE_DESC_BOB,
+ Phone.MESSAGE_CONSTRAINTS);
+
+ // invalid school
+ assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + INVALID_SCHOOL_DESC + YEAR_DESC_BOB
+ + CLASS_VENUE_DESC_BOB + CLASS_TIME_DESC_BOB + FEE_DESC_BOB + PAYMENT_DATE_DESC_BOB,
+ School.MESSAGE_CONSTRAINTS);
+
+ // invalid year
+ assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + SCHOOL_DESC_BOB + INVALID_YEAR_DESC
+ + CLASS_VENUE_DESC_BOB + CLASS_TIME_DESC_BOB + FEE_DESC_BOB + PAYMENT_DATE_DESC_BOB,
+ Year.MESSAGE_CONSTRAINTS);
+
+ //invalid venue
+ assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + SCHOOL_DESC_BOB + YEAR_DESC_BOB
+ + INVALID_VENUE_DESC + CLASS_TIME_DESC_BOB + FEE_DESC_BOB + PAYMENT_DATE_DESC_BOB,
+ ClassVenue.MESSAGE_CONSTRAINTS);
+
+ //invalid time
+ assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + SCHOOL_DESC_BOB + YEAR_DESC_BOB
+ + CLASS_VENUE_DESC_BOB + INVALID_TIME_DESC + FEE_DESC_BOB + PAYMENT_DATE_DESC_BOB,
+ ClassTime.MESSAGE_CONSTRAINTS);
+
+ //invalid fee
+ assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + SCHOOL_DESC_BOB + YEAR_DESC_BOB
+ + CLASS_VENUE_DESC_BOB + CLASS_TIME_DESC_BOB + INVALID_FEE_DESC + PAYMENT_DATE_DESC_BOB,
+ Fee.MESSAGE_CONSTRAINTS);
+
+ //invalid payment date
+ assertParseFailure(parser, NAME_DESC_BOB + PHONE_DESC_BOB + SCHOOL_DESC_BOB + YEAR_DESC_BOB
+ + CLASS_VENUE_DESC_BOB + CLASS_TIME_DESC_BOB + FEE_DESC_BOB + INVALID_PAYMENT_DESC,
+ PaymentDate.MESSAGE_CONSTRAINTS);
// two invalid values, only first invalid value reported
- assertParseFailure(parser, INVALID_NAME_DESC + PHONE_DESC_BOB + EMAIL_DESC_BOB + INVALID_ADDRESS_DESC,
+ assertParseFailure(parser, INVALID_NAME_DESC + PHONE_DESC_BOB + INVALID_SCHOOL_DESC + YEAR_DESC_BOB
+ + CLASS_VENUE_DESC_BOB + CLASS_TIME_DESC_BOB + FEE_DESC_BOB + PAYMENT_DATE_DESC_BOB,
Name.MESSAGE_CONSTRAINTS);
// non-empty preamble
- assertParseFailure(parser, PREAMBLE_NON_EMPTY + NAME_DESC_BOB + PHONE_DESC_BOB + EMAIL_DESC_BOB
- + ADDRESS_DESC_BOB + TAG_DESC_HUSBAND + TAG_DESC_FRIEND,
+ assertParseFailure(parser, PREAMBLE_NON_EMPTY + NAME_DESC_BOB + PHONE_DESC_BOB + SCHOOL_DESC_BOB
+ + YEAR_DESC_BOB + CLASS_VENUE_DESC_BOB + CLASS_TIME_DESC_BOB + FEE_DESC_BOB
+ + PAYMENT_DATE_DESC_BOB,
String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE));
}
}
diff --git a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java b/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
deleted file mode 100644
index d9659205b57..00000000000
--- a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package seedu.address.logic.parser;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
-import static seedu.address.testutil.Assert.assertThrows;
-import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.junit.jupiter.api.Test;
-
-import seedu.address.logic.commands.AddCommand;
-import seedu.address.logic.commands.ClearCommand;
-import seedu.address.logic.commands.DeleteCommand;
-import seedu.address.logic.commands.EditCommand;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
-import seedu.address.logic.commands.ExitCommand;
-import seedu.address.logic.commands.FindCommand;
-import seedu.address.logic.commands.HelpCommand;
-import seedu.address.logic.commands.ListCommand;
-import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
-import seedu.address.model.person.Person;
-import seedu.address.testutil.EditPersonDescriptorBuilder;
-import seedu.address.testutil.PersonBuilder;
-import seedu.address.testutil.PersonUtil;
-
-public class AddressBookParserTest {
-
- private final AddressBookParser parser = new AddressBookParser();
-
- @Test
- public void parseCommand_add() throws Exception {
- Person person = new PersonBuilder().build();
- AddCommand command = (AddCommand) parser.parseCommand(PersonUtil.getAddCommand(person));
- assertEquals(new AddCommand(person), command);
- }
-
- @Test
- public void parseCommand_clear() throws Exception {
- assertTrue(parser.parseCommand(ClearCommand.COMMAND_WORD) instanceof ClearCommand);
- assertTrue(parser.parseCommand(ClearCommand.COMMAND_WORD + " 3") instanceof ClearCommand);
- }
-
- @Test
- public void parseCommand_delete() throws Exception {
- DeleteCommand command = (DeleteCommand) parser.parseCommand(
- DeleteCommand.COMMAND_WORD + " " + INDEX_FIRST_PERSON.getOneBased());
- assertEquals(new DeleteCommand(INDEX_FIRST_PERSON), command);
- }
-
- @Test
- public void parseCommand_edit() throws Exception {
- Person person = new PersonBuilder().build();
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder(person).build();
- EditCommand command = (EditCommand) parser.parseCommand(EditCommand.COMMAND_WORD + " "
- + INDEX_FIRST_PERSON.getOneBased() + " " + PersonUtil.getEditPersonDescriptorDetails(descriptor));
- assertEquals(new EditCommand(INDEX_FIRST_PERSON, descriptor), command);
- }
-
- @Test
- public void parseCommand_exit() throws Exception {
- assertTrue(parser.parseCommand(ExitCommand.COMMAND_WORD) instanceof ExitCommand);
- assertTrue(parser.parseCommand(ExitCommand.COMMAND_WORD + " 3") instanceof ExitCommand);
- }
-
- @Test
- public void parseCommand_find() throws Exception {
- List<String> keywords = Arrays.asList("foo", "bar", "baz");
- FindCommand command = (FindCommand) parser.parseCommand(
- FindCommand.COMMAND_WORD + " " + keywords.stream().collect(Collectors.joining(" ")));
- assertEquals(new FindCommand(new NameContainsKeywordsPredicate(keywords)), command);
- }
-
- @Test
- public void parseCommand_help() throws Exception {
- assertTrue(parser.parseCommand(HelpCommand.COMMAND_WORD) instanceof HelpCommand);
- assertTrue(parser.parseCommand(HelpCommand.COMMAND_WORD + " 3") instanceof HelpCommand);
- }
-
- @Test
- public void parseCommand_list() throws Exception {
- assertTrue(parser.parseCommand(ListCommand.COMMAND_WORD) instanceof ListCommand);
- assertTrue(parser.parseCommand(ListCommand.COMMAND_WORD + " 3") instanceof ListCommand);
- }
-
- @Test
- public void parseCommand_unrecognisedInput_throwsParseException() {
- assertThrows(ParseException.class, String.format(MESSAGE_INVALID_COMMAND_FORMAT, HelpCommand.MESSAGE_USAGE), ()
- -> parser.parseCommand(""));
- }
-
- @Test
- public void parseCommand_unknownCommand_throwsParseException() {
- assertThrows(ParseException.class, MESSAGE_UNKNOWN_COMMAND, () -> parser.parseCommand("unknownCommand"));
- }
-}
diff --git a/src/test/java/seedu/address/logic/parser/AttendanceCommandParserTest.java b/src/test/java/seedu/address/logic/parser/AttendanceCommandParserTest.java
new file mode 100644
index 00000000000..85dce3371a6
--- /dev/null
+++ b/src/test/java/seedu/address/logic/parser/AttendanceCommandParserTest.java
@@ -0,0 +1,131 @@
+package seedu.address.logic.parser;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.commands.CommandTestUtil.ATTENDANCE_DATE_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.ATTENDANCE_DATE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.ATTENDANCE_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.ATTENDANCE_DESC_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.ATTENDANCE_DESC_WITH_FEEDBACK_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_ATTENDANCE_DATE_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_ATTENDANCE_FEEDBACK_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_ATTENDANCE_STATUS_AMY;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ATTENDANCE_DATE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ATTENDANCE_FEEDBACK;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ATTENDANCE_STATUS;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.AddAttendanceCommand;
+import seedu.address.logic.commands.AttendanceCommand;
+import seedu.address.logic.commands.DeleteAttendanceCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.student.academic.Attendance;
+import seedu.address.model.student.academic.Feedback;
+
+public class AttendanceCommandParserTest {
+
+ private static final String ADD_ATTENDANCE_DESC = AddAttendanceCommand.COMMAND_WORD + " ";
+ private static final String DELETE_ATTENDANCE_DESC = DeleteAttendanceCommand.COMMAND_WORD + " ";
+ private static final Feedback VALID_FEEDBACK = new Feedback(VALID_ATTENDANCE_FEEDBACK_AMY);
+
+ private static final Attendance VALID_ATTENDANCE_AMY =
+ new Attendance(ATTENDANCE_DATE_AMY, true, VALID_FEEDBACK);
+ private static final Attendance VALID_ATTENDANCE_BOB = new Attendance(ATTENDANCE_DATE_BOB, false);
+
+ private final AttendanceCommandParser parser = new AttendanceCommandParser();
+
+ @Test
+ public void parse_addAttendanceCompulsoryFieldsPresent_success() {
+ Index targetStudentIndex = INDEX_SECOND_PERSON;
+ String userInput = ADD_ATTENDANCE_DESC + targetStudentIndex.getOneBased() + ATTENDANCE_DESC_WITH_FEEDBACK_AMY;
+ AddAttendanceCommand expectedCommand = new AddAttendanceCommand(targetStudentIndex, VALID_ATTENDANCE_AMY);
+
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+
+ @Test
+ public void parse_addAttendanceAllFieldsPresent_success() {
+ Index targetStudentIndex = INDEX_SECOND_PERSON;
+ String userInput = ADD_ATTENDANCE_DESC + targetStudentIndex.getOneBased() + ATTENDANCE_DESC_BOB;
+ AddAttendanceCommand expectedCommand = new AddAttendanceCommand(targetStudentIndex, VALID_ATTENDANCE_BOB);
+
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+
+ @Test
+ public void parse_addAttendanceMissingParts_throwsParseException() {
+ String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ AddAttendanceCommand.MESSAGE_USAGE);
+ String attendanceDateDesc = " " + PREFIX_ATTENDANCE_DATE + VALID_ATTENDANCE_AMY;
+ String isPresentDesc = " " + PREFIX_ATTENDANCE_STATUS + VALID_ATTENDANCE_STATUS_AMY;
+ String targetStudentIndex = INDEX_SECOND_PERSON.toString();
+
+ // missing index and prefix
+ assertParseFailure(parser, ADD_ATTENDANCE_DESC, expectedMessage);
+
+ // missing both prefixes
+ assertParseFailure(parser, ADD_ATTENDANCE_DESC + targetStudentIndex, expectedMessage);
+ // missing attendance presence prefix
+ assertParseFailure(parser, ADD_ATTENDANCE_DESC + targetStudentIndex + attendanceDateDesc, expectedMessage);
+ // missing date prefix
+ assertParseFailure(parser, ADD_ATTENDANCE_DESC + targetStudentIndex + isPresentDesc, expectedMessage);
+
+ // missing index, valid prefix
+ assertParseFailure(parser, ADD_ATTENDANCE_DESC + ATTENDANCE_DESC_WITH_FEEDBACK_AMY, expectedMessage);
+ }
+
+ @Test
+ public void parse_addAttendanceInvalidFeedback_throwsParseException() {
+ String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddAttendanceCommand.MESSAGE_USAGE);
+ String targetStudentIndex = "1 ";
+ String invalidFeedbackDesc = ADD_ATTENDANCE_DESC + targetStudentIndex + ATTENDANCE_DESC_AMY + " "
+ + PREFIX_ATTENDANCE_FEEDBACK + "#48as8@3$$$!!!"; // invalid special characters
+ assertParseFailure(parser, invalidFeedbackDesc, expectedMessage);
+ }
+
+ @Test
+ public void parse_deleteAttendanceAllFieldsPresent_success() {
+ Index targetStudentIndex = INDEX_SECOND_PERSON;
+ String targetAttendanceDate = " " + PREFIX_ATTENDANCE_DATE + VALID_ATTENDANCE_DATE_AMY;
+ String userInput = DELETE_ATTENDANCE_DESC + targetStudentIndex.getOneBased() + targetAttendanceDate;
+ DeleteAttendanceCommand expectedCommand = new DeleteAttendanceCommand(targetStudentIndex, ATTENDANCE_DATE_AMY);
+
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+
+ @Test
+ public void parse_deleteAttendanceMissingParts_throwsParseException() {
+ String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ DeleteAttendanceCommand.MESSAGE_USAGE);
+
+ // missing 2 arguments
+ assertParseFailure(parser, DELETE_ATTENDANCE_DESC, expectedMessage);
+
+ // missing 1 argument
+ assertParseFailure(parser, DELETE_ATTENDANCE_DESC + "2", expectedMessage);
+
+ String targetAttendanceDate = String.format("%1$s%2$s", PREFIX_ATTENDANCE_DATE, VALID_ATTENDANCE_DATE_AMY);
+ assertParseFailure(parser, DELETE_ATTENDANCE_DESC + targetAttendanceDate, expectedMessage);
+
+ // wrong date format
+ String invalidDate = " " + PREFIX_ATTENDANCE_DATE + "2020-03-22";
+ assertParseFailure(parser, DELETE_ATTENDANCE_DESC + "2" + invalidDate, expectedMessage);
+ }
+
+ @Test
+ public void parseCommand_unrecognisedInput_throwsParseException() {
+ String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, AttendanceCommand.MESSAGE_USAGE);
+ assertThrows(ParseException.class, expectedMessage, () -> parser.parse(""));
+ }
+
+ @Test
+ public void parseCommand_unknownCommand_throwsParseException() {
+ String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, AttendanceCommand.MESSAGE_USAGE);
+ assertThrows(ParseException.class, expectedMessage, () -> parser.parse("unknownCommand"));
+ }
+}
diff --git a/src/test/java/seedu/address/logic/parser/DetailCommandParserTest.java b/src/test/java/seedu/address/logic/parser/DetailCommandParserTest.java
new file mode 100644
index 00000000000..d3d0f4c9018
--- /dev/null
+++ b/src/test/java/seedu/address/logic/parser/DetailCommandParserTest.java
@@ -0,0 +1,143 @@
+package seedu.address.logic.parser;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.commands.CommandTestUtil.ADDITIONAL_DETAIL_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDITIONAL_DETAILS_AMY;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_INDEX;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.AddDetailCommand;
+import seedu.address.logic.commands.DeleteDetailCommand;
+import seedu.address.logic.commands.DetailCommand;
+import seedu.address.logic.commands.EditDetailCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.student.admin.Detail;
+
+public class DetailCommandParserTest {
+
+ //@@author VaishakAnand
+ private static final String ADD_DETAIL_DESC = AddDetailCommand.COMMAND_WORD + " ";
+ private static final String EDIT_DETAIL_DESC = EditDetailCommand.COMMAND_WORD + " ";
+ private static final String DELETE_DETAIL_DESC = DeleteDetailCommand.COMMAND_WORD + " ";
+
+ private final DetailCommandParser parser = new DetailCommandParser();
+
+ @Test
+ public void parse_addDetailAllFieldsPresent_success() {
+ Index targetStudentIndex = INDEX_SECOND_PERSON;
+ String userInput = ADD_DETAIL_DESC + targetStudentIndex.getOneBased() + ADDITIONAL_DETAIL_DESC_AMY;
+ AddDetailCommand expectedCommand = new AddDetailCommand(targetStudentIndex,
+ new Detail(VALID_ADDITIONAL_DETAILS_AMY));
+
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+
+ @Test
+ public void parse_addDetailMissingParts_throwsParseException() {
+ String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ AddDetailCommand.MESSAGE_USAGE);
+ Index targetStudentIndex = INDEX_SECOND_PERSON;
+
+ // missing index and prefix
+ assertParseFailure(parser, ADD_DETAIL_DESC, expectedMessage);
+
+ // valid index, missing prefix
+ assertParseFailure(parser, ADD_DETAIL_DESC + targetStudentIndex + " ", expectedMessage);
+
+ // missing index, valid prefix
+ assertParseFailure(parser, ADD_DETAIL_DESC + ADDITIONAL_DETAIL_DESC_AMY, expectedMessage);
+ }
+
+ @Test
+ public void parse_deleteDetailAllFieldsPresent_success() {
+ Index targetStudentIndex = INDEX_SECOND_PERSON;
+ String targetDetailIndexDesc = " " + PREFIX_INDEX + "2";
+ String userInput = DELETE_DETAIL_DESC + targetStudentIndex.getOneBased() + targetDetailIndexDesc;
+ DeleteDetailCommand expectedCommand = new DeleteDetailCommand(targetStudentIndex,
+ Index.fromOneBased(2));
+
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+
+ @Test
+ public void parse_deleteDetailMissingParts_throwsParseException() {
+ String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ DeleteDetailCommand.MESSAGE_USAGE);
+
+ // missing 2 arguments
+ assertParseFailure(parser, DELETE_DETAIL_DESC, expectedMessage);
+
+ // missing 1 argument
+ assertParseFailure(parser, DELETE_DETAIL_DESC + "2", expectedMessage);
+
+ String targetDetailIndexDesc = String.format(" %s%s", PREFIX_INDEX, "2");
+ assertParseFailure(parser, DELETE_DETAIL_DESC + targetDetailIndexDesc, expectedMessage);
+
+ // wrong detail index
+ String invalidDetailIndex = " " + PREFIX_INDEX + "0";
+ assertParseFailure(parser, DELETE_DETAIL_DESC + "2" + invalidDetailIndex, expectedMessage);
+ }
+
+ @Test
+ public void parse_editDetailAllFieldsPresent_success() {
+ Index targetStudentIndex = INDEX_SECOND_PERSON;
+ Index targetDetailIndex = Index.fromOneBased(2);
+ String targetDetailIndexDesc = String.format(" %s%s", PREFIX_INDEX, "2");
+ String userInput = EDIT_DETAIL_DESC + "2" + targetDetailIndexDesc + ADDITIONAL_DETAIL_DESC_AMY;
+
+ EditDetailCommand expectedCommand = new EditDetailCommand(targetStudentIndex,
+ targetDetailIndex, new Detail(VALID_ADDITIONAL_DETAILS_AMY));
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+
+ @Test
+ public void parse_editDetailMissingParts_throwsParseException() {
+ String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ EditDetailCommand.MESSAGE_USAGE);
+
+ Index targetStudentIndex = INDEX_SECOND_PERSON;
+ Index targetDetailIndex = INDEX_SECOND_PERSON;
+ String targetDetailIndexDesc = String.format(" %s%s", PREFIX_INDEX, targetDetailIndex.getOneBased());
+
+ // missing 3 arguments
+ assertParseFailure(parser, EDIT_DETAIL_DESC, expectedMessage);
+
+ // missing 2 arguments
+ assertParseFailure(parser, EDIT_DETAIL_DESC + "2", expectedMessage);
+ assertParseFailure(parser, EDIT_DETAIL_DESC + targetDetailIndexDesc, expectedMessage);
+ assertParseFailure(parser, EDIT_DETAIL_DESC + ADDITIONAL_DETAIL_DESC_AMY, expectedMessage);
+
+ // missing 1 argument
+ assertParseFailure(parser, EDIT_DETAIL_DESC + "2" + ADDITIONAL_DETAIL_DESC_AMY,
+ expectedMessage);
+ assertParseFailure(parser, EDIT_DETAIL_DESC + "2" + targetDetailIndexDesc,
+ expectedMessage);
+ assertParseFailure(parser, EDIT_DETAIL_DESC + targetDetailIndexDesc + ADDITIONAL_DETAIL_DESC_AMY,
+ expectedMessage);
+
+ // wrong detail index
+ assertParseFailure(parser, EDIT_DETAIL_DESC + targetStudentIndex.getOneBased() + " "
+ + PREFIX_INDEX + "0"
+ + ADDITIONAL_DETAIL_DESC_AMY, expectedMessage);
+ }
+
+ @Test
+ public void parseCommand_unrecognisedInput_throwsParseException() {
+ String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, DetailCommand.MESSAGE_USAGE);
+ assertThrows(ParseException.class, expectedMessage, () -> parser.parse(""));
+ }
+
+ @Test
+ public void parseCommand_unknownCommand_throwsParseException() {
+ String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, DetailCommand.MESSAGE_USAGE);
+ assertThrows(ParseException.class, expectedMessage, () -> parser.parse("unknownCommand"));
+ }
+ //@@author
+
+}
diff --git a/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java b/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java
index 2ff31522486..3dbbf11a4d6 100644
--- a/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java
@@ -1,30 +1,38 @@
package seedu.address.logic.parser;
import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.EMAIL_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_ADDRESS_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_EMAIL_DESC;
+import static seedu.address.logic.commands.CommandTestUtil.CLASS_TIME_DESC_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.CLASS_VENUE_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.CLASS_VENUE_DESC_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.FEE_DESC_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.INVALID_FEE_DESC;
import static seedu.address.logic.commands.CommandTestUtil.INVALID_NAME_DESC;
+import static seedu.address.logic.commands.CommandTestUtil.INVALID_PAYMENT_DESC;
import static seedu.address.logic.commands.CommandTestUtil.INVALID_PHONE_DESC;
-import static seedu.address.logic.commands.CommandTestUtil.INVALID_TAG_DESC;
+import static seedu.address.logic.commands.CommandTestUtil.INVALID_SCHOOL_DESC;
+import static seedu.address.logic.commands.CommandTestUtil.INVALID_TIME_DESC;
+import static seedu.address.logic.commands.CommandTestUtil.INVALID_VENUE_DESC;
+import static seedu.address.logic.commands.CommandTestUtil.INVALID_YEAR_DESC;
import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.PAYMENT_DATE_DESC_AMY;
import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY;
import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_FRIEND;
-import static seedu.address.logic.commands.CommandTestUtil.TAG_DESC_HUSBAND;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.SCHOOL_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.SCHOOL_DESC_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_CLASS_TIME_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_CLASS_VENUE_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_CLASS_VENUE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_FEE_BOB;
import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_PAYMENT_DATE_AMY;
import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_AMY;
import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_FRIEND;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_SCHOOL_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_SCHOOL_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_YEAR_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_YEAR_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.YEAR_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.YEAR_DESC_BOB;
import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
@@ -35,18 +43,21 @@
import seedu.address.commons.core.index.Index;
import seedu.address.logic.commands.EditCommand;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-import seedu.address.testutil.EditPersonDescriptorBuilder;
+import seedu.address.logic.commands.EditCommand.EditAdminDescriptor;
+import seedu.address.logic.commands.EditCommand.EditStudentDescriptor;
+import seedu.address.model.student.Name;
+import seedu.address.model.student.Phone;
+import seedu.address.model.student.School;
+import seedu.address.model.student.Year;
+import seedu.address.model.student.admin.ClassTime;
+import seedu.address.model.student.admin.ClassVenue;
+import seedu.address.model.student.admin.Fee;
+import seedu.address.model.student.admin.PaymentDate;
+import seedu.address.testutil.EditAdminDescriptorBuilder;
+import seedu.address.testutil.EditStudentDescriptorBuilder;
public class EditCommandParserTest {
- private static final String TAG_EMPTY = " " + PREFIX_TAG;
-
private static final String MESSAGE_INVALID_FORMAT =
String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_USAGE);
@@ -83,38 +94,50 @@ public void parse_invalidPreamble_failure() {
public void parse_invalidValue_failure() {
assertParseFailure(parser, "1" + INVALID_NAME_DESC, Name.MESSAGE_CONSTRAINTS); // invalid name
assertParseFailure(parser, "1" + INVALID_PHONE_DESC, Phone.MESSAGE_CONSTRAINTS); // invalid phone
- assertParseFailure(parser, "1" + INVALID_EMAIL_DESC, Email.MESSAGE_CONSTRAINTS); // invalid email
- assertParseFailure(parser, "1" + INVALID_ADDRESS_DESC, Address.MESSAGE_CONSTRAINTS); // invalid address
- assertParseFailure(parser, "1" + INVALID_TAG_DESC, Tag.MESSAGE_CONSTRAINTS); // invalid tag
+ assertParseFailure(parser, "1" + INVALID_SCHOOL_DESC, School.MESSAGE_CONSTRAINTS); // invalid school
+ assertParseFailure(parser, "1" + INVALID_YEAR_DESC, Year.MESSAGE_CONSTRAINTS); // invalid year
+ assertParseFailure(parser, "1" + INVALID_VENUE_DESC, ClassVenue.MESSAGE_CONSTRAINTS); // invalid venue
+ assertParseFailure(parser, "1" + INVALID_TIME_DESC, ClassTime.MESSAGE_CONSTRAINTS); // invalid time
+ assertParseFailure(parser, "1" + INVALID_FEE_DESC, Fee.MESSAGE_CONSTRAINTS); // invalid fee
+ assertParseFailure(parser, "1" + INVALID_PAYMENT_DESC, PaymentDate.MESSAGE_CONSTRAINTS);
+ // invalid payment date
- // invalid phone followed by valid email
- assertParseFailure(parser, "1" + INVALID_PHONE_DESC + EMAIL_DESC_AMY, Phone.MESSAGE_CONSTRAINTS);
+ // invalid phone followed by valid school
+ assertParseFailure(parser, "1" + INVALID_PHONE_DESC + SCHOOL_DESC_AMY, Phone.MESSAGE_CONSTRAINTS);
// valid phone followed by invalid phone. The test case for invalid phone followed by valid phone
// is tested at {@code parse_invalidValueFollowedByValidValue_success()}
assertParseFailure(parser, "1" + PHONE_DESC_BOB + INVALID_PHONE_DESC, Phone.MESSAGE_CONSTRAINTS);
+
// while parsing {@code PREFIX_TAG} alone will reset the tags of the {@code Person} being edited,
// parsing it together with a valid tag results in error
- assertParseFailure(parser, "1" + TAG_DESC_FRIEND + TAG_DESC_HUSBAND + TAG_EMPTY, Tag.MESSAGE_CONSTRAINTS);
- assertParseFailure(parser, "1" + TAG_DESC_FRIEND + TAG_EMPTY + TAG_DESC_HUSBAND, Tag.MESSAGE_CONSTRAINTS);
- assertParseFailure(parser, "1" + TAG_EMPTY + TAG_DESC_FRIEND + TAG_DESC_HUSBAND, Tag.MESSAGE_CONSTRAINTS);
+ // assertParseFailure(parser, "1" + DET_DESC_FRIEND + TAG_DESC_HUSBAND + TAG_EMPTY, Tag.MESSAGE_CONSTRAINTS);
+ // assertParseFailure(parser, "1" + TAG_DESC_FRIEND + TAG_EMPTY + TAG_DESC_HUSBAND, Tag.MESSAGE_CONSTRAINTS);
+ // assertParseFailure(parser, "1" + TAG_EMPTY + TAG_DESC_FRIEND + TAG_DESC_HUSBAND, Tag.MESSAGE_CONSTRAINTS);
+
// multiple invalid values, but only the first invalid value is captured
- assertParseFailure(parser, "1" + INVALID_NAME_DESC + INVALID_EMAIL_DESC + VALID_ADDRESS_AMY + VALID_PHONE_AMY,
+ assertParseFailure(parser, "1" + INVALID_NAME_DESC + INVALID_SCHOOL_DESC + VALID_YEAR_AMY
+ + VALID_PHONE_AMY + INVALID_PAYMENT_DESC,
Name.MESSAGE_CONSTRAINTS);
}
@Test
public void parse_allFieldsSpecified_success() {
Index targetIndex = INDEX_SECOND_PERSON;
- String userInput = targetIndex.getOneBased() + PHONE_DESC_BOB + TAG_DESC_HUSBAND
- + EMAIL_DESC_AMY + ADDRESS_DESC_AMY + NAME_DESC_AMY + TAG_DESC_FRIEND;
+ String userInput = targetIndex.getOneBased() + PHONE_DESC_BOB + YEAR_DESC_AMY
+ + SCHOOL_DESC_AMY + NAME_DESC_AMY + FEE_DESC_BOB + PAYMENT_DATE_DESC_AMY
+ + CLASS_TIME_DESC_BOB + CLASS_VENUE_DESC_AMY;
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY)
- .withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_AMY).withAddress(VALID_ADDRESS_AMY)
- .withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND).build();
- EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
+ EditStudentDescriptor editStudentDescriptor = new EditStudentDescriptorBuilder().withName(VALID_NAME_AMY)
+ .withPhone(VALID_PHONE_BOB).withSchool(VALID_SCHOOL_AMY)
+ .withYear(VALID_YEAR_AMY).build();
+ EditAdminDescriptor editAdminDescriptor = new EditAdminDescriptorBuilder().withFee(VALID_FEE_BOB)
+ .withPaymentDate(VALID_PAYMENT_DATE_AMY).withTime(VALID_CLASS_TIME_BOB)
+ .withVenue(VALID_CLASS_VENUE_AMY).build();
+
+ EditCommand expectedCommand = new EditCommand(targetIndex, editStudentDescriptor, editAdminDescriptor);
assertParseSuccess(parser, userInput, expectedCommand);
}
@@ -122,11 +145,14 @@ public void parse_allFieldsSpecified_success() {
@Test
public void parse_someFieldsSpecified_success() {
Index targetIndex = INDEX_FIRST_PERSON;
- String userInput = targetIndex.getOneBased() + PHONE_DESC_BOB + EMAIL_DESC_AMY;
+ String userInput = targetIndex.getOneBased() + PHONE_DESC_BOB + SCHOOL_DESC_AMY + PAYMENT_DATE_DESC_AMY;
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_BOB)
- .withEmail(VALID_EMAIL_AMY).build();
- EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
+ EditStudentDescriptor editStudentDescriptor = new EditStudentDescriptorBuilder().withPhone(VALID_PHONE_BOB)
+ .withSchool(VALID_SCHOOL_AMY).build();
+ EditAdminDescriptor editAdminDescriptor = new EditAdminDescriptorBuilder()
+ .withPaymentDate(VALID_PAYMENT_DATE_AMY)
+ .build();
+ EditCommand expectedCommand = new EditCommand(targetIndex, editStudentDescriptor, editAdminDescriptor);
assertParseSuccess(parser, userInput, expectedCommand);
}
@@ -136,46 +162,72 @@ public void parse_oneFieldSpecified_success() {
// name
Index targetIndex = INDEX_THIRD_PERSON;
String userInput = targetIndex.getOneBased() + NAME_DESC_AMY;
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withName(VALID_NAME_AMY).build();
- EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
+ EditStudentDescriptor editStudentDescriptor = new EditStudentDescriptorBuilder().withName(VALID_NAME_AMY)
+ .build();
+ EditAdminDescriptor editAdminDescriptor = new EditAdminDescriptorBuilder().build();
+ EditCommand expectedCommand = new EditCommand(targetIndex, editStudentDescriptor, editAdminDescriptor);
assertParseSuccess(parser, userInput, expectedCommand);
// phone
userInput = targetIndex.getOneBased() + PHONE_DESC_AMY;
- descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_AMY).build();
- expectedCommand = new EditCommand(targetIndex, descriptor);
+ editStudentDescriptor = new EditStudentDescriptorBuilder().withPhone(VALID_PHONE_AMY).build();
+ expectedCommand = new EditCommand(targetIndex, editStudentDescriptor, editAdminDescriptor);
assertParseSuccess(parser, userInput, expectedCommand);
- // email
- userInput = targetIndex.getOneBased() + EMAIL_DESC_AMY;
- descriptor = new EditPersonDescriptorBuilder().withEmail(VALID_EMAIL_AMY).build();
- expectedCommand = new EditCommand(targetIndex, descriptor);
+ // school
+ userInput = targetIndex.getOneBased() + SCHOOL_DESC_AMY;
+ editStudentDescriptor = new EditStudentDescriptorBuilder().withSchool(VALID_SCHOOL_AMY).build();
+ expectedCommand = new EditCommand(targetIndex, editStudentDescriptor, editAdminDescriptor);
assertParseSuccess(parser, userInput, expectedCommand);
- // address
- userInput = targetIndex.getOneBased() + ADDRESS_DESC_AMY;
- descriptor = new EditPersonDescriptorBuilder().withAddress(VALID_ADDRESS_AMY).build();
- expectedCommand = new EditCommand(targetIndex, descriptor);
+ // year
+ userInput = targetIndex.getOneBased() + YEAR_DESC_AMY;
+ editStudentDescriptor = new EditStudentDescriptorBuilder()
+ .withYear(VALID_YEAR_AMY).build();
+ expectedCommand = new EditCommand(targetIndex, editStudentDescriptor, editAdminDescriptor);
assertParseSuccess(parser, userInput, expectedCommand);
- // tags
- userInput = targetIndex.getOneBased() + TAG_DESC_FRIEND;
- descriptor = new EditPersonDescriptorBuilder().withTags(VALID_TAG_FRIEND).build();
- expectedCommand = new EditCommand(targetIndex, descriptor);
+ // class time
+ userInput = targetIndex.getOneBased() + CLASS_TIME_DESC_BOB;
+ editStudentDescriptor = new EditStudentDescriptorBuilder().build();
+ editAdminDescriptor = new EditAdminDescriptorBuilder().withTime(VALID_CLASS_TIME_BOB).build();
+ expectedCommand = new EditCommand(targetIndex, editStudentDescriptor, editAdminDescriptor);
+ assertParseSuccess(parser, userInput, expectedCommand);
+
+ // class venue
+ userInput = targetIndex.getOneBased() + CLASS_VENUE_DESC_AMY;
+ editStudentDescriptor = new EditStudentDescriptorBuilder().build();
+ editAdminDescriptor = new EditAdminDescriptorBuilder().withVenue(VALID_CLASS_VENUE_AMY).build();
+ expectedCommand = new EditCommand(targetIndex, editStudentDescriptor, editAdminDescriptor);
+ assertParseSuccess(parser, userInput, expectedCommand);
+
+ // fee
+ userInput = targetIndex.getOneBased() + FEE_DESC_BOB;
+ editStudentDescriptor = new EditStudentDescriptorBuilder().build();
+ editAdminDescriptor = new EditAdminDescriptorBuilder().withFee(VALID_FEE_BOB).build();
+ expectedCommand = new EditCommand(targetIndex, editStudentDescriptor, editAdminDescriptor);
+ assertParseSuccess(parser, userInput, expectedCommand);
+
+ // payment date
+ userInput = targetIndex.getOneBased() + PAYMENT_DATE_DESC_AMY;
+ editStudentDescriptor = new EditStudentDescriptorBuilder().build();
+ editAdminDescriptor = new EditAdminDescriptorBuilder().withPaymentDate(VALID_PAYMENT_DATE_AMY).build();
+ expectedCommand = new EditCommand(targetIndex, editStudentDescriptor, editAdminDescriptor);
assertParseSuccess(parser, userInput, expectedCommand);
}
@Test
public void parse_multipleRepeatedFields_acceptsLast() {
Index targetIndex = INDEX_FIRST_PERSON;
- String userInput = targetIndex.getOneBased() + PHONE_DESC_AMY + ADDRESS_DESC_AMY + EMAIL_DESC_AMY
- + TAG_DESC_FRIEND + PHONE_DESC_AMY + ADDRESS_DESC_AMY + EMAIL_DESC_AMY + TAG_DESC_FRIEND
- + PHONE_DESC_BOB + ADDRESS_DESC_BOB + EMAIL_DESC_BOB + TAG_DESC_HUSBAND;
+ String userInput = targetIndex.getOneBased() + PHONE_DESC_AMY + SCHOOL_DESC_AMY + YEAR_DESC_AMY
+ + PHONE_DESC_AMY + SCHOOL_DESC_AMY + YEAR_DESC_AMY + CLASS_TIME_DESC_BOB + CLASS_VENUE_DESC_AMY
+ + CLASS_TIME_DESC_BOB + CLASS_VENUE_DESC_BOB + PHONE_DESC_BOB + SCHOOL_DESC_BOB + YEAR_DESC_BOB;
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_BOB)
- .withEmail(VALID_EMAIL_BOB).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_FRIEND, VALID_TAG_HUSBAND)
- .build();
- EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
+ EditStudentDescriptor editStudentDescriptor = new EditStudentDescriptorBuilder().withPhone(VALID_PHONE_BOB)
+ .withSchool(VALID_SCHOOL_BOB).withYear(VALID_YEAR_BOB).build();
+ EditAdminDescriptor editAdminDescriptor = new EditAdminDescriptorBuilder().withTime(VALID_CLASS_TIME_BOB)
+ .withVenue(VALID_CLASS_VENUE_BOB).build();
+ EditCommand expectedCommand = new EditCommand(targetIndex, editStudentDescriptor, editAdminDescriptor);
assertParseSuccess(parser, userInput, expectedCommand);
}
@@ -184,28 +236,20 @@ public void parse_multipleRepeatedFields_acceptsLast() {
public void parse_invalidValueFollowedByValidValue_success() {
// no other valid values specified
Index targetIndex = INDEX_FIRST_PERSON;
- String userInput = targetIndex.getOneBased() + INVALID_PHONE_DESC + PHONE_DESC_BOB;
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_BOB).build();
- EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
+ String userInput = targetIndex.getOneBased() + INVALID_PHONE_DESC + PHONE_DESC_BOB + FEE_DESC_BOB;
+ EditStudentDescriptor editStudentDescriptor = new EditStudentDescriptorBuilder().withPhone(VALID_PHONE_BOB)
+ .build();
+ EditAdminDescriptor editAdminDescriptor = new EditAdminDescriptorBuilder().withFee(VALID_FEE_BOB).build();
+ EditCommand expectedCommand = new EditCommand(targetIndex, editStudentDescriptor, editAdminDescriptor);
assertParseSuccess(parser, userInput, expectedCommand);
// other valid values specified
- userInput = targetIndex.getOneBased() + EMAIL_DESC_BOB + INVALID_PHONE_DESC + ADDRESS_DESC_BOB
+ userInput = targetIndex.getOneBased() + YEAR_DESC_BOB + INVALID_PHONE_DESC + SCHOOL_DESC_BOB
+ PHONE_DESC_BOB;
- descriptor = new EditPersonDescriptorBuilder().withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB)
- .withAddress(VALID_ADDRESS_BOB).build();
- expectedCommand = new EditCommand(targetIndex, descriptor);
- assertParseSuccess(parser, userInput, expectedCommand);
- }
-
- @Test
- public void parse_resetTags_success() {
- Index targetIndex = INDEX_THIRD_PERSON;
- String userInput = targetIndex.getOneBased() + TAG_EMPTY;
-
- EditPersonDescriptor descriptor = new EditPersonDescriptorBuilder().withTags().build();
- EditCommand expectedCommand = new EditCommand(targetIndex, descriptor);
-
+ editStudentDescriptor = new EditStudentDescriptorBuilder().withPhone(VALID_PHONE_BOB)
+ .withYear(VALID_YEAR_BOB).withSchool(VALID_SCHOOL_BOB).build();
+ editAdminDescriptor = new EditAdminDescriptorBuilder().build();
+ expectedCommand = new EditCommand(targetIndex, editStudentDescriptor, editAdminDescriptor);
assertParseSuccess(parser, userInput, expectedCommand);
}
}
diff --git a/src/test/java/seedu/address/logic/parser/ExamCommandParserTest.java b/src/test/java/seedu/address/logic/parser/ExamCommandParserTest.java
new file mode 100644
index 00000000000..64d652122cd
--- /dev/null
+++ b/src/test/java/seedu/address/logic/parser/ExamCommandParserTest.java
@@ -0,0 +1,160 @@
+package seedu.address.logic.parser;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.commands.CommandTestUtil.EXAM_DATE_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.EXAM_DATE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.EXAM_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_EXAM_DATE_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_EXAM_DATE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_EXAM_NAME_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_EXAM_NAME_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_EXAM_SCORE_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_EXAM_SCORE_BOB;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_EXAM_DATE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_EXAM_INDEX;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_EXAM_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SCORE;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.AddExamCommand;
+import seedu.address.logic.commands.DeleteExamCommand;
+import seedu.address.logic.commands.ExamCommand;
+import seedu.address.logic.commands.ExamStatsCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.student.academic.exam.Exam;
+import seedu.address.model.student.academic.exam.Score;
+
+public class ExamCommandParserTest {
+
+ private static final String ADD_EXAM_DESC = AddExamCommand.COMMAND_WORD + " ";
+ private static final String DEL_EXAM_DESC = DeleteExamCommand.COMMAND_WORD + " ";
+
+ private final ExamCommandParser parser = new ExamCommandParser();
+
+ //@@author hogantan
+ @Test
+ public void parse_addExamAllFieldsPresent_success() {
+ //all fields presents - single
+ String userInput = ADD_EXAM_DESC + INDEX_SECOND_PERSON.getOneBased() + EXAM_DESC_AMY;
+ AddExamCommand expectedCommand = new AddExamCommand(INDEX_SECOND_PERSON,
+ new Exam(VALID_EXAM_NAME_AMY, EXAM_DATE_AMY, new Score(VALID_EXAM_SCORE_AMY)));
+
+ assertParseSuccess(parser, userInput, expectedCommand);
+
+ // multiple exam names - last name accepted
+ userInput = ADD_EXAM_DESC + INDEX_SECOND_PERSON.getOneBased() + EXAM_DESC_AMY + " " + PREFIX_EXAM_NAME
+ + VALID_EXAM_NAME_BOB;
+ expectedCommand = new AddExamCommand(INDEX_SECOND_PERSON,
+ new Exam(VALID_EXAM_NAME_BOB, EXAM_DATE_AMY, new Score(VALID_EXAM_SCORE_AMY)));
+
+ assertParseSuccess(parser, userInput, expectedCommand);
+
+ // multiple exam dates - last date accepted
+ userInput = ADD_EXAM_DESC + INDEX_SECOND_PERSON.getOneBased() + EXAM_DESC_AMY + " " + PREFIX_EXAM_DATE
+ + VALID_EXAM_DATE_BOB;
+ expectedCommand = new AddExamCommand(INDEX_SECOND_PERSON,
+ new Exam(VALID_EXAM_NAME_AMY, EXAM_DATE_BOB, new Score(VALID_EXAM_SCORE_AMY)));
+
+ assertParseSuccess(parser, userInput, expectedCommand);
+
+ // multiple exam scores - last score accepted
+ userInput = ADD_EXAM_DESC + INDEX_SECOND_PERSON.getOneBased() + EXAM_DESC_AMY + " " + PREFIX_SCORE
+ + VALID_EXAM_SCORE_BOB;
+ expectedCommand = new AddExamCommand(INDEX_SECOND_PERSON,
+ new Exam(VALID_EXAM_NAME_AMY, EXAM_DATE_AMY, new Score(VALID_EXAM_SCORE_BOB)));
+
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+
+ @Test
+ public void parse_addExamMissingArguments_throwsParseException() {
+ String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ AddExamCommand.MESSAGE_USAGE);
+
+ // missing index and prefix
+ assertParseFailure(parser, ADD_EXAM_DESC, expectedMessage);
+
+ // missing index, valid prefix
+ assertParseFailure(parser, ADD_EXAM_DESC + EXAM_DESC_AMY, expectedMessage);
+
+ // valid index, missing all three prefixes
+ assertParseFailure(parser, ADD_EXAM_DESC + INDEX_SECOND_PERSON + " ", expectedMessage);
+
+ // valid index, missing two prefixes
+ assertParseFailure(parser, ADD_EXAM_DESC + INDEX_SECOND_PERSON + " " + PREFIX_EXAM_NAME
+ + VALID_EXAM_NAME_AMY, expectedMessage);
+
+ // valid index, missing one prefixes
+ assertParseFailure(parser, ADD_EXAM_DESC + INDEX_SECOND_PERSON + " " + PREFIX_EXAM_NAME
+ + VALID_EXAM_NAME_AMY + " " + PREFIX_EXAM_DATE + VALID_EXAM_DATE_AMY, expectedMessage);
+ }
+
+ @Test
+ public void parse_deleteExamAllFieldsPresent_success() {
+ String targetExamIndexDesc = String.format(" %s%s", PREFIX_EXAM_INDEX, "2");
+ String userInput = DEL_EXAM_DESC + INDEX_SECOND_PERSON.getOneBased() + targetExamIndexDesc;
+ DeleteExamCommand expectedCommand = new DeleteExamCommand(INDEX_SECOND_PERSON, Index.fromOneBased(2));
+
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+
+ @Test
+ public void parse_deleteExamMissingArguments_throwsParseException() {
+ String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ DeleteExamCommand.MESSAGE_USAGE);
+
+ String targetExamIndexDesc = String.format(" %s%s", PREFIX_EXAM_INDEX, INDEX_SECOND_PERSON.getOneBased());
+
+ // missing 2 arguments
+ assertParseFailure(parser, DEL_EXAM_DESC, expectedMessage);
+
+ // missing 1 argument
+ String badCommand = DEL_EXAM_DESC + String.format("%s", INDEX_SECOND_PERSON.getOneBased());
+ assertParseFailure(parser, badCommand, expectedMessage);
+ badCommand = DEL_EXAM_DESC + targetExamIndexDesc;
+ assertParseFailure(parser, badCommand, expectedMessage);
+
+ // wrong exam index
+ badCommand = DEL_EXAM_DESC + INDEX_SECOND_PERSON.getOneBased() + " " + INDEX_SECOND_PERSON + "0";
+ assertParseFailure(parser, badCommand, expectedMessage);
+ }
+
+ @Test
+ public void parse_examStatsMissingIndex_throwsParseException() {
+ String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ ExamStatsCommand.MESSAGE_USAGE);
+
+ String missingIndexDesc = String.format("%s %s", ExamStatsCommand.COMMAND_WORD, " ");
+
+ assertParseFailure(parser, missingIndexDesc, expectedMessage);
+ }
+
+ @Test
+ public void parse_examStatsInvalidIndex_throwsParseException() {
+ String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ ExamStatsCommand.MESSAGE_USAGE);
+
+ String missingIndexDesc = String.format("%s %s", ExamStatsCommand.COMMAND_WORD, "0");
+
+ assertParseFailure(parser, missingIndexDesc, expectedMessage);
+ }
+
+ @Test
+ public void parseCommand_emptyInput_throwsParseException() {
+ assertThrows(ParseException.class, String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ ExamCommand.MESSAGE_USAGE), () -> parser.parse(""));
+ }
+
+ @Test
+ public void parseCommand_unknownCommand_throwsParseException() {
+ assertThrows(ParseException.class, String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ ExamCommand.MESSAGE_USAGE), () -> parser.parse("unknownCommand"));
+ }
+ //@@author
+}
diff --git a/src/test/java/seedu/address/logic/parser/FindCommandParserTest.java b/src/test/java/seedu/address/logic/parser/FindCommandParserTest.java
index 70f4f0e79c4..5328a08f931 100644
--- a/src/test/java/seedu/address/logic/parser/FindCommandParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/FindCommandParserTest.java
@@ -9,7 +9,11 @@
import org.junit.jupiter.api.Test;
import seedu.address.logic.commands.FindCommand;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
+import seedu.address.model.student.NameContainsKeywordsPredicate;
+import seedu.address.model.student.SchoolContainsKeywordsPredicate;
+import seedu.address.model.student.Year;
+import seedu.address.model.student.YearMatchPredicate;
+import seedu.address.testutil.FindStudentDescriptorBuilder;
public class FindCommandParserTest {
@@ -22,13 +26,40 @@ public void parse_emptyArg_throwsParseException() {
@Test
public void parse_validArgs_returnsFindCommand() {
+
+ NameContainsKeywordsPredicate predicate = new NameContainsKeywordsPredicate(Arrays.asList("Alice", "Bob"));
+ FindCommand.FindStudentDescriptor descriptor =
+ new FindStudentDescriptorBuilder().withNamePredicate(predicate).build();
+
+ // no leading and trailing whitespaces
+ FindCommand expectedFindCommand = new FindCommand(descriptor);
+ assertParseSuccess(parser, " n/Alice Bob", expectedFindCommand);
+
+ // multiple whitespaces between keywords
+ assertParseSuccess(parser, " n/ \n Alice \n \t Bob \t", expectedFindCommand);
+ }
+
+ @Test
+ public void parse_validArgsCompoundPredicates_returnsFindCommand() {
+
+ NameContainsKeywordsPredicate namePredicate = new NameContainsKeywordsPredicate(Arrays.asList("Alice", "Bob"));
+ SchoolContainsKeywordsPredicate schoolPredicate =
+ new SchoolContainsKeywordsPredicate(Arrays.asList("Changi", "Sec"));
+ YearMatchPredicate yearPredicate = new YearMatchPredicate(new Year("Sec 3"));
+
+ FindCommand.FindStudentDescriptor descriptor = new FindStudentDescriptorBuilder()
+ .withNamePredicate(namePredicate)
+ .withSchoolPredicate(schoolPredicate)
+ .withYearPredicate(yearPredicate)
+ .build();
+
// no leading and trailing whitespaces
- FindCommand expectedFindCommand =
- new FindCommand(new NameContainsKeywordsPredicate(Arrays.asList("Alice", "Bob")));
- assertParseSuccess(parser, "Alice Bob", expectedFindCommand);
+ FindCommand expectedFindCommand = new FindCommand(descriptor);
+ assertParseSuccess(parser, " n/Alice Bob s/Changi Sec y/Secondary 3", expectedFindCommand);
// multiple whitespaces between keywords
- assertParseSuccess(parser, " \n Alice \n \t Bob \t", expectedFindCommand);
+ assertParseSuccess(parser,
+ " n/ \n Alice \n \t Bob \n s/Changi\t Sec\t \t y/Secondary 3", expectedFindCommand);
}
}
diff --git a/src/test/java/seedu/address/logic/parser/ParserUtilTest.java b/src/test/java/seedu/address/logic/parser/ParserUtilTest.java
index 4256788b1a7..1d68024cf9a 100644
--- a/src/test/java/seedu/address/logic/parser/ParserUtilTest.java
+++ b/src/test/java/seedu/address/logic/parser/ParserUtilTest.java
@@ -1,39 +1,81 @@
package seedu.address.logic.parser;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static seedu.address.commons.util.DateUtil.parseToDate;
import static seedu.address.logic.parser.ParserUtil.MESSAGE_INVALID_INDEX;
import static seedu.address.testutil.Assert.assertThrows;
import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.stream.Collectors;
import org.junit.jupiter.api.Test;
import seedu.address.logic.parser.exceptions.ParseException;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
+import seedu.address.model.notes.note.Description;
+import seedu.address.model.notes.note.Title;
+import seedu.address.model.student.Name;
+import seedu.address.model.student.Phone;
+import seedu.address.model.student.School;
+import seedu.address.model.student.Year;
+import seedu.address.model.student.academic.Feedback;
+import seedu.address.model.student.academic.exam.Score;
+import seedu.address.model.student.academic.question.Question;
+import seedu.address.model.student.academic.question.SolvedQuestion;
+import seedu.address.model.student.academic.question.UnsolvedQuestion;
+import seedu.address.model.student.admin.ClassTime;
+import seedu.address.model.student.admin.ClassVenue;
+import seedu.address.model.student.admin.Detail;
+import seedu.address.model.student.admin.Fee;
+import seedu.address.model.student.admin.PaymentDate;
public class ParserUtilTest {
private static final String INVALID_NAME = "R@chel";
private static final String INVALID_PHONE = "+651234";
- private static final String INVALID_ADDRESS = " ";
- private static final String INVALID_EMAIL = "example.com";
- private static final String INVALID_TAG = "#friend";
+ private static final String INVALID_SCHOOL = " ";
+ private static final String INVALID_YEAR = "$4";
+ private static final String INVALID_CLASS_VENUE = " ";
+ private static final String INVALID_CLASS_TIME = "8 1240-2400";
+ private static final String INVALID_FEE = "231.451";
+ private static final String INVALID_PAYMENT_DATE = "23-9-2019";
+ private static final String INVALID_ADDITIONAL_DETAIL = "sch!zophren#c";
+ private static final String INVALID_QUESTION = "";
+ private static final String INVALID_SOLUTION = " ";
+ private static final String INVALID_EXAM_NAME = " ";
+ private static final String INVALID_SCORE_LARGER = "100/50";
+ private static final String INVALID_SCORE_NEGATIVE = "-50/-100";
+ private static final String INVALID_ATTENDANCE_STATUS = "you wot m8";
+ private static final String INVALID_DATE_ALPHABETS = "abcdef";
+ private static final String INVALID_DATE_FORMAT = "23-9-2019";
+ private static final String INVALID_FEEDBACK = " ";
+ private static final String INVALID_TITLE = "What is the meaning of life?";
+ private static final String INVALID_DESCRIPTION = "Lorem ipsum dolor sit amet, consectetur"
+ + " adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna ali"
+ + "qua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut "
+ + "aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in volupt"
+ + "ate velit esse cillum dolore eu fugiat nulla pariatur.";
private static final String VALID_NAME = "Rachel Walker";
private static final String VALID_PHONE = "123456";
- private static final String VALID_ADDRESS = "123 Main Street #0505";
- private static final String VALID_EMAIL = "rachel@example.com";
- private static final String VALID_TAG_1 = "friend";
- private static final String VALID_TAG_2 = "neighbour";
-
+ private static final String VALID_SCHOOL = "Raffles Institution";
+ private static final String VALID_YEAR = "JC 2";
+ private static final String VALID_CLASS_VENUE = "Blk 411 #04-11, Lorong Chuan, Singapore 234332";
+ private static final String VALID_CLASS_TIME = "3 1240-1530";
+ private static final String VALID_FEE = "2350.30";
+ private static final String VALID_PAYMENT_DATE = "23/9/2019";
+ private static final String VALID_ADDITIONAL_DETAIL_WEEB = "Is a weeaboo";
+ private static final String VALID_ADDITIONAL_DETAIL_CONVICT = "Just released from prison";
+ private static final String VALID_QUESTION = "Why can't humans fly?";
+ private static final String VALID_SOLUTION = "Read your textbook.";
+ private static final String VALID_EXAM_NAME = "Mid Year 2020";
+ private static final String VALID_DATE = "23/9/2019";
+ private static final String VALID_SCORE = "50/100";
+ private static final String VALID_ATTENDANCE_STATUS = "present";
+ private static final String VALID_FEEDBACK = "attentive";
+ private static final String VALID_TITLE = "meaning of life";
+ private static final String VALID_DESCRIPTION = "Lorem ipsum dolor";
private static final String WHITESPACE = " \t\r\n";
@Test
@@ -103,94 +145,395 @@ public void parsePhone_validValueWithWhitespace_returnsTrimmedPhone() throws Exc
}
@Test
- public void parseAddress_null_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> ParserUtil.parseAddress((String) null));
+ public void parseSchool_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> ParserUtil.parseSchool(null));
+ }
+
+ @Test
+ public void parseSchool_invalidValue_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseSchool(INVALID_SCHOOL));
+ }
+
+ @Test
+ public void parseSchool_validSchoolWithoutWhiteSpace_returnsSchool() throws Exception {
+ School expectedSchool = new School(VALID_SCHOOL);
+ assertEquals(expectedSchool, ParserUtil.parseSchool(VALID_SCHOOL));
+ }
+
+ @Test
+ public void parseSchool_validSchoolWithWhiteSpace_returnsTrimmedSchool() throws Exception {
+ String schoolWithSpaces = WHITESPACE + VALID_SCHOOL + WHITESPACE;
+ School expectedSchool = new School(VALID_SCHOOL);
+ assertEquals(expectedSchool, ParserUtil.parseSchool(schoolWithSpaces));
+ }
+
+ @Test
+ public void parseYear_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> ParserUtil.parseYear(null));
+ }
+
+ @Test
+ public void parseYear_invalidYear_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseYear(INVALID_YEAR));
+ }
+
+ @Test
+ public void parseYear_validYear_returnsYear() throws Exception {
+ Year expectedYear = new Year(VALID_YEAR);
+ assertEquals(expectedYear, ParserUtil.parseYear(VALID_YEAR));
+ assertEquals(expectedYear, ParserUtil.parseYear("J2")); // no whitespace
+ assertEquals(expectedYear, ParserUtil.parseYear("J2 ")); // lots of trailing whitespace
+ assertEquals(expectedYear, ParserUtil.parseYear("J 2 ")); // lots of whitespace
+ assertEquals(expectedYear, ParserUtil.parseYear("Jc 2")); // only one letter capitalised
+ assertEquals(expectedYear, ParserUtil.parseYear("jc 2")); // no letter capitalised
+ assertEquals(expectedYear, ParserUtil.parseYear("jc 2")); // no letter capitalised
+ assertEquals(expectedYear, ParserUtil.parseYear("j2")); // short form
+ }
+
+ @Test
+ public void parseYear_validYearWithWhiteSpace_returnsTrimmedYear() throws Exception {
+ String yearWithWhiteSpace = WHITESPACE + VALID_YEAR + WHITESPACE;
+ Year expectedYear = new Year(VALID_YEAR);
+ assertEquals(expectedYear, ParserUtil.parseYear(yearWithWhiteSpace));
+ }
+
+ @Test
+ public void parseVenue_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> ParserUtil.parseClassVenue(null));
+ }
+
+ @Test
+ public void parseVenue_invalidVenue_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseSchool(INVALID_CLASS_VENUE));
+ }
+
+ @Test
+ public void parseVenue_validVenueWithoutWhiteSpace_returnsVenue() throws Exception {
+ ClassVenue expectedVenue = new ClassVenue(VALID_CLASS_VENUE);
+ assertEquals(expectedVenue, ParserUtil.parseClassVenue(VALID_CLASS_VENUE));
+ }
+
+ @Test
+ public void parseVenue_validVenueWithWhiteSpace_returnsTrimmedVenue() throws Exception {
+ String venueWithWhiteSpace = WHITESPACE + VALID_CLASS_VENUE + WHITESPACE;
+ ClassVenue expectedVenue = new ClassVenue(VALID_CLASS_VENUE);
+ assertEquals(expectedVenue, ParserUtil.parseClassVenue(venueWithWhiteSpace));
+ }
+
+ @Test
+ public void parseTime_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> ParserUtil.parseClassTime(null));
+ }
+
+ @Test
+ public void parseTime_invalidTime_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseClassTime(INVALID_CLASS_TIME));
+ }
+
+ @Test
+ public void parseTime_validTimeWithoutWhiteSpace_returnsTime() throws Exception {
+ ClassTime expectedTime = new ClassTime(VALID_CLASS_TIME);
+ assertEquals(expectedTime, ParserUtil.parseClassTime(VALID_CLASS_TIME));
+ }
+
+ @Test
+ public void parseTime_validTimeWithWhiteSpace_returnsTrimmedTime() throws Exception {
+ String timeWithWhiteSpace = WHITESPACE + VALID_CLASS_TIME + WHITESPACE;
+ ClassTime expectedTime = new ClassTime(VALID_CLASS_TIME);
+ assertEquals(expectedTime, ParserUtil.parseClassTime(timeWithWhiteSpace));
+ }
+
+ @Test
+ public void parseFee_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> ParserUtil.parseFee(null));
+ }
+
+ @Test
+ public void parseFee_invalidFee_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseFee(INVALID_FEE));
+ }
+
+ @Test
+ public void parseFee_validFeeWithoutWhiteSpace_returnsFee() throws Exception {
+ Fee expectedFee = new Fee(VALID_FEE);
+ assertEquals(expectedFee, ParserUtil.parseFee(VALID_FEE));
+ }
+
+ @Test
+ public void parseFee_validFeeWithWhiteSpaces_returnsTrimmedFee() throws Exception {
+ String feeWithWhiteSpace = WHITESPACE + VALID_FEE + WHITESPACE;
+ Fee expectedFee = new Fee(VALID_FEE);
+ assertEquals(expectedFee, ParserUtil.parseFee(feeWithWhiteSpace));
+ }
+
+ @Test
+ public void parsePaymentDate_null_throwNullPointerException() {
+ assertThrows(NullPointerException.class, () -> ParserUtil.parsePaymentDate(null));
+ }
+
+ @Test
+ public void parsePaymentDate_invalidDate_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parsePaymentDate(INVALID_PAYMENT_DATE));
+ }
+
+ @Test
+ public void parsePaymentDate_validDateWithoutWhiteSpace_returnsPaymentDate() throws Exception {
+ PaymentDate expectedPaymentDate = new PaymentDate(VALID_PAYMENT_DATE);
+ assertEquals(expectedPaymentDate, ParserUtil.parsePaymentDate(VALID_PAYMENT_DATE));
+ }
+
+ @Test
+ public void parsePaymentDate_validDateWithWhiteSpace_returnsTrimmedPaymentDate() throws Exception {
+ String paymentDateWithWhiteSpace = WHITESPACE + VALID_PAYMENT_DATE + WHITESPACE;
+ PaymentDate expectedPaymentDate = new PaymentDate(VALID_PAYMENT_DATE);
+ assertEquals(expectedPaymentDate, ParserUtil.parsePaymentDate(paymentDateWithWhiteSpace));
+ }
+
+ @Test
+ public void parseDetail_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> ParserUtil.parseDetail(null));
+ }
+
+ @Test
+ public void parseDetail_invalidValue_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseDetail(INVALID_ADDITIONAL_DETAIL));
+ }
+
+ @Test
+ public void parseDetail_validValue_returnsDetail() throws Exception {
+ Detail expectedDetail = new Detail(VALID_ADDITIONAL_DETAIL_WEEB);
+ assertEquals(expectedDetail, ParserUtil.parseDetail(VALID_ADDITIONAL_DETAIL_WEEB));
+ }
+
+ @Test
+ public void parseDetail_validValueWithWhiteSpace_returnsTrimmedDetail() throws Exception {
+ String detailWithWhiteSpace = WHITESPACE + VALID_ADDITIONAL_DETAIL_WEEB + WHITESPACE;
+ Detail expectedDetail = new Detail(VALID_ADDITIONAL_DETAIL_WEEB);
+ assertEquals(expectedDetail, ParserUtil.parseDetail(detailWithWhiteSpace));
+ }
+
+ @Test
+ public void parseDetails_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> ParserUtil.parseDetails(null));
+ }
+
+ @Test
+ public void parseDetails_invalidDetail_throwsParseException() {
+ List<String> invalidSet = List.of(INVALID_ADDITIONAL_DETAIL);
+ assertThrows(ParseException.class, () -> ParserUtil.parseDetails(invalidSet));
+ }
+
+ @Test
+ public void parseDetails_validDetails_returnsDetails() throws Exception {
+ List<String> validList = List.of(VALID_ADDITIONAL_DETAIL_CONVICT, VALID_ADDITIONAL_DETAIL_WEEB);
+ List<Detail> expectedSet = validList.stream()
+ .map(Detail::new)
+ .collect(Collectors.toList());
+ assertEquals(expectedSet, ParserUtil.parseDetails(validList));
+ }
+
+ @Test
+ public void parseDetails_validDetailsSpace_returnsTrimmedDetails() throws Exception {
+ List<String> baseList = List.of(VALID_ADDITIONAL_DETAIL_CONVICT, VALID_ADDITIONAL_DETAIL_WEEB);
+ List<String> validList = baseList.stream()
+ .map(string -> WHITESPACE + string + WHITESPACE)
+ .collect(Collectors.toList());
+ List<Detail> expectedSet = baseList.stream()
+ .map(Detail::new)
+ .collect(Collectors.toList());
+ assertEquals(expectedSet, ParserUtil.parseDetails(validList));
}
@Test
- public void parseAddress_invalidValue_throwsParseException() {
- assertThrows(ParseException.class, () -> ParserUtil.parseAddress(INVALID_ADDRESS));
+ public void parseQuestion_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> ParserUtil.parseQuestion((String) null));
}
@Test
- public void parseAddress_validValueWithoutWhitespace_returnsAddress() throws Exception {
- Address expectedAddress = new Address(VALID_ADDRESS);
- assertEquals(expectedAddress, ParserUtil.parseAddress(VALID_ADDRESS));
+ public void parseQuestion_invalidValue_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseQuestion(INVALID_QUESTION));
}
@Test
- public void parseAddress_validValueWithWhitespace_returnsTrimmedAddress() throws Exception {
- String addressWithWhitespace = WHITESPACE + VALID_ADDRESS + WHITESPACE;
- Address expectedAddress = new Address(VALID_ADDRESS);
- assertEquals(expectedAddress, ParserUtil.parseAddress(addressWithWhitespace));
+ public void parseQuestion_validValueWithoutWhiteSpace_returnsQuestion() throws Exception {
+ Question expectedQuestion = new UnsolvedQuestion(VALID_QUESTION);
+ assertEquals(expectedQuestion, ParserUtil.parseQuestion(VALID_QUESTION));
}
@Test
- public void parseEmail_null_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> ParserUtil.parseEmail((String) null));
+ public void parseQuestion_validValueWithWhiteSpace_returnsTrimmedQuestion() throws Exception {
+ String questionWithWhiteSpace = WHITESPACE + VALID_QUESTION + WHITESPACE;
+ Question expectedQuestion = new UnsolvedQuestion(VALID_QUESTION);
+ assertEquals(expectedQuestion, ParserUtil.parseQuestion(questionWithWhiteSpace));
}
@Test
- public void parseEmail_invalidValue_throwsParseException() {
- assertThrows(ParseException.class, () -> ParserUtil.parseEmail(INVALID_EMAIL));
+ public void parseQuestion_valueValue_returnsUnresolvedQuestion() throws Exception {
+ Question unexpectedQuestion = new SolvedQuestion(VALID_QUESTION, VALID_SOLUTION);
+ assertNotEquals(unexpectedQuestion, ParserUtil.parseQuestion(VALID_QUESTION));
}
@Test
- public void parseEmail_validValueWithoutWhitespace_returnsEmail() throws Exception {
- Email expectedEmail = new Email(VALID_EMAIL);
- assertEquals(expectedEmail, ParserUtil.parseEmail(VALID_EMAIL));
+ public void parseSolution_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> ParserUtil.parseSolution(null));
}
@Test
- public void parseEmail_validValueWithWhitespace_returnsTrimmedEmail() throws Exception {
- String emailWithWhitespace = WHITESPACE + VALID_EMAIL + WHITESPACE;
- Email expectedEmail = new Email(VALID_EMAIL);
- assertEquals(expectedEmail, ParserUtil.parseEmail(emailWithWhitespace));
+ public void parseSolution_invalidValue_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseSolution(INVALID_SOLUTION));
}
@Test
- public void parseTag_null_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> ParserUtil.parseTag(null));
+ public void parseSolution_validValueWithoutWhiteSpace_returnsSolution() throws Exception {
+ assertEquals(VALID_SOLUTION, ParserUtil.parseSolution(VALID_SOLUTION));
}
@Test
- public void parseTag_invalidValue_throwsParseException() {
- assertThrows(ParseException.class, () -> ParserUtil.parseTag(INVALID_TAG));
+ public void parseSolution_validValueWithWhiteSpace_returnsTrimmedSolution() throws Exception {
+ String solutionWithSpace = WHITESPACE + VALID_SOLUTION + WHITESPACE;
+ assertEquals(VALID_SOLUTION, ParserUtil.parseSolution(solutionWithSpace));
}
@Test
- public void parseTag_validValueWithoutWhitespace_returnsTag() throws Exception {
- Tag expectedTag = new Tag(VALID_TAG_1);
- assertEquals(expectedTag, ParserUtil.parseTag(VALID_TAG_1));
+ public void parseExamName_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> ParserUtil.parseExamName(null));
}
@Test
- public void parseTag_validValueWithWhitespace_returnsTrimmedTag() throws Exception {
- String tagWithWhitespace = WHITESPACE + VALID_TAG_1 + WHITESPACE;
- Tag expectedTag = new Tag(VALID_TAG_1);
- assertEquals(expectedTag, ParserUtil.parseTag(tagWithWhitespace));
+ public void parseExamName_invalidValue_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseExamName(INVALID_EXAM_NAME));
}
@Test
- public void parseTags_null_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> ParserUtil.parseTags(null));
+ public void parseExamName_validExamNameWithoutWhiteSpace_returnsExamNameString() throws Exception {
+ assertEquals(VALID_EXAM_NAME, ParserUtil.parseExamName(VALID_EXAM_NAME));
}
@Test
- public void parseTags_collectionWithInvalidTags_throwsParseException() {
- assertThrows(ParseException.class, () -> ParserUtil.parseTags(Arrays.asList(VALID_TAG_1, INVALID_TAG)));
+ public void parseExamName_validExamNameWithWhiteSpace_returnsTrimmedExamNameString() throws Exception {
+ String examNameWithSpaces = WHITESPACE + VALID_EXAM_NAME + WHITESPACE;
+ assertEquals(VALID_EXAM_NAME, ParserUtil.parseExamName(examNameWithSpaces));
}
@Test
- public void parseTags_emptyCollection_returnsEmptySet() throws Exception {
- assertTrue(ParserUtil.parseTags(Collections.emptyList()).isEmpty());
+ public void parseScore_null_throwNullPointerException() {
+ assertThrows(NullPointerException.class, () -> ParserUtil.parseScore(null));
}
@Test
- public void parseTags_collectionWithValidTags_returnsTagSet() throws Exception {
- Set<Tag> actualTagSet = ParserUtil.parseTags(Arrays.asList(VALID_TAG_1, VALID_TAG_2));
- Set<Tag> expectedTagSet = new HashSet<Tag>(Arrays.asList(new Tag(VALID_TAG_1), new Tag(VALID_TAG_2)));
+ public void parseScore_invalidScoreFirstLargerThanSecond_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseScore(INVALID_SCORE_LARGER));
+ }
- assertEquals(expectedTagSet, actualTagSet);
+ @Test
+ public void parseScore_invalidScoreNegative_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseScore(INVALID_SCORE_NEGATIVE));
}
+
+ @Test
+ public void parseScore_validScoreWithoutWhiteSpace_returnsScore() throws Exception {
+ Score expectedScore = new Score(VALID_SCORE);
+ assertEquals(expectedScore, ParserUtil.parseScore(VALID_SCORE));
+ }
+
+ @Test
+ public void parseScore_validScoreWithoutWhiteSpace_returnsTrimmedScore() throws Exception {
+ String scoreWithWhiteSpace = WHITESPACE + VALID_SCORE + WHITESPACE;
+ Score expectedScore = new Score(VALID_SCORE);
+ assertEquals(expectedScore, ParserUtil.parseScore(scoreWithWhiteSpace));
+ }
+
+ @Test
+ public void parseAttendanceStatus_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> ParserUtil.parseAttendanceStatus(null));
+ }
+
+ @Test
+ public void parseAttendanceStatus_invalidStatus_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseAttendanceStatus(INVALID_ATTENDANCE_STATUS));
+ }
+
+ @Test
+ public void parseAttendanceStatus_validStatusWithoutWhiteSpace_returnsStatusString() throws Exception {
+ assertEquals(true, ParserUtil.parseAttendanceStatus(VALID_ATTENDANCE_STATUS));
+ }
+
+ @Test
+ public void parseAttendanceStatus_validStatusWithWhiteSpace_returnsStatusString() throws Exception {
+ String statusWithWhiteSpace = WHITESPACE + VALID_ATTENDANCE_STATUS + WHITESPACE;
+ assertEquals(true, ParserUtil.parseAttendanceStatus(statusWithWhiteSpace));
+ }
+
+ @Test
+ public void parseFeedback_invalidStatus_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseFeedback(INVALID_FEEDBACK));
+ }
+
+ @Test
+ public void parseFeedback_validStatusWithoutWhiteSpace_returnsFeedbackString() throws Exception {
+ assertEquals(new Feedback(VALID_FEEDBACK), ParserUtil.parseFeedback(VALID_FEEDBACK));
+ }
+
+ @Test
+ public void parseFeedback_validStatusWithWhiteSpace_returnsFeedbackString() throws Exception {
+ String statusWithWhiteSpace = WHITESPACE + VALID_FEEDBACK + WHITESPACE;
+ assertEquals(new Feedback(VALID_FEEDBACK), ParserUtil.parseFeedback(statusWithWhiteSpace));
+ }
+
+ @Test
+ public void parseTitle_invalidTitle_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseTitle(INVALID_TITLE));
+ }
+
+ @Test
+ public void parseTitle_validTitleWithoutWhiteSpace_returnsTitleString() throws Exception {
+ assertEquals(new Title(VALID_TITLE), ParserUtil.parseTitle(VALID_TITLE));
+ }
+
+ @Test
+ public void parseTitle_validTitleWithWhiteSpace_returnsTitleString() throws Exception {
+ String titleWithWhiteSpace = WHITESPACE + VALID_TITLE + WHITESPACE;
+ assertEquals(new Title(VALID_TITLE), ParserUtil.parseTitle(titleWithWhiteSpace));
+ }
+
+ @Test
+ public void parseDescription_invalidDescription_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseDescription(INVALID_DESCRIPTION));
+ }
+
+ @Test
+ public void parseDescription_validDescriptionWithoutWhiteSpace_returnsDescriptionString() throws Exception {
+ assertEquals(new Description(VALID_DESCRIPTION), ParserUtil.parseDescription(VALID_DESCRIPTION));
+ }
+
+ @Test
+ public void parseDescription_validDescriptionWithWhiteSpace_returnsDescriptionString() throws Exception {
+ String descriptionWithWhiteSpace = WHITESPACE + VALID_DESCRIPTION + WHITESPACE;
+ assertEquals(new Description(VALID_DESCRIPTION), ParserUtil.parseDescription(descriptionWithWhiteSpace));
+ }
+
+ @Test
+ public void parseDate_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> ParserUtil.parseDate(null));
+ }
+
+ @Test
+ public void parseDate_invalidDate_throwsParseException() {
+ assertThrows(ParseException.class, () -> ParserUtil.parseDate(INVALID_DATE_ALPHABETS));
+ assertThrows(ParseException.class, () -> ParserUtil.parseDate(INVALID_DATE_FORMAT));
+ }
+
+ @Test
+ public void parseDate_validDate_returnsDate() throws Exception {
+ LocalDate expected = parseToDate(VALID_DATE);
+ assertEquals(expected, ParserUtil.parseDate(VALID_DATE));
+ }
+
+ @Test
+ public void parseDate_validDateWithWhiteSpace_returnsTrimmedDate() throws Exception {
+ String dateWithWhiteSpace = WHITESPACE + VALID_DATE + WHITESPACE;
+ LocalDate expected = parseToDate(VALID_DATE);
+ assertEquals(expected, ParserUtil.parseDate(dateWithWhiteSpace));
+ }
+
}
diff --git a/src/test/java/seedu/address/logic/parser/QuestionCommandParserTest.java b/src/test/java/seedu/address/logic/parser/QuestionCommandParserTest.java
new file mode 100644
index 00000000000..afcb5422870
--- /dev/null
+++ b/src/test/java/seedu/address/logic/parser/QuestionCommandParserTest.java
@@ -0,0 +1,194 @@
+package seedu.address.logic.parser;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.commands.CommandTestUtil.QUESTION_DESC_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_QUESTION_AMY;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_INDEX;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TEXT;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static seedu.address.testutil.StudentBuilder.DEFAULT_SOLUTION;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.AddQuestionCommand;
+import seedu.address.logic.commands.DeleteQuestionCommand;
+import seedu.address.logic.commands.QuestionCommand;
+import seedu.address.logic.commands.SolveQuestionCommand;
+import seedu.address.model.student.academic.question.Question;
+import seedu.address.model.student.academic.question.SolvedQuestion;
+import seedu.address.model.student.academic.question.UnsolvedQuestion;
+
+public class QuestionCommandParserTest {
+
+ private static final String MESSAGE_INVALID_FORMAT =
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, QuestionCommand.MESSAGE_USAGE);
+ private static final String MESSAGE_INVALID_ADD_FORMAT =
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddQuestionCommand.MESSAGE_USAGE);
+ private static final String MESSAGE_INVALID_SOLVE_FORMAT =
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, SolveQuestionCommand.MESSAGE_USAGE);
+ private static final String MESSAGE_INVALID_DEL_FORMAT =
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteQuestionCommand.MESSAGE_USAGE);
+
+ private static final String ADD_QUESTION_DESC = AddQuestionCommand.COMMAND_WORD + " ";
+ private static final String SOLVE_QUESTION_DESC = SolveQuestionCommand.COMMAND_WORD + " ";
+ private static final String DEL_QUESTION_DESC = DeleteQuestionCommand.COMMAND_WORD + " ";
+
+ private static final String QUESTION_INDEX_DESC = " " + PREFIX_INDEX + "1";
+ private static final String SOLUTION_DESC = " " + PREFIX_TEXT + DEFAULT_SOLUTION;
+
+ private QuestionCommandParser parser = new QuestionCommandParser();
+
+ @Test
+ public void parse_invalidCommandWord_failure() {
+ String invalidWord = "random words";
+ assertParseFailure(parser, invalidWord, MESSAGE_INVALID_FORMAT);
+ }
+
+ @Test
+ public void parse_addQuestionMissingParts_failure() {
+ // missing student index
+ assertParseFailure(parser, ADD_QUESTION_DESC + QUESTION_DESC_AMY, MESSAGE_INVALID_ADD_FORMAT);
+
+ // missing student question
+ assertParseFailure(parser, ADD_QUESTION_DESC + "1", MESSAGE_INVALID_ADD_FORMAT);
+ }
+
+ @Test
+ public void parse_addQuestionInvalidPreamble_failure() {
+ // invalid integers
+ assertParseFailure(parser, ADD_QUESTION_DESC + "0" + QUESTION_DESC_AMY, MESSAGE_INVALID_ADD_FORMAT);
+ assertParseFailure(parser, ADD_QUESTION_DESC + "-2" + QUESTION_DESC_AMY, MESSAGE_INVALID_ADD_FORMAT);
+
+ // invalid argument
+ assertParseFailure(parser, ADD_QUESTION_DESC + "1 some random string", MESSAGE_INVALID_ADD_FORMAT);
+
+ // invalid prefix parsed as preamble
+ String invalidPrefix = " " + PREFIX_INDEX + VALID_QUESTION_AMY;
+ assertParseFailure(parser, ADD_QUESTION_DESC + "1" + invalidPrefix, MESSAGE_INVALID_ADD_FORMAT);
+ }
+
+ @Test
+ public void parse_addQuestionInvalidQuestion_failure() {
+ String invalidQuestion = " " + PREFIX_TEXT;
+ assertParseFailure(parser, ADD_QUESTION_DESC + "1" + invalidQuestion, Question.MESSAGE_CONSTRAINTS);
+
+ invalidQuestion = " " + PREFIX_TEXT + " ";
+ assertParseFailure(parser, ADD_QUESTION_DESC + "1" + invalidQuestion, Question.MESSAGE_CONSTRAINTS);
+ }
+
+ @Test
+ public void parse_addQuestionValidArguments_success() {
+ String input = ADD_QUESTION_DESC + "1" + QUESTION_DESC_AMY;
+ UnsolvedQuestion question = new UnsolvedQuestion(VALID_QUESTION_AMY);
+ AddQuestionCommand command = new AddQuestionCommand(INDEX_FIRST_PERSON, question);
+ assertParseSuccess(parser, input, command);
+ }
+
+ @Test
+ public void parse_solveQuestionMissingParts_failure() {
+ // missing student index
+ assertParseFailure(parser, SOLVE_QUESTION_DESC + QUESTION_INDEX_DESC + SOLUTION_DESC,
+ MESSAGE_INVALID_SOLVE_FORMAT);
+
+ // missing question question
+ assertParseFailure(parser, SOLVE_QUESTION_DESC + "1" + SOLUTION_DESC, MESSAGE_INVALID_SOLVE_FORMAT);
+
+ // missing solution
+ assertParseFailure(parser, SOLVE_QUESTION_DESC + "1" + QUESTION_INDEX_DESC, MESSAGE_INVALID_SOLVE_FORMAT);
+ }
+
+ @Test
+ public void parse_solveQuestionInvalidPreamble_failure() {
+ // invalid integers
+ assertParseFailure(parser, SOLVE_QUESTION_DESC + "0" + QUESTION_INDEX_DESC + SOLUTION_DESC,
+ MESSAGE_INVALID_SOLVE_FORMAT);
+ assertParseFailure(parser, SOLVE_QUESTION_DESC + "-2" + QUESTION_INDEX_DESC + SOLUTION_DESC,
+ MESSAGE_INVALID_SOLVE_FORMAT);
+
+ // invalid argument
+ assertParseFailure(parser, SOLVE_QUESTION_DESC + "1 some random string", MESSAGE_INVALID_SOLVE_FORMAT);
+
+ // invalid prefix parsed as preamble
+ String invalidPrefix = "1 p/ string";
+ assertParseFailure(parser, SOLVE_QUESTION_DESC + invalidPrefix, MESSAGE_INVALID_SOLVE_FORMAT);
+ }
+
+ @Test
+ public void parse_solveQuestionInvalidQuestionIndex_failure() {
+ // negative index
+ String invalidIndex = " " + PREFIX_INDEX + "-5";
+ assertParseFailure(parser, SOLVE_QUESTION_DESC + "1" + invalidIndex, MESSAGE_INVALID_SOLVE_FORMAT);
+
+ // 0 index
+ invalidIndex = " " + PREFIX_INDEX + "0";
+ assertParseFailure(parser, SOLVE_QUESTION_DESC + "1" + invalidIndex, MESSAGE_INVALID_SOLVE_FORMAT);
+ }
+
+ @Test
+ public void parse_solveQuestionInvalidSolution_failure() {
+ String invalidSolution = " " + PREFIX_TEXT;
+ assertParseFailure(parser, SOLVE_QUESTION_DESC + "1" + QUESTION_INDEX_DESC + invalidSolution,
+ SolvedQuestion.MESSAGE_SOLUTION_CONSTRAINTS);
+
+ invalidSolution = " " + PREFIX_TEXT + " ";
+ assertParseFailure(parser, SOLVE_QUESTION_DESC + "1" + QUESTION_INDEX_DESC + invalidSolution,
+ SolvedQuestion.MESSAGE_SOLUTION_CONSTRAINTS);
+ }
+
+ @Test
+ public void parse_solveQuestionValidArguments_success() {
+ String input = SOLVE_QUESTION_DESC + "1" + SOLUTION_DESC + QUESTION_INDEX_DESC;
+ SolveQuestionCommand command = new SolveQuestionCommand(INDEX_FIRST_PERSON,
+ Index.fromOneBased(1), DEFAULT_SOLUTION);
+ assertParseSuccess(parser, input, command);
+
+ input = SOLVE_QUESTION_DESC + "1" + QUESTION_INDEX_DESC + SOLUTION_DESC;
+ assertParseSuccess(parser, input, command);
+ }
+
+ @Test
+ public void parse_deleteQuestionMissingParts_failure() {
+ // missing student index
+ assertParseFailure(parser, DEL_QUESTION_DESC + QUESTION_INDEX_DESC, MESSAGE_INVALID_DEL_FORMAT);
+
+ // missing question index
+ assertParseFailure(parser, DEL_QUESTION_DESC + "1", MESSAGE_INVALID_DEL_FORMAT);
+ }
+
+ @Test
+ public void parse_deleteQuestionInvalidPreamble_failure() {
+ // invalid integers
+ assertParseFailure(parser, DEL_QUESTION_DESC + "0" + QUESTION_INDEX_DESC, MESSAGE_INVALID_DEL_FORMAT);
+ assertParseFailure(parser, DEL_QUESTION_DESC + "-2" + QUESTION_INDEX_DESC, MESSAGE_INVALID_DEL_FORMAT);
+
+ // invalid argument
+ assertParseFailure(parser, DEL_QUESTION_DESC + "1 some random string", MESSAGE_INVALID_DEL_FORMAT);
+
+ // invalid prefix parsed as preamble
+ String invalidPrefix = " " + PREFIX_TEXT + "string";
+ assertParseFailure(parser, DEL_QUESTION_DESC + "1" + invalidPrefix, MESSAGE_INVALID_DEL_FORMAT);
+ }
+
+ @Test
+ public void parse_deleteQuestionInvalidArgument_failure() {
+ String invalidQuestion = " " + PREFIX_INDEX + "-1";
+ assertParseFailure(parser, DEL_QUESTION_DESC + "1" + invalidQuestion, MESSAGE_INVALID_DEL_FORMAT);
+
+ invalidQuestion = " " + PREFIX_INDEX + "0";
+ assertParseFailure(parser, DEL_QUESTION_DESC + "1" + invalidQuestion, MESSAGE_INVALID_DEL_FORMAT);
+
+ invalidQuestion = " " + PREFIX_INDEX + " ";
+ assertParseFailure(parser, DEL_QUESTION_DESC + "1" + invalidQuestion, MESSAGE_INVALID_DEL_FORMAT);
+ }
+
+ @Test
+ public void parse_deleteQuestionValidArguments_success() {
+ String input = DEL_QUESTION_DESC + "1" + QUESTION_INDEX_DESC;
+ DeleteQuestionCommand command = new DeleteQuestionCommand(INDEX_FIRST_PERSON, Index.fromOneBased(1));
+ assertParseSuccess(parser, input, command);
+ }
+
+}
diff --git a/src/test/java/seedu/address/logic/parser/ReeveParserTest.java b/src/test/java/seedu/address/logic/parser/ReeveParserTest.java
new file mode 100644
index 00000000000..41f6eef7b31
--- /dev/null
+++ b/src/test/java/seedu/address/logic/parser/ReeveParserTest.java
@@ -0,0 +1,219 @@
+package seedu.address.logic.parser;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.commons.core.Messages.MESSAGE_UNKNOWN_COMMAND;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_INDEX;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TEXT;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.StudentBuilder.DEFAULT_QUESTION_MATH;
+import static seedu.address.testutil.StudentBuilder.DEFAULT_SOLUTION;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.AddCommand;
+import seedu.address.logic.commands.AddExamCommand;
+import seedu.address.logic.commands.AddQuestionCommand;
+import seedu.address.logic.commands.AttendanceCommand;
+import seedu.address.logic.commands.ClearCommand;
+import seedu.address.logic.commands.DeleteCommand;
+import seedu.address.logic.commands.DeleteExamCommand;
+import seedu.address.logic.commands.DeleteQuestionCommand;
+import seedu.address.logic.commands.DetailCommand;
+import seedu.address.logic.commands.EditCommand;
+import seedu.address.logic.commands.ExitCommand;
+import seedu.address.logic.commands.FindCommand;
+import seedu.address.logic.commands.HelpCommand;
+import seedu.address.logic.commands.ListCommand;
+import seedu.address.logic.commands.OverdueCommand;
+import seedu.address.logic.commands.QuestionCommand;
+import seedu.address.logic.commands.ScheduleCommand;
+import seedu.address.logic.commands.SolveQuestionCommand;
+import seedu.address.logic.commands.SortCommand;
+import seedu.address.logic.commands.ToggleStudentCardCommand;
+import seedu.address.logic.commands.notes.AddNoteCommand;
+import seedu.address.logic.commands.notes.DeleteNoteCommand;
+import seedu.address.logic.commands.notes.EditNoteCommand;
+import seedu.address.logic.commands.notes.NoteCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.notes.note.Note;
+import seedu.address.model.student.NameContainsKeywordsPredicate;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.academic.question.UnsolvedQuestion;
+import seedu.address.testutil.EditAdminDescriptorBuilder;
+import seedu.address.testutil.EditStudentDescriptorBuilder;
+import seedu.address.testutil.FindStudentDescriptorBuilder;
+import seedu.address.testutil.StudentBuilder;
+import seedu.address.testutil.StudentUtil;
+import seedu.address.testutil.notes.EditNoteDescriptorBuilder;
+import seedu.address.testutil.notes.NoteBuilder;
+import seedu.address.testutil.notes.NoteUtil;
+
+public class ReeveParserTest {
+
+ private final ReeveParser parser = new ReeveParser();
+
+ @Test
+ public void parseCommand_add() throws Exception {
+ Student student = new StudentBuilder().withQuestions().withDetails().withExams().withAttendances().build();
+ AddCommand command = (AddCommand) parser.parseCommand(StudentUtil.getAddCommand(student));
+ assertEquals(new AddCommand(student), command);
+ }
+
+ @Test
+ public void parseCommand_clear() throws Exception {
+ assertTrue(parser.parseCommand(ClearCommand.COMMAND_WORD) instanceof ClearCommand);
+ assertTrue(parser.parseCommand(ClearCommand.COMMAND_WORD + " 3") instanceof ClearCommand);
+ }
+
+ @Test
+ public void parseCommand_delete() throws Exception {
+ DeleteCommand command = (DeleteCommand) parser.parseCommand(
+ DeleteCommand.COMMAND_WORD + " " + INDEX_FIRST_PERSON.getOneBased());
+ assertEquals(new DeleteCommand(INDEX_FIRST_PERSON), command);
+ }
+
+ @Test
+ public void parseCommand_edit() throws Exception {
+ Student student = new StudentBuilder().build();
+ EditCommand.EditStudentDescriptor editStudentDescriptor = new EditStudentDescriptorBuilder(student).build();
+ EditCommand.EditAdminDescriptor editAdminDescriptor = new EditAdminDescriptorBuilder(student).build();
+ EditCommand command = (EditCommand) parser.parseCommand(EditCommand.COMMAND_WORD + " "
+ + INDEX_FIRST_PERSON.getOneBased() + " "
+ + StudentUtil.getEditStudentDescriptorDetails(editStudentDescriptor)
+ + StudentUtil.getEditAdminDescriptorDetails(editAdminDescriptor));
+ assertEquals(new EditCommand(INDEX_FIRST_PERSON, editStudentDescriptor, editAdminDescriptor), command);
+ }
+
+ @Test
+ public void parseCommand_exit() throws Exception {
+ assertTrue(parser.parseCommand(ExitCommand.COMMAND_WORD) instanceof ExitCommand);
+ assertTrue(parser.parseCommand(ExitCommand.COMMAND_WORD + " 3") instanceof ExitCommand);
+ }
+
+ @Test
+ public void parseCommand_find() throws Exception {
+ List<String> keywords = Arrays.asList("foo", "bar", "baz");
+ NameContainsKeywordsPredicate namePredicate = new NameContainsKeywordsPredicate(keywords);
+ FindCommand.FindStudentDescriptor descriptor = new FindStudentDescriptorBuilder()
+ .withNamePredicate(namePredicate).build();
+ FindCommand command = (FindCommand) parser.parseCommand(
+ FindCommand.COMMAND_WORD + " " + StudentUtil.getFindStudentDescriptorDetails(descriptor));
+ assertEquals(new FindCommand(descriptor), command);
+ }
+
+ @Test
+ public void parseCommand_question() throws Exception {
+ String addCommandDesc = QuestionCommand.COMMAND_WORD + " " + AddQuestionCommand.COMMAND_WORD + " ";
+ String questionDesc = " " + PREFIX_TEXT + DEFAULT_QUESTION_MATH;
+ UnsolvedQuestion question = new UnsolvedQuestion(DEFAULT_QUESTION_MATH);
+ QuestionCommand command = (QuestionCommand) parser.parseCommand(addCommandDesc + "1" + questionDesc);
+ assertEquals(new AddQuestionCommand(INDEX_FIRST_PERSON, question), command);
+
+ String solveCommandDesc = QuestionCommand.COMMAND_WORD + " " + SolveQuestionCommand.COMMAND_WORD + " ";
+ questionDesc = " " + PREFIX_INDEX + "1" + " " + PREFIX_TEXT + DEFAULT_SOLUTION;
+ command = (QuestionCommand) parser.parseCommand(solveCommandDesc + "1" + questionDesc);
+ assertEquals(new SolveQuestionCommand(INDEX_FIRST_PERSON, Index.fromOneBased(1), DEFAULT_SOLUTION), command);
+
+ String delCommandDesc = QuestionCommand.COMMAND_WORD + " " + DeleteQuestionCommand.COMMAND_WORD + " ";
+ questionDesc = " " + PREFIX_INDEX + "1";
+ command = (QuestionCommand) parser.parseCommand(delCommandDesc + "1" + questionDesc);
+ assertEquals(new DeleteQuestionCommand(INDEX_FIRST_PERSON, Index.fromOneBased(1)), command);
+ }
+
+ @Test
+ public void parseCommand_exam() throws Exception {
+ assertTrue(parser.parseCommand("exam add 1 n/Mid Year 2020 d/23/7/2020 s/50/100") instanceof AddExamCommand);
+ assertTrue(parser.parseCommand("exam delete 1 i/1") instanceof DeleteExamCommand);
+
+ }
+
+ @Test
+ public void parseCommand_help() throws Exception {
+ assertTrue(parser.parseCommand(HelpCommand.COMMAND_WORD) instanceof HelpCommand);
+ assertTrue(parser.parseCommand(HelpCommand.COMMAND_WORD + " 3") instanceof HelpCommand);
+ }
+
+ @Test
+ public void parseCommand_list() throws Exception {
+ assertTrue(parser.parseCommand(ListCommand.COMMAND_WORD) instanceof ListCommand);
+ assertTrue(parser.parseCommand(ListCommand.COMMAND_WORD + " 3") instanceof ListCommand);
+ }
+
+ @Test
+ public void parseCommand_sort() throws Exception {
+ assertTrue(parser.parseCommand(SortCommand.COMMAND_WORD + " classTime") instanceof SortCommand);
+ assertTrue(parser.parseCommand(SortCommand.COMMAND_WORD + " year") instanceof SortCommand);
+ }
+
+ @Test
+ public void parseCommand_detail() throws Exception {
+ assertTrue(parser.parseCommand("detail add 2 t/ smart") instanceof DetailCommand);
+ }
+
+ @Test
+ public void parseCommand_unpaid() throws Exception {
+ assertTrue(parser.parseCommand(OverdueCommand.COMMAND_WORD) instanceof OverdueCommand);
+ assertTrue(parser.parseCommand(OverdueCommand.COMMAND_WORD + " 3") instanceof OverdueCommand);
+ }
+
+ @Test
+ public void parseCommand_note() throws Exception {
+ // add notes command
+ assertTrue(parser.parseCommand(NoteCommand.COMMAND_WORD + " " + AddNoteCommand.COMMAND_WORD
+ + " " + "t/hi d/hehe") instanceof NoteCommand);
+
+ // edit notes command
+ Note note = new NoteBuilder().build();
+ EditNoteCommand.EditNoteDescriptor editNoteDescriptor =
+ new EditNoteDescriptorBuilder(note).build();
+ EditNoteCommand command = (EditNoteCommand) parser.parseCommand(
+ NoteCommand.COMMAND_WORD + " " + EditNoteCommand.COMMAND_WORD + " "
+ + INDEX_FIRST.getOneBased() + " "
+ + NoteUtil.getEditNoteDescriptorDetails(editNoteDescriptor));
+ assertEquals(new EditNoteCommand(INDEX_FIRST, editNoteDescriptor), command);
+
+ // delete notes command
+ DeleteNoteCommand deleteNoteCommand = (DeleteNoteCommand) parser.parseCommand(
+ NoteCommand.COMMAND_WORD + " " + DeleteNoteCommand.COMMAND_WORD
+ + " " + INDEX_FIRST.getOneBased());
+ assertEquals(new DeleteNoteCommand(INDEX_FIRST), deleteNoteCommand);
+ }
+
+ @Test
+ public void parseCommand_attendance() throws Exception {
+ assertTrue(parser.parseCommand("attendance add 1 d/19/02/2020 a/present f/attentive")
+ instanceof AttendanceCommand);
+ assertTrue(parser.parseCommand("attendance delete 3 d/25/12/2020")
+ instanceof AttendanceCommand);
+ }
+
+ @Test
+ public void parseCommand_schedule() throws Exception {
+ assertTrue(parser.parseCommand("schedule m/weekly d/2/11/2020") instanceof ScheduleCommand);
+ assertTrue(parser.parseCommand("schedule m/DAILY d/4/07/2018") instanceof ScheduleCommand);
+ }
+
+ @Test
+ public void parseCommand_toggle() throws Exception {
+ assertTrue(parser.parseCommand("toggle") instanceof ToggleStudentCardCommand);
+ }
+
+ @Test
+ public void parseCommand_unrecognisedInput_throwsParseException() {
+ assertThrows(ParseException.class, String.format(MESSAGE_INVALID_COMMAND_FORMAT, HelpCommand.MESSAGE_USAGE), ()
+ -> parser.parseCommand(""));
+ }
+
+ @Test
+ public void parseCommand_unknownCommand_throwsParseException() {
+ assertThrows(ParseException.class, MESSAGE_UNKNOWN_COMMAND, () -> parser.parseCommand("unknownCommand"));
+ }
+}
diff --git a/src/test/java/seedu/address/logic/parser/ScheduleCommandParserTest.java b/src/test/java/seedu/address/logic/parser/ScheduleCommandParserTest.java
new file mode 100644
index 00000000000..5999d1f1c27
--- /dev/null
+++ b/src/test/java/seedu/address/logic/parser/ScheduleCommandParserTest.java
@@ -0,0 +1,67 @@
+package seedu.address.logic.parser;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import java.time.LocalDate;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.logic.commands.ScheduleViewCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.schedule.ScheduleViewMode;
+
+public class ScheduleCommandParserTest {
+
+ private ScheduleCommandParser parser = new ScheduleCommandParser();
+
+ @Test
+ public void parse_allFieldsPresent_success() {
+ ScheduleViewMode viewMode = ScheduleViewMode.WEEKLY;
+ LocalDate viewDate = LocalDate.of(2020, 11, 5);
+
+ assertParseSuccess(parser, " m/weekly d/5/11/2020",
+ new ScheduleViewCommand(viewMode, viewDate));
+ }
+
+ @Test
+ public void parse_compulsoryFieldMissing_failure() {
+ // date missing
+ assertParseFailure(parser, " m/weekly", String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ ScheduleViewCommand.MESSAGE_USAGE));
+
+ // both mode and date missing
+ assertParseFailure(parser, " ", String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ ScheduleViewCommand.MESSAGE_USAGE));
+
+ // mode missing
+ assertParseFailure(parser, " d/5/11/2020", String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ ScheduleViewCommand.MESSAGE_USAGE));
+
+ }
+
+ @Test
+ public void parse_invalidValue_failure() {
+ // invalid mode
+ assertParseFailure(parser, " m/123 d/5/11/2020",
+ ScheduleViewCommand.MESSAGE_INVALID_VIEW_MODE);
+
+ //invalid date
+ assertParseFailure(parser, " m/daily d/1234",
+ ScheduleViewCommand.MESSAGE_CONSTRAINTS);
+ }
+
+ @Test
+ public void parseCommand_emptyInput_throwsParseException() {
+ assertThrows(ParseException.class, String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ ScheduleViewCommand.MESSAGE_USAGE), () -> parser.parse(""));
+ }
+
+ @Test
+ public void parseCommand_unknownCommand_throwsParseException() {
+ assertThrows(ParseException.class, String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+ ScheduleViewCommand.MESSAGE_USAGE), () -> parser.parse("unknownCommand"));
+ }
+}
diff --git a/src/test/java/seedu/address/logic/parser/SortCommandParserTest.java b/src/test/java/seedu/address/logic/parser/SortCommandParserTest.java
new file mode 100644
index 00000000000..f97a9a4bdd6
--- /dev/null
+++ b/src/test/java/seedu/address/logic/parser/SortCommandParserTest.java
@@ -0,0 +1,53 @@
+package seedu.address.logic.parser;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.logic.commands.SortCommand;
+
+public class SortCommandParserTest {
+
+ private SortCommandParser parser = new SortCommandParser();
+
+ @Test
+ public void parse_emptyArg_throwsParseException() {
+ assertParseFailure(parser, " ", String.format(MESSAGE_INVALID_COMMAND_FORMAT, SortCommand.MESSAGE_USAGE));
+ }
+
+ @Test
+ public void parse_validArgs_returnsSortCommand() {
+
+ SortCommand expectedSortCommandName = new SortCommand("name");
+ SortCommand expectedSortCommandClassTime = new SortCommand("classTime");
+ SortCommand expectedSortCommandYear = new SortCommand("year");
+ assertParseSuccess(parser, "classTime", expectedSortCommandClassTime);
+
+ // multiple whitespaces before keywords
+ assertParseSuccess(parser, " name", expectedSortCommandName);
+
+ // a lot of whitespace
+ assertParseSuccess(parser, " year ", expectedSortCommandYear);
+ }
+
+ @Test
+ public void parse_invalidParameters_failure() {
+
+ String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, SortCommand.MESSAGE_USAGE);
+
+ // multiple parameters
+ assertParseFailure(parser, "name year", expectedMessage);
+
+ // not a recognised parameter
+ assertParseFailure(parser, "class", expectedMessage);
+
+ // duplicate parameters
+ assertParseFailure(parser, "name name", expectedMessage);
+
+ // white space given
+ assertParseFailure(parser, " ", expectedMessage);
+ }
+
+}
diff --git a/src/test/java/seedu/address/logic/parser/notes/AddNoteCommandParserTest.java b/src/test/java/seedu/address/logic/parser/notes/AddNoteCommandParserTest.java
new file mode 100644
index 00000000000..519cd2593e7
--- /dev/null
+++ b/src/test/java/seedu/address/logic/parser/notes/AddNoteCommandParserTest.java
@@ -0,0 +1,61 @@
+package seedu.address.logic.parser.notes;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.commands.CommandTestUtil.DESCRIPTION_DESC_EXISTENTIAL_CRISIS;
+import static seedu.address.logic.commands.CommandTestUtil.DESCRIPTION_DESC_GRADUATION;
+import static seedu.address.logic.commands.CommandTestUtil.INVALID_DESCRIPTION_DESC;
+import static seedu.address.logic.commands.CommandTestUtil.INVALID_TITLE_DESC;
+import static seedu.address.logic.commands.CommandTestUtil.PREAMBLE_NON_EMPTY;
+import static seedu.address.logic.commands.CommandTestUtil.PREAMBLE_WHITESPACE;
+import static seedu.address.logic.commands.CommandTestUtil.TITLE_DESC_EXISTENTIAL_CRISIS;
+import static seedu.address.logic.commands.CommandTestUtil.TITLE_DESC_GRADUATION;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static seedu.address.testutil.notes.TypicalNotes.NOTE_EXISTENTIAL_CRISIS;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.logic.commands.notes.AddNoteCommand;
+import seedu.address.model.notes.note.Description;
+import seedu.address.model.notes.note.Note;
+import seedu.address.model.notes.note.Title;
+import seedu.address.testutil.notes.NoteBuilder;
+
+public class AddNoteCommandParserTest {
+
+ private AddNoteCommandParser parser = new AddNoteCommandParser();
+
+ @Test
+ public void parse_fieldsPresent_success() {
+ Note expectedNote = new NoteBuilder(NOTE_EXISTENTIAL_CRISIS).build();
+
+ // whitespace only preamble
+ assertParseSuccess(parser, PREAMBLE_WHITESPACE + TITLE_DESC_EXISTENTIAL_CRISIS
+ + DESCRIPTION_DESC_EXISTENTIAL_CRISIS, new AddNoteCommand(expectedNote));
+
+ // multiple titles - last title accepted
+ assertParseSuccess(parser, TITLE_DESC_GRADUATION + TITLE_DESC_EXISTENTIAL_CRISIS
+ + DESCRIPTION_DESC_EXISTENTIAL_CRISIS, new AddNoteCommand(expectedNote));
+
+ // multiple description - last phone accepted
+ assertParseSuccess(parser, TITLE_DESC_EXISTENTIAL_CRISIS
+ + DESCRIPTION_DESC_GRADUATION + DESCRIPTION_DESC_EXISTENTIAL_CRISIS,
+ new AddNoteCommand(expectedNote));
+ }
+
+ @Test
+ public void parse_invalidValue_failure() {
+ // invalid title
+ assertParseFailure(parser, INVALID_TITLE_DESC + DESCRIPTION_DESC_GRADUATION,
+ Title.MESSAGE_CONSTRAINTS);
+
+ // invalid description
+ assertParseFailure(parser, TITLE_DESC_GRADUATION + INVALID_DESCRIPTION_DESC,
+ Description.MESSAGE_CONSTRAINTS);
+
+ // non-empty preamble
+ assertParseFailure(parser, PREAMBLE_NON_EMPTY + TITLE_DESC_GRADUATION
+ + DESCRIPTION_DESC_GRADUATION,
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddNoteCommand.MESSAGE_USAGE));
+ }
+}
diff --git a/src/test/java/seedu/address/logic/parser/notes/DeleteNoteCommandParserTest.java b/src/test/java/seedu/address/logic/parser/notes/DeleteNoteCommandParserTest.java
new file mode 100644
index 00000000000..f3eca4ac829
--- /dev/null
+++ b/src/test/java/seedu/address/logic/parser/notes/DeleteNoteCommandParserTest.java
@@ -0,0 +1,33 @@
+package seedu.address.logic.parser.notes;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.logic.commands.notes.DeleteNoteCommand;
+
+/**
+ * As we are only doing white-box testing, our test cases do not cover path variations
+ * outside of the DeleteNoteCommand code. For example, inputs "1" and "1 abc" take the
+ * same path through the DeleteNoteCommand, and therefore we test only one of them.
+ * The path variation for those two cases occur inside the ParserUtil, and
+ * therefore should be covered by the ParserUtilTest.
+ */
+public class DeleteNoteCommandParserTest {
+
+ private DeleteNoteCommandParser parser = new DeleteNoteCommandParser();
+
+ @Test
+ public void parse_validArgs_returnsDeleteNoteCommand() {
+ assertParseSuccess(parser, "1", new DeleteNoteCommand(INDEX_FIRST_PERSON));
+ }
+
+ @Test
+ public void parse_invalidArgs_throwsParseException() {
+ assertParseFailure(parser, "a",
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteNoteCommand.MESSAGE_USAGE));
+ }
+}
diff --git a/src/test/java/seedu/address/logic/parser/notes/EditNoteCommandParserTest.java b/src/test/java/seedu/address/logic/parser/notes/EditNoteCommandParserTest.java
new file mode 100644
index 00000000000..139d1608273
--- /dev/null
+++ b/src/test/java/seedu/address/logic/parser/notes/EditNoteCommandParserTest.java
@@ -0,0 +1,148 @@
+package seedu.address.logic.parser.notes;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.commands.CommandTestUtil.DESCRIPTION_DESC_EXISTENTIAL_CRISIS;
+import static seedu.address.logic.commands.CommandTestUtil.DESCRIPTION_DESC_GRADUATION;
+import static seedu.address.logic.commands.CommandTestUtil.INVALID_DESCRIPTION_DESC;
+import static seedu.address.logic.commands.CommandTestUtil.INVALID_TITLE_DESC;
+import static seedu.address.logic.commands.CommandTestUtil.TITLE_DESC_EXISTENTIAL_CRISIS;
+import static seedu.address.logic.commands.CommandTestUtil.TITLE_DESC_GRADUATION;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_DESCRIPTION;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_TITLE;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_TITLE_GRADUATION;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
+import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
+import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
+import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.notes.EditNoteCommand;
+import seedu.address.model.notes.note.Description;
+import seedu.address.model.notes.note.Title;
+import seedu.address.testutil.notes.EditNoteDescriptorBuilder;
+
+public class EditNoteCommandParserTest {
+
+ private static final String MESSAGE_INVALID_FORMAT =
+ String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditNoteCommand.MESSAGE_USAGE);
+
+ private EditNoteCommandParser parser = new EditNoteCommandParser();
+
+ @Test
+ public void parse_missingParts_failure() {
+ // no index specified
+ assertParseFailure(parser, VALID_TITLE, MESSAGE_INVALID_FORMAT);
+
+ // no field specified
+ assertParseFailure(parser, "1", EditNoteCommand.MESSAGE_NOT_EDITED);
+
+ // no index and no field specified
+ assertParseFailure(parser, "", MESSAGE_INVALID_FORMAT);
+ }
+
+ @Test
+ public void parse_invalidPreamble_failure() {
+ // negative index
+ assertParseFailure(parser, "-5" + TITLE_DESC_GRADUATION, MESSAGE_INVALID_FORMAT);
+
+ // zero index
+ assertParseFailure(parser, "0" + TITLE_DESC_GRADUATION, MESSAGE_INVALID_FORMAT);
+
+ // invalid arguments being parsed as preamble
+ assertParseFailure(parser, "1 some random string", MESSAGE_INVALID_FORMAT);
+
+ // invalid prefix being parsed as preamble
+ assertParseFailure(parser, "1 i/ string", MESSAGE_INVALID_FORMAT);
+ }
+
+ @Test
+ public void parse_invalidValue_failure() {
+ assertParseFailure(parser, "1" + INVALID_TITLE_DESC,
+ Title.MESSAGE_CONSTRAINTS); // invalid title
+ assertParseFailure(parser, "1" + INVALID_DESCRIPTION_DESC,
+ Description.MESSAGE_CONSTRAINTS); // invalid description
+
+ // invalid title followed by valid description
+ assertParseFailure(parser, "1" + INVALID_TITLE_DESC + DESCRIPTION_DESC_GRADUATION,
+ Title.MESSAGE_CONSTRAINTS);
+
+ // valid title followed by invalid description
+ assertParseFailure(parser, "1" + TITLE_DESC_GRADUATION + INVALID_DESCRIPTION_DESC,
+ Description.MESSAGE_CONSTRAINTS);
+
+ // multiple invalid values, but only the first invalid value is captured
+ assertParseFailure(parser, "1" + INVALID_TITLE_DESC + INVALID_DESCRIPTION_DESC,
+ Title.MESSAGE_CONSTRAINTS);
+ }
+
+ @Test
+ public void parse_allFieldsSpecified_success() {
+ Index targetIndex = INDEX_SECOND;
+ String userInput = targetIndex.getOneBased() + TITLE_DESC_EXISTENTIAL_CRISIS
+ + DESCRIPTION_DESC_EXISTENTIAL_CRISIS;
+
+ EditNoteCommand.EditNoteDescriptor editNoteDescriptor = new EditNoteDescriptorBuilder()
+ .withTitle(VALID_TITLE).withDescription(VALID_DESCRIPTION).build();
+
+ EditNoteCommand expectedCommand = new EditNoteCommand(targetIndex, editNoteDescriptor);
+
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+
+ @Test
+ public void parse_oneFieldSpecified_success() {
+ Index targetIndex = INDEX_SECOND;
+
+ // title
+ String userInput = targetIndex.getOneBased() + TITLE_DESC_EXISTENTIAL_CRISIS;
+ EditNoteCommand.EditNoteDescriptor editNoteDescriptor = new EditNoteDescriptorBuilder()
+ .withTitle(VALID_TITLE).build();
+ EditNoteCommand expectedCommand = new EditNoteCommand(targetIndex, editNoteDescriptor);
+ assertParseSuccess(parser, userInput, expectedCommand);
+
+ // description
+ userInput = targetIndex.getOneBased() + DESCRIPTION_DESC_EXISTENTIAL_CRISIS;
+ editNoteDescriptor = new EditNoteDescriptorBuilder().withDescription(VALID_DESCRIPTION).build();
+ expectedCommand = new EditNoteCommand(targetIndex, editNoteDescriptor);
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+
+ @Test
+ public void parse_multipleRepeatedFields_acceptsLast() {
+ Index targetIndex = INDEX_FIRST_PERSON;
+ String userInput = targetIndex.getOneBased() + DESCRIPTION_DESC_EXISTENTIAL_CRISIS
+ + DESCRIPTION_DESC_GRADUATION + TITLE_DESC_EXISTENTIAL_CRISIS
+ + DESCRIPTION_DESC_EXISTENTIAL_CRISIS;
+
+ EditNoteCommand.EditNoteDescriptor editNoteDescriptor = new EditNoteDescriptorBuilder()
+ .withTitle(VALID_TITLE).withDescription(VALID_DESCRIPTION).build();
+
+ EditNoteCommand expectedCommand = new EditNoteCommand(targetIndex, editNoteDescriptor);
+
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+
+ @Test
+ public void parse_invalidValueFollowedByValidValue_success() {
+ // no other valid values specified
+ Index targetIndex = INDEX_FIRST_PERSON;
+ String userInput = targetIndex.getOneBased() + INVALID_DESCRIPTION_DESC
+ + DESCRIPTION_DESC_EXISTENTIAL_CRISIS;
+ EditNoteCommand.EditNoteDescriptor editNoteDescriptor = new EditNoteDescriptorBuilder()
+ .withDescription(VALID_DESCRIPTION).build();
+
+ EditNoteCommand expectedCommand = new EditNoteCommand(targetIndex, editNoteDescriptor);
+ assertParseSuccess(parser, userInput, expectedCommand);
+
+ // other valid values specified
+ userInput = targetIndex.getOneBased() + TITLE_DESC_GRADUATION + INVALID_DESCRIPTION_DESC
+ + DESCRIPTION_DESC_EXISTENTIAL_CRISIS;
+ editNoteDescriptor = new EditNoteDescriptorBuilder().withTitle(VALID_TITLE_GRADUATION)
+ .withDescription(VALID_DESCRIPTION).build();
+
+ expectedCommand = new EditNoteCommand(targetIndex, editNoteDescriptor);
+ assertParseSuccess(parser, userInput, expectedCommand);
+ }
+}
diff --git a/src/test/java/seedu/address/model/AddressBookTest.java b/src/test/java/seedu/address/model/AddressBookTest.java
deleted file mode 100644
index 87782528ecd..00000000000
--- a/src/test/java/seedu/address/model/AddressBookTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package seedu.address.model;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-import static seedu.address.testutil.Assert.assertThrows;
-import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.jupiter.api.Test;
-
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.exceptions.DuplicatePersonException;
-import seedu.address.testutil.PersonBuilder;
-
-public class AddressBookTest {
-
- private final AddressBook addressBook = new AddressBook();
-
- @Test
- public void constructor() {
- assertEquals(Collections.emptyList(), addressBook.getPersonList());
- }
-
- @Test
- public void resetData_null_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> addressBook.resetData(null));
- }
-
- @Test
- public void resetData_withValidReadOnlyAddressBook_replacesData() {
- AddressBook newData = getTypicalAddressBook();
- addressBook.resetData(newData);
- assertEquals(newData, addressBook);
- }
-
- @Test
- public void resetData_withDuplicatePersons_throwsDuplicatePersonException() {
- // Two persons with the same identity fields
- Person editedAlice = new PersonBuilder(ALICE).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND)
- .build();
- List<Person> newPersons = Arrays.asList(ALICE, editedAlice);
- AddressBookStub newData = new AddressBookStub(newPersons);
-
- assertThrows(DuplicatePersonException.class, () -> addressBook.resetData(newData));
- }
-
- @Test
- public void hasPerson_nullPerson_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> addressBook.hasPerson(null));
- }
-
- @Test
- public void hasPerson_personNotInAddressBook_returnsFalse() {
- assertFalse(addressBook.hasPerson(ALICE));
- }
-
- @Test
- public void hasPerson_personInAddressBook_returnsTrue() {
- addressBook.addPerson(ALICE);
- assertTrue(addressBook.hasPerson(ALICE));
- }
-
- @Test
- public void hasPerson_personWithSameIdentityFieldsInAddressBook_returnsTrue() {
- addressBook.addPerson(ALICE);
- Person editedAlice = new PersonBuilder(ALICE).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND)
- .build();
- assertTrue(addressBook.hasPerson(editedAlice));
- }
-
- @Test
- public void getPersonList_modifyList_throwsUnsupportedOperationException() {
- assertThrows(UnsupportedOperationException.class, () -> addressBook.getPersonList().remove(0));
- }
-
- /**
- * A stub ReadOnlyAddressBook whose persons list can violate interface constraints.
- */
- private static class AddressBookStub implements ReadOnlyAddressBook {
- private final ObservableList<Person> persons = FXCollections.observableArrayList();
-
- AddressBookStub(Collection<Person> persons) {
- this.persons.setAll(persons);
- }
-
- @Override
- public ObservableList<Person> getPersonList() {
- return persons;
- }
- }
-
-}
diff --git a/src/test/java/seedu/address/model/ModelManagerTest.java b/src/test/java/seedu/address/model/ModelManagerTest.java
index 2cf1418d116..5aacdca5b9d 100644
--- a/src/test/java/seedu/address/model/ModelManagerTest.java
+++ b/src/test/java/seedu/address/model/ModelManagerTest.java
@@ -3,10 +3,12 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PERSONS;
+import static seedu.address.model.Model.PREDICATE_SHOW_ALL_STUDENTS;
import static seedu.address.testutil.Assert.assertThrows;
-import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.BENSON;
+import static seedu.address.testutil.TypicalStudents.ALICE;
+import static seedu.address.testutil.TypicalStudents.AMY;
+import static seedu.address.testutil.TypicalStudents.BOB;
+import static seedu.address.testutil.notes.TypicalNotes.NOTE_EXISTENTIAL_CRISIS;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -15,8 +17,11 @@
import org.junit.jupiter.api.Test;
import seedu.address.commons.core.GuiSettings;
-import seedu.address.model.person.NameContainsKeywordsPredicate;
-import seedu.address.testutil.AddressBookBuilder;
+import seedu.address.model.notes.Notebook;
+import seedu.address.model.schedule.Scheduler;
+import seedu.address.model.student.NameContainsKeywordsPredicate;
+import seedu.address.testutil.ReeveBuilder;
+import seedu.address.testutil.notes.NotebookBuilder;
public class ModelManagerTest {
@@ -26,7 +31,8 @@ public class ModelManagerTest {
public void constructor() {
assertEquals(new UserPrefs(), modelManager.getUserPrefs());
assertEquals(new GuiSettings(), modelManager.getGuiSettings());
- assertEquals(new AddressBook(), new AddressBook(modelManager.getAddressBook()));
+ assertEquals(new Reeve(), new Reeve(modelManager.getReeve()));
+ assertEquals(new Scheduler(), modelManager.getSchedule());
}
@Test
@@ -74,34 +80,36 @@ public void setAddressBookFilePath_validPath_setsAddressBookFilePath() {
@Test
public void hasPerson_nullPerson_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> modelManager.hasPerson(null));
+ assertThrows(NullPointerException.class, () -> modelManager.hasStudent(null));
}
@Test
public void hasPerson_personNotInAddressBook_returnsFalse() {
- assertFalse(modelManager.hasPerson(ALICE));
+ assertFalse(modelManager.hasStudent(AMY));
}
@Test
public void hasPerson_personInAddressBook_returnsTrue() {
- modelManager.addPerson(ALICE);
- assertTrue(modelManager.hasPerson(ALICE));
+ modelManager.addStudent(AMY);
+ assertTrue(modelManager.hasStudent(AMY));
}
@Test
public void getFilteredPersonList_modifyList_throwsUnsupportedOperationException() {
- assertThrows(UnsupportedOperationException.class, () -> modelManager.getFilteredPersonList().remove(0));
+ assertThrows(UnsupportedOperationException.class, () -> modelManager.getSortedStudentList().remove(0));
}
@Test
public void equals() {
- AddressBook addressBook = new AddressBookBuilder().withPerson(ALICE).withPerson(BENSON).build();
- AddressBook differentAddressBook = new AddressBook();
+ Reeve reeve = new ReeveBuilder().withPerson(AMY).withPerson(BOB).build();
+ Reeve differentReeve = new Reeve();
+ Notebook notebook = new NotebookBuilder().withNote(NOTE_EXISTENTIAL_CRISIS).build();
+ Notebook differentNotebook = new Notebook();
UserPrefs userPrefs = new UserPrefs();
// same values -> returns true
- modelManager = new ModelManager(addressBook, userPrefs);
- ModelManager modelManagerCopy = new ModelManager(addressBook, userPrefs);
+ modelManager = new ModelManager(reeve, userPrefs, notebook);
+ ModelManager modelManagerCopy = new ModelManager(reeve, userPrefs, notebook);
assertTrue(modelManager.equals(modelManagerCopy));
// same object -> returns true
@@ -113,20 +121,44 @@ public void equals() {
// different types -> returns false
assertFalse(modelManager.equals(5));
- // different addressBook -> returns false
- assertFalse(modelManager.equals(new ModelManager(differentAddressBook, userPrefs)));
+ // different reeve -> returns false
+ assertFalse(modelManager.equals(new ModelManager(differentReeve, userPrefs, notebook)));
+
+ // different notebook -> returns false
+ assertFalse(modelManager.equals(new ModelManager(reeve, userPrefs, differentNotebook)));
// different filteredList -> returns false
- String[] keywords = ALICE.getName().fullName.split("\\s+");
- modelManager.updateFilteredPersonList(new NameContainsKeywordsPredicate(Arrays.asList(keywords)));
- assertFalse(modelManager.equals(new ModelManager(addressBook, userPrefs)));
+ String[] keywords = AMY.getName().fullName.split("\\s+");
+
+ modelManager.updateFilteredStudentList(new NameContainsKeywordsPredicate(Arrays.asList(keywords)));
+ assertFalse(modelManager.equals(new ModelManager(reeve, userPrefs, notebook)));
// resets modelManager to initial state for upcoming tests
- modelManager.updateFilteredPersonList(PREDICATE_SHOW_ALL_PERSONS);
+ modelManager.updateFilteredStudentList(PREDICATE_SHOW_ALL_STUDENTS);
// different userPrefs -> returns false
UserPrefs differentUserPrefs = new UserPrefs();
differentUserPrefs.setAddressBookFilePath(Paths.get("differentFilePath"));
- assertFalse(modelManager.equals(new ModelManager(addressBook, differentUserPrefs)));
+ assertFalse(modelManager.equals(new ModelManager(reeve, differentUserPrefs, notebook)));
+
+ }
+
+ @Test
+ public void isClashingClassTime() {
+ Reeve reeve = new ReeveBuilder().withPerson(AMY).withPerson(BOB).build();
+ Notebook notebook = new NotebookBuilder().withNote(NOTE_EXISTENTIAL_CRISIS).build();
+ UserPrefs userPrefs = new UserPrefs();
+ modelManager = new ModelManager(reeve, userPrefs, notebook);
+ assertTrue(modelManager.hasClashingClassTimeWith(AMY));
+ assertTrue(modelManager.hasClashingClassTimeWith(BOB));
+ assertFalse(modelManager.hasClashingClassTimeWith(ALICE));
}
+
+ @Test
+ public void getVEventList_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, () -> modelManager.getVEventList().remove(0));
+ }
+
+
+
}
diff --git a/src/test/java/seedu/address/model/ModelStub.java b/src/test/java/seedu/address/model/ModelStub.java
new file mode 100644
index 00000000000..7d4ef7b7eda
--- /dev/null
+++ b/src/test/java/seedu/address/model/ModelStub.java
@@ -0,0 +1,176 @@
+package seedu.address.model;
+
+import java.nio.file.Path;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Comparator;
+import java.util.function.Predicate;
+
+import javafx.collections.ObservableList;
+import jfxtras.icalendarfx.components.VEvent;
+import seedu.address.commons.core.GuiSettings;
+import seedu.address.model.notes.ReadOnlyNotebook;
+import seedu.address.model.notes.note.Note;
+import seedu.address.model.schedule.ReadOnlyEvent;
+import seedu.address.model.schedule.ScheduleViewMode;
+import seedu.address.model.student.Student;
+
+/**
+ * A default model stub that have all of the methods failing.
+ */
+public class ModelStub implements Model {
+ @Override
+ public void setUserPrefs(ReadOnlyUserPrefs userPrefs) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public ReadOnlyUserPrefs getUserPrefs() {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public GuiSettings getGuiSettings() {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void setGuiSettings(GuiSettings guiSettings) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public Path getAddressBookFilePath() {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void setAddressBookFilePath(Path addressBookFilePath) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void addStudent(Student student) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void setReeve(ReadOnlyReeve newData) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public ReadOnlyReeve getReeve() {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public boolean hasStudent(Student student) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void deleteStudent(Student target) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void setStudent(Student target, Student editedStudent) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public ObservableList<Student> getSortedStudentList() {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void updateFilteredStudentList(Predicate<Student> predicate) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public ObservableList<Student> getFilteredStudentList() {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public ReadOnlyEvent getSchedule() {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public LocalDateTime getScheduleViewDateTime() {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void setScheduleViewDate(LocalDate targetDate) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public ScheduleViewMode getScheduleViewMode() {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void setScheduleViewMode(ScheduleViewMode viewMode) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public ObservableList<VEvent> getVEventList() {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void updateSortedStudentList(Comparator<? super Student> predicate) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void updateClassTimesToEvent() {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public ObservableList<VEvent> getLessonEventsList() {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public boolean hasClashingClassTimeWith(Student toCheck) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void setNotebook(ReadOnlyNotebook notebook) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public ReadOnlyNotebook getNotebook() {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public boolean hasNote(Note note) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void deleteNote(Note target) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void addNote(Note note) {
+ throw new AssertionError("This method should not be called.");
+ }
+
+ @Override
+ public void setNote(Note target, Note editedNote) {
+ throw new AssertionError("This method should not be called.");
+ }
+}
diff --git a/src/test/java/seedu/address/model/ModelStubAcceptingNoteAdded.java b/src/test/java/seedu/address/model/ModelStubAcceptingNoteAdded.java
new file mode 100644
index 00000000000..5a293cf886c
--- /dev/null
+++ b/src/test/java/seedu/address/model/ModelStubAcceptingNoteAdded.java
@@ -0,0 +1,33 @@
+package seedu.address.model;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.ArrayList;
+
+import seedu.address.model.notes.Notebook;
+import seedu.address.model.notes.ReadOnlyNotebook;
+import seedu.address.model.notes.note.Note;
+
+/**
+ * A Model stub that always accept the note being added.
+ */
+public class ModelStubAcceptingNoteAdded extends ModelStub {
+ public final ArrayList<Note> notesAdded = new ArrayList<>();
+
+ @Override
+ public boolean hasNote(Note note) {
+ requireNonNull(note);
+ return notesAdded.stream().anyMatch(note::isSameNote);
+ }
+
+ @Override
+ public void addNote(Note note) {
+ notesAdded.add(note);
+ }
+
+ @Override
+ public ReadOnlyNotebook getNotebook() {
+ return new Notebook();
+ }
+}
+
diff --git a/src/test/java/seedu/address/model/ModelStubAcceptingStudentAdded.java b/src/test/java/seedu/address/model/ModelStubAcceptingStudentAdded.java
new file mode 100644
index 00000000000..7d150da8e8f
--- /dev/null
+++ b/src/test/java/seedu/address/model/ModelStubAcceptingStudentAdded.java
@@ -0,0 +1,36 @@
+package seedu.address.model;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.ArrayList;
+
+import seedu.address.model.student.Student;
+
+/**
+ * A Model stub that always accept the person being added.
+ */
+public class ModelStubAcceptingStudentAdded extends ModelStub {
+ public final ArrayList<Student> personsAdded = new ArrayList<>();
+
+ @Override
+ public boolean hasStudent(Student student) {
+ requireNonNull(student);
+ return personsAdded.stream().anyMatch(student::isSameStudent);
+ }
+
+ @Override
+ public void addStudent(Student student) {
+ requireNonNull(student);
+ personsAdded.add(student);
+ }
+
+ @Override
+ public boolean hasClashingClassTimeWith(Student toCheck) {
+ return false;
+ }
+
+ @Override
+ public ReadOnlyReeve getReeve() {
+ return new Reeve();
+ }
+}
diff --git a/src/test/java/seedu/address/model/ModelStubWithNote.java b/src/test/java/seedu/address/model/ModelStubWithNote.java
new file mode 100644
index 00000000000..0d5f0e2664f
--- /dev/null
+++ b/src/test/java/seedu/address/model/ModelStubWithNote.java
@@ -0,0 +1,26 @@
+package seedu.address.model;
+
+import static java.util.Objects.requireNonNull;
+
+import seedu.address.model.notes.note.Note;
+
+/**
+ * A Model stub that contains a single person.
+ */
+public class ModelStubWithNote extends ModelStub {
+ private final Note note;
+
+ /**
+ * {@code note} note to be included in the model
+ */
+ public ModelStubWithNote(Note note) {
+ requireNonNull(note);
+ this.note = note;
+ }
+
+ @Override
+ public boolean hasNote(Note note) {
+ requireNonNull(note);
+ return this.note.isSameNote(note);
+ }
+}
diff --git a/src/test/java/seedu/address/model/ModelStubWithStudent.java b/src/test/java/seedu/address/model/ModelStubWithStudent.java
new file mode 100644
index 00000000000..80fbe33d245
--- /dev/null
+++ b/src/test/java/seedu/address/model/ModelStubWithStudent.java
@@ -0,0 +1,27 @@
+package seedu.address.model;
+
+import static java.util.Objects.requireNonNull;
+
+import seedu.address.model.student.Student;
+
+/**
+ * A Model stub that contains a single student.
+ */
+public class ModelStubWithStudent extends ModelStub {
+ private final Student student;
+
+ /**
+ * {@code student} student inside the model
+ */
+ public ModelStubWithStudent(Student student) {
+ requireNonNull(student);
+ this.student = student;
+ }
+
+ @Override
+ public boolean hasStudent(Student student) {
+ requireNonNull(student);
+ return this.student.isSameStudent(student);
+ }
+}
+
diff --git a/src/test/java/seedu/address/model/ReeveTest.java b/src/test/java/seedu/address/model/ReeveTest.java
new file mode 100644
index 00000000000..b7c80c0f962
--- /dev/null
+++ b/src/test/java/seedu/address/model/ReeveTest.java
@@ -0,0 +1,98 @@
+package seedu.address.model;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.TypicalStudents.AMY;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.exceptions.DuplicateStudentException;
+import seedu.address.testutil.StudentBuilder;
+
+public class ReeveTest {
+
+ private final Reeve reeve = new Reeve();
+
+ @Test
+ public void constructor() {
+ assertEquals(Collections.emptyList(), reeve.getStudentList());
+ }
+
+ @Test
+ public void resetData_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> reeve.resetData(null));
+ }
+
+ @Test
+ public void resetData_withValidReadOnlyAddressBook_replacesData() {
+ Reeve newData = getTypicalAddressBook();
+ reeve.resetData(newData);
+ assertEquals(newData, reeve);
+ }
+
+ @Test
+ public void resetData_withDuplicatePersons_throwsDuplicatePersonException() {
+ // Two persons with the same identity fields
+ Student editedAlice = new StudentBuilder(AMY).build();
+ List<Student> newStudents = Arrays.asList(AMY, editedAlice);
+ ReeveStub newData = new ReeveStub(newStudents);
+
+ assertThrows(DuplicateStudentException.class, () -> reeve.resetData(newData));
+ }
+
+ @Test
+ public void hasPerson_nullPerson_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> reeve.hasStudent(null));
+ }
+
+ @Test
+ public void hasPerson_personNotInAddressBook_returnsFalse() {
+ assertFalse(reeve.hasStudent(AMY));
+ }
+
+ @Test
+ public void hasPerson_personInAddressBook_returnsTrue() {
+ reeve.addStudent(AMY);
+ assertTrue(reeve.hasStudent(AMY));
+ }
+
+ @Test
+ public void hasPerson_personWithSameIdentityFieldsInAddressBook_returnsTrue() {
+ reeve.addStudent(AMY);
+ Student editedAlice = new StudentBuilder(AMY).build();
+ assertTrue(reeve.hasStudent(editedAlice));
+ }
+
+ @Test
+ public void getPersonList_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, () -> reeve.getStudentList().remove(0));
+ }
+
+ /**
+ * A stub ReadOnlyAddressBook whose student list can violate interface constraints.
+ */
+ private static class ReeveStub implements ReadOnlyReeve {
+ private final ObservableList<Student> students = FXCollections.observableArrayList();
+
+ ReeveStub(Collection<Student> students) {
+ this.students.setAll(students);
+ }
+
+ @Override
+ public ObservableList<Student> getStudentList() {
+ return students;
+ }
+ }
+
+}
diff --git a/src/test/java/seedu/address/model/UserPrefsTest.java b/src/test/java/seedu/address/model/UserPrefsTest.java
index b1307a70d52..74ca4347d33 100644
--- a/src/test/java/seedu/address/model/UserPrefsTest.java
+++ b/src/test/java/seedu/address/model/UserPrefsTest.java
@@ -18,4 +18,12 @@ public void setAddressBookFilePath_nullPath_throwsNullPointerException() {
assertThrows(NullPointerException.class, () -> userPrefs.setAddressBookFilePath(null));
}
+ @Test
+ public void setScheduleFilePath_nullPath_throwsNullPointerException() {
+ UserPrefs userPrefs = new UserPrefs();
+ assertThrows(NullPointerException.class, () -> userPrefs.setScheduleFilePath(null));
+ }
+
+
+
}
diff --git a/src/test/java/seedu/address/model/notes/DescriptionTest.java b/src/test/java/seedu/address/model/notes/DescriptionTest.java
new file mode 100644
index 00000000000..810f08f9ae9
--- /dev/null
+++ b/src/test/java/seedu/address/model/notes/DescriptionTest.java
@@ -0,0 +1,54 @@
+package seedu.address.model.notes;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.model.notes.note.Description;
+
+public class DescriptionTest {
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new Description(null));
+ }
+
+ @Test
+ public void constructor_invalidDescription_throwsIllegalArgumentException() {
+ // Empty string
+ assertThrows(IllegalArgumentException.class, () -> new Description(""));
+
+ // More than 80 characters
+ assertThrows(IllegalArgumentException.class, () -> new Description("Lorem ipsum dolor"
+ + " sit amet, consectetur adipiscing elit. Integer dapibus sapienar"));
+
+ }
+
+ @Test
+ public void isValidDescription() {
+ // EP: null
+ assertThrows(NullPointerException.class, () -> Description.isValidDescription(null));
+
+ // EP: empty spaces
+ assertFalse(Description.isValidDescription(" ")); // spaces only
+
+ // EP: 0 characters
+ assertFalse(Description.isValidDescription("")); // empty string
+
+ // EP: 1 char
+ assertTrue(Description.isValidDescription("p")); // alphabets only
+
+ // EP: 80 char
+ assertTrue(Description.isValidDescription("Lorem ipsum dolor sit amet, consectetur"
+ + " adipiscing elit. Integer dapibus sapiena")); // 80 char
+
+ // EP: 81 char
+ assertFalse(Description.isValidDescription("Lorem ipsum dolor sit amet, consectetur"
+ + " adipiscing elit. Integer dapibus sapienar")); // 80 char
+
+ // EP: special characters
+ assertTrue(Description.isValidDescription("hi!! :)")); // a few special characters
+ }
+}
diff --git a/src/test/java/seedu/address/model/notes/NoteTest.java b/src/test/java/seedu/address/model/notes/NoteTest.java
new file mode 100644
index 00000000000..944261bd92c
--- /dev/null
+++ b/src/test/java/seedu/address/model/notes/NoteTest.java
@@ -0,0 +1,61 @@
+package seedu.address.model.notes;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.notes.TypicalNotes.NOTE_BUY_COFFEE;
+import static seedu.address.testutil.notes.TypicalNotes.NOTE_GRADUATION;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.model.notes.note.Note;
+import seedu.address.testutil.notes.NoteBuilder;
+
+public class NoteTest {
+
+ @Test
+ public void isSameNote() {
+ // same object -> returns true
+ assertTrue(NOTE_BUY_COFFEE.isSameNote(NOTE_BUY_COFFEE));
+
+ // null -> returns false
+ assertFalse(NOTE_BUY_COFFEE.isSameNote(null));
+
+ // different title -> returns false
+ Note editedCoffeeNote = new NoteBuilder(NOTE_BUY_COFFEE).withTitle("hehe").build();
+ assertFalse(NOTE_BUY_COFFEE.isSameNote(editedCoffeeNote));
+
+ // different description same title -> returns true
+ editedCoffeeNote = new NoteBuilder(NOTE_BUY_COFFEE).withDescription("haha").build();
+ assertTrue(NOTE_BUY_COFFEE.isSameNote(editedCoffeeNote));
+
+ }
+
+ @Test
+ public void equals() {
+ // same values -> returns true
+ Note graduationNoteCopy = new NoteBuilder(NOTE_GRADUATION).build();
+ assertTrue(NOTE_GRADUATION.equals(graduationNoteCopy));
+
+ // same object -> returns true
+ assertTrue(NOTE_GRADUATION.equals(NOTE_GRADUATION));
+
+ // null -> returns false
+ assertFalse(NOTE_GRADUATION.equals(null));
+
+ // different type -> returns false
+ assertFalse(NOTE_GRADUATION.equals(5));
+
+ // different note -> returns false
+ assertFalse(NOTE_GRADUATION.equals(NOTE_BUY_COFFEE));
+
+ // different title -> returns false
+ Note editedCoffeeNote = new NoteBuilder(NOTE_BUY_COFFEE).withTitle("hehe").build();
+ assertFalse(NOTE_BUY_COFFEE.equals(editedCoffeeNote));
+
+ // different description -> returns false
+ editedCoffeeNote = new NoteBuilder(NOTE_BUY_COFFEE).withDescription("haha").build();
+ assertFalse(NOTE_BUY_COFFEE.equals(editedCoffeeNote));
+
+ }
+
+}
diff --git a/src/test/java/seedu/address/model/notes/NotebookTest.java b/src/test/java/seedu/address/model/notes/NotebookTest.java
new file mode 100644
index 00000000000..72517148e1d
--- /dev/null
+++ b/src/test/java/seedu/address/model/notes/NotebookTest.java
@@ -0,0 +1,99 @@
+package seedu.address.model.notes;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.notes.TypicalNotes.NOTE_GRADUATION;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import seedu.address.model.notes.note.Note;
+import seedu.address.model.notes.note.exceptions.DuplicateNoteException;
+import seedu.address.testutil.notes.NoteBuilder;
+
+public class NotebookTest {
+
+ private final Notebook notebook = new Notebook();
+
+ @Test
+ public void constructor() {
+ assertEquals(Collections.emptyList(), notebook.getNotesList());
+ }
+
+ @Test
+ public void resetData_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> notebook.resetData(null));
+ }
+
+ @Test
+ public void resetData_withValidReadOnlyNotebook_replacesData() {
+ Notebook newData = getTypicalNotebook();
+ notebook.resetData(newData);
+ assertEquals(newData, notebook);
+ }
+
+ @Test
+ public void resetData_withDuplicateNotes_throwsDuplicateNoteException() {
+ // Two notes with the same title
+ Note editedGraduation = new NoteBuilder(NOTE_GRADUATION).build();
+ List<Note> newNotes = Arrays.asList(NOTE_GRADUATION, editedGraduation);
+ NotebookStub newData = new NotebookStub(newNotes);
+
+ assertThrows(DuplicateNoteException.class, () -> notebook.resetData(newData));
+ }
+
+ @Test
+ public void hasNote_nullNote_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> notebook.hasNote(null));
+ }
+
+ @Test
+ public void hasNote_noteNotInNotebook_returnsFalse() {
+ assertFalse(notebook.hasNote(NOTE_GRADUATION));
+ }
+
+ @Test
+ public void hasNote_noteInAddressBook_returnsTrue() {
+ notebook.addNote(NOTE_GRADUATION);
+ assertTrue(notebook.hasNote(NOTE_GRADUATION));
+ }
+
+ @Test
+ public void hasNote_noteWithSameTitle_returnsTrue() {
+ notebook.addNote(NOTE_GRADUATION);
+ Note editedGraduation = new NoteBuilder(NOTE_GRADUATION).build();
+ assertTrue(notebook.hasNote(editedGraduation));
+ }
+
+ @Test
+ public void getNoteList_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, () ->
+ notebook.getNotesList().remove(0));
+ }
+
+ /**
+ * A stub ReadOnlyNotebook whose note list can violate interface constraints.
+ */
+ private static class NotebookStub implements ReadOnlyNotebook {
+ private final ObservableList<Note> notes = FXCollections.observableArrayList();
+
+ NotebookStub(Collection<Note> notes) {
+ this.notes.setAll(notes);
+ }
+
+ @Override
+ public ObservableList<Note> getNotesList() {
+ return notes;
+ }
+ }
+
+}
diff --git a/src/test/java/seedu/address/model/notes/TitleTest.java b/src/test/java/seedu/address/model/notes/TitleTest.java
new file mode 100644
index 00000000000..1b02b0437f0
--- /dev/null
+++ b/src/test/java/seedu/address/model/notes/TitleTest.java
@@ -0,0 +1,44 @@
+package seedu.address.model.notes;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.model.notes.note.Title;
+
+public class TitleTest {
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new Title(null));
+ }
+
+ @Test
+ public void constructor_invalidTitle_throwsIllegalArgumentException() {
+ // Empty string
+ assertThrows(IllegalArgumentException.class, () -> new Title(""));
+
+ // More than 20 characters
+ assertThrows(IllegalArgumentException.class, () -> new Title("What is the meaning of life?"));
+
+ }
+
+ @Test
+ public void isValidTitle() {
+ // null name
+ assertThrows(NullPointerException.class, () -> Title.isValidTitle(null));
+
+ // invalid name
+ assertFalse(Title.isValidTitle("")); // empty string
+ assertFalse(Title.isValidTitle(" ")); // spaces only
+ assertFalse(Title.isValidTitle("Life is very hard....")); // 21 char
+
+ // valid name
+ assertTrue(Title.isValidTitle("peter jack")); // alphabets only
+ assertTrue(Title.isValidTitle("12345")); // numbers only
+ assertTrue(Title.isValidTitle("peter the 2nd")); // alphanumeric characters
+ assertTrue(Title.isValidTitle("hi!! :)")); // a few special characters
+ }
+}
diff --git a/src/test/java/seedu/address/model/person/AddressTest.java b/src/test/java/seedu/address/model/person/AddressTest.java
deleted file mode 100644
index dcd3be87b3a..00000000000
--- a/src/test/java/seedu/address/model/person/AddressTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package seedu.address.model.person;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.testutil.Assert.assertThrows;
-
-import org.junit.jupiter.api.Test;
-
-public class AddressTest {
-
- @Test
- public void constructor_null_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> new Address(null));
- }
-
- @Test
- public void constructor_invalidAddress_throwsIllegalArgumentException() {
- String invalidAddress = "";
- assertThrows(IllegalArgumentException.class, () -> new Address(invalidAddress));
- }
-
- @Test
- public void isValidAddress() {
- // null address
- assertThrows(NullPointerException.class, () -> Address.isValidAddress(null));
-
- // invalid addresses
- assertFalse(Address.isValidAddress("")); // empty string
- assertFalse(Address.isValidAddress(" ")); // spaces only
-
- // valid addresses
- assertTrue(Address.isValidAddress("Blk 456, Den Road, #01-355"));
- assertTrue(Address.isValidAddress("-")); // one character
- assertTrue(Address.isValidAddress("Leng Inc; 1234 Market St; San Francisco CA 2349879; USA")); // long address
- }
-}
diff --git a/src/test/java/seedu/address/model/person/EmailTest.java b/src/test/java/seedu/address/model/person/EmailTest.java
deleted file mode 100644
index 7fa726ceb18..00000000000
--- a/src/test/java/seedu/address/model/person/EmailTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package seedu.address.model.person;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.testutil.Assert.assertThrows;
-
-import org.junit.jupiter.api.Test;
-
-public class EmailTest {
-
- @Test
- public void constructor_null_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> new Email(null));
- }
-
- @Test
- public void constructor_invalidEmail_throwsIllegalArgumentException() {
- String invalidEmail = "";
- assertThrows(IllegalArgumentException.class, () -> new Email(invalidEmail));
- }
-
- @Test
- public void isValidEmail() {
- // null email
- assertThrows(NullPointerException.class, () -> Email.isValidEmail(null));
-
- // blank email
- assertFalse(Email.isValidEmail("")); // empty string
- assertFalse(Email.isValidEmail(" ")); // spaces only
-
- // missing parts
- assertFalse(Email.isValidEmail("@example.com")); // missing local part
- assertFalse(Email.isValidEmail("peterjackexample.com")); // missing '@' symbol
- assertFalse(Email.isValidEmail("peterjack@")); // missing domain name
-
- // invalid parts
- assertFalse(Email.isValidEmail("peterjack@-")); // invalid domain name
- assertFalse(Email.isValidEmail("peterjack@exam_ple.com")); // underscore in domain name
- assertFalse(Email.isValidEmail("peter jack@example.com")); // spaces in local part
- assertFalse(Email.isValidEmail("peterjack@exam ple.com")); // spaces in domain name
- assertFalse(Email.isValidEmail(" peterjack@example.com")); // leading space
- assertFalse(Email.isValidEmail("peterjack@example.com ")); // trailing space
- assertFalse(Email.isValidEmail("peterjack@@example.com")); // double '@' symbol
- assertFalse(Email.isValidEmail("peter@jack@example.com")); // '@' symbol in local part
- assertFalse(Email.isValidEmail("peterjack@example@com")); // '@' symbol in domain name
- assertFalse(Email.isValidEmail("peterjack@.example.com")); // domain name starts with a period
- assertFalse(Email.isValidEmail("peterjack@example.com.")); // domain name ends with a period
- assertFalse(Email.isValidEmail("peterjack@-example.com")); // domain name starts with a hyphen
- assertFalse(Email.isValidEmail("peterjack@example.com-")); // domain name ends with a hyphen
-
- // valid email
- assertTrue(Email.isValidEmail("PeterJack_1190@example.com"));
- assertTrue(Email.isValidEmail("a@bc")); // minimal
- assertTrue(Email.isValidEmail("test@localhost")); // alphabets only
- assertTrue(Email.isValidEmail("!#$%&'*+/=?`{|}~^.-@example.org")); // special characters local part
- assertTrue(Email.isValidEmail("123@145")); // numeric local part and domain name
- assertTrue(Email.isValidEmail("a1+be!@example1.com")); // mixture of alphanumeric and special characters
- assertTrue(Email.isValidEmail("peter_jack@very-very-very-long-example.com")); // long domain name
- assertTrue(Email.isValidEmail("if.you.dream.it_you.can.do.it@example.com")); // long local part
- }
-}
diff --git a/src/test/java/seedu/address/model/person/PersonTest.java b/src/test/java/seedu/address/model/person/PersonTest.java
deleted file mode 100644
index 7c1058d8635..00000000000
--- a/src/test/java/seedu/address/model/person/PersonTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package seedu.address.model.person;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-import static seedu.address.testutil.Assert.assertThrows;
-import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.BOB;
-
-import org.junit.jupiter.api.Test;
-
-import seedu.address.testutil.PersonBuilder;
-
-public class PersonTest {
-
- @Test
- public void asObservableList_modifyList_throwsUnsupportedOperationException() {
- Person person = new PersonBuilder().build();
- assertThrows(UnsupportedOperationException.class, () -> person.getTags().remove(0));
- }
-
- @Test
- public void isSamePerson() {
- // same object -> returns true
- assertTrue(ALICE.isSamePerson(ALICE));
-
- // null -> returns false
- assertFalse(ALICE.isSamePerson(null));
-
- // different phone and email -> returns false
- Person editedAlice = new PersonBuilder(ALICE).withPhone(VALID_PHONE_BOB).withEmail(VALID_EMAIL_BOB).build();
- assertFalse(ALICE.isSamePerson(editedAlice));
-
- // different name -> returns false
- editedAlice = new PersonBuilder(ALICE).withName(VALID_NAME_BOB).build();
- assertFalse(ALICE.isSamePerson(editedAlice));
-
- // same name, same phone, different attributes -> returns true
- editedAlice = new PersonBuilder(ALICE).withEmail(VALID_EMAIL_BOB).withAddress(VALID_ADDRESS_BOB)
- .withTags(VALID_TAG_HUSBAND).build();
- assertTrue(ALICE.isSamePerson(editedAlice));
-
- // same name, same email, different attributes -> returns true
- editedAlice = new PersonBuilder(ALICE).withPhone(VALID_PHONE_BOB).withAddress(VALID_ADDRESS_BOB)
- .withTags(VALID_TAG_HUSBAND).build();
- assertTrue(ALICE.isSamePerson(editedAlice));
-
- // same name, same phone, same email, different attributes -> returns true
- editedAlice = new PersonBuilder(ALICE).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND).build();
- assertTrue(ALICE.isSamePerson(editedAlice));
- }
-
- @Test
- public void equals() {
- // same values -> returns true
- Person aliceCopy = new PersonBuilder(ALICE).build();
- assertTrue(ALICE.equals(aliceCopy));
-
- // same object -> returns true
- assertTrue(ALICE.equals(ALICE));
-
- // null -> returns false
- assertFalse(ALICE.equals(null));
-
- // different type -> returns false
- assertFalse(ALICE.equals(5));
-
- // different person -> returns false
- assertFalse(ALICE.equals(BOB));
-
- // different name -> returns false
- Person editedAlice = new PersonBuilder(ALICE).withName(VALID_NAME_BOB).build();
- assertFalse(ALICE.equals(editedAlice));
-
- // different phone -> returns false
- editedAlice = new PersonBuilder(ALICE).withPhone(VALID_PHONE_BOB).build();
- assertFalse(ALICE.equals(editedAlice));
-
- // different email -> returns false
- editedAlice = new PersonBuilder(ALICE).withEmail(VALID_EMAIL_BOB).build();
- assertFalse(ALICE.equals(editedAlice));
-
- // different address -> returns false
- editedAlice = new PersonBuilder(ALICE).withAddress(VALID_ADDRESS_BOB).build();
- assertFalse(ALICE.equals(editedAlice));
-
- // different tags -> returns false
- editedAlice = new PersonBuilder(ALICE).withTags(VALID_TAG_HUSBAND).build();
- assertFalse(ALICE.equals(editedAlice));
- }
-}
diff --git a/src/test/java/seedu/address/model/person/UniquePersonListTest.java b/src/test/java/seedu/address/model/person/UniquePersonListTest.java
deleted file mode 100644
index 1cc5fe9e0fe..00000000000
--- a/src/test/java/seedu/address/model/person/UniquePersonListTest.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package seedu.address.model.person;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-import static seedu.address.testutil.Assert.assertThrows;
-import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.BOB;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.jupiter.api.Test;
-
-import seedu.address.model.person.exceptions.DuplicatePersonException;
-import seedu.address.model.person.exceptions.PersonNotFoundException;
-import seedu.address.testutil.PersonBuilder;
-
-public class UniquePersonListTest {
-
- private final UniquePersonList uniquePersonList = new UniquePersonList();
-
- @Test
- public void contains_nullPerson_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> uniquePersonList.contains(null));
- }
-
- @Test
- public void contains_personNotInList_returnsFalse() {
- assertFalse(uniquePersonList.contains(ALICE));
- }
-
- @Test
- public void contains_personInList_returnsTrue() {
- uniquePersonList.add(ALICE);
- assertTrue(uniquePersonList.contains(ALICE));
- }
-
- @Test
- public void contains_personWithSameIdentityFieldsInList_returnsTrue() {
- uniquePersonList.add(ALICE);
- Person editedAlice = new PersonBuilder(ALICE).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND)
- .build();
- assertTrue(uniquePersonList.contains(editedAlice));
- }
-
- @Test
- public void add_nullPerson_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> uniquePersonList.add(null));
- }
-
- @Test
- public void add_duplicatePerson_throwsDuplicatePersonException() {
- uniquePersonList.add(ALICE);
- assertThrows(DuplicatePersonException.class, () -> uniquePersonList.add(ALICE));
- }
-
- @Test
- public void setPerson_nullTargetPerson_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> uniquePersonList.setPerson(null, ALICE));
- }
-
- @Test
- public void setPerson_nullEditedPerson_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> uniquePersonList.setPerson(ALICE, null));
- }
-
- @Test
- public void setPerson_targetPersonNotInList_throwsPersonNotFoundException() {
- assertThrows(PersonNotFoundException.class, () -> uniquePersonList.setPerson(ALICE, ALICE));
- }
-
- @Test
- public void setPerson_editedPersonIsSamePerson_success() {
- uniquePersonList.add(ALICE);
- uniquePersonList.setPerson(ALICE, ALICE);
- UniquePersonList expectedUniquePersonList = new UniquePersonList();
- expectedUniquePersonList.add(ALICE);
- assertEquals(expectedUniquePersonList, uniquePersonList);
- }
-
- @Test
- public void setPerson_editedPersonHasSameIdentity_success() {
- uniquePersonList.add(ALICE);
- Person editedAlice = new PersonBuilder(ALICE).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND)
- .build();
- uniquePersonList.setPerson(ALICE, editedAlice);
- UniquePersonList expectedUniquePersonList = new UniquePersonList();
- expectedUniquePersonList.add(editedAlice);
- assertEquals(expectedUniquePersonList, uniquePersonList);
- }
-
- @Test
- public void setPerson_editedPersonHasDifferentIdentity_success() {
- uniquePersonList.add(ALICE);
- uniquePersonList.setPerson(ALICE, BOB);
- UniquePersonList expectedUniquePersonList = new UniquePersonList();
- expectedUniquePersonList.add(BOB);
- assertEquals(expectedUniquePersonList, uniquePersonList);
- }
-
- @Test
- public void setPerson_editedPersonHasNonUniqueIdentity_throwsDuplicatePersonException() {
- uniquePersonList.add(ALICE);
- uniquePersonList.add(BOB);
- assertThrows(DuplicatePersonException.class, () -> uniquePersonList.setPerson(ALICE, BOB));
- }
-
- @Test
- public void remove_nullPerson_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> uniquePersonList.remove(null));
- }
-
- @Test
- public void remove_personDoesNotExist_throwsPersonNotFoundException() {
- assertThrows(PersonNotFoundException.class, () -> uniquePersonList.remove(ALICE));
- }
-
- @Test
- public void remove_existingPerson_removesPerson() {
- uniquePersonList.add(ALICE);
- uniquePersonList.remove(ALICE);
- UniquePersonList expectedUniquePersonList = new UniquePersonList();
- assertEquals(expectedUniquePersonList, uniquePersonList);
- }
-
- @Test
- public void setPersons_nullUniquePersonList_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> uniquePersonList.setPersons((UniquePersonList) null));
- }
-
- @Test
- public void setPersons_uniquePersonList_replacesOwnListWithProvidedUniquePersonList() {
- uniquePersonList.add(ALICE);
- UniquePersonList expectedUniquePersonList = new UniquePersonList();
- expectedUniquePersonList.add(BOB);
- uniquePersonList.setPersons(expectedUniquePersonList);
- assertEquals(expectedUniquePersonList, uniquePersonList);
- }
-
- @Test
- public void setPersons_nullList_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> uniquePersonList.setPersons((List<Person>) null));
- }
-
- @Test
- public void setPersons_list_replacesOwnListWithProvidedList() {
- uniquePersonList.add(ALICE);
- List<Person> personList = Collections.singletonList(BOB);
- uniquePersonList.setPersons(personList);
- UniquePersonList expectedUniquePersonList = new UniquePersonList();
- expectedUniquePersonList.add(BOB);
- assertEquals(expectedUniquePersonList, uniquePersonList);
- }
-
- @Test
- public void setPersons_listWithDuplicatePersons_throwsDuplicatePersonException() {
- List<Person> listWithDuplicatePersons = Arrays.asList(ALICE, ALICE);
- assertThrows(DuplicatePersonException.class, () -> uniquePersonList.setPersons(listWithDuplicatePersons));
- }
-
- @Test
- public void asUnmodifiableObservableList_modifyList_throwsUnsupportedOperationException() {
- assertThrows(UnsupportedOperationException.class, ()
- -> uniquePersonList.asUnmodifiableObservableList().remove(0));
- }
-}
diff --git a/src/test/java/seedu/address/model/schedule/EventRecurrenceTest.java b/src/test/java/seedu/address/model/schedule/EventRecurrenceTest.java
new file mode 100644
index 00000000000..6ae2e4c0d03
--- /dev/null
+++ b/src/test/java/seedu/address/model/schedule/EventRecurrenceTest.java
@@ -0,0 +1,42 @@
+package seedu.address.model.schedule;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.logic.parser.exceptions.ParseException;
+
+public class EventRecurrenceTest {
+
+ @Test
+ public void checkWhichRecurrence_validInput_success() throws Exception {
+ assertEquals(EventRecurrence.DAILY, EventRecurrence.checkWhichRecurrence("Daily"));
+ assertEquals(EventRecurrence.WEEKLY, EventRecurrence.checkWhichRecurrence("Weekly"));
+ assertEquals(EventRecurrence.NONE, EventRecurrence.checkWhichRecurrence("None"));
+ }
+
+ @Test
+ public void checkWhichRecurrence_invalidInput_throwsIllegalArgumentException() {
+ assertThrows(ParseException.class, () -> EventRecurrence.checkWhichRecurrence(""));
+ assertThrows(ParseException.class, () -> EventRecurrence.checkWhichRecurrence(" "));
+ assertThrows(ParseException.class, () -> EventRecurrence.checkWhichRecurrence("123"));
+ assertThrows(ParseException.class, () -> EventRecurrence.checkWhichRecurrence("hahahah"));
+ }
+
+ @Test
+ public void checkWhichRecurRule_validInput_success() throws Exception {
+ assertEquals(EventRecurrence.DAILY, EventRecurrence.checkWhichRecurRule("FREQ=DAILY;INTERVAL=1"));
+ assertEquals(EventRecurrence.WEEKLY, EventRecurrence.checkWhichRecurRule("FREQ=WEEKLY;INTERVAL=1"));
+ assertEquals(EventRecurrence.NONE, EventRecurrence.checkWhichRecurRule("FREQ=YEARLY;INTERVAL=1"));
+ }
+
+ @Test
+ public void checkWhichRecurRulee_invalidInput_throwsParseException() {
+ assertThrows(ParseException.class, () -> EventRecurrence.checkWhichRecurRule(" "));
+ assertThrows(ParseException.class, () -> EventRecurrence.checkWhichRecurRule(""));
+ assertThrows(ParseException.class, () -> EventRecurrence.checkWhichRecurRule("123"));
+ assertThrows(ParseException.class, () -> EventRecurrence.checkWhichRecurRule("hahahah"));
+ }
+
+}
diff --git a/src/test/java/seedu/address/model/schedule/EventTest.java b/src/test/java/seedu/address/model/schedule/EventTest.java
new file mode 100644
index 00000000000..fbd49fa7be6
--- /dev/null
+++ b/src/test/java/seedu/address/model/schedule/EventTest.java
@@ -0,0 +1,102 @@
+package seedu.address.model.schedule;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.TypicalEvents.ALICE_CLASS_EVENT;
+import static seedu.address.testutil.TypicalEvents.DATE_TIME_BEFORE_ALICE_CLASS_EVENT;
+import static seedu.address.testutil.TypicalEvents.TODO_EVENT;
+
+import java.time.LocalDateTime;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.testutil.EventBuilder;
+
+public class EventTest {
+ public static final String VALID_EVENT_NAME = "Valid event name";
+ public static final LocalDateTime VALID_EVENT_START_DATE_TIME = LocalDateTime.of(2020, 1, 27, 0, 0);
+ public static final LocalDateTime VALID_EVENT_END_DATE_TIME = LocalDateTime.of(2020, 1, 28, 0, 1);
+ public static final String VALID_UNIQUE_IDENTIFIER = "This is a valid identifier";
+ public static final EventRecurrence VALID_EVENT_RECURRENCE = EventRecurrence.DAILY;
+
+
+ @Test
+ public void constructor_nullEventName_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new Event(null,
+ VALID_EVENT_START_DATE_TIME, VALID_EVENT_END_DATE_TIME,
+ VALID_UNIQUE_IDENTIFIER, VALID_EVENT_RECURRENCE));
+ }
+
+ @Test
+ public void constructor_nullEventStartDateTime_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new Event(VALID_EVENT_NAME,
+ null, VALID_EVENT_END_DATE_TIME,
+ VALID_UNIQUE_IDENTIFIER, VALID_EVENT_RECURRENCE));
+ }
+
+ @Test
+ public void constructor_nullEventEndDateTime_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new Event(VALID_EVENT_NAME,
+ VALID_EVENT_START_DATE_TIME, null,
+ VALID_UNIQUE_IDENTIFIER, VALID_EVENT_RECURRENCE));
+ }
+
+ @Test
+ public void constructor_nullIdentifier_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new Event(VALID_EVENT_NAME,
+ VALID_EVENT_START_DATE_TIME, VALID_EVENT_END_DATE_TIME,
+ null, VALID_EVENT_RECURRENCE));
+ }
+
+ @Test
+ public void constructor_nullRecurrence_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new Event(VALID_EVENT_NAME,
+ VALID_EVENT_START_DATE_TIME, VALID_EVENT_END_DATE_TIME,
+ VALID_UNIQUE_IDENTIFIER, null));
+ }
+
+ @Test
+ public void equals() {
+ // same values -> returns true
+ Event aliceClassEventCopy = new EventBuilder(ALICE_CLASS_EVENT).build();
+ assertTrue(ALICE_CLASS_EVENT.equals(aliceClassEventCopy));
+
+ // same object -> returns true
+ assertTrue(ALICE_CLASS_EVENT.equals(ALICE_CLASS_EVENT));
+
+ // null -> returns false
+ assertFalse(ALICE_CLASS_EVENT.equals(null));
+
+ // different type -> returns false
+ assertFalse(ALICE_CLASS_EVENT.equals(5));
+
+ // different event -> returns false
+ assertFalse(ALICE_CLASS_EVENT.equals(TODO_EVENT));
+
+ // different event name -> returns false
+ Event editedAliceClassEvent = new EventBuilder(ALICE_CLASS_EVENT)
+ .withEventName(TODO_EVENT.getEventName()).build();
+ assertFalse(ALICE_CLASS_EVENT.equals(editedAliceClassEvent));
+
+ // different startTime -> returns false
+ editedAliceClassEvent = new EventBuilder(ALICE_CLASS_EVENT)
+ .withEventStartDateTime(DATE_TIME_BEFORE_ALICE_CLASS_EVENT).build();
+ assertFalse(ALICE_CLASS_EVENT.equals(editedAliceClassEvent));
+
+ // different endTime -> returns false
+ editedAliceClassEvent =
+ new EventBuilder(ALICE_CLASS_EVENT).withEventEndDateTime(DATE_TIME_BEFORE_ALICE_CLASS_EVENT).build();
+ assertFalse(ALICE_CLASS_EVENT.equals(editedAliceClassEvent));
+
+ // different recurrence -> return false
+ editedAliceClassEvent = new EventBuilder(ALICE_CLASS_EVENT)
+ .withRecurrence(TODO_EVENT.getRecurrence()).build();
+ assertFalse(ALICE_CLASS_EVENT.equals(editedAliceClassEvent));
+
+ // different uniqueIdentifier -> return false
+ editedAliceClassEvent = new EventBuilder(ALICE_CLASS_EVENT)
+ .withUniqueIdentifier(TODO_EVENT.getUniqueIdentifier()).build();
+ assertFalse(ALICE_CLASS_EVENT.equals(editedAliceClassEvent));
+ }
+}
diff --git a/src/test/java/seedu/address/model/schedule/LessonEventTest.java b/src/test/java/seedu/address/model/schedule/LessonEventTest.java
new file mode 100644
index 00000000000..c54a75f3113
--- /dev/null
+++ b/src/test/java/seedu/address/model/schedule/LessonEventTest.java
@@ -0,0 +1,51 @@
+package seedu.address.model.schedule;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.time.DayOfWeek;
+import java.time.LocalDateTime;
+
+import org.junit.jupiter.api.Test;
+
+public class LessonEventTest {
+
+ @Test
+ public void computeLessonStartDate_dateCreatedDayIsAfterDayOfLesson_returnsNextWeekDate() {
+ // this is a thursday
+ LocalDateTime dummyDateCreated = LocalDateTime.of(2020, 10, 29, 9, 0);
+ DayOfWeek dayOfClass = DayOfWeek.WEDNESDAY;
+
+ LocalDateTime expected = dummyDateCreated.plusWeeks(1).minusDays(1); // lesson start next wednesday
+
+ LocalDateTime result = LessonEvent.computeLessonStartDate(dummyDateCreated,
+ dayOfClass);
+
+ assertEquals(expected, result);
+
+ }
+
+ @Test
+ public void computeLessonStartDate_dateCreatedDayIsBeforeDayOfLesson_returnsThisWeekDate() {
+ // this is a thursday
+ LocalDateTime dummyDateCreated = LocalDateTime.of(2020, 10, 29, 9, 0);
+
+ // lesson will start on same week
+ LocalDateTime expected = dummyDateCreated.plusDays(1);
+
+ assertEquals(expected, LessonEvent.computeLessonStartDate(dummyDateCreated, DayOfWeek.FRIDAY));
+ }
+
+ @Test
+ public void computeLessonStartDate_nullDate_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () ->
+ LessonEvent.computeLessonStartDate(null, DayOfWeek.THURSDAY));
+ }
+
+ @Test
+ public void computeLessonStartDate_nullDayOfWeek_throwsNullPointerException() {
+ LocalDateTime dummyDateCreated = LocalDateTime.of(2020, 10, 29, 9, 0);
+ assertThrows(NullPointerException.class, () ->
+ LessonEvent.computeLessonStartDate(dummyDateCreated, null));
+ }
+}
diff --git a/src/test/java/seedu/address/model/schedule/MapperTest.java b/src/test/java/seedu/address/model/schedule/MapperTest.java
new file mode 100644
index 00000000000..8f5e248de54
--- /dev/null
+++ b/src/test/java/seedu/address/model/schedule/MapperTest.java
@@ -0,0 +1,42 @@
+package seedu.address.model.schedule;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static seedu.address.testutil.TypicalEvents.ALICE_CLASS_EVENT;
+
+import org.junit.jupiter.api.Test;
+
+import jfxtras.icalendarfx.components.VEvent;
+
+public class MapperTest {
+
+ @Test
+ public void mapEventToVEvent_validEvent_returnsVEvent() {
+ Event event = (ALICE_CLASS_EVENT);
+ VEvent expectedVEvent = new VEvent();
+ expectedVEvent.withSummary(ALICE_CLASS_EVENT.getEventName())
+ .withDateTimeStart(ALICE_CLASS_EVENT.getEventStartDateTime())
+ .withDateTimeEnd(ALICE_CLASS_EVENT.getEventEndDateTime())
+ .withUniqueIdentifier(ALICE_CLASS_EVENT.getUniqueIdentifier())
+ .withRecurrenceRule(ALICE_CLASS_EVENT.getRecurrence().getVEventRecurRule());
+
+ VEvent mappedVEvent = Mapper.mapEventToVEvent(event);
+ assertEquals(expectedVEvent, mappedVEvent);
+ }
+
+ @Test
+ public void mapVEventToEvent_validVEvent_returnEvent() {
+ VEvent vEvent = new VEvent();
+ vEvent.withSummary(ALICE_CLASS_EVENT.getEventName())
+ .withDateTimeStart(ALICE_CLASS_EVENT.getEventStartDateTime())
+ .withDateTimeEnd(ALICE_CLASS_EVENT.getEventEndDateTime())
+ .withUniqueIdentifier(ALICE_CLASS_EVENT.getUniqueIdentifier())
+ .withRecurrenceRule(ALICE_CLASS_EVENT.getRecurrence().getVEventRecurRule());
+
+ Event expectedEvent = ALICE_CLASS_EVENT;
+
+ Event mappedEvent = Mapper.mapVEventToEvent(vEvent);
+ assertEquals(expectedEvent, mappedEvent);
+
+ }
+
+}
diff --git a/src/test/java/seedu/address/model/schedule/SchedulePrefsTest.java b/src/test/java/seedu/address/model/schedule/SchedulePrefsTest.java
new file mode 100644
index 00000000000..5e3f3ba9c23
--- /dev/null
+++ b/src/test/java/seedu/address/model/schedule/SchedulePrefsTest.java
@@ -0,0 +1,49 @@
+package seedu.address.model.schedule;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import java.time.LocalDate;
+
+import org.junit.jupiter.api.Test;
+
+public class SchedulePrefsTest {
+
+ private LocalDate date = LocalDate.of(2020, 10, 29);
+ private SchedulePrefs schedulePrefs = new SchedulePrefs(ScheduleViewMode.WEEKLY, date);
+ @Test
+ public void setViewMode_nullViewMode_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> schedulePrefs.setViewMode(null));
+ }
+
+ @Test
+ public void setViewMode_nullPath_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> schedulePrefs.setViewDate(null));
+ }
+
+ @Test
+ public void equals() {
+ SchedulePrefs otherSchedulePrefs = new SchedulePrefs(ScheduleViewMode.WEEKLY, date);
+
+ // same object returns true
+ assertTrue(schedulePrefs.equals(schedulePrefs));
+
+ // same ScheduleViewMode and Date return true
+ assertTrue(otherSchedulePrefs.equals(schedulePrefs));
+
+ // null returns false
+ assertFalse(schedulePrefs.equals(null));
+
+ // same ScheduleViewMode different Date return false
+ LocalDate diffDate = LocalDate.of(2020, 10, 20);
+ SchedulePrefs diffDateSchedulePrefs = new SchedulePrefs(ScheduleViewMode.WEEKLY, diffDate);
+ assertFalse(schedulePrefs.equals(diffDateSchedulePrefs));
+
+ // same Date different ScheduleViewMode return false
+ SchedulePrefs diffViewModePrefs = new SchedulePrefs(ScheduleViewMode.DAILY, date);
+ assertFalse(schedulePrefs.equals(diffViewModePrefs));
+ }
+
+
+}
diff --git a/src/test/java/seedu/address/model/schedule/SchedulerTest.java b/src/test/java/seedu/address/model/schedule/SchedulerTest.java
new file mode 100644
index 00000000000..d05173390da
--- /dev/null
+++ b/src/test/java/seedu/address/model/schedule/SchedulerTest.java
@@ -0,0 +1,121 @@
+package seedu.address.model.schedule;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.TypicalEvents.ALICE_CLASS_EVENT;
+import static seedu.address.testutil.TypicalEvents.getTypicalEvents;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import jfxtras.icalendarfx.components.VEvent;
+
+public class SchedulerTest {
+ private final Scheduler scheduler = new Scheduler();
+
+ @Test
+ public void constructor() {
+ assertEquals(Collections.emptyList(), scheduler.getEventsList());
+ assertEquals(Collections.emptyList(), scheduler.getVEvents());
+ }
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new Scheduler(null));
+ }
+
+ @Test
+ public void setVEvents_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> scheduler.setVEvents(null));
+ }
+
+ @Test
+ public void setVEvents_validArguments_success() {
+ List<VEvent> validVEventList = new ArrayList<>();
+ validVEventList.add(new VEvent());
+ scheduler.setVEvents(validVEventList);
+ assertEquals(scheduler.getVEvents(), validVEventList);
+ }
+
+ @Test
+ public void resetData_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> scheduler.resetData(null));
+ }
+
+ @Test
+ public void resetData_withValidEventList_replacesData() {
+ List<Event> eventList = new ArrayList<>(getTypicalEvents());
+ scheduler.resetData(eventList);
+ assertEquals(eventList, scheduler.getEventsList());
+ }
+
+ @Test
+ public void addEvent_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> scheduler.addEvent(null));
+ }
+
+ @Test
+ public void addEvent_validEvent_success() {
+ List<Event> validEventList = Arrays.asList(ALICE_CLASS_EVENT);
+ scheduler.addEvent(ALICE_CLASS_EVENT);
+ assertEquals(scheduler.getEventsList(), validEventList);
+ }
+
+ @Test
+ public void addListOfEvents_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> scheduler.addListOfEvents(null));
+ }
+
+ @Test
+ public void addListOfEvents_validEventList_success() {
+ scheduler.addListOfEvents(getTypicalEvents());
+ assertEquals(getTypicalEvents(), scheduler.getEventsList());
+ }
+
+ @Test
+ public void getVEvents_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, () -> scheduler.getVEvents().remove(0));
+ }
+
+ @Test
+ public void add_nullEvent_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> scheduler.addEvent(null));
+ }
+
+ @Test
+ public void equals() {
+ Scheduler otherScheduler = new Scheduler();
+
+ // same object return true
+ assertTrue(scheduler.equals(scheduler));
+
+ // same internal List return true
+ scheduler.addListOfEvents(getTypicalEvents());
+ otherScheduler.addListOfEvents(getTypicalEvents());
+ assertTrue(scheduler.equals(otherScheduler));
+
+ // null return false
+ assertFalse(scheduler.equals(null));
+
+ // different types return false
+ assertFalse(scheduler.equals(1));
+
+ // different event list return false
+ otherScheduler.addListOfEvents(Arrays.asList(ALICE_CLASS_EVENT));
+ scheduler.addListOfEvents(getTypicalEvents());
+ assertFalse(scheduler.equals(otherScheduler));
+
+ }
+
+ @Test
+ public void mapClassTimeToLessonEvent_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> scheduler.mapClassTimesToLessonEvent(null));
+ }
+
+}
diff --git a/src/test/java/seedu/address/model/schedule/UniqueIdentifierGeneratorTest.java b/src/test/java/seedu/address/model/schedule/UniqueIdentifierGeneratorTest.java
new file mode 100644
index 00000000000..b3c56d97470
--- /dev/null
+++ b/src/test/java/seedu/address/model/schedule/UniqueIdentifierGeneratorTest.java
@@ -0,0 +1,33 @@
+package seedu.address.model.schedule;
+
+import static seedu.address.testutil.Assert.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+public class UniqueIdentifierGeneratorTest {
+ private static final String DEFAULT_EVENT_NAME = "eevnt name";
+ private static final String DEFAULT_EVENT_START = "2020-12-03T10:15:30";
+ private static final String DEFAULT_EVENT_END = "2020-12-03T10:17:30";
+
+ @Test
+ public void generateUid_nullEventName_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () ->
+ UniqueIdentifierGenerator.generateUid(null, DEFAULT_EVENT_START,
+ DEFAULT_EVENT_END));
+ }
+
+ @Test
+ public void generateUid_nullEventStart_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () ->
+ UniqueIdentifierGenerator.generateUid(DEFAULT_EVENT_NAME, null,
+ DEFAULT_EVENT_END));
+ }
+
+ @Test
+ public void generateUid_nullEventEnd_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () ->
+ UniqueIdentifierGenerator.generateUid(DEFAULT_EVENT_NAME, DEFAULT_EVENT_START,
+ null));
+ }
+
+}
diff --git a/src/test/java/seedu/address/model/student/NameComparatorTest.java b/src/test/java/seedu/address/model/student/NameComparatorTest.java
new file mode 100644
index 00000000000..ffb41013019
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/NameComparatorTest.java
@@ -0,0 +1,49 @@
+package seedu.address.model.student;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.testutil.StudentBuilder;
+
+public class NameComparatorTest {
+
+ private NameComparator cmp = new NameComparator();
+
+ private Student eve = new StudentBuilder().withName("Eve").withSchool("Bishan Primary School")
+ .withYear("P3").build();
+ private Student alice = new StudentBuilder().withName("Alice").withSchool("SST")
+ .withYear("Sec 1").build();
+ private Student aloysius = new StudentBuilder().withName("aloysius").withSchool("SST")
+ .withYear("Sec 1").build();
+ private Student dominic = new StudentBuilder().withName("dominic").withSchool("SOTA")
+ .withYear("Sec 1").build();
+ private Student pikachu = new StudentBuilder().withName("pikachu").withSchool("Trainers School")
+ .withYear("Sec 3").build();
+ private Student bob = new StudentBuilder().withName("Bob").withSchool("Innova JC")
+ .withYear("JC 1").build();
+
+ @Test
+ public void test_smallerThan_lesThanZero() {
+ assertTrue(cmp.compare(alice, dominic) < 0);
+ assertTrue(cmp.compare(alice, pikachu) < 0);
+ assertTrue(cmp.compare(alice, bob) < 0);
+ assertTrue(cmp.compare(alice, aloysius) < 0);
+ assertTrue(cmp.compare(aloysius, eve) < 0);
+ assertTrue(cmp.compare(bob, pikachu) < 0);
+ assertTrue(cmp.compare(eve, pikachu) < 0);
+ }
+
+ @Test
+ public void test_sameStudent_returnsZero() {
+ assertEquals(0, cmp.compare(eve, eve));
+ }
+
+ @Test
+ public void test_largerThan_greaterThanZero() {
+ assertTrue(cmp.compare(dominic, aloysius) > 0);
+ assertTrue(cmp.compare(bob, aloysius) > 0);
+ assertTrue(cmp.compare(eve, bob) > 0);
+ }
+}
diff --git a/src/test/java/seedu/address/model/person/NameContainsKeywordsPredicateTest.java b/src/test/java/seedu/address/model/student/NameContainsKeywordsPredicateTest.java
similarity index 72%
rename from src/test/java/seedu/address/model/person/NameContainsKeywordsPredicateTest.java
rename to src/test/java/seedu/address/model/student/NameContainsKeywordsPredicateTest.java
index f136664e017..5493bf3b8a0 100644
--- a/src/test/java/seedu/address/model/person/NameContainsKeywordsPredicateTest.java
+++ b/src/test/java/seedu/address/model/student/NameContainsKeywordsPredicateTest.java
@@ -1,4 +1,4 @@
-package seedu.address.model.person;
+package seedu.address.model.student;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -9,7 +9,7 @@
import org.junit.jupiter.api.Test;
-import seedu.address.testutil.PersonBuilder;
+import seedu.address.testutil.StudentBuilder;
public class NameContainsKeywordsPredicateTest {
@@ -42,34 +42,38 @@ public void equals() {
public void test_nameContainsKeywords_returnsTrue() {
// One keyword
NameContainsKeywordsPredicate predicate = new NameContainsKeywordsPredicate(Collections.singletonList("Alice"));
- assertTrue(predicate.test(new PersonBuilder().withName("Alice Bob").build()));
+ assertTrue(predicate.test(new StudentBuilder().withName("Alice Bob").build()));
// Multiple keywords
predicate = new NameContainsKeywordsPredicate(Arrays.asList("Alice", "Bob"));
- assertTrue(predicate.test(new PersonBuilder().withName("Alice Bob").build()));
+ assertTrue(predicate.test(new StudentBuilder().withName("Alice Bob").build()));
// Only one matching keyword
predicate = new NameContainsKeywordsPredicate(Arrays.asList("Bob", "Carol"));
- assertTrue(predicate.test(new PersonBuilder().withName("Alice Carol").build()));
+ assertTrue(predicate.test(new StudentBuilder().withName("Alice Carol").build()));
// Mixed-case keywords
predicate = new NameContainsKeywordsPredicate(Arrays.asList("aLIce", "bOB"));
- assertTrue(predicate.test(new PersonBuilder().withName("Alice Bob").build()));
+ assertTrue(predicate.test(new StudentBuilder().withName("Alice Bob").build()));
}
@Test
public void test_nameDoesNotContainKeywords_returnsFalse() {
// Zero keywords
NameContainsKeywordsPredicate predicate = new NameContainsKeywordsPredicate(Collections.emptyList());
- assertFalse(predicate.test(new PersonBuilder().withName("Alice").build()));
+ assertFalse(predicate.test(new StudentBuilder().withName("Alice").build()));
// Non-matching keyword
- predicate = new NameContainsKeywordsPredicate(Arrays.asList("Carol"));
- assertFalse(predicate.test(new PersonBuilder().withName("Alice Bob").build()));
+ predicate = new NameContainsKeywordsPredicate(Collections.singletonList("Carol"));
+ assertFalse(predicate.test(new StudentBuilder().withName("Alice Bob").build()));
// Keywords match phone, email and address, but does not match name
predicate = new NameContainsKeywordsPredicate(Arrays.asList("12345", "alice@email.com", "Main", "Street"));
- assertFalse(predicate.test(new PersonBuilder().withName("Alice").withPhone("12345")
- .withEmail("alice@email.com").withAddress("Main Street").build()));
+ assertFalse(predicate.test(new StudentBuilder().withName("Alice").withPhone("12345")
+ .build()));
+
+ // User guide test cases
+ predicate = new NameContainsKeywordsPredicate(Arrays.asList("Alex", "david"));
+ assertFalse(predicate.test(new StudentBuilder().withName("Alexis davinder").build()));
}
}
diff --git a/src/test/java/seedu/address/model/person/NameTest.java b/src/test/java/seedu/address/model/student/NameTest.java
similarity index 97%
rename from src/test/java/seedu/address/model/person/NameTest.java
rename to src/test/java/seedu/address/model/student/NameTest.java
index c9801392874..3a8a247b89f 100644
--- a/src/test/java/seedu/address/model/person/NameTest.java
+++ b/src/test/java/seedu/address/model/student/NameTest.java
@@ -1,4 +1,4 @@
-package seedu.address.model.person;
+package seedu.address.model.student;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/src/test/java/seedu/address/model/person/PhoneTest.java b/src/test/java/seedu/address/model/student/PhoneTest.java
similarity index 97%
rename from src/test/java/seedu/address/model/person/PhoneTest.java
rename to src/test/java/seedu/address/model/student/PhoneTest.java
index 8dd52766a5f..66b87c3fd01 100644
--- a/src/test/java/seedu/address/model/person/PhoneTest.java
+++ b/src/test/java/seedu/address/model/student/PhoneTest.java
@@ -1,4 +1,4 @@
-package seedu.address.model.person;
+package seedu.address.model.student;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/src/test/java/seedu/address/model/student/SchoolContainsKeywordsPredicateTest.java b/src/test/java/seedu/address/model/student/SchoolContainsKeywordsPredicateTest.java
new file mode 100644
index 00000000000..93b9f54dc8a
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/SchoolContainsKeywordsPredicateTest.java
@@ -0,0 +1,90 @@
+package seedu.address.model.student;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.testutil.StudentBuilder;
+
+public class SchoolContainsKeywordsPredicateTest {
+
+ @Test
+ public void equals() {
+ List<String> firstPredicateKeywordList = Collections.singletonList("Changi");
+ List<String> secondPredicateKeywordList = Arrays.asList("Kent", "Ridge");
+
+ SchoolContainsKeywordsPredicate firstPredicate =
+ new SchoolContainsKeywordsPredicate(firstPredicateKeywordList);
+ SchoolContainsKeywordsPredicate secondPredicate =
+ new SchoolContainsKeywordsPredicate(secondPredicateKeywordList);
+
+ // same object -> returns true
+ assertTrue(firstPredicate.equals(firstPredicate));
+
+ // same values -> returns true
+ SchoolContainsKeywordsPredicate firstPredicateCopy =
+ new SchoolContainsKeywordsPredicate(firstPredicateKeywordList);
+ assertTrue(firstPredicate.equals(firstPredicateCopy));
+
+ // different types -> returns false
+ assertFalse(firstPredicate.equals(1));
+
+ // null -> returns false
+ assertFalse(firstPredicate.equals(null));
+
+ // different person -> returns false
+ assertFalse(firstPredicate.equals(secondPredicate));
+ }
+
+ @Test
+ public void test_schoolContainsAllKeywords_returnsTrue() {
+ // One keyword different case
+ SchoolContainsKeywordsPredicate predicate =
+ new SchoolContainsKeywordsPredicate(Collections.singletonList("Changi"));
+ assertTrue(predicate.test(new StudentBuilder().withSchool("changi").build()));
+
+ // Multiple keywords same case
+ predicate = new SchoolContainsKeywordsPredicate(Arrays.asList("Kent", "Ridge"));
+ assertTrue(predicate.test(new StudentBuilder().withSchool("Kent Ridge").build()));
+
+ // Mixed-case keywords
+ predicate = new SchoolContainsKeywordsPredicate(Arrays.asList("KeNt", "RiDGE"));
+ assertTrue(predicate.test(new StudentBuilder().withSchool("kent ridge").build()));
+
+ // User guide test cases
+ predicate = new SchoolContainsKeywordsPredicate(Arrays.asList("yishun", "sec"));
+ assertTrue(predicate.test(new StudentBuilder().withSchool("Yishun Secondary School").build()));
+ assertTrue(predicate.test(new StudentBuilder().withSchool("Yishun Town Secondary School").build()));
+
+ }
+
+ @Test
+ public void test_schoolDoesNotContainAllKeywords_returnsFalse() {
+ // Zero keywords
+ SchoolContainsKeywordsPredicate predicate = new SchoolContainsKeywordsPredicate(Collections.emptyList());
+ assertFalse(predicate.test(new StudentBuilder().withSchool("Changi").build()));
+
+ // Non-matching keyword
+ predicate = new SchoolContainsKeywordsPredicate(Arrays.asList("Science"));
+ assertFalse(predicate.test(new StudentBuilder().withSchool("School of Computing").build()));
+
+ // One keyword matching one not matching
+ predicate = new SchoolContainsKeywordsPredicate(Arrays.asList("Kent", "Ridge"));
+ assertFalse(predicate.test(new StudentBuilder().withSchool("Kent Vale").build()));
+
+ // Keywords match phone, email and address, but does not match school
+ predicate = new SchoolContainsKeywordsPredicate(Arrays.asList("12345", "alice@email.com", "Main", "Street"));
+ assertFalse(predicate.test(new StudentBuilder().withName("Alice").withPhone("12345")
+ .build()));
+
+ // User guide test cases
+ predicate = new SchoolContainsKeywordsPredicate(Arrays.asList("yishun", "secondary"));
+ assertFalse(predicate.test(new StudentBuilder().withSchool("Yishun sec").build()));
+
+ }
+}
diff --git a/src/test/java/seedu/address/model/student/SchoolTest.java b/src/test/java/seedu/address/model/student/SchoolTest.java
new file mode 100644
index 00000000000..ea2ba71be60
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/SchoolTest.java
@@ -0,0 +1,40 @@
+package seedu.address.model.student;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+public class SchoolTest {
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new School(null));
+ }
+
+ @Test
+ public void constructor_invalidSchool_throwsIllegalArgumentException() {
+ String invalidSchool = "";
+ assertThrows(IllegalArgumentException.class, () -> new School(invalidSchool));
+ }
+
+ @Test
+ public void isValidSchool() {
+ // null school
+ assertThrows(NullPointerException.class, () -> School.isValidSchool(null));
+
+ // invalid school names
+ assertFalse(School.isValidSchool("")); // empty string
+ assertFalse(School.isValidSchool(" ")); // spaces only
+
+ // valid school name
+ assertTrue(School.isValidSchool("a")); //1 small letter
+ assertTrue(School.isValidSchool("A")); // 1 capital letter
+
+ assertTrue(School.isValidSchool("NUS High School")); // strings with spacing
+ assertTrue(School.isValidSchool("abc")); // no spacing
+ assertTrue(School.isValidSchool("abcAbcqweretrytyuiuiopsadfghjkxzcvbnm")); //long word
+
+ }
+}
diff --git a/src/test/java/seedu/address/model/student/SchoolTypeTest.java b/src/test/java/seedu/address/model/student/SchoolTypeTest.java
new file mode 100644
index 00000000000..d626b42f0dc
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/SchoolTypeTest.java
@@ -0,0 +1,34 @@
+package seedu.address.model.student;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+public class SchoolTypeTest {
+
+ @Test
+ public void toString_returnsCorrectString() {
+ assertEquals("Primary", SchoolType.PRIMARY.toString());
+ assertEquals("Secondary", SchoolType.SECONDARY.toString());
+ assertEquals("JC", SchoolType.JC.toString());
+ }
+
+ @Test
+ public void isValidSchoolType_validSchoolType_returnsTrue() {
+ assertTrue(SchoolType.isValidSchoolType("pri"));
+ assertTrue(SchoolType.isValidSchoolType("primary"));
+ assertTrue(SchoolType.isValidSchoolType("Primary"));
+ assertTrue(SchoolType.isValidSchoolType("p"));
+ assertTrue(SchoolType.isValidSchoolType("sec"));
+ assertTrue(SchoolType.isValidSchoolType("JC"));
+ }
+
+ @Test
+ public void isValidSchoolType_invalidSchoolType_returnsFalse() {
+ assertFalse(SchoolType.isValidSchoolType("ns"));
+ assertFalse(SchoolType.isValidSchoolType("n"));
+ assertFalse(SchoolType.isValidSchoolType("yramirp"));
+ }
+}
diff --git a/src/test/java/seedu/address/model/student/StudentTest.java b/src/test/java/seedu/address/model/student/StudentTest.java
new file mode 100644
index 00000000000..5a31274bdc1
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/StudentTest.java
@@ -0,0 +1,182 @@
+package seedu.address.model.student;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.logic.commands.CommandTestUtil.ATTENDANCE_DATE_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.ATTENDANCE_DATE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_ATTENDANCE_FEEDBACK_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_SCHOOL_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_YEAR_BOB;
+import static seedu.address.testutil.StudentBuilder.DEFAULT_QUESTION_MATH;
+import static seedu.address.testutil.StudentBuilder.DEFAULT_SOLUTION;
+import static seedu.address.testutil.TypicalStudents.ALICE;
+import static seedu.address.testutil.TypicalStudents.BOB;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.model.student.academic.Attendance;
+import seedu.address.model.student.academic.Feedback;
+import seedu.address.model.student.academic.question.SolvedQuestion;
+import seedu.address.model.student.academic.question.UnsolvedQuestion;
+import seedu.address.testutil.StudentBuilder;
+
+public class StudentTest {
+
+ @Test
+ public void isSamePerson() {
+ // same object -> returns true
+ assertTrue(ALICE.isSameStudent(ALICE));
+
+ // null -> returns false
+ assertFalse(ALICE.isSameStudent(null));
+
+ // different phone and school and year -> returns false
+ Student editedAlice = new StudentBuilder(ALICE).withPhone(VALID_PHONE_BOB).withSchool(VALID_SCHOOL_BOB)
+ .withYear(VALID_YEAR_BOB).build();
+ assertFalse(ALICE.isSameStudent(editedAlice));
+
+ // different name -> returns false
+ editedAlice = new StudentBuilder(ALICE).withName(VALID_NAME_BOB).build();
+ assertFalse(ALICE.isSameStudent(editedAlice));
+
+ // same name, same phone, different attributes -> returns false
+ editedAlice = new StudentBuilder(ALICE).withSchool(VALID_SCHOOL_BOB)
+ .withYear(VALID_YEAR_BOB).build();
+ assertFalse(ALICE.isSameStudent(editedAlice));
+
+ // same name, same school, different attributes -> returns true
+ editedAlice = new StudentBuilder(ALICE).withPhone(VALID_PHONE_BOB)
+ .withYear(VALID_YEAR_BOB).build();
+ assertFalse(ALICE.isSameStudent(editedAlice));
+
+ // same name, same year, different attributes -> returns true
+ editedAlice = new StudentBuilder(ALICE).withPhone(VALID_PHONE_BOB).withSchool(VALID_SCHOOL_BOB)
+ .build();
+ assertFalse(ALICE.isSameStudent(editedAlice));
+
+ // same name, same phone, same school, different year -> returns true
+ editedAlice = new StudentBuilder(ALICE).withYear(VALID_YEAR_BOB).build();
+ assertFalse(ALICE.isSameStudent(editedAlice));
+ }
+
+ @Test
+ public void equals() {
+ // same values -> returns true
+ Student aliceCopy = new StudentBuilder(ALICE).build();
+ assertTrue(ALICE.equals(aliceCopy));
+
+ // same object -> returns true
+ assertTrue(ALICE.equals(ALICE));
+
+ // null -> returns false
+ assertFalse(ALICE.equals(null));
+
+ // different type -> returns false
+ assertFalse(ALICE.equals(5));
+
+ // different person -> returns false
+ assertFalse(ALICE.equals(BOB));
+
+ // different name -> returns false
+ Student editedAlice = new StudentBuilder(ALICE).withName(VALID_NAME_BOB).build();
+ assertFalse(ALICE.equals(editedAlice));
+
+ // different phone -> returns false
+ editedAlice = new StudentBuilder(ALICE).withPhone(VALID_PHONE_BOB).build();
+ assertFalse(ALICE.equals(editedAlice));
+
+ // different school -> returns false
+ editedAlice = new StudentBuilder(ALICE).withSchool(VALID_SCHOOL_BOB).build();
+ assertFalse(ALICE.equals(editedAlice));
+
+ // different year -> returns false
+ editedAlice = new StudentBuilder(ALICE).withYear(VALID_YEAR_BOB).build();
+ assertFalse(ALICE.equals(editedAlice));
+
+ }
+
+ @Test
+ public void containsQuestion() {
+ String test1 = "What is 1+1?";
+ String test2 = "How do you do grammar?";
+ String test3 = "Do giraffes fart?";
+ String[] questions = new String[] {test1, test2};
+ Student editedAlice = new StudentBuilder(ALICE).withQuestions(questions).build();
+
+ assertTrue(editedAlice.containsQuestion(new UnsolvedQuestion(test1)));
+ assertTrue(editedAlice.containsQuestion(new UnsolvedQuestion(test2)));
+ assertTrue(editedAlice.containsQuestion(new SolvedQuestion(test1, DEFAULT_SOLUTION)));
+ assertTrue(editedAlice.containsQuestion(new SolvedQuestion(test2, DEFAULT_SOLUTION)));
+
+ assertFalse(editedAlice.containsQuestion(new UnsolvedQuestion(test3)));
+ }
+
+ @Test
+ public void addQuestion() {
+ Student editedAlice = new StudentBuilder(ALICE).withQuestions().build();
+ Student newAlice = editedAlice.addQuestion(new UnsolvedQuestion(DEFAULT_QUESTION_MATH));
+ Student expected = new StudentBuilder(ALICE).withQuestions(DEFAULT_QUESTION_MATH).build();
+ assertNotEquals(editedAlice, newAlice);
+ assertEquals(expected, newAlice);
+ }
+
+ @Test
+ public void setQuestion() {
+ Student editedAlice = new StudentBuilder(ALICE).withQuestions(DEFAULT_QUESTION_MATH).build();
+ Student newAlice = editedAlice.setQuestion(new UnsolvedQuestion(DEFAULT_QUESTION_MATH),
+ new SolvedQuestion(DEFAULT_QUESTION_MATH, DEFAULT_SOLUTION));
+ Student expected = new StudentBuilder(ALICE).withSolved(DEFAULT_SOLUTION, DEFAULT_QUESTION_MATH).build();
+ assertNotEquals(editedAlice, newAlice);
+ assertEquals(expected, newAlice);
+ }
+
+ @Test
+ public void deleteQuestion() {
+ Student editedAlice = new StudentBuilder(ALICE).withQuestions(DEFAULT_QUESTION_MATH).build();
+ Student newAlice = editedAlice.deleteQuestion(new UnsolvedQuestion(DEFAULT_QUESTION_MATH));
+ Student expected = new StudentBuilder(ALICE).withQuestions().build();
+ assertNotEquals(editedAlice, newAlice);
+ assertEquals(expected, newAlice);
+
+ editedAlice = new StudentBuilder(ALICE).withSolved(DEFAULT_SOLUTION, DEFAULT_QUESTION_MATH).build();
+ newAlice = editedAlice.deleteQuestion(new SolvedQuestion(DEFAULT_QUESTION_MATH, DEFAULT_SOLUTION));
+ assertNotEquals(editedAlice, newAlice);
+ assertEquals(expected, newAlice);
+ }
+
+ @Test
+ public void containsAttendance() {
+ Feedback amyFeedback = new Feedback(VALID_ATTENDANCE_FEEDBACK_AMY);
+ Attendance standard = new Attendance(ATTENDANCE_DATE_AMY, true, amyFeedback);
+ Student aliceAcademic = new StudentBuilder(ALICE).withAttendances(standard).build();
+ assertTrue(aliceAcademic.containsAttendance(standard));
+
+ Attendance test = new Attendance(ATTENDANCE_DATE_AMY, false, amyFeedback);
+ assertTrue(aliceAcademic.containsAttendance(test));
+
+ test = new Attendance(ATTENDANCE_DATE_AMY, true);
+ assertTrue(aliceAcademic.containsAttendance(test));
+
+ test = new Attendance(ATTENDANCE_DATE_BOB, true, amyFeedback);
+ assertFalse(aliceAcademic.containsAttendance(test));
+ }
+
+ @Test
+ public void hasClashingClassTimeWith() {
+ // same class time
+ assertTrue(ALICE.hasClashingClassTimeWith(ALICE));
+
+ // clashes
+ Student test = new StudentBuilder(ALICE).withClassTime("5 1530-1800").build();
+ assertTrue(ALICE.hasClashingClassTimeWith(test));
+
+ // does not clash
+ test = new StudentBuilder(ALICE).withClassTime("3 1400-1500").build();
+ assertFalse(ALICE.hasClashingClassTimeWith(test));
+ }
+
+}
diff --git a/src/test/java/seedu/address/model/student/UniqueStudentListTest.java b/src/test/java/seedu/address/model/student/UniqueStudentListTest.java
new file mode 100644
index 00000000000..514829cfdab
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/UniqueStudentListTest.java
@@ -0,0 +1,188 @@
+package seedu.address.model.student;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_SCHOOL_BOB;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.TypicalStudents.ALICE;
+import static seedu.address.testutil.TypicalStudents.BOB;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.model.student.exceptions.DuplicateStudentException;
+import seedu.address.model.student.exceptions.StudentNotFoundException;
+import seedu.address.testutil.StudentBuilder;
+
+public class UniqueStudentListTest {
+
+
+ private final UniqueStudentList uniqueStudentList = new UniqueStudentList();
+
+ @Test
+ public void contains_nullPerson_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> uniqueStudentList.contains(null));
+ }
+
+ @Test
+ public void contains_personNotInList_returnsFalse() {
+ assertFalse(uniqueStudentList.contains(ALICE));
+ }
+
+ @Test
+ public void contains_personInList_returnsTrue() {
+ uniqueStudentList.add(ALICE);
+ assertTrue(uniqueStudentList.contains(ALICE));
+ }
+
+ @Test
+ public void contains_personWithSameIdentityFieldsInList_returnsTrue() {
+ uniqueStudentList.add(ALICE);
+ Student editedAlice = new StudentBuilder(ALICE)
+ .build();
+ assertTrue(uniqueStudentList.contains(editedAlice));
+ }
+
+ @Test
+ public void add_nullPerson_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> uniqueStudentList.add(null));
+ }
+
+ @Test
+ public void add_duplicatePerson_throwsDuplicatePersonException() {
+ uniqueStudentList.add(ALICE);
+ assertThrows(DuplicateStudentException.class, () -> uniqueStudentList.add(ALICE));
+ }
+
+ @Test
+ public void setPerson_nullTargetPerson_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> uniqueStudentList.setStudent(null, ALICE));
+ }
+
+ @Test
+ public void setPerson_nullEditedPerson_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> uniqueStudentList.setStudent(ALICE, null));
+ }
+
+ @Test
+ public void setPerson_targetPersonNotInList_throwsPersonNotFoundException() {
+ assertThrows(StudentNotFoundException.class, () -> uniqueStudentList.setStudent(ALICE, ALICE));
+ }
+
+ @Test
+ public void setPerson_editedPersonIsSamePerson_success() {
+ uniqueStudentList.add(ALICE);
+ uniqueStudentList.setStudent(ALICE, ALICE);
+ UniqueStudentList expectedUniqueStudentList = new UniqueStudentList();
+ expectedUniqueStudentList.add(ALICE);
+ assertEquals(expectedUniqueStudentList, uniqueStudentList);
+ }
+
+ @Test
+ public void setPerson_editedPersonHasSameIdentity_success() {
+ uniqueStudentList.add(ALICE);
+ Student editedAlice = new StudentBuilder(ALICE).withSchool(VALID_SCHOOL_BOB)
+ .build();
+ uniqueStudentList.setStudent(ALICE, editedAlice);
+ UniqueStudentList expectedUniqueStudentList = new UniqueStudentList();
+ expectedUniqueStudentList.add(editedAlice);
+ assertEquals(expectedUniqueStudentList, uniqueStudentList);
+ }
+
+ @Test
+ public void setPerson_editedPersonHasDifferentIdentity_success() {
+ uniqueStudentList.add(ALICE);
+ uniqueStudentList.setStudent(ALICE, BOB);
+ UniqueStudentList expectedUniqueStudentList = new UniqueStudentList();
+ expectedUniqueStudentList.add(BOB);
+ assertEquals(expectedUniqueStudentList, uniqueStudentList);
+ }
+
+ @Test
+ public void setPerson_editedPersonHasNonUniqueIdentity_throwsDuplicatePersonException() {
+ uniqueStudentList.add(ALICE);
+ uniqueStudentList.add(BOB);
+ assertThrows(DuplicateStudentException.class, () -> uniqueStudentList.setStudent(ALICE, BOB));
+ }
+
+ @Test
+ public void remove_nullPerson_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> uniqueStudentList.remove(null));
+ }
+
+ @Test
+ public void remove_personDoesNotExist_throwsPersonNotFoundException() {
+ assertThrows(StudentNotFoundException.class, () -> uniqueStudentList.remove(ALICE));
+ }
+
+ @Test
+ public void remove_existingPerson_removesPerson() {
+ uniqueStudentList.add(ALICE);
+ uniqueStudentList.remove(ALICE);
+ UniqueStudentList expectedUniqueStudentList = new UniqueStudentList();
+ assertEquals(expectedUniqueStudentList, uniqueStudentList);
+ }
+
+ @Test
+ public void setPersons_nullUniquePersonList_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> uniqueStudentList.setStudents((UniqueStudentList) null));
+ }
+
+ @Test
+ public void setPersons_uniquePersonList_replacesOwnListWithProvidedUniquePersonList() {
+ uniqueStudentList.add(ALICE);
+ UniqueStudentList expectedUniqueStudentList = new UniqueStudentList();
+ expectedUniqueStudentList.add(BOB);
+ uniqueStudentList.setStudents(expectedUniqueStudentList);
+ assertEquals(expectedUniqueStudentList, uniqueStudentList);
+ }
+
+ @Test
+ public void setPersons_nullList_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> uniqueStudentList.setStudents((List<Student>) null));
+ }
+
+ @Test
+ public void setPersons_list_replacesOwnListWithProvidedList() {
+ uniqueStudentList.add(ALICE);
+ List<Student> studentList = Collections.singletonList(BOB);
+ uniqueStudentList.setStudents(studentList);
+ UniqueStudentList expectedUniqueStudentList = new UniqueStudentList();
+ expectedUniqueStudentList.add(BOB);
+ assertEquals(expectedUniqueStudentList, uniqueStudentList);
+ }
+
+ @Test
+ public void setPersons_listWithDuplicatePersons_throwsDuplicatePersonException() {
+ List<Student> listWithDuplicateStudents = Arrays.asList(ALICE, ALICE);
+ assertThrows(DuplicateStudentException.class, () -> uniqueStudentList.setStudents(listWithDuplicateStudents));
+ }
+
+ @Test
+ public void isClashingClassTime() {
+ // one student
+ uniqueStudentList.setStudents(Collections.singletonList(ALICE));
+ assertTrue(uniqueStudentList.hasClashingClassTimeWith(ALICE)); // same class time -> clashes
+ Student test = new StudentBuilder(BOB).withClassTime("5 1600-1800").build();
+ assertTrue(uniqueStudentList.hasClashingClassTimeWith(test)); // clashes
+ assertFalse(uniqueStudentList.hasClashingClassTimeWith(BOB)); // does not clash
+
+ // multiple students
+ uniqueStudentList.setStudents(Arrays.asList(ALICE, BOB));
+ assertTrue(uniqueStudentList.hasClashingClassTimeWith(ALICE)); // contains student
+ assertTrue(uniqueStudentList.hasClashingClassTimeWith(BOB)); // contains student
+ assertTrue(uniqueStudentList.hasClashingClassTimeWith(test)); // clashes with ALICE
+ test = new StudentBuilder(BOB).withClassTime("3 1200-1230").build();
+ assertFalse(uniqueStudentList.hasClashingClassTimeWith(test)); // does not clash
+ }
+
+ @Test
+ public void asUnmodifiableObservableList_modifyList_throwsUnsupportedOperationException() {
+ assertThrows(UnsupportedOperationException.class, ()
+ -> uniqueStudentList.asUnmodifiableObservableList().remove(0));
+ }
+}
diff --git a/src/test/java/seedu/address/model/student/YearComparatorTest.java b/src/test/java/seedu/address/model/student/YearComparatorTest.java
new file mode 100644
index 00000000000..7203f2b90a6
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/YearComparatorTest.java
@@ -0,0 +1,44 @@
+package seedu.address.model.student;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.testutil.StudentBuilder;
+
+public class YearComparatorTest {
+
+ private YearComparator cmp = new YearComparator();
+
+ private Student priThreeStudent = new StudentBuilder().withName("Eve").withSchool("Bishan Primary School")
+ .withYear("Primary 3").build();
+ private Student secOneStudent = new StudentBuilder().withName("Alice").withSchool("SST")
+ .withYear("Secondary 1").build();
+ private Student secOneStudent2 = new StudentBuilder().withName("Dominic").withSchool("SOTA")
+ .withYear("Secondary 1").build();
+ private Student secThreeStudent = new StudentBuilder().withName("Pikachu").withSchool("Trainers School")
+ .withYear("Secondary 3").build();
+ private Student jcOneStudent = new StudentBuilder().withName("Bob").withSchool("Innova JC")
+ .withYear("JC 1").build();
+
+ @Test
+ public void test_largerThan_moreThanZero() {
+ assertTrue(cmp.compare(jcOneStudent, secThreeStudent) > 0);
+ assertTrue(cmp.compare(jcOneStudent, secOneStudent) > 0);
+ assertTrue(cmp.compare(jcOneStudent, priThreeStudent) > 0);
+ assertTrue(cmp.compare(secThreeStudent, secOneStudent) > 0);
+ }
+
+ @Test
+ public void test_sameYear_returnsZero() {
+ assertEquals(0, cmp.compare(secOneStudent, secOneStudent2));
+ assertEquals(0, cmp.compare(secOneStudent, secOneStudent));
+ }
+
+ @Test
+ public void test_smallerThan_lessThanZero() {
+ assertTrue(cmp.compare(priThreeStudent, secThreeStudent) < 0);
+ assertTrue(cmp.compare(priThreeStudent, secOneStudent) < 0);
+ }
+}
diff --git a/src/test/java/seedu/address/model/student/YearMatchPredicateTest.java b/src/test/java/seedu/address/model/student/YearMatchPredicateTest.java
new file mode 100644
index 00000000000..febb2b5df0c
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/YearMatchPredicateTest.java
@@ -0,0 +1,68 @@
+package seedu.address.model.student;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.testutil.StudentBuilder;
+
+public class YearMatchPredicateTest {
+
+ private Year secondaryOne = new Year("Sec 1");
+ private Year secondaryOneDuplicate = new Year("Sec 1");
+ private Year secondaryThree = new Year("Sec 3");
+
+ private YearMatchPredicate yearMatchPredicateSecondaryOne = new YearMatchPredicate(secondaryOne);
+ private YearMatchPredicate yearMatchPredicateSecondaryThree = new YearMatchPredicate(secondaryThree);
+
+ private YearMatchPredicate yearMatchPredicateSecondaryOneDuplicate =
+ new YearMatchPredicate(secondaryOneDuplicate);
+
+ private Student yearOneStudent = new StudentBuilder().withName("Alice").withSchool("Changi Junior College")
+ .withYear("Sec 1").build();
+ private Student yearThreeStudent = new StudentBuilder().withName("Pikachu").withSchool("Trainers School")
+ .withYear("Sec 3").build();
+
+ @Test
+ public void equals() {
+
+ // same object -> returns true
+ assertEquals(yearMatchPredicateSecondaryOne, yearMatchPredicateSecondaryOne);
+
+ // different type -> return false
+ assertNotEquals("1", yearMatchPredicateSecondaryOne);
+
+ // null -> returns false
+ assertNotEquals(yearMatchPredicateSecondaryOne, null);
+
+ // same year -> returns true
+ assertTrue(yearMatchPredicateSecondaryOne.equals(yearMatchPredicateSecondaryOneDuplicate));
+
+ // different year -> returns false
+ assertFalse(yearMatchPredicateSecondaryOne.equals(yearMatchPredicateSecondaryThree));
+
+ }
+
+ @Test
+ public void test_matchingYear_returnsTrue() {
+ assertTrue(yearMatchPredicateSecondaryOne.test(yearOneStudent));
+ assertTrue(yearMatchPredicateSecondaryThree.test(yearThreeStudent));
+
+ // User guide test cases
+ assertTrue(yearMatchPredicateSecondaryThree.test(new StudentBuilder()
+ .withYear("Sec 3").build()));
+
+ }
+
+ @Test
+ public void test_notMatchingYear_returnsFalse() {
+ assertFalse(yearMatchPredicateSecondaryOne.test(yearThreeStudent));
+
+ // User guide test cases
+ assertFalse(yearMatchPredicateSecondaryThree.test(new StudentBuilder()
+ .withYear("Sec 4").build()));
+ }
+}
diff --git a/src/test/java/seedu/address/model/student/YearTest.java b/src/test/java/seedu/address/model/student/YearTest.java
new file mode 100644
index 00000000000..c8c2f516989
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/YearTest.java
@@ -0,0 +1,125 @@
+package seedu.address.model.student;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+public class YearTest {
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new Year(null));
+ }
+
+ @Test
+ public void parseSchoolType_primary() {
+ String primary = "Primary 1";
+ assertEquals(new Year(primary).schoolType, SchoolType.PRIMARY);
+
+ primary = "P 1";
+ assertEquals(new Year(primary).schoolType, SchoolType.PRIMARY);
+
+ primary = "Pri 1";
+ assertEquals(new Year(primary).schoolType, SchoolType.PRIMARY);
+ }
+
+ @Test
+ public void parseSchoolType_secondary() {
+ String secondary = "Secondary 1";
+ assertEquals(new Year(secondary).schoolType, SchoolType.SECONDARY);
+
+ secondary = "Sec 1";
+ assertEquals(new Year(secondary).schoolType, SchoolType.SECONDARY);
+
+ secondary = "S 1";
+ assertEquals(new Year(secondary).schoolType, SchoolType.SECONDARY);
+ }
+
+ @Test
+ public void parseSchoolType_juniorCollege() {
+ String juniorCollege = "JC 1";
+ assertEquals(new Year(juniorCollege).schoolType, SchoolType.JC);
+
+ juniorCollege = "J 1";
+ assertEquals(new Year(juniorCollege).schoolType, SchoolType.JC);
+
+ juniorCollege = "Jc 1";
+ assertEquals(new Year(juniorCollege).schoolType, SchoolType.JC);
+ }
+
+ @Test
+ public void isValidYear_invalidFormat() {
+ // null year
+ assertThrows(NullPointerException.class, () -> Year.isValidYear(null));
+
+ // invalid input
+ assertFalse(Year.isValidYear("")); // empty string
+ assertFalse(Year.isValidYear(" ")); // space only
+ assertFalse(Year.isValidYear(" Primary 2")); //spacing in front
+ assertFalse(Year.isValidYear("!@#$")); // characters
+ assertFalse(Year.isValidYear("NS 1")); // not a valid school type
+ assertFalse(Year.isValidYear("j")); // not a valid level
+ assertFalse(Year.isValidYear("0")); // just digits
+ assertFalse(Year.isValidYear("11")); // just digits
+ assertFalse(Year.isValidYear("92312432423")); // long number
+ assertFalse(Year.isValidYear("1 2 3 ")); //numbers with spacing
+ assertFalse(Year.isValidYear("abc")); // only letters
+ assertFalse(Year.isValidYear("a b c ")); //letters with spacing
+ }
+
+ @Test
+ public void isValidYear_primaryLevels() {
+ // level
+ assertFalse(Year.isValidYear("Primary 0")); // lower than min value
+ assertFalse(Year.isValidYear("Primary 7")); // higher than max value
+ assertTrue(Year.isValidYear("Primary 1")); // min value
+ assertTrue(Year.isValidYear("Primary 6")); // max value
+
+ // school type string
+ assertTrue(Year.isValidYear("P 2"));
+ assertTrue(Year.isValidYear("Pri 2"));
+ assertTrue(Year.isValidYear("primary 2")); // lower case
+ assertTrue(Year.isValidYear("p 2")); // lower case
+ assertTrue(Year.isValidYear("pri 2")); // lower case
+ assertTrue(Year.isValidYear("Primary 2")); // space between values
+ assertTrue(Year.isValidYear("Primary2")); // no space between values
+ }
+
+ @Test
+ public void isValidYear_secondaryLevels() {
+ // level
+ assertFalse(Year.isValidYear("Secondary 0")); // lower than min value
+ assertFalse(Year.isValidYear("Secondary 6")); // higher than max value
+ assertTrue(Year.isValidYear("Secondary 1")); // min value
+ assertTrue(Year.isValidYear("Secondary 5")); // max value
+
+ // school type string
+ assertTrue(Year.isValidYear("S 2"));
+ assertTrue(Year.isValidYear("Sec 2"));
+ assertTrue(Year.isValidYear("secondary 2")); // lower case
+ assertTrue(Year.isValidYear("s 2")); // lower case
+ assertTrue(Year.isValidYear("sec 2")); // lower case
+ assertTrue(Year.isValidYear("Secondary 2")); // space between values
+ assertTrue(Year.isValidYear("Secondary2")); // no space between values
+ }
+
+ @Test
+ public void isValidYear_juniorCollegeLevels() {
+ // level
+ assertFalse(Year.isValidYear("JC 0")); // lower than min value
+ assertFalse(Year.isValidYear("JC 3")); // higher than max value
+ assertTrue(Year.isValidYear("JC 1")); // min value
+ assertTrue(Year.isValidYear("JC 2")); // max value
+
+ // school type string
+ assertTrue(Year.isValidYear("J 2"));
+ assertTrue(Year.isValidYear("Jc 2"));
+ assertTrue(Year.isValidYear("jc 2")); // lower case
+ assertTrue(Year.isValidYear("j 2")); // lower case
+ assertTrue(Year.isValidYear("JC 2")); // space between values
+ assertTrue(Year.isValidYear("JC2")); // no space between values
+ }
+}
diff --git a/src/test/java/seedu/address/model/student/academic/AcademicTest.java b/src/test/java/seedu/address/model/student/academic/AcademicTest.java
new file mode 100644
index 00000000000..14885abffc1
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/academic/AcademicTest.java
@@ -0,0 +1,141 @@
+package seedu.address.model.student.academic;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.logic.commands.CommandTestUtil.ATTENDANCE_DATE_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.ATTENDANCE_DATE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_ATTENDANCE_FEEDBACK_AMY;
+import static seedu.address.testutil.StudentBuilder.DEFAULT_EXAM_FYE;
+import static seedu.address.testutil.StudentBuilder.DEFAULT_EXAM_MYE;
+import static seedu.address.testutil.StudentBuilder.DEFAULT_QUESTION_MATH;
+import static seedu.address.testutil.StudentBuilder.DEFAULT_QUESTION_NEWTON;
+import static seedu.address.testutil.StudentBuilder.DEFAULT_SOLUTION;
+import static seedu.address.testutil.TypicalStudents.ALICE;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.model.student.academic.exam.Exam;
+import seedu.address.model.student.academic.question.SolvedQuestion;
+import seedu.address.model.student.academic.question.UnsolvedQuestion;
+import seedu.address.testutil.StudentBuilder;
+
+public class AcademicTest {
+
+ @Test
+ public void equals() {
+ Academic aliceAcademic = ALICE.getAcademic();
+
+ // same values should return true
+ Academic academicCopy = new StudentBuilder(ALICE).build().getAcademic();
+ assertTrue(aliceAcademic.equals(academicCopy));
+
+ // same object return true
+ assertTrue(aliceAcademic.equals(aliceAcademic));
+
+ // null returns false
+ assertFalse(aliceAcademic.equals(null));
+
+ // different types should return false
+ assertFalse(aliceAcademic.equals(6));
+
+ // different attendance list returns false
+ Academic editedAliceAcademic = new StudentBuilder(ALICE).withAttendances(new Attendance(ATTENDANCE_DATE_BOB,
+ true, new Feedback("sleeping"))).build().getAcademic();
+ assertFalse(aliceAcademic.equals(editedAliceAcademic));
+
+ // different exam list returns false
+ editedAliceAcademic = new StudentBuilder(ALICE).withExams(DEFAULT_EXAM_FYE).build().getAcademic();
+ assertFalse(aliceAcademic.equals(editedAliceAcademic));
+
+ // different question list returns false
+ editedAliceAcademic = new StudentBuilder(ALICE).withQuestions().build().getAcademic();
+ assertFalse(aliceAcademic.equals(editedAliceAcademic));
+ }
+
+ @Test
+ public void containsQuestion() {
+ String[] questions = new String[] {DEFAULT_QUESTION_MATH, DEFAULT_QUESTION_NEWTON};
+ Academic aliceAcademic = ALICE.getAcademic();
+ for (String question : questions) {
+ assertTrue(aliceAcademic.containsQuestion(new UnsolvedQuestion(question)));
+ assertTrue(aliceAcademic.containsQuestion(new SolvedQuestion(question, DEFAULT_SOLUTION)));
+ }
+ }
+
+ @Test
+ public void addQuestion() {
+ Academic aliceAcademic = new StudentBuilder(ALICE).withQuestions().build().getAcademic();
+ Academic acadWithQuestion = aliceAcademic.addQuestion(new UnsolvedQuestion(DEFAULT_QUESTION_MATH));
+ Academic expected = new StudentBuilder(ALICE).withQuestions(DEFAULT_QUESTION_MATH).build().getAcademic();
+ assertEquals(expected, acadWithQuestion);
+ }
+
+ @Test
+ public void setQuestion() {
+ Academic aliceAcademic = new StudentBuilder(ALICE).withQuestions(DEFAULT_QUESTION_MATH).build().getAcademic();
+ Academic acadWithQuestion = aliceAcademic.setQuestion(new UnsolvedQuestion(DEFAULT_QUESTION_MATH),
+ new SolvedQuestion(DEFAULT_QUESTION_MATH, DEFAULT_SOLUTION));
+ Academic expected = new StudentBuilder(ALICE).withSolved(DEFAULT_SOLUTION, DEFAULT_QUESTION_MATH)
+ .build().getAcademic();
+ assertEquals(expected, acadWithQuestion);
+ }
+
+ @Test
+ public void deleteQuestion() {
+ Academic aliceAcademic = new StudentBuilder(ALICE).withQuestions(DEFAULT_QUESTION_MATH).build().getAcademic();
+ Academic acadWithQuestion = aliceAcademic.deleteQuestion(new UnsolvedQuestion(DEFAULT_QUESTION_MATH));
+ Academic expected = new StudentBuilder(ALICE).withQuestions().build().getAcademic();
+ assertEquals(expected, acadWithQuestion);
+ }
+
+ @Test
+ public void containsAttendance() {
+ Feedback amyFeedback = new Feedback(VALID_ATTENDANCE_FEEDBACK_AMY);
+ Attendance standard = new Attendance(ATTENDANCE_DATE_AMY, true, amyFeedback);
+ Academic aliceAcademic = new StudentBuilder(ALICE).withAttendances(standard).build().getAcademic();
+ assertTrue(aliceAcademic.containsAttendance(standard));
+
+ Attendance test = new Attendance(ATTENDANCE_DATE_AMY, false, amyFeedback);
+ assertTrue(aliceAcademic.containsAttendance(test));
+
+ test = new Attendance(ATTENDANCE_DATE_AMY, true);
+ assertTrue(aliceAcademic.containsAttendance(test));
+
+ test = new Attendance(ATTENDANCE_DATE_BOB, true, amyFeedback);
+ assertFalse(aliceAcademic.containsAttendance(test));
+ }
+
+ @Test
+ public void getFormattedQuestions() {
+ Academic aliceAcademic = new StudentBuilder(ALICE).withQuestions(DEFAULT_QUESTION_MATH,
+ DEFAULT_QUESTION_NEWTON).build().getAcademic();
+ String expectedText = "1. " + new UnsolvedQuestion(DEFAULT_QUESTION_MATH)
+ + "\n2. " + new UnsolvedQuestion(DEFAULT_QUESTION_NEWTON) + "\n";
+ assertEquals(expectedText, aliceAcademic.getFormattedQuestions());
+ }
+
+ @Test
+ public void getFormattedAttendance() {
+ Attendance amyAttendance = new Attendance(ATTENDANCE_DATE_AMY, true);
+ Attendance bobAttendance = new Attendance(ATTENDANCE_DATE_BOB, true);
+ Academic aliceAcademic = new StudentBuilder(ALICE).withAttendances(amyAttendance, bobAttendance)
+ .build().getAcademic();
+ String expectedText = "1. " + amyAttendance
+ + "\n2. " + bobAttendance + "\n";
+ assertEquals(expectedText, aliceAcademic.getFormattedAttendance());
+ }
+
+ @Test
+ public void getFormattedExams() {
+ Exam examFye = DEFAULT_EXAM_FYE;
+ Exam examMye = DEFAULT_EXAM_MYE;
+ Academic aliceAcademic = new StudentBuilder(ALICE).withExams(examFye, examMye)
+ .build().getAcademic();
+ String expectedText = "1." + examFye
+ + "\n2." + examMye + "\n";
+ assertEquals(expectedText, aliceAcademic.getFormattedExams());
+ }
+
+
+}
diff --git a/src/test/java/seedu/address/model/student/academic/AttendanceTest.java b/src/test/java/seedu/address/model/student/academic/AttendanceTest.java
new file mode 100644
index 00000000000..dce56be4f65
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/academic/AttendanceTest.java
@@ -0,0 +1,112 @@
+package seedu.address.model.student.academic;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.commons.util.DateUtil.parseToDate;
+import static seedu.address.commons.util.DateUtil.print;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import java.time.LocalDate;
+
+import org.junit.jupiter.api.Test;
+
+public class AttendanceTest {
+
+ private static final String DATE_INPUT = "14/3/1998";
+ private static final String FEEDBACK_INPUT = "sleepy";
+ private static final LocalDate VALID_DATE = parseToDate(DATE_INPUT);
+ private static final Feedback VALID_FEEDBACK = new Feedback(FEEDBACK_INPUT);
+ private static final Attendance VALID_ATTENDANCE = new Attendance(VALID_DATE, true, VALID_FEEDBACK);
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ // All but one null
+ assertThrows(NullPointerException.class, () -> new Attendance(null, true,
+ null));
+
+ // Only one null
+ assertThrows(NullPointerException.class, () -> new Attendance(VALID_DATE, true,
+ null));
+ assertThrows(NullPointerException.class, () -> new Attendance(null, true,
+ VALID_FEEDBACK));
+ }
+
+ @Test
+ public void constructor_invalidAttendanceFields_throwsIllegalArgumentException() {
+ String invalidAttendanceFeedback = "";
+
+ // 1 invalid
+ assertThrows(IllegalArgumentException.class, () -> new Attendance(VALID_DATE,
+ true, new Feedback(invalidAttendanceFeedback)));
+ }
+
+ @Test
+ public void equals_test() {
+ Attendance test = VALID_ATTENDANCE;
+
+ // same object -> return true
+ assertTrue(VALID_ATTENDANCE.equals(test));
+
+ // same fields -> return true
+ test = new Attendance(VALID_DATE, true, VALID_FEEDBACK);
+ assertTrue(VALID_ATTENDANCE.equals(test));
+
+ // different class
+ assertFalse(VALID_ATTENDANCE.equals(VALID_FEEDBACK));
+
+ // diff fields
+ LocalDate differentDate = parseToDate("17/04/1998");
+ test = new Attendance(differentDate, true, VALID_FEEDBACK);
+ assertFalse(VALID_ATTENDANCE.equals(test));
+
+ test = new Attendance(VALID_DATE, false, VALID_FEEDBACK);
+ assertFalse(VALID_ATTENDANCE.equals(test));
+
+ Feedback differentFeedback = new Feedback("sleepayy son");
+ test = new Attendance(VALID_DATE, true, differentFeedback);
+ assertFalse(VALID_ATTENDANCE.equals(test));
+
+ test = new Attendance(VALID_DATE, true);
+ assertFalse(VALID_ATTENDANCE.equals(test));
+ }
+
+ @Test
+ public void toString_feedbackTest() {
+ String outputDate = print(VALID_DATE);
+ String outputDateDesc = outputDate + " ";
+ String feedbackDesc = "[" + FEEDBACK_INPUT + "]";
+ String expected = "(\u2713) " + outputDateDesc + feedbackDesc;
+ assertEquals(expected, VALID_ATTENDANCE.toString());
+
+ expected = "(\u2718) " + outputDateDesc + feedbackDesc;
+ Attendance test = new Attendance(VALID_DATE, false, VALID_FEEDBACK);
+ assertEquals(expected, test.toString());
+
+ expected = "(\u2713) " + outputDateDesc;
+ test = new Attendance(VALID_DATE, true);
+ assertEquals(expected, test.toString());
+
+ expected = "(\u2718) " + outputDateDesc;
+ test = new Attendance(VALID_DATE, false);
+ assertEquals(expected, test.toString());
+ }
+
+ @Test
+ public void isSameAttendance() {
+ Attendance test = new Attendance(VALID_DATE, true, VALID_FEEDBACK);
+ assertTrue(VALID_ATTENDANCE.isSameAttendance(test));
+ test = new Attendance(VALID_DATE, true);
+ assertTrue(VALID_ATTENDANCE.isSameAttendance(test));
+
+ test = new Attendance(VALID_DATE, false, VALID_FEEDBACK);
+ assertTrue(VALID_ATTENDANCE.isSameAttendance(test));
+ test = new Attendance(VALID_DATE, false);
+ assertTrue(VALID_ATTENDANCE.isSameAttendance(test));
+
+ LocalDate otherDate = parseToDate("28/2/20");
+ test = new Attendance(otherDate, true, VALID_FEEDBACK);
+ assertFalse(VALID_ATTENDANCE.isSameAttendance(test));
+ }
+
+}
diff --git a/src/test/java/seedu/address/model/student/academic/FeedbackTest.java b/src/test/java/seedu/address/model/student/academic/FeedbackTest.java
new file mode 100644
index 00000000000..f4a1eca2691
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/academic/FeedbackTest.java
@@ -0,0 +1,47 @@
+package seedu.address.model.student.academic;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+public class FeedbackTest {
+
+ static final Feedback VALID_FEEDBACK = new Feedback("attentive");
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new Feedback(null));
+ }
+
+ @Test
+ public void constructor_invalidAttendanceFields_throwsIllegalArgumentException() {
+ // cannot be empty string
+ assertThrows(IllegalArgumentException.class, () -> new Feedback(""));
+ // can only be alphanumeric
+ assertThrows(IllegalArgumentException.class, () -> new Feedback("!!@@##__"));
+ }
+
+ @Test
+ public void isValidFeedback_test() {
+ assertFalse(Feedback.isValidFeedback(""));
+ assertFalse(Feedback.isValidFeedback("!!@@##__"));
+ assertTrue(Feedback.isValidFeedback("was an attentive lad today"));
+ }
+
+ @Test
+ public void equals_test() {
+ // same object -> true
+ assertTrue(VALID_FEEDBACK.equals(VALID_FEEDBACK));
+
+ // same state -> true
+ assertTrue(VALID_FEEDBACK.equals(new Feedback("attentive")));
+
+ // different type -> false
+ assertFalse(VALID_FEEDBACK.equals("lass"));
+
+ // different state -> false
+ assertFalse(VALID_FEEDBACK.equals(new Feedback("not attentive")));
+ }
+}
diff --git a/src/test/java/seedu/address/model/student/academic/exam/ExamTest.java b/src/test/java/seedu/address/model/student/academic/exam/ExamTest.java
new file mode 100644
index 00000000000..3bc67a6dfda
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/academic/exam/ExamTest.java
@@ -0,0 +1,65 @@
+package seedu.address.model.student.academic.exam;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.commons.util.DateUtil.parseToDate;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import java.time.LocalDate;
+
+import org.junit.jupiter.api.Test;
+
+public class ExamTest {
+ private static final String VALID_EXAM_NAME = "CA2";
+ private static final LocalDate VALID_EXAM_DATE_DEF = parseToDate("13/03/2020");
+ private static final LocalDate VALID_EXAM_DATE_ALT = parseToDate("13/3/20");
+ private static final Score VALID_SCORE = new Score("25/50");
+ private static final Exam VALID_EXAM = new Exam(VALID_EXAM_NAME, VALID_EXAM_DATE_DEF, VALID_SCORE);
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ // All fields null
+ assertThrows(NullPointerException.class, () -> new Exam(null, null, null));
+
+ // Only one non-null
+ assertThrows(NullPointerException.class, () -> new Exam(VALID_EXAM_NAME, null, null));
+ assertThrows(NullPointerException.class, () -> new Exam(null, VALID_EXAM_DATE_DEF, null));
+ assertThrows(NullPointerException.class, () -> new Exam(null, null, VALID_SCORE));
+
+ // Only one null
+ assertThrows(NullPointerException.class, () -> new Exam(VALID_EXAM_NAME, VALID_EXAM_DATE_DEF, null));
+ assertThrows(NullPointerException.class, () -> new Exam(null, VALID_EXAM_DATE_DEF, VALID_SCORE));
+ assertThrows(NullPointerException.class, () -> new Exam(VALID_EXAM_NAME, null, VALID_SCORE));
+ }
+
+ @Test
+ public void isValidExamName() {
+ assertTrue(Exam.isValidExamName("Test")); // all letters
+ assertTrue(Exam.isValidExamName("2384")); // all numbers
+ assertTrue(Exam.isValidExamName("$*#")); // all special characters
+ assertTrue(Exam.isValidExamName("a123!")); // all characters
+
+ assertFalse(Exam.isValidExamName(""));
+ assertFalse(Exam.isValidExamName(" "));
+ }
+
+ @Test
+ public void equals_test() {
+ // different object
+ assertNotEquals(VALID_EXAM, "not an exam");
+
+ // diff fields - name is the only field that differentiates exams
+ assertNotEquals(VALID_EXAM, new Exam("Mid Terms 19/20", VALID_EXAM_DATE_DEF, VALID_SCORE));
+
+ assertEquals(VALID_EXAM, new Exam(VALID_EXAM_NAME, parseToDate("25/12/2020"), VALID_SCORE));
+ assertEquals(VALID_EXAM, new Exam(VALID_EXAM_NAME, VALID_EXAM_DATE_ALT, new Score("10/100")));
+
+ // same object
+ assertEquals(VALID_EXAM, VALID_EXAM);
+
+ // same fields
+ assertEquals(VALID_EXAM, new Exam(VALID_EXAM_NAME, VALID_EXAM_DATE_ALT, VALID_SCORE));
+ }
+}
diff --git a/src/test/java/seedu/address/model/student/academic/exam/ScoreTest.java b/src/test/java/seedu/address/model/student/academic/exam/ScoreTest.java
new file mode 100644
index 00000000000..50d57af66d7
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/academic/exam/ScoreTest.java
@@ -0,0 +1,57 @@
+package seedu.address.model.student.academic.exam;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+public class ScoreTest {
+ static final String VALID_SCORE_STRING = "25/50";
+ static final String INVALID_SCORE_LARGER = "50/25";
+ static final String INVALID_SCORE_NEGATIVE_1 = "-25/50";
+ static final String INVALID_SCORE_NEGATIVE_2 = "-25/-50";
+ static final String INVALID_SCORE_EMPTY = "";
+ static final String INVALID_SCORE_ALPHABETS_1 = "alphabets";
+ static final String INVALID_SCORE_ALPHABETS_2 = "alphabets/alphabets";
+ static final String INVALID_SCORE_FORMAT = "25-50";
+ static final Score VALID_SCORE = new Score(VALID_SCORE_STRING);
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ // All fields null
+ assertThrows(NullPointerException.class, () -> new Score(null));
+ }
+
+ @Test
+ public void isValidExamScore() {
+ //valid score
+ assertTrue(Score.isValidExamScore(VALID_SCORE_STRING));
+
+ //invalid scores
+ assertFalse(Score.isValidExamScore(INVALID_SCORE_LARGER));
+ assertFalse(Score.isValidExamScore(INVALID_SCORE_NEGATIVE_1));
+ assertFalse(Score.isValidExamScore(INVALID_SCORE_NEGATIVE_2));
+ assertFalse(Score.isValidExamScore(INVALID_SCORE_EMPTY));
+ assertFalse(Score.isValidExamScore(INVALID_SCORE_ALPHABETS_1));
+ assertFalse(Score.isValidExamScore(INVALID_SCORE_ALPHABETS_2));
+ assertFalse(Score.isValidExamScore(INVALID_SCORE_FORMAT));
+ }
+
+ @Test
+ public void equals_test() {
+ //same object
+ assertEquals(VALID_SCORE, VALID_SCORE);
+
+ //different object
+ assertNotEquals(VALID_SCORE, "not a score");
+
+ //same score string
+ assertEquals(VALID_SCORE, new Score(VALID_SCORE_STRING));
+
+ //different score string
+ assertNotEquals(VALID_SCORE, new Score("100/100"));
+ }
+}
diff --git a/src/test/java/seedu/address/model/student/academic/question/QuestionTest.java b/src/test/java/seedu/address/model/student/academic/question/QuestionTest.java
new file mode 100644
index 00000000000..1f82180aec3
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/academic/question/QuestionTest.java
@@ -0,0 +1,41 @@
+package seedu.address.model.student.academic.question;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+public class QuestionTest {
+
+ @Test
+ public void isValidQuestion() {
+ // null question
+ assertThrows(NullPointerException.class, () -> Question.isValidQuestion(null));
+
+ // invalid question
+ assertFalse(Question.isValidQuestion(" "));
+ assertFalse(Question.isValidQuestion(""));
+
+ // valid questions
+ assertTrue(Question.isValidQuestion("what is 1 + 1?"));
+ assertTrue(Question.isValidQuestion("Hello?"));
+ assertTrue(Question.isValidQuestion("How does Newton's Second Law work?"));
+ }
+
+ @Test
+ public void isSameQuestion() {
+ Question test = new UnsolvedQuestion("Hello?");
+ Question otherUnsolved = new UnsolvedQuestion("Hello?");
+ Question otherSolved = new SolvedQuestion("Hello?", "No thanks.");
+
+ assertTrue(test.isSameQuestion(otherSolved));
+ assertTrue(test.isSameQuestion(otherUnsolved));
+ assertTrue(otherSolved.isSameQuestion(test));
+ assertTrue(otherUnsolved.isSameQuestion(test));
+
+ assertFalse(test.isSameQuestion(new UnsolvedQuestion("What?")));
+ assertFalse(test.isSameQuestion(new SolvedQuestion("What?", "No.")));
+ }
+
+}
diff --git a/src/test/java/seedu/address/model/student/academic/question/SolvedQuestionTest.java b/src/test/java/seedu/address/model/student/academic/question/SolvedQuestionTest.java
new file mode 100644
index 00000000000..20398370575
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/academic/question/SolvedQuestionTest.java
@@ -0,0 +1,87 @@
+package seedu.address.model.student.academic.question;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+public class SolvedQuestionTest {
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ String validString = "test";
+
+ // both fields null
+ assertThrows(NullPointerException.class, () -> new SolvedQuestion(null, null));
+
+ // one field null
+ assertThrows(NullPointerException.class, () -> new SolvedQuestion(null, validString));
+ assertThrows(NullPointerException.class, () -> new SolvedQuestion(validString, null));
+ }
+
+ @Test
+ public void constructor_invalidString_throwsIllegalArgumentException() {
+ String invalidString = " ";
+ String validString = "test";
+
+ // both fields invalid
+ assertThrows(IllegalArgumentException.class, () -> new SolvedQuestion(invalidString, invalidString));
+
+ // one field invalid
+ assertThrows(IllegalArgumentException.class, () -> new SolvedQuestion(validString, invalidString));
+ assertThrows(IllegalArgumentException.class, () -> new SolvedQuestion(invalidString, validString));
+ }
+
+ @Test
+ public void isValidSolution() {
+ // null question
+ assertThrows(NullPointerException.class, () -> SolvedQuestion.isValidSolution(null));
+
+ // invalid solution
+ assertFalse(SolvedQuestion.isValidSolution(" "));
+ assertFalse(SolvedQuestion.isValidSolution(""));
+
+ // valid questions
+ assertTrue(SolvedQuestion.isValidSolution("2"));
+ assertTrue(SolvedQuestion.isValidSolution("No thanks"));
+ assertTrue(SolvedQuestion.isValidSolution("Answered via Whatsapp"));
+ }
+
+ @Test
+ public void toString_equals() {
+ assertEquals("(\u2713) Hello? [Goodbye]",
+ new SolvedQuestion("Hello?", "Goodbye").toString());
+ }
+
+ @Test
+ public void equals() {
+ String testQuestion = "1 + 1 = ?";
+ String testSolution = "2";
+ Question test = new SolvedQuestion(testQuestion, testSolution);
+
+ // different question gives false
+ assertFalse(test.equals(new SolvedQuestion("Hello?", testSolution)));
+
+ // different solution gives false
+ assertFalse(test.equals(new SolvedQuestion(testQuestion, "No")));
+
+ // different question type gives false
+ assertFalse(test.equals(new UnsolvedQuestion(testQuestion)));
+
+ // true
+ assertTrue(test.equals(test));
+ assertTrue(test.equals(new SolvedQuestion(testQuestion, testSolution)));
+ }
+
+ @Test
+ public void isResolved() {
+ String testQuestion = "1 + 1 = ?";
+ String testSolution = "2";
+ Question test = new SolvedQuestion(testQuestion, testSolution);
+
+ assertTrue(test.isResolved());
+ }
+
+}
diff --git a/src/test/java/seedu/address/model/student/academic/question/UnsolvedQuestionTest.java b/src/test/java/seedu/address/model/student/academic/question/UnsolvedQuestionTest.java
new file mode 100644
index 00000000000..f42ca4bd428
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/academic/question/UnsolvedQuestionTest.java
@@ -0,0 +1,50 @@
+package seedu.address.model.student.academic.question;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+public class UnsolvedQuestionTest {
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new UnsolvedQuestion(null));
+ }
+
+ @Test
+ public void constructor_invalidString_throwsIllegalArgumentException() {
+ String invalidString = " ";
+ assertThrows(IllegalArgumentException.class, () -> new UnsolvedQuestion(invalidString));
+ }
+
+ @Test
+ public void toString_equals() {
+ assertEquals(new UnsolvedQuestion("Hello?").toString(), "(\u2718) Hello?");
+ }
+
+ @Test
+ public void equals() {
+ String testString = "1 + 1 = ?";
+ Question test = new UnsolvedQuestion(testString);
+
+ // different question gives false
+ assertFalse(test.equals(new UnsolvedQuestion("Hello?")));
+
+ // different question type gives false
+ assertFalse(test.equals(new SolvedQuestion(testString, "2")));
+
+ // true
+ assertTrue(test.equals(test));
+ assertTrue(test.equals(new UnsolvedQuestion(testString)));
+ }
+
+ @Test
+ public void isResolved() {
+ String testString = "1 + 1 = ?";
+ Question test = new UnsolvedQuestion(testString);
+
+ assertFalse(test.isResolved());
+ }
+}
diff --git a/src/test/java/seedu/address/model/student/admin/AdminTest.java b/src/test/java/seedu/address/model/student/admin/AdminTest.java
new file mode 100644
index 00000000000..13eab242fd3
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/admin/AdminTest.java
@@ -0,0 +1,66 @@
+package seedu.address.model.student.admin;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.TypicalStudents.ALICE;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.testutil.StudentBuilder;
+
+public class AdminTest {
+
+ @Test
+ public void equals() {
+ Admin aliceAdmin = ALICE.getAdmin();
+
+ // same values should return true
+ Admin adminCopy = new StudentBuilder(ALICE).build().getAdmin();
+ assertTrue(adminCopy.equals(aliceAdmin));
+
+ // same object should return true
+ assertTrue(aliceAdmin.equals(aliceAdmin));
+
+ // null returns false
+ assertFalse(aliceAdmin.equals(null));
+
+ // different types should return false
+ assertFalse(aliceAdmin.equals(6));
+
+ // different classVenue should return false
+ Admin editedAliceAdmin = new StudentBuilder(ALICE).withClassVenue("Fairyland").build().getAdmin();
+ assertFalse(adminCopy.equals(editedAliceAdmin));
+
+ // different classTime should return false
+ editedAliceAdmin = new StudentBuilder(ALICE).withClassTime("2 1200-1600").build().getAdmin();
+ assertFalse(adminCopy.equals(editedAliceAdmin));
+
+ // different fee should return false
+ editedAliceAdmin = new StudentBuilder(ALICE).withFee("2").build().getAdmin();
+ assertFalse(aliceAdmin.equals(editedAliceAdmin));
+
+ // different paymentDate should return false
+ editedAliceAdmin = new StudentBuilder(ALICE).withPaymentDate("28/2/19").build().getAdmin();
+ assertFalse(aliceAdmin.equals(editedAliceAdmin));
+
+ // different details should return false
+ editedAliceAdmin = new StudentBuilder(ALICE).withDetails("nice", "schizophrenic").build().getAdmin();
+ assertFalse(aliceAdmin.equals(editedAliceAdmin));
+ }
+
+ @Test
+ public void hasClashingClassTime() {
+ // same class time -> clash
+ Admin admin = new StudentBuilder().build().getAdmin();
+ assertTrue(admin.hasClashingClassTime(admin));
+
+ // clashes -> return true
+ Admin test = new StudentBuilder().withClassTime("1 2000-2100").build().getAdmin();
+ assertFalse(admin.hasClashingClassTime(test));
+
+ // does not clash -> return false
+ test = new StudentBuilder().withClassTime("1 2130-2300").build().getAdmin();
+ assertTrue(admin.hasClashingClassTime(test));
+ }
+
+}
diff --git a/src/test/java/seedu/address/model/student/admin/ClassTimeComparatorTest.java b/src/test/java/seedu/address/model/student/admin/ClassTimeComparatorTest.java
new file mode 100644
index 00000000000..582e96e24ef
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/admin/ClassTimeComparatorTest.java
@@ -0,0 +1,40 @@
+package seedu.address.model.student.admin;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.model.student.Student;
+import seedu.address.testutil.StudentBuilder;
+
+public class ClassTimeComparatorTest {
+
+ private ClassTimeComparator cmp = new ClassTimeComparator();
+
+ private Student wedEight = new StudentBuilder().withName("Eve").withSchool("Bishan Primary School")
+ .withClassTime("3 0800-1000").build();
+ private Student thursTen = new StudentBuilder().withName("Alice").withSchool("SST")
+ .withClassTime("4 1000-1200").build();
+ private Student friTwelve = new StudentBuilder().withName("aloysius").withSchool("SST")
+ .withClassTime("5 1200-1400").build();
+ private Student monTen = new StudentBuilder().withName("dominic").withSchool("SOTA")
+ .withClassTime("1 1000-1300").build();
+ private Student tuesNine = new StudentBuilder().withName("pikachu").withSchool("Trainers School")
+ .withClassTime("2 0900-1700").build();
+ private Student monThirteen = new StudentBuilder().withName("Bob").withSchool("Innova JC")
+ .withClassTime("1 1300-1400").build();
+
+ @Test
+ public void test_smallerThan_lesThanZero() {
+ assertTrue(cmp.compare(tuesNine, wedEight) < 0);
+ assertTrue(cmp.compare(tuesNine, thursTen) < 0);
+ assertTrue(cmp.compare(monTen, monThirteen) < 0);
+ assertTrue(cmp.compare(thursTen, friTwelve) < 0);
+ }
+
+ @Test
+ public void test_largerThan_greaterThanZero() {
+ assertTrue(cmp.compare(wedEight, tuesNine) > 0);
+ assertTrue(cmp.compare(thursTen, monThirteen) > 0);
+ }
+}
diff --git a/src/test/java/seedu/address/model/student/admin/ClassTimeTest.java b/src/test/java/seedu/address/model/student/admin/ClassTimeTest.java
new file mode 100644
index 00000000000..bdbbccae08b
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/admin/ClassTimeTest.java
@@ -0,0 +1,130 @@
+package seedu.address.model.student.admin;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import java.time.DayOfWeek;
+
+import org.junit.jupiter.api.Test;
+
+public class ClassTimeTest {
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new ClassTime(null));
+ }
+
+ @Test
+ public void constructor_invalidClassTime_throwsIllegalArgumentException() {
+ // Completely empty input
+ String emptyClassTime = "";
+ assertThrows(IllegalArgumentException.class, () -> new ClassTime(emptyClassTime));
+
+ // Invalid input
+ String invalidInput = "2 hey sup";
+ assertThrows(IllegalArgumentException.class, () -> new ClassTime(invalidInput));
+
+ // Invalid Day of week (must be 1 - 7)
+ String invalidDayOfWeek1 = "0 1000-1230";
+ assertThrows(IllegalArgumentException.class, () -> new ClassTime(invalidDayOfWeek1));
+
+ String invalidDayOfWeek2 = "9 1000-1200";
+ assertThrows(IllegalArgumentException.class, () -> new ClassTime(invalidDayOfWeek2));
+
+ // Invalid Start time
+ String invalidStartTime = "0 2500-1230";
+ assertThrows(IllegalArgumentException.class, () -> new ClassTime(invalidStartTime));
+
+ // Invalid End time
+ String invalidEndTime = "9 1000-0090";
+ assertThrows(IllegalArgumentException.class, () -> new ClassTime(invalidEndTime));
+ }
+
+ @Test
+ public void isValidClassTime() {
+ // null class time
+ assertThrows(NullPointerException.class, () -> ClassTime.isValidClassTime(null));
+
+ // invalid class times
+ assertFalse(ClassTime.isValidClassTime("")); // empty string
+ assertFalse(ClassTime.isValidClassTime(" ")); // spaces only
+ assertFalse(ClassTime.isValidClassTime("0 1000-1230")); // invalid day of week
+ assertFalse(ClassTime.isValidClassTime("10 1000-1230")); // invalid day of week
+ assertFalse(ClassTime.isValidClassTime("1 1090-1230")); // invalid start time
+ assertFalse(ClassTime.isValidClassTime("2 1000-2930")); // invalid day of week
+
+ // valid class times
+ assertTrue(ClassTime.isValidClassTime("2 1000-2230"));
+ assertTrue(ClassTime.isValidClassTime("7 0000-2359"));
+ }
+
+ @Test
+ public void isSameDay() {
+ ClassTime t1 = new ClassTime("2 1000-2230");
+ DayOfWeek daySameAst1 = DayOfWeek.TUESDAY;
+ DayOfWeek dayDifferentFromt1 = DayOfWeek.MONDAY;
+
+ assertTrue(t1.isSameDay(daySameAst1));
+ assertFalse(t1.isSameDay(dayDifferentFromt1));
+ assertFalse(t1.isSameDay(null)); // equals method on null should return false
+ }
+
+ @Test
+ public void isValidStartAndEndTime() {
+ // invalid start and end times
+ assertFalse(ClassTime.isValidStartAndEndTime("2 0900-0100")); // end time before start time
+ assertFalse(ClassTime.isValidStartAndEndTime("6 1200-0900")); // end time before start time
+
+ // valid start and end times
+ assertTrue(ClassTime.isValidStartAndEndTime("2 0900-1200"));
+ assertTrue(ClassTime.isValidStartAndEndTime("4 1100-1600"));
+
+ }
+
+ @Test
+ public void clashesWith() {
+ // same class time -> true
+ ClassTime classTime = new ClassTime("5 1500-1700");
+ assertTrue(classTime.clashesWith(classTime));
+
+ // end after classTime start -> true
+ ClassTime test = new ClassTime("5 1400-1501");
+ assertTrue(classTime.clashesWith(test));
+
+ // start before classTime end -> true
+ test = new ClassTime("5 1659-1800");
+ assertTrue(classTime.clashesWith(test));
+
+ // complete overlap -> true
+ test = new ClassTime("5 1459-1701");
+ assertTrue(classTime.clashesWith(test));
+
+ // different day -> false
+ test = new ClassTime("3 1500-1700");
+ assertFalse(classTime.clashesWith(test));
+
+ // end just as classTime start
+ test = new ClassTime("5 1400-1500");
+ assertFalse(classTime.clashesWith(test));
+
+ // start just as classTime end
+ test = new ClassTime("5 1700-1800");
+ assertFalse(classTime.clashesWith(test));
+ }
+
+ @Test
+ public void compareTo() {
+ ClassTime time = new ClassTime("2 1500-1700");
+ ClassTime laterDayOfWeek = new ClassTime("3 1500-1700");
+ ClassTime sameDayOfWeekEarlierTime = new ClassTime("2 1400-1500");
+
+ assertEquals(-1, time.compareTo(laterDayOfWeek)); // earlier dayOfWeek
+
+ assertEquals(1, time.compareTo(sameDayOfWeekEarlierTime)); // same dayOfWeek but later time
+
+ assertThrows(NullPointerException.class, () -> time.compareTo(null)); // null throws exception
+
+ }
+}
diff --git a/src/test/java/seedu/address/model/student/admin/ClassVenueTest.java b/src/test/java/seedu/address/model/student/admin/ClassVenueTest.java
new file mode 100644
index 00000000000..f1a9b67f449
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/admin/ClassVenueTest.java
@@ -0,0 +1,37 @@
+package seedu.address.model.student.admin;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+public class ClassVenueTest {
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new ClassVenue(null));
+ }
+
+ @Test
+ public void constructor_invalidAddress_throwsIllegalArgumentException() {
+ String invalidAddress = "";
+ assertThrows(IllegalArgumentException.class, () -> new ClassVenue(invalidAddress));
+ }
+
+ @Test
+ public void isValidAddress() {
+ // null address
+ assertThrows(NullPointerException.class, () -> ClassVenue.isValidClassVenue(null));
+
+ // invalid addresses
+ assertFalse(ClassVenue.isValidClassVenue("")); // empty string
+ assertFalse(ClassVenue.isValidClassVenue(" ")); // spaces only
+
+ // valid addresses
+ assertTrue(ClassVenue.isValidClassVenue("Blk 456, Den Road, #01-355"));
+ assertTrue(ClassVenue.isValidClassVenue("-")); // one character
+ assertTrue(ClassVenue.isValidClassVenue("Leng Inc; 1234 Market St; "
+ + "San Francisco CA 2349879; USA")); // long address
+ }
+}
diff --git a/src/test/java/seedu/address/model/student/admin/DetailTest.java b/src/test/java/seedu/address/model/student/admin/DetailTest.java
new file mode 100644
index 00000000000..fc84ffe8663
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/admin/DetailTest.java
@@ -0,0 +1,54 @@
+package seedu.address.model.student.admin;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+public class DetailTest {
+
+ static final Detail VALID_DETAIL = new Detail("smart");
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new Detail(null));
+ }
+
+ @Test
+ public void constructor_invalidDetail_throwsIllegalArgumentException() {
+ String invalidDetail = "";
+ assertThrows(IllegalArgumentException.class, () -> new Detail(invalidDetail));
+ }
+
+ @Test
+ public void isValidDetail() {
+ // null detail
+ assertThrows(NullPointerException.class, () -> Detail.isValidDetail(null));
+
+ // invalid detail - only alphanumeric chars
+ assertFalse(Detail.isValidDetail("@$!!!"));
+
+ // valid detail
+ assertTrue(Detail.isValidDetail("smart lad"));
+ }
+
+ @Test
+ public void equals() {
+ // different object
+ assertNotEquals(VALID_DETAIL, "hey");
+
+ // diff fields
+ assertNotEquals(VALID_DETAIL, new Detail("dumb"));
+
+ // same object
+ assertEquals(VALID_DETAIL, VALID_DETAIL);
+
+ // same fields
+ assertEquals(VALID_DETAIL, new Detail("smart"));
+ }
+
+
+}
diff --git a/src/test/java/seedu/address/model/student/admin/FeeTest.java b/src/test/java/seedu/address/model/student/admin/FeeTest.java
new file mode 100644
index 00000000000..542edebf462
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/admin/FeeTest.java
@@ -0,0 +1,47 @@
+package seedu.address.model.student.admin;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+public class FeeTest {
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new Fee(null));
+ }
+
+ @Test
+ public void constructor_invalidFee_throwsIllegalArgumentException() {
+ String invalidFee = "";
+ assertThrows(IllegalArgumentException.class, () -> new Fee(invalidFee));
+ }
+
+ @Test
+ public void isValidFee() {
+ // null fee
+ assertThrows(NullPointerException.class, () -> Fee.isValidFee(null));
+
+ // invalid fees
+ assertFalse(Fee.isValidFee(""));
+ assertFalse(Fee.isValidFee("a"));
+ assertFalse(Fee.isValidFee("b81.1"));
+ assertFalse(Fee.isValidFee("12.a"));
+
+ // valid fees
+ assertTrue(Fee.isValidFee("12.23"));
+ assertTrue(Fee.isValidFee("213123.21"));
+ assertTrue(Fee.isValidFee("324"));
+ assertTrue(Fee.isValidFee("13.4"));
+ }
+
+ @Test
+ public void toString_equals() {
+ assertEquals(new Fee("10").toString(), "$10.00");
+ assertEquals(new Fee("143.12").toString(), "$143.12");
+ assertEquals(new Fee("1036.5").toString(), "$1036.50");
+ }
+}
diff --git a/src/test/java/seedu/address/model/student/admin/OverdueFeePredicateTest.java b/src/test/java/seedu/address/model/student/admin/OverdueFeePredicateTest.java
new file mode 100644
index 00000000000..de820261923
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/admin/OverdueFeePredicateTest.java
@@ -0,0 +1,54 @@
+package seedu.address.model.student.admin;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.model.student.Student;
+import seedu.address.testutil.StudentBuilder;
+
+public class OverdueFeePredicateTest {
+
+ private static final DateTimeFormatter FORMAT = DateTimeFormatter.ofPattern("d/M/yy");
+
+ @Test
+ public void test_studentHasNotPaid_returnsTrue() {
+ LocalDate overDue = LocalDate.now().minusMonths(1).minusDays(1);
+ Student unpaid = new StudentBuilder().withPaymentDate(overDue.format(FORMAT)).build();
+ OverdueFeePredicate predicate = new OverdueFeePredicate();
+ assertTrue(predicate.test(unpaid));
+
+ overDue = LocalDate.now().minusYears(1);
+ unpaid = new StudentBuilder().withPaymentDate(overDue.format(FORMAT)).build();
+ assertTrue(predicate.test(unpaid));
+
+ overDue = LocalDate.now().minusDays(32);
+ unpaid = new StudentBuilder().withPaymentDate(overDue.format(FORMAT)).build();
+ assertTrue(predicate.test(unpaid));
+
+ overDue = LocalDate.now().minusWeeks(5);
+ unpaid = new StudentBuilder().withPaymentDate(overDue.format(FORMAT)).build();
+ assertTrue(predicate.test(unpaid));
+ }
+
+ @Test
+ public void test_studentHasPaid_returnFalse() {
+ LocalDate paidDate = LocalDate.now();
+ Student paid = new StudentBuilder().withPaymentDate(paidDate.format(FORMAT)).build();
+ OverdueFeePredicate predicate = new OverdueFeePredicate();
+ assertFalse(predicate.test(paid));
+
+ paidDate = LocalDate.now().minusDays(10);
+ paid = new StudentBuilder().withPaymentDate(paidDate.format(FORMAT)).build();
+ assertFalse(predicate.test(paid));
+
+ paidDate = LocalDate.now().minusMonths(1).plusDays(1);
+ paid = new StudentBuilder().withPaymentDate(paidDate.format(FORMAT)).build();
+ assertFalse(predicate.test(paid));
+ }
+
+}
diff --git a/src/test/java/seedu/address/model/student/admin/PaymentDateTest.java b/src/test/java/seedu/address/model/student/admin/PaymentDateTest.java
new file mode 100644
index 00000000000..2315a5edf78
--- /dev/null
+++ b/src/test/java/seedu/address/model/student/admin/PaymentDateTest.java
@@ -0,0 +1,92 @@
+package seedu.address.model.student.admin;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+import org.junit.jupiter.api.Test;
+
+public class PaymentDateTest {
+
+ @Test
+ public void constructor_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new PaymentDate(null));
+ }
+
+ @Test
+ public void constructor_invalidDate_throwsIllegalArgumentException() {
+ String[] invalidDates = new String[]{"12-1-31", "32/10/19"};
+ for (String invalidDate : invalidDates) {
+ assertThrows(IllegalArgumentException.class, () -> new PaymentDate(invalidDate));
+ }
+ }
+
+ @Test
+ public void isValidDate_null_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> new PaymentDate(null));
+ }
+
+ @Test
+ public void isValidDate_validValue_returnsTrue() {
+ assertTrue(PaymentDate.isValidDate("12/12/12"));
+ assertTrue(PaymentDate.isValidDate("12/2/12"));
+ assertTrue(PaymentDate.isValidDate("2/12/12"));
+ assertTrue(PaymentDate.isValidDate("2/2/12"));
+ assertTrue(PaymentDate.isValidDate("12/12/2002"));
+ assertTrue(PaymentDate.isValidDate("12/2/2002"));
+ assertTrue(PaymentDate.isValidDate("2/12/2002"));
+ assertTrue(PaymentDate.isValidDate("2/2/2002"));
+ }
+
+ @Test
+ public void isValidDate_invalidFormat_returnsFalse() {
+ assertFalse(PaymentDate.isValidDate("")); // blank
+ assertFalse(PaymentDate.isValidDate("abc")); // not even a date
+ assertFalse(PaymentDate.isValidDate("2-2-22")); // - instead of / to delimit fields
+ assertFalse(PaymentDate.isValidDate("12.2.31")); // . instead of / to delimit fields
+ assertFalse(PaymentDate.isValidDate("2/2")); // missing at least one field
+
+ assertFalse(PaymentDate.isValidDate("2/2/2")); // year has too few characters
+ assertFalse(PaymentDate.isValidDate("2/2/020")); // year has 3 characters instead of 2/4
+ assertFalse(PaymentDate.isValidDate("2/2/22020")); // year has too many characters
+
+ assertFalse(PaymentDate.isValidDate("222/2/2")); // day has too few characters
+ assertFalse(PaymentDate.isValidDate("2/222/020")); // month has 3 characters instead of 2/4
+ }
+
+ @Test
+ public void isValidDate_invalidDate_returnsFalse() {
+ // invalid days
+ assertFalse(PaymentDate.isValidDate("31/11/19"));
+ assertFalse(PaymentDate.isValidDate("31/11/2019"));
+ assertFalse(PaymentDate.isValidDate("32/10/19"));
+ assertFalse(PaymentDate.isValidDate("32/10/2019"));
+ assertFalse(PaymentDate.isValidDate("29/2/19"));
+ assertFalse(PaymentDate.isValidDate("30/2/20"));
+
+ assertFalse(PaymentDate.isValidDate("0/10/19")); // too low
+ assertFalse(PaymentDate.isValidDate("0/10/2019"));
+
+ // invalid months
+ assertFalse(PaymentDate.isValidDate("20/0/19"));
+ assertFalse(PaymentDate.isValidDate("20/13/19"));
+ assertFalse(PaymentDate.isValidDate("20/0/2019"));
+ assertFalse(PaymentDate.isValidDate("20/13/2019"));
+ }
+
+ @Test
+ public void isValidDate_pastPresentFuture() {
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("d/M/yyyy");
+ String future = LocalDate.now().plusDays(1).format(formatter);
+ assertFalse(PaymentDate.isValidDate(future));
+
+ String present = LocalDate.now().format(formatter);
+ assertTrue(PaymentDate.isValidDate(present));
+
+ String past = LocalDate.now().minusDays(1).format(formatter);
+ assertTrue(PaymentDate.isValidDate(past));
+ }
+}
diff --git a/src/test/java/seedu/address/model/tag/TagTest.java b/src/test/java/seedu/address/model/tag/TagTest.java
deleted file mode 100644
index 64d07d79ee2..00000000000
--- a/src/test/java/seedu/address/model/tag/TagTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package seedu.address.model.tag;
-
-import static seedu.address.testutil.Assert.assertThrows;
-
-import org.junit.jupiter.api.Test;
-
-public class TagTest {
-
- @Test
- public void constructor_null_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> new Tag(null));
- }
-
- @Test
- public void constructor_invalidTagName_throwsIllegalArgumentException() {
- String invalidTagName = "";
- assertThrows(IllegalArgumentException.class, () -> new Tag(invalidTagName));
- }
-
- @Test
- public void isValidTagName() {
- // null tag name
- assertThrows(NullPointerException.class, () -> Tag.isValidTagName(null));
- }
-
-}
diff --git a/src/test/java/seedu/address/storage/JsonAdaptedAdminTest.java b/src/test/java/seedu/address/storage/JsonAdaptedAdminTest.java
new file mode 100644
index 00000000000..e26afe6e765
--- /dev/null
+++ b/src/test/java/seedu/address/storage/JsonAdaptedAdminTest.java
@@ -0,0 +1,118 @@
+package seedu.address.storage;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static seedu.address.storage.JsonAdaptedStudent.MISSING_FIELD_MESSAGE_FORMAT;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.TypicalStudents.BOB;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.model.student.admin.ClassTime;
+import seedu.address.model.student.admin.ClassVenue;
+import seedu.address.model.student.admin.Detail;
+import seedu.address.model.student.admin.Fee;
+import seedu.address.model.student.admin.PaymentDate;
+
+public class JsonAdaptedAdminTest {
+ private static final String INVALID_CLASS_VENUE = " "; // blank
+ private static final String INVALID_CLASS_TIME = "000";
+ private static final String INVALID_FEE = "10.!#0";
+ private static final String INVALID_PAYMENT_DATE = "0000";
+ private static final String INVALID_ADDITIONAL_DETAIL = "!@#";
+
+ private static final String VALID_CLASS_VENUE = BOB.getClassVenue().toString();
+ private static final String VALID_CLASS_TIME = BOB.getClassTime().convertClassTimeToUserInputString();
+ private static final String VALID_FEE = BOB.getFee().convertFeeToUserInputString();
+ private static final String VALID_PAYMENT_DATE = BOB.getPaymentDate().getUserInputDate();
+ private static final List<JsonAdaptedDetail> VALID_ADDITIONAL_DETAILS =
+ BOB.getDetails().stream().map(JsonAdaptedDetail::new).collect(Collectors.toList());
+
+
+
+ @Test
+ public void toModelType_validAdmin_returnsAdmin() throws Exception {
+ JsonAdaptedAdmin admin = new JsonAdaptedAdmin(BOB);
+ assertEquals(BOB.getAdmin(), admin.toModelType());
+ }
+
+ @Test
+ public void toModelType_invalidVenue_throwsIllegalValueException() {
+ JsonAdaptedAdmin admin = new JsonAdaptedAdmin(INVALID_CLASS_VENUE, VALID_CLASS_TIME, VALID_FEE,
+ VALID_PAYMENT_DATE, VALID_ADDITIONAL_DETAILS);
+ String expectedMessage = ClassVenue.MESSAGE_CONSTRAINTS;
+ assertThrows(IllegalValueException.class, expectedMessage, admin::toModelType);
+ }
+
+ @Test
+ public void toModelType_nullVenue_throwsIllegalValueException() {
+ JsonAdaptedAdmin admin = new JsonAdaptedAdmin(null, VALID_CLASS_TIME, VALID_FEE, VALID_PAYMENT_DATE,
+ VALID_ADDITIONAL_DETAILS);
+ String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, ClassVenue.class.getSimpleName());
+ assertThrows(IllegalValueException.class, expectedMessage, admin::toModelType);
+ }
+
+ @Test
+ public void toModelType_invalidTime_throwsIllegalValueException() {
+ JsonAdaptedAdmin admin = new JsonAdaptedAdmin(VALID_CLASS_VENUE, INVALID_CLASS_TIME, VALID_FEE,
+ VALID_PAYMENT_DATE, VALID_ADDITIONAL_DETAILS);
+ String expectedMessage = ClassTime.MESSAGE_CONSTRAINTS;
+ assertThrows(IllegalValueException.class, expectedMessage, admin::toModelType);
+ }
+
+ @Test
+ public void toModelType_nullTime_throwsIllegalValueException() {
+ JsonAdaptedAdmin admin = new JsonAdaptedAdmin(VALID_CLASS_VENUE, null, VALID_FEE, VALID_PAYMENT_DATE,
+ VALID_ADDITIONAL_DETAILS);
+ String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, ClassTime.class.getSimpleName());
+ assertThrows(IllegalValueException.class, expectedMessage, admin::toModelType);
+ }
+
+ @Test
+ public void toModelType_invalidFee_throwsIllegalValueException() {
+ JsonAdaptedAdmin admin = new JsonAdaptedAdmin(VALID_CLASS_VENUE, VALID_CLASS_TIME, INVALID_FEE,
+ VALID_PAYMENT_DATE, VALID_ADDITIONAL_DETAILS);
+ String expectedMessage = Fee.MESSAGE_CONSTRAINTS;
+ assertThrows(IllegalValueException.class, expectedMessage, admin::toModelType);
+ }
+
+ @Test
+ public void toModelType_nullFee_throwsIllegalValueException() {
+ JsonAdaptedAdmin admin = new JsonAdaptedAdmin(VALID_CLASS_VENUE, VALID_CLASS_TIME, null, VALID_PAYMENT_DATE,
+ VALID_ADDITIONAL_DETAILS);
+ String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Fee.class.getSimpleName());
+ assertThrows(IllegalValueException.class, expectedMessage, admin::toModelType);
+ }
+
+ @Test
+ public void toModelType_invalidPaymentDate_throwsIllegalValueException() {
+ JsonAdaptedAdmin admin = new JsonAdaptedAdmin(VALID_CLASS_VENUE, VALID_CLASS_TIME, VALID_FEE,
+ INVALID_PAYMENT_DATE, VALID_ADDITIONAL_DETAILS);
+ String expectedMessage = PaymentDate.MESSAGE_CONSTRAINTS;
+ assertThrows(IllegalValueException.class, expectedMessage, admin::toModelType);
+ }
+
+ @Test
+ public void toModelType_nullPaymentDate_throwsIllegalValueException() {
+ JsonAdaptedAdmin admin = new JsonAdaptedAdmin(VALID_CLASS_VENUE, VALID_CLASS_TIME, VALID_FEE, null,
+ VALID_ADDITIONAL_DETAILS);
+ String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, PaymentDate.class.getSimpleName());
+ assertThrows(IllegalValueException.class, expectedMessage, admin::toModelType);
+ }
+
+ @Test
+ public void toModelType_invalidDetails_throwsIllegalValueException() {
+
+ List<JsonAdaptedDetail> invalidDetails = new ArrayList<>(VALID_ADDITIONAL_DETAILS);
+ invalidDetails.add(new JsonAdaptedDetail(INVALID_ADDITIONAL_DETAIL));
+
+ JsonAdaptedAdmin admin = new JsonAdaptedAdmin(INVALID_CLASS_VENUE, VALID_CLASS_TIME, VALID_FEE,
+ VALID_PAYMENT_DATE, invalidDetails);
+ String expectedMessage = Detail.MESSAGE_CONSTRAINTS;
+ assertThrows(IllegalValueException.class, expectedMessage, admin::toModelType);
+ }
+}
diff --git a/src/test/java/seedu/address/storage/JsonAdaptedAttendanceTest.java b/src/test/java/seedu/address/storage/JsonAdaptedAttendanceTest.java
new file mode 100644
index 00000000000..941789a481f
--- /dev/null
+++ b/src/test/java/seedu/address/storage/JsonAdaptedAttendanceTest.java
@@ -0,0 +1,92 @@
+package seedu.address.storage;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static seedu.address.commons.util.DateUtil.parseToDate;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import java.time.LocalDate;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.model.student.academic.Attendance;
+import seedu.address.model.student.academic.Feedback;
+
+public class JsonAdaptedAttendanceTest {
+
+ private static final String PRESENT = "present";
+ private static final String ABSENT = "absent";
+
+ @Test
+ public void toModelType_invalidDate_throwsException() {
+ JsonAdaptedAttendance test = new JsonAdaptedAttendance("", PRESENT, "");
+ assertThrows(IllegalValueException.class, test::toModelType);
+
+ test = new JsonAdaptedAttendance(null, PRESENT, "");
+ assertThrows(IllegalValueException.class, test::toModelType);
+
+ test = new JsonAdaptedAttendance("abc", PRESENT, "");
+ assertThrows(IllegalValueException.class, test::toModelType);
+ }
+
+ @Test
+ public void toModelType_invalidStatus_throwsException() {
+ String dateInput = "10/10/20";
+ String feedbackInput = "sleepy";
+ String invalidPresence = "random";
+
+ JsonAdaptedAttendance test = new JsonAdaptedAttendance(dateInput, null, feedbackInput);
+ assertThrows(IllegalValueException.class, test::toModelType);
+
+ test = new JsonAdaptedAttendance(dateInput, invalidPresence, feedbackInput);
+ assertThrows(IllegalValueException.class, test::toModelType);
+
+ test = new JsonAdaptedAttendance(dateInput, "", feedbackInput);
+ assertThrows(IllegalValueException.class, test::toModelType);
+ }
+
+ @Test
+ public void toModelType_invalidFeedback_throwsException() {
+ String dateInput = "10/10/20";
+ String invalidFeedback = "!n_val!d";
+ JsonAdaptedAttendance test = new JsonAdaptedAttendance(dateInput, PRESENT, invalidFeedback);
+ assertThrows(IllegalValueException.class, test::toModelType);
+
+ test = new JsonAdaptedAttendance(dateInput, PRESENT, null);
+ assertThrows(IllegalValueException.class, test::toModelType);
+ }
+
+ @Test
+ public void toModelType_noFeedback_success() throws Exception {
+ String dateInput = "10/10/20";
+ LocalDate date = parseToDate(dateInput);
+
+ // status = PRESENT
+ Attendance expected = new Attendance(date, true);
+ JsonAdaptedAttendance test = new JsonAdaptedAttendance(dateInput, PRESENT, "");
+ assertEquals(expected, test.toModelType());
+
+ // status = ABSENT
+ expected = new Attendance(date, false);
+ test = new JsonAdaptedAttendance(dateInput, ABSENT, "");
+ assertEquals(expected, test.toModelType());
+ }
+
+ @Test
+ public void toModelType_withFeedback_success() throws Exception {
+ String dateInput = "10/10/20";
+ LocalDate date = parseToDate(dateInput);
+ String feedbackInput = "sleepy";
+ Feedback feedback = new Feedback(feedbackInput);
+
+ // status = PRESENT
+ Attendance expected = new Attendance(date, true, feedback);
+ JsonAdaptedAttendance test = new JsonAdaptedAttendance(dateInput, PRESENT, feedbackInput);
+ assertEquals(expected, test.toModelType());
+
+ // status = ABSENT
+ expected = new Attendance(date, false, feedback);
+ test = new JsonAdaptedAttendance(dateInput, ABSENT, feedbackInput);
+ assertEquals(expected, test.toModelType());
+ }
+}
diff --git a/src/test/java/seedu/address/storage/JsonAdaptedExamTest.java b/src/test/java/seedu/address/storage/JsonAdaptedExamTest.java
new file mode 100644
index 00000000000..c3b914322ac
--- /dev/null
+++ b/src/test/java/seedu/address/storage/JsonAdaptedExamTest.java
@@ -0,0 +1,67 @@
+package seedu.address.storage;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static seedu.address.commons.util.DateUtil.parseToDate;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.model.student.academic.exam.Exam;
+import seedu.address.model.student.academic.exam.Score;
+
+public class JsonAdaptedExamTest {
+
+ private static final String VALID_NAME = "EOY 2020";
+ private static final String VALID_DATE = "14/5/2020";
+ private static final String VALID_SCORE = "30/100";
+
+ @Test
+ public void toModelType_null_throwsException() {
+ JsonAdaptedExam exam = new JsonAdaptedExam(null, VALID_DATE, VALID_SCORE);
+ assertThrows(IllegalValueException.class, exam::toModelType);
+
+ exam = new JsonAdaptedExam(VALID_NAME, null, VALID_SCORE);
+ assertThrows(IllegalValueException.class, exam::toModelType);
+
+ exam = new JsonAdaptedExam(VALID_NAME, VALID_DATE, null);
+ assertThrows(IllegalValueException.class, exam::toModelType);
+ }
+
+ @Test
+ public void toModelType_emptyString_throwsException() {
+ String empty = "";
+
+ JsonAdaptedExam exam = new JsonAdaptedExam(VALID_NAME, VALID_DATE, empty);
+ assertThrows(IllegalValueException.class, exam::toModelType);
+
+ exam = new JsonAdaptedExam(VALID_NAME, empty, VALID_SCORE);
+ assertThrows(IllegalValueException.class, exam::toModelType);
+
+ exam = new JsonAdaptedExam(empty, VALID_DATE, VALID_SCORE);
+ assertThrows(IllegalValueException.class, exam::toModelType);
+ }
+
+ @Test
+ public void toModelType_invalidString_throwsException() {
+ String invalidName = " ";
+ String invalidDate = "23.9.2019";
+ String invalidScore = "50/20";
+
+ JsonAdaptedExam exam = new JsonAdaptedExam(invalidName, VALID_DATE, VALID_SCORE);
+ assertThrows(IllegalValueException.class, exam::toModelType);
+
+ exam = new JsonAdaptedExam(VALID_NAME, invalidDate, VALID_SCORE);
+ assertThrows(IllegalValueException.class, exam::toModelType);
+
+ exam = new JsonAdaptedExam(VALID_NAME, VALID_DATE, invalidScore);
+ assertThrows(IllegalValueException.class, exam::toModelType);
+ }
+
+ @Test
+ public void toModelType_validFields_success() throws Exception {
+ Exam expected = new Exam(VALID_NAME, parseToDate(VALID_DATE), new Score(VALID_SCORE));
+ JsonAdaptedExam exam = new JsonAdaptedExam(VALID_NAME, VALID_DATE, VALID_SCORE);
+ assertEquals(expected, exam.toModelType());
+ }
+}
diff --git a/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java b/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java
deleted file mode 100644
index 83b11331cdb..00000000000
--- a/src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package seedu.address.storage;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static seedu.address.storage.JsonAdaptedPerson.MISSING_FIELD_MESSAGE_FORMAT;
-import static seedu.address.testutil.Assert.assertThrows;
-import static seedu.address.testutil.TypicalPersons.BENSON;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.junit.jupiter.api.Test;
-
-import seedu.address.commons.exceptions.IllegalValueException;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Phone;
-
-public class JsonAdaptedPersonTest {
- private static final String INVALID_NAME = "R@chel";
- private static final String INVALID_PHONE = "+651234";
- private static final String INVALID_ADDRESS = " ";
- private static final String INVALID_EMAIL = "example.com";
- private static final String INVALID_TAG = "#friend";
-
- private static final String VALID_NAME = BENSON.getName().toString();
- private static final String VALID_PHONE = BENSON.getPhone().toString();
- private static final String VALID_EMAIL = BENSON.getEmail().toString();
- private static final String VALID_ADDRESS = BENSON.getAddress().toString();
- private static final List<JsonAdaptedTag> VALID_TAGS = BENSON.getTags().stream()
- .map(JsonAdaptedTag::new)
- .collect(Collectors.toList());
-
- @Test
- public void toModelType_validPersonDetails_returnsPerson() throws Exception {
- JsonAdaptedPerson person = new JsonAdaptedPerson(BENSON);
- assertEquals(BENSON, person.toModelType());
- }
-
- @Test
- public void toModelType_invalidName_throwsIllegalValueException() {
- JsonAdaptedPerson person =
- new JsonAdaptedPerson(INVALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_TAGS);
- String expectedMessage = Name.MESSAGE_CONSTRAINTS;
- assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
- }
-
- @Test
- public void toModelType_nullName_throwsIllegalValueException() {
- JsonAdaptedPerson person = new JsonAdaptedPerson(null, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_TAGS);
- String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Name.class.getSimpleName());
- assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
- }
-
- @Test
- public void toModelType_invalidPhone_throwsIllegalValueException() {
- JsonAdaptedPerson person =
- new JsonAdaptedPerson(VALID_NAME, INVALID_PHONE, VALID_EMAIL, VALID_ADDRESS, VALID_TAGS);
- String expectedMessage = Phone.MESSAGE_CONSTRAINTS;
- assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
- }
-
- @Test
- public void toModelType_nullPhone_throwsIllegalValueException() {
- JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, null, VALID_EMAIL, VALID_ADDRESS, VALID_TAGS);
- String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Phone.class.getSimpleName());
- assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
- }
-
- @Test
- public void toModelType_invalidEmail_throwsIllegalValueException() {
- JsonAdaptedPerson person =
- new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, INVALID_EMAIL, VALID_ADDRESS, VALID_TAGS);
- String expectedMessage = Email.MESSAGE_CONSTRAINTS;
- assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
- }
-
- @Test
- public void toModelType_nullEmail_throwsIllegalValueException() {
- JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, null, VALID_ADDRESS, VALID_TAGS);
- String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Email.class.getSimpleName());
- assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
- }
-
- @Test
- public void toModelType_invalidAddress_throwsIllegalValueException() {
- JsonAdaptedPerson person =
- new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, INVALID_ADDRESS, VALID_TAGS);
- String expectedMessage = Address.MESSAGE_CONSTRAINTS;
- assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
- }
-
- @Test
- public void toModelType_nullAddress_throwsIllegalValueException() {
- JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, null, VALID_TAGS);
- String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Address.class.getSimpleName());
- assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
- }
-
- @Test
- public void toModelType_invalidTags_throwsIllegalValueException() {
- List<JsonAdaptedTag> invalidTags = new ArrayList<>(VALID_TAGS);
- invalidTags.add(new JsonAdaptedTag(INVALID_TAG));
- JsonAdaptedPerson person =
- new JsonAdaptedPerson(VALID_NAME, VALID_PHONE, VALID_EMAIL, VALID_ADDRESS, invalidTags);
- assertThrows(IllegalValueException.class, person::toModelType);
- }
-
-}
diff --git a/src/test/java/seedu/address/storage/JsonAdaptedQuestionTest.java b/src/test/java/seedu/address/storage/JsonAdaptedQuestionTest.java
new file mode 100644
index 00000000000..28766bd4a92
--- /dev/null
+++ b/src/test/java/seedu/address/storage/JsonAdaptedQuestionTest.java
@@ -0,0 +1,89 @@
+package seedu.address.storage;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.StudentBuilder.DEFAULT_QUESTION_NEWTON;
+import static seedu.address.testutil.StudentBuilder.DEFAULT_SOLUTION;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.model.student.academic.question.Question;
+import seedu.address.model.student.academic.question.SolvedQuestion;
+import seedu.address.model.student.academic.question.UnsolvedQuestion;
+
+public class JsonAdaptedQuestionTest {
+
+ private static final String SOLVED = "solved";
+ private static final String UNSOLVED = "unsolved";
+
+ @Test
+ public void toModelType_validQuestion_returnsQuestion() throws Exception {
+ Question question = new UnsolvedQuestion(DEFAULT_QUESTION_NEWTON);
+ assertEquals(question, new JsonAdaptedQuestion(question).toModelType());
+
+ question = new SolvedQuestion(DEFAULT_QUESTION_NEWTON, DEFAULT_SOLUTION);
+ assertEquals(question, new JsonAdaptedQuestion(question).toModelType());
+ }
+
+ @Test
+ public void toModelType_invalidStatus_throwsIllegalArgumentException() {
+ String invalidStatus = "r@nd0m";
+
+ JsonAdaptedQuestion test = new JsonAdaptedQuestion(invalidStatus, DEFAULT_QUESTION_NEWTON, DEFAULT_SOLUTION);
+ assertThrows(IllegalValueException.class, test::toModelType);
+
+ test = new JsonAdaptedQuestion("", DEFAULT_QUESTION_NEWTON, DEFAULT_SOLUTION);
+ assertThrows(IllegalValueException.class, test::toModelType);
+
+ test = new JsonAdaptedQuestion(null, DEFAULT_QUESTION_NEWTON, DEFAULT_SOLUTION);
+ assertThrows(IllegalValueException.class, test::toModelType);
+ }
+
+ @Test
+ public void toModelType_invalidQuestion_throwsIllegalArgumentException() {
+ JsonAdaptedQuestion test = new JsonAdaptedQuestion(SOLVED, "", "");
+ assertThrows(IllegalValueException.class, test::toModelType);
+
+ test = new JsonAdaptedQuestion(SOLVED, " ", DEFAULT_SOLUTION);
+ assertThrows(IllegalValueException.class, test::toModelType);
+ }
+
+ @Test
+ public void toModelType_nullQuestion_throwsIllegalArgumentException() {
+ JsonAdaptedQuestion test = new JsonAdaptedQuestion(UNSOLVED, null, "");
+ assertThrows(IllegalValueException.class, test::toModelType);
+
+ test = new JsonAdaptedQuestion(UNSOLVED, "", "");
+ assertThrows(IllegalValueException.class, test::toModelType);
+
+ test = new JsonAdaptedQuestion(SOLVED, null, DEFAULT_SOLUTION);
+ assertThrows(IllegalValueException.class, test::toModelType);
+
+ test = new JsonAdaptedQuestion(SOLVED, "", DEFAULT_SOLUTION);
+ assertThrows(IllegalValueException.class, test::toModelType);
+ }
+
+ @Test
+ public void toModelType_invalidSolution_throwsIllegalArgumentException() {
+ JsonAdaptedQuestion test = new JsonAdaptedQuestion(SOLVED, DEFAULT_QUESTION_NEWTON, null);
+ assertThrows(IllegalValueException.class, test::toModelType);
+
+ test = new JsonAdaptedQuestion(SOLVED, DEFAULT_QUESTION_NEWTON, "");
+ assertThrows(IllegalValueException.class, test::toModelType);
+
+ test = new JsonAdaptedQuestion(SOLVED, DEFAULT_QUESTION_NEWTON, " ");
+ assertThrows(IllegalValueException.class, test::toModelType);
+ }
+
+ @Test
+ public void toModelType_validInputs_returnsQuestion() throws Exception {
+ Question expected = new SolvedQuestion(DEFAULT_QUESTION_NEWTON, DEFAULT_SOLUTION);
+ JsonAdaptedQuestion test = new JsonAdaptedQuestion(SOLVED, DEFAULT_QUESTION_NEWTON, DEFAULT_SOLUTION);
+ assertEquals(expected, test.toModelType());
+
+ expected = new UnsolvedQuestion(DEFAULT_QUESTION_NEWTON);
+ test = new JsonAdaptedQuestion(UNSOLVED, DEFAULT_QUESTION_NEWTON, "");
+ assertEquals(expected, test.toModelType());
+ }
+}
diff --git a/src/test/java/seedu/address/storage/JsonAdaptedStudentTest.java b/src/test/java/seedu/address/storage/JsonAdaptedStudentTest.java
new file mode 100644
index 00000000000..40433a82484
--- /dev/null
+++ b/src/test/java/seedu/address/storage/JsonAdaptedStudentTest.java
@@ -0,0 +1,119 @@
+package seedu.address.storage;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static seedu.address.storage.JsonAdaptedStudent.MISSING_FIELD_MESSAGE_FORMAT;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.TypicalStudents.BOB;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.model.student.Name;
+import seedu.address.model.student.Phone;
+import seedu.address.model.student.School;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.Year;
+
+public class JsonAdaptedStudentTest {
+ private static final String INVALID_NAME = "R@chel";
+ private static final String INVALID_PHONE = "+651234";
+ private static final String INVALID_SCHOOL = " ";
+ private static final String INVALID_YEAR = "!nval1d!";
+
+ private static final String VALID_NAME = BOB.getName().toString();
+ private static final String VALID_PHONE = BOB.getPhone().toString();
+ private static final String VALID_SCHOOL = BOB.getSchool().toString();
+ private static final String VALID_YEAR = BOB.getYear().toString();
+
+ private static final JsonAdaptedAdmin JSON_ADAPTED_ADMIN = new JsonAdaptedAdmin(BOB);
+ private static final JsonAdaptedAcademic JSON_ADAPTED_ACADEMIC = new JsonAdaptedAcademic(BOB);
+
+ @Test
+ public void toModelType_validStudentDetails_returnsStudent() throws Exception {
+ JsonAdaptedStudent student = new JsonAdaptedStudent(BOB);
+ Student bob = BOB;
+ assertEquals(bob, student.toModelType());
+ }
+
+ @Test
+ public void toModelType_invalidName_throwsIllegalValueException() {
+ JsonAdaptedStudent student =
+ new JsonAdaptedStudent(INVALID_NAME, VALID_PHONE, VALID_SCHOOL, VALID_YEAR,
+ JSON_ADAPTED_ADMIN, JSON_ADAPTED_ACADEMIC);
+ String expectedMessage = Name.MESSAGE_CONSTRAINTS;
+ assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
+ }
+
+ @Test
+ public void toModelType_nullName_throwsIllegalValueException() {
+ JsonAdaptedStudent student = new JsonAdaptedStudent(null, VALID_PHONE, VALID_SCHOOL, VALID_YEAR,
+ JSON_ADAPTED_ADMIN, JSON_ADAPTED_ACADEMIC);
+ String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Name.class.getSimpleName());
+ assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
+ }
+
+ @Test
+ public void toModelType_invalidPhone_throwsIllegalValueException() {
+ JsonAdaptedStudent student =
+ new JsonAdaptedStudent(VALID_NAME, INVALID_PHONE, VALID_SCHOOL, VALID_YEAR,
+ JSON_ADAPTED_ADMIN, JSON_ADAPTED_ACADEMIC);
+ String expectedMessage = Phone.MESSAGE_CONSTRAINTS;
+ assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
+ }
+
+ @Test
+ public void toModelType_nullPhone_throwsIllegalValueException() {
+ JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, null, VALID_SCHOOL, VALID_YEAR,
+ JSON_ADAPTED_ADMIN, JSON_ADAPTED_ACADEMIC);
+ String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Phone.class.getSimpleName());
+ assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
+ }
+
+ @Test
+ public void toModelType_invalidSchool_throwsIllegalValueException() {
+ JsonAdaptedStudent student =
+ new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, INVALID_SCHOOL, VALID_YEAR,
+ JSON_ADAPTED_ADMIN, JSON_ADAPTED_ACADEMIC);
+ String expectedMessage = School.MESSAGE_CONSTRAINTS;
+ assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
+ }
+
+ @Test
+ public void toModelType_nullSchool_throwsIllegalValueException() {
+ JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, null, VALID_YEAR,
+ JSON_ADAPTED_ADMIN, JSON_ADAPTED_ACADEMIC);
+ String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, School.class.getSimpleName());
+ assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
+ }
+
+ @Test
+ public void toModelType_invalidYear_throwsIllegalValueException() {
+ JsonAdaptedStudent student =
+ new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_SCHOOL, INVALID_YEAR,
+ JSON_ADAPTED_ADMIN, JSON_ADAPTED_ACADEMIC);
+ String expectedMessage = Year.MESSAGE_CONSTRAINTS;
+ assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
+ }
+
+ @Test
+ public void toModelType_nullYear_throwsIllegalValueException() {
+ JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_SCHOOL, null,
+ JSON_ADAPTED_ADMIN, JSON_ADAPTED_ACADEMIC);
+ String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Year.class.getSimpleName());
+ assertThrows(IllegalValueException.class, expectedMessage, student::toModelType);
+ }
+
+ @Test
+ public void toModelType_nullAdmin_throwsIllegalValueException() {
+ JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_SCHOOL, VALID_YEAR,
+ null, JSON_ADAPTED_ACADEMIC);
+ assertThrows(IllegalValueException.class, student::toModelType);
+ }
+
+ @Test
+ public void toModelType_nullAcademic_throwsIllegalValueException() {
+ JsonAdaptedStudent student = new JsonAdaptedStudent(VALID_NAME, VALID_PHONE, VALID_SCHOOL, VALID_YEAR,
+ JSON_ADAPTED_ADMIN, null);
+ assertThrows(IllegalValueException.class, student::toModelType);
+ }
+}
diff --git a/src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java b/src/test/java/seedu/address/storage/JsonReeveStorageTest.java
similarity index 68%
rename from src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java
rename to src/test/java/seedu/address/storage/JsonReeveStorageTest.java
index ac3c3af9566..609ab0160f1 100644
--- a/src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java
+++ b/src/test/java/seedu/address/storage/JsonReeveStorageTest.java
@@ -3,10 +3,10 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static seedu.address.testutil.Assert.assertThrows;
-import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.HOON;
-import static seedu.address.testutil.TypicalPersons.IDA;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalStudents.ALICE;
+import static seedu.address.testutil.TypicalStudents.HOON;
+import static seedu.address.testutil.TypicalStudents.IDA;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
import java.io.IOException;
import java.nio.file.Path;
@@ -16,10 +16,10 @@
import org.junit.jupiter.api.io.TempDir;
import seedu.address.commons.exceptions.DataConversionException;
-import seedu.address.model.AddressBook;
-import seedu.address.model.ReadOnlyAddressBook;
+import seedu.address.model.ReadOnlyReeve;
+import seedu.address.model.Reeve;
-public class JsonAddressBookStorageTest {
+public class JsonReeveStorageTest {
private static final Path TEST_DATA_FOLDER = Paths.get("src", "test", "data", "JsonAddressBookStorageTest");
@TempDir
@@ -30,8 +30,8 @@ public void readAddressBook_nullFilePath_throwsNullPointerException() {
assertThrows(NullPointerException.class, () -> readAddressBook(null));
}
- private java.util.Optional<ReadOnlyAddressBook> readAddressBook(String filePath) throws Exception {
- return new JsonAddressBookStorage(Paths.get(filePath)).readAddressBook(addToTestDataPathIfNotNull(filePath));
+ private java.util.Optional<ReadOnlyReeve> readAddressBook(String filePath) throws Exception {
+ return new JsonReeveStorage(Paths.get(filePath)).readAddressBook(addToTestDataPathIfNotNull(filePath));
}
private Path addToTestDataPathIfNotNull(String prefsFileInTestDataFolder) {
@@ -52,37 +52,37 @@ public void read_notJsonFormat_exceptionThrown() {
@Test
public void readAddressBook_invalidPersonAddressBook_throwDataConversionException() {
- assertThrows(DataConversionException.class, () -> readAddressBook("invalidPersonAddressBook.json"));
+ assertThrows(DataConversionException.class, () -> readAddressBook("invalidStudentReeve.json"));
}
@Test
public void readAddressBook_invalidAndValidPersonAddressBook_throwDataConversionException() {
- assertThrows(DataConversionException.class, () -> readAddressBook("invalidAndValidPersonAddressBook.json"));
+ assertThrows(DataConversionException.class, () -> readAddressBook("invalidAndValidStudentReeve.json"));
}
@Test
public void readAndSaveAddressBook_allInOrder_success() throws Exception {
Path filePath = testFolder.resolve("TempAddressBook.json");
- AddressBook original = getTypicalAddressBook();
- JsonAddressBookStorage jsonAddressBookStorage = new JsonAddressBookStorage(filePath);
+ Reeve original = getTypicalAddressBook();
+ JsonReeveStorage jsonAddressBookStorage = new JsonReeveStorage(filePath);
// Save in new file and read back
jsonAddressBookStorage.saveAddressBook(original, filePath);
- ReadOnlyAddressBook readBack = jsonAddressBookStorage.readAddressBook(filePath).get();
- assertEquals(original, new AddressBook(readBack));
+ ReadOnlyReeve readBack = jsonAddressBookStorage.readAddressBook(filePath).get();
+ assertEquals(original, new Reeve(readBack));
// Modify data, overwrite exiting file, and read back
- original.addPerson(HOON);
- original.removePerson(ALICE);
+ original.addStudent(HOON);
+ original.removeStudent(ALICE);
jsonAddressBookStorage.saveAddressBook(original, filePath);
readBack = jsonAddressBookStorage.readAddressBook(filePath).get();
- assertEquals(original, new AddressBook(readBack));
+ assertEquals(original, new Reeve(readBack));
// Save and read without specifying file path
- original.addPerson(IDA);
+ original.addStudent(IDA);
jsonAddressBookStorage.saveAddressBook(original); // file path not specified
readBack = jsonAddressBookStorage.readAddressBook().get(); // file path not specified
- assertEquals(original, new AddressBook(readBack));
+ assertEquals(original, new Reeve(readBack));
}
@@ -94,9 +94,9 @@ public void saveAddressBook_nullAddressBook_throwsNullPointerException() {
/**
* Saves {@code addressBook} at the specified {@code filePath}.
*/
- private void saveAddressBook(ReadOnlyAddressBook addressBook, String filePath) {
+ private void saveAddressBook(ReadOnlyReeve addressBook, String filePath) {
try {
- new JsonAddressBookStorage(Paths.get(filePath))
+ new JsonReeveStorage(Paths.get(filePath))
.saveAddressBook(addressBook, addToTestDataPathIfNotNull(filePath));
} catch (IOException ioe) {
throw new AssertionError("There should not be an error writing to the file.", ioe);
@@ -105,6 +105,6 @@ private void saveAddressBook(ReadOnlyAddressBook addressBook, String filePath) {
@Test
public void saveAddressBook_nullFilePath_throwsNullPointerException() {
- assertThrows(NullPointerException.class, () -> saveAddressBook(new AddressBook(), null));
+ assertThrows(NullPointerException.class, () -> saveAddressBook(new Reeve(), null));
}
}
diff --git a/src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java b/src/test/java/seedu/address/storage/JsonSerializableReeveTest.java
similarity index 53%
rename from src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java
rename to src/test/java/seedu/address/storage/JsonSerializableReeveTest.java
index 188c9058d20..c5474bce430 100644
--- a/src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java
+++ b/src/test/java/seedu/address/storage/JsonSerializableReeveTest.java
@@ -10,37 +10,37 @@
import seedu.address.commons.exceptions.IllegalValueException;
import seedu.address.commons.util.JsonUtil;
-import seedu.address.model.AddressBook;
-import seedu.address.testutil.TypicalPersons;
+import seedu.address.model.Reeve;
+import seedu.address.testutil.TypicalStudents;
-public class JsonSerializableAddressBookTest {
+public class JsonSerializableReeveTest {
private static final Path TEST_DATA_FOLDER = Paths.get("src", "test", "data", "JsonSerializableAddressBookTest");
- private static final Path TYPICAL_PERSONS_FILE = TEST_DATA_FOLDER.resolve("typicalPersonsAddressBook.json");
- private static final Path INVALID_PERSON_FILE = TEST_DATA_FOLDER.resolve("invalidPersonAddressBook.json");
- private static final Path DUPLICATE_PERSON_FILE = TEST_DATA_FOLDER.resolve("duplicatePersonAddressBook.json");
+ private static final Path TYPICAL_PERSONS_FILE = TEST_DATA_FOLDER.resolve("typicalStudentsReeve.json");
+ private static final Path INVALID_PERSON_FILE = TEST_DATA_FOLDER.resolve("invalidStudentReeve.json");
+ private static final Path DUPLICATE_PERSON_FILE = TEST_DATA_FOLDER.resolve("duplicateStudentReeve.json");
@Test
public void toModelType_typicalPersonsFile_success() throws Exception {
- JsonSerializableAddressBook dataFromFile = JsonUtil.readJsonFile(TYPICAL_PERSONS_FILE,
- JsonSerializableAddressBook.class).get();
- AddressBook addressBookFromFile = dataFromFile.toModelType();
- AddressBook typicalPersonsAddressBook = TypicalPersons.getTypicalAddressBook();
- assertEquals(addressBookFromFile, typicalPersonsAddressBook);
+ JsonSerializableReeve dataFromFile = JsonUtil.readJsonFile(TYPICAL_PERSONS_FILE,
+ JsonSerializableReeve.class).get();
+ Reeve reeveFromFile = dataFromFile.toModelType();
+ Reeve typicalPersonsReeve = TypicalStudents.getTypicalAddressBook();
+ assertEquals(reeveFromFile, typicalPersonsReeve);
}
@Test
public void toModelType_invalidPersonFile_throwsIllegalValueException() throws Exception {
- JsonSerializableAddressBook dataFromFile = JsonUtil.readJsonFile(INVALID_PERSON_FILE,
- JsonSerializableAddressBook.class).get();
+ JsonSerializableReeve dataFromFile = JsonUtil.readJsonFile(INVALID_PERSON_FILE,
+ JsonSerializableReeve.class).get();
assertThrows(IllegalValueException.class, dataFromFile::toModelType);
}
@Test
public void toModelType_duplicatePersons_throwsIllegalValueException() throws Exception {
- JsonSerializableAddressBook dataFromFile = JsonUtil.readJsonFile(DUPLICATE_PERSON_FILE,
- JsonSerializableAddressBook.class).get();
- assertThrows(IllegalValueException.class, JsonSerializableAddressBook.MESSAGE_DUPLICATE_PERSON,
+ JsonSerializableReeve dataFromFile = JsonUtil.readJsonFile(DUPLICATE_PERSON_FILE,
+ JsonSerializableReeve.class).get();
+ assertThrows(IllegalValueException.class, JsonSerializableReeve.MESSAGE_DUPLICATE_STUDENT,
dataFromFile::toModelType);
}
diff --git a/src/test/java/seedu/address/storage/StorageManagerTest.java b/src/test/java/seedu/address/storage/StorageManagerTest.java
index 99a16548970..e44180860ae 100644
--- a/src/test/java/seedu/address/storage/StorageManagerTest.java
+++ b/src/test/java/seedu/address/storage/StorageManagerTest.java
@@ -2,7 +2,8 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalStudents.getTypicalAddressBook;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
import java.nio.file.Path;
@@ -11,9 +12,12 @@
import org.junit.jupiter.api.io.TempDir;
import seedu.address.commons.core.GuiSettings;
-import seedu.address.model.AddressBook;
-import seedu.address.model.ReadOnlyAddressBook;
+import seedu.address.model.ReadOnlyReeve;
+import seedu.address.model.Reeve;
import seedu.address.model.UserPrefs;
+import seedu.address.model.notes.Notebook;
+import seedu.address.model.notes.ReadOnlyNotebook;
+import seedu.address.storage.notes.JsonNotebookStorage;
public class StorageManagerTest {
@@ -24,9 +28,11 @@ public class StorageManagerTest {
@BeforeEach
public void setUp() {
- JsonAddressBookStorage addressBookStorage = new JsonAddressBookStorage(getTempFilePath("ab"));
+ JsonReeveStorage addressBookStorage = new JsonReeveStorage(getTempFilePath("ab"));
JsonUserPrefsStorage userPrefsStorage = new JsonUserPrefsStorage(getTempFilePath("prefs"));
- storageManager = new StorageManager(addressBookStorage, userPrefsStorage);
+ JsonNotebookStorage notebookStorage = new JsonNotebookStorage(getTempFilePath("notebook"));
+
+ storageManager = new StorageManager(addressBookStorage, userPrefsStorage, notebookStorage);
}
private Path getTempFilePath(String fileName) {
@@ -54,10 +60,22 @@ public void addressBookReadSave() throws Exception {
* {@link JsonAddressBookStorage} class.
* More extensive testing of UserPref saving/reading is done in {@link JsonAddressBookStorageTest} class.
*/
- AddressBook original = getTypicalAddressBook();
+ Reeve original = getTypicalAddressBook();
storageManager.saveAddressBook(original);
- ReadOnlyAddressBook retrieved = storageManager.readAddressBook().get();
- assertEquals(original, new AddressBook(retrieved));
+ ReadOnlyReeve retrieved = storageManager.readAddressBook().get();
+ assertEquals(original, new Reeve(retrieved));
+ }
+
+ @Test
+ public void notebookReadSave() throws Exception {
+ /*
+ * Note: This is an integration test that verifies the StorageManager is properly wired to the
+ * {@link JsonNotebookStorage} class.
+ */
+ Notebook original = getTypicalNotebook();
+ storageManager.saveNotebook(original);
+ ReadOnlyNotebook retrieved = storageManager.readNotebook().get();
+ assertEquals(original, new Notebook(retrieved));
}
@Test
@@ -65,4 +83,9 @@ public void getAddressBookFilePath() {
assertNotNull(storageManager.getAddressBookFilePath());
}
+ @Test
+ public void getNotebookFilePath() {
+ assertNotNull(storageManager.getNotebookFilePath());
+ }
+
}
diff --git a/src/test/java/seedu/address/storage/notes/JsonAdaptedNoteTest.java b/src/test/java/seedu/address/storage/notes/JsonAdaptedNoteTest.java
new file mode 100644
index 00000000000..e0e58731fc0
--- /dev/null
+++ b/src/test/java/seedu/address/storage/notes/JsonAdaptedNoteTest.java
@@ -0,0 +1,58 @@
+package seedu.address.storage.notes;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static seedu.address.storage.notes.JsonAdaptedNote.MISSING_FIELD_MESSAGE_FORMAT;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.notes.TypicalNotes.NOTE_GRADUATION;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.model.notes.note.Description;
+import seedu.address.model.notes.note.Title;
+
+public class JsonAdaptedNoteTest {
+ private static final String INVALID_TITLE = "Lorem ipsum dolor sit amet hehe";
+ private static final String INVALID_DESCRIPTION = "Lorem ipsum dolor sit amet"
+ + ", consectetur adipiscing elit. Integer dapibus sapienar";
+
+ private static final String VALID_TITLE = NOTE_GRADUATION.getTitle().toString();
+ private static final String VALID_DESCRIPTION = NOTE_GRADUATION.getDescription().toString();
+
+ @Test
+ public void toModelType_validStudentDetails_returnsStudent() throws Exception {
+ JsonAdaptedNote note = new JsonAdaptedNote(NOTE_GRADUATION);
+ assertEquals(NOTE_GRADUATION, note.toModelType());
+ }
+
+ @Test
+ public void toModelType_invalidTitle_throwsIllegalValueException() {
+ JsonAdaptedNote note = new JsonAdaptedNote(INVALID_TITLE, VALID_DESCRIPTION);
+ String expectedMessage = Title.MESSAGE_CONSTRAINTS;
+ assertThrows(IllegalValueException.class, expectedMessage, note::toModelType);
+ }
+
+ @Test
+ public void toModelType_nullName_throwsIllegalValueException() {
+ JsonAdaptedNote note = new JsonAdaptedNote(null, VALID_DESCRIPTION);
+ String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT,
+ Title.class.getSimpleName());
+ assertThrows(IllegalValueException.class, expectedMessage, note::toModelType);
+ }
+
+ @Test
+ public void toModelType_invalidDescription_throwsIllegalValueException() {
+ JsonAdaptedNote note = new JsonAdaptedNote(VALID_TITLE, INVALID_DESCRIPTION);
+ String expectedMessage = Description.MESSAGE_CONSTRAINTS;
+ assertThrows(IllegalValueException.class, expectedMessage, note::toModelType);
+ }
+
+ @Test
+ public void toModelType_nullDescription_throwsIllegalValueException() {
+ JsonAdaptedNote note = new JsonAdaptedNote(VALID_TITLE, null);
+ String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT,
+ Description.class.getSimpleName());
+ assertThrows(IllegalValueException.class, expectedMessage, note::toModelType);
+ }
+
+}
diff --git a/src/test/java/seedu/address/storage/notes/JsonNotebookStorageTest.java b/src/test/java/seedu/address/storage/notes/JsonNotebookStorageTest.java
new file mode 100644
index 00000000000..6f1d12f6da0
--- /dev/null
+++ b/src/test/java/seedu/address/storage/notes/JsonNotebookStorageTest.java
@@ -0,0 +1,110 @@
+package seedu.address.storage.notes;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static seedu.address.testutil.Assert.assertThrows;
+import static seedu.address.testutil.notes.TypicalNotes.NOTE_BUY_COFFEE;
+import static seedu.address.testutil.notes.TypicalNotes.NOTE_EVENTS;
+import static seedu.address.testutil.notes.TypicalNotes.NOTE_TODO;
+import static seedu.address.testutil.notes.TypicalNotes.getTypicalNotebook;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import seedu.address.commons.exceptions.DataConversionException;
+import seedu.address.model.notes.Notebook;
+import seedu.address.model.notes.ReadOnlyNotebook;
+
+public class JsonNotebookStorageTest {
+ private static final Path TEST_DATA_FOLDER = Paths.get("src", "test", "data", "JsonNotebookStorageTest");
+
+ @TempDir
+ public Path testFolder;
+
+ @Test
+ public void readNotebook_nullFilePath_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> readNotebook(null));
+ }
+
+ private java.util.Optional<ReadOnlyNotebook> readNotebook(String filePath) throws Exception {
+ return new JsonNotebookStorage(Paths.get(filePath)).readNotebook(addToTestDataPathIfNotNull(filePath));
+ }
+
+ private Path addToTestDataPathIfNotNull(String prefsFileInTestDataFolder) {
+ return prefsFileInTestDataFolder != null
+ ? TEST_DATA_FOLDER.resolve(prefsFileInTestDataFolder)
+ : null;
+ }
+
+ @Test
+ public void read_missingFile_emptyResult() throws Exception {
+ assertFalse(readNotebook("NonExistentFile.json").isPresent());
+ }
+
+ @Test
+ public void read_notJsonFormat_exceptionThrown() {
+ assertThrows(DataConversionException.class, () -> readNotebook("notJsonFormatNotebook.json"));
+ }
+
+ @Test
+ public void readNotebook_invalidNoteNotebook_throwDataConversionException() {
+ assertThrows(DataConversionException.class, () -> readNotebook("invalidNoteNotebook.json"));
+ }
+
+ @Test
+ public void readNotebook_invalidAndValidNoteNotebook_throwDataConversionException() {
+ assertThrows(DataConversionException.class, () -> readNotebook("invalidAndValidNoteNotebook.json"));
+ }
+
+ @Test
+ public void readAndSaveNotebook_allInOrder_success() throws Exception {
+ Path filePath = testFolder.resolve("TempNotebook.json");
+ Notebook original = getTypicalNotebook();
+ JsonNotebookStorage jsonNotebookStorage = new JsonNotebookStorage(filePath);
+
+ // Save in new file and read back
+ jsonNotebookStorage.saveNotebook(original, filePath);
+ ReadOnlyNotebook readBack = jsonNotebookStorage.readNotebook(filePath).get();
+ assertEquals(original, new Notebook(readBack));
+
+ // Modify data, overwrite exiting file, and read back
+ original.addNote(NOTE_TODO);
+ original.removeNote(NOTE_BUY_COFFEE);
+ jsonNotebookStorage.saveNotebook(original, filePath);
+ readBack = jsonNotebookStorage.readNotebook(filePath).get();
+ assertEquals(original, new Notebook(readBack));
+
+ // Save and read without specifying file path
+ original.addNote(NOTE_EVENTS);
+ jsonNotebookStorage.saveNotebook(original); // file path not specified
+ readBack = jsonNotebookStorage.readNotebook().get(); // file path not specified
+ assertEquals(original, new Notebook(readBack));
+
+ }
+
+ @Test
+ public void saveNotebook_nullNotebook_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> saveNotebook(null, "SomeFile.json"));
+ }
+
+ /**
+ * Saves {@code notebook} at the specified {@code filePath}.
+ */
+ private void saveNotebook(ReadOnlyNotebook notebook, String filePath) {
+ try {
+ new JsonNotebookStorage(Paths.get(filePath))
+ .saveNotebook(notebook, addToTestDataPathIfNotNull(filePath));
+ } catch (IOException ioe) {
+ throw new AssertionError("There should not be an error writing to the file.", ioe);
+ }
+ }
+
+ @Test
+ public void saveNotebook_nullFilePath_throwsNullPointerException() {
+ assertThrows(NullPointerException.class, () -> saveNotebook(new Notebook(), null));
+ }
+}
diff --git a/src/test/java/seedu/address/storage/notes/JsonSerializableNotebookTest.java b/src/test/java/seedu/address/storage/notes/JsonSerializableNotebookTest.java
new file mode 100644
index 00000000000..423837886ac
--- /dev/null
+++ b/src/test/java/seedu/address/storage/notes/JsonSerializableNotebookTest.java
@@ -0,0 +1,47 @@
+package seedu.address.storage.notes;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static seedu.address.testutil.Assert.assertThrows;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.commons.util.JsonUtil;
+import seedu.address.model.notes.Notebook;
+import seedu.address.testutil.notes.TypicalNotes;
+
+public class JsonSerializableNotebookTest {
+
+ private static final Path TEST_DATA_FOLDER = Paths.get("src", "test", "data", "JsonSerializableNotebookTest");
+ private static final Path TYPICAL_NOTES_FILE = TEST_DATA_FOLDER.resolve("typicalNotesNotebook.json");
+ private static final Path INVALID_NOTES_FILE = TEST_DATA_FOLDER.resolve("invalidNoteNotebook.json");
+ private static final Path DUPLICATE_NOTES_FILE = TEST_DATA_FOLDER.resolve("duplicateNoteNotebook.json");
+
+ @Test
+ public void toModelType_typicalNotesFile_success() throws Exception {
+ JsonSerializableNotebook dataFromFile = JsonUtil.readJsonFile(TYPICAL_NOTES_FILE,
+ JsonSerializableNotebook.class).get();
+ Notebook notebookFromFile = dataFromFile.toModelType();
+ Notebook typicalNotesReeve = TypicalNotes.getTypicalNotebook();
+ assertEquals(notebookFromFile, typicalNotesReeve);
+ }
+
+ @Test
+ public void toModelType_invalidNotesFile_throwsIllegalValueException() throws Exception {
+ JsonSerializableNotebook dataFromFile = JsonUtil.readJsonFile(INVALID_NOTES_FILE,
+ JsonSerializableNotebook.class).get();
+ assertThrows(IllegalValueException.class, dataFromFile::toModelType);
+ }
+
+ @Test
+ public void toModelType_duplicateNotes_throwsIllegalValueException() throws Exception {
+ JsonSerializableNotebook dataFromFile = JsonUtil.readJsonFile(DUPLICATE_NOTES_FILE,
+ JsonSerializableNotebook.class).get();
+ assertThrows(IllegalValueException.class, JsonSerializableNotebook.MESSAGE_DUPLICATE_NOTE,
+ dataFromFile::toModelType);
+ }
+
+}
diff --git a/src/test/java/seedu/address/testutil/AddressBookBuilder.java b/src/test/java/seedu/address/testutil/AddressBookBuilder.java
deleted file mode 100644
index d53799fd110..00000000000
--- a/src/test/java/seedu/address/testutil/AddressBookBuilder.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package seedu.address.testutil;
-
-import seedu.address.model.AddressBook;
-import seedu.address.model.person.Person;
-
-/**
- * A utility class to help with building Addressbook objects.
- * Example usage: <br>
- * {@code AddressBook ab = new AddressBookBuilder().withPerson("John", "Doe").build();}
- */
-public class AddressBookBuilder {
-
- private AddressBook addressBook;
-
- public AddressBookBuilder() {
- addressBook = new AddressBook();
- }
-
- public AddressBookBuilder(AddressBook addressBook) {
- this.addressBook = addressBook;
- }
-
- /**
- * Adds a new {@code Person} to the {@code AddressBook} that we are building.
- */
- public AddressBookBuilder withPerson(Person person) {
- addressBook.addPerson(person);
- return this;
- }
-
- public AddressBook build() {
- return addressBook;
- }
-}
diff --git a/src/test/java/seedu/address/testutil/EditAdminDescriptorBuilder.java b/src/test/java/seedu/address/testutil/EditAdminDescriptorBuilder.java
new file mode 100644
index 00000000000..47a33fa5913
--- /dev/null
+++ b/src/test/java/seedu/address/testutil/EditAdminDescriptorBuilder.java
@@ -0,0 +1,71 @@
+package seedu.address.testutil;
+
+import seedu.address.logic.commands.EditCommand.EditAdminDescriptor;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.admin.ClassTime;
+import seedu.address.model.student.admin.ClassVenue;
+import seedu.address.model.student.admin.Fee;
+import seedu.address.model.student.admin.PaymentDate;
+
+/**
+ * A utility class to help with building EditPersonDescriptor objects.
+ */
+public class EditAdminDescriptorBuilder {
+
+ private EditAdminDescriptor descriptor;
+
+ public EditAdminDescriptorBuilder() {
+ descriptor = new EditAdminDescriptor();
+ }
+
+ public EditAdminDescriptorBuilder(EditAdminDescriptor descriptor) {
+ this.descriptor = new EditAdminDescriptor(descriptor);
+ }
+
+ /**
+ * Returns an {@code EditPersonDescriptor} with fields containing {@code person}'s details
+ */
+ public EditAdminDescriptorBuilder(Student student) {
+ descriptor = new EditAdminDescriptor();
+ descriptor.setTime(student.getClassTime());
+ descriptor.setVenue(student.getClassVenue());
+ descriptor.setFee(student.getFee());
+ descriptor.setPaymentDate(student.getPaymentDate());
+ }
+
+ /**
+ * Sets the {@code Venue} of the {@code EditAdminDescriptor} that we are building.
+ */
+ public EditAdminDescriptorBuilder withVenue(String venue) {
+ descriptor.setVenue(new ClassVenue(venue));
+ return this;
+ }
+
+ /**
+ * Sets the {@code Time} of the {@code EditAdminDescriptor} that we are building.
+ */
+ public EditAdminDescriptorBuilder withTime(String time) {
+ descriptor.setTime(new ClassTime(time));
+ return this;
+ }
+
+ /**
+ * Sets the {@code Fee} of the {@code EditAdminDescriptor} that we are building.
+ */
+ public EditAdminDescriptorBuilder withFee(String fee) {
+ descriptor.setFee(new Fee(fee));
+ return this;
+ }
+
+ /**
+ * Sets the {@code PaymentDate} of the {@code EditAdminDescriptor} that we are building.
+ */
+ public EditAdminDescriptorBuilder withPaymentDate(String paymentDate) {
+ descriptor.setPaymentDate(new PaymentDate(paymentDate));
+ return this;
+ }
+
+ public EditAdminDescriptor build() {
+ return descriptor;
+ }
+}
diff --git a/src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java b/src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java
deleted file mode 100644
index 4584bd5044e..00000000000
--- a/src/test/java/seedu/address/testutil/EditPersonDescriptorBuilder.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package seedu.address.testutil;
-
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-
-/**
- * A utility class to help with building EditPersonDescriptor objects.
- */
-public class EditPersonDescriptorBuilder {
-
- private EditPersonDescriptor descriptor;
-
- public EditPersonDescriptorBuilder() {
- descriptor = new EditPersonDescriptor();
- }
-
- public EditPersonDescriptorBuilder(EditPersonDescriptor descriptor) {
- this.descriptor = new EditPersonDescriptor(descriptor);
- }
-
- /**
- * Returns an {@code EditPersonDescriptor} with fields containing {@code person}'s details
- */
- public EditPersonDescriptorBuilder(Person person) {
- descriptor = new EditPersonDescriptor();
- descriptor.setName(person.getName());
- descriptor.setPhone(person.getPhone());
- descriptor.setEmail(person.getEmail());
- descriptor.setAddress(person.getAddress());
- descriptor.setTags(person.getTags());
- }
-
- /**
- * Sets the {@code Name} of the {@code EditPersonDescriptor} that we are building.
- */
- public EditPersonDescriptorBuilder withName(String name) {
- descriptor.setName(new Name(name));
- return this;
- }
-
- /**
- * Sets the {@code Phone} of the {@code EditPersonDescriptor} that we are building.
- */
- public EditPersonDescriptorBuilder withPhone(String phone) {
- descriptor.setPhone(new Phone(phone));
- return this;
- }
-
- /**
- * Sets the {@code Email} of the {@code EditPersonDescriptor} that we are building.
- */
- public EditPersonDescriptorBuilder withEmail(String email) {
- descriptor.setEmail(new Email(email));
- return this;
- }
-
- /**
- * Sets the {@code Address} of the {@code EditPersonDescriptor} that we are building.
- */
- public EditPersonDescriptorBuilder withAddress(String address) {
- descriptor.setAddress(new Address(address));
- return this;
- }
-
- /**
- * Parses the {@code tags} into a {@code Set<Tag>} and set it to the {@code EditPersonDescriptor}
- * that we are building.
- */
- public EditPersonDescriptorBuilder withTags(String... tags) {
- Set<Tag> tagSet = Stream.of(tags).map(Tag::new).collect(Collectors.toSet());
- descriptor.setTags(tagSet);
- return this;
- }
-
- public EditPersonDescriptor build() {
- return descriptor;
- }
-}
diff --git a/src/test/java/seedu/address/testutil/EditStudentDescriptorBuilder.java b/src/test/java/seedu/address/testutil/EditStudentDescriptorBuilder.java
new file mode 100644
index 00000000000..b0a5e0b933c
--- /dev/null
+++ b/src/test/java/seedu/address/testutil/EditStudentDescriptorBuilder.java
@@ -0,0 +1,71 @@
+package seedu.address.testutil;
+
+import seedu.address.logic.commands.EditCommand.EditStudentDescriptor;
+import seedu.address.model.student.Name;
+import seedu.address.model.student.Phone;
+import seedu.address.model.student.School;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.Year;
+
+/**
+ * A utility class to help with building EditStudentDescriptor objects.
+ */
+public class EditStudentDescriptorBuilder {
+
+ private EditStudentDescriptor descriptor;
+
+ public EditStudentDescriptorBuilder() {
+ descriptor = new EditStudentDescriptor();
+ }
+
+ public EditStudentDescriptorBuilder(EditStudentDescriptor descriptor) {
+ this.descriptor = new EditStudentDescriptor(descriptor);
+ }
+
+ /**
+ * Returns an {@code EditStudentDescriptor} with fields containing {@code student}'s details
+ */
+ public EditStudentDescriptorBuilder(Student student) {
+ descriptor = new EditStudentDescriptor();
+ descriptor.setName(student.getName());
+ descriptor.setPhone(student.getPhone());
+ descriptor.setSchool(student.getSchool());
+ descriptor.setYear(student.getYear());
+ }
+
+ /**
+ * Sets the {@code Name} of the {@code EditStudentDescriptor} that we are building.
+ */
+ public EditStudentDescriptorBuilder withName(String name) {
+ descriptor.setName(new Name(name));
+ return this;
+ }
+
+ /**
+ * Sets the {@code Phone} of the {@code EditStudentDescriptor} that we are building.
+ */
+ public EditStudentDescriptorBuilder withPhone(String phone) {
+ descriptor.setPhone(new Phone(phone));
+ return this;
+ }
+
+ /**
+ * Sets the {@code School} of the {@code EditStudentDescriptor} that we are building.
+ */
+ public EditStudentDescriptorBuilder withSchool(String school) {
+ descriptor.setSchool(new School(school));
+ return this;
+ }
+
+ /**
+ * Sets the {@code Year} of the {@code EditStudentDescriptor} that we are building.
+ */
+ public EditStudentDescriptorBuilder withYear(String year) {
+ descriptor.setYear(new Year(year));
+ return this;
+ }
+
+ public EditStudentDescriptor build() {
+ return descriptor;
+ }
+}
diff --git a/src/test/java/seedu/address/testutil/EventBuilder.java b/src/test/java/seedu/address/testutil/EventBuilder.java
new file mode 100644
index 00000000000..4a1d9b75059
--- /dev/null
+++ b/src/test/java/seedu/address/testutil/EventBuilder.java
@@ -0,0 +1,95 @@
+package seedu.address.testutil;
+
+import java.time.LocalDateTime;
+
+import seedu.address.model.schedule.Event;
+import seedu.address.model.schedule.EventRecurrence;
+
+/**
+ * A utility class to help with building Event objects.
+ */
+public class EventBuilder {
+
+ public static final String DEFAULT_EVENT_NAME = "Lesson event";
+ public static final LocalDateTime DEFAULT_START_DATE_TIME = LocalDateTime.of(2020, 12, 25, 21, 30);
+ public static final LocalDateTime DEFAULT_END_DATE_TIME = LocalDateTime.of(2020, 12, 25, 23, 30);
+ public static final EventRecurrence DEFAULT_RECURRENCE = EventRecurrence.NONE;
+ public static final String DEFAULT_UNIQUE_IDENTIFIER = "defaultUID";
+
+ private String eventName;
+ private LocalDateTime eventStartDateTime;
+ private LocalDateTime eventEndDateTime;
+ private String uniqueIdentifier;
+ private EventRecurrence recurrence;
+
+ /**
+ * Creates a {@code EventBuilder} with the default details.
+ */
+ public EventBuilder() {
+ this.eventName = DEFAULT_EVENT_NAME;
+ this.eventStartDateTime = DEFAULT_START_DATE_TIME;
+ this.eventEndDateTime = DEFAULT_END_DATE_TIME;
+ this.uniqueIdentifier = DEFAULT_UNIQUE_IDENTIFIER;
+ this.recurrence = DEFAULT_RECURRENCE;
+ }
+
+ /**
+ * Initializes the EventBuilder with the data of {@code eventToCopy}.
+ */
+ public EventBuilder(Event eventToCopy) {
+ this.eventName = eventToCopy.getEventName();
+ this.eventStartDateTime = eventToCopy.getEventStartDateTime();
+ this.eventEndDateTime = eventToCopy.getEventEndDateTime();
+ this.uniqueIdentifier = eventToCopy.getUniqueIdentifier();
+ this.recurrence = eventToCopy.getRecurrence();
+ }
+
+ /**
+ * Sets the {@code eventName} of the {@code Event} that we are building.
+ */
+ public EventBuilder withEventName(String eventName) {
+ this.eventName = eventName;
+ return this;
+ }
+
+ /**
+ * Sets the {@code eventStartDateTime} of the {@code Event} that we are building.
+ */
+ public EventBuilder withEventStartDateTime(LocalDateTime eventStartDateTime) {
+ this.eventStartDateTime = eventStartDateTime;
+ return this;
+ }
+
+ /**
+ * Sets the {@code eventEndDateTime} of the {@code Event} that we are building.
+ */
+ public EventBuilder withEventEndDateTime(LocalDateTime eventEndDateTime) {
+ this.eventEndDateTime = eventEndDateTime;
+ return this;
+ }
+
+ /**
+ * Sets the {@code uniqueIdentifier} of the {@code Event} that we are building.
+ */
+ public EventBuilder withUniqueIdentifier(String uniqueIdentifier) {
+ this.uniqueIdentifier = uniqueIdentifier;
+ return this;
+ }
+
+ /**
+ * Sets the {@code recurrence} of the {@code Event} that we are building.
+ */
+ public EventBuilder withRecurrence(EventRecurrence recurrence) {
+ this.recurrence = recurrence;
+ return this;
+ }
+
+ /**
+ * Builds a {@code Event} based on the given information.
+ */
+ public Event build() {
+ return new Event(eventName, eventStartDateTime, eventEndDateTime,
+ uniqueIdentifier, recurrence);
+ }
+
+}
diff --git a/src/test/java/seedu/address/testutil/FindStudentDescriptorBuilder.java b/src/test/java/seedu/address/testutil/FindStudentDescriptorBuilder.java
new file mode 100644
index 00000000000..62f98638b12
--- /dev/null
+++ b/src/test/java/seedu/address/testutil/FindStudentDescriptorBuilder.java
@@ -0,0 +1,51 @@
+package seedu.address.testutil;
+
+import seedu.address.logic.commands.FindCommand.FindStudentDescriptor;
+import seedu.address.model.student.NameContainsKeywordsPredicate;
+import seedu.address.model.student.SchoolContainsKeywordsPredicate;
+import seedu.address.model.student.YearMatchPredicate;
+
+
+/**
+ * A utility class to help with building FindStudentDescriptor objects.
+ */
+public class FindStudentDescriptorBuilder {
+
+ private FindStudentDescriptor descriptor;
+
+ public FindStudentDescriptorBuilder() {
+ descriptor = new FindStudentDescriptor();
+ }
+
+ public FindStudentDescriptorBuilder(FindStudentDescriptor descriptor) {
+ this.descriptor = new FindStudentDescriptor(descriptor);
+ }
+
+ /**
+ * Sets the {@code namePredicate} of the {@code FindStudentDescriptor} that we are building.
+ */
+ public FindStudentDescriptorBuilder withNamePredicate(NameContainsKeywordsPredicate namePredicate) {
+ descriptor.setNamePredicate(namePredicate);
+ return this;
+ }
+
+ /**
+ * Sets the {@code schoolPredicate} of the {@code FindStudentDescriptor} that we are building.
+ */
+ public FindStudentDescriptorBuilder withSchoolPredicate(SchoolContainsKeywordsPredicate schoolPredicate) {
+ descriptor.setSchoolPredicate(schoolPredicate);
+ return this;
+ }
+
+ /**
+ * Sets the {@code Year} of the {@code FindStudentDescriptor} that we are building.
+ */
+ public FindStudentDescriptorBuilder withYearPredicate(YearMatchPredicate yearPredicate) {
+ descriptor.setYearPredicate(yearPredicate);
+ return this;
+ }
+
+ public FindStudentDescriptor build() {
+ return descriptor;
+ }
+}
diff --git a/src/test/java/seedu/address/testutil/PersonBuilder.java b/src/test/java/seedu/address/testutil/PersonBuilder.java
deleted file mode 100644
index efe744cd12c..00000000000
--- a/src/test/java/seedu/address/testutil/PersonBuilder.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package seedu.address.testutil;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import seedu.address.model.person.Address;
-import seedu.address.model.person.Email;
-import seedu.address.model.person.Name;
-import seedu.address.model.person.Person;
-import seedu.address.model.person.Phone;
-import seedu.address.model.tag.Tag;
-import seedu.address.model.util.SampleDataUtil;
-
-/**
- * A utility class to help with building Person objects.
- */
-public class PersonBuilder {
-
- public static final String DEFAULT_NAME = "Alice Pauline";
- public static final String DEFAULT_PHONE = "85355255";
- public static final String DEFAULT_EMAIL = "alice@gmail.com";
- public static final String DEFAULT_ADDRESS = "123, Jurong West Ave 6, #08-111";
-
- private Name name;
- private Phone phone;
- private Email email;
- private Address address;
- private Set<Tag> tags;
-
- /**
- * Creates a {@code PersonBuilder} with the default details.
- */
- public PersonBuilder() {
- name = new Name(DEFAULT_NAME);
- phone = new Phone(DEFAULT_PHONE);
- email = new Email(DEFAULT_EMAIL);
- address = new Address(DEFAULT_ADDRESS);
- tags = new HashSet<>();
- }
-
- /**
- * Initializes the PersonBuilder with the data of {@code personToCopy}.
- */
- public PersonBuilder(Person personToCopy) {
- name = personToCopy.getName();
- phone = personToCopy.getPhone();
- email = personToCopy.getEmail();
- address = personToCopy.getAddress();
- tags = new HashSet<>(personToCopy.getTags());
- }
-
- /**
- * Sets the {@code Name} of the {@code Person} that we are building.
- */
- public PersonBuilder withName(String name) {
- this.name = new Name(name);
- return this;
- }
-
- /**
- * Parses the {@code tags} into a {@code Set<Tag>} and set it to the {@code Person} that we are building.
- */
- public PersonBuilder withTags(String ... tags) {
- this.tags = SampleDataUtil.getTagSet(tags);
- return this;
- }
-
- /**
- * Sets the {@code Address} of the {@code Person} that we are building.
- */
- public PersonBuilder withAddress(String address) {
- this.address = new Address(address);
- return this;
- }
-
- /**
- * Sets the {@code Phone} of the {@code Person} that we are building.
- */
- public PersonBuilder withPhone(String phone) {
- this.phone = new Phone(phone);
- return this;
- }
-
- /**
- * Sets the {@code Email} of the {@code Person} that we are building.
- */
- public PersonBuilder withEmail(String email) {
- this.email = new Email(email);
- return this;
- }
-
- public Person build() {
- return new Person(name, phone, email, address, tags);
- }
-
-}
diff --git a/src/test/java/seedu/address/testutil/PersonUtil.java b/src/test/java/seedu/address/testutil/PersonUtil.java
deleted file mode 100644
index 90849945183..00000000000
--- a/src/test/java/seedu/address/testutil/PersonUtil.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package seedu.address.testutil;
-
-import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_EMAIL;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
-
-import java.util.Set;
-
-import seedu.address.logic.commands.AddCommand;
-import seedu.address.logic.commands.EditCommand.EditPersonDescriptor;
-import seedu.address.model.person.Person;
-import seedu.address.model.tag.Tag;
-
-/**
- * A utility class for Person.
- */
-public class PersonUtil {
-
- /**
- * Returns an add command string for adding the {@code person}.
- */
- public static String getAddCommand(Person person) {
- return AddCommand.COMMAND_WORD + " " + getPersonDetails(person);
- }
-
- /**
- * Returns the part of command string for the given {@code person}'s details.
- */
- public static String getPersonDetails(Person person) {
- StringBuilder sb = new StringBuilder();
- sb.append(PREFIX_NAME + person.getName().fullName + " ");
- sb.append(PREFIX_PHONE + person.getPhone().value + " ");
- sb.append(PREFIX_EMAIL + person.getEmail().value + " ");
- sb.append(PREFIX_ADDRESS + person.getAddress().value + " ");
- person.getTags().stream().forEach(
- s -> sb.append(PREFIX_TAG + s.tagName + " ")
- );
- return sb.toString();
- }
-
- /**
- * Returns the part of command string for the given {@code EditPersonDescriptor}'s details.
- */
- public static String getEditPersonDescriptorDetails(EditPersonDescriptor descriptor) {
- StringBuilder sb = new StringBuilder();
- descriptor.getName().ifPresent(name -> sb.append(PREFIX_NAME).append(name.fullName).append(" "));
- descriptor.getPhone().ifPresent(phone -> sb.append(PREFIX_PHONE).append(phone.value).append(" "));
- descriptor.getEmail().ifPresent(email -> sb.append(PREFIX_EMAIL).append(email.value).append(" "));
- descriptor.getAddress().ifPresent(address -> sb.append(PREFIX_ADDRESS).append(address.value).append(" "));
- if (descriptor.getTags().isPresent()) {
- Set<Tag> tags = descriptor.getTags().get();
- if (tags.isEmpty()) {
- sb.append(PREFIX_TAG);
- } else {
- tags.forEach(s -> sb.append(PREFIX_TAG).append(s.tagName).append(" "));
- }
- }
- return sb.toString();
- }
-}
diff --git a/src/test/java/seedu/address/testutil/ReeveBuilder.java b/src/test/java/seedu/address/testutil/ReeveBuilder.java
new file mode 100644
index 00000000000..c414c4b0388
--- /dev/null
+++ b/src/test/java/seedu/address/testutil/ReeveBuilder.java
@@ -0,0 +1,34 @@
+package seedu.address.testutil;
+
+import seedu.address.model.Reeve;
+import seedu.address.model.student.Student;
+
+/**
+ * A utility class to help with building Addressbook objects.
+ * Example usage: <br>
+ * {@code AddressBook ab = new AddressBookBuilder().withPerson("John", "Doe").build();}
+ */
+public class ReeveBuilder {
+
+ private Reeve reeve;
+
+ public ReeveBuilder() {
+ reeve = new Reeve();
+ }
+
+ public ReeveBuilder(Reeve reeve) {
+ this.reeve = reeve;
+ }
+
+ /**
+ * Adds a new {@code Person} to the {@code AddressBook} that we are building.
+ */
+ public ReeveBuilder withPerson(Student student) {
+ reeve.addStudent(student);
+ return this;
+ }
+
+ public Reeve build() {
+ return reeve;
+ }
+}
diff --git a/src/test/java/seedu/address/testutil/StudentBuilder.java b/src/test/java/seedu/address/testutil/StudentBuilder.java
new file mode 100644
index 00000000000..24c9f3c2eef
--- /dev/null
+++ b/src/test/java/seedu/address/testutil/StudentBuilder.java
@@ -0,0 +1,233 @@
+package seedu.address.testutil;
+
+import static seedu.address.commons.util.DateUtil.parseToDate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import seedu.address.model.student.Name;
+import seedu.address.model.student.Phone;
+import seedu.address.model.student.School;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.Year;
+import seedu.address.model.student.academic.Academic;
+import seedu.address.model.student.academic.Attendance;
+import seedu.address.model.student.academic.Feedback;
+import seedu.address.model.student.academic.exam.Exam;
+import seedu.address.model.student.academic.exam.Score;
+import seedu.address.model.student.academic.question.Question;
+import seedu.address.model.student.academic.question.UnsolvedQuestion;
+import seedu.address.model.student.admin.ClassTime;
+import seedu.address.model.student.admin.ClassVenue;
+import seedu.address.model.student.admin.Detail;
+import seedu.address.model.student.admin.Fee;
+import seedu.address.model.student.admin.PaymentDate;
+import seedu.address.model.util.SampleDataUtil;
+
+/**
+ * A utility class to help with building Student objects.
+ */
+public class StudentBuilder {
+
+ public static final String DEFAULT_NAME = "Alice Pauline";
+ public static final String DEFAULT_PHONE = "85355255";
+ public static final String DEFAULT_SCHOOL = "NUS High School";
+ public static final String DEFAULT_YEAR = "Sec 4";
+ public static final String DEFAULT_CLASS_VENUE = "311, Clementi Ave 2, #02-25";
+ public static final String DEFAULT_CLASS_TIME = "1 2100-2200";
+ public static final String DEFAULT_FEE = "21";
+ public static final String DEFAULT_PAYMENT_DATE = "21/05/2020";
+ public static final String DEFAULT_ADDITIONAL_DETAILS_MONEY = "owesMoney";
+ public static final String DEFAULT_ADDITIONAL_DETAILS_FRIEND = "friends";
+ public static final String DEFAULT_QUESTION_NEWTON = "What is Newton's Second Law?";
+ public static final String DEFAULT_QUESTION_MATH = "How do you inverse a matrix?";
+ public static final String DEFAULT_SOLUTION = "Read your textbook";
+ public static final Exam DEFAULT_EXAM_FYE = new Exam("End of Year Examination 2020",
+ parseToDate("07/11/2020"), new Score("50/100"));
+ public static final Exam DEFAULT_EXAM_MYE = new Exam("Mid Year Examination 2020",
+ parseToDate("25/7/2020"), new Score("20/30"));
+ public static final Attendance DEFAULT_ATTENDANCE = new Attendance(parseToDate("14/4/1998"),
+ true, new Feedback("sleepy during lesson"));
+
+ // Identity fields
+ private Name name;
+ private Phone phone;
+ private School school;
+ private Year year;
+
+ // Admin details
+ private ClassVenue venue;
+ private ClassTime time;
+ private Fee fee;
+ private PaymentDate paymentDate;
+ private List<Detail> details = new ArrayList<>();
+
+ // Academic details
+ private List<Exam> exams = new ArrayList<>();
+ private List<Attendance> attendances = new ArrayList<>();
+ private List<Question> questions = new ArrayList<>();
+
+ /**
+ * Creates a {@code StudentBuilder} with the default details.
+ */
+ public StudentBuilder() {
+ name = new Name(DEFAULT_NAME);
+ phone = new Phone(DEFAULT_PHONE);
+ school = new School(DEFAULT_SCHOOL);
+ year = new Year(DEFAULT_YEAR);
+
+ venue = new ClassVenue(DEFAULT_CLASS_VENUE);
+ time = new ClassTime(DEFAULT_CLASS_TIME);
+ fee = new Fee(DEFAULT_FEE);
+ paymentDate = new PaymentDate(DEFAULT_PAYMENT_DATE);
+ List.of(DEFAULT_ADDITIONAL_DETAILS_MONEY, DEFAULT_ADDITIONAL_DETAILS_FRIEND)
+ .stream()
+ .map(Detail::new)
+ .forEach(details::add);
+
+ List.of(DEFAULT_QUESTION_NEWTON, DEFAULT_QUESTION_MATH)
+ .stream()
+ .map(UnsolvedQuestion::new)
+ .forEach(questions::add);
+
+ exams = List.of(DEFAULT_EXAM_FYE, DEFAULT_EXAM_MYE);
+ attendances = List.of(DEFAULT_ATTENDANCE);
+ }
+
+ /**
+ * Initializes the StudentBuilder with the data of {@code studentToCopy}.
+ */
+ public StudentBuilder(Student studentToCopy) {
+ name = studentToCopy.getName();
+ phone = studentToCopy.getPhone();
+ school = studentToCopy.getSchool();
+ year = studentToCopy.getYear();
+
+ venue = studentToCopy.getClassVenue();
+ time = studentToCopy.getClassTime();
+ fee = studentToCopy.getFee();
+ paymentDate = studentToCopy.getPaymentDate();
+ details.addAll(studentToCopy.getDetails());
+
+ questions.addAll(studentToCopy.getQuestions());
+ exams.addAll(studentToCopy.getExams());
+
+ Academic studentAcademic = studentToCopy.getAcademic();
+ attendances.addAll(studentAcademic.getAttendance());
+ }
+
+ /**
+ * Sets the {@code Name} of the {@code Student} that we are building.
+ */
+ public StudentBuilder withName(String name) {
+ this.name = new Name(name);
+ return this;
+ }
+
+
+ /**
+ * Sets the {@code Phone} of the {@code Student} that we are building.
+ */
+ public StudentBuilder withPhone(String phone) {
+ this.phone = new Phone(phone);
+ return this;
+ }
+
+ /**
+ * Sets the {@code School} of the {@code Student} that we are building.
+ */
+ public StudentBuilder withSchool(String school) {
+ this.school = new School(school);
+ return this;
+ }
+
+ /**
+ * Sets the {@code Year} of the {@code Student} that we are building.
+ */
+ public StudentBuilder withYear(String year) {
+ this.year = new Year(year);
+ return this;
+ }
+
+ /**
+ * Sets the {@code ClassVenue} of the {@code Student} that we are building.
+ */
+ public StudentBuilder withClassVenue(String venue) {
+ this.venue = new ClassVenue(venue);
+ return this;
+ }
+
+ /**
+ * Sets the {@code ClassTime} of the {@code Student} that we are building.
+ */
+ public StudentBuilder withClassTime(String time) {
+ this.time = new ClassTime(time);
+ return this;
+ }
+
+ /**
+ * Sets the {@code Fee} of the {@code Student} that we are building.
+ */
+ public StudentBuilder withFee(String fee) {
+ this.fee = new Fee(fee);
+ return this;
+ }
+
+ /**
+ * Sets the {@code PaymentDate} of the {@code Student} that we are building.
+ */
+ public StudentBuilder withPaymentDate(String date) {
+ this.paymentDate = new PaymentDate(date);
+ return this;
+ }
+
+ /**
+ * Sets the {@code Details} of the {@code Student} that we are building.
+ */
+ public StudentBuilder withDetails(String... details) {
+ this.details = SampleDataUtil.getDetailList(details);
+ return this;
+ }
+
+ /**
+ * Sets the {@code Questions} of the {@code Student} that we are building.
+ */
+ public StudentBuilder withQuestions(String... questions) {
+ this.questions = SampleDataUtil.getQuestions(questions);
+ return this;
+ }
+
+ /**
+ * Sets some {@code Questions} as solved for the {@code Student} that we are building.
+ */
+ public StudentBuilder withSolved(String solution, String... questions) {
+ this.questions = SampleDataUtil.getSolvedQuestions(solution, questions);
+ return this;
+ }
+
+ /**
+ * Sets some {@code Exam} for the {@code Student} that we are building.
+ */
+ public StudentBuilder withExams(Exam... exams) {
+ this.exams = SampleDataUtil.getExams(exams);
+ return this;
+ }
+
+ /**
+ * Sets some {@code Exam} for the {@code Student} that we are building.
+ */
+ public StudentBuilder withAttendances(Attendance... attendances) {
+ this.attendances = SampleDataUtil.getAttendance(attendances);
+ return this;
+ }
+
+ /**
+ * Builds a {@code Student} based on the given information.
+ */
+ public Student build() {
+ return new Student(name, phone, school, year,
+ venue, time, fee, paymentDate, details,
+ questions, exams, attendances);
+ }
+
+}
diff --git a/src/test/java/seedu/address/testutil/StudentUtil.java b/src/test/java/seedu/address/testutil/StudentUtil.java
new file mode 100644
index 00000000000..fba67f0f350
--- /dev/null
+++ b/src/test/java/seedu/address/testutil/StudentUtil.java
@@ -0,0 +1,114 @@
+package seedu.address.testutil;
+
+import static seedu.address.logic.parser.CliSyntax.PREFIX_DETAILS;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_FEE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_PAYMENT;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SCHOOL;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TIME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_VENUE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_YEAR;
+
+import java.time.format.DateTimeFormatter;
+
+import seedu.address.logic.commands.AddCommand;
+import seedu.address.logic.commands.EditCommand;
+import seedu.address.logic.commands.FindCommand;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.admin.Detail;
+
+
+/**
+ * A utility class for Student.
+ */
+public class StudentUtil {
+
+ /**
+ * Returns an add command string for adding the {@code student}.
+ */
+ public static String getAddCommand(Student student) {
+ return AddCommand.COMMAND_WORD + " " + getStudentDetails(student);
+ }
+
+ /**
+ * Returns the part of command string for the given {@code student}'s details.
+ */
+ public static String getStudentDetails(Student student) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(PREFIX_NAME + student.getName().fullName + " ")
+ .append(PREFIX_PHONE + student.getPhone().value + " ")
+ .append(PREFIX_SCHOOL + student.getSchool().school + " ")
+ .append(PREFIX_YEAR + String.valueOf(student.getYear()) + " ")
+ .append(getAdminDetails(student));
+ return sb.toString();
+ }
+
+ private static String getAdminDetails(Student student) {
+ StringBuilder sb = new StringBuilder();
+ String venue = PREFIX_VENUE + student.getClassVenue().venue + " ";
+ String time = PREFIX_TIME + String.valueOf(student.getClassTime().dayOfWeek.getValue())
+ + " " + student.getClassTime().startTime.toString().replace(":", "")
+ + "-" + student.getClassTime().endTime.toString().replace(":", "") + " ";
+ String fee = PREFIX_FEE + String.valueOf(student.getFee().amount) + " ";
+ String date = PREFIX_PAYMENT + student.getPaymentDate()
+ .lastPaid
+ .format(DateTimeFormatter.ofPattern("d/M/yy")) + " ";
+ sb.append(venue).append(time).append(fee).append(date);
+
+ for (Detail detail : student.getDetails()) {
+ sb.append(PREFIX_DETAILS + detail.detail + " ");
+ }
+ return sb.toString();
+ }
+
+ /**
+ * Returns the part of command string for the given {@code EditStudentDescriptor}'s details.
+ */
+ public static String getEditStudentDescriptorDetails(EditCommand.EditStudentDescriptor descriptor) {
+ StringBuilder sb = new StringBuilder();
+ descriptor.getName().ifPresent(name -> sb.append(PREFIX_NAME).append(name.fullName).append(" "));
+ descriptor.getPhone().ifPresent(phone -> sb.append(PREFIX_PHONE).append(phone.value).append(" "));
+ descriptor.getSchool().ifPresent(school -> sb.append(PREFIX_SCHOOL).append(school.school).append(" "));
+ descriptor.getYear().ifPresent(year -> sb.append(PREFIX_YEAR).append(year).append(" "));
+
+ return sb.toString();
+ }
+
+ /**
+ * Returns the part of command string for the given {@code EditAdminDescriptor}'s details.
+ */
+ public static String getEditAdminDescriptorDetails(EditCommand.EditAdminDescriptor descriptor) {
+ StringBuilder sb = new StringBuilder();
+ descriptor.getClassTime().ifPresent(classTime -> sb.append(PREFIX_TIME)
+ .append(classTime.convertClassTimeToUserInputString()).append(" "));
+ descriptor.getClassVenue().ifPresent(classVenue -> sb.append(PREFIX_VENUE)
+ .append(classVenue.venue).append(" "));
+ descriptor.getFee().ifPresent(fee -> sb.append(PREFIX_FEE)
+ .append(fee.convertFeeToUserInputString()).append(" "));
+ descriptor.getPaymentDate().ifPresent(paymentDate -> sb.append(PREFIX_PAYMENT)
+ .append(paymentDate.getUserInputDate()).append(" "));
+ return sb.toString();
+ }
+
+ /**
+ * Returns the part of command string for the given {@code FindStudentDescriptor}'s details.
+ */
+ public static String getFindStudentDescriptorDetails(FindCommand.FindStudentDescriptor descriptor) {
+ StringBuilder sb = new StringBuilder();
+ descriptor.getNamePredicate().ifPresent(predicate -> {
+ String stringName = predicate.keywords.stream() // Convert the keywords list in predicate into a string
+ .reduce("", (x, y) -> x + " " + y);
+ sb.append(PREFIX_NAME).append(stringName).append(" ");
+ });
+ descriptor.getSchoolPredicate().ifPresent(predicate -> {
+ String stringSchool = predicate.keywords.stream() // Convert the keywords list in predicate into a string
+ .reduce("", (x, y) -> x + " " + y);
+ sb.append(PREFIX_SCHOOL).append(stringSchool).append(" ");
+ });
+ descriptor.getYearPredicate().ifPresent(predicate ->
+ sb.append(PREFIX_YEAR).append(predicate.year).append(" "));
+
+ return sb.toString();
+ }
+}
diff --git a/src/test/java/seedu/address/testutil/TestUtil.java b/src/test/java/seedu/address/testutil/TestUtil.java
index 896d103eb0b..a6be612df1e 100644
--- a/src/test/java/seedu/address/testutil/TestUtil.java
+++ b/src/test/java/seedu/address/testutil/TestUtil.java
@@ -7,7 +7,7 @@
import seedu.address.commons.core.index.Index;
import seedu.address.model.Model;
-import seedu.address.model.person.Person;
+import seedu.address.model.student.Student;
/**
* A utility class for test cases.
@@ -36,20 +36,20 @@ public static Path getFilePathInSandboxFolder(String fileName) {
* Returns the middle index of the person in the {@code model}'s person list.
*/
public static Index getMidIndex(Model model) {
- return Index.fromOneBased(model.getFilteredPersonList().size() / 2);
+ return Index.fromOneBased(model.getSortedStudentList().size() / 2);
}
/**
* Returns the last index of the person in the {@code model}'s person list.
*/
public static Index getLastIndex(Model model) {
- return Index.fromOneBased(model.getFilteredPersonList().size());
+ return Index.fromOneBased(model.getSortedStudentList().size());
}
/**
* Returns the person in the {@code model}'s person list at {@code index}.
*/
- public static Person getPerson(Model model, Index index) {
- return model.getFilteredPersonList().get(index.getZeroBased());
+ public static Student getPerson(Model model, Index index) {
+ return model.getSortedStudentList().get(index.getZeroBased());
}
}
diff --git a/src/test/java/seedu/address/testutil/TypicalEvents.java b/src/test/java/seedu/address/testutil/TypicalEvents.java
new file mode 100644
index 00000000000..9d18efedacd
--- /dev/null
+++ b/src/test/java/seedu/address/testutil/TypicalEvents.java
@@ -0,0 +1,50 @@
+package seedu.address.testutil;
+
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import seedu.address.model.schedule.Event;
+import seedu.address.model.schedule.EventRecurrence;
+import seedu.address.model.schedule.Scheduler;
+
+public class TypicalEvents {
+
+ public static final LocalDateTime DATE_TIME_BEFORE_ALICE_CLASS_EVENT = LocalDateTime.parse("2020-12-03T10:16:30");
+
+ public static final Event ALICE_CLASS_EVENT = new EventBuilder().withEventName("Lesson event")
+ .withEventStartDateTime(LocalDateTime.parse("2020-12-03T10:15:30"))
+ .withEventEndDateTime(LocalDateTime.parse("2020-12-03T10:17:30"))
+ .withUniqueIdentifier("uidAliceLesson")
+ .withRecurrence(EventRecurrence.WEEKLY)
+ .build();
+
+ public static final Event TODO_EVENT = new EventBuilder().withEventName("Plan lessons")
+ .withEventStartDateTime(LocalDateTime.parse("2020-11-03T10:14:30"))
+ .withEventEndDateTime(LocalDateTime.parse("2020-11-03T10:16:35"))
+ .withUniqueIdentifier("uidPlanLesson")
+ .withRecurrence(EventRecurrence.DAILY)
+ .build();
+
+ public static final Event RELAX_EVENT = new EventBuilder().withEventName("Watch a movie")
+ .withEventStartDateTime(LocalDateTime.parse("2020-11-25T10:10:00"))
+ .withEventEndDateTime(LocalDateTime.parse("2020-11-26T10:12:01"))
+ .withUniqueIdentifier("uidWatchMovie")
+ .withRecurrence(EventRecurrence.NONE)
+ .build();
+
+ private TypicalEvents() {} // prevents instantiation
+
+ public static List<Event> getTypicalEvents() {
+ return new ArrayList<>(Arrays.asList(ALICE_CLASS_EVENT, TODO_EVENT, RELAX_EVENT));
+ }
+
+ /**
+ * Returns an {@code scheduler} with all the typical events.
+ */
+ public static Scheduler getTypicalScheduler() {
+ return new Scheduler(getTypicalEvents());
+ }
+}
diff --git a/src/test/java/seedu/address/testutil/TypicalIndexes.java b/src/test/java/seedu/address/testutil/TypicalIndexes.java
index 1e613937657..2ff7340a39f 100644
--- a/src/test/java/seedu/address/testutil/TypicalIndexes.java
+++ b/src/test/java/seedu/address/testutil/TypicalIndexes.java
@@ -9,4 +9,7 @@ public class TypicalIndexes {
public static final Index INDEX_FIRST_PERSON = Index.fromOneBased(1);
public static final Index INDEX_SECOND_PERSON = Index.fromOneBased(2);
public static final Index INDEX_THIRD_PERSON = Index.fromOneBased(3);
+
+ public static final Index INDEX_FIRST = Index.fromOneBased(1);
+ public static final Index INDEX_SECOND = Index.fromOneBased(2);
}
diff --git a/src/test/java/seedu/address/testutil/TypicalPersons.java b/src/test/java/seedu/address/testutil/TypicalPersons.java
deleted file mode 100644
index fec76fb7129..00000000000
--- a/src/test/java/seedu/address/testutil/TypicalPersons.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package seedu.address.testutil;
-
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_FRIEND;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_TAG_HUSBAND;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import seedu.address.model.AddressBook;
-import seedu.address.model.person.Person;
-
-/**
- * A utility class containing a list of {@code Person} objects to be used in tests.
- */
-public class TypicalPersons {
-
- public static final Person ALICE = new PersonBuilder().withName("Alice Pauline")
- .withAddress("123, Jurong West Ave 6, #08-111").withEmail("alice@example.com")
- .withPhone("94351253")
- .withTags("friends").build();
- public static final Person BENSON = new PersonBuilder().withName("Benson Meier")
- .withAddress("311, Clementi Ave 2, #02-25")
- .withEmail("johnd@example.com").withPhone("98765432")
- .withTags("owesMoney", "friends").build();
- public static final Person CARL = new PersonBuilder().withName("Carl Kurz").withPhone("95352563")
- .withEmail("heinz@example.com").withAddress("wall street").build();
- public static final Person DANIEL = new PersonBuilder().withName("Daniel Meier").withPhone("87652533")
- .withEmail("cornelia@example.com").withAddress("10th street").withTags("friends").build();
- public static final Person ELLE = new PersonBuilder().withName("Elle Meyer").withPhone("9482224")
- .withEmail("werner@example.com").withAddress("michegan ave").build();
- public static final Person FIONA = new PersonBuilder().withName("Fiona Kunz").withPhone("9482427")
- .withEmail("lydia@example.com").withAddress("little tokyo").build();
- public static final Person GEORGE = new PersonBuilder().withName("George Best").withPhone("9482442")
- .withEmail("anna@example.com").withAddress("4th street").build();
-
- // Manually added
- public static final Person HOON = new PersonBuilder().withName("Hoon Meier").withPhone("8482424")
- .withEmail("stefan@example.com").withAddress("little india").build();
- public static final Person IDA = new PersonBuilder().withName("Ida Mueller").withPhone("8482131")
- .withEmail("hans@example.com").withAddress("chicago ave").build();
-
- // Manually added - Person's details found in {@code CommandTestUtil}
- public static final Person AMY = new PersonBuilder().withName(VALID_NAME_AMY).withPhone(VALID_PHONE_AMY)
- .withEmail(VALID_EMAIL_AMY).withAddress(VALID_ADDRESS_AMY).withTags(VALID_TAG_FRIEND).build();
- public static final Person BOB = new PersonBuilder().withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB)
- .withEmail(VALID_EMAIL_BOB).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND, VALID_TAG_FRIEND)
- .build();
-
- public static final String KEYWORD_MATCHING_MEIER = "Meier"; // A keyword that matches MEIER
-
- private TypicalPersons() {} // prevents instantiation
-
- /**
- * Returns an {@code AddressBook} with all the typical persons.
- */
- public static AddressBook getTypicalAddressBook() {
- AddressBook ab = new AddressBook();
- for (Person person : getTypicalPersons()) {
- ab.addPerson(person);
- }
- return ab;
- }
-
- public static List<Person> getTypicalPersons() {
- return new ArrayList<>(Arrays.asList(ALICE, BENSON, CARL, DANIEL, ELLE, FIONA, GEORGE));
- }
-}
diff --git a/src/test/java/seedu/address/testutil/TypicalStudents.java b/src/test/java/seedu/address/testutil/TypicalStudents.java
new file mode 100644
index 00000000000..e724f4a42b5
--- /dev/null
+++ b/src/test/java/seedu/address/testutil/TypicalStudents.java
@@ -0,0 +1,140 @@
+package seedu.address.testutil;
+
+import static seedu.address.commons.util.DateUtil.parseToDate;
+import static seedu.address.logic.commands.CommandTestUtil.ATTENDANCE_DATE_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.ATTENDANCE_DATE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.EXAM_DATE_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.EXAM_DATE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDITIONAL_DETAILS_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDITIONAL_DETAILS_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_ATTENDANCE_FEEDBACK_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_ATTENDANCE_FEEDBACK_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_CLASS_TIME_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_CLASS_TIME_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_CLASS_VENUE_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_CLASS_VENUE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_EXAM_NAME_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_EXAM_NAME_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_EXAM_SCORE_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_EXAM_SCORE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_FEE_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_FEE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_PAYMENT_DATE_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_PAYMENT_DATE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_QUESTION_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_QUESTION_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_SCHOOL_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_SCHOOL_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_YEAR_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_YEAR_BOB;
+import static seedu.address.testutil.StudentBuilder.DEFAULT_QUESTION_MATH;
+import static seedu.address.testutil.StudentBuilder.DEFAULT_QUESTION_NEWTON;
+import static seedu.address.testutil.StudentBuilder.DEFAULT_SOLUTION;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import seedu.address.model.Reeve;
+import seedu.address.model.student.Student;
+import seedu.address.model.student.academic.Attendance;
+import seedu.address.model.student.academic.Feedback;
+import seedu.address.model.student.academic.exam.Exam;
+import seedu.address.model.student.academic.exam.Score;
+
+/**
+ * A utility class containing a list of {@code Student} objects to be used in tests.
+ */
+public class TypicalStudents {
+
+ public static final Student ALICE = new StudentBuilder().withName("Alice Pauline")
+ .withSchool("Anderson Secondary").withYear("Sec 3").withPhone("94351253")
+ .withClassVenue("123, Jurong West Ave 6, #08-111")
+ .withClassTime("5 1500-1700")
+ .withDetails("owesMoney", "friends")
+ .build();
+ public static final Student BENSON = new StudentBuilder().withName("Benson Meier")
+ .withSchool("Pei Hwa Secondary").withYear("Sec 2").withPhone("98765432")
+ .withClassTime("2 1230-1430")
+ .withExams(new Exam("CA2", parseToDate("19/9/2020"), new Score("73/100")),
+ new Exam("CA1", parseToDate("2/3/2020"), new Score("21/40")))
+ .build();
+ public static final Student CARL = new StudentBuilder().withName("Carl Kurz")
+ .withSchool("Catholic High").withYear("Sec 5").withPhone("95352563")
+ .withFee("450.50").withClassTime("1 1500-1700")
+ .build();
+ public static final Student DANIEL = new StudentBuilder().withName("Daniel Meier")
+ .withSchool("Methodist Girls School").withYear("Sec 1").withPhone("87652533")
+ .withPaymentDate("28/2/2018").withClassTime("1 1700-1900")
+ .build();
+ public static final Student ELLE = new StudentBuilder().withName("Elle Meyer")
+ .withSchool("River Valley High").withYear("JC 2").withPhone("9482224")
+ .withSolved(DEFAULT_SOLUTION, DEFAULT_QUESTION_NEWTON, DEFAULT_QUESTION_MATH)
+ .withClassTime("1 1900-2100")
+ .build();
+ public static final Student FIONA = new StudentBuilder().withName("Fiona Kunz").withPhone("9482427")
+ .withSchool("Raffles Girls School").withYear("Sec 2").withClassTime("3 1200-1430")
+ .build();
+ public static final Student GEORGE = new StudentBuilder().withName("George Best").withPhone("9482442")
+ .withSchool("Montford Secondary").withYear("Sec 4").withClassTime("2 1000-1130")
+ .build();
+
+ // Manually added
+ public static final Student HOON = new StudentBuilder().withName("Hoon Meier").withPhone("8482424")
+ .withSchool("NUS High School").withYear("JC 2").build();
+ public static final Student IDA = new StudentBuilder().withName("Ida Mueller").withPhone("8482131")
+ .withSchool("NUS High School").withYear("JC 2").build();
+
+ // Manually added - Student's details found in {@code CommandTestUtil}
+ public static final Student AMY = new StudentBuilder().withName(VALID_NAME_AMY)
+ .withPhone(VALID_PHONE_AMY)
+ .withSchool(VALID_SCHOOL_AMY)
+ .withYear(VALID_YEAR_AMY)
+ .withClassVenue(VALID_CLASS_VENUE_AMY)
+ .withClassTime(VALID_CLASS_TIME_AMY)
+ .withFee(VALID_FEE_AMY)
+ .withPaymentDate(VALID_PAYMENT_DATE_AMY)
+ .withDetails(VALID_ADDITIONAL_DETAILS_AMY)
+ .withQuestions(VALID_QUESTION_AMY)
+ .withExams(new Exam(VALID_EXAM_NAME_AMY, EXAM_DATE_AMY, new Score(VALID_EXAM_SCORE_AMY)))
+ .withAttendances(new Attendance(ATTENDANCE_DATE_AMY, true,
+ new Feedback(VALID_ATTENDANCE_FEEDBACK_AMY)))
+ .build();
+
+ public static final Student BOB = new StudentBuilder().withName(VALID_NAME_BOB)
+ .withPhone(VALID_PHONE_BOB)
+ .withSchool(VALID_SCHOOL_BOB)
+ .withYear(VALID_YEAR_BOB)
+ .withClassVenue(VALID_CLASS_VENUE_BOB)
+ .withClassTime(VALID_CLASS_TIME_BOB)
+ .withFee(VALID_FEE_BOB)
+ .withPaymentDate(VALID_PAYMENT_DATE_BOB)
+ .withDetails(VALID_ADDITIONAL_DETAILS_BOB)
+ .withSolved(DEFAULT_SOLUTION, VALID_QUESTION_BOB)
+ .withExams(new Exam(VALID_EXAM_NAME_BOB, EXAM_DATE_BOB, new Score(VALID_EXAM_SCORE_BOB)))
+ .withAttendances(new Attendance(ATTENDANCE_DATE_BOB, false,
+ new Feedback(VALID_ATTENDANCE_FEEDBACK_BOB)))
+ .build();
+
+ private TypicalStudents() {
+ } // prevents instantiation
+
+ /**
+ * Returns an {@code AddressBook} with all the typical students.
+ */
+ public static Reeve getTypicalAddressBook() {
+ Reeve ab = new Reeve();
+ for (Student student : getTypicalPersons()) {
+ ab.addStudent(student);
+ }
+ return ab;
+ }
+
+ public static List<Student> getTypicalPersons() {
+ return new ArrayList<>(Arrays.asList(ALICE, BENSON, CARL, DANIEL, ELLE, FIONA, GEORGE));
+ }
+}
diff --git a/src/test/java/seedu/address/testutil/notes/EditNoteDescriptorBuilder.java b/src/test/java/seedu/address/testutil/notes/EditNoteDescriptorBuilder.java
new file mode 100644
index 00000000000..397aaaa9bab
--- /dev/null
+++ b/src/test/java/seedu/address/testutil/notes/EditNoteDescriptorBuilder.java
@@ -0,0 +1,51 @@
+package seedu.address.testutil.notes;
+
+import seedu.address.logic.commands.notes.EditNoteCommand.EditNoteDescriptor;
+import seedu.address.model.notes.note.Description;
+import seedu.address.model.notes.note.Note;
+import seedu.address.model.notes.note.Title;
+
+/**
+ * A utility class to help with building EditNoteDescriptor objects.
+ */
+public class EditNoteDescriptorBuilder {
+
+ private EditNoteDescriptor descriptor;
+
+ public EditNoteDescriptorBuilder() {
+ descriptor = new EditNoteDescriptor();
+ }
+
+ public EditNoteDescriptorBuilder(EditNoteDescriptor descriptor) {
+ this.descriptor = new EditNoteDescriptor(descriptor);
+ }
+
+ /**
+ * Returns an {@code EditNoteDescriptor} with fields containing {@code note}'s details
+ */
+ public EditNoteDescriptorBuilder(Note note) {
+ descriptor = new EditNoteDescriptor();
+ descriptor.setTitle(note.getTitle());
+ descriptor.setDescription(note.getDescription());
+ }
+
+ /**
+ * Sets the {@code Title} of the {@code EditNoteDescriptor} that we are building.
+ */
+ public EditNoteDescriptorBuilder withTitle(String title) {
+ descriptor.setTitle(new Title(title));
+ return this;
+ }
+
+ /**
+ * Sets the {@code Description} of the {@code EditNoteDescriptor} that we are building.
+ */
+ public EditNoteDescriptorBuilder withDescription(String description) {
+ descriptor.setDescription(new Description(description));
+ return this;
+ }
+
+ public EditNoteDescriptor build() {
+ return descriptor;
+ }
+}
diff --git a/src/test/java/seedu/address/testutil/notes/NoteBuilder.java b/src/test/java/seedu/address/testutil/notes/NoteBuilder.java
new file mode 100644
index 00000000000..617934e5b69
--- /dev/null
+++ b/src/test/java/seedu/address/testutil/notes/NoteBuilder.java
@@ -0,0 +1,59 @@
+package seedu.address.testutil.notes;
+
+import seedu.address.model.notes.note.Description;
+import seedu.address.model.notes.note.Note;
+import seedu.address.model.notes.note.Title;
+
+/**
+ * A utility class to help with building Note objects.
+ */
+public class NoteBuilder {
+
+ public static final String DEFAULT_TITLE = "meaning of life";
+ public static final String DEFAULT_DESCRIPTION = "Eat sleep code? :'(";
+
+ // Identity fields
+ private Title title;
+ private Description description;
+
+ /**
+ * Creates a {@code NoteBuilder} with the default details.
+ */
+ public NoteBuilder() {
+ title = new Title(DEFAULT_TITLE);
+ description = new Description(DEFAULT_DESCRIPTION);
+ }
+
+ /**
+ * Initializes the StudentBuilder with the data of {@code studentToCopy}.
+ */
+ public NoteBuilder(Note noteToCopy) {
+ title = noteToCopy.getTitle();
+ description = noteToCopy.getDescription();
+ }
+
+ /**
+ * Sets the {@code Title} of the {@code Note} that we are building.
+ */
+ public NoteBuilder withTitle(String title) {
+ this.title = new Title(title);
+ return this;
+ }
+
+
+ /**
+ * Sets the {@code Description} of the {@code Note} that we are building.
+ */
+ public NoteBuilder withDescription(String description) {
+ this.description = new Description(description);
+ return this;
+ }
+
+ /**
+ * Builds a {@code Note} based on the given information.
+ */
+ public Note build() {
+ return new Note(title, description);
+ }
+
+}
diff --git a/src/test/java/seedu/address/testutil/notes/NoteUtil.java b/src/test/java/seedu/address/testutil/notes/NoteUtil.java
new file mode 100644
index 00000000000..77ee5cca7fa
--- /dev/null
+++ b/src/test/java/seedu/address/testutil/notes/NoteUtil.java
@@ -0,0 +1,23 @@
+package seedu.address.testutil.notes;
+
+import static seedu.address.logic.parser.CliSyntax.PREFIX_DESCRIPTION;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TITLE;
+
+import seedu.address.logic.commands.notes.EditNoteCommand.EditNoteDescriptor;
+
+/**
+ * A utility class for Note.
+ */
+public class NoteUtil {
+
+ /**
+ * Returns the part of command string for the given {@code EditNoteDescriptor}'s details.
+ */
+ public static String getEditNoteDescriptorDetails(EditNoteDescriptor descriptor) {
+ StringBuilder sb = new StringBuilder();
+ descriptor.getTitle().ifPresent(title -> sb.append(PREFIX_TITLE).append(title.title).append(" "));
+ descriptor.getDescription().ifPresent(description ->
+ sb.append(PREFIX_DESCRIPTION).append(description.description).append(" "));
+ return sb.toString();
+ }
+}
diff --git a/src/test/java/seedu/address/testutil/notes/NotebookBuilder.java b/src/test/java/seedu/address/testutil/notes/NotebookBuilder.java
new file mode 100644
index 00000000000..6efe70607a8
--- /dev/null
+++ b/src/test/java/seedu/address/testutil/notes/NotebookBuilder.java
@@ -0,0 +1,34 @@
+package seedu.address.testutil.notes;
+
+import seedu.address.model.notes.Notebook;
+import seedu.address.model.notes.note.Note;
+
+/**
+ * A utility class to help with building Notebook objects.
+ * Example usage: <br>
+ * {@code Notebook notebook = new NotebookBuilder().withTitle("hehe").build();}
+ */
+public class NotebookBuilder {
+
+ private Notebook notebook;
+
+ public NotebookBuilder() {
+ notebook = new Notebook();
+ }
+
+ public NotebookBuilder(Notebook notebook) {
+ this.notebook = notebook;
+ }
+
+ /**
+ * Adds a new {@code Note} to the {@code Notebook} that we are building.
+ */
+ public NotebookBuilder withNote(Note note) {
+ notebook.addNote(note);
+ return this;
+ }
+
+ public Notebook build() {
+ return notebook;
+ }
+}
diff --git a/src/test/java/seedu/address/testutil/notes/TypicalNotes.java b/src/test/java/seedu/address/testutil/notes/TypicalNotes.java
new file mode 100644
index 00000000000..96be5582a18
--- /dev/null
+++ b/src/test/java/seedu/address/testutil/notes/TypicalNotes.java
@@ -0,0 +1,44 @@
+package seedu.address.testutil.notes;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import seedu.address.model.notes.Notebook;
+import seedu.address.model.notes.note.Note;
+
+/**
+ * A utility class containing a list of {@code Note} objects to be used in tests.
+ */
+public class TypicalNotes {
+
+ public static final Note NOTE_EXISTENTIAL_CRISIS = new NoteBuilder().withTitle("W10 blues")
+ .withDescription("why must i do cs2103").build();
+ public static final Note NOTE_GRADUATION = new NoteBuilder().withTitle("Graduation :(")
+ .withDescription("write cards for people").build();
+ public static final Note NOTE_BUY_COFFEE = new NoteBuilder().withTitle("JY!!!")
+ .withDescription("Cafeine is good...").build();
+
+ // manually added
+ public static final Note NOTE_TODO = new NoteBuilder().withTitle("TODO")
+ .withDescription("TP").build();
+ public static final Note NOTE_EVENTS = new NoteBuilder().withTitle("Events")
+ .withDescription("presentation...").build();
+
+ private TypicalNotes() {} // prevents instantiation
+
+ /**
+ * Returns a {@code Notebook} with all the typical notes.
+ */
+ public static Notebook getTypicalNotebook() {
+ Notebook notebook = new Notebook();
+ for (Note note : getTypicalNotes()) {
+ notebook.addNote(note);
+ }
+ return notebook;
+ }
+
+ public static List<Note> getTypicalNotes() {
+ return new ArrayList<>(Arrays.asList(NOTE_EXISTENTIAL_CRISIS, NOTE_GRADUATION, NOTE_BUY_COFFEE));
+ }
+}
+
-[[homepage](http://www.comp.nus.edu.sg/~damithch)]
-[[github](https://github.com/johndoe)]
-[[portfolio](team/johndoe.md)]
+[[github](https://github.com/StopTakingAllTheNames)]
-* Role: Project Advisor
+* Role: Developer
-### Jane Doe
+### Vaishak Anand
-
-[[github](http://github.com/johndoe)]
-[[portfolio](team/johndoe.md)]
+[[github](http://github.com/VaishakAnand)]
-* Role: Team Lead
-* Responsibilities: UI
+* Role: Developer
-### Johnny Doe
+### Alex Chua
-
-[[github](http://github.com/johndoe)] [[portfolio](team/johndoe.md)]
+[[github](https://github.com/AlexCQY)]
* Role: Developer
-* Responsibilities: Data
-### Jean Doe
+### Ng Choon Siong
-
-[[github](http://github.com/johndoe)]
-[[portfolio](team/johndoe.md)]
+[[github](http://github.com/csiongn)]
* Role: Developer
-* Responsibilities: Dev Ops + Threading
-### James Doe
+### Hogan Tan
-
-[[github](http://github.com/johndoe)]
-[[portfolio](team/johndoe.md)]
+[[github](http://github.com/hogantan)]
* Role: Developer
-* Responsibilities: UI
diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md
index 4829fe43011..c50af803cdf 100644
--- a/docs/DeveloperGuide.md
+++ b/docs/DeveloperGuide.md
@@ -1,70 +1,172 @@
----
-layout: page
-title: Developer Guide
----
-* Table of Contents
-{:toc}
-
---------------------------------------------------------------------------------------------------------------------
-
-## **Setting up, getting started**
+## **Reeve** - Developer Guide
+
+**Table of Contents**
+- [1. Introduction](#1-introduction)
+- [2. About](#2-about)
+- [3. Understanding the guide](#3-understanding-the-guide)
+- [4. Getting started](#4-getting-started)
+- [5. Design](#5-design)
+ * [5.1 Architecture](#51-architecture)
+ * [5.2 UI component](#52-ui-component)
+ * [5.3 Logic component](#53-logic-component)
+ * [5.4 Model component](#54-model-component)
+ * [5.5 Storage component](#55-storage-component)
+ * [5.6 Common classes](#56-common-classes)
+- [6. Implementation](#6-implementation)
+ * [6.1 General features](#61-general-features)
+ * [6.1.1 Help Command](#611-help-command)
+ * [6.1.2 Toggle Command](#612-toggle-command)
+ * [6.1.3 Exit Command](#613-exit-command)
+ * [6.2 Student administrative details features](#62-student-administrative-details-features)
+ * [6.2.1 Add student command](#621-add-student-command)
+ * [6.2.2 Edit student command](#622-edit-student-command)
+ * [6.2.3 Delete student command](#623-delete-student-command)
+ * [6.2.4 Find student command](#624-find-student-command)
+ * [6.2.5 Overdue command](#625-overdue-command)
+ * [6.2.6 Detail commands](#626-detail-commands)
+ * [6.2.6.1 Add detail command](#6261-add-detail-command)
+ * [6.2.6.2 Edit detail command](#6262-edit-detail-command)
+ * [6.2.6.3 Delete detail command](#6263-delete-detail-command)
+ * [6.2.7 Sort command](#627-sort-command)
+ * [6.3 Student academic details features](#63-student-academic-details-features)
+ * [6.3.1 Question commands](#631-question-commands)
+ * [6.3.1.1 Add question command](#6311-add-question-command)
+ * [6.3.1.2 Solve question command](#6312-solve-question-command)
+ * [6.3.1.3 Delete question command](#6313-delete-question-command)
+ * [6.3.1.4 Design considerations](#6314-design-considerations)
+ * [6.3.2 Exam Commands](#632-exam-commands)
+ * [6.3.2.1 Add exam command](#6321-add-exam-command)
+ * [6.3.2.2 Delete exam command](#6322-delete-exam-command)
+ * [6.3.2.3 Exam Stats command](#6323-exam-stats-command)
+ * [6.3.3 Attendance commands](#633-attendance-commands)
+ * [6.3.3.1 Add attendance command](#6331-add-attendance-command)
+ * [6.3.3.2 Delete attendance command](#6332-delete-attendance-command)
+ * [6.4 Schedule command](#64-schedule-command)
+ * [6.5 Notebook feature](#65-notebook-feature)
+ * [6.5.1 Add note command](#651-add-note-command)
+ * [6.5.2 Edit note command](#652-edit-note-command)
+ * [6.5.3 Delete note command](#653-delete-note-command)
+- [7. Documentation](#7-documentation)
+- [8. Logging](#8-logging)
+- [9. Testing](#9-testing)
+- [10. Configuration](#10-configuration)
+- [11. DevOps](#11-devops)
+- [Appendix A: Product Scope](#appendix-a-product-scope)
+- [Appendix B: User Stories](#appendix-b-user-stories)
+- [Appendix C: Use Cases](#appendix-c-use-cases)
+- [Appendix D: Non-Functional Requirements](#appendix-d-non-functional-requirements)
+- [Appendix E: Glossary](#appendix-e-glossary)
+- [Appendix F: Instructions for Manual Testing](#appendix-f-instructions-for-manual-testing)
+ * [F.1 Launch and Shutdown](#f1-launching-reeve)
+ * [F.2 General Features](#f2-general-features)
+ * [F.3 Administrative Features](#f3-student-administrative-features)
+ * [F.4 Academic Features](#f4-student-academic-features)
+ * [F.5 Notebook Features](#f5-notebook-feature)
+ * [F.6 Saving Data](#f6-saving-data)
+
+
+## 1. Introduction
+Welcome to **Reeve**!
+
+**Reeve** is a desktop application for **private tutors to better manage both administrative and academic details of their students**, optimised for use via a
+**Command Line Interface (CLI)** for receiving inputs while still having the benefits of a **Graphical User Interface (GUI)** for displaying information.
+In addition, **Reeve** comes with a customisable personal scheduler to assist users to keep track of their classes. **Reeve** also allows users to set timely reminders for themselves.
+
+**Reeve** is optimized for users that are very comfortable with typing as it works on a Command Line Interface (CLI).
+
+Students' details are displayed in a neat and organized manner through the use of a Graphical User Interface (GUI).
+
+## 2. About
+
+This developer guide will provide you the details of the software architecture and implementation of **Reeve**.
+It is made for developers who wish to understand the internal and external workings of the application.
+
+All developers are warmly welcome to contribute your ideas and improve **Reeve**!
+To contribute, simply head over to [our github](https://github.com/AY2021S1-CS2103T-W15-2/tp) and raise an issue.
+
+## 3. Understanding the Guide
+
+This section will share with you how should you go about understanding this guide in order to best understand **Reeve**.
+
+We have adopted the "top-down" approach into the structure of this guide where we will first look at the high-level structure of our application
+before going into the implementation details of each feature.
+
+We highly encourage you to read the guide from top to bottom in order to have the best understanding of **Reeve**.
+
+Here is a summary (Table 1) of the symbols that are used in this Developer Guide:
+
+Table 1: Summary of symbols
+
+Symbol | Meaning
+:-----:|:-------
+`code` | Code snippets
+:information_source: | Important information
+:bulb: | Tips
+
+
+
+## 4. **Getting Started**
Refer to the guide [_Setting up and getting started_](SettingUp.md).
---------------------------------------------------------------------------------------------------------------------
+## 5. **Design**
+
+### 5.1 Architecture
-## **Design**
+
+
