From e0c5a79857d8b4e80022575c22c758816fb8e682 Mon Sep 17 00:00:00 2001 From: MathanC Date: Sat, 11 Nov 2023 20:30:08 +0800 Subject: [PATCH 01/36] Add test cases for Lock, Unlock, Change Password --- pword.txt | 1 - .../java/seedu/address/model/Password.java | 3 ++ .../commands/ChangePasswordCommandTest.java | 51 +++++++++++++++++++ .../logic/commands/LockCommandTest.java | 25 +++++++++ .../logic/commands/UnlockCommandTest.java | 33 ++++++++++++ 5 files changed, 112 insertions(+), 1 deletion(-) delete mode 100644 pword.txt create mode 100644 src/test/java/seedu/address/logic/commands/ChangePasswordCommandTest.java create mode 100644 src/test/java/seedu/address/logic/commands/LockCommandTest.java create mode 100644 src/test/java/seedu/address/logic/commands/UnlockCommandTest.java diff --git a/pword.txt b/pword.txt deleted file mode 100644 index 81de59c5b55..00000000000 --- a/pword.txt +++ /dev/null @@ -1 +0,0 @@ -730288490 diff --git a/src/main/java/seedu/address/model/Password.java b/src/main/java/seedu/address/model/Password.java index 74390032916..e732d42cff6 100644 --- a/src/main/java/seedu/address/model/Password.java +++ b/src/main/java/seedu/address/model/Password.java @@ -116,6 +116,9 @@ public static String changePassword(String currentPassword, String newPassword) if (verifyPassword(currentPassword)) { // Verify that the new password meets the constraints if (isValidPassword(newPassword)) { + if(currentPassword.equals(newPassword)) { + return "New password cannot be the same as the current password."; + } // Hash the new password String newHashedPassword = hashPassword(newPassword); // Save the new hashed password to the file diff --git a/src/test/java/seedu/address/logic/commands/ChangePasswordCommandTest.java b/src/test/java/seedu/address/logic/commands/ChangePasswordCommandTest.java new file mode 100644 index 00000000000..a9e54ea166d --- /dev/null +++ b/src/test/java/seedu/address/logic/commands/ChangePasswordCommandTest.java @@ -0,0 +1,51 @@ +package seedu.address.logic.commands; +import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; +import static seedu.address.model.Password.MESSAGE_CONSTRAINTS; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import seedu.address.model.Model; +import seedu.address.model.ModelManager; +public class ChangePasswordCommandTest { + + private Model model; + private Model expectedModel; + + @BeforeEach + public void setUp() { + model = new ModelManager(); + expectedModel = new ModelManager(); + } + + @Test + public void execute_changePassword_success() { + //Works only for default password + assertCommandSuccess(new ChangePasswordCommand("Password123!","Password1243!"), model, + "Password changed successfully." + , expectedModel); + //Change back to default password + assertCommandSuccess(new ChangePasswordCommand("Password1243!","Password123!"), model, + "Password changed successfully." + , expectedModel); + } + + @Test + public void execute_changePassword_failure_same() { + assertCommandSuccess(new ChangePasswordCommand("Password123!","Password123!"), model, + "New password cannot be the same as the current password." + , expectedModel); + } + @Test + public void execute_changePassword_failure_wrong() { + assertCommandSuccess(new ChangePasswordCommand("Password13!","Password123!"), model, + "Current password is incorrect.\n" + MESSAGE_CONSTRAINTS + , expectedModel); + } + @Test + public void execute_changePassword_failure_invalid() { + assertCommandSuccess(new ChangePasswordCommand("Password123!","Password123"), model, + "New password doesn't meet the constraints.\n" + MESSAGE_CONSTRAINTS + , expectedModel); + } +} diff --git a/src/test/java/seedu/address/logic/commands/LockCommandTest.java b/src/test/java/seedu/address/logic/commands/LockCommandTest.java new file mode 100644 index 00000000000..b81c83b10cb --- /dev/null +++ b/src/test/java/seedu/address/logic/commands/LockCommandTest.java @@ -0,0 +1,25 @@ +package seedu.address.logic.commands; +import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import seedu.address.model.Model; +import seedu.address.model.ModelManager; + +public class LockCommandTest { + + private Model model; + private Model expectedModel; + + @BeforeEach + public void setUp() { + model = new ModelManager(); + expectedModel = new ModelManager(); + } + + @Test + public void execute_lock_success() { + assertCommandSuccess(new LockCommand(), model, LockCommand.MESSAGE_SUCCESS, model); + } +} diff --git a/src/test/java/seedu/address/logic/commands/UnlockCommandTest.java b/src/test/java/seedu/address/logic/commands/UnlockCommandTest.java new file mode 100644 index 00000000000..d5b2f9f5c32 --- /dev/null +++ b/src/test/java/seedu/address/logic/commands/UnlockCommandTest.java @@ -0,0 +1,33 @@ +package seedu.address.logic.commands; +import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import seedu.address.model.Model; +import seedu.address.model.ModelManager; +public class UnlockCommandTest { + + private Model model; + private Model expectedModel; + + @BeforeEach + public void setUp() { + model = new ModelManager(); + expectedModel = new ModelManager(); + } + + @Test + public void execute_unlock_success() { + //Works only for default password + assertCommandSuccess(new UnlockCommand("Password123!"), model, UnlockCommand.MESSAGE_SUCCESS + , expectedModel); + } + + @Test + public void execute_unlock_failure() { + assertCommandSuccess(new UnlockCommand("Password123"), model, UnlockCommand.MESSAGE_FAILURE + , expectedModel); + } + +} From 5a24c5a7419284e20b8f6f62bdccf56c5e21cb52 Mon Sep 17 00:00:00 2001 From: waseem Date: Sun, 12 Nov 2023 00:32:36 +0800 Subject: [PATCH 02/36] Add test cases for find client and find projects Update developer guide with diagrams --- docs/DeveloperGuide.md | 59 +++++------ docs/Documentation.md | 2 +- .../FindDeveloperSequenceDiagram.puml | 70 +++++++++++++ docs/images/FindDeveloperSequenceDiagram.png | Bin 0 -> 36019 bytes .../logic/commands/CommandTestUtil.java | 20 ++++ .../logic/commands/FindClientCommandTest.java | 92 ++++++++++++++++++ .../commands/FindProjectCommandTest.java | 92 ++++++++++++++++++ .../address/testutil/ProjectBuilder.java | 65 +++++++++++++ .../address/testutil/TypicalProjects.java | 92 ++++++++++++++++++ 9 files changed, 462 insertions(+), 30 deletions(-) create mode 100644 docs/diagrams/FindDeveloperSequenceDiagram.puml create mode 100644 docs/images/FindDeveloperSequenceDiagram.png create mode 100644 src/test/java/seedu/address/logic/commands/FindClientCommandTest.java create mode 100644 src/test/java/seedu/address/logic/commands/FindProjectCommandTest.java create mode 100644 src/test/java/seedu/address/testutil/ProjectBuilder.java create mode 100644 src/test/java/seedu/address/testutil/TypicalProjects.java diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index b2d201bf8d8..80049ea2229 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -40,7 +40,7 @@ The *Sequence Diagram* below shows how the components interact with each other f Each of the four main components (also shown in the diagram above), * defines its *API* in an `interface` with the same name as the Component. -* implements its functionality using a concrete `{Component Name}Manager` class (which follows the corresponding API `interface` mentioned in the previous point. +* implements its functionality using a concrete `{Component Name}Manager` class (which follows the corresponding API `interface` mentioned in the previous point). For example, the `Logic` component defines its API in the `Logic.java` interface and implements its functionality using the `LogicManager.java` class which follows the `Logic` interface. Other components interact with a given component through its interface rather than the concrete class (reason: to prevent outside component's being coupled to the implementation of a component), as illustrated in the (partial) class diagram below. @@ -79,11 +79,11 @@ The sequence diagram below illustrates the interactions within the `Logic` compo How the `Logic` component works: 1. When `Logic` is called upon to execute a command, it is passed to an `AddressBookParser` object which in turn creates a parser that matches the command (e.g., `DeleteCommandParser`) and uses it to parse the command. -1. This results in a `Command` object (more precisely, an object of one of its subclasses e.g., `DeleteCommand`) which is executed by the `LogicManager`. -1. The command can communicate with the `Model` when it is executed (e.g. to delete a developer). -1. The result of the command execution is encapsulated as a `CommandResult` object which is returned back from `Logic`. +2. This results in a `Command` object (more precisely, an object of one of its subclasses e.g., `DeleteCommand`) which is executed by the `LogicManager`. +3. The command can communicate with the `Model` when it is executed (e.g. to delete a developer). +4. The result of the command execution is encapsulated as a `CommandResult` object which is returned back from `Logic`. - @@ -110,39 +135,56 @@ Here are the other classes in `Logic` (omitted from the class diagram above) tha + @@ -110,39 +135,56 @@ Here are the other classes in `Logic` (omitted from the class diagram above) tha How the parsing works: @@ -220,7 +220,7 @@ The implementation follows likewise for clients. The following sequence diagram illustrates how the add developer operation works: -##### GUI Implentation +##### GUI Implementation A new menu item will be added under File called `Import developers` and `Import clients` Clicking it will lead to a window to select the location of the respective file in csv format. @@ -243,22 +243,24 @@ Given below is an example usage scenario and how the find mechanism behaves at e **Step 2.** To filter developers by name, the user executes the command `find-developer n/ alice bob`. The application recognizes the "developer n/" prefix and uses the `NameContainsKeywordsPredicate` to generate a filtering criteria. The list in the UI is updated to only display developers named Alice or Bob. -**Step 3.** Next, the user wants to find clients from a specific organisation. They use the command `find-client o/ Google`. The "find-client o/" prefix maps to the `OrganisationContainsKeywordsPredicate` and filters clients associated with Google. +**Step 3.** Next, the user wants to find clients from a specific organisation. They use the command `find-client o/Google`. The "find-client o/" prefix maps to the `OrganisationContainsKeywordsPredicate` and filters clients associated with Google. **Step 4.** If the user provides an unrecognized prefix, e.g., `find-developer z/ alice`, an error message is displayed informing them of the correct command format. -> :information_source: **Note:** While the user can search by multiple keywords, each keyword maps to an entire word in the attributes. For example, searching for "Ali" will not return "Alice". -The following sequence diagram provides an overview of how the find operation is executed: +> :information_source: **Note:** The following sequence diagram provides an overview of how the find operation is executed: @@ -295,48 +383,64 @@ The following sequence diagram provides an overview of how the find operation is + + +![Interactions Inside the Logic Component for the `find-developer n/alice` Command](images/FindDeveloperSequenceDiagram.png) **Aspect:** Implementation of the predicate map: -**Alternative 1 (current choice):** +**Alternative 1:** - Use a long chain of `if-else` conditions for each attribute. - **Pros:** Explicit parsing logic for each attribute. - **Cons:** Code becomes lengthy and hard to maintain. Adding a new attribute involves modifying the parsing logic, increasing the risk of errors. -**Alternative 2:** +**Alternative 2 (current choice):** - Use a map linking prefixes to their corresponding predicate constructors. - **Pros:** Simplifies the parsing process. Adding a new attribute to search becomes as simple as adding a new entry in the map. - **Cons:** A potential mismatch between the prefix and its predicate can lead to wrong results. @@ -292,7 +294,6 @@ Step 3. The user executes `add n/David …​` to add a new developer. The `add` ![UndoRedoState2](images/UndoRedoState2.png)
:information_source: **Note:** If a command fails its execution, it will not call `Model#commitAddressBook()`, so the address book state will not be saved into the `addressBookStateList`. -
Step 4. The user now decides that adding the developer was a mistake, and decides to undo that action by executing the `undo` command. The `undo` command will call `Model#undoAddressBook()`, which will shift the `currentStatePointer` once to the left, pointing it to the previous address book state, and restores the address book to that state. @@ -381,7 +382,7 @@ _{more aspects and alternatives to be added}_ * 3a. The given details are invalid or in an invalid format. - @@ -486,24 +598,27 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unli + @@ -486,24 +598,27 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (not important) Use case resumes at step 4. * *a. At any time, User chooses to cancel the action. @@ -399,19 +400,19 @@ _{more aspects and alternatives to be added}_ **Guarantees:** 1. User is logged into their account system. -2. They only have the access rights to the user-specific features (eg. developers can only modify their personal +2. They only have the access rights to the user-specific features (e.g. developers can only modify their personal particulars and no other information). **MSS** 1. User accesses the login page of the system. 2. System presents the login page to the user. 3. User enters their own login credentials and submits to the system. - @@ -513,80 +628,92 @@ particulars and no other information). + (@@ -513,80 +628,92 @@ particulars and no other information). Use case ends. **Extensions** * 4a. The login credentials are invalid (no record it is created). - * 4a1. System informs user there is an erro and directs user to seek HR for help. + * 4a1. System informs user there is an error and directs user to seek HR for help. Use case ends. @@ -478,9 +479,9 @@ in a clear and user-friendly manner. * A comprehensive user manual or online documentation shall be provided to explain how to use the application. #### Process Requirements * The project is expected to adhere to a schedule that completes a milestone set every two weeks. -* The projsct shall follow a iterative breadth-first development methodology +* The project shall follow an iterative breadth-first development methodology * Automated testing suits shall be maintained and run for each build -* Code review shall be conducted for all new code contrivution, with at least one team member +* Code review shall be conducted for all new code contribution, with at least one team member reviewing each piece of code before it is merged * All project source code shall be stored in a version control system (e.g., Git), and commits should follow a consistent naming convention. @@ -493,32 +494,32 @@ and commits should follow a consistent naming convention. 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 contacts. The window size may not be optimum. + 2. Double-click the jar file Expected: Shows the GUI with a set of sample contacts. The window size may not be optimum. -1. Saving window preferences +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.
+ 2. Re-launch the app by double-clicking the jar file.
Expected: The most recent window size and location is retained. -1. _{ more test cases …​ }_ - @@ -628,23 +756,24 @@ testers are expected to do more *exploratory* testing. +3. _{ more test cases …​ }_ + @@ -628,23 +756,24 @@ testers are expected to do more *exploratory* testing. -1. Deleting a developer while all developers are being shown +4. Deleting a developer while all developers are being shown 1. Prerequisites: List all developers using the `list` command. Multiple developers in the list. - 1. Test case: `delete 1`
+ 2. Test case: `delete 1`
Expected: First contact is deleted from the list. Details of the deleted contact shown in the status message. Timestamp in the status bar is updated. - 1. Test case: `delete 0`
+ 3. Test case: `delete 0`
Expected: No developer is deleted. Error details shown in the status message. Status bar remains the same. - 1. Other incorrect delete commands to try: `delete`, `delete x`, `...` (where x is larger than the list size)
+ 4. Other incorrect delete commands to try: `delete`, `delete x`, `...` (where x is larger than the list size)
Expected: Similar to previous. -1. _{ more test cases …​ }_ +5. _{ more test cases …​ }_ ### Saving data @@ -526,4 +527,4 @@ and commits should follow a consistent naming convention. 1. _{explain how to simulate a missing/corrupted file, and the expected behavior}_ -1. _{ more test cases …​ }_ +2. _{ more test cases …​ }_ diff --git a/docs/Documentation.md b/docs/Documentation.md index 3e68ea364e7..0e33867d565 100644 --- a/docs/Documentation.md +++ b/docs/Documentation.md @@ -18,7 +18,7 @@ title: Documentation guide * Follow the [**_Google developer documentation style guide_**](https://developers.google.com/style). -* Also relevant is the [_[se-edu/guides] **Markdown coding standard**_](https://se-education.org/guides/conventions/markdown.html) +* Also, relevant is the [_[se-edu/guides] **Markdown coding standard**_](https://se-education.org/guides/conventions/markdown.html) **Diagrams:** diff --git a/docs/diagrams/FindDeveloperSequenceDiagram.puml b/docs/diagrams/FindDeveloperSequenceDiagram.puml new file mode 100644 index 00000000000..f5e9dcd8735 --- /dev/null +++ b/docs/diagrams/FindDeveloperSequenceDiagram.puml @@ -0,0 +1,70 @@ +@startuml +!include style.puml +skinparam ArrowFontStyle plain + +box Logic LOGIC_COLOR_T1 +participant ":LogicManager" as LogicManager LOGIC_COLOR +participant ":AddressBookParser" as AddressBookParser LOGIC_COLOR +participant ":FindCommandParser" as FindCommandParser LOGIC_COLOR +participant "d:FindCommand" as FindCommand LOGIC_COLOR +participant ":CommandResult" as CommandResult LOGIC_COLOR +end box + +box Model MODEL_COLOR_T1 +participant ":Model" as Model MODEL_COLOR +end box + +[-> LogicManager : execute("find-developer n/Alice") +activate LogicManager + +LogicManager -> AddressBookParser : parseCommand("find-developer n/Alice") +activate AddressBookParser + +create FindCommandParser +AddressBookParser -> FindCommandParser +activate FindCommandParser + +FindCommandParser --> AddressBookParser +deactivate FindCommandParser + +AddressBookParser -> FindCommandParser : parse("Alice") +activate FindCommandParser + +create FindCommand +FindCommandParser -> FindCommand +activate FindCommand + +FindCommand --> FindCommandParser : d +deactivate FindCommand + +FindCommandParser --> AddressBookParser : d +deactivate FindCommandParser +'Hidden arrow to position the destroy marker below the end of the activation bar. +FindCommandParser -[hidden]-> AddressBookParser +destroy FindCommandParser + +AddressBookParser --> LogicManager : d +deactivate AddressBookParser + +LogicManager -> FindCommand : execute() +activate FindCommand + +FindCommand -> Model : FindDeveloper(1) +activate Model + +Model --> FindCommand +deactivate Model + +create CommandResult +FindCommand -> CommandResult +activate CommandResult + +CommandResult --> FindCommand +deactivate CommandResult + +FindCommand --> LogicManager : result +deactivate FindCommand + +[<--LogicManager +deactivate LogicManager +@enduml diff --git a/docs/images/FindDeveloperSequenceDiagram.png b/docs/images/FindDeveloperSequenceDiagram.png new file mode 100644 index 0000000000000000000000000000000000000000..41b2db7d865d2dc62bca3f6fb738357017980531 GIT binary patch literal 36019 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 L#ao}m^`8A715KJK literal 0 HcmV?d00001 diff --git a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java index 873ea69b853..84d9d1fb91e 100644 --- a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java +++ b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java @@ -92,6 +92,24 @@ public class CommandTestUtil { public static final String DOCUMENT_DESC_AMY = " " + PREFIX_DOCUMENT + VALID_DOCUMENT_AMY; public static final String DOCUMENT_DESC_BOB = " " + PREFIX_DOCUMENT + VALID_DOCUMENT_BOB; + public static final String VALID_PROJECT_DESCRIPTION_APPLEAPP = "Developing the AppleApp"; + public static final String VALID_PROJECT_DESCRIPTION_GOOGLEAPP = "Working on the GoogleApp"; + public static final String VALID_PROJECT_DESCRIPTION_ANDROIDAPP = "AndroidApp development"; + + public static final String VALID_PROJECT_DEADLINE_APPLEAPP = "2023-12-31"; + public static final String VALID_PROJECT_DEADLINE_GOOGLEAPP = "2023-11-30"; + public static final String VALID_PROJECT_DEADLINE_ANDROIDAPP = "2023-10-31"; + + public static final String VALID_PROJECT_PRIORITY_APPLEAPP = "High"; + public static final String VALID_PROJECT_PRIORITY_GOOGLEAPP = "Medium"; + public static final String VALID_PROJECT_PRIORITY_ANDROIDAPP = "Low"; + + public static final String VALID_PROJECT_NAME_APPLEAPP = "AppleApp"; + public static final String VALID_PROJECT_NAME_GOOGLEAPP = "GoogleApp"; + public static final String VALID_PROJECT_NAME_ANDROIDAPP = "AndroidApp"; + + public static final String VALID_PROJECT_TAG_UI = "UI"; + public static final String VALID_PROJECT_TAG_BACKEND = "Backend"; 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 @@ -104,6 +122,8 @@ public class CommandTestUtil { public static final String INVALID_RATING_DESC = "abc" + PREFIX_RATING; // public static final String INVALID_PROJECT_DESC = " " + PREFIX_PROJECT; // + + public static final String PREAMBLE_WHITESPACE = "\t \r \n"; public static final String PREAMBLE_NON_EMPTY = "NonEmptyPreamble"; diff --git a/src/test/java/seedu/address/logic/commands/FindClientCommandTest.java b/src/test/java/seedu/address/logic/commands/FindClientCommandTest.java new file mode 100644 index 00000000000..87bb9549482 --- /dev/null +++ b/src/test/java/seedu/address/logic/commands/FindClientCommandTest.java @@ -0,0 +1,92 @@ +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.logic.commands.CommandTestUtil.assertCommandSuccess; +import static seedu.address.testutil.TypicalClients.ALICE; +import static seedu.address.testutil.TypicalClients.BENSON; +import static seedu.address.testutil.TypicalClients.CARL; +import static seedu.address.testutil.TypicalClients.getTypicalAddressBook; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import seedu.address.logic.commands.find.FindClientCommand; +import seedu.address.model.Model; +import seedu.address.model.ModelManager; +import seedu.address.model.UserPrefs; +import seedu.address.model.client.NameClientContainsKeywordsPredicate; + +/** + * Contains integration tests (interaction with the Model) for {@code FindClientCommand}. + */ +public class FindClientCommandTest { + private final Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + private final Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + + @Test + public void equals() { + NameClientContainsKeywordsPredicate firstPredicate = + new NameClientContainsKeywordsPredicate(Collections.singletonList("first")); + NameClientContainsKeywordsPredicate secondPredicate = + new NameClientContainsKeywordsPredicate(Collections.singletonList("second")); + + FindClientCommand findFirstCommand = new FindClientCommand(firstPredicate); + FindClientCommand findSecondCommand = new FindClientCommand(secondPredicate); + + // same object -> returns true + assertEquals(findFirstCommand, findFirstCommand); + + // same values -> returns true + FindClientCommand findFirstCommandCopy = new FindClientCommand(firstPredicate); + assertEquals(findFirstCommand, findFirstCommandCopy); + + // different types -> returns false + assertNotEquals(1, findFirstCommand); + + // null -> returns false + assertNotEquals(null, findFirstCommand); + + // different client -> returns false + assertNotEquals(findFirstCommand, findSecondCommand); + } + + @Test + public void execute_zeroKeywords_noPersonFound() { + String expectedMessage = "There are no clients with matching information."; + NameClientContainsKeywordsPredicate predicate = preparePredicate("hii"); + FindClientCommand command = new FindClientCommand(predicate); + expectedModel.updateFilteredClientList(predicate); + assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertEquals(Collections.emptyList(), model.getFilteredClientList()); + } + + @Test + public void execute_multipleKeywords_multiplePersonsFound() { + String expectedMessage = "These are the 3 clients with matching information."; + NameClientContainsKeywordsPredicate predicate = preparePredicate("Alice Benson Carl"); + FindClientCommand command = new FindClientCommand(predicate); + expectedModel.updateFilteredClientList(predicate); + assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertEquals(Arrays.asList(ALICE, BENSON, CARL), model.getFilteredClientList()); + } + + @Test + public void toStringMethod() { + NameClientContainsKeywordsPredicate predicate = + new NameClientContainsKeywordsPredicate(List.of("keyword")); + FindClientCommand findClientCommand = new FindClientCommand(predicate); + String expected = FindClientCommand.class.getCanonicalName() + "{predicate=" + predicate + "}"; + assertEquals(expected, findClientCommand.toString()); + } + + /** + * Parses {@code userInput} into a {@code NameClientContainsKeywordsPredicate}. + */ + private NameClientContainsKeywordsPredicate preparePredicate(String userInput) { + return new NameClientContainsKeywordsPredicate(Arrays.asList(userInput.split("\\s+"))); + } +} diff --git a/src/test/java/seedu/address/logic/commands/FindProjectCommandTest.java b/src/test/java/seedu/address/logic/commands/FindProjectCommandTest.java new file mode 100644 index 00000000000..408334a4c61 --- /dev/null +++ b/src/test/java/seedu/address/logic/commands/FindProjectCommandTest.java @@ -0,0 +1,92 @@ +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.logic.commands.CommandTestUtil.assertCommandSuccess; +import static seedu.address.testutil.TypicalProjects.PROJECT_A; +import static seedu.address.testutil.TypicalProjects.PROJECT_B; +import static seedu.address.testutil.TypicalProjects.PROJECT_C; +import static seedu.address.testutil.TypicalProjects.getTypicalAddressBook; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import seedu.address.logic.commands.find.FindProjectCommand; +import seedu.address.model.Model; +import seedu.address.model.ModelManager; +import seedu.address.model.UserPrefs; +import seedu.address.model.project.ProjectNameContainsKeywordsPredicate; + +/** + * Contains integration tests (interaction with the Model) for {@code FindProjectCommand}. + */ +public class FindProjectCommandTest { + private final Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + private final Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + + @Test + public void equals() { + ProjectNameContainsKeywordsPredicate firstPredicate = + new ProjectNameContainsKeywordsPredicate(Collections.singletonList("first")); + ProjectNameContainsKeywordsPredicate secondPredicate = + new ProjectNameContainsKeywordsPredicate(Collections.singletonList("second")); + + FindProjectCommand findFirstCommand = new FindProjectCommand(firstPredicate); + FindProjectCommand findSecondCommand = new FindProjectCommand(secondPredicate); + + // same object -> returns true + assertEquals(findFirstCommand, findFirstCommand); + + // same values -> returns true + FindProjectCommand findFirstCommandCopy = new FindProjectCommand(firstPredicate); + assertEquals(findFirstCommand, findFirstCommandCopy); + + // different types -> returns false + assertNotEquals(1, findFirstCommand); + + // null -> returns false + assertNotEquals(null, findFirstCommand); + + // different project -> returns false + assertNotEquals(findFirstCommand, findSecondCommand); + } + + @Test + public void execute_zeroKeywords_noProjectFound() { + String expectedMessage = "There are no projects with matching information."; + ProjectNameContainsKeywordsPredicate predicate = preparePredicate("hii"); + FindProjectCommand command = new FindProjectCommand(predicate); + expectedModel.updateFilteredProjectList(predicate); + assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertEquals(Collections.emptyList(), model.getFilteredProjectList()); + } + + @Test + public void execute_multipleKeywords_multipleProjectsFound() { + String expectedMessage = "These are the 3 projects with matching information."; + ProjectNameContainsKeywordsPredicate predicate = preparePredicate("Project A B C"); + FindProjectCommand command = new FindProjectCommand(predicate); + expectedModel.updateFilteredProjectList(predicate); + assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertEquals(Arrays.asList(PROJECT_A, PROJECT_B, PROJECT_C), model.getFilteredProjectList()); + } + + @Test + public void toStringMethod() { + ProjectNameContainsKeywordsPredicate predicate = + new ProjectNameContainsKeywordsPredicate(List.of("keyword")); + FindProjectCommand findProjectCommand = new FindProjectCommand(predicate); + String expected = FindProjectCommand.class.getCanonicalName() + "{predicate=" + predicate + "}"; + assertEquals(expected, findProjectCommand.toString()); + } + + /** + * Parses {@code userInput} into a {@code ProjectNameContainsKeywordsPredicate}. + */ + private ProjectNameContainsKeywordsPredicate preparePredicate(String userInput) { + return new ProjectNameContainsKeywordsPredicate(Arrays.asList(userInput.split("\\s+"))); + } +} diff --git a/src/test/java/seedu/address/testutil/ProjectBuilder.java b/src/test/java/seedu/address/testutil/ProjectBuilder.java new file mode 100644 index 00000000000..277b7b3c498 --- /dev/null +++ b/src/test/java/seedu/address/testutil/ProjectBuilder.java @@ -0,0 +1,65 @@ +package seedu.address.testutil; + +import java.util.ArrayList; +import java.util.List; + +import seedu.address.model.commons.Name; +import seedu.address.model.project.Deadline; +import seedu.address.model.project.Description; +import seedu.address.model.project.Project; + +/** + * A utility class to help with building Project objects. + */ +public class ProjectBuilder { + public static final String DEFAULT_NAME = "AppleApp"; + public static final String DEFAULT_DESCRIPTION = "Developing the AppleApp"; + public static final String DEFAULT_DEADLINE = "31-12-2019,Develop front end interface,HIGH,0"; + + private Name name; + private Description description; + private List deadlineList; + + /** + * Creates a {@code ProjectBuilder} with the default details. + */ + public ProjectBuilder() { + name = new Name(DEFAULT_NAME); + description = new Description(DEFAULT_DESCRIPTION); + deadlineList = new ArrayList<>(); + deadlineList.add(new Deadline(DEFAULT_DEADLINE, 1)); + } + + /** + * Initializes the ProjectBuilder with the data of {@code projectToCopy}. + * @param projectToCopy + */ + public ProjectBuilder(Project projectToCopy) { + name = projectToCopy.getProjectName(); + description = projectToCopy.getProjectDescription(); + deadlineList = projectToCopy.getProjectDeadlines(); + } + + /** Sets the {@code Name} of the {@code Project} that we are building. */ + public ProjectBuilder withName(String name) { + this.name = new Name(name); + return this; + } + + /** Sets the {@code Description} of the {@code Project} that we are building. */ + public ProjectBuilder withDescription(String description) { + this.description = new Description(description); + return this; + } + + /** Sets the {@code Deadline} of the {@code Project} that we are building. */ + public ProjectBuilder withDeadline(String deadline) { + this.deadlineList.add(new Deadline(deadline, 1)); + return this; + } + + /** Builds a Project object. */ + public Project build() { + return new Project(name, description, deadlineList); + } +} \ No newline at end of file diff --git a/src/test/java/seedu/address/testutil/TypicalProjects.java b/src/test/java/seedu/address/testutil/TypicalProjects.java new file mode 100644 index 00000000000..36b454700ff --- /dev/null +++ b/src/test/java/seedu/address/testutil/TypicalProjects.java @@ -0,0 +1,92 @@ +package seedu.address.testutil; + +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_DESCRIPTION_APPLEAPP; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_DESCRIPTION_GOOGLEAPP; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_DESCRIPTION_ANDROIDAPP; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_DEADLINE_APPLEAPP; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_DEADLINE_GOOGLEAPP; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_DEADLINE_ANDROIDAPP; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_PRIORITY_APPLEAPP; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_PRIORITY_GOOGLEAPP; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_PRIORITY_ANDROIDAPP; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_NAME_APPLEAPP; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_NAME_GOOGLEAPP; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_NAME_ANDROIDAPP; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_TAG_UI; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_TAG_BACKEND; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import seedu.address.model.AddressBook; +import seedu.address.model.project.Project; + +/** + * A utility class containing a list of {@code Project} objects to be used in tests. + */ +public class TypicalProjects { + + public static final Project PROJECT_A = new ProjectBuilder().withName("Project A") + .withDescription("This is Project A").withDeadline("20-12-2023,Design frontend,MEDIUM,0").build(); + public static final Project PROJECT_B = new ProjectBuilder().withName("Project B") + .withDescription("This is Project B").withDeadline("22-12-2023,Design backend,HIGH,0").build(); + public static final Project PROJECT_C = new ProjectBuilder().withName("Project C") + .withDescription("This is Project C").withDeadline("25-12-2023,Testing,LOW,1").build(); + + private TypicalProjects() {} // prevents instantiation + + /** + * Returns an {@code AddressBook} with all the typical projects. + */ + public static AddressBook getTypicalAddressBook() { + AddressBook ab = new AddressBook(); + for (Project project : getTypicalProjects()) { + ab.addProject(project); + } + return ab; + } + + public static List getTypicalProjects() { + return new ArrayList<>(Arrays.asList(PROJECT_A, PROJECT_B, PROJECT_C)); + } + + /** + * Returns a list of typical project names. + */ + public static List getTypicalProjectNames() { + return new ArrayList<>(Arrays.asList(VALID_PROJECT_NAME_APPLEAPP, VALID_PROJECT_NAME_GOOGLEAPP, + VALID_PROJECT_NAME_ANDROIDAPP)); + } + + /** + * Returns a list of typical project descriptions. + */ + public static List getTypicalProjectDescriptions() { + return new ArrayList<>(Arrays.asList(VALID_PROJECT_DESCRIPTION_APPLEAPP, VALID_PROJECT_DESCRIPTION_GOOGLEAPP, + VALID_PROJECT_DESCRIPTION_ANDROIDAPP)); + } + + /** + * Returns a list of typical project deadlines. + */ + public static List getTypicalProjectDeadlines() { + return new ArrayList<>(Arrays.asList(VALID_PROJECT_DEADLINE_APPLEAPP, VALID_PROJECT_DEADLINE_GOOGLEAPP, + VALID_PROJECT_DEADLINE_ANDROIDAPP)); + } + + /** + * Returns a list of typical project priorities. + */ + public static List getTypicalProjectPriorities() { + return new ArrayList<>(Arrays.asList(VALID_PROJECT_PRIORITY_APPLEAPP, VALID_PROJECT_PRIORITY_GOOGLEAPP, + VALID_PROJECT_PRIORITY_ANDROIDAPP)); + } + + /** + * Returns a list of typical project tags. + */ + public static List getTypicalProjectTags() { + return new ArrayList<>(Arrays.asList(VALID_PROJECT_TAG_UI, VALID_PROJECT_TAG_BACKEND)); + } +} From 063d4d1f8b7921e8166036d4985f25b04b2510f4 Mon Sep 17 00:00:00 2001 From: MathanC Date: Sun, 12 Nov 2023 01:05:32 +0800 Subject: [PATCH 03/36] Updated UG, fixed bugs, added test cases --- docs/UserGuide.md | 72 +++++++++--------- .../address/logic/commands/CommandResult.java | 6 +- .../address/logic/commands/ImportCommand.java | 75 ------------------- .../address/logic/commands/TabIndex.java | 5 -- .../commands/edit/EditProjectCommand.java | 2 +- .../commands/imports/ImportClientCommand.java | 11 +-- .../imports/ImportDeveloperCommand.java | 12 +-- .../commands/list/ListProjectCommand.java | 2 +- .../logic/parser/AddressBookParser.java | 4 - .../address/logic/parser/ParserUtil.java | 16 ++++ .../find/FindDeadlineCommandParser.java | 7 +- .../imports/ImportDeveloperCommandParser.java | 3 - .../java/seedu/address/ui/MainWindow.java | 24 +++++- .../java/seedu/address/ui/ProjectCard.java | 2 +- .../find/FindDeadlineCommandTest.java | 24 ++++++ 15 files changed, 114 insertions(+), 151 deletions(-) delete mode 100644 src/main/java/seedu/address/logic/commands/ImportCommand.java create mode 100644 src/test/java/seedu/address/logic/commands/find/FindDeadlineCommandTest.java diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 837bfe97fc1..1e4baac9b65 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -14,43 +14,43 @@ management tasks done faster than traditional GUI apps. * How can this guide help me? * Navigating this guide - * Glossary - * Definitions - * Parameter Information - * Common parameters - * Developer parameters - * Client parameters - * Project parameters - * Format - * General Formatting - * Command Format -* Navigating the Graphical User Interface (GUI) + * [Glossary](#glossary) + * [Definitions](#definitions) + * [Parameter Information](#parameter-information) + * [Common parameters](#common-parameters) + * [Developer parameters](#developer-parameters) + * [Client parameters](#client-parameters) + * [Project parameters](#project-parameters) + * [Format](#format) + * [General Formatting](#general-formatting) + * [Command Format](#command-format) +* [Navigating the Graphical User Interface (GUI)](#navigating-the-graphical-user-interface--gui-) * [Quick Start](#quick-start) * [CodeContact Tutorial](#codecontact-tutorial--for-new-users-) * [Features](#features) - -| Description | Developer | Client | Project | -|:-------------------------------|:-------------------------------------------------------------------------:|:----------------------------------------------------------------:|:----------------:| -| Adding new information | `add-developer` | `add-client` | `add-project` | -| Editing information | `edit-developer` | `edit-client` | `edit-project` | -| Importing information | `import-developer` | `import-client` | - | -| Deleting information | `delete-developer` | `delete-client` | `delete-project` | -| Finding information | `find-developer` | `find-client` | `find-project` | -| Listing information | `list-developer` | `list-client` | `list-project` | -| [Adding new role](#add-roles) | [`add-developer-role`](#add-developer-roles--add-developer-role) | [`add-client-role`](#add-client-roles--add-client-role) | - | -| [Deleting role](#delete-roles) | [`delete-developer-role`](#delete-developer-roles--delete-developer-role) | [`delete-client-role`](#delete-client-roles--delete-client-role) | - | - -* [Lock `lock`](#lock-lock) -* [Unlock `unlock`](#unlock-unlock) -* [Change password `change-password`](#change-password-change-password) -* [Mark deadline as done `mark-deadline`](#mark-deadline-as-done--mark-deadline) -* [Mark deadline as undone `unmark-deadline`](#mark-deadline-as-undone--unmark-deadline) -* [Find Deadline `find-deadline`](#find-deadlines-find-deadline) -* [Undo `undo`](#undo--undo) -* [Redo `redo`](#redo--redo) -* [Help `help`](#viewing-help--help) -* [Clear entries `clear`](#clearing-all-entries--clear) -* [Exit program `exit`](#exiting-the-program--exit) + * [Lock `lock`](#lock-lock) + * [Unlock `unlock`](#unlock-unlock) + * [Change password `change-password`](#change-password-change-password) + +| Description | Developer | Client | Project | +|:--------------------------------------------------|:-------------------------------------------------------------------------:|:----------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------:| +| [Adding new information](#add) | [`add-developer`](#add-developer--add-developer) | [`add-client`](#add-client--add-client) | [`add-project`](#add-project--add-project) | +| [Deleting information](#delete) | [`delete-developer`](#delete-developer--delete-developer) | [`delete-client`](#delete-client--delete-client) | [`delete-project`](#delete-project--delete-project) | +| [Editing information](#edit) | [`edit-developer`](#edit-developer-details--edit-developer) | [`edit-client`](#edit-client-details--edit-client) | [`edit-project`](#edit-project-details--edit-project) | +| [Importing information](#import-information) | [`import-developer` ](#import-developers-import-developer) | [`import-client`](#import-clients-import-client) | - | +| [Finding information](#find) | [`find-developer`](#find-developer-details) | [`find-client`](#find-client-details) | [`find-project`](#find-project-details), [`find-deadline`](#find-deadlines-find-deadline) | +| [Listing information](#listing-information--list) | `list-developer` | `list-client` | `list-project` | +| [Adding new role](#add-roles) | [`add-developer-role`](#add-developer-roles--add-developer-role) | [`add-client-role`](#add-client-roles--add-client-role) | - | +| [Deleting role](#delete-roles) | [`delete-developer-role`](#delete-developer-roles--delete-developer-role) | [`delete-client-role`](#delete-client-roles--delete-client-role) | - | + +* + * [Mark deadline as done `mark-deadline`](#mark-deadline-as-done--mark-deadline) + * [Mark deadline as undone `unmark-deadline`](#mark-deadline-as-undone--unmark-deadline) + * [Undo `undo`](#undo--undo) + * [Redo `redo`](#redo--redo) + * [Help `help`](#viewing-help--help) + * [Clear entries `clear`](#clearing-all-entries--clear) + * [Exit program `exit`](#exiting-the-program--exit) * [FAQ](#faq) * [Known Issues](#known-issues) * [Command Summary](#command-summary) @@ -433,7 +433,7 @@ Example: ### Delete -#### Delete developer details : `delete-developer` +#### Delete developer : `delete-developer` Deletes developer in the address book. @@ -453,7 +453,7 @@ Example of usage: `delete-client 3` * Deletes third client in list. -#### Delete project details : `delete-project` +#### Delete project : `delete-project` Deletes the details of an existing project in the address book. diff --git a/src/main/java/seedu/address/logic/commands/CommandResult.java b/src/main/java/seedu/address/logic/commands/CommandResult.java index dc8fc90801c..d4bbbdb85cd 100644 --- a/src/main/java/seedu/address/logic/commands/CommandResult.java +++ b/src/main/java/seedu/address/logic/commands/CommandResult.java @@ -69,12 +69,13 @@ public boolean equals(Object other) { CommandResult otherCommandResult = (CommandResult) other; return feedbackToUser.equals(otherCommandResult.feedbackToUser) && showHelp == otherCommandResult.showHelp - && exit == otherCommandResult.exit; + && exit == otherCommandResult.exit + && index == otherCommandResult.index; } @Override public int hashCode() { - return Objects.hash(feedbackToUser, showHelp, exit); + return Objects.hash(feedbackToUser, showHelp, exit, index); } @Override @@ -83,6 +84,7 @@ public String toString() { .add("feedbackToUser", feedbackToUser) .add("showHelp", showHelp) .add("exit", exit) + .add("index", index.toString()) .toString(); } diff --git a/src/main/java/seedu/address/logic/commands/ImportCommand.java b/src/main/java/seedu/address/logic/commands/ImportCommand.java deleted file mode 100644 index 7a7f2e509ad..00000000000 --- a/src/main/java/seedu/address/logic/commands/ImportCommand.java +++ /dev/null @@ -1,75 +0,0 @@ -package seedu.address.logic.commands; - -import static java.util.Objects.requireNonNull; - -import java.util.ArrayList; - -import seedu.address.commons.util.ToStringBuilder; -import seedu.address.logic.Messages; -import seedu.address.logic.commands.exceptions.CommandException; -import seedu.address.model.Model; -import seedu.address.model.developer.Developer; - -/** - * Imports a list of developers from a CSV file into the application. - */ -public class ImportCommand extends Command { - public static final String COMMAND_WORD = "import"; - - public static final String MESSAGE_USAGE = COMMAND_WORD + ": Imports employees from csv file.\n" - + "Column titles should follow this format strictly:\n" - + "Name, Contact Number, Email, Address, Date Joined, Role, Salary, Username, Password, Projects"; - public static final String MESSAGE_SUCCESS = "New developer added: %1$s"; - public static final String MESSAGE_DUPLICATE_PERSON = " already exists in the address book\n"; - - private final ArrayList toAddList; - - /** - * Creates an AddDeveloperCommand to add the specified {@code Developer} - */ - public ImportCommand(ArrayList developerList) { - requireNonNull(developerList); - for (Developer i : developerList) { - requireNonNull(i); - } - toAddList = developerList; - } - - @Override - public CommandResult execute(Model model) throws CommandException { - requireNonNull(model); - String output = ""; - for (Developer toAdd : toAddList) { - if (model.hasDeveloper(toAdd)) { - output += toAdd.getName().fullName + MESSAGE_DUPLICATE_PERSON; - } - - model.addDeveloper(toAdd); - output += String.format(MESSAGE_SUCCESS, Messages.format(toAdd)); - output += "\n"; - } - return new CommandResult(output, TabIndex.Developer); - } - - @Override - public boolean equals(Object other) { - if (other == this) { - return true; - } - - // instanceof handles nulls - if (!(other instanceof ImportCommand)) { - return false; - } - - ImportCommand otherImportCommand = (ImportCommand) other; - return toAddList.equals(otherImportCommand.toAddList); - } - - @Override - public String toString() { - return new ToStringBuilder(this) - .add("toAddList", toAddList) - .toString(); - } -} diff --git a/src/main/java/seedu/address/logic/commands/TabIndex.java b/src/main/java/seedu/address/logic/commands/TabIndex.java index 01b4ce9b125..444c6167e71 100644 --- a/src/main/java/seedu/address/logic/commands/TabIndex.java +++ b/src/main/java/seedu/address/logic/commands/TabIndex.java @@ -15,11 +15,6 @@ public enum TabIndex { */ Client, - /** - * Represents the "developers" tab, which may have a different purpose or behavior. - */ - developers, - /** * Represents the "Project" tab, which is used to display and manage projects. */ diff --git a/src/main/java/seedu/address/logic/commands/edit/EditProjectCommand.java b/src/main/java/seedu/address/logic/commands/edit/EditProjectCommand.java index 87cb9b8504d..f05dd605ba8 100644 --- a/src/main/java/seedu/address/logic/commands/edit/EditProjectCommand.java +++ b/src/main/java/seedu/address/logic/commands/edit/EditProjectCommand.java @@ -98,7 +98,7 @@ public CommandResult execute(Model model) throws CommandException { } String successMessage = String.format(MESSAGE_EDIT_PROJECT_SUCCESS, Messages.format(editedProject)); - TabIndex index = TabIndex.developers; + TabIndex index = TabIndex.Project; model.setProject(projectToEdit, editedProject); model.updateFilteredProjectList(Model.PREDICATE_SHOW_ALL_PROJECTS); diff --git a/src/main/java/seedu/address/logic/commands/imports/ImportClientCommand.java b/src/main/java/seedu/address/logic/commands/imports/ImportClientCommand.java index 233292ad078..7e1fe681194 100644 --- a/src/main/java/seedu/address/logic/commands/imports/ImportClientCommand.java +++ b/src/main/java/seedu/address/logic/commands/imports/ImportClientCommand.java @@ -9,6 +9,7 @@ import seedu.address.logic.commands.Command; import seedu.address.logic.commands.CommandResult; import seedu.address.logic.commands.TabIndex; +import seedu.address.logic.commands.add.AddClientCommand; import seedu.address.logic.commands.exceptions.CommandException; import seedu.address.model.Model; import seedu.address.model.client.Client; @@ -23,7 +24,6 @@ public class ImportClientCommand extends Command { + "Column titles should follow this format strictly:\n" + "Name, Contact Number, Email, Address, Role, Organisation, Document, Projects"; public static final String MESSAGE_SUCCESS = "New client added: %1$s"; - public static final String MESSAGE_DUPLICATE_CLIENT = " is a client that already exists in the address book\n"; private final ArrayList toAddList; @@ -52,13 +52,8 @@ public CommandResult execute(Model model) throws CommandException { requireNonNull(model); String output = ""; for (Client toAdd : toAddList) { - if (model.hasClient(toAdd)) { - output += toAdd.getName().fullName + MESSAGE_DUPLICATE_CLIENT; - } else { - model.addClient(toAdd); - output += String.format(MESSAGE_SUCCESS, Messages.format(toAdd)); - } - output += "\n"; + CommandResult result = new AddClientCommand(toAdd).execute(model); + output += result.getFeedbackToUser()+"\n"; } return new CommandResult(output, TabIndex.Client); } diff --git a/src/main/java/seedu/address/logic/commands/imports/ImportDeveloperCommand.java b/src/main/java/seedu/address/logic/commands/imports/ImportDeveloperCommand.java index d7f926f6f8a..34c03943174 100644 --- a/src/main/java/seedu/address/logic/commands/imports/ImportDeveloperCommand.java +++ b/src/main/java/seedu/address/logic/commands/imports/ImportDeveloperCommand.java @@ -9,6 +9,7 @@ import seedu.address.logic.commands.Command; import seedu.address.logic.commands.CommandResult; import seedu.address.logic.commands.TabIndex; +import seedu.address.logic.commands.add.AddDeveloperCommand; import seedu.address.logic.commands.exceptions.CommandException; import seedu.address.model.Model; import seedu.address.model.developer.Developer; @@ -22,8 +23,6 @@ public class ImportDeveloperCommand extends Command { + "Column titles should follow this format strictly:\n" + "Name, Contact Number, Email, Address, Date Joined, Role, Salary, GithubId, Rating, Projects"; public static final String MESSAGE_SUCCESS = "New developer added: %1$s"; - public static final String MESSAGE_DUPLICATE_DEVELOPER = - " is a developer that already exists in the address book\n"; private final ArrayList toAddList; @@ -52,13 +51,8 @@ public CommandResult execute(Model model) throws CommandException { requireNonNull(model); String output = ""; for (Developer toAdd : toAddList) { - if (model.hasDeveloper(toAdd)) { - output += toAdd.getName().fullName + MESSAGE_DUPLICATE_DEVELOPER; - } else { - model.addDeveloper(toAdd); - output += String.format(MESSAGE_SUCCESS, Messages.format(toAdd)); - } - output += "\n"; + CommandResult result = new AddDeveloperCommand(toAdd).execute(model); + output += result.getFeedbackToUser()+"\n"; } return new CommandResult(output, TabIndex.Developer); } diff --git a/src/main/java/seedu/address/logic/commands/list/ListProjectCommand.java b/src/main/java/seedu/address/logic/commands/list/ListProjectCommand.java index a6d43b9294b..8b8346371b4 100644 --- a/src/main/java/seedu/address/logic/commands/list/ListProjectCommand.java +++ b/src/main/java/seedu/address/logic/commands/list/ListProjectCommand.java @@ -24,6 +24,6 @@ public CommandResult execute(Model model) { requireNonNull(model); model.updateFilteredProjectList(PREDICATE_SHOW_ALL_PROJECTS); model.updateFilteredProjectDeadlineList(unused -> true); - return new CommandResult(MESSAGE_SUCCESS, TabIndex.developers); + return new CommandResult(MESSAGE_SUCCESS, TabIndex.Project); } } diff --git a/src/main/java/seedu/address/logic/parser/AddressBookParser.java b/src/main/java/seedu/address/logic/parser/AddressBookParser.java index 7e49a25ab1f..a7561a06a8c 100644 --- a/src/main/java/seedu/address/logic/parser/AddressBookParser.java +++ b/src/main/java/seedu/address/logic/parser/AddressBookParser.java @@ -15,7 +15,6 @@ import seedu.address.logic.commands.Command; import seedu.address.logic.commands.ExitCommand; import seedu.address.logic.commands.HelpCommand; -import seedu.address.logic.commands.ImportCommand; import seedu.address.logic.commands.LockCommand; import seedu.address.logic.commands.RedoCommand; import seedu.address.logic.commands.UndoCommand; @@ -132,9 +131,6 @@ public Command parseCommand(String userInput) throws ParseException { case FindDeadlineCommand.COMMAND_WORD: return new FindDeadlineCommandParser().parse(arguments); - case ImportCommand.COMMAND_WORD: - return new ImportDeveloperCommandParser().parse(arguments); - case EditDeveloperCommand.COMMAND_WORD: return new EditDeveloperCommandParser().parse(arguments); diff --git a/src/main/java/seedu/address/logic/parser/ParserUtil.java b/src/main/java/seedu/address/logic/parser/ParserUtil.java index 5eb665bea6d..cb58b11c61f 100644 --- a/src/main/java/seedu/address/logic/parser/ParserUtil.java +++ b/src/main/java/seedu/address/logic/parser/ParserUtil.java @@ -26,6 +26,7 @@ import seedu.address.model.person.Phone; import seedu.address.model.project.Deadline; import seedu.address.model.project.Description; +import seedu.address.model.project.Priority; import seedu.address.model.project.Project; /** @@ -187,6 +188,14 @@ public static Date parseDateJoined(String dateJoined) throws ParseException { } return new Date(trimmedDateJoined, false); } + public static Date parseDateDeadline(String dateJoined) throws ParseException { + requireNonNull(dateJoined); + String trimmedDateJoined = dateJoined.trim(); + if (!Date.isValidDate(trimmedDateJoined, true)) { + throw new ParseException(Date.MESSAGE_CONSTRAINTS); + } + return new Date(trimmedDateJoined, true); + } /** @@ -314,4 +323,11 @@ public static String parsePassword(String pw) throws ParseException { } return trimmedPw; } + + public static Priority parsePriority(String priorityKeywords) throws ParseException{ + if(!(priorityKeywords.equals("HIGH")||priorityKeywords.equals("MEDIUM")||priorityKeywords.equals("LOW"))) { + throw new ParseException("Priority has to be HIGH, MEDIUM or LOW"); + } + return Priority.valueOf(priorityKeywords); + } } diff --git a/src/main/java/seedu/address/logic/parser/find/FindDeadlineCommandParser.java b/src/main/java/seedu/address/logic/parser/find/FindDeadlineCommandParser.java index 7eb5abb39fb..c54ff932e0a 100644 --- a/src/main/java/seedu/address/logic/parser/find/FindDeadlineCommandParser.java +++ b/src/main/java/seedu/address/logic/parser/find/FindDeadlineCommandParser.java @@ -11,6 +11,7 @@ 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.Prefix; import seedu.address.logic.parser.exceptions.ParseException; import seedu.address.model.commons.Date; @@ -61,12 +62,12 @@ public FindDeadlineCommand parse(String args) throws ParseException { * @param argMultimap Argument multimap containing user input arguments. * @return A predicate for filtering deadlines. */ - private Predicate buildPredicate(ArgumentMultimap argMultimap) { + private Predicate buildPredicate(ArgumentMultimap argMultimap) throws ParseException { Predicate finalPredicate = deadline -> true; if (argMultimap.getValue(PREFIX_DATEJOINED).isPresent()) { String dateKeywords = argMultimap.getValue(PREFIX_DATEJOINED).get(); - Date input = new Date(dateKeywords, true); + Date input = ParserUtil.parseDateDeadline(dateKeywords); finalPredicate = finalPredicate.and(d -> !d.getDate().value.after(input.value)); // Replace with your DateJoinedPredicate @@ -74,7 +75,7 @@ private Predicate buildPredicate(ArgumentMultimap argMultimap) { if (argMultimap.getValue(PREFIX_PRIORITY).isPresent()) { String priorityKeywords = argMultimap.getValue(PREFIX_PRIORITY).get(); - Priority input = Priority.valueOf(priorityKeywords); + Priority input = ParserUtil.parsePriority(priorityKeywords); finalPredicate = finalPredicate.and(d -> d.getPriority().equals(input)); // Replace with your PriorityPredicate } diff --git a/src/main/java/seedu/address/logic/parser/imports/ImportDeveloperCommandParser.java b/src/main/java/seedu/address/logic/parser/imports/ImportDeveloperCommandParser.java index 11a5210e90a..fe1ff6e5a18 100644 --- a/src/main/java/seedu/address/logic/parser/imports/ImportDeveloperCommandParser.java +++ b/src/main/java/seedu/address/logic/parser/imports/ImportDeveloperCommandParser.java @@ -43,9 +43,6 @@ public class ImportDeveloperCommandParser implements Parser { private ProjectListPanel projectListPanel; private ResultDisplay resultDisplay; private HelpWindow helpWindow; + private int resultTabIndex; @FXML private StackPane commandBoxPlaceholder; @@ -132,7 +134,7 @@ private void setAccelerator(MenuItem menuItem, KeyCombination keyCombination) { * Fills up all the placeholders of this window. */ void fillInnerParts() { - tabPane = new TabPane(); + //tabPane = new TabPane(); // Create tabs /*developerTab = new Tab("Developer"); clientTab = new Tab("Client"); @@ -155,7 +157,21 @@ void fillInnerParts() { // Add tabs to the TabPane tabPane.getTabs().addAll(developerTab, clientTab, projectTab); - //tabPane.getSelectionModel().select(1); + tabPane.getSelectionModel().selectedIndexProperty().addListener((observable, oldValue, newValue) -> { + if(newValue.intValue() != resultTabIndex) { + try{ + if (newValue.intValue() == 0) { + executeCommand("list-developer"); + } else if (newValue.intValue() == 1) { + executeCommand("list-client"); + } else if (newValue.intValue() == 2) { + executeCommand("list-project"); + } + } catch (CommandException | ParseException e) { + e.printStackTrace(); + } + } + }); resultDisplay = new ResultDisplay(); resultDisplay.setFeedbackToUser("Welcome to CodeContact!\nUnlock to continue."); @@ -230,7 +246,9 @@ private CommandResult executeCommand(String commandText) throws CommandException CommandResult commandResult = logic.execute(commandText); logger.info("Result: " + commandResult.getFeedbackToUser()); resultDisplay.setFeedbackToUser(commandResult.getFeedbackToUser()); - tabPane.getSelectionModel().select(commandResult.getIndex()); + resultTabIndex =commandResult.getIndex(); + System.out.println("resultTabIndex: " + resultTabIndex); + tabPane.getSelectionModel().select(resultTabIndex); if (commandResult.isShowHelp()) { handleHelp(); } diff --git a/src/main/java/seedu/address/ui/ProjectCard.java b/src/main/java/seedu/address/ui/ProjectCard.java index e8e40d4a262..d71a7d54a58 100644 --- a/src/main/java/seedu/address/ui/ProjectCard.java +++ b/src/main/java/seedu/address/ui/ProjectCard.java @@ -76,7 +76,7 @@ public ProjectCard(Project project, int displayedIndex) { new PropertyValueFactory<>("date")); TableColumn descriptionCol = new TableColumn("Description"); - descriptionCol.setMinWidth(260); + descriptionCol.setMinWidth(100); descriptionCol.setCellValueFactory( new PropertyValueFactory<>("description")); diff --git a/src/test/java/seedu/address/logic/commands/find/FindDeadlineCommandTest.java b/src/test/java/seedu/address/logic/commands/find/FindDeadlineCommandTest.java new file mode 100644 index 00000000000..637a59d811a --- /dev/null +++ b/src/test/java/seedu/address/logic/commands/find/FindDeadlineCommandTest.java @@ -0,0 +1,24 @@ +package seedu.address.logic.commands.find; +import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import seedu.address.model.Model; +import seedu.address.model.ModelManager; +public class FindDeadlineCommandTest { + private Model model; + private Model expectedModel; + + @BeforeEach + public void setUp() { + model = new ModelManager(); + expectedModel = new ModelManager(); + } + + @Test + public void execute_findDeadline_success() { + assertCommandSuccess(new FindDeadlineCommand(), model, FindDeadlineCommand.MESSAGE_SUCCESS, model); + } + +} From e0bae5b24c30bdf886f46fa690e274bc80ee8624 Mon Sep 17 00:00:00 2001 From: waseem Date: Sun, 12 Nov 2023 01:35:24 +0800 Subject: [PATCH 04/36] add more testcases for find developer, project and client --- .../{ => find}/FindClientCommandTest.java | 49 +++++++++++++++++-- .../find/FindDeveloperCommandTest.java | 33 +++++++++++++ .../{ => find}/FindProjectCommandTest.java | 35 ++++++++++++- .../address/testutil/ProjectBuilder.java | 2 +- .../address/testutil/TypicalProjects.java | 23 +++++---- 5 files changed, 124 insertions(+), 18 deletions(-) rename src/test/java/seedu/address/logic/commands/{ => find}/FindClientCommandTest.java (60%) rename src/test/java/seedu/address/logic/commands/{ => find}/FindProjectCommandTest.java (69%) diff --git a/src/test/java/seedu/address/logic/commands/FindClientCommandTest.java b/src/test/java/seedu/address/logic/commands/find/FindClientCommandTest.java similarity index 60% rename from src/test/java/seedu/address/logic/commands/FindClientCommandTest.java rename to src/test/java/seedu/address/logic/commands/find/FindClientCommandTest.java index 87bb9549482..cd4db68563b 100644 --- a/src/test/java/seedu/address/logic/commands/FindClientCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/find/FindClientCommandTest.java @@ -1,4 +1,4 @@ -package seedu.address.logic.commands; +package seedu.address.logic.commands.find; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; @@ -6,6 +6,7 @@ import static seedu.address.testutil.TypicalClients.ALICE; import static seedu.address.testutil.TypicalClients.BENSON; import static seedu.address.testutil.TypicalClients.CARL; +import static seedu.address.testutil.TypicalClients.DANIEL; import static seedu.address.testutil.TypicalClients.getTypicalAddressBook; import java.util.Arrays; @@ -14,11 +15,11 @@ import org.junit.jupiter.api.Test; -import seedu.address.logic.commands.find.FindClientCommand; import seedu.address.model.Model; import seedu.address.model.ModelManager; import seedu.address.model.UserPrefs; import seedu.address.model.client.NameClientContainsKeywordsPredicate; +import seedu.address.model.client.OrganisationContainsKeywordsPredicate; /** * Contains integration tests (interaction with the Model) for {@code FindClientCommand}. @@ -57,7 +58,7 @@ public void equals() { @Test public void execute_zeroKeywords_noPersonFound() { String expectedMessage = "There are no clients with matching information."; - NameClientContainsKeywordsPredicate predicate = preparePredicate("hii"); + NameClientContainsKeywordsPredicate predicate = prepareNamePredicate("hii"); FindClientCommand command = new FindClientCommand(predicate); expectedModel.updateFilteredClientList(predicate); assertCommandSuccess(command, model, expectedMessage, expectedModel); @@ -67,7 +68,7 @@ public void execute_zeroKeywords_noPersonFound() { @Test public void execute_multipleKeywords_multiplePersonsFound() { String expectedMessage = "These are the 3 clients with matching information."; - NameClientContainsKeywordsPredicate predicate = preparePredicate("Alice Benson Carl"); + NameClientContainsKeywordsPredicate predicate = prepareNamePredicate("Alice Benson Carl"); FindClientCommand command = new FindClientCommand(predicate); expectedModel.updateFilteredClientList(predicate); assertCommandSuccess(command, model, expectedMessage, expectedModel); @@ -83,10 +84,48 @@ public void toStringMethod() { assertEquals(expected, findClientCommand.toString()); } + @Test + public void execute_caseInsensitiveSearch_clientFound() { + String expectedMessage = "This is the 1 client with matching information."; + OrganisationContainsKeywordsPredicate predicate = prepareOrganisationPredicate("Microsoft"); // using mixed case + FindClientCommand command = new FindClientCommand(predicate); + expectedModel.updateFilteredClientList(predicate); + assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertEquals(Arrays.asList(DANIEL), model.getFilteredClientList()); + } + + @Test + public void execute_partialName_clientFound() { + String expectedMessage = "This is the 1 client with matching information."; + NameClientContainsKeywordsPredicate predicate = prepareNamePredicate("rl"); + FindClientCommand command = new FindClientCommand(predicate); + expectedModel.updateFilteredClientList(predicate); + assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertEquals(Arrays.asList(CARL), model.getFilteredClientList()); + } + + @Test + public void execute_noMatchingClients_noClientFound() { + String expectedMessage = "There are no clients with matching information."; + NameClientContainsKeywordsPredicate predicate = prepareNamePredicate("NonExistentClient"); + FindClientCommand command = new FindClientCommand(predicate); + expectedModel.updateFilteredClientList(predicate); + assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertEquals(Collections.emptyList(), model.getFilteredClientList()); + } + + /** * Parses {@code userInput} into a {@code NameClientContainsKeywordsPredicate}. */ - private NameClientContainsKeywordsPredicate preparePredicate(String userInput) { + private NameClientContainsKeywordsPredicate prepareNamePredicate(String userInput) { return new NameClientContainsKeywordsPredicate(Arrays.asList(userInput.split("\\s+"))); } + + /** + * Parses {@code userInput} into a {@code OrganisationClientContainsKeywordsPredicate}. + */ + private OrganisationContainsKeywordsPredicate prepareOrganisationPredicate(String userInput) { + return new OrganisationContainsKeywordsPredicate(Arrays.asList(userInput.split("\\s+"))); + } } diff --git a/src/test/java/seedu/address/logic/commands/find/FindDeveloperCommandTest.java b/src/test/java/seedu/address/logic/commands/find/FindDeveloperCommandTest.java index aed7b9d9966..75142943477 100644 --- a/src/test/java/seedu/address/logic/commands/find/FindDeveloperCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/find/FindDeveloperCommandTest.java @@ -84,6 +84,39 @@ public void toStringMethod() { assertEquals(expected, findDeveloperCommand.toString()); } + @Test + public void execute_caseInsensitiveSearch_personFound() { + String expectedMessage = "This is the 1 developer with matching information."; + NameDeveloperContainsKeywordsPredicate predicate = preparePredicate("ElLe"); // using mixed case + FindDeveloperCommand command = new FindDeveloperCommand(predicate); + expectedModel.updateFilteredDeveloperList(predicate); + assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertEquals(Arrays.asList(ELLE), model.getFilteredDeveloperList()); + } + + @Test + public void execute_partialName_personFound() { + String expectedMessage = "This is the 1 developer with matching information."; + NameDeveloperContainsKeywordsPredicate predicate = preparePredicate("Ell"); + FindDeveloperCommand command = new FindDeveloperCommand(predicate); + expectedModel.updateFilteredDeveloperList(predicate); + assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertEquals(Arrays.asList(ELLE), model.getFilteredDeveloperList()); + } + + @Test + public void execute_noMatchingPersons_noPersonFound() { + String expectedMessage = "There are no developers with matching information."; + NameDeveloperContainsKeywordsPredicate predicate = preparePredicate("NonExistentDeveloper"); + FindDeveloperCommand command = new FindDeveloperCommand(predicate); + expectedModel.updateFilteredDeveloperList(predicate); + assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertEquals(Collections.emptyList(), model.getFilteredDeveloperList()); + } + + + + /** * Parses {@code userInput} into a {@code NameContainsKeywordsPredicate}. */ diff --git a/src/test/java/seedu/address/logic/commands/FindProjectCommandTest.java b/src/test/java/seedu/address/logic/commands/find/FindProjectCommandTest.java similarity index 69% rename from src/test/java/seedu/address/logic/commands/FindProjectCommandTest.java rename to src/test/java/seedu/address/logic/commands/find/FindProjectCommandTest.java index 408334a4c61..2f7ba86ad12 100644 --- a/src/test/java/seedu/address/logic/commands/FindProjectCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/find/FindProjectCommandTest.java @@ -1,9 +1,10 @@ -package seedu.address.logic.commands; +package seedu.address.logic.commands.find; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; import static seedu.address.testutil.TypicalProjects.PROJECT_A; +import static seedu.address.testutil.TypicalProjects.PROJECT_A_NO_SPACING; import static seedu.address.testutil.TypicalProjects.PROJECT_B; import static seedu.address.testutil.TypicalProjects.PROJECT_C; import static seedu.address.testutil.TypicalProjects.getTypicalAddressBook; @@ -14,7 +15,6 @@ import org.junit.jupiter.api.Test; -import seedu.address.logic.commands.find.FindProjectCommand; import seedu.address.model.Model; import seedu.address.model.ModelManager; import seedu.address.model.UserPrefs; @@ -83,6 +83,37 @@ public void toStringMethod() { assertEquals(expected, findProjectCommand.toString()); } + @Test + public void execute_caseInsensitiveSearch_projectFound() { + String expectedMessage = "This is the 1 project with matching information."; + ProjectNameContainsKeywordsPredicate predicate = preparePredicate("a"); // using mixed case + FindProjectCommand command = new FindProjectCommand(predicate); + expectedModel.updateFilteredProjectList(predicate); + assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertEquals(Arrays.asList(PROJECT_A), model.getFilteredProjectList()); + } + + + @Test + public void execute_partialName_projectFound() { + String expectedMessage = "This is the 1 project with matching information."; + ProjectNameContainsKeywordsPredicate predicate = preparePredicate("jecta"); + FindProjectCommand command = new FindProjectCommand(predicate); + expectedModel.updateFilteredProjectList(predicate); + assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertEquals(Arrays.asList(PROJECT_A_NO_SPACING), model.getFilteredProjectList()); + } + + @Test + public void execute_noMatchingProjects_noProjectFound() { + String expectedMessage = "There are no projects with matching information."; + ProjectNameContainsKeywordsPredicate predicate = preparePredicate("NonExistentProject"); + FindProjectCommand command = new FindProjectCommand(predicate); + expectedModel.updateFilteredProjectList(predicate); + assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertEquals(Collections.emptyList(), model.getFilteredProjectList()); + } + /** * Parses {@code userInput} into a {@code ProjectNameContainsKeywordsPredicate}. */ diff --git a/src/test/java/seedu/address/testutil/ProjectBuilder.java b/src/test/java/seedu/address/testutil/ProjectBuilder.java index 277b7b3c498..60b295c3f0d 100644 --- a/src/test/java/seedu/address/testutil/ProjectBuilder.java +++ b/src/test/java/seedu/address/testutil/ProjectBuilder.java @@ -62,4 +62,4 @@ public ProjectBuilder withDeadline(String deadline) { public Project build() { return new Project(name, description, deadlineList); } -} \ No newline at end of file +} diff --git a/src/test/java/seedu/address/testutil/TypicalProjects.java b/src/test/java/seedu/address/testutil/TypicalProjects.java index 36b454700ff..c1c0d8dc852 100644 --- a/src/test/java/seedu/address/testutil/TypicalProjects.java +++ b/src/test/java/seedu/address/testutil/TypicalProjects.java @@ -1,19 +1,19 @@ package seedu.address.testutil; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_DESCRIPTION_APPLEAPP; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_DESCRIPTION_GOOGLEAPP; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_DESCRIPTION_ANDROIDAPP; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_DEADLINE_ANDROIDAPP; import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_DEADLINE_APPLEAPP; import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_DEADLINE_GOOGLEAPP; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_DEADLINE_ANDROIDAPP; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_PRIORITY_APPLEAPP; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_PRIORITY_GOOGLEAPP; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_PRIORITY_ANDROIDAPP; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_DESCRIPTION_ANDROIDAPP; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_DESCRIPTION_APPLEAPP; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_DESCRIPTION_GOOGLEAPP; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_NAME_ANDROIDAPP; import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_NAME_APPLEAPP; import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_NAME_GOOGLEAPP; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_NAME_ANDROIDAPP; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_TAG_UI; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_PRIORITY_ANDROIDAPP; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_PRIORITY_APPLEAPP; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_PRIORITY_GOOGLEAPP; import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_TAG_BACKEND; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_TAG_UI; import java.util.ArrayList; import java.util.Arrays; @@ -34,6 +34,9 @@ public class TypicalProjects { public static final Project PROJECT_C = new ProjectBuilder().withName("Project C") .withDescription("This is Project C").withDeadline("25-12-2023,Testing,LOW,1").build(); + public static final Project PROJECT_A_NO_SPACING = new ProjectBuilder().withName("ProjectA") + .withDescription("This is Project A").withDeadline("20-12-2023,Design frontend,MEDIUM,0").build(); + private TypicalProjects() {} // prevents instantiation /** @@ -48,7 +51,7 @@ public static AddressBook getTypicalAddressBook() { } public static List getTypicalProjects() { - return new ArrayList<>(Arrays.asList(PROJECT_A, PROJECT_B, PROJECT_C)); + return new ArrayList<>(Arrays.asList(PROJECT_A, PROJECT_B, PROJECT_C, PROJECT_A_NO_SPACING)); } /** From f3f2d4d72873c3714381a6abe82bc66adb4710b3 Mon Sep 17 00:00:00 2001 From: waseem Date: Sun, 12 Nov 2023 01:41:42 +0800 Subject: [PATCH 05/36] fix checkstyle errors and tests --- .../commands/deleteroles/DeleteClientRoleCommand.java | 2 +- .../commands/deleteroles/DeleteDeveloperRoleCommand.java | 2 +- .../logic/commands/find/FindProjectCommandTest.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/seedu/address/logic/commands/deleteroles/DeleteClientRoleCommand.java b/src/main/java/seedu/address/logic/commands/deleteroles/DeleteClientRoleCommand.java index 30c7e221444..08bee5ea90f 100644 --- a/src/main/java/seedu/address/logic/commands/deleteroles/DeleteClientRoleCommand.java +++ b/src/main/java/seedu/address/logic/commands/deleteroles/DeleteClientRoleCommand.java @@ -60,7 +60,7 @@ public CommandResult execute(Model model) throws CommandException { + ClientRoles.printRoles()); } else if (!ClientRoles.isNotDefault()) { throw new CommandException(MESSAGE_CANNOT_DELETE_PREXISTS); - } else if (!ClientRoles.isNoRepeat() ) { + } else if (!ClientRoles.isNoRepeat()) { throw new CommandException(MESSAGE_CANNOT_DELETE_REPEAT); } } diff --git a/src/main/java/seedu/address/logic/commands/deleteroles/DeleteDeveloperRoleCommand.java b/src/main/java/seedu/address/logic/commands/deleteroles/DeleteDeveloperRoleCommand.java index 5fbff7e3bc1..782ff350312 100644 --- a/src/main/java/seedu/address/logic/commands/deleteroles/DeleteDeveloperRoleCommand.java +++ b/src/main/java/seedu/address/logic/commands/deleteroles/DeleteDeveloperRoleCommand.java @@ -60,7 +60,7 @@ public CommandResult execute(Model model) throws CommandException { + DeveloperRoles.printRoles()); } else if (!DeveloperRoles.isNotDefault()) { throw new CommandException(MESSAGE_CANNOT_DELETE_PREXISTS); - } else if (!DeveloperRoles.isNoRepeat() ) { + } else if (!DeveloperRoles.isNoRepeat()) { throw new CommandException(MESSAGE_CANNOT_DELETE_REPEAT); } } diff --git a/src/test/java/seedu/address/logic/commands/find/FindProjectCommandTest.java b/src/test/java/seedu/address/logic/commands/find/FindProjectCommandTest.java index 2f7ba86ad12..a19372db27d 100644 --- a/src/test/java/seedu/address/logic/commands/find/FindProjectCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/find/FindProjectCommandTest.java @@ -66,12 +66,12 @@ public void execute_zeroKeywords_noProjectFound() { @Test public void execute_multipleKeywords_multipleProjectsFound() { - String expectedMessage = "These are the 3 projects with matching information."; + String expectedMessage = "These are the 4 projects with matching information."; ProjectNameContainsKeywordsPredicate predicate = preparePredicate("Project A B C"); FindProjectCommand command = new FindProjectCommand(predicate); expectedModel.updateFilteredProjectList(predicate); assertCommandSuccess(command, model, expectedMessage, expectedModel); - assertEquals(Arrays.asList(PROJECT_A, PROJECT_B, PROJECT_C), model.getFilteredProjectList()); + assertEquals(Arrays.asList(PROJECT_A, PROJECT_B, PROJECT_C, PROJECT_A_NO_SPACING), model.getFilteredProjectList()); } @Test @@ -85,12 +85,12 @@ public void toStringMethod() { @Test public void execute_caseInsensitiveSearch_projectFound() { - String expectedMessage = "This is the 1 project with matching information."; + String expectedMessage = "These are the 2 projects with matching information."; ProjectNameContainsKeywordsPredicate predicate = preparePredicate("a"); // using mixed case FindProjectCommand command = new FindProjectCommand(predicate); expectedModel.updateFilteredProjectList(predicate); assertCommandSuccess(command, model, expectedMessage, expectedModel); - assertEquals(Arrays.asList(PROJECT_A), model.getFilteredProjectList()); + assertEquals(Arrays.asList(PROJECT_A, PROJECT_A_NO_SPACING), model.getFilteredProjectList()); } From 4b3cb970ea8c3df2a607139c9639c6e47c0cb0bd Mon Sep 17 00:00:00 2001 From: waseem Date: Sun, 12 Nov 2023 01:52:56 +0800 Subject: [PATCH 06/36] fix checkstyle error --- .../address/logic/commands/find/FindProjectCommandTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/seedu/address/logic/commands/find/FindProjectCommandTest.java b/src/test/java/seedu/address/logic/commands/find/FindProjectCommandTest.java index a19372db27d..df348e66a31 100644 --- a/src/test/java/seedu/address/logic/commands/find/FindProjectCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/find/FindProjectCommandTest.java @@ -71,7 +71,8 @@ public void execute_multipleKeywords_multipleProjectsFound() { FindProjectCommand command = new FindProjectCommand(predicate); expectedModel.updateFilteredProjectList(predicate); assertCommandSuccess(command, model, expectedMessage, expectedModel); - assertEquals(Arrays.asList(PROJECT_A, PROJECT_B, PROJECT_C, PROJECT_A_NO_SPACING), model.getFilteredProjectList()); + assertEquals(Arrays.asList(PROJECT_A, PROJECT_B, PROJECT_C, PROJECT_A_NO_SPACING), + model.getFilteredProjectList()); } @Test From 83a6a1b3cdd33f09caaa9e77711457089f0e44e2 Mon Sep 17 00:00:00 2001 From: waseem Date: Sun, 12 Nov 2023 01:59:58 +0800 Subject: [PATCH 07/36] update code coverage icon --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index 6d2c93a65bb..9e15e89b118 100644 --- a/docs/index.md +++ b/docs/index.md @@ -4,7 +4,7 @@ title: CodeContact --- [![CI Status](https://github.com/AY2324S1-CS2103T-T09-2/tp/workflows/Java%20CI/badge.svg)](https://github.com/AY2324S1-CS2103T-T09-2/tp/actions) -[![codecov](https://app.codecov.io/gh/AY2324S1-CS2103T-T09-2/branch/master/graph/badge.svg)](https://app.codecov.io/gh/AY2324S1-CS2103T-T09-2) +[![codecov](https://app.codecov.io/gh/AY2324S1-CS2103T-T09-2/branch/master/graph/badge.svg)](https://codecov.io/gh/AY2324S1-CS2103T-T09-2/tp/tree/master) ![Ui](images/Ui.png) From 6035864be10a441a54770881d721b62ae9b66abf Mon Sep 17 00:00:00 2001 From: MathanC Date: Sun, 12 Nov 2023 03:12:45 +0800 Subject: [PATCH 08/36] Add test cases --- .../deleteroles/DeleteClientRoleCommand.java | 2 +- .../DeleteDeveloperRoleCommand.java | 2 +- .../commands/imports/ImportClientCommand.java | 3 +- .../imports/ImportDeveloperCommand.java | 3 +- .../address/logic/parser/ParserUtil.java | 18 ++++- .../imports/ImportDeveloperCommandParser.java | 1 - .../java/seedu/address/model/Password.java | 2 +- .../java/seedu/address/ui/MainWindow.java | 7 +- .../commands/ChangePasswordCommandTest.java | 70 +++++++++--------- .../logic/commands/CommandTestUtil.java | 10 +++ .../logic/commands/LockCommandTest.java | 22 +++--- .../logic/commands/UnlockCommandTest.java | 36 ++++----- .../find/FindDeadlineCommandTest.java | 63 ++++++++++++---- .../address/testutil/ProjectBuilder.java | 73 +++++++++++++++++++ .../address/testutil/TypicalProjects.java | 45 ++++++++++++ 15 files changed, 264 insertions(+), 93 deletions(-) create mode 100644 src/test/java/seedu/address/testutil/ProjectBuilder.java create mode 100644 src/test/java/seedu/address/testutil/TypicalProjects.java diff --git a/src/main/java/seedu/address/logic/commands/deleteroles/DeleteClientRoleCommand.java b/src/main/java/seedu/address/logic/commands/deleteroles/DeleteClientRoleCommand.java index 30c7e221444..08bee5ea90f 100644 --- a/src/main/java/seedu/address/logic/commands/deleteroles/DeleteClientRoleCommand.java +++ b/src/main/java/seedu/address/logic/commands/deleteroles/DeleteClientRoleCommand.java @@ -60,7 +60,7 @@ public CommandResult execute(Model model) throws CommandException { + ClientRoles.printRoles()); } else if (!ClientRoles.isNotDefault()) { throw new CommandException(MESSAGE_CANNOT_DELETE_PREXISTS); - } else if (!ClientRoles.isNoRepeat() ) { + } else if (!ClientRoles.isNoRepeat()) { throw new CommandException(MESSAGE_CANNOT_DELETE_REPEAT); } } diff --git a/src/main/java/seedu/address/logic/commands/deleteroles/DeleteDeveloperRoleCommand.java b/src/main/java/seedu/address/logic/commands/deleteroles/DeleteDeveloperRoleCommand.java index 5fbff7e3bc1..782ff350312 100644 --- a/src/main/java/seedu/address/logic/commands/deleteroles/DeleteDeveloperRoleCommand.java +++ b/src/main/java/seedu/address/logic/commands/deleteroles/DeleteDeveloperRoleCommand.java @@ -60,7 +60,7 @@ public CommandResult execute(Model model) throws CommandException { + DeveloperRoles.printRoles()); } else if (!DeveloperRoles.isNotDefault()) { throw new CommandException(MESSAGE_CANNOT_DELETE_PREXISTS); - } else if (!DeveloperRoles.isNoRepeat() ) { + } else if (!DeveloperRoles.isNoRepeat()) { throw new CommandException(MESSAGE_CANNOT_DELETE_REPEAT); } } diff --git a/src/main/java/seedu/address/logic/commands/imports/ImportClientCommand.java b/src/main/java/seedu/address/logic/commands/imports/ImportClientCommand.java index 7e1fe681194..8892e82eaff 100644 --- a/src/main/java/seedu/address/logic/commands/imports/ImportClientCommand.java +++ b/src/main/java/seedu/address/logic/commands/imports/ImportClientCommand.java @@ -5,7 +5,6 @@ import java.util.ArrayList; import seedu.address.commons.util.ToStringBuilder; -import seedu.address.logic.Messages; import seedu.address.logic.commands.Command; import seedu.address.logic.commands.CommandResult; import seedu.address.logic.commands.TabIndex; @@ -53,7 +52,7 @@ public CommandResult execute(Model model) throws CommandException { String output = ""; for (Client toAdd : toAddList) { CommandResult result = new AddClientCommand(toAdd).execute(model); - output += result.getFeedbackToUser()+"\n"; + output += result.getFeedbackToUser() + "\n"; } return new CommandResult(output, TabIndex.Client); } diff --git a/src/main/java/seedu/address/logic/commands/imports/ImportDeveloperCommand.java b/src/main/java/seedu/address/logic/commands/imports/ImportDeveloperCommand.java index 34c03943174..378503e76ba 100644 --- a/src/main/java/seedu/address/logic/commands/imports/ImportDeveloperCommand.java +++ b/src/main/java/seedu/address/logic/commands/imports/ImportDeveloperCommand.java @@ -5,7 +5,6 @@ import java.util.ArrayList; import seedu.address.commons.util.ToStringBuilder; -import seedu.address.logic.Messages; import seedu.address.logic.commands.Command; import seedu.address.logic.commands.CommandResult; import seedu.address.logic.commands.TabIndex; @@ -52,7 +51,7 @@ public CommandResult execute(Model model) throws CommandException { String output = ""; for (Developer toAdd : toAddList) { CommandResult result = new AddDeveloperCommand(toAdd).execute(model); - output += result.getFeedbackToUser()+"\n"; + output += result.getFeedbackToUser() + "\n"; } return new CommandResult(output, TabIndex.Developer); } diff --git a/src/main/java/seedu/address/logic/parser/ParserUtil.java b/src/main/java/seedu/address/logic/parser/ParserUtil.java index cb58b11c61f..723ef907d9b 100644 --- a/src/main/java/seedu/address/logic/parser/ParserUtil.java +++ b/src/main/java/seedu/address/logic/parser/ParserUtil.java @@ -188,6 +188,13 @@ public static Date parseDateJoined(String dateJoined) throws ParseException { } return new Date(trimmedDateJoined, false); } + + /** + * Parses a {@code String dateDeadline} into a {@code DateDeadline}. + * Leading and trailing whitespaces will be trimmed. + * + * @throws ParseException if the given {@code DateDeadline} is invalid. + */ public static Date parseDateDeadline(String dateJoined) throws ParseException { requireNonNull(dateJoined); String trimmedDateJoined = dateJoined.trim(); @@ -324,8 +331,15 @@ public static String parsePassword(String pw) throws ParseException { return trimmedPw; } - public static Priority parsePriority(String priorityKeywords) throws ParseException{ - if(!(priorityKeywords.equals("HIGH")||priorityKeywords.equals("MEDIUM")||priorityKeywords.equals("LOW"))) { + /** + * Parses a priority string and returns the corresponding Priority enum. + * + * @param priorityKeywords The priority string to be parsed. + * @return The corresponding Priority enum. + * @throws ParseException If the input string is not a valid priority. + */ + public static Priority parsePriority(String priorityKeywords) throws ParseException { + if (!(priorityKeywords.equals("HIGH") || priorityKeywords.equals("MEDIUM") || priorityKeywords.equals("LOW"))) { throw new ParseException("Priority has to be HIGH, MEDIUM or LOW"); } return Priority.valueOf(priorityKeywords); diff --git a/src/main/java/seedu/address/logic/parser/imports/ImportDeveloperCommandParser.java b/src/main/java/seedu/address/logic/parser/imports/ImportDeveloperCommandParser.java index fe1ff6e5a18..6704b89ffdc 100644 --- a/src/main/java/seedu/address/logic/parser/imports/ImportDeveloperCommandParser.java +++ b/src/main/java/seedu/address/logic/parser/imports/ImportDeveloperCommandParser.java @@ -6,7 +6,6 @@ import java.io.BufferedReader; import java.io.FileNotFoundException; import java.io.FileReader; -import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; import java.util.Set; diff --git a/src/main/java/seedu/address/model/Password.java b/src/main/java/seedu/address/model/Password.java index e732d42cff6..d2f225b071b 100644 --- a/src/main/java/seedu/address/model/Password.java +++ b/src/main/java/seedu/address/model/Password.java @@ -116,7 +116,7 @@ public static String changePassword(String currentPassword, String newPassword) if (verifyPassword(currentPassword)) { // Verify that the new password meets the constraints if (isValidPassword(newPassword)) { - if(currentPassword.equals(newPassword)) { + if (currentPassword.equals(newPassword)) { return "New password cannot be the same as the current password."; } // Hash the new password diff --git a/src/main/java/seedu/address/ui/MainWindow.java b/src/main/java/seedu/address/ui/MainWindow.java index 22a2e0b9cef..cb2c7c4c4ac 100644 --- a/src/main/java/seedu/address/ui/MainWindow.java +++ b/src/main/java/seedu/address/ui/MainWindow.java @@ -16,7 +16,6 @@ import seedu.address.commons.core.LogsCenter; import seedu.address.logic.Logic; import seedu.address.logic.commands.CommandResult; -import seedu.address.logic.commands.TabIndex; import seedu.address.logic.commands.exceptions.CommandException; import seedu.address.logic.parser.exceptions.ParseException; @@ -158,8 +157,8 @@ void fillInnerParts() { // Add tabs to the TabPane tabPane.getTabs().addAll(developerTab, clientTab, projectTab); tabPane.getSelectionModel().selectedIndexProperty().addListener((observable, oldValue, newValue) -> { - if(newValue.intValue() != resultTabIndex) { - try{ + if (newValue.intValue() != resultTabIndex) { + try { if (newValue.intValue() == 0) { executeCommand("list-developer"); } else if (newValue.intValue() == 1) { @@ -246,7 +245,7 @@ private CommandResult executeCommand(String commandText) throws CommandException CommandResult commandResult = logic.execute(commandText); logger.info("Result: " + commandResult.getFeedbackToUser()); resultDisplay.setFeedbackToUser(commandResult.getFeedbackToUser()); - resultTabIndex =commandResult.getIndex(); + resultTabIndex = commandResult.getIndex(); System.out.println("resultTabIndex: " + resultTabIndex); tabPane.getSelectionModel().select(resultTabIndex); if (commandResult.isShowHelp()) { diff --git a/src/test/java/seedu/address/logic/commands/ChangePasswordCommandTest.java b/src/test/java/seedu/address/logic/commands/ChangePasswordCommandTest.java index a9e54ea166d..fccc3c7fc84 100644 --- a/src/test/java/seedu/address/logic/commands/ChangePasswordCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/ChangePasswordCommandTest.java @@ -9,43 +9,41 @@ import seedu.address.model.ModelManager; public class ChangePasswordCommandTest { - private Model model; - private Model expectedModel; + private Model model; + private Model expectedModel; - @BeforeEach - public void setUp() { - model = new ModelManager(); - expectedModel = new ModelManager(); - } + @BeforeEach + public void setUp() { + model = new ModelManager(); + expectedModel = new ModelManager(); + } - @Test - public void execute_changePassword_success() { - //Works only for default password - assertCommandSuccess(new ChangePasswordCommand("Password123!","Password1243!"), model, - "Password changed successfully." - , expectedModel); - //Change back to default password - assertCommandSuccess(new ChangePasswordCommand("Password1243!","Password123!"), model, - "Password changed successfully." - , expectedModel); - } + @Test + public void execute_changePassword_success() { + //Works only for default password + assertCommandSuccess(new ChangePasswordCommand("Password123!", "Password1243!"), model, + "Password changed successfully.", expectedModel); + //Change back to default password + assertCommandSuccess(new ChangePasswordCommand("Password1243!", "Password123!"), model, + "Password changed successfully.", expectedModel); + } - @Test - public void execute_changePassword_failure_same() { - assertCommandSuccess(new ChangePasswordCommand("Password123!","Password123!"), model, - "New password cannot be the same as the current password." - , expectedModel); - } - @Test - public void execute_changePassword_failure_wrong() { - assertCommandSuccess(new ChangePasswordCommand("Password13!","Password123!"), model, - "Current password is incorrect.\n" + MESSAGE_CONSTRAINTS - , expectedModel); - } - @Test - public void execute_changePassword_failure_invalid() { - assertCommandSuccess(new ChangePasswordCommand("Password123!","Password123"), model, - "New password doesn't meet the constraints.\n" + MESSAGE_CONSTRAINTS - , expectedModel); - } + @Test + public void execute_changePassword_same() { + assertCommandSuccess(new ChangePasswordCommand("Password123!", "Password123!"), model, + "New password cannot be the same as the current password.", + expectedModel); + } + @Test + public void execute_changePassword_wrong() { + assertCommandSuccess(new ChangePasswordCommand("Password13!", "Password123!"), model, + "Current password is incorrect.\n" + MESSAGE_CONSTRAINTS, + expectedModel); + } + @Test + public void execute_changePassword_invalid() { + assertCommandSuccess(new ChangePasswordCommand("Password123!", "Password123"), model, + "New password doesn't meet the constraints.\n" + MESSAGE_CONSTRAINTS, + expectedModel); + } } diff --git a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java index 466b0824c73..1dacfb66b7d 100644 --- a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java +++ b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java @@ -191,6 +191,16 @@ public static void assertCommandSuccess(Command command, Model actualModel, Stri false, TabIndex.Developer); assertCommandSuccess(command, actualModel, expectedCommandResult, expectedModel); } + /** + * Convenience wrapper to {@link #assertCommandSuccess(Command, Model, CommandResult, Model)} + * that takes a string {@code expectedMessage}. + */ + public static void assertProjectCommandSuccess(Command command, Model actualModel, String expectedMessage, + Model expectedModel) { + CommandResult expectedCommandResult = new CommandResult(expectedMessage, false, + false, TabIndex.Project); + assertCommandSuccess(command, actualModel, expectedCommandResult, expectedModel); + } /** * Executes the given {@code command}, confirms that
diff --git a/src/test/java/seedu/address/logic/commands/LockCommandTest.java b/src/test/java/seedu/address/logic/commands/LockCommandTest.java index b81c83b10cb..116661a5541 100644 --- a/src/test/java/seedu/address/logic/commands/LockCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/LockCommandTest.java @@ -9,17 +9,17 @@ public class LockCommandTest { - private Model model; - private Model expectedModel; + private Model model; + private Model expectedModel; - @BeforeEach - public void setUp() { - model = new ModelManager(); - expectedModel = new ModelManager(); - } + @BeforeEach + public void setUp() { + model = new ModelManager(); + expectedModel = new ModelManager(); + } - @Test - public void execute_lock_success() { - assertCommandSuccess(new LockCommand(), model, LockCommand.MESSAGE_SUCCESS, model); - } + @Test + public void execute_lock_success() { + assertCommandSuccess(new LockCommand(), model, LockCommand.MESSAGE_SUCCESS, model); + } } diff --git a/src/test/java/seedu/address/logic/commands/UnlockCommandTest.java b/src/test/java/seedu/address/logic/commands/UnlockCommandTest.java index d5b2f9f5c32..6d85562cb27 100644 --- a/src/test/java/seedu/address/logic/commands/UnlockCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/UnlockCommandTest.java @@ -8,26 +8,26 @@ import seedu.address.model.ModelManager; public class UnlockCommandTest { - private Model model; - private Model expectedModel; + private Model model; + private Model expectedModel; - @BeforeEach - public void setUp() { - model = new ModelManager(); - expectedModel = new ModelManager(); - } + @BeforeEach + public void setUp() { + model = new ModelManager(); + expectedModel = new ModelManager(); + } - @Test - public void execute_unlock_success() { - //Works only for default password - assertCommandSuccess(new UnlockCommand("Password123!"), model, UnlockCommand.MESSAGE_SUCCESS - , expectedModel); - } + @Test + public void execute_unlock_success() { + //Works only for default password + assertCommandSuccess(new UnlockCommand("Password123!"), model, UnlockCommand.MESSAGE_SUCCESS, + expectedModel); + } - @Test - public void execute_unlock_failure() { - assertCommandSuccess(new UnlockCommand("Password123"), model, UnlockCommand.MESSAGE_FAILURE - , expectedModel); - } + @Test + public void execute_unlock_failure() { + assertCommandSuccess(new UnlockCommand("Password123"), model, UnlockCommand.MESSAGE_FAILURE, + expectedModel); + } } diff --git a/src/test/java/seedu/address/logic/commands/find/FindDeadlineCommandTest.java b/src/test/java/seedu/address/logic/commands/find/FindDeadlineCommandTest.java index 637a59d811a..94e35621326 100644 --- a/src/test/java/seedu/address/logic/commands/find/FindDeadlineCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/find/FindDeadlineCommandTest.java @@ -1,24 +1,59 @@ package seedu.address.logic.commands.find; -import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static seedu.address.logic.commands.CommandTestUtil.assertProjectCommandSuccess; +import static seedu.address.testutil.TypicalProjects.PROJECT_A; +import static seedu.address.testutil.TypicalProjects.PROJECT_B; +import static seedu.address.testutil.TypicalProjects.PROJECT_C; +import static seedu.address.testutil.TypicalProjects.getTypicalAddressBook; + +import java.util.Arrays; +import java.util.function.Predicate; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import seedu.address.logic.parser.ParserUtil; +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.commons.Date; +import seedu.address.model.project.Deadline; +import seedu.address.model.project.Priority; + public class FindDeadlineCommandTest { - private Model model; - private Model expectedModel; - - @BeforeEach - public void setUp() { - model = new ModelManager(); - expectedModel = new ModelManager(); - } - - @Test - public void execute_findDeadline_success() { - assertCommandSuccess(new FindDeadlineCommand(), model, FindDeadlineCommand.MESSAGE_SUCCESS, model); - } + private Model model; + + @BeforeEach + public void setUp() { + model = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + } + + @Test + public void execute_zeroKeywords_noDeadlineFound() throws ParseException { + //String expectedMessage = String.format(MESSAGE_PERSONS_LISTED_OVERVIEW, 0); + String expectedMessage = "There are no deadlines with matching information."; + Predicate finalPredicate = deadline -> true; + String dateKeywords = "10-10-2000"; + Date input = ParserUtil.parseDateDeadline(dateKeywords); + finalPredicate = + finalPredicate.and(d -> !d.getDate().value.after(input.value)); + FindDeadlineCommand command = new FindDeadlineCommand(finalPredicate); + model.updateFilteredProjectDeadlineList(finalPredicate); + assertProjectCommandSuccess(command, model, expectedMessage, model); + } + + @Test + public void execute_multipleKeywords_multiplePersonsFound() { + //String expectedMessage = String.format(MESSAGE_PERSONS_LISTED_OVERVIEW, 3); + String expectedMessage = "These are the 3 deadlines with matching information."; + Predicate finalPredicate = deadline -> true; + finalPredicate = finalPredicate.and(d -> d.getPriority().equals(Priority.HIGH)); + FindDeadlineCommand command = new FindDeadlineCommand(finalPredicate); + model.updateFilteredProjectDeadlineList(finalPredicate); + assertProjectCommandSuccess(command, model, expectedMessage, model); + assertEquals(Arrays.asList(PROJECT_A, PROJECT_B, PROJECT_C), model.getFilteredProjectList()); + } } diff --git a/src/test/java/seedu/address/testutil/ProjectBuilder.java b/src/test/java/seedu/address/testutil/ProjectBuilder.java new file mode 100644 index 00000000000..41ff3192d47 --- /dev/null +++ b/src/test/java/seedu/address/testutil/ProjectBuilder.java @@ -0,0 +1,73 @@ +package seedu.address.testutil; + +import java.util.List; + +import seedu.address.model.commons.Name; +import seedu.address.model.project.Deadline; +import seedu.address.model.project.Description; +import seedu.address.model.project.Project; + +/** + * A utility class to help with building Project objects. + */ +public class ProjectBuilder { + public static final String DEFAULT_PROJECT_NAME = "JuiceApp"; + public static final String DEFAULT_DESCRIPTION = "A project to create a juice ordering app"; + public static final List DEFAULT_DEADLINES = List.of(new Deadline("09-12-2023,Design backend,HIGH,0", + 1), + new Deadline("25-12-2023,Design frontend,MEDIUM,0", 2)); + private Name projectName = new Name(DEFAULT_PROJECT_NAME); + private Description description; + private List deadlines; + + /** + * Creates a {@code ProjectBuilder} with the default details. + */ + public ProjectBuilder() { + this.projectName = new Name(DEFAULT_PROJECT_NAME); + description = new Description(DEFAULT_DESCRIPTION); + deadlines = DEFAULT_DEADLINES; + } + + /** + * Initializes the ProjectBuilder with the data of {@code projectToCopy}. + */ + public ProjectBuilder(Project p) { + this.projectName = p.getProjectName(); + this.description = p.getProjectDescription(); + this.deadlines = p.getProjectDeadlines(); + } + + /** + * Sets the {@code Name} of the {@code Project} that we are building. + */ + public ProjectBuilder withProjectName(String projectName) { + this.projectName = new Name(projectName); + return this; + } + + /** + * Sets the {@code Description} of the {@code Project} that we are building. + */ + public ProjectBuilder withProjectDescription(String description) { + this.description = new Description(description); + return this; + } + + /** + * Sets the {@code Deadlines} of the {@code Project} that we are building. + */ + public ProjectBuilder withProjectDeadlines(List deadlines) { + this.deadlines = deadlines; + return this; + } + + /** + * Builds the project. + */ + public Project build() { + return new Project(projectName, description, deadlines); + } + + +} diff --git a/src/test/java/seedu/address/testutil/TypicalProjects.java b/src/test/java/seedu/address/testutil/TypicalProjects.java new file mode 100644 index 00000000000..a217177f7fc --- /dev/null +++ b/src/test/java/seedu/address/testutil/TypicalProjects.java @@ -0,0 +1,45 @@ +package seedu.address.testutil; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import seedu.address.model.AddressBook; +import seedu.address.model.project.Deadline; +import seedu.address.model.project.Project; + +/** + * A utility class to help with building Project objects. + */ +public class TypicalProjects { + public static final Project PROJECT_A = new ProjectBuilder().withProjectName("Project A") + .withProjectDescription("A softare engineering project").withProjectDeadlines(List + .of(new Deadline("09-12-2023,Design backend,HIGH,0", 1), + new Deadline("25-12-2023,Design frontend,MEDIUM,0", 2))).build(); + public static final Project PROJECT_B = new ProjectBuilder().withProjectName("Project B") + .withProjectDescription("A project to create a juice ordering app").withProjectDeadlines(List + .of(new Deadline("09-12-2023,Design backend,HIGH,0", 1), + new Deadline("25-12-2023,Design frontend,MEDIUM,0", 2))).build(); + public static final Project PROJECT_C = new ProjectBuilder().withProjectName("Project C") + .withProjectDescription("A project to create a juice ordering app").withProjectDeadlines(List + .of(new Deadline("09-12-2023,Design backend,HIGH,0", 1), + new Deadline("25-12-2023,Design frontend,MEDIUM,0", 2))).build(); + private TypicalProjects() { + + } // prevents instantiation + + /** + * Returns an {@code AddressBook} with all the typical projects. + */ + public static AddressBook getTypicalAddressBook() { + AddressBook ab = new AddressBook(); + for (Project p : getTypicalProjects()) { + ab.addProject(p); + } + return ab; + } + public static List getTypicalProjects() { + return new ArrayList<>(Arrays.asList(PROJECT_A, PROJECT_B, PROJECT_C)); + } + +} From a1dac0feca82575a13519c6ad00a03783641c80c Mon Sep 17 00:00:00 2001 From: MathanC Date: Sun, 12 Nov 2023 04:56:12 +0800 Subject: [PATCH 09/36] update UG --- docs/UserGuide.md | 65 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 1e4baac9b65..105dcb8f3cc 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -72,6 +72,7 @@ Confused about the terms or formatting used in this guide? Learn how to **naviga Confused about the visual display of CodeContact? Learn how to **navigate the user interface** of CodeContact [here](#navigating-the-graphical-user-interface--gui-). + ------------------------------------------------------------------------------------------ ## Navigating this guide @@ -141,6 +142,7 @@ Here are some notes about these parameters. | `dr/` | description of project | alphanumeric characters and spaces, and it should not be blank | App to allow for different juices to be ordered | | | `dl/` | deadline of project | alphanumeric characters and spaces, and it should not be blank | 19-12-2023, Design backend, HIGH, 0 | | +[Scroll back to Table of Contents](#table-of-contents) ----------------------------------------------------------------------------------------------- @@ -165,6 +167,8 @@ Here are some notes about these parameters. 6. Refer to the [Features](#features) below for details of each command. +[Scroll back to Table of Contents](#table-of-contents) + -------------------------------------------------------------------------------------------------------------------- ## CodeContact Tutorial (for new users) @@ -235,6 +239,7 @@ Congratulations! You are now ready to use CodeContact! To view all our features, you may visit our [Features](#features) section +[Scroll back to Table of Contents](#table-of-contents) -------------------------------------------------------------------------------------------------------------------- ## Features @@ -277,6 +282,8 @@ When command succeeds, CLI shows: Locked all data ``` +[Scroll back to Table of Contents](#table-of-contents) + ### Unlock `unlock` Unlocks the system by making all the information visible and allows all commands to be parsed. @@ -292,6 +299,8 @@ When command succeeds, CLI shows: Unlocked all data ``` +[Scroll back to Table of Contents](#table-of-contents) + ### Change password `change-password` Allows for password to be changed, given the current password and new password matches criteria @@ -309,6 +318,8 @@ When command succeeds, CLI shows: Password changed successfully. ``` +[Scroll back to Table of Contents](#table-of-contents) + ### Add Project Manager can add developers, clients and projects. @@ -357,6 +368,8 @@ Example: * Missing particular's error (when prefixes are missing) * `Invalid command format!` +[Scroll back to Table of Contents](#table-of-contents) + #### Add Client: `add-client` * Type in: @@ -398,6 +411,8 @@ Example: * Missing particular's error (when prefixes are missing) * `Invalid command format!` +[Scroll back to Table of Contents](#table-of-contents) + #### Add Project: `add-project` * Type in: @@ -431,6 +446,8 @@ Example: * Missing particular's error (when prefixes are missing) * `Invalid command format!` +[Scroll back to Table of Contents](#table-of-contents) + ### Delete #### Delete developer : `delete-developer` @@ -463,6 +480,9 @@ Example of usage: `delete-project 2` * Deletes second project from the list and updates developers and client details accordingly +[Scroll back to Table of Contents](#table-of-contents) + + ### Edit #### Edit developer details : `edit-developer` @@ -498,6 +518,8 @@ Salary: 6999 Projects: Project1, Project2 ``` +[Scroll back to Table of Contents](#table-of-contents) + #### Edit client details : `edit-client` Edits the details of an existing client in the address book. @@ -530,6 +552,8 @@ Document: google.com Projects: ProjectA ``` +[Scroll back to Table of Contents](#table-of-contents) + #### Edit project details : `edit-project` Edits the details of an existing project in the address book. @@ -556,6 +580,8 @@ Deadlines: 1. Design backend by: 19-12-2023, priority: HIGH (undone) ``` +[Scroll back to Table of Contents](#table-of-contents) + ### Import information #### Import developers `import-developer` @@ -598,6 +624,8 @@ Projects: ProjectBAndroidApp for each developer successfully added +[Scroll back to Table of Contents](#table-of-contents) + #### Import clients `import-client` Takes in a CSV file and populates the internal list of clients if the file is formatted correctly @@ -638,6 +666,8 @@ Projects: ProjectBAndroidApp for each client successfully added +[Scroll back to Table of Contents](#table-of-contents) + ### Find #### Find developer details @@ -664,6 +694,8 @@ This is the one developer with matching information ``` followed by the matching developer's details in the GUI. +[Scroll back to Table of Contents](#table-of-contents) + #### Find client details Finds the details of an existing client in the address book. @@ -688,6 +720,8 @@ These are the 2 clients with matching information ``` followed by the matching clients' details in the GUI. +[Scroll back to Table of Contents](#table-of-contents) + #### Find project details Finds the details of an existing project in the address book. @@ -712,6 +746,8 @@ This is the one project with matching information ``` followed by the matching project's details in the GUI. +[Scroll back to Table of Contents](#table-of-contents) + ### Find deadlines `find-deadline` Finds deadlines in project tab based on date and/or priority @@ -731,6 +767,8 @@ When command succeeds, CLI shows: These are the 3 projects with matching information. ``` +[Scroll back to Table of Contents](#table-of-contents) + ### Listing information : `list` Shows a list of all developers in the address book. @@ -755,6 +793,8 @@ When command succeeds, CLI shows: Listed all developers ``` +[Scroll back to Table of Contents](#table-of-contents) + ### Add roles #### Add developer roles : `add-developer-role` @@ -781,6 +821,8 @@ When command succeeds, CLI shows: New role for developer added: UIDesigner ``` +[Scroll back to Table of Contents](#table-of-contents) + #### Add client roles : `add-client-role` Adds new client roles into the system. @@ -805,6 +847,8 @@ When command succeeds, CLI shows: New role for client added: Boss ``` +[Scroll back to Table of Contents](#table-of-contents) + ### Delete roles #### Delete developer roles : `delete-developer-role` @@ -829,6 +873,7 @@ When command succeeds, CLI shows: Role for developers deleted: UIDesigner ``` +[Scroll back to Table of Contents](#table-of-contents) #### Delete client roles : `delete-client-role` @@ -854,6 +899,7 @@ Role for clients deleted: Boss the client tab will be cleared or only showing the clients with role you are deleting. Use `list-client` to see all the data again +[Scroll back to Table of Contents](#table-of-contents) ### Mark deadline as done : `mark-deadline` @@ -873,6 +919,8 @@ When command succeeds, CLI shows: The deadline has been marked as completed! ``` +[Scroll back to Table of Contents](#table-of-contents) + ### Mark deadline as undone : `unmark-deadline` Marks the indicated deadline for the project as undone. @@ -891,6 +939,8 @@ When command succeeds, CLI shows: The deadline has been marked as undone! ``` +[Scroll back to Table of Contents](#table-of-contents) + ### Undo : `undo` Undo the previous command you entered. @@ -920,6 +970,8 @@ Salary: 5000; Projects: CustomWebsiteAndroidApp ``` +[Scroll back to Table of Contents](#table-of-contents) + ### Redo : `redo` Redo the previous command you undid. @@ -949,6 +1001,7 @@ Salary: 5000; Projects: CustomWebsiteAndroidApp ``` +[Scroll back to Table of Contents](#table-of-contents) ### Viewing help : `help` @@ -956,18 +1009,24 @@ Shows a message explaining how to access the help page. Format: `help` +[Scroll back to Table of Contents](#table-of-contents) + ### Clearing all entries : `clear` Clears all entries from the address book. Format: `clear` +[Scroll back to Table of Contents](#table-of-contents) + ### Exiting the program : `exit` Exits the program. Format: `exit` +[Scroll back to Table of Contents](#table-of-contents) + ### Feedback System `[coming in v2.0]` -------------------------------------------------------------------------------------------------------------------- @@ -1009,6 +1068,8 @@ the data of your previous AddressBook home folder. **A**: Open a command prompt and type `java -version` . If you do not have Java installed, you can download it [here](https://www.oracle.com/java/technologies/downloads/#java11) +[Scroll back to Table of Contents](#table-of-contents) + -------------------------------------------------------------------------------------------------------------------- ## Known issues @@ -1017,6 +1078,8 @@ can download it [here](https://www.oracle.com/java/technologies/downloads/#java1 the primary screen, the GUI will open off-screen. The remedy is to delete the `preferences.json` file created by the application before running the application again. +[Scroll back to Table of Contents](#table-of-contents) + -------------------------------------------------------------------------------------------------------------------- ## Command summary @@ -1035,3 +1098,5 @@ can download it [here](https://www.oracle.com/java/technologies/downloads/#java1 | **delete** | Format:

Example:

| | **list** | Format:
`list-developers`
`list-projects`
`list-clients` | | **help** | `help` | + +[Scroll back to Table of Contents](#table-of-contents) From b929e0e6d85ab08f8b49b63970f69bda631db8ea Mon Sep 17 00:00:00 2001 From: MathanC Date: Sun, 12 Nov 2023 13:38:07 +0800 Subject: [PATCH 10/36] Fixed some tests --- .../seedu/address/model/client/ClientRoles.java | 2 +- .../address/logic/commands/CommandResultTest.java | 2 +- .../address/logic/commands/CommandTestUtil.java | 14 ++++++++++++++ .../logic/commands/edit/EditClientCommandTest.java | 3 ++- .../logic/commands/find/FindClientCommandTest.java | 11 ++++++----- .../commands/find/FindProjectCommandTest.java | 11 ++++++----- .../logic/commands/list/ListClientCommandTest.java | 5 +++-- 7 files changed, 33 insertions(+), 15 deletions(-) diff --git a/src/main/java/seedu/address/model/client/ClientRoles.java b/src/main/java/seedu/address/model/client/ClientRoles.java index ef42cd81b54..ffc7e437880 100644 --- a/src/main/java/seedu/address/model/client/ClientRoles.java +++ b/src/main/java/seedu/address/model/client/ClientRoles.java @@ -174,7 +174,7 @@ public static void loadClientRoles() { lineCount++; } } catch (IOException e) { - e.printStackTrace(); + saveClientRoles(); } } diff --git a/src/test/java/seedu/address/logic/commands/CommandResultTest.java b/src/test/java/seedu/address/logic/commands/CommandResultTest.java index 0fe345a0c83..40e3d3b82f6 100644 --- a/src/test/java/seedu/address/logic/commands/CommandResultTest.java +++ b/src/test/java/seedu/address/logic/commands/CommandResultTest.java @@ -57,7 +57,7 @@ public void toStringMethod() { CommandResult commandResult = new CommandResult("feedback", TabIndex.Developer); String expected = CommandResult.class.getCanonicalName() + "{feedbackToUser=" + commandResult.getFeedbackToUser() + ", showHelp=" + commandResult.isShowHelp() - + ", exit=" + commandResult.isExit() + "}"; + + ", exit=" + commandResult.isExit() + ", index=Developer}"; assertEquals(expected, commandResult.toString()); } } diff --git a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java index 1342f25319f..31b0995285b 100644 --- a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java +++ b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java @@ -222,6 +222,20 @@ public static void assertProjectCommandSuccess(Command command, Model actualMode assertCommandSuccess(command, actualModel, expectedCommandResult, expectedModel); } + /** + * Convenience wrapper to {@link #assertCommandSuccess(Command, Model, CommandResult, Model)} + * that takes a string {@code expectedMessage}. + */ + public static void assertClientCommandSuccess(Command command, Model actualModel, String expectedMessage, + Model expectedModel) { + CommandResult expectedCommandResult = new CommandResult(expectedMessage, false, + false, TabIndex.Client); + assertCommandSuccess(command, actualModel, expectedCommandResult, expectedModel); + } + + + + /** * Executes the given {@code command}, confirms that
* - a {@code CommandException} is thrown
diff --git a/src/test/java/seedu/address/logic/commands/edit/EditClientCommandTest.java b/src/test/java/seedu/address/logic/commands/edit/EditClientCommandTest.java index 8ff31ad66f0..fb2e7d32243 100644 --- a/src/test/java/seedu/address/logic/commands/edit/EditClientCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/edit/EditClientCommandTest.java @@ -7,6 +7,7 @@ import static seedu.address.logic.commands.CommandTestUtil.DESC_DAN; import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB; import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_CALEB; +import static seedu.address.logic.commands.CommandTestUtil.assertClientCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure; import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.showClientAtIndex; @@ -48,7 +49,7 @@ public void execute_allFieldsSpecifiedUnfilteredList_success() { Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs()); expectedModel.setClient(model.getFilteredClientList().get(0), editedClient); - assertCommandSuccess(editCommand, model, expectedMessage, expectedModel); + assertClientCommandSuccess(editCommand, model, expectedMessage, expectedModel); } // Project needs to be created diff --git a/src/test/java/seedu/address/logic/commands/find/FindClientCommandTest.java b/src/test/java/seedu/address/logic/commands/find/FindClientCommandTest.java index cd4db68563b..0f656cd8a96 100644 --- a/src/test/java/seedu/address/logic/commands/find/FindClientCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/find/FindClientCommandTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static seedu.address.logic.commands.CommandTestUtil.assertClientCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; import static seedu.address.testutil.TypicalClients.ALICE; import static seedu.address.testutil.TypicalClients.BENSON; @@ -61,7 +62,7 @@ public void execute_zeroKeywords_noPersonFound() { NameClientContainsKeywordsPredicate predicate = prepareNamePredicate("hii"); FindClientCommand command = new FindClientCommand(predicate); expectedModel.updateFilteredClientList(predicate); - assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertClientCommandSuccess(command, model, expectedMessage, expectedModel); assertEquals(Collections.emptyList(), model.getFilteredClientList()); } @@ -71,7 +72,7 @@ public void execute_multipleKeywords_multiplePersonsFound() { NameClientContainsKeywordsPredicate predicate = prepareNamePredicate("Alice Benson Carl"); FindClientCommand command = new FindClientCommand(predicate); expectedModel.updateFilteredClientList(predicate); - assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertClientCommandSuccess(command, model, expectedMessage, expectedModel); assertEquals(Arrays.asList(ALICE, BENSON, CARL), model.getFilteredClientList()); } @@ -90,7 +91,7 @@ public void execute_caseInsensitiveSearch_clientFound() { OrganisationContainsKeywordsPredicate predicate = prepareOrganisationPredicate("Microsoft"); // using mixed case FindClientCommand command = new FindClientCommand(predicate); expectedModel.updateFilteredClientList(predicate); - assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertClientCommandSuccess(command, model, expectedMessage, expectedModel); assertEquals(Arrays.asList(DANIEL), model.getFilteredClientList()); } @@ -100,7 +101,7 @@ public void execute_partialName_clientFound() { NameClientContainsKeywordsPredicate predicate = prepareNamePredicate("rl"); FindClientCommand command = new FindClientCommand(predicate); expectedModel.updateFilteredClientList(predicate); - assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertClientCommandSuccess(command, model, expectedMessage, expectedModel); assertEquals(Arrays.asList(CARL), model.getFilteredClientList()); } @@ -110,7 +111,7 @@ public void execute_noMatchingClients_noClientFound() { NameClientContainsKeywordsPredicate predicate = prepareNamePredicate("NonExistentClient"); FindClientCommand command = new FindClientCommand(predicate); expectedModel.updateFilteredClientList(predicate); - assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertClientCommandSuccess(command, model, expectedMessage, expectedModel); assertEquals(Collections.emptyList(), model.getFilteredClientList()); } diff --git a/src/test/java/seedu/address/logic/commands/find/FindProjectCommandTest.java b/src/test/java/seedu/address/logic/commands/find/FindProjectCommandTest.java index df348e66a31..37b00c56104 100644 --- a/src/test/java/seedu/address/logic/commands/find/FindProjectCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/find/FindProjectCommandTest.java @@ -3,6 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; +import static seedu.address.logic.commands.CommandTestUtil.assertProjectCommandSuccess; import static seedu.address.testutil.TypicalProjects.PROJECT_A; import static seedu.address.testutil.TypicalProjects.PROJECT_A_NO_SPACING; import static seedu.address.testutil.TypicalProjects.PROJECT_B; @@ -60,7 +61,7 @@ public void execute_zeroKeywords_noProjectFound() { ProjectNameContainsKeywordsPredicate predicate = preparePredicate("hii"); FindProjectCommand command = new FindProjectCommand(predicate); expectedModel.updateFilteredProjectList(predicate); - assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertProjectCommandSuccess(command, model, expectedMessage, expectedModel); assertEquals(Collections.emptyList(), model.getFilteredProjectList()); } @@ -70,7 +71,7 @@ public void execute_multipleKeywords_multipleProjectsFound() { ProjectNameContainsKeywordsPredicate predicate = preparePredicate("Project A B C"); FindProjectCommand command = new FindProjectCommand(predicate); expectedModel.updateFilteredProjectList(predicate); - assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertProjectCommandSuccess(command, model, expectedMessage, expectedModel); assertEquals(Arrays.asList(PROJECT_A, PROJECT_B, PROJECT_C, PROJECT_A_NO_SPACING), model.getFilteredProjectList()); } @@ -90,7 +91,7 @@ public void execute_caseInsensitiveSearch_projectFound() { ProjectNameContainsKeywordsPredicate predicate = preparePredicate("a"); // using mixed case FindProjectCommand command = new FindProjectCommand(predicate); expectedModel.updateFilteredProjectList(predicate); - assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertProjectCommandSuccess(command, model, expectedMessage, expectedModel); assertEquals(Arrays.asList(PROJECT_A, PROJECT_A_NO_SPACING), model.getFilteredProjectList()); } @@ -101,7 +102,7 @@ public void execute_partialName_projectFound() { ProjectNameContainsKeywordsPredicate predicate = preparePredicate("jecta"); FindProjectCommand command = new FindProjectCommand(predicate); expectedModel.updateFilteredProjectList(predicate); - assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertProjectCommandSuccess(command, model, expectedMessage, expectedModel); assertEquals(Arrays.asList(PROJECT_A_NO_SPACING), model.getFilteredProjectList()); } @@ -111,7 +112,7 @@ public void execute_noMatchingProjects_noProjectFound() { ProjectNameContainsKeywordsPredicate predicate = preparePredicate("NonExistentProject"); FindProjectCommand command = new FindProjectCommand(predicate); expectedModel.updateFilteredProjectList(predicate); - assertCommandSuccess(command, model, expectedMessage, expectedModel); + assertProjectCommandSuccess(command, model, expectedMessage, expectedModel); assertEquals(Collections.emptyList(), model.getFilteredProjectList()); } diff --git a/src/test/java/seedu/address/logic/commands/list/ListClientCommandTest.java b/src/test/java/seedu/address/logic/commands/list/ListClientCommandTest.java index ee232924aa2..28513e503ea 100644 --- a/src/test/java/seedu/address/logic/commands/list/ListClientCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/list/ListClientCommandTest.java @@ -1,5 +1,6 @@ package seedu.address.logic.commands.list; +import static seedu.address.logic.commands.CommandTestUtil.assertClientCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.showClientAtIndex; import static seedu.address.testutil.TypicalClients.getTypicalAddressBook; @@ -28,12 +29,12 @@ public void setUp() { @Test public void execute_listIsNotFiltered_showsSameList() { - assertCommandSuccess(new ListClientCommand(), model, ListClientCommand.MESSAGE_SUCCESS, expectedModel); + assertClientCommandSuccess(new ListClientCommand(), model, ListClientCommand.MESSAGE_SUCCESS, expectedModel); } @Test public void execute_listIsFiltered_showsEverything() { showClientAtIndex(model, INDEX_FIRST_PERSON); - assertCommandSuccess(new ListClientCommand(), model, ListClientCommand.MESSAGE_SUCCESS, expectedModel); + assertClientCommandSuccess(new ListClientCommand(), model, ListClientCommand.MESSAGE_SUCCESS, expectedModel); } } From 4caa9f406d0808f648a41804e6822706b55ac7ff Mon Sep 17 00:00:00 2001 From: MathanC Date: Sun, 12 Nov 2023 13:42:06 +0800 Subject: [PATCH 11/36] no message --- src/main/java/seedu/address/model/client/ClientRoles.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/seedu/address/model/client/ClientRoles.java b/src/main/java/seedu/address/model/client/ClientRoles.java index ffc7e437880..84f25418081 100644 --- a/src/main/java/seedu/address/model/client/ClientRoles.java +++ b/src/main/java/seedu/address/model/client/ClientRoles.java @@ -174,7 +174,7 @@ public static void loadClientRoles() { lineCount++; } } catch (IOException e) { - saveClientRoles(); + saveClientRoles(); } } From 8e9f28aff738fda9a268c2b41189bd97d8a14ed0 Mon Sep 17 00:00:00 2001 From: MathanC Date: Sun, 12 Nov 2023 13:48:47 +0800 Subject: [PATCH 12/36] checkstyle fix --- .../seedu/address/logic/commands/edit/EditClientCommandTest.java | 1 - .../seedu/address/logic/commands/find/FindClientCommandTest.java | 1 - .../address/logic/commands/find/FindProjectCommandTest.java | 1 - .../seedu/address/logic/commands/list/ListClientCommandTest.java | 1 - 4 files changed, 4 deletions(-) diff --git a/src/test/java/seedu/address/logic/commands/edit/EditClientCommandTest.java b/src/test/java/seedu/address/logic/commands/edit/EditClientCommandTest.java index fb2e7d32243..4a4866a1920 100644 --- a/src/test/java/seedu/address/logic/commands/edit/EditClientCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/edit/EditClientCommandTest.java @@ -9,7 +9,6 @@ import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_CALEB; import static seedu.address.logic.commands.CommandTestUtil.assertClientCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure; -import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.showClientAtIndex; import static seedu.address.testutil.TypicalClients.getTypicalAddressBook; import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON; diff --git a/src/test/java/seedu/address/logic/commands/find/FindClientCommandTest.java b/src/test/java/seedu/address/logic/commands/find/FindClientCommandTest.java index 0f656cd8a96..19d18650a4c 100644 --- a/src/test/java/seedu/address/logic/commands/find/FindClientCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/find/FindClientCommandTest.java @@ -3,7 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static seedu.address.logic.commands.CommandTestUtil.assertClientCommandSuccess; -import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; import static seedu.address.testutil.TypicalClients.ALICE; import static seedu.address.testutil.TypicalClients.BENSON; import static seedu.address.testutil.TypicalClients.CARL; diff --git a/src/test/java/seedu/address/logic/commands/find/FindProjectCommandTest.java b/src/test/java/seedu/address/logic/commands/find/FindProjectCommandTest.java index 37b00c56104..9efdd89da39 100644 --- a/src/test/java/seedu/address/logic/commands/find/FindProjectCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/find/FindProjectCommandTest.java @@ -2,7 +2,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.assertProjectCommandSuccess; import static seedu.address.testutil.TypicalProjects.PROJECT_A; import static seedu.address.testutil.TypicalProjects.PROJECT_A_NO_SPACING; diff --git a/src/test/java/seedu/address/logic/commands/list/ListClientCommandTest.java b/src/test/java/seedu/address/logic/commands/list/ListClientCommandTest.java index 28513e503ea..0b310e03f6c 100644 --- a/src/test/java/seedu/address/logic/commands/list/ListClientCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/list/ListClientCommandTest.java @@ -1,7 +1,6 @@ package seedu.address.logic.commands.list; import static seedu.address.logic.commands.CommandTestUtil.assertClientCommandSuccess; -import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.showClientAtIndex; import static seedu.address.testutil.TypicalClients.getTypicalAddressBook; import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON; From 7d6f54af07b276af1a27ea9cb2c4d16c8cd19fa6 Mon Sep 17 00:00:00 2001 From: mingyu Date: Sun, 12 Nov 2023 17:04:45 +0800 Subject: [PATCH 13/36] Formatting DG --- docs/DeveloperGuide.md | 315 +++++++++++++++++++++-------------------- docs/UserGuide.md | 21 +-- 2 files changed, 174 insertions(+), 162 deletions(-) diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index 80049ea2229..28da5f084c2 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -2,18 +2,41 @@ layout: page title: Developer Guide --- -* Table of Contents - {:toc} +## Table of Contents +* [Acknowledgements](#acknowledgements) +* [Setting up and getting started](#setting-up-and-getting-started) +* [Design](#design) + * [Architecture](#architecture) + * [UI Component](#ui-component) + * [Logic Component](#logic-component) + * [Model Component](#model-component) + * [Storage component](#storage-component) + * [Common Classes](#common-classes) +* [Implementation](#implementation) +* [Documentation, logging, testing, configuration, dev-ops](#documentation-logging-testing-configuration-dev-ops) +* [Appendix: Requirements](#appendix-requirements) + * [Product Scope](#project-scope) + * [User Stories](#user-stories) + * [Use Cases](#use-cases) + * [Non Functional Requirements](#non-functional-requirements) + * [Glossary] +* [Appendix: Manual Testing](#appendix-manual-testing) +* [Appendix: Planned Enhancements](#appendix-planned-enhancement) +* [Appendix: Effort](#appendix-effort) -------------------------------------------------------------------------------------------------------------------- ## **Acknowledgements** - +* Adapted from [AB3](https://se-education.org/addressbook-level3/) * {list here sources of all reused/adapted ideas, code, documentation, and third-party libraries -- include links to the original source as well} -------------------------------------------------------------------------------------------------------------------- - @@ -23,7 +25,9 @@ Refer to the guide [_Setting up and getting started_](SettingUp.md). +## **Setting up and getting started** + +* Refer to the guide [Setting up and getting started](https://ay2324s1-cs2103t-t09-2.github.io/tp/SettingUp.html). +-------------------------------------------------------------------------------------------------------------------- +## **Design**
@@ -21,15 +44,24 @@ title: Developer Guide
### Architecture - @@ -36,7 +40,11 @@ Given below is a quick overview of main components and how they interact with ea + + +The **Architecture Diagram** given above explains the high-level design of the App. + +Given below is a quick overview of main components and how they interact with ea **Main components of the architecture** **`Main`** (consisting of classes [`Main`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/java/seedu/address/Main.java) and [`MainApp`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/java/seedu/address/MainApp.java)) is in charge of the app launch and shut down. * At app launch, it initializes the other components in the correct sequence, and connects them up with each other. * At shut down, it shuts down the other components and invokes cleanup methods where necessary. - - @@ -51,30 +59,43 @@ The bulk of the app's work is done by the following four components: +* The bulk of the app's work is done by the following four components: + * [**`UI`**](#ui-component): The UI of the App. + * [**`Logic`**](#logic-component): The command executor. + * [**`Model`**](#model-component): Holds the data of the App in memory. + * [**`Storage`**](#storage-component): Reads data from, and writes data to, the hard disk. + +[**`Commons`**](#common-classes) represents a collection of classes used by multiple other components. **How the architecture components interact with each other** @@ -48,6 +80,7 @@ For example, the `Logic` component defines its API in the `Logic.java` interface The sections below give more details of each component. + ### UI component The **API** of this component is specified in [`Ui.java`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/java/seedu/address/ui/Ui.java) @@ -59,8 +92,11 @@ The UI consists of a `MainWindow` that is made up of parts e.g.`CommandBox`, `Re The `UI` component uses the JavaFx UI framework. The layout of these UI parts are defined in matching `.fxml` files that are in the `src/main/resources/view` folder. For example, the layout of the [`MainWindow`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/java/seedu/address/ui/MainWindow.java) is specified in [`MainWindow.fxml`](https://github.com/se-edu/addressbook-level3/tree/master/src/main/resources/view/MainWindow.fxml) The `UI` component, - - @@ -85,13 +106,15 @@ The `UI` component, +The UI component, +* executes user commands using the Logic component. +* listens for changes to Model data so that the UI can be updated with the modified data. +* keeps a reference to the Logic component, because the UI relies on the Logic to execute commands. +* depends on some classes in the Model component, as it displays Person object residing in the Model. ### Logic component @@ -74,7 +110,8 @@ The sequence diagram below illustrates the interactions within the `Logic` compo ![Interactions Inside the Logic Component for the `delete 1` Command](images/DeleteSequenceDiagram.png) - @@ -100,8 +123,10 @@ The sequence diagram below illustrates the interactions within the `Logic` compo +
:information_source: **Note:** The lifeline for `DeleteCommandParser` should end at the destroy marker (X) but due to a limitation of PlantUML, the lifeline reaches the end of diagram. +
How the `Logic` component works: @@ -83,7 +120,7 @@ How the `Logic` component works: 3. The command can communicate with the `Model` when it is executed (e.g. to delete a developer). 4. The result of the command execution is encapsulated as a `CommandResult` object which is returned back from `Logic`. - @@ -110,39 +135,56 @@ Here are the other classes in `Logic` (omitted from the class diagram above) tha +Here are the other classes in `Logic` (omitted from the class diagram above) that are used for parsing a user command: How the parsing works: @@ -123,9 +160,66 @@ The `Storage` component, ### Common classes - @@ -155,57 +197,78 @@ Classes used by multiple components are in the `seedu.addressbook.commons` packa +Classes used by multiple components are in the `seedu.address.commons` package. + This section describes some noteworthy details on how certain features are implemented. +-------------------------------------------------------------------------------------------------------------------- +## Implementation +### Add features +Upon entry of the add developer command, an `AddDeveloperCommand` class is created. The `AddDeveloperCommand` class extends the abstract `Command` class and implements the `execute()` method. Upon execution of this method, a `Developer` object is added to the model’s list of developers if all the attributes provided are valid and a duplicate instance does not exist. + +Given below is an example usage scenario of how the add developer is executed step by step. + +The following sequence diagram illustrates how the add developer operation works +#### Implementation +#### Design considerations + + +### Delete features +Deletes a developer at the specified **one-based index** of list of currently existing/found developers. Users are able to delete any developer in the list. If an index larger than or equal to the size of the developer’s list is provided, the command will not be allowed and an error will be thrown to alert user. + +Example Use: `del-d 1` +#### Implementation +Upon entry of the delete developer command, a `DeleteDeveloperCommand` class is created. The `DeleteDeveloperCommand` class extends the abstract `Command` class and implements the `execute()` method. Upon execution of this method, the doctor at specified **one-based index** is removed if the index provided is valid. + +Given below is an example usage scenario of how the delete developer command behaves at each step. +Step 2. User executes `del-d 1` to delete the developer at index 1 (one-based in +Step 3. The developer at this index is removed if the index provided is valid. + +The following sequence diagram illustrates how the delete developer operation works: +#### Design considerations + + +### Import feature +This feature will allow project managers to import existing spreadsheets of developer and client data in the specified format in CSV +#### Implementation + +There are 2 implementations: CLI and GUI + +##### CLI Implementation +Upon entry of the import developer command, an `ImportDeveloperCommand` class is created. The `ImportDeveloperCommand` class extends the abstract `Command` class and implements the `execute()` method. Upon execution of this method, a list of `Developer` objects are added to the model’s list of developers if all the attributes provided are valid and a duplicate instance does not exist. + +Given below is an example usage scenario of how the import developer is executed step by step. + +Step 1. User launches the application + +Step 2. User inputs `import-developer developers.csv` to indicate path and filename of where the spreadsheet of developers is located. + +Step 3. The developers are added to the model’s list of developers if valid the column names are valid and each row of input is valid. + +The implementation follows likewise for clients. + +The following sequence diagram illustrates how the add developer operation works: + +##### GUI Implementation +A new menu item will be added under File called `Import developers` and `Import clients` + +Clicking it will lead to a window to select the location of the respective file in csv format. + +The backend implementation of logic follows the CLI implementation by creating a `ImportDeveloperCommand` or `ImportClientCommand` + + ### Edit features #### Implementation The original edit feature from AB-3 has been extended to account for the editing of projects and specific people - developers @@ -169,63 +263,6 @@ automatically switches user to the respective tab. * Cons: User needs to ensure that intended tab is open. Allowed parameters are less clearly defined, can lead to confusion and mistakes. -### Add Developer Feature - -This feature allows users to add a developer to the bottom of the list of currently existing developers. Users are able to add any valid developer to the list. If a record of the same developer already exists in the list, the command will not be allowed and an error will be thrown to alert user. - -Example Use: `add-d n/John Doe p/98765432 e/johnd@example.com` - -#### Implementation - -Upon entry of the add developer command, an `AddDeveloperCommand` class is created. The `AddDeveloperCommand` class extends the abstract `Command` class and implements the `execute()` method. Upon execution of this method, a `Developer` object is added to the model’s list of developers if all the attributes provided are valid and a duplicate instance does not exist. - -Given below is an example usage scenario of how the add developer is executed step by step. - - @@ -219,13 +282,17 @@ The following sequence diagram illustrates how the add developer operation works - -### Delete Developer Feature - -Deletes a developer at the specified **one-based index** of list of currently existing/found developers. Users are able to delete any developer in the list. If an index larger than or equal to the size of the developer’s list is provided, the command will not be allowed and an error will be thrown to alert user. - -Example Use: `del-d 1` - -#### Implementation - -Upon entry of the delete developer command, a `DeleteDeveloperCommand` class is created. The `DeleteDeveloperCommand` class extends the abstract `Command` class and implements the `execute()` method. Upon execution of this method, the doctor at specified **one-based index** is removed if the index provided is valid. - -Given below is an example usage scenario of how the delete developer command behaves at each step. - - @@ -236,55 +303,76 @@ Step 2. User executes `del-d 1` to delete the developer at index 1 (one-based in -Step 3. The developer at this index is removed if the index provided is valid. - -The following sequence diagram illustrates how the delete developer operation works: -### \[Proposed\] Import feature -This feature will allow project managers to import existing spreadsheets of developer and client data in the specified format in CSV -#### Proposed Implementation - -There are 2 implementations: CLI and GUI - -##### CLI Implementation -Upon entry of the import developer command, an `ImportDeveloperCommand` class is created. The `ImportDeveloperCommand` class extends the abstract `Command` class and implements the `execute()` method. Upon execution of this method, a list of `Developer` objects are added to the model’s list of developers if all the attributes provided are valid and a duplicate instance does not exist. - -Given below is an example usage scenario of how the import developer is executed step by step. - -Step 1. User launches the application - -Step 2. User inputs `import-developer developers.csv` to indicate path and filename of where the spreadsheet of developers is located. - -Step 3. The developers are added to the model’s list of developers if valid the column names are valid and each row of input is valid. - -The implementation follows likewise for clients. - -The following sequence diagram illustrates how the add developer operation works: - -##### GUI Implementation -A new menu item will be added under File called `Import developers` and `Import clients` - -Clicking it will lead to a window to select the location of the respective file in csv format. - -The backend implementation of logic follows the CLI implementation by creating a `ImportDeveloperCommand` or `ImportClientCommand` ### Find Feature @@ -267,9 +304,9 @@ Given below is an example usage scenario and how the find mechanism behaves at e Given the benefits of a more maintainable and scalable codebase, we've decided to go with the first alternative. Future enhancements might include fuzzy search. -### \[Proposed\] Undo/redo feature +### Undo/redo feature -#### Proposed Implementation +#### Implementation The proposed undo/redo mechanism is facilitated by `VersionedAddressBook`. It extends `AddressBook` with an undo/redo history, stored internally as an `addressBookStateList` and `currentStatePointer`. Additionally, it implements the following operations: @@ -300,9 +337,7 @@ Step 4. The user now decides that adding the developer was a mistake, and decide ![UndoRedoState3](images/UndoRedoState3.png) - @@ -353,17 +457,23 @@ The following sequence diagram shows how the undo operation works: - - +The following sequence diagram shows how the undo operation works: The `redo` command does the opposite — it calls `Model#redoAddressBook()`, which shifts the `currentStatePointer` once to the right, pointing to the previously undone state, and restores the address book to that state. @@ -318,7 +353,7 @@ Step 6. The user executes `clear`, which calls `Model#commitAddressBook()`. Sinc ![UndoRedoState5](images/UndoRedoState5.png) - @@ -376,13 +486,13 @@ The following activity diagram summarizes what happens when a user executes a ne +The following activity diagram summarizes what happens when a user executes a ne **Aspect: How undo & redo executes:** * **Alternative 1 (current choice):** Saves the entire address book. @@ -332,16 +367,53 @@ Step 6. The user executes `clear`, which calls `Model#commitAddressBook()`. Sinc _{more aspects and alternatives to be added}_ - @@ -416,8 +526,9 @@ _{Explain here how the data archiving feature will be implemented}_ +Explain here how the data archiving feature will be implemented * is reasonably comfortable using CLI apps * a project manager or someone with similar needs working within a software company **Value proposition**: CodeContact aims to seamlessly integrate contact, client, and project management, simplifying access to coding-related contacts, facilitating collaboration, and offering command-line efficiency for project managers. +-------------------------------------------------------------------------------------------------------------------- +## **Documentation, logging, testing, configuration, dev-ops** +* [Documentation guide](https://ay2324s1-cs2103t-t09-2.github.io/tp/Documentation.html) +* [Testing guide](https://ay2324s1-cs2103t-t09-2.github.io/tp/Testing.html) +* [Logging guide](https://ay2324s1-cs2103t-t09-2.github.io/tp/Logging.html) +* [Configuration guide](https://ay2324s1-cs2103t-t09-2.github.io/tp/Configuration.html) +* [DevOps guide](https://ay2324s1-cs2103t-t09-2.github.io/tp/DevOps.html) +-------------------------------------------------------------------------------------------------------------------- +## **Appendix: Requirements** + +### Project Scope +**Target user profile**: -### User stories +* has a need to manage a significant number of colleague contacts internally +* prefer desktop apps over other types +* can type fast +* prefers typing to mouse interactions +* is reasonably comfortable using CLI apps +* a project manager or someone with similar needs working within a software company + +**Value proposition**: CodeContact aims to seamlessly integrate contact, client, and project management, simplifying +access to coding-related contacts, facilitating collaboration, and offering command-line efficiency for project +managers. - @@ -440,12 +551,12 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unli +### User stories +Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unlikely) - `*` + +| Priority | As a …​ | I want to …​ | So that I can…​ | +|----------|-----------------|------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------| +| `* * *` | project manager | add a list of Developers and their contact information | access contact details easily and quickly assemble teams for new projects | +| `* * *` | project manager | add a list of Clients and their contact information | access client details easily and know who is related to what project. | +| `* * *` | project manager | add a list of Projects and their details | access project details easily and see who is related to the project | +| `* * *` | project manager | delete information about a Client or Developer and the project details will update accordingly | don't repeat deleting several time | +| `* * *` | project manager | edit the the details of the Developers added in | constantly update the contact book | +| `* * *` | project manager | edit the the details of the Clients added in | constantly update the contact book | +| `* * *` | project manager | edit the the details of the Projects added in | constantly update any changes to the project | +| `* * *` | project manager | find the the Developers according to any details they have | source for information related to developers easily | +| `* * *` | project manager | find the the Clients according to any details they have | source for information related to clients easily | +| `* * *` | project manager | find the the Projects according to any details they have | source for information related to projects easily | +| `* * *` | project manager | list different groups of people according to the different commands | view projects, clients and developers can be as different lists | +| `* * *` | project manager | switch between tabs for Developers, Clients and Projects | intuitively view the different data lists | | `* *` | project manager | | | | `* *` | project manager | | | @@ -354,7 +426,6 @@ _{more aspects and alternatives to be added}_ #### **Use case:** UC1 - Add a single employee - @@ -454,27 +565,28 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unli **Preconditions:** User is logged in as an HR staff **Guarantees:** @@ -381,85 +452,12 @@ _{more aspects and alternatives to be added}_ Use case ends. * 3a. The given details are invalid or in an invalid format. - - @@ -486,24 +598,27 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (not important) - Use case resumes at step 4. - * *a. At any time, User chooses to cancel the action. * *a1. System requests to confirm the cancellation. * *a2. User confirms the cancellation. Use case ends. -#### **Use case:** UC2 - Logging in as a specific user - -**Actor:** Any Employee - -**Preconditions:** -1. The employee has valid login credentials provided by the HR. - -**Guarantees:** -1. User is logged into their account system. -2. They only have the access rights to the user-specific features (e.g. developers can only modify their personal -particulars and no other information). - -**MSS** -1. User accesses the login page of the system. -2. System presents the login page to the user. -3. User enters their own login credentials and submits to the system. - (@@ -513,80 +628,92 @@ particulars and no other information). - Use case ends. - -**Extensions** -* 4a. The login credentials are invalid (no record it is created). - * 4a1. System informs user there is an error and directs user to seek HR for help. - - Use case ends. - -* 4b. The login credentials has an invalid format. - * 4b1. System informs user there is an error and requests for correct input. - * 4b2. User enters requested details again. - - Step 4b1-4b2 are repeated until details entered are valid. - - Use case resumed at step 5. - -#### **Use case:** UC3 - Search for other employee's contacts - -**Actor:** Any Employee - -**Precondition:** -1. User is logged in. -2. System identifies what role the user is (so that no irrelevant information is shown). - -**Guarantees:** -1. User can view the contact information and details of other users based on the -search keyword. -2. User can only view relevant information their roles have access rights to. - -**MSS** -1. User requests to search an employee -2. System requests the keywords for the search. -3. User enters the requested details in the required format. -4. System processes the search request and retrieves a list of employees matching the provided criteria. -5. System displays search results, which include the names of employees who match the search criteria along -with information that user's role has access rights to. - - Use case ends. - -**Extensions** -* 3a. The search has an invalid type or format. - * 3a1. System informs user there is an error and requests for correct input. - * 3a2. User enters requested details again. - - Steps 3a1-3a2 are repeated until details entered are valid. - - Use case resumes at step 4. - -* 4a. There is no matching list of employees. - * 4a1. System informs user that no relevant information is found - - Use case ends. ### Non-Functional Requirements @@ -487,8 +485,11 @@ reviewing each piece of code before it is merged and commits should follow a consistent naming convention. * Coding standards and style guidelines shall be defined and followed consistently by all development team members. -*{More to be added}* - @@ -611,15 +738,16 @@ testers are expected to do more *exploratory* testing. +### Glossary + +-------------------------------------------------------------------------------------------------------------------- +## **Appendix: Manual Testing** +testers are expected to do more *exploratory* testing. 1. Initial launch @@ -528,3 +529,9 @@ and commits should follow a consistent naming convention. 1. _{explain how to simulate a missing/corrupted file, and the expected behavior}_ 2. _{ more test cases …​ }_ +-------------------------------------------------------------------------------------------------------------------- + +## **Appendix: Planned Enhancement** + +-------------------------------------------------------------------------------------------------------------------- +## **Appendix: Effort** \ No newline at end of file diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 105dcb8f3cc..16b1a81da00 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -3,15 +3,9 @@ layout: page title: User Guide --- -Seamlessly integrate contact, client, and project management, simplifying access to coding-related contacts, -facilitating collaboration, and offering command-line efficiency for project managers - -CodeContact is a **desktop app for managing contacts, optimized for use via a Command Line Interface** (CLI) while still -having the benefits of a Graphical User Interface (GUI). If you can type fast, CodeContact can get your contact -management tasks done faster than traditional GUI apps. - ## Table of Contents +* [Introduction](#introduction) * How can this guide help me? * Navigating this guide * [Glossary](#glossary) @@ -55,6 +49,15 @@ management tasks done faster than traditional GUI apps. * [Known Issues](#known-issues) * [Command Summary](#command-summary) +------------------------------------------------------------------------------------- +## Introduction + +Seamlessly integrate contact, client, and project management, simplifying access to coding-related contacts, +facilitating collaboration, and offering command-line efficiency for project managers + +CodeContact is a **desktop app for managing contacts, optimized for use via a Command Line Interface** (CLI) while still +having the benefits of a Graphical User Interface (GUI). If you can type fast, CodeContact can get your contact +management tasks done faster than traditional GUI apps. ------------------------------------------------------------------------------------- ## How can this guide help me? @@ -185,7 +188,9 @@ This is a tutorial for **first-time** CodeContact users. 1. You can **change the password** to unlock CodeContact. * Enter the command `change-password pw/Password123! npw/` in the command box - * ❗Note: You can always lock and unlock CodeContact using the `lock` and `unlock` commands +
:exclamation: **Note:** +You can always lock and unlock CodeContact using the `lock` and `unlock` commands +
1. Let us try **adding a project** to our CodeContact. From 2f49d6121ec31a673db9399b95f6bb75947ff217 Mon Sep 17 00:00:00 2001 From: mingyu Date: Sun, 12 Nov 2023 17:07:47 +0800 Subject: [PATCH 14/36] fix checkstyle --- docs/DeveloperGuide.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index 28da5f084c2..7a65d553db4 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -33,7 +33,7 @@ title: Developer Guide -------------------------------------------------------------------------------------------------------------------- ## **Setting up and getting started** - + * Refer to the guide [Setting up and getting started](https://ay2324s1-cs2103t-t09-2.github.io/tp/SettingUp.html). -------------------------------------------------------------------------------------------------------------------- ## **Design** @@ -60,7 +60,7 @@ Given below is a quick overview of main components and how they interact with ea * [**`Logic`**](#logic-component): The command executor. * [**`Model`**](#model-component): Holds the data of the App in memory. * [**`Storage`**](#storage-component): Reads data from, and writes data to, the hard disk. - + [**`Commons`**](#common-classes) represents a collection of classes used by multiple other components. **How the architecture components interact with each other** @@ -287,8 +287,8 @@ Given below is an example usage scenario and how the find mechanism behaves at e > :information_source: **Note:** The following sequence diagram provides an overview of how the find operation is executed: @@ -295,48 +383,64 @@ The following sequence diagram provides an overview of how the find operation is - - + + ![Interactions Inside the Logic Component for the `find-developer n/alice` Command](images/FindDeveloperSequenceDiagram.png) **Aspect:** Implementation of the predicate map: @@ -534,4 +534,4 @@ testers are expected to do more *exploratory* testing. ## **Appendix: Planned Enhancement** -------------------------------------------------------------------------------------------------------------------- -## **Appendix: Effort** \ No newline at end of file +## **Appendix: Effort** From b0de3e895e38eadec9e1e1e9904b7c34c418b8aa Mon Sep 17 00:00:00 2001 From: mingyu Date: Sun, 12 Nov 2023 17:14:52 +0800 Subject: [PATCH 15/36] Formatting DG --- docs/DeveloperGuide.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index 7a65d553db4..2822609f69b 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -35,6 +35,7 @@ title: Developer Guide ## **Setting up and getting started** * Refer to the guide [Setting up and getting started](https://ay2324s1-cs2103t-t09-2.github.io/tp/SettingUp.html). + -------------------------------------------------------------------------------------------------------------------- ## **Design** @@ -286,7 +287,7 @@ Given below is an example usage scenario and how the find mechanism behaves at e > :information_source: **Note:** The following sequence diagram provides an overview of how the find operation is executed: - @@ -295,48 +383,64 @@ The following sequence diagram provides an overview of how the find operation is +The following sequence diagram provides an overview of how the find operation is ![Interactions Inside the Logic Component for the `find-developer n/alice` Command](images/FindDeveloperSequenceDiagram.png) @@ -374,12 +375,14 @@ Explain here how the data archiving feature will be implemented **Value proposition**: CodeContact aims to seamlessly integrate contact, client, and project management, simplifying access to coding-related contacts, facilitating collaboration, and offering command-line efficiency for project managers. -------------------------------------------------------------------------------------------------------------------- + ## **Documentation, logging, testing, configuration, dev-ops** * [Documentation guide](https://ay2324s1-cs2103t-t09-2.github.io/tp/Documentation.html) * [Testing guide](https://ay2324s1-cs2103t-t09-2.github.io/tp/Testing.html) * [Logging guide](https://ay2324s1-cs2103t-t09-2.github.io/tp/Logging.html) * [Configuration guide](https://ay2324s1-cs2103t-t09-2.github.io/tp/Configuration.html) * [DevOps guide](https://ay2324s1-cs2103t-t09-2.github.io/tp/DevOps.html) + -------------------------------------------------------------------------------------------------------------------- ## **Appendix: Requirements** From 3fa24ddf5e70ca5fbb7b552074c6c5454028dde0 Mon Sep 17 00:00:00 2001 From: mingyu Date: Sun, 12 Nov 2023 22:27:04 +0800 Subject: [PATCH 16/36] list command dg --- docs/DeveloperGuide.md | 33 ++++++++++- docs/UserGuide.md | 3 +- docs/diagrams/ListDeveloperCommand.puml | 56 +++++++++++++++++++ docs/images/ListDeveloperSequenceDiagram.png | Bin 0 -> 31345 bytes 4 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 docs/diagrams/ListDeveloperCommand.puml create mode 100644 docs/images/ListDeveloperSequenceDiagram.png diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index 2822609f69b..aa16fd8f488 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -287,7 +287,7 @@ Given below is an example usage scenario and how the find mechanism behaves at e > :information_source: **Note:** The following sequence diagram provides an overview of how the find operation is executed: -The following sequence diagram provides an overview of how the find operation is +The following sequence diagram provides an overview of how the find operation is executed ![Interactions Inside the Logic Component for the `find-developer n/alice` Command](images/FindDeveloperSequenceDiagram.png) @@ -305,6 +305,37 @@ The following sequence diagram provides an overview of how the find operation is Given the benefits of a more maintainable and scalable codebase, we've decided to go with the first alternative. Future enhancements might include fuzzy search. +### List feature + +#### Implementation +The list command employs a structured approach where specific commands, such as `list-developer` or `list-client` +are associated with corresponding functionalities. This allows users to efficiently retrieve +information about developers, clients or proejects by specifying the relevant prefix, streamlining the process of generating targeted lists based on user input. + +Implemented operations include: +* `` here refers to developer, client or project +* `AddressBookParser`: Interprets the user's input and calls the appropriate `ListCommand#execute()` to print the +relevant lists of data +* `Model#updateFilteredList`: Update the list displayed in the UI to print all the existing developers +,clients or projects. + +Given below is an example usage scenario and how the find mechanism behaves at each step: +**Step 1** The user used the `find` feature to search for something and the UI is only displaying some of the +developers + +**Step 2** To list all the developers, the user executes the command `list-developer`. `AddressBookParser` +recognizes the `list-developer` command and calls the `ListDeveloperCommand`. + +**Step 3** Next, the `ListDeveloperCommand#execute()` method that overides the abstract method `Command#execute()` gets +activated.This `execute()` method calls the `Model#updateFilteredDeveloperList`, passing in the `Predicate` +that has been set to true. + +**Step 4** `Model#updateFilteredDeveloperList` then updates the list in the UI to print all the existing developers. + +The following sequence diagram provides an overview of how the find operation is executed + +![sequence diagram](images/ListDeveloperSequenceDiagram.png) + ### Undo/redo feature #### Implementation diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 16b1a81da00..8fa7a024540 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -58,6 +58,7 @@ facilitating collaboration, and offering command-line efficiency for project man CodeContact is a **desktop app for managing contacts, optimized for use via a Command Line Interface** (CLI) while still having the benefits of a Graphical User Interface (GUI). If you can type fast, CodeContact can get your contact management tasks done faster than traditional GUI apps. + ------------------------------------------------------------------------------------- ## How can this guide help me? @@ -190,8 +191,6 @@ This is a tutorial for **first-time** CodeContact users. * Enter the command `change-password pw/Password123! npw/` in the command box
:exclamation: **Note:** You can always lock and unlock CodeContact using the `lock` and `unlock` commands -
- 1. Let us try **adding a project** to our CodeContact. * Enter the diff --git a/docs/diagrams/ListDeveloperCommand.puml b/docs/diagrams/ListDeveloperCommand.puml new file mode 100644 index 00000000000..aed938a27ac --- /dev/null +++ b/docs/diagrams/ListDeveloperCommand.puml @@ -0,0 +1,56 @@ + + @startuml + !include style.puml + skinparam ArrowFontStyle plain + + box Logic LOGIC_COLOR_T1 + participant ":LogicManager" as LogicManager LOGIC_COLOR + participant ":AddressBookParser" as AddressBookParser LOGIC_COLOR + participant ":ListDeveloperCommand" as ListDeveloperCommand LOGIC_COLOR + participant ":CommandResult" as CommandResult LOGIC_COLOR + end box + + box Model MODEL_COLOR_T1 + participant ":Model" as Model MODEL_COLOR + end box + + [-> LogicManager : execute("list-developer") + activate LogicManager + + LogicManager -> AddressBookParser : parseCommand("list-developer") + activate AddressBookParser + + create ListDeveloperCommand + AddressBookParser -> ListDeveloperCommand + activate ListDeveloperCommand + + ListDeveloperCommand --> AddressBookParser + deactivate ListDeveloperCommand + + AddressBookParser --> LogicManager + deactivate AddressBookParser + + LogicManager -> ListDeveloperCommand : execute() + activate ListDeveloperCommand + + ListDeveloperCommand -> Model : updateFilteredDeveloperList(PREDICATE_SHOW_ALL_DEVELOPERS) + activate Model + + Model --> ListDeveloperCommand + deactivate Model + + create CommandResult + ListDeveloperCommand -> CommandResult + activate CommandResult + + CommandResult --> ListDeveloperCommand + deactivate CommandResult + + ListDeveloperCommand --> LogicManager : result + deactivate ListDeveloperCommand + + [<--LogicManager + deactivate LogicManager + + @enduml + diff --git a/docs/images/ListDeveloperSequenceDiagram.png b/docs/images/ListDeveloperSequenceDiagram.png new file mode 100644 index 0000000000000000000000000000000000000000..3746b790cd2fccda513e1f72d5f5e8bf1e3689dd GIT binary patch literal 31345 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 T0(mN!P!d%|4TS=EQ{Vpwb};m; literal 0 HcmV?d00001 From c635cb5bc82b90af0e6e9c4607bbdb5de9434bfd Mon Sep 17 00:00:00 2001 From: mingyu Date: Sun, 12 Nov 2023 23:06:06 +0800 Subject: [PATCH 17/36] Undo/Redo feature DG --- docs/DeveloperGuide.md | 43 +++++++++++-------- docs/diagrams/ListDeveloperCommand.puml | 6 +-- docs/diagrams/UndoRedoActivityDiagram.puml | 37 ++++++++++++++++ docs/diagrams/UndoSequenceDiagram.puml | 2 +- docs/images/ListDeveloperSequenceDiagram.png | Bin 31345 -> 32250 bytes docs/images/UndoSequenceDiagram.png | Bin 27508 -> 30900 bytes 6 files changed, 66 insertions(+), 22 deletions(-) create mode 100644 docs/diagrams/UndoRedoActivityDiagram.puml diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index aa16fd8f488..5a47f01493f 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -338,9 +338,13 @@ The following sequence diagram provides an overview of how the find operation is ### Undo/redo feature -#### Implementation +#### Implementation - undo -The proposed undo/redo mechanism is facilitated by `VersionedAddressBook`. It extends `AddressBook` with an undo/redo history, stored internally as an `addressBookStateList` and `currentStatePointer`. Additionally, it implements the following operations: +The proposed undo/redo mechanism is facilitated by `VersionedAddressBook`. It extends `AddressBook` with an undo/redo +history, stored internally as an `addressBookStateList` and `currentStatePointer`. Customised to the functions of CodeContact to +have a more helpful message and automatic tab switch, the history for messages and tabs are also stored internally as +`successfulCommandMessages` and `tabIndex`. +Additionally, it implements the following operations: * `VersionedAddressBook#commit()` — Saves the current address book state in its history. * `VersionedAddressBook#undo()` — Restores the previous address book state from its history. @@ -350,60 +354,63 @@ These operations are exposed in the `Model` interface as `Model#commitAddressBoo Given below is an example usage scenario and how the undo/redo mechanism behaves at each step. -Step 1. The user launches the application for the first time. The `VersionedAddressBook` will be initialized with the initial address book state, and the `currentStatePointer` pointing to that single address book state. +**Step 1** The user launches the application for the first time. The `VersionedAddressBook` will be initialized with the initial address book state, and the `currentStatePointer` pointing to that single address book state. ![UndoRedoState0](images/UndoRedoState0.png) -Step 2. The user executes `delete 5` command to delete the 5th developer in the address book. The `delete` command calls `Model#commitAddressBook()`, causing the modified state of the address book after the `delete 5` command executes to be saved in the `addressBookStateList`, and the `currentStatePointer` is shifted to the newly inserted address book state. +**Step 2** The user executes `delete-developer 5` command to delete the 5th developer in the address book. The `delete` +command calls `Model#commitAddressBook()`, causing the modified state of the address book after the `delete-developer 5` +command executes to be saved in the `addressBookStateList`. The successful command message and tab it switched to +also saved into `successfulCommandMessages` and `tabIndex` respectively. The `currentStatePointer` is then shifted to the newly +inserted address book state. ![UndoRedoState1](images/UndoRedoState1.png) -Step 3. The user executes `add n/David …​` to add a new developer. The `add` command also calls `Model#commitAddressBook()`, causing another modified address book state to be saved into the `addressBookStateList`. +**Step 3** The user executes `add-developer n/David …​` to add a new developer. The `add` command also calls +`Model#commitAddressBook()`, causing another modified address book state to be saved into the `addressBookStateList`, +and another successful command message and tab switched saved into `successfulCommandMessages` and `tabIndex`. ![UndoRedoState2](images/UndoRedoState2.png)
:information_source: **Note:** If a command fails its execution, it will not call `Model#commitAddressBook()`, so the address book state will not be saved into the `addressBookStateList`.
-Step 4. The user now decides that adding the developer was a mistake, and decides to undo that action by executing the `undo` command. The `undo` command will call `Model#undoAddressBook()`, which will shift the `currentStatePointer` once to the left, pointing it to the previous address book state, and restores the address book to that state. +**Step 4** The user now decides that adding the developer was a mistake, and decides to undo that action by executing the `undo` command. The `undo` command will call `Model#undoAddressBook()`, which will shift the `currentStatePointer` once to the left, pointing it to the previous address book state, and restores the address book to that state. ![UndoRedoState3](images/UndoRedoState3.png) The following sequence diagram shows how the undo operation works: +![UndoRedoState3](images/UndoSequenceDiagram.png) +#### Implementation - redo The `redo` command does the opposite — it calls `Model#redoAddressBook()`, which shifts the `currentStatePointer` once to the right, pointing to the previously undone state, and restores the address book to that state.
:information_source: **Note:** If the `currentStatePointer` is at index `addressBookStateList.size() - 1`, pointing to the latest address book state, then there are no undone AddressBook states to restore. The `redo` command uses `Model#canRedoAddressBook()` to check if this is the case. If so, it will return an error to the user rather than attempting to perform the redo.
-Step 5. The user then decides to execute the command `list`. Commands that do not modify the address book, such as `list`, will usually not call `Model#commitAddressBook()`, `Model#undoAddressBook()` or `Model#redoAddressBook()`. Thus, the `addressBookStateList` remains unchanged. +**Step 5** The user then decides to execute the command `list`. Commands that do not modify the address book, such as `list`, will usually not call `Model#commitAddressBook()`, `Model#undoAddressBook()` or `Model#redoAddressBook()`. Thus, the `addressBookStateList` remains unchanged. ![UndoRedoState4](images/UndoRedoState4.png) -Step 6. The user executes `clear`, which calls `Model#commitAddressBook()`. Since the `currentStatePointer` is not pointing at the end of the `addressBookStateList`, all address book states after the `currentStatePointer` will be purged. Reason: It no longer makes sense to redo the `add n/David …​` command. This is the behavior that most modern desktop applications follow. -![UndoRedoState5](images/UndoRedoState5.png) -The following activity diagram summarizes what happens when a user executes a ne **Aspect: How undo & redo executes:** * **Alternative 1 (current choice):** Saves the entire address book. * Pros: Easy to implement. * Cons: May have performance issues in terms of memory usage. -* **Alternative 2:** Individual command knows how to undo/redo by - itself. +* **Alternative 2 (part of current choice):** Individual command knows how to undo/redo by itself. * Pros: Will use less memory (e.g. for `delete`, just save the developer being deleted). * Cons: We must ensure that the implementation of each individual command are correct. + * Due to a special parameter `role` having its own add and delete functions which are separated from the + model and not stored in address book, it uses alternative 2 whereby `undo` an `add-developer-role` will just + execute the `delete-developer-role function`. The process of this implementation had to be very careful just like + what the cons mentioned, a slight validation error can change the whole `undo` and `redo` feature. -_{more aspects and alternatives to be added}_ - -Explain here how the data archiving feature will be implemented -* is reasonably comfortable using CLI apps -* a project manager or someone with similar needs working within a software company + * _{more aspects and alternatives to be added}_ -**Value proposition**: CodeContact aims to seamlessly integrate contact, client, and project management, simplifying access to coding-related contacts, facilitating collaboration, and offering command-line efficiency for project managers. -------------------------------------------------------------------------------------------------------------------- diff --git a/docs/diagrams/ListDeveloperCommand.puml b/docs/diagrams/ListDeveloperCommand.puml index aed938a27ac..3c32aec9cd1 100644 --- a/docs/diagrams/ListDeveloperCommand.puml +++ b/docs/diagrams/ListDeveloperCommand.puml @@ -6,7 +6,7 @@ box Logic LOGIC_COLOR_T1 participant ":LogicManager" as LogicManager LOGIC_COLOR participant ":AddressBookParser" as AddressBookParser LOGIC_COLOR - participant ":ListDeveloperCommand" as ListDeveloperCommand LOGIC_COLOR + participant "d :ListDeveloperCommand" as ListDeveloperCommand LOGIC_COLOR participant ":CommandResult" as CommandResult LOGIC_COLOR end box @@ -24,10 +24,10 @@ AddressBookParser -> ListDeveloperCommand activate ListDeveloperCommand - ListDeveloperCommand --> AddressBookParser + ListDeveloperCommand --> AddressBookParser : d deactivate ListDeveloperCommand - AddressBookParser --> LogicManager + AddressBookParser --> LogicManager : d deactivate AddressBookParser LogicManager -> ListDeveloperCommand : execute() diff --git a/docs/diagrams/UndoRedoActivityDiagram.puml b/docs/diagrams/UndoRedoActivityDiagram.puml new file mode 100644 index 00000000000..3ec83d497b3 --- /dev/null +++ b/docs/diagrams/UndoRedoActivityDiagram.puml @@ -0,0 +1,37 @@ +@startuml +'https://plantuml.com/activity-diagram-beta + +start +:undo +:new page; +if (Page.onSecurityCheck) then (true) + :Page.onInit(); + if (isForward?) then (no) + :Process controls; + if (continue processing?) then (no) + stop + endif + + if (isPost?) then (yes) + :Page.onPost(); + else (no) + :Page.onGet(); + endif + :Page.onRender(); + endif +else (false) +endif + +if (do redirect?) then (yes) + :redirect process; +else + if (do forward?) then (yes) + :Forward request; + else (no) + :Render page template; + endif +endif + +stop + +@enduml diff --git a/docs/diagrams/UndoSequenceDiagram.puml b/docs/diagrams/UndoSequenceDiagram.puml index 87ff3e9237e..2f8a4cd0d56 100644 --- a/docs/diagrams/UndoSequenceDiagram.puml +++ b/docs/diagrams/UndoSequenceDiagram.puml @@ -37,7 +37,7 @@ activate Model Model -> VersionedAddressBook : undo() activate VersionedAddressBook -VersionedAddressBook -> VersionedAddressBook :resetData(ReadOnlyAddressBook) +VersionedAddressBook -> VersionedAddressBook :changeAddressBook(model) VersionedAddressBook --> Model : deactivate VersionedAddressBook diff --git a/docs/images/ListDeveloperSequenceDiagram.png b/docs/images/ListDeveloperSequenceDiagram.png index 3746b790cd2fccda513e1f72d5f5e8bf1e3689dd..2fea1533c486f635befa5454e092c86cee4ae19c 100644 GIT binary patch literal 32250 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 T0(mN!P!d%|4TS=EQ{Vpwb};m; diff --git a/docs/images/UndoSequenceDiagram.png b/docs/images/UndoSequenceDiagram.png index c7a7e637266b619cb915f925ccec102552979f38..4e23d7f95d6fe90b63db4e8df4227030f13a89bc 100644 GIT binary patch literal 30900 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 Jb1&Tr_&?ud97g~E literal 27508 zcmdqJc|4Wf7e0I>gb*qrB%u<@n9Ni%D-~sm%=0{R5|M-ua?EowW}YQ;=6RkuGSA~V z&UyDC&!e8_`TlP50!J@``&x)y{>hwYpwfuE67O@5l|68AP^$S2X`MqAlPvb z2v+y06W}-6m)l=~zph)~Q?`C-X6|6DqiYS3&@t7q)U?*ozNF=FN#EMq-0BWHyScHZ zskM!XG22Ts6Wf*_bYK`$gU8C&N56+)fpP337N5$R4cL$ z@%o!TE_ij_U?>lo%HI&J_b{ZYQZU-wmyzUbF8grz@dGi_?i2S7*~BjRwhALgk*oU7 zyC!h5E0m<~JfyIfOHYs~NY1EMV8dRUWTjA-(!Ycy&whPGLjI-mT#@E*#s>$bz-t;c zw}R6ysUWC)Cuvi!NfVr%Bt1D9)Y+aNNbn%G4`OyHvqQLy~4(aPdCnzQcXkG- zYHyb_`}tF+CKsDRUNz(D@RTKfXddaCO&c6UL{15(3t^ppr^^x|%YMn@et>RuN_)SVA%GUY+EoqU=-m7+F>6BJbMw-SsZ%#>Qzwf{YXd`^l^6 zvRhr|&B4!@oJ;mJxN42!aeU{Bh{WB0CMT6ErhOmDEls#R4b@Zid_sraL|1a>eYL7s zJtMrBAYcD!*(Zfsj|lgdFV&UWs~yt{HcHQ?Xc0yDhIBDcroa0%P2_Q-W!>imoOUa6 zt3Ej22$8(~F=e@E*YEzd0s&^E--MFTB%vbL^;)4P&ClZl*RWYTi>G2^Eom*pR+h{Q z6@N_SB=%Jcl-Go-nTo|$y{*vNutQ>_$BcKrgpKysOfT;@I*k5sb?8z07{WKo$B!JN zMH+syBbL8dM}tfrS2rjn+A63-@${ivD}}sQQ0h1g_BROe?DWP?+uErnBi?Wp)?YTq zyVX_Rcs(YsljO~Tv$L;`R=yD7O||}d{#BZ~V}j@P=rgoC-u!)ZA4rAZ zlsz8NxmScx%QqcoHKV4Omzcix6_c&yKp=WPl6OTP+p8}`;yItahp1a8h;@%SX&L$f zH}<3$$;ne#gqIi}kOojFJUn}u=G@IwpRc}ti=%;aO-uali11IJOP4M&a$#M2_vmae z6RY*96eP3Eh2HRzK^niN#RXJU>vmAn_C)`9XojK((efb;r z!M`xS_)OQPdh`JfHp~Ze1^9o~3lS^QUw528t&fr0$MKqJ?pTvSAg^A-H+wbg zT+rvdd-q5px~}6x6wZ9uoGzX^gL4MeKGYn}3Bcs+)p8@#+AInz2o4sPlAMSY7UUZY z{JhE9rpkxajI;GR%EMXxqY5_(1P6~xiLbA+)p=ER?E_MWvOI_R{RVFb-r1}FdFh@x zmcs*7_UX}n^80(#v)BY@^)n(~!B04e%8Ln+yxM#Pzb=7_t+3`pl=x0*Zoy;|WUZX_ z0V7<%5yam`hOma!`AuuFqoTEQ(i=;o z#F=p$`DS6-h|{y;V>BHnpWdihk%3;0&~62EgKpEXWt-odWhScRL)rD<)4ka-=SwZGI|py~OFjoe%hbVDP@ z8=eDqxu@6j&!^9Is|Jpi3kHc$&Cc$AfdvGFj^?wjd(o|(4FMC7)En@MJ`WK-(fowi zaVkgG^*%}$J=#&a^}ci~k6H>AZp)J?sA~!TR5}5Vx*ZuUY)8)?&EYMu>5tNDna+!b zvcBv}b=a4WZvV%Vg?L*ZXPWc}ZWEpCsBdUko($A`nYS1*-|HZW=lUFiJOxh4&w%7F zFsC(Zb;K@Ie?D)a6m9o$d)Pg>PNP*9K9i%5VmvX5UaoK0ts}Ich9qD$2a~s{zF_|; zSwEwe0aq`2omwQ~5L5I+)Ze+*H#L7Mlc!vYcKK7uDN!PX|YJ7QVjZ3k!2VJDsV> zg*0Iwn1%XG<>zG(c!W*)L=Y(nZtAR0s?8ohagcevF4j!NAJg@t;pA9 zwx#y+-Zw>*Rp^!rbpQQu$bEV}cG73Si}>8&Ctf^1be31V+1YEZs>bs@O&YEZ2(j<| zIXhw}6ma#~AW1kd7Uq~Di2cjuku>R0ODoGYS0}gIOC-W$g!m$q;FC}154{ueiu>4* z5J=BS7~v}ew*%usAj;&&27|niJ-YE`9y~+Up;)CLbg77WdZ|PLOEhYJz-9rl46UQ< zR>Aoae+tKy3DS94(JIsyxjpuC06Si*OH03dfSgPvn(D*%<@R*3b_VRbq=KPfG2gpj zgBinpdz+!W`X2~P{k&*l+?wC@kZxs+F?R?a#^{~6$=bnXXIf&~8e-c-Tqu4|_pF_a zaev5YipuK_3Ea1rt=UAarae-)3v`=fk$5~e<+LW?ZrB>*Bnzxq-4EZM5F~$P5Rg>V zT3fqHw@V3-<*njZ}B2B)enguRX13&4uIAdFeo37C<^ zdpeVc3N(3F3puecCKr95>V5V9zk_`2Rpp?MF2yfx%`qEI{Q7dcm9$ew%D|N?P9*@?tzk`ZeD~}gsW>@?cY?FSkH z!#kXIqFvMbH?sq3TNw|WgX(qZk5*xg()o<$8$q86XTP~MTB;9IV7B!AW3OymlYzK< zbqyM*Yo5srv)7jSjp2obk015>3*8Yzz4TnxJy}4VA{&@99jxT4_I2Xys4UgNq0-WA zW?YXR$Y1ZYe0XEsB5Z}TWLuT<1=(|J#Jue%);OlP3w#_UOy$9Q)e50g#S(Z6VRzh@ zjjyZvEk>gex}#10XyhDqd2%v+vBRh)C)8YJSAO|(sZ+s z{tA?1k==6SLcc*LD&qDkFHeIsJIyEV`7_krV2k1`nB}y!b>XxE_Bwr8(fuM5yb}KE z%?(8%!NG`)&ItI10>!>l_Vl9h?Rl zvBCV&py4YL!3(4YIRgD}(5P+pZ2qbKTQ9f1K8#vJMimQQY86-~c* z=Nh(E8C)T!Dr9Lan~56WgW798+Dqx2x^~$wff^kbbu)u0&Yq9MxC+i^n6S8KuvM{y zMD#<4!}4ElBi|Np#3t|W6+0kU>f}**Ou+)G{Y7?iy1KS|-9h060i})7_IExdh|dL8 zv7u0UrgFrT<=Kkt`9!7~U5%A!f!y9HCI3O%H^d!p~%)82)lN8a1|a|<*Ba66q%LpB0gTj3+EnuU_YNeTCq2G zvbkbs!tI`q->B2_`8X=XmYP=8vzN8+#V2bQnICbuBC)iJ7oK%MTcdo8Q6_^eHuGE9 z)Oo;rFIVE@hm(=>mLZntsy+HdI)dJt^xfR-*IQ4kae~T+^XfLC@X1{nuiFB5eL&Zt zyUza1GO(#LV|bJ{vj(7K%>x@MRXYx?mkFztcwXL>ImoGo3fX8BbH8P%;O0lWenoja zkBgdGUKSSA_uubKx5ZksOY(4DlWhzMZ}2JK-&*FHoSjPQA6(~6=kKXiX@GiZ0}wzK-R5P_zku9h<4t7miP+$37*ZrAU% zc_zC{-uY048vSB%H%-aL;gih7{yjk&WPh*DNBye?3lS@Dl1ZlQ(q#ImH8#Ywf%MQ) z=HS#Q^=>A=@HJ{l^$mnxUHkjws)=i@NzVs38anfACuhh2b60+91w|}!Ag*htK2`Cf zDUliko-vL>6tvq`xH?ET>dCm$83!2b27!^p(j}Dih1%>@V6UbPpgv=*8x zS&KL$?-07bmdj|m-D?sU)dZC=WqUY->=(FrUf!WNK!exFX>4-W7*Fk{>jA~k;pSyv z@Y+YKc3dJc;1?A1dW&Pi%w!7u$bCaQ>3d8o=B!4$I)3CDahUNp=v-ryG1MrNk5=Q< zqkaB$qAP%5cEDhA5*;O5P?6kRVopC_yV^*Y&!5n|SMtkIJc$qvh^_SndIJ&~7+Uye zLllo`1XO#e*eGY~RAF<;LP|2Wn3)~F`PkZfN-t%aVW$434a21b$qG`RL`r#P|73x% zxc~{SoTWN!H8i<)ccA_b>Xw=_+yzbg^U~SJsb`v^I zw`u%-rA$M#hJ)?ilYy3EXC1j0_Xbe8s%Ph;Ew&z@_{Uyv_p{l!l<=UbMgQFUb*GXDZDS1iPIrKzm9xU z@g)9%Ifw)%Mw>t517o4v73KlxvJ;CQ>X=Y-L6}3DjQ?Up#apiW(L}q^*0tJgBTeJ) zYxyL!^25l^@J`h|5K`EJe$vXwI5CNz3X6I>Lk z0`PyY;EuNYY_r}C@d0Le-8OcA)JEsMM-;H-PCbf2(qGoSAn3F-MdHUZyLQ9j;TFxa zgOeOShha~}8wt{Zb&8vUMD3>e$u!$sArH+lSP$=2{q8NR0*wIpNpmYixXdMV3wlvc zqq!o^*0OP{_4?EJ#TwaxER@5x@tf`>6V^0$3Je1mlYm!yvZ9Tw+4(LFB>Z%Bc~-&b zB(?pbSSHTt<}j^uN6?6KZ87PsGUpBUz3Jx#;-yn+JPn;8H*>-1#LTa~vCgkE{}7r7 z+RSz`qg`VoLo^SQiAF;BDNyU5f3>(fjBou6zryKk3Qpar{WDno`zea(OWl%E15&6-x5c-~rHxUJcP;^( zzVACQ__^IPIU0rV6fTfl^w19M&mqZSNjjiUJWo`IJT;(Y$el@tig#m)Tv1<^IjR?R zodzt}*(I(WWG;+ccI$0tJ5a9GglrC4WCMe*)?9tY99>P8Q7RJU4+7U2=ExY3B~Wy7 zf#7yWUE+08(f$w))XyJzY~+rWAT7FVt^HJR*BW z*)01XIVnO{&sxLlqATR|>vVMwVc~%F?%uVF+;`+EL=DQ*xmZtqf0MR8lM})&T*DSX zrrUhyZlHvJl0O~v)jrhl&O4FQy4_zo0l#$GR-bEs>D8FCJ-qEAC&zZ{W~ejZtll3J zl4s5s(SP}|mZq5n#U=@tu+?jcsG4cfQ7exqvo(PQpgH9*gmzV(=CZSCrcVJtfT>wt zS?_B}i8_IiFs@nNMZaIrz4kM{q@KRHr6o~Vag0$?KG>+&Oo-o#Dd;xaHNo(q#fHgi znZx;_?pq&vFZ2KW*WJi5SmO3I&)O2ulQFgBL9E^gL67CHm1u;+EVhQaIrT_f%U68r zD>PnzstcZE&Ww^9IUn@}Po{W4T7 z@cx#Oh4XxFq%d4tr(J{Ee0Fm7&@J?=@Py@eT=%9YJ2VFzPDKyViY5fPiuRb40dk6Q z4h%VMC{+x*Z)&>Npjd6;U7Fo6Obf#3Vm@m{Cba`A>OR*Yf4Q1cR6wxUyv8&YVjKln zhm@!i-q3S`B^gLkjWNvV`5#HLadHtr4FNQ=oJp1^-?+$OX(*l!>g=&RDPg(`rxYHD zJA2ngr1B6F+Em>!Z0)fyhsfE(r}fEMAvO^ffYd5w!Xx;CcKh`thDUOj{%>zy^gJ#J zoM`5LYr#!=Zxg5&w+=YLNv__B3t$p4cMSh)3L;jle*d2b`Sjc>Rf+C9^f~q|>rv?%%I+&aIFw8DNp zx8dp3=QcOb#NGFeZH5UV;NdL0@s6n?HXlX4he2d~xSAQA2NJsDr&%^{oJ%O8_4Bo?(`~9_>vKi-_qlne? zNiGTqBn=<@>^z(m1d_$nrV5ccoX779`X>HRhPI%B;tR?f@kNEvl6?Q1Sk`;^L~qJR zY{t$*iB3o}(FN-)#svCoD-=gl*u-a9B#enk`o+3CA~+)M=Lx5#J#WYfnX?jC>S1B_s9*FIugBh69^TP*?j%Y znrDc}&Ybzie9f1-;BwHq0|cUQ_DK4ZNhs2344DaHdz`6`p7bwRb8xqBSLI+0i)h7$ zyox(2AZT80-kgZ}7{=LKQ_C~HUb~7S%QNDQI?4rP;-l3MFnU+B+?%c;MXH99H(gSZQ0(1$qVgHQD`_@Y|cFiyprV9 z><%}i_E;LmYmP)zc@il-dX%)iz!$-kH>$kCC0<}E@3KAI?@eBDDM>nrhJS0eclk}8 zQEL$H{O&jGhAOWLQAa;o!FZ!y6xVLMgv#BD0tn;bsr~!li)mO@RaJQx1=cnMF~`Tn zDZ7q+bCZQ}QSumn+K!S-USFGTOl#$S38TJv@%}|StC76EczXH(u4l#8{ZCTm)+6&c zo!6U5L$!C;{AzsAmwew4Zs#Oak;<`8WT;0zjTJj33)J2(*0Ywz&lyC#)9`>#9&;sN zn7DgBxI=F*-+PyZMD08D>>!paoR%psT=*0o-nggAnN;NF29-Z|LD_?e@Z5Eo;oiiY zK}zND_foQDGF0=u8d{PZ=vv>|1W{D>e7Uw|M_BWVlUD;aMSgeWJs33^SzuV$EUe6x zo0pzm^JiP^jmdnyM5*A8&dxl_bU2%eZBu#zE)HKxxZyRGeB|0Rw8(mk3)?6tr5w4& z+p#m3>VD%HSWg+O#ISpof9Z35(sdP{x8QOA>bStLh|T!|tC^NmrA)bKp)$!JCa#9^ zaFt}a$TFvG$63A?-(Dq3hXzi~L_=w*shz;dJkNIVw#CG2Zle~PCFDs(`9L74oiPbQ zGDjP$RG=p61D0!RYdf`lsfdJjUSQ8RwT?ZtDzRNeuT(MAKL$kiWrJMgUiLCP-)uCT zsbT8YEu#L@5J(Ic04YcssLILxG%|hud|-cjRO8Fzl)cUQ<^CKmrhazT8ye-MY9+Sn zj!}Y6`M`OuJj+xsqv5wzEy*a_IR6!RneT;Fx}>P>k->E3uVlGpS~aWH)d>?d(oa&K znvImIarMX7eV`Xtk2fjcEbJZ%W|6O{E5IkPEMNPfH(>NlHawqIy;R%T*{CB)lEWcW zT|S2r0ueDdstJH&phC;LKU_!2*;8Fzz3MRftaxK(XO)gLF-nj>75`nRiXu#%vkq-C!pgUr;vJ?92T4h5PReOhq|O2Hv%`NmW)>j*kZf zUw<>NKE%CV{wf^%AKv{6Ui@7q)T5JA#2wpJ+f5)u#7&HNF@aQH8 zxF`1@&?$k^GDPIu(SE*yzr$+I6DY(X`bS_n_&_Q;8ln%v%WvUK3osr3ju~bMs8Jo+ z?Iaf%Ib-_a9`d9J;qeIk_b{LY^>?_w6;l*~R}h2s$9}e{f)5~&Cm@0zMKl)NKbBSl z;y&ath>pKXSQ!`Ky+ga}P{W=yHE*&+8ow32=*S;-H?gs>u+ju=<~nwEdYtLp^^+}Q zEhe98TY?IkEEwWfg^k6tf!nSjQ2g9=kN4EPGbPI{P2mNpQo(%z45QN}yEN(HPk%*3 zm(vsXtQvB`0LwH(uW>Pqg<_lY8s1TeuDMwRw_O(c3`K|bRXxk;sjKFi0t3L4IQ24o zd`-UF-SneqX6(us{&?}E&@xV9t2`uE`M%Za{Ntn33|8;lr8=Q~?b>qa)rZBV!yabk zd}2X4ddUDzDA?7rogM1>zS3nyiF?XqJkKLGkdG*gF(3a1Fu6OeUw?0-JGbh~lVp|r zg~wmI7FnNLtCrpIWvcofC%mg2zIBe*u$i z=dr1s`OmiA2I(vV-}sj1pql-Tc;B z2Ue3-KN`fw{Py>OyctRNqLeLa!YHoZF);a+c>nyju4baMz)?Yq#NRxV#d8^k7)7J9 zclQ$O_?N90BVdltQtcKj&EoHGGhNAr&P1B^r190=!Nc<+ts9Q8Gg#Mu@ZgH!TZU&w4RLs83#Ld5#IK*-G?^0X+TJLwNh##tkN)VRmw&2Ku4)`y0fwZ0p(V)Tfc~ znNshRp`}Z^?C$`MfBi3Ws#Tym;PXB88M15|D5VNl_FUushS~RRb2Nx@EYg0*O&A{T z`D^N>Q(knYNe$n=#bNQj7PuD_5Wp>jcII{Biz{WX5D48IExZ-URj;vF^L*?2LSmlD zFmV)5)bg{>3Yu}>6GZ)9@kr_ncU~=!EKn>O7UkfZZPLAY!c-LdfG;7!{^qt?J0S9K zT=`n{?wq(mwp^sHpc654fAgNz3~KD@^40kswFi=6Eg4vNAYjiKIQ)#Q98hUvlG!P> zT};YV!-VO+qQfx#Ajp*Q(V%U3SH2BzR9*uvP_@kxR=bt(o@ImcIi*mzp_;$YCo3~; zi`Vd2rxEunB_!+IUlCKps%Ayaiq8I$!{%IWr8~3DJkKj8>EPo1DiU6xqc0o`sqY$Bd9rM%bHNsdcD?0=`tx1)Yk;@=`uZj}-18y+$fBf)+>x(9EG@jJG@N7Eip3m)L?j$^IJpJ6+ z?nXTk3?;VY2i7a%gBqQH;2)7_tY(Z`&~QxUfw;`b#PoGJp?q%+xw7&_RJ4U&oT;R{ z1i*)cL@(Rp&o|GB!c@Ob+z#`Qd6NFT%wgU3YfH7MQMaLLnley4f4r=1(%QvPUXy`* z`_;hJ)pW^l=(z%u0!b4UyUAxx(?1kfS4|$s$1U6dk^hXPh<^Bp_S0hPB2osF6`0+^ z7|0On{LuilD4aGOVaBqrw8P>?WcsgM1)2G`)Q0Y&CPHOFOHA`g$jS+mi6z{RJ z&ix&704|SM#>E@8hUIv-B8bC!#!uPZ5s#45tMbH;mylN}TDvmZjPtL^iMeyc(a1t| zNDxqk`dqWJ&CNoK92#PYyLYDx3#;qvuMd|nJ5>~>9v}=zfm|b{{z|-9JpDncbb@<$ zY`#54GzZ2#?@;vX%HOa^T*-=5>h9gUXLnVKEV~UlpB4($;XtV%F(-fX`}hCP62)_WB#MWZrYygwT$d~`Z53Ym zc3Z(*V57|k=6M4c!2ZTo;x%Bn8%a%5X3N{y=(3wSQW_b9+L|J=4N!fK014EJqQFSo(^UrUj1 ziYjBfejRqe{ggOrN5xppM<%Mqbw@=oAoC20(x10zh>~X{=B6frhlJ)FyHR8ZbU0o8Oy4M_THc)}? z0EMYM(|woDBx+DXykl{hfl-HUwDYljKl{NdkA>C4trnV)w94F9?CKLY8A?=9q1oMA}VZ3u#f z3+=ahc*strxFFcRqW-NAkKP)brWLd;EF}o*L|o-q>_}u*$sdwYgTo&1x^u{M*mZ2(X-l%)&F3?WDpJt zChMhkZDM;<@R2Fk)e8qMb;N^z?aL!`7&TpmTPwMV$1#%~3Wl?-z2l)Kku)fkd9B4MC0 zY%*x_Xi!eNQCmaoXU`&D0d^jV;Qu^2_8miMX+wHZyNQ}r0(Fef9hxHxWIwIUgGw8% z{R^icCTgdRKG6a8(yVBq>5gc@i=4XXt`sPjQU0xK2J=h96v`-27V937$%mpDVP^f7 z>(NkkdU;ZB8JVFC}z2(sl&#bY@N z2H$|=3K+2MQ@TY&7*%t4k)U^Bc&*_AyS!Q+pgxi?2n_qeA=Grht6Bnd@_47q!8WKH z>uM5RH`)UTDYAhxJugR|Efap<5nJ^%kk5)~{YUTuD3=O@u8oCj^6|OsGY1T5d$9yj zFv^w;>MC`Nri->Qjp7A}nwS59C16TdFCF0QF){QI!}dT6DhABn=1P&*!p*+@}`NpZb04d8-H_p$Z}$`VyQ#N-f)hwoWS&t%=rKdB3CD81d%H{ zUUaSvO&*>-v_eQ7`44)#^h__2IjtyW?oAFTQV=wJqfQ*j(1+pNkla{V|F=j`IV9&+WH;%yhaHgiR{nLYE)a_}{SZ-%n{yYz(i@WpZcC+&Io;46pA3|Jpns8(k%@5tHBBi) z^_-HGTf;v@pr6-Cg-?FEILRH!sV6?u;!j%V`}QpXQToZwCoqt{tV#O(e)ujZU5+7$ zMG!;h{E9H)L0i|D`H{e~Q}mYr$pU-^bDKW1lj?%pi#W%uI>TE+$5 z^t<13ca#;8Ec)-_HmCzc|ER=(gh1+~%qc@ddCU{u{v(j)F&E;<@&Xop_TmxyKB(yY ze<9Y_vaW+OgS-=Lc_<`e1hE5zTEsUM?IhA?D>OJN6tNuo`_|omuIzxa4Ui{}zC8{2 z|36&!ul4+d9dL)3VXiwmwrplz`o{! zL%KRC{JePMCi-JT*zHw9tzw|gQ{S2p25%f-9c}n;1}ZdQgdH4G7m%I;-s}fGzY`Fi zaZP~=W9Z+U_aWnR00uz!s;=&`xP4Jmlhj<5{PJ_f7es%U(bM8!OfO>f8)ko=-iA=&-qRv|2v z;NL~tpN4Gnd_XGq@Zcf#3cB)AYwnx%6O8P20qC%^Kx7@_I;u>bt15&)%B8TYs$$SA zhD%_ssUv>l`CIyRmpk+p7%ks~u6h{`qXTN@i;Mhcsea263JsbQKO-_@`tkUY6~C;Qg_Hre5ndj%4!ZE>4Ghf@E&x8Z2flDaDga))y4J1WM3=@ zamS*@|NNkD9IfNt+@^}HN&81giz#}gHKk!3b;riQ*?GR!S0w-!ePf0FUsf&x%31=^ z*0GM8dvws!U=b>0&bNxb@od54q@?K8K`l40DWZstCm-LWH)GhkCvDT24g%iE`s?Ko zU?bUQ-ujrpa-m$}x-nLIbatSs}YX4zUmpItHKm z84dWv#0>A3B_942V!c(7!eYoGCLiTrMAIN5~h?dCcov9!bP$s>|w>I3@XAjdJ zZT9uc5QL)S)g6UaL@bl#`~#*M*;~_9i_XjbU4IOqZ!(p%1oaE`q%RNSEAi-zV@x{U zdK)|#{C4FaApFMkuwh1)PeDQa)2GL!_9=$lbIsueKA5^<>Hbz=lI)=4>@KJY%=gM) zY54MFKAXCpNe=n?fyr#gH0akR=^S!eUVNISjL)vP`SX@`{fA!ta4tt68s=A~>&$jk zP1ZpHI!mIiEgyxVA27CED*QW-iUbgr=-!rC;l3Pp7C0^3cc1K7O40vqnw&xXgy}n>R4F zXPyA|o5M$ylI0>+eM&<9Drf>+D#pC9*+kx*S{GRH@L_vrQo6Z|AE9ems^6c?`BYD* zs_Q8QLV%3n;>-6^pQbZ$_O7hF#iLuOu$~=n&Q~q{2Vnq2b$|%mz%NcyU^%USy^x5C z%Vo3MVSt!Nwe&X-!Vtnm&yJa76M8>tTH0~*+qt1;YFXnGzl&rTuFU&UNO%$7Vh9Lw z+$N6xjX*>+F0}s#LmnXFM@D=JzKH^OZNB>aPiF*EJMn@D+z4c*zqUrRN?r=!G!X^+ zF-!o@#DB$oIF;l46)Ow(U=>GgH8q%QVfY)X{?i&ypWZ(ayKg0^!xV$R?0pBb`Mpeb zv@W;*SPHP=7!Ea?`fsNn!{KekK{T_k^z@_K%SVUXI) zxkmV&1;6)T0%07CI>wtr=f`6b!qHB>o9NXA8jcWovJhK`!YB5@PE{;H0O}#Ozi8Rc zbPyS2jNkQH>3wZ3`dF7bKNlG9^0%YGcw>ul1A>BrLPC17P4@>xE0J|Mb^->b`|nzo zofydT$99ytk6{4P*D$+t(IPRx z1POzn_o0$QOp-6F-`a(+@=Fc;qcYj88ke(Nwykb!yY(7}5Oi#af%gnJ#-dj;EZs;tzkw&0yn+ZLoEBa`GV0L>thl9HpYh{fr~(0)|0EG}~0 z&@|bjn#vBh-G6F@LuYn#pcDI%m{jm;;FX{z{o#}p&V{)wiaut?{N-s#6FbEadm zxDY_Hbqwb#9h;ocd0u4Pe=A*Ujpp_12o2X=Y6IuZZqbl51$qzlX0^Pz4H~=0SBN^i zHZaU3TywaX5b%!rtMWmGvW5k2)-kj)?IW*4qN0SX;4-1^V}aJ~Ltp&`&Z}l~?LQ#C z_QX@YP>}mlqL}w1^+4@FY4KWDbB$1F@8>F^_C^YJiyIDCOz0McIX>G<0y~cV)z*S( z1UPO+70}#P?M(>E&AmnI@_uy_y{)jF?eJ&hx0!1!4<9UdF$;89_}Y$*S3b9P zy`f=}4vKX6HC5w5(453TbKlRImxm|H&{RgI3AwwTlb!w3M9&)2bq#Zx>q;q^=e_v2 z0)PL(67}E*7oq|?88!BXSM#IIvUGc5Wdy`qExYa458 z6Ro8U0;kIx%=)u~>9G~B$-raKob_FM9vj=cs{?a13Q5s>y%n!tzlQZ@SlPC%Z!qlY zqXV|@-48u|qvLuhfq|3cqh`h%vui7YBJmc{=Ia6oKJnG^Ct{xAc_#O}jjnA9;;6X`TcbN=2ZXSC4N6|RcEg!F;h6Zm?CcYnp%%oHxA#(}8)IF>hjKt{=8=o(*mo{Yt| zbmAx^97IM8@O>Sh;7*6@4&59+lgzo}_}KDJnd;C#RW=MeaHFuMVE=ylA!BaGJFmTB z-J-EXtWN~Um`{hjvY_6z927`*qD$;o?Cfn)vZ_FA2aVIycRfq>c+-8#|E+%pPr90t zBezn4GScJQV-YKx!*V$#Q&sj)wx2y7ZQtaKi7X~bM+-xEe}ss zx#24J;(AOGrUMHjoDB17{Gv_=QQXRq&0Cz81(4hyB3sViE905-i9kEU;5KKm=E68v>O!Q84K< zkggMly2;P--8FFtME4t@C7@IN;;`1LI7ET)a4U`va4gR{b`M|{e|0APT6`f+^A|v4 z#DH80_|AW<62nz?L~s4RsyCp|YUT9-!P)^c__ZP8+s&cJ_Tzxda4G$^M8jAN!o8@f zA;joNu++m==9)H_^=U6i-Y?d5a3e@>4%?Kq{?{TPuP6^F-E~nB5lD1bc5Y);`uEf! zYV|O#9X&VDApG~nLB5?nSZuI}lGVJDwd*KL7$%1mdHC!2AM6+81?~Y0l^RpC>J{oL z@XjGK;kEHhclwE6PND$RcFegyG`67|22U_HP~v#5sbkV%zde%hIos~!$WwjMI$AD= zTy%X%@a4v{*Y1>c@2AaZG{g_wd&1aoNEqT8ur?=>bB(13GYbm+1+>{Ub%A^Qmmygw z6h@iWYVcL7;IbbUdKb(XXeIYx0Qx1wyQ%G$G8XLnua5t89dv%Kf^ovd0> zU!2Xbgs=YUTR$?g0w!)B7)`1+2u?f8`<;*7H=KIi$lFTKf^7ur-U(yB2Socd2EYEx~n?@$$bwv#`|Mnox1MSxT@f_%!NT@>ypf!~o1-pyM!@7PISHV-+CiCoRU zA{W=Qa(nNW4GjIcqBYXl{Y|I;JZZ^U{Z2`$=CCoc%QK@E)by(o9}N~k2>$tLm-?7hd20iSwkA= zfLR{utSo^?InNdKkUoh>{Ly4GD(ghFQ(pfw(CyyyH%jy-u#2h{4MyH3ASw0aHLleS z`ZkVY5L(!2^QP7y#w|E={74-FfPMzfP6lGqqH8zV>HKbH_w{s;p7(ISM;7{KLR-=&F#L z*ax|fQC6YVa!FO(DGj^XW?>dQtzv+o#9r~X+K;s#TxDC@BR+WZ;phbY?WU&mUDocI z64uK0GWH&!J|%x5+F$N&q}hD$6aB?r^wX5b1~uX?=-v0>W2weghrV||Yvcedk672Q3 zO6R3KC8!DBN14O#19}%*61Yn*!g>%}4%~b!MC2mxGAd{6#X%Db$6r_=1^*3>oV{+F z=4Gv93}ISbe!mLR^y&}?->yP&h#1L_Kr2Jr_0$pMxN-f*O%JgDFK;*ojR|gn-bY7L zi35a~BddXI_s{VT^88;Z=LcLVCW2r4sMc^i__e8CBKmI|iBMe)JN)XUbK-W4>*BAT zgQnnAtpf<}5cz#8jt&N>JB!N0)ouI z)z$`SiffJ<+8eRVn_eX`-KrcUM(EW#I?!Fts+iP7V>i^Eqt_ZQ;h&v6G9dag)Jpad+a)` z_MqxCBa24qNh5M{t;JnQlHjWse-2ycy%c;{5x0&|Z=gg+AU9rpw2)n1dYXQIbd=we zo0pZ<_w%A34L|7m2l*gkI#gq8wsU5v$SRGQu5^7h;N!=Qok@SYg}(MpZ|ZSdvI0pu z_vWymAaPsU>bImeb6vZ76#HYm?=ODEC88?4Vo+!sdBkUTK*j z^CF=m#>b~0xkyDNHIN~%K~ew`g1rlDR_aBT(_4dPy}Iu`28oP%()yER!&P(IR3BO& zoS-9;0uF+2I2+}|kOtPJRPv9#<6W;l$~`e0QqNVc`_b*q-$AUQ%G;&&hLD$lSZ#Cc zC0D~X;JC)mQE&8Ly7)6s&;(22p2uf<=4czbWY))Xn*xyCwJ94TNj_LKkJxnvX9 zDgoKsOYP-$pief8Lr1q6cFw$NP)kb-yyCFm>TZ_~UiZlrEiOZ&5Wy@;#HUZI=IWD5 zci=YA3D|$&BEEQAA^tuQ?8+_Ep+dcAm#qOCFW2!mpe3OzMG=WxC>vNyZC3iQz*Mb6 z2#RtJWm9__ZaddC`~3}JZWZ{^z;uq~X`01k?R-!AdZ4xy91aI>ENs<)cV-szdi9xD zS<}V6h^G>R0s~tj_$C<}n8I#qib+Wkm{jb-!`<;nl1xlMH&)v}+~?40DRy?ZJD?{G zNYW@O%C;3lz21lSe3{I`ZPv$|C`_mdj-7F^JaP+0PL|wrGjbfI5`(gJRB zmmnu62ko$u@pV2jVep$9HamEU1B%{;R$qD+$g{V-jBepy{!j~S0}h5qz}zWBU|Hf(9j?Ad==8^zZ~*?-wmnzL2q^ z4E21kBZ+zzN{nG5Hj{G;qpE+eQdZmZ@+_`%};MFfFDXGisj=O6*u+@*+RvoED)r~K;wDg%S zUw*BgS!O;irmz1w^h(&2JBg5fPa0*Ihwg(2e!C3SBFhDOz>hB!{~4zeEIJt(epuS{ z5$3ApDvUcjoIZ8+(N%P6ZZ$=?mq(D--K)I&CE$%NtXi&Z<+XYW*vN2-l<(WY#;*za z6@$cY%u0OsSmq;yHr})j2rI9*5Yz=peEn+5+qCFWFl?)$s|(MYzf5f|jsmYA%&sNk zXa#-!`Zc$?*kCZt0)^atlqeN2E-EUjl&PNB0QM?pF}6Kc9B=RO`1d!vMCRdFh?qX! z^Et1hc<$OG52l9uOiWCHUe)ylpj(Tv0iIwn+rh|#9~P!=zy$5jGb{i)$M(`N(31D+ z=%8(<@h^{RPxgzS2YSIFz8sHGlS$I&V^*d0QaHfIP9x5=kWg`^KdF1iDD5zt5-By< zQn-qvF<^S0j3-Sr=ic`A&A0*G_X^&5kLGyY0Cm5gn24`HIP_Zg$uBVHRpUtK5PDcL-lN_?f$P89 zDk!Cd8VI{j=0V@2=j8TvEtHsIU+KfPUhIF#!a*F`tk=)%r*7t$%DAu44`Nh0mCQ|>v9 zTNr9EQfP-LAtslhP;Q&T4wISDq)pQ7j7#p!#jSB4iwHZv{*1S8-@4Ri)`fzBJN7!hFB3HE%UWJuG3w6FO77Bm>wbP_6L_1XCF%H2 zPwYICSPK(`VQgdCvcnQG)6>QGW{IWT`eHP-AHbS7-WkW3#-LDUr2(^`)2p^8PR**T ztIOF+hNpF2Ds@zvBZs-z!@IMuPoDqXVBmu1(5(aW6IRUH&6uD&A~YYFedioe@S8r* z&BOatlj1^re(4Ut8*E_%zFIgSwnN?nThy%+ z`c$JW_ZnG7-yYOS5f&DfsC1x_m7Cf@q!FWR{K}>NZV^GLb&A~z2XM@yBMyIWnGV{d z4p{Y^sEM1ngUmMF{#%TH^XwS5LtHPge#<-P)XkxmmzJ2TILBd$YuBzN>3H~%^brPi z?3WBLyQv*R{%?uPD>hLy#s7F#(LoriY;;JNRY&*hO~at!F5 zz`v1Rc9gxmEG@Q5Yz03V0@%kVY<~=CkUUP6#^i*A-mRR}jB_f?X=LYT8GlN5N(c{Nx7AwT1dW^< zDL?F|R&86!Eo0&M6CjaWT}ir4Z_{1Yr{R^yJw|1Qko?4r{d(t{8&JE-nsgJ_X3PzY zwCEng;%p1uu4xB~c<7b7RZ*jbtt$l7Eua$Hf(Bb6aqM1QY?)={yQceL1-bqD3)l^N zs|$&-`op`<#Fh%1tnzcje(O&JF=!S>Fcah(06QKdV67BQ-V>ZNdHC56{#h^X#nJh# zT8RH&Hs$^tr_FknMH_nw(*_h#Feh`#Ys38y-1s5p>*ABSSM57}O5AB9AX;+cp=94( z0w#(szt|c!RK`X*6NLoKhwD5rLGoo}9I|G7_lzpJ5j=?j@IPgTDTi2&_i z6s*mgc{wy2@w{!xFSlMoSkx@BlRN#1tNorz`GQE3Bh1Bjv>ikIW2h^yzVnYBFZF(E zXv*dftCwPqyvP(t6w+5gk+#Q5k!t=e#HHO}yGzPTX zj@2Y?TMGShbM+l~Uy#3?Vls%J6`4c()IV5B*$5EWRZHNl1#INOUh2KgP>_FZ{U`BYN!&sQ-eUj6z$5g*iD%sy|uii)z|u_ygZtbwEMrMSzhF7)tw@i)yo@Ky02FnmN76O9hwzB%IG?xd#?-*mV8MqZE0b2yD z2|!igqW=7jZ#H#fWcBLRwRbJ&H@*-Bg(2|U{1d_ zZp-{tDygxa1CI)@>^O|)^<#Asid2hNL%Up%BYMsZvVyi7HYNr_aH{E?U@1i!A95on z=-HR`0y0qRuHlWz(r+Ix)LFi_L9rF7bixQ6%ysUZUR`C;e-glGj0u)oLmxFbcxvSJ zI4N;|Z&BJ;ZJH368MX{JM0xvZyo=cychFi(nlA$-kjs}P{6wVBQ9-*cDijnkS)=77 zw?{r}&Wc_(1xX1Y$t*4?vYF=h%#DKXJkHLJ|E3oVxN)GZxpcgmRZwsa(A&C)B>^{! zd*>p0jq$S!pMGSAJ$Ue9?C(7(?k%1n)bNw2^kedQ7Kq4=ox^d5OJKz9@lq@4T#gIB z5(N$bV2oa8eT^C&S@%^gmkw(8hxhHv_8mLln9~SiVW~6Ki5R^@cpoi(ty*i;%ut&ynWoARhUm`LCM^lO(u&m{`s$UA9sc! zoF+PVYtHqh1)4ZAz-$`ot?|&xx#LBZcf_dDL~Ca?w3Q=7r^Yof>viD#Ad)sqnwqM1 zN||-~Qux;5=I~k%0!+Oqu1ZZ4outCl{ftrpJrQ4Mlh=9( z*+ZHK(K+28VqkDIk$iZ3VM*$@MjWCykw$L)Mhp>&*Me`&d83E6pIhtkGq|I~>_TO< zGLZ~H;cmpx{!!^c%VPz4l+GdmhchSttm7#?UzPdO!!Y%aUA%>fBad8N2g~tt?(Vsz zB{NL=bGV*-z_1>Cyiy0w0uu>muv1YN&&!w`rn;&iEF=x%ln@_H=yVGs2L{;xnFd?@ zME$uDI2>L&*%U<~Hrobp=Qb)`$1~&9DbsoXhUa!to z%n8_$XqHel>6bZhpg@T$J{DS63y*6boNQ`pid8Q<(RlU*Vgm{%9>o=$4#H4gj~qBZ z3-zN}JKs|$zlz7zT0)AeVDRMTYV!8^4bs0ps0wL{!8z%WKyBE-V<__kvxDhPnye51GT?3H$1SLDV31(qP7+yo z&ss>l!!?)@=eOn2GPcV+I#}7}tA+L|v~Fb^3TIpMn;cJq(KzwriyzI9uD{U+>%JH9 z6vNdzMCy+a{*!#LPL+g6SsK&h&{ZTwMEPJ@O+kN{26}MPq;bh69*CfD)F(NIB2|re zS3jSgh6QjI|E|MmT;~OUe+YcujuzlO+wC+z=kvuZ2qoq>Mav2Q@qw|K<_e`_g?qIF zbukuM@?P~=Qi{i1Q+zX01!^US{#d}%;DVGHVVUqy(jknON=n$th?$C}wWz>1CzlvD zL~1uA%`57NM1?E)SZY;>FYn0*uAlFZq`eYr#jZk&sO{t!T{Q03C#ciNU01t*0tYE! zK^yuJrn@O`BXl3)YX8YoMRI(q!F~(;OBtm2E(9Std#Na1jeVM>kBzrP=&pOTjHr}c ze#1wV&WD5VAL3M_6pgvY^npCeK5msdVCL^!kezl!J8PO&lX7}hJ1Ngy1Tm%Kad7%3tOfR zs60CuLbMJuq{p?&oK4XKtmaEMyk`UEsf3#(GuZgp=)EsqQ2Br$mw;SGcWlF&%`}(W zk^^P#H_;-w%7~9cB_+7f&`{(El|m-VV%kVaI(zNj48hfpF1Y)`i*qzGfk1F=&YScj zWO{+FWxta^e=9ZslVy9Z%-8j0eROzz2`N9z79R~M7J)K{q@7N)eLDXwaE3^(o0^(} zQ}Cbt5l&$f7>yp2^@@TXs}O=bFu$Q~WAq!zyN_KAy#(A=p%*=QdWXY_^!$+RPHhr4 z2b{m3SLAm74XF;_UkxE%oxRC6-6py_K5ecuTI?{7N_ltQ+r_g>^;!b~w`F}hf%}## zRE9Aaj4YwY7-3DON8t2$mI6!ufC#C3@aysF>dVF-$fw$AH0Yd_`M1Z}7VY$N78F@D z1_nVsRr4);XL-QsYSXJ5znSY8I;x?oY@FqZV{{W;2r_ARqM?H~0@f5mB!|$WWj(5k z6cM#sN%j|(T)Eb!PS%`%VQ(_$c7Z=yYl4r+0ko?l_^ePtkgBSxR6AgKXz&q!T(uv3 eTX=g$!QsU_O_KZuWAN{ Date: Mon, 13 Nov 2023 02:23:28 +0800 Subject: [PATCH 18/36] Add and delete role's developer guide and user stories --- docs/DeveloperGuide.md | 143 +++++++++++++++--- docs/UserGuide.md | 3 +- .../AddDeveloperRoleSequenceDiagram.puml | 87 +++++++++++ .../DeleteDeveloperRoleSequenceDiagram.puml | 87 +++++++++++ docs/diagrams/isRemovableRole.puml | 23 +++ .../AddDeveloperRoleSequenceDiagram.png | Bin 0 -> 63765 bytes .../DeleteDeveloperRoleSequenceDiagram.png | Bin 0 -> 64090 bytes docs/images/isRemovableRole.png | Bin 0 -> 27310 bytes .../address/model/client/ClientRoles.java | 8 +- .../model/developer/DeveloperRoles.java | 6 +- 10 files changed, 325 insertions(+), 32 deletions(-) create mode 100644 docs/diagrams/AddDeveloperRoleSequenceDiagram.puml create mode 100644 docs/diagrams/DeleteDeveloperRoleSequenceDiagram.puml create mode 100644 docs/diagrams/isRemovableRole.puml create mode 100644 docs/images/AddDeveloperRoleSequenceDiagram.png create mode 100644 docs/images/DeleteDeveloperRoleSequenceDiagram.png create mode 100644 docs/images/isRemovableRole.png diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index 5a47f01493f..135441e4221 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -291,8 +291,8 @@ The following sequence diagram provides an overview of how the find operation is ![Interactions Inside the Logic Component for the `find-developer n/alice` Command](images/FindDeveloperSequenceDiagram.png) -**Aspect:** Implementation of the predicate map: +**Aspect:** Implementation of the predicate map:
**Alternative 1:** - Use a long chain of `if-else` conditions for each attribute. - **Pros:** Explicit parsing logic for each attribute. @@ -310,7 +310,8 @@ Given the benefits of a more maintainable and scalable codebase, we've decided t #### Implementation The list command employs a structured approach where specific commands, such as `list-developer` or `list-client` are associated with corresponding functionalities. This allows users to efficiently retrieve -information about developers, clients or proejects by specifying the relevant prefix, streamlining the process of generating targeted lists based on user input. +information about developers, clients or projects by specifying the relevant prefix, streamlining the process of +generating targeted lists based on user input. Implemented operations include: * `` here refers to developer, client or project @@ -319,8 +320,9 @@ relevant lists of data * `Model#updateFilteredList`: Update the list displayed in the UI to print all the existing developers ,clients or projects. -Given below is an example usage scenario and how the find mechanism behaves at each step: -**Step 1** The user used the `find` feature to search for something and the UI is only displaying some of the +Given below is an example usage scenario and how the `list` mechanism behaves at each step: + +**Step 1** The user used the `find` feature to search for something and the UI is only displaying some developers **Step 2** To list all the developers, the user executes the command `list-developer`. `AddressBookParser` @@ -352,7 +354,7 @@ Additionally, it implements the following operations: These operations are exposed in the `Model` interface as `Model#commitAddressBook()`, `Model#undoAddressBook()` and `Model#redoAddressBook()` respectively. -Given below is an example usage scenario and how the undo/redo mechanism behaves at each step. +Given below is an example usage scenario and how the `undo`/`redo` mechanism behaves at each step. **Step 1** The user launches the application for the first time. The `VersionedAddressBook` will be initialized with the initial address book state, and the `currentStatePointer` pointing to that single address book state. @@ -394,7 +396,6 @@ The `redo` command does the opposite — it calls `Model#redoAddressBook()`, ![UndoRedoState4](images/UndoRedoState4.png) - **Aspect: How undo & redo executes:** * **Alternative 1 (current choice):** Saves the entire address book. @@ -409,7 +410,94 @@ The `redo` command does the opposite — it calls `Model#redoAddressBook()`, execute the `delete-developer-role function`. The process of this implementation had to be very careful just like what the cons mentioned, a slight validation error can change the whole `undo` and `redo` feature. - * _{more aspects and alternatives to be added}_ +### Add-role feature +#### Implementation +The add role command employs a structured approach where specific commands, such as `add-developer-role` or +`add-client-role`are associated with corresponding functionalities. This allows users to efficiently add +information about developers and clients. One of the validation checks when adding a developer or client is that this role +added must exist. This is where users will need this command to add in the respective roles. This feature is facilitated +with the `DeveloperRoles` and `ClientRoles` class which implements the following operations: + +* `DeveloperRoles#addDeveloperRole()`  —  Adds a developer role into the list of roles stored +* `DeveloperRoles#saveDeveloperRoles()`  —  Saves the updated list of developer roles +* `DeveloperRoles#loadDeveloperRoles()`  —  Loads the existing list of developer roles from file +* `DeveloperRoles#isValidRole()`  —  Checks if this role being added exists already + +The classes are similar for `ClientRoles` but just that they are associated with the clients. + +Given below is an example usage scenario and how the `add-developer-role` mechanism behaves at each step: + +**Step 1** The user launches the application. The list roles for developers and clients are loaded into a list or roles. + +**Step 2** The user executes the command `add-developer-role Tester`. The application recognizes the `add-developer-role` +and calls `AddDeveloperRoleCommandParser#parse()`. + +**Step 3** The parser checks if the argument is an empty blank space and trims the input given, in this case ` Tester` is +trimmed to `Tester` and calls `AddDeveloperRoleCommand`. + +**Step 4** `AddDeveloperRoleCommand#execute()` checks if there is an existing role with the same name and creates +a new developer role if there is no such role. + +
:exclamation: **Note:** +Although no changes is made to the address book, but this stage is still committed so that the success command +message and tab index switched to can be changed, the currentPointer can also note that there is an action done here.
+ +
:exclamation: **Note:** +This is not a case-sensitive feature. The command allows users to add `developer` even if `Developer` exists.
+ +The following sequence diagram shows how the Add-role operation works: +![SequenceDiagram](images/AddDeveloperRoleSequenceDiagram.png) + +**Aspect: How add-role executes:** +* **Alternative 1 (current choice):** Treat role as a variable, has a separate load and unload list + * Pros: Role can just be treated as an attributed that needs more validation checks + * Cons: Have to load and unload each time system relaunches, quite time and memory consuming + +* **Alternative 2:** Treating role like another person or project, adding roles are like adding projects + * Pros: Easy to implement. + * Cons: Roles would have to be implemented on the same level as developers, clients and projects which should not be case. + + +### Delete-role feature +#### Implementation +The add role command employs a structured approach where specific commands, such as `delete-developer-role` or +`delete-client-role`are associated with corresponding functionalities. This allows users to efficiently delete +information about developers and clients that they no longer need.The system helps you to check if there are any +developers or clients in the list using this feature. If there is, the command will not be successfully executed. +This feature is facilitated with the `DeveloperRoles` and `ClientRoles` class which implements the following operations: + +* `DeveloperRoles#deleteDeveloperRole()`  —  Deletes a developer role into the list of roles stored +* `DeveloperRoles#saveDeveloperRoles()`  —  Saves the updated list of developer roles +* `DeveloperRoles#loadDeveloperRoles()`  —  Loads the existing list of developer roles from file +* `DeveloperRoles#isRemovableRole()`  —  Checks if this role can be deleted; It should not be a pre-determined role, +it should not be a non-existing role, it should not be a role that is in use. + +The classes are similar for `ClientRoles` but just that they are associated with the clients. + +Given below is an example usage scenario and how the `delete-developer-role` mechanism behaves at each step: + +**Step 1** The user launches the application. The list roles for developers and clients are loaded into a list or roles. + +**Step 2** The user executes the command `delete-developer-role Tester`. The application recognizes the `delete-developer-role` +and calls `DeleteDeveloperRoleCommandParser#parse()`. + +**Step 3** The parser checks if the argument is an empty blank space and trims the input given, in this case ` Tester` is +trimmed to `Tester` and calls `DeleteDeveloperRoleCommand`. + +**Step 4** `DeleteDeveloperRoleCommand#execute()` checks if this is a removable role and removes it from the list of roles +if `DeveloperRoles#isRemovableRole()` returns true. + +
:exclamation: **Note:** +Although no changes is made to the address book, but this stage is still committed so that the success command +message and tab index switched to can be changed, the currentPointer can also note that there is an action done here.
+ +The following sequence diagram shows how the Delete-role operation works: +![SequenceDiagram](images/DeleteDeveloperRoleSequenceDiagram.png) + +The following activity diagram shows how the validation check in `DeveloperRoles#isRemovableRole()` works:
+![ActivityDiagram](images/isRemovableRole.png) + +* _{more aspects and alternatives to be added}_ -------------------------------------------------------------------------------------------------------------------- @@ -441,22 +529,31 @@ managers. ### User stories Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unlikely) - `*` -| Priority | As a …​ | I want to …​ | So that I can…​ | -|----------|-----------------|------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------| -| `* * *` | project manager | add a list of Developers and their contact information | access contact details easily and quickly assemble teams for new projects | -| `* * *` | project manager | add a list of Clients and their contact information | access client details easily and know who is related to what project. | -| `* * *` | project manager | add a list of Projects and their details | access project details easily and see who is related to the project | -| `* * *` | project manager | delete information about a Client or Developer and the project details will update accordingly | don't repeat deleting several time | -| `* * *` | project manager | edit the the details of the Developers added in | constantly update the contact book | -| `* * *` | project manager | edit the the details of the Clients added in | constantly update the contact book | -| `* * *` | project manager | edit the the details of the Projects added in | constantly update any changes to the project | -| `* * *` | project manager | find the the Developers according to any details they have | source for information related to developers easily | -| `* * *` | project manager | find the the Clients according to any details they have | source for information related to clients easily | -| `* * *` | project manager | find the the Projects according to any details they have | source for information related to projects easily | -| `* * *` | project manager | list different groups of people according to the different commands | view projects, clients and developers can be as different lists | -| `* * *` | project manager | switch between tabs for Developers, Clients and Projects | intuitively view the different data lists | -| `* *` | project manager | | | -| `* *` | project manager | | | +| Priority | As a …​ | I want to …​ | So that I can…​ | +|----------|-----------------|------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------| +| `* * *` | project manager | add a list of Developers and their contact information | access contact details easily and quickly assemble teams for new projects | +| `* * *` | project manager | add a list of Clients and their contact information | access client details easily and know who is related to what project. | +| `* * *` | project manager | add a list of Projects and their details | access project details easily and see who is related to the project | +| `* * *` | project manager | delete information about a Client or Developer and the project details will update accordingly | don't repeat deleting several time | +| `* * *` | project manager | edit the the details of the Developers added in | constantly update the contact book | +| `* * *` | project manager | edit the the details of the Clients added in | constantly update the contact book | +| `* * *` | project manager | edit the the details of the Projects added in | constantly update any changes to the project | +| `* * *` | project manager | find the the Developers according to any details they have | source for information related to developers easily | +| `* * *` | project manager | find the the Clients according to any details they have | source for information related to clients easily | +| `* * *` | project manager | find the the Projects according to any details they have | source for information related to projects easily | +| `* * *` | project manager | list different groups of people according to the different commands | view projects, clients and developers can be as different lists | +| `* * *` | project manager | switch between tabs for Developers, Clients and Projects | intuitively view the different data lists | +| `* * *` | project manager | import data from a csv | transfer data from what i am using right now | +| `* *` | project manager | add roles | only add people to existing roles in the system so that i do not assign people to random roles | +| `* *` | project manager | delete roles | remove roles that i think are not useful anymore | +| `* *` | project manager | undo actions | undo any mistakes i made | +| `* *` | project manager | redo actions | redo anything i accidentally undid | +| `* *` | project manager | lock all the data | keep all these data safe | +| `* *` | project manager | unlock all the data | see all these data after locking it | +| `* *` | project manager | change password | access these data without worrying data might be stolen | +| `* *` | project manager | find by deadline | sort out information by deadline due | +| `* ` | project manager | send reminder emails to the developers when deadlines are nearing | it can remind them that work is due soon | +| `* ` | project manager | give developers feedback directly from CodeContact | reviews can be autogenerated trough my ratings and i need to write a new review each time | *{More to be added}* diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 8fa7a024540..4cc6f34635c 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -190,7 +190,7 @@ This is a tutorial for **first-time** CodeContact users. 1. You can **change the password** to unlock CodeContact. * Enter the command `change-password pw/Password123! npw/` in the command box
:exclamation: **Note:** -You can always lock and unlock CodeContact using the `lock` and `unlock` commands +You can always lock and unlock CodeContact using the `lock` and `unlock` commands
1. Let us try **adding a project** to our CodeContact. * Enter the @@ -271,7 +271,6 @@ To view all our features, you may visit our [Features](#features) section * If you are using a PDF version of this document, be careful when copying and pasting commands that span multiple lines as space characters surrounding line-breaks may be omitted when copied over to the application. - ### Lock `lock` diff --git a/docs/diagrams/AddDeveloperRoleSequenceDiagram.puml b/docs/diagrams/AddDeveloperRoleSequenceDiagram.puml new file mode 100644 index 00000000000..8e8341b5aa7 --- /dev/null +++ b/docs/diagrams/AddDeveloperRoleSequenceDiagram.puml @@ -0,0 +1,87 @@ +@startuml +'https://plantuml.com/sequence-diagram + + !include style.puml + skinparam ArrowFontStyle plain + + box Logic LOGIC_COLOR_T1 + participant ":LogicManager" as LogicManager LOGIC_COLOR + participant ":AddressBookParser" as AddressBookParser LOGIC_COLOR + participant "d :AddDeveloperRoleCommandParser" as AddDeveloperRoleCommandParser LOGIC_COLOR + participant "d :AddDeveloperRoleCommand" as AddDeveloperRoleCommand LOGIC_COLOR + participant ":CommandResult" as CommandResult LOGIC_COLOR + end box + + box Model MODEL_COLOR_T1 + participant ":Model" as Model MODEL_COLOR + participant ":VersionedAddressBook" as VersionedAddressBook MODEL_COLOR + participant ":DeveloperRoles" as DeveloperRoles MODEL_COLOR + end box + + [-> LogicManager : execute("add-developer-role Tester") + activate LogicManager + + LogicManager -> AddressBookParser : parseCommand("add-developer-role Tester") + activate AddressBookParser + + create AddDeveloperRoleCommandParser + AddressBookParser -> AddDeveloperRoleCommandParser + activate AddDeveloperRoleCommandParser + + AddDeveloperRoleCommandParser --> AddressBookParser + deactivate AddDeveloperRoleCommandParser + + AddressBookParser -> AddDeveloperRoleCommandParser : parse("Tester") + activate AddDeveloperRoleCommandParser + + create AddDeveloperRoleCommand + AddDeveloperRoleCommandParser -> AddDeveloperRoleCommand + activate AddDeveloperRoleCommand + + AddDeveloperRoleCommand --> AddDeveloperRoleCommandParser + deactivate AddDeveloperRoleCommand + + AddDeveloperRoleCommandParser --> AddressBookParser + deactivate AddDeveloperRoleCommandParser + + AddressBookParser --> LogicManager + deactivate AddressBookParser + + LogicManager -> AddDeveloperRoleCommand : execute() + activate AddDeveloperRoleCommand + + AddDeveloperRoleCommand -> DeveloperRoles : isValidRole("Tester") + activate DeveloperRoles + + DeveloperRoles --> AddDeveloperRoleCommand : boolean true + deactivate DeveloperRoles + + AddDeveloperRoleCommand -> DeveloperRoles : addDeveloperRole(new DeveloperRoles("Tester)) + activate DeveloperRoles + + DeveloperRoles -> DeveloperRoles : saveDeveloperRoles() + DeveloperRoles --> AddDeveloperRoleCommand + + AddDeveloperRoleCommand -> Model : commitAddressBook(model, successMessage, TabIndex) + activate Model + + Model -> VersionedAddressBook : commit() + activate VersionedAddressBook + + VersionedAddressBook --> Model + deactivate VersionedAddressBook + + Model --> AddDeveloperRoleCommand + deactivate Model + + create CommandResult + AddDeveloperRoleCommand -> CommandResult + activate CommandResult + + CommandResult --> AddDeveloperRoleCommand + deactivate CommandResult + + AddDeveloperRoleCommand --> LogicManager : result + deactivate AddDeveloperRoleCommand + +@enduml \ No newline at end of file diff --git a/docs/diagrams/DeleteDeveloperRoleSequenceDiagram.puml b/docs/diagrams/DeleteDeveloperRoleSequenceDiagram.puml new file mode 100644 index 00000000000..27a3b282b7e --- /dev/null +++ b/docs/diagrams/DeleteDeveloperRoleSequenceDiagram.puml @@ -0,0 +1,87 @@ +@startuml +'https://plantuml.com/sequence-diagram + + !include style.puml + skinparam ArrowFontStyle plain + + box Logic LOGIC_COLOR_T1 + participant ":LogicManager" as LogicManager LOGIC_COLOR + participant ":AddressBookParser" as AddressBookParser LOGIC_COLOR + participant "d :DeleteDeveloperRoleCommandParser" as DeleteDeveloperRoleCommandParser LOGIC_COLOR + participant "d :DeleteDeveloperRoleCommand" as DeleteDeveloperRoleCommand LOGIC_COLOR + participant ":CommandResult" as CommandResult LOGIC_COLOR + end box + + box Model MODEL_COLOR_T1 + participant ":Model" as Model MODEL_COLOR + participant ":VersionedAddressBook" as VersionedAddressBook MODEL_COLOR + participant ":DeveloperRoles" as DeveloperRoles MODEL_COLOR + end box + + [-> LogicManager : execute("delete-developer-role Tester") + activate LogicManager + + LogicManager -> AddressBookParser : parseCommand("delete-developer-role Tester") + activate AddressBookParser + + create DeleteDeveloperRoleCommandParser + AddressBookParser -> DeleteDeveloperRoleCommandParser + activate DeleteDeveloperRoleCommandParser + + DeleteDeveloperRoleCommandParser --> AddressBookParser + deactivate DeleteDeveloperRoleCommandParser + + AddressBookParser -> DeleteDeveloperRoleCommandParser : parse("Tester") + activate DeleteDeveloperRoleCommandParser + + create DeleteDeveloperRoleCommand + DeleteDeveloperRoleCommandParser -> DeleteDeveloperRoleCommand + activate DeleteDeveloperRoleCommand + + DeleteDeveloperRoleCommand --> DeleteDeveloperRoleCommandParser + deactivate DeleteDeveloperRoleCommand + + DeleteDeveloperRoleCommandParser --> AddressBookParser + deactivate DeleteDeveloperRoleCommandParser + + AddressBookParser --> LogicManager + deactivate AddressBookParser + + LogicManager -> DeleteDeveloperRoleCommand : execute() + activate DeleteDeveloperRoleCommand + + DeleteDeveloperRoleCommand -> DeveloperRoles : isRemovableRole("Tester") + activate DeveloperRoles + + DeveloperRoles --> DeleteDeveloperRoleCommand : boolean true + deactivate DeveloperRoles + + DeleteDeveloperRoleCommand -> DeveloperRoles : deleteDeveloperRole(new DeveloperRoles("Tester)) + activate DeveloperRoles + + DeveloperRoles -> DeveloperRoles : saveDeveloperRoles() + DeveloperRoles --> DeleteDeveloperRoleCommand + + DeleteDeveloperRoleCommand -> Model : commitAddressBook(model, successMessage, TabIndex) + activate Model + + Model -> VersionedAddressBook : commit() + activate VersionedAddressBook + + VersionedAddressBook --> Model + deactivate VersionedAddressBook + + Model --> DeleteDeveloperRoleCommand + deactivate Model + + create CommandResult + DeleteDeveloperRoleCommand -> CommandResult + activate CommandResult + + CommandResult --> DeleteDeveloperRoleCommand + deactivate CommandResult + + DeleteDeveloperRoleCommand --> LogicManager : result + deactivate DeleteDeveloperRoleCommand + +@enduml \ No newline at end of file diff --git a/docs/diagrams/isRemovableRole.puml b/docs/diagrams/isRemovableRole.puml new file mode 100644 index 00000000000..042c49335fc --- /dev/null +++ b/docs/diagrams/isRemovableRole.puml @@ -0,0 +1,23 @@ +@startuml +'https://plantuml.com/activity-diagram-beta + +start +:get the full developer list; + +if (check is any developer using this role) then (there are developers using this role) + :throw developer still using error; + stop + endif + if (check is this role one of the pre-defined roles) then (is pre-defined role) + :throw cannot be deleted error; + stop + endif + if (check is this role in the list of existing roles) then (role does not exist) + :throw role does not exist error; + stop + endif + :delete role from existing list; + stop + + +@enduml diff --git a/docs/images/AddDeveloperRoleSequenceDiagram.png b/docs/images/AddDeveloperRoleSequenceDiagram.png new file mode 100644 index 0000000000000000000000000000000000000000..b984caf89bd00a7886579675b78891d5b2c0ca11 GIT binary patch literal 63765 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 s{Oa7pbB~FMSn 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�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 WbJA(v`V)*Gh0HnGvxyQn9{eATZ$B^q literal 0 HcmV?d00001 diff --git a/docs/images/isRemovableRole.png b/docs/images/isRemovableRole.png new file mode 100644 index 0000000000000000000000000000000000000000..03640755a819e11250710d0f38e9a598986bd993 GIT binary patch literal 27310 zcmcG$cRZH;|2J-L*`w3ml*~?hZ?bn*Mx@goi3-`9NRn(3rx8U)WRGO8MA@OD5R#1h zb#`6X=X>4v{k?yW`}fCv{d48q$8o&huh(zxwe*?F%}l~H7qQg zw?sJb2zp~;4E}e{U)|E*$;&&)-Py$-OVioY+1J6}`6|0(5WB0tzqg-^u&}qggQx!u z4|gFaFOPtsem3}+SJzD~{r`C!3mZNsFncq--E&riEc*K`lDQ1#?2Fn)WZ!t!X9%=t zDlEt6=pMg}dXvUs^lfLqXoJV+9dzFzSi=1`Gmv*fjRZuBEE^;Ru@bYGQV+C*asPq%F#s#ZTA@!AS5IM+pFvL%du z3BsKtcql6P@Ft2amNc>3>Lqmuo+`SB_O+zz)K7z6@<5SF->C^#t%~`V*V+ef_&$v_ z@K40?vi3=dBFmaieV_eGYw^a<%sX^U*ZbKoRV8WMd13R8#n|#=-25muS%h99{CIh)Bwx`6x=24-sf(A|HzX{=w+RU&|?q zQx%tgOj&!$A8mEs*jT`+*HX(s>BaKpqcSsx6;GSZ%FU6?cLfaI zWbUfIjw0hl`(%Qf|pBF)Myg-os#k- z14mRi+Cl8wtM3YC6gIf{W>+F5u9PB5BIoV6LL$))ItO||OPcVC=+=JKBOJ5N4_gdaao-D2mhot_aohh*#!}>?EJ@G=+t{Y$my{>j74D)P1WFNI zgoelgJ#+JneRCsno`;kva2h19U%&qO^XDD&a)g##HI1`?s8KL;(v@o{o;MtT!XuD^eAtqwJrmX>B}q9TWF*17Bcv5C&ns7QmH zh){_AEC&aNgM-7_vuDu)9J%ld@RydBBE3!PeoQ;1)VYqTAUV5K4UrXX`N|QIc0@7( z8&Xa^WRtO!6v~s;IMUM6(`iI+0#{Nst9KWq`L|h3$rHA^XbgxZ1NSB^g3jnPlbCgK z!Z#u>UZh2jHV66TMo>RfnXEpuq?^8$-!% U(>Y3EnE9{1g#-@@s8-xp!^gk+@@5 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 K^(%DkLjDV!FMo6Z literal 0 HcmV?d00001 diff --git a/src/main/java/seedu/address/model/client/ClientRoles.java b/src/main/java/seedu/address/model/client/ClientRoles.java index 84f25418081..c7c549292a4 100644 --- a/src/main/java/seedu/address/model/client/ClientRoles.java +++ b/src/main/java/seedu/address/model/client/ClientRoles.java @@ -118,10 +118,10 @@ public static boolean isRemovableRole(Model model, String role) { } // check if this role is one of the defaults - if (role.equalsIgnoreCase("Manager") - || role.equalsIgnoreCase("Developer") - || role.equalsIgnoreCase("HR") - || role.equalsIgnoreCase("Client")) { + if (role.equals("Manager") + || role.equals("Developer") + || role.equals("HR") + || role.equals("Client")) { notDefault = false; } else { notDefault = true; diff --git a/src/main/java/seedu/address/model/developer/DeveloperRoles.java b/src/main/java/seedu/address/model/developer/DeveloperRoles.java index e0e35858498..f3c1b990f87 100644 --- a/src/main/java/seedu/address/model/developer/DeveloperRoles.java +++ b/src/main/java/seedu/address/model/developer/DeveloperRoles.java @@ -117,9 +117,9 @@ public static boolean isRemovableRole(Model model, String role) { } // check if this role is one of the defaults - if (role.equalsIgnoreCase("Frontend Developer") - || role.equalsIgnoreCase("Backend Developer") - || role.equalsIgnoreCase("Developer")) { + if (role.equals("Frontend Developer") + || role.equals("Backend Developer") + || role.equals("Developer")) { notDefault = false; } else { notDefault = true; From 901efc33165bd2b765e537bd67ec44b2c8fa3bb6 Mon Sep 17 00:00:00 2001 From: mingyu Date: Mon, 13 Nov 2023 02:26:22 +0800 Subject: [PATCH 19/36] fix checkstyles --- docs/DeveloperGuide.md | 8 ++++---- docs/diagrams/AddDeveloperRoleSequenceDiagram.puml | 2 +- docs/diagrams/DeleteDeveloperRoleSequenceDiagram.puml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index 135441e4221..7f929993ebc 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -313,9 +313,9 @@ are associated with corresponding functionalities. This allows users to efficien information about developers, clients or projects by specifying the relevant prefix, streamlining the process of generating targeted lists based on user input. -Implemented operations include: +Implemented operations include: * `` here refers to developer, client or project -* `AddressBookParser`: Interprets the user's input and calls the appropriate `ListCommand#execute()` to print the +* `AddressBookParser`: Interprets the user's input and calls the appropriate `ListCommand#execute()` to print the relevant lists of data * `Model#updateFilteredList`: Update the list displayed in the UI to print all the existing developers ,clients or projects. @@ -335,7 +335,7 @@ that has been set to true. **Step 4** `Model#updateFilteredDeveloperList` then updates the list in the UI to print all the existing developers. The following sequence diagram provides an overview of how the find operation is executed - + ![sequence diagram](images/ListDeveloperSequenceDiagram.png) ### Undo/redo feature @@ -484,7 +484,7 @@ and calls `DeleteDeveloperRoleCommandParser#parse()`. **Step 3** The parser checks if the argument is an empty blank space and trims the input given, in this case ` Tester` is trimmed to `Tester` and calls `DeleteDeveloperRoleCommand`. -**Step 4** `DeleteDeveloperRoleCommand#execute()` checks if this is a removable role and removes it from the list of roles +**Step 4** `DeleteDeveloperRoleCommand#execute()` checks if this is a removable role and removes it from the list of roles if `DeveloperRoles#isRemovableRole()` returns true.
:exclamation: **Note:** diff --git a/docs/diagrams/AddDeveloperRoleSequenceDiagram.puml b/docs/diagrams/AddDeveloperRoleSequenceDiagram.puml index 8e8341b5aa7..861294bf0c8 100644 --- a/docs/diagrams/AddDeveloperRoleSequenceDiagram.puml +++ b/docs/diagrams/AddDeveloperRoleSequenceDiagram.puml @@ -84,4 +84,4 @@ AddDeveloperRoleCommand --> LogicManager : result deactivate AddDeveloperRoleCommand -@enduml \ No newline at end of file +@enduml diff --git a/docs/diagrams/DeleteDeveloperRoleSequenceDiagram.puml b/docs/diagrams/DeleteDeveloperRoleSequenceDiagram.puml index 27a3b282b7e..0319e46d543 100644 --- a/docs/diagrams/DeleteDeveloperRoleSequenceDiagram.puml +++ b/docs/diagrams/DeleteDeveloperRoleSequenceDiagram.puml @@ -84,4 +84,4 @@ DeleteDeveloperRoleCommand --> LogicManager : result deactivate DeleteDeveloperRoleCommand -@enduml \ No newline at end of file +@enduml From 796df7ff77f4b9851ccfb337bc1e2374e840c6dc Mon Sep 17 00:00:00 2001 From: mingyu Date: Mon, 13 Nov 2023 03:23:13 +0800 Subject: [PATCH 20/36] Add use cases and planned enhancements --- docs/DeveloperGuide.md | 187 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 171 insertions(+), 16 deletions(-) diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index 7f929993ebc..2a102682a7e 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -562,40 +562,175 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unli (For all use cases below, the **System** is the `AddressBook`, and the **Actor** is the `user`, unless specified otherwise)unless specified otherwise) -#### **Use case:** UC1 - Add a single employee -**Preconditions:** User is logged in as an HR staff +#### **Use case:** UC1 - Add a developer + +
:exclamation: **Note:** +Adding developers and clients works the same way, but with different parameters, hence it will not be repeated
+ +**Preconditions:** User is logged in **Guarantees:** -1. A new profile will be added to the company's system after every successful addition -2. A login credential for the added user will be created +1. A new developer will be added to the system after every successful addition **MSS** -1. User requests to add an employee. -2. System requests the details of the employee. +1. User requests to add a developer. +2. System requests the details of the developer. 3. User enters the requested details in the required format. -4. System requests for confirmation. -5. User confirms. -6. System adds the new employee to the company database. +4. System validates if user's inputs are valid. +6. System adds the developer to the data. Use case ends. **Extensions** -* 1a. The request is done by a non-HR staff. +* 3a. The given details are invalid or in an invalid format. + * 3a1. System requests for the correct data + * 3a2. User enters new data +
Steps 3a1-3a2 are repeated until the data entered are correct. +
Use case resumes from step 4. - * 1a1. System informs user that user does not have the access rights to add a new employee. +#### **Use case:** UC2 - Delete a developer +
:exclamation: **Note:** +Deleting developers and clients works the same way, but with different parameters, hence it will not be repeated
- Use case ends. +**Preconditions:** User is logged in -* 3a. The given details are invalid or in an invalid format. -* *a. At any time, User chooses to cancel the action. - * *a1. System requests to confirm the cancellation. - * *a2. User confirms the cancellation. +**Guarantees:** +1. A developer deleted from the system after every successful delete + +**MSS** + +1. User requests to delete a developer. +2. System requests the index of the developer. +3. User enters the index of the developer. +4. System validates index is valid. +5. System deletes the developer to the data. Use case ends. +**Extensions** + +* 3a. The index entered is an invalid number or is not a number. + * 3a1. System requests for the correct index + * 3a2. User enters new index +
Steps 3a1-3a2 are repeated until the data entered are correct. +
Use case resumes from step 4. + +#### **Use case:** UCX - Undo + +**Preconditions:** User is logged in + +**Guarantees:** +1. The previous command will be undone. + +**MSS** + +1. User requests undo. +2. System checks if there were any changes before. +3. System reverts the change. +
Use case ends. + +**Extensions** + +* 3a. There are no changes before + * 3a1. System informs users they have reached the first step +
Use case ends + +#### **Use case:** UCX - Redo + +**Preconditions:** User is logged in + +**Guarantees:** +1. The previous command undone will be redone. + +**MSS** + +1. User requests redo. +2. System checks if there were anything undone changes before. +3. System redoes the change. +
Use case ends. + +**Extensions** + +* 3a. There are no undone changes before + * 3a1. System inform users they have reached the last step +
Use case ends + +#### **Use case:** UCX - Add developer role +
:exclamation: **Note:** +Adding developer roles and client roles works the same way, hence add client role use case will not be repeated
+ +**Preconditions:** User is logged in + +**Guarantees:** +1. A new developer role will be added. + +**MSS** + +1. User requests to add a developer role. +2. User enters the role they want to add. +3. System validates if user's inputs are valid. +4. System validates if user's inputs can be added. +5. System adds the developer to the data. + +**Extensions** + +* 3a. User enters an empty role + * 3a1. System requests for the correct role + * 3a2. User enters new role +
Steps 3a1-3a2 are repeated until the data entered is not empty +
Use case resumes from step 4. + +* 4a. User enters an existing role + * 4a1. System informs users this role exists + * 4a2. User enters new role +
Steps 4a1-4a2 are repeated until the data entered is not empty +
Use case resumes from step 5. + +#### **Use case:** UCX - Delete developer role +
:exclamation: **Note:** +Deleting developer roles and client roles works the same way, hence deleting client role use case will not be repeated
+ +**Preconditions:** User is logged in + +**Guarantees:** +1. A developer role will be deleted. + +**MSS** + +1. User requests to delete a developer role. +2. User enters the role they want to delete. +3. System validates if user's inputs are valid. +4. System validates if user's input can be deleted. +5. System adds the developer to the data. + +**Extensions** + +* 3a. User enters an empty role + * 3a1. System requests for the correct role + * 3a2. User enters correct role +
Steps 3a1-3a2 are repeated until the data entered is not empty +
Use case resumes from step 4. + +* 4a. User enters a role that some developer is still using + * 4a1. System informs users this role cannot be deleted as there are developers using + * 4a2. User enters correct role +
Steps 4a1-4a2 are repeated until the data entered is can be deleted +
Use case resumes from step 5. + +* 4b. User enters a role that doesn't exist + * 4b1. System informs users this role don't exist + * 4b2. User enters correct role +
Steps 4a1-4a2 are repeated until the data entered is can be deleted +
Use case resumes from step 5. + +* 4b. User enters a role that cannot be deleted + * 4b1. System informs users this role cannot be deleted as it is a pre-defined role + * 4b2. User enters correct role +
Steps 4a1-4a2 are repeated until the data entered can be deleted +
Use case resumes from step 5. ### Non-Functional Requirements @@ -667,9 +802,29 @@ testers are expected to do more *exploratory* testing. 1. _{explain how to simulate a missing/corrupted file, and the expected behavior}_ 2. _{ more test cases …​ }_ + -------------------------------------------------------------------------------------------------------------------- ## **Appendix: Planned Enhancement** +### Validation checks for edit +**Current Behavior:** Two developers can have the same address, contact number etc. As long as they don't have the same name +they can both be added.
+**Enhanced Behavior:** Validation checks should be added for email, contact number and address to make sure there are no 2 +people with repeated the details. + +### Case-sensitive validation checks for adding roles +**Current Behavior:** Two similar roles with different cases can both be added. `Developer` and `developer` can exist at the +same time.
+**Enhanced Behavior:** Two same words that are only differentiated by case should not be able to be added in as a role. + +### Deadlines cannot be any date +**Current Behavior:** Deadlines for projects can be any date such at year 0001.
+**Enhanced Behavior:** There should be a limit to the deadline line dates like 10-20 years before and after the current date. + +### Password Recovery +**Current Behavior:** If you forgot your password, there is no way to retrieve it +**Enhanced Behavior:** Links the system to email or have verifications that allows users to reset their password. + -------------------------------------------------------------------------------------------------------------------- ## **Appendix: Effort** From f6d68ec75e93d5128b1b1557af0052b3da2a2094 Mon Sep 17 00:00:00 2001 From: mingyu Date: Mon, 13 Nov 2023 03:28:11 +0800 Subject: [PATCH 21/36] fix CI --- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59821 bytes gradlew.bat | 178 +++++++++++++++--------------- 2 files changed, 89 insertions(+), 89 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..41d9927a4d4fb3f96a785543079b8df6723c946b 100644 GIT binary patch delta 20926 zcmY(p19zBh*tDC*wr$(CZQHhW$3|n@W@Fn%V>fmhHTa(WuDw3|hwGe~>zEmy1FKsG zYYc=z@M+Z>Uk4n- zf>LPE!P?mA5#!>@QlN|1%u#eAY%z9sYzTix2)?dl^qr+FV;S+1iF%X=EN6X@efcip zx4L{6MHen@KT&~3ddxw!vGK3 zDR6IzmfS(C#hBd@wn!OgvMoF}phsEk&F5-Dcwt7G2xG&Dm&xutI)E-Va!-qKz~+w0 z-=AFd+H(~(Q$3%N5nez;ZIxbBM31j>5Nyo-YkiExY1M<@u<0e*nz!!R z;{N$-qP&QO{9nWv^INxb>J`g-yYMA$eDo8qb{Bw9^fZ9m+S(Rz2Zph#(1yUfaZB?I z#eOI?a)(CpDeqla5F^C|B-C7T7CC2S%N!%mR&iZ=7m$e>8JAYv-&Am?exYu9F)s@^ z9C)0W-|mW~Vu~>&H5kvxytGG67Zv0pEg}b-m(ggB8~^+aXZ&XbbIGOp!bkEM{Np3q z@-SX2K#W$Hez?IRlyxVVm5t}P- zltiFvZ&=0@Q}LqUpz=6(h07TA`ZYSz8rFm{Z{-~Qw!}yL8*=dtF@T_H90~mu8Kw1t z)le9013)H|!YcV=K?2_d9ifA*Q*M@vBRhpdibeK-gIY}{cl&GETL*)(oq?%BoP{H$ zn4O~f$L0bBm?qk}Rxw_2yYt*IM#^$v;IJSd(9j_NsR~GbNZnQu7zjwxm0I8$)sVjq#M(yl^fk=Y`b_$ZVpEG;yCH|Z~I1>MTYdpi8P>+NQC zE_BSsn_WD^EqD%(G{YUlEBLDQx{o%zvDKPVnupGJe#6t<@AjO#$J70?_*f7K>5NMO zCdGnVcF-Cu*i*B@rqUDnlJ*oFjO4O5fDMd!aWYNYr?1Q%bXxmhTs+GlOuiIos<7s9?Rq}Re!?8dR-lV6wuAMP@lIdDi#5Rjy`J^G=>=w^ zv-=qd_E^Jjec?ZYvRRjl)ZU`Tp|r;fQ0+e;vL#MSm0`uzNi*svh0g|21$yHVsskBt}fvlw5cR}CPTD)g#ZN9hWkzJiL`q# zI0YW?x=^LciAbCH`Blg1^v-&f2K#)4q@^MJV*02DZqX0X-h=qdoEF$}M~SpY3pzsk zjSrpF@05PZM}QhiFzr&-AQw3u5F}%7#F0rPla{VYb0~aE6$(UFm010IA@ar_IZzG_ zmSKga>0=esGyeC;)gc^j&8@M-tPu*a1l=rx;Tmi~=p^ccq;fJgp;+R4&O}&r_s$&9 z^bPU<-gBa}(hLnM2uLMmN+AjrFscLNt+$#cIIg?f@`S%7dnhgg4cg3YC<6`i+c=5< zitavH+cN}B)VnF)fufnbw1PgBBDLI48@83c%)KbAY+(VFXHdA10mkp#-u?N!HIIgE zrq9#*^6RCKN~bwo<}~Lv$NxUyCExF+^ECgl!0qOj(f6zy6Y3)EmkP})un2gc37z-z zpMADl2Uab7drwFZd7rtwr)2~x^xrR;u?I)Um^>$E$nl#uiaq5T@=h_rpMy=9wp*hw zR>EfZS|j?648RT6R_RlASXJrQJBLSNx|T%-@NbDV+~Y6KVAyLEXPp)y<~KAN9Y7H3 z4#5ey|6qDp(DP5oG^Ec4+%yoq&kzKa4jxBeKo{vzW>pvI9~W|Zwue`HMALHOduIe6{6Gf40 zRLkq<1&{5L2TP>S)b`5l8fWRB@9H;NJ~g6L7`uNCYJ7xGu0_WX!y8n*E2h?~d*n_o z)z>t38Qk&FyCXF?)d^L7v`d>XW|HN4diuv0MOM&r!&)RoHO(3d+e<4FVv zIM&Bs#*1A9dU$XEB1POPbt`fUTx0WxVE6s~u2vq?k(r4?$1xH5+uPlhot8Sk^|j|+ z<;Ds;`#is=0ADlpL^-E`>NyK^HV zP%0cOvzyynZW>O0)U7pjV9f+WW()Oo72Vyvbx3?y7jT}yua~En>kC*bNI$B*D~i5EwtR-PR+E)dDo{=}GMv@e~Jo=F#|ab_Ui3^ZPl zj*_7V>L+e+;<6-J%cYu#^H`HFBM|ri(7NtrF)>n@v@7e;v8E^M29ngLY!|gePuwOG zH*%$9l(}SYGEttK>CHo%CWvCpwjjgD$JHD0se~WB%CNYsoB~d+yy!&Rc9{W5DrEVb zZd0N2!7hwb&I9?aS<*SoJw=J8UF4|K5VV#+Xw!!bMHv##=j0jsKab-5a&%4%MY0v~98iJ4 z?9Uk;!%6D*%aJ|&F3JYXfQwRDzgSW1)S76ku1d|-3>O8xmwvAA7v|M?Ll*{=i? zE;5}7yed-bGu@ZphkjV-lUM-@21k*vbhtwF*$oft>|eZq*pbw04y;i1y-J|`(fC_i zZM!(?)nquXW1|jB@TV^=GRiqmmSU!4hsfD;*pQO#2ScFjQN`PqymvOi@+(fD=+Q0o zR>40M7~Fea4o%(Vq{_JCsjE3+$cW_o#h|gh6DtWf{Ag}nPtw3TywPd`Yh6aED)@D8iZ(Puv5=hi;?ev&|m|%CuVP&vGeS0h=NykRI=q**z z60h@d-2M?JyAOdc!8kg^9b(Y-B8@eecwnFb#5-k!2!)+u(bhkE{&&!vQ8#(JX?oh{ zzr*y3>wpKlprHoa58Qsle}7*bD*MHcxL#*L`>vKYBw)eRgp~m#c6{u3&Z~rxA%sg0 zH7*x3#}>yIR81IYW`e^Hp-&&rFF@mkD_rJEj=OC)RC9~n#e;34 zB8ucD9wIh6e_MT%XxqoAnBp>-7#J;V4uUKF1F9xN$N?m?DQo=jTXR0tNbg=X1LV}H!7!x&-6z@D#<}1l}M|wUee!@W4|eZ zE-ri-P+EYIjgckuXi|^{T(G=<|0AU}Br-NL2O@LyVX)sgW+vn%8R_(#qh9G~!wT$a z|M-?u@I8YuP1|w0#g02jiy+lkdeWC$ssO?dePpkPKNP*Mal{SO^alvrKVtC8(4Tp! z^HN%W6Es(Je!}?y`44yS()^H{GX8Y$Re~TmzzVf=s4A$#6f$!lz#&Od2M*d76UN$IZSD83`o#6EFYrYGq z{S)+_qW9B<5~~hu2a1KJ4;(jyF;r3>ZZUwS1mbs5lw&(KhH()Es}?izw`cI+?7x)-??%CsoK9;>6{ zzD`I6_vk=3VvfF?&3lZ1Viq^ZH+hPn_4;fiYt!uKd1|(1((AufUDb0`UD=E!O50*b z+jL#1#(%21l14=h#ZU}qc26Gu8W%vJlk_7$DMjjU{XOsu4lkrXgroX+Jb;2=cmnOy zZ}2+e3eiM8vhW^t((WV}dfHrPZM4^KxfvZnZ&BZUnQ3P3csN1g>KdGqnC#6XbsaSz z*PkQs)Fs>C$cuog9;bo_?3afb`wO>5utUCcq8Q=3zchtyFid@+Y8R@bt`y)_i9u~s za?+Y_TV;S-IJ!x8+SZl3bwREuYknK$o^u8R#cQEdI8HHJvhm?HNX__AH*T%dzL!_@ zpHpP(_PfPZA2ebp#O%Rj(BgpBx%x;%TwFVa?qwB?QEFLm2sCh3nF8(yxJu``PUoAf z{nHJW)+YnmOUaQor!cx{MX@&(%`UnE``zAgYq`}Aa|{Bt4SzM$CY^LNHt==%bbaT= zN=>HRUh|=>gG+JjruW0Dbr-68sLoZnp0xS{hNBr(W`OhSL*=>=nV z%U^=k{5w&f0}8CB8z6$9kiCcUC|VKDx^VTkY*?OLr)R$Pa z6MvHJfG9W~OSq#INO3)~@{Vx0({U|0^q_8N8vhYAHp4*O#9pKM&7(jC{RY>qFE<}t zfu22LjW2-ov>`XY3>WoHV*NtuYr#E^!yA75XT%X}VR}IdMS98?^vRc zHqgt)Dl^B}DyimTyvhuOf_%c7^Uw+{P+Z}BNa+RpFFtUIU%>#@x4X##o0nWfAdIuC z|I@({>IAWLfv+r7;#r8OA}}kE{O$7mWgnUDwj2H^&H{Vez@i% zNFs=^7Y}f8X8zYI=ybGM90@A;UT z6C>>adZvv`Y~6kJ&C~KscaL!#&fOs5>4taDk%iFRlz;y&T#T5L=Mv{pG9n^dKd@pi zT*hobD$qPd~1Ek_On}pk<}}&>&s@i^<)ORpblTmmY6x zj3X*t)A;3|ng^*KBA1lkK7iN@or3~C$H0A2C%rjjxIO^-ICww)MD=qaXyBjPQ*Pmm z6zZ#+w=+0rn{|8f?gzvtg>SDkI}n~fFp-p7mnhwR7!fVEsdUy*RMP0okS1^J7a7I^ zdInUGLO#ob2+ZNbfXj>~7m%E4OJk;~aknUFj%U^;G>T{7kF^ZnbS=9xKAef-iB!5e zU?||ouINGYLiQK{^pPZ&h)?{gt8fF$vC>r)L2((6jmznLN;xB3p)lz`(x$+${-w)l+WLX>e+#z{KXU3b(zFfTXJ`+)hr%Lc z>75w!kfN^GcUXS6XcgW-G zV%Oqm(gF#-Xi|9=?IC0m7;=ANVN~&bkl5B_#2d%aT|x@QL-&eg$ryqPEGidR#oUxe z&=Ey1-`mym-jqY`H>(%-u4dwZH$nFH$3L@l-+qs~@QH%=3l<=Dqofe?>P-;yszrwz zuHFgw`8E4Kw6f%#;PYC}86jA&_o708Avp|_<~?f9N}^j}kNn`YhPuocZI38ppXz9h zv*BQk#*E8kgUY>bk77)(9^%Wy!C%^&Q9SgX#YC>RdrJ&ZCzU%*3=i*|7~LL&K|Xc* zG|-z-K8)?t@ox37J4cM$!Ow@wURUn|{N3AesE>}qVsxa5Hz*B%Xr$^_W>s21lBN8R zlu(tqexHn%^B_5f&v_$}&UIMo(_4Fx?BUVO_5O%fFjy)5K<%|PWL|nss!TdrD0Y7G z;E}d3h^hJ&wXb%cj@I+A2Gq^#%FYI^o#_19anGx?#7^s9QoVpcoiXLLc2XJZk1`x* zntj3u*)wKvvGQl&52G3$VF!!@>FwWnaRh9&grC|gKP9t2eck&VC64(Oo;HS)!Umcf zZ4fvRb>4+ntoa?z$;cvBJBG6eovpf`q;nPDOg}I((RkI*noA7YBd8mIO*0)~1-acS zJH5upSDst~BOXl?(?ffPLw=?U<>rzc6q2 z_(4(OQXpGkOvrHr!W&-KJf%HZ8&wIdobcrc=aljc3g6JHPo?`4y!kbmp9QHBJ&Eh5 z+-8#X5xK$p`P4;O6M-cV7nm+STSQ`W1=>IzmM3vjBdxYMkNx>yW$}&5^aa+bkNW(~ z_8D=R5YoWH{XQTp2ro{1?BMK}>1xG#_^XItH&DN3Dcypu1|FmFtwdhQ#+;JlFkQ3y!`Qwj8xE0mJ3SN-m9^8h3z%jI9+LNm zG{Ds&C=l#|sisMR~!`4W58e~;umktsyI?nBU)%g+QH2S)e{3v zk0>#g1h3#F#O(`qLjC?&o;1%^gfOO_&^>RilU3cXHu=*S;dHPC+gEbX{YvPg2#a1I zFA1+_yz}ky#qJLf2`$`-eMk=`a(sX%vcyuRw1_Fevqj+s#uU)Jc19TOXW){0XGfsq zt~lc>Y2DEw^p81#|MBZsrMYxvpHjPF%q^d^BQNZqm2eIL5*?A+$x$Wabj)P>_9hQr zK&J&V+ncN@>=nrk<+<03g!U6bbv+3eDZEZECcCIczhr>H0*(&|VD*j*XS@HXIs(|I zy&SoofwPMi)|pEO4vk#*`Z4(H4}`o$2LTRVakG>M^#C{u-0=NO1}9uaX{R;p); zBTsTmb4(heR}K~0x;um=Z-vTYd1JX6!o(a;=Yhf$mI&tGO!GU?_ppfBn#}PsKOuy; zt+Sepg#f>076B9R3?>D7qr8+zgYg8s&o)YS7PV?RE%9(lT8T7L(CkV`wW{ZLD1EdR zXAP7V4i>2y3&|Ltn99Wwe;Iw^$52w+dLQbtx$xTf6yD~-#pd7?2zFc!rI#_K5g+Vs zO5D+8AVRW1|G=O1EnbmUSx=Ma}A}!vHnKiXFGgl7I zR=-Q_%9F*Z*Z|#Ajbi5tqD`TM)=I_%!lr&c2X5v; zm5hm4rdvWYPMF#VoTW0S3t<_GFbeD~Z-D{)5>EH5_1(9A*hiq88G9G24Np{!<8^pl z131z!r1DKYwN+&CK&Os4LJQ_TP7}|k-G;sC{G$;>AP_5HFbh>WC}tkGd|@moaS~sb z9j)t~HZ|VLJev!?&OoTh1t!bpR=zLZd}^4F(R{Ub5}?u&msH8IFD`2@{h-NAT ztxBm$<+|0is|`&>pVOyjTUTsPjm&YA^UFM$;mkuV7^h(>dTbuNz-gOVe!x60BpY7e z5whoQ_c=0GO++o+*!Xbtva1)8hQtiXoEz9V4E`cX6fjK6xo*adj0Ztni zQ;SK4&p|sG6}&TN+{u+m z5>syBaPtGB{S3A|kNKyD%6&+AhNczIj6Vanq2CIqf{-|%&9J~d-8jK4a=k2OIp$u> zXX&{2ayS~o3if*1-L6Q=lKMmXfl-8#%=@6>rRk;-63C{4l0U5bAo(+Us!s>RogF&4 z6)F~`0<00mcQGulo-Wk80tv}|D%1*nxJIyFU>tpia@5y!u&Ev|Z=kwfuxx771>{=N zu4Uvz*isl?kl8VIF(4}sa4ZO$0&MjY*C$THU~bIy#8P_ia; zH!2nx@xYVHKjY1iS6*BWa6yrJS+8Eg{8v{ zdRV!#Ce3Sd82*H3(;c6R`kLP%mUJv?gg^k4vi}WR28vfyN8-akUR^YR4(xA3SjCa@0>)7$=qcSHH+g>oFJjdLNv38uK$2%<0e>v}vKQV% z4`*eelNE|cO`3$VnEWS)?z%Kn<3o?Y8opNMpj@SP7OR~~ZhJe9TTpfRkdQ2h?R5)H zSxq}*=pCK2)cMij#l+GZKj&RD?l7HBeG%PS(d1DelPWq`FCe3_tf8{V4_;5|zLYMk z`h>I%MjyIj))r3!_y-~73ZZ6A<~Zs}x-Q#V>M)H>y3hu=RZO^8!LNPJ?6`XIreVz{iv z8>Rx^_Nh6T@)k0+oXNkP%oA;TDn8Y-pO%S5YD3zo81A9A98fF;BKcu0Ym?$yHYl&P zDkoxGb(U(n3UAz=s=g2!@rP|6XW}g*X%(X|{KE%bkHG&|9j3r;;HH$Cp{0a#jzf?u zXX$CAsBkd?T0Z{hS_I#HS1i-!LF}mu5S!(gTeBjV)!1 zR%;tNpnnTDbrXHp>HZ2f#mF}4h%S!(6SnJhTGXtQ61XIKR+ISrwDe5bnN3E0d^_&- zx&6G^dwKD5n*Tfh&KOL7^`4HG;%QyC5#c};p#7><%Rq~GIi6Aam9J$aDy zrt3``%xTvLm`=wY)^09rrtC5=#7EsC5`xbdpCr= zgx`Gu$b!g2P-3q?<0$;s68&eA)_Im4^naax(LVOnJHUaV(oYcmPAb>SmMMR#ImA z)QPrY^>dV^-|?e@LTtrWoyv0K3OCC$+S<}Z;hJF#$7qvk-loYcF@N%-M!q{QS8<-W zT!>wam=}8*l92<<_1K}aJ?ZY7Kmsm+w^3BCj|o$d?5sNUX?~r0ZUa*R&NvUXJbN}5 zY{D?sb^7-VM$LnjvucYqrEmbGIzfA^jbk~wO$AxU0LSl`kj`wJok{v_o1FzG*fIx) zt@b~{8TkiZ#|5T9^A2PT!+v-cma|x6kdiPzbQZSFxF&?NmF{-}{Uoh=**-hq2}4g4 zezq3pIKrVf2tG&cjci5Jps*GdGJogGCs?yjB2W8@k5q8l%d{U0+ZV<}_X^ubdte9K zm*58bUwV`MFY>qFMTIz-sSbIe`(y2)L9>^sZ>ih`d<4Z!fd#p*HxCiXz9xkbv8^lJ zslf=T-MM{;4*Gnk4mR9XhKvJub`bq0pZyXc%**vS*~3?1LNOf{L=+;4M_#Cb4f{y1 zB_ULIR1m2mJ@P zu=yjU154*;9#-;FO15gEJetQtiii&n8!>6E8K#o^Q#vAK&Yu+N)`Gx!=bD5=cL#pu zxxAA*H!cU`^qkb>uS#NBIi~tlWxN)SRTn$0!cO}NhAlFyCn}?`oa2wMKUb<7b`6N+ zx?WW>b*-=!PGIQ{s(3m$G|Qe=_9w=QaU|mpZQ%9ssdoR$KD$+w+E0W3WXlE6RaOY_ zVI}A3K`x~yxwINovxx)2DrPJU3RtVOUDc>=eIYSBnPOIRRR;g*td*MH%;fH|&pNZy zn|}H!!>q-RX1|1Tg7|vZ0?Vy%tP#eC8Io^y4jtpa2(_IabJ?*ZO_gzoqN*`kkOw|4 zJf+GZp)QWpsWTQ9D@uD>sCycI_IZv+()VCR^-m6|UYBE5@YcW^zL#!v7~C4E^C@HI z#sEQICG%962}QYr-gLP`Znq7=TabN+bU_ZHHnrei9}k(4nBZXZe6G#dW-|0>(0h!yt?&oJMdJ@<;9A6!j8=uSWl z?1maA?8r(dd?|^~DVNua;V+lh%i&-b@QdL=7w}6Zu`Zy1n(mGtH*^GP>D3?C&N`92 z5X~Uy-)Q!k$e>Iskz+a?7(pVoWl9xQmvUb(xOrzeQ2zt!?axbRq z_vQ|J_)EOzO2T2=P2`?)0{ZNM6Fyw3MsIkMY+J?rA=K=K2~zndIX{7-)fdqRqR72< zS-WrWbPs@mXn3NQlD>eoXq4#rR6H6+KZ~rcF9urE(uD)XLgkXcaQJZei_JS7$)um^ zdULmD6is{aFkeuwkOCPochCdW%=)C^5<-AUjA0O!0!0-SF*zrngGb_EAN;~M@!N}) zisz?90473h;@5d2i{Xhn-}bZE5xBS7}0f_?fGYq*# zrCLC$;CD=56T-jIANc4pBQnb*CSn*bCc?R5^89fkF8TSZiDuILFa{rJ!-t^BjO9=y zDdiUA0bC@n;HxWy)r>-uj>HUg(8;BGi*juc*sDBOQX^((C2GMcE=a3ubt8WA+wq^r zX-G=Zwml$F(o;U{UCChF()zHAepZpxsI>3{F%pSS2UD?eBlUd= zhHv;mhXv$@MiAet%X=-oft}VZu($t-AOB~GSi8SJ9smjgf&=*E-j0>=ng+0yLU-sj;$Q{I-IHgZ)( z3d?M6o~HqGex8;u^Ls@7AoRu?!uUQomZ<2K7T(m$JOmItb9mCmBIBf?Dt})S=s0mX z2AOp?Pj5R<*lRNq=rqrV7`?XBsW`)d+eg|uX(&250DQ)Z*pPfD+y z!~8}hbzLmO#gjfJ|A=2#Iv({ach#E4L+|_d!(s`yF>ICpCog_o!zR_^M0_3I!uW2Mn_H3`2v;#+HK;tCRa5;QE@8k>?EPTsG@If-hoAwz9Cb_W%wD9dB z_YVfyh0TS+Wh!c)rSyxMJerg-&61N1(e!KlMjjXz7YHqdxWf<_G#WI>WJ<@w^aP5C z^B)9R9TAtT{HEBq-hOHuSe_|>$>BHlFBuE@CA_pkET)iFcj1=SRxz^>S63+BqErTv z5**_XasQl?ev$85bu5~(6N0uFId-m4jgDIE2>WItlKFS!{CrYyN7ClOpN$GSsbeg( zLdgX@5$Od2l23AYDdnifmkZh`FwgiUSK*?HkgW3ikcF10b1U+kctu2jz+2-CZ~TKH z?Kj4z)7d7K^&(jp^7TX4;t2;vh|{uAg!BUr9?>8{HSS&QPb{*nrjq>pjBak0?KFJU zz2OxcmaOvt{B18U6VTo=j_<+^DV{)_+`YO*capOLuS$JPy|OaxGxB&9l9( z?bk2AU)Fu!olcglGLXSvf`IpJj^Dh%3;nm-O(&O9|JT5S9+;wNb#I$T_y^AXc=kbq$;gh~ae-#Sg16yBG7r}~@1sXK`|lFF zLUDz6XaUnwhfX=yg}Xre#6G2vQ~DRc!0U9NDdd!vgpy)brfSx<{=7 z!@p_FY1xLNZFqmHtW!MOU}!wGj3DqPHHk5vA-?-_`{>jV2l~7@ z)CpVpvcz`9GGt)nm`fff%nL&9T?>Oy@)Em^f2ZP>cl+2UFVY>xl75w1PFxS5R*|Rw z=hRE)+tDW5y)UNW`H_RyX!>^Y=+Zl}(!IA}kM0wJbm1R+pGt*clPyy}fXcQ(CEjU~h6L{LLq+G8mbGAci=6)=-7Mi($5_GLqhMbBajXSX zW?=tQ`}HY+|P%M7u`Szoia z*7G;{mqMLhJA2(m+bUbUh|$6KzbH*1_6E_g3N z7@z84#6(=J$~!Ryg7xldr>MmmH0Mn&BVRUWmUBiHYs#@MnT)n)XQCsG@Xp?OvJocl zRf#0-;Dwz2`Ln%o&r!M#@ExVw=-G+Ei@B|j=Bh>^II#jl7o)i6bK zk+6E^SDUnH36V7TEl7AFJ$37F&%BHt8L-k^)8=3UDkH)vW7nY5V((+eI>atOU)?a9 zz4FQk&y`4Isp~6C$CTL!%V*d8xT(xfwo*A4vFR^WsT4SzJ`lYMP)(!a?jf`rH?!eH z__TlvwtLfOB|4CVbDunP9&)t}jsn{< z*tjO^J|-5BkSJhK#NC?r=Wg7;qnf95rjW08eVmkeySC{E+d>9n_I^ir%~(utm*UZU zLUk6b5rw8`Zg;JBv1x@meo~zTe#Ib+WknwQFf6T4v^MK5U{e*8Y5w;`C$DX_%<{to zDn*$i6HjTQ+7E((IIqi%zDja$oU*PcztV>4=(qnpjkiK0WKeSB)mWhMJSLc9+hLM2 zDG5ptHvT+9Oc!`;3)>N5Wob=~^tA4>OCmU{q)`j zoW~(%kbs$0J^umZHis_`qoQO3w8&A5+n7!pRFCEgkbq>KTL>RlrZHg}&sw5rY>r4( zhT|+rX&}8_`sOf&n?X*aF9zB?MBf*`Xg)G!?$e&UKsM8~ALG78pGz%G+q-sb`K$WM zyjadV(C~D ze5Zdnfg&_~=T^PJJp#;%%W}}+kkMEyw!g>xxyw{<-&VdJf0@$Db+fZoXwqZQJLSS! z(RsWk)je$_r^6Pj*{o6x-pYI!gg6@1{*1FXU<}n9%6ng98~FFp2Tt423of?|uJ)U| zXQVaD?ck7+@codNZK^i(AG82$elEPoODrxKe`^oJ{kwd zf!B_~#5<8tqLcBTq;6P>xWMXu!~GGY(4Z3T2f7f$>^j01mMaW_%fq1+_PLcIO9AXfCLI^RXPCM)G%xc6CPx{~SEmYQjOMXHlf!DCP zgQZEwmJB&ubf6DI0d<>)v?B6~jv40f}3LRQy za^~uqx#ZzsmE-J$@@NJ>wtSd{A}(Pee8GIL?4KH|-s~`j>sG4e;SFkg)t3!AqRn0N zR#5ArJ3w`~Es4(r8#nlLVq7)WS}$;t1*o=xdqrODP8C;n&5w|Ybg#EAY7a^PJWh16 zAp!T;n44fCXDq~iJjiv@BCV_(NTHBrmT(cM%6yD#q0`;wG7E8Ht?Go}T`QhdCxbWM z^q~KK-BqhlOq)u*CJq2#1x;0;imd(m**bDG4ZLTIn+JC{szC)@ZmKX z+Ap{dsGN|z|3!iGOALihjYnny_{8^^v3{;g9H0FmGYI(|V#xlQ@j({~Fc|d*gPlV} z!}OA&D~vWVdlPz0PuljeoGI>^_2l&?VaKq)#8^zje=(RM=m%Qe-M&GD8lex&PZ`9r zLb&4Z&gBjQ`$DiKLNbp_*k!E0ss{ngSnrX1R0}{RCBBXaAy8-HPrnPWQFU*G@P+ri zvkyq$(C22FsZvrqL{SVI(7GyTl0hz~`7}DUvLktpAN~@V6#8CyHG=%s!!H>{O;dff z{vZl9GD#e3!2K{1G`ahaeU^LiVbl$hF|z7kxfY>M>2%;cRZlx~@H>}IUp|yE@E7T_ z>1US;a{0k$82Jl$^-uwv@l^s=R;PzoG~9z}Pz4?Cp`UR~M0OokRyyqXZN4+k0X)T@TbtdJV<_~>rLHm+$0+2r(ZrnzHjtg3b$@Pddv1s|Cvy6)K+ zSoP@VHZpjXMRs!^MWpeJWzOjlZoB&~#CS;?;dYo6b-nk$9ZvyUehd4Zuz%BG()eJ} zwJ`*v?)Al5I|;|Ks@p5%0gRz1zAU0mJ7ybZzX~+3Cjri76C+u{a8>U;!riO#S zc$}=b(+8p&=rB<74^e$=a|AhwYAOz7JncWv;B-V>)D+?0oZT*){4m-ql$!GR(Pn5I zGo=fB)aiukrfnj&oyM13t&7CXO6SMoch~FY2tA~72JC@Takx`-AveCt^sT`h*BFm? zE*T|KcZk}{2r4RV`lC~QlYUCf78Fp+J;_x6x;C8lQ82Z#MtjZ_l~kg81WL(2r-4nl z@yT(5993JF+z-p^qgK6OX-cNsaKfAE4--c{*W4RbePk$bR1R{7pX7;~D`a&Dm{brYw7#BjbP7P7}~)t-9OC_D7Bv80)b`k;waw$3OIVTw9C`N$Hf zV_S)&(Om0}<%DE-=&tAY{^~Wt?J}A&A8algd_Y{+nhVN-`Bc zrfkf1W}wb&HKI#()d(|BTGUeiI3e7ebzaYDnH<3CVI){5tRN%?srXJzn#kXj-=uK~ za`7CM^2S+F4{HN@x}WwanlIG;%kt|cokOJ}S>4T^tNB;fgzw{2`6SNs*VDBkss^Tr zSObm|#2v%2F@&pQs$NS|GkQmk2nL$r#?{iwRi}!;g!Vv6 z0c(Ic;_>NEto|SVTPR5vwgZ$pTD=pNhEOW7%6jDjYd9HuZ?7ZrrZfCaF$(eHGLYUx zNAmKQql{R`Vt=2B0k6Iu+sZG?_oxe}qQqh*kZZ$t?9IfZ_0|1-k^VyWs0Z0d8K?OI z_Pl(2(xbp^eO*r>o3fLal!n&Bz-(9T>pK9Z)hY?;+O)Q|G)o-;$JSbqq3F??=6YDZ zYB=S2xla5-&fN4bg=*(Y#>C0k8Pz#wTok*MG!??5q5%%DJ-6Cm#Q|vq$ag z!6_zVgqzm{!4HeLHenta(AOWw1$7K8?UaeLd}qEFB`>C<2$`KIAUj~~fN)k19_4IB_!C7J))-9CDG4vU+VjCb!3Epa(DcO& z7P|Va9G6+ccUbs%Y_N)dHp-KM0ti1?9k2XI2q3VKJdG5P7MNcJqB!Ja@P6nONcyqU zuAGs?6I#Y6p!AA9uG_e8fAazg<4*A*{vnvQD|fI8ghx|SXN&5EaX}SY$4uc+y$l#q zHYj36S#P8Hk(H%82D`ptvWdzYBr~aG2s;T?G52aWCFC_UhYbK9yCV2{t^NipNf@KZK%w{c)5Nd#?QQ}}5qw|J@ zQCY*FCDzbGqS>05lJTx`dRiwH3sqZ=>nkN!udV8B6o$gk!hDysCpFG_r*e(h0_wNJv z3w(v!AaSon@-Dm|FE{}AEn(bV?20QAvRCFB2*f}2!gqCP08H0Mq&K85nn{Ki0p}X; zOplgjDg(SqE+9Y;;xUxg;{h0C-rCtKx-DnN7hy{3Hp$c^U9+XYS-mdNIMe(kd`W?E zI24(|N20yon=+SlSK}gjtMG4v8p&G9=2vX)&woB|-WiC&-zY%l8#Q`BkR@2_DzY7g z0C-jeiejRrzOKSD#w&+1W7+NEOA!e9G<6rriKUQcjGF;Y1}~YCsrdh@;yS~c*tRGP zMS2fl=pa>!bO=aC=_p7MsUlL8W`a_bP$ET&fuUGvA|0eCT_H#jf&!sP6+#VosRAOM z$IbKJ_ni4LYp=7;p6@%~`7z&~eHNRv&@U>B^fZR(LWOki@8dYzE86^qKPi+)Fq z!vc*s?9_5nQ&P~2o&H9bah!$;N6qJTg21?no>Wa2;idC(Pvt9L^wfakGBSgP%s&! zQl>njcn1fc-log>DQQ->*s|J5HJII^sY#K8q~t&0K0eIf^x&HwkAiP?K1)ZR2YTS6 zZ_)|jo0nD^P_<#l99qUw4k#;3gs%_zYQ=YD&I#JS;}=;rNN1#EWO(Pb3$JhL!;ann zA*2>7>vGP%=P*d}gZ)8`PZ-LCVUO*Q1SJmxAw&eh)g){hDTx>x%zFX_*9l*I?m1oB}B)|Y>4%jn>GZ*s~v%I)Jw8jJKpMUjqO z6-26@wM~H_vY67L@6%>yaeGs+qiSy>+z7JPz4(*x3Jx3QkfdIDI6c-XC!rH5zV!1^j&8AElZQM z>n3c!RIcIK1GxsL*AEkpKW#aZvZf!Vid&JXN8n)wNFQi{qw0~al*(rr$UJZU=Xt8C z`SV|{s0qeaRW{j22nM5WUa1%s)!av$pA(rP-PXKl;*T=Ry*SM!7!s3QV^>_lC(Y=g zTYcl^>k|^w@}H#@VJD;ENl#rnNyUXW=Y`M@OcJ|!RM>LS=V|nevZEu9?6yZ{nJ`LV zX)XU^7t;Uv4J(G{ zO_F<(F9wOJJ6>+S@BTK+4x1ZZUyxNj;vq3>jC2i6=p7LQ?4LSstz1DHx?hU4*i}E~ z>kdh^FEQxiW}YxeUz}z$nGndMlH=>#fgE`3TyPl6Ix!QqN$r+Z)?0^J2a83vizn9x zNqee4C2Wp$(?zv~3%3}?F0->ZWW`uc*i-X7E^0)er<$_aQwdIr1~%)RwRA$hgV_9Tk6OsZXOtY+tWi>~=X2Lgia6 zc*`s=&w5vequlxtoWpnvO35B?r?rOEf)tygh@XvQLNWro1fl*NKHj>ZvwQW)1#pN` zg?2*?ihX0CEH__lZbmR?F@~jxiZfUr36U~OT8g5k4KEI{%u?(M(0TISRkSGVa;8F0 z9~iFG8Ju7%T$pcd7bVxB8LYTbEM=5Jr5#PafzZQ|Se&^9HBWD(mfQ-u^u!Gk{CumM z6ny#0^-4t>Q=I!f?Zl4e!5ivvw3cyqEYFSqM9nI0nhn{1OAfJ)RMVuRlwP%u@xBVm0e|q zSePOtWQtAP5}LouK#-$6J)h6w%CFwb9IU}nh~b}1IFIGEe~3s`T)?~!-|o9Ib@DF6 z<~>01oyGZCBB*9(j_e-}#GK!~Qp(AMXVYfW7LyQ*X!f4SpM-*qreFIku8{K`l4u%b zOtM!=#K_3QZxg;`j6DiL22oTd?nzp3_O*OODS^@j4qq-vV7Kho+U)(f*Y( zx>aLRtA-uuspKS++Oq`OCetR5z4(t~38fJNHpxjUcb!rnBVh{*Xt_}F@{Nu7^Tqzk z-_He%-Q<+3xoB5-t0A*X<>m%Mu0hcxy3Q`bPU*C2K%v-C`ija2;;ZzSCNanY|7ssX zZ)vOYa&xyHxP3)lK^+;0QkCVSA+&9acCTwlUbF_MZ5%sr3Y)``2x*EXq08suOM z;d7ZpGMK-duQ|IE0Bs~Ydnr_S0*`%wK}*F$)uPmc9+gD$iw~sk{ZXOUCdrwpRU<#O zusF{^LLx#e(5u^XBc+5s&rx(3R#vfgP*+J}*$t^vRPyv{V_uy9{Unt$Q ziU!Rbr?nmP<)rAZ7p~befB}!ASs2}zp)$+r#W8{E@k(VIPmmwe&PH^YtHm>wZ*D5` z4(r)7zUIQy&E43&&xv=5R%zyH{nfgwkwrDf6528h3i@np6<^r@p}^P|6KLHI7f|Q> zL=wu``gC-Ug4c0gOY`=!sGuXwjGK}Z^~_f$N7|Wy9i(piOTg#lz}7uadqpYTp0Tu& zJ3wB1f%qp|LnWkX2V3RI%F6Q}#jy*I8)C;6u+LZ8H@_X;y}e%+)-~j|SCS!twUbr6 zOj%H0O*OdB&AZLbrLR4@9w)zbmiUzCc$-lk`YS&$U z8S0c3=}(}?9w3(B%!v;PlD55v!(zaTC{G$O{uI#E&F*%BE(Oi<3-74%chzeq^Bf9W zWwc)UEha1PkY^5rH}6`o<$9-xxWQ8;2XHlsO4^={4NYaw3hb|a`kH&w4%l}PwZu+D zc{!N7)isNpXstDNJf65GE2Wjg{mUm7R+VNWk)@$M7|xGUHSTr7c0($}VD$NAPF5nr zlKS#IV@EGur)m8~b#?$(N^a9eD#L18WkLJyxx+ccF!$7CBB%<)ij{D?tC z%SyShF!tAB6hEM{XB?>I?hR4gw=kUWD$e0#3GLOuw8$7fPeD2TxXXq~+u*7Vje9`B zeX^O_hmiRu_Y*|kKwLpp@VDv(qg`8rjNUC>V|+4vdH#BfuUmef}fm`Fo#u7(Hn>U?K_FE zliW#qg1oBFvxzjqhuNKu`tuB-AJ@}$+N18XFJX9h%-hF&;U^w zocp>JhqA0O{>!}I;1os*mwP~el?$#K%$nZDW2(R@s%qS5(ynLec$J;bswJF&hwCyT zJ(n|PkF!JPcb>#=8Gm7Y<@&x5b4Qof-^MTGg{D%wgOrC2&0GB$peoMO3}(B5i>Qi! z|5iE8Gg$q{?VhG8IgHoRNIfmguC`w|tcxS1<~f9645hY!_Zn~Lv2K(}^Gy7lfIm;M z;D1B-23;mFYE&JF38ZA{oh_D8<=2Y|I#*J)W4Fb_UIO&VVe&vK>@8Ch=lDQGaqzW@;$ z)*Us^O-w@FF@UL>HD)ZUPPM3rh`qLM%+fFrtiwrjxnno`r{wms`7=Ltsp-;?izTAq zwTAcAx84bvLvJ`xujLbNx z4Pkv*!(WgucVbiE$q0I#6xxS#&`6LrdK89cWL4UF|MDDFE~C7P`L6f5e&mR(aR?)L zF*-=}WfJUwSyE+%1IwV(6^j~dMY=xy={AlP9?6XPcDmj-BVyeD^OYeX5%@=S z`pgU8Vg4$50FLMW4aY~c05f4?_*sx2d@;@hx{N{rE6G!e3w$~b-5AzW6sWhMSr)AWQ=ig|ItwLhcHfu znC)-j%9s%MAAk4%5L)X07AgbgH;6ECocs5eV8u8DIB+16>h|>D(zqD+A73GVB*HuW z7P5kzGfd#EQ?ou%cOq5i%0r~`JecVInUWW-e3v+A_U#PV>%j`rf0F>@e1B7#Ktdq+ z^qV=b8VF8*vjUWYK;=m_z%2-z4v+_#rkKFGNhq)pavGimS0>GXS7G2x3O8swr41-Y z5Mgg9BT+a!1qIS0i4+4~37CvMg+ibwUKZ$jLWCH+9&k7DH>3a=)Yh~)aQoRQ)CA4vnLuy`3M6F{M`SX%z||QE0G&$=wF)Ugg=}`B z%3~G^q~`xiznO&r`9=SRhWX4ymHZqO$SwIzvkcED i_W%EDg1>@4`_NK(#)z|gdCiK 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 diff --git a/gradlew.bat b/gradlew.bat index 107acd32c4e..ac1b06f9382 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,89 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From ad68664ab63296df15af3e6f82f33323c96833e4 Mon Sep 17 00:00:00 2001 From: mingyu Date: Mon, 13 Nov 2023 03:35:38 +0800 Subject: [PATCH 22/36] fix checkstyles --- docs/DeveloperGuide.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index 2a102682a7e..a73d952a472 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -586,7 +586,7 @@ Adding developers and clients works the same way, but with different parameters, **Extensions** * 3a. The given details are invalid or in an invalid format. - * 3a1. System requests for the correct data + * 3a1. System requests for the correct data * 3a2. User enters new data
Steps 3a1-3a2 are repeated until the data entered are correct.
Use case resumes from step 4. @@ -671,7 +671,7 @@ Adding developer roles and client roles works the same way, hence add client rol 1. User requests to add a developer role. 2. User enters the role they want to add. -3. System validates if user's inputs are valid. +3. System validates if user's inputs are valid. 4. System validates if user's inputs can be added. 5. System adds the developer to the data. @@ -684,7 +684,7 @@ Adding developer roles and client roles works the same way, hence add client rol
Use case resumes from step 4. * 4a. User enters an existing role - * 4a1. System informs users this role exists + * 4a1. System informs users this role exists * 4a2. User enters new role
Steps 4a1-4a2 are repeated until the data entered is not empty
Use case resumes from step 5. @@ -816,7 +816,7 @@ people with repeated the details. ### Case-sensitive validation checks for adding roles **Current Behavior:** Two similar roles with different cases can both be added. `Developer` and `developer` can exist at the same time.
-**Enhanced Behavior:** Two same words that are only differentiated by case should not be able to be added in as a role. +**Enhanced Behavior:** Two same words that are only differentiated by case should not be able to be added in as a role. ### Deadlines cannot be any date **Current Behavior:** Deadlines for projects can be any date such at year 0001.
From 917bfea6011e6f04489bd49f97c6eb071f04bff0 Mon Sep 17 00:00:00 2001 From: mingyu Date: Mon, 13 Nov 2023 03:38:52 +0800 Subject: [PATCH 23/36] fix CI --- gradlew.bat | 178 ++++++++++++++++++++++++++-------------------------- 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/gradlew.bat b/gradlew.bat index ac1b06f9382..107acd32c4e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,89 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From b2459d52fc5de57f9b38637df1a329dee7ae5258 Mon Sep 17 00:00:00 2001 From: emzm2023 Date: Mon, 13 Nov 2023 03:44:18 +0800 Subject: [PATCH 24/36] Write tests for edit commands --- ClientRoles.txt | 8 + DeveloperRoles.txt | 6 + .../logic/commands/CommandTestUtil.java | 19 +- .../logic/commands/{add => }/ModelStub.java | 2 +- .../commands/add/AddClientCommandTest.java | 1 + .../commands/add/AddDeveloperCommandTest.java | 1 + .../commands/edit/EditClientCommandTest.java | 233 ++++++++++++----- .../edit/EditClientDescriptorTest.java | 76 ++++++ .../edit/EditDeveloperCommandTest.java | 235 +++++++++++++----- .../edit/EditDeveloperDescriptorTest.java | 4 +- .../commands/edit/EditProjectCommandTest.java | 211 ++++++++++++++++ .../address/testutil/DeveloperBuilder.java | 18 +- .../testutil/EditClientDescriptorBuilder.java | 3 +- .../EditProjectDescriptorBuilder.java | 86 +++++++ .../address/testutil/ProjectBuilder.java | 1 + .../address/testutil/TypicalClients.java | 18 +- .../address/testutil/TypicalDevelopers.java | 21 +- .../address/testutil/TypicalIndexes.java | 2 + 18 files changed, 801 insertions(+), 144 deletions(-) create mode 100644 ClientRoles.txt create mode 100644 DeveloperRoles.txt rename src/test/java/seedu/address/logic/commands/{add => }/ModelStub.java (99%) create mode 100644 src/test/java/seedu/address/logic/commands/edit/EditClientDescriptorTest.java create mode 100644 src/test/java/seedu/address/logic/commands/edit/EditProjectCommandTest.java create mode 100644 src/test/java/seedu/address/testutil/EditProjectDescriptorBuilder.java diff --git a/ClientRoles.txt b/ClientRoles.txt new file mode 100644 index 00000000000..0480180b791 --- /dev/null +++ b/ClientRoles.txt @@ -0,0 +1,8 @@ +Manager +Developer +HR +Client +damn +c +h +dev diff --git a/DeveloperRoles.txt b/DeveloperRoles.txt new file mode 100644 index 00000000000..dba8afbf9c5 --- /dev/null +++ b/DeveloperRoles.txt @@ -0,0 +1,6 @@ +Frontend Developer +Backend Developer +Developer +damn +d +dog diff --git a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java index 31b0995285b..233c910eabf 100644 --- a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java +++ b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java @@ -71,6 +71,7 @@ public class CommandTestUtil { public static final String VALID_PROJECT_2_AMY = "ProjectB"; public static final String VALID_PROJECT_1_BOB = "ProjectC"; public static final String VALID_PROJECT_2_BOB = "ProjectD"; + public static final String VALID_PROJECT_3_BOB = "Project C"; public static final String VALID_PROJECT_1_CALEB = "ProjectC"; public static final String VALID_PROJECT_2_CALEB = "ProjectD"; public static final String VALID_PROJECT_1_DAN = "ProjectA"; @@ -128,7 +129,9 @@ public class CommandTestUtil { public static final String VALID_PROJECT_DESCRIPTION_APPLEAPP = "Developing the AppleApp"; public static final String VALID_PROJECT_DESCRIPTION_GOOGLEAPP = "Working on the GoogleApp"; public static final String VALID_PROJECT_DESCRIPTION_ANDROIDAPP = "AndroidApp development"; - + public static final String VALID_FULL_PROJECT_DEADLINE_1 = "31-12-2019,Develop front end interface,HIGH,0"; + public static final String VALID_FULL_PROJECT_DEADLINE_2 = "01-02-2020,Develop back end,HIGH,0"; + public static final String INVALID_FULL_PROJECT_DEADLINE_1 = "30-02-2020,Develop back end,HIGH,0"; public static final String VALID_PROJECT_DEADLINE_APPLEAPP = "2023-12-31"; public static final String VALID_PROJECT_DEADLINE_GOOGLEAPP = "2023-11-30"; public static final String VALID_PROJECT_DEADLINE_ANDROIDAPP = "2023-10-31"; @@ -182,7 +185,6 @@ public class CommandTestUtil { DESC_DAN = new EditClientDescriptorBuilder().withName(VALID_NAME_DAN).withPhone(VALID_PHONE_DAN) .withAddress(VALID_ADDRESS_DAN).withEmail(VALID_EMAIL_DAN).withProjects(VALID_PROJECT_1_DAN) .withDocument(VALID_DOCUMENT_DAN).build(); - } /** @@ -232,8 +234,17 @@ public static void assertClientCommandSuccess(Command command, Model actualModel false, TabIndex.Client); assertCommandSuccess(command, actualModel, expectedCommandResult, expectedModel); } - - + + /** + * Convenience wrapper to {@link #assertCommandSuccess(Command, Model, CommandResult, Model)} + * that takes a string {@code expectedMessage}. + */ + public static void assertDeveloperCommandSuccess(Command command, Model actualModel, String expectedMessage, + Model expectedModel) { + CommandResult expectedCommandResult = new CommandResult(expectedMessage, false, + false, TabIndex.Developer); + assertCommandSuccess(command, actualModel, expectedCommandResult, expectedModel); + } /** diff --git a/src/test/java/seedu/address/logic/commands/add/ModelStub.java b/src/test/java/seedu/address/logic/commands/ModelStub.java similarity index 99% rename from src/test/java/seedu/address/logic/commands/add/ModelStub.java rename to src/test/java/seedu/address/logic/commands/ModelStub.java index 7479dd9a921..c65b1ffa5b6 100644 --- a/src/test/java/seedu/address/logic/commands/add/ModelStub.java +++ b/src/test/java/seedu/address/logic/commands/ModelStub.java @@ -1,4 +1,4 @@ -package seedu.address.logic.commands.add; +package seedu.address.logic.commands; import java.nio.file.Path; import java.util.function.Predicate; diff --git a/src/test/java/seedu/address/logic/commands/add/AddClientCommandTest.java b/src/test/java/seedu/address/logic/commands/add/AddClientCommandTest.java index d8a84e37c62..63bf509ecbf 100644 --- a/src/test/java/seedu/address/logic/commands/add/AddClientCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/add/AddClientCommandTest.java @@ -13,6 +13,7 @@ import seedu.address.logic.Messages; import seedu.address.logic.commands.CommandResult; +import seedu.address.logic.commands.ModelStub; import seedu.address.logic.commands.exceptions.CommandException; import seedu.address.model.AddressBook; import seedu.address.model.ReadOnlyAddressBook; diff --git a/src/test/java/seedu/address/logic/commands/add/AddDeveloperCommandTest.java b/src/test/java/seedu/address/logic/commands/add/AddDeveloperCommandTest.java index 84a7ffb0129..fafba5e24ea 100644 --- a/src/test/java/seedu/address/logic/commands/add/AddDeveloperCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/add/AddDeveloperCommandTest.java @@ -13,6 +13,7 @@ import seedu.address.logic.Messages; import seedu.address.logic.commands.CommandResult; +import seedu.address.logic.commands.ModelStub; import seedu.address.logic.commands.exceptions.CommandException; import seedu.address.model.AddressBook; import seedu.address.model.ReadOnlyAddressBook; diff --git a/src/test/java/seedu/address/logic/commands/edit/EditClientCommandTest.java b/src/test/java/seedu/address/logic/commands/edit/EditClientCommandTest.java index 4a4866a1920..11c28403407 100644 --- a/src/test/java/seedu/address/logic/commands/edit/EditClientCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/edit/EditClientCommandTest.java @@ -7,10 +7,15 @@ import static seedu.address.logic.commands.CommandTestUtil.DESC_DAN; import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB; import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_CALEB; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_1_BOB; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_2_BOB; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_3_BOB; import static seedu.address.logic.commands.CommandTestUtil.assertClientCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure; import static seedu.address.logic.commands.CommandTestUtil.showClientAtIndex; import static seedu.address.testutil.TypicalClients.getTypicalAddressBook; +import static seedu.address.testutil.TypicalClients.getTypicalAddressBookWithProjects; import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON; import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON; @@ -33,10 +38,11 @@ */ public class EditClientCommandTest { - private final Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + private final Model model_no_projects = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + private final Model model_with_projects = new ModelManager(getTypicalAddressBookWithProjects(), new UserPrefs()); @Test - public void execute_allFieldsSpecifiedUnfilteredList_success() { + public void execute_allFieldsSpecifiedNoProjectEditUnfilteredListNoProjects_success() { Client editedClient = new ClientBuilder().build(); EditClientCommand.EditClientDescriptor descriptor = new EditClientDescriptorBuilder(editedClient) .build(); @@ -45,101 +51,192 @@ public void execute_allFieldsSpecifiedUnfilteredList_success() { String expectedMessage = String.format(EditClientCommand.MESSAGE_EDIT_CLIENT_SUCCESS, Messages.format(editedClient)); - Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs()); - expectedModel.setClient(model.getFilteredClientList().get(0), editedClient); + Model expectedModel = new ModelManager(new AddressBook(model_no_projects.getAddressBook()), new UserPrefs()); + expectedModel.setClient(model_no_projects.getFilteredClientList().get(0), editedClient); - assertClientCommandSuccess(editCommand, model, expectedMessage, expectedModel); + assertClientCommandSuccess(editCommand, model_no_projects, expectedMessage, expectedModel); } - // Project needs to be created - /*@Test - public void execute_someFieldsSpecifiedUnfilteredList_success() { - Index indexLastDeveloper = Index.fromOneBased(model.getFilteredDeveloperList().size()); - Developer lastDeveloper = model.getFilteredDeveloperList().get(indexLastDeveloper.getZeroBased()); + @Test + public void execute_allFieldsSpecifiedNoProjectEditUnfilteredListWithProjects_success() { + Client editedClient = new ClientBuilder().build(); + EditClientCommand.EditClientDescriptor descriptor = new EditClientDescriptorBuilder(editedClient) + .build(); + EditClientCommand editCommand = new EditClientCommand(INDEX_FIRST_PERSON, descriptor); + + String expectedMessage = String.format(EditClientCommand.MESSAGE_EDIT_CLIENT_SUCCESS, + Messages.format(editedClient)); + + Model expectedModel = new ModelManager(new AddressBook(model_with_projects.getAddressBook()), new UserPrefs()); + expectedModel.setClient(model_with_projects.getFilteredClientList().get(0), editedClient); - DeveloperBuilder developerInList = new DeveloperBuilder(lastDeveloper); - Developer editedDeveloper = developerInList.withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB) - .withProjects(VALID_PROJECT_1_BOB).build(); + assertClientCommandSuccess(editCommand, model_with_projects, expectedMessage, expectedModel); + } + + @Test + public void execute_someFieldsSpecifiedValidProjectEditUnfilteredListWithProjects_success() { + Index indexLastClient = Index.fromOneBased(model_with_projects.getFilteredClientList().size()); + Client lastClient = model_with_projects.getFilteredClientList().get(indexLastClient.getZeroBased()); - EditDeveloperCommand.EditDeveloperDescriptor descriptor = new EditDeveloperDescriptorBuilder() + ClientBuilder clientInList = new ClientBuilder(lastClient); + Client editedClient = clientInList.withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB) + .withProjects(VALID_PROJECT_3_BOB).build(); + + EditClientCommand.EditClientDescriptor descriptor = new EditClientDescriptorBuilder() .withName(VALID_NAME_BOB) - .withPhone(VALID_PHONE_BOB).withProjects(VALID_PROJECT_1_BOB).build(); - EditDeveloperCommand editCommand = new EditDeveloperCommand(indexLastDeveloper, descriptor); + .withPhone(VALID_PHONE_BOB).withProjects(VALID_PROJECT_3_BOB).build(); + EditClientCommand editCommand = new EditClientCommand(indexLastClient, descriptor); - String expectedMessage = String.format(EditDeveloperCommand.MESSAGE_EDIT_DEVELOPER_SUCCESS, - Messages.format(editedDeveloper)); + String expectedMessage = String.format(EditClientCommand.MESSAGE_EDIT_CLIENT_SUCCESS, + Messages.format(editedClient)); - Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs()); - expectedModel.setDeveloper(lastDeveloper, editedDeveloper); + Model expectedModel = new ModelManager(new AddressBook(model_with_projects.getAddressBook()), new UserPrefs()); + expectedModel.setClient(lastClient, editedClient); - assertCommandSuccess(editCommand, model, expectedMessage, expectedModel); - }*/ + assertClientCommandSuccess(editCommand, model_with_projects, expectedMessage, expectedModel); + } - // Project needs to be created - /* @Test - public void execute_noFieldSpecifiedUnfilteredList_success() { - EditDeveloperCommand editCommand = new EditDeveloperCommand(INDEX_FIRST_PERSON, - new EditDeveloperCommand.EditDeveloperDescriptor()); - Developer editedDeveloper = model.getFilteredDeveloperList().get(INDEX_FIRST_PERSON.getZeroBased()); + public void execute_someFieldsSpecifiedInvalidProjectEditUnfilteredListWithProjects_failure() { + Index indexLastClient = Index.fromOneBased(model_with_projects.getFilteredClientList().size()); + + EditClientCommand.EditClientDescriptor descriptor = new EditClientDescriptorBuilder() + .withName(VALID_NAME_BOB) + .withPhone(VALID_PHONE_BOB).withProjects(VALID_PROJECT_2_BOB).build(); + EditClientCommand editCommand = new EditClientCommand(indexLastClient, descriptor); - String expectedMessage = String.format(EditDeveloperCommand.MESSAGE_EDIT_DEVELOPER_SUCCESS, - Messages.format(editedDeveloper)); + String expectedMessage = String.format(Messages.MESSAGE_NONEXISTENT_PROJECT, VALID_PROJECT_2_BOB); + + assertCommandFailure(editCommand, model_with_projects, expectedMessage); + } - Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs()); + @Test + public void execute_allFieldsSpecifiedValidProjectEditUnfilteredListWithProjects_success() { + Client editedClient = new ClientBuilder().withProjects(VALID_PROJECT_3_BOB).build(); + EditClientCommand.EditClientDescriptor descriptor = new EditClientDescriptorBuilder(editedClient) + .build(); + EditClientCommand editCommand = new EditClientCommand(INDEX_FIRST_PERSON, descriptor); + + String expectedMessage = String.format(EditClientCommand.MESSAGE_EDIT_CLIENT_SUCCESS, + Messages.format(editedClient)); - assertCommandSuccess(editCommand, model, expectedMessage, expectedModel); - }*/ + Model expectedModel = new ModelManager(new AddressBook(model_with_projects.getAddressBook()), new UserPrefs()); + expectedModel.setClient(model_with_projects.getFilteredClientList().get(0), editedClient); - // Project needs to be created - /* @Test - public void execute_filteredList_success() { - showDeveloperAtIndex(model, INDEX_FIRST_PERSON); + assertClientCommandSuccess(editCommand, model_with_projects, expectedMessage, expectedModel); + } + +// @Test +// public void execute_noFieldSpecifiedUnfilteredList_success() { +// EditClientCommand editCommand = new EditClientCommand(INDEX_FIRST_PERSON, +// new EditClientCommand.EditClientDescriptor()); +// Client editedClient = model_no_projects.getFilteredClientList().get(INDEX_FIRST_PERSON.getZeroBased()); +// +// String expectedMessage = String.format(EditClientCommand.MESSAGE_EDIT_CLIENT_SUCCESS, +// Messages.format(editedClient)); +// +// Model expectedModel = new ModelManager(new AddressBook(model_no_projects.getAddressBook()), new UserPrefs()); +// +// assertClientCommandSuccess(editCommand, model_no_projects, expectedMessage, expectedModel); +// } + + @Test + public void execute_filteredListValidProjectEditWithProjects_success() { + showClientAtIndex(model_with_projects, INDEX_FIRST_PERSON); - Developer developerInFilteredList = model.getFilteredDeveloperList().get(INDEX_FIRST_PERSON.getZeroBased()); - Developer editedDeveloper = new DeveloperBuilder(developerInFilteredList).withName(VALID_NAME_BOB).build(); - EditDeveloperCommand editCommand = new EditDeveloperCommand(INDEX_FIRST_PERSON, - new EditDeveloperDescriptorBuilder().withName(VALID_NAME_BOB).build()); + Client clientInFilteredList = model_with_projects.getFilteredClientList(). + get(INDEX_FIRST_PERSON.getZeroBased()); + Client editedClient = new ClientBuilder(clientInFilteredList).withName(VALID_NAME_BOB) + .withProjects(VALID_PROJECT_3_BOB).build(); + EditClientCommand editCommand = new EditClientCommand(INDEX_FIRST_PERSON, + new EditClientDescriptorBuilder().withName(VALID_NAME_BOB).withProjects(VALID_PROJECT_3_BOB) + .build()); - String expectedMessage = String.format(EditDeveloperCommand.MESSAGE_EDIT_DEVELOPER_SUCCESS, - Messages.format(editedDeveloper)); + String expectedMessage = String.format(EditClientCommand.MESSAGE_EDIT_CLIENT_SUCCESS, + Messages.format(editedClient)); - Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs()); - expectedModel.setDeveloper(model.getFilteredDeveloperList().get(0), editedDeveloper); + Model expectedModel = new ModelManager(new AddressBook(model_with_projects.getAddressBook()), new UserPrefs()); + expectedModel.setClient(model_with_projects.getFilteredClientList().get(0), editedClient); - assertCommandSuccess(editCommand, model, expectedMessage, expectedModel); - }*/ + assertClientCommandSuccess(editCommand, model_with_projects, expectedMessage, expectedModel); + } @Test - public void execute_duplicateClientUnfilteredList_failure() { - Client firstClient = model.getFilteredClientList().get(INDEX_FIRST_PERSON.getZeroBased()); + public void execute_filteredListInvalidProjectEditWithProjects_failure() { + showClientAtIndex(model_with_projects, INDEX_FIRST_PERSON); + + EditClientCommand editCommand = new EditClientCommand(INDEX_FIRST_PERSON, + new EditClientDescriptorBuilder().withName(VALID_NAME_BOB).withProjects(VALID_PROJECT_2_BOB) + .build()); + + String expectedMessage = String.format(Messages.MESSAGE_NONEXISTENT_PROJECT, VALID_PROJECT_2_BOB); + + assertCommandFailure(editCommand, model_with_projects, expectedMessage); + } + + @Test + public void execute_duplicateClientUnfilteredListNoProjects_failure() { + Client firstClient = model_no_projects.getFilteredClientList().get(INDEX_FIRST_PERSON.getZeroBased()); + EditClientCommand.EditClientDescriptor descriptor = new EditClientDescriptorBuilder(firstClient) + .build(); + EditClientCommand editCommand = new EditClientCommand(INDEX_SECOND_PERSON, descriptor); + + assertCommandFailure(editCommand, model_no_projects, EditClientCommand.MESSAGE_DUPLICATE_CLIENT); + } + + @Test + public void execute_duplicateClientUnfilteredListWithProjects_failure() { + Client firstClient = model_with_projects.getFilteredClientList().get(INDEX_FIRST_PERSON.getZeroBased()); EditClientCommand.EditClientDescriptor descriptor = new EditClientDescriptorBuilder(firstClient) .build(); EditClientCommand editCommand = new EditClientCommand(INDEX_SECOND_PERSON, descriptor); - assertCommandFailure(editCommand, model, EditClientCommand.MESSAGE_DUPLICATE_CLIENT); + assertCommandFailure(editCommand, model_with_projects, EditClientCommand.MESSAGE_DUPLICATE_CLIENT); } @Test - public void execute_duplicateClientFilteredList_failure() { - showClientAtIndex(model, INDEX_FIRST_PERSON); + public void execute_duplicateClientFilteredListNoProjects_failure() { + showClientAtIndex(model_no_projects, INDEX_FIRST_PERSON); // edit client in filtered list into a duplicate in address book - Client clientInList = model.getAddressBook().getClientList().get(INDEX_SECOND_PERSON.getZeroBased()); + Client clientInList = model_no_projects.getAddressBook().getClientList().get(INDEX_SECOND_PERSON.getZeroBased()); EditClientCommand editCommand = new EditClientCommand(INDEX_FIRST_PERSON, new EditClientDescriptorBuilder(clientInList).build()); - assertCommandFailure(editCommand, model, EditClientCommand.MESSAGE_DUPLICATE_CLIENT); + assertCommandFailure(editCommand, model_no_projects, EditClientCommand.MESSAGE_DUPLICATE_CLIENT); } @Test - public void execute_invalidClientIndexUnfilteredList_failure() { - Index outOfBoundIndex = Index.fromOneBased(model.getFilteredClientList().size() + 1); + public void execute_duplicateClientFilteredListWithProjects_failure() { + showClientAtIndex(model_with_projects, INDEX_FIRST_PERSON); + + // edit client in filtered list into a duplicate in address book + Client clientInList = model_with_projects.getAddressBook().getClientList(). + get(INDEX_SECOND_PERSON.getZeroBased()); + EditClientCommand editCommand = new EditClientCommand(INDEX_FIRST_PERSON, + new EditClientDescriptorBuilder(clientInList).build()); + + assertCommandFailure(editCommand, model_with_projects, EditClientCommand.MESSAGE_DUPLICATE_CLIENT); + } + + @Test + public void execute_invalidClientIndexUnfilteredListNoProjects_failure() { + Index outOfBoundIndex = Index.fromOneBased(model_no_projects.getFilteredClientList().size() + 1); EditClientCommand.EditClientDescriptor descriptor = new EditClientDescriptorBuilder() .withName(VALID_NAME_CALEB).build(); EditClientCommand editCommand = new EditClientCommand(outOfBoundIndex, descriptor); - assertCommandFailure(editCommand, model, Messages.MESSAGE_INVALID_CLIENT_DISPLAYED_INDEX); + assertCommandFailure(editCommand, model_no_projects, Messages.MESSAGE_INVALID_CLIENT_DISPLAYED_INDEX); + } + + @Test + public void execute_invalidClientIndexUnfilteredListWithProjects_failure() { + Index outOfBoundIndex = Index.fromOneBased(model_with_projects.getFilteredClientList().size() + 1); + EditClientCommand.EditClientDescriptor descriptor = new EditClientDescriptorBuilder() + .withName(VALID_NAME_CALEB).build(); + EditClientCommand editCommand = new EditClientCommand(outOfBoundIndex, descriptor); + + assertCommandFailure(editCommand, model_with_projects, Messages.MESSAGE_INVALID_CLIENT_DISPLAYED_INDEX); } /** @@ -147,16 +244,30 @@ public void execute_invalidClientIndexUnfilteredList_failure() { * but smaller than size of address book */ @Test - public void execute_invalidClientIndexFilteredList_failure() { - showClientAtIndex(model, INDEX_FIRST_PERSON); + public void execute_invalidClientIndexFilteredListNoProjects_failure() { + showClientAtIndex(model_no_projects, INDEX_FIRST_PERSON); + Index outOfBoundIndex = INDEX_SECOND_PERSON; + // ensures that outOfBoundIndex is still in bounds of address book list + assertTrue(outOfBoundIndex.getZeroBased() < model_no_projects.getAddressBook().getClientList().size()); + + EditClientCommand editCommand = new EditClientCommand(outOfBoundIndex, + new EditClientDescriptorBuilder().withName(VALID_NAME_BOB).build()); + + assertCommandFailure(editCommand, model_no_projects, Messages.MESSAGE_INVALID_CLIENT_DISPLAYED_INDEX); + } + + @Test + public void execute_invalidClientIndexFilteredListWithProjects_failure() { + showClientAtIndex(model_with_projects, INDEX_FIRST_PERSON); Index outOfBoundIndex = INDEX_SECOND_PERSON; // ensures that outOfBoundIndex is still in bounds of address book list - assertTrue(outOfBoundIndex.getZeroBased() < model.getAddressBook().getClientList().size()); + assertTrue(outOfBoundIndex.getZeroBased() < model_with_projects.getAddressBook() + .getClientList().size()); EditClientCommand editCommand = new EditClientCommand(outOfBoundIndex, new EditClientDescriptorBuilder().withName(VALID_NAME_BOB).build()); - assertCommandFailure(editCommand, model, Messages.MESSAGE_INVALID_CLIENT_DISPLAYED_INDEX); + assertCommandFailure(editCommand, model_with_projects, Messages.MESSAGE_INVALID_CLIENT_DISPLAYED_INDEX); } @Test diff --git a/src/test/java/seedu/address/logic/commands/edit/EditClientDescriptorTest.java b/src/test/java/seedu/address/logic/commands/edit/EditClientDescriptorTest.java new file mode 100644 index 00000000000..8ec3305b25f --- /dev/null +++ b/src/test/java/seedu/address/logic/commands/edit/EditClientDescriptorTest.java @@ -0,0 +1,76 @@ +package seedu.address.logic.commands.edit; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static seedu.address.logic.commands.CommandTestUtil.DESC_CALEB; +import static seedu.address.logic.commands.CommandTestUtil.DESC_DAN; +import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_DAN; +import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_DAN; +import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_DAN; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_DAN; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_1_DAN; + +import org.junit.jupiter.api.Test; + +import seedu.address.testutil.EditClientDescriptorBuilder; + +public class EditClientDescriptorTest { + + @Test + public void equals() { + // same values -> returns true + EditClientCommand.EditClientDescriptor descriptorWithSameValues = + new EditClientCommand.EditClientDescriptor(DESC_CALEB); + assertEquals(DESC_CALEB, descriptorWithSameValues); + + // same object -> returns true + assertEquals(DESC_CALEB, DESC_CALEB); + + // null -> returns false + assertNotEquals(null, DESC_CALEB); + + // different types -> returns false + assertNotEquals(5, DESC_CALEB); + + // different values -> returns false + assertNotEquals(DESC_CALEB, DESC_DAN); + + // different name -> returns false + EditClientCommand.EditClientDescriptor editedCaleb = new EditClientDescriptorBuilder(DESC_CALEB) + .withName(VALID_NAME_DAN).build(); + assertNotEquals(DESC_CALEB, editedCaleb); + + // different phone -> returns false + editedCaleb = new EditClientDescriptorBuilder(DESC_CALEB).withPhone(VALID_PHONE_DAN).build(); + assertNotEquals(DESC_CALEB, editedCaleb); + + // different email -> returns false + editedCaleb = new EditClientDescriptorBuilder(DESC_CALEB).withEmail(VALID_EMAIL_DAN).build(); + assertNotEquals(DESC_CALEB, editedCaleb); + + // different address -> returns false + editedCaleb = new EditClientDescriptorBuilder(DESC_CALEB).withAddress(VALID_ADDRESS_DAN).build(); + assertNotEquals(DESC_CALEB, editedCaleb); + + // different tags -> returns false + editedCaleb = new EditClientDescriptorBuilder(DESC_CALEB).withProjects(VALID_PROJECT_1_DAN).build(); + assertNotEquals(DESC_CALEB, editedCaleb); + } + + @Test + public void toStringMethod() { + EditClientCommand.EditClientDescriptor editClientDescriptor = + new EditClientDescriptorBuilder().build(); + String expected = EditClientCommand.EditClientDescriptor.class.getCanonicalName() + "{name=" + + editClientDescriptor.getName().orElse(null) + ", phone=" + + editClientDescriptor.getPhone().orElse(null) + ", email=" + + editClientDescriptor.getEmail().orElse(null) + ", address=" + + editClientDescriptor.getAddress().orElse(null) + ", projects=" + + editClientDescriptor.getProjects().orElse(null) + ", role=" + + editClientDescriptor.getRole().orElse(null) + ", organisation=" + + editClientDescriptor.getOrganisation().orElse(null) + ", document=" + + editClientDescriptor.getDocument().orElse(null) + "}"; + + assertEquals(expected, editClientDescriptor.toString()); + } +} diff --git a/src/test/java/seedu/address/logic/commands/edit/EditDeveloperCommandTest.java b/src/test/java/seedu/address/logic/commands/edit/EditDeveloperCommandTest.java index b791ac15609..0f4c2fc41f0 100644 --- a/src/test/java/seedu/address/logic/commands/edit/EditDeveloperCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/edit/EditDeveloperCommandTest.java @@ -6,10 +6,15 @@ 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_NAME_BOB; +import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_CALEB; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_2_BOB; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_3_BOB; +import static seedu.address.logic.commands.CommandTestUtil.assertDeveloperCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure; -import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.showDeveloperAtIndex; import static seedu.address.testutil.TypicalDevelopers.getTypicalAddressBook; +import static seedu.address.testutil.TypicalDevelopers.getTypicalAddressBookWithProjects; import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON; import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PERSON; @@ -28,14 +33,15 @@ import seedu.address.testutil.EditDeveloperDescriptorBuilder; /** - * Contains integration tests (interaction with the Model) and unit tests for EditCommand. + * Contains integration tests (interaction with the Model) and unit tests for EditDeveloperCommand. */ public class EditDeveloperCommandTest { - private final Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + private final Model model_no_projects = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + private final Model model_with_projects = new ModelManager(getTypicalAddressBookWithProjects(), new UserPrefs()); @Test - public void execute_allFieldsSpecifiedUnfilteredList_success() { + public void execute_allFieldsSpecifiedNoProjectEditUnfilteredListNoProjects_success() { Developer editedDeveloper = new DeveloperBuilder().build(); EditDeveloperCommand.EditDeveloperDescriptor descriptor = new EditDeveloperDescriptorBuilder(editedDeveloper) .build(); @@ -44,43 +50,86 @@ public void execute_allFieldsSpecifiedUnfilteredList_success() { String expectedMessage = String.format(EditDeveloperCommand.MESSAGE_EDIT_DEVELOPER_SUCCESS, Messages.format(editedDeveloper)); - Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs()); - expectedModel.setDeveloper(model.getFilteredDeveloperList().get(0), editedDeveloper); + Model expectedModel = new ModelManager(new AddressBook(model_no_projects.getAddressBook()), new UserPrefs()); + expectedModel.setDeveloper(model_no_projects.getFilteredDeveloperList().get(0), editedDeveloper); - assertCommandSuccess(editCommand, model, expectedMessage, expectedModel); + assertDeveloperCommandSuccess(editCommand, model_no_projects, expectedMessage, expectedModel); } - // need to build a project first - /*@Test - public void execute_someFieldsSpecifiedUnfilteredList_success() { - AddressBookParser.unlock(); - Index indexLastPerson = Index.fromOneBased(model.getFilteredDeveloperList().size()); - Developer lastDeveloper = model.getFilteredDeveloperList().get(indexLastPerson.getZeroBased()); + @Test + public void execute_allFieldsSpecifiedNoProjectEditUnfilteredListWithProjects_success() { + Developer editedDeveloper = new DeveloperBuilder().build(); + EditDeveloperCommand.EditDeveloperDescriptor descriptor = new EditDeveloperDescriptorBuilder(editedDeveloper) + .build(); + EditDeveloperCommand editCommand = new EditDeveloperCommand(INDEX_FIRST_PERSON, descriptor); + + String expectedMessage = String.format(EditDeveloperCommand.MESSAGE_EDIT_DEVELOPER_SUCCESS, + Messages.format(editedDeveloper)); - DeveloperBuilder personInList = new DeveloperBuilder(lastDeveloper); - Developer editedDeveloper = personInList.withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB) - .withProjects(VALID_PROJECT_1_BOB).build(); + Model expectedModel = new ModelManager(new AddressBook(model_with_projects.getAddressBook()), new UserPrefs()); + expectedModel.setDeveloper(model_with_projects.getFilteredDeveloperList().get(0), editedDeveloper); + + assertDeveloperCommandSuccess(editCommand, model_with_projects, expectedMessage, expectedModel); + } + + @Test + public void execute_someFieldsSpecifiedValidProjectEditUnfilteredListWithProjects_success() { + Index indexLastDeveloper = Index.fromOneBased(model_with_projects.getFilteredDeveloperList().size()); + Developer lastDeveloper = model_with_projects.getFilteredDeveloperList().get(indexLastDeveloper.getZeroBased()); + + DeveloperBuilder developerInList = new DeveloperBuilder(lastDeveloper); + Developer editedDeveloper = developerInList.withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB) + .withProjects(VALID_PROJECT_3_BOB).build(); EditDeveloperCommand.EditDeveloperDescriptor descriptor = new EditDeveloperDescriptorBuilder() - .withName(VALID_NAME_BOB) - .withPhone(VALID_PHONE_BOB).withProjects(VALID_PROJECT_1_BOB).build(); - EditDeveloperCommand editCommand = new EditDeveloperCommand(indexLastPerson, descriptor); + .withName(VALID_NAME_BOB) + .withPhone(VALID_PHONE_BOB).withProjects(VALID_PROJECT_3_BOB).build(); + EditDeveloperCommand editCommand = new EditDeveloperCommand(indexLastDeveloper, descriptor); String expectedMessage = String.format(EditDeveloperCommand.MESSAGE_EDIT_DEVELOPER_SUCCESS, - Messages.format(editedDeveloper)); + Messages.format(editedDeveloper)); - Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs()); + Model expectedModel = new ModelManager(new AddressBook(model_with_projects.getAddressBook()), new UserPrefs()); expectedModel.setDeveloper(lastDeveloper, editedDeveloper); - assertCommandSuccess(editCommand, model, expectedMessage, expectedModel); - } */ + assertDeveloperCommandSuccess(editCommand, model_with_projects, expectedMessage, expectedModel); + } - // need to build a prj first + @Test + public void execute_someFieldsSpecifiedInvalidProjectEditUnfilteredListWithProjects_failure() { + Index indexLastDeveloper = Index.fromOneBased(model_with_projects.getFilteredDeveloperList().size()); + + EditDeveloperCommand.EditDeveloperDescriptor descriptor = new EditDeveloperDescriptorBuilder() + .withName(VALID_NAME_BOB) + .withPhone(VALID_PHONE_BOB).withProjects(VALID_PROJECT_2_BOB).build(); + EditDeveloperCommand editCommand = new EditDeveloperCommand(indexLastDeveloper, descriptor); + + String expectedMessage = String.format(Messages.MESSAGE_NONEXISTENT_PROJECT, VALID_PROJECT_2_BOB); + + assertCommandFailure(editCommand, model_with_projects, expectedMessage); + } + + @Test + public void execute_allFieldsSpecifiedValidProjectEditUnfilteredListWithProjects_success() { + Developer editedDeveloper = new DeveloperBuilder().withProjects(VALID_PROJECT_3_BOB).build(); + EditDeveloperCommand.EditDeveloperDescriptor descriptor = new EditDeveloperDescriptorBuilder(editedDeveloper) + .build(); + EditDeveloperCommand editCommand = new EditDeveloperCommand(INDEX_FIRST_PERSON, descriptor); + + String expectedMessage = String.format(EditDeveloperCommand.MESSAGE_EDIT_DEVELOPER_SUCCESS, + Messages.format(editedDeveloper)); + + Model expectedModel = new ModelManager(new AddressBook(model_with_projects.getAddressBook()), new UserPrefs()); + expectedModel.setDeveloper(model_with_projects.getFilteredDeveloperList().get(0), editedDeveloper); + + assertDeveloperCommandSuccess(editCommand, model_with_projects, expectedMessage, expectedModel); + } + + // Project needs to be created /* @Test public void execute_noFieldSpecifiedUnfilteredList_success() { - AddressBookParser.unlock(); - EditDeveloperCommand editDeveloperCommand = new EditDeveloperCommand(INDEX_FIRST_PERSON, + EditDeveloperCommand editCommand = new EditDeveloperCommand(INDEX_FIRST_PERSON, new EditDeveloperCommand.EditDeveloperDescriptor()); Developer editedDeveloper = model.getFilteredDeveloperList().get(INDEX_FIRST_PERSON.getZeroBased()); @@ -89,59 +138,106 @@ public void execute_noFieldSpecifiedUnfilteredList_success() { Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs()); - assertCommandSuccess(editDeveloperCommand, model, expectedMessage, expectedModel); + assertCommandSuccess(editCommand, model, expectedMessage, expectedModel); }*/ - // need to build a project first - /* @Test - public void execute_filteredList_success() { - AddressBookParser.unlock(); - showDeveloperAtIndex(model, INDEX_FIRST_PERSON); + @Test + public void execute_filteredListValidProjectEditWithProjects_success() { + showDeveloperAtIndex(model_with_projects, INDEX_FIRST_PERSON); - Developer developerInFilteredList = model.getFilteredDeveloperList().get(INDEX_FIRST_PERSON.getZeroBased()); - Developer editedDeveloper = new DeveloperBuilder(developerInFilteredList).withName(VALID_NAME_BOB).build(); - EditDeveloperCommand editDeveloperCommand = new EditDeveloperCommand(INDEX_FIRST_PERSON, - new EditDeveloperDescriptorBuilder().withName(VALID_NAME_BOB).build()); + Developer developerInFilteredList = model_with_projects.getFilteredDeveloperList(). + get(INDEX_FIRST_PERSON.getZeroBased()); + Developer editedDeveloper = new DeveloperBuilder(developerInFilteredList).withName(VALID_NAME_BOB) + .withProjects(VALID_PROJECT_3_BOB).build(); + EditDeveloperCommand editCommand = new EditDeveloperCommand(INDEX_FIRST_PERSON, + new EditDeveloperDescriptorBuilder().withName(VALID_NAME_BOB).withProjects(VALID_PROJECT_3_BOB) + .build()); String expectedMessage = String.format(EditDeveloperCommand.MESSAGE_EDIT_DEVELOPER_SUCCESS, Messages.format(editedDeveloper)); - Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs()); - expectedModel.setDeveloper(model.getFilteredDeveloperList().get(0), editedDeveloper); + Model expectedModel = new ModelManager(new AddressBook(model_with_projects.getAddressBook()), new UserPrefs()); + expectedModel.setDeveloper(model_with_projects.getFilteredDeveloperList().get(0), editedDeveloper); - assertCommandSuccess(editDeveloperCommand, model, expectedMessage, expectedModel); - }*/ + assertDeveloperCommandSuccess(editCommand, model_with_projects, expectedMessage, expectedModel); + } @Test - public void execute_duplicatePersonUnfilteredList_failure() { - Developer firstDeveloper = model.getFilteredDeveloperList().get(INDEX_FIRST_PERSON.getZeroBased()); + public void execute_filteredListInvalidProjectEditWithProjects_failure() { + showDeveloperAtIndex(model_with_projects, INDEX_FIRST_PERSON); + + EditDeveloperCommand editCommand = new EditDeveloperCommand(INDEX_FIRST_PERSON, + new EditDeveloperDescriptorBuilder().withName(VALID_NAME_BOB).withProjects(VALID_PROJECT_2_BOB) + .build()); + + String expectedMessage = String.format(Messages.MESSAGE_NONEXISTENT_PROJECT, VALID_PROJECT_2_BOB); + + assertCommandFailure(editCommand, model_with_projects, expectedMessage); + } + + @Test + public void execute_duplicateDeveloperUnfilteredListNoProjects_failure() { + Developer firstDeveloper = model_no_projects.getFilteredDeveloperList().get(INDEX_FIRST_PERSON.getZeroBased()); EditDeveloperCommand.EditDeveloperDescriptor descriptor = new EditDeveloperDescriptorBuilder(firstDeveloper) .build(); - EditDeveloperCommand editDeveloperCommand = new EditDeveloperCommand(INDEX_SECOND_PERSON, descriptor); + EditDeveloperCommand editCommand = new EditDeveloperCommand(INDEX_SECOND_PERSON, descriptor); + + assertCommandFailure(editCommand, model_no_projects, EditDeveloperCommand.MESSAGE_DUPLICATE_DEVELOPER); + } + + @Test + public void execute_duplicateDeveloperUnfilteredListWithProjects_failure() { + Developer firstDeveloper = model_with_projects.getFilteredDeveloperList().get(INDEX_FIRST_PERSON.getZeroBased()); + EditDeveloperCommand.EditDeveloperDescriptor descriptor = new EditDeveloperDescriptorBuilder(firstDeveloper) + .build(); + EditDeveloperCommand editCommand = new EditDeveloperCommand(INDEX_SECOND_PERSON, descriptor); + + assertCommandFailure(editCommand, model_with_projects, EditDeveloperCommand.MESSAGE_DUPLICATE_DEVELOPER); + } - assertCommandFailure(editDeveloperCommand, model, EditDeveloperCommand.MESSAGE_DUPLICATE_DEVELOPER); + @Test + public void execute_duplicateDeveloperFilteredListNoProjects_failure() { + showDeveloperAtIndex(model_no_projects, INDEX_FIRST_PERSON); + + // edit developer in filtered list into a duplicate in address book + Developer developerInList = model_no_projects.getAddressBook().getDeveloperList().get(INDEX_SECOND_PERSON.getZeroBased()); + EditDeveloperCommand editCommand = new EditDeveloperCommand(INDEX_FIRST_PERSON, + new EditDeveloperDescriptorBuilder(developerInList).build()); + + assertCommandFailure(editCommand, model_no_projects, EditDeveloperCommand.MESSAGE_DUPLICATE_DEVELOPER); } @Test - public void execute_duplicatePersonFilteredList_failure() { - showDeveloperAtIndex(model, INDEX_FIRST_PERSON); + public void execute_duplicateDeveloperFilteredListWithProjects_failure() { + showDeveloperAtIndex(model_with_projects, INDEX_FIRST_PERSON); // edit developer in filtered list into a duplicate in address book - Developer developerInList = model.getAddressBook().getDeveloperList().get(INDEX_SECOND_PERSON.getZeroBased()); - EditDeveloperCommand editDeveloperCommand = new EditDeveloperCommand(INDEX_FIRST_PERSON, + Developer developerInList = model_with_projects.getAddressBook().getDeveloperList(). + get(INDEX_SECOND_PERSON.getZeroBased()); + EditDeveloperCommand editCommand = new EditDeveloperCommand(INDEX_FIRST_PERSON, new EditDeveloperDescriptorBuilder(developerInList).build()); - assertCommandFailure(editDeveloperCommand, model, EditDeveloperCommand.MESSAGE_DUPLICATE_DEVELOPER); + assertCommandFailure(editCommand, model_with_projects, EditDeveloperCommand.MESSAGE_DUPLICATE_DEVELOPER); + } + + @Test + public void execute_invalidDeveloperIndexUnfilteredListNoProjects_failure() { + Index outOfBoundIndex = Index.fromOneBased(model_no_projects.getFilteredDeveloperList().size() + 1); + EditDeveloperCommand.EditDeveloperDescriptor descriptor = new EditDeveloperDescriptorBuilder() + .withName(VALID_NAME_CALEB).build(); + EditDeveloperCommand editCommand = new EditDeveloperCommand(outOfBoundIndex, descriptor); + + assertCommandFailure(editCommand, model_no_projects, Messages.MESSAGE_INVALID_DEVELOPER_DISPLAYED_INDEX); } @Test - public void execute_invalidPersonIndexUnfilteredList_failure() { - Index outOfBoundIndex = Index.fromOneBased(model.getFilteredDeveloperList().size() + 1); + public void execute_invalidDeveloperIndexUnfilteredListWithProjects_failure() { + Index outOfBoundIndex = Index.fromOneBased(model_with_projects.getFilteredDeveloperList().size() + 1); EditDeveloperCommand.EditDeveloperDescriptor descriptor = new EditDeveloperDescriptorBuilder() - .withName(VALID_NAME_BOB).build(); - EditDeveloperCommand editDeveloperCommand = new EditDeveloperCommand(outOfBoundIndex, descriptor); + .withName(VALID_NAME_CALEB).build(); + EditDeveloperCommand editCommand = new EditDeveloperCommand(outOfBoundIndex, descriptor); - assertCommandFailure(editDeveloperCommand, model, Messages.MESSAGE_INVALID_DEVELOPER_DISPLAYED_INDEX); + assertCommandFailure(editCommand, model_with_projects, Messages.MESSAGE_INVALID_DEVELOPER_DISPLAYED_INDEX); } /** @@ -149,16 +245,30 @@ public void execute_invalidPersonIndexUnfilteredList_failure() { * but smaller than size of address book */ @Test - public void execute_invalidPersonIndexFilteredList_failure() { - showDeveloperAtIndex(model, INDEX_FIRST_PERSON); + public void execute_invalidDeveloperIndexFilteredListNoProjects_failure() { + showDeveloperAtIndex(model_no_projects, INDEX_FIRST_PERSON); Index outOfBoundIndex = INDEX_SECOND_PERSON; // ensures that outOfBoundIndex is still in bounds of address book list - assertTrue(outOfBoundIndex.getZeroBased() < model.getAddressBook().getDeveloperList().size()); + assertTrue(outOfBoundIndex.getZeroBased() < model_no_projects.getAddressBook().getDeveloperList().size()); - EditDeveloperCommand editDeveloperCommand = new EditDeveloperCommand(outOfBoundIndex, + EditDeveloperCommand editCommand = new EditDeveloperCommand(outOfBoundIndex, new EditDeveloperDescriptorBuilder().withName(VALID_NAME_BOB).build()); - assertCommandFailure(editDeveloperCommand, model, Messages.MESSAGE_INVALID_DEVELOPER_DISPLAYED_INDEX); + assertCommandFailure(editCommand, model_no_projects, Messages.MESSAGE_INVALID_DEVELOPER_DISPLAYED_INDEX); + } + + @Test + public void execute_invalidDeveloperIndexFilteredListWithProjects_failure() { + showDeveloperAtIndex(model_with_projects, INDEX_FIRST_PERSON); + Index outOfBoundIndex = INDEX_SECOND_PERSON; + // ensures that outOfBoundIndex is still in bounds of address book list + assertTrue(outOfBoundIndex.getZeroBased() < model_with_projects.getAddressBook() + .getDeveloperList().size()); + + EditDeveloperCommand editCommand = new EditDeveloperCommand(outOfBoundIndex, + new EditDeveloperDescriptorBuilder().withName(VALID_NAME_BOB).build()); + + assertCommandFailure(editCommand, model_with_projects, Messages.MESSAGE_INVALID_DEVELOPER_DISPLAYED_INDEX); } @Test @@ -166,7 +276,7 @@ public void equals() { final EditDeveloperCommand standardCommand = new EditDeveloperCommand(INDEX_FIRST_PERSON, DESC_AMY); // same values -> returns true - EditDeveloperCommand.EditDeveloperDescriptor copyDescriptor = + EditDeveloperCommand.EditDeveloperDescriptor copyDescriptor = new EditDeveloperCommand.EditDeveloperDescriptor(DESC_AMY); EditDeveloperCommand commandWithSameValues = new EditDeveloperCommand(INDEX_FIRST_PERSON, copyDescriptor); assertEquals(standardCommand, commandWithSameValues); @@ -192,11 +302,10 @@ public void toStringMethod() { Index index = Index.fromOneBased(1); EditDeveloperCommand.EditDeveloperDescriptor editDeveloperDescriptor = new EditDeveloperCommand .EditDeveloperDescriptor(); - EditDeveloperCommand editDeveloperCommand = new EditDeveloperCommand(index, editDeveloperDescriptor); + EditDeveloperCommand editCommand = new EditDeveloperCommand(index, editDeveloperDescriptor); String expected = EditDeveloperCommand.class.getCanonicalName() + "{index=" + index + ", editDeveloperDescriptor=" + editDeveloperDescriptor + "}"; - assertEquals(expected, editDeveloperCommand.toString()); + assertEquals(expected, editCommand.toString()); } - } diff --git a/src/test/java/seedu/address/logic/commands/edit/EditDeveloperDescriptorTest.java b/src/test/java/seedu/address/logic/commands/edit/EditDeveloperDescriptorTest.java index 1718f3c8185..efbdf6b06fb 100644 --- a/src/test/java/seedu/address/logic/commands/edit/EditDeveloperDescriptorTest.java +++ b/src/test/java/seedu/address/logic/commands/edit/EditDeveloperDescriptorTest.java @@ -70,8 +70,8 @@ public void toStringMethod() { + editDeveloperDescriptor.getDateJoined().orElse(null) + ", role=" + editDeveloperDescriptor.getRole().orElse(null) + ", salary=" + editDeveloperDescriptor.getSalary().orElse(null) + ", githubId=" - + editDeveloperDescriptor.getSalary().orElse(null) + ", rating=" - + editDeveloperDescriptor.getSalary().orElse(null) + "}"; + + editDeveloperDescriptor.getGithubId().orElse(null) + ", rating=" + + editDeveloperDescriptor.getRating().orElse(null) + "}"; assertEquals(expected, editDeveloperDescriptor.toString()); } diff --git a/src/test/java/seedu/address/logic/commands/edit/EditProjectCommandTest.java b/src/test/java/seedu/address/logic/commands/edit/EditProjectCommandTest.java new file mode 100644 index 00000000000..9ed86ca7f0a --- /dev/null +++ b/src/test/java/seedu/address/logic/commands/edit/EditProjectCommandTest.java @@ -0,0 +1,211 @@ +package seedu.address.logic.commands.edit; + +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_FULL_PROJECT_DEADLINE_1; +import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_DESCRIPTION_APPLEAPP; +import static seedu.address.logic.commands.CommandTestUtil.assertClientCommandSuccess; +import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure; +import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; +import static seedu.address.logic.commands.CommandTestUtil.assertProjectCommandSuccess; +import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PROJECT; +import static seedu.address.testutil.TypicalProjects.getTypicalAddressBook; + +import java.util.ArrayList; +import java.util.Arrays; + +import org.junit.jupiter.api.Test; + +import seedu.address.commons.core.index.Index; +import seedu.address.logic.Messages; +import seedu.address.model.AddressBook; +import seedu.address.model.Model; +import seedu.address.model.ModelManager; +import seedu.address.model.UserPrefs; +import seedu.address.model.project.Description; +import seedu.address.model.project.Project; +import seedu.address.testutil.EditProjectDescriptorBuilder; +import seedu.address.testutil.ProjectBuilder; + +public class EditProjectCommandTest { + + private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + + @Test + public void execute_allFieldsSpecifiedUnfilteredList_success() { + Project editedProject = model.getFilteredProjectList().get(INDEX_FIRST_PROJECT.getZeroBased()); + EditProjectCommand.EditProjectDescriptor descriptor = new EditProjectDescriptorBuilder(editedProject).build(); + EditProjectCommand editProjectCommand = new EditProjectCommand(INDEX_FIRST_PROJECT, descriptor); + + String expectedMessage = String.format(EditProjectCommand.MESSAGE_EDIT_PROJECT_SUCCESS, + Messages.format(editedProject)); + + Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs()); + expectedModel.setProject(model.getFilteredProjectList().get(0), editedProject); + + assertProjectCommandSuccess(editProjectCommand, model, expectedMessage, expectedModel); + } + + @Test + public void execute_someFieldsSpecifiedUnfilteredList_success() { + Index indexLastProject = Index.fromOneBased(model.getFilteredProjectList().size()); + Project lastProject = model.getFilteredProjectList().get(indexLastProject.getZeroBased()); + + ProjectBuilder projectInList = new ProjectBuilder(lastProject); + Project editedProject = projectInList.withDescription(VALID_PROJECT_DESCRIPTION_APPLEAPP) + .withDeadline(VALID_FULL_PROJECT_DEADLINE_1).build(); + + EditProjectCommand.EditProjectDescriptor descriptor = new EditProjectDescriptorBuilder() + .withDescription(VALID_PROJECT_DESCRIPTION_APPLEAPP) + .withDeadlines(VALID_FULL_PROJECT_DEADLINE_1).build(); + EditProjectCommand editProjectCommand = new EditProjectCommand(indexLastProject, descriptor); + + String expectedMessage = String.format(EditProjectCommand.MESSAGE_EDIT_PROJECT_SUCCESS, + Messages.format(editedProject)); + + Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs()); + expectedModel.setProject(lastProject, editedProject); + + assertProjectCommandSuccess(editProjectCommand, model, expectedMessage, expectedModel); + } + + @Test + public void execute_noFieldSpecifiedUnfilteredList_success() { + EditProjectCommand editProjectCommand = new EditProjectCommand(INDEX_FIRST_PROJECT, + new EditProjectCommand.EditProjectDescriptor()); + Project editedProject = model.getFilteredProjectList().get(INDEX_FIRST_PROJECT.getZeroBased()); + + String expectedMessage = String.format(EditProjectCommand.MESSAGE_EDIT_PROJECT_SUCCESS, + Messages.format(editedProject)); + + Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs()); + + assertProjectCommandSuccess(editProjectCommand, model, expectedMessage, expectedModel); + } +// +// @Test +// public void execute_filteredList_success() { +// showProjectAtIndex(model, INDEX_FIRST_PROJECT); +// +// Project projectInFilteredList = model.getFilteredProjectList().get(INDEX_FIRST_PROJECT.getZeroBased()); +// Project editedProject = new ProjectBuilder(projectInFilteredList).withName(VALID_NAME_PROJECT_2).build(); +// EditProjectCommand editProjectCommand = new EditProjectCommand(INDEX_FIRST_PROJECT, +// new EditProjectDescriptorBuilder().withName(VALID_NAME_PROJECT_2).build()); +// +// String expectedMessage = String.format(EditProjectCommand.MESSAGE_EDIT_PROJECT_SUCCESS, +// Messages.format(editedProject)); +// +// Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs()); +// expectedModel.setProject(model.getFilteredProjectList().get(0), editedProject); +// +// assertCommandSuccess(editProjectCommand, model, expectedMessage, expectedModel); +// } +// +// @Test +// public void execute_duplicateProjectUnfilteredList_failure() { +// Project firstProject = model.getFilteredProjectList().get(INDEX_FIRST_PROJECT.getZeroBased()); +// EditProjectCommand.EditProjectDescriptor descriptor = new EditProjectDescriptorBuilder(firstProject).build(); +// EditProjectCommand editProjectCommand = new EditProjectCommand(INDEX_SECOND_PROJECT, descriptor); +// +// assertCommandFailure(editProjectCommand, model, EditProjectCommand.MESSAGE_DUPLICATE_PROJECT); +// } +// +// @Test +// public void execute_duplicateProjectFilteredList_failure() { +// showProjectAtIndex(model, INDEX_FIRST_PROJECT); +// +// // edit project in filtered list into a duplicate in address book +// Project projectInList = model.getAddressBook().getProjectList().get(INDEX_SECOND_PROJECT.getZeroBased()); +// EditProjectCommand editProjectCommand = new EditProjectCommand(INDEX_FIRST_PROJECT, +// new EditProjectDescriptorBuilder(projectInList).build()); +// +// assertCommandFailure(editProjectCommand, model, EditProjectCommand.MESSAGE_DUPLICATE_PROJECT); +// } +// +// @Test +// public void execute_invalidProjectIndexUnfilteredList_failure() { +// Index outOfBoundIndex = Index.fromOneBased(model.getFilteredProjectList().size() + 1); +// EditProjectCommand.EditProjectDescriptor descriptor = new EditProjectDescriptorBuilder() +// .withName(VALID_NAME_PROJECT_2).build(); +// EditProjectCommand editProjectCommand = new EditProjectCommand(outOfBoundIndex, descriptor); +// +// assertCommandFailure(editProjectCommand, model, Messages.MESSAGE_INVALID_PROJECT_DISPLAYED_INDEX); +// } +// +// /** +// * Edit filtered list where index is larger than size of filtered list, +// * but smaller than size of address book +// */ +// @Test +// public void execute_invalidProjectIndexFilteredList_failure() { +// showProjectAtIndex(model, INDEX_FIRST_PROJECT); +// Index outOfBoundIndex = INDEX_SECOND_PROJECT; +// // ensures that outOfBoundIndex is still in bounds of address book list +// assertTrue(outOfBoundIndex.getZeroBased() < model.getAddressBook().getProjectList().size()); +// +// EditProjectCommand editProjectCommand = new EditProjectCommand(outOfBoundIndex, +// new EditProjectDescriptorBuilder().withName(VALID_NAME_PROJECT_2).build()); +// +// assertCommandFailure(editProjectCommand, model, Messages.MESSAGE_INVALID_PROJECT_DISPLAYED_INDEX); +// } +// +// @Test +// public void equals() { +// final EditProjectCommand standardCommand = new EditProjectCommand(INDEX_FIRST_PROJECT, DESCRIPTION_PROJECT_1); +// +// // same values -> returns true +// EditProjectCommand.EditProjectDescriptor copyDescriptor = new EditProjectCommand.EditProjectDescriptor( +// DESCRIPTION_PROJECT_1); +// EditProjectCommand commandWithSameValues = new EditProjectCommand(INDEX_FIRST_PROJECT, copyDescriptor); +// assertTrue(standardCommand.equals(commandWithSameValues)); +// +// // same object -> returns true +// assertTrue(standardCommand.equals(standardCommand)); +// +// // null -> returns false +// assertFalse(standardCommand.equals(null)); +// +// // different types -> returns false +// assertFalse(standardCommand.equals(new ClearCommand())); +// +// // different index -> returns false +// assertFalse(standardCommand.equals(new EditProjectCommand(INDEX_SECOND_PROJECT, DESCRIPTION_PROJECT_1))); +// +// // different descriptor -> returns false +// assertFalse(standardCommand.equals(new EditProjectCommand(INDEX_FIRST_PROJECT, DESCRIPTION_PROJECT_2))); +// } +// +// @Test +// public void toStringMethod() { +// Index index = Index.fromOneBased(1); +// EditProjectCommand.EditProjectDescriptor editProjectDescriptor = new EditProjectCommand.EditProjectDescriptor(); +// EditProjectCommand editProjectCommand = new EditProjectCommand(index, editProjectDescriptor); +// String expected = EditProjectCommand.class.getCanonicalName() + "{index=" + index +// + ", editProjectDescriptor=" + editProjectDescriptor + "}"; +// assertEquals(expected, editProjectCommand.toString()); +// } +// +// /** +// * Updates {@code model}'s filtered list to show no one. +// */ +// private void showNoProject(Model model) { +// model.updateFilteredProjectList(p -> false); +// +// assertTrue(model.getFilteredProjectList().isEmpty()); +// } +// +// /** +// * Updates {@code model}'s filtered list to show projects at {@code targetIndex} in {@code model}'s address book. +// */ +// private void showProjectAtIndex(Model model, Index targetIndex) { +// assertTrue(targetIndex.getZeroBased() < model.getFilteredProjectList().size()); +// +// Project project = model.getFilteredProjectList().get(targetIndex.getZeroBased()); +// final String[] splitName = project.getProjectName().fullName.split("\\s+"); +// model.updateFilteredProjectList( +// p -> Arrays.asList(splitName).contains(p.getProjectName().fullName)); +// +// assertEquals(1, model.getFilteredProjectList().size()); +// } +} diff --git a/src/test/java/seedu/address/testutil/DeveloperBuilder.java b/src/test/java/seedu/address/testutil/DeveloperBuilder.java index ff49201b755..5e109d11da0 100644 --- a/src/test/java/seedu/address/testutil/DeveloperBuilder.java +++ b/src/test/java/seedu/address/testutil/DeveloperBuilder.java @@ -79,25 +79,25 @@ public DeveloperBuilder withName(String name) { return this; } - /** Sets the {@code Phone} of the {@code Developer} that we are building. */ + /** Sets the {@code Projects} of the {@code Developer} that we are building. */ public DeveloperBuilder withProjects(String... projects) { this.projects = SampleDataUtil.getProjectSet(projects); return this; } - /** Sets the {@code Phone} of the {@code Developer} that we are building. */ + /** Sets the {@code GithubId} of the {@code Developer} that we are building. */ public DeveloperBuilder withGithubId(String githubId) { this.githubId = new GithubId(githubId); return this; } - /** Sets the {@code Phone} of the {@code Developer} that we are building. */ + /** Sets the {@code Rating} of the {@code Developer} that we are building. */ public DeveloperBuilder withRating(String rating) { this.rating = new Rating(rating); return this; } - /** Sets the {@code Phone} of the {@code Developer} that we are building. */ + /** Sets the {@code Address} of the {@code Developer} that we are building. */ public DeveloperBuilder withAddress(String address) { this.address = new Address(address); return this; @@ -109,31 +109,31 @@ public DeveloperBuilder withPhone(String phone) { return this; } - /** Sets the {@code Phone} of the {@code Developer} that we are building. */ + /** Sets the {@code Email} of the {@code Developer} that we are building. */ public DeveloperBuilder withEmail(String email) { this.email = new Email(email); return this; } - /** Sets the {@code Phone} of the {@code Developer} that we are building. */ + /** Sets the {@code DateJoined} of the {@code Developer} that we are building. */ public DeveloperBuilder withDateJoined(String dateJoined) { this.dateJoined = new Date(dateJoined, false); return this; } - /** Sets the {@code Phone} of the {@code Developer} that we are building. */ + /** Sets the {@code Role} of the {@code Developer} that we are building. */ public DeveloperBuilder withRole(String role) { this.role = new DeveloperRoles(role); return this; } - /** Sets the {@code Phone} of the {@code Developer} that we are building. */ + /** Sets the {@code Salary} of the {@code Developer} that we are building. */ public DeveloperBuilder withSalary(String salary) { this.salary = new Salary(salary); return this; } - /** Sets the {@code Phone} of the {@code Developer} that we are building. */ + /** Builds the developer. */ public Developer build() { return new Developer(name, phone, email, address, role, projects, salary, dateJoined, githubId, rating); } diff --git a/src/test/java/seedu/address/testutil/EditClientDescriptorBuilder.java b/src/test/java/seedu/address/testutil/EditClientDescriptorBuilder.java index 31c3bb2d1ce..108048a4bc3 100644 --- a/src/test/java/seedu/address/testutil/EditClientDescriptorBuilder.java +++ b/src/test/java/seedu/address/testutil/EditClientDescriptorBuilder.java @@ -5,6 +5,7 @@ import java.util.stream.Stream; import seedu.address.logic.commands.edit.EditClientCommand; +import seedu.address.logic.commands.edit.EditClientCommandTest; import seedu.address.model.client.Client; import seedu.address.model.client.ClientRoles; import seedu.address.model.client.Document; @@ -29,7 +30,7 @@ public EditClientDescriptorBuilder(EditClientCommand.EditClientDescriptor descri } /** - * Returns an {@code EditPersonDescriptor} with fields containing {@code developer}'s details + * Returns an {@code EditClientDescriptor} with fields containing {@code client}'s details. */ public EditClientDescriptorBuilder(Client client) { descriptor = new EditClientCommand.EditClientDescriptor(); diff --git a/src/test/java/seedu/address/testutil/EditProjectDescriptorBuilder.java b/src/test/java/seedu/address/testutil/EditProjectDescriptorBuilder.java new file mode 100644 index 00000000000..c5668cc0389 --- /dev/null +++ b/src/test/java/seedu/address/testutil/EditProjectDescriptorBuilder.java @@ -0,0 +1,86 @@ +package seedu.address.testutil; + +import seedu.address.logic.commands.edit.EditProjectCommand; +import seedu.address.model.project.Description; +import seedu.address.model.project.Deadline; +import seedu.address.model.project.Project; +import seedu.address.commons.util.CollectionUtil; +import seedu.address.commons.util.ToStringBuilder; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.Optional; + +/** + * A utility class to help with building EditProjectDescriptor objects. + */ +public class EditProjectDescriptorBuilder { + + private final EditProjectCommand.EditProjectDescriptor descriptor; + + public EditProjectDescriptorBuilder() { + descriptor = new EditProjectCommand.EditProjectDescriptor(); + } + + public EditProjectDescriptorBuilder(EditProjectCommand.EditProjectDescriptor descriptor) { + this.descriptor = new EditProjectCommand.EditProjectDescriptor(descriptor); + } + + /** + * Returns an {@code EditProjectDescriptor} with fields containing {@code project}'s details + */ + public EditProjectDescriptorBuilder(Project project) { + descriptor = new EditProjectCommand.EditProjectDescriptor(); + descriptor.setDescription(project.getProjectDescription()); + descriptor.setDeadlines(project.getProjectDeadlines()); + } + + /** + * Sets the {@code Description} of the {@code EditProjectDescriptor} that we are building. + */ + public EditProjectDescriptorBuilder withDescription(String description) { + descriptor.setDescription(new Description(description)); + return this; + } + + /** + * Sets the {@code Deadlines} of the {@code EditProjectDescriptor} that we are building. + */ + public EditProjectDescriptorBuilder withDeadlines(List deadlines) { + descriptor.setDeadlines(deadlines); + return this; + } + + /** + * Sets the {@code Deadlines} of the {@code EditProjectDescriptor} that we are building. + */ + public EditProjectDescriptorBuilder withDeadlines(String... deadlines) { + List deadlineList = new ArrayList<>(); + int index = 1; + for (String deadline : deadlines) { + deadlineList.add(new Deadline(deadline, index)); + index += 1; + } + descriptor.setDeadlines(deadlineList); + return this; + } + + /** + * Sets the {@code Deadline} of the {@code EditProjectDescriptor} that we are building. + */ + public EditProjectDescriptorBuilder withDeadline(String deadline) { + List deadlineList = new ArrayList<>(); + deadlineList.add(new Deadline(deadline, 1)); + descriptor.setDeadlines(deadlineList); + return this; + } + + /** + * Builds and returns the EditProjectDescriptor. + */ + public EditProjectCommand.EditProjectDescriptor build() { + return descriptor; + } +} diff --git a/src/test/java/seedu/address/testutil/ProjectBuilder.java b/src/test/java/seedu/address/testutil/ProjectBuilder.java index 60b295c3f0d..7ce0e618e54 100644 --- a/src/test/java/seedu/address/testutil/ProjectBuilder.java +++ b/src/test/java/seedu/address/testutil/ProjectBuilder.java @@ -54,6 +54,7 @@ public ProjectBuilder withDescription(String description) { /** Sets the {@code Deadline} of the {@code Project} that we are building. */ public ProjectBuilder withDeadline(String deadline) { + this.deadlineList = new ArrayList<>(); this.deadlineList.add(new Deadline(deadline, 1)); return this; } diff --git a/src/test/java/seedu/address/testutil/TypicalClients.java b/src/test/java/seedu/address/testutil/TypicalClients.java index fca73480717..0c83d58305c 100644 --- a/src/test/java/seedu/address/testutil/TypicalClients.java +++ b/src/test/java/seedu/address/testutil/TypicalClients.java @@ -14,6 +14,7 @@ import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_2_AMY; import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_2_BOB; import static seedu.address.logic.commands.CommandTestUtil.VALID_ROLE_AMY; +import static seedu.address.testutil.TypicalProjects.getTypicalProjects; import java.util.ArrayList; import java.util.Arrays; @@ -21,6 +22,7 @@ import seedu.address.model.AddressBook; import seedu.address.model.client.Client; +import seedu.address.model.project.Project; /** * A utility class containing a list of {@code Developer} objects to be used in tests. @@ -79,7 +81,7 @@ private TypicalClients() { } // prevents instantiation /** - * Returns an {@code AddressBook} with all the typical persons. + * Returns an {@code AddressBook} with all the typical clients. */ public static AddressBook getTypicalAddressBook() { AddressBook ab = new AddressBook(); @@ -89,6 +91,20 @@ public static AddressBook getTypicalAddressBook() { return ab; } + /** + * Returns an {@code AddressBook} with all the typical clients integrated with projects. + */ + public static AddressBook getTypicalAddressBookWithProjects() { + AddressBook ab = new AddressBook(); + for (Client client: getTypicalClients()) { + ab.addClient(client); + } + for (Project project : getTypicalProjects()) { + ab.addProject(project); + } + return ab; + } + public static List getTypicalClients() { return new ArrayList<>(Arrays.asList(ALICE, BENSON, CARL, DANIEL, ELLE, FIONA, GEORGE)); } diff --git a/src/test/java/seedu/address/testutil/TypicalDevelopers.java b/src/test/java/seedu/address/testutil/TypicalDevelopers.java index 3975be53698..abf1def401a 100644 --- a/src/test/java/seedu/address/testutil/TypicalDevelopers.java +++ b/src/test/java/seedu/address/testutil/TypicalDevelopers.java @@ -16,13 +16,16 @@ import static seedu.address.logic.commands.CommandTestUtil.VALID_RATING_AMY; import static seedu.address.logic.commands.CommandTestUtil.VALID_ROLE_AMY; import static seedu.address.logic.commands.CommandTestUtil.VALID_SALARY_AMY; +import static seedu.address.testutil.TypicalProjects.getTypicalProjects; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import seedu.address.model.AddressBook; +import seedu.address.model.client.Client; import seedu.address.model.developer.Developer; +import seedu.address.model.project.Project; /** * A utility class containing a list of {@code Developer} objects to be used in tests. @@ -84,13 +87,27 @@ private TypicalDevelopers() { */ public static AddressBook getTypicalAddressBook() { AddressBook ab = new AddressBook(); - for (Developer developer : getTypicalPersons()) { + for (Developer developer : getTypicalDevelopers()) { ab.addDeveloper(developer); } return ab; } - public static List getTypicalPersons() { + /** + * Returns an {@code AddressBook} with all the typical developers integrated with projects. + */ + public static AddressBook getTypicalAddressBookWithProjects() { + AddressBook ab = new AddressBook(); + for (Developer developer: getTypicalDevelopers()) { + ab.addDeveloper(developer); + } + for (Project project : getTypicalProjects()) { + ab.addProject(project); + } + return ab; + } + + public static List getTypicalDevelopers() { return new ArrayList<>(Arrays.asList(ALICE, BENSON, CARL, DANIEL, ELLE, FIONA, GEORGE)); } } diff --git a/src/test/java/seedu/address/testutil/TypicalIndexes.java b/src/test/java/seedu/address/testutil/TypicalIndexes.java index 1e613937657..f4e86573ad6 100644 --- a/src/test/java/seedu/address/testutil/TypicalIndexes.java +++ b/src/test/java/seedu/address/testutil/TypicalIndexes.java @@ -9,4 +9,6 @@ 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_PROJECT = Index.fromOneBased(1); + } From 3a52a78da543dbbde56185b8ccb5535f5b587d40 Mon Sep 17 00:00:00 2001 From: mingyu Date: Mon, 13 Nov 2023 12:47:49 +0800 Subject: [PATCH 25/36] add-client role and add developer role tests --- docs/DeveloperGuide.md | 4 +- .../addroles/AddClientRoleCommand.java | 4 +- .../addroles/AddDeveloperRoleCommand.java | 4 +- .../logic/commands/CommandTestUtil.java | 16 ++++ .../addroles/AddClientRoleCommandTest.java | 78 ++++++++++++++++++ .../addroles/AddDeveloperRoleCommandTest.java | 79 +++++++++++++++++++ .../commands/list/ListProjectCommandTest.java | 39 +++++++++ 7 files changed, 218 insertions(+), 6 deletions(-) create mode 100644 src/test/java/seedu/address/logic/commands/addroles/AddClientRoleCommandTest.java create mode 100644 src/test/java/seedu/address/logic/commands/addroles/AddDeveloperRoleCommandTest.java diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index a73d952a472..60b8635b067 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -439,7 +439,7 @@ trimmed to `Tester` and calls `AddDeveloperRoleCommand`. a new developer role if there is no such role.
:exclamation: **Note:** -Although no changes is made to the address book, but this stage is still committed so that the success command +Although no changes is made to the address book, this stage is still committed so that the success command message and tab index switched to can be changed, the currentPointer can also note that there is an action done here.
:exclamation: **Note:** @@ -488,7 +488,7 @@ trimmed to `Tester` and calls `DeleteDeveloperRoleCommand`. if `DeveloperRoles#isRemovableRole()` returns true.
:exclamation: **Note:** -Although no changes is made to the address book, but this stage is still committed so that the success command +Although no changes is made to the address book, this stage is still committed so that the success command message and tab index switched to can be changed, the currentPointer can also note that there is an action done here.
The following sequence diagram shows how the Delete-role operation works: diff --git a/src/main/java/seedu/address/logic/commands/addroles/AddClientRoleCommand.java b/src/main/java/seedu/address/logic/commands/addroles/AddClientRoleCommand.java index 2c69a62f41b..8ed119d0467 100644 --- a/src/main/java/seedu/address/logic/commands/addroles/AddClientRoleCommand.java +++ b/src/main/java/seedu/address/logic/commands/addroles/AddClientRoleCommand.java @@ -24,7 +24,7 @@ public class AddClientRoleCommand extends Command { + "Example: " + PREFIX_ROLE + "Developer "; public static final String MESSAGE_SUCCESS = "New role for client added: %1$s"; - public static final String MESSAGE_DUPLICATE_DEVELOPER = "This client role already exists in the address book!"; + public static final String MESSAGE_DUPLICATE_ROLE = "This client role already exists in the address book!"; private final String toAdd; /** @@ -49,7 +49,7 @@ public CommandResult execute(Model model) throws CommandException { requireNonNull(model); if (ClientRoles.isValidRole(toAdd)) { - throw new CommandException(MESSAGE_DUPLICATE_DEVELOPER); + throw new CommandException(MESSAGE_DUPLICATE_ROLE); } String successMessage = String.format(MESSAGE_SUCCESS, Messages.format(toAdd)); diff --git a/src/main/java/seedu/address/logic/commands/addroles/AddDeveloperRoleCommand.java b/src/main/java/seedu/address/logic/commands/addroles/AddDeveloperRoleCommand.java index d733bf1ede2..a0e6d2b1a98 100644 --- a/src/main/java/seedu/address/logic/commands/addroles/AddDeveloperRoleCommand.java +++ b/src/main/java/seedu/address/logic/commands/addroles/AddDeveloperRoleCommand.java @@ -25,7 +25,7 @@ public class AddDeveloperRoleCommand extends Command { + "Example: " + PREFIX_ROLE + "Developer "; public static final String MESSAGE_SUCCESS = "New role for developer added: %1$s"; - public static final String MESSAGE_DUPLICATE_DEVELOPER = "This developer role already exists in the address book!"; + public static final String MESSAGE_DUPLICATE_ROLE = "This developer role already exists in the address book!"; private final String toAdd; /** @@ -50,7 +50,7 @@ public CommandResult execute(Model model) throws CommandException { requireNonNull(model); if (DeveloperRoles.isValidRole(toAdd)) { - throw new CommandException(MESSAGE_DUPLICATE_DEVELOPER); + throw new CommandException(MESSAGE_DUPLICATE_ROLE); } String successMessage = String.format(MESSAGE_SUCCESS, Messages.format(toAdd)); diff --git a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java index 31b0995285b..399429c9e45 100644 --- a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java +++ b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java @@ -31,6 +31,8 @@ import seedu.address.model.client.NameClientContainsKeywordsPredicate; import seedu.address.model.developer.Developer; import seedu.address.model.developer.NameDeveloperContainsKeywordsPredicate; +import seedu.address.model.project.Project; +import seedu.address.model.project.ProjectNameContainsKeywordsPredicate; import seedu.address.testutil.EditClientDescriptorBuilder; import seedu.address.testutil.EditDeveloperDescriptorBuilder; @@ -282,4 +284,18 @@ public static void showClientAtIndex(Model model, Index targetIndex) { assertEquals(1, model.getFilteredClientList().size()); } + /** + * Updates {@code model}'s filtered list to show only the client at the given {@code targetIndex} in the + * {@code model}'s address book. + */ + public static void showProjectAtIndex(Model model, Index targetIndex) { + assertTrue(targetIndex.getZeroBased() < model.getFilteredProjectList().size()); + + Project project = model.getFilteredProjectList().get(targetIndex.getZeroBased()); + final String[] splitName = project.getName().split("\\s+"); + model.updateFilteredProjectList(new ProjectNameContainsKeywordsPredicate(Arrays.asList(splitName[0]))); + + assertEquals(4, model.getFilteredProjectList().size()); + } + } diff --git a/src/test/java/seedu/address/logic/commands/addroles/AddClientRoleCommandTest.java b/src/test/java/seedu/address/logic/commands/addroles/AddClientRoleCommandTest.java new file mode 100644 index 00000000000..c20619ce962 --- /dev/null +++ b/src/test/java/seedu/address/logic/commands/addroles/AddClientRoleCommandTest.java @@ -0,0 +1,78 @@ +package seedu.address.logic.commands.addroles; + +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.assertCommandFailure; +import static seedu.address.testutil.TypicalClients.getTypicalAddressBook; + +import org.junit.jupiter.api.Test; + +import seedu.address.logic.commands.deleteroles.DeleteClientRoleCommand; +import seedu.address.logic.commands.exceptions.CommandException; +import seedu.address.model.Model; +import seedu.address.model.ModelManager; +import seedu.address.model.UserPrefs; +import seedu.address.testutil.Assert; + +public class AddClientRoleCommandTest { + + private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + private final Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + + @Test + public void constructor_nullRole_throwsNullPointerException() { + Assert.assertThrows(NullPointerException.class, () -> new AddClientRoleCommand(null)); + } + + @Test + public void execute_roleAcceptedByModel_addSuccessful() throws CommandException { + String validRole1 = "Tester"; + AddClientRoleCommand addClientRoleCommand = new AddClientRoleCommand(validRole1); + String expectedMessage = String.format(AddClientRoleCommand.MESSAGE_SUCCESS, validRole1); + + assertEquals(addClientRoleCommand.execute(model).getFeedbackToUser(), expectedMessage); + + DeleteClientRoleCommand deleteClientRoleCommand = new DeleteClientRoleCommand(validRole1); + deleteClientRoleCommand.execute(model); + } + + @Test + public void execute_duplicateRole_throwsCommandException() { + String duplicateRole = "Developer"; + AddClientRoleCommand addClientRoleCommand = new AddClientRoleCommand(duplicateRole); + + assertCommandFailure(addClientRoleCommand, model, AddClientRoleCommand.MESSAGE_DUPLICATE_ROLE); + } + + @Test + public void equals() { + String firstRole = "Tester"; + String secondRole = "Developer"; + AddClientRoleCommand addFirstCommand = new AddClientRoleCommand(firstRole); + AddClientRoleCommand addSecondCommand = new AddClientRoleCommand(secondRole); + + // same object -> returns true + assertTrue(addFirstCommand.equals(addFirstCommand)); + + // same values -> returns False because cannot add twice + AddClientRoleCommand addFirstCommandCopy = new AddClientRoleCommand(firstRole); + assertFalse(addFirstCommand.equals(addFirstCommandCopy)); + + // different types -> returns false + assertFalse(addFirstCommand.equals(1)); + + // null -> returns false + assertFalse(addFirstCommand.equals(null)); + + // different developer role -> returns false + assertFalse(addFirstCommand.equals(addSecondCommand)); + } + + @Test + public void toStringTest() { + String roleName = "Tester"; + AddClientRoleCommand addClientRoleCommand = new AddClientRoleCommand(roleName); + assertEquals(addClientRoleCommand.toString(), new AddClientRoleCommand(roleName).toString()); + } +} diff --git a/src/test/java/seedu/address/logic/commands/addroles/AddDeveloperRoleCommandTest.java b/src/test/java/seedu/address/logic/commands/addroles/AddDeveloperRoleCommandTest.java new file mode 100644 index 00000000000..655ea04bbdc --- /dev/null +++ b/src/test/java/seedu/address/logic/commands/addroles/AddDeveloperRoleCommandTest.java @@ -0,0 +1,79 @@ +package seedu.address.logic.commands.addroles; + +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.assertCommandFailure; +import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; +import static seedu.address.testutil.TypicalDevelopers.getTypicalAddressBook; + +import org.junit.jupiter.api.Test; + +import seedu.address.logic.commands.deleteroles.DeleteDeveloperRoleCommand; +import seedu.address.logic.commands.exceptions.CommandException; +import seedu.address.model.Model; +import seedu.address.model.ModelManager; +import seedu.address.model.UserPrefs; +import seedu.address.testutil.Assert; + +public class AddDeveloperRoleCommandTest { + + private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + private final Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + + @Test + public void constructor_nullRole_throwsNullPointerException() { + Assert.assertThrows(NullPointerException.class, () -> new AddDeveloperRoleCommand(null)); + } + + @Test + public void execute_roleAcceptedByModel_addSuccessful() throws CommandException { + String validRole1 = "Tester"; + AddDeveloperRoleCommand addDeveloperRoleCommand = new AddDeveloperRoleCommand(validRole1); + String expectedMessage = String.format(AddDeveloperRoleCommand.MESSAGE_SUCCESS, validRole1); + + assertCommandSuccess(addDeveloperRoleCommand, model, expectedMessage, expectedModel); + + DeleteDeveloperRoleCommand deleteDeveloperRoleCommand = new DeleteDeveloperRoleCommand(validRole1); + deleteDeveloperRoleCommand.execute(model); + } + + @Test + public void execute_duplicateRole_throwsCommandException() { + String duplicateRole = "Developer"; + AddDeveloperRoleCommand addDeveloperRoleCommand = new AddDeveloperRoleCommand(duplicateRole); + + assertCommandFailure(addDeveloperRoleCommand, model, AddDeveloperRoleCommand.MESSAGE_DUPLICATE_ROLE); + } + + @Test + public void equals() { + String firstRole = "Tester"; + String secondRole = "Developer"; + AddDeveloperRoleCommand addFirstCommand = new AddDeveloperRoleCommand(firstRole); + AddDeveloperRoleCommand addSecondCommand = new AddDeveloperRoleCommand(secondRole); + + // same object -> returns true + assertTrue(addFirstCommand.equals(addFirstCommand)); + + // same values -> returns False because cannot add twice + AddDeveloperRoleCommand addFirstCommandCopy = new AddDeveloperRoleCommand(firstRole); + assertFalse(addFirstCommand.equals(addFirstCommandCopy)); + + // different types -> returns false + assertFalse(addFirstCommand.equals(1)); + + // null -> returns false + assertFalse(addFirstCommand.equals(null)); + + // different developer role -> returns false + assertFalse(addFirstCommand.equals(addSecondCommand)); + } + + @Test + public void toStringTest() { + String roleName = "Tester"; + AddDeveloperRoleCommand addDeveloperRoleCommand = new AddDeveloperRoleCommand(roleName); + assertEquals(addDeveloperRoleCommand.toString(), new AddDeveloperRoleCommand(roleName).toString()); + } +} diff --git a/src/test/java/seedu/address/logic/commands/list/ListProjectCommandTest.java b/src/test/java/seedu/address/logic/commands/list/ListProjectCommandTest.java index 36cd31b1c13..d7bfa327096 100644 --- a/src/test/java/seedu/address/logic/commands/list/ListProjectCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/list/ListProjectCommandTest.java @@ -1,4 +1,43 @@ package seedu.address.logic.commands.list; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static seedu.address.testutil.Assert.assertThrows; +import static seedu.address.testutil.TypicalProjects.getTypicalAddressBook; + +import org.junit.jupiter.api.Test; + +import seedu.address.logic.commands.CommandResult; +import seedu.address.model.Model; +import seedu.address.model.ModelManager; +import seedu.address.model.UserPrefs; + public class ListProjectCommandTest { + + private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + + @Test + public void execute_listIsNotFiltered_showsSameList() { + ListProjectCommand listProjectCommand = new ListProjectCommand(); + CommandResult commandResult = listProjectCommand.execute(model); + + assertEquals(ListProjectCommand.MESSAGE_SUCCESS, commandResult.getFeedbackToUser()); + assertEquals(model.getAddressBook().getProjectList(), model.getFilteredProjectList()); + } + + @Test + public void execute_listIsFiltered_showsEverything() { + // Assume the list is filtered by some predicate + model.updateFilteredProjectList(project -> project.getProjectDeadlines().equals("2023-01-01")); + ListProjectCommand listProjectCommand = new ListProjectCommand(); + CommandResult commandResult = listProjectCommand.execute(model); + + assertEquals(ListProjectCommand.MESSAGE_SUCCESS, commandResult.getFeedbackToUser()); + assertEquals(model.getAddressBook().getProjectList(), model.getFilteredProjectList()); + } + + @Test + public void execute_modelIsNull_throwsAssertionError() { + ListProjectCommand listProjectCommand = new ListProjectCommand(); + assertThrows(AssertionError.class, () -> listProjectCommand.execute(null)); + } } From 3f79d3f6d4ed86660b199d2b9ac771da2053c8de Mon Sep 17 00:00:00 2001 From: mingyu Date: Mon, 13 Nov 2023 13:25:25 +0800 Subject: [PATCH 26/36] delete client and developer roles test cases --- .../addroles/AddClientRoleCommandTest.java | 1 - .../DeleteClientRoleCommandTest.java | 114 +++++++++++++++++ .../DeleteDeveloperRoleCommandTest.java | 116 ++++++++++++++++++ 3 files changed, 230 insertions(+), 1 deletion(-) create mode 100644 src/test/java/seedu/address/logic/commands/deleteroles/DeleteClientRoleCommandTest.java create mode 100644 src/test/java/seedu/address/logic/commands/deleteroles/DeleteDeveloperRoleCommandTest.java diff --git a/src/test/java/seedu/address/logic/commands/addroles/AddClientRoleCommandTest.java b/src/test/java/seedu/address/logic/commands/addroles/AddClientRoleCommandTest.java index c20619ce962..30d5e67ff58 100644 --- a/src/test/java/seedu/address/logic/commands/addroles/AddClientRoleCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/addroles/AddClientRoleCommandTest.java @@ -18,7 +18,6 @@ public class AddClientRoleCommandTest { private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs()); - private final Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs()); @Test public void constructor_nullRole_throwsNullPointerException() { diff --git a/src/test/java/seedu/address/logic/commands/deleteroles/DeleteClientRoleCommandTest.java b/src/test/java/seedu/address/logic/commands/deleteroles/DeleteClientRoleCommandTest.java new file mode 100644 index 00000000000..913575056a8 --- /dev/null +++ b/src/test/java/seedu/address/logic/commands/deleteroles/DeleteClientRoleCommandTest.java @@ -0,0 +1,114 @@ +package seedu.address.logic.commands.deleteroles; + +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 static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure; +import static seedu.address.testutil.TypicalDevelopers.getTypicalAddressBook; + +import org.junit.jupiter.api.Test; + +import seedu.address.logic.Messages; +import seedu.address.logic.commands.addroles.AddClientRoleCommand; +import seedu.address.logic.commands.exceptions.CommandException; +import seedu.address.model.Model; +import seedu.address.model.ModelManager; +import seedu.address.model.UserPrefs; +import seedu.address.model.client.ClientRoles; +import seedu.address.testutil.Assert; +import seedu.address.testutil.ClientBuilder; + +public class DeleteClientRoleCommandTest { + + private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + + @Test + public void constructor_nullRole_throwsNullPointerException() { + Assert.assertThrows(NullPointerException.class, () -> new DeleteClientRoleCommand(null)); + } + + @Test + public void execute_roleAcceptedByModel_deleteSuccessful() throws CommandException { + + String validRole = "NewRole"; + AddClientRoleCommand addClientRoleCommand = new AddClientRoleCommand(validRole); + addClientRoleCommand.execute(model); + + DeleteClientRoleCommand deleteClientRoleCommand = new DeleteClientRoleCommand(validRole); + + String expectedMessage = String.format(DeleteClientRoleCommand.MESSAGE_SUCCESS, validRole); + assertEquals(deleteClientRoleCommand.execute(model).getFeedbackToUser(), expectedMessage); + } + + @Test + public void execute_roleSomeoneUsing_throwsCommandException() throws CommandException { + // Assign a client with the specified role + String roleWithClient = "NewRole"; + AddClientRoleCommand addClientRoleCommand = new AddClientRoleCommand(roleWithClient); + addClientRoleCommand.execute(model); + ClientBuilder clientBuilder = new ClientBuilder().withRole(roleWithClient); + model.addClient(clientBuilder.build()); + + // Attempt to delete the role + DeleteClientRoleCommand deleteClientRoleCommand = new DeleteClientRoleCommand(roleWithClient); + String expectedResult = String.format(DeleteClientRoleCommand.MESSAGE_CANNOT_DELETE_REPEAT, + Messages.format(roleWithClient)); + + // Assert that the command throws an exception + assertCommandFailure(deleteClientRoleCommand, model, expectedResult); + + model.deleteClient(clientBuilder.build()); + deleteClientRoleCommand.execute(model); + } + + + @Test + public void execute_roleNotInList_throwsCommandException() { + String nonExistingRole = "NonExistingRole"; + DeleteClientRoleCommand deleteClientRoleCommand = new DeleteClientRoleCommand(nonExistingRole); + + assertCommandFailure(deleteClientRoleCommand, model, + DeleteClientRoleCommand.MESSAGE_CANNOT_DELETE_NONEXISTING + + DeleteClientRoleCommand.MESSAGE_EXISTING_CLIENT_ROLES + + ClientRoles.printRoles()); + } + + @Test + public void execute_roleIsPredefined_throwsCommandException() { + String roleWithClient = "Client"; + DeleteClientRoleCommand deleteClientRoleCommand = new DeleteClientRoleCommand(roleWithClient); + assertThrows(CommandException.class, () -> deleteClientRoleCommand.execute(model)); + } + + @Test + public void equals() { + String firstRole = "Tester"; + String secondRole = "Client"; + DeleteClientRoleCommand deleteFirstCommand = new DeleteClientRoleCommand(firstRole); + DeleteClientRoleCommand deleteSecondCommand = new DeleteClientRoleCommand(secondRole); + + // same object -> returns true + assertTrue(deleteFirstCommand.equals(deleteFirstCommand)); + + // role will no longer exists-> returns false + DeleteClientRoleCommand deleteFirstCommandCopy = new DeleteClientRoleCommand(firstRole); + assertFalse(deleteFirstCommand.equals(deleteFirstCommandCopy)); + + // different types -> returns false + assertFalse(deleteFirstCommand.equals(1)); + + // null -> returns false + assertFalse(deleteFirstCommand.equals(null)); + + // different client role -> returns false + assertFalse(deleteFirstCommand.equals(deleteSecondCommand)); + } + + @Test + public void toStringTest() { + String roleName = "Tester"; + DeleteClientRoleCommand deleteClientRoleCommand = new DeleteClientRoleCommand(roleName); + assertEquals(deleteClientRoleCommand.toString(), new DeleteClientRoleCommand(roleName).toString()); + } +} diff --git a/src/test/java/seedu/address/logic/commands/deleteroles/DeleteDeveloperRoleCommandTest.java b/src/test/java/seedu/address/logic/commands/deleteroles/DeleteDeveloperRoleCommandTest.java new file mode 100644 index 00000000000..da5a1161a41 --- /dev/null +++ b/src/test/java/seedu/address/logic/commands/deleteroles/DeleteDeveloperRoleCommandTest.java @@ -0,0 +1,116 @@ +package seedu.address.logic.commands.deleteroles; + +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 static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure; +import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; +import static seedu.address.testutil.TypicalDevelopers.getTypicalAddressBook; + +import org.junit.jupiter.api.Test; + +import seedu.address.logic.Messages; +import seedu.address.logic.commands.addroles.AddDeveloperRoleCommand; +import seedu.address.logic.commands.exceptions.CommandException; +import seedu.address.model.Model; +import seedu.address.model.ModelManager; +import seedu.address.model.UserPrefs; +import seedu.address.model.developer.DeveloperRoles; +import seedu.address.testutil.Assert; +import seedu.address.testutil.DeveloperBuilder; + +public class DeleteDeveloperRoleCommandTest { + + private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + + @Test + public void constructor_nullRole_throwsNullPointerException() { + Assert.assertThrows(NullPointerException.class, () -> new DeleteDeveloperRoleCommand(null)); + } + + @Test + public void execute_roleAcceptedByModel_deleteSuccessful() throws CommandException { + + String validRole = "NewRole"; + AddDeveloperRoleCommand addDeveloperRoleCommand = new AddDeveloperRoleCommand(validRole); + addDeveloperRoleCommand.execute(model); + + DeleteDeveloperRoleCommand deleteDeveloperRoleCommand = new DeleteDeveloperRoleCommand(validRole); + + String expectedMessage = String.format(DeleteDeveloperRoleCommand.MESSAGE_SUCCESS, validRole); + + assertCommandSuccess(deleteDeveloperRoleCommand, model, expectedMessage, model); + } + + @Test + public void execute_roleSomeoneUsing_throwsCommandException() throws CommandException { + // Assign a developer with the specified role + String roleWithDevelopers = "NewRole"; + AddDeveloperRoleCommand addDeveloperRoleCommand = new AddDeveloperRoleCommand(roleWithDevelopers); + addDeveloperRoleCommand.execute(model); + DeveloperBuilder developerBuilder = new DeveloperBuilder().withRole(roleWithDevelopers); + model.addDeveloper(developerBuilder.build()); + + // Attempt to delete the role + DeleteDeveloperRoleCommand deleteDeveloperRoleCommand = new DeleteDeveloperRoleCommand(roleWithDevelopers); + String expectedResult = String.format(DeleteDeveloperRoleCommand.MESSAGE_CANNOT_DELETE_REPEAT, + Messages.format(roleWithDevelopers)); + + // Assert that the command throws an exception + assertCommandFailure(deleteDeveloperRoleCommand, model, expectedResult); + + model.deleteDeveloper(developerBuilder.build()); + deleteDeveloperRoleCommand.execute(model); + } + + + @Test + public void execute_roleNotInList_throwsCommandException() { + String nonExistingRole = "NonExistingRole"; + DeleteDeveloperRoleCommand deleteDeveloperRoleCommand = new DeleteDeveloperRoleCommand(nonExistingRole); + + assertCommandFailure(deleteDeveloperRoleCommand, model, + DeleteDeveloperRoleCommand.MESSAGE_CANNOT_DELETE_NONEXISTING + + DeleteDeveloperRoleCommand.MESSAGE_EXISTING_DEVELOPERS_ROLES + + DeveloperRoles.printRoles()); + } + + @Test + public void execute_roleIsPredefined_throwsCommandException() { + String roleWithDevelopers = "Developer"; + DeleteDeveloperRoleCommand deleteDeveloperRoleCommand = new DeleteDeveloperRoleCommand(roleWithDevelopers); + assertThrows(CommandException.class, () -> deleteDeveloperRoleCommand.execute(model)); + } + + @Test + public void equals() { + String firstRole = "Tester"; + String secondRole = "Developer"; + DeleteDeveloperRoleCommand deleteFirstCommand = new DeleteDeveloperRoleCommand(firstRole); + DeleteDeveloperRoleCommand deleteSecondCommand = new DeleteDeveloperRoleCommand(secondRole); + + // same object -> returns true + assertTrue(deleteFirstCommand.equals(deleteFirstCommand)); + + // role will no longer exists-> returns false + DeleteDeveloperRoleCommand deleteFirstCommandCopy = new DeleteDeveloperRoleCommand(firstRole); + assertFalse(deleteFirstCommand.equals(deleteFirstCommandCopy)); + + // different types -> returns false + assertFalse(deleteFirstCommand.equals(1)); + + // null -> returns false + assertFalse(deleteFirstCommand.equals(null)); + + // different developer role -> returns false + assertFalse(deleteFirstCommand.equals(deleteSecondCommand)); + } + + @Test + public void toStringTest() { + String roleName = "Tester"; + DeleteDeveloperRoleCommand deleteDeveloperRoleCommand = new DeleteDeveloperRoleCommand(roleName); + assertEquals(deleteDeveloperRoleCommand.toString(), new DeleteDeveloperRoleCommand(roleName).toString()); + } +} From 686759f3a7243e685f2395b9412ef533927b1add Mon Sep 17 00:00:00 2001 From: emzm2023 Date: Mon, 13 Nov 2023 14:17:02 +0800 Subject: [PATCH 27/36] Add tests for edit project command and mark/unmark commands --- .../commands/mark/UnmarkDeadlineCommand.java | 2 +- .../logic/commands/CommandTestUtil.java | 24 ++ .../commands/edit/EditProjectCommandTest.java | 216 ++++++++---------- .../edit/EditProjectDescriptorTest.java | 61 +++++ .../mark/MarkDeadlineCommandTest.java | 134 +++++++++++ .../mark/UnmarkDeadlineCommandTest.java | 127 ++++++++++ .../EditProjectDescriptorBuilder.java | 8 - .../address/testutil/ProjectBuilder.java | 23 ++ .../address/testutil/TypicalIndexes.java | 8 +- 9 files changed, 468 insertions(+), 135 deletions(-) create mode 100644 src/test/java/seedu/address/logic/commands/edit/EditProjectDescriptorTest.java create mode 100644 src/test/java/seedu/address/logic/commands/mark/MarkDeadlineCommandTest.java create mode 100644 src/test/java/seedu/address/logic/commands/mark/UnmarkDeadlineCommandTest.java diff --git a/src/main/java/seedu/address/logic/commands/mark/UnmarkDeadlineCommand.java b/src/main/java/seedu/address/logic/commands/mark/UnmarkDeadlineCommand.java index 47b63569251..c384e689625 100644 --- a/src/main/java/seedu/address/logic/commands/mark/UnmarkDeadlineCommand.java +++ b/src/main/java/seedu/address/logic/commands/mark/UnmarkDeadlineCommand.java @@ -105,7 +105,7 @@ public boolean equals(Object other) { } // instanceof handles nulls - if (!(other instanceof MarkDeadlineCommand)) { + if (!(other instanceof UnmarkDeadlineCommand)) { return false; } diff --git a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java index 233c910eabf..90697d42fa8 100644 --- a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java +++ b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java @@ -24,6 +24,7 @@ import seedu.address.commons.core.index.Index; import seedu.address.logic.commands.edit.EditClientCommand; import seedu.address.logic.commands.edit.EditDeveloperCommand; +import seedu.address.logic.commands.edit.EditProjectCommand; import seedu.address.logic.commands.exceptions.CommandException; import seedu.address.model.AddressBook; import seedu.address.model.Model; @@ -31,8 +32,11 @@ import seedu.address.model.client.NameClientContainsKeywordsPredicate; import seedu.address.model.developer.Developer; import seedu.address.model.developer.NameDeveloperContainsKeywordsPredicate; +import seedu.address.model.project.Project; +import seedu.address.model.project.ProjectNameContainsKeywordsPredicate; import seedu.address.testutil.EditClientDescriptorBuilder; import seedu.address.testutil.EditDeveloperDescriptorBuilder; +import seedu.address.testutil.EditProjectDescriptorBuilder; /** * Contains helper methods for testing commands. @@ -167,6 +171,8 @@ public class CommandTestUtil { public static final EditDeveloperCommand.EditDeveloperDescriptor DESC_BOB; public static final EditClientCommand.EditClientDescriptor DESC_CALEB; public static final EditClientCommand.EditClientDescriptor DESC_DAN; + public static final EditProjectCommand.EditProjectDescriptor DESC_PROJECT1; + public static final EditProjectCommand.EditProjectDescriptor DESC_PROJECT2; static { @@ -185,6 +191,11 @@ public class CommandTestUtil { DESC_DAN = new EditClientDescriptorBuilder().withName(VALID_NAME_DAN).withPhone(VALID_PHONE_DAN) .withAddress(VALID_ADDRESS_DAN).withEmail(VALID_EMAIL_DAN).withProjects(VALID_PROJECT_1_DAN) .withDocument(VALID_DOCUMENT_DAN).build(); + + DESC_PROJECT1 = new EditProjectDescriptorBuilder().withDescription(VALID_PROJECT_DESCRIPTION_ANDROIDAPP) + .withDeadlines(VALID_FULL_PROJECT_DEADLINE_1).build(); + DESC_PROJECT2 = new EditProjectDescriptorBuilder().withDescription(VALID_PROJECT_DESCRIPTION_APPLEAPP) + .withDeadlines(VALID_FULL_PROJECT_DEADLINE_2).build(); } /** @@ -293,4 +304,17 @@ public static void showClientAtIndex(Model model, Index targetIndex) { assertEquals(1, model.getFilteredClientList().size()); } + /** + * Updates {@code model}'s filtered list to show only the project at the given {@code targetIndex} in the + * {@code model}'s address book. + */ + public static void showProjectAtIndex(Model model, Index targetIndex) { + assertTrue(targetIndex.getZeroBased() < model.getFilteredProjectList().size()); + + Project project = model.getFilteredProjectList().get(targetIndex.getZeroBased()); + final String[] splitName = project.getName().split("\\s+"); + model.updateFilteredProjectList(new ProjectNameContainsKeywordsPredicate(Arrays.asList(splitName[0]))); +// assertEquals(1, model.getFilteredProjectList().size()); + } + } diff --git a/src/test/java/seedu/address/logic/commands/edit/EditProjectCommandTest.java b/src/test/java/seedu/address/logic/commands/edit/EditProjectCommandTest.java index 9ed86ca7f0a..f8a13da881a 100644 --- a/src/test/java/seedu/address/logic/commands/edit/EditProjectCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/edit/EditProjectCommandTest.java @@ -3,13 +3,18 @@ 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.DESC_PROJECT1; +import static seedu.address.logic.commands.CommandTestUtil.DESC_PROJECT2; import static seedu.address.logic.commands.CommandTestUtil.VALID_FULL_PROJECT_DEADLINE_1; import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_DESCRIPTION_APPLEAPP; import static seedu.address.logic.commands.CommandTestUtil.assertClientCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure; import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.assertProjectCommandSuccess; +import static seedu.address.logic.commands.CommandTestUtil.showProjectAtIndex; import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PROJECT; +import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PROJECT; +import static seedu.address.testutil.TypicalIndexes.INVALID_INDEX_PROJECT; import static seedu.address.testutil.TypicalProjects.getTypicalAddressBook; import java.util.ArrayList; @@ -19,6 +24,7 @@ import seedu.address.commons.core.index.Index; import seedu.address.logic.Messages; +import seedu.address.logic.commands.ClearCommand; import seedu.address.model.AddressBook; import seedu.address.model.Model; import seedu.address.model.ModelManager; @@ -83,129 +89,89 @@ public void execute_noFieldSpecifiedUnfilteredList_success() { assertProjectCommandSuccess(editProjectCommand, model, expectedMessage, expectedModel); } -// -// @Test -// public void execute_filteredList_success() { -// showProjectAtIndex(model, INDEX_FIRST_PROJECT); -// -// Project projectInFilteredList = model.getFilteredProjectList().get(INDEX_FIRST_PROJECT.getZeroBased()); -// Project editedProject = new ProjectBuilder(projectInFilteredList).withName(VALID_NAME_PROJECT_2).build(); -// EditProjectCommand editProjectCommand = new EditProjectCommand(INDEX_FIRST_PROJECT, -// new EditProjectDescriptorBuilder().withName(VALID_NAME_PROJECT_2).build()); -// -// String expectedMessage = String.format(EditProjectCommand.MESSAGE_EDIT_PROJECT_SUCCESS, -// Messages.format(editedProject)); -// -// Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs()); -// expectedModel.setProject(model.getFilteredProjectList().get(0), editedProject); -// -// assertCommandSuccess(editProjectCommand, model, expectedMessage, expectedModel); -// } -// -// @Test -// public void execute_duplicateProjectUnfilteredList_failure() { -// Project firstProject = model.getFilteredProjectList().get(INDEX_FIRST_PROJECT.getZeroBased()); -// EditProjectCommand.EditProjectDescriptor descriptor = new EditProjectDescriptorBuilder(firstProject).build(); -// EditProjectCommand editProjectCommand = new EditProjectCommand(INDEX_SECOND_PROJECT, descriptor); -// -// assertCommandFailure(editProjectCommand, model, EditProjectCommand.MESSAGE_DUPLICATE_PROJECT); -// } -// -// @Test -// public void execute_duplicateProjectFilteredList_failure() { -// showProjectAtIndex(model, INDEX_FIRST_PROJECT); -// -// // edit project in filtered list into a duplicate in address book -// Project projectInList = model.getAddressBook().getProjectList().get(INDEX_SECOND_PROJECT.getZeroBased()); -// EditProjectCommand editProjectCommand = new EditProjectCommand(INDEX_FIRST_PROJECT, -// new EditProjectDescriptorBuilder(projectInList).build()); -// -// assertCommandFailure(editProjectCommand, model, EditProjectCommand.MESSAGE_DUPLICATE_PROJECT); -// } -// -// @Test -// public void execute_invalidProjectIndexUnfilteredList_failure() { -// Index outOfBoundIndex = Index.fromOneBased(model.getFilteredProjectList().size() + 1); -// EditProjectCommand.EditProjectDescriptor descriptor = new EditProjectDescriptorBuilder() -// .withName(VALID_NAME_PROJECT_2).build(); -// EditProjectCommand editProjectCommand = new EditProjectCommand(outOfBoundIndex, descriptor); -// -// assertCommandFailure(editProjectCommand, model, Messages.MESSAGE_INVALID_PROJECT_DISPLAYED_INDEX); -// } -// -// /** -// * Edit filtered list where index is larger than size of filtered list, -// * but smaller than size of address book -// */ -// @Test -// public void execute_invalidProjectIndexFilteredList_failure() { -// showProjectAtIndex(model, INDEX_FIRST_PROJECT); -// Index outOfBoundIndex = INDEX_SECOND_PROJECT; -// // ensures that outOfBoundIndex is still in bounds of address book list -// assertTrue(outOfBoundIndex.getZeroBased() < model.getAddressBook().getProjectList().size()); -// -// EditProjectCommand editProjectCommand = new EditProjectCommand(outOfBoundIndex, -// new EditProjectDescriptorBuilder().withName(VALID_NAME_PROJECT_2).build()); -// -// assertCommandFailure(editProjectCommand, model, Messages.MESSAGE_INVALID_PROJECT_DISPLAYED_INDEX); -// } -// -// @Test -// public void equals() { -// final EditProjectCommand standardCommand = new EditProjectCommand(INDEX_FIRST_PROJECT, DESCRIPTION_PROJECT_1); -// -// // same values -> returns true -// EditProjectCommand.EditProjectDescriptor copyDescriptor = new EditProjectCommand.EditProjectDescriptor( -// DESCRIPTION_PROJECT_1); -// EditProjectCommand commandWithSameValues = new EditProjectCommand(INDEX_FIRST_PROJECT, copyDescriptor); -// assertTrue(standardCommand.equals(commandWithSameValues)); -// -// // same object -> returns true -// assertTrue(standardCommand.equals(standardCommand)); -// -// // null -> returns false -// assertFalse(standardCommand.equals(null)); -// -// // different types -> returns false -// assertFalse(standardCommand.equals(new ClearCommand())); -// -// // different index -> returns false -// assertFalse(standardCommand.equals(new EditProjectCommand(INDEX_SECOND_PROJECT, DESCRIPTION_PROJECT_1))); -// -// // different descriptor -> returns false -// assertFalse(standardCommand.equals(new EditProjectCommand(INDEX_FIRST_PROJECT, DESCRIPTION_PROJECT_2))); -// } -// -// @Test -// public void toStringMethod() { -// Index index = Index.fromOneBased(1); -// EditProjectCommand.EditProjectDescriptor editProjectDescriptor = new EditProjectCommand.EditProjectDescriptor(); -// EditProjectCommand editProjectCommand = new EditProjectCommand(index, editProjectDescriptor); -// String expected = EditProjectCommand.class.getCanonicalName() + "{index=" + index -// + ", editProjectDescriptor=" + editProjectDescriptor + "}"; -// assertEquals(expected, editProjectCommand.toString()); -// } -// -// /** -// * Updates {@code model}'s filtered list to show no one. -// */ -// private void showNoProject(Model model) { -// model.updateFilteredProjectList(p -> false); -// -// assertTrue(model.getFilteredProjectList().isEmpty()); -// } -// -// /** -// * Updates {@code model}'s filtered list to show projects at {@code targetIndex} in {@code model}'s address book. -// */ -// private void showProjectAtIndex(Model model, Index targetIndex) { -// assertTrue(targetIndex.getZeroBased() < model.getFilteredProjectList().size()); -// -// Project project = model.getFilteredProjectList().get(targetIndex.getZeroBased()); -// final String[] splitName = project.getProjectName().fullName.split("\\s+"); -// model.updateFilteredProjectList( -// p -> Arrays.asList(splitName).contains(p.getProjectName().fullName)); -// -// assertEquals(1, model.getFilteredProjectList().size()); -// } + + @Test + public void execute_filteredList_success() { + showProjectAtIndex(model, INDEX_FIRST_PROJECT); + + Project projectInFilteredList = model.getFilteredProjectList().get(INDEX_FIRST_PROJECT.getZeroBased()); + Project editedProject = new ProjectBuilder(projectInFilteredList) + .withDescription(VALID_PROJECT_DESCRIPTION_APPLEAPP).build(); + EditProjectCommand editProjectCommand = new EditProjectCommand(INDEX_FIRST_PROJECT, + new EditProjectDescriptorBuilder().withDescription(VALID_PROJECT_DESCRIPTION_APPLEAPP).build()); + + String expectedMessage = String.format(EditProjectCommand.MESSAGE_EDIT_PROJECT_SUCCESS, + Messages.format(editedProject)); + + Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs()); + expectedModel.setProject(model.getFilteredProjectList().get(0), editedProject); + + assertProjectCommandSuccess(editProjectCommand, model, expectedMessage, expectedModel); + } + + @Test + public void execute_duplicateProjectDetailsUnfilteredList_success() { + Project firstProject = model.getFilteredProjectList().get(INDEX_FIRST_PROJECT.getZeroBased()); + Project secondProject = model.getFilteredProjectList().get(INDEX_SECOND_PROJECT.getZeroBased()); + EditProjectCommand.EditProjectDescriptor descriptor = new EditProjectDescriptorBuilder(firstProject).build(); + EditProjectCommand editProjectCommand = new EditProjectCommand(INDEX_SECOND_PROJECT, descriptor); + + Project editedProject = new ProjectBuilder(secondProject) + .withDescription(firstProject.getProjectDescription().desc) + .withDeadlines(firstProject.getProjectDeadlines()).build(); + + String expectedMessage = String.format(EditProjectCommand.MESSAGE_EDIT_PROJECT_SUCCESS, + Messages.format(editedProject)); + + Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs()); + expectedModel.setProject(model.getFilteredProjectList().get(1), editedProject); + + assertProjectCommandSuccess(editProjectCommand, model, expectedMessage, expectedModel); + } + + @Test + public void execute_invalidProjectIndexUnfilteredList_failure() { + Index outOfBoundIndex = Index.fromOneBased(model.getFilteredProjectList().size() + 1); + EditProjectCommand.EditProjectDescriptor descriptor = new EditProjectDescriptorBuilder() + .withDescription(VALID_PROJECT_DESCRIPTION_APPLEAPP).build(); + EditProjectCommand editProjectCommand = new EditProjectCommand(outOfBoundIndex, descriptor); + + assertCommandFailure(editProjectCommand, model, Messages.MESSAGE_INVALID_PROJECT_DISPLAYED_INDEX); + } + + @Test + public void equals() { + final EditProjectCommand standardCommand = new EditProjectCommand(INDEX_FIRST_PROJECT, DESC_PROJECT1); + + // same values -> returns true + EditProjectCommand.EditProjectDescriptor copyDescriptor = new EditProjectCommand.EditProjectDescriptor( + DESC_PROJECT1); + EditProjectCommand commandWithSameValues = new EditProjectCommand(INDEX_FIRST_PROJECT, copyDescriptor); + assertTrue(standardCommand.equals(commandWithSameValues)); + + // same object -> returns true + assertTrue(standardCommand.equals(standardCommand)); + + // null -> returns false + assertFalse(standardCommand.equals(null)); + + // different types -> returns false + assertFalse(standardCommand.equals(new ClearCommand())); + + // different index -> returns false + assertFalse(standardCommand.equals(new EditProjectCommand(INDEX_SECOND_PROJECT, DESC_PROJECT1))); + + // different descriptor -> returns false + assertFalse(standardCommand.equals(new EditProjectCommand(INDEX_FIRST_PROJECT, DESC_PROJECT2))); + } + + @Test + public void toStringMethod() { + Index index = Index.fromOneBased(1); + EditProjectCommand.EditProjectDescriptor editProjectDescriptor = new EditProjectCommand.EditProjectDescriptor(); + EditProjectCommand editProjectCommand = new EditProjectCommand(index, editProjectDescriptor); + String expected = EditProjectCommand.class.getCanonicalName() + "{index=" + index + + ", editProjectDescriptor=" + editProjectDescriptor + "}"; + assertEquals(expected, editProjectCommand.toString()); + } } diff --git a/src/test/java/seedu/address/logic/commands/edit/EditProjectDescriptorTest.java b/src/test/java/seedu/address/logic/commands/edit/EditProjectDescriptorTest.java new file mode 100644 index 00000000000..7bf1acb9f14 --- /dev/null +++ b/src/test/java/seedu/address/logic/commands/edit/EditProjectDescriptorTest.java @@ -0,0 +1,61 @@ +package seedu.address.logic.commands.edit; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +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.DESC_PROJECT1; +import static seedu.address.logic.commands.CommandTestUtil.DESC_PROJECT2; +import static seedu.address.logic.commands.CommandTestUtil.VALID_FULL_PROJECT_DEADLINE_1; +import static seedu.address.logic.commands.CommandTestUtil.VALID_FULL_PROJECT_DEADLINE_2; +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_PROJECT_DESCRIPTION_APPLEAPP; + +import org.junit.jupiter.api.Test; + +import seedu.address.testutil.EditProjectDescriptorBuilder; + +public class EditProjectDescriptorTest { + + @Test + public void equals() { + // same values -> returns true + EditProjectCommand.EditProjectDescriptor descriptorWithSameValues = + new EditProjectCommand.EditProjectDescriptor(DESC_PROJECT1); + assertEquals(DESC_PROJECT1, descriptorWithSameValues); + + // same object -> returns true + assertEquals(DESC_PROJECT1, DESC_PROJECT1); + + // null -> returns false + assertNotEquals(null, DESC_PROJECT1); + + // different types -> returns false + assertNotEquals(5, DESC_PROJECT1); + + // different values -> returns false + assertNotEquals(DESC_PROJECT1, DESC_PROJECT2); + + // different description -> returns false + EditProjectCommand.EditProjectDescriptor editedProj = new EditProjectDescriptorBuilder(DESC_PROJECT1) + .withDescription(VALID_PROJECT_DESCRIPTION_APPLEAPP).build(); + assertNotEquals(DESC_PROJECT1, editedProj); + + // different deadlines -> returns false + editedProj = new EditProjectDescriptorBuilder(DESC_PROJECT1). + withDeadline(VALID_FULL_PROJECT_DEADLINE_2).build(); + assertNotEquals(DESC_PROJECT1, editedProj); + } + + @Test + public void toStringMethod() { + EditProjectCommand.EditProjectDescriptor editProjectDescriptor = + new EditProjectDescriptorBuilder().build(); + String expected = EditProjectCommand.EditProjectDescriptor.class.getCanonicalName() + "{description=" + + editProjectDescriptor.getDescription().orElse(null) + ", deadlines=" + + editProjectDescriptor.getDeadlines().orElse(null) + "}"; + + assertEquals(expected, editProjectDescriptor.toString()); + } +} diff --git a/src/test/java/seedu/address/logic/commands/mark/MarkDeadlineCommandTest.java b/src/test/java/seedu/address/logic/commands/mark/MarkDeadlineCommandTest.java new file mode 100644 index 00000000000..680bf23a59c --- /dev/null +++ b/src/test/java/seedu/address/logic/commands/mark/MarkDeadlineCommandTest.java @@ -0,0 +1,134 @@ +package seedu.address.logic.commands.mark; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure; +import static seedu.address.logic.commands.CommandTestUtil.assertProjectCommandSuccess; +import static seedu.address.logic.commands.CommandTestUtil.showProjectAtIndex; +import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PROJECT; +import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PROJECT_AND_DEADLINE; +import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PROJECT; +import static seedu.address.testutil.TypicalProjects.getTypicalAddressBook; + +import java.util.List; + +import org.junit.jupiter.api.Test; + +import seedu.address.commons.core.index.Index; +import seedu.address.logic.Messages; +import seedu.address.logic.commands.CommandResult; +import seedu.address.model.Model; +import seedu.address.model.ModelManager; +import seedu.address.model.UserPrefs; +import seedu.address.model.project.Deadline; +import seedu.address.model.project.Project; +import seedu.address.testutil.ProjectBuilder; + +/** + * Contains integration tests (interaction with the Model) and unit tests for MarkDeadlineCommand. + */ +public class MarkDeadlineCommandTest { + + private final Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + + @Test + public void execute_validIndexesUnfilteredList_success() { + Project projectToEdit = model.getFilteredProjectList().get(INDEX_FIRST_PROJECT.getZeroBased()); + Index projectIndex = INDEX_FIRST_PROJECT_AND_DEADLINE.get(0); + Index deadlineIndex = INDEX_FIRST_PROJECT_AND_DEADLINE.get(1); + List markedDeadline = projectToEdit.markDeadlineStringRep(deadlineIndex.getOneBased()); + + MarkDeadlineCommand markDeadlineCommand = new MarkDeadlineCommand(projectIndex, deadlineIndex); + + ProjectBuilder projectInList = new ProjectBuilder(projectToEdit); + Project editedProject = projectInList.withDeadlinesString(markedDeadline).build(); + + String expectedMessage = MarkDeadlineCommand.MESSAGE_SUCCESS; + + ModelManager expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs()); + expectedModel.setProject(projectToEdit, editedProject); + + assertProjectCommandSuccess(markDeadlineCommand, model, expectedMessage, expectedModel); + } + + @Test + public void execute_invalidProjectIndexUnfilteredList_failure() { + Index outOfBoundIndex = Index.fromOneBased(model.getFilteredProjectList().size() + 1); + MarkDeadlineCommand markDeadlineCommand = new MarkDeadlineCommand(outOfBoundIndex, INDEX_FIRST_PROJECT); + + assertCommandFailure(markDeadlineCommand, model, Messages.MESSAGE_INVALID_PROJECT_DISPLAYED_INDEX); + } + + @Test + public void execute_invalidDeadlineIndexUnfilteredList_failure() { + Project projectToEdit = model.getFilteredProjectList().get(INDEX_FIRST_PROJECT.getZeroBased()); + Index outOfBoundIndex = Index.fromOneBased(projectToEdit.deadlineListSize() + 1); + MarkDeadlineCommand markDeadlineCommand = new MarkDeadlineCommand(INDEX_FIRST_PROJECT, outOfBoundIndex); + + assertCommandFailure(markDeadlineCommand, model, Messages.MESSAGE_INVALID_DEADLINE_DISPLAYED_INDEX); + } + + @Test + public void equals() { + MarkDeadlineCommand markFirstCommand = new MarkDeadlineCommand(INDEX_FIRST_PROJECT, INDEX_FIRST_PROJECT); + MarkDeadlineCommand markSecondCommand = new MarkDeadlineCommand(INDEX_SECOND_PROJECT, INDEX_SECOND_PROJECT); + + // same object -> returns true + assertTrue(markFirstCommand.equals(markFirstCommand)); + + // same values -> returns true + MarkDeadlineCommand markFirstCommandCopy = new MarkDeadlineCommand(INDEX_FIRST_PROJECT, INDEX_FIRST_PROJECT); + assertTrue(markFirstCommand.equals(markFirstCommandCopy)); + + // different types -> returns false + assertFalse(markFirstCommand.equals(1)); + + // null -> returns false + assertFalse(markFirstCommand.equals(null)); + + // different project index -> returns false + assertFalse(markFirstCommand.equals(markSecondCommand)); + } + +// /** +// * Generates a new MarkDeadlineCommand with the details of the given project index and deadline index. +// */ +// private MarkDeadlineCommand prepareCommand(Index projIndex, Index deadlineIndex) { +// MarkDeadlineCommand markDeadlineCommand = new MarkDeadlineCommand(projIndex, deadlineIndex); +// markDeadlineCommand.setData(model, new CommandResult("", TabIndex.Project)); +// return markDeadlineCommand; +// } + + @Test + public void execute_validIndexesFilteredList_success() { + showProjectAtIndex(model, INDEX_FIRST_PROJECT); + + Project projectToEdit = model.getFilteredProjectList().get(INDEX_FIRST_PROJECT.getZeroBased()); + Index projectIndex = INDEX_FIRST_PROJECT_AND_DEADLINE.get(0); + Index deadlineIndex = INDEX_FIRST_PROJECT_AND_DEADLINE.get(1); + List markedDeadline = projectToEdit.markDeadlineStringRep(deadlineIndex.getOneBased()); + + MarkDeadlineCommand markDeadlineCommand = new MarkDeadlineCommand(projectIndex, deadlineIndex); + + ProjectBuilder projectInList = new ProjectBuilder(projectToEdit); + Project editedProject = projectInList.withDeadlinesString(markedDeadline).build(); + + String expectedMessage = MarkDeadlineCommand.MESSAGE_SUCCESS; + + ModelManager expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs()); + expectedModel.setProject(projectToEdit, editedProject); + + assertProjectCommandSuccess(markDeadlineCommand, model, expectedMessage, expectedModel); + } + + @Test + public void execute_invalidDeadlineIndexFilteredList_failure() { + showProjectAtIndex(model, INDEX_FIRST_PROJECT); + + Project projectToEdit = model.getFilteredProjectList().get(INDEX_FIRST_PROJECT.getZeroBased()); + Index outOfBoundIndex = Index.fromOneBased(projectToEdit.deadlineListSize() + 1); + MarkDeadlineCommand markDeadlineCommand = new MarkDeadlineCommand(INDEX_FIRST_PROJECT, outOfBoundIndex); + + assertCommandFailure(markDeadlineCommand, model, Messages.MESSAGE_INVALID_DEADLINE_DISPLAYED_INDEX); + } +} diff --git a/src/test/java/seedu/address/logic/commands/mark/UnmarkDeadlineCommandTest.java b/src/test/java/seedu/address/logic/commands/mark/UnmarkDeadlineCommandTest.java new file mode 100644 index 00000000000..feb0d7a6d64 --- /dev/null +++ b/src/test/java/seedu/address/logic/commands/mark/UnmarkDeadlineCommandTest.java @@ -0,0 +1,127 @@ +package seedu.address.logic.commands.mark; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure; +import static seedu.address.logic.commands.CommandTestUtil.assertProjectCommandSuccess; +import static seedu.address.logic.commands.CommandTestUtil.showProjectAtIndex; +import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PROJECT; +import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PROJECT_AND_DEADLINE; +import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PROJECT; +import static seedu.address.testutil.TypicalProjects.getTypicalAddressBook; + +import java.util.List; + +import org.junit.jupiter.api.Test; + +import seedu.address.commons.core.index.Index; +import seedu.address.logic.Messages; +import seedu.address.logic.commands.CommandResult; +import seedu.address.model.Model; +import seedu.address.model.ModelManager; +import seedu.address.model.UserPrefs; +import seedu.address.model.project.Deadline; +import seedu.address.model.project.Project; +import seedu.address.testutil.ProjectBuilder; + +/** + * Contains integration tests (interaction with the Model) and unit tests for UnmarkDeadlineCommand. + */ +public class UnmarkDeadlineCommandTest { + + private final Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + + @Test + public void execute_validIndexesUnfilteredList_success() { + Project projectToEdit = model.getFilteredProjectList().get(INDEX_FIRST_PROJECT.getZeroBased()); + Index projectIndex = INDEX_FIRST_PROJECT_AND_DEADLINE.get(0); + Index deadlineIndex = INDEX_FIRST_PROJECT_AND_DEADLINE.get(1); + List markedDeadline = projectToEdit.markDeadlineStringRep(deadlineIndex.getOneBased()); + + UnmarkDeadlineCommand unmarkDeadlineCommand = new UnmarkDeadlineCommand(projectIndex, deadlineIndex); + + ProjectBuilder projectInList = new ProjectBuilder(projectToEdit); + Project editedProject = projectInList.withDeadlinesString(markedDeadline).build(); + + String expectedMessage = UnmarkDeadlineCommand.MESSAGE_SUCCESS; + + ModelManager expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs()); + expectedModel.setProject(projectToEdit, editedProject); + + assertProjectCommandSuccess(unmarkDeadlineCommand, model, expectedMessage, expectedModel); + } + + @Test + public void execute_invalidProjectIndexUnfilteredList_failure() { + Index outOfBoundIndex = Index.fromOneBased(model.getFilteredProjectList().size() + 1); + UnmarkDeadlineCommand unmarkDeadlineCommand = new UnmarkDeadlineCommand(outOfBoundIndex, INDEX_FIRST_PROJECT); + + assertCommandFailure(unmarkDeadlineCommand, model, Messages.MESSAGE_INVALID_PROJECT_DISPLAYED_INDEX); + } + + @Test + public void execute_invalidDeadlineIndexUnfilteredList_failure() { + Project projectToEdit = model.getFilteredProjectList().get(INDEX_FIRST_PROJECT.getZeroBased()); + Index outOfBoundIndex = Index.fromOneBased(projectToEdit.deadlineListSize() + 1); + UnmarkDeadlineCommand unmarkDeadlineCommand = new UnmarkDeadlineCommand(INDEX_FIRST_PROJECT, outOfBoundIndex); + + assertCommandFailure(unmarkDeadlineCommand, model, Messages.MESSAGE_INVALID_DEADLINE_DISPLAYED_INDEX); + } + + @Test + public void equals() { + UnmarkDeadlineCommand unmarkFirstCommand = new UnmarkDeadlineCommand(INDEX_FIRST_PROJECT, INDEX_FIRST_PROJECT); + UnmarkDeadlineCommand unmarkSecondCommand = + new UnmarkDeadlineCommand(INDEX_SECOND_PROJECT, INDEX_SECOND_PROJECT); + + // same object -> returns true + assertTrue(unmarkFirstCommand.equals(unmarkFirstCommand)); + + // same values -> returns true + UnmarkDeadlineCommand unmarkFirstCommandCopy = + new UnmarkDeadlineCommand(INDEX_FIRST_PROJECT, INDEX_FIRST_PROJECT); + assertTrue(unmarkFirstCommand.equals(unmarkFirstCommandCopy)); + + // different types -> returns false + assertFalse(unmarkFirstCommand.equals(1)); + + // null -> returns false + assertFalse(unmarkFirstCommand.equals(null)); + + // different project index -> returns false + assertFalse(unmarkFirstCommand.equals(unmarkSecondCommand)); + } + + @Test + public void execute_validIndexesFilteredList_success() { + showProjectAtIndex(model, INDEX_FIRST_PROJECT); + + Project projectToEdit = model.getFilteredProjectList().get(INDEX_FIRST_PROJECT.getZeroBased()); + Index projectIndex = INDEX_FIRST_PROJECT_AND_DEADLINE.get(0); + Index deadlineIndex = INDEX_FIRST_PROJECT_AND_DEADLINE.get(1); + List markedDeadline = projectToEdit.markDeadlineStringRep(deadlineIndex.getOneBased()); + + UnmarkDeadlineCommand unmarkDeadlineCommand = new UnmarkDeadlineCommand(projectIndex, deadlineIndex); + + ProjectBuilder projectInList = new ProjectBuilder(projectToEdit); + Project editedProject = projectInList.withDeadlinesString(markedDeadline).build(); + + String expectedMessage = UnmarkDeadlineCommand.MESSAGE_SUCCESS; + + ModelManager expectedModel = new ModelManager(model.getAddressBook(), new UserPrefs()); + expectedModel.setProject(projectToEdit, editedProject); + + assertProjectCommandSuccess(unmarkDeadlineCommand, model, expectedMessage, expectedModel); + } + + @Test + public void execute_invalidDeadlineIndexFilteredList_failure() { + showProjectAtIndex(model, INDEX_FIRST_PROJECT); + + Project projectToEdit = model.getFilteredProjectList().get(INDEX_FIRST_PROJECT.getZeroBased()); + Index outOfBoundIndex = Index.fromOneBased(projectToEdit.deadlineListSize() + 1); + UnmarkDeadlineCommand unmarkDeadlineCommand = new UnmarkDeadlineCommand(INDEX_FIRST_PROJECT, outOfBoundIndex); + + assertCommandFailure(unmarkDeadlineCommand, model, Messages.MESSAGE_INVALID_DEADLINE_DISPLAYED_INDEX); + } +} diff --git a/src/test/java/seedu/address/testutil/EditProjectDescriptorBuilder.java b/src/test/java/seedu/address/testutil/EditProjectDescriptorBuilder.java index c5668cc0389..be3f0ff9d73 100644 --- a/src/test/java/seedu/address/testutil/EditProjectDescriptorBuilder.java +++ b/src/test/java/seedu/address/testutil/EditProjectDescriptorBuilder.java @@ -45,14 +45,6 @@ public EditProjectDescriptorBuilder withDescription(String description) { return this; } - /** - * Sets the {@code Deadlines} of the {@code EditProjectDescriptor} that we are building. - */ - public EditProjectDescriptorBuilder withDeadlines(List deadlines) { - descriptor.setDeadlines(deadlines); - return this; - } - /** * Sets the {@code Deadlines} of the {@code EditProjectDescriptor} that we are building. */ diff --git a/src/test/java/seedu/address/testutil/ProjectBuilder.java b/src/test/java/seedu/address/testutil/ProjectBuilder.java index 7ce0e618e54..e347baecde2 100644 --- a/src/test/java/seedu/address/testutil/ProjectBuilder.java +++ b/src/test/java/seedu/address/testutil/ProjectBuilder.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Set; import seedu.address.model.commons.Name; import seedu.address.model.project.Deadline; @@ -59,6 +60,28 @@ public ProjectBuilder withDeadline(String deadline) { return this; } + /** Sets the {@code Deadline} of the {@code Project} that we are building. */ + public ProjectBuilder withDeadlines(List deadlines) { + this.deadlineList = new ArrayList<>(); + int index = 1; + for (Deadline d : deadlines) { + this.deadlineList.add(new Deadline(d.getStringRepresentation(), index)); + index += 1; + } + return this; + } + + /** Sets the {@code Deadline} of the {@code Project} that we are building. */ + public ProjectBuilder withDeadlinesString(List deadlines) { + this.deadlineList = new ArrayList<>(); + int index = 1; + for (String d : deadlines) { + this.deadlineList.add(new Deadline(d, index)); + index += 1; + } + return this; + } + /** Builds a Project object. */ public Project build() { return new Project(name, description, deadlineList); diff --git a/src/test/java/seedu/address/testutil/TypicalIndexes.java b/src/test/java/seedu/address/testutil/TypicalIndexes.java index f4e86573ad6..cbea78874f0 100644 --- a/src/test/java/seedu/address/testutil/TypicalIndexes.java +++ b/src/test/java/seedu/address/testutil/TypicalIndexes.java @@ -1,5 +1,8 @@ package seedu.address.testutil; +import java.util.ArrayList; +import java.util.List; + import seedu.address.commons.core.index.Index; /** @@ -10,5 +13,8 @@ public class TypicalIndexes { 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_PROJECT = Index.fromOneBased(1); - + public static final Index INDEX_SECOND_PROJECT = Index.fromOneBased(2); + public static final Index INVALID_INDEX_PROJECT = Index.fromOneBased(5); + public static final List INDEX_FIRST_PROJECT_AND_DEADLINE = List.of(Index.fromOneBased(1), + Index.fromOneBased(1)); } From 8e9ef731fd19d5693006e5fe24a7d0413fe27a36 Mon Sep 17 00:00:00 2001 From: emzm2023 <122291720+emzm2023@users.noreply.github.com> Date: Mon, 13 Nov 2023 14:19:29 +0800 Subject: [PATCH 28/36] Update ClientRoles.txt --- ClientRoles.txt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/ClientRoles.txt b/ClientRoles.txt index 0480180b791..8b137891791 100644 --- a/ClientRoles.txt +++ b/ClientRoles.txt @@ -1,8 +1 @@ -Manager -Developer -HR -Client -damn -c -h -dev + From f028dd7f4947356ca54562029384326bd42fd27a Mon Sep 17 00:00:00 2001 From: emzm2023 <122291720+emzm2023@users.noreply.github.com> Date: Mon, 13 Nov 2023 14:19:44 +0800 Subject: [PATCH 29/36] Update DeveloperRoles.txt --- DeveloperRoles.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/DeveloperRoles.txt b/DeveloperRoles.txt index dba8afbf9c5..8b137891791 100644 --- a/DeveloperRoles.txt +++ b/DeveloperRoles.txt @@ -1,6 +1 @@ -Frontend Developer -Backend Developer -Developer -damn -d -dog + From c760cd61f024ca374e40d6a7396e99dee564f144 Mon Sep 17 00:00:00 2001 From: mingyu Date: Mon, 13 Nov 2023 14:45:40 +0800 Subject: [PATCH 30/36] VersionedAddressBook test cases --- .../address/model/VersionedAddressBook.java | 18 ++++ .../model/VersionedAddressBookTest.java | 85 +++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 src/test/java/seedu/address/model/VersionedAddressBookTest.java diff --git a/src/main/java/seedu/address/model/VersionedAddressBook.java b/src/main/java/seedu/address/model/VersionedAddressBook.java index 7dad5cdc940..996ab17e9ed 100644 --- a/src/main/java/seedu/address/model/VersionedAddressBook.java +++ b/src/main/java/seedu/address/model/VersionedAddressBook.java @@ -137,6 +137,24 @@ public TabIndex getPreviousTabIndexForRedo() { return tabIndex.get(currentStatePointer - 1); } + /** + * Gets the current addressbook. + * + * @return The tab index from the previous command. + */ + public ReadOnlyAddressBook getCurrentState(int currentStatePointer) { + return addressBookStateList.get(currentStatePointer); + } + + /** + * Gets the current current state pointer. + * + * @return The tab index from the previous command. + */ + public int getCurrentStatePointer() { + return currentStatePointer; + } + /** * Changes the current model's address book to match the current state. * diff --git a/src/test/java/seedu/address/model/VersionedAddressBookTest.java b/src/test/java/seedu/address/model/VersionedAddressBookTest.java new file mode 100644 index 00000000000..0be58d4a166 --- /dev/null +++ b/src/test/java/seedu/address/model/VersionedAddressBookTest.java @@ -0,0 +1,85 @@ +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.TypicalClients.getTypicalAddressBook; + +import org.junit.jupiter.api.Test; + +import seedu.address.logic.commands.TabIndex; +import seedu.address.logic.commands.exceptions.CommandException; + + +public class VersionedAddressBookTest { + + private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + private VersionedAddressBook versionedAddressBook = new VersionedAddressBook(model.getAddressBook()); + + @Test + public void commit_validModelState_successfullyCommits() { + versionedAddressBook.commit(model, "Committing state", TabIndex.Client); + + // Ensure that the model's address book is updated + assertEquals(model.getAddressBook(), versionedAddressBook.getCurrentState(1)); + + // Ensure that the state pointer has moved to the latest state + assertEquals(1, versionedAddressBook.getCurrentStatePointer()); + } + + @Test + public void undo_validModelState_successfullyUndoes() throws CommandException { + versionedAddressBook.commit(model, "Committing state", TabIndex.Client); + versionedAddressBook.undo(model); + + // Ensure that the model's address book is updated to the previous state + assertEquals(model.getAddressBook(), versionedAddressBook.getCurrentState(1)); + + // Ensure that the state pointer has moved to the previous state + assertEquals(0, versionedAddressBook.getCurrentStatePointer()); + + // Ensure that the success message and tab index are retrieved + assertEquals("Committing state", versionedAddressBook.getPreviousMessage()); + assertEquals(TabIndex.Client, versionedAddressBook.getPreviousTabIndex()); + } + + @Test + public void redo_validModelState_successfullyRedoes() throws CommandException { + versionedAddressBook.commit(model, "Committing state", TabIndex.Client); + versionedAddressBook.undo(model); + versionedAddressBook.redo(model); + + // Ensure that the model's address book is updated to the next state + assertEquals(model.getAddressBook(), versionedAddressBook.getCurrentState(1)); + + // Ensure that the state pointer has moved to the next state + assertEquals(1, versionedAddressBook.getCurrentStatePointer()); + + // Ensure that the success message and tab index are retrieved + assertEquals("Committing state", versionedAddressBook.getPreviousMessageForRedo()); + assertEquals(TabIndex.Client, versionedAddressBook.getPreviousTabIndexForRedo()); + } + + @Test + public void canUndo_noStatesToUndo_returnsFalse() { + assertFalse(versionedAddressBook.canUndo()); + } + + @Test + public void canRedo_noStatesToRedo_returnsFalse() { + assertFalse(versionedAddressBook.canRedo()); + } + + @Test + public void canUndo_hasStatesToUndo_returnsTrue() throws CommandException { + versionedAddressBook.commit(model, "Committing state", TabIndex.Client); + assertTrue(versionedAddressBook.canUndo()); + } + + @Test + public void canRedo_hasStatesToRedo_returnsTrue() throws CommandException { + versionedAddressBook.commit(model, "Committing state", TabIndex.Client); + versionedAddressBook.undo(model); + assertTrue(versionedAddressBook.canRedo()); + } +} From aaa7edc07e2cbff5fa62668c3a60bcef793497b5 Mon Sep 17 00:00:00 2001 From: emzm2023 Date: Mon, 13 Nov 2023 14:48:54 +0800 Subject: [PATCH 31/36] Fix checkstyle issues --- .../logic/commands/CommandTestUtil.java | 5 +- .../address/logic/commands/ModelStub.java | 1 - .../commands/edit/EditClientCommandTest.java | 113 ++++++++---------- .../edit/EditDeveloperCommandTest.java | 97 +++++++-------- .../commands/edit/EditProjectCommandTest.java | 9 +- .../edit/EditProjectDescriptorTest.java | 9 +- .../mark/MarkDeadlineCommandTest.java | 11 -- .../mark/UnmarkDeadlineCommandTest.java | 6 +- .../testutil/EditClientDescriptorBuilder.java | 1 - .../EditProjectDescriptorBuilder.java | 7 +- .../address/testutil/ProjectBuilder.java | 3 +- .../address/testutil/TypicalClients.java | 2 +- .../address/testutil/TypicalDevelopers.java | 3 +- .../address/testutil/TypicalIndexes.java | 1 - 14 files changed, 109 insertions(+), 159 deletions(-) diff --git a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java index 90697d42fa8..acc62cbf728 100644 --- a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java +++ b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java @@ -191,7 +191,7 @@ public class CommandTestUtil { DESC_DAN = new EditClientDescriptorBuilder().withName(VALID_NAME_DAN).withPhone(VALID_PHONE_DAN) .withAddress(VALID_ADDRESS_DAN).withEmail(VALID_EMAIL_DAN).withProjects(VALID_PROJECT_1_DAN) .withDocument(VALID_DOCUMENT_DAN).build(); - + DESC_PROJECT1 = new EditProjectDescriptorBuilder().withDescription(VALID_PROJECT_DESCRIPTION_ANDROIDAPP) .withDeadlines(VALID_FULL_PROJECT_DEADLINE_1).build(); DESC_PROJECT2 = new EditProjectDescriptorBuilder().withDescription(VALID_PROJECT_DESCRIPTION_APPLEAPP) @@ -245,7 +245,7 @@ public static void assertClientCommandSuccess(Command command, Model actualModel false, TabIndex.Client); assertCommandSuccess(command, actualModel, expectedCommandResult, expectedModel); } - + /** * Convenience wrapper to {@link #assertCommandSuccess(Command, Model, CommandResult, Model)} * that takes a string {@code expectedMessage}. @@ -314,7 +314,6 @@ public static void showProjectAtIndex(Model model, Index targetIndex) { Project project = model.getFilteredProjectList().get(targetIndex.getZeroBased()); final String[] splitName = project.getName().split("\\s+"); model.updateFilteredProjectList(new ProjectNameContainsKeywordsPredicate(Arrays.asList(splitName[0]))); -// assertEquals(1, model.getFilteredProjectList().size()); } } diff --git a/src/test/java/seedu/address/logic/commands/ModelStub.java b/src/test/java/seedu/address/logic/commands/ModelStub.java index c65b1ffa5b6..c01c9f6d9c1 100644 --- a/src/test/java/seedu/address/logic/commands/ModelStub.java +++ b/src/test/java/seedu/address/logic/commands/ModelStub.java @@ -5,7 +5,6 @@ import javafx.collections.ObservableList; import seedu.address.commons.core.GuiSettings; -import seedu.address.logic.commands.TabIndex; import seedu.address.logic.commands.exceptions.CommandException; import seedu.address.model.Model; import seedu.address.model.ReadOnlyAddressBook; diff --git a/src/test/java/seedu/address/logic/commands/edit/EditClientCommandTest.java b/src/test/java/seedu/address/logic/commands/edit/EditClientCommandTest.java index 11c28403407..fe8fc4bea20 100644 --- a/src/test/java/seedu/address/logic/commands/edit/EditClientCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/edit/EditClientCommandTest.java @@ -8,7 +8,6 @@ import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB; import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_CALEB; import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB; -import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_1_BOB; import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_2_BOB; import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_3_BOB; import static seedu.address.logic.commands.CommandTestUtil.assertClientCommandSuccess; @@ -38,8 +37,8 @@ */ public class EditClientCommandTest { - private final Model model_no_projects = new ModelManager(getTypicalAddressBook(), new UserPrefs()); - private final Model model_with_projects = new ModelManager(getTypicalAddressBookWithProjects(), new UserPrefs()); + private final Model modelNoProjects = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + private final Model modelWithProjects = new ModelManager(getTypicalAddressBookWithProjects(), new UserPrefs()); @Test public void execute_allFieldsSpecifiedNoProjectEditUnfilteredListNoProjects_success() { @@ -51,10 +50,10 @@ public void execute_allFieldsSpecifiedNoProjectEditUnfilteredListNoProjects_succ String expectedMessage = String.format(EditClientCommand.MESSAGE_EDIT_CLIENT_SUCCESS, Messages.format(editedClient)); - Model expectedModel = new ModelManager(new AddressBook(model_no_projects.getAddressBook()), new UserPrefs()); - expectedModel.setClient(model_no_projects.getFilteredClientList().get(0), editedClient); + Model expectedModel = new ModelManager(new AddressBook(modelNoProjects.getAddressBook()), new UserPrefs()); + expectedModel.setClient(modelNoProjects.getFilteredClientList().get(0), editedClient); - assertClientCommandSuccess(editCommand, model_no_projects, expectedMessage, expectedModel); + assertClientCommandSuccess(editCommand, modelNoProjects, expectedMessage, expectedModel); } @Test @@ -67,16 +66,16 @@ public void execute_allFieldsSpecifiedNoProjectEditUnfilteredListWithProjects_su String expectedMessage = String.format(EditClientCommand.MESSAGE_EDIT_CLIENT_SUCCESS, Messages.format(editedClient)); - Model expectedModel = new ModelManager(new AddressBook(model_with_projects.getAddressBook()), new UserPrefs()); - expectedModel.setClient(model_with_projects.getFilteredClientList().get(0), editedClient); + Model expectedModel = new ModelManager(new AddressBook(modelWithProjects.getAddressBook()), new UserPrefs()); + expectedModel.setClient(modelWithProjects.getFilteredClientList().get(0), editedClient); - assertClientCommandSuccess(editCommand, model_with_projects, expectedMessage, expectedModel); + assertClientCommandSuccess(editCommand, modelWithProjects, expectedMessage, expectedModel); } @Test public void execute_someFieldsSpecifiedValidProjectEditUnfilteredListWithProjects_success() { - Index indexLastClient = Index.fromOneBased(model_with_projects.getFilteredClientList().size()); - Client lastClient = model_with_projects.getFilteredClientList().get(indexLastClient.getZeroBased()); + Index indexLastClient = Index.fromOneBased(modelWithProjects.getFilteredClientList().size()); + Client lastClient = modelWithProjects.getFilteredClientList().get(indexLastClient.getZeroBased()); ClientBuilder clientInList = new ClientBuilder(lastClient); Client editedClient = clientInList.withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB) @@ -90,15 +89,15 @@ public void execute_someFieldsSpecifiedValidProjectEditUnfilteredListWithProject String expectedMessage = String.format(EditClientCommand.MESSAGE_EDIT_CLIENT_SUCCESS, Messages.format(editedClient)); - Model expectedModel = new ModelManager(new AddressBook(model_with_projects.getAddressBook()), new UserPrefs()); + Model expectedModel = new ModelManager(new AddressBook(modelWithProjects.getAddressBook()), new UserPrefs()); expectedModel.setClient(lastClient, editedClient); - assertClientCommandSuccess(editCommand, model_with_projects, expectedMessage, expectedModel); + assertClientCommandSuccess(editCommand, modelWithProjects, expectedMessage, expectedModel); } @Test public void execute_someFieldsSpecifiedInvalidProjectEditUnfilteredListWithProjects_failure() { - Index indexLastClient = Index.fromOneBased(model_with_projects.getFilteredClientList().size()); + Index indexLastClient = Index.fromOneBased(modelWithProjects.getFilteredClientList().size()); EditClientCommand.EditClientDescriptor descriptor = new EditClientDescriptorBuilder() .withName(VALID_NAME_BOB) @@ -106,8 +105,8 @@ public void execute_someFieldsSpecifiedInvalidProjectEditUnfilteredListWithProje EditClientCommand editCommand = new EditClientCommand(indexLastClient, descriptor); String expectedMessage = String.format(Messages.MESSAGE_NONEXISTENT_PROJECT, VALID_PROJECT_2_BOB); - - assertCommandFailure(editCommand, model_with_projects, expectedMessage); + + assertCommandFailure(editCommand, modelWithProjects, expectedMessage); } @Test @@ -120,32 +119,18 @@ public void execute_allFieldsSpecifiedValidProjectEditUnfilteredListWithProjects String expectedMessage = String.format(EditClientCommand.MESSAGE_EDIT_CLIENT_SUCCESS, Messages.format(editedClient)); - Model expectedModel = new ModelManager(new AddressBook(model_with_projects.getAddressBook()), new UserPrefs()); - expectedModel.setClient(model_with_projects.getFilteredClientList().get(0), editedClient); + Model expectedModel = new ModelManager(new AddressBook(modelWithProjects.getAddressBook()), new UserPrefs()); + expectedModel.setClient(modelWithProjects.getFilteredClientList().get(0), editedClient); - assertClientCommandSuccess(editCommand, model_with_projects, expectedMessage, expectedModel); + assertClientCommandSuccess(editCommand, modelWithProjects, expectedMessage, expectedModel); } - -// @Test -// public void execute_noFieldSpecifiedUnfilteredList_success() { -// EditClientCommand editCommand = new EditClientCommand(INDEX_FIRST_PERSON, -// new EditClientCommand.EditClientDescriptor()); -// Client editedClient = model_no_projects.getFilteredClientList().get(INDEX_FIRST_PERSON.getZeroBased()); -// -// String expectedMessage = String.format(EditClientCommand.MESSAGE_EDIT_CLIENT_SUCCESS, -// Messages.format(editedClient)); -// -// Model expectedModel = new ModelManager(new AddressBook(model_no_projects.getAddressBook()), new UserPrefs()); -// -// assertClientCommandSuccess(editCommand, model_no_projects, expectedMessage, expectedModel); -// } - + @Test public void execute_filteredListValidProjectEditWithProjects_success() { - showClientAtIndex(model_with_projects, INDEX_FIRST_PERSON); + showClientAtIndex(modelWithProjects, INDEX_FIRST_PERSON); - Client clientInFilteredList = model_with_projects.getFilteredClientList(). - get(INDEX_FIRST_PERSON.getZeroBased()); + Client clientInFilteredList = modelWithProjects.getFilteredClientList() + .get(INDEX_FIRST_PERSON.getZeroBased()); Client editedClient = new ClientBuilder(clientInFilteredList).withName(VALID_NAME_BOB) .withProjects(VALID_PROJECT_3_BOB).build(); EditClientCommand editCommand = new EditClientCommand(INDEX_FIRST_PERSON, @@ -155,88 +140,88 @@ public void execute_filteredListValidProjectEditWithProjects_success() { String expectedMessage = String.format(EditClientCommand.MESSAGE_EDIT_CLIENT_SUCCESS, Messages.format(editedClient)); - Model expectedModel = new ModelManager(new AddressBook(model_with_projects.getAddressBook()), new UserPrefs()); - expectedModel.setClient(model_with_projects.getFilteredClientList().get(0), editedClient); + Model expectedModel = new ModelManager(new AddressBook(modelWithProjects.getAddressBook()), new UserPrefs()); + expectedModel.setClient(modelWithProjects.getFilteredClientList().get(0), editedClient); - assertClientCommandSuccess(editCommand, model_with_projects, expectedMessage, expectedModel); + assertClientCommandSuccess(editCommand, modelWithProjects, expectedMessage, expectedModel); } @Test public void execute_filteredListInvalidProjectEditWithProjects_failure() { - showClientAtIndex(model_with_projects, INDEX_FIRST_PERSON); - + showClientAtIndex(modelWithProjects, INDEX_FIRST_PERSON); + EditClientCommand editCommand = new EditClientCommand(INDEX_FIRST_PERSON, new EditClientDescriptorBuilder().withName(VALID_NAME_BOB).withProjects(VALID_PROJECT_2_BOB) .build()); String expectedMessage = String.format(Messages.MESSAGE_NONEXISTENT_PROJECT, VALID_PROJECT_2_BOB); - assertCommandFailure(editCommand, model_with_projects, expectedMessage); + assertCommandFailure(editCommand, modelWithProjects, expectedMessage); } @Test public void execute_duplicateClientUnfilteredListNoProjects_failure() { - Client firstClient = model_no_projects.getFilteredClientList().get(INDEX_FIRST_PERSON.getZeroBased()); + Client firstClient = modelNoProjects.getFilteredClientList().get(INDEX_FIRST_PERSON.getZeroBased()); EditClientCommand.EditClientDescriptor descriptor = new EditClientDescriptorBuilder(firstClient) .build(); EditClientCommand editCommand = new EditClientCommand(INDEX_SECOND_PERSON, descriptor); - assertCommandFailure(editCommand, model_no_projects, EditClientCommand.MESSAGE_DUPLICATE_CLIENT); + assertCommandFailure(editCommand, modelNoProjects, EditClientCommand.MESSAGE_DUPLICATE_CLIENT); } @Test public void execute_duplicateClientUnfilteredListWithProjects_failure() { - Client firstClient = model_with_projects.getFilteredClientList().get(INDEX_FIRST_PERSON.getZeroBased()); + Client firstClient = modelWithProjects.getFilteredClientList().get(INDEX_FIRST_PERSON.getZeroBased()); EditClientCommand.EditClientDescriptor descriptor = new EditClientDescriptorBuilder(firstClient) .build(); EditClientCommand editCommand = new EditClientCommand(INDEX_SECOND_PERSON, descriptor); - assertCommandFailure(editCommand, model_with_projects, EditClientCommand.MESSAGE_DUPLICATE_CLIENT); + assertCommandFailure(editCommand, modelWithProjects, EditClientCommand.MESSAGE_DUPLICATE_CLIENT); } @Test public void execute_duplicateClientFilteredListNoProjects_failure() { - showClientAtIndex(model_no_projects, INDEX_FIRST_PERSON); + showClientAtIndex(modelNoProjects, INDEX_FIRST_PERSON); // edit client in filtered list into a duplicate in address book - Client clientInList = model_no_projects.getAddressBook().getClientList().get(INDEX_SECOND_PERSON.getZeroBased()); + Client clientInList = modelNoProjects.getAddressBook().getClientList().get(INDEX_SECOND_PERSON.getZeroBased()); EditClientCommand editCommand = new EditClientCommand(INDEX_FIRST_PERSON, new EditClientDescriptorBuilder(clientInList).build()); - assertCommandFailure(editCommand, model_no_projects, EditClientCommand.MESSAGE_DUPLICATE_CLIENT); + assertCommandFailure(editCommand, modelNoProjects, EditClientCommand.MESSAGE_DUPLICATE_CLIENT); } @Test public void execute_duplicateClientFilteredListWithProjects_failure() { - showClientAtIndex(model_with_projects, INDEX_FIRST_PERSON); + showClientAtIndex(modelWithProjects, INDEX_FIRST_PERSON); // edit client in filtered list into a duplicate in address book - Client clientInList = model_with_projects.getAddressBook().getClientList(). - get(INDEX_SECOND_PERSON.getZeroBased()); + Client clientInList = modelWithProjects.getAddressBook().getClientList() + .get(INDEX_SECOND_PERSON.getZeroBased()); EditClientCommand editCommand = new EditClientCommand(INDEX_FIRST_PERSON, new EditClientDescriptorBuilder(clientInList).build()); - assertCommandFailure(editCommand, model_with_projects, EditClientCommand.MESSAGE_DUPLICATE_CLIENT); + assertCommandFailure(editCommand, modelWithProjects, EditClientCommand.MESSAGE_DUPLICATE_CLIENT); } @Test public void execute_invalidClientIndexUnfilteredListNoProjects_failure() { - Index outOfBoundIndex = Index.fromOneBased(model_no_projects.getFilteredClientList().size() + 1); + Index outOfBoundIndex = Index.fromOneBased(modelNoProjects.getFilteredClientList().size() + 1); EditClientCommand.EditClientDescriptor descriptor = new EditClientDescriptorBuilder() .withName(VALID_NAME_CALEB).build(); EditClientCommand editCommand = new EditClientCommand(outOfBoundIndex, descriptor); - assertCommandFailure(editCommand, model_no_projects, Messages.MESSAGE_INVALID_CLIENT_DISPLAYED_INDEX); + assertCommandFailure(editCommand, modelNoProjects, Messages.MESSAGE_INVALID_CLIENT_DISPLAYED_INDEX); } @Test public void execute_invalidClientIndexUnfilteredListWithProjects_failure() { - Index outOfBoundIndex = Index.fromOneBased(model_with_projects.getFilteredClientList().size() + 1); + Index outOfBoundIndex = Index.fromOneBased(modelWithProjects.getFilteredClientList().size() + 1); EditClientCommand.EditClientDescriptor descriptor = new EditClientDescriptorBuilder() .withName(VALID_NAME_CALEB).build(); EditClientCommand editCommand = new EditClientCommand(outOfBoundIndex, descriptor); - assertCommandFailure(editCommand, model_with_projects, Messages.MESSAGE_INVALID_CLIENT_DISPLAYED_INDEX); + assertCommandFailure(editCommand, modelWithProjects, Messages.MESSAGE_INVALID_CLIENT_DISPLAYED_INDEX); } /** @@ -245,29 +230,29 @@ public void execute_invalidClientIndexUnfilteredListWithProjects_failure() { */ @Test public void execute_invalidClientIndexFilteredListNoProjects_failure() { - showClientAtIndex(model_no_projects, INDEX_FIRST_PERSON); + showClientAtIndex(modelNoProjects, INDEX_FIRST_PERSON); Index outOfBoundIndex = INDEX_SECOND_PERSON; // ensures that outOfBoundIndex is still in bounds of address book list - assertTrue(outOfBoundIndex.getZeroBased() < model_no_projects.getAddressBook().getClientList().size()); + assertTrue(outOfBoundIndex.getZeroBased() < modelNoProjects.getAddressBook().getClientList().size()); EditClientCommand editCommand = new EditClientCommand(outOfBoundIndex, new EditClientDescriptorBuilder().withName(VALID_NAME_BOB).build()); - assertCommandFailure(editCommand, model_no_projects, Messages.MESSAGE_INVALID_CLIENT_DISPLAYED_INDEX); + assertCommandFailure(editCommand, modelNoProjects, Messages.MESSAGE_INVALID_CLIENT_DISPLAYED_INDEX); } @Test public void execute_invalidClientIndexFilteredListWithProjects_failure() { - showClientAtIndex(model_with_projects, INDEX_FIRST_PERSON); + showClientAtIndex(modelWithProjects, INDEX_FIRST_PERSON); Index outOfBoundIndex = INDEX_SECOND_PERSON; // ensures that outOfBoundIndex is still in bounds of address book list - assertTrue(outOfBoundIndex.getZeroBased() < model_with_projects.getAddressBook() + assertTrue(outOfBoundIndex.getZeroBased() < modelWithProjects.getAddressBook() .getClientList().size()); EditClientCommand editCommand = new EditClientCommand(outOfBoundIndex, new EditClientDescriptorBuilder().withName(VALID_NAME_BOB).build()); - assertCommandFailure(editCommand, model_with_projects, Messages.MESSAGE_INVALID_CLIENT_DISPLAYED_INDEX); + assertCommandFailure(editCommand, modelWithProjects, Messages.MESSAGE_INVALID_CLIENT_DISPLAYED_INDEX); } @Test diff --git a/src/test/java/seedu/address/logic/commands/edit/EditDeveloperCommandTest.java b/src/test/java/seedu/address/logic/commands/edit/EditDeveloperCommandTest.java index 0f4c2fc41f0..b7f687d2a5c 100644 --- a/src/test/java/seedu/address/logic/commands/edit/EditDeveloperCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/edit/EditDeveloperCommandTest.java @@ -10,8 +10,8 @@ import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_BOB; import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_2_BOB; import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_3_BOB; -import static seedu.address.logic.commands.CommandTestUtil.assertDeveloperCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure; +import static seedu.address.logic.commands.CommandTestUtil.assertDeveloperCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.showDeveloperAtIndex; import static seedu.address.testutil.TypicalDevelopers.getTypicalAddressBook; import static seedu.address.testutil.TypicalDevelopers.getTypicalAddressBookWithProjects; @@ -37,8 +37,8 @@ */ public class EditDeveloperCommandTest { - private final Model model_no_projects = new ModelManager(getTypicalAddressBook(), new UserPrefs()); - private final Model model_with_projects = new ModelManager(getTypicalAddressBookWithProjects(), new UserPrefs()); + private final Model modelNoProjects = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + private final Model modelWithProjects = new ModelManager(getTypicalAddressBookWithProjects(), new UserPrefs()); @Test public void execute_allFieldsSpecifiedNoProjectEditUnfilteredListNoProjects_success() { @@ -50,10 +50,10 @@ public void execute_allFieldsSpecifiedNoProjectEditUnfilteredListNoProjects_succ String expectedMessage = String.format(EditDeveloperCommand.MESSAGE_EDIT_DEVELOPER_SUCCESS, Messages.format(editedDeveloper)); - Model expectedModel = new ModelManager(new AddressBook(model_no_projects.getAddressBook()), new UserPrefs()); - expectedModel.setDeveloper(model_no_projects.getFilteredDeveloperList().get(0), editedDeveloper); + Model expectedModel = new ModelManager(new AddressBook(modelNoProjects.getAddressBook()), new UserPrefs()); + expectedModel.setDeveloper(modelNoProjects.getFilteredDeveloperList().get(0), editedDeveloper); - assertDeveloperCommandSuccess(editCommand, model_no_projects, expectedMessage, expectedModel); + assertDeveloperCommandSuccess(editCommand, modelNoProjects, expectedMessage, expectedModel); } @Test @@ -66,16 +66,16 @@ public void execute_allFieldsSpecifiedNoProjectEditUnfilteredListWithProjects_su String expectedMessage = String.format(EditDeveloperCommand.MESSAGE_EDIT_DEVELOPER_SUCCESS, Messages.format(editedDeveloper)); - Model expectedModel = new ModelManager(new AddressBook(model_with_projects.getAddressBook()), new UserPrefs()); - expectedModel.setDeveloper(model_with_projects.getFilteredDeveloperList().get(0), editedDeveloper); + Model expectedModel = new ModelManager(new AddressBook(modelWithProjects.getAddressBook()), new UserPrefs()); + expectedModel.setDeveloper(modelWithProjects.getFilteredDeveloperList().get(0), editedDeveloper); - assertDeveloperCommandSuccess(editCommand, model_with_projects, expectedMessage, expectedModel); + assertDeveloperCommandSuccess(editCommand, modelWithProjects, expectedMessage, expectedModel); } @Test public void execute_someFieldsSpecifiedValidProjectEditUnfilteredListWithProjects_success() { - Index indexLastDeveloper = Index.fromOneBased(model_with_projects.getFilteredDeveloperList().size()); - Developer lastDeveloper = model_with_projects.getFilteredDeveloperList().get(indexLastDeveloper.getZeroBased()); + Index indexLastDeveloper = Index.fromOneBased(modelWithProjects.getFilteredDeveloperList().size()); + Developer lastDeveloper = modelWithProjects.getFilteredDeveloperList().get(indexLastDeveloper.getZeroBased()); DeveloperBuilder developerInList = new DeveloperBuilder(lastDeveloper); Developer editedDeveloper = developerInList.withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB) @@ -89,15 +89,15 @@ public void execute_someFieldsSpecifiedValidProjectEditUnfilteredListWithProject String expectedMessage = String.format(EditDeveloperCommand.MESSAGE_EDIT_DEVELOPER_SUCCESS, Messages.format(editedDeveloper)); - Model expectedModel = new ModelManager(new AddressBook(model_with_projects.getAddressBook()), new UserPrefs()); + Model expectedModel = new ModelManager(new AddressBook(modelWithProjects.getAddressBook()), new UserPrefs()); expectedModel.setDeveloper(lastDeveloper, editedDeveloper); - assertDeveloperCommandSuccess(editCommand, model_with_projects, expectedMessage, expectedModel); + assertDeveloperCommandSuccess(editCommand, modelWithProjects, expectedMessage, expectedModel); } @Test public void execute_someFieldsSpecifiedInvalidProjectEditUnfilteredListWithProjects_failure() { - Index indexLastDeveloper = Index.fromOneBased(model_with_projects.getFilteredDeveloperList().size()); + Index indexLastDeveloper = Index.fromOneBased(modelWithProjects.getFilteredDeveloperList().size()); EditDeveloperCommand.EditDeveloperDescriptor descriptor = new EditDeveloperDescriptorBuilder() .withName(VALID_NAME_BOB) @@ -106,7 +106,7 @@ public void execute_someFieldsSpecifiedInvalidProjectEditUnfilteredListWithProje String expectedMessage = String.format(Messages.MESSAGE_NONEXISTENT_PROJECT, VALID_PROJECT_2_BOB); - assertCommandFailure(editCommand, model_with_projects, expectedMessage); + assertCommandFailure(editCommand, modelWithProjects, expectedMessage); } @Test @@ -119,10 +119,10 @@ public void execute_allFieldsSpecifiedValidProjectEditUnfilteredListWithProjects String expectedMessage = String.format(EditDeveloperCommand.MESSAGE_EDIT_DEVELOPER_SUCCESS, Messages.format(editedDeveloper)); - Model expectedModel = new ModelManager(new AddressBook(model_with_projects.getAddressBook()), new UserPrefs()); - expectedModel.setDeveloper(model_with_projects.getFilteredDeveloperList().get(0), editedDeveloper); + Model expectedModel = new ModelManager(new AddressBook(modelWithProjects.getAddressBook()), new UserPrefs()); + expectedModel.setDeveloper(modelWithProjects.getFilteredDeveloperList().get(0), editedDeveloper); - assertDeveloperCommandSuccess(editCommand, model_with_projects, expectedMessage, expectedModel); + assertDeveloperCommandSuccess(editCommand, modelWithProjects, expectedMessage, expectedModel); } // Project needs to be created @@ -143,10 +143,10 @@ public void execute_noFieldSpecifiedUnfilteredList_success() { @Test public void execute_filteredListValidProjectEditWithProjects_success() { - showDeveloperAtIndex(model_with_projects, INDEX_FIRST_PERSON); + showDeveloperAtIndex(modelWithProjects, INDEX_FIRST_PERSON); - Developer developerInFilteredList = model_with_projects.getFilteredDeveloperList(). - get(INDEX_FIRST_PERSON.getZeroBased()); + Developer developerInFilteredList = modelWithProjects.getFilteredDeveloperList() + .get(INDEX_FIRST_PERSON.getZeroBased()); Developer editedDeveloper = new DeveloperBuilder(developerInFilteredList).withName(VALID_NAME_BOB) .withProjects(VALID_PROJECT_3_BOB).build(); EditDeveloperCommand editCommand = new EditDeveloperCommand(INDEX_FIRST_PERSON, @@ -156,15 +156,15 @@ public void execute_filteredListValidProjectEditWithProjects_success() { String expectedMessage = String.format(EditDeveloperCommand.MESSAGE_EDIT_DEVELOPER_SUCCESS, Messages.format(editedDeveloper)); - Model expectedModel = new ModelManager(new AddressBook(model_with_projects.getAddressBook()), new UserPrefs()); - expectedModel.setDeveloper(model_with_projects.getFilteredDeveloperList().get(0), editedDeveloper); + Model expectedModel = new ModelManager(new AddressBook(modelWithProjects.getAddressBook()), new UserPrefs()); + expectedModel.setDeveloper(modelWithProjects.getFilteredDeveloperList().get(0), editedDeveloper); - assertDeveloperCommandSuccess(editCommand, model_with_projects, expectedMessage, expectedModel); + assertDeveloperCommandSuccess(editCommand, modelWithProjects, expectedMessage, expectedModel); } @Test public void execute_filteredListInvalidProjectEditWithProjects_failure() { - showDeveloperAtIndex(model_with_projects, INDEX_FIRST_PERSON); + showDeveloperAtIndex(modelWithProjects, INDEX_FIRST_PERSON); EditDeveloperCommand editCommand = new EditDeveloperCommand(INDEX_FIRST_PERSON, new EditDeveloperDescriptorBuilder().withName(VALID_NAME_BOB).withProjects(VALID_PROJECT_2_BOB) @@ -172,72 +172,73 @@ public void execute_filteredListInvalidProjectEditWithProjects_failure() { String expectedMessage = String.format(Messages.MESSAGE_NONEXISTENT_PROJECT, VALID_PROJECT_2_BOB); - assertCommandFailure(editCommand, model_with_projects, expectedMessage); + assertCommandFailure(editCommand, modelWithProjects, expectedMessage); } @Test public void execute_duplicateDeveloperUnfilteredListNoProjects_failure() { - Developer firstDeveloper = model_no_projects.getFilteredDeveloperList().get(INDEX_FIRST_PERSON.getZeroBased()); + Developer firstDeveloper = modelNoProjects.getFilteredDeveloperList().get(INDEX_FIRST_PERSON.getZeroBased()); EditDeveloperCommand.EditDeveloperDescriptor descriptor = new EditDeveloperDescriptorBuilder(firstDeveloper) .build(); EditDeveloperCommand editCommand = new EditDeveloperCommand(INDEX_SECOND_PERSON, descriptor); - assertCommandFailure(editCommand, model_no_projects, EditDeveloperCommand.MESSAGE_DUPLICATE_DEVELOPER); + assertCommandFailure(editCommand, modelNoProjects, EditDeveloperCommand.MESSAGE_DUPLICATE_DEVELOPER); } @Test public void execute_duplicateDeveloperUnfilteredListWithProjects_failure() { - Developer firstDeveloper = model_with_projects.getFilteredDeveloperList().get(INDEX_FIRST_PERSON.getZeroBased()); + Developer firstDeveloper = modelWithProjects.getFilteredDeveloperList().get(INDEX_FIRST_PERSON.getZeroBased()); EditDeveloperCommand.EditDeveloperDescriptor descriptor = new EditDeveloperDescriptorBuilder(firstDeveloper) .build(); EditDeveloperCommand editCommand = new EditDeveloperCommand(INDEX_SECOND_PERSON, descriptor); - assertCommandFailure(editCommand, model_with_projects, EditDeveloperCommand.MESSAGE_DUPLICATE_DEVELOPER); + assertCommandFailure(editCommand, modelWithProjects, EditDeveloperCommand.MESSAGE_DUPLICATE_DEVELOPER); } @Test public void execute_duplicateDeveloperFilteredListNoProjects_failure() { - showDeveloperAtIndex(model_no_projects, INDEX_FIRST_PERSON); + showDeveloperAtIndex(modelNoProjects, INDEX_FIRST_PERSON); // edit developer in filtered list into a duplicate in address book - Developer developerInList = model_no_projects.getAddressBook().getDeveloperList().get(INDEX_SECOND_PERSON.getZeroBased()); + Developer developerInList = modelNoProjects.getAddressBook().getDeveloperList() + .get(INDEX_SECOND_PERSON.getZeroBased()); EditDeveloperCommand editCommand = new EditDeveloperCommand(INDEX_FIRST_PERSON, new EditDeveloperDescriptorBuilder(developerInList).build()); - assertCommandFailure(editCommand, model_no_projects, EditDeveloperCommand.MESSAGE_DUPLICATE_DEVELOPER); + assertCommandFailure(editCommand, modelNoProjects, EditDeveloperCommand.MESSAGE_DUPLICATE_DEVELOPER); } @Test public void execute_duplicateDeveloperFilteredListWithProjects_failure() { - showDeveloperAtIndex(model_with_projects, INDEX_FIRST_PERSON); + showDeveloperAtIndex(modelWithProjects, INDEX_FIRST_PERSON); // edit developer in filtered list into a duplicate in address book - Developer developerInList = model_with_projects.getAddressBook().getDeveloperList(). - get(INDEX_SECOND_PERSON.getZeroBased()); + Developer developerInList = modelWithProjects.getAddressBook().getDeveloperList() + .get(INDEX_SECOND_PERSON.getZeroBased()); EditDeveloperCommand editCommand = new EditDeveloperCommand(INDEX_FIRST_PERSON, new EditDeveloperDescriptorBuilder(developerInList).build()); - assertCommandFailure(editCommand, model_with_projects, EditDeveloperCommand.MESSAGE_DUPLICATE_DEVELOPER); + assertCommandFailure(editCommand, modelWithProjects, EditDeveloperCommand.MESSAGE_DUPLICATE_DEVELOPER); } @Test public void execute_invalidDeveloperIndexUnfilteredListNoProjects_failure() { - Index outOfBoundIndex = Index.fromOneBased(model_no_projects.getFilteredDeveloperList().size() + 1); + Index outOfBoundIndex = Index.fromOneBased(modelNoProjects.getFilteredDeveloperList().size() + 1); EditDeveloperCommand.EditDeveloperDescriptor descriptor = new EditDeveloperDescriptorBuilder() .withName(VALID_NAME_CALEB).build(); EditDeveloperCommand editCommand = new EditDeveloperCommand(outOfBoundIndex, descriptor); - assertCommandFailure(editCommand, model_no_projects, Messages.MESSAGE_INVALID_DEVELOPER_DISPLAYED_INDEX); + assertCommandFailure(editCommand, modelNoProjects, Messages.MESSAGE_INVALID_DEVELOPER_DISPLAYED_INDEX); } @Test public void execute_invalidDeveloperIndexUnfilteredListWithProjects_failure() { - Index outOfBoundIndex = Index.fromOneBased(model_with_projects.getFilteredDeveloperList().size() + 1); + Index outOfBoundIndex = Index.fromOneBased(modelWithProjects.getFilteredDeveloperList().size() + 1); EditDeveloperCommand.EditDeveloperDescriptor descriptor = new EditDeveloperDescriptorBuilder() .withName(VALID_NAME_CALEB).build(); EditDeveloperCommand editCommand = new EditDeveloperCommand(outOfBoundIndex, descriptor); - assertCommandFailure(editCommand, model_with_projects, Messages.MESSAGE_INVALID_DEVELOPER_DISPLAYED_INDEX); + assertCommandFailure(editCommand, modelWithProjects, Messages.MESSAGE_INVALID_DEVELOPER_DISPLAYED_INDEX); } /** @@ -246,29 +247,29 @@ public void execute_invalidDeveloperIndexUnfilteredListWithProjects_failure() { */ @Test public void execute_invalidDeveloperIndexFilteredListNoProjects_failure() { - showDeveloperAtIndex(model_no_projects, INDEX_FIRST_PERSON); + showDeveloperAtIndex(modelNoProjects, INDEX_FIRST_PERSON); Index outOfBoundIndex = INDEX_SECOND_PERSON; // ensures that outOfBoundIndex is still in bounds of address book list - assertTrue(outOfBoundIndex.getZeroBased() < model_no_projects.getAddressBook().getDeveloperList().size()); + assertTrue(outOfBoundIndex.getZeroBased() < modelNoProjects.getAddressBook().getDeveloperList().size()); EditDeveloperCommand editCommand = new EditDeveloperCommand(outOfBoundIndex, new EditDeveloperDescriptorBuilder().withName(VALID_NAME_BOB).build()); - assertCommandFailure(editCommand, model_no_projects, Messages.MESSAGE_INVALID_DEVELOPER_DISPLAYED_INDEX); + assertCommandFailure(editCommand, modelNoProjects, Messages.MESSAGE_INVALID_DEVELOPER_DISPLAYED_INDEX); } @Test public void execute_invalidDeveloperIndexFilteredListWithProjects_failure() { - showDeveloperAtIndex(model_with_projects, INDEX_FIRST_PERSON); + showDeveloperAtIndex(modelWithProjects, INDEX_FIRST_PERSON); Index outOfBoundIndex = INDEX_SECOND_PERSON; // ensures that outOfBoundIndex is still in bounds of address book list - assertTrue(outOfBoundIndex.getZeroBased() < model_with_projects.getAddressBook() + assertTrue(outOfBoundIndex.getZeroBased() < modelWithProjects.getAddressBook() .getDeveloperList().size()); EditDeveloperCommand editCommand = new EditDeveloperCommand(outOfBoundIndex, new EditDeveloperDescriptorBuilder().withName(VALID_NAME_BOB).build()); - assertCommandFailure(editCommand, model_with_projects, Messages.MESSAGE_INVALID_DEVELOPER_DISPLAYED_INDEX); + assertCommandFailure(editCommand, modelWithProjects, Messages.MESSAGE_INVALID_DEVELOPER_DISPLAYED_INDEX); } @Test @@ -276,7 +277,7 @@ public void equals() { final EditDeveloperCommand standardCommand = new EditDeveloperCommand(INDEX_FIRST_PERSON, DESC_AMY); // same values -> returns true - EditDeveloperCommand.EditDeveloperDescriptor copyDescriptor = + EditDeveloperCommand.EditDeveloperDescriptor copyDescriptor = new EditDeveloperCommand.EditDeveloperDescriptor(DESC_AMY); EditDeveloperCommand commandWithSameValues = new EditDeveloperCommand(INDEX_FIRST_PERSON, copyDescriptor); assertEquals(standardCommand, commandWithSameValues); diff --git a/src/test/java/seedu/address/logic/commands/edit/EditProjectCommandTest.java b/src/test/java/seedu/address/logic/commands/edit/EditProjectCommandTest.java index f8a13da881a..3ce9fa9f4ee 100644 --- a/src/test/java/seedu/address/logic/commands/edit/EditProjectCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/edit/EditProjectCommandTest.java @@ -7,19 +7,13 @@ import static seedu.address.logic.commands.CommandTestUtil.DESC_PROJECT2; import static seedu.address.logic.commands.CommandTestUtil.VALID_FULL_PROJECT_DEADLINE_1; import static seedu.address.logic.commands.CommandTestUtil.VALID_PROJECT_DESCRIPTION_APPLEAPP; -import static seedu.address.logic.commands.CommandTestUtil.assertClientCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure; -import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.assertProjectCommandSuccess; import static seedu.address.logic.commands.CommandTestUtil.showProjectAtIndex; import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PROJECT; import static seedu.address.testutil.TypicalIndexes.INDEX_SECOND_PROJECT; -import static seedu.address.testutil.TypicalIndexes.INVALID_INDEX_PROJECT; import static seedu.address.testutil.TypicalProjects.getTypicalAddressBook; -import java.util.ArrayList; -import java.util.Arrays; - import org.junit.jupiter.api.Test; import seedu.address.commons.core.index.Index; @@ -29,7 +23,6 @@ import seedu.address.model.Model; import seedu.address.model.ModelManager; import seedu.address.model.UserPrefs; -import seedu.address.model.project.Description; import seedu.address.model.project.Project; import seedu.address.testutil.EditProjectDescriptorBuilder; import seedu.address.testutil.ProjectBuilder; @@ -86,7 +79,7 @@ public void execute_noFieldSpecifiedUnfilteredList_success() { Messages.format(editedProject)); Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()), new UserPrefs()); - + assertProjectCommandSuccess(editProjectCommand, model, expectedMessage, expectedModel); } diff --git a/src/test/java/seedu/address/logic/commands/edit/EditProjectDescriptorTest.java b/src/test/java/seedu/address/logic/commands/edit/EditProjectDescriptorTest.java index 7bf1acb9f14..2b6b0c65e05 100644 --- a/src/test/java/seedu/address/logic/commands/edit/EditProjectDescriptorTest.java +++ b/src/test/java/seedu/address/logic/commands/edit/EditProjectDescriptorTest.java @@ -2,14 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -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.DESC_PROJECT1; import static seedu.address.logic.commands.CommandTestUtil.DESC_PROJECT2; -import static seedu.address.logic.commands.CommandTestUtil.VALID_FULL_PROJECT_DEADLINE_1; import static seedu.address.logic.commands.CommandTestUtil.VALID_FULL_PROJECT_DEADLINE_2; -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_PROJECT_DESCRIPTION_APPLEAPP; import org.junit.jupiter.api.Test; @@ -43,8 +38,8 @@ public void equals() { assertNotEquals(DESC_PROJECT1, editedProj); // different deadlines -> returns false - editedProj = new EditProjectDescriptorBuilder(DESC_PROJECT1). - withDeadline(VALID_FULL_PROJECT_DEADLINE_2).build(); + editedProj = new EditProjectDescriptorBuilder(DESC_PROJECT1) + .withDeadline(VALID_FULL_PROJECT_DEADLINE_2).build(); assertNotEquals(DESC_PROJECT1, editedProj); } diff --git a/src/test/java/seedu/address/logic/commands/mark/MarkDeadlineCommandTest.java b/src/test/java/seedu/address/logic/commands/mark/MarkDeadlineCommandTest.java index 680bf23a59c..15273b4d675 100644 --- a/src/test/java/seedu/address/logic/commands/mark/MarkDeadlineCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/mark/MarkDeadlineCommandTest.java @@ -16,11 +16,9 @@ import seedu.address.commons.core.index.Index; import seedu.address.logic.Messages; -import seedu.address.logic.commands.CommandResult; import seedu.address.model.Model; import seedu.address.model.ModelManager; import seedu.address.model.UserPrefs; -import seedu.address.model.project.Deadline; import seedu.address.model.project.Project; import seedu.address.testutil.ProjectBuilder; @@ -90,15 +88,6 @@ public void equals() { assertFalse(markFirstCommand.equals(markSecondCommand)); } -// /** -// * Generates a new MarkDeadlineCommand with the details of the given project index and deadline index. -// */ -// private MarkDeadlineCommand prepareCommand(Index projIndex, Index deadlineIndex) { -// MarkDeadlineCommand markDeadlineCommand = new MarkDeadlineCommand(projIndex, deadlineIndex); -// markDeadlineCommand.setData(model, new CommandResult("", TabIndex.Project)); -// return markDeadlineCommand; -// } - @Test public void execute_validIndexesFilteredList_success() { showProjectAtIndex(model, INDEX_FIRST_PROJECT); diff --git a/src/test/java/seedu/address/logic/commands/mark/UnmarkDeadlineCommandTest.java b/src/test/java/seedu/address/logic/commands/mark/UnmarkDeadlineCommandTest.java index feb0d7a6d64..77a4ab73701 100644 --- a/src/test/java/seedu/address/logic/commands/mark/UnmarkDeadlineCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/mark/UnmarkDeadlineCommandTest.java @@ -16,11 +16,9 @@ import seedu.address.commons.core.index.Index; import seedu.address.logic.Messages; -import seedu.address.logic.commands.CommandResult; import seedu.address.model.Model; import seedu.address.model.ModelManager; import seedu.address.model.UserPrefs; -import seedu.address.model.project.Deadline; import seedu.address.model.project.Project; import seedu.address.testutil.ProjectBuilder; @@ -71,14 +69,14 @@ public void execute_invalidDeadlineIndexUnfilteredList_failure() { @Test public void equals() { UnmarkDeadlineCommand unmarkFirstCommand = new UnmarkDeadlineCommand(INDEX_FIRST_PROJECT, INDEX_FIRST_PROJECT); - UnmarkDeadlineCommand unmarkSecondCommand = + UnmarkDeadlineCommand unmarkSecondCommand = new UnmarkDeadlineCommand(INDEX_SECOND_PROJECT, INDEX_SECOND_PROJECT); // same object -> returns true assertTrue(unmarkFirstCommand.equals(unmarkFirstCommand)); // same values -> returns true - UnmarkDeadlineCommand unmarkFirstCommandCopy = + UnmarkDeadlineCommand unmarkFirstCommandCopy = new UnmarkDeadlineCommand(INDEX_FIRST_PROJECT, INDEX_FIRST_PROJECT); assertTrue(unmarkFirstCommand.equals(unmarkFirstCommandCopy)); diff --git a/src/test/java/seedu/address/testutil/EditClientDescriptorBuilder.java b/src/test/java/seedu/address/testutil/EditClientDescriptorBuilder.java index 108048a4bc3..1bd28c4e6a4 100644 --- a/src/test/java/seedu/address/testutil/EditClientDescriptorBuilder.java +++ b/src/test/java/seedu/address/testutil/EditClientDescriptorBuilder.java @@ -5,7 +5,6 @@ import java.util.stream.Stream; import seedu.address.logic.commands.edit.EditClientCommand; -import seedu.address.logic.commands.edit.EditClientCommandTest; import seedu.address.model.client.Client; import seedu.address.model.client.ClientRoles; import seedu.address.model.client.Document; diff --git a/src/test/java/seedu/address/testutil/EditProjectDescriptorBuilder.java b/src/test/java/seedu/address/testutil/EditProjectDescriptorBuilder.java index be3f0ff9d73..37cae6eaabc 100644 --- a/src/test/java/seedu/address/testutil/EditProjectDescriptorBuilder.java +++ b/src/test/java/seedu/address/testutil/EditProjectDescriptorBuilder.java @@ -1,17 +1,12 @@ package seedu.address.testutil; import seedu.address.logic.commands.edit.EditProjectCommand; -import seedu.address.model.project.Description; import seedu.address.model.project.Deadline; +import seedu.address.model.project.Description; import seedu.address.model.project.Project; -import seedu.address.commons.util.CollectionUtil; -import seedu.address.commons.util.ToStringBuilder; import java.util.ArrayList; -import java.util.Collections; import java.util.List; -import java.util.Objects; -import java.util.Optional; /** * A utility class to help with building EditProjectDescriptor objects. diff --git a/src/test/java/seedu/address/testutil/ProjectBuilder.java b/src/test/java/seedu/address/testutil/ProjectBuilder.java index e347baecde2..34fa9b563de 100644 --- a/src/test/java/seedu/address/testutil/ProjectBuilder.java +++ b/src/test/java/seedu/address/testutil/ProjectBuilder.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Set; import seedu.address.model.commons.Name; import seedu.address.model.project.Deadline; @@ -81,7 +80,7 @@ public ProjectBuilder withDeadlinesString(List deadlines) { } return this; } - + /** Builds a Project object. */ public Project build() { return new Project(name, description, deadlineList); diff --git a/src/test/java/seedu/address/testutil/TypicalClients.java b/src/test/java/seedu/address/testutil/TypicalClients.java index 0c83d58305c..b5f6790e4a9 100644 --- a/src/test/java/seedu/address/testutil/TypicalClients.java +++ b/src/test/java/seedu/address/testutil/TypicalClients.java @@ -104,7 +104,7 @@ public static AddressBook getTypicalAddressBookWithProjects() { } return ab; } - + public static List getTypicalClients() { return new ArrayList<>(Arrays.asList(ALICE, BENSON, CARL, DANIEL, ELLE, FIONA, GEORGE)); } diff --git a/src/test/java/seedu/address/testutil/TypicalDevelopers.java b/src/test/java/seedu/address/testutil/TypicalDevelopers.java index abf1def401a..a319f5388f4 100644 --- a/src/test/java/seedu/address/testutil/TypicalDevelopers.java +++ b/src/test/java/seedu/address/testutil/TypicalDevelopers.java @@ -23,7 +23,6 @@ import java.util.List; import seedu.address.model.AddressBook; -import seedu.address.model.client.Client; import seedu.address.model.developer.Developer; import seedu.address.model.project.Project; @@ -106,7 +105,7 @@ public static AddressBook getTypicalAddressBookWithProjects() { } return ab; } - + public static List getTypicalDevelopers() { return new ArrayList<>(Arrays.asList(ALICE, BENSON, CARL, DANIEL, ELLE, FIONA, GEORGE)); } diff --git a/src/test/java/seedu/address/testutil/TypicalIndexes.java b/src/test/java/seedu/address/testutil/TypicalIndexes.java index cbea78874f0..8ac23139257 100644 --- a/src/test/java/seedu/address/testutil/TypicalIndexes.java +++ b/src/test/java/seedu/address/testutil/TypicalIndexes.java @@ -1,6 +1,5 @@ package seedu.address.testutil; -import java.util.ArrayList; import java.util.List; import seedu.address.commons.core.index.Index; From 635446ded0a71758e2f5ba91b596ee5b0c0a059b Mon Sep 17 00:00:00 2001 From: emzm2023 Date: Mon, 13 Nov 2023 14:53:19 +0800 Subject: [PATCH 32/36] Fix import checkstyle issues --- .../address/testutil/EditProjectDescriptorBuilder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/seedu/address/testutil/EditProjectDescriptorBuilder.java b/src/test/java/seedu/address/testutil/EditProjectDescriptorBuilder.java index 37cae6eaabc..eb233dd93f6 100644 --- a/src/test/java/seedu/address/testutil/EditProjectDescriptorBuilder.java +++ b/src/test/java/seedu/address/testutil/EditProjectDescriptorBuilder.java @@ -1,13 +1,13 @@ package seedu.address.testutil; +import java.util.ArrayList; +import java.util.List; + import seedu.address.logic.commands.edit.EditProjectCommand; import seedu.address.model.project.Deadline; import seedu.address.model.project.Description; import seedu.address.model.project.Project; -import java.util.ArrayList; -import java.util.List; - /** * A utility class to help with building EditProjectDescriptor objects. */ From 800d946895342cf3d487cabbeab3ae2126f2e741 Mon Sep 17 00:00:00 2001 From: emzm2023 Date: Mon, 13 Nov 2023 14:58:17 +0800 Subject: [PATCH 33/36] Fix failing test --- .../address/logic/commands/find/FindDeadlineCommandTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/seedu/address/logic/commands/find/FindDeadlineCommandTest.java b/src/test/java/seedu/address/logic/commands/find/FindDeadlineCommandTest.java index f0adc034345..888c11409e5 100644 --- a/src/test/java/seedu/address/logic/commands/find/FindDeadlineCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/find/FindDeadlineCommandTest.java @@ -46,9 +46,9 @@ public void execute_zeroKeywords_noDeadlineFound() throws ParseException { } @Test - public void execute_multipleKeywords_multiplePersonsFound() { + public void execute_multipleKeywords_onePersonsFound() { //String expectedMessage = String.format(MESSAGE_PERSONS_LISTED_OVERVIEW, 3); - String expectedMessage = "These are the 5 deadlines with matching information."; + String expectedMessage = "This is the 1 deadline with matching information."; Predicate finalPredicate = deadline -> true; finalPredicate = finalPredicate.and(d -> d.getPriority().equals(Priority.HIGH)); FindDeadlineCommand command = new FindDeadlineCommand(finalPredicate); From ff4c6a3191651d7ab87cbf1c145ce08ed6a44c18 Mon Sep 17 00:00:00 2001 From: mingyu Date: Mon, 13 Nov 2023 15:39:35 +0800 Subject: [PATCH 34/36] Undo Redo Command test cases --- .../address/logic/commands/RedoCommand.java | 5 +- .../address/logic/commands/UndoCommand.java | 6 +- .../logic/commands/RedoCommandTest.java | 101 ++++++++++++++ .../logic/commands/UndoCommandTest.java | 123 ++++++++++++++++++ 4 files changed, 233 insertions(+), 2 deletions(-) create mode 100644 src/test/java/seedu/address/logic/commands/RedoCommandTest.java create mode 100644 src/test/java/seedu/address/logic/commands/UndoCommandTest.java diff --git a/src/main/java/seedu/address/logic/commands/RedoCommand.java b/src/main/java/seedu/address/logic/commands/RedoCommand.java index d512ffeae36..17efa4b90e6 100644 --- a/src/main/java/seedu/address/logic/commands/RedoCommand.java +++ b/src/main/java/seedu/address/logic/commands/RedoCommand.java @@ -21,7 +21,11 @@ public CommandResult execute(Model model) throws CommandException { model.redoAddressBook(model); String previousCommand = model.getPreviousCommandForRedo(); TabIndex index = model.getPreviousTabIndexForRedo(); + handleRoleRedo(previousCommand); + return new CommandResult(MESSAGE_SUCCESS + "\n" + previousCommand, index); + } + private void handleRoleRedo(String previousCommand) { if (previousCommand.contains("New role for client added: ")) { ClientRoles.addClientRole(new ClientRoles(previousCommand.substring(27))); } else if (previousCommand.contains("New role for developer added: ")) { @@ -31,6 +35,5 @@ public CommandResult execute(Model model) throws CommandException { } else if (previousCommand.contains("Role for developers deleted: ")) { DeveloperRoles.deleteDeveloperRole(new DeveloperRoles(previousCommand.substring(29))); } - return new CommandResult(MESSAGE_SUCCESS + "\n" + previousCommand, index); } } diff --git a/src/main/java/seedu/address/logic/commands/UndoCommand.java b/src/main/java/seedu/address/logic/commands/UndoCommand.java index 3cfb932d7eb..faffb39a91a 100644 --- a/src/main/java/seedu/address/logic/commands/UndoCommand.java +++ b/src/main/java/seedu/address/logic/commands/UndoCommand.java @@ -31,6 +31,11 @@ public CommandResult execute(Model model) throws CommandException { String previousCommand = model.getPreviousCommandForUndo(); TabIndex index = model.getPreviousTabIndex(); // check if it is any of the role commands + handleRoleUndo(previousCommand); + return new CommandResult(MESSAGE_SUCCESS + "\n" + previousCommand, index); + } + + private void handleRoleUndo(String previousCommand) { if (previousCommand.contains("New role for client added: ")) { ClientRoles.deleteClientRole(new ClientRoles(previousCommand.substring(27))); } else if (previousCommand.contains("New role for developer added: ")) { @@ -40,6 +45,5 @@ public CommandResult execute(Model model) throws CommandException { } else if (previousCommand.contains("Role for developers deleted: ")) { DeveloperRoles.addDeveloperRole(new DeveloperRoles(previousCommand.substring(29))); } - return new CommandResult(MESSAGE_SUCCESS + "\n" + previousCommand, index); } } diff --git a/src/test/java/seedu/address/logic/commands/RedoCommandTest.java b/src/test/java/seedu/address/logic/commands/RedoCommandTest.java new file mode 100644 index 00000000000..da5bdaa4092 --- /dev/null +++ b/src/test/java/seedu/address/logic/commands/RedoCommandTest.java @@ -0,0 +1,101 @@ +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.assertTrue; +import static seedu.address.testutil.Assert.assertThrows; +import static seedu.address.testutil.TypicalClients.getTypicalAddressBook; + +import org.junit.jupiter.api.Test; + +import seedu.address.logic.commands.exceptions.CommandException; +import seedu.address.model.Model; +import seedu.address.model.ModelManager; +import seedu.address.model.UserPrefs; +import seedu.address.model.client.ClientRoles; +import seedu.address.model.developer.DeveloperRoles; +import seedu.address.testutil.ClientBuilder; + +public class RedoCommandTest { + + private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + private Model modelAfterChange = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + private RedoCommand redoCommand = new RedoCommand(); + + @Test + public void execute_validRedo_success() throws CommandException { + ClientBuilder clientBuilder = new ClientBuilder(); + model.addClient(clientBuilder.build()); + model.commitAddressBook(model, "Add Benson", TabIndex.Client); + model.undoAddressBook(model); + + modelAfterChange = model; + + redoCommand.execute(model); + + assertEquals(model, modelAfterChange); // Ensure that the redo was successful + } + + @Test + public void execute_noRedoAvailable_throwsCommandException() { + assertThrows(CommandException.class, () -> redoCommand.execute(model)); + } + + @Test + public void execute_redoRoleCommand_success() throws CommandException { + // Undo a command that added a new role for a client + ClientRoles.addClientRole(new ClientRoles("NewRole")); + model.commitAddressBook(model, "New role for client added: NewRole", TabIndex.Client); + model.undoAddressBook(model); + + // Redo the role addition + redoCommand.execute(model); + + assertTrue(ClientRoles.isValidRole("NewRole")); + } + + @Test + public void execute_redoDeveloperRoleCommand_success() throws CommandException { + // Undo a command that added a new role for a developer + DeveloperRoles.addDeveloperRole(new DeveloperRoles("NewRole")); + model.commitAddressBook(model, "New role for developer added: NewRole", TabIndex.Developer); + model.undoAddressBook(model); + + // Redo the role addition + redoCommand.execute(model); + assertTrue(ClientRoles.isValidRole("NewRole")); + model.undoAddressBook(model); + } + + @Test + public void execute_redoDeleteClientRoleCommand_success() throws CommandException { + ClientRoles.addClientRole(new ClientRoles("RoleToDelete")); + model.commitAddressBook(model, "New role for client added: RoleToDelete", TabIndex.Client); + + // Undo a command that deleted a role for a client + ClientRoles.deleteClientRole(new ClientRoles("RoleToDelete")); + model.commitAddressBook(model, "Role for clients deleted: RoleToDelete", TabIndex.Client); + model.undoAddressBook(model); + + // Redo the role deletion + redoCommand.execute(model); + + assertFalse(ClientRoles.isValidRole("RoleToDelete")); + } + + @Test + public void execute_redoDeleteDeveloperRoleCommand_success() throws CommandException { + DeveloperRoles.addDeveloperRole(new DeveloperRoles("RoleToDelete")); + model.commitAddressBook(model, "New role for developer added: NewRole", TabIndex.Developer); + + // Undo a command that deleted a role for a developer + DeveloperRoles.deleteDeveloperRole(new DeveloperRoles("RoleToDelete")); + model.commitAddressBook(model, "Role for developers deleted: RoleToDelete", TabIndex.Developer); + model.undoAddressBook(model); + + // Redo the role deletion + redoCommand.execute(model); + + assertFalse(DeveloperRoles.isValidRole("RoleToDelete")); + } +} diff --git a/src/test/java/seedu/address/logic/commands/UndoCommandTest.java b/src/test/java/seedu/address/logic/commands/UndoCommandTest.java new file mode 100644 index 00000000000..34c24f0d3f9 --- /dev/null +++ b/src/test/java/seedu/address/logic/commands/UndoCommandTest.java @@ -0,0 +1,123 @@ +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.assertTrue; +import static seedu.address.testutil.Assert.assertThrows; +import static seedu.address.testutil.TypicalClients.BOB; +import static seedu.address.testutil.TypicalClients.getTypicalAddressBook; + +import org.junit.jupiter.api.Test; + +import seedu.address.logic.commands.exceptions.CommandException; +import seedu.address.model.Model; +import seedu.address.model.ModelManager; +import seedu.address.model.UserPrefs; +import seedu.address.model.client.ClientRoles; +import seedu.address.model.developer.DeveloperRoles; +import seedu.address.testutil.ClientBuilder; +import seedu.address.testutil.DeveloperBuilder; + +public class UndoCommandTest { + + private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + private Model modelAfterChange = new ModelManager(getTypicalAddressBook(), new UserPrefs()); + private UndoCommand undoCommand = new UndoCommand(); + + @Test + public void execute_validUndo_success() throws CommandException { + model.addClient(BOB); + model.commitAddressBook(model, "Add Alice", TabIndex.Client); + undoCommand.execute(model); + assertEquals(model, modelAfterChange); + } + + @Test + public void execute_noUndoAvailable_throwsCommandException() { + assertThrows(CommandException.class, () -> undoCommand.execute(model)); + } + + @Test + public void execute_undoNonRoleCommand_success() throws CommandException { + // Add a new role for a client + ClientBuilder clientBuilder = new ClientBuilder(); + model.addClient(clientBuilder.build()); + model.commitAddressBook(model, "New client added", TabIndex.Client); + + // Undo the role addition + undoCommand.execute(model); + + assertFalse(model.getFilteredClientList().contains(clientBuilder.build())); + } + + @Test + public void execute_undoRoleCommand_success() throws CommandException { + // Add a new role for a client + ClientRoles.addClientRole(new ClientRoles("NewRole")); + model.commitAddressBook(model, "New role for client added: NewRole", TabIndex.Client); + + // Undo the role addition + undoCommand.execute(model); + + assertFalse(ClientRoles.isValidRole("NewRole")); + } + + @Test + public void execute_undoNonDeveloperRoleCommand_success() throws CommandException { + // Add a new role for a client + DeveloperBuilder developerBuilder = new DeveloperBuilder(); + model.addDeveloper(developerBuilder.build()); + model.commitAddressBook(model, "New Developer Added", TabIndex.Developer); + + // Undo the role addition + undoCommand.execute(model); + + assertFalse(model.getFilteredClientList().contains(developerBuilder.build())); + } + + @Test + public void execute_undoDeveloperRoleCommand_success() throws CommandException { + // Add a new role for a client + DeveloperRoles.addDeveloperRole(new DeveloperRoles("NewRole")); + model.commitAddressBook(model, "New role for developer added: NewRole", TabIndex.Developer); + + // Undo the role addition + undoCommand.execute(model); + + assertFalse(DeveloperRoles.isValidRole("NewRole")); + } + + @Test + public void execute_undoDeleteClientRoleCommand_success() throws CommandException { + ClientRoles.addClientRole(new ClientRoles("NewRole")); + model.commitAddressBook(model, "New role for client added: NewRole", TabIndex.Client); + + // Delete a role for a client + ClientRoles.deleteClientRole(new ClientRoles("NewRole")); + model.commitAddressBook(model, "Role for clients deleted: NewRole", TabIndex.Client); + + // Undo the role deletion + undoCommand.execute(model); + + assertTrue(ClientRoles.isValidRole("NewRole")); + + undoCommand.execute(model); + } + + @Test + public void execute_undoDeleteDeveloperRoleCommand_success() throws CommandException { + DeveloperRoles.addDeveloperRole(new DeveloperRoles("RoleToDelete")); + model.commitAddressBook(model, "New role for client added: NewRole", TabIndex.Developer); + + // Delete a role for a developer + DeveloperRoles.deleteDeveloperRole(new DeveloperRoles("RoleToDelete")); + model.commitAddressBook(model, "Role for developers deleted: RoleToDelete", TabIndex.Developer); + + // Undo the role deletion + undoCommand.execute(model); + + assertTrue(DeveloperRoles.isValidRole("RoleToDelete")); + + undoCommand.execute(model); + } +} From 0a8ac05bae53b1e1812184b47560340336d6ff84 Mon Sep 17 00:00:00 2001 From: mingyu Date: Mon, 13 Nov 2023 15:53:57 +0800 Subject: [PATCH 35/36] fix test cases --- .../address/logic/commands/RedoCommandTest.java | 14 ++++++++------ .../address/logic/commands/UndoCommandTest.java | 9 ++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/test/java/seedu/address/logic/commands/RedoCommandTest.java b/src/test/java/seedu/address/logic/commands/RedoCommandTest.java index da5bdaa4092..4b62b132fc6 100644 --- a/src/test/java/seedu/address/logic/commands/RedoCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/RedoCommandTest.java @@ -21,6 +21,7 @@ public class RedoCommandTest { private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs()); private Model modelAfterChange = new ModelManager(getTypicalAddressBook(), new UserPrefs()); private RedoCommand redoCommand = new RedoCommand(); + private UndoCommand undoCommand = new UndoCommand(); @Test public void execute_validRedo_success() throws CommandException { @@ -46,12 +47,13 @@ public void execute_redoRoleCommand_success() throws CommandException { // Undo a command that added a new role for a client ClientRoles.addClientRole(new ClientRoles("NewRole")); model.commitAddressBook(model, "New role for client added: NewRole", TabIndex.Client); - model.undoAddressBook(model); + undoCommand.execute(model); // Redo the role addition redoCommand.execute(model); assertTrue(ClientRoles.isValidRole("NewRole")); + ClientRoles.deleteClientRole(new ClientRoles("NewRole")); } @Test @@ -59,12 +61,12 @@ public void execute_redoDeveloperRoleCommand_success() throws CommandException { // Undo a command that added a new role for a developer DeveloperRoles.addDeveloperRole(new DeveloperRoles("NewRole")); model.commitAddressBook(model, "New role for developer added: NewRole", TabIndex.Developer); - model.undoAddressBook(model); + undoCommand.execute(model); // Redo the role addition redoCommand.execute(model); - assertTrue(ClientRoles.isValidRole("NewRole")); - model.undoAddressBook(model); + assertTrue(DeveloperRoles.isValidRole("NewRole")); + DeveloperRoles.deleteDeveloperRole(new DeveloperRoles("NewRole")); } @Test @@ -75,7 +77,7 @@ public void execute_redoDeleteClientRoleCommand_success() throws CommandExceptio // Undo a command that deleted a role for a client ClientRoles.deleteClientRole(new ClientRoles("RoleToDelete")); model.commitAddressBook(model, "Role for clients deleted: RoleToDelete", TabIndex.Client); - model.undoAddressBook(model); + undoCommand.execute(model); // Redo the role deletion redoCommand.execute(model); @@ -91,7 +93,7 @@ public void execute_redoDeleteDeveloperRoleCommand_success() throws CommandExcep // Undo a command that deleted a role for a developer DeveloperRoles.deleteDeveloperRole(new DeveloperRoles("RoleToDelete")); model.commitAddressBook(model, "Role for developers deleted: RoleToDelete", TabIndex.Developer); - model.undoAddressBook(model); + undoCommand.execute(model); // Redo the role deletion redoCommand.execute(model); diff --git a/src/test/java/seedu/address/logic/commands/UndoCommandTest.java b/src/test/java/seedu/address/logic/commands/UndoCommandTest.java index 34c24f0d3f9..bc313d36e38 100644 --- a/src/test/java/seedu/address/logic/commands/UndoCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/UndoCommandTest.java @@ -9,6 +9,7 @@ import org.junit.jupiter.api.Test; +import seedu.address.logic.commands.deleteroles.DeleteClientRoleCommand; import seedu.address.logic.commands.exceptions.CommandException; import seedu.address.model.Model; import seedu.address.model.ModelManager; @@ -51,7 +52,7 @@ public void execute_undoNonRoleCommand_success() throws CommandException { } @Test - public void execute_undoRoleCommand_success() throws CommandException { + public void execute_undoClientRoleCommand_success() throws CommandException { // Add a new role for a client ClientRoles.addClientRole(new ClientRoles("NewRole")); model.commitAddressBook(model, "New role for client added: NewRole", TabIndex.Client); @@ -100,8 +101,7 @@ public void execute_undoDeleteClientRoleCommand_success() throws CommandExceptio undoCommand.execute(model); assertTrue(ClientRoles.isValidRole("NewRole")); - - undoCommand.execute(model); + ClientRoles.deleteClientRole(new ClientRoles("NewRole")); } @Test @@ -117,7 +117,6 @@ public void execute_undoDeleteDeveloperRoleCommand_success() throws CommandExcep undoCommand.execute(model); assertTrue(DeveloperRoles.isValidRole("RoleToDelete")); - - undoCommand.execute(model); + DeveloperRoles.deleteDeveloperRole(new DeveloperRoles("RoleToDelete")); } } From e3b2d8e869f27183900c24cd9259022b48441f5b Mon Sep 17 00:00:00 2001 From: mingyu-wan <112554073+mingyu-wan@users.noreply.github.com> Date: Mon, 13 Nov 2023 16:00:05 +0800 Subject: [PATCH 36/36] fix checkstyles --- src/test/java/seedu/address/logic/commands/UndoCommandTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/seedu/address/logic/commands/UndoCommandTest.java b/src/test/java/seedu/address/logic/commands/UndoCommandTest.java index bc313d36e38..6fa32d885b2 100644 --- a/src/test/java/seedu/address/logic/commands/UndoCommandTest.java +++ b/src/test/java/seedu/address/logic/commands/UndoCommandTest.java @@ -9,7 +9,6 @@ import org.junit.jupiter.api.Test; -import seedu.address.logic.commands.deleteroles.DeleteClientRoleCommand; import seedu.address.logic.commands.exceptions.CommandException; import seedu.address.model.Model; import seedu.address.model.ModelManager;