From a43300ad0f9ad96d6e0653c2749dc9d5d1b31435 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Thu, 30 Sep 2021 10:14:14 +0800 Subject: [PATCH 001/466] Set theme jekyll-theme-cayman --- docs/_config.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/_config.yml diff --git a/docs/_config.yml b/docs/_config.yml new file mode 100644 index 0000000000..c4192631f2 --- /dev/null +++ b/docs/_config.yml @@ -0,0 +1 @@ +theme: jekyll-theme-cayman \ No newline at end of file From 63cbe029aa124c73159ea56656b410fcec0e349c Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Thu, 30 Sep 2021 10:43:27 +0800 Subject: [PATCH 002/466] Update AboutUs.md --- docs/AboutUs.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/AboutUs.md b/docs/AboutUs.md index 0f072953ea..0f3fb87985 100644 --- a/docs/AboutUs.md +++ b/docs/AboutUs.md @@ -5,5 +5,4 @@ Display | Name | Github Profile | Portfolio ![](https://via.placeholder.com/100.png?text=Photo) | John Doe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) ![](https://via.placeholder.com/100.png?text=Photo) | Don Joe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) ![](https://via.placeholder.com/100.png?text=Photo) | Ron John | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) -![](https://via.placeholder.com/100.png?text=Photo) | John Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) -![](https://via.placeholder.com/100.png?text=Photo) | Don Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) +![](https://via.placeholder.com/100.png?text=Photo) | 3m0W33D | [Github](https://github.com/3m0W33D) | [Portfolio](docs/team/johndoe.md) From 05e734b953b0076e1138ae5a6570d57ab447edde Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Thu, 30 Sep 2021 10:44:26 +0800 Subject: [PATCH 003/466] Update aboutus to add my details --- docs/AboutUs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/AboutUs.md b/docs/AboutUs.md index 0f072953ea..bcceb205f3 100644 --- a/docs/AboutUs.md +++ b/docs/AboutUs.md @@ -3,7 +3,7 @@ Display | Name | Github Profile | Portfolio --------|:----:|:--------------:|:---------: ![](https://via.placeholder.com/100.png?text=Photo) | John Doe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) -![](https://via.placeholder.com/100.png?text=Photo) | Don Joe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) +![](https://via.placeholder.com/100.png?text=Photo) | Tan Juen Woo | [Github](https://github.com/woolicious98) | [Portfolio](docs/team/johndoe.md) ![](https://via.placeholder.com/100.png?text=Photo) | Ron John | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) ![](https://via.placeholder.com/100.png?text=Photo) | John Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) ![](https://via.placeholder.com/100.png?text=Photo) | Don Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) From c801c77b6bf436032d507a6993b1e2916aa77e39 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Thu, 30 Sep 2021 10:44:31 +0800 Subject: [PATCH 004/466] Update AboutUs.md to add my details --- docs/AboutUs.md | 2 +- docs/team/{johndoe.md => kelvneo.md} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename docs/team/{johndoe.md => kelvneo.md} (100%) diff --git a/docs/AboutUs.md b/docs/AboutUs.md index 0f072953ea..427042ab39 100644 --- a/docs/AboutUs.md +++ b/docs/AboutUs.md @@ -2,7 +2,7 @@ Display | Name | Github Profile | Portfolio --------|:----:|:--------------:|:---------: -![](https://via.placeholder.com/100.png?text=Photo) | John Doe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) +![](https://avatars.githubusercontent.com/u/2332196?v=4) | Kelvin Neo | [Github](https://github.com/kelvneo) | [Portfolio](docs/team/kelvneo.md) ![](https://via.placeholder.com/100.png?text=Photo) | Don Joe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) ![](https://via.placeholder.com/100.png?text=Photo) | Ron John | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) ![](https://via.placeholder.com/100.png?text=Photo) | John Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) diff --git a/docs/team/johndoe.md b/docs/team/kelvneo.md similarity index 100% rename from docs/team/johndoe.md rename to docs/team/kelvneo.md From 06c39e710923cb929c46b3fdb311786d4e3d4d27 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Thu, 30 Sep 2021 10:46:09 +0800 Subject: [PATCH 005/466] Add AboutUs --- docs/AboutUs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/AboutUs.md b/docs/AboutUs.md index 0f072953ea..56b739f510 100644 --- a/docs/AboutUs.md +++ b/docs/AboutUs.md @@ -4,6 +4,6 @@ Display | Name | Github Profile | Portfolio --------|:----:|:--------------:|:---------: ![](https://via.placeholder.com/100.png?text=Photo) | John Doe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) ![](https://via.placeholder.com/100.png?text=Photo) | Don Joe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) -![](https://via.placeholder.com/100.png?text=Photo) | Ron John | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) +![](https://via.placeholder.com/100.png?text=Photo) | Louis | [Github](https://github.com/LouisLouis19) | [Portfolio](docs/team/johndoe.md) ![](https://via.placeholder.com/100.png?text=Photo) | John Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) ![](https://via.placeholder.com/100.png?text=Photo) | Don Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) From a60a888d5a2df5a3426ae577dfded43ecf2454c3 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Thu, 30 Sep 2021 10:54:49 +0800 Subject: [PATCH 006/466] Fix Data --- docs/AboutUs.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/AboutUs.md b/docs/AboutUs.md index da8dc7118c..d3954db6ba 100644 --- a/docs/AboutUs.md +++ b/docs/AboutUs.md @@ -5,6 +5,5 @@ Display | Name | Github Profile | Portfolio ![](https://avatars.githubusercontent.com/u/2332196?v=4) | Kelvin Neo | [Github](https://github.com/kelvneo) | [Portfolio](docs/team/kelvneo.md) ![](https://via.placeholder.com/100.png?text=Photo) | Louis | [Github](https://github.com/LouisLouis19) | [Portfolio](docs/team/johndoe.md) ![](https://via.placeholder.com/100.png?text=Photo) | Tan Juen Woo | [Github](https://github.com/woolicious98) | [Portfolio](docs/team/johndoe.md) -![](https://via.placeholder.com/100.png?text=Photo) | Ron John | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) ![](https://via.placeholder.com/100.png?text=Photo) | 3m0W33D | [Github](https://github.com/3m0W33D) | [Portfolio](docs/team/johndoe.md) From e2ddf3c1e7490a6e0b8be9d7d6f7a490836c308a Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Thu, 30 Sep 2021 11:04:26 +0800 Subject: [PATCH 007/466] Update AboutUs to reflect profile pictures --- docs/AboutUs.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/AboutUs.md b/docs/AboutUs.md index d3954db6ba..b2e3c94eb6 100644 --- a/docs/AboutUs.md +++ b/docs/AboutUs.md @@ -3,7 +3,7 @@ Display | Name | Github Profile | Portfolio --------|:----:|:--------------:|:---------: ![](https://avatars.githubusercontent.com/u/2332196?v=4) | Kelvin Neo | [Github](https://github.com/kelvneo) | [Portfolio](docs/team/kelvneo.md) -![](https://via.placeholder.com/100.png?text=Photo) | Louis | [Github](https://github.com/LouisLouis19) | [Portfolio](docs/team/johndoe.md) -![](https://via.placeholder.com/100.png?text=Photo) | Tan Juen Woo | [Github](https://github.com/woolicious98) | [Portfolio](docs/team/johndoe.md) -![](https://via.placeholder.com/100.png?text=Photo) | 3m0W33D | [Github](https://github.com/3m0W33D) | [Portfolio](docs/team/johndoe.md) +![](https://avatars.githubusercontent.com/u/69447277?v=4) | Louis | [Github](https://github.com/LouisLouis19) | [Portfolio](docs/team/johndoe.md) +![](https://avatars.githubusercontent.com/u/68680740?v=4) | Tan Juen Woo | [Github](https://github.com/woolicious98) | [Portfolio](docs/team/johndoe.md) +![](https://avatars.githubusercontent.com/u/26686523?v=4) | 3m0W33D | [Github](https://github.com/3m0W33D) | [Portfolio](docs/team/johndoe.md) From 8109eabbf32ba422fb42a9497f546f16ee2fd78d Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Thu, 30 Sep 2021 11:19:01 +0800 Subject: [PATCH 008/466] Fix profile picture width to 100px --- docs/AboutUs.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/AboutUs.md b/docs/AboutUs.md index b2e3c94eb6..5b9a9e9bb9 100644 --- a/docs/AboutUs.md +++ b/docs/AboutUs.md @@ -2,8 +2,8 @@ Display | Name | Github Profile | Portfolio --------|:----:|:--------------:|:---------: -![](https://avatars.githubusercontent.com/u/2332196?v=4) | Kelvin Neo | [Github](https://github.com/kelvneo) | [Portfolio](docs/team/kelvneo.md) -![](https://avatars.githubusercontent.com/u/69447277?v=4) | Louis | [Github](https://github.com/LouisLouis19) | [Portfolio](docs/team/johndoe.md) -![](https://avatars.githubusercontent.com/u/68680740?v=4) | Tan Juen Woo | [Github](https://github.com/woolicious98) | [Portfolio](docs/team/johndoe.md) -![](https://avatars.githubusercontent.com/u/26686523?v=4) | 3m0W33D | [Github](https://github.com/3m0W33D) | [Portfolio](docs/team/johndoe.md) + | Kelvin Neo | [Github](https://github.com/kelvneo) | [Portfolio](docs/team/kelvneo.md) + | Louis | [Github](https://github.com/LouisLouis19) | [Portfolio](docs/team/johndoe.md) +| Tan Juen Woo | [Github](https://github.com/woolicious98) | [Portfolio](docs/team/johndoe.md) + | 3m0W33D | [Github](https://github.com/3m0W33D) | [Portfolio](docs/team/johndoe.md) From 99342308b1a0464315b63bab838a89d9acb5ffa5 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Thu, 30 Sep 2021 11:25:31 +0800 Subject: [PATCH 009/466] Change Schuyler's name in About Us --- docs/AboutUs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/AboutUs.md b/docs/AboutUs.md index 5b9a9e9bb9..3665e3091e 100644 --- a/docs/AboutUs.md +++ b/docs/AboutUs.md @@ -5,5 +5,5 @@ Display | Name | Github Profile | Portfolio | Kelvin Neo | [Github](https://github.com/kelvneo) | [Portfolio](docs/team/kelvneo.md) | Louis | [Github](https://github.com/LouisLouis19) | [Portfolio](docs/team/johndoe.md) | Tan Juen Woo | [Github](https://github.com/woolicious98) | [Portfolio](docs/team/johndoe.md) - | 3m0W33D | [Github](https://github.com/3m0W33D) | [Portfolio](docs/team/johndoe.md) + | Schuyler Tay | [Github](https://github.com/3m0W33D) | [Portfolio](docs/team/johndoe.md) From 9e712204d16d78086c872bd9092f04d9974e236e Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Fri, 1 Oct 2021 23:14:53 +0800 Subject: [PATCH 010/466] Restructure Main files and update gradle configuration --- build.gradle | 4 ++-- .../java/{seedu/duke/Duke.java => terminus/Terminus.java} | 6 +++--- .../java/seedu/duke/{DukeTest.java => TerminusTest.java} | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename src/main/java/{seedu/duke/Duke.java => terminus/Terminus.java} (83%) rename src/test/java/seedu/duke/{DukeTest.java => TerminusTest.java} (90%) diff --git a/build.gradle b/build.gradle index b0c5528fb5..a213ccedb0 100644 --- a/build.gradle +++ b/build.gradle @@ -29,11 +29,11 @@ test { } application { - mainClassName = "seedu.duke.Duke" + mainClassName = "terminus.Terminus" } shadowJar { - archiveBaseName = "duke" + archiveBaseName = "TermiNUS" archiveClassifier = null } diff --git a/src/main/java/seedu/duke/Duke.java b/src/main/java/terminus/Terminus.java similarity index 83% rename from src/main/java/seedu/duke/Duke.java rename to src/main/java/terminus/Terminus.java index 5c74e68d59..2075e4903f 100644 --- a/src/main/java/seedu/duke/Duke.java +++ b/src/main/java/terminus/Terminus.java @@ -1,10 +1,10 @@ -package seedu.duke; +package terminus; import java.util.Scanner; -public class Duke { +public class Terminus { /** - * Main entry-point for the java.duke.Duke application. + * Main entry-point for the terminus.Terminus application. */ public static void main(String[] args) { String logo = " ____ _ \n" diff --git a/src/test/java/seedu/duke/DukeTest.java b/src/test/java/seedu/duke/TerminusTest.java similarity index 90% rename from src/test/java/seedu/duke/DukeTest.java rename to src/test/java/seedu/duke/TerminusTest.java index 2dda5fd651..23997f58a6 100644 --- a/src/test/java/seedu/duke/DukeTest.java +++ b/src/test/java/seedu/duke/TerminusTest.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -class DukeTest { +class TerminusTest { @Test public void sampleTest() { assertTrue(true); From cfd790c08dc3daa3effd486e81ac68bc3bd047c0 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Sat, 2 Oct 2021 03:15:03 +0800 Subject: [PATCH 011/466] Separate Ui into its own class User input will now echo back to the user. --- src/main/java/terminus/Terminus.java | 44 +++++++++++++++----- src/main/java/terminus/ui/Ui.java | 61 ++++++++++++++++++++++++++++ text-ui-test/EXPECTED.TXT | 19 +++++---- text-ui-test/input.txt | 3 +- 4 files changed, 108 insertions(+), 19 deletions(-) create mode 100644 src/main/java/terminus/ui/Ui.java diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 2075e4903f..fa3830a833 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -1,21 +1,45 @@ package terminus; -import java.util.Scanner; +import terminus.ui.Ui; public class Terminus { + + private Ui ui; + /** * Main entry-point for the terminus.Terminus application. */ public static void main(String[] args) { - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); - System.out.println("What is your name?"); + new Terminus().run(); + } - Scanner in = new Scanner(System.in); - System.out.println("Hello " + in.nextLine()); + /** + * Start the program. + */ + public void run() { + start(); + runCommandsUntilExit(); + exit(); + } + + private void start() { + this.ui = new Ui(); + this.ui.printBanner(); + } + + private void runCommandsUntilExit() { + while (true) { + String input = ui.requestCommand(""); + if (input.equalsIgnoreCase("bye")) { + break; + } + + ui.printSection(input); + } + } + + private void exit() { + this.ui.printExitMessage(); } + } diff --git a/src/main/java/terminus/ui/Ui.java b/src/main/java/terminus/ui/Ui.java new file mode 100644 index 0000000000..e790a745f7 --- /dev/null +++ b/src/main/java/terminus/ui/Ui.java @@ -0,0 +1,61 @@ +package terminus.ui; + +import java.util.Arrays; +import java.util.Scanner; + +public class Ui { + + private static final String BANNER = "Welcome to TermiNUS!\n" + + "\n" + + "Type any of the following to get started:\n" + + "> notes\n" + + "> schedules\n" + + "> help\n" + + "> exit\n"; + private static final String PROMPT = "[%s] >>> "; + + private final Scanner scanner; + + public Ui() { + this.scanner = new Scanner(System.in); + } + + /** + * Prints the banner. + */ + public void printBanner() { + System.out.println(BANNER); + } + + /** + * Prints a prompt and requests a command from the user. + * + * @param workspaceName The string to place within the brackets. + * @return The command the user inputted. + */ + public String requestCommand(String workspaceName) { + String validatedWorkspaceName = workspaceName; + if (validatedWorkspaceName == null) { + validatedWorkspaceName = ""; + } + System.out.printf((PROMPT) + "%n", validatedWorkspaceName); + return scanner.nextLine(); + } + + /** + * Prints multiple strings at once, separated by a new line. + * + * @param strings The strings to print. + */ + public void printSection(String... strings) { + Arrays.stream(strings).forEach(System.out::println); + } + + /** + * Prints the exit message. + */ + public void printExitMessage() { + System.out.println("Goodbye!"); + } + +} diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 892cb6cae7..aa370a0fb1 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -1,9 +1,12 @@ -Hello from - ____ _ -| _ \ _ _| | _____ -| | | | | | | |/ / _ \ -| |_| | |_| | < __/ -|____/ \__,_|_|\_\___| +Welcome to TermiNUS! -What is your name? -Hello James Gosling +Type any of the following to get started: +> notes +> schedules +> help +> exit + +[] >>> +notes +[] >>> +Goodbye! diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index f6ec2e9f95..46f4d22988 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -1 +1,2 @@ -James Gosling \ No newline at end of file +notes +bye \ No newline at end of file From a5cd9386e004c53cad9f21c639f2ad0e969f2713 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Sat, 2 Oct 2021 13:54:30 +0800 Subject: [PATCH 012/466] Add basic command parsing * Todo: Error checking implementation --- src/main/java/terminus/Terminus.java | 26 ++++++++++++-- src/main/java/terminus/command/Command.java | 17 +++++++++ .../java/terminus/command/CommandResult.java | 33 +++++++++++++++++ .../java/terminus/command/NotesCommand.java | 36 +++++++++++++++++++ .../java/terminus/command/TestCommand.java | 28 +++++++++++++++ src/main/java/terminus/module/NusModule.java | 5 +++ .../java/terminus/parser/CommandParser.java | 32 +++++++++++++++++ .../terminus/parser/MainCommandParser.java | 17 +++++++++ .../terminus/parser/NoteCommandParser.java | 17 +++++++++ 9 files changed, 208 insertions(+), 3 deletions(-) create mode 100644 src/main/java/terminus/command/Command.java create mode 100644 src/main/java/terminus/command/CommandResult.java create mode 100644 src/main/java/terminus/command/NotesCommand.java create mode 100644 src/main/java/terminus/command/TestCommand.java create mode 100644 src/main/java/terminus/module/NusModule.java create mode 100644 src/main/java/terminus/parser/CommandParser.java create mode 100644 src/main/java/terminus/parser/MainCommandParser.java create mode 100644 src/main/java/terminus/parser/NoteCommandParser.java diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index fa3830a833..7fd37490e9 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -1,11 +1,16 @@ package terminus; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.parser.CommandParser; +import terminus.parser.MainCommandParser; import terminus.ui.Ui; public class Terminus { private Ui ui; - + private CommandParser parser; + private String workspace; /** * Main entry-point for the terminus.Terminus application. */ @@ -24,16 +29,31 @@ public void run() { private void start() { this.ui = new Ui(); + this.parser = MainCommandParser.getInstance(); + this.workspace = ""; this.ui.printBanner(); } private void runCommandsUntilExit() { while (true) { - String input = ui.requestCommand(""); + String input = ui.requestCommand(workspace); + Command currentCommand = parser.parseCommand(input); + if (currentCommand == null) { + ui.printSection("Command not found"); + continue; + } + CommandResult result = currentCommand.execute(ui,null); + if (result.isOk() && result.isExit()) { + break; + } else if (result.isOk() && result.getAdditionalData() != null) { + this.parser = result.getAdditionalData(); + this.workspace = this.parser.getWorkspace(); + } else if( !result.isOk()) { + ui.printSection(result.getErrorMessage()); + } if (input.equalsIgnoreCase("bye")) { break; } - ui.printSection(input); } } diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java new file mode 100644 index 0000000000..f4f54e01ae --- /dev/null +++ b/src/main/java/terminus/command/Command.java @@ -0,0 +1,17 @@ +package terminus.command; + +import terminus.module.NusModule; +import terminus.parser.CommandParser; +import terminus.ui.Ui; + +public abstract class Command { + + public Command() { + + } + + public abstract String getFormat(); + public abstract StringBuilder getHelpMessage(); + public abstract void parseArguments(String arguments); + public abstract CommandResult execute(Ui ui, NusModule module); +} diff --git a/src/main/java/terminus/command/CommandResult.java b/src/main/java/terminus/command/CommandResult.java new file mode 100644 index 0000000000..48ed3aaf42 --- /dev/null +++ b/src/main/java/terminus/command/CommandResult.java @@ -0,0 +1,33 @@ +package terminus.command; + +import terminus.parser.CommandParser; + +public class CommandResult { + protected CommandParser additionalData; + protected boolean isOk; + protected boolean isExit; + protected String errorMessage; + + public CommandResult(boolean isOk, boolean isExit, CommandParser additionalData, String errorMessage) { + this.additionalData = additionalData; + this.isOk = isOk; + this.errorMessage = errorMessage; + this.isExit = isExit; + } + + public CommandParser getAdditionalData() { + return additionalData; + } + + public boolean isOk() { + return isOk; + } + + public boolean isExit() { + return isExit; + } + + public String getErrorMessage() { + return errorMessage; + } +} diff --git a/src/main/java/terminus/command/NotesCommand.java b/src/main/java/terminus/command/NotesCommand.java new file mode 100644 index 0000000000..7854c43856 --- /dev/null +++ b/src/main/java/terminus/command/NotesCommand.java @@ -0,0 +1,36 @@ +package terminus.command; + +import terminus.module.NusModule; +import terminus.parser.NoteCommandParser; +import terminus.ui.Ui; + +public class NotesCommand extends Command { + + private String arguments; + + @Override + public String getFormat() { + return null; + } + + @Override + public StringBuilder getHelpMessage() { + return null; + } + + @Override + public void parseArguments(String arguments) { + this.arguments = arguments; + } + + @Override + public CommandResult execute(Ui ui, NusModule module) { + NoteCommandParser notesMap = NoteCommandParser.getInstance(); + if (arguments != null && !arguments.strip().isEmpty()) { + return notesMap.parseCommand(arguments).execute(ui, module); + } else { + return new CommandResult(true,false,notesMap,null); + } + } + +} diff --git a/src/main/java/terminus/command/TestCommand.java b/src/main/java/terminus/command/TestCommand.java new file mode 100644 index 0000000000..b5fee1e516 --- /dev/null +++ b/src/main/java/terminus/command/TestCommand.java @@ -0,0 +1,28 @@ +package terminus.command; + +import terminus.module.NusModule; +import terminus.ui.Ui; + +public class TestCommand extends Command { + private String arguments; + @Override + public String getFormat() { + return null; + } + + @Override + public StringBuilder getHelpMessage() { + return null; + } + + @Override + public void parseArguments(String arguments) { + this.arguments = arguments; + } + + @Override + public CommandResult execute(Ui ui, NusModule module) { + System.out.println(arguments); + return new CommandResult(true,false,null,null); + } +} diff --git a/src/main/java/terminus/module/NusModule.java b/src/main/java/terminus/module/NusModule.java new file mode 100644 index 0000000000..41c5ff84fe --- /dev/null +++ b/src/main/java/terminus/module/NusModule.java @@ -0,0 +1,5 @@ +package terminus.module; + +public class NusModule { + +} diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java new file mode 100644 index 0000000000..34aea50890 --- /dev/null +++ b/src/main/java/terminus/parser/CommandParser.java @@ -0,0 +1,32 @@ +package terminus.parser; + +import java.util.HashMap; +import java.util.Locale; +import terminus.command.Command; + +public class CommandParser { + protected String workspace; + protected final HashMap commandMap; + public CommandParser (String workspace) { + commandMap = new HashMap(); + this.workspace = workspace; + } + public Command parseCommand(String command) { + String [] commandLine = command.strip().split(" ",2); + String cmdName = commandLine[0]; + String cmdData = null; + if (commandLine.length > 1) { + cmdData = commandLine[1]; + } + Command currentCommand = commandMap.get(cmdName.strip().toLowerCase(Locale.ROOT)); + if (currentCommand == null) { + return null; + } + currentCommand.parseArguments(cmdData); + return currentCommand; + } + + public String getWorkspace() { + return workspace; + } +} \ No newline at end of file diff --git a/src/main/java/terminus/parser/MainCommandParser.java b/src/main/java/terminus/parser/MainCommandParser.java new file mode 100644 index 0000000000..c7ae0643de --- /dev/null +++ b/src/main/java/terminus/parser/MainCommandParser.java @@ -0,0 +1,17 @@ +package terminus.parser; + +import terminus.command.NotesCommand; + +public class MainCommandParser extends CommandParser { + + public MainCommandParser() { + super(""); + } + + public static MainCommandParser getInstance () { + MainCommandParser parser = new MainCommandParser(); + parser.commandMap.put("notes",new NotesCommand()); +// parser.commandMap.put("schedules"); + return parser; + } +} diff --git a/src/main/java/terminus/parser/NoteCommandParser.java b/src/main/java/terminus/parser/NoteCommandParser.java new file mode 100644 index 0000000000..4ed9e4c5ff --- /dev/null +++ b/src/main/java/terminus/parser/NoteCommandParser.java @@ -0,0 +1,17 @@ +package terminus.parser; + +import terminus.command.TestCommand; + + +public class NoteCommandParser extends CommandParser{ + + public NoteCommandParser() { + super("notes"); + } + + public static NoteCommandParser getInstance() { + NoteCommandParser parser = new NoteCommandParser(); + parser.commandMap.put("test",new TestCommand()); + return parser; + } +} From 2c4e1355e516a985f9a1c738b0ed24f8f4cfc71e Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Sat, 2 Oct 2021 03:15:03 +0800 Subject: [PATCH 013/466] Separate Ui into its own class User input will now echo back to the user. --- src/main/java/terminus/Terminus.java | 44 +++++++++++++++----- src/main/java/terminus/ui/Ui.java | 61 ++++++++++++++++++++++++++++ text-ui-test/EXPECTED.TXT | 19 +++++---- text-ui-test/input.txt | 3 +- 4 files changed, 108 insertions(+), 19 deletions(-) create mode 100644 src/main/java/terminus/ui/Ui.java diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 2075e4903f..fa3830a833 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -1,21 +1,45 @@ package terminus; -import java.util.Scanner; +import terminus.ui.Ui; public class Terminus { + + private Ui ui; + /** * Main entry-point for the terminus.Terminus application. */ public static void main(String[] args) { - String logo = " ____ _ \n" - + "| _ \\ _ _| | _____ \n" - + "| | | | | | | |/ / _ \\\n" - + "| |_| | |_| | < __/\n" - + "|____/ \\__,_|_|\\_\\___|\n"; - System.out.println("Hello from\n" + logo); - System.out.println("What is your name?"); + new Terminus().run(); + } - Scanner in = new Scanner(System.in); - System.out.println("Hello " + in.nextLine()); + /** + * Start the program. + */ + public void run() { + start(); + runCommandsUntilExit(); + exit(); + } + + private void start() { + this.ui = new Ui(); + this.ui.printBanner(); + } + + private void runCommandsUntilExit() { + while (true) { + String input = ui.requestCommand(""); + if (input.equalsIgnoreCase("bye")) { + break; + } + + ui.printSection(input); + } + } + + private void exit() { + this.ui.printExitMessage(); } + } diff --git a/src/main/java/terminus/ui/Ui.java b/src/main/java/terminus/ui/Ui.java new file mode 100644 index 0000000000..e790a745f7 --- /dev/null +++ b/src/main/java/terminus/ui/Ui.java @@ -0,0 +1,61 @@ +package terminus.ui; + +import java.util.Arrays; +import java.util.Scanner; + +public class Ui { + + private static final String BANNER = "Welcome to TermiNUS!\n" + + "\n" + + "Type any of the following to get started:\n" + + "> notes\n" + + "> schedules\n" + + "> help\n" + + "> exit\n"; + private static final String PROMPT = "[%s] >>> "; + + private final Scanner scanner; + + public Ui() { + this.scanner = new Scanner(System.in); + } + + /** + * Prints the banner. + */ + public void printBanner() { + System.out.println(BANNER); + } + + /** + * Prints a prompt and requests a command from the user. + * + * @param workspaceName The string to place within the brackets. + * @return The command the user inputted. + */ + public String requestCommand(String workspaceName) { + String validatedWorkspaceName = workspaceName; + if (validatedWorkspaceName == null) { + validatedWorkspaceName = ""; + } + System.out.printf((PROMPT) + "%n", validatedWorkspaceName); + return scanner.nextLine(); + } + + /** + * Prints multiple strings at once, separated by a new line. + * + * @param strings The strings to print. + */ + public void printSection(String... strings) { + Arrays.stream(strings).forEach(System.out::println); + } + + /** + * Prints the exit message. + */ + public void printExitMessage() { + System.out.println("Goodbye!"); + } + +} diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 892cb6cae7..aa370a0fb1 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -1,9 +1,12 @@ -Hello from - ____ _ -| _ \ _ _| | _____ -| | | | | | | |/ / _ \ -| |_| | |_| | < __/ -|____/ \__,_|_|\_\___| +Welcome to TermiNUS! -What is your name? -Hello James Gosling +Type any of the following to get started: +> notes +> schedules +> help +> exit + +[] >>> +notes +[] >>> +Goodbye! diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index f6ec2e9f95..46f4d22988 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -1 +1,2 @@ -James Gosling \ No newline at end of file +notes +bye \ No newline at end of file From b6b5401b4d8d088b6570797d3536b9d6e397e396 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Sat, 2 Oct 2021 13:54:30 +0800 Subject: [PATCH 014/466] Add basic command parsing * Todo: Error checking implementation --- src/main/java/terminus/Terminus.java | 26 ++++++++++++-- src/main/java/terminus/command/Command.java | 17 +++++++++ .../java/terminus/command/CommandResult.java | 33 +++++++++++++++++ .../java/terminus/command/NotesCommand.java | 36 +++++++++++++++++++ .../java/terminus/command/TestCommand.java | 28 +++++++++++++++ src/main/java/terminus/module/NusModule.java | 5 +++ .../java/terminus/parser/CommandParser.java | 32 +++++++++++++++++ .../terminus/parser/MainCommandParser.java | 17 +++++++++ .../terminus/parser/NoteCommandParser.java | 17 +++++++++ 9 files changed, 208 insertions(+), 3 deletions(-) create mode 100644 src/main/java/terminus/command/Command.java create mode 100644 src/main/java/terminus/command/CommandResult.java create mode 100644 src/main/java/terminus/command/NotesCommand.java create mode 100644 src/main/java/terminus/command/TestCommand.java create mode 100644 src/main/java/terminus/module/NusModule.java create mode 100644 src/main/java/terminus/parser/CommandParser.java create mode 100644 src/main/java/terminus/parser/MainCommandParser.java create mode 100644 src/main/java/terminus/parser/NoteCommandParser.java diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index fa3830a833..7fd37490e9 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -1,11 +1,16 @@ package terminus; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.parser.CommandParser; +import terminus.parser.MainCommandParser; import terminus.ui.Ui; public class Terminus { private Ui ui; - + private CommandParser parser; + private String workspace; /** * Main entry-point for the terminus.Terminus application. */ @@ -24,16 +29,31 @@ public void run() { private void start() { this.ui = new Ui(); + this.parser = MainCommandParser.getInstance(); + this.workspace = ""; this.ui.printBanner(); } private void runCommandsUntilExit() { while (true) { - String input = ui.requestCommand(""); + String input = ui.requestCommand(workspace); + Command currentCommand = parser.parseCommand(input); + if (currentCommand == null) { + ui.printSection("Command not found"); + continue; + } + CommandResult result = currentCommand.execute(ui,null); + if (result.isOk() && result.isExit()) { + break; + } else if (result.isOk() && result.getAdditionalData() != null) { + this.parser = result.getAdditionalData(); + this.workspace = this.parser.getWorkspace(); + } else if( !result.isOk()) { + ui.printSection(result.getErrorMessage()); + } if (input.equalsIgnoreCase("bye")) { break; } - ui.printSection(input); } } diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java new file mode 100644 index 0000000000..f4f54e01ae --- /dev/null +++ b/src/main/java/terminus/command/Command.java @@ -0,0 +1,17 @@ +package terminus.command; + +import terminus.module.NusModule; +import terminus.parser.CommandParser; +import terminus.ui.Ui; + +public abstract class Command { + + public Command() { + + } + + public abstract String getFormat(); + public abstract StringBuilder getHelpMessage(); + public abstract void parseArguments(String arguments); + public abstract CommandResult execute(Ui ui, NusModule module); +} diff --git a/src/main/java/terminus/command/CommandResult.java b/src/main/java/terminus/command/CommandResult.java new file mode 100644 index 0000000000..48ed3aaf42 --- /dev/null +++ b/src/main/java/terminus/command/CommandResult.java @@ -0,0 +1,33 @@ +package terminus.command; + +import terminus.parser.CommandParser; + +public class CommandResult { + protected CommandParser additionalData; + protected boolean isOk; + protected boolean isExit; + protected String errorMessage; + + public CommandResult(boolean isOk, boolean isExit, CommandParser additionalData, String errorMessage) { + this.additionalData = additionalData; + this.isOk = isOk; + this.errorMessage = errorMessage; + this.isExit = isExit; + } + + public CommandParser getAdditionalData() { + return additionalData; + } + + public boolean isOk() { + return isOk; + } + + public boolean isExit() { + return isExit; + } + + public String getErrorMessage() { + return errorMessage; + } +} diff --git a/src/main/java/terminus/command/NotesCommand.java b/src/main/java/terminus/command/NotesCommand.java new file mode 100644 index 0000000000..7854c43856 --- /dev/null +++ b/src/main/java/terminus/command/NotesCommand.java @@ -0,0 +1,36 @@ +package terminus.command; + +import terminus.module.NusModule; +import terminus.parser.NoteCommandParser; +import terminus.ui.Ui; + +public class NotesCommand extends Command { + + private String arguments; + + @Override + public String getFormat() { + return null; + } + + @Override + public StringBuilder getHelpMessage() { + return null; + } + + @Override + public void parseArguments(String arguments) { + this.arguments = arguments; + } + + @Override + public CommandResult execute(Ui ui, NusModule module) { + NoteCommandParser notesMap = NoteCommandParser.getInstance(); + if (arguments != null && !arguments.strip().isEmpty()) { + return notesMap.parseCommand(arguments).execute(ui, module); + } else { + return new CommandResult(true,false,notesMap,null); + } + } + +} diff --git a/src/main/java/terminus/command/TestCommand.java b/src/main/java/terminus/command/TestCommand.java new file mode 100644 index 0000000000..b5fee1e516 --- /dev/null +++ b/src/main/java/terminus/command/TestCommand.java @@ -0,0 +1,28 @@ +package terminus.command; + +import terminus.module.NusModule; +import terminus.ui.Ui; + +public class TestCommand extends Command { + private String arguments; + @Override + public String getFormat() { + return null; + } + + @Override + public StringBuilder getHelpMessage() { + return null; + } + + @Override + public void parseArguments(String arguments) { + this.arguments = arguments; + } + + @Override + public CommandResult execute(Ui ui, NusModule module) { + System.out.println(arguments); + return new CommandResult(true,false,null,null); + } +} diff --git a/src/main/java/terminus/module/NusModule.java b/src/main/java/terminus/module/NusModule.java new file mode 100644 index 0000000000..41c5ff84fe --- /dev/null +++ b/src/main/java/terminus/module/NusModule.java @@ -0,0 +1,5 @@ +package terminus.module; + +public class NusModule { + +} diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java new file mode 100644 index 0000000000..34aea50890 --- /dev/null +++ b/src/main/java/terminus/parser/CommandParser.java @@ -0,0 +1,32 @@ +package terminus.parser; + +import java.util.HashMap; +import java.util.Locale; +import terminus.command.Command; + +public class CommandParser { + protected String workspace; + protected final HashMap commandMap; + public CommandParser (String workspace) { + commandMap = new HashMap(); + this.workspace = workspace; + } + public Command parseCommand(String command) { + String [] commandLine = command.strip().split(" ",2); + String cmdName = commandLine[0]; + String cmdData = null; + if (commandLine.length > 1) { + cmdData = commandLine[1]; + } + Command currentCommand = commandMap.get(cmdName.strip().toLowerCase(Locale.ROOT)); + if (currentCommand == null) { + return null; + } + currentCommand.parseArguments(cmdData); + return currentCommand; + } + + public String getWorkspace() { + return workspace; + } +} \ No newline at end of file diff --git a/src/main/java/terminus/parser/MainCommandParser.java b/src/main/java/terminus/parser/MainCommandParser.java new file mode 100644 index 0000000000..c7ae0643de --- /dev/null +++ b/src/main/java/terminus/parser/MainCommandParser.java @@ -0,0 +1,17 @@ +package terminus.parser; + +import terminus.command.NotesCommand; + +public class MainCommandParser extends CommandParser { + + public MainCommandParser() { + super(""); + } + + public static MainCommandParser getInstance () { + MainCommandParser parser = new MainCommandParser(); + parser.commandMap.put("notes",new NotesCommand()); +// parser.commandMap.put("schedules"); + return parser; + } +} diff --git a/src/main/java/terminus/parser/NoteCommandParser.java b/src/main/java/terminus/parser/NoteCommandParser.java new file mode 100644 index 0000000000..4ed9e4c5ff --- /dev/null +++ b/src/main/java/terminus/parser/NoteCommandParser.java @@ -0,0 +1,17 @@ +package terminus.parser; + +import terminus.command.TestCommand; + + +public class NoteCommandParser extends CommandParser{ + + public NoteCommandParser() { + super("notes"); + } + + public static NoteCommandParser getInstance() { + NoteCommandParser parser = new NoteCommandParser(); + parser.commandMap.put("test",new TestCommand()); + return parser; + } +} From d53e462d4e0bae5688657405fada636e6d2d2ff4 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Sat, 2 Oct 2021 14:55:33 +0800 Subject: [PATCH 015/466] Refactor code, add InvalidCommandException and exit --- src/main/java/terminus/Terminus.java | 39 +++++++++++-------- src/main/java/terminus/command/Command.java | 7 +++- .../java/terminus/command/ExitCommand.java | 28 +++++++++++++ .../java/terminus/command/NotesCommand.java | 7 ++-- .../java/terminus/command/TestCommand.java | 5 ++- .../exception/InvalidCommandException.java | 9 +++++ .../java/terminus/parser/CommandParser.java | 35 ++++++++++++----- .../terminus/parser/MainCommandParser.java | 5 +-- .../terminus/parser/NoteCommandParser.java | 4 +- src/main/java/terminus/ui/Ui.java | 19 +++++---- text-ui-test/EXPECTED.TXT | 17 +++++--- text-ui-test/input.txt | 7 +++- 12 files changed, 130 insertions(+), 52 deletions(-) create mode 100644 src/main/java/terminus/command/ExitCommand.java create mode 100644 src/main/java/terminus/exception/InvalidCommandException.java diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 7fd37490e9..60937be8f6 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -2,6 +2,7 @@ import terminus.command.Command; import terminus.command.CommandResult; +import terminus.exception.InvalidCommandException; import terminus.parser.CommandParser; import terminus.parser.MainCommandParser; import terminus.ui.Ui; @@ -11,6 +12,7 @@ public class Terminus { private Ui ui; private CommandParser parser; private String workspace; + /** * Main entry-point for the terminus.Terminus application. */ @@ -32,29 +34,32 @@ private void start() { this.parser = MainCommandParser.getInstance(); this.workspace = ""; this.ui.printBanner(); + this.ui.printParserBanner(this.parser); } private void runCommandsUntilExit() { while (true) { String input = ui.requestCommand(workspace); - Command currentCommand = parser.parseCommand(input); - if (currentCommand == null) { - ui.printSection("Command not found"); - continue; - } - CommandResult result = currentCommand.execute(ui,null); - if (result.isOk() && result.isExit()) { - break; - } else if (result.isOk() && result.getAdditionalData() != null) { - this.parser = result.getAdditionalData(); - this.workspace = this.parser.getWorkspace(); - } else if( !result.isOk()) { - ui.printSection(result.getErrorMessage()); - } - if (input.equalsIgnoreCase("bye")) { - break; + + Command currentCommand = null; + try { + currentCommand = parser.parseCommand(input); + + CommandResult result = currentCommand.execute(ui,null); + if (result.isOk() && result.isExit()) { + break; + } else if (result.isOk() && result.getAdditionalData() != null) { + this.parser = result.getAdditionalData(); + this.workspace = this.parser.getWorkspace(); + this.ui.printParserBanner(this.parser); + } else if (!result.isOk()) { + ui.printSection(result.getErrorMessage()); + } + + } catch (InvalidCommandException e) { + ui.printSection(e.getMessage()); } - ui.printSection(input); + } } diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java index f4f54e01ae..f362886b02 100644 --- a/src/main/java/terminus/command/Command.java +++ b/src/main/java/terminus/command/Command.java @@ -1,5 +1,6 @@ package terminus.command; +import terminus.exception.InvalidCommandException; import terminus.module.NusModule; import terminus.parser.CommandParser; import terminus.ui.Ui; @@ -11,7 +12,11 @@ public Command() { } public abstract String getFormat(); + public abstract StringBuilder getHelpMessage(); + public abstract void parseArguments(String arguments); - public abstract CommandResult execute(Ui ui, NusModule module); + + public abstract CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException; + } diff --git a/src/main/java/terminus/command/ExitCommand.java b/src/main/java/terminus/command/ExitCommand.java new file mode 100644 index 0000000000..6ea8fc97d4 --- /dev/null +++ b/src/main/java/terminus/command/ExitCommand.java @@ -0,0 +1,28 @@ +package terminus.command; + +import terminus.exception.InvalidCommandException; +import terminus.module.NusModule; +import terminus.ui.Ui; + +public class ExitCommand extends Command { + + @Override + public String getFormat() { + return "exit"; + } + + @Override + public StringBuilder getHelpMessage() { + return new StringBuilder("Exits the program."); + } + + @Override + public void parseArguments(String arguments) { + + } + + @Override + public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { + return new CommandResult(true, true, null, null); + } +} diff --git a/src/main/java/terminus/command/NotesCommand.java b/src/main/java/terminus/command/NotesCommand.java index 7854c43856..a5d7708e37 100644 --- a/src/main/java/terminus/command/NotesCommand.java +++ b/src/main/java/terminus/command/NotesCommand.java @@ -1,5 +1,6 @@ package terminus.command; +import terminus.exception.InvalidCommandException; import terminus.module.NusModule; import terminus.parser.NoteCommandParser; import terminus.ui.Ui; @@ -10,7 +11,7 @@ public class NotesCommand extends Command { @Override public String getFormat() { - return null; + return "notes"; } @Override @@ -24,12 +25,12 @@ public void parseArguments(String arguments) { } @Override - public CommandResult execute(Ui ui, NusModule module) { + public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { NoteCommandParser notesMap = NoteCommandParser.getInstance(); if (arguments != null && !arguments.strip().isEmpty()) { return notesMap.parseCommand(arguments).execute(ui, module); } else { - return new CommandResult(true,false,notesMap,null); + return new CommandResult(true,false, notesMap,null); } } diff --git a/src/main/java/terminus/command/TestCommand.java b/src/main/java/terminus/command/TestCommand.java index b5fee1e516..1be132b782 100644 --- a/src/main/java/terminus/command/TestCommand.java +++ b/src/main/java/terminus/command/TestCommand.java @@ -5,9 +5,10 @@ public class TestCommand extends Command { private String arguments; + @Override public String getFormat() { - return null; + return "test"; } @Override @@ -22,7 +23,7 @@ public void parseArguments(String arguments) { @Override public CommandResult execute(Ui ui, NusModule module) { - System.out.println(arguments); + ui.printSection(arguments); return new CommandResult(true,false,null,null); } } diff --git a/src/main/java/terminus/exception/InvalidCommandException.java b/src/main/java/terminus/exception/InvalidCommandException.java new file mode 100644 index 0000000000..95dd81612b --- /dev/null +++ b/src/main/java/terminus/exception/InvalidCommandException.java @@ -0,0 +1,9 @@ +package terminus.exception; + +public class InvalidCommandException extends Exception { + + public InvalidCommandException(String message) { + super(message); + } + +} diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java index 34aea50890..81d3519267 100644 --- a/src/main/java/terminus/parser/CommandParser.java +++ b/src/main/java/terminus/parser/CommandParser.java @@ -2,29 +2,46 @@ import java.util.HashMap; import java.util.Locale; +import java.util.Set; +import terminus.command.ExitCommand; import terminus.command.Command; +import terminus.exception.InvalidCommandException; public class CommandParser { + + private static final String SPACE_DELIMITER = "\\s+"; protected String workspace; - protected final HashMap commandMap; - public CommandParser (String workspace) { - commandMap = new HashMap(); + protected final HashMap commandMap; + + public CommandParser(String workspace) { + this.commandMap = new HashMap<>(); this.workspace = workspace; + addCommand("exit", new ExitCommand()); } - public Command parseCommand(String command) { - String [] commandLine = command.strip().split(" ",2); + + public Command parseCommand(String command) throws InvalidCommandException { + String[] commandLine = command.strip().split(SPACE_DELIMITER,2); String cmdName = commandLine[0]; + Command currentCommand = commandMap.get(cmdName.strip().toLowerCase(Locale.ROOT)); + if (currentCommand == null) { + throw new InvalidCommandException("Command not found! Type 'help' for a list of commands."); + } + String cmdData = null; if (commandLine.length > 1) { cmdData = commandLine[1]; } - Command currentCommand = commandMap.get(cmdName.strip().toLowerCase(Locale.ROOT)); - if (currentCommand == null) { - return null; - } currentCommand.parseArguments(cmdData); return currentCommand; } + + public Set getCommandList() { + return commandMap.keySet(); + } + + protected void addCommand(String cmdName, Command command) { + commandMap.put(cmdName, command); + } public String getWorkspace() { return workspace; diff --git a/src/main/java/terminus/parser/MainCommandParser.java b/src/main/java/terminus/parser/MainCommandParser.java index c7ae0643de..81826e3deb 100644 --- a/src/main/java/terminus/parser/MainCommandParser.java +++ b/src/main/java/terminus/parser/MainCommandParser.java @@ -8,10 +8,9 @@ public MainCommandParser() { super(""); } - public static MainCommandParser getInstance () { + public static MainCommandParser getInstance() { MainCommandParser parser = new MainCommandParser(); - parser.commandMap.put("notes",new NotesCommand()); -// parser.commandMap.put("schedules"); + parser.addCommand("notes", new NotesCommand()); return parser; } } diff --git a/src/main/java/terminus/parser/NoteCommandParser.java b/src/main/java/terminus/parser/NoteCommandParser.java index 4ed9e4c5ff..0582d44aa1 100644 --- a/src/main/java/terminus/parser/NoteCommandParser.java +++ b/src/main/java/terminus/parser/NoteCommandParser.java @@ -3,7 +3,7 @@ import terminus.command.TestCommand; -public class NoteCommandParser extends CommandParser{ +public class NoteCommandParser extends CommandParser { public NoteCommandParser() { super("notes"); @@ -11,7 +11,7 @@ public NoteCommandParser() { public static NoteCommandParser getInstance() { NoteCommandParser parser = new NoteCommandParser(); - parser.commandMap.put("test",new TestCommand()); + parser.addCommand("test", new TestCommand()); return parser; } } diff --git a/src/main/java/terminus/ui/Ui.java b/src/main/java/terminus/ui/Ui.java index e790a745f7..ea57d0aeb1 100644 --- a/src/main/java/terminus/ui/Ui.java +++ b/src/main/java/terminus/ui/Ui.java @@ -2,16 +2,11 @@ import java.util.Arrays; import java.util.Scanner; +import terminus.parser.CommandParser; public class Ui { - private static final String BANNER = "Welcome to TermiNUS!\n" - + "\n" - + "Type any of the following to get started:\n" - + "> notes\n" - + "> schedules\n" - + "> help\n" - + "> exit\n"; + private static final String BANNER = "Welcome to TermiNUS!"; private static final String PROMPT = "[%s] >>> "; private final Scanner scanner; @@ -27,6 +22,14 @@ public void printBanner() { System.out.println(BANNER); } + /** + * Prints the banner for a workspace, which includes all the commands in the parser. + */ + public void printParserBanner(CommandParser parser) { + printSection(parser.getCommandList().stream().reduce("\nType any of the following to get started:\n", + (x, y) -> String.format("%s> %s\n", x, y))); + } + /** * Prints a prompt and requests a command from the user. * @@ -38,7 +41,7 @@ public String requestCommand(String workspaceName) { if (validatedWorkspaceName == null) { validatedWorkspaceName = ""; } - System.out.printf((PROMPT) + "%n", validatedWorkspaceName); + System.out.printf(PROMPT, validatedWorkspaceName); return scanner.nextLine(); } diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index aa370a0fb1..017da393a4 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -1,12 +1,17 @@ Welcome to TermiNUS! Type any of the following to get started: -> notes -> schedules -> help > exit +> notes +[] >>> Command not found! Type 'help' for a list of commands. +[] >>> c f a +[] >>> Command not found! Type 'help' for a list of commands. [] >>> -notes -[] >>> -Goodbye! +Type any of the following to get started: +> exit +> test + +[notes] >>> Command not found! Type 'help' for a list of commands. +[notes] >>> c f a +[notes] >>> Goodbye! diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index 46f4d22988..97a8756cc7 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -1,2 +1,7 @@ +invalid +notes test c f a +notes invalid notes -bye \ No newline at end of file +invalid +test c f a +exit \ No newline at end of file From f0974d5ee9f202dc54d9d402e7d5f57777477adf Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Sat, 2 Oct 2021 15:46:20 +0800 Subject: [PATCH 016/466] Update command parser and refactor code --- src/main/java/terminus/Terminus.java | 8 ++--- .../java/terminus/command/BackCommand.java | 30 +++++++++++++++++++ src/main/java/terminus/command/Command.java | 10 +++---- .../java/terminus/command/CommandResult.java | 19 +++++++++++- .../java/terminus/command/ExitCommand.java | 6 ++-- .../java/terminus/command/NotesCommand.java | 30 +++++-------------- .../java/terminus/command/TestCommand.java | 4 +-- .../terminus/command/WorkspaceCommand.java | 30 +++++++++++++++++++ .../exception/InvalidArgumentException.java | 8 +++++ .../terminus/parser/MainCommandParser.java | 4 ++- .../terminus/parser/NoteCommandParser.java | 2 ++ src/main/java/terminus/ui/Ui.java | 2 +- text-ui-test/EXPECTED.TXT | 8 ++++- text-ui-test/input.txt | 1 + 14 files changed, 121 insertions(+), 41 deletions(-) create mode 100644 src/main/java/terminus/command/BackCommand.java create mode 100644 src/main/java/terminus/command/WorkspaceCommand.java create mode 100644 src/main/java/terminus/exception/InvalidArgumentException.java diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 60937be8f6..f3484741ac 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -44,18 +44,16 @@ private void runCommandsUntilExit() { Command currentCommand = null; try { currentCommand = parser.parseCommand(input); - CommandResult result = currentCommand.execute(ui,null); if (result.isOk() && result.isExit()) { break; } else if (result.isOk() && result.getAdditionalData() != null) { - this.parser = result.getAdditionalData(); - this.workspace = this.parser.getWorkspace(); - this.ui.printParserBanner(this.parser); + parser = result.getAdditionalData(); + workspace = parser.getWorkspace(); + ui.printParserBanner(parser); } else if (!result.isOk()) { ui.printSection(result.getErrorMessage()); } - } catch (InvalidCommandException e) { ui.printSection(e.getMessage()); } diff --git a/src/main/java/terminus/command/BackCommand.java b/src/main/java/terminus/command/BackCommand.java new file mode 100644 index 0000000000..5944d2f5c4 --- /dev/null +++ b/src/main/java/terminus/command/BackCommand.java @@ -0,0 +1,30 @@ +package terminus.command; + +import terminus.exception.InvalidCommandException; +import terminus.module.NusModule; +import terminus.parser.MainCommandParser; +import terminus.ui.Ui; + +public class BackCommand extends Command { + + @Override + public String getFormat() { + return "back"; + } + + @Override + public String getHelpMessage() { + return "Returns to the parent workspace."; + } + + @Override + public void parseArguments(String arguments) { + + } + + @Override + public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { + MainCommandParser mainParser = MainCommandParser.getInstance(); + return new CommandResult(true, mainParser); + } +} diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java index f362886b02..7575f9e0d0 100644 --- a/src/main/java/terminus/command/Command.java +++ b/src/main/java/terminus/command/Command.java @@ -12,11 +12,11 @@ public Command() { } public abstract String getFormat(); - - public abstract StringBuilder getHelpMessage(); - + + public abstract String getHelpMessage(); + public abstract void parseArguments(String arguments); - + public abstract CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException; - + } diff --git a/src/main/java/terminus/command/CommandResult.java b/src/main/java/terminus/command/CommandResult.java index 48ed3aaf42..5f8a06082c 100644 --- a/src/main/java/terminus/command/CommandResult.java +++ b/src/main/java/terminus/command/CommandResult.java @@ -2,7 +2,8 @@ import terminus.parser.CommandParser; -public class CommandResult { +public class CommandResult { + protected CommandParser additionalData; protected boolean isOk; protected boolean isExit; @@ -15,6 +16,22 @@ public CommandResult(boolean isOk, boolean isExit, CommandParser additionalData, this.isExit = isExit; } + public CommandResult(boolean isOk, boolean isExit) { + this(isOk, isExit, null, null); + } + + public CommandResult(boolean isOk, CommandParser additionalData) { + this(isOk, false, additionalData, null); + } + + public CommandResult(boolean isOk, String errorMessage) { + this(isOk, false, null, errorMessage); + } + + public CommandResult(boolean isOk) { + this(isOk, false, null, null); + } + public CommandParser getAdditionalData() { return additionalData; } diff --git a/src/main/java/terminus/command/ExitCommand.java b/src/main/java/terminus/command/ExitCommand.java index 6ea8fc97d4..a7dc2a88cb 100644 --- a/src/main/java/terminus/command/ExitCommand.java +++ b/src/main/java/terminus/command/ExitCommand.java @@ -12,8 +12,8 @@ public String getFormat() { } @Override - public StringBuilder getHelpMessage() { - return new StringBuilder("Exits the program."); + public String getHelpMessage() { + return "Exits the program."; } @Override @@ -23,6 +23,6 @@ public void parseArguments(String arguments) { @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { - return new CommandResult(true, true, null, null); + return new CommandResult(true, true); } } diff --git a/src/main/java/terminus/command/NotesCommand.java b/src/main/java/terminus/command/NotesCommand.java index a5d7708e37..c75535dd68 100644 --- a/src/main/java/terminus/command/NotesCommand.java +++ b/src/main/java/terminus/command/NotesCommand.java @@ -1,37 +1,23 @@ package terminus.command; -import terminus.exception.InvalidCommandException; -import terminus.module.NusModule; + import terminus.parser.NoteCommandParser; -import terminus.ui.Ui; -public class NotesCommand extends Command { +public class NotesCommand extends WorkspaceCommand { private String arguments; - @Override - public String getFormat() { - return "notes"; - } - - @Override - public StringBuilder getHelpMessage() { - return null; + public NotesCommand() { + super(NoteCommandParser.getInstance()); } @Override - public void parseArguments(String arguments) { - this.arguments = arguments; + public String getFormat() { + return "notes"; } @Override - public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { - NoteCommandParser notesMap = NoteCommandParser.getInstance(); - if (arguments != null && !arguments.strip().isEmpty()) { - return notesMap.parseCommand(arguments).execute(ui, module); - } else { - return new CommandResult(true,false, notesMap,null); - } + public String getHelpMessage() { + return "Move to notes workspace"; } - } diff --git a/src/main/java/terminus/command/TestCommand.java b/src/main/java/terminus/command/TestCommand.java index 1be132b782..1b15c770a0 100644 --- a/src/main/java/terminus/command/TestCommand.java +++ b/src/main/java/terminus/command/TestCommand.java @@ -12,7 +12,7 @@ public String getFormat() { } @Override - public StringBuilder getHelpMessage() { + public String getHelpMessage() { return null; } @@ -24,6 +24,6 @@ public void parseArguments(String arguments) { @Override public CommandResult execute(Ui ui, NusModule module) { ui.printSection(arguments); - return new CommandResult(true,false,null,null); + return new CommandResult(true,false); } } diff --git a/src/main/java/terminus/command/WorkspaceCommand.java b/src/main/java/terminus/command/WorkspaceCommand.java new file mode 100644 index 0000000000..216db692ad --- /dev/null +++ b/src/main/java/terminus/command/WorkspaceCommand.java @@ -0,0 +1,30 @@ +package terminus.command; + +import terminus.exception.InvalidCommandException; +import terminus.module.NusModule; +import terminus.parser.CommandParser; +import terminus.ui.Ui; + +public abstract class WorkspaceCommand extends Command { + + protected String arguments; + protected CommandParser commandMap; + + public WorkspaceCommand(CommandParser commandMap) { + this.commandMap = commandMap; + } + + @Override + public void parseArguments(String arguments) { + this.arguments = arguments; + } + + @Override + public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { + if (arguments != null && !arguments.isBlank()) { + return commandMap.parseCommand(arguments).execute(ui, module); + } else { + return new CommandResult(true, commandMap); + } + } +} diff --git a/src/main/java/terminus/exception/InvalidArgumentException.java b/src/main/java/terminus/exception/InvalidArgumentException.java new file mode 100644 index 0000000000..8b0d3c30b1 --- /dev/null +++ b/src/main/java/terminus/exception/InvalidArgumentException.java @@ -0,0 +1,8 @@ +package terminus.exception; + +public class InvalidArgumentException extends Exception { + + public InvalidArgumentException(String message) { + super(message); + } +} diff --git a/src/main/java/terminus/parser/MainCommandParser.java b/src/main/java/terminus/parser/MainCommandParser.java index 81826e3deb..795f41e144 100644 --- a/src/main/java/terminus/parser/MainCommandParser.java +++ b/src/main/java/terminus/parser/MainCommandParser.java @@ -4,12 +4,14 @@ public class MainCommandParser extends CommandParser { + private static final MainCommandParser PARSER = new MainCommandParser(); + public MainCommandParser() { super(""); } public static MainCommandParser getInstance() { - MainCommandParser parser = new MainCommandParser(); + MainCommandParser parser = PARSER; parser.addCommand("notes", new NotesCommand()); return parser; } diff --git a/src/main/java/terminus/parser/NoteCommandParser.java b/src/main/java/terminus/parser/NoteCommandParser.java index 0582d44aa1..683fbd62cc 100644 --- a/src/main/java/terminus/parser/NoteCommandParser.java +++ b/src/main/java/terminus/parser/NoteCommandParser.java @@ -1,5 +1,6 @@ package terminus.parser; +import terminus.command.BackCommand; import terminus.command.TestCommand; @@ -12,6 +13,7 @@ public NoteCommandParser() { public static NoteCommandParser getInstance() { NoteCommandParser parser = new NoteCommandParser(); parser.addCommand("test", new TestCommand()); + parser.addCommand("back", new BackCommand()); return parser; } } diff --git a/src/main/java/terminus/ui/Ui.java b/src/main/java/terminus/ui/Ui.java index ea57d0aeb1..9a51e28b99 100644 --- a/src/main/java/terminus/ui/Ui.java +++ b/src/main/java/terminus/ui/Ui.java @@ -27,7 +27,7 @@ public void printBanner() { */ public void printParserBanner(CommandParser parser) { printSection(parser.getCommandList().stream().reduce("\nType any of the following to get started:\n", - (x, y) -> String.format("%s> %s\n", x, y))); + (x, y) -> String.format("%s> %s\n", x, y))); } /** diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 017da393a4..551f3f4301 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -11,7 +11,13 @@ Type any of the following to get started: Type any of the following to get started: > exit > test +> back [notes] >>> Command not found! Type 'help' for a list of commands. [notes] >>> c f a -[notes] >>> Goodbye! +[notes] >>> +Type any of the following to get started: +> exit +> notes + +[] >>> Goodbye! diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index 97a8756cc7..e6e35577b7 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -4,4 +4,5 @@ notes invalid notes invalid test c f a +back exit \ No newline at end of file From f3082e7595b891e7975ee650ece046587fe193e7 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Sat, 2 Oct 2021 15:49:30 +0800 Subject: [PATCH 017/466] Fix ui-testing --- text-ui-test/EXPECTED.TXT | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 551f3f4301..2bbdf60cde 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -15,7 +15,7 @@ Type any of the following to get started: [notes] >>> Command not found! Type 'help' for a list of commands. [notes] >>> c f a -[notes] >>> +[notes] >>> Type any of the following to get started: > exit > notes From 59a1bbdc08340dd9de4798bc49621dd40ef0dd75 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Sat, 2 Oct 2021 17:25:55 +0800 Subject: [PATCH 018/466] Add Help Command --- .../java/terminus/command/HelpCommand.java | 36 +++++++++++++++++++ .../java/terminus/command/NotesCommand.java | 2 +- .../java/terminus/command/TestCommand.java | 2 +- .../java/terminus/parser/CommandParser.java | 31 ++++++++++++---- src/main/java/terminus/ui/Ui.java | 15 ++++---- text-ui-test/EXPECTED.TXT | 24 +++++++++++++ text-ui-test/input.txt | 2 ++ 7 files changed, 98 insertions(+), 14 deletions(-) create mode 100644 src/main/java/terminus/command/HelpCommand.java diff --git a/src/main/java/terminus/command/HelpCommand.java b/src/main/java/terminus/command/HelpCommand.java new file mode 100644 index 0000000000..4aec3946da --- /dev/null +++ b/src/main/java/terminus/command/HelpCommand.java @@ -0,0 +1,36 @@ +package terminus.command; + +import terminus.exception.InvalidCommandException; +import terminus.module.NusModule; +import terminus.parser.CommandParser; +import terminus.ui.Ui; + +public class HelpCommand extends Command { + + private CommandParser commandMap; + + public HelpCommand(CommandParser commandMap) { + this.commandMap = commandMap; + } + + @Override + public String getFormat() { + return "help"; + } + + @Override + public String getHelpMessage() { + return "Prints the help page."; + } + + @Override + public void parseArguments(String arguments) { + + } + + @Override + public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { + ui.printSection(commandMap.getHelpMenu()); + return new CommandResult(true); + } +} diff --git a/src/main/java/terminus/command/NotesCommand.java b/src/main/java/terminus/command/NotesCommand.java index c75535dd68..0ef57391a2 100644 --- a/src/main/java/terminus/command/NotesCommand.java +++ b/src/main/java/terminus/command/NotesCommand.java @@ -18,6 +18,6 @@ public String getFormat() { @Override public String getHelpMessage() { - return "Move to notes workspace"; + return "Move to notes workspace."; } } diff --git a/src/main/java/terminus/command/TestCommand.java b/src/main/java/terminus/command/TestCommand.java index 1b15c770a0..aec82f4b3b 100644 --- a/src/main/java/terminus/command/TestCommand.java +++ b/src/main/java/terminus/command/TestCommand.java @@ -13,7 +13,7 @@ public String getFormat() { @Override public String getHelpMessage() { - return null; + return "This is testing command."; } @Override diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java index 81d3519267..78a05d9781 100644 --- a/src/main/java/terminus/parser/CommandParser.java +++ b/src/main/java/terminus/parser/CommandParser.java @@ -1,10 +1,13 @@ package terminus.parser; import java.util.HashMap; +import java.util.List; import java.util.Locale; import java.util.Set; +import java.util.stream.Collectors; import terminus.command.ExitCommand; import terminus.command.Command; +import terminus.command.HelpCommand; import terminus.exception.InvalidCommandException; public class CommandParser { @@ -12,21 +15,22 @@ public class CommandParser { private static final String SPACE_DELIMITER = "\\s+"; protected String workspace; protected final HashMap commandMap; - + public CommandParser(String workspace) { this.commandMap = new HashMap<>(); this.workspace = workspace; addCommand("exit", new ExitCommand()); + addCommand("help", new HelpCommand(this)); } - + public Command parseCommand(String command) throws InvalidCommandException { - String[] commandLine = command.strip().split(SPACE_DELIMITER,2); + String[] commandLine = command.strip().split(SPACE_DELIMITER, 2); String cmdName = commandLine[0]; Command currentCommand = commandMap.get(cmdName.strip().toLowerCase(Locale.ROOT)); if (currentCommand == null) { throw new InvalidCommandException("Command not found! Type 'help' for a list of commands."); } - + String cmdData = null; if (commandLine.length > 1) { cmdData = commandLine[1]; @@ -34,11 +38,26 @@ public Command parseCommand(String command) throws InvalidCommandException { currentCommand.parseArguments(cmdData); return currentCommand; } - + public Set getCommandList() { return commandMap.keySet(); } - + + /** + * Get the help menu for the current workspace. + * + * @return Array of strings contain the help messages + */ + public String[] getHelpMenu() { + return commandMap.entrySet() + .stream() + .map((i) -> String.format("%s : %s\nFormat: %s\n", + i.getKey(), + i.getValue().getHelpMessage(), + i.getValue().getFormat())) + .toArray(String[]::new); + } + protected void addCommand(String cmdName, Command command) { commandMap.put(cmdName, command); } diff --git a/src/main/java/terminus/ui/Ui.java b/src/main/java/terminus/ui/Ui.java index 9a51e28b99..fe4293ec3b 100644 --- a/src/main/java/terminus/ui/Ui.java +++ b/src/main/java/terminus/ui/Ui.java @@ -5,7 +5,7 @@ import terminus.parser.CommandParser; public class Ui { - + private static final String BANNER = "Welcome to TermiNUS!"; private static final String PROMPT = "[%s] >>> "; @@ -26,13 +26,16 @@ public void printBanner() { * Prints the banner for a workspace, which includes all the commands in the parser. */ public void printParserBanner(CommandParser parser) { - printSection(parser.getCommandList().stream().reduce("\nType any of the following to get started:\n", - (x, y) -> String.format("%s> %s\n", x, y))); + printSection(parser.getCommandList() + .stream() + .reduce("\nType any of the following to get started:\n", + (x, y) -> String.format("%s> %s\n", x, y)) + ); } /** * Prints a prompt and requests a command from the user. - * + * * @param workspaceName The string to place within the brackets. * @return The command the user inputted. */ @@ -47,7 +50,7 @@ public String requestCommand(String workspaceName) { /** * Prints multiple strings at once, separated by a new line. - * + * * @param strings The strings to print. */ public void printSection(String... strings) { @@ -60,5 +63,5 @@ public void printSection(String... strings) { public void printExitMessage() { System.out.println("Goodbye!"); } - + } diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 2bbdf60cde..9ebf7b5045 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -2,6 +2,7 @@ Welcome to TermiNUS! Type any of the following to get started: > exit +> help > notes [] >>> Command not found! Type 'help' for a list of commands. @@ -10,14 +11,37 @@ Type any of the following to get started: [] >>> Type any of the following to get started: > exit +> help > test > back +[notes] >>> exit : Exits the program. +Format: exit + +help : Prints the help page. +Format: help + +test : This is testing command. +Format: test + +back : Returns to the parent workspace. +Format: back + [notes] >>> Command not found! Type 'help' for a list of commands. [notes] >>> c f a [notes] >>> Type any of the following to get started: > exit +> help > notes +[] >>> exit : Exits the program. +Format: exit + +help : Prints the help page. +Format: help + +notes : Move to notes workspace. +Format: notes + [] >>> Goodbye! diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index e6e35577b7..887158052b 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -2,7 +2,9 @@ invalid notes test c f a notes invalid notes +help invalid test c f a back +help exit \ No newline at end of file From 8d268104f31fcf141396cf9e46fde48ae209de0c Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Sun, 3 Oct 2021 22:17:22 +0800 Subject: [PATCH 019/466] Add notes add,delete and view functionality --- src/main/java/terminus/Terminus.java | 11 ++- src/main/java/terminus/command/Command.java | 5 +- .../java/terminus/command/DeleteCommand.java | 51 +++++++++++ .../java/terminus/command/ViewCommand.java | 60 +++++++++++++ .../terminus/command/WorkspaceCommand.java | 3 +- .../terminus/command/note/AddCommand.java | 89 +++++++++++++++++++ .../java/terminus/common/CommonFormat.java | 13 +++ src/main/java/terminus/common/Messages.java | 9 ++ src/main/java/terminus/content/Content.java | 36 ++++++++ .../java/terminus/content/ContentManager.java | 61 +++++++++++++ src/main/java/terminus/content/Note.java | 10 +++ src/main/java/terminus/module/NusModule.java | 35 ++++++++ .../java/terminus/parser/CommandParser.java | 3 +- .../terminus/parser/NoteCommandParser.java | 14 ++- 14 files changed, 390 insertions(+), 10 deletions(-) create mode 100644 src/main/java/terminus/command/DeleteCommand.java create mode 100644 src/main/java/terminus/command/ViewCommand.java create mode 100644 src/main/java/terminus/command/note/AddCommand.java create mode 100644 src/main/java/terminus/common/CommonFormat.java create mode 100644 src/main/java/terminus/common/Messages.java create mode 100644 src/main/java/terminus/content/Content.java create mode 100644 src/main/java/terminus/content/ContentManager.java create mode 100644 src/main/java/terminus/content/Note.java diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index f3484741ac..bf03aacba4 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -2,7 +2,9 @@ import terminus.command.Command; import terminus.command.CommandResult; +import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.module.NusModule; import terminus.parser.CommandParser; import terminus.parser.MainCommandParser; import terminus.ui.Ui; @@ -12,6 +14,8 @@ public class Terminus { private Ui ui; private CommandParser parser; private String workspace; + + private NusModule nusModule; /** * Main entry-point for the terminus.Terminus application. @@ -35,6 +39,7 @@ private void start() { this.workspace = ""; this.ui.printBanner(); this.ui.printParserBanner(this.parser); + this.nusModule = new NusModule(); } private void runCommandsUntilExit() { @@ -44,7 +49,7 @@ private void runCommandsUntilExit() { Command currentCommand = null; try { currentCommand = parser.parseCommand(input); - CommandResult result = currentCommand.execute(ui,null); + CommandResult result = currentCommand.execute(ui,nusModule); if (result.isOk() && result.isExit()) { break; } else if (result.isOk() && result.getAdditionalData() != null) { @@ -56,8 +61,10 @@ private void runCommandsUntilExit() { } } catch (InvalidCommandException e) { ui.printSection(e.getMessage()); + } catch (InvalidArgumentException e) { + ui.printSection(e.getMessage()); } - + } } diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java index 7575f9e0d0..c0345de31c 100644 --- a/src/main/java/terminus/command/Command.java +++ b/src/main/java/terminus/command/Command.java @@ -1,5 +1,6 @@ package terminus.command; +import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.NusModule; import terminus.parser.CommandParser; @@ -15,8 +16,8 @@ public Command() { public abstract String getHelpMessage(); - public abstract void parseArguments(String arguments); + public abstract void parseArguments(String arguments) throws InvalidArgumentException; - public abstract CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException; + public abstract CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException, InvalidArgumentException; } diff --git a/src/main/java/terminus/command/DeleteCommand.java b/src/main/java/terminus/command/DeleteCommand.java new file mode 100644 index 0000000000..d2ad0002cd --- /dev/null +++ b/src/main/java/terminus/command/DeleteCommand.java @@ -0,0 +1,51 @@ +package terminus.command; + +import terminus.common.CommonFormat; +import terminus.common.Messages; +import terminus.content.ContentManager; +import terminus.exception.InvalidArgumentException; +import terminus.module.NusModule; +import terminus.ui.Ui; + +public class DeleteCommand extends Command { + + private T type; + + private int itemNumber; + + public DeleteCommand(T type) { + this.type = type; + } + + @Override + public String getFormat() { + return CommonFormat.COMMAND_DELETE_FORMAT; + } + + @Override + public String getHelpMessage() { + return Messages.MESSAGE_COMMAND_DELETE; + } + + @Override + public void parseArguments(String arguments) throws InvalidArgumentException { + if (arguments == null || arguments.isBlank()) { + throw new InvalidArgumentException("Error: Missing content number."); + } + try { + itemNumber = Integer.parseInt(arguments); + } catch (NumberFormatException e) { + throw new InvalidArgumentException("Error: Invalid numerical value."); + } + } + + @Override + public CommandResult execute(Ui ui, NusModule module) throws InvalidArgumentException { + ContentManager contentManager = module.getContentManager(); + contentManager.setContent(module.get(type)); + String deletedContentName = contentManager.deleteContent(itemNumber); + module.setNotes(contentManager.getContents()); + ui.printSection(String.format(Messages.MESSAGE_RESPONSE_DELETE, type, deletedContentName)); + return new CommandResult(true, false); + } +} diff --git a/src/main/java/terminus/command/ViewCommand.java b/src/main/java/terminus/command/ViewCommand.java new file mode 100644 index 0000000000..af722f4ea8 --- /dev/null +++ b/src/main/java/terminus/command/ViewCommand.java @@ -0,0 +1,60 @@ +package terminus.command; + +import terminus.common.CommonFormat; +import terminus.common.Messages; +import terminus.content.ContentManager; +import terminus.exception.InvalidArgumentException; +import terminus.module.NusModule; +import terminus.ui.Ui; + +public class ViewCommand extends Command{ + + private T type; + + private int itemNumber; + private boolean displayAll; + + public ViewCommand(T type) { + this.type = type; + this.displayAll = false; + } + + @Override + public String getFormat() { + return CommonFormat.COMMAND_VIEW_FORMAT; + } + + @Override + public String getHelpMessage() { + return Messages.MESSAGE_COMMAND_VIEW; + } + + @Override + public void parseArguments(String arguments) throws InvalidArgumentException { + if(arguments == null || arguments.isBlank()){ + displayAll = true; + return; + } + try{ + itemNumber = Integer.parseInt(arguments); + displayAll = false; + }catch(NumberFormatException e){ + throw new InvalidArgumentException("Error: Invalid numerical value."); + } + } + + @Override + public CommandResult execute(Ui ui, NusModule module) throws InvalidArgumentException { + ContentManager contentManager = module.getContentManager(); + contentManager.setContent(module.get(type)); + String result = ""; + if(displayAll){ + result = contentManager.listAllContents(); + }else{ + result = contentManager.getContentData(itemNumber); + } + ui.printSection(result); + return new CommandResult(true,false); + } + +} diff --git a/src/main/java/terminus/command/WorkspaceCommand.java b/src/main/java/terminus/command/WorkspaceCommand.java index 216db692ad..835cf30a23 100644 --- a/src/main/java/terminus/command/WorkspaceCommand.java +++ b/src/main/java/terminus/command/WorkspaceCommand.java @@ -1,5 +1,6 @@ package terminus.command; +import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.NusModule; import terminus.parser.CommandParser; @@ -20,7 +21,7 @@ public void parseArguments(String arguments) { } @Override - public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { + public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException, InvalidArgumentException { if (arguments != null && !arguments.isBlank()) { return commandMap.parseCommand(arguments).execute(ui, module); } else { diff --git a/src/main/java/terminus/command/note/AddCommand.java b/src/main/java/terminus/command/note/AddCommand.java new file mode 100644 index 0000000000..1b6979427c --- /dev/null +++ b/src/main/java/terminus/command/note/AddCommand.java @@ -0,0 +1,89 @@ +package terminus.command.note; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.common.CommonFormat; +import terminus.common.Messages; +import terminus.content.ContentManager; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.NusModule; +import terminus.ui.Ui; + +public class AddCommand extends Command { + + private String name; + private String data; + + private int totalArg; + + public AddCommand() { + this.totalArg = 2; + } + + @Override + public String getFormat() { + return CommonFormat.COMMAND_ADD + " \"{item name}\" \"{item content}\""; + } + + @Override + public String getHelpMessage() { + return Messages.MESSAGE_COMMAND_ADD; + } + + @Override + public void parseArguments(String arguments) throws InvalidArgumentException { + // Perform required checks with regex + if(arguments == null || arguments.isBlank()){ + throw new InvalidArgumentException("Error: Missing arguments."); + } + ArrayList argArray = findArguments(arguments); + if(!isValidArguments(argArray)){ + throw new InvalidArgumentException("Error: Missing arguments."); + } + this.name = argArray.get(0); + this.data = argArray.get(1); + } + + @Override + public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { + ContentManager contentManager = module.getContentManager(); + contentManager.setContent(module.getNotes()); + contentManager.addNote(name, data); + module.setNotes(contentManager.getContents()); + return new CommandResult(true,false); + } + + private ArrayList findArguments(String arg){ + ArrayList argsArray = new ArrayList<>(); + Pattern p = Pattern.compile("\"(.*?)\""); + Matcher m = p.matcher(arg); + while(m.find()){ + argsArray.add(m.group(1)); + } + return argsArray; + } + + private boolean isValidArguments(ArrayList argArray){ + boolean isValid = true; + if(argArray.size() != totalArg){ + isValid = false; + }else if(isArrayEmpty(argArray)){ + isValid = false; + } + return isValid; + } + + private boolean isArrayEmpty(ArrayList argArray){ + for(String s:argArray){ + if(s.isBlank()){ + return true; + } + } + return false; + } +} diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java new file mode 100644 index 0000000000..cc7cfb4305 --- /dev/null +++ b/src/main/java/terminus/common/CommonFormat.java @@ -0,0 +1,13 @@ +package terminus.common; + +public class CommonFormat { + final public static String COMMAND_NOTE = "note"; + final public static String COMMAND_ADD = "add"; + final public static String COMMAND_DELETE = "delete"; + final public static String COMMAND_VIEW = "view"; + final public static String COMMAND_BACK = "back"; + final public static String COMMAND_EXIT = "exit"; + + final public static String COMMAND_DELETE_FORMAT = COMMAND_DELETE + " {item number}"; + final public static String COMMAND_VIEW_FORMAT = COMMAND_VIEW + " {[optional]item number}"; +} diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java new file mode 100644 index 0000000000..515ee085d1 --- /dev/null +++ b/src/main/java/terminus/common/Messages.java @@ -0,0 +1,9 @@ +package terminus.common; + +public class Messages { + final public static String MESSAGE_COMMAND_ADD = "add an item into your list."; + final public static String MESSAGE_COMMAND_DELETE = "delete an item from your list."; + final public static String MESSAGE_COMMAND_VIEW = "view all items or view an individual items"; + + final public static String MESSAGE_RESPONSE_DELETE = "%s \'%s\' has been deleted!"; +} diff --git a/src/main/java/terminus/content/Content.java b/src/main/java/terminus/content/Content.java new file mode 100644 index 0000000000..0c53b65bf3 --- /dev/null +++ b/src/main/java/terminus/content/Content.java @@ -0,0 +1,36 @@ +package terminus.content; + +public class Content { + + private String name; + private String data; + final public static String TYPE = ""; + + final private String DISPLAY_MESSAGE = "Name: %s\nContent: %s\n"; + + public Content(String name, String data) { + this.name = name; + this.data = data; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDisplayInfo() { + return String.format(DISPLAY_MESSAGE, name, data); + } + +} diff --git a/src/main/java/terminus/content/ContentManager.java b/src/main/java/terminus/content/ContentManager.java new file mode 100644 index 0000000000..7c05fdf0d7 --- /dev/null +++ b/src/main/java/terminus/content/ContentManager.java @@ -0,0 +1,61 @@ +package terminus.content; + +import java.util.ArrayList; +import terminus.exception.InvalidArgumentException; + +public class ContentManager { + + final private static String DATA_SEPARATOR = ""; + + private ArrayList contents; + + public ContentManager() { + + } + + public void setContent(ArrayList contents) { + this.contents = contents; + } + + public void addNote(String name, String data) { + contents.add(new Note(name, data)); + } + + public String listAllContents() { + String result = ""; + int i = 1; + for (Content n : contents) { + result += String.format("%d. %s\n", i, n.getName()); + i++; + } + return result; + } + + public String getContentData(int contentNumber) throws InvalidArgumentException { + if (!isValidNumber(contentNumber)) { + throw new InvalidArgumentException("Error: content not found."); + } + return contents.get(contentNumber - 1).getDisplayInfo(); + } + + public ArrayList getContents() { + return contents; + } + + public int getTotalContents() { + return contents.size(); + } + + public String deleteContent(int contentNumber) throws InvalidArgumentException { + if (!isValidNumber(contentNumber)) { + throw new InvalidArgumentException("Error: content not found."); + } + String deletedContentName = contents.get(contentNumber - 1).getName(); + contents.remove(contentNumber - 1); + return deletedContentName; + } + + private boolean isValidNumber(int number) { + return !(number < 1 || number > contents.size()); + } +} diff --git a/src/main/java/terminus/content/Note.java b/src/main/java/terminus/content/Note.java new file mode 100644 index 0000000000..2eb34a3154 --- /dev/null +++ b/src/main/java/terminus/content/Note.java @@ -0,0 +1,10 @@ +package terminus.content; + +public class Note extends Content{ + + final public static String TYPE = "N"; + + public Note(String name, String data) { + super(name, data); + } +} diff --git a/src/main/java/terminus/module/NusModule.java b/src/main/java/terminus/module/NusModule.java index 41c5ff84fe..2eef542c06 100644 --- a/src/main/java/terminus/module/NusModule.java +++ b/src/main/java/terminus/module/NusModule.java @@ -1,5 +1,40 @@ package terminus.module; +import java.util.ArrayList; +import terminus.content.Content; +import terminus.content.ContentManager; +import terminus.content.Note; + public class NusModule { + private ArrayList notes; + + private ContentManager contentManager; + + public NusModule() { + contentManager = new ContentManager(); + notes = new ArrayList(); + } + + public ContentManager getContentManager() { + return contentManager; + } + + public ArrayList getNotes() { + return notes; + } + + public void setNotes(ArrayList notes) { + this.notes = notes; + } + + public ArrayList get(T type) { + ArrayList result = new ArrayList<>(); + if(type == Note.class){ + result = this.notes; + }else{ + // Error encountered + } + return result; + } } diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java index 78a05d9781..2c6936dac1 100644 --- a/src/main/java/terminus/parser/CommandParser.java +++ b/src/main/java/terminus/parser/CommandParser.java @@ -8,6 +8,7 @@ import terminus.command.ExitCommand; import terminus.command.Command; import terminus.command.HelpCommand; +import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; public class CommandParser { @@ -23,7 +24,7 @@ public CommandParser(String workspace) { addCommand("help", new HelpCommand(this)); } - public Command parseCommand(String command) throws InvalidCommandException { + public Command parseCommand(String command) throws InvalidCommandException, InvalidArgumentException { String[] commandLine = command.strip().split(SPACE_DELIMITER, 2); String cmdName = commandLine[0]; Command currentCommand = commandMap.get(cmdName.strip().toLowerCase(Locale.ROOT)); diff --git a/src/main/java/terminus/parser/NoteCommandParser.java b/src/main/java/terminus/parser/NoteCommandParser.java index 683fbd62cc..ceb80de0e0 100644 --- a/src/main/java/terminus/parser/NoteCommandParser.java +++ b/src/main/java/terminus/parser/NoteCommandParser.java @@ -1,19 +1,25 @@ package terminus.parser; +import terminus.command.DeleteCommand; +import terminus.command.ViewCommand; +import terminus.command.note.AddCommand; import terminus.command.BackCommand; -import terminus.command.TestCommand; +import terminus.common.CommonFormat; +import terminus.content.Note; public class NoteCommandParser extends CommandParser { public NoteCommandParser() { - super("notes"); + super(CommonFormat.COMMAND_NOTE); } public static NoteCommandParser getInstance() { NoteCommandParser parser = new NoteCommandParser(); - parser.addCommand("test", new TestCommand()); - parser.addCommand("back", new BackCommand()); + parser.addCommand(CommonFormat.COMMAND_BACK, new BackCommand()); + parser.addCommand(CommonFormat.COMMAND_ADD, new AddCommand()); + parser.addCommand(CommonFormat.COMMAND_VIEW, new ViewCommand>(Note.class)); + parser.addCommand(CommonFormat.COMMAND_DELETE, new DeleteCommand>(Note.class)); return parser; } } From f4a32cdbf3c80ac836d27707485031282d5bb545 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Mon, 4 Oct 2021 20:36:15 +0800 Subject: [PATCH 020/466] Add unit testing for MainCommandParser Signed-off-by: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> --- .../duke => terminus}/TerminusTest.java | 2 +- .../parser/MainCommandParserTest.java | 69 +++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) rename src/test/java/{seedu/duke => terminus}/TerminusTest.java (90%) create mode 100644 src/test/java/terminus/parser/MainCommandParserTest.java diff --git a/src/test/java/seedu/duke/TerminusTest.java b/src/test/java/terminus/TerminusTest.java similarity index 90% rename from src/test/java/seedu/duke/TerminusTest.java rename to src/test/java/terminus/TerminusTest.java index 23997f58a6..6bface6022 100644 --- a/src/test/java/seedu/duke/TerminusTest.java +++ b/src/test/java/terminus/TerminusTest.java @@ -1,4 +1,4 @@ -package seedu.duke; +package terminus; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/terminus/parser/MainCommandParserTest.java b/src/test/java/terminus/parser/MainCommandParserTest.java new file mode 100644 index 0000000000..d9434ab4c8 --- /dev/null +++ b/src/test/java/terminus/parser/MainCommandParserTest.java @@ -0,0 +1,69 @@ +package terminus.parser; + +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.command.ExitCommand; +import terminus.command.HelpCommand; +import terminus.command.NotesCommand; +import terminus.exception.InvalidCommandException; + +public class MainCommandParserTest { + + private MainCommandParser commandParser; + + @BeforeEach + void setUp() { + this.commandParser = MainCommandParser.getInstance(); + } + + @Test + void parseCommand_invalidCommand_exceptionThrown() { + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("ex it")); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("helpa")); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("")); + } + + @Test + void parseCommand_resolveExitCommand_success() throws InvalidCommandException { + assertTrue(commandParser.parseCommand("exit") instanceof ExitCommand); + assertTrue(commandParser.parseCommand("EXIT") instanceof ExitCommand); + assertTrue(commandParser.parseCommand(" exit ") instanceof ExitCommand); + assertTrue(commandParser.parseCommand("eXiT a") instanceof ExitCommand); + } + + @Test + void parseCommand_resolveHelpCommand_success() throws InvalidCommandException { + assertTrue(commandParser.parseCommand("help") instanceof HelpCommand); + assertTrue(commandParser.parseCommand("HELP") instanceof HelpCommand); + assertTrue(commandParser.parseCommand(" help ") instanceof HelpCommand); + assertTrue(commandParser.parseCommand("HeLp a") instanceof HelpCommand); + } + + @Test + void getCommandList_containsBasicCommands() { + assertTrue(commandParser.getCommandList().contains("exit")); + assertTrue(commandParser.getCommandList().contains("help")); + } + + @Test + void parseCommand_resolveNoteCommand_success() throws InvalidCommandException { + assertTrue(commandParser.parseCommand("notes") instanceof NotesCommand); + assertTrue(commandParser.parseCommand("NOTES") instanceof NotesCommand); + assertTrue(commandParser.parseCommand(" notes ") instanceof NotesCommand); + assertTrue(commandParser.parseCommand("notes help") instanceof NotesCommand); + assertTrue(commandParser.parseCommand("notes exit") instanceof NotesCommand); + } + + @Test + void getHelpMenu_isNotEmpty() { + assertTrue(commandParser.getHelpMenu().length > 0); + } + + @Test + void getWorkspace_isEmptyString() { + assertTrue(commandParser.getWorkspace().isEmpty()); + } +} From 97631d496fc76f4cfb8b81b57edc35ca8a9df35f Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Mon, 4 Oct 2021 23:46:34 +0800 Subject: [PATCH 021/466] Create main.yml --- main.yml | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 main.yml diff --git a/main.yml b/main.yml new file mode 100644 index 0000000000..2cdd68aacb --- /dev/null +++ b/main.yml @@ -0,0 +1,54 @@ +# This is a basic workflow to help you get started with Actions + +name: CI + +# Controls when the workflow will run +on: + # Triggers the workflow on push or pull request events but only for the master branch + push: + branches: [ master ] + pull_request: + branches: [ master ] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + # Runs a single command using the runners shell + - name: Run a one-line script + run: echo Hello, world! + + # Runs a set of commands using the runners shell + - name: Run a multi-line script + run: | + echo Add other actions to build, + echo test, and deploy your project. + inform: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + # Runs the telegram notify action to send a notification + - name: Telegram Notify + uses: appleboy/telegram-action@master + with: + to: ${{ secrets.TELEGRAM_TO }} + token: ${{ secrets.TELEGRAM_TOKEN }} + format: markdown + message: | + There is an update to the repo. [View repo](https://github.com/AY2122S1-CS2113T-T10-2/tp/) From 6c5cc03dd37a56cb4efaeac547367cccf90714cd Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Mon, 4 Oct 2021 23:54:00 +0800 Subject: [PATCH 022/466] Delete main.yml --- main.yml | 54 ------------------------------------------------------ 1 file changed, 54 deletions(-) delete mode 100644 main.yml diff --git a/main.yml b/main.yml deleted file mode 100644 index 2cdd68aacb..0000000000 --- a/main.yml +++ /dev/null @@ -1,54 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: CI - -# Controls when the workflow will run -on: - # Triggers the workflow on push or pull request events but only for the master branch - push: - branches: [ master ] - pull_request: - branches: [ master ] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - build: - # The type of runner that the job will run on - runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - # Runs a single command using the runners shell - - name: Run a one-line script - run: echo Hello, world! - - # Runs a set of commands using the runners shell - - name: Run a multi-line script - run: | - echo Add other actions to build, - echo test, and deploy your project. - inform: - # The type of runner that the job will run on - runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - # Runs the telegram notify action to send a notification - - name: Telegram Notify - uses: appleboy/telegram-action@master - with: - to: ${{ secrets.TELEGRAM_TO }} - token: ${{ secrets.TELEGRAM_TOKEN }} - format: markdown - message: | - There is an update to the repo. [View repo](https://github.com/AY2122S1-CS2113T-T10-2/tp/) From 6cbc80421232609772b42cc94b2e1722c949dc1b Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Mon, 4 Oct 2021 23:55:06 +0800 Subject: [PATCH 023/466] Create main.yml --- .github/workflows/main.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000000..38721e0b75 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,34 @@ +# This is a basic workflow to help you get started with Actions + +name: Telegram Notification + +# Controls when the workflow will run +on: + # Triggers the workflow on push or pull request events but only for the master branch + pull_request: + branches: [ master ] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + # Runs the telegram notify action to send a notification + - name: Telegram Notify + uses: appleboy/telegram-action@master + with: + to: ${{ secrets.TELEGRAM_TO }} + token: ${{ secrets.TELEGRAM_TOKEN }} + format: markdown + message: | + There is a new PR to the repo. [View Repo PR](https://github.com/AY2122S1-CS2113T-T10-2/tp/pulls) From d6908f484d38a19f2f1d46a06cb885d082044b98 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Tue, 5 Oct 2021 00:53:58 +0800 Subject: [PATCH 024/466] Add basic JavaDocs --- src/main/java/terminus/command/Command.java | 24 +++++++++++++++++++ .../java/terminus/command/CommandResult.java | 15 ++++++++++++ .../terminus/command/WorkspaceCommand.java | 10 ++++++++ .../java/terminus/parser/CommandParser.java | 13 ++++++++++ 4 files changed, 62 insertions(+) diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java index 7575f9e0d0..19450c7fa3 100644 --- a/src/main/java/terminus/command/Command.java +++ b/src/main/java/terminus/command/Command.java @@ -11,12 +11,36 @@ public Command() { } + /** + * Contains the format for the command. + * + * @return The String object holding the appropriate format for the command. + */ public abstract String getFormat(); + /** + * Contains the description for the command. + * + * @return The String object containing the description for this command. + */ public abstract String getHelpMessage(); + /** + * The function that parse the remaining arguments for the command. + * + * @param arguments The string arguments to be parsed in to the respective fields. + */ public abstract void parseArguments(String arguments); + /** + * A common function that needs to be run to execute the command. + * This function also updates the required changes and prints UI. + * + * @param ui The Ui object to send messages to the users. + * @param module The NusModule contain the list of all notes and schedules. + * @return The CommandResult object indicating the success of failure including additional options. + * @throws InvalidCommandException Exception for when the command could not be found. + */ public abstract CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException; } diff --git a/src/main/java/terminus/command/CommandResult.java b/src/main/java/terminus/command/CommandResult.java index 5f8a06082c..392fd05bea 100644 --- a/src/main/java/terminus/command/CommandResult.java +++ b/src/main/java/terminus/command/CommandResult.java @@ -32,14 +32,29 @@ public CommandResult(boolean isOk) { this(isOk, false, null, null); } + /** + * Contain the CommandParser that is required to switch workspaces + * + * @return The CommandParser object for the workspace or else null + */ public CommandParser getAdditionalData() { return additionalData; } + /** + * Returns the result of the command execution + * + * @return True if successful or else false + */ public boolean isOk() { return isOk; } + /** + * Tells the program to quit if the 'exit' command is sent + * + * @return true if 'exit' command is sent + */ public boolean isExit() { return isExit; } diff --git a/src/main/java/terminus/command/WorkspaceCommand.java b/src/main/java/terminus/command/WorkspaceCommand.java index 216db692ad..d346e5d294 100644 --- a/src/main/java/terminus/command/WorkspaceCommand.java +++ b/src/main/java/terminus/command/WorkspaceCommand.java @@ -19,6 +19,16 @@ public void parseArguments(String arguments) { this.arguments = arguments; } + /** + * A custom execute for command that switch workplaces. + * Runs any additional commands in arguments but will change works space if none is specified + * + * @param ui The Ui object to send messages to the users. + * @param module The NusModule contain the list of all notes and schedules. + * @return The CommandResult containing success or failure of command, + * may include CommandParser for additional data + * @throws InvalidCommandException Exception for when the command could not be found. + */ @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { if (arguments != null && !arguments.isBlank()) { diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java index 78a05d9781..2da5a0ee47 100644 --- a/src/main/java/terminus/parser/CommandParser.java +++ b/src/main/java/terminus/parser/CommandParser.java @@ -16,6 +16,12 @@ public class CommandParser { protected String workspace; protected final HashMap commandMap; + /** + * Initializes the commandMap. + * Adds some default commands to it. + * + * @param workspace The name of the workspace + */ public CommandParser(String workspace) { this.commandMap = new HashMap<>(); this.workspace = workspace; @@ -23,6 +29,13 @@ public CommandParser(String workspace) { addCommand("help", new HelpCommand(this)); } + /** + * Parses the command and its arguments + * + * @param command The user input command + * @return The Command object to be executed + * @throws InvalidCommandException if there is no command or empty command + */ public Command parseCommand(String command) throws InvalidCommandException { String[] commandLine = command.strip().split(SPACE_DELIMITER, 2); String cmdName = commandLine[0]; From a59f0e05a31c95d0523aca2c787cd77f736db317 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 5 Oct 2021 10:55:40 +0800 Subject: [PATCH 025/466] Fix formatting and issues commented on pr --- src/main/java/terminus/Terminus.java | 18 +++++----- .../java/terminus/command/BackCommand.java | 6 ++-- .../java/terminus/command/DeleteCommand.java | 4 +-- .../java/terminus/command/ExitCommand.java | 6 ++-- .../java/terminus/command/HelpCommand.java | 6 ++-- .../java/terminus/command/NotesCommand.java | 6 ++-- .../java/terminus/command/ViewCommand.java | 16 ++++----- .../terminus/command/note/AddCommand.java | 36 ++++++++++--------- .../java/terminus/common/CommonFormat.java | 18 +++++----- src/main/java/terminus/common/Messages.java | 20 ++++++++--- src/main/java/terminus/content/Content.java | 2 +- .../java/terminus/content/ContentManager.java | 7 ++-- src/main/java/terminus/content/Note.java | 2 +- src/main/java/terminus/module/NusModule.java | 4 +-- .../terminus/parser/MainCommandParser.java | 3 +- 15 files changed, 89 insertions(+), 65 deletions(-) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index bf03aacba4..6ffb8b010f 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -10,13 +10,13 @@ import terminus.ui.Ui; public class Terminus { - + private Ui ui; private CommandParser parser; private String workspace; private NusModule nusModule; - + /** * Main entry-point for the terminus.Terminus application. */ @@ -32,7 +32,7 @@ public void run() { runCommandsUntilExit(); exit(); } - + private void start() { this.ui = new Ui(); this.parser = MainCommandParser.getInstance(); @@ -41,15 +41,15 @@ private void start() { this.ui.printParserBanner(this.parser); this.nusModule = new NusModule(); } - + private void runCommandsUntilExit() { while (true) { String input = ui.requestCommand(workspace); - + Command currentCommand = null; try { currentCommand = parser.parseCommand(input); - CommandResult result = currentCommand.execute(ui,nusModule); + CommandResult result = currentCommand.execute(ui, nusModule); if (result.isOk() && result.isExit()) { break; } else if (result.isOk() && result.getAdditionalData() != null) { @@ -66,10 +66,10 @@ private void runCommandsUntilExit() { } } - } - + } + private void exit() { this.ui.printExitMessage(); } - + } diff --git a/src/main/java/terminus/command/BackCommand.java b/src/main/java/terminus/command/BackCommand.java index 5944d2f5c4..4408f7d0be 100644 --- a/src/main/java/terminus/command/BackCommand.java +++ b/src/main/java/terminus/command/BackCommand.java @@ -1,5 +1,7 @@ package terminus.command; +import terminus.common.CommonFormat; +import terminus.common.Messages; import terminus.exception.InvalidCommandException; import terminus.module.NusModule; import terminus.parser.MainCommandParser; @@ -9,12 +11,12 @@ public class BackCommand extends Command { @Override public String getFormat() { - return "back"; + return CommonFormat.COMMAND_BACK; } @Override public String getHelpMessage() { - return "Returns to the parent workspace."; + return Messages.MESSAGE_COMMAND_BACK; } @Override diff --git a/src/main/java/terminus/command/DeleteCommand.java b/src/main/java/terminus/command/DeleteCommand.java index d2ad0002cd..281b72f644 100644 --- a/src/main/java/terminus/command/DeleteCommand.java +++ b/src/main/java/terminus/command/DeleteCommand.java @@ -30,12 +30,12 @@ public String getHelpMessage() { @Override public void parseArguments(String arguments) throws InvalidArgumentException { if (arguments == null || arguments.isBlank()) { - throw new InvalidArgumentException("Error: Missing content number."); + throw new InvalidArgumentException(Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } try { itemNumber = Integer.parseInt(arguments); } catch (NumberFormatException e) { - throw new InvalidArgumentException("Error: Invalid numerical value."); + throw new InvalidArgumentException(Messages.ERROR_MESSAGE_INVALID_NUMBER); } } diff --git a/src/main/java/terminus/command/ExitCommand.java b/src/main/java/terminus/command/ExitCommand.java index a7dc2a88cb..1a1b1d8f3c 100644 --- a/src/main/java/terminus/command/ExitCommand.java +++ b/src/main/java/terminus/command/ExitCommand.java @@ -1,5 +1,7 @@ package terminus.command; +import terminus.common.CommonFormat; +import terminus.common.Messages; import terminus.exception.InvalidCommandException; import terminus.module.NusModule; import terminus.ui.Ui; @@ -8,12 +10,12 @@ public class ExitCommand extends Command { @Override public String getFormat() { - return "exit"; + return CommonFormat.COMMAND_EXIT; } @Override public String getHelpMessage() { - return "Exits the program."; + return Messages.MESSAGE_COMMAND_EXIT; } @Override diff --git a/src/main/java/terminus/command/HelpCommand.java b/src/main/java/terminus/command/HelpCommand.java index 4aec3946da..c176507597 100644 --- a/src/main/java/terminus/command/HelpCommand.java +++ b/src/main/java/terminus/command/HelpCommand.java @@ -1,5 +1,7 @@ package terminus.command; +import terminus.common.CommonFormat; +import terminus.common.Messages; import terminus.exception.InvalidCommandException; import terminus.module.NusModule; import terminus.parser.CommandParser; @@ -15,12 +17,12 @@ public HelpCommand(CommandParser commandMap) { @Override public String getFormat() { - return "help"; + return CommonFormat.COMMAND_HELP; } @Override public String getHelpMessage() { - return "Prints the help page."; + return Messages.MESSAGE_COMMAND_HELP; } @Override diff --git a/src/main/java/terminus/command/NotesCommand.java b/src/main/java/terminus/command/NotesCommand.java index 0ef57391a2..02eb20e5b8 100644 --- a/src/main/java/terminus/command/NotesCommand.java +++ b/src/main/java/terminus/command/NotesCommand.java @@ -1,6 +1,8 @@ package terminus.command; +import terminus.common.CommonFormat; +import terminus.common.Messages; import terminus.parser.NoteCommandParser; public class NotesCommand extends WorkspaceCommand { @@ -13,11 +15,11 @@ public NotesCommand() { @Override public String getFormat() { - return "notes"; + return CommonFormat.COMMAND_NOTE; } @Override public String getHelpMessage() { - return "Move to notes workspace."; + return Messages.MESSAGE_COMMAND_NOTE; } } diff --git a/src/main/java/terminus/command/ViewCommand.java b/src/main/java/terminus/command/ViewCommand.java index af722f4ea8..ab5c0e43d1 100644 --- a/src/main/java/terminus/command/ViewCommand.java +++ b/src/main/java/terminus/command/ViewCommand.java @@ -7,7 +7,7 @@ import terminus.module.NusModule; import terminus.ui.Ui; -public class ViewCommand extends Command{ +public class ViewCommand extends Command { private T type; @@ -31,15 +31,15 @@ public String getHelpMessage() { @Override public void parseArguments(String arguments) throws InvalidArgumentException { - if(arguments == null || arguments.isBlank()){ + if (arguments == null || arguments.isBlank()) { displayAll = true; return; } - try{ + try { itemNumber = Integer.parseInt(arguments); displayAll = false; - }catch(NumberFormatException e){ - throw new InvalidArgumentException("Error: Invalid numerical value."); + } catch (NumberFormatException e) { + throw new InvalidArgumentException(Messages.ERROR_MESSAGE_INVALID_NUMBER); } } @@ -48,13 +48,13 @@ public CommandResult execute(Ui ui, NusModule module) throws InvalidArgumentExce ContentManager contentManager = module.getContentManager(); contentManager.setContent(module.get(type)); String result = ""; - if(displayAll){ + if (displayAll) { result = contentManager.listAllContents(); - }else{ + } else { result = contentManager.getContentData(itemNumber); } ui.printSection(result); - return new CommandResult(true,false); + return new CommandResult(true, false); } } diff --git a/src/main/java/terminus/command/note/AddCommand.java b/src/main/java/terminus/command/note/AddCommand.java index 1b6979427c..3240c162a9 100644 --- a/src/main/java/terminus/command/note/AddCommand.java +++ b/src/main/java/terminus/command/note/AddCommand.java @@ -1,7 +1,6 @@ package terminus.command.note; import java.util.ArrayList; -import java.util.Arrays; import java.util.regex.Matcher; import java.util.regex.Pattern; import terminus.command.Command; @@ -19,15 +18,17 @@ public class AddCommand extends Command { private String name; private String data; - private int totalArg; + private static final String COMMAND_FORMAT = " \"{item name}\" \"{item content}\""; + + private static final int TOTAL_ARGUMENTS = 2; public AddCommand() { - this.totalArg = 2; + } @Override public String getFormat() { - return CommonFormat.COMMAND_ADD + " \"{item name}\" \"{item content}\""; + return CommonFormat.COMMAND_ADD + COMMAND_FORMAT; } @Override @@ -38,12 +39,12 @@ public String getHelpMessage() { @Override public void parseArguments(String arguments) throws InvalidArgumentException { // Perform required checks with regex - if(arguments == null || arguments.isBlank()){ - throw new InvalidArgumentException("Error: Missing arguments."); + if (arguments == null || arguments.isBlank()) { + throw new InvalidArgumentException(Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } ArrayList argArray = findArguments(arguments); - if(!isValidArguments(argArray)){ - throw new InvalidArgumentException("Error: Missing arguments."); + if (!isValidArguments(argArray)) { + throw new InvalidArgumentException(Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } this.name = argArray.get(0); this.data = argArray.get(1); @@ -55,32 +56,33 @@ public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandExcep contentManager.setContent(module.getNotes()); contentManager.addNote(name, data); module.setNotes(contentManager.getContents()); - return new CommandResult(true,false); + ui.printSection(String.format(Messages.MESSAGE_RESPONSE_ADD, CommonFormat.COMMAND_NOTE)); + return new CommandResult(true, false); } - private ArrayList findArguments(String arg){ + private ArrayList findArguments(String arg) { ArrayList argsArray = new ArrayList<>(); Pattern p = Pattern.compile("\"(.*?)\""); Matcher m = p.matcher(arg); - while(m.find()){ + while (m.find()) { argsArray.add(m.group(1)); } return argsArray; } - private boolean isValidArguments(ArrayList argArray){ + private boolean isValidArguments(ArrayList argArray) { boolean isValid = true; - if(argArray.size() != totalArg){ + if (argArray.size() != TOTAL_ARGUMENTS) { isValid = false; - }else if(isArrayEmpty(argArray)){ + } else if (isArrayEmpty(argArray)) { isValid = false; } return isValid; } - private boolean isArrayEmpty(ArrayList argArray){ - for(String s:argArray){ - if(s.isBlank()){ + private boolean isArrayEmpty(ArrayList argArray) { + for (String s : argArray) { + if (s.isBlank()) { return true; } } diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index cc7cfb4305..63d3fdfb77 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -1,13 +1,15 @@ package terminus.common; public class CommonFormat { - final public static String COMMAND_NOTE = "note"; - final public static String COMMAND_ADD = "add"; - final public static String COMMAND_DELETE = "delete"; - final public static String COMMAND_VIEW = "view"; - final public static String COMMAND_BACK = "back"; - final public static String COMMAND_EXIT = "exit"; - final public static String COMMAND_DELETE_FORMAT = COMMAND_DELETE + " {item number}"; - final public static String COMMAND_VIEW_FORMAT = COMMAND_VIEW + " {[optional]item number}"; + public static final String COMMAND_NOTE = "note"; + public static final String COMMAND_ADD = "add"; + public static final String COMMAND_DELETE = "delete"; + public static final String COMMAND_VIEW = "view"; + public static final String COMMAND_BACK = "back"; + public static final String COMMAND_EXIT = "exit"; + public static final String COMMAND_HELP = "help"; + + public static final String COMMAND_DELETE_FORMAT = COMMAND_DELETE + " "; + public static final String COMMAND_VIEW_FORMAT = COMMAND_VIEW + " {item number}"; } diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index 515ee085d1..17f3e803dd 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -1,9 +1,21 @@ package terminus.common; public class Messages { - final public static String MESSAGE_COMMAND_ADD = "add an item into your list."; - final public static String MESSAGE_COMMAND_DELETE = "delete an item from your list."; - final public static String MESSAGE_COMMAND_VIEW = "view all items or view an individual items"; - final public static String MESSAGE_RESPONSE_DELETE = "%s \'%s\' has been deleted!"; + public static final String MESSAGE_COMMAND_ADD = "add an item into your list."; + public static final String MESSAGE_COMMAND_DELETE = "delete an item from your list."; + public static final String MESSAGE_COMMAND_VIEW = "view all items or view an individual items"; + public static final String MESSAGE_COMMAND_BACK = "Returns to the parent workspace."; + public static final String MESSAGE_COMMAND_EXIT = "Exits the program."; + public static final String MESSAGE_COMMAND_HELP = "Prints the help page."; + public static final String MESSAGE_COMMAND_NOTE = "Move to notes workspace."; + + public static final String MESSAGE_RESPONSE_DELETE = "%s \'%s\' has been deleted!"; + public static final String MESSAGE_RESPONSE_ADD = "%s has been added!"; + + public static final String ERROR_MESSAGE_TAG = "Error: "; + + public static final String ERROR_MESSAGE_MISSING_ARGUMENTS = ERROR_MESSAGE_TAG + "Missing arguments."; + public static final String ERROR_MESSAGE_EMPTY_CONTENTS = ERROR_MESSAGE_TAG + "Content not found."; + public static final String ERROR_MESSAGE_INVALID_NUMBER = ERROR_MESSAGE_TAG + "Invalid numerical value provided."; } diff --git a/src/main/java/terminus/content/Content.java b/src/main/java/terminus/content/Content.java index 0c53b65bf3..91055a1c06 100644 --- a/src/main/java/terminus/content/Content.java +++ b/src/main/java/terminus/content/Content.java @@ -6,7 +6,7 @@ public class Content { private String data; final public static String TYPE = ""; - final private String DISPLAY_MESSAGE = "Name: %s\nContent: %s\n"; + private final String DISPLAY_MESSAGE = "Name: %s\nContent: %s\n"; public Content(String name, String data) { this.name = name; diff --git a/src/main/java/terminus/content/ContentManager.java b/src/main/java/terminus/content/ContentManager.java index 7c05fdf0d7..4afa0ea8a9 100644 --- a/src/main/java/terminus/content/ContentManager.java +++ b/src/main/java/terminus/content/ContentManager.java @@ -1,12 +1,11 @@ package terminus.content; import java.util.ArrayList; +import terminus.common.Messages; import terminus.exception.InvalidArgumentException; public class ContentManager { - final private static String DATA_SEPARATOR = ""; - private ArrayList contents; public ContentManager() { @@ -33,7 +32,7 @@ public String listAllContents() { public String getContentData(int contentNumber) throws InvalidArgumentException { if (!isValidNumber(contentNumber)) { - throw new InvalidArgumentException("Error: content not found."); + throw new InvalidArgumentException(Messages.ERROR_MESSAGE_EMPTY_CONTENTS); } return contents.get(contentNumber - 1).getDisplayInfo(); } @@ -48,7 +47,7 @@ public int getTotalContents() { public String deleteContent(int contentNumber) throws InvalidArgumentException { if (!isValidNumber(contentNumber)) { - throw new InvalidArgumentException("Error: content not found."); + throw new InvalidArgumentException(Messages.ERROR_MESSAGE_EMPTY_CONTENTS); } String deletedContentName = contents.get(contentNumber - 1).getName(); contents.remove(contentNumber - 1); diff --git a/src/main/java/terminus/content/Note.java b/src/main/java/terminus/content/Note.java index 2eb34a3154..aac355edbc 100644 --- a/src/main/java/terminus/content/Note.java +++ b/src/main/java/terminus/content/Note.java @@ -1,6 +1,6 @@ package terminus.content; -public class Note extends Content{ +public class Note extends Content { final public static String TYPE = "N"; diff --git a/src/main/java/terminus/module/NusModule.java b/src/main/java/terminus/module/NusModule.java index 2eef542c06..6e29b72087 100644 --- a/src/main/java/terminus/module/NusModule.java +++ b/src/main/java/terminus/module/NusModule.java @@ -30,9 +30,9 @@ public void setNotes(ArrayList notes) { public ArrayList get(T type) { ArrayList result = new ArrayList<>(); - if(type == Note.class){ + if (type == Note.class) { result = this.notes; - }else{ + } else { // Error encountered } return result; diff --git a/src/main/java/terminus/parser/MainCommandParser.java b/src/main/java/terminus/parser/MainCommandParser.java index 795f41e144..217d5b62be 100644 --- a/src/main/java/terminus/parser/MainCommandParser.java +++ b/src/main/java/terminus/parser/MainCommandParser.java @@ -1,6 +1,7 @@ package terminus.parser; import terminus.command.NotesCommand; +import terminus.common.CommonFormat; public class MainCommandParser extends CommandParser { @@ -12,7 +13,7 @@ public MainCommandParser() { public static MainCommandParser getInstance() { MainCommandParser parser = PARSER; - parser.addCommand("notes", new NotesCommand()); + parser.addCommand(CommonFormat.COMMAND_NOTE, new NotesCommand()); return parser; } } From d01cab80e9e930c841701433a03352c266c825b3 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 5 Oct 2021 11:06:18 +0800 Subject: [PATCH 026/466] Update text-ui-test expected and input --- text-ui-test/EXPECTED.TXT | 42 ++++++++++++++++++++++++++++----------- text-ui-test/input.txt | 15 ++++++++++---- 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 9ebf7b5045..e79e3050c4 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -3,45 +3,63 @@ Welcome to TermiNUS! Type any of the following to get started: > exit > help -> notes +> note [] >>> Command not found! Type 'help' for a list of commands. -[] >>> c f a [] >>> Command not found! Type 'help' for a list of commands. [] >>> Type any of the following to get started: +> add > exit > help -> test +> view > back +> delete -[notes] >>> exit : Exits the program. +[note] >>> add : add an item into your list. +Format: add "{item name}" "{item content}" + +exit : Exits the program. Format: exit help : Prints the help page. Format: help -test : This is testing command. -Format: test +view : view all items or view an individual items +Format: view {item number} back : Returns to the parent workspace. Format: back -[notes] >>> Command not found! Type 'help' for a list of commands. -[notes] >>> c f a -[notes] >>> +delete : delete an item from your list. +Format: delete + +[note] >>> Command not found! Type 'help' for a list of commands. +[note] >>> Type any of the following to get started: > exit > help -> notes +> note + +[] >>> note has been added! +[] >>> 1. CS2113T +[] >>> Error: Invalid numerical value provided. +[] >>> Error: Content not found. +[] >>> Name: CS2113T +Content: Week 8 test + +[] >>> Error: Invalid numerical value provided. +[] >>> Error: Content not found. +[] >>> class terminus.content.Note 'CS2113T' has been deleted! +[] >>> [] >>> exit : Exits the program. Format: exit help : Prints the help page. Format: help -notes : Move to notes workspace. -Format: notes +note : Move to notes workspace. +Format: note [] >>> Goodbye! diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index 887158052b..ab3f79aa62 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -1,10 +1,17 @@ invalid -notes test c f a -notes invalid -notes +note invalid +note help invalid -test c f a back +note add "CS2113T" "Week 8 test" +note view +note view aa +note view 2 +note view 1 +note delete aa +note delete 2 +note delete 1 +note view help exit \ No newline at end of file From 363c23f1ba8a9b61bd41dedbf183156e066b8a2c Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 5 Oct 2021 11:13:06 +0800 Subject: [PATCH 027/466] Fix issues from format auto checks --- src/main/java/terminus/command/Command.java | 3 ++- src/main/java/terminus/content/Content.java | 4 ++-- src/main/java/terminus/content/Note.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java index c0345de31c..aaa746c27a 100644 --- a/src/main/java/terminus/command/Command.java +++ b/src/main/java/terminus/command/Command.java @@ -18,6 +18,7 @@ public Command() { public abstract void parseArguments(String arguments) throws InvalidArgumentException; - public abstract CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException, InvalidArgumentException; + public abstract CommandResult execute(Ui ui, NusModule module) + throws InvalidCommandException, InvalidArgumentException; } diff --git a/src/main/java/terminus/content/Content.java b/src/main/java/terminus/content/Content.java index 91055a1c06..a00acc7953 100644 --- a/src/main/java/terminus/content/Content.java +++ b/src/main/java/terminus/content/Content.java @@ -4,9 +4,9 @@ public class Content { private String name; private String data; - final public static String TYPE = ""; + public static final String TYPE = ""; - private final String DISPLAY_MESSAGE = "Name: %s\nContent: %s\n"; + private static final String DISPLAY_MESSAGE = "Name: %s\nContent: %s\n"; public Content(String name, String data) { this.name = name; diff --git a/src/main/java/terminus/content/Note.java b/src/main/java/terminus/content/Note.java index aac355edbc..0d3dd9a81f 100644 --- a/src/main/java/terminus/content/Note.java +++ b/src/main/java/terminus/content/Note.java @@ -2,7 +2,7 @@ public class Note extends Content { - final public static String TYPE = "N"; + public static final String TYPE = "N"; public Note(String name, String data) { super(name, data); From e2d7b9fe9870081e7a9185a85e75c007d58dd317 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 5 Oct 2021 11:26:02 +0800 Subject: [PATCH 028/466] Fix MainCommandParser unit test --- .../terminus/parser/MainCommandParserTest.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/test/java/terminus/parser/MainCommandParserTest.java b/src/test/java/terminus/parser/MainCommandParserTest.java index d9434ab4c8..2ab1556dbf 100644 --- a/src/test/java/terminus/parser/MainCommandParserTest.java +++ b/src/test/java/terminus/parser/MainCommandParserTest.java @@ -8,6 +8,7 @@ import terminus.command.ExitCommand; import terminus.command.HelpCommand; import terminus.command.NotesCommand; +import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; public class MainCommandParserTest { @@ -27,7 +28,7 @@ void parseCommand_invalidCommand_exceptionThrown() { } @Test - void parseCommand_resolveExitCommand_success() throws InvalidCommandException { + void parseCommand_resolveExitCommand_success() throws InvalidCommandException, InvalidArgumentException { assertTrue(commandParser.parseCommand("exit") instanceof ExitCommand); assertTrue(commandParser.parseCommand("EXIT") instanceof ExitCommand); assertTrue(commandParser.parseCommand(" exit ") instanceof ExitCommand); @@ -35,7 +36,7 @@ void parseCommand_resolveExitCommand_success() throws InvalidCommandException { } @Test - void parseCommand_resolveHelpCommand_success() throws InvalidCommandException { + void parseCommand_resolveHelpCommand_success() throws InvalidCommandException, InvalidArgumentException { assertTrue(commandParser.parseCommand("help") instanceof HelpCommand); assertTrue(commandParser.parseCommand("HELP") instanceof HelpCommand); assertTrue(commandParser.parseCommand(" help ") instanceof HelpCommand); @@ -49,12 +50,12 @@ void getCommandList_containsBasicCommands() { } @Test - void parseCommand_resolveNoteCommand_success() throws InvalidCommandException { - assertTrue(commandParser.parseCommand("notes") instanceof NotesCommand); - assertTrue(commandParser.parseCommand("NOTES") instanceof NotesCommand); - assertTrue(commandParser.parseCommand(" notes ") instanceof NotesCommand); - assertTrue(commandParser.parseCommand("notes help") instanceof NotesCommand); - assertTrue(commandParser.parseCommand("notes exit") instanceof NotesCommand); + void parseCommand_resolveNoteCommand_success() throws InvalidCommandException, InvalidArgumentException { + assertTrue(commandParser.parseCommand("note") instanceof NotesCommand); + assertTrue(commandParser.parseCommand("NOTE") instanceof NotesCommand); + assertTrue(commandParser.parseCommand(" note ") instanceof NotesCommand); + assertTrue(commandParser.parseCommand("note help") instanceof NotesCommand); + assertTrue(commandParser.parseCommand("note exit") instanceof NotesCommand); } @Test From f127b881481c259d1fa2ce654f7771bd3c1df7a5 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Tue, 5 Oct 2021 18:42:22 +0800 Subject: [PATCH 029/466] Implemented view and add zoom link --- src/main/java/terminus/Terminus.java | 3 + src/main/java/terminus/command/Command.java | 8 +- .../java/terminus/command/DeleteCommand.java | 51 ++++++++++ .../java/terminus/command/NotesCommand.java | 1 - .../terminus/command/SchedulesCommand.java | 22 +++++ .../terminus/command/WorkspaceCommand.java | 3 +- .../command/zoomlink/AddLinkCommand.java | 95 +++++++++++++++++++ .../command/zoomlink/ViewLinkCommand.java | 56 +++++++++++ .../java/terminus/common/CommonFormat.java | 13 +++ src/main/java/terminus/common/Messages.java | 8 ++ src/main/java/terminus/content/Content.java | 35 +++++++ .../java/terminus/content/ContentManager.java | 61 ++++++++++++ src/main/java/terminus/content/Link.java | 55 +++++++++++ .../java/terminus/content/LinkManager.java | 66 +++++++++++++ src/main/java/terminus/content/Note.java | 10 ++ src/main/java/terminus/module/NusModule.java | 35 +++++++ .../java/terminus/parser/CommandParser.java | 3 +- .../terminus/parser/LinkCommandParser.java | 83 ++++++++++++++++ .../terminus/parser/MainCommandParser.java | 2 + src/main/java/terminus/schedule/ZoomLink.java | 41 ++++++++ 20 files changed, 645 insertions(+), 6 deletions(-) create mode 100644 src/main/java/terminus/command/DeleteCommand.java create mode 100644 src/main/java/terminus/command/SchedulesCommand.java create mode 100644 src/main/java/terminus/command/zoomlink/AddLinkCommand.java create mode 100644 src/main/java/terminus/command/zoomlink/ViewLinkCommand.java create mode 100644 src/main/java/terminus/common/CommonFormat.java create mode 100644 src/main/java/terminus/common/Messages.java create mode 100644 src/main/java/terminus/content/Content.java create mode 100644 src/main/java/terminus/content/ContentManager.java create mode 100644 src/main/java/terminus/content/Link.java create mode 100644 src/main/java/terminus/content/LinkManager.java create mode 100644 src/main/java/terminus/content/Note.java create mode 100644 src/main/java/terminus/parser/LinkCommandParser.java create mode 100644 src/main/java/terminus/schedule/ZoomLink.java diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index f3484741ac..0a52d1b3ee 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -2,6 +2,7 @@ import terminus.command.Command; import terminus.command.CommandResult; +import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.parser.CommandParser; import terminus.parser.MainCommandParser; @@ -56,6 +57,8 @@ private void runCommandsUntilExit() { } } catch (InvalidCommandException e) { ui.printSection(e.getMessage()); + } catch (InvalidArgumentException e) { + ui.printSection(e.getMessage()); } } diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java index 7575f9e0d0..3bd245ec76 100644 --- a/src/main/java/terminus/command/Command.java +++ b/src/main/java/terminus/command/Command.java @@ -1,8 +1,9 @@ package terminus.command; +import terminus.schedule.ZoomLink; +import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.NusModule; -import terminus.parser.CommandParser; import terminus.ui.Ui; public abstract class Command { @@ -15,8 +16,9 @@ public Command() { public abstract String getHelpMessage(); - public abstract void parseArguments(String arguments); + public abstract void parseArguments(String arguments) throws InvalidArgumentException; - public abstract CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException; + public abstract CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException, InvalidArgumentException; + public abstract CommandResult executeLink(Ui ui, ZoomLink zoomLink) throws InvalidCommandException; } diff --git a/src/main/java/terminus/command/DeleteCommand.java b/src/main/java/terminus/command/DeleteCommand.java new file mode 100644 index 0000000000..155ad945eb --- /dev/null +++ b/src/main/java/terminus/command/DeleteCommand.java @@ -0,0 +1,51 @@ +package terminus.command; + +import terminus.common.CommonFormat; +import terminus.common.Messages; +import terminus.content.ContentManager; +import terminus.exception.InvalidArgumentException; +import terminus.module.NusModule; +import terminus.ui.Ui; + +public class DeleteCommand extends Command { + + private T type; + + private int itemNumber; + + public DeleteCommand(T type) { + this.type = type; + } + + @Override + public String getFormat() { + return CommonFormat.COMMAND_DELETE_FORMAT; + } + + @Override + public String getHelpMessage() { + return Messages.MESSAGE_COMMAND_DELETE; + } + + @Override + public void parseArguments(String arguments) throws InvalidArgumentException { + if (arguments == null || arguments.isBlank()) { + throw new InvalidArgumentException("Error: Missing content number."); + } + try { + itemNumber = Integer.parseInt(arguments); + } catch (NumberFormatException e) { + throw new InvalidArgumentException("Error: Invalid numerical value."); + } + } + + @Override + public CommandResult execute(Ui ui, NusModule module) throws InvalidArgumentException { + ContentManager contentManager = module.getContentManager(); + contentManager.setContent(module.get(type)); + String deletedContentName = contentManager.deleteContent(itemNumber); + module.setNotes(contentManager.getContents()); + ui.printSection(String.format(Messages.MESSAGE_RESPONSE_DELETE, type, deletedContentName)); + return new CommandResult(true, false); + } +} \ No newline at end of file diff --git a/src/main/java/terminus/command/NotesCommand.java b/src/main/java/terminus/command/NotesCommand.java index 0ef57391a2..75749f8042 100644 --- a/src/main/java/terminus/command/NotesCommand.java +++ b/src/main/java/terminus/command/NotesCommand.java @@ -1,6 +1,5 @@ package terminus.command; - import terminus.parser.NoteCommandParser; public class NotesCommand extends WorkspaceCommand { diff --git a/src/main/java/terminus/command/SchedulesCommand.java b/src/main/java/terminus/command/SchedulesCommand.java new file mode 100644 index 0000000000..f43b699430 --- /dev/null +++ b/src/main/java/terminus/command/SchedulesCommand.java @@ -0,0 +1,22 @@ +package terminus.command; + +import terminus.parser.LinkCommandParser; + +public class SchedulesCommand extends WorkspaceCommand { + + private String arguments; + + public SchedulesCommand() { + super(LinkCommandParser.getInstance()); + } + + @Override + public String getFormat() { + return "schedules"; + } + + @Override + public String getHelpMessage() { + return "Move to schedules workspace."; + } +} diff --git a/src/main/java/terminus/command/WorkspaceCommand.java b/src/main/java/terminus/command/WorkspaceCommand.java index 216db692ad..835cf30a23 100644 --- a/src/main/java/terminus/command/WorkspaceCommand.java +++ b/src/main/java/terminus/command/WorkspaceCommand.java @@ -1,5 +1,6 @@ package terminus.command; +import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.NusModule; import terminus.parser.CommandParser; @@ -20,7 +21,7 @@ public void parseArguments(String arguments) { } @Override - public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { + public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException, InvalidArgumentException { if (arguments != null && !arguments.isBlank()) { return commandMap.parseCommand(arguments).execute(ui, module); } else { diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java new file mode 100644 index 0000000000..530a521edd --- /dev/null +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -0,0 +1,95 @@ +package terminus.command.zoomlink; + +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.schedule.ZoomLink; +import terminus.common.CommonFormat; +import terminus.common.Messages; +import terminus.content.LinkManager; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.ui.Ui; + +import java.util.ArrayList; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class AddLinkCommand extends Command { + + private String description; + private String day; + private String startTime; + private String zoomLink; + + private int totalArg; + + public AddLinkCommand() { + this.totalArg = 4; + } + + @Override + public String getFormat() { + return CommonFormat.COMMAND_ADD + " \"{description}\" " + + "\"{day}\" \"{start_time}\" \"{zoom_link}\""; + } + + @Override + public String getHelpMessage() { + return Messages.MESSAGE_COMMAND_ADD; + } + + @Override + public void parseArguments(String arguments) throws InvalidArgumentException { + // Perform required checks with regex + if(arguments == null || arguments.isBlank()){ + throw new InvalidArgumentException("Error: Missing arguments."); + } + ArrayList argArray = findArguments(arguments); + if(!isValidArguments(argArray)){ + throw new InvalidArgumentException("Error: Missing arguments."); + } + this.description = argArray.get(0); + this.day = argArray.get(1); + this.startTime = argArray.get(2); + this.zoomLink = argArray.get(3); + } + + @Override + public CommandResult executeLink(Ui ui, ZoomLink link) throws InvalidCommandException { + LinkManager linkManager = link.getLinkManager(); + linkManager.setSchedules(link.getSchedules()); + linkManager.addLink(description, day, startTime, zoomLink); + link.setSchedules(linkManager.getSchedules()); + return new CommandResult(true,false); + } + + private ArrayList findArguments(String arg){ + ArrayList argsArray = new ArrayList<>(); + Pattern p = Pattern.compile("\"(.*?)\""); + Matcher m = p.matcher(arg); + while(m.find()){ + argsArray.add(m.group(1)); + } + return argsArray; + } + + private boolean isValidArguments(ArrayList argArray){ + boolean isValid = true; + if(argArray.size() != totalArg){ + isValid = false; + }else if(isArrayEmpty(argArray)){ + isValid = false; + } + return isValid; + } + + private boolean isArrayEmpty(ArrayList argArray){ + for(String s:argArray){ + if(s.isBlank()){ + return true; + } + } + return false; + } + +} diff --git a/src/main/java/terminus/command/zoomlink/ViewLinkCommand.java b/src/main/java/terminus/command/zoomlink/ViewLinkCommand.java new file mode 100644 index 0000000000..4f1854f13f --- /dev/null +++ b/src/main/java/terminus/command/zoomlink/ViewLinkCommand.java @@ -0,0 +1,56 @@ +package terminus.command.zoomlink; + +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.common.CommonFormat; +import terminus.common.Messages; +import terminus.content.LinkManager; +import terminus.exception.InvalidArgumentException; +import terminus.schedule.ZoomLink; +import terminus.ui.Ui; + +public class ViewLinkCommand extends Command { + + private T type; + + private int itemNumber; + + public ViewLinkCommand(T type) { + this.type = type; + } + + @Override + public String getFormat() { + return CommonFormat.COMMAND_VIEW_FORMAT; + } + + @Override + public String getHelpMessage() { + return Messages.MESSAGE_COMMAND_VIEW; + } + + /*@Override + public void parseArguments(String arguments) throws InvalidArgumentException { + if(arguments == null || arguments.isBlank()){ + return; + } + try{ + itemNumber = Integer.parseInt(arguments); + displayAll = false; + }catch(NumberFormatException e){ + throw new InvalidArgumentException("Error: Invalid numerical value."); + } + } + + */ + + @Override + public CommandResult executeLink(Ui ui, ZoomLink zoomLink) throws InvalidArgumentException { + LinkManager linkManager = zoomLink.getLinkManager(); + linkManager.setSchedules(zoomLink.get(type)); + String result = ""; + result = linkManager.listAllLinks(); + ui.printSection(result); + return new CommandResult(true,false); + } +} diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java new file mode 100644 index 0000000000..d5e25dfae2 --- /dev/null +++ b/src/main/java/terminus/common/CommonFormat.java @@ -0,0 +1,13 @@ +package terminus.common; + +public class CommonFormat { + final public static String COMMAND_NOTE = "note"; + final public static String COMMAND_SCHEDULE = "schedule"; + final public static String COMMAND_ADD = "add"; + final public static String COMMAND_DELETE = "delete"; + final public static String COMMAND_VIEW = "view"; + final public static String COMMAND_BACK = "back"; + final public static String COMMAND_EXIT = "exit"; + final public static String COMMAND_DELETE_FORMAT = COMMAND_DELETE + " {item number}"; + final public static String COMMAND_VIEW_FORMAT = COMMAND_VIEW + " {[optional]item number}"; +} diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java new file mode 100644 index 0000000000..bbd022ccbc --- /dev/null +++ b/src/main/java/terminus/common/Messages.java @@ -0,0 +1,8 @@ +package terminus.common; + +public class Messages { + final public static String MESSAGE_COMMAND_ADD = "add an item into your list."; + final public static String MESSAGE_COMMAND_DELETE = "delete an item from your list."; + final public static String MESSAGE_COMMAND_VIEW = "view all items or view an individual items"; + final public static String MESSAGE_RESPONSE_DELETE = "%s \'%s\' has been deleted!"; +} diff --git a/src/main/java/terminus/content/Content.java b/src/main/java/terminus/content/Content.java new file mode 100644 index 0000000000..fb2b7446aa --- /dev/null +++ b/src/main/java/terminus/content/Content.java @@ -0,0 +1,35 @@ +package terminus.content; + +public class Content { + + private String name; + private String data; + final public static String TYPE = ""; + + final private String DISPLAY_MESSAGE = "Name: %s\nContent: %s\n"; + + public Content(String name, String data) { + this.name = name; + this.data = data; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public String getDisplayInfo() { + return String.format(DISPLAY_MESSAGE, name, data); + } +} diff --git a/src/main/java/terminus/content/ContentManager.java b/src/main/java/terminus/content/ContentManager.java new file mode 100644 index 0000000000..7c05fdf0d7 --- /dev/null +++ b/src/main/java/terminus/content/ContentManager.java @@ -0,0 +1,61 @@ +package terminus.content; + +import java.util.ArrayList; +import terminus.exception.InvalidArgumentException; + +public class ContentManager { + + final private static String DATA_SEPARATOR = ""; + + private ArrayList contents; + + public ContentManager() { + + } + + public void setContent(ArrayList contents) { + this.contents = contents; + } + + public void addNote(String name, String data) { + contents.add(new Note(name, data)); + } + + public String listAllContents() { + String result = ""; + int i = 1; + for (Content n : contents) { + result += String.format("%d. %s\n", i, n.getName()); + i++; + } + return result; + } + + public String getContentData(int contentNumber) throws InvalidArgumentException { + if (!isValidNumber(contentNumber)) { + throw new InvalidArgumentException("Error: content not found."); + } + return contents.get(contentNumber - 1).getDisplayInfo(); + } + + public ArrayList getContents() { + return contents; + } + + public int getTotalContents() { + return contents.size(); + } + + public String deleteContent(int contentNumber) throws InvalidArgumentException { + if (!isValidNumber(contentNumber)) { + throw new InvalidArgumentException("Error: content not found."); + } + String deletedContentName = contents.get(contentNumber - 1).getName(); + contents.remove(contentNumber - 1); + return deletedContentName; + } + + private boolean isValidNumber(int number) { + return !(number < 1 || number > contents.size()); + } +} diff --git a/src/main/java/terminus/content/Link.java b/src/main/java/terminus/content/Link.java new file mode 100644 index 0000000000..89ea476185 --- /dev/null +++ b/src/main/java/terminus/content/Link.java @@ -0,0 +1,55 @@ +package terminus.content; + +public class Link { + + private String description; + private String day; + private String startTime; + private String zoomLink; + final public static String TYPE = "Z"; + + final private String DISPLAY_MESSAGE = "%s, %s, %s, %s"; + + public Link(String description, String day, String startTime, String zoomLink) { + this.description = description; + this.day = day; + this.startTime = startTime; + this.zoomLink = zoomLink; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getDay() { + return day; + } + + public void setDay(String day) { + this.day = day; + } + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getZoomLink() { + return zoomLink; + } + + public void setZoomLink(String zoomLink) { + this.zoomLink = zoomLink; + } + + public String getDisplayInfo() { + return String.format(DISPLAY_MESSAGE, description, day, startTime, zoomLink); + } +} diff --git a/src/main/java/terminus/content/LinkManager.java b/src/main/java/terminus/content/LinkManager.java new file mode 100644 index 0000000000..b4def1f56a --- /dev/null +++ b/src/main/java/terminus/content/LinkManager.java @@ -0,0 +1,66 @@ +package terminus.content; + +import terminus.exception.InvalidArgumentException; + +import java.util.ArrayList; + +public class LinkManager { + + final private static String DATA_SEPARATOR = ""; + + private ArrayList schedules; + + public LinkManager() { + + } + + public void setSchedules(ArrayList schedules) { + this.schedules = schedules; + } + + public void addLink(String description, String day, String startTime, String zoomLink) { + schedules.add(new Link(description, day, startTime, zoomLink)); + } + + public String listAllLinks() { + String result = ""; + int i = 1; + for (Link l : schedules) { + result += String.format("%d. %s, %s, %s, %s\n", i, l.getDescription(), + l.getDay(), l.getStartTime(), l.getZoomLink()); + i++; + } + return result; + } + + public String getLinkData(int contentNumber) throws InvalidArgumentException { + if (!isValidNumber(contentNumber)) { + throw new InvalidArgumentException("Error: content not found."); + } + return schedules.get(contentNumber - 1).getDisplayInfo(); + } + + public ArrayList getSchedules() { + return schedules; + } + + public int getTotalLinks() { + return schedules.size(); + } + + public String deleteLink(int contentNumber) throws InvalidArgumentException { + if (!isValidNumber(contentNumber)) { + throw new InvalidArgumentException("Error: content not found."); + } + String deletedLinkDescription = schedules.get(contentNumber - 1).getDescription() + ", "; + deletedLinkDescription += schedules.get(contentNumber - 1).getDay() + ", "; + deletedLinkDescription += schedules.get(contentNumber - 1).getStartTime() + ", "; + deletedLinkDescription += schedules.get(contentNumber - 1).getZoomLink(); + schedules.remove(contentNumber - 1); + return deletedLinkDescription; + } + + private boolean isValidNumber(int number) { + return !(number < 1 || number > schedules.size()); + } +} diff --git a/src/main/java/terminus/content/Note.java b/src/main/java/terminus/content/Note.java new file mode 100644 index 0000000000..2eb34a3154 --- /dev/null +++ b/src/main/java/terminus/content/Note.java @@ -0,0 +1,10 @@ +package terminus.content; + +public class Note extends Content{ + + final public static String TYPE = "N"; + + public Note(String name, String data) { + super(name, data); + } +} diff --git a/src/main/java/terminus/module/NusModule.java b/src/main/java/terminus/module/NusModule.java index 41c5ff84fe..2eef542c06 100644 --- a/src/main/java/terminus/module/NusModule.java +++ b/src/main/java/terminus/module/NusModule.java @@ -1,5 +1,40 @@ package terminus.module; +import java.util.ArrayList; +import terminus.content.Content; +import terminus.content.ContentManager; +import terminus.content.Note; + public class NusModule { + private ArrayList notes; + + private ContentManager contentManager; + + public NusModule() { + contentManager = new ContentManager(); + notes = new ArrayList(); + } + + public ContentManager getContentManager() { + return contentManager; + } + + public ArrayList getNotes() { + return notes; + } + + public void setNotes(ArrayList notes) { + this.notes = notes; + } + + public ArrayList get(T type) { + ArrayList result = new ArrayList<>(); + if(type == Note.class){ + result = this.notes; + }else{ + // Error encountered + } + return result; + } } diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java index 78a05d9781..2c6936dac1 100644 --- a/src/main/java/terminus/parser/CommandParser.java +++ b/src/main/java/terminus/parser/CommandParser.java @@ -8,6 +8,7 @@ import terminus.command.ExitCommand; import terminus.command.Command; import terminus.command.HelpCommand; +import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; public class CommandParser { @@ -23,7 +24,7 @@ public CommandParser(String workspace) { addCommand("help", new HelpCommand(this)); } - public Command parseCommand(String command) throws InvalidCommandException { + public Command parseCommand(String command) throws InvalidCommandException, InvalidArgumentException { String[] commandLine = command.strip().split(SPACE_DELIMITER, 2); String cmdName = commandLine[0]; Command currentCommand = commandMap.get(cmdName.strip().toLowerCase(Locale.ROOT)); diff --git a/src/main/java/terminus/parser/LinkCommandParser.java b/src/main/java/terminus/parser/LinkCommandParser.java new file mode 100644 index 0000000000..8058309439 --- /dev/null +++ b/src/main/java/terminus/parser/LinkCommandParser.java @@ -0,0 +1,83 @@ +package terminus.parser; + +import terminus.command.*; +import terminus.command.zoomlink.AddLinkCommand; +import terminus.command.zoomlink.ViewLinkCommand; +import terminus.common.CommonFormat; +import terminus.content.Link; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; + +import java.util.HashMap; +import java.util.Locale; +import java.util.Set; + +public class LinkCommandParser { + private static final String SPACE_DELIMITER = "\\s+"; + protected String workspace; + protected final HashMap commandMap; + + public LinkCommandParser(String workspace) { + this.commandMap = new HashMap<>(); + this.workspace = workspace; + addCommand("exit", new ExitCommand()); + addCommand("help", new HelpCommand(this)); + } + + public Command parseCommand(String command) throws InvalidCommandException, InvalidArgumentException { + String[] commandLine = command.strip().split(SPACE_DELIMITER, 2); + String cmdName = commandLine[0]; + Command currentCommand = commandMap.get(cmdName.strip().toLowerCase(Locale.ROOT)); + if (currentCommand == null) { + throw new InvalidCommandException("Command not found! Type 'help' for a list of commands."); + } + + String cmdData = null; + if (commandLine.length > 1) { + cmdData = commandLine[1]; + } + currentCommand.parseArguments(cmdData); + return currentCommand; + } + + public Set getCommandList() { + return commandMap.keySet(); + } + + /** + * Get the help menu for the current workspace. + * + * @return Array of strings contain the help messages + */ + public String[] getHelpMenu() { + return commandMap.entrySet() + .stream() + .map((i) -> String.format("%s : %s\nFormat: %s\n", + i.getKey(), + i.getValue().getHelpMessage(), + i.getValue().getFormat())) + .toArray(String[]::new); + } + + protected void addCommand(String cmdName, Command command) { + commandMap.put(cmdName, command); + } + + public String getWorkspace() { + return workspace; + } + + public LinkCommandParser() { + super(CommonFormat.COMMAND_SCHEDULE); + } + + public static LinkCommandParser getInstance() { + LinkCommandParser parser = new LinkCommandParser(); + parser.addCommand(CommonFormat.COMMAND_BACK, new BackCommand()); + parser.addCommand(CommonFormat.COMMAND_ADD, new AddLinkCommand()); + parser.addCommand(CommonFormat.COMMAND_VIEW, new ViewLinkCommand>(Link.class)); + parser.addCommand(CommonFormat.COMMAND_DELETE, new DeleteCommand>(Link.class)); + return parser; + } + +} diff --git a/src/main/java/terminus/parser/MainCommandParser.java b/src/main/java/terminus/parser/MainCommandParser.java index 795f41e144..61ae76ee11 100644 --- a/src/main/java/terminus/parser/MainCommandParser.java +++ b/src/main/java/terminus/parser/MainCommandParser.java @@ -1,6 +1,7 @@ package terminus.parser; import terminus.command.NotesCommand; +import terminus.command.SchedulesCommand; public class MainCommandParser extends CommandParser { @@ -13,6 +14,7 @@ public MainCommandParser() { public static MainCommandParser getInstance() { MainCommandParser parser = PARSER; parser.addCommand("notes", new NotesCommand()); + parser.addCommand("schedules", new SchedulesCommand()); return parser; } } diff --git a/src/main/java/terminus/schedule/ZoomLink.java b/src/main/java/terminus/schedule/ZoomLink.java new file mode 100644 index 0000000000..84657aae58 --- /dev/null +++ b/src/main/java/terminus/schedule/ZoomLink.java @@ -0,0 +1,41 @@ +package terminus.schedule; + +import java.util.ArrayList; +import terminus.content.Link; +import terminus.content.LinkManager; + + +public class ZoomLink { + + private ArrayList schedules; + + private LinkManager linkManager; + + public ZoomLink() { + linkManager = new LinkManager(); + schedules = new ArrayList(); + } + + public LinkManager getLinkManager() { + return linkManager; + } + + public ArrayList getSchedules() { + return schedules; + } + + public void setSchedules(ArrayList schedules) { + this.schedules = schedules; + } + + public ArrayList get(T type) { + ArrayList result = new ArrayList<>(); + if(type == Link.class){ + result = this.schedules; + }else{ + // Error encountered + } + return result; + } +} + From 226a261d347ccc9feacc334ab5c16689bc3ac2af Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Tue, 5 Oct 2021 21:19:23 +0800 Subject: [PATCH 030/466] Fix formatting for auto checks --- .../terminus/command/SchedulesCommand.java | 8 +++--- .../command/zoomlink/AddLinkCommand.java | 26 +++++++++---------- .../java/terminus/common/CommonFormat.java | 2 +- src/main/java/terminus/content/Link.java | 4 +-- .../terminus/parser/LinkCommandParser.java | 4 ++- 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/main/java/terminus/command/SchedulesCommand.java b/src/main/java/terminus/command/SchedulesCommand.java index f43b699430..efbd9329e0 100644 --- a/src/main/java/terminus/command/SchedulesCommand.java +++ b/src/main/java/terminus/command/SchedulesCommand.java @@ -12,11 +12,11 @@ public SchedulesCommand() { @Override public String getFormat() { - return "schedules"; - } + return "schedules"; + } @Override public String getHelpMessage() { - return "Move to schedules workspace."; - } + return "Move to schedules workspace."; + } } diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index 819c3b3bc1..1e8f435654 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -29,8 +29,8 @@ public AddLinkCommand() { @Override public String getFormat() { - return CommonFormat.COMMAND_ADD + " \"{description}\" " + - "\"{day}\" \"{start_time}\" \"{zoom_link}\""; + return CommonFormat.COMMAND_ADD + " \"{description}\" " + + "\"{day}\" \"{start_time}\" \"{zoom_link}\""; } @Override @@ -41,11 +41,11 @@ public String getHelpMessage() { @Override public void parseArguments(String arguments) throws InvalidArgumentException { // Perform required checks with regex - if(arguments == null || arguments.isBlank()){ + if (arguments == null || arguments.isBlank()) { throw new InvalidArgumentException("Error: Missing arguments."); } ArrayList argArray = findArguments(arguments); - if(!isValidArguments(argArray)){ + if (!isValidArguments(argArray)) { throw new InvalidArgumentException("Error: Missing arguments."); } this.description = argArray.get(0); @@ -61,32 +61,32 @@ public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandExcep contentManager.addLink(description, day, startTime, zoomLink); module.setLinks(contentManager.getContents()); ui.printSection(String.format(Messages.MESSAGE_RESPONSE_ADD, CommonFormat.COMMAND_SCHEDULE)); - return new CommandResult(true,false); + return new CommandResult(true, false); } - private ArrayList findArguments(String arg){ + private ArrayList findArguments(String arg) { ArrayList argsArray = new ArrayList<>(); Pattern p = Pattern.compile("\"(.*?)\""); Matcher m = p.matcher(arg); - while(m.find()){ + while (m.find()) { argsArray.add(m.group(1)); } return argsArray; } - private boolean isValidArguments(ArrayList argArray){ + private boolean isValidArguments(ArrayList argArray) { boolean isValid = true; - if(argArray.size() != totalArg){ + if (argArray.size() != totalArg) { isValid = false; - }else if(isArrayEmpty(argArray)){ + } else if (isArrayEmpty(argArray)) { isValid = false; } return isValid; } - private boolean isArrayEmpty(ArrayList argArray){ - for(String s:argArray){ - if(s.isBlank()){ + private boolean isArrayEmpty(ArrayList argArray) { + for (String s : argArray) { + if (s.isBlank()) { return true; } } diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index c47b88179c..88e0f13d21 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -9,7 +9,7 @@ public class CommonFormat { public static final String COMMAND_BACK = "back"; public static final String COMMAND_EXIT = "exit"; public static final String COMMAND_HELP = "help"; - final public static String COMMAND_SCHEDULE = "schedules"; + public static final String COMMAND_SCHEDULE = "schedules"; public static final String COMMAND_DELETE_FORMAT = COMMAND_DELETE + " "; public static final String COMMAND_VIEW_FORMAT = COMMAND_VIEW + " {item number}"; diff --git a/src/main/java/terminus/content/Link.java b/src/main/java/terminus/content/Link.java index e857462097..6cea2f380e 100644 --- a/src/main/java/terminus/content/Link.java +++ b/src/main/java/terminus/content/Link.java @@ -5,9 +5,9 @@ public class Link extends Content { private String day; private String startTime; private String zoomLink; - final public static String TYPE = "Z"; + public static final String TYPE = "Z"; - final private String DISPLAY_LINK_MESSAGE = "%s, %s, %s, %s"; + private static final String DISPLAY_LINK_MESSAGE = "%s, %s, %s, %s"; public Link(String name, String day, String startTime, String zoomLink) { super(name); diff --git a/src/main/java/terminus/parser/LinkCommandParser.java b/src/main/java/terminus/parser/LinkCommandParser.java index 3a1aaa53cb..711359e28f 100644 --- a/src/main/java/terminus/parser/LinkCommandParser.java +++ b/src/main/java/terminus/parser/LinkCommandParser.java @@ -1,7 +1,9 @@ package terminus.parser; -import terminus.command.*; +import terminus.command.BackCommand; import terminus.command.zoomlink.AddLinkCommand; +import terminus.command.ViewCommand; +import terminus.command.DeleteCommand; import terminus.common.CommonFormat; import terminus.content.Link; From fc949c6f38337f7eb7eb1c6ede6a7d1ab3ff0b7c Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Tue, 5 Oct 2021 22:44:34 +0800 Subject: [PATCH 031/466] Update text-ui-test, change naming convention --- ...SchedulesCommand.java => LinkCommand.java} | 10 +++-- src/main/java/terminus/common/Messages.java | 1 + .../terminus/parser/MainCommandParser.java | 4 +- text-ui-test/EXPECTED.TXT | 42 +++++++++++++++++-- text-ui-test/input.txt | 15 ++++++- 5 files changed, 62 insertions(+), 10 deletions(-) rename src/main/java/terminus/command/{SchedulesCommand.java => LinkCommand.java} (52%) diff --git a/src/main/java/terminus/command/SchedulesCommand.java b/src/main/java/terminus/command/LinkCommand.java similarity index 52% rename from src/main/java/terminus/command/SchedulesCommand.java rename to src/main/java/terminus/command/LinkCommand.java index efbd9329e0..bdf20ed506 100644 --- a/src/main/java/terminus/command/SchedulesCommand.java +++ b/src/main/java/terminus/command/LinkCommand.java @@ -1,22 +1,24 @@ package terminus.command; +import terminus.common.CommonFormat; +import terminus.common.Messages; import terminus.parser.LinkCommandParser; -public class SchedulesCommand extends WorkspaceCommand { +public class LinkCommand extends WorkspaceCommand { private String arguments; - public SchedulesCommand() { + public LinkCommand() { super(LinkCommandParser.getInstance()); } @Override public String getFormat() { - return "schedules"; + return CommonFormat.COMMAND_SCHEDULE; } @Override public String getHelpMessage() { - return "Move to schedules workspace."; + return Messages.MESSAGE_COMMAND_SCHEDULE; } } diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index 17f3e803dd..9c3637091e 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -9,6 +9,7 @@ public class Messages { public static final String MESSAGE_COMMAND_EXIT = "Exits the program."; public static final String MESSAGE_COMMAND_HELP = "Prints the help page."; public static final String MESSAGE_COMMAND_NOTE = "Move to notes workspace."; + public static final String MESSAGE_COMMAND_SCHEDULE = "Move to schedules workspace."; public static final String MESSAGE_RESPONSE_DELETE = "%s \'%s\' has been deleted!"; public static final String MESSAGE_RESPONSE_ADD = "%s has been added!"; diff --git a/src/main/java/terminus/parser/MainCommandParser.java b/src/main/java/terminus/parser/MainCommandParser.java index 83a468d766..1182470d84 100644 --- a/src/main/java/terminus/parser/MainCommandParser.java +++ b/src/main/java/terminus/parser/MainCommandParser.java @@ -1,7 +1,7 @@ package terminus.parser; import terminus.command.NotesCommand; -import terminus.command.SchedulesCommand; +import terminus.command.LinkCommand; import terminus.common.CommonFormat; public class MainCommandParser extends CommandParser { @@ -15,7 +15,7 @@ public MainCommandParser() { public static MainCommandParser getInstance() { MainCommandParser parser = PARSER; parser.addCommand(CommonFormat.COMMAND_NOTE, new NotesCommand()); - parser.addCommand(CommonFormat.COMMAND_SCHEDULE, new SchedulesCommand()); + parser.addCommand(CommonFormat.COMMAND_SCHEDULE, new LinkCommand()); return parser; } } diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index e79e3050c4..91b206dce7 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -4,10 +4,11 @@ Type any of the following to get started: > exit > help > note +> schedules [] >>> Command not found! Type 'help' for a list of commands. [] >>> Command not found! Type 'help' for a list of commands. -[] >>> +[] >>> Type any of the following to get started: > add > exit @@ -35,11 +36,12 @@ delete : delete an item from your list. Format: delete [note] >>> Command not found! Type 'help' for a list of commands. -[note] >>> +[note] >>> Type any of the following to get started: > exit > help > note +> schedules [] >>> note has been added! [] >>> 1. CS2113T @@ -52,7 +54,6 @@ Content: Week 8 test [] >>> Error: Invalid numerical value provided. [] >>> Error: Content not found. [] >>> class terminus.content.Note 'CS2113T' has been deleted! -[] >>> [] >>> exit : Exits the program. Format: exit @@ -62,4 +63,39 @@ Format: help note : Move to notes workspace. Format: note +schedules : Move to schedules workspace. +Format: schedules + +[] >>> schedules has been added! +[] >>> schedules has been added! +[] >>> Command not found! Type 'help' for a list of commands. +[] >>> 1. CS2113T Tutorial, Thursday, 10:00, zoom.nus.sg +2. CS2113T Lecture, Friday, 16:00, zoom.com + +[] >>> Error: Content not found. +[] >>> CS2113T Lecture, Friday, 16:00, zoom.com +[] >>> Error: Content not found. +[] >>> class terminus.content.Link 'CS2113T Tutorial' has been deleted! +[] >>> 1. CS2113T Lecture, Friday, 16:00, zoom.com + +[] >>> +Type any of the following to get started: +> add +> exit +> help +> view +> back +> delete + +[schedules] >>> 1. CS2113T Lecture, Friday, 16:00, zoom.com + +[schedules] >>> Error: Missing arguments. +[schedules] >>> class terminus.content.Link 'CS2113T Lecture' has been deleted! +[schedules] >>> +Type any of the following to get started: +> exit +> help +> note +> schedules + [] >>> Goodbye! diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index ab3f79aa62..9b5c30b049 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -12,6 +12,19 @@ note view 1 note delete aa note delete 2 note delete 1 -note view help +schedules add "CS2113T Tutorial" "Thursday" "10:00" "zoom.nus.sg" +schedules add "CS2113T Lecture" "Friday" "16:00" "zoom.com" +schedules invalid +schedules view +schedules view 4 +schedules view 2 +schedules delete 5 +schedules delete 1 +schedules view +schedules +view +delete +delete 1 +back exit \ No newline at end of file From 4cf69f716dfd0a2d2af013ac587777104cb5bd25 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Tue, 5 Oct 2021 22:49:10 +0800 Subject: [PATCH 032/466] Fix minor code quality issues --- src/main/java/terminus/Terminus.java | 1 - src/main/java/terminus/command/BackCommand.java | 2 +- src/main/java/terminus/command/Command.java | 2 -- src/main/java/terminus/command/ViewCommand.java | 1 - src/main/java/terminus/command/zoomlink/AddLinkCommand.java | 1 - src/main/java/terminus/content/Content.java | 1 - src/main/java/terminus/exception/InvalidCommandException.java | 1 - src/main/java/terminus/parser/CommandParser.java | 2 -- src/main/java/terminus/parser/LinkCommandParser.java | 1 - src/main/java/terminus/ui/Ui.java | 1 - 10 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 6ffb8b010f..86fd51ccec 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -71,5 +71,4 @@ private void runCommandsUntilExit() { private void exit() { this.ui.printExitMessage(); } - } diff --git a/src/main/java/terminus/command/BackCommand.java b/src/main/java/terminus/command/BackCommand.java index 4408f7d0be..9d3028d4cb 100644 --- a/src/main/java/terminus/command/BackCommand.java +++ b/src/main/java/terminus/command/BackCommand.java @@ -21,7 +21,7 @@ public String getHelpMessage() { @Override public void parseArguments(String arguments) { - + return; } @Override diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java index 76417f3b97..907c8521cc 100644 --- a/src/main/java/terminus/command/Command.java +++ b/src/main/java/terminus/command/Command.java @@ -19,6 +19,4 @@ public Command() { public abstract CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException, InvalidArgumentException; - - } diff --git a/src/main/java/terminus/command/ViewCommand.java b/src/main/java/terminus/command/ViewCommand.java index ab5c0e43d1..1d25924802 100644 --- a/src/main/java/terminus/command/ViewCommand.java +++ b/src/main/java/terminus/command/ViewCommand.java @@ -56,5 +56,4 @@ public CommandResult execute(Ui ui, NusModule module) throws InvalidArgumentExce ui.printSection(result); return new CommandResult(true, false); } - } diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index 1e8f435654..8d4d0d4bc7 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -92,5 +92,4 @@ private boolean isArrayEmpty(ArrayList argArray) { } return false; } - } diff --git a/src/main/java/terminus/content/Content.java b/src/main/java/terminus/content/Content.java index bdbf847496..4d19495caa 100644 --- a/src/main/java/terminus/content/Content.java +++ b/src/main/java/terminus/content/Content.java @@ -40,5 +40,4 @@ public String getDisplayInfo() { public String getViewDescription() { return this.name; } - } diff --git a/src/main/java/terminus/exception/InvalidCommandException.java b/src/main/java/terminus/exception/InvalidCommandException.java index 95dd81612b..d1b23224ab 100644 --- a/src/main/java/terminus/exception/InvalidCommandException.java +++ b/src/main/java/terminus/exception/InvalidCommandException.java @@ -5,5 +5,4 @@ public class InvalidCommandException extends Exception { public InvalidCommandException(String message) { super(message); } - } diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java index 2c6936dac1..586b7ca09f 100644 --- a/src/main/java/terminus/parser/CommandParser.java +++ b/src/main/java/terminus/parser/CommandParser.java @@ -1,10 +1,8 @@ package terminus.parser; import java.util.HashMap; -import java.util.List; import java.util.Locale; import java.util.Set; -import java.util.stream.Collectors; import terminus.command.ExitCommand; import terminus.command.Command; import terminus.command.HelpCommand; diff --git a/src/main/java/terminus/parser/LinkCommandParser.java b/src/main/java/terminus/parser/LinkCommandParser.java index 711359e28f..67d254131d 100644 --- a/src/main/java/terminus/parser/LinkCommandParser.java +++ b/src/main/java/terminus/parser/LinkCommandParser.java @@ -21,5 +21,4 @@ public static LinkCommandParser getInstance() { parser.addCommand(CommonFormat.COMMAND_DELETE, new DeleteCommand>(Link.class)); return parser; } - } diff --git a/src/main/java/terminus/ui/Ui.java b/src/main/java/terminus/ui/Ui.java index fe4293ec3b..117f8164db 100644 --- a/src/main/java/terminus/ui/Ui.java +++ b/src/main/java/terminus/ui/Ui.java @@ -63,5 +63,4 @@ public void printSection(String... strings) { public void printExitMessage() { System.out.println("Goodbye!"); } - } From c52d9d4c9df200d64070307292c3c6f8f92b46c2 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Tue, 5 Oct 2021 23:46:23 +0800 Subject: [PATCH 033/466] Update JavaDocs --- src/main/java/terminus/command/Command.java | 10 +++++----- src/main/java/terminus/command/CommandResult.java | 12 +++++++++--- .../java/terminus/command/WorkspaceCommand.java | 4 ++-- src/main/java/terminus/parser/CommandParser.java | 13 ++++++++++++- 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java index 7b72af33c7..7a1329868c 100644 --- a/src/main/java/terminus/command/Command.java +++ b/src/main/java/terminus/command/Command.java @@ -13,21 +13,21 @@ public Command() { } /** - * Contains the format for the command. + * Returns the format for the command. * * @return The String object holding the appropriate format for the command. */ public abstract String getFormat(); /** - * Contains the description for the command. + * Returns the description for the command. * * @return The String object containing the description for this command. */ public abstract String getHelpMessage(); /** - * The function that parse the remaining arguments for the command. + * Parses remaining arguments for the command. * * @param arguments The string arguments to be parsed in to the respective fields. * @throws InvalidArgumentException Fail to parse arguments @@ -36,8 +36,8 @@ public Command() { /** - * A common function that needs to be run to execute the command. This function also updates the required changes - * and prints UI. + * Executes the command. + * Prints the required result to the Ui. * * @param ui The Ui object to send messages to the users. * @param module The NusModule contain the list of all notes and schedules. diff --git a/src/main/java/terminus/command/CommandResult.java b/src/main/java/terminus/command/CommandResult.java index 090bed1d20..0eaf08ceb1 100644 --- a/src/main/java/terminus/command/CommandResult.java +++ b/src/main/java/terminus/command/CommandResult.java @@ -33,7 +33,8 @@ public CommandResult(boolean isOk) { } /** - * Contain the CommandParser that is required to switch workspaces. + * Returns the CommandParser that is required to switch workspaces. + * If there isn't it s null. * * @return The CommandParser object for the workspace or else null */ @@ -51,14 +52,19 @@ public boolean isOk() { } /** - * Tells the program to quit if the 'exit' command is sent. + * Returns the result to exit or not. * - * @return true if 'exit' command is sent + * @return True if 'exit' command is sent */ public boolean isExit() { return isExit; } + /** + * Returns the error message as a String. + * + * @return The String object containing the error + */ public String getErrorMessage() { return errorMessage; } diff --git a/src/main/java/terminus/command/WorkspaceCommand.java b/src/main/java/terminus/command/WorkspaceCommand.java index a2aa4ff6b9..b6423d174b 100644 --- a/src/main/java/terminus/command/WorkspaceCommand.java +++ b/src/main/java/terminus/command/WorkspaceCommand.java @@ -21,8 +21,8 @@ public void parseArguments(String arguments) { } /** - * A custom execute for command that switch workplaces. Runs any additional commands in arguments but will change - * works space if none is specified + * Returns the Command Result after execution. + * If no other arguments, returns the workspace. * * @param ui The Ui object to send messages to the users. * @param module The NusModule contain the list of all notes and schedules. diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java index d96cdb36d9..a2d713ba61 100644 --- a/src/main/java/terminus/parser/CommandParser.java +++ b/src/main/java/terminus/parser/CommandParser.java @@ -59,7 +59,7 @@ public Set getCommandList() { } /** - * Get the help menu for the current workspace. + * Returns the list of items in the help menu. * * @return Array of strings contain the help messages */ @@ -73,10 +73,21 @@ public String[] getHelpMenu() { .toArray(String[]::new); } + /** + * Adds a command to the commandMap. + * + * @param cmdName The name of the command + * @param command The actual command object + */ protected void addCommand(String cmdName, Command command) { commandMap.put(cmdName, command); } + /** + * Returns the name of the current workspace. + * + * @return The name of the workspace + */ public String getWorkspace() { return workspace; } From 0b214a08160752f31fd5717d58a6569cd8affd44 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Tue, 5 Oct 2021 23:53:10 +0800 Subject: [PATCH 034/466] Typo fix --- src/main/java/terminus/command/CommandResult.java | 2 +- src/main/java/terminus/parser/CommandParser.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/terminus/command/CommandResult.java b/src/main/java/terminus/command/CommandResult.java index 0eaf08ceb1..e0d90b4921 100644 --- a/src/main/java/terminus/command/CommandResult.java +++ b/src/main/java/terminus/command/CommandResult.java @@ -34,7 +34,7 @@ public CommandResult(boolean isOk) { /** * Returns the CommandParser that is required to switch workspaces. - * If there isn't it s null. + * If additionalData will be null. * * @return The CommandParser object for the workspace or else null */ diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java index a2d713ba61..b8341c9aad 100644 --- a/src/main/java/terminus/parser/CommandParser.java +++ b/src/main/java/terminus/parser/CommandParser.java @@ -18,7 +18,8 @@ public class CommandParser { protected final HashMap commandMap; /** - * Initializes the commandMap. Adds some default commands to it. + * Initializes the commandMap. + * Adds some default commands to it. * * @param workspace The name of the workspace */ From 713729cd4595981f008abf7179639342d5351302 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Wed, 6 Oct 2021 20:52:33 +0800 Subject: [PATCH 035/466] Add NoteCommandParser JUnitTesting --- .../parser/NoteCommandParserTest.java | 157 ++++++++++++++++++ 1 file changed, 157 insertions(+) create mode 100644 src/test/java/terminus/parser/NoteCommandParserTest.java diff --git a/src/test/java/terminus/parser/NoteCommandParserTest.java b/src/test/java/terminus/parser/NoteCommandParserTest.java new file mode 100644 index 0000000000..243facdac7 --- /dev/null +++ b/src/test/java/terminus/parser/NoteCommandParserTest.java @@ -0,0 +1,157 @@ +package terminus.parser; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import javax.swing.text.View; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.command.DeleteCommand; +import terminus.command.ExitCommand; +import terminus.command.HelpCommand; +import terminus.command.ViewCommand; +import terminus.command.note.AddCommand; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.NusModule; +import terminus.ui.Ui; + +public class NoteCommandParserTest { + + private NoteCommandParser commandParser; + private NusModule nusModule; + private Ui ui; + + @BeforeEach + void setUp() { + this.commandParser = NoteCommandParser.getInstance(); + this.nusModule = new NusModule(); + this.ui = new Ui(); + } + + @Test + void parseCommand_invalidCommand_exceptionThrown() { + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("ex it")); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("helpa")); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("adda")); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("vie wer")); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("deleterr")); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("")); + } + + @Test + void parseCommand_resolveExitCommand_success() throws InvalidCommandException, InvalidArgumentException { + assertTrue(commandParser.parseCommand("exit") instanceof ExitCommand); + assertTrue(commandParser.parseCommand("EXIT") instanceof ExitCommand); + assertTrue(commandParser.parseCommand(" exit ") instanceof ExitCommand); + assertTrue(commandParser.parseCommand("eXiT a") instanceof ExitCommand); + } + + @Test + void parseCommand_resolveHelpCommand_success() throws InvalidCommandException, InvalidArgumentException { + assertTrue(commandParser.parseCommand("help") instanceof HelpCommand); + assertTrue(commandParser.parseCommand("HELP") instanceof HelpCommand); + assertTrue(commandParser.parseCommand(" help ") instanceof HelpCommand); + assertTrue(commandParser.parseCommand("HeLp a") instanceof HelpCommand); + } + + @Test + void parseCommand_resolveAddCommand_exceptionThrown() throws InvalidCommandException, InvalidArgumentException { + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("add")); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("add \"test1\"test2\"")); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("add \"test\" \"test1\" \"test2\"")); + } + + @Test + void parseCommand_resolveAddCommand_success() throws InvalidCommandException, InvalidArgumentException { + assertTrue(commandParser.parseCommand("add \"test\" \"test1\"") instanceof AddCommand); + assertTrue(commandParser.parseCommand("add \" test \" \" test1 \"") instanceof AddCommand); + assertTrue(commandParser.parseCommand("add \"username\" \"password\"") instanceof AddCommand); + } + + @Test + void parseCommand_resolveDeleteCommand_exceptionThrown() throws InvalidCommandException, InvalidArgumentException { + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("delete")); + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("delete abcd")); + } + + @Test + void parseCommand_resolveDeleteCommand_success() throws InvalidCommandException, InvalidArgumentException { + assertTrue(commandParser.parseCommand("delete 1") instanceof DeleteCommand); + assertTrue(commandParser.parseCommand("delete -1") instanceof DeleteCommand); + } + + @Test + void parseCommand_resolveViewCommand_exceptionThrown() throws InvalidCommandException, InvalidArgumentException { + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("view abcd")); + } + + @Test + void parseCommand_resolveViewCommand_success() throws InvalidCommandException, InvalidArgumentException { + assertTrue(commandParser.parseCommand("view") instanceof ViewCommand); + assertTrue(commandParser.parseCommand("view 1") instanceof ViewCommand); + } + + @Test + void execute_addCommand_success() throws InvalidCommandException, InvalidArgumentException { + Command addCommand = commandParser.parseCommand("add \"test\" \"test1\""); + CommandResult addResult = addCommand.execute(ui, nusModule); + assertTrue(addResult.isOk()); + assertEquals(1, nusModule.getContentManager().getTotalContents()); + assertTrue(nusModule.getContentManager().getContentData(1).contains("test")); + assertTrue(nusModule.getContentManager().getContentData(1).contains("test1")); + for (int i = 0; i < 5; i++) { + addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); + addResult = addCommand.execute(ui, nusModule); + assertTrue(addResult.isOk()); + } + assertEquals(6, nusModule.getContentManager().getTotalContents()); + } + + @Test + void execute_deleteCommand_success() throws InvalidCommandException, InvalidArgumentException { + for (int i = 0; i < 5; i++) { + Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); + CommandResult addResult = addCommand.execute(ui, nusModule); + assertTrue(addResult.isOk()); + } + + assertEquals(5, nusModule.getContentManager().getTotalContents()); + + Command deleteCommand = commandParser.parseCommand("delete 1"); + CommandResult deleteResult = deleteCommand.execute(ui, nusModule); + assertTrue(deleteResult.isOk()); + assertEquals(4, nusModule.getContentManager().getTotalContents()); + for (int i = 2; i < 4; i++) { + deleteCommand = commandParser.parseCommand("delete " + i); + deleteResult = deleteCommand.execute(ui, nusModule); + assertTrue(deleteResult.isOk()); + } + assertEquals(2, nusModule.getContentManager().getTotalContents()); + } + + @Test + void getCommandList_containsBasicCommands() { + assertTrue(commandParser.getCommandList().contains("exit")); + assertTrue(commandParser.getCommandList().contains("add")); + assertTrue(commandParser.getCommandList().contains("back")); + assertTrue(commandParser.getCommandList().contains("delete")); + assertTrue(commandParser.getCommandList().contains("view")); + assertTrue(commandParser.getCommandList().contains("help")); + } + + @Test + void getWorkspace_isNote() { + assertEquals("note", commandParser.getWorkspace()); + } + + @Test + void getHelpMenu_isNotEmpty() { + assertTrue(commandParser.getHelpMenu().length > 0); + } +} From d973533647108f9e68cfd55a3b9dd62bdd7f04ce Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Wed, 6 Oct 2021 20:57:49 +0800 Subject: [PATCH 036/466] Fixed Formatting --- src/test/java/terminus/parser/NoteCommandParserTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/test/java/terminus/parser/NoteCommandParserTest.java b/src/test/java/terminus/parser/NoteCommandParserTest.java index 243facdac7..7caa2976be 100644 --- a/src/test/java/terminus/parser/NoteCommandParserTest.java +++ b/src/test/java/terminus/parser/NoteCommandParserTest.java @@ -61,10 +61,9 @@ void parseCommand_resolveHelpCommand_success() throws InvalidCommandException, I @Test void parseCommand_resolveAddCommand_exceptionThrown() throws InvalidCommandException, InvalidArgumentException { assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("add")); + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("add \"test1\"test2\"")); assertThrows(InvalidArgumentException.class, - () -> commandParser.parseCommand("add \"test1\"test2\"")); - assertThrows(InvalidArgumentException.class, - () -> commandParser.parseCommand("add \"test\" \"test1\" \"test2\"")); + () -> commandParser.parseCommand("add \"test\" \"test1\" \"test2\"")); } @Test From 9f035440dbcd835ff3990c8369759427857c86d2 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Wed, 6 Oct 2021 21:22:44 +0800 Subject: [PATCH 037/466] Update TestCase and Refactor JUnitTest --- .../terminus/parser/NoteAddCommandTest.java | 42 ++++++++++++++++ .../terminus/parser/NoteBackCommandTest.java | 35 ++++++++++++++ .../parser/NoteCommandParserTest.java | 36 -------------- .../parser/NoteDeleteCommandTest.java | 48 +++++++++++++++++++ 4 files changed, 125 insertions(+), 36 deletions(-) create mode 100644 src/test/java/terminus/parser/NoteAddCommandTest.java create mode 100644 src/test/java/terminus/parser/NoteBackCommandTest.java create mode 100644 src/test/java/terminus/parser/NoteDeleteCommandTest.java diff --git a/src/test/java/terminus/parser/NoteAddCommandTest.java b/src/test/java/terminus/parser/NoteAddCommandTest.java new file mode 100644 index 0000000000..a614911b53 --- /dev/null +++ b/src/test/java/terminus/parser/NoteAddCommandTest.java @@ -0,0 +1,42 @@ +package terminus.parser; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.NusModule; +import terminus.ui.Ui; + +public class NoteAddCommandTest { + private NoteCommandParser commandParser; + private NusModule nusModule; + private Ui ui; + + @BeforeEach + void setUp() { + this.commandParser = NoteCommandParser.getInstance(); + this.nusModule = new NusModule(); + this.ui = new Ui(); + } + + @Test + void execute_addCommand_success() throws InvalidCommandException, InvalidArgumentException { + Command addCommand = commandParser.parseCommand("add \"test\" \"test1\""); + CommandResult addResult = addCommand.execute(ui, nusModule); + assertTrue(addResult.isOk()); + assertEquals(1, nusModule.getContentManager().getTotalContents()); + assertTrue(nusModule.getContentManager().getContentData(1).contains("test")); + assertTrue(nusModule.getContentManager().getContentData(1).contains("test1")); + for (int i = 0; i < 5; i++) { + addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); + addResult = addCommand.execute(ui, nusModule); + assertTrue(addResult.isOk()); + } + assertEquals(6, nusModule.getContentManager().getTotalContents()); + } +} diff --git a/src/test/java/terminus/parser/NoteBackCommandTest.java b/src/test/java/terminus/parser/NoteBackCommandTest.java new file mode 100644 index 0000000000..3a343f46c7 --- /dev/null +++ b/src/test/java/terminus/parser/NoteBackCommandTest.java @@ -0,0 +1,35 @@ +package terminus.parser; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import com.sun.tools.javac.Main; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.NusModule; +import terminus.ui.Ui; + +public class NoteBackCommandTest { + + private NoteCommandParser commandParser; + private NusModule nusModule; + private Ui ui; + + @BeforeEach + void setUp() { + this.commandParser = NoteCommandParser.getInstance(); + this.nusModule = new NusModule(); + this.ui = new Ui(); + } + + @Test + void execute_deleteCommand_success() throws InvalidCommandException, InvalidArgumentException { + Command backCommand = commandParser.parseCommand("back"); + CommandResult backResult = backCommand.execute(ui, nusModule); + assertTrue(backResult.isOk()); + assertTrue(backResult.getAdditionalData() instanceof MainCommandParser); + } +} diff --git a/src/test/java/terminus/parser/NoteCommandParserTest.java b/src/test/java/terminus/parser/NoteCommandParserTest.java index 7caa2976be..649b23422d 100644 --- a/src/test/java/terminus/parser/NoteCommandParserTest.java +++ b/src/test/java/terminus/parser/NoteCommandParserTest.java @@ -96,43 +96,7 @@ void parseCommand_resolveViewCommand_success() throws InvalidCommandException, I assertTrue(commandParser.parseCommand("view 1") instanceof ViewCommand); } - @Test - void execute_addCommand_success() throws InvalidCommandException, InvalidArgumentException { - Command addCommand = commandParser.parseCommand("add \"test\" \"test1\""); - CommandResult addResult = addCommand.execute(ui, nusModule); - assertTrue(addResult.isOk()); - assertEquals(1, nusModule.getContentManager().getTotalContents()); - assertTrue(nusModule.getContentManager().getContentData(1).contains("test")); - assertTrue(nusModule.getContentManager().getContentData(1).contains("test1")); - for (int i = 0; i < 5; i++) { - addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); - addResult = addCommand.execute(ui, nusModule); - assertTrue(addResult.isOk()); - } - assertEquals(6, nusModule.getContentManager().getTotalContents()); - } - @Test - void execute_deleteCommand_success() throws InvalidCommandException, InvalidArgumentException { - for (int i = 0; i < 5; i++) { - Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); - CommandResult addResult = addCommand.execute(ui, nusModule); - assertTrue(addResult.isOk()); - } - - assertEquals(5, nusModule.getContentManager().getTotalContents()); - - Command deleteCommand = commandParser.parseCommand("delete 1"); - CommandResult deleteResult = deleteCommand.execute(ui, nusModule); - assertTrue(deleteResult.isOk()); - assertEquals(4, nusModule.getContentManager().getTotalContents()); - for (int i = 2; i < 4; i++) { - deleteCommand = commandParser.parseCommand("delete " + i); - deleteResult = deleteCommand.execute(ui, nusModule); - assertTrue(deleteResult.isOk()); - } - assertEquals(2, nusModule.getContentManager().getTotalContents()); - } @Test void getCommandList_containsBasicCommands() { diff --git a/src/test/java/terminus/parser/NoteDeleteCommandTest.java b/src/test/java/terminus/parser/NoteDeleteCommandTest.java new file mode 100644 index 0000000000..d450e9df0f --- /dev/null +++ b/src/test/java/terminus/parser/NoteDeleteCommandTest.java @@ -0,0 +1,48 @@ +package terminus.parser; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.NusModule; +import terminus.ui.Ui; + +public class NoteDeleteCommandTest { + private NoteCommandParser commandParser; + private NusModule nusModule; + private Ui ui; + + @BeforeEach + void setUp() { + this.commandParser = NoteCommandParser.getInstance(); + this.nusModule = new NusModule(); + this.ui = new Ui(); + } + + @Test + void execute_deleteCommand_success() throws InvalidCommandException, InvalidArgumentException { + for (int i = 0; i < 5; i++) { + Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); + CommandResult addResult = addCommand.execute(ui, nusModule); + assertTrue(addResult.isOk()); + } + + assertEquals(5, nusModule.getContentManager().getTotalContents()); + + Command deleteCommand = commandParser.parseCommand("delete 1"); + CommandResult deleteResult = deleteCommand.execute(ui, nusModule); + assertTrue(deleteResult.isOk()); + assertEquals(4, nusModule.getContentManager().getTotalContents()); + for (int i = 2; i < 4; i++) { + deleteCommand = commandParser.parseCommand("delete " + i); + deleteResult = deleteCommand.execute(ui, nusModule); + assertTrue(deleteResult.isOk()); + } + assertEquals(2, nusModule.getContentManager().getTotalContents()); + } +} From 1758ff2918abad2dad40d5d9da0dc6b864d5a8cc Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Thu, 7 Oct 2021 00:14:31 +0800 Subject: [PATCH 038/466] Addressed PR Comments, Resolve Conflict --- src/main/java/terminus/Terminus.java | 4 +- .../java/terminus/command/BackCommand.java | 5 -- src/main/java/terminus/command/Command.java | 21 +++++-- ...{LinkCommand.java => ScheduleCommand.java} | 4 +- .../terminus/command/WorkspaceCommand.java | 4 +- .../terminus/command/note/AddCommand.java | 33 ++--------- .../command/zoomlink/AddLinkCommand.java | 55 +++++++------------ .../java/terminus/common/CommonFormat.java | 37 ++++++++++++- src/main/java/terminus/common/Messages.java | 3 + .../java/terminus/content/ContentManager.java | 3 +- src/main/java/terminus/content/Link.java | 24 ++++---- .../exception/InvalidTimeFormatException.java | 8 +++ .../java/terminus/parser/CommandParser.java | 4 +- .../terminus/parser/MainCommandParser.java | 4 +- .../parser/MainCommandParserTest.java | 10 +++- text-ui-test/EXPECTED.TXT | 22 ++++---- text-ui-test/input.txt | 20 +++---- 17 files changed, 143 insertions(+), 118 deletions(-) rename src/main/java/terminus/command/{LinkCommand.java => ScheduleCommand.java} (83%) create mode 100644 src/main/java/terminus/exception/InvalidTimeFormatException.java diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 86fd51ccec..ed0aed56dd 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -4,6 +4,7 @@ import terminus.command.CommandResult; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidTimeFormatException; import terminus.module.NusModule; import terminus.parser.CommandParser; import terminus.parser.MainCommandParser; @@ -63,8 +64,9 @@ private void runCommandsUntilExit() { ui.printSection(e.getMessage()); } catch (InvalidArgumentException e) { ui.printSection(e.getMessage()); + } catch (InvalidTimeFormatException e) { + ui.printSection(e.getMessage()); } - } } diff --git a/src/main/java/terminus/command/BackCommand.java b/src/main/java/terminus/command/BackCommand.java index 9d3028d4cb..f584154d75 100644 --- a/src/main/java/terminus/command/BackCommand.java +++ b/src/main/java/terminus/command/BackCommand.java @@ -19,11 +19,6 @@ public String getHelpMessage() { return Messages.MESSAGE_COMMAND_BACK; } - @Override - public void parseArguments(String arguments) { - return; - } - @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { MainCommandParser mainParser = MainCommandParser.getInstance(); diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java index 907c8521cc..2a0ea0c051 100644 --- a/src/main/java/terminus/command/Command.java +++ b/src/main/java/terminus/command/Command.java @@ -2,21 +2,30 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidTimeFormatException; import terminus.module.NusModule; import terminus.ui.Ui; -public abstract class Command { +public class Command { public Command() { } - public abstract String getFormat(); + public String getFormat() { + return null; + } - public abstract String getHelpMessage(); + public String getHelpMessage() { + return null; + } - public abstract void parseArguments(String arguments) throws InvalidArgumentException; + public void parseArguments(String arguments) throws InvalidArgumentException, InvalidTimeFormatException { - public abstract CommandResult execute(Ui ui, NusModule module) - throws InvalidCommandException, InvalidArgumentException; + } + + public CommandResult execute(Ui ui, NusModule module) + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + return null; + } } diff --git a/src/main/java/terminus/command/LinkCommand.java b/src/main/java/terminus/command/ScheduleCommand.java similarity index 83% rename from src/main/java/terminus/command/LinkCommand.java rename to src/main/java/terminus/command/ScheduleCommand.java index bdf20ed506..5e6974f989 100644 --- a/src/main/java/terminus/command/LinkCommand.java +++ b/src/main/java/terminus/command/ScheduleCommand.java @@ -4,11 +4,11 @@ import terminus.common.Messages; import terminus.parser.LinkCommandParser; -public class LinkCommand extends WorkspaceCommand { +public class ScheduleCommand extends WorkspaceCommand { private String arguments; - public LinkCommand() { + public ScheduleCommand() { super(LinkCommandParser.getInstance()); } diff --git a/src/main/java/terminus/command/WorkspaceCommand.java b/src/main/java/terminus/command/WorkspaceCommand.java index 835cf30a23..08c49aa128 100644 --- a/src/main/java/terminus/command/WorkspaceCommand.java +++ b/src/main/java/terminus/command/WorkspaceCommand.java @@ -2,6 +2,7 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidTimeFormatException; import terminus.module.NusModule; import terminus.parser.CommandParser; import terminus.ui.Ui; @@ -21,7 +22,8 @@ public void parseArguments(String arguments) { } @Override - public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException, InvalidArgumentException { + public CommandResult execute(Ui ui, NusModule module) + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { if (arguments != null && !arguments.isBlank()) { return commandMap.parseCommand(arguments).execute(ui, module); } else { diff --git a/src/main/java/terminus/command/note/AddCommand.java b/src/main/java/terminus/command/note/AddCommand.java index 3240c162a9..2bc7945758 100644 --- a/src/main/java/terminus/command/note/AddCommand.java +++ b/src/main/java/terminus/command/note/AddCommand.java @@ -1,8 +1,6 @@ package terminus.command.note; import java.util.ArrayList; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import terminus.command.Command; import terminus.command.CommandResult; import terminus.common.CommonFormat; @@ -20,7 +18,7 @@ public class AddCommand extends Command { private static final String COMMAND_FORMAT = " \"{item name}\" \"{item content}\""; - private static final int TOTAL_ARGUMENTS = 2; + private static final int ADD_NOTE_ARGUMENTS = 2; public AddCommand() { @@ -42,8 +40,8 @@ public void parseArguments(String arguments) throws InvalidArgumentException { if (arguments == null || arguments.isBlank()) { throw new InvalidArgumentException(Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } - ArrayList argArray = findArguments(arguments); - if (!isValidArguments(argArray)) { + ArrayList argArray = CommonFormat.findArguments(arguments); + if (!isValidNoteArguments(argArray)) { throw new InvalidArgumentException(Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } this.name = argArray.get(0); @@ -60,32 +58,13 @@ public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandExcep return new CommandResult(true, false); } - private ArrayList findArguments(String arg) { - ArrayList argsArray = new ArrayList<>(); - Pattern p = Pattern.compile("\"(.*?)\""); - Matcher m = p.matcher(arg); - while (m.find()) { - argsArray.add(m.group(1)); - } - return argsArray; - } - - private boolean isValidArguments(ArrayList argArray) { + private boolean isValidNoteArguments(ArrayList argArray) { boolean isValid = true; - if (argArray.size() != TOTAL_ARGUMENTS) { + if (argArray.size() != ADD_NOTE_ARGUMENTS) { isValid = false; - } else if (isArrayEmpty(argArray)) { + } else if (CommonFormat.isArrayEmpty(argArray)) { isValid = false; } return isValid; } - - private boolean isArrayEmpty(ArrayList argArray) { - for (String s : argArray) { - if (s.isBlank()) { - return true; - } - } - return false; - } } diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index 8d4d0d4bc7..630953ed7d 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -3,6 +3,7 @@ import terminus.command.Command; import terminus.command.CommandResult; import terminus.content.ContentManager; +import terminus.exception.InvalidTimeFormatException; import terminus.module.NusModule; import terminus.common.CommonFormat; import terminus.common.Messages; @@ -10,21 +11,20 @@ import terminus.exception.InvalidCommandException; import terminus.ui.Ui; +import java.time.LocalTime; import java.util.ArrayList; -import java.util.regex.Matcher; -import java.util.regex.Pattern; public class AddLinkCommand extends Command { private String description; private String day; - private String startTime; - private String zoomLink; + private LocalTime startTime; + private String link; - private int totalArg; + private static final int ADD_SCHEDULE_ARGUMENTS = 4; public AddLinkCommand() { - this.totalArg = 4; + } @Override @@ -39,57 +39,40 @@ public String getHelpMessage() { } @Override - public void parseArguments(String arguments) throws InvalidArgumentException { + public void parseArguments(String arguments) throws InvalidArgumentException, InvalidTimeFormatException { // Perform required checks with regex if (arguments == null || arguments.isBlank()) { - throw new InvalidArgumentException("Error: Missing arguments."); + throw new InvalidArgumentException(Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } - ArrayList argArray = findArguments(arguments); - if (!isValidArguments(argArray)) { - throw new InvalidArgumentException("Error: Missing arguments."); + ArrayList argArray = CommonFormat.findArguments(arguments); + if (!isValidScheduleArguments(argArray)) { + throw new InvalidArgumentException(Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } + String userStartTime = argArray.get(2); + this.description = argArray.get(0); this.day = argArray.get(1); - this.startTime = argArray.get(2); - this.zoomLink = argArray.get(3); + this.startTime = CommonFormat.localTimeConverter(userStartTime); + this.link = argArray.get(3); } @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException, InvalidArgumentException { ContentManager contentManager = module.getContentManager(); contentManager.setContent(module.getLinks()); - contentManager.addLink(description, day, startTime, zoomLink); + contentManager.addLink(description, day, startTime, link); module.setLinks(contentManager.getContents()); ui.printSection(String.format(Messages.MESSAGE_RESPONSE_ADD, CommonFormat.COMMAND_SCHEDULE)); return new CommandResult(true, false); } - private ArrayList findArguments(String arg) { - ArrayList argsArray = new ArrayList<>(); - Pattern p = Pattern.compile("\"(.*?)\""); - Matcher m = p.matcher(arg); - while (m.find()) { - argsArray.add(m.group(1)); - } - return argsArray; - } - - private boolean isValidArguments(ArrayList argArray) { + private boolean isValidScheduleArguments(ArrayList argArray) { boolean isValid = true; - if (argArray.size() != totalArg) { + if (argArray.size() != ADD_SCHEDULE_ARGUMENTS) { isValid = false; - } else if (isArrayEmpty(argArray)) { + } else if (CommonFormat.isArrayEmpty(argArray)) { isValid = false; } return isValid; } - - private boolean isArrayEmpty(ArrayList argArray) { - for (String s : argArray) { - if (s.isBlank()) { - return true; - } - } - return false; - } } diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index 88e0f13d21..c802cda236 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -1,5 +1,13 @@ package terminus.common; +import terminus.exception.InvalidTimeFormatException; + +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + public class CommonFormat { public static final String COMMAND_NOTE = "note"; @@ -9,8 +17,35 @@ public class CommonFormat { public static final String COMMAND_BACK = "back"; public static final String COMMAND_EXIT = "exit"; public static final String COMMAND_HELP = "help"; - public static final String COMMAND_SCHEDULE = "schedules"; + public static final String COMMAND_SCHEDULE = "schedule"; public static final String COMMAND_DELETE_FORMAT = COMMAND_DELETE + " "; public static final String COMMAND_VIEW_FORMAT = COMMAND_VIEW + " {item number}"; + + public static ArrayList findArguments(String arg) { + ArrayList argsArray = new ArrayList<>(); + Pattern p = Pattern.compile("\"(.*?)\""); + Matcher m = p.matcher(arg); + while (m.find()) { + argsArray.add(m.group(1)); + } + return argsArray; + } + + public static boolean isArrayEmpty(ArrayList argArray) { + for (String s : argArray) { + if (s.isBlank()) { + return true; + } + } + return false; + } + + public static LocalTime localTimeConverter(String startTime) throws InvalidTimeFormatException { + if (startTime.length() != 5 || startTime.indexOf(":") != 2) { + throw new InvalidTimeFormatException(Messages.ERROR_MESSAGE_INVALID_TIME_FORMAT); + } + DateTimeFormatter format = DateTimeFormatter.ofPattern(Messages.LOCAL_TIME_FORMAT); + return LocalTime.parse(startTime, format); + } } diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index 9c3637091e..b2f18343d0 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -16,7 +16,10 @@ public class Messages { public static final String ERROR_MESSAGE_TAG = "Error: "; + public static final String LOCAL_TIME_FORMAT = "HH:mm"; + public static final String ERROR_MESSAGE_MISSING_ARGUMENTS = ERROR_MESSAGE_TAG + "Missing arguments."; public static final String ERROR_MESSAGE_EMPTY_CONTENTS = ERROR_MESSAGE_TAG + "Content not found."; public static final String ERROR_MESSAGE_INVALID_NUMBER = ERROR_MESSAGE_TAG + "Invalid numerical value provided."; + public static final String ERROR_MESSAGE_INVALID_TIME_FORMAT = ERROR_MESSAGE_TAG + "Invalid time format."; } diff --git a/src/main/java/terminus/content/ContentManager.java b/src/main/java/terminus/content/ContentManager.java index 071c6fbd0a..81b95e96cb 100644 --- a/src/main/java/terminus/content/ContentManager.java +++ b/src/main/java/terminus/content/ContentManager.java @@ -1,5 +1,6 @@ package terminus.content; +import java.time.LocalTime; import java.util.ArrayList; import terminus.common.Messages; import terminus.exception.InvalidArgumentException; @@ -20,7 +21,7 @@ public void addNote(String name, String data) { contents.add(new Note(name, data)); } - public void addLink(String description, String day, String startTime, String zoomLink) { + public void addLink(String description, String day, LocalTime startTime, String zoomLink) { contents.add(new Link(description, day, startTime, zoomLink)); } diff --git a/src/main/java/terminus/content/Link.java b/src/main/java/terminus/content/Link.java index 6cea2f380e..b8cb49fea5 100644 --- a/src/main/java/terminus/content/Link.java +++ b/src/main/java/terminus/content/Link.java @@ -1,19 +1,21 @@ package terminus.content; +import java.time.LocalTime; + public class Link extends Content { private String day; - private String startTime; - private String zoomLink; + private LocalTime startTime; + private String link; public static final String TYPE = "Z"; private static final String DISPLAY_LINK_MESSAGE = "%s, %s, %s, %s"; - public Link(String name, String day, String startTime, String zoomLink) { + public Link(String name, String day, LocalTime startTime, String link) { super(name); this.day = day; this.startTime = startTime; - this.zoomLink = zoomLink; + this.link = link; } public String getDay() { @@ -24,25 +26,25 @@ public void setDay(String day) { this.day = day; } - public String getStartTime() { + public LocalTime getStartTime() { return startTime; } - public void setStartTime(String startTime) { + public void setStartTime(LocalTime startTime) { this.startTime = startTime; } - public String getZoomLink() { - return zoomLink; + public String getLink() { + return link; } - public void setZoomLink(String zoomLink) { - this.zoomLink = zoomLink; + public void setLink(String link) { + this.link = link; } @Override public String getDisplayInfo() { - return String.format(DISPLAY_LINK_MESSAGE, this.name, day, startTime, zoomLink); + return String.format(DISPLAY_LINK_MESSAGE, this.name, day, startTime, link); } @Override diff --git a/src/main/java/terminus/exception/InvalidTimeFormatException.java b/src/main/java/terminus/exception/InvalidTimeFormatException.java new file mode 100644 index 0000000000..938a19fd45 --- /dev/null +++ b/src/main/java/terminus/exception/InvalidTimeFormatException.java @@ -0,0 +1,8 @@ +package terminus.exception; + +public class InvalidTimeFormatException extends Exception { + + public InvalidTimeFormatException(String message) { + super(message); + } +} diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java index 586b7ca09f..d691da2505 100644 --- a/src/main/java/terminus/parser/CommandParser.java +++ b/src/main/java/terminus/parser/CommandParser.java @@ -8,6 +8,7 @@ import terminus.command.HelpCommand; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidTimeFormatException; public class CommandParser { @@ -22,7 +23,8 @@ public CommandParser(String workspace) { addCommand("help", new HelpCommand(this)); } - public Command parseCommand(String command) throws InvalidCommandException, InvalidArgumentException { + public Command parseCommand(String command) + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { String[] commandLine = command.strip().split(SPACE_DELIMITER, 2); String cmdName = commandLine[0]; Command currentCommand = commandMap.get(cmdName.strip().toLowerCase(Locale.ROOT)); diff --git a/src/main/java/terminus/parser/MainCommandParser.java b/src/main/java/terminus/parser/MainCommandParser.java index 1182470d84..90821c68c4 100644 --- a/src/main/java/terminus/parser/MainCommandParser.java +++ b/src/main/java/terminus/parser/MainCommandParser.java @@ -1,7 +1,7 @@ package terminus.parser; import terminus.command.NotesCommand; -import terminus.command.LinkCommand; +import terminus.command.ScheduleCommand; import terminus.common.CommonFormat; public class MainCommandParser extends CommandParser { @@ -15,7 +15,7 @@ public MainCommandParser() { public static MainCommandParser getInstance() { MainCommandParser parser = PARSER; parser.addCommand(CommonFormat.COMMAND_NOTE, new NotesCommand()); - parser.addCommand(CommonFormat.COMMAND_SCHEDULE, new LinkCommand()); + parser.addCommand(CommonFormat.COMMAND_SCHEDULE, new ScheduleCommand()); return parser; } } diff --git a/src/test/java/terminus/parser/MainCommandParserTest.java b/src/test/java/terminus/parser/MainCommandParserTest.java index 2ab1556dbf..c7019651ac 100644 --- a/src/test/java/terminus/parser/MainCommandParserTest.java +++ b/src/test/java/terminus/parser/MainCommandParserTest.java @@ -10,6 +10,7 @@ import terminus.command.NotesCommand; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidTimeFormatException; public class MainCommandParserTest { @@ -28,7 +29,8 @@ void parseCommand_invalidCommand_exceptionThrown() { } @Test - void parseCommand_resolveExitCommand_success() throws InvalidCommandException, InvalidArgumentException { + void parseCommand_resolveExitCommand_success() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { assertTrue(commandParser.parseCommand("exit") instanceof ExitCommand); assertTrue(commandParser.parseCommand("EXIT") instanceof ExitCommand); assertTrue(commandParser.parseCommand(" exit ") instanceof ExitCommand); @@ -36,7 +38,8 @@ void parseCommand_resolveExitCommand_success() throws InvalidCommandException, I } @Test - void parseCommand_resolveHelpCommand_success() throws InvalidCommandException, InvalidArgumentException { + void parseCommand_resolveHelpCommand_success() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { assertTrue(commandParser.parseCommand("help") instanceof HelpCommand); assertTrue(commandParser.parseCommand("HELP") instanceof HelpCommand); assertTrue(commandParser.parseCommand(" help ") instanceof HelpCommand); @@ -50,7 +53,8 @@ void getCommandList_containsBasicCommands() { } @Test - void parseCommand_resolveNoteCommand_success() throws InvalidCommandException, InvalidArgumentException { + void parseCommand_resolveNoteCommand_success() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { assertTrue(commandParser.parseCommand("note") instanceof NotesCommand); assertTrue(commandParser.parseCommand("NOTE") instanceof NotesCommand); assertTrue(commandParser.parseCommand(" note ") instanceof NotesCommand); diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 91b206dce7..28b91a1507 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -4,7 +4,7 @@ Type any of the following to get started: > exit > help > note -> schedules +> schedule [] >>> Command not found! Type 'help' for a list of commands. [] >>> Command not found! Type 'help' for a list of commands. @@ -41,7 +41,7 @@ Type any of the following to get started: > exit > help > note -> schedules +> schedule [] >>> note has been added! [] >>> 1. CS2113T @@ -63,11 +63,11 @@ Format: help note : Move to notes workspace. Format: note -schedules : Move to schedules workspace. -Format: schedules +schedule : Move to schedules workspace. +Format: schedule -[] >>> schedules has been added! -[] >>> schedules has been added! +[] >>> schedule has been added! +[] >>> schedule has been added! [] >>> Command not found! Type 'help' for a list of commands. [] >>> 1. CS2113T Tutorial, Thursday, 10:00, zoom.nus.sg 2. CS2113T Lecture, Friday, 16:00, zoom.com @@ -87,15 +87,15 @@ Type any of the following to get started: > back > delete -[schedules] >>> 1. CS2113T Lecture, Friday, 16:00, zoom.com +[schedule] >>> 1. CS2113T Lecture, Friday, 16:00, zoom.com -[schedules] >>> Error: Missing arguments. -[schedules] >>> class terminus.content.Link 'CS2113T Lecture' has been deleted! -[schedules] >>> +[schedule] >>> Error: Missing arguments. +[schedule] >>> class terminus.content.Link 'CS2113T Lecture' has been deleted! +[schedule] >>> Type any of the following to get started: > exit > help > note -> schedules +> schedule [] >>> Goodbye! diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index 9b5c30b049..756392d907 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -13,16 +13,16 @@ note delete aa note delete 2 note delete 1 help -schedules add "CS2113T Tutorial" "Thursday" "10:00" "zoom.nus.sg" -schedules add "CS2113T Lecture" "Friday" "16:00" "zoom.com" -schedules invalid -schedules view -schedules view 4 -schedules view 2 -schedules delete 5 -schedules delete 1 -schedules view -schedules +schedule add "CS2113T Tutorial" "Thursday" "10:00" "zoom.nus.sg" +schedule add "CS2113T Lecture" "Friday" "16:00" "zoom.com" +schedule invalid +schedule view +schedule view 4 +schedule view 2 +schedule delete 5 +schedule delete 1 +schedule view +schedule view delete delete 1 From 781757058d69e2d6f9e0c5e46557ec3a0b8081d6 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Thu, 7 Oct 2021 00:50:01 +0800 Subject: [PATCH 039/466] Update text ui test --- text-ui-test/EXPECTED.TXT | 59 +++------------------------------------ text-ui-test/input.txt | 7 +---- 2 files changed, 5 insertions(+), 61 deletions(-) diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 28b91a1507..9d17f34132 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -8,41 +8,7 @@ Type any of the following to get started: [] >>> Command not found! Type 'help' for a list of commands. [] >>> Command not found! Type 'help' for a list of commands. -[] >>> -Type any of the following to get started: -> add -> exit -> help -> view -> back -> delete - -[note] >>> add : add an item into your list. -Format: add "{item name}" "{item content}" - -exit : Exits the program. -Format: exit - -help : Prints the help page. -Format: help - -view : view all items or view an individual items -Format: view {item number} - -back : Returns to the parent workspace. -Format: back - -delete : delete an item from your list. -Format: delete - -[note] >>> Command not found! Type 'help' for a list of commands. -[note] >>> -Type any of the following to get started: -> exit -> help -> note -> schedule - +[] >>> Command not found! Type 'help' for a list of commands. [] >>> note has been added! [] >>> 1. CS2113T @@ -78,24 +44,7 @@ Format: schedule [] >>> class terminus.content.Link 'CS2113T Tutorial' has been deleted! [] >>> 1. CS2113T Lecture, Friday, 16:00, zoom.com -[] >>> -Type any of the following to get started: -> add -> exit -> help -> view -> back -> delete - -[schedule] >>> 1. CS2113T Lecture, Friday, 16:00, zoom.com - -[schedule] >>> Error: Missing arguments. -[schedule] >>> class terminus.content.Link 'CS2113T Lecture' has been deleted! -[schedule] >>> -Type any of the following to get started: -> exit -> help -> note -> schedule - +[] >>> Command not found! Type 'help' for a list of commands. +[] >>> Command not found! Type 'help' for a list of commands. +[] >>> class terminus.content.Link 'CS2113T Lecture' has been deleted! [] >>> Goodbye! diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index 756392d907..bdc57f7e55 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -1,9 +1,6 @@ invalid note invalid -note -help invalid -back note add "CS2113T" "Week 8 test" note view note view aa @@ -22,9 +19,7 @@ schedule view 2 schedule delete 5 schedule delete 1 schedule view -schedule view delete -delete 1 -back +schedule delete 1 exit \ No newline at end of file From 4ac93ad3213dcfbc397f776d051941d214e2ed6a Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Thu, 7 Oct 2021 01:33:53 +0800 Subject: [PATCH 040/466] Change methods in Command class to abstract --- src/main/java/terminus/command/Command.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java index 4d068958b2..acb211b240 100644 --- a/src/main/java/terminus/command/Command.java +++ b/src/main/java/terminus/command/Command.java @@ -6,7 +6,7 @@ import terminus.module.NusModule; import terminus.ui.Ui; -public class Command { +public abstract class Command { public Command() { @@ -17,18 +17,14 @@ public Command() { * * @return The String object holding the appropriate format for the command. */ - public String getFormat() { - return null; - } + public abstract String getFormat(); /** * Returns the description for the command. * * @return The String object containing the description for this command. */ - public String getHelpMessage() { - return null; - } + public abstract String getHelpMessage(); /** * Parses remaining arguments for the command. @@ -52,8 +48,6 @@ public void parseArguments(String arguments) throws InvalidArgumentException, In * @throws InvalidArgumentException Exception for when arguments parsing fails * @throws InvalidTimeFormatException Exception for when time format is invalid */ - public CommandResult execute(Ui ui, NusModule module) - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { - return null; - } + public abstract CommandResult execute(Ui ui, NusModule module) + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException; } From 535d608739e7c8bab284767466ebe9f9483d6b12 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Thu, 7 Oct 2021 01:44:21 +0800 Subject: [PATCH 041/466] Make code quality improvements, minor fix on test --- .../terminus/parser/NoteAddCommandTest.java | 4 ++- .../terminus/parser/NoteBackCommandTest.java | 4 ++- .../parser/NoteCommandParserTest.java | 25 +++++++++++++------ .../parser/NoteDeleteCommandTest.java | 4 ++- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/src/test/java/terminus/parser/NoteAddCommandTest.java b/src/test/java/terminus/parser/NoteAddCommandTest.java index a614911b53..e121159648 100644 --- a/src/test/java/terminus/parser/NoteAddCommandTest.java +++ b/src/test/java/terminus/parser/NoteAddCommandTest.java @@ -9,6 +9,7 @@ import terminus.command.CommandResult; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidTimeFormatException; import terminus.module.NusModule; import terminus.ui.Ui; @@ -25,7 +26,8 @@ void setUp() { } @Test - void execute_addCommand_success() throws InvalidCommandException, InvalidArgumentException { + void execute_addCommand_success() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { Command addCommand = commandParser.parseCommand("add \"test\" \"test1\""); CommandResult addResult = addCommand.execute(ui, nusModule); assertTrue(addResult.isOk()); diff --git a/src/test/java/terminus/parser/NoteBackCommandTest.java b/src/test/java/terminus/parser/NoteBackCommandTest.java index 3a343f46c7..4fbb957e95 100644 --- a/src/test/java/terminus/parser/NoteBackCommandTest.java +++ b/src/test/java/terminus/parser/NoteBackCommandTest.java @@ -9,6 +9,7 @@ import terminus.command.CommandResult; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidTimeFormatException; import terminus.module.NusModule; import terminus.ui.Ui; @@ -26,7 +27,8 @@ void setUp() { } @Test - void execute_deleteCommand_success() throws InvalidCommandException, InvalidArgumentException { + void execute_deleteCommand_success() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { Command backCommand = commandParser.parseCommand("back"); CommandResult backResult = backCommand.execute(ui, nusModule); assertTrue(backResult.isOk()); diff --git a/src/test/java/terminus/parser/NoteCommandParserTest.java b/src/test/java/terminus/parser/NoteCommandParserTest.java index 649b23422d..02f5ed12b2 100644 --- a/src/test/java/terminus/parser/NoteCommandParserTest.java +++ b/src/test/java/terminus/parser/NoteCommandParserTest.java @@ -16,6 +16,7 @@ import terminus.command.note.AddCommand; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidTimeFormatException; import terminus.module.NusModule; import terminus.ui.Ui; @@ -43,7 +44,8 @@ void parseCommand_invalidCommand_exceptionThrown() { } @Test - void parseCommand_resolveExitCommand_success() throws InvalidCommandException, InvalidArgumentException { + void parseCommand_resolveExitCommand_success() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { assertTrue(commandParser.parseCommand("exit") instanceof ExitCommand); assertTrue(commandParser.parseCommand("EXIT") instanceof ExitCommand); assertTrue(commandParser.parseCommand(" exit ") instanceof ExitCommand); @@ -51,7 +53,8 @@ void parseCommand_resolveExitCommand_success() throws InvalidCommandException, I } @Test - void parseCommand_resolveHelpCommand_success() throws InvalidCommandException, InvalidArgumentException { + void parseCommand_resolveHelpCommand_success() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { assertTrue(commandParser.parseCommand("help") instanceof HelpCommand); assertTrue(commandParser.parseCommand("HELP") instanceof HelpCommand); assertTrue(commandParser.parseCommand(" help ") instanceof HelpCommand); @@ -59,7 +62,8 @@ void parseCommand_resolveHelpCommand_success() throws InvalidCommandException, I } @Test - void parseCommand_resolveAddCommand_exceptionThrown() throws InvalidCommandException, InvalidArgumentException { + void parseCommand_resolveAddCommand_exceptionThrown() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("add")); assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("add \"test1\"test2\"")); assertThrows(InvalidArgumentException.class, @@ -67,31 +71,36 @@ void parseCommand_resolveAddCommand_exceptionThrown() throws InvalidCommandExcep } @Test - void parseCommand_resolveAddCommand_success() throws InvalidCommandException, InvalidArgumentException { + void parseCommand_resolveAddCommand_success() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { assertTrue(commandParser.parseCommand("add \"test\" \"test1\"") instanceof AddCommand); assertTrue(commandParser.parseCommand("add \" test \" \" test1 \"") instanceof AddCommand); assertTrue(commandParser.parseCommand("add \"username\" \"password\"") instanceof AddCommand); } @Test - void parseCommand_resolveDeleteCommand_exceptionThrown() throws InvalidCommandException, InvalidArgumentException { + void parseCommand_resolveDeleteCommand_exceptionThrown() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("delete")); assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("delete abcd")); } @Test - void parseCommand_resolveDeleteCommand_success() throws InvalidCommandException, InvalidArgumentException { + void parseCommand_resolveDeleteCommand_success() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { assertTrue(commandParser.parseCommand("delete 1") instanceof DeleteCommand); assertTrue(commandParser.parseCommand("delete -1") instanceof DeleteCommand); } @Test - void parseCommand_resolveViewCommand_exceptionThrown() throws InvalidCommandException, InvalidArgumentException { + void parseCommand_resolveViewCommand_exceptionThrown() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("view abcd")); } @Test - void parseCommand_resolveViewCommand_success() throws InvalidCommandException, InvalidArgumentException { + void parseCommand_resolveViewCommand_success() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { assertTrue(commandParser.parseCommand("view") instanceof ViewCommand); assertTrue(commandParser.parseCommand("view 1") instanceof ViewCommand); } diff --git a/src/test/java/terminus/parser/NoteDeleteCommandTest.java b/src/test/java/terminus/parser/NoteDeleteCommandTest.java index d450e9df0f..f2a0c0d7b3 100644 --- a/src/test/java/terminus/parser/NoteDeleteCommandTest.java +++ b/src/test/java/terminus/parser/NoteDeleteCommandTest.java @@ -9,6 +9,7 @@ import terminus.command.CommandResult; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidTimeFormatException; import terminus.module.NusModule; import terminus.ui.Ui; @@ -25,7 +26,8 @@ void setUp() { } @Test - void execute_deleteCommand_success() throws InvalidCommandException, InvalidArgumentException { + void execute_deleteCommand_success() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { for (int i = 0; i < 5; i++) { Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); CommandResult addResult = addCommand.execute(ui, nusModule); From 81b007c1347f5c0b13a90b9ed421bd82119230b6 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Thu, 7 Oct 2021 16:33:06 +0800 Subject: [PATCH 042/466] Fix bug in DeleteCommand and messages --- .../java/terminus/command/DeleteCommand.java | 5 +++-- .../{AddCommand.java => AddNoteCommand.java} | 8 +++---- .../command/zoomlink/AddLinkCommand.java | 3 +-- .../java/terminus/common/CommonFormat.java | 21 +++++++++++++++++-- src/main/java/terminus/common/Messages.java | 4 +--- src/main/java/terminus/module/NusModule.java | 11 ++++++++++ .../terminus/parser/NoteCommandParser.java | 4 ++-- .../parser/NoteCommandParserTest.java | 12 ++++------- text-ui-test/EXPECTED.TXT | 6 +++--- 9 files changed, 47 insertions(+), 27 deletions(-) rename src/main/java/terminus/command/note/{AddCommand.java => AddNoteCommand.java} (90%) diff --git a/src/main/java/terminus/command/DeleteCommand.java b/src/main/java/terminus/command/DeleteCommand.java index 6d38e66a18..23faaab500 100644 --- a/src/main/java/terminus/command/DeleteCommand.java +++ b/src/main/java/terminus/command/DeleteCommand.java @@ -44,8 +44,9 @@ public CommandResult execute(Ui ui, NusModule module) throws InvalidArgumentExce ContentManager contentManager = module.getContentManager(); contentManager.setContent(module.get(type)); String deletedContentName = contentManager.deleteContent(itemNumber); - module.setNotes(contentManager.getContents()); - ui.printSection(String.format(Messages.MESSAGE_RESPONSE_DELETE, type, deletedContentName)); + module.set(type, contentManager.getContents()); + ui.printSection(String.format(Messages.MESSAGE_RESPONSE_DELETE, + CommonFormat.getClassName(type), deletedContentName)); return new CommandResult(true, false); } } diff --git a/src/main/java/terminus/command/note/AddCommand.java b/src/main/java/terminus/command/note/AddNoteCommand.java similarity index 90% rename from src/main/java/terminus/command/note/AddCommand.java rename to src/main/java/terminus/command/note/AddNoteCommand.java index 2bc7945758..4151c56196 100644 --- a/src/main/java/terminus/command/note/AddCommand.java +++ b/src/main/java/terminus/command/note/AddNoteCommand.java @@ -11,22 +11,20 @@ import terminus.module.NusModule; import terminus.ui.Ui; -public class AddCommand extends Command { +public class AddNoteCommand extends Command { private String name; private String data; - private static final String COMMAND_FORMAT = " \"{item name}\" \"{item content}\""; - private static final int ADD_NOTE_ARGUMENTS = 2; - public AddCommand() { + public AddNoteCommand() { } @Override public String getFormat() { - return CommonFormat.COMMAND_ADD + COMMAND_FORMAT; + return CommonFormat.COMMAND_ADD_NOTE_FORMAT; } @Override diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index 630953ed7d..1380cb79da 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -29,8 +29,7 @@ public AddLinkCommand() { @Override public String getFormat() { - return CommonFormat.COMMAND_ADD + " \"{description}\" " - + "\"{day}\" \"{start_time}\" \"{zoom_link}\""; + return CommonFormat.COMMAND_ADD_SCHEDULE_FORMAT; } @Override diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index c802cda236..913dbc1a83 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -1,5 +1,7 @@ package terminus.common; +import java.util.Arrays; +import terminus.exception.InvalidCommandException; import terminus.exception.InvalidTimeFormatException; import java.time.LocalTime; @@ -19,8 +21,13 @@ public class CommonFormat { public static final String COMMAND_HELP = "help"; public static final String COMMAND_SCHEDULE = "schedule"; + public static final String LOCAL_TIME_FORMAT = "HH:mm"; + public static final String COMMAND_DELETE_FORMAT = COMMAND_DELETE + " "; public static final String COMMAND_VIEW_FORMAT = COMMAND_VIEW + " {item number}"; + public static final String COMMAND_ADD_SCHEDULE_FORMAT = COMMAND_ADD + " \"\" " + + "\"\" \"\" \"\""; + public static final String COMMAND_ADD_NOTE_FORMAT = COMMAND_ADD + " \"\" \"\""; public static ArrayList findArguments(String arg) { ArrayList argsArray = new ArrayList<>(); @@ -43,9 +50,19 @@ public static boolean isArrayEmpty(ArrayList argArray) { public static LocalTime localTimeConverter(String startTime) throws InvalidTimeFormatException { if (startTime.length() != 5 || startTime.indexOf(":") != 2) { - throw new InvalidTimeFormatException(Messages.ERROR_MESSAGE_INVALID_TIME_FORMAT); + throw new InvalidTimeFormatException( + String.format(Messages.ERROR_MESSAGE_INVALID_TIME_FORMAT, LOCAL_TIME_FORMAT)); } - DateTimeFormatter format = DateTimeFormatter.ofPattern(Messages.LOCAL_TIME_FORMAT); + DateTimeFormatter format = DateTimeFormatter.ofPattern(LOCAL_TIME_FORMAT); return LocalTime.parse(startTime, format); } + + public static String getClassName(T type) { + String result = type.toString(); + String[] string = result.split("\\."); + if (string.length > 0) { + result = string[string.length - 1]; + } + return result; + } } diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index b2f18343d0..15b6b58a48 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -16,10 +16,8 @@ public class Messages { public static final String ERROR_MESSAGE_TAG = "Error: "; - public static final String LOCAL_TIME_FORMAT = "HH:mm"; - public static final String ERROR_MESSAGE_MISSING_ARGUMENTS = ERROR_MESSAGE_TAG + "Missing arguments."; public static final String ERROR_MESSAGE_EMPTY_CONTENTS = ERROR_MESSAGE_TAG + "Content not found."; public static final String ERROR_MESSAGE_INVALID_NUMBER = ERROR_MESSAGE_TAG + "Invalid numerical value provided."; - public static final String ERROR_MESSAGE_INVALID_TIME_FORMAT = ERROR_MESSAGE_TAG + "Invalid time format."; + public static final String ERROR_MESSAGE_INVALID_TIME_FORMAT = ERROR_MESSAGE_TAG + "Invalid time format %s."; } diff --git a/src/main/java/terminus/module/NusModule.java b/src/main/java/terminus/module/NusModule.java index 83efad7af6..708be9dddc 100644 --- a/src/main/java/terminus/module/NusModule.java +++ b/src/main/java/terminus/module/NusModule.java @@ -39,6 +39,16 @@ public void setLinks(ArrayList links) { this.links = links; } + public void set(T type, ArrayList contents) { + if (type == Note.class) { + this.notes = contents; + } else if (type == Link.class) { + this.links = contents; + } else { + //error encountered + } + } + public ArrayList get(T type) { ArrayList result = new ArrayList<>(); if (type == Note.class) { @@ -50,4 +60,5 @@ public ArrayList get(T type) { } return result; } + } diff --git a/src/main/java/terminus/parser/NoteCommandParser.java b/src/main/java/terminus/parser/NoteCommandParser.java index ceb80de0e0..f4998990fa 100644 --- a/src/main/java/terminus/parser/NoteCommandParser.java +++ b/src/main/java/terminus/parser/NoteCommandParser.java @@ -2,7 +2,7 @@ import terminus.command.DeleteCommand; import terminus.command.ViewCommand; -import terminus.command.note.AddCommand; +import terminus.command.note.AddNoteCommand; import terminus.command.BackCommand; import terminus.common.CommonFormat; import terminus.content.Note; @@ -17,7 +17,7 @@ public NoteCommandParser() { public static NoteCommandParser getInstance() { NoteCommandParser parser = new NoteCommandParser(); parser.addCommand(CommonFormat.COMMAND_BACK, new BackCommand()); - parser.addCommand(CommonFormat.COMMAND_ADD, new AddCommand()); + parser.addCommand(CommonFormat.COMMAND_ADD, new AddNoteCommand()); parser.addCommand(CommonFormat.COMMAND_VIEW, new ViewCommand>(Note.class)); parser.addCommand(CommonFormat.COMMAND_DELETE, new DeleteCommand>(Note.class)); return parser; diff --git a/src/test/java/terminus/parser/NoteCommandParserTest.java b/src/test/java/terminus/parser/NoteCommandParserTest.java index 02f5ed12b2..f3fd7542e3 100644 --- a/src/test/java/terminus/parser/NoteCommandParserTest.java +++ b/src/test/java/terminus/parser/NoteCommandParserTest.java @@ -4,16 +4,13 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.swing.text.View; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import terminus.command.Command; -import terminus.command.CommandResult; import terminus.command.DeleteCommand; import terminus.command.ExitCommand; import terminus.command.HelpCommand; import terminus.command.ViewCommand; -import terminus.command.note.AddCommand; +import terminus.command.note.AddNoteCommand; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidTimeFormatException; @@ -73,9 +70,9 @@ void parseCommand_resolveAddCommand_exceptionThrown() @Test void parseCommand_resolveAddCommand_success() throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { - assertTrue(commandParser.parseCommand("add \"test\" \"test1\"") instanceof AddCommand); - assertTrue(commandParser.parseCommand("add \" test \" \" test1 \"") instanceof AddCommand); - assertTrue(commandParser.parseCommand("add \"username\" \"password\"") instanceof AddCommand); + assertTrue(commandParser.parseCommand("add \"test\" \"test1\"") instanceof AddNoteCommand); + assertTrue(commandParser.parseCommand("add \" test \" \" test1 \"") instanceof AddNoteCommand); + assertTrue(commandParser.parseCommand("add \"username\" \"password\"") instanceof AddNoteCommand); } @Test @@ -106,7 +103,6 @@ void parseCommand_resolveViewCommand_success() } - @Test void getCommandList_containsBasicCommands() { assertTrue(commandParser.getCommandList().contains("exit")); diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 9d17f34132..a326d2c47c 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -19,7 +19,7 @@ Content: Week 8 test [] >>> Error: Invalid numerical value provided. [] >>> Error: Content not found. -[] >>> class terminus.content.Note 'CS2113T' has been deleted! +[] >>> Note 'CS2113T' has been deleted! [] >>> exit : Exits the program. Format: exit @@ -41,10 +41,10 @@ Format: schedule [] >>> Error: Content not found. [] >>> CS2113T Lecture, Friday, 16:00, zoom.com [] >>> Error: Content not found. -[] >>> class terminus.content.Link 'CS2113T Tutorial' has been deleted! +[] >>> Link 'CS2113T Tutorial' has been deleted! [] >>> 1. CS2113T Lecture, Friday, 16:00, zoom.com [] >>> Command not found! Type 'help' for a list of commands. [] >>> Command not found! Type 'help' for a list of commands. -[] >>> class terminus.content.Link 'CS2113T Lecture' has been deleted! +[] >>> Link 'CS2113T Lecture' has been deleted! [] >>> Goodbye! From 6c8a57b0babe32c9e4dd40c0dc899cbe660a7446 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Thu, 7 Oct 2021 18:17:23 +0800 Subject: [PATCH 043/466] Add format message for invalid arguments --- src/main/java/terminus/Terminus.java | 12 +++-- src/main/java/terminus/command/Command.java | 4 +- .../java/terminus/command/CommandResult.java | 18 ++++---- .../java/terminus/command/DeleteCommand.java | 6 +-- .../java/terminus/command/ExitCommand.java | 5 --- .../java/terminus/command/HelpCommand.java | 5 --- .../java/terminus/command/NotesCommand.java | 2 - .../terminus/command/ScheduleCommand.java | 2 - .../java/terminus/command/TestCommand.java | 7 +-- .../java/terminus/command/ViewCommand.java | 2 +- .../terminus/command/WorkspaceCommand.java | 19 +++++--- .../terminus/command/note/AddNoteCommand.java | 4 +- .../command/zoomlink/AddLinkCommand.java | 4 +- .../exception/InvalidArgumentException.java | 11 +++++ .../terminus/command/ExitCommandTest.java | 44 +++++++++++++++++++ .../note/AddNoteCommandTest.java} | 7 +-- .../note/BackNoteCommandTest.java} | 9 ++-- .../note/DeleteNoteCommandTest.java} | 7 +-- text-ui-test/EXPECTED.TXT | 14 ++++++ text-ui-test/input.txt | 6 +++ 20 files changed, 129 insertions(+), 59 deletions(-) create mode 100644 src/test/java/terminus/command/ExitCommandTest.java rename src/test/java/terminus/{parser/NoteAddCommandTest.java => command/note/AddNoteCommandTest.java} (92%) rename src/test/java/terminus/{parser/NoteBackCommandTest.java => command/note/BackNoteCommandTest.java} (85%) rename src/test/java/terminus/{parser/NoteDeleteCommandTest.java => command/note/DeleteNoteCommandTest.java} (92%) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index ed0aed56dd..84e8861a29 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -17,6 +17,8 @@ public class Terminus { private String workspace; private NusModule nusModule; + + private static final String INVALID_ARGUMENT_FORMAT_MESSAGE = "Format: %s"; /** * Main entry-point for the terminus.Terminus application. @@ -60,12 +62,14 @@ private void runCommandsUntilExit() { } else if (!result.isOk()) { ui.printSection(result.getErrorMessage()); } - } catch (InvalidCommandException e) { + } catch (InvalidCommandException | InvalidTimeFormatException e) { ui.printSection(e.getMessage()); } catch (InvalidArgumentException e) { - ui.printSection(e.getMessage()); - } catch (InvalidTimeFormatException e) { - ui.printSection(e.getMessage()); + if (e.getFormat() != null) { + ui.printSection(e.getMessage(), String.format(INVALID_ARGUMENT_FORMAT_MESSAGE, e.getFormat())); + } else { + ui.printSection(e.getMessage()); + } } } } diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java index acb211b240..bb491052aa 100644 --- a/src/main/java/terminus/command/Command.java +++ b/src/main/java/terminus/command/Command.java @@ -8,6 +8,8 @@ public abstract class Command { + protected String arguments; + public Command() { } @@ -34,7 +36,7 @@ public Command() { * @throws InvalidTimeFormatException Exception for when time format is invalid */ public void parseArguments(String arguments) throws InvalidArgumentException, InvalidTimeFormatException { - + this.arguments = arguments; } /** diff --git a/src/main/java/terminus/command/CommandResult.java b/src/main/java/terminus/command/CommandResult.java index e0d90b4921..38454b5baf 100644 --- a/src/main/java/terminus/command/CommandResult.java +++ b/src/main/java/terminus/command/CommandResult.java @@ -8,14 +8,11 @@ public class CommandResult { protected boolean isOk; protected boolean isExit; protected String errorMessage; - - public CommandResult(boolean isOk, boolean isExit, CommandParser additionalData, String errorMessage) { - this.additionalData = additionalData; - this.isOk = isOk; - this.errorMessage = errorMessage; - this.isExit = isExit; + + public CommandResult(boolean isOk) { + this(isOk, false); } - + public CommandResult(boolean isOk, boolean isExit) { this(isOk, isExit, null, null); } @@ -28,8 +25,11 @@ public CommandResult(boolean isOk, String errorMessage) { this(isOk, false, null, errorMessage); } - public CommandResult(boolean isOk) { - this(isOk, false, null, null); + public CommandResult(boolean isOk, boolean isExit, CommandParser additionalData, String errorMessage) { + this.additionalData = additionalData; + this.isOk = isOk; + this.errorMessage = errorMessage; + this.isExit = isExit; } /** diff --git a/src/main/java/terminus/command/DeleteCommand.java b/src/main/java/terminus/command/DeleteCommand.java index 23faaab500..ade932f00a 100644 --- a/src/main/java/terminus/command/DeleteCommand.java +++ b/src/main/java/terminus/command/DeleteCommand.java @@ -30,12 +30,12 @@ public String getHelpMessage() { @Override public void parseArguments(String arguments) throws InvalidArgumentException { if (arguments == null || arguments.isBlank()) { - throw new InvalidArgumentException(Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); + throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } try { itemNumber = Integer.parseInt(arguments); } catch (NumberFormatException e) { - throw new InvalidArgumentException(Messages.ERROR_MESSAGE_INVALID_NUMBER); + throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_INVALID_NUMBER); } } @@ -47,7 +47,7 @@ public CommandResult execute(Ui ui, NusModule module) throws InvalidArgumentExce module.set(type, contentManager.getContents()); ui.printSection(String.format(Messages.MESSAGE_RESPONSE_DELETE, CommonFormat.getClassName(type), deletedContentName)); - return new CommandResult(true, false); + return new CommandResult(true); } } diff --git a/src/main/java/terminus/command/ExitCommand.java b/src/main/java/terminus/command/ExitCommand.java index 1a1b1d8f3c..200d372d68 100644 --- a/src/main/java/terminus/command/ExitCommand.java +++ b/src/main/java/terminus/command/ExitCommand.java @@ -18,11 +18,6 @@ public String getHelpMessage() { return Messages.MESSAGE_COMMAND_EXIT; } - @Override - public void parseArguments(String arguments) { - - } - @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { return new CommandResult(true, true); diff --git a/src/main/java/terminus/command/HelpCommand.java b/src/main/java/terminus/command/HelpCommand.java index c176507597..c9c4fe5426 100644 --- a/src/main/java/terminus/command/HelpCommand.java +++ b/src/main/java/terminus/command/HelpCommand.java @@ -25,11 +25,6 @@ public String getHelpMessage() { return Messages.MESSAGE_COMMAND_HELP; } - @Override - public void parseArguments(String arguments) { - - } - @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { ui.printSection(commandMap.getHelpMenu()); diff --git a/src/main/java/terminus/command/NotesCommand.java b/src/main/java/terminus/command/NotesCommand.java index 9a5f4f924b..1e34e02a4e 100644 --- a/src/main/java/terminus/command/NotesCommand.java +++ b/src/main/java/terminus/command/NotesCommand.java @@ -6,8 +6,6 @@ public class NotesCommand extends WorkspaceCommand { - private String arguments; - public NotesCommand() { super(NoteCommandParser.getInstance()); } diff --git a/src/main/java/terminus/command/ScheduleCommand.java b/src/main/java/terminus/command/ScheduleCommand.java index 5e6974f989..e3a0d19b99 100644 --- a/src/main/java/terminus/command/ScheduleCommand.java +++ b/src/main/java/terminus/command/ScheduleCommand.java @@ -6,8 +6,6 @@ public class ScheduleCommand extends WorkspaceCommand { - private String arguments; - public ScheduleCommand() { super(LinkCommandParser.getInstance()); } diff --git a/src/main/java/terminus/command/TestCommand.java b/src/main/java/terminus/command/TestCommand.java index aec82f4b3b..fe34a2fe30 100644 --- a/src/main/java/terminus/command/TestCommand.java +++ b/src/main/java/terminus/command/TestCommand.java @@ -3,8 +3,8 @@ import terminus.module.NusModule; import terminus.ui.Ui; +@Deprecated public class TestCommand extends Command { - private String arguments; @Override public String getFormat() { @@ -16,11 +16,6 @@ public String getHelpMessage() { return "This is testing command."; } - @Override - public void parseArguments(String arguments) { - this.arguments = arguments; - } - @Override public CommandResult execute(Ui ui, NusModule module) { ui.printSection(arguments); diff --git a/src/main/java/terminus/command/ViewCommand.java b/src/main/java/terminus/command/ViewCommand.java index 1d25924802..c2b9201819 100644 --- a/src/main/java/terminus/command/ViewCommand.java +++ b/src/main/java/terminus/command/ViewCommand.java @@ -39,7 +39,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { itemNumber = Integer.parseInt(arguments); displayAll = false; } catch (NumberFormatException e) { - throw new InvalidArgumentException(Messages.ERROR_MESSAGE_INVALID_NUMBER); + throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_INVALID_NUMBER); } } diff --git a/src/main/java/terminus/command/WorkspaceCommand.java b/src/main/java/terminus/command/WorkspaceCommand.java index 2e046783da..b244e9dbac 100644 --- a/src/main/java/terminus/command/WorkspaceCommand.java +++ b/src/main/java/terminus/command/WorkspaceCommand.java @@ -9,18 +9,13 @@ public abstract class WorkspaceCommand extends Command { - protected String arguments; protected CommandParser commandMap; + private static final String INVALID_ARGUMENT_FORMAT_MESSAGE = "%s %s"; public WorkspaceCommand(CommandParser commandMap) { this.commandMap = commandMap; } - @Override - public void parseArguments(String arguments) { - this.arguments = arguments; - } - /** * Returns the Command Result after execution. * If no other arguments, returns the workspace. @@ -34,7 +29,17 @@ public void parseArguments(String arguments) { public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { if (arguments != null && !arguments.isBlank()) { - return commandMap.parseCommand(arguments).execute(ui, module); + try { + return commandMap.parseCommand(arguments).execute(ui, module); + } catch (InvalidArgumentException e) { + if (e.getFormat() == null) { + throw e; + } + throw new InvalidArgumentException( + String.format(INVALID_ARGUMENT_FORMAT_MESSAGE, commandMap.getWorkspace(), e.getFormat()), + e.getMessage() + ); + } } else { return new CommandResult(true, commandMap); } diff --git a/src/main/java/terminus/command/note/AddNoteCommand.java b/src/main/java/terminus/command/note/AddNoteCommand.java index 4151c56196..82fad6ebdb 100644 --- a/src/main/java/terminus/command/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/note/AddNoteCommand.java @@ -36,11 +36,11 @@ public String getHelpMessage() { public void parseArguments(String arguments) throws InvalidArgumentException { // Perform required checks with regex if (arguments == null || arguments.isBlank()) { - throw new InvalidArgumentException(Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); + throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } ArrayList argArray = CommonFormat.findArguments(arguments); if (!isValidNoteArguments(argArray)) { - throw new InvalidArgumentException(Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); + throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } this.name = argArray.get(0); this.data = argArray.get(1); diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index 1380cb79da..ef8154fd91 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -41,11 +41,11 @@ public String getHelpMessage() { public void parseArguments(String arguments) throws InvalidArgumentException, InvalidTimeFormatException { // Perform required checks with regex if (arguments == null || arguments.isBlank()) { - throw new InvalidArgumentException(Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); + throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } ArrayList argArray = CommonFormat.findArguments(arguments); if (!isValidScheduleArguments(argArray)) { - throw new InvalidArgumentException(Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); + throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } String userStartTime = argArray.get(2); diff --git a/src/main/java/terminus/exception/InvalidArgumentException.java b/src/main/java/terminus/exception/InvalidArgumentException.java index 8b0d3c30b1..16f27b0c94 100644 --- a/src/main/java/terminus/exception/InvalidArgumentException.java +++ b/src/main/java/terminus/exception/InvalidArgumentException.java @@ -2,7 +2,18 @@ public class InvalidArgumentException extends Exception { + private final String format; + public InvalidArgumentException(String message) { + this(null, message); + } + + public InvalidArgumentException(String format, String message) { super(message); + this.format = format; + } + + public String getFormat() { + return format; } } diff --git a/src/test/java/terminus/command/ExitCommandTest.java b/src/test/java/terminus/command/ExitCommandTest.java new file mode 100644 index 0000000000..32654593d3 --- /dev/null +++ b/src/test/java/terminus/command/ExitCommandTest.java @@ -0,0 +1,44 @@ +package terminus.command; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.common.CommonFormat; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidTimeFormatException; +import terminus.module.NusModule; +import terminus.parser.MainCommandParser; +import terminus.ui.Ui; + +public class ExitCommandTest { + + private MainCommandParser commandParser; + private NusModule nusModule; + private Ui ui; + + @BeforeEach + void setUp() { + this.commandParser = MainCommandParser.getInstance(); + this.nusModule = new NusModule(); + this.ui = new Ui(); + } + + @Test + void execute_success() throws InvalidArgumentException, InvalidCommandException, InvalidTimeFormatException { + Command exitCommand = commandParser.parseCommand(CommonFormat.COMMAND_EXIT); + CommandResult mainResult = exitCommand.execute(ui, nusModule); + assertTrue(mainResult.isOk() && mainResult.isExit()); + + Command noteExitCommand = commandParser + .parseCommand(CommonFormat.COMMAND_NOTE + " " + CommonFormat.COMMAND_EXIT); + CommandResult noteResult = noteExitCommand.execute(ui, nusModule); + assertTrue(noteResult.isOk() && noteResult.isExit()); + + Command scheduleExitCommand = commandParser + .parseCommand(CommonFormat.COMMAND_SCHEDULE + " " + CommonFormat.COMMAND_EXIT); + CommandResult scheduleExitResult = scheduleExitCommand.execute(ui, nusModule); + assertTrue(scheduleExitResult.isOk() && scheduleExitResult.isExit()); + } +} diff --git a/src/test/java/terminus/parser/NoteAddCommandTest.java b/src/test/java/terminus/command/note/AddNoteCommandTest.java similarity index 92% rename from src/test/java/terminus/parser/NoteAddCommandTest.java rename to src/test/java/terminus/command/note/AddNoteCommandTest.java index e121159648..618e677056 100644 --- a/src/test/java/terminus/parser/NoteAddCommandTest.java +++ b/src/test/java/terminus/command/note/AddNoteCommandTest.java @@ -1,4 +1,4 @@ -package terminus.parser; +package terminus.command.note; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -11,9 +11,10 @@ import terminus.exception.InvalidCommandException; import terminus.exception.InvalidTimeFormatException; import terminus.module.NusModule; +import terminus.parser.NoteCommandParser; import terminus.ui.Ui; -public class NoteAddCommandTest { +public class AddNoteCommandTest { private NoteCommandParser commandParser; private NusModule nusModule; private Ui ui; @@ -26,7 +27,7 @@ void setUp() { } @Test - void execute_addCommand_success() + void execute_success() throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { Command addCommand = commandParser.parseCommand("add \"test\" \"test1\""); CommandResult addResult = addCommand.execute(ui, nusModule); diff --git a/src/test/java/terminus/parser/NoteBackCommandTest.java b/src/test/java/terminus/command/note/BackNoteCommandTest.java similarity index 85% rename from src/test/java/terminus/parser/NoteBackCommandTest.java rename to src/test/java/terminus/command/note/BackNoteCommandTest.java index 4fbb957e95..058e561978 100644 --- a/src/test/java/terminus/parser/NoteBackCommandTest.java +++ b/src/test/java/terminus/command/note/BackNoteCommandTest.java @@ -1,8 +1,7 @@ -package terminus.parser; +package terminus.command.note; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.sun.tools.javac.Main; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.command.Command; @@ -11,9 +10,11 @@ import terminus.exception.InvalidCommandException; import terminus.exception.InvalidTimeFormatException; import terminus.module.NusModule; +import terminus.parser.MainCommandParser; +import terminus.parser.NoteCommandParser; import terminus.ui.Ui; -public class NoteBackCommandTest { +public class BackNoteCommandTest { private NoteCommandParser commandParser; private NusModule nusModule; @@ -27,7 +28,7 @@ void setUp() { } @Test - void execute_deleteCommand_success() + void execute_success() throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { Command backCommand = commandParser.parseCommand("back"); CommandResult backResult = backCommand.execute(ui, nusModule); diff --git a/src/test/java/terminus/parser/NoteDeleteCommandTest.java b/src/test/java/terminus/command/note/DeleteNoteCommandTest.java similarity index 92% rename from src/test/java/terminus/parser/NoteDeleteCommandTest.java rename to src/test/java/terminus/command/note/DeleteNoteCommandTest.java index f2a0c0d7b3..02a9edb3c5 100644 --- a/src/test/java/terminus/parser/NoteDeleteCommandTest.java +++ b/src/test/java/terminus/command/note/DeleteNoteCommandTest.java @@ -1,4 +1,4 @@ -package terminus.parser; +package terminus.command.note; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -11,9 +11,10 @@ import terminus.exception.InvalidCommandException; import terminus.exception.InvalidTimeFormatException; import terminus.module.NusModule; +import terminus.parser.NoteCommandParser; import terminus.ui.Ui; -public class NoteDeleteCommandTest { +public class DeleteNoteCommandTest { private NoteCommandParser commandParser; private NusModule nusModule; private Ui ui; @@ -26,7 +27,7 @@ void setUp() { } @Test - void execute_deleteCommand_success() + void execute_success() throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { for (int i = 0; i < 5; i++) { Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index a326d2c47c..fc7bbf872f 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -9,15 +9,21 @@ Type any of the following to get started: [] >>> Command not found! Type 'help' for a list of commands. [] >>> Command not found! Type 'help' for a list of commands. [] >>> Command not found! Type 'help' for a list of commands. +[] >>> Error: Missing arguments. +Format: note add "" "" [] >>> note has been added! [] >>> 1. CS2113T [] >>> Error: Invalid numerical value provided. +Format: note view {item number} [] >>> Error: Content not found. [] >>> Name: CS2113T Content: Week 8 test +[] >>> Error: Missing arguments. +Format: note delete [] >>> Error: Invalid numerical value provided. +Format: note delete [] >>> Error: Content not found. [] >>> Note 'CS2113T' has been deleted! [] >>> exit : Exits the program. @@ -32,6 +38,12 @@ Format: note schedule : Move to schedules workspace. Format: schedule +[] >>> Error: Missing arguments. +Format: schedule add "" "" "" "" +[] >>> Error: Missing arguments. +Format: schedule add "" "" "" "" +[] >>> Error: Missing arguments. +Format: schedule add "" "" "" "" [] >>> schedule has been added! [] >>> schedule has been added! [] >>> Command not found! Type 'help' for a list of commands. @@ -40,6 +52,8 @@ Format: schedule [] >>> Error: Content not found. [] >>> CS2113T Lecture, Friday, 16:00, zoom.com +[] >>> Error: Missing arguments. +Format: schedule delete [] >>> Error: Content not found. [] >>> Link 'CS2113T Tutorial' has been deleted! [] >>> 1. CS2113T Lecture, Friday, 16:00, zoom.com diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index bdc57f7e55..288d448e4b 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -1,21 +1,27 @@ invalid note invalid invalid +note add a note add "CS2113T" "Week 8 test" note view note view aa note view 2 note view 1 +note delete note delete aa note delete 2 note delete 1 help +schedule add a +schedule add a "Thursday" +schedule add a "Thursday" "10:00" schedule add "CS2113T Tutorial" "Thursday" "10:00" "zoom.nus.sg" schedule add "CS2113T Lecture" "Friday" "16:00" "zoom.com" schedule invalid schedule view schedule view 4 schedule view 2 +schedule delete schedule delete 5 schedule delete 1 schedule view From cd516f688c5cb45adbdca6dfc790fb3b8ecc8bfc Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Thu, 7 Oct 2021 18:48:57 +0800 Subject: [PATCH 044/466] Added JUnit Tests --- .../terminus/parser/AddLinkCommandTest.java | 62 ++++++++ .../parser/LinkCommandParserTest.java | 141 ++++++++++++++++++ .../parser/NoteCommandParserTest.java | 2 - 3 files changed, 203 insertions(+), 2 deletions(-) create mode 100644 src/test/java/terminus/parser/AddLinkCommandTest.java create mode 100644 src/test/java/terminus/parser/LinkCommandParserTest.java diff --git a/src/test/java/terminus/parser/AddLinkCommandTest.java b/src/test/java/terminus/parser/AddLinkCommandTest.java new file mode 100644 index 0000000000..c125221b6f --- /dev/null +++ b/src/test/java/terminus/parser/AddLinkCommandTest.java @@ -0,0 +1,62 @@ +package terminus.parser; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.common.CommonFormat; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidTimeFormatException; +import terminus.module.NusModule; +import terminus.ui.Ui; + +import java.util.ArrayList; + +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class AddLinkCommandTest { + + private LinkCommandParser linkCommandParser; + private NusModule nusModule; + private Ui ui; + + @BeforeEach + void setUp() { + this.linkCommandParser = LinkCommandParser.getInstance(); + this.nusModule = new NusModule(); + this.ui = new Ui(); + } + + @Test + void parseArguments_addLinkCommand_success() { + String addLinkInput = "add \"test\" \"test_day\" \"00:00\" \"Test.com\""; + ArrayList parsedArguments = CommonFormat.findArguments(addLinkInput); + assertEquals("test", parsedArguments.get(0)); + assertEquals("test_day", parsedArguments.get(1)); + assertEquals("00:00", parsedArguments.get(2)); + assertEquals("Test.com", parsedArguments.get(3)); + } + + @Test + void execute_addLinkCommand_success() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + Command addLinkCommand = linkCommandParser.parseCommand("add \"test\" \"test_day\" \"00:00\" \"Test.com\""); + CommandResult addResult = addLinkCommand.execute(ui, nusModule); + assertTrue(addResult.isOk()); + assertEquals(1, nusModule.getContentManager().getTotalContents()); + assertTrue(nusModule.getContentManager().getContentData(1).contains("test")); + assertTrue(nusModule.getContentManager().getContentData(1).contains("test_day")); + assertTrue(nusModule.getContentManager().getContentData(1).contains("00:00")); + assertTrue(nusModule.getContentManager().getContentData(1).contains("Test.com")); + + for (int i = 0; i < 5; i++) { + addLinkCommand = linkCommandParser.parseCommand( + "add \"test\" \"test_day\" \"00:00\" \"Test.com" + i + "\""); + addResult = addLinkCommand.execute(ui, nusModule); + assertTrue(addResult.isOk()); + } + assertEquals(6, nusModule.getContentManager().getTotalContents()); + } +} \ No newline at end of file diff --git a/src/test/java/terminus/parser/LinkCommandParserTest.java b/src/test/java/terminus/parser/LinkCommandParserTest.java new file mode 100644 index 0000000000..fa43f80fb0 --- /dev/null +++ b/src/test/java/terminus/parser/LinkCommandParserTest.java @@ -0,0 +1,141 @@ +package terminus.parser; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.command.DeleteCommand; +import terminus.command.ExitCommand; +import terminus.command.HelpCommand; +import terminus.command.ViewCommand; +import terminus.command.zoomlink.AddLinkCommand; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidTimeFormatException; +import terminus.module.NusModule; +import terminus.ui.Ui; + +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class LinkCommandParserTest { + + private LinkCommandParser linkCommandParser; + private NusModule nusModule; + private Ui ui; + + @BeforeEach + void setUp() { + this.linkCommandParser = LinkCommandParser.getInstance(); + this.nusModule = new NusModule(); + this.ui = new Ui(); + } + + @Test + void parseCommand_invalidCommand_exceptionThrown() { + assertThrows(InvalidCommandException.class, () -> linkCommandParser.parseCommand("exitt")); + assertThrows(InvalidCommandException.class, () -> linkCommandParser.parseCommand("helpp")); + assertThrows(InvalidCommandException.class, () -> linkCommandParser.parseCommand("aadddd")); + assertThrows(InvalidCommandException.class, () -> linkCommandParser.parseCommand("vieww")); + assertThrows(InvalidCommandException.class, () -> linkCommandParser.parseCommand("dellett")); + assertThrows(InvalidCommandException.class, () -> linkCommandParser.parseCommand("")); + } + + @Test + void parseCommand_resolveExitCommand_success() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + assertTrue(linkCommandParser.parseCommand("exit") instanceof ExitCommand); + assertTrue(linkCommandParser.parseCommand("eXiT") instanceof ExitCommand); + assertTrue(linkCommandParser.parseCommand(" ExIt ") instanceof ExitCommand); + assertTrue(linkCommandParser.parseCommand("eXiT tt") instanceof ExitCommand); + } + + @Test + void parseCommand_resolveHelpCommand_success() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + assertTrue(linkCommandParser.parseCommand("help") instanceof HelpCommand); + assertTrue(linkCommandParser.parseCommand("HeLp") instanceof HelpCommand); + assertTrue(linkCommandParser.parseCommand(" hElP ") instanceof HelpCommand); + assertTrue(linkCommandParser.parseCommand("HeLp pppp") instanceof HelpCommand); + } + + @Test + void parseCommand_resolveAddCommand_InvalidArgumentExceptionThrown() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + assertThrows(InvalidArgumentException.class, () -> linkCommandParser.parseCommand("add")); + assertThrows(InvalidArgumentException.class, + () -> linkCommandParser.parseCommand("add \"test desc\"test day\"")); + assertThrows(InvalidArgumentException.class, + () -> linkCommandParser.parseCommand("add \"test desc\" \"test day\" \"00:00\"")); + } + + @Test + void parseCommand_resolveAddCommand_InvalidTimeFormatExceptionThrown() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + assertThrows(InvalidTimeFormatException.class, + () -> linkCommandParser.parseCommand("add \"test desc\" \"test day\" \"0:0\" \"zoom\"")); + assertThrows(InvalidTimeFormatException.class, + () -> linkCommandParser.parseCommand("add \"test desc\" \"test day\" \"0:0X\" \"zoom\"")); + assertThrows(InvalidTimeFormatException.class, + () -> linkCommandParser.parseCommand("add \"test desc\" \"test day\" \"0\" \"zoom\"")); + assertThrows(InvalidTimeFormatException.class, + () -> linkCommandParser.parseCommand("add \"test desc\" \"test day\" \"14:0\" \"zoom\"")); + } + + @Test + void parseCommand_resolveAddCommand_success() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + assertTrue(linkCommandParser.parseCommand( + "add \"test desc\" \"test day\" \"10:00\" \"Zoom.com\"") instanceof AddLinkCommand); + assertTrue(linkCommandParser.parseCommand( + "add \" test \" \" test1 \" \"10:00\" \" Zoom.com \"") instanceof AddLinkCommand); + assertTrue(linkCommandParser.parseCommand( + "add \"CS2113T Lecture\" \"Friday\" \"16:00\" \"nus-sg.zoom.com\"") instanceof AddLinkCommand); + } + + @Test + void parseCommand_resolveDeleteCommand_exceptionThrown() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + assertThrows(InvalidArgumentException.class, () -> linkCommandParser.parseCommand("delete")); + assertThrows(InvalidArgumentException.class, () -> linkCommandParser.parseCommand("delete abcd")); + } + + @Test + void parseCommand_resolveDeleteCommand_success() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + assertTrue(linkCommandParser.parseCommand("delete 1") instanceof DeleteCommand); + assertTrue(linkCommandParser.parseCommand("delete -1") instanceof DeleteCommand); + } + + @Test + void parseCommand_resolveViewCommand_exceptionThrown() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + assertThrows(InvalidArgumentException.class, () -> linkCommandParser.parseCommand("view abcd")); + } + + @Test + void parseCommand_resolveViewCommand_success() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + assertTrue(linkCommandParser.parseCommand("view") instanceof ViewCommand); + assertTrue(linkCommandParser.parseCommand("view 1") instanceof ViewCommand); + } + + @Test + void getCommandList_containsBasicCommands() { + assertTrue(linkCommandParser.getCommandList().contains("exit")); + assertTrue(linkCommandParser.getCommandList().contains("add")); + assertTrue(linkCommandParser.getCommandList().contains("back")); + assertTrue(linkCommandParser.getCommandList().contains("delete")); + assertTrue(linkCommandParser.getCommandList().contains("view")); + assertTrue(linkCommandParser.getCommandList().contains("help")); + } + + @Test + void getWorkspace_isSchedule() { + assertEquals("schedule", linkCommandParser.getWorkspace()); + } + + @Test + void getHelpMenu_isNotEmpty() { + assertTrue(linkCommandParser.getHelpMenu().length > 0); + } +} \ No newline at end of file diff --git a/src/test/java/terminus/parser/NoteCommandParserTest.java b/src/test/java/terminus/parser/NoteCommandParserTest.java index 02f5ed12b2..6996cb6ef6 100644 --- a/src/test/java/terminus/parser/NoteCommandParserTest.java +++ b/src/test/java/terminus/parser/NoteCommandParserTest.java @@ -105,8 +105,6 @@ void parseCommand_resolveViewCommand_success() assertTrue(commandParser.parseCommand("view 1") instanceof ViewCommand); } - - @Test void getCommandList_containsBasicCommands() { assertTrue(commandParser.getCommandList().contains("exit")); From 2a06a93f16952542cbc2aa35a68ddfe55446283d Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Thu, 7 Oct 2021 19:15:06 +0800 Subject: [PATCH 045/466] Fixed bug for negative index --- src/main/java/terminus/command/DeleteCommand.java | 4 ++++ src/main/java/terminus/content/ContentManager.java | 2 +- src/test/java/terminus/parser/LinkCommandParserTest.java | 3 ++- src/test/java/terminus/parser/NoteCommandParserTest.java | 3 ++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/terminus/command/DeleteCommand.java b/src/main/java/terminus/command/DeleteCommand.java index 23faaab500..d279085663 100644 --- a/src/main/java/terminus/command/DeleteCommand.java +++ b/src/main/java/terminus/command/DeleteCommand.java @@ -37,6 +37,10 @@ public void parseArguments(String arguments) throws InvalidArgumentException { } catch (NumberFormatException e) { throw new InvalidArgumentException(Messages.ERROR_MESSAGE_INVALID_NUMBER); } + + if (itemNumber <= 0) { + throw new InvalidArgumentException(Messages.ERROR_MESSAGE_INVALID_NUMBER); + } } @Override diff --git a/src/main/java/terminus/content/ContentManager.java b/src/main/java/terminus/content/ContentManager.java index 81b95e96cb..e762d1ed9c 100644 --- a/src/main/java/terminus/content/ContentManager.java +++ b/src/main/java/terminus/content/ContentManager.java @@ -51,7 +51,7 @@ public int getTotalContents() { } public String deleteContent(int contentNumber) throws InvalidArgumentException { - if (!isValidNumber(contentNumber)) { + if (!isValidNumber(contentNumber) || contentNumber <= 0) { throw new InvalidArgumentException(Messages.ERROR_MESSAGE_EMPTY_CONTENTS); } String deletedContentName = contents.get(contentNumber - 1).getName(); diff --git a/src/test/java/terminus/parser/LinkCommandParserTest.java b/src/test/java/terminus/parser/LinkCommandParserTest.java index fa43f80fb0..3b6fea52a9 100644 --- a/src/test/java/terminus/parser/LinkCommandParserTest.java +++ b/src/test/java/terminus/parser/LinkCommandParserTest.java @@ -97,13 +97,14 @@ void parseCommand_resolveDeleteCommand_exceptionThrown() throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { assertThrows(InvalidArgumentException.class, () -> linkCommandParser.parseCommand("delete")); assertThrows(InvalidArgumentException.class, () -> linkCommandParser.parseCommand("delete abcd")); + assertThrows(InvalidArgumentException.class, () -> linkCommandParser.parseCommand("delete -1")); } @Test void parseCommand_resolveDeleteCommand_success() throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { assertTrue(linkCommandParser.parseCommand("delete 1") instanceof DeleteCommand); - assertTrue(linkCommandParser.parseCommand("delete -1") instanceof DeleteCommand); + assertTrue(linkCommandParser.parseCommand("delete 2") instanceof DeleteCommand); } @Test diff --git a/src/test/java/terminus/parser/NoteCommandParserTest.java b/src/test/java/terminus/parser/NoteCommandParserTest.java index 7e8f90bb44..16f8711c4d 100644 --- a/src/test/java/terminus/parser/NoteCommandParserTest.java +++ b/src/test/java/terminus/parser/NoteCommandParserTest.java @@ -80,13 +80,14 @@ void parseCommand_resolveDeleteCommand_exceptionThrown() throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("delete")); assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("delete abcd")); + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("delete -5")); } @Test void parseCommand_resolveDeleteCommand_success() throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { assertTrue(commandParser.parseCommand("delete 1") instanceof DeleteCommand); - assertTrue(commandParser.parseCommand("delete -1") instanceof DeleteCommand); + assertTrue(commandParser.parseCommand("delete 2") instanceof DeleteCommand); } @Test From bba7f37277a5fa4658309285b910120d9caeb544 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Thu, 7 Oct 2021 19:26:45 +0800 Subject: [PATCH 046/466] Beautify view command --- src/main/java/terminus/command/ViewCommand.java | 15 +++++++++++---- src/main/java/terminus/common/Messages.java | 2 ++ .../java/terminus/content/ContentManager.java | 6 +++--- text-ui-test/EXPECTED.TXT | 15 ++++++++++++--- 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/main/java/terminus/command/ViewCommand.java b/src/main/java/terminus/command/ViewCommand.java index c2b9201819..c47da59185 100644 --- a/src/main/java/terminus/command/ViewCommand.java +++ b/src/main/java/terminus/command/ViewCommand.java @@ -47,13 +47,20 @@ public void parseArguments(String arguments) throws InvalidArgumentException { public CommandResult execute(Ui ui, NusModule module) throws InvalidArgumentException { ContentManager contentManager = module.getContentManager(); contentManager.setContent(module.get(type)); - String result = ""; + StringBuilder result = new StringBuilder(); if (displayAll) { - result = contentManager.listAllContents(); + String fullList = contentManager.listAllContents(); + if (fullList.isBlank()) { + result.append(Messages.EMPTY_CONTENT_LIST_MESSAGE); + } else { + result.append(Messages.CONTENT_MESSAGE_HEADER); + result.append(contentManager.listAllContents()); + result.append("\nRerun the same command with an index behind to view the content."); + } } else { - result = contentManager.getContentData(itemNumber); + result.append(contentManager.getContentData(itemNumber)); } - ui.printSection(result); + ui.printSection(result.toString()); return new CommandResult(true, false); } } diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index 15b6b58a48..9b06784c85 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -20,4 +20,6 @@ public class Messages { public static final String ERROR_MESSAGE_EMPTY_CONTENTS = ERROR_MESSAGE_TAG + "Content not found."; public static final String ERROR_MESSAGE_INVALID_NUMBER = ERROR_MESSAGE_TAG + "Invalid numerical value provided."; public static final String ERROR_MESSAGE_INVALID_TIME_FORMAT = ERROR_MESSAGE_TAG + "Invalid time format %s."; + public static final String EMPTY_CONTENT_LIST_MESSAGE = "You do not have any content in this workspace.\n"; + public static final String CONTENT_MESSAGE_HEADER = "List of Content\n---------------\n"; } diff --git a/src/main/java/terminus/content/ContentManager.java b/src/main/java/terminus/content/ContentManager.java index 81b95e96cb..a06bafb859 100644 --- a/src/main/java/terminus/content/ContentManager.java +++ b/src/main/java/terminus/content/ContentManager.java @@ -26,13 +26,13 @@ public void addLink(String description, String day, LocalTime startTime, String } public String listAllContents() { - String result = ""; + StringBuilder result = new StringBuilder(); int i = 1; for (Content n : contents) { - result += String.format("%d. %s\n", i, n.getViewDescription()); + result.append(String.format("%d. %s\n", i, n.getViewDescription())); i++; } - return result; + return result.toString(); } public String getContentData(int contentNumber) throws InvalidArgumentException { diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index fc7bbf872f..0e94a3eed4 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -12,8 +12,11 @@ Type any of the following to get started: [] >>> Error: Missing arguments. Format: note add "" "" [] >>> note has been added! -[] >>> 1. CS2113T +[] >>> List of Content +--------------- +1. CS2113T +Rerun the same command with an index behind to view the content. [] >>> Error: Invalid numerical value provided. Format: note view {item number} [] >>> Error: Content not found. @@ -47,17 +50,23 @@ Format: schedule add "" "" "" ">> schedule has been added! [] >>> schedule has been added! [] >>> Command not found! Type 'help' for a list of commands. -[] >>> 1. CS2113T Tutorial, Thursday, 10:00, zoom.nus.sg +[] >>> List of Content +--------------- +1. CS2113T Tutorial, Thursday, 10:00, zoom.nus.sg 2. CS2113T Lecture, Friday, 16:00, zoom.com +Rerun the same command with an index behind to view the content. [] >>> Error: Content not found. [] >>> CS2113T Lecture, Friday, 16:00, zoom.com [] >>> Error: Missing arguments. Format: schedule delete [] >>> Error: Content not found. [] >>> Link 'CS2113T Tutorial' has been deleted! -[] >>> 1. CS2113T Lecture, Friday, 16:00, zoom.com +[] >>> List of Content +--------------- +1. CS2113T Lecture, Friday, 16:00, zoom.com +Rerun the same command with an index behind to view the content. [] >>> Command not found! Type 'help' for a list of commands. [] >>> Command not found! Type 'help' for a list of commands. [] >>> Link 'CS2113T Lecture' has been deleted! From 61af388c5b5771f01e8c831d8d78b7089026121c Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Thu, 7 Oct 2021 19:57:11 +0800 Subject: [PATCH 047/466] Remove unnecessary check --- src/main/java/terminus/content/ContentManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/terminus/content/ContentManager.java b/src/main/java/terminus/content/ContentManager.java index e762d1ed9c..81b95e96cb 100644 --- a/src/main/java/terminus/content/ContentManager.java +++ b/src/main/java/terminus/content/ContentManager.java @@ -51,7 +51,7 @@ public int getTotalContents() { } public String deleteContent(int contentNumber) throws InvalidArgumentException { - if (!isValidNumber(contentNumber) || contentNumber <= 0) { + if (!isValidNumber(contentNumber)) { throw new InvalidArgumentException(Messages.ERROR_MESSAGE_EMPTY_CONTENTS); } String deletedContentName = contents.get(contentNumber - 1).getName(); From 0cbe112108a5ca5ec95822dae9cfc4265997e903 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Thu, 7 Oct 2021 20:06:51 +0800 Subject: [PATCH 048/466] Beautify workspace commands --- src/main/java/terminus/Terminus.java | 5 ++-- .../java/terminus/command/DeleteCommand.java | 3 +- .../java/terminus/command/HelpCommand.java | 2 ++ .../java/terminus/command/NotesCommand.java | 2 ++ .../terminus/command/ScheduleCommand.java | 2 ++ .../terminus/command/WorkspaceCommand.java | 2 +- .../terminus/command/note/AddNoteCommand.java | 2 +- .../command/zoomlink/AddLinkCommand.java | 2 +- src/main/java/terminus/common/Messages.java | 8 +++-- src/main/java/terminus/content/Content.java | 2 +- src/main/java/terminus/content/Link.java | 2 +- .../java/terminus/parser/CommandParser.java | 5 +++- .../terminus/parser/LinkCommandParser.java | 7 +++++ .../terminus/parser/MainCommandParser.java | 7 +++++ .../terminus/parser/NoteCommandParser.java | 7 +++++ src/main/java/terminus/ui/Ui.java | 23 +++++++-------- text-ui-test/EXPECTED.TXT | 29 +++++++++++-------- 17 files changed, 73 insertions(+), 37 deletions(-) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 84e8861a29..76e62f2f7d 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -40,9 +40,8 @@ private void start() { this.ui = new Ui(); this.parser = MainCommandParser.getInstance(); this.workspace = ""; - this.ui.printBanner(); - this.ui.printParserBanner(this.parser); this.nusModule = new NusModule(); + this.ui.printParserBanner(this.parser, this.nusModule); } private void runCommandsUntilExit() { @@ -58,7 +57,7 @@ private void runCommandsUntilExit() { } else if (result.isOk() && result.getAdditionalData() != null) { parser = result.getAdditionalData(); workspace = parser.getWorkspace(); - ui.printParserBanner(parser); + ui.printParserBanner(parser, nusModule); } else if (!result.isOk()) { ui.printSection(result.getErrorMessage()); } diff --git a/src/main/java/terminus/command/DeleteCommand.java b/src/main/java/terminus/command/DeleteCommand.java index ade932f00a..6c15e50c39 100644 --- a/src/main/java/terminus/command/DeleteCommand.java +++ b/src/main/java/terminus/command/DeleteCommand.java @@ -1,5 +1,6 @@ package terminus.command; +import java.util.Locale; import terminus.common.CommonFormat; import terminus.common.Messages; import terminus.content.ContentManager; @@ -46,7 +47,7 @@ public CommandResult execute(Ui ui, NusModule module) throws InvalidArgumentExce String deletedContentName = contentManager.deleteContent(itemNumber); module.set(type, contentManager.getContents()); ui.printSection(String.format(Messages.MESSAGE_RESPONSE_DELETE, - CommonFormat.getClassName(type), deletedContentName)); + CommonFormat.getClassName(type).toLowerCase(), deletedContentName)); return new CommandResult(true); } } diff --git a/src/main/java/terminus/command/HelpCommand.java b/src/main/java/terminus/command/HelpCommand.java index c9c4fe5426..52d34e2054 100644 --- a/src/main/java/terminus/command/HelpCommand.java +++ b/src/main/java/terminus/command/HelpCommand.java @@ -9,6 +9,7 @@ public class HelpCommand extends Command { + public static final String HELP_MENU_MESSAGE = "\nHelp Menu\n---------"; private CommandParser commandMap; public HelpCommand(CommandParser commandMap) { @@ -27,6 +28,7 @@ public String getHelpMessage() { @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { + ui.printSection(HELP_MENU_MESSAGE); ui.printSection(commandMap.getHelpMenu()); return new CommandResult(true); } diff --git a/src/main/java/terminus/command/NotesCommand.java b/src/main/java/terminus/command/NotesCommand.java index 1e34e02a4e..5aee82c5b7 100644 --- a/src/main/java/terminus/command/NotesCommand.java +++ b/src/main/java/terminus/command/NotesCommand.java @@ -2,6 +2,7 @@ import terminus.common.CommonFormat; import terminus.common.Messages; +import terminus.module.NusModule; import terminus.parser.NoteCommandParser; public class NotesCommand extends WorkspaceCommand { @@ -19,4 +20,5 @@ public String getFormat() { public String getHelpMessage() { return Messages.MESSAGE_COMMAND_NOTE; } + } diff --git a/src/main/java/terminus/command/ScheduleCommand.java b/src/main/java/terminus/command/ScheduleCommand.java index e3a0d19b99..5bd43ccfe0 100644 --- a/src/main/java/terminus/command/ScheduleCommand.java +++ b/src/main/java/terminus/command/ScheduleCommand.java @@ -2,6 +2,7 @@ import terminus.common.CommonFormat; import terminus.common.Messages; +import terminus.module.NusModule; import terminus.parser.LinkCommandParser; public class ScheduleCommand extends WorkspaceCommand { @@ -19,4 +20,5 @@ public String getFormat() { public String getHelpMessage() { return Messages.MESSAGE_COMMAND_SCHEDULE; } + } diff --git a/src/main/java/terminus/command/WorkspaceCommand.java b/src/main/java/terminus/command/WorkspaceCommand.java index b244e9dbac..c89dd43add 100644 --- a/src/main/java/terminus/command/WorkspaceCommand.java +++ b/src/main/java/terminus/command/WorkspaceCommand.java @@ -15,7 +15,7 @@ public abstract class WorkspaceCommand extends Command { public WorkspaceCommand(CommandParser commandMap) { this.commandMap = commandMap; } - + /** * Returns the Command Result after execution. * If no other arguments, returns the workspace. diff --git a/src/main/java/terminus/command/note/AddNoteCommand.java b/src/main/java/terminus/command/note/AddNoteCommand.java index 82fad6ebdb..c285eae1d8 100644 --- a/src/main/java/terminus/command/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/note/AddNoteCommand.java @@ -52,7 +52,7 @@ public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandExcep contentManager.setContent(module.getNotes()); contentManager.addNote(name, data); module.setNotes(contentManager.getContents()); - ui.printSection(String.format(Messages.MESSAGE_RESPONSE_ADD, CommonFormat.COMMAND_NOTE)); + ui.printSection(String.format(Messages.MESSAGE_RESPONSE_ADD, CommonFormat.COMMAND_NOTE, name)); return new CommandResult(true, false); } diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index ef8154fd91..dfb96e18f7 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -61,7 +61,7 @@ public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandExcep contentManager.setContent(module.getLinks()); contentManager.addLink(description, day, startTime, link); module.setLinks(contentManager.getContents()); - ui.printSection(String.format(Messages.MESSAGE_RESPONSE_ADD, CommonFormat.COMMAND_SCHEDULE)); + ui.printSection(String.format(Messages.MESSAGE_RESPONSE_ADD, CommonFormat.COMMAND_SCHEDULE, description)); return new CommandResult(true, false); } diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index 9b06784c85..b4cda14a7d 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -11,8 +11,8 @@ public class Messages { public static final String MESSAGE_COMMAND_NOTE = "Move to notes workspace."; public static final String MESSAGE_COMMAND_SCHEDULE = "Move to schedules workspace."; - public static final String MESSAGE_RESPONSE_DELETE = "%s \'%s\' has been deleted!"; - public static final String MESSAGE_RESPONSE_ADD = "%s has been added!"; + public static final String MESSAGE_RESPONSE_DELETE = "Your %s on \'%s\' has been deleted!"; + public static final String MESSAGE_RESPONSE_ADD = "Your %s on '%s' has been added!"; public static final String ERROR_MESSAGE_TAG = "Error: "; @@ -22,4 +22,8 @@ public class Messages { public static final String ERROR_MESSAGE_INVALID_TIME_FORMAT = ERROR_MESSAGE_TAG + "Invalid time format %s."; public static final String EMPTY_CONTENT_LIST_MESSAGE = "You do not have any content in this workspace.\n"; public static final String CONTENT_MESSAGE_HEADER = "List of Content\n---------------\n"; + + public static final String MAIN_BANNER = "Welcome to TermiNUS!"; + public static final String NOTE_BANNER = "You have %d note(s) inside this workspace."; + public static final String SCHEDULE_BANNER = "You have %d link(s) in this workspace."; } diff --git a/src/main/java/terminus/content/Content.java b/src/main/java/terminus/content/Content.java index 4d19495caa..e0bcae16fc 100644 --- a/src/main/java/terminus/content/Content.java +++ b/src/main/java/terminus/content/Content.java @@ -6,7 +6,7 @@ public class Content { protected String data; public static final String TYPE = ""; - private static final String DISPLAY_MESSAGE = "Name: %s\nContent: %s\n"; + private static final String DISPLAY_MESSAGE = "Name: %s\nContent:\n%s\n"; public Content(String name) { this.name = name; diff --git a/src/main/java/terminus/content/Link.java b/src/main/java/terminus/content/Link.java index b8cb49fea5..0f31118cc7 100644 --- a/src/main/java/terminus/content/Link.java +++ b/src/main/java/terminus/content/Link.java @@ -9,7 +9,7 @@ public class Link extends Content { private String link; public static final String TYPE = "Z"; - private static final String DISPLAY_LINK_MESSAGE = "%s, %s, %s, %s"; + private static final String DISPLAY_LINK_MESSAGE = "%s (%s, %s): %s"; public Link(String name, String day, LocalTime startTime, String link) { super(name); diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java index 0dd5fab6c8..b4f3b4edb5 100644 --- a/src/main/java/terminus/parser/CommandParser.java +++ b/src/main/java/terminus/parser/CommandParser.java @@ -9,8 +9,9 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidTimeFormatException; +import terminus.module.NusModule; -public class CommandParser { +public abstract class CommandParser { private static final String SPACE_DELIMITER = "\\s+"; protected String workspace; @@ -60,6 +61,8 @@ public Command parseCommand(String command) public Set getCommandList() { return commandMap.keySet(); } + + public abstract String getWorkspaceBanner(NusModule module); /** * Returns the list of items in the help menu. diff --git a/src/main/java/terminus/parser/LinkCommandParser.java b/src/main/java/terminus/parser/LinkCommandParser.java index 67d254131d..2efb9c36dd 100644 --- a/src/main/java/terminus/parser/LinkCommandParser.java +++ b/src/main/java/terminus/parser/LinkCommandParser.java @@ -5,7 +5,9 @@ import terminus.command.ViewCommand; import terminus.command.DeleteCommand; import terminus.common.CommonFormat; +import terminus.common.Messages; import terminus.content.Link; +import terminus.module.NusModule; public class LinkCommandParser extends CommandParser { @@ -21,4 +23,9 @@ public static LinkCommandParser getInstance() { parser.addCommand(CommonFormat.COMMAND_DELETE, new DeleteCommand>(Link.class)); return parser; } + + @Override + public String getWorkspaceBanner(NusModule module) { + return String.format(Messages.SCHEDULE_BANNER, module.getLinks().size()); + } } diff --git a/src/main/java/terminus/parser/MainCommandParser.java b/src/main/java/terminus/parser/MainCommandParser.java index 90821c68c4..51bc62af16 100644 --- a/src/main/java/terminus/parser/MainCommandParser.java +++ b/src/main/java/terminus/parser/MainCommandParser.java @@ -3,6 +3,8 @@ import terminus.command.NotesCommand; import terminus.command.ScheduleCommand; import terminus.common.CommonFormat; +import terminus.common.Messages; +import terminus.module.NusModule; public class MainCommandParser extends CommandParser { @@ -18,4 +20,9 @@ public static MainCommandParser getInstance() { parser.addCommand(CommonFormat.COMMAND_SCHEDULE, new ScheduleCommand()); return parser; } + + @Override + public String getWorkspaceBanner(NusModule module) { + return Messages.MAIN_BANNER; + } } diff --git a/src/main/java/terminus/parser/NoteCommandParser.java b/src/main/java/terminus/parser/NoteCommandParser.java index f4998990fa..7ccd292b70 100644 --- a/src/main/java/terminus/parser/NoteCommandParser.java +++ b/src/main/java/terminus/parser/NoteCommandParser.java @@ -5,7 +5,9 @@ import terminus.command.note.AddNoteCommand; import terminus.command.BackCommand; import terminus.common.CommonFormat; +import terminus.common.Messages; import terminus.content.Note; +import terminus.module.NusModule; public class NoteCommandParser extends CommandParser { @@ -22,4 +24,9 @@ public static NoteCommandParser getInstance() { parser.addCommand(CommonFormat.COMMAND_DELETE, new DeleteCommand>(Note.class)); return parser; } + + @Override + public String getWorkspaceBanner(NusModule module) { + return String.format(Messages.NOTE_BANNER, module.getNotes().size()); + } } diff --git a/src/main/java/terminus/ui/Ui.java b/src/main/java/terminus/ui/Ui.java index 117f8164db..7f5c61735a 100644 --- a/src/main/java/terminus/ui/Ui.java +++ b/src/main/java/terminus/ui/Ui.java @@ -2,11 +2,12 @@ import java.util.Arrays; import java.util.Scanner; +import terminus.common.Messages; +import terminus.module.NusModule; import terminus.parser.CommandParser; public class Ui { - private static final String BANNER = "Welcome to TermiNUS!"; private static final String PROMPT = "[%s] >>> "; private final Scanner scanner; @@ -15,21 +16,17 @@ public Ui() { this.scanner = new Scanner(System.in); } - /** - * Prints the banner. - */ - public void printBanner() { - System.out.println(BANNER); - } - /** * Prints the banner for a workspace, which includes all the commands in the parser. */ - public void printParserBanner(CommandParser parser) { - printSection(parser.getCommandList() - .stream() - .reduce("\nType any of the following to get started:\n", - (x, y) -> String.format("%s> %s\n", x, y)) + public void printParserBanner(CommandParser parser, NusModule nusModule) { + printSection( + "", + parser.getWorkspaceBanner(nusModule), + parser.getCommandList() + .stream() + .reduce("\nType any of the following to get started:\n", + (x, y) -> String.format("%s> %s\n", x, y)) ); } diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 0e94a3eed4..adbf9bf68d 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -1,3 +1,4 @@ + Welcome to TermiNUS! Type any of the following to get started: @@ -11,7 +12,7 @@ Type any of the following to get started: [] >>> Command not found! Type 'help' for a list of commands. [] >>> Error: Missing arguments. Format: note add "" "" -[] >>> note has been added! +[] >>> Your note on 'CS2113T' has been added! [] >>> List of Content --------------- 1. CS2113T @@ -21,15 +22,19 @@ Rerun the same command with an index behind to view the content. Format: note view {item number} [] >>> Error: Content not found. [] >>> Name: CS2113T -Content: Week 8 test +Content: +Week 8 test [] >>> Error: Missing arguments. Format: note delete [] >>> Error: Invalid numerical value provided. Format: note delete [] >>> Error: Content not found. -[] >>> Note 'CS2113T' has been deleted! -[] >>> exit : Exits the program. +[] >>> Your note on 'CS2113T' has been deleted! +[] >>> +Help Menu +--------- +exit : Exits the program. Format: exit help : Prints the help page. @@ -47,27 +52,27 @@ Format: schedule add "" "" "" "" "" "" "" [] >>> Error: Missing arguments. Format: schedule add "" "" "" "" -[] >>> schedule has been added! -[] >>> schedule has been added! +[] >>> Your schedule on 'CS2113T Tutorial' has been added! +[] >>> Your schedule on 'CS2113T Lecture' has been added! [] >>> Command not found! Type 'help' for a list of commands. [] >>> List of Content --------------- -1. CS2113T Tutorial, Thursday, 10:00, zoom.nus.sg -2. CS2113T Lecture, Friday, 16:00, zoom.com +1. CS2113T Tutorial (Thursday, 10:00): zoom.nus.sg +2. CS2113T Lecture (Friday, 16:00): zoom.com Rerun the same command with an index behind to view the content. [] >>> Error: Content not found. -[] >>> CS2113T Lecture, Friday, 16:00, zoom.com +[] >>> CS2113T Lecture (Friday, 16:00): zoom.com [] >>> Error: Missing arguments. Format: schedule delete [] >>> Error: Content not found. -[] >>> Link 'CS2113T Tutorial' has been deleted! +[] >>> Your link on 'CS2113T Tutorial' has been deleted! [] >>> List of Content --------------- -1. CS2113T Lecture, Friday, 16:00, zoom.com +1. CS2113T Lecture (Friday, 16:00): zoom.com Rerun the same command with an index behind to view the content. [] >>> Command not found! Type 'help' for a list of commands. [] >>> Command not found! Type 'help' for a list of commands. -[] >>> Link 'CS2113T Lecture' has been deleted! +[] >>> Your link on 'CS2113T Lecture' has been deleted! [] >>> Goodbye! From e0746e2dccbc16f2f00939c83fbd308abb2e0159 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Thu, 7 Oct 2021 20:08:32 +0800 Subject: [PATCH 049/466] Move AddLinkCommandTest to correct package --- .../terminus/{parser => command/link}/AddLinkCommandTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename src/test/java/terminus/{parser => command/link}/AddLinkCommandTest.java (97%) diff --git a/src/test/java/terminus/parser/AddLinkCommandTest.java b/src/test/java/terminus/command/link/AddLinkCommandTest.java similarity index 97% rename from src/test/java/terminus/parser/AddLinkCommandTest.java rename to src/test/java/terminus/command/link/AddLinkCommandTest.java index c125221b6f..d8f08f342e 100644 --- a/src/test/java/terminus/parser/AddLinkCommandTest.java +++ b/src/test/java/terminus/command/link/AddLinkCommandTest.java @@ -1,4 +1,4 @@ -package terminus.parser; +package terminus.command.link; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -9,6 +9,7 @@ import terminus.exception.InvalidCommandException; import terminus.exception.InvalidTimeFormatException; import terminus.module.NusModule; +import terminus.parser.LinkCommandParser; import terminus.ui.Ui; import java.util.ArrayList; From 380775f00f48cd08710040bc92488d20473453ac Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Fri, 8 Oct 2021 01:02:13 +0800 Subject: [PATCH 050/466] Add JSON file support Uses GSON library to serialize NusModule to store the data. Signed-off-by: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> --- .gitignore | 2 + build.gradle | 1 + src/main/java/terminus/Terminus.java | 37 ++++++++++++++-- src/main/java/terminus/module/NusModule.java | 2 +- .../java/terminus/storage/ModuleStorage.java | 43 +++++++++++++++++++ text-ui-test/runtest.bat | 4 ++ text-ui-test/runtest.sh | 10 +++++ 7 files changed, 94 insertions(+), 5 deletions(-) create mode 100644 src/main/java/terminus/storage/ModuleStorage.java diff --git a/.gitignore b/.gitignore index f69985ef1f..27d8a0bb95 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ bin/ /text-ui-test/ACTUAL.txt text-ui-test/EXPECTED-UNIX.TXT + +data/ diff --git a/build.gradle b/build.gradle index a213ccedb0..5ed27f919c 100644 --- a/build.gradle +++ b/build.gradle @@ -12,6 +12,7 @@ repositories { dependencies { testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0' testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0' + implementation 'com.google.code.gson:gson:2.8.8' } test { diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 76e62f2f7d..996fdfbfbe 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -1,5 +1,7 @@ package terminus; +import java.io.IOException; +import java.nio.file.Path; import terminus.command.Command; import terminus.command.CommandResult; import terminus.exception.InvalidArgumentException; @@ -8,6 +10,7 @@ import terminus.module.NusModule; import terminus.parser.CommandParser; import terminus.parser.MainCommandParser; +import terminus.storage.ModuleStorage; import terminus.ui.Ui; public class Terminus { @@ -16,9 +19,12 @@ public class Terminus { private CommandParser parser; private String workspace; + private ModuleStorage moduleStorage; private NusModule nusModule; private static final String INVALID_ARGUMENT_FORMAT_MESSAGE = "Format: %s"; + private static final Path DATA_DIRECTORY = Path.of(System.getProperty("user.dir"), "data"); + private static final String MAIN_JSON = "main.json"; /** * Main entry-point for the terminus.Terminus application. @@ -40,8 +46,20 @@ private void start() { this.ui = new Ui(); this.parser = MainCommandParser.getInstance(); this.workspace = ""; - this.nusModule = new NusModule(); - this.ui.printParserBanner(this.parser, this.nusModule); + this.moduleStorage = new ModuleStorage(DATA_DIRECTORY.resolve(MAIN_JSON)); + try { + this.nusModule = moduleStorage.loadFile(); + if (this.nusModule == null) { + this.nusModule = new NusModule(); + } + this.moduleStorage.saveFile(nusModule); + this.ui.printParserBanner(this.parser, this.nusModule); + } catch (IOException e) { + ui.printSection( + "Unable to save/load file: " + DATA_DIRECTORY.resolve(MAIN_JSON), + "TermiNUS may still run, but your changes may not be saved." + ); + } } private void runCommandsUntilExit() { @@ -52,9 +70,15 @@ private void runCommandsUntilExit() { try { currentCommand = parser.parseCommand(input); CommandResult result = currentCommand.execute(ui, nusModule); - if (result.isOk() && result.isExit()) { + if (result.isOk()) { + this.moduleStorage.saveFile(nusModule); + } + + boolean isExitCommand = result.isOk() && result.isExit(); + boolean isWorkspaceCommand = result.isOk() && result.getAdditionalData() != null; + if (isExitCommand) { break; - } else if (result.isOk() && result.getAdditionalData() != null) { + } else if (isWorkspaceCommand) { parser = result.getAdditionalData(); workspace = parser.getWorkspace(); ui.printParserBanner(parser, nusModule); @@ -69,6 +93,11 @@ private void runCommandsUntilExit() { } else { ui.printSection(e.getMessage()); } + } catch (IOException e) { + ui.printSection( + "Unable to save/load file: " + DATA_DIRECTORY.resolve(MAIN_JSON), + "TermiNUS may still run, but your changes may not be saved." + ); } } } diff --git a/src/main/java/terminus/module/NusModule.java b/src/main/java/terminus/module/NusModule.java index 708be9dddc..ad9a264630 100644 --- a/src/main/java/terminus/module/NusModule.java +++ b/src/main/java/terminus/module/NusModule.java @@ -11,7 +11,7 @@ public class NusModule { private ArrayList notes; private ArrayList links; - private ContentManager contentManager; + private transient ContentManager contentManager; public NusModule() { contentManager = new ContentManager(); diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java new file mode 100644 index 0000000000..e67334cbaf --- /dev/null +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -0,0 +1,43 @@ +package terminus.storage; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import terminus.module.NusModule; + +public class ModuleStorage { + + private Path filePath; + private Gson gson; + + public ModuleStorage(Path filePath) { + this.filePath = filePath; + this.gson = new GsonBuilder().setPrettyPrinting().create(); + } + + private void createRequiredFolders() throws IOException { + if (!Files.isDirectory(filePath.getParent())) { + Files.createDirectories(filePath.getParent()); + } + } + + public NusModule loadFile() throws IOException { + createRequiredFolders(); + if (!Files.exists(filePath) || !Files.isReadable(filePath)) { + return null; + } + return gson.fromJson(Files.newBufferedReader(filePath), NusModule.class); + } + + public void saveFile(NusModule module) throws IOException { + createRequiredFolders(); + if (!Files.exists(filePath)) { + Files.createFile(filePath); + } + String jsonString = gson.toJson(module); + Files.writeString(filePath, jsonString); + } + +} diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat index 25ac7a2989..63cb41e8c3 100644 --- a/text-ui-test/runtest.bat +++ b/text-ui-test/runtest.bat @@ -2,6 +2,8 @@ setlocal enableextensions pushd %~dp0 +if exist .\data rmdir /Q /S .\data + cd .. call gradlew clean shadowJar @@ -17,3 +19,5 @@ java -jar %jarloc% < ..\..\text-ui-test\input.txt > ..\..\text-ui-test\ACTUAL.TX cd ..\..\text-ui-test FC ACTUAL.TXT EXPECTED.TXT >NUL && ECHO Test passed! || Echo Test failed! + +if exist .\data rmdir /Q /S .\data diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh index 1dcbd12021..24dc41b16c 100755 --- a/text-ui-test/runtest.sh +++ b/text-ui-test/runtest.sh @@ -8,8 +8,18 @@ cd .. cd text-ui-test +if [ -d "./data" ] +then + rm -rf ./data +fi + java -jar $(find ../build/libs/ -mindepth 1 -print -quit) < input.txt > ACTUAL.TXT +if [ -d "./data" ] +then + rm -rf ./data +fi + cp EXPECTED.TXT EXPECTED-UNIX.TXT dos2unix EXPECTED-UNIX.TXT ACTUAL.TXT diff EXPECTED-UNIX.TXT ACTUAL.TXT From 87c2972f5a93ba7c8841aef42961cac424868778 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Fri, 8 Oct 2021 01:14:12 +0800 Subject: [PATCH 051/466] Move file creation to initializeFile Signed-off-by: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> --- src/main/java/terminus/Terminus.java | 1 - .../java/terminus/storage/ModuleStorage.java | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 996fdfbfbe..38300ab230 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -52,7 +52,6 @@ private void start() { if (this.nusModule == null) { this.nusModule = new NusModule(); } - this.moduleStorage.saveFile(nusModule); this.ui.printParserBanner(this.parser, this.nusModule); } catch (IOException e) { ui.printSection( diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index e67334cbaf..01e9e94a54 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -9,33 +9,33 @@ public class ModuleStorage { - private Path filePath; - private Gson gson; + private final Path filePath; + private final Gson gson; public ModuleStorage(Path filePath) { this.filePath = filePath; this.gson = new GsonBuilder().setPrettyPrinting().create(); } - private void createRequiredFolders() throws IOException { + private void initializeFile() throws IOException { if (!Files.isDirectory(filePath.getParent())) { Files.createDirectories(filePath.getParent()); } + if (!Files.exists(filePath)) { + Files.createFile(filePath); + } } public NusModule loadFile() throws IOException { - createRequiredFolders(); - if (!Files.exists(filePath) || !Files.isReadable(filePath)) { + initializeFile(); + if (!Files.isReadable(filePath)) { return null; } return gson.fromJson(Files.newBufferedReader(filePath), NusModule.class); } public void saveFile(NusModule module) throws IOException { - createRequiredFolders(); - if (!Files.exists(filePath)) { - Files.createFile(filePath); - } + initializeFile(); String jsonString = gson.toJson(module); Files.writeString(filePath, jsonString); } From f18cdc48b6fa831d9f5c2a99bdb3d9e5e4a13938 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Fri, 8 Oct 2021 13:24:01 +0800 Subject: [PATCH 052/466] Draft user guide --- docs/UserGuide.md | 257 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 237 insertions(+), 20 deletions(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index abd9fbe891..743970d583 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -1,42 +1,259 @@ -# User Guide +# TermiNUS User Guide ## Introduction -{Give a product intro} +TermiNUS is a CLI (command line interface) program for NUS Students who wish to organize their NUS academic materials through a CLI. +
The product aims to aid student in organizing their academic schedule and enhancing their learning experiences. -## Quick Start +## Contents +* [Getting Start](#Getting-Started) +* [Section: Notes](#Section:-Notes) + * [Accessing Notes : `note`](#Accessing-Notes) + * [Adding a note : `add {name} {content}`](#Adding-a-Note) + * [Delete a note : `delete {index}`](#Delete-a-Note) + * [View notes : `view {index}`](#View-Notes) +* [Section: Schedules](#Section:-Schedules) + * [Accessing Schedules : `schedule`](#Accessing-Schedules) + * [Adding a Schedule : `add {description} {day} {start_time} {zoom_link}`](#Adding-a-Schedule) + * [Delete a Schedule : `delete {index}`](#Delete-a-Schedule) + * [View Schedule : `view`](#View-Schedule) +* [Exiting the Program: `exit`](#Exiting-the-Program) +* [Accessing Help: `help`](#Accessing-Help) +* [FAQ](#faq) +* [Command Summary](#Command-Summary) +* [Advanced Command Summary](#Advanced-Command-Summary) -{Give steps to get started quickly} +## Getting Started 1. Ensure that you have Java 11 or above installed. -1. Down the latest version of `Duke` from [here](http://link.to/duke). +2. Down the latest version of `TermiNUS` from [here](https://github.com/AY2122S1-CS2113T-T10-2/tp). +3. When you first start the program, you will be greeted with our banner: +``` +Welcome to TermiNUS! -## Features +Type any of the following to get started: +> notes +> schedules +> help +> exit + +[] >>> +``` +4. To get started, you can run the following commands: -{Give detailed description of each feature} + - notes + - schedules + - help + - exit -### Adding a todo: `todo` -Adds a new item to the list of todo items. +## Section: Notes -Format: `todo n/TODO_NAME d/DEADLINE` +### Accessing Notes +**Format:** `note` +
Accessing the notes workspace +After running the notes command, you can see the following: +``` +[] >>> note -* The `DEADLINE` can be in a natural language format. -* The `TODO_NAME` cannot contain punctuation. +You have no notes inside, run `add` to add a new note! +You can run the following commands after you add a new note: +> add +> delete +> view + +[note] >>> +``` -Example of usage: +### Adding a Note +**Format:** `add {name} {content}` +
Adding a note when in the notes workspace +``` +[note] >>> add “Remind Cabbin” “Cabbin was here” +Note has been added! +[note] >>> +``` -`todo n/Write the rest of the User Guide d/next week` +### Delete a Note +**Format:** `delete {index}` +
Deletes the specified note given by its index. +``` +[note] >>> delete 1 +Note `Remind Cabbin` has been deleted! +[note] >>> +``` -`todo n/Refactor the User Guide to remove passive voice d/13/04/2020` +### View Notes +**Format:** `view {index}` +
Two ways to use this command simply running view or view [index] +View by itself will list all notes +``` +[note] >>> view +You have {N} notes inside: +1. Remind Cabbin +2. Name1 +. +. +. +N. Name2 -## FAQ +[note] >>> +``` + +The second way to use view is with an index view [index] + +``` +[note] >>> view 1 +Name: Remind Cabbin +Content: Cabbin was here + +[note] >>> +``` + + +## Section: Schedules + +### Accessing Schedules +**Format:** `schedule` +
After running the schedules command, you can see the following: +``` +[] >>> schedule +You have {N} schedules inside, run `add` to add a schedule! +You can run the following commands after you add a new note: +> add +> delete +> view + +[schedule] >>> +``` + +### Adding a Schedule +**Format:** `add {description} {day} {start_time} {zoom_link}` +
Adding a new schedule when in the schedule’s workspace +``` +[schedule] >>> add “Module1 Tut1” Thursday 10:00 https://zoom.us/test +You have added Module1 Tut’s scheduled zoom link! +[schedule] >>> +``` + +### Delete a Schedule +**Format:** `delete {index}` +
Delete schedule when in the schedule’s workspace +``` +[schedule] >>> delete 1 +You have deleted your 1st schedule. +Schedule `Module1 Tut, Thursday, 10:00, https://zoom.us/test` has been deleted! +[schedule] >>> +``` + +### View Schedule +**Format:** `view` +
View all schedules when in the schedule’s workspace +``` +[schedule] >>> view +You have {N} schedules inside: +1. Module1 Tut, Thursday, 10:00, https://zoom.us/test +2. Module2 Lecture, Friday, 14:00, https://zoom.us/test +. +. +. +N. ModuleN Lecture, Nday, 09:00, https://zoom.us/test + +[schedule] >>> +``` + + +## Exiting the Program +**Format:** `exit` +
To exit the program, simply run the following command: +``` +[] >>> exit +Goodbye! +``` + +## Accessing Help +**Format:** `help` +
Depending on your current workspace, you may get different help messages. +
The following shows the help message in the main workspace: + +``` +[] >>> help + +You can run the following commands in the workspace: +> notes + - Access all your notes that you have made. +> schedules + - Access all your schedules that you have scheduled. +> help + - Prints this. +> quit + - Quits TermiNUS + +You can also run the following to quickly do certain tasks: +> notes add Water “Drinking more water will make me hydrated” +> schedule view + +Running `help [command]` will print the help for the specific workspace. -**Q**: How do I transfer my data to another computer? +[] >>> +``` -**A**: {your answer here} +## Advanced Usage of Commands +User can access workspace command directly without entering its environment. Seen below are some command examples. +
+A workspace command is a command that will bring you to its own workspace. Current workspace command includes notes and schedules. +
+Command syntax: {workspace} {workspace available command} +
+ +Adding a note without entering the notes workspace. +``` +[] >>> note add “Remind Cabbin” “Cabbin was here” +Note has been added! +[] >>> +``` + +Adding a schedule without entering the schedules workspace. +```dtd +[] >>> schedule add “Module1 Tut” Thursday 10:00 https://zoom.us/test +You have added Module1 Tut’s scheduled zoom link! +[] >>> +``` +## FAQ ## Command Summary -{Give a 'cheat sheet' of commands here} +**Action** | **Format, Examples** +------------ | ------------- +**access note workspace**|`note` +**access schedule workspace**|`schedule` +**add**|`add {name} {content}`
e.g. `add note1 note_content` +**delete**|`delete {index}`
e.g. `delete 1` +**view**|`view` or `view {index}`
e.g. `view` or `view 1` +**help**|`help` +**exit**|`exit` + +##Advanced Command Summary +**Action** | **Format, Examples** +------------ | ------------- +**add note**|`note add {name} {content}`
e.g. `note add note1 note_content` +**add schedule**|`schedule add {description} {day} {start_time} {zoom_link}`
e.g. `schedule add “Module1 Tut” Thursday 10:00 https://zoom.us/test` +**delete note**|`note delete {index}`
e.g. `note delete 1` +**delete schedule**|`schedule delete {index}`
e.g. `schedule delete 1` +**view note**|`note view` or `note view {index}`
e.g. `note view 1` +**view schedule**|`schedule view`
e.g. `schedule view` + + + + + + + + + + + + + + + -* Add todo `todo n/TODO_NAME d/DEADLINE` From 0df37ebda07c973e14a2e3304848b88bed92dcb4 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Sat, 9 Oct 2021 10:29:43 +0800 Subject: [PATCH 053/466] Fix user guide, address pr comments --- docs/UserGuide.md | 44 ++++++++++--------- .../java/terminus/command/DeleteCommand.java | 1 - .../parser/LinkCommandParserTest.java | 2 - 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 743970d583..705a78197b 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -9,12 +9,12 @@ TermiNUS is a CLI (command line interface) program for NUS Students who wish to * [Getting Start](#Getting-Started) * [Section: Notes](#Section:-Notes) * [Accessing Notes : `note`](#Accessing-Notes) - * [Adding a note : `add {name} {content}`](#Adding-a-Note) + * [Adding a note : `add "{name}" "{content}"`](#Adding-a-Note) * [Delete a note : `delete {index}`](#Delete-a-Note) * [View notes : `view {index}`](#View-Notes) * [Section: Schedules](#Section:-Schedules) * [Accessing Schedules : `schedule`](#Accessing-Schedules) - * [Adding a Schedule : `add {description} {day} {start_time} {zoom_link}`](#Adding-a-Schedule) + * [Adding a Schedule : `add "{description}" "{day}" "{start_time}" "{zoom_link}"`](#Adding-a-Schedule) * [Delete a Schedule : `delete {index}`](#Delete-a-Schedule) * [View Schedule : `view`](#View-Schedule) * [Exiting the Program: `exit`](#Exiting-the-Program) @@ -55,17 +55,21 @@ After running the notes command, you can see the following: ``` [] >>> note -You have no notes inside, run `add` to add a new note! -You can run the following commands after you add a new note: +You have 0 note(s) inside this workspace + +Type any of the following to get started: > add +> exit +> help +> view +> back > delete -> view [note] >>> ``` ### Adding a Note -**Format:** `add {name} {content}` +**Format:** `add "{name}" "{content}"`
Adding a note when in the notes workspace ``` [note] >>> add “Remind Cabbin” “Cabbin was here” @@ -88,13 +92,10 @@ Note `Remind Cabbin` has been deleted! View by itself will list all notes ``` [note] >>> view -You have {N} notes inside: +You have 3 notes inside: 1. Remind Cabbin 2. Name1 -. -. -. -N. Name2 +3. Name2 [note] >>> ``` @@ -117,20 +118,24 @@ Content: Cabbin was here
After running the schedules command, you can see the following: ``` [] >>> schedule -You have {N} schedules inside, run `add` to add a schedule! -You can run the following commands after you add a new note: +You have 0 link(s) in this workspace. + +Type any of the following to get started: > add +> edit +> help +> view +> back > delete -> view [schedule] >>> ``` ### Adding a Schedule -**Format:** `add {description} {day} {start_time} {zoom_link}` +**Format:** `add "{description}" "{day}" "{start_time}" "{zoom_link}"`
Adding a new schedule when in the schedule’s workspace ``` -[schedule] >>> add “Module1 Tut1” Thursday 10:00 https://zoom.us/test +[schedule] >>> add “Module1 Tut1” "Thursday" "10:00" "https://zoom.us/test" You have added Module1 Tut’s scheduled zoom link! [schedule] >>> ``` @@ -150,13 +155,10 @@ Schedule `Module1 Tut, Thursday, 10:00, https://zoom.us/test` has been deleted!
View all schedules when in the schedule’s workspace ``` [schedule] >>> view -You have {N} schedules inside: +You have 3 schedules inside: 1. Module1 Tut, Thursday, 10:00, https://zoom.us/test 2. Module2 Lecture, Friday, 14:00, https://zoom.us/test -. -. -. -N. ModuleN Lecture, Nday, 09:00, https://zoom.us/test +3. Module1 Tut1, Thursday, 10:00, https://zoom.us/test [schedule] >>> ``` diff --git a/src/main/java/terminus/command/DeleteCommand.java b/src/main/java/terminus/command/DeleteCommand.java index b67c1c2834..f4b08b3f3d 100644 --- a/src/main/java/terminus/command/DeleteCommand.java +++ b/src/main/java/terminus/command/DeleteCommand.java @@ -38,7 +38,6 @@ public void parseArguments(String arguments) throws InvalidArgumentException { } catch (NumberFormatException e) { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_INVALID_NUMBER); } - if (itemNumber <= 0) { throw new InvalidArgumentException(Messages.ERROR_MESSAGE_INVALID_NUMBER); } diff --git a/src/test/java/terminus/parser/LinkCommandParserTest.java b/src/test/java/terminus/parser/LinkCommandParserTest.java index 3b6fea52a9..03be93ff24 100644 --- a/src/test/java/terminus/parser/LinkCommandParserTest.java +++ b/src/test/java/terminus/parser/LinkCommandParserTest.java @@ -21,13 +21,11 @@ public class LinkCommandParserTest { private LinkCommandParser linkCommandParser; private NusModule nusModule; - private Ui ui; @BeforeEach void setUp() { this.linkCommandParser = LinkCommandParser.getInstance(); this.nusModule = new NusModule(); - this.ui = new Ui(); } @Test From c9a51a17f26de0c400ec48f30e791e343d25bd14 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Sat, 9 Oct 2021 21:28:39 +0800 Subject: [PATCH 054/466] Update forgotten testcase to delete --- .../terminus/command/note/DeleteNoteCommandTest.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/test/java/terminus/command/note/DeleteNoteCommandTest.java b/src/test/java/terminus/command/note/DeleteNoteCommandTest.java index 02a9edb3c5..59fe9ee70e 100644 --- a/src/test/java/terminus/command/note/DeleteNoteCommandTest.java +++ b/src/test/java/terminus/command/note/DeleteNoteCommandTest.java @@ -1,6 +1,7 @@ package terminus.command.note; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.BeforeEach; @@ -15,6 +16,7 @@ import terminus.ui.Ui; public class DeleteNoteCommandTest { + private NoteCommandParser commandParser; private NusModule nusModule; private Ui ui; @@ -48,4 +50,11 @@ void execute_success() } assertEquals(2, nusModule.getContentManager().getTotalContents()); } + + @Test + void execute_throwsException() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + Command deleteCommand = commandParser.parseCommand("delete 100"); + assertThrows(InvalidArgumentException.class, () -> deleteCommand.execute(ui, nusModule)); + } } From 2778afd3d0cefbedf8251a4eaf05c14c3a045044 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Sat, 9 Oct 2021 22:46:14 +0800 Subject: [PATCH 055/466] Fix User guide command format --- docs/UserGuide.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 705a78197b..b1917c858d 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -9,13 +9,13 @@ TermiNUS is a CLI (command line interface) program for NUS Students who wish to * [Getting Start](#Getting-Started) * [Section: Notes](#Section:-Notes) * [Accessing Notes : `note`](#Accessing-Notes) - * [Adding a note : `add "{name}" "{content}"`](#Adding-a-Note) - * [Delete a note : `delete {index}`](#Delete-a-Note) + * [Adding a note : `add "" ""`](#Adding-a-Note) + * [Delete a note : `delete `](#Delete-a-Note) * [View notes : `view {index}`](#View-Notes) * [Section: Schedules](#Section:-Schedules) * [Accessing Schedules : `schedule`](#Accessing-Schedules) - * [Adding a Schedule : `add "{description}" "{day}" "{start_time}" "{zoom_link}"`](#Adding-a-Schedule) - * [Delete a Schedule : `delete {index}`](#Delete-a-Schedule) + * [Adding a Schedule : `add "" "" "" ""`](#Adding-a-Schedule) + * [Delete a Schedule : `delete `](#Delete-a-Schedule) * [View Schedule : `view`](#View-Schedule) * [Exiting the Program: `exit`](#Exiting-the-Program) * [Accessing Help: `help`](#Accessing-Help) @@ -69,7 +69,7 @@ Type any of the following to get started: ``` ### Adding a Note -**Format:** `add "{name}" "{content}"` +**Format:** `add "" ""`
Adding a note when in the notes workspace ``` [note] >>> add “Remind Cabbin” “Cabbin was here” @@ -78,7 +78,7 @@ Note has been added! ``` ### Delete a Note -**Format:** `delete {index}` +**Format:** `delete `
Deletes the specified note given by its index. ``` [note] >>> delete 1 @@ -87,7 +87,7 @@ Note `Remind Cabbin` has been deleted! ``` ### View Notes -**Format:** `view {index}` +**Format:** `view` or `view {index}`
Two ways to use this command simply running view or view [index] View by itself will list all notes ``` @@ -132,7 +132,7 @@ Type any of the following to get started: ``` ### Adding a Schedule -**Format:** `add "{description}" "{day}" "{start_time}" "{zoom_link}"` +**Format:** `add "" "" "" ""`
Adding a new schedule when in the schedule’s workspace ``` [schedule] >>> add “Module1 Tut1” "Thursday" "10:00" "https://zoom.us/test" @@ -141,7 +141,7 @@ You have added Module1 Tut’s scheduled zoom link! ``` ### Delete a Schedule -**Format:** `delete {index}` +**Format:** `delete `
Delete schedule when in the schedule’s workspace ``` [schedule] >>> delete 1 @@ -228,8 +228,8 @@ You have added Module1 Tut’s scheduled zoom link! ------------ | ------------- **access note workspace**|`note` **access schedule workspace**|`schedule` -**add**|`add {name} {content}`
e.g. `add note1 note_content` -**delete**|`delete {index}`
e.g. `delete 1` +**add**|`add "" ""`
e.g. `add note1 note_content` +**delete**|`delete `
e.g. `delete 1` **view**|`view` or `view {index}`
e.g. `view` or `view 1` **help**|`help` **exit**|`exit` @@ -237,10 +237,10 @@ You have added Module1 Tut’s scheduled zoom link! ##Advanced Command Summary **Action** | **Format, Examples** ------------ | ------------- -**add note**|`note add {name} {content}`
e.g. `note add note1 note_content` -**add schedule**|`schedule add {description} {day} {start_time} {zoom_link}`
e.g. `schedule add “Module1 Tut” Thursday 10:00 https://zoom.us/test` -**delete note**|`note delete {index}`
e.g. `note delete 1` -**delete schedule**|`schedule delete {index}`
e.g. `schedule delete 1` +**add note**|`note add "" ""`
e.g. `note add note1 note_content` +**add schedule**|`schedule add "" "" "" ""`
e.g. `schedule add “Module1 Tut” "Thursday" "10:00" "https://zoom.us/test"` +**delete note**|`note delete `
e.g. `note delete 1` +**delete schedule**|`schedule delete `
e.g. `schedule delete 1` **view note**|`note view` or `note view {index}`
e.g. `note view 1` **view schedule**|`schedule view`
e.g. `schedule view` From 94f875863e141dc996c85bede8c7c2fbf038e072 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Sat, 9 Oct 2021 23:07:10 +0800 Subject: [PATCH 056/466] Fix minor consistency issues --- docs/UserGuide.md | 49 +++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index b1917c858d..786c8cc31c 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -7,13 +7,13 @@ TermiNUS is a CLI (command line interface) program for NUS Students who wish to ## Contents * [Getting Start](#Getting-Started) -* [Section: Notes](#Section:-Notes) - * [Accessing Notes : `note`](#Accessing-Notes) +* [Section: Note](#Section:-Note) + * [Accessing Note : `note`](#Accessing-Note) * [Adding a note : `add "" ""`](#Adding-a-Note) * [Delete a note : `delete `](#Delete-a-Note) - * [View notes : `view {index}`](#View-Notes) -* [Section: Schedules](#Section:-Schedules) - * [Accessing Schedules : `schedule`](#Accessing-Schedules) + * [View note : `view {index}`](#View-Note) +* [Section: Schedule](#Section:-Schedule) + * [Accessing Schedule : `schedule`](#Accessing-Schedule) * [Adding a Schedule : `add "" "" "" ""`](#Adding-a-Schedule) * [Delete a Schedule : `delete `](#Delete-a-Schedule) * [View Schedule : `view`](#View-Schedule) @@ -32,8 +32,8 @@ TermiNUS is a CLI (command line interface) program for NUS Students who wish to Welcome to TermiNUS! Type any of the following to get started: -> notes -> schedules +> note +> schedule > help > exit @@ -41,20 +41,19 @@ Type any of the following to get started: ``` 4. To get started, you can run the following commands: - - notes - - schedules + - note + - schedule - help - exit -## Section: Notes +## Section: Note -### Accessing Notes +### Accessing Note **Format:** `note` -
Accessing the notes workspace -After running the notes command, you can see the following: +
Accessing the note workspace +After running the note command, you can see the following: ``` [] >>> note - You have 0 note(s) inside this workspace Type any of the following to get started: @@ -70,7 +69,7 @@ Type any of the following to get started: ### Adding a Note **Format:** `add "" ""` -
Adding a note when in the notes workspace +
Adding a note when in the note workspace ``` [note] >>> add “Remind Cabbin” “Cabbin was here” Note has been added! @@ -86,7 +85,7 @@ Note `Remind Cabbin` has been deleted! [note] >>> ``` -### View Notes +### View Note **Format:** `view` or `view {index}`
Two ways to use this command simply running view or view [index] View by itself will list all notes @@ -111,11 +110,11 @@ Content: Cabbin was here ``` -## Section: Schedules +## Section: Schedule -### Accessing Schedules +### Accessing Schedule **Format:** `schedule` -
After running the schedules command, you can see the following: +
After running the schedule command, you can see the following: ``` [] >>> schedule You have 0 link(s) in this workspace. @@ -181,9 +180,9 @@ Goodbye! [] >>> help You can run the following commands in the workspace: -> notes +> note - Access all your notes that you have made. -> schedules +> schedule - Access all your schedules that you have scheduled. > help - Prints this. @@ -191,7 +190,7 @@ You can run the following commands in the workspace: - Quits TermiNUS You can also run the following to quickly do certain tasks: -> notes add Water “Drinking more water will make me hydrated” +> note add Water “Drinking more water will make me hydrated” > schedule view Running `help [command]` will print the help for the specific workspace. @@ -204,17 +203,17 @@ User can access workspace command directly without entering its environment. See
A workspace command is a command that will bring you to its own workspace. Current workspace command includes notes and schedules.
-Command syntax: {workspace} {workspace available command} +Command syntax:
-Adding a note without entering the notes workspace. +Adding a note without entering the note workspace. ``` [] >>> note add “Remind Cabbin” “Cabbin was here” Note has been added! [] >>> ``` -Adding a schedule without entering the schedules workspace. +Adding a schedule without entering the schedule workspace. ```dtd [] >>> schedule add “Module1 Tut” Thursday 10:00 https://zoom.us/test You have added Module1 Tut’s scheduled zoom link! From 84b3e6f164fad54ebbea78e9d3910ca42c72071d Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Sun, 10 Oct 2021 18:02:56 +0800 Subject: [PATCH 057/466] Test Update --- docs/UserGuide.md | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 786c8cc31c..8709009e27 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -2,8 +2,8 @@ ## Introduction -TermiNUS is a CLI (command line interface) program for NUS Students who wish to organize their NUS academic materials through a CLI. -
The product aims to aid student in organizing their academic schedule and enhancing their learning experiences. +TermiNUS is a CLI (command line interface) program for NUS Students who wish to organize their NUS academic materials through a CLI. +The product aims to aid student in organizing their academic schedule and enhancing their learning experiences. ## Contents * [Getting Start](#Getting-Started) @@ -27,7 +27,8 @@ TermiNUS is a CLI (command line interface) program for NUS Students who wish to 1. Ensure that you have Java 11 or above installed. 2. Down the latest version of `TermiNUS` from [here](https://github.com/AY2122S1-CS2113T-T10-2/tp). -3. When you first start the program, you will be greeted with our banner: +3. When you first start the program, you will be greeted with our banner: + ``` Welcome to TermiNUS! @@ -51,7 +52,8 @@ Type any of the following to get started: ### Accessing Note **Format:** `note`
Accessing the note workspace -After running the note command, you can see the following: +After running the note command, you can see the following: + ``` [] >>> note You have 0 note(s) inside this workspace @@ -68,8 +70,8 @@ Type any of the following to get started: ``` ### Adding a Note -**Format:** `add "" ""` -
Adding a note when in the note workspace +**Format:** `add "" ""` +Adding a note when in the note workspace ``` [note] >>> add “Remind Cabbin” “Cabbin was here” Note has been added! @@ -77,8 +79,8 @@ Note has been added! ``` ### Delete a Note -**Format:** `delete ` -
Deletes the specified note given by its index. +**Format:** `delete ` +Deletes the specified note given by its index. ``` [note] >>> delete 1 Note `Remind Cabbin` has been deleted! @@ -213,7 +215,7 @@ Note has been added! [] >>> ``` -Adding a schedule without entering the schedule workspace. +Adding a schedule without entering the schedule workspace. ```dtd [] >>> schedule add “Module1 Tut” Thursday 10:00 https://zoom.us/test You have added Module1 Tut’s scheduled zoom link! @@ -221,10 +223,10 @@ You have added Module1 Tut’s scheduled zoom link! ``` ## FAQ -## Command Summary +## Command Summary -**Action** | **Format, Examples** ------------- | ------------- +| **Action** | **Format, Examples** +| ------------ | ------------- **access note workspace**|`note` **access schedule workspace**|`schedule` **add**|`add "" ""`
e.g. `add note1 note_content` @@ -233,7 +235,7 @@ You have added Module1 Tut’s scheduled zoom link! **help**|`help` **exit**|`exit` -##Advanced Command Summary +##Advanced Command Summary **Action** | **Format, Examples** ------------ | ------------- **add note**|`note add "" ""`
e.g. `note add note1 note_content` From 42a4129e5dbba43915fd27177e9503987b8db243 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Sun, 10 Oct 2021 18:07:51 +0800 Subject: [PATCH 058/466] Update table --- docs/UserGuide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 8709009e27..2b68492711 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -235,7 +235,7 @@ You have added Module1 Tut’s scheduled zoom link! **help**|`help` **exit**|`exit` -##Advanced Command Summary +## Advanced Command Summary **Action** | **Format, Examples** ------------ | ------------- **add note**|`note add "" ""`
e.g. `note add note1 note_content` From e937de86aba090f63dc417692fdd5c57b3772633 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Sun, 10 Oct 2021 18:09:33 +0800 Subject: [PATCH 059/466] Update UserDocs --- docs/UserGuide.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 2b68492711..83bfb49ab8 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -236,8 +236,8 @@ You have added Module1 Tut’s scheduled zoom link! **exit**|`exit` ## Advanced Command Summary -**Action** | **Format, Examples** ------------- | ------------- +| **Action** | **Format, Examples** +| ------------ | ------------- **add note**|`note add "" ""`
e.g. `note add note1 note_content` **add schedule**|`schedule add "" "" "" ""`
e.g. `schedule add “Module1 Tut” "Thursday" "10:00" "https://zoom.us/test"` **delete note**|`note delete `
e.g. `note delete 1` From 685470169f2d6dee18c3a0d401bfacda84ce57ab Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Sun, 10 Oct 2021 18:10:35 +0800 Subject: [PATCH 060/466] Update UserDocs --- docs/UserGuide.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 83bfb49ab8..4b5f1950d6 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -236,8 +236,8 @@ You have added Module1 Tut’s scheduled zoom link! **exit**|`exit` ## Advanced Command Summary -| **Action** | **Format, Examples** -| ------------ | ------------- +| **Action** | **Format, Examples** +| ------------ | ------------- **add note**|`note add "" ""`
e.g. `note add note1 note_content` **add schedule**|`schedule add "" "" "" ""`
e.g. `schedule add “Module1 Tut” "Thursday" "10:00" "https://zoom.us/test"` **delete note**|`note delete `
e.g. `note delete 1` From a0070294c8a72cc06154bfcdd2fae560c7ad7bfe Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Sun, 10 Oct 2021 18:13:49 +0800 Subject: [PATCH 061/466] Fix UserDocs --- docs/UserGuide.md | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 4b5f1950d6..8eff948bbd 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -225,25 +225,25 @@ You have added Module1 Tut’s scheduled zoom link! ## Command Summary -| **Action** | **Format, Examples** -| ------------ | ------------- -**access note workspace**|`note` -**access schedule workspace**|`schedule` -**add**|`add "" ""`
e.g. `add note1 note_content` -**delete**|`delete `
e.g. `delete 1` -**view**|`view` or `view {index}`
e.g. `view` or `view 1` -**help**|`help` -**exit**|`exit` +| **Action** | **Format, Examples** | +| ------------ | -------------| +|**access note workspace**|`note`| +|**access schedule workspace**|`schedule`| +|**add**|`add "" ""`
e.g. `add note1 note_content`| +|**delete**|`delete `
e.g. `delete 1`| +|**view**|`view` or `view {index}`
e.g. `view` or `view 1`| +|**help**|`help`| +|**exit**|`exit`| ## Advanced Command Summary -| **Action** | **Format, Examples** -| ------------ | ------------- -**add note**|`note add "" ""`
e.g. `note add note1 note_content` -**add schedule**|`schedule add "" "" "" ""`
e.g. `schedule add “Module1 Tut” "Thursday" "10:00" "https://zoom.us/test"` -**delete note**|`note delete `
e.g. `note delete 1` -**delete schedule**|`schedule delete `
e.g. `schedule delete 1` -**view note**|`note view` or `note view {index}`
e.g. `note view 1` -**view schedule**|`schedule view`
e.g. `schedule view` +| **Action** | **Format, Examples** | +| ------------ | ------------- | +|**add note**|`note add "" ""`
e.g. `note add note1 note_content`| +|**add schedule**|`schedule add "" "" "" ""`
e.g. `schedule add “Module1 Tut” "Thursday" "10:00" "https://zoom.us/test"`| +|**delete note**|`note delete `
e.g. `note delete 1`| +|**delete schedule**|`schedule delete `
e.g. `schedule delete 1`| +|**view note**|`note view` or `note view {index}`
e.g. `note view 1`| +|**view schedule**|`schedule view`
e.g. `schedule view`| From 61d2a81445e14ff31caddd6092fdad6538d5d030 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Sun, 10 Oct 2021 18:14:41 +0800 Subject: [PATCH 062/466] Another attempt to fix UG --- docs/UserGuide.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 8eff948bbd..86a2ace3cc 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -235,7 +235,8 @@ You have added Module1 Tut’s scheduled zoom link! |**help**|`help`| |**exit**|`exit`| -## Advanced Command Summary +## Advanced Command Summary + | **Action** | **Format, Examples** | | ------------ | ------------- | |**add note**|`note add "" ""`
e.g. `note add note1 note_content`| From 515e8207fc489b8e528965fa2336c8e7a75e0d07 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Sun, 10 Oct 2021 18:19:42 +0800 Subject: [PATCH 063/466] Minor Update to UG --- docs/UserGuide.md | 79 ++++++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 35 deletions(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 86a2ace3cc..9f497b0593 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -29,17 +29,17 @@ The product aims to aid student in organizing their academic schedule and enhanc 2. Down the latest version of `TermiNUS` from [here](https://github.com/AY2122S1-CS2113T-T10-2/tp). 3. When you first start the program, you will be greeted with our banner: -``` -Welcome to TermiNUS! - -Type any of the following to get started: -> note -> schedule -> help -> exit - -[] >>> -``` + ``` + Welcome to TermiNUS! + + Type any of the following to get started: + > note + > schedule + > help + > exit + + [] >>> + ``` 4. To get started, you can run the following commands: - note @@ -47,11 +47,13 @@ Type any of the following to get started: - help - exit +___ + ## Section: Note ### Accessing Note -**Format:** `note` -
Accessing the note workspace +**Format:** `note` +Accessing the note workspace After running the note command, you can see the following: ``` @@ -88,8 +90,8 @@ Note `Remind Cabbin` has been deleted! ``` ### View Note -**Format:** `view` or `view {index}` -
Two ways to use this command simply running view or view [index] +**Format:** `view` or `view {index}` +Two ways to use this command simply running view or view [index] View by itself will list all notes ``` [note] >>> view @@ -115,8 +117,8 @@ Content: Cabbin was here ## Section: Schedule ### Accessing Schedule -**Format:** `schedule` -
After running the schedule command, you can see the following: +**Format:** `schedule` +After running the schedule command, you can see the following: ``` [] >>> schedule You have 0 link(s) in this workspace. @@ -133,8 +135,8 @@ Type any of the following to get started: ``` ### Adding a Schedule -**Format:** `add "" "" "" ""` -
Adding a new schedule when in the schedule’s workspace +**Format:** `add "" "" "" ""` +Adding a new schedule when in the schedule’s workspace ``` [schedule] >>> add “Module1 Tut1” "Thursday" "10:00" "https://zoom.us/test" You have added Module1 Tut’s scheduled zoom link! @@ -142,8 +144,8 @@ You have added Module1 Tut’s scheduled zoom link! ``` ### Delete a Schedule -**Format:** `delete ` -
Delete schedule when in the schedule’s workspace +**Format:** `delete ` +Delete schedule when in the schedule’s workspace ``` [schedule] >>> delete 1 You have deleted your 1st schedule. @@ -152,8 +154,8 @@ Schedule `Module1 Tut, Thursday, 10:00, https://zoom.us/test` has been deleted! ``` ### View Schedule -**Format:** `view` -
View all schedules when in the schedule’s workspace +**Format:** `view` +View all schedules when in the schedule’s workspace ``` [schedule] >>> view You have 3 schedules inside: @@ -166,17 +168,17 @@ You have 3 schedules inside: ## Exiting the Program -**Format:** `exit` -
To exit the program, simply run the following command: +**Format:** `exit` +To exit the program, simply run the following command: ``` [] >>> exit Goodbye! ``` ## Accessing Help -**Format:** `help` -
Depending on your current workspace, you may get different help messages. -
The following shows the help message in the main workspace: +**Format:** `help` +Depending on your current workspace, you may get different help messages. +The following shows the help message in the main workspace: ``` [] >>> help @@ -201,12 +203,12 @@ Running `help [command]` will print the help for the specific workspace. ``` ## Advanced Usage of Commands -User can access workspace command directly without entering its environment. Seen below are some command examples. -
-A workspace command is a command that will bring you to its own workspace. Current workspace command includes notes and schedules. -
-Command syntax: -
+User can access workspace command directly without entering its environment. Seen below are some command examples. + +A workspace command is a command that will bring you to its own workspace. Current workspace command includes notes and schedules. + +Command syntax: + Adding a note without entering the note workspace. ``` @@ -221,12 +223,17 @@ Adding a schedule without entering the schedule workspace. You have added Module1 Tut’s scheduled zoom link! [] >>> ``` + +___ + ## FAQ +___ + ## Command Summary | **Action** | **Format, Examples** | -| ------------ | -------------| +| ------------ | ------------- | |**access note workspace**|`note`| |**access schedule workspace**|`schedule`| |**add**|`add "" ""`
e.g. `add note1 note_content`| @@ -235,6 +242,8 @@ You have added Module1 Tut’s scheduled zoom link! |**help**|`help`| |**exit**|`exit`| +___ + ## Advanced Command Summary | **Action** | **Format, Examples** | From 09b345cbb1818072ace31af15052eddb7ae42d42 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Mon, 11 Oct 2021 08:20:31 +0800 Subject: [PATCH 064/466] Change method name for consistency --- src/main/java/terminus/command/zoomlink/AddLinkCommand.java | 2 +- src/main/java/terminus/common/CommonFormat.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index dfb96e18f7..ad753c01f1 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -51,7 +51,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException, In this.description = argArray.get(0); this.day = argArray.get(1); - this.startTime = CommonFormat.localTimeConverter(userStartTime); + this.startTime = CommonFormat.convertToLocalTime(userStartTime); this.link = argArray.get(3); } diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index 913dbc1a83..b03486024e 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -48,7 +48,7 @@ public static boolean isArrayEmpty(ArrayList argArray) { return false; } - public static LocalTime localTimeConverter(String startTime) throws InvalidTimeFormatException { + public static LocalTime convertToLocalTime(String startTime) throws InvalidTimeFormatException { if (startTime.length() != 5 || startTime.indexOf(":") != 2) { throw new InvalidTimeFormatException( String.format(Messages.ERROR_MESSAGE_INVALID_TIME_FORMAT, LOCAL_TIME_FORMAT)); From 8f6a589c7a21310a6c60692f2fb43c031aa22492 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Mon, 11 Oct 2021 09:01:20 +0800 Subject: [PATCH 065/466] Add JavaDoc for AddLinkCommand class --- .../command/zoomlink/AddLinkCommand.java | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index ad753c01f1..a965f262ab 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -27,16 +27,34 @@ public AddLinkCommand() { } + /** + * Returns the command format to Add a Link + * + * @return The string containing the command format to add a link + */ @Override public String getFormat() { return CommonFormat.COMMAND_ADD_SCHEDULE_FORMAT; } + /** + * Returns the description of Add Link Command + * + * @return The string containing the description of an add command + */ @Override public String getHelpMessage() { return Messages.MESSAGE_COMMAND_ADD; } + /** + * Parses the arguments in an add link command + * to its respective description, day, start-time, and link + * + * @param arguments The string arguments to be parsed in to the respective fields. + * @throws InvalidArgumentException Exception for when argument parsing fails + * @throws InvalidTimeFormatException Exception for when time format is invalid + */ @Override public void parseArguments(String arguments) throws InvalidArgumentException, InvalidTimeFormatException { // Perform required checks with regex @@ -55,6 +73,16 @@ public void parseArguments(String arguments) throws InvalidArgumentException, In this.link = argArray.get(3); } + /** + * Executes the add link command + * Prints the relevant response to the Ui + * + * @param ui The Ui object to send messages to the users. + * @param module The NusModule contain the list of all notes and schedules. + * @return CommandResult to indicate the success and additional information about the execution + * @throws InvalidCommandException Exception for when the user command is not found + * @throws InvalidArgumentException Exception for when the argument parsing fails + */ @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException, InvalidArgumentException { ContentManager contentManager = module.getContentManager(); @@ -65,6 +93,12 @@ public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandExcep return new CommandResult(true, false); } + /** + * Checks if arguments are non-empty and valid + * + * @param argArray The command arguments in an array list + * @return True if the appropriate number of arguments are present, false otherwise. + */ private boolean isValidScheduleArguments(ArrayList argArray) { boolean isValid = true; if (argArray.size() != ADD_SCHEDULE_ARGUMENTS) { From 2e99d5a89a766f09b4ce050e1a93feac5e3e6b5a Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Mon, 11 Oct 2021 09:07:38 +0800 Subject: [PATCH 066/466] Add JavaDoc for ScheduleCommand class --- src/main/java/terminus/command/ScheduleCommand.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/terminus/command/ScheduleCommand.java b/src/main/java/terminus/command/ScheduleCommand.java index 5bd43ccfe0..aba0e4e2de 100644 --- a/src/main/java/terminus/command/ScheduleCommand.java +++ b/src/main/java/terminus/command/ScheduleCommand.java @@ -2,7 +2,6 @@ import terminus.common.CommonFormat; import terminus.common.Messages; -import terminus.module.NusModule; import terminus.parser.LinkCommandParser; public class ScheduleCommand extends WorkspaceCommand { @@ -11,11 +10,21 @@ public ScheduleCommand() { super(LinkCommandParser.getInstance()); } + /** + * Returns the keyword for schedule-related commands + * + * @return The string containing the keyword for schedule-related commands + */ @Override public String getFormat() { return CommonFormat.COMMAND_SCHEDULE; } + /** + * Returns the description for the command + * + * @return The string containing the description for this command + */ @Override public String getHelpMessage() { return Messages.MESSAGE_COMMAND_SCHEDULE; From d6d801181b23263f1f770a6432980dfaf97a049e Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Mon, 11 Oct 2021 09:17:48 +0800 Subject: [PATCH 067/466] Add JavaDoc to Link class --- src/main/java/terminus/content/Link.java | 40 ++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/main/java/terminus/content/Link.java b/src/main/java/terminus/content/Link.java index 0f31118cc7..4a81391fa9 100644 --- a/src/main/java/terminus/content/Link.java +++ b/src/main/java/terminus/content/Link.java @@ -18,35 +18,75 @@ public Link(String name, String day, LocalTime startTime, String link) { this.link = link; } + /** + * Returns the day of the Link object + * + * @return A string containing the day of the Link object + */ public String getDay() { return day; } + /** + * Sets the day of the Link object + * + * @param day The new day to be set for the Link object + */ public void setDay(String day) { this.day = day; } + /** + * Returns the startTime of the Link object + * + * @return A LocalTime object containing the startTime of the Link object + */ public LocalTime getStartTime() { return startTime; } + /** + * Sets the startTime of the Link object + * + * @param startTime The new startTime to be set for the Link object + */ public void setStartTime(LocalTime startTime) { this.startTime = startTime; } + /** + * Returns the link of the Link object + * + * @return A String containing the link of the Link object + */ public String getLink() { return link; } + /** + * Sets the link of the Link object + * + * @param link The new link to be set for the Link object + */ public void setLink(String link) { this.link = link; } + /** + * Returns all the attributes of the Link object + * + * @return A string containing all the attributes of the Link object + */ @Override public String getDisplayInfo() { return String.format(DISPLAY_LINK_MESSAGE, this.name, day, startTime, link); } + /** + * Returns all the attributes' information of the Link object + * + * @return A method to display all the attributes of the Link object + */ @Override public String getViewDescription() { return getDisplayInfo(); From a9e038791f7ebc4c830147d14b64790cd05cf14e Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Mon, 11 Oct 2021 09:22:42 +0800 Subject: [PATCH 068/466] Add description for exception classes --- src/main/java/terminus/exception/InvalidArgumentException.java | 3 +++ src/main/java/terminus/exception/InvalidCommandException.java | 3 +++ .../java/terminus/exception/InvalidTimeFormatException.java | 3 +++ 3 files changed, 9 insertions(+) diff --git a/src/main/java/terminus/exception/InvalidArgumentException.java b/src/main/java/terminus/exception/InvalidArgumentException.java index 16f27b0c94..11086d777d 100644 --- a/src/main/java/terminus/exception/InvalidArgumentException.java +++ b/src/main/java/terminus/exception/InvalidArgumentException.java @@ -1,5 +1,8 @@ package terminus.exception; +/** + * Invalid Argument Exception class which handles exception when argument from user command is invalid + */ public class InvalidArgumentException extends Exception { private final String format; diff --git a/src/main/java/terminus/exception/InvalidCommandException.java b/src/main/java/terminus/exception/InvalidCommandException.java index d1b23224ab..7eaee5c4ca 100644 --- a/src/main/java/terminus/exception/InvalidCommandException.java +++ b/src/main/java/terminus/exception/InvalidCommandException.java @@ -1,5 +1,8 @@ package terminus.exception; +/** + * Invalid Command Exception class which handles exception when user command is not found + */ public class InvalidCommandException extends Exception { public InvalidCommandException(String message) { diff --git a/src/main/java/terminus/exception/InvalidTimeFormatException.java b/src/main/java/terminus/exception/InvalidTimeFormatException.java index 938a19fd45..9573238249 100644 --- a/src/main/java/terminus/exception/InvalidTimeFormatException.java +++ b/src/main/java/terminus/exception/InvalidTimeFormatException.java @@ -1,5 +1,8 @@ package terminus.exception; +/** + * Invalid Time Format Exception class which handles exception when time format from user is invalid + */ public class InvalidTimeFormatException extends Exception { public InvalidTimeFormatException(String message) { From 22cf670320bdba270bc793a7d7ba225e19e17449 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Mon, 11 Oct 2021 09:49:56 +0800 Subject: [PATCH 069/466] Add JavaDoc for LinkCommandParser class --- src/main/java/terminus/parser/LinkCommandParser.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/terminus/parser/LinkCommandParser.java b/src/main/java/terminus/parser/LinkCommandParser.java index 2efb9c36dd..058c8fd216 100644 --- a/src/main/java/terminus/parser/LinkCommandParser.java +++ b/src/main/java/terminus/parser/LinkCommandParser.java @@ -15,6 +15,11 @@ public LinkCommandParser() { super(CommonFormat.COMMAND_SCHEDULE); } + /** + * Returns the command map for the schedule workspace + * + * @return A LinkCommandParser object which contains the command map for the schedule workspace + */ public static LinkCommandParser getInstance() { LinkCommandParser parser = new LinkCommandParser(); parser.addCommand(CommonFormat.COMMAND_BACK, new BackCommand()); @@ -24,6 +29,12 @@ public static LinkCommandParser getInstance() { return parser; } + /** + * Returns the opening description of the workspace + * + * @param module The current module containing the array list of all the links + * @return The string containing a description of the number of links in the workspace + */ @Override public String getWorkspaceBanner(NusModule module) { return String.format(Messages.SCHEDULE_BANNER, module.getLinks().size()); From 907dd177e31c552b0e30bc979ef393cee44c7a63 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Mon, 11 Oct 2021 09:56:18 +0800 Subject: [PATCH 070/466] Add JavaDoc for Content class --- src/main/java/terminus/content/Content.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/main/java/terminus/content/Content.java b/src/main/java/terminus/content/Content.java index e0bcae16fc..b4054f12b4 100644 --- a/src/main/java/terminus/content/Content.java +++ b/src/main/java/terminus/content/Content.java @@ -12,11 +12,22 @@ public Content(String name) { this.name = name; } + /** + * Initializes the Content object + * + * @param name the name attribute of Content + * @param data the data attribute of Content + */ public Content(String name, String data) { this.name = name; this.data = data; } + /** + * Returns the name attribute of the Content object + * + * @return A string containing the name attribute of the Content object + */ public String getName() { return name; } @@ -33,6 +44,11 @@ public void setData(String data) { this.data = data; } + /** + * Returns all the attributes of the Content object + * + * @return A string containing all the attributes of the Content object + */ public String getDisplayInfo() { return String.format(DISPLAY_MESSAGE, name, data); } From 38198f8d11f401b7bca101ed9bd76e93f79321f2 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Mon, 11 Oct 2021 10:01:55 +0800 Subject: [PATCH 071/466] Add JavaDoc to methods in CommonFormat class --- .../java/terminus/common/CommonFormat.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index b03486024e..6484ae6221 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -29,6 +29,12 @@ public class CommonFormat { + "\"\" \"\" \"\""; public static final String COMMAND_ADD_NOTE_FORMAT = COMMAND_ADD + " \"\" \"\""; + /** + * Method to get arguments + * + * @param arg String containing the arguments + * @return An array list containing the separated arguments + */ public static ArrayList findArguments(String arg) { ArrayList argsArray = new ArrayList<>(); Pattern p = Pattern.compile("\"(.*?)\""); @@ -39,6 +45,12 @@ public static ArrayList findArguments(String arg) { return argsArray; } + /** + * Checks if an array list is empty + * + * @param argArray The array list to be checked + * @return True if array list is empty, false otherwise + */ public static boolean isArrayEmpty(ArrayList argArray) { for (String s : argArray) { if (s.isBlank()) { @@ -48,6 +60,13 @@ public static boolean isArrayEmpty(ArrayList argArray) { return false; } + /** + * Converts string to a LocalTime object + * + * @param startTime The string to be converted to a LocalTime object + * @return A LocalTime object of the converted string + * @throws InvalidTimeFormatException Exception for when string does not follow the proper time format + */ public static LocalTime convertToLocalTime(String startTime) throws InvalidTimeFormatException { if (startTime.length() != 5 || startTime.indexOf(":") != 2) { throw new InvalidTimeFormatException( From fade2ebf965860eb2bab52105bda13c7210a16f5 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Mon, 11 Oct 2021 10:06:55 +0800 Subject: [PATCH 072/466] Add class description --- src/main/java/terminus/command/ScheduleCommand.java | 3 +++ src/main/java/terminus/command/zoomlink/AddLinkCommand.java | 3 +++ src/main/java/terminus/content/Link.java | 3 +++ src/main/java/terminus/parser/LinkCommandParser.java | 3 +++ 4 files changed, 12 insertions(+) diff --git a/src/main/java/terminus/command/ScheduleCommand.java b/src/main/java/terminus/command/ScheduleCommand.java index aba0e4e2de..bdec5c6694 100644 --- a/src/main/java/terminus/command/ScheduleCommand.java +++ b/src/main/java/terminus/command/ScheduleCommand.java @@ -4,6 +4,9 @@ import terminus.common.Messages; import terminus.parser.LinkCommandParser; +/** + * ScheduleCommand class to manage commands inside the Schedule workspace + */ public class ScheduleCommand extends WorkspaceCommand { public ScheduleCommand() { diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index a965f262ab..90f1580ea5 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -14,6 +14,9 @@ import java.time.LocalTime; import java.util.ArrayList; +/** + * AddLinkCommand class which will manage the adding of new Links from user command + */ public class AddLinkCommand extends Command { private String description; diff --git a/src/main/java/terminus/content/Link.java b/src/main/java/terminus/content/Link.java index 4a81391fa9..792ed671a9 100644 --- a/src/main/java/terminus/content/Link.java +++ b/src/main/java/terminus/content/Link.java @@ -2,6 +2,9 @@ import java.time.LocalTime; +/** + * Link class to represent a content of type link + */ public class Link extends Content { private String day; diff --git a/src/main/java/terminus/parser/LinkCommandParser.java b/src/main/java/terminus/parser/LinkCommandParser.java index 058c8fd216..0538483876 100644 --- a/src/main/java/terminus/parser/LinkCommandParser.java +++ b/src/main/java/terminus/parser/LinkCommandParser.java @@ -9,6 +9,9 @@ import terminus.content.Link; import terminus.module.NusModule; +/** + * LinkCommandParser class to manage schedule-related commands + */ public class LinkCommandParser extends CommandParser { public LinkCommandParser() { From 0ecc59ba08ed4ec3b3df59ae4dd81c7c6deff7d9 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Mon, 11 Oct 2021 10:44:59 +0800 Subject: [PATCH 073/466] Fix CI Issues --- .../java/terminus/command/ScheduleCommand.java | 10 +++++----- .../command/zoomlink/AddLinkCommand.java | 15 +++++++-------- .../java/terminus/common/CommonFormat.java | 6 +++--- src/main/java/terminus/content/Content.java | 6 +++--- src/main/java/terminus/content/Link.java | 18 +++++++++--------- .../exception/InvalidArgumentException.java | 2 +- .../exception/InvalidCommandException.java | 2 +- .../exception/InvalidTimeFormatException.java | 2 +- .../terminus/parser/LinkCommandParser.java | 6 +++--- 9 files changed, 33 insertions(+), 34 deletions(-) diff --git a/src/main/java/terminus/command/ScheduleCommand.java b/src/main/java/terminus/command/ScheduleCommand.java index bdec5c6694..9600eee0bf 100644 --- a/src/main/java/terminus/command/ScheduleCommand.java +++ b/src/main/java/terminus/command/ScheduleCommand.java @@ -5,7 +5,7 @@ import terminus.parser.LinkCommandParser; /** - * ScheduleCommand class to manage commands inside the Schedule workspace + * ScheduleCommand class to manage commands inside the Schedule workspace. */ public class ScheduleCommand extends WorkspaceCommand { @@ -14,7 +14,7 @@ public ScheduleCommand() { } /** - * Returns the keyword for schedule-related commands + * Returns the keyword for schedule-related commands. * * @return The string containing the keyword for schedule-related commands */ @@ -24,13 +24,13 @@ public String getFormat() { } /** - * Returns the description for the command + * Returns the description for the command. * - * @return The string containing the description for this command + * @return The string containing the description for this command */ @Override public String getHelpMessage() { return Messages.MESSAGE_COMMAND_SCHEDULE; } - + } diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index 90f1580ea5..ec9d3514f1 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -15,7 +15,7 @@ import java.util.ArrayList; /** - * AddLinkCommand class which will manage the adding of new Links from user command + * AddLinkCommand class which will manage the adding of new Links from user command. */ public class AddLinkCommand extends Command { @@ -31,7 +31,7 @@ public AddLinkCommand() { } /** - * Returns the command format to Add a Link + * Returns the command format to Add a Link. * * @return The string containing the command format to add a link */ @@ -41,7 +41,7 @@ public String getFormat() { } /** - * Returns the description of Add Link Command + * Returns the description of Add Link Command. * * @return The string containing the description of an add command */ @@ -51,8 +51,7 @@ public String getHelpMessage() { } /** - * Parses the arguments in an add link command - * to its respective description, day, start-time, and link + * Parses the arguments in an add link command to its respective description, day, start-time, and link. * * @param arguments The string arguments to be parsed in to the respective fields. * @throws InvalidArgumentException Exception for when argument parsing fails @@ -77,8 +76,8 @@ public void parseArguments(String arguments) throws InvalidArgumentException, In } /** - * Executes the add link command - * Prints the relevant response to the Ui + * Executes the add link command. + * Prints the relevant response to the Ui. * * @param ui The Ui object to send messages to the users. * @param module The NusModule contain the list of all notes and schedules. @@ -97,7 +96,7 @@ public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandExcep } /** - * Checks if arguments are non-empty and valid + * Checks if arguments are non-empty and valid. * * @param argArray The command arguments in an array list * @return True if the appropriate number of arguments are present, false otherwise. diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index 6484ae6221..2a2536dfa4 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -30,7 +30,7 @@ public class CommonFormat { public static final String COMMAND_ADD_NOTE_FORMAT = COMMAND_ADD + " \"\" \"\""; /** - * Method to get arguments + * Method to get arguments. * * @param arg String containing the arguments * @return An array list containing the separated arguments @@ -46,7 +46,7 @@ public static ArrayList findArguments(String arg) { } /** - * Checks if an array list is empty + * Checks if an array list is empty. * * @param argArray The array list to be checked * @return True if array list is empty, false otherwise @@ -61,7 +61,7 @@ public static boolean isArrayEmpty(ArrayList argArray) { } /** - * Converts string to a LocalTime object + * Converts string to a LocalTime object. * * @param startTime The string to be converted to a LocalTime object * @return A LocalTime object of the converted string diff --git a/src/main/java/terminus/content/Content.java b/src/main/java/terminus/content/Content.java index b4054f12b4..0756baf8fe 100644 --- a/src/main/java/terminus/content/Content.java +++ b/src/main/java/terminus/content/Content.java @@ -13,7 +13,7 @@ public Content(String name) { } /** - * Initializes the Content object + * Initializes the Content object. * * @param name the name attribute of Content * @param data the data attribute of Content @@ -24,7 +24,7 @@ public Content(String name, String data) { } /** - * Returns the name attribute of the Content object + * Returns the name attribute of the Content object. * * @return A string containing the name attribute of the Content object */ @@ -45,7 +45,7 @@ public void setData(String data) { } /** - * Returns all the attributes of the Content object + * Returns all the attributes of the Content object. * * @return A string containing all the attributes of the Content object */ diff --git a/src/main/java/terminus/content/Link.java b/src/main/java/terminus/content/Link.java index 792ed671a9..b26cc6ccfc 100644 --- a/src/main/java/terminus/content/Link.java +++ b/src/main/java/terminus/content/Link.java @@ -3,7 +3,7 @@ import java.time.LocalTime; /** - * Link class to represent a content of type link + * Link class to represent a content of type link. */ public class Link extends Content { @@ -22,7 +22,7 @@ public Link(String name, String day, LocalTime startTime, String link) { } /** - * Returns the day of the Link object + * Returns the day of the Link object. * * @return A string containing the day of the Link object */ @@ -31,7 +31,7 @@ public String getDay() { } /** - * Sets the day of the Link object + * Sets the day of the Link object. * * @param day The new day to be set for the Link object */ @@ -40,7 +40,7 @@ public void setDay(String day) { } /** - * Returns the startTime of the Link object + * Returns the startTime of the Link object. * * @return A LocalTime object containing the startTime of the Link object */ @@ -49,7 +49,7 @@ public LocalTime getStartTime() { } /** - * Sets the startTime of the Link object + * Sets the startTime of the Link object. * * @param startTime The new startTime to be set for the Link object */ @@ -58,7 +58,7 @@ public void setStartTime(LocalTime startTime) { } /** - * Returns the link of the Link object + * Returns the link of the Link object. * * @return A String containing the link of the Link object */ @@ -67,7 +67,7 @@ public String getLink() { } /** - * Sets the link of the Link object + * Sets the link of the Link object. * * @param link The new link to be set for the Link object */ @@ -76,7 +76,7 @@ public void setLink(String link) { } /** - * Returns all the attributes of the Link object + * Returns all the attributes of the Link object. * * @return A string containing all the attributes of the Link object */ @@ -86,7 +86,7 @@ public String getDisplayInfo() { } /** - * Returns all the attributes' information of the Link object + * Returns all the attributes' information of the Link object. * * @return A method to display all the attributes of the Link object */ diff --git a/src/main/java/terminus/exception/InvalidArgumentException.java b/src/main/java/terminus/exception/InvalidArgumentException.java index 11086d777d..1d8e033bdd 100644 --- a/src/main/java/terminus/exception/InvalidArgumentException.java +++ b/src/main/java/terminus/exception/InvalidArgumentException.java @@ -1,7 +1,7 @@ package terminus.exception; /** - * Invalid Argument Exception class which handles exception when argument from user command is invalid + * Invalid Argument Exception class which handles exception when argument from user command is invalid. */ public class InvalidArgumentException extends Exception { diff --git a/src/main/java/terminus/exception/InvalidCommandException.java b/src/main/java/terminus/exception/InvalidCommandException.java index 7eaee5c4ca..26d64182ea 100644 --- a/src/main/java/terminus/exception/InvalidCommandException.java +++ b/src/main/java/terminus/exception/InvalidCommandException.java @@ -1,7 +1,7 @@ package terminus.exception; /** - * Invalid Command Exception class which handles exception when user command is not found + * Invalid Command Exception class which handles exception when user command is not found. */ public class InvalidCommandException extends Exception { diff --git a/src/main/java/terminus/exception/InvalidTimeFormatException.java b/src/main/java/terminus/exception/InvalidTimeFormatException.java index 9573238249..09450ea5e3 100644 --- a/src/main/java/terminus/exception/InvalidTimeFormatException.java +++ b/src/main/java/terminus/exception/InvalidTimeFormatException.java @@ -1,7 +1,7 @@ package terminus.exception; /** - * Invalid Time Format Exception class which handles exception when time format from user is invalid + * Invalid Time Format Exception class which handles exception when time format from user is invalid. */ public class InvalidTimeFormatException extends Exception { diff --git a/src/main/java/terminus/parser/LinkCommandParser.java b/src/main/java/terminus/parser/LinkCommandParser.java index 0538483876..bc77f90960 100644 --- a/src/main/java/terminus/parser/LinkCommandParser.java +++ b/src/main/java/terminus/parser/LinkCommandParser.java @@ -10,7 +10,7 @@ import terminus.module.NusModule; /** - * LinkCommandParser class to manage schedule-related commands + * LinkCommandParser class to manage schedule-related commands. */ public class LinkCommandParser extends CommandParser { @@ -19,7 +19,7 @@ public LinkCommandParser() { } /** - * Returns the command map for the schedule workspace + * Returns the command map for the schedule workspace. * * @return A LinkCommandParser object which contains the command map for the schedule workspace */ @@ -33,7 +33,7 @@ public static LinkCommandParser getInstance() { } /** - * Returns the opening description of the workspace + * Returns the opening description of the workspace. * * @param module The current module containing the array list of all the links * @return The string containing a description of the number of links in the workspace From e69d45800958f607837062dc8fd83b31de0cd7be Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Mon, 11 Oct 2021 18:45:02 +0800 Subject: [PATCH 074/466] Add assertions to core code --- src/main/java/terminus/Terminus.java | 12 ++++++++---- src/main/java/terminus/storage/ModuleStorage.java | 2 ++ src/main/java/terminus/ui/Ui.java | 1 - 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 38300ab230..2760610769 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -49,21 +49,24 @@ private void start() { this.moduleStorage = new ModuleStorage(DATA_DIRECTORY.resolve(MAIN_JSON)); try { this.nusModule = moduleStorage.loadFile(); - if (this.nusModule == null) { - this.nusModule = new NusModule(); - } - this.ui.printParserBanner(this.parser, this.nusModule); } catch (IOException e) { ui.printSection( "Unable to save/load file: " + DATA_DIRECTORY.resolve(MAIN_JSON), "TermiNUS may still run, but your changes may not be saved." ); + } finally { + if (this.nusModule == null) { + this.nusModule = new NusModule(); + } + this.ui.printParserBanner(this.parser, this.nusModule); } } private void runCommandsUntilExit() { while (true) { + assert workspace != null: "Workspace should always have a value"; String input = ui.requestCommand(workspace); + assert input != null: "Input should not be null."; Command currentCommand = null; try { @@ -79,6 +82,7 @@ private void runCommandsUntilExit() { break; } else if (isWorkspaceCommand) { parser = result.getAdditionalData(); + assert parser != null: "commandParser is not null"; workspace = parser.getWorkspace(); ui.printParserBanner(parser, nusModule); } else if (!result.isOk()) { diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 01e9e94a54..67276386ff 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -18,6 +18,7 @@ public ModuleStorage(Path filePath) { } private void initializeFile() throws IOException { + assert filePath != null: "filePath should not be null"; if (!Files.isDirectory(filePath.getParent())) { Files.createDirectories(filePath.getParent()); } @@ -37,6 +38,7 @@ public NusModule loadFile() throws IOException { public void saveFile(NusModule module) throws IOException { initializeFile(); String jsonString = gson.toJson(module); + assert jsonString != null && !jsonString.isBlank(): "File saved is blank"; Files.writeString(filePath, jsonString); } diff --git a/src/main/java/terminus/ui/Ui.java b/src/main/java/terminus/ui/Ui.java index 7f5c61735a..22431fec2c 100644 --- a/src/main/java/terminus/ui/Ui.java +++ b/src/main/java/terminus/ui/Ui.java @@ -2,7 +2,6 @@ import java.util.Arrays; import java.util.Scanner; -import terminus.common.Messages; import terminus.module.NusModule; import terminus.parser.CommandParser; From 32202235e239430e491be2d8dd41a6b725179fcf Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Mon, 11 Oct 2021 21:11:01 +0800 Subject: [PATCH 075/466] Delete Telegram Bot Github Action Workflow --- .github/workflows/main.yml | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index 38721e0b75..0000000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,34 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Telegram Notification - -# Controls when the workflow will run -on: - # Triggers the workflow on push or pull request events but only for the master branch - pull_request: - branches: [ master ] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - build: - # The type of runner that the job will run on - runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - # Runs the telegram notify action to send a notification - - name: Telegram Notify - uses: appleboy/telegram-action@master - with: - to: ${{ secrets.TELEGRAM_TO }} - token: ${{ secrets.TELEGRAM_TOKEN }} - format: markdown - message: | - There is a new PR to the repo. [View Repo PR](https://github.com/AY2122S1-CS2113T-T10-2/tp/pulls) From cd1d45a7895a565a9ba0a7c0e341df37182572f9 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Mon, 11 Oct 2021 23:56:06 +0800 Subject: [PATCH 076/466] Refactor NusModule and ContentManager --- .../java/terminus/command/DeleteCommand.java | 15 +++--- .../java/terminus/command/ViewCommand.java | 10 ++-- .../terminus/command/note/AddNoteCommand.java | 7 ++- .../command/zoomlink/AddLinkCommand.java | 8 +-- .../java/terminus/content/ContentManager.java | 32 ++++++------ src/main/java/terminus/module/NusModule.java | 51 ++++--------------- .../terminus/parser/LinkCommandParser.java | 6 +-- .../terminus/parser/NoteCommandParser.java | 6 +-- .../command/link/AddLinkCommandTest.java | 15 +++--- .../command/note/AddNoteCommandTest.java | 12 +++-- .../command/note/DeleteNoteCommandTest.java | 9 ++-- 11 files changed, 73 insertions(+), 98 deletions(-) diff --git a/src/main/java/terminus/command/DeleteCommand.java b/src/main/java/terminus/command/DeleteCommand.java index f4b08b3f3d..f5619e88b0 100644 --- a/src/main/java/terminus/command/DeleteCommand.java +++ b/src/main/java/terminus/command/DeleteCommand.java @@ -3,18 +3,17 @@ import java.util.Locale; import terminus.common.CommonFormat; import terminus.common.Messages; +import terminus.content.Content; import terminus.content.ContentManager; import terminus.exception.InvalidArgumentException; import terminus.module.NusModule; import terminus.ui.Ui; -public class DeleteCommand extends Command { - - private T type; - +public class DeleteCommand extends Command { + private Class type; private int itemNumber; - public DeleteCommand(T type) { + public DeleteCommand(Class type) { this.type = type; } @@ -45,10 +44,8 @@ public void parseArguments(String arguments) throws InvalidArgumentException { @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidArgumentException { - ContentManager contentManager = module.getContentManager(); - contentManager.setContent(module.get(type)); - String deletedContentName = contentManager.deleteContent(itemNumber); - module.set(type, contentManager.getContents()); + ContentManager contentManager = module.getContentManager(type); + String deletedContentName = contentManager.deleteContent(itemNumber); ui.printSection(String.format(Messages.MESSAGE_RESPONSE_DELETE, CommonFormat.getClassName(type).toLowerCase(), deletedContentName)); return new CommandResult(true); diff --git a/src/main/java/terminus/command/ViewCommand.java b/src/main/java/terminus/command/ViewCommand.java index c47da59185..ed6606e119 100644 --- a/src/main/java/terminus/command/ViewCommand.java +++ b/src/main/java/terminus/command/ViewCommand.java @@ -2,19 +2,20 @@ import terminus.common.CommonFormat; import terminus.common.Messages; +import terminus.content.Content; import terminus.content.ContentManager; import terminus.exception.InvalidArgumentException; import terminus.module.NusModule; import terminus.ui.Ui; -public class ViewCommand extends Command { +public class ViewCommand extends Command { - private T type; + private Class type; private int itemNumber; private boolean displayAll; - public ViewCommand(T type) { + public ViewCommand(Class type) { this.type = type; this.displayAll = false; } @@ -45,9 +46,8 @@ public void parseArguments(String arguments) throws InvalidArgumentException { @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidArgumentException { - ContentManager contentManager = module.getContentManager(); - contentManager.setContent(module.get(type)); StringBuilder result = new StringBuilder(); + ContentManager contentManager = module.getContentManager(type); if (displayAll) { String fullList = contentManager.listAllContents(); if (fullList.isBlank()) { diff --git a/src/main/java/terminus/command/note/AddNoteCommand.java b/src/main/java/terminus/command/note/AddNoteCommand.java index c285eae1d8..508754f48a 100644 --- a/src/main/java/terminus/command/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/note/AddNoteCommand.java @@ -6,6 +6,7 @@ import terminus.common.CommonFormat; import terminus.common.Messages; import terminus.content.ContentManager; +import terminus.content.Note; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.NusModule; @@ -48,10 +49,8 @@ public void parseArguments(String arguments) throws InvalidArgumentException { @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { - ContentManager contentManager = module.getContentManager(); - contentManager.setContent(module.getNotes()); - contentManager.addNote(name, data); - module.setNotes(contentManager.getContents()); + ContentManager contentManager = module.getContentManager(Note.class); + contentManager.add(new Note(name, data)); ui.printSection(String.format(Messages.MESSAGE_RESPONSE_ADD, CommonFormat.COMMAND_NOTE, name)); return new CommandResult(true, false); } diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index dfb96e18f7..7f10409805 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -3,6 +3,8 @@ import terminus.command.Command; import terminus.command.CommandResult; import terminus.content.ContentManager; +import terminus.content.Link; +import terminus.content.Note; import terminus.exception.InvalidTimeFormatException; import terminus.module.NusModule; import terminus.common.CommonFormat; @@ -57,10 +59,8 @@ public void parseArguments(String arguments) throws InvalidArgumentException, In @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException, InvalidArgumentException { - ContentManager contentManager = module.getContentManager(); - contentManager.setContent(module.getLinks()); - contentManager.addLink(description, day, startTime, link); - module.setLinks(contentManager.getContents()); + ContentManager contentManager = module.getContentManager(Link.class); + contentManager.add(new Link(description, day, startTime, link)); ui.printSection(String.format(Messages.MESSAGE_RESPONSE_ADD, CommonFormat.COMMAND_SCHEDULE, description)); return new CommandResult(true, false); } diff --git a/src/main/java/terminus/content/ContentManager.java b/src/main/java/terminus/content/ContentManager.java index a06bafb859..df697848fb 100644 --- a/src/main/java/terminus/content/ContentManager.java +++ b/src/main/java/terminus/content/ContentManager.java @@ -5,30 +5,30 @@ import terminus.common.Messages; import terminus.exception.InvalidArgumentException; -public class ContentManager { +public class ContentManager { - private ArrayList contents; + private ArrayList contents; public ContentManager() { - + contents = new ArrayList<>(); } - public void setContent(ArrayList contents) { + public void setContent(ArrayList contents) { this.contents = contents; } - public void addNote(String name, String data) { - contents.add(new Note(name, data)); + public ArrayList getContents() { + return contents; } - public void addLink(String description, String day, LocalTime startTime, String zoomLink) { - contents.add(new Link(description, day, startTime, zoomLink)); + public int getTotalContents() { + return contents.size(); } public String listAllContents() { StringBuilder result = new StringBuilder(); int i = 1; - for (Content n : contents) { + for (T n : contents) { result.append(String.format("%d. %s\n", i, n.getViewDescription())); i++; } @@ -42,14 +42,6 @@ public String getContentData(int contentNumber) throws InvalidArgumentException return contents.get(contentNumber - 1).getDisplayInfo(); } - public ArrayList getContents() { - return contents; - } - - public int getTotalContents() { - return contents.size(); - } - public String deleteContent(int contentNumber) throws InvalidArgumentException { if (!isValidNumber(contentNumber)) { throw new InvalidArgumentException(Messages.ERROR_MESSAGE_EMPTY_CONTENTS); @@ -59,7 +51,13 @@ public String deleteContent(int contentNumber) throws InvalidArgumentException { return deletedContentName; } + public void add(T content) { + contents.add(content); + } + private boolean isValidNumber(int number) { return !(number < 1 || number > contents.size()); } + + } diff --git a/src/main/java/terminus/module/NusModule.java b/src/main/java/terminus/module/NusModule.java index ad9a264630..f24166afdf 100644 --- a/src/main/java/terminus/module/NusModule.java +++ b/src/main/java/terminus/module/NusModule.java @@ -1,64 +1,35 @@ package terminus.module; +import java.time.LocalTime; import java.util.ArrayList; import terminus.content.Content; import terminus.content.ContentManager; import terminus.content.Link; import terminus.content.Note; +import terminus.exception.InvalidArgumentException; public class NusModule { - private ArrayList notes; - private ArrayList links; - private transient ContentManager contentManager; + private ContentManager noteManager; + private ContentManager linkManager; public NusModule() { - contentManager = new ContentManager(); - notes = new ArrayList(); - links = new ArrayList(); + noteManager = new ContentManager(); + linkManager = new ContentManager(); } - public ContentManager getContentManager() { - return contentManager; - } - - public ArrayList getNotes() { - return notes; - } - - public void setNotes(ArrayList notes) { - this.notes = notes; - } - - public ArrayList getLinks() { - return links; - } - - public void setLinks(ArrayList links) { - this.links = links; - } - - public void set(T type, ArrayList contents) { - if (type == Note.class) { - this.notes = contents; - } else if (type == Link.class) { - this.links = contents; - } else { - //error encountered - } - } - public ArrayList get(T type) { - ArrayList result = new ArrayList<>(); + public ContentManager getContentManager(Class type) { if (type == Note.class) { - result = this.notes; + return (ContentManager) this.noteManager; } else if (type == Link.class) { - result = this.links; + return (ContentManager) this.linkManager; } else { //error encountered + assert false; } - return result; + return null; } } diff --git a/src/main/java/terminus/parser/LinkCommandParser.java b/src/main/java/terminus/parser/LinkCommandParser.java index 2efb9c36dd..1ca2d66375 100644 --- a/src/main/java/terminus/parser/LinkCommandParser.java +++ b/src/main/java/terminus/parser/LinkCommandParser.java @@ -19,13 +19,13 @@ public static LinkCommandParser getInstance() { LinkCommandParser parser = new LinkCommandParser(); parser.addCommand(CommonFormat.COMMAND_BACK, new BackCommand()); parser.addCommand(CommonFormat.COMMAND_ADD, new AddLinkCommand()); - parser.addCommand(CommonFormat.COMMAND_VIEW, new ViewCommand>(Link.class)); - parser.addCommand(CommonFormat.COMMAND_DELETE, new DeleteCommand>(Link.class)); + parser.addCommand(CommonFormat.COMMAND_VIEW, new ViewCommand(Link.class)); + parser.addCommand(CommonFormat.COMMAND_DELETE, new DeleteCommand(Link.class)); return parser; } @Override public String getWorkspaceBanner(NusModule module) { - return String.format(Messages.SCHEDULE_BANNER, module.getLinks().size()); + return String.format(Messages.SCHEDULE_BANNER, module.getContentManager(Link.class).getContents().size()); } } diff --git a/src/main/java/terminus/parser/NoteCommandParser.java b/src/main/java/terminus/parser/NoteCommandParser.java index 7ccd292b70..75e8295121 100644 --- a/src/main/java/terminus/parser/NoteCommandParser.java +++ b/src/main/java/terminus/parser/NoteCommandParser.java @@ -20,13 +20,13 @@ public static NoteCommandParser getInstance() { NoteCommandParser parser = new NoteCommandParser(); parser.addCommand(CommonFormat.COMMAND_BACK, new BackCommand()); parser.addCommand(CommonFormat.COMMAND_ADD, new AddNoteCommand()); - parser.addCommand(CommonFormat.COMMAND_VIEW, new ViewCommand>(Note.class)); - parser.addCommand(CommonFormat.COMMAND_DELETE, new DeleteCommand>(Note.class)); + parser.addCommand(CommonFormat.COMMAND_VIEW, new ViewCommand(Note.class)); + parser.addCommand(CommonFormat.COMMAND_DELETE, new DeleteCommand(Note.class)); return parser; } @Override public String getWorkspaceBanner(NusModule module) { - return String.format(Messages.NOTE_BANNER, module.getNotes().size()); + return String.format(Messages.NOTE_BANNER, module.getContentManager(Note.class).getContents().size()); } } diff --git a/src/test/java/terminus/command/link/AddLinkCommandTest.java b/src/test/java/terminus/command/link/AddLinkCommandTest.java index d8f08f342e..76a94a2805 100644 --- a/src/test/java/terminus/command/link/AddLinkCommandTest.java +++ b/src/test/java/terminus/command/link/AddLinkCommandTest.java @@ -5,6 +5,7 @@ import terminus.command.Command; import terminus.command.CommandResult; import terminus.common.CommonFormat; +import terminus.content.Link; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidTimeFormatException; @@ -23,6 +24,8 @@ public class AddLinkCommandTest { private NusModule nusModule; private Ui ui; + Class type = Link.class; + @BeforeEach void setUp() { this.linkCommandParser = LinkCommandParser.getInstance(); @@ -46,11 +49,11 @@ void execute_addLinkCommand_success() Command addLinkCommand = linkCommandParser.parseCommand("add \"test\" \"test_day\" \"00:00\" \"Test.com\""); CommandResult addResult = addLinkCommand.execute(ui, nusModule); assertTrue(addResult.isOk()); - assertEquals(1, nusModule.getContentManager().getTotalContents()); - assertTrue(nusModule.getContentManager().getContentData(1).contains("test")); - assertTrue(nusModule.getContentManager().getContentData(1).contains("test_day")); - assertTrue(nusModule.getContentManager().getContentData(1).contains("00:00")); - assertTrue(nusModule.getContentManager().getContentData(1).contains("Test.com")); + assertEquals(1, nusModule.getContentManager(type).getTotalContents()); + assertTrue(nusModule.getContentManager(type).getContentData(1).contains("test")); + assertTrue(nusModule.getContentManager(type).getContentData(1).contains("test_day")); + assertTrue(nusModule.getContentManager(type).getContentData(1).contains("00:00")); + assertTrue(nusModule.getContentManager(type).getContentData(1).contains("Test.com")); for (int i = 0; i < 5; i++) { addLinkCommand = linkCommandParser.parseCommand( @@ -58,6 +61,6 @@ void execute_addLinkCommand_success() addResult = addLinkCommand.execute(ui, nusModule); assertTrue(addResult.isOk()); } - assertEquals(6, nusModule.getContentManager().getTotalContents()); + assertEquals(6, nusModule.getContentManager(type).getTotalContents()); } } \ No newline at end of file diff --git a/src/test/java/terminus/command/note/AddNoteCommandTest.java b/src/test/java/terminus/command/note/AddNoteCommandTest.java index 618e677056..d97f0b5e57 100644 --- a/src/test/java/terminus/command/note/AddNoteCommandTest.java +++ b/src/test/java/terminus/command/note/AddNoteCommandTest.java @@ -7,6 +7,7 @@ import org.junit.jupiter.api.Test; import terminus.command.Command; import terminus.command.CommandResult; +import terminus.content.Note; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidTimeFormatException; @@ -15,10 +16,13 @@ import terminus.ui.Ui; public class AddNoteCommandTest { + private NoteCommandParser commandParser; private NusModule nusModule; private Ui ui; + Class type = Note.class; + @BeforeEach void setUp() { this.commandParser = NoteCommandParser.getInstance(); @@ -32,14 +36,14 @@ void execute_success() Command addCommand = commandParser.parseCommand("add \"test\" \"test1\""); CommandResult addResult = addCommand.execute(ui, nusModule); assertTrue(addResult.isOk()); - assertEquals(1, nusModule.getContentManager().getTotalContents()); - assertTrue(nusModule.getContentManager().getContentData(1).contains("test")); - assertTrue(nusModule.getContentManager().getContentData(1).contains("test1")); + assertEquals(1, nusModule.getContentManager(type).getTotalContents()); + assertTrue(nusModule.getContentManager(type).getContentData(1).contains("test")); + assertTrue(nusModule.getContentManager(type).getContentData(1).contains("test1")); for (int i = 0; i < 5; i++) { addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); addResult = addCommand.execute(ui, nusModule); assertTrue(addResult.isOk()); } - assertEquals(6, nusModule.getContentManager().getTotalContents()); + assertEquals(6, nusModule.getContentManager(type).getTotalContents()); } } diff --git a/src/test/java/terminus/command/note/DeleteNoteCommandTest.java b/src/test/java/terminus/command/note/DeleteNoteCommandTest.java index 59fe9ee70e..31a6190198 100644 --- a/src/test/java/terminus/command/note/DeleteNoteCommandTest.java +++ b/src/test/java/terminus/command/note/DeleteNoteCommandTest.java @@ -8,6 +8,7 @@ import org.junit.jupiter.api.Test; import terminus.command.Command; import terminus.command.CommandResult; +import terminus.content.Note; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidTimeFormatException; @@ -21,6 +22,8 @@ public class DeleteNoteCommandTest { private NusModule nusModule; private Ui ui; + Class type = Note.class; + @BeforeEach void setUp() { this.commandParser = NoteCommandParser.getInstance(); @@ -37,18 +40,18 @@ void execute_success() assertTrue(addResult.isOk()); } - assertEquals(5, nusModule.getContentManager().getTotalContents()); + assertEquals(5, nusModule.getContentManager(type).getTotalContents()); Command deleteCommand = commandParser.parseCommand("delete 1"); CommandResult deleteResult = deleteCommand.execute(ui, nusModule); assertTrue(deleteResult.isOk()); - assertEquals(4, nusModule.getContentManager().getTotalContents()); + assertEquals(4, nusModule.getContentManager(type).getTotalContents()); for (int i = 2; i < 4; i++) { deleteCommand = commandParser.parseCommand("delete " + i); deleteResult = deleteCommand.execute(ui, nusModule); assertTrue(deleteResult.isOk()); } - assertEquals(2, nusModule.getContentManager().getTotalContents()); + assertEquals(2, nusModule.getContentManager(type).getTotalContents()); } @Test From e3c99d948614763e81b2d607b5f285b70fe74dca Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Tue, 12 Oct 2021 00:16:45 +0800 Subject: [PATCH 077/466] Command assertions --- src/main/java/terminus/command/BackCommand.java | 2 ++ src/main/java/terminus/command/DeleteCommand.java | 4 ++++ src/main/java/terminus/command/ViewCommand.java | 1 + .../java/terminus/command/WorkspaceCommand.java | 1 + src/main/java/terminus/parser/CommandParser.java | 13 +++++++------ 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/terminus/command/BackCommand.java b/src/main/java/terminus/command/BackCommand.java index f584154d75..508bc0113b 100644 --- a/src/main/java/terminus/command/BackCommand.java +++ b/src/main/java/terminus/command/BackCommand.java @@ -1,9 +1,11 @@ package terminus.command; +import com.sun.tools.javac.Main; import terminus.common.CommonFormat; import terminus.common.Messages; import terminus.exception.InvalidCommandException; import terminus.module.NusModule; +import terminus.parser.CommandParser; import terminus.parser.MainCommandParser; import terminus.ui.Ui; diff --git a/src/main/java/terminus/command/DeleteCommand.java b/src/main/java/terminus/command/DeleteCommand.java index f5619e88b0..b867453aa9 100644 --- a/src/main/java/terminus/command/DeleteCommand.java +++ b/src/main/java/terminus/command/DeleteCommand.java @@ -45,7 +45,11 @@ public void parseArguments(String arguments) throws InvalidArgumentException { @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidArgumentException { ContentManager contentManager = module.getContentManager(type); + assert contentManager != null; + String deletedContentName = contentManager.deleteContent(itemNumber); + assert deletedContentName != null && !deletedContentName.isBlank(); + ui.printSection(String.format(Messages.MESSAGE_RESPONSE_DELETE, CommonFormat.getClassName(type).toLowerCase(), deletedContentName)); return new CommandResult(true); diff --git a/src/main/java/terminus/command/ViewCommand.java b/src/main/java/terminus/command/ViewCommand.java index ed6606e119..617900b29a 100644 --- a/src/main/java/terminus/command/ViewCommand.java +++ b/src/main/java/terminus/command/ViewCommand.java @@ -50,6 +50,7 @@ public CommandResult execute(Ui ui, NusModule module) throws InvalidArgumentExce ContentManager contentManager = module.getContentManager(type); if (displayAll) { String fullList = contentManager.listAllContents(); + assert fullList != null; if (fullList.isBlank()) { result.append(Messages.EMPTY_CONTENT_LIST_MESSAGE); } else { diff --git a/src/main/java/terminus/command/WorkspaceCommand.java b/src/main/java/terminus/command/WorkspaceCommand.java index c89dd43add..1fbb9fb92d 100644 --- a/src/main/java/terminus/command/WorkspaceCommand.java +++ b/src/main/java/terminus/command/WorkspaceCommand.java @@ -28,6 +28,7 @@ public WorkspaceCommand(CommandParser commandMap) { @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + assert commandMap != null; if (arguments != null && !arguments.isBlank()) { try { return commandMap.parseCommand(arguments).execute(ui, module); diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java index b4f3b4edb5..8618cc4fdd 100644 --- a/src/main/java/terminus/parser/CommandParser.java +++ b/src/main/java/terminus/parser/CommandParser.java @@ -18,8 +18,7 @@ public abstract class CommandParser { protected final HashMap commandMap; /** - * Initializes the commandMap. - * Adds some default commands to it. + * Initializes the commandMap. Adds some default commands to it. * * @param workspace The name of the workspace */ @@ -36,20 +35,22 @@ public CommandParser(String workspace) { * * @param command The user input command * @return The Command object to be executed - * @throws InvalidCommandException if there is no command or empty command - * @throws InvalidArgumentException Fails when arguments could not be parsed + * @throws InvalidCommandException if there is no command or empty command + * @throws InvalidArgumentException Fails when arguments could not be parsed * @throws InvalidTimeFormatException Fails when time format is invalid */ public Command parseCommand(String command) throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { String[] commandLine = command.strip().split(SPACE_DELIMITER, 2); + + assert commandLine.length <= 2 && commandLine.length > 0; + String cmdName = commandLine[0]; Command currentCommand = commandMap.get(cmdName.strip().toLowerCase(Locale.ROOT)); if (currentCommand == null) { throw new InvalidCommandException("Command not found! Type 'help' for a list of commands."); } - String cmdData = null; if (commandLine.length > 1) { cmdData = commandLine[1]; @@ -61,7 +62,7 @@ public Command parseCommand(String command) public Set getCommandList() { return commandMap.keySet(); } - + public abstract String getWorkspaceBanner(NusModule module); /** From 6ef8df2bfc645e14330656d611c7e5588dc57c3f Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Tue, 12 Oct 2021 00:23:55 +0800 Subject: [PATCH 078/466] Fix unused imports --- src/main/java/terminus/command/BackCommand.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/terminus/command/BackCommand.java b/src/main/java/terminus/command/BackCommand.java index 508bc0113b..f584154d75 100644 --- a/src/main/java/terminus/command/BackCommand.java +++ b/src/main/java/terminus/command/BackCommand.java @@ -1,11 +1,9 @@ package terminus.command; -import com.sun.tools.javac.Main; import terminus.common.CommonFormat; import terminus.common.Messages; import terminus.exception.InvalidCommandException; import terminus.module.NusModule; -import terminus.parser.CommandParser; import terminus.parser.MainCommandParser; import terminus.ui.Ui; From aaa225e398c81f2d3ec81fa6c06528394f087962 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Tue, 12 Oct 2021 00:29:26 +0800 Subject: [PATCH 079/466] Add TerminusLogger --- .gitignore | 1 + src/main/java/terminus/Terminus.java | 66 ++++++++++++++----- .../java/terminus/common/TerminusLogger.java | 57 ++++++++++++++++ .../java/terminus/storage/ModuleStorage.java | 15 ++++- 4 files changed, 119 insertions(+), 20 deletions(-) create mode 100644 src/main/java/terminus/common/TerminusLogger.java diff --git a/.gitignore b/.gitignore index 27d8a0bb95..99b70fba70 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ bin/ text-ui-test/EXPECTED-UNIX.TXT data/ +terminus.log* \ No newline at end of file diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 2760610769..0bdf2052b6 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -4,6 +4,7 @@ import java.nio.file.Path; import terminus.command.Command; import terminus.command.CommandResult; +import terminus.common.TerminusLogger; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidTimeFormatException; @@ -43,38 +44,43 @@ public void run() { } private void start() { - this.ui = new Ui(); - this.parser = MainCommandParser.getInstance(); - this.workspace = ""; - this.moduleStorage = new ModuleStorage(DATA_DIRECTORY.resolve(MAIN_JSON)); try { + TerminusLogger.initializeLogger(); + TerminusLogger.info("Starting Terminus..."); + this.ui = new Ui(); + this.parser = MainCommandParser.getInstance(); + this.workspace = ""; + this.moduleStorage = new ModuleStorage(DATA_DIRECTORY.resolve(MAIN_JSON)); + + TerminusLogger.info("Loading file..."); this.nusModule = moduleStorage.loadFile(); } catch (IOException e) { - ui.printSection( - "Unable to save/load file: " + DATA_DIRECTORY.resolve(MAIN_JSON), - "TermiNUS may still run, but your changes may not be saved." - ); + TerminusLogger.warning("File loading has failed."); + handleIoException(e); } finally { if (this.nusModule == null) { + TerminusLogger.warning("File not found."); + TerminusLogger.warning("Creating new NusModule instance..."); this.nusModule = new NusModule(); + } else { + TerminusLogger.info("File loaded."); } this.ui.printParserBanner(this.parser, this.nusModule); } + TerminusLogger.info("Terminus has started."); } private void runCommandsUntilExit() { while (true) { - assert workspace != null: "Workspace should always have a value"; + assert workspace != null : "Workspace should always have a value"; String input = ui.requestCommand(workspace); - assert input != null: "Input should not be null."; + TerminusLogger.debug("User entered: " + input); + assert input != null : "Input should not be null."; Command currentCommand = null; try { currentCommand = parser.parseCommand(input); CommandResult result = currentCommand.execute(ui, nusModule); - if (result.isOk()) { - this.moduleStorage.saveFile(nusModule); - } boolean isExitCommand = result.isOk() && result.isExit(); boolean isWorkspaceCommand = result.isOk() && result.getAdditionalData() != null; @@ -82,30 +88,54 @@ private void runCommandsUntilExit() { break; } else if (isWorkspaceCommand) { parser = result.getAdditionalData(); - assert parser != null: "commandParser is not null"; + assert parser != null : "commandParser is not null"; workspace = parser.getWorkspace(); ui.printParserBanner(parser, nusModule); } else if (!result.isOk()) { ui.printSection(result.getErrorMessage()); } + TerminusLogger.info("Saving data into file..."); + this.moduleStorage.saveFile(nusModule); + TerminusLogger.info("Save completed."); } catch (InvalidCommandException | InvalidTimeFormatException e) { + TerminusLogger.warning("Invalid input provided: " + input, e.getCause()); ui.printSection(e.getMessage()); } catch (InvalidArgumentException e) { + TerminusLogger.warning("Invalid input provided: " + input, e.getCause()); + + // Check if the exception specified a correct command format for the user to follow. if (e.getFormat() != null) { + // Print the format of the command along with the error message to the user. ui.printSection(e.getMessage(), String.format(INVALID_ARGUMENT_FORMAT_MESSAGE, e.getFormat())); } else { ui.printSection(e.getMessage()); } } catch (IOException e) { - ui.printSection( - "Unable to save/load file: " + DATA_DIRECTORY.resolve(MAIN_JSON), - "TermiNUS may still run, but your changes may not be saved." - ); + TerminusLogger.warning("File saving has failed."); + handleIoException(e); } } } + private void handleIoException(IOException e) { + TerminusLogger.severe("Save file is inaccessible."); + TerminusLogger.severe(e.getMessage(), e.getCause()); + ui.printSection( + "Unable to save/load file: " + DATA_DIRECTORY.resolve(MAIN_JSON), + "TermiNUS may still run, but your changes may not be saved.", + "Check 'terminus.log' for more information." + ); + } + private void exit() { + TerminusLogger.info("Saving data into file..."); + try { + this.moduleStorage.saveFile(nusModule); + TerminusLogger.info("Save completed."); + } catch (IOException e) { + TerminusLogger.warning("File saving has failed."); + handleIoException(e); + } this.ui.printExitMessage(); } } diff --git a/src/main/java/terminus/common/TerminusLogger.java b/src/main/java/terminus/common/TerminusLogger.java new file mode 100644 index 0000000000..c2d89cb157 --- /dev/null +++ b/src/main/java/terminus/common/TerminusLogger.java @@ -0,0 +1,57 @@ +package terminus.common; + +import java.io.IOException; +import java.util.logging.ConsoleHandler; +import java.util.logging.FileHandler; +import java.util.logging.Level; +import java.util.logging.LogManager; +import java.util.logging.Logger; + +public class TerminusLogger { + + private static final Logger LOGGER = Logger.getLogger("TermiNUS"); + + public static void initializeLogger() throws IOException { + LogManager.getLogManager().reset(); + ConsoleHandler consoleHandler = new ConsoleHandler(); + consoleHandler.setLevel(Level.OFF); + LOGGER.addHandler(consoleHandler); + + FileHandler fileHandler = new FileHandler("terminus.log"); + fileHandler.setLevel(Level.INFO); + LOGGER.addHandler(fileHandler); + } + + public static void debug(String message) { + LOGGER.fine(message); + } + + public static void verboseDebug(String message) { + LOGGER.finer(message); + } + + public static void veryVerboseDebug(String message) { + LOGGER.finest(message); + } + + public static void info(String message) { + LOGGER.info(message); + } + + public static void warning(String message) { + LOGGER.warning(message); + } + + public static void warning(String message, Throwable throwable) { + LOGGER.log(Level.WARNING, message, throwable); + } + + public static void severe(String message) { + LOGGER.severe(message); + } + + public static void severe(String message, Throwable throwable) { + LOGGER.log(Level.SEVERE, message, throwable); + } + +} diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 67276386ff..9f10c735f1 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -5,6 +5,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +import terminus.common.TerminusLogger; import terminus.module.NusModule; public class ModuleStorage { @@ -18,27 +19,37 @@ public ModuleStorage(Path filePath) { } private void initializeFile() throws IOException { - assert filePath != null: "filePath should not be null"; + assert filePath != null : "filePath should not be null"; if (!Files.isDirectory(filePath.getParent())) { + TerminusLogger.warning("Parent directories not found, attempting to create them..."); Files.createDirectories(filePath.getParent()); + TerminusLogger.info("Parent directories created."); } if (!Files.exists(filePath)) { + TerminusLogger.warning(String.format("%s not found, attempting to create file...", + filePath.getFileName().toString())); Files.createFile(filePath); + TerminusLogger.info(String.format("%s created.", filePath.getFileName().toString())); } } public NusModule loadFile() throws IOException { initializeFile(); if (!Files.isReadable(filePath)) { + TerminusLogger.severe("File is does not exist or is not readable!"); return null; } + TerminusLogger.info("Decoding JSON to object"); return gson.fromJson(Files.newBufferedReader(filePath), NusModule.class); } public void saveFile(NusModule module) throws IOException { initializeFile(); + TerminusLogger.info("Converting NusModule object into String..."); String jsonString = gson.toJson(module); - assert jsonString != null && !jsonString.isBlank(): "File saved is blank"; + TerminusLogger.info("String conversion completed."); + TerminusLogger.info(String.format("Writing to file: %s", filePath.toString())); + assert jsonString != null && !jsonString.isBlank() : "File saved is blank"; Files.writeString(filePath, jsonString); } From 915865492b08223fe1e8b5c741852ac4eda42f05 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Tue, 12 Oct 2021 01:14:38 +0800 Subject: [PATCH 080/466] Logging for commands and command parser --- src/main/java/terminus/command/BackCommand.java | 3 +++ src/main/java/terminus/command/DeleteCommand.java | 6 +++++- src/main/java/terminus/command/ExitCommand.java | 2 ++ src/main/java/terminus/command/HelpCommand.java | 2 ++ src/main/java/terminus/command/ViewCommand.java | 7 +++++++ .../java/terminus/command/WorkspaceCommand.java | 14 +++++++++----- src/main/java/terminus/parser/CommandParser.java | 4 +++- 7 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/main/java/terminus/command/BackCommand.java b/src/main/java/terminus/command/BackCommand.java index f584154d75..e13aa926bc 100644 --- a/src/main/java/terminus/command/BackCommand.java +++ b/src/main/java/terminus/command/BackCommand.java @@ -2,6 +2,7 @@ import terminus.common.CommonFormat; import terminus.common.Messages; +import terminus.common.TerminusLogger; import terminus.exception.InvalidCommandException; import terminus.module.NusModule; import terminus.parser.MainCommandParser; @@ -21,7 +22,9 @@ public String getHelpMessage() { @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { + TerminusLogger.info("Executing Back Command"); MainCommandParser mainParser = MainCommandParser.getInstance(); + TerminusLogger.info("Changing Workspace to:" + mainParser.getWorkspace()); return new CommandResult(true, mainParser); } } diff --git a/src/main/java/terminus/command/DeleteCommand.java b/src/main/java/terminus/command/DeleteCommand.java index b867453aa9..e8e22661f6 100644 --- a/src/main/java/terminus/command/DeleteCommand.java +++ b/src/main/java/terminus/command/DeleteCommand.java @@ -3,6 +3,7 @@ import java.util.Locale; import terminus.common.CommonFormat; import terminus.common.Messages; +import terminus.common.TerminusLogger; import terminus.content.Content; import terminus.content.ContentManager; import terminus.exception.InvalidArgumentException; @@ -32,12 +33,15 @@ public void parseArguments(String arguments) throws InvalidArgumentException { if (arguments == null || arguments.isBlank()) { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } + TerminusLogger.info("Parsing delete arguments"); try { itemNumber = Integer.parseInt(arguments); } catch (NumberFormatException e) { + TerminusLogger.warning(String.format("Failed to parse delete itemNumber %s", arguments)); throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_INVALID_NUMBER); } if (itemNumber <= 0) { + TerminusLogger.warning(String.format("Invalid itemNumber %d", itemNumber)); throw new InvalidArgumentException(Messages.ERROR_MESSAGE_INVALID_NUMBER); } } @@ -46,7 +50,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { public CommandResult execute(Ui ui, NusModule module) throws InvalidArgumentException { ContentManager contentManager = module.getContentManager(type); assert contentManager != null; - + TerminusLogger.info("Executing Delete Command"); String deletedContentName = contentManager.deleteContent(itemNumber); assert deletedContentName != null && !deletedContentName.isBlank(); diff --git a/src/main/java/terminus/command/ExitCommand.java b/src/main/java/terminus/command/ExitCommand.java index 200d372d68..7da5838a0f 100644 --- a/src/main/java/terminus/command/ExitCommand.java +++ b/src/main/java/terminus/command/ExitCommand.java @@ -2,6 +2,7 @@ import terminus.common.CommonFormat; import terminus.common.Messages; +import terminus.common.TerminusLogger; import terminus.exception.InvalidCommandException; import terminus.module.NusModule; import terminus.ui.Ui; @@ -20,6 +21,7 @@ public String getHelpMessage() { @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { + TerminusLogger.info("Executing Exit Command"); return new CommandResult(true, true); } } diff --git a/src/main/java/terminus/command/HelpCommand.java b/src/main/java/terminus/command/HelpCommand.java index 52d34e2054..21db8e67d3 100644 --- a/src/main/java/terminus/command/HelpCommand.java +++ b/src/main/java/terminus/command/HelpCommand.java @@ -2,6 +2,7 @@ import terminus.common.CommonFormat; import terminus.common.Messages; +import terminus.common.TerminusLogger; import terminus.exception.InvalidCommandException; import terminus.module.NusModule; import terminus.parser.CommandParser; @@ -28,6 +29,7 @@ public String getHelpMessage() { @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { + TerminusLogger.info("Executing Help Command"); ui.printSection(HELP_MENU_MESSAGE); ui.printSection(commandMap.getHelpMenu()); return new CommandResult(true); diff --git a/src/main/java/terminus/command/ViewCommand.java b/src/main/java/terminus/command/ViewCommand.java index 617900b29a..6cd5372926 100644 --- a/src/main/java/terminus/command/ViewCommand.java +++ b/src/main/java/terminus/command/ViewCommand.java @@ -2,6 +2,7 @@ import terminus.common.CommonFormat; import terminus.common.Messages; +import terminus.common.TerminusLogger; import terminus.content.Content; import terminus.content.ContentManager; import terminus.exception.InvalidArgumentException; @@ -36,12 +37,18 @@ public void parseArguments(String arguments) throws InvalidArgumentException { displayAll = true; return; } + TerminusLogger.info("Parsing view arguments"); try { itemNumber = Integer.parseInt(arguments); displayAll = false; } catch (NumberFormatException e) { + TerminusLogger.warning(String.format("Failed to parse view itemNumber %s", arguments)); throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_INVALID_NUMBER); } + if (itemNumber <= 0) { + TerminusLogger.warning(String.format("Invalid itemNumber %d", itemNumber)); + throw new InvalidArgumentException(Messages.ERROR_MESSAGE_INVALID_NUMBER); + } } @Override diff --git a/src/main/java/terminus/command/WorkspaceCommand.java b/src/main/java/terminus/command/WorkspaceCommand.java index 1fbb9fb92d..8b8b2548fb 100644 --- a/src/main/java/terminus/command/WorkspaceCommand.java +++ b/src/main/java/terminus/command/WorkspaceCommand.java @@ -1,5 +1,6 @@ package terminus.command; +import terminus.common.TerminusLogger; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidTimeFormatException; @@ -15,10 +16,9 @@ public abstract class WorkspaceCommand extends Command { public WorkspaceCommand(CommandParser commandMap) { this.commandMap = commandMap; } - + /** - * Returns the Command Result after execution. - * If no other arguments, returns the workspace. + * Returns the Command Result after execution. If no other arguments, returns the workspace. * * @param ui The Ui object to send messages to the users. * @param module The NusModule contain the list of all notes and schedules. @@ -29,19 +29,23 @@ public WorkspaceCommand(CommandParser commandMap) { public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { assert commandMap != null; + TerminusLogger.info("Executing Delete Command"); if (arguments != null && !arguments.isBlank()) { try { + TerminusLogger.info("Parsing workspace command"); return commandMap.parseCommand(arguments).execute(ui, module); } catch (InvalidArgumentException e) { if (e.getFormat() == null) { throw e; } + TerminusLogger.warning("Failed to parse command." + commandMap.getWorkspace() + ":" + e.getFormat()); throw new InvalidArgumentException( - String.format(INVALID_ARGUMENT_FORMAT_MESSAGE, commandMap.getWorkspace(), e.getFormat()), - e.getMessage() + String.format(INVALID_ARGUMENT_FORMAT_MESSAGE, commandMap.getWorkspace(), e.getFormat()), + e.getMessage() ); } } else { + TerminusLogger.info("Switching workspace to: " + commandMap.getWorkspace()); return new CommandResult(true, commandMap); } } diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java index 8618cc4fdd..398f2ee28c 100644 --- a/src/main/java/terminus/parser/CommandParser.java +++ b/src/main/java/terminus/parser/CommandParser.java @@ -6,6 +6,7 @@ import terminus.command.ExitCommand; import terminus.command.Command; import terminus.command.HelpCommand; +import terminus.common.TerminusLogger; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidTimeFormatException; @@ -43,7 +44,7 @@ public CommandParser(String workspace) { public Command parseCommand(String command) throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { String[] commandLine = command.strip().split(SPACE_DELIMITER, 2); - + TerminusLogger.info("Parsing Command: " + command); assert commandLine.length <= 2 && commandLine.length > 0; String cmdName = commandLine[0]; @@ -55,6 +56,7 @@ public Command parseCommand(String command) if (commandLine.length > 1) { cmdData = commandLine[1]; } + TerminusLogger.info("Parsing arguments."); currentCommand.parseArguments(cmdData); return currentCommand; } From c74f6248ee2aea05c190ffe440fa543ac223495b Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Tue, 12 Oct 2021 01:18:00 +0800 Subject: [PATCH 081/466] Use assertions on add commands --- src/main/java/terminus/command/note/AddNoteCommand.java | 1 + src/main/java/terminus/command/zoomlink/AddLinkCommand.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/terminus/command/note/AddNoteCommand.java b/src/main/java/terminus/command/note/AddNoteCommand.java index 508754f48a..7dcaf5b472 100644 --- a/src/main/java/terminus/command/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/note/AddNoteCommand.java @@ -40,6 +40,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } ArrayList argArray = CommonFormat.findArguments(arguments); + assert argArray.size() > 0; if (!isValidNoteArguments(argArray)) { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index 7f10409805..c4dcca14ca 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -46,6 +46,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException, In throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } ArrayList argArray = CommonFormat.findArguments(arguments); + assert argArray.size() > 0; if (!isValidScheduleArguments(argArray)) { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } From 4a735273379e9392c92c436c99e02be3e6a2e563 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Tue, 12 Oct 2021 01:24:43 +0800 Subject: [PATCH 082/466] Use more assertions on add commands --- src/main/java/terminus/command/note/AddNoteCommand.java | 3 +++ src/main/java/terminus/command/zoomlink/AddLinkCommand.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/main/java/terminus/command/note/AddNoteCommand.java b/src/main/java/terminus/command/note/AddNoteCommand.java index 7dcaf5b472..e7bfee29a8 100644 --- a/src/main/java/terminus/command/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/note/AddNoteCommand.java @@ -41,6 +41,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { } ArrayList argArray = CommonFormat.findArguments(arguments); assert argArray.size() > 0; + if (!isValidNoteArguments(argArray)) { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } @@ -51,6 +52,8 @@ public void parseArguments(String arguments) throws InvalidArgumentException { @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { ContentManager contentManager = module.getContentManager(Note.class); + assert contentManager != null; + contentManager.add(new Note(name, data)); ui.printSection(String.format(Messages.MESSAGE_RESPONSE_ADD, CommonFormat.COMMAND_NOTE, name)); return new CommandResult(true, false); diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index c4dcca14ca..652d5aaf2f 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -47,6 +47,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException, In } ArrayList argArray = CommonFormat.findArguments(arguments); assert argArray.size() > 0; + if (!isValidScheduleArguments(argArray)) { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } @@ -61,6 +62,8 @@ public void parseArguments(String arguments) throws InvalidArgumentException, In @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException, InvalidArgumentException { ContentManager contentManager = module.getContentManager(Link.class); + assert contentManager != null; + contentManager.add(new Link(description, day, startTime, link)); ui.printSection(String.format(Messages.MESSAGE_RESPONSE_ADD, CommonFormat.COMMAND_SCHEDULE, description)); return new CommandResult(true, false); From aaf65171e7cfa22d5d2af6cfc9cfb5b628071259 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 12 Oct 2021 01:35:01 +0800 Subject: [PATCH 083/466] Add JUnit for ContentManager and NusModule --- .../terminus/content/ContentManagerTest.java | 129 ++++++++++++++++++ .../java/terminus/module/NusModuleTest.java | 44 ++++++ 2 files changed, 173 insertions(+) create mode 100644 src/test/java/terminus/content/ContentManagerTest.java create mode 100644 src/test/java/terminus/module/NusModuleTest.java diff --git a/src/test/java/terminus/content/ContentManagerTest.java b/src/test/java/terminus/content/ContentManagerTest.java new file mode 100644 index 0000000000..2acaa91033 --- /dev/null +++ b/src/test/java/terminus/content/ContentManagerTest.java @@ -0,0 +1,129 @@ +package terminus.content; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.time.LocalTime; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.exception.InvalidArgumentException; + +public class ContentManagerTest { + + private ContentManager noteContentManager; + private ContentManager linkContentManager; + + @BeforeEach + void setUp() { + this.noteContentManager = new ContentManager<>(); + this.linkContentManager = new ContentManager<>(); + } + + @Test + void addContent_note_success() throws InvalidArgumentException { + Note note = new Note("test", "test1"); + noteContentManager.add(note); + assertEquals(note.getDisplayInfo(), noteContentManager.getContentData(1)); + } + + @Test + void addContent_link_success() throws InvalidArgumentException { + Link link = new Link("test", "monday", LocalTime.now(), "test.com"); + linkContentManager.add(link); + assertEquals(link.getDisplayInfo(), linkContentManager.getContentData(1)); + } + + @Test + void deleteContent_link_success() throws InvalidArgumentException { + Link link = new Link("test", "monday", LocalTime.now(), "test.com"); + linkContentManager.add(link); + assertEquals(1, linkContentManager.getTotalContents()); + assertSame(link.getName(), linkContentManager.deleteContent(1)); + assertEquals(0, linkContentManager.getTotalContents()); + } + + @Test + void deleteContent_note_success() throws InvalidArgumentException { + Note note = new Note("test", "test1"); + noteContentManager.add(note); + assertEquals(1, noteContentManager.getTotalContents()); + assertSame(note.getName(), noteContentManager.deleteContent(1)); + assertEquals(0, noteContentManager.getTotalContents()); + } + + @Test + void deleteContent_exceptionThrown() throws InvalidArgumentException { + Link link = new Link("test", "monday", LocalTime.now(), "test.com"); + linkContentManager.add(link); + assertThrows(InvalidArgumentException.class, () -> linkContentManager.deleteContent(-1)); + assertThrows(InvalidArgumentException.class, () -> linkContentManager.deleteContent(0)); + assertThrows(InvalidArgumentException.class, () -> linkContentManager.deleteContent(99)); + } + + @Test + void getContent_note_success() throws InvalidArgumentException { + Note note = new Note("test", "test1"); + noteContentManager.add(note); + assertEquals(note.getDisplayInfo(), noteContentManager.getContentData(1)); + } + + @Test + void getContent_link_success() throws InvalidArgumentException { + Link link = new Link("test", "monday", LocalTime.now(), "test.com"); + linkContentManager.add(link); + assertEquals(link.getDisplayInfo(), linkContentManager.getContentData(1)); + } + + @Test + void getContent_exceptionThrown() throws InvalidArgumentException { + Note note = new Note("test", "test1"); + noteContentManager.add(note); + assertThrows(InvalidArgumentException.class, () -> noteContentManager.getContentData(-1)); + assertThrows(InvalidArgumentException.class, () -> noteContentManager.getContentData(0)); + assertThrows(InvalidArgumentException.class, () -> noteContentManager.getContentData(99)); + } + + @Test + void getContentSize_success() { + Note note = new Note("test1", "test1"); + noteContentManager.add(note); + assertEquals(1, noteContentManager.getTotalContents()); + note = new Note("test2", "test2"); + noteContentManager.add(note); + assertEquals(2, noteContentManager.getTotalContents()); + note = new Note("test3", "test3"); + noteContentManager.add(note); + assertEquals(3, noteContentManager.getTotalContents()); + } + + @Test + void listContent_note_success() { + Note note1 = new Note("test1", "test1"); + Note note2 = new Note("test2", "test2"); + Note note3 = new Note("test3", "test3"); + noteContentManager.add(note1); + noteContentManager.add(note2); + noteContentManager.add(note3); + String result = noteContentManager.listAllContents(); + assertTrue(result.contains(note1.getViewDescription())); + assertTrue(result.contains(note2.getViewDescription())); + assertTrue(result.contains(note3.getViewDescription())); + } + + @Test + void listContent_link_success() { + Link link1 = new Link("test1", "monday", LocalTime.now(), "test.com"); + Link link2 = new Link("test2", "monday", LocalTime.now(), "test.com"); + Link link3 = new Link("test3", "monday", LocalTime.now(), "test.com"); + linkContentManager.add(link1); + linkContentManager.add(link2); + linkContentManager.add(link3); + String result = linkContentManager.listAllContents(); + assertTrue(result.contains(link1.getViewDescription())); + assertTrue(result.contains(link2.getViewDescription())); + assertTrue(result.contains(link3.getViewDescription())); + } + +} diff --git a/src/test/java/terminus/module/NusModuleTest.java b/src/test/java/terminus/module/NusModuleTest.java new file mode 100644 index 0000000000..3ae221c221 --- /dev/null +++ b/src/test/java/terminus/module/NusModuleTest.java @@ -0,0 +1,44 @@ +package terminus.module; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.time.LocalTime; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.content.Content; +import terminus.content.ContentManager; +import terminus.content.Link; +import terminus.content.Note; +import terminus.exception.InvalidArgumentException; + +public class NusModuleTest { + + private NusModule module; + + @BeforeEach + void setUp() { + this.module = new NusModule(); + } + + @Test + void getContent_success() throws InvalidArgumentException { + ContentManager noteContentManager = module.getContentManager(Note.class); + ContentManager linkContentManager = module.getContentManager(Link.class); + Note note = new Note("test1", "test1"); + Link link = new Link("test1", "test1", LocalTime.now(), "test1"); + noteContentManager.add(note); + linkContentManager.add(link); + assertEquals(note.getDisplayInfo(), noteContentManager.getContentData(1)); + assertEquals(link.getDisplayInfo(), linkContentManager.getContentData(1)); + } + + @Test + void getContent_exceptionThrown() { + assertThrows(AssertionError.class, () -> module.getContentManager(null)); + } + +} From 8f6708a8a0cf2a620469bc6aef253d6673f4cb8a Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Tue, 12 Oct 2021 02:34:17 +0800 Subject: [PATCH 084/466] Add more exceptions for invalid user input --- src/main/java/terminus/Terminus.java | 9 ++++-- src/main/java/terminus/command/Command.java | 12 +++++--- .../terminus/command/WorkspaceCommand.java | 9 ++++-- .../command/zoomlink/AddLinkCommand.java | 21 +++++++++++--- .../java/terminus/common/CommonFormat.java | 21 ++++++++++++++ .../java/terminus/common/DaysOfWeekEnum.java | 11 ++++++++ src/main/java/terminus/common/Messages.java | 2 ++ .../exception/InvalidDayException.java | 8 ++++++ .../exception/InvalidLinkException.java | 8 ++++++ .../java/terminus/parser/CommandParser.java | 9 ++++-- .../terminus/command/ExitCommandTest.java | 10 +++++-- .../command/link/AddLinkCommandTest.java | 21 ++++++++------ .../command/note/AddNoteCommandTest.java | 9 ++++-- .../command/note/BackNoteCommandTest.java | 9 ++++-- .../command/note/DeleteNoteCommandTest.java | 12 +++++--- .../parser/LinkCommandParserTest.java | 28 +++++++++++-------- .../parser/MainCommandParserTest.java | 15 ++++++---- .../parser/NoteCommandParserTest.java | 21 +++++++++----- text-ui-test/EXPECTED.TXT | 8 +++--- text-ui-test/input.txt | 4 +-- 20 files changed, 179 insertions(+), 68 deletions(-) create mode 100644 src/main/java/terminus/common/DaysOfWeekEnum.java create mode 100644 src/main/java/terminus/exception/InvalidDayException.java create mode 100644 src/main/java/terminus/exception/InvalidLinkException.java diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 0bdf2052b6..ef2bd00916 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -5,9 +5,11 @@ import terminus.command.Command; import terminus.command.CommandResult; import terminus.common.TerminusLogger; -import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidLinkException; import terminus.exception.InvalidTimeFormatException; +import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidDayException; import terminus.module.NusModule; import terminus.parser.CommandParser; import terminus.parser.MainCommandParser; @@ -97,7 +99,8 @@ private void runCommandsUntilExit() { TerminusLogger.info("Saving data into file..."); this.moduleStorage.saveFile(nusModule); TerminusLogger.info("Save completed."); - } catch (InvalidCommandException | InvalidTimeFormatException e) { + } catch (InvalidCommandException | InvalidTimeFormatException + | InvalidLinkException | InvalidDayException e) { TerminusLogger.warning("Invalid input provided: " + input, e.getCause()); ui.printSection(e.getMessage()); } catch (InvalidArgumentException e) { diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java index bb491052aa..d0c08fd535 100644 --- a/src/main/java/terminus/command/Command.java +++ b/src/main/java/terminus/command/Command.java @@ -1,8 +1,10 @@ package terminus.command; -import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidLinkException; import terminus.exception.InvalidTimeFormatException; +import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidDayException; import terminus.module.NusModule; import terminus.ui.Ui; @@ -35,7 +37,8 @@ public Command() { * @throws InvalidArgumentException Exception for when arguments parsing fails * @throws InvalidTimeFormatException Exception for when time format is invalid */ - public void parseArguments(String arguments) throws InvalidArgumentException, InvalidTimeFormatException { + public void parseArguments(String arguments) + throws InvalidArgumentException, InvalidTimeFormatException, InvalidLinkException, InvalidDayException { this.arguments = arguments; } @@ -51,5 +54,6 @@ public void parseArguments(String arguments) throws InvalidArgumentException, In * @throws InvalidTimeFormatException Exception for when time format is invalid */ public abstract CommandResult execute(Ui ui, NusModule module) - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException; + throws InvalidCommandException, InvalidArgumentException, + InvalidTimeFormatException, InvalidLinkException, InvalidDayException; } diff --git a/src/main/java/terminus/command/WorkspaceCommand.java b/src/main/java/terminus/command/WorkspaceCommand.java index 1fbb9fb92d..0ab40e4f2c 100644 --- a/src/main/java/terminus/command/WorkspaceCommand.java +++ b/src/main/java/terminus/command/WorkspaceCommand.java @@ -1,8 +1,10 @@ package terminus.command; -import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidLinkException; import terminus.exception.InvalidTimeFormatException; +import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidDayException; import terminus.module.NusModule; import terminus.parser.CommandParser; import terminus.ui.Ui; @@ -27,7 +29,8 @@ public WorkspaceCommand(CommandParser commandMap) { */ @Override public CommandResult execute(Ui ui, NusModule module) - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException, + InvalidTimeFormatException, InvalidLinkException, InvalidDayException { assert commandMap != null; if (arguments != null && !arguments.isBlank()) { try { diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index 652d5aaf2f..144245fff2 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -4,18 +4,22 @@ import terminus.command.CommandResult; import terminus.content.ContentManager; import terminus.content.Link; -import terminus.content.Note; +import terminus.exception.InvalidLinkException; import terminus.exception.InvalidTimeFormatException; +import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidDayException; import terminus.module.NusModule; import terminus.common.CommonFormat; import terminus.common.Messages; -import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidCommandException; import terminus.ui.Ui; import java.time.LocalTime; import java.util.ArrayList; +import static terminus.common.CommonFormat.isValidDay; +import static terminus.common.CommonFormat.isValidUrl; + public class AddLinkCommand extends Command { private String description; @@ -40,7 +44,8 @@ public String getHelpMessage() { } @Override - public void parseArguments(String arguments) throws InvalidArgumentException, InvalidTimeFormatException { + public void parseArguments(String arguments) + throws InvalidArgumentException, InvalidTimeFormatException, InvalidLinkException, InvalidDayException { // Perform required checks with regex if (arguments == null || arguments.isBlank()) { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); @@ -57,6 +62,14 @@ public void parseArguments(String arguments) throws InvalidArgumentException, In this.day = argArray.get(1); this.startTime = CommonFormat.localTimeConverter(userStartTime); this.link = argArray.get(3); + + if (!isValidDay(this.day)) { + throw new InvalidDayException(String.format(Messages.ERROR_MESSAGE_INVALID_DAY, this.day)); + } + if (!isValidUrl(this.link)) { + throw new InvalidLinkException( + String.format(Messages.ERROR_MESSAGE_INVALID_LINK, this.link)); + } } @Override diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index 913dbc1a83..f09a17a1cd 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -1,5 +1,8 @@ package terminus.common; +import java.net.MalformedURLException; +import java.net.URISyntaxException; +import java.net.URL; import java.util.Arrays; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidTimeFormatException; @@ -65,4 +68,22 @@ public static String getClassName(T type) { } return result; } + + public static boolean isValidUrl(String url) { + try { + new URL(url).toURI(); + return true; + } catch (Exception e) { + return false; + } + } + + public static boolean isValidDay(String day) { + for (DaysOfWeekEnum dayOfWeek : DaysOfWeekEnum.values()) { + if (dayOfWeek.name().equalsIgnoreCase(day)) { + return true; + } + } + return false; + } } diff --git a/src/main/java/terminus/common/DaysOfWeekEnum.java b/src/main/java/terminus/common/DaysOfWeekEnum.java new file mode 100644 index 0000000000..9579ead132 --- /dev/null +++ b/src/main/java/terminus/common/DaysOfWeekEnum.java @@ -0,0 +1,11 @@ +package terminus.common; + +public enum DaysOfWeekEnum { + SUNDAY, + MONDAY, + TUESDAY, + WEDNESDAY, + THURSDAY, + FRIDAY, + SATURDAY +} diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index b4cda14a7d..76a757eb21 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -20,6 +20,8 @@ public class Messages { public static final String ERROR_MESSAGE_EMPTY_CONTENTS = ERROR_MESSAGE_TAG + "Content not found."; public static final String ERROR_MESSAGE_INVALID_NUMBER = ERROR_MESSAGE_TAG + "Invalid numerical value provided."; public static final String ERROR_MESSAGE_INVALID_TIME_FORMAT = ERROR_MESSAGE_TAG + "Invalid time format %s."; + public static final String ERROR_MESSAGE_INVALID_LINK = ERROR_MESSAGE_TAG + "Invalid link %s."; + public static final String ERROR_MESSAGE_INVALID_DAY = ERROR_MESSAGE_TAG + "Invalid day %s."; public static final String EMPTY_CONTENT_LIST_MESSAGE = "You do not have any content in this workspace.\n"; public static final String CONTENT_MESSAGE_HEADER = "List of Content\n---------------\n"; diff --git a/src/main/java/terminus/exception/InvalidDayException.java b/src/main/java/terminus/exception/InvalidDayException.java new file mode 100644 index 0000000000..fce96ad090 --- /dev/null +++ b/src/main/java/terminus/exception/InvalidDayException.java @@ -0,0 +1,8 @@ +package terminus.exception; + +public class InvalidDayException extends Exception { + + public InvalidDayException(String message) { + super(message); + } +} diff --git a/src/main/java/terminus/exception/InvalidLinkException.java b/src/main/java/terminus/exception/InvalidLinkException.java new file mode 100644 index 0000000000..3478911b83 --- /dev/null +++ b/src/main/java/terminus/exception/InvalidLinkException.java @@ -0,0 +1,8 @@ +package terminus.exception; + +public class InvalidLinkException extends Exception { + + public InvalidLinkException(String message) { + super(message); + } +} diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java index 8618cc4fdd..504c19674a 100644 --- a/src/main/java/terminus/parser/CommandParser.java +++ b/src/main/java/terminus/parser/CommandParser.java @@ -6,9 +6,11 @@ import terminus.command.ExitCommand; import terminus.command.Command; import terminus.command.HelpCommand; -import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidLinkException; import terminus.exception.InvalidTimeFormatException; +import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidDayException; import terminus.module.NusModule; public abstract class CommandParser { @@ -41,7 +43,8 @@ public CommandParser(String workspace) { */ public Command parseCommand(String command) - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException, + InvalidTimeFormatException, InvalidLinkException, InvalidDayException { String[] commandLine = command.strip().split(SPACE_DELIMITER, 2); assert commandLine.length <= 2 && commandLine.length > 0; diff --git a/src/test/java/terminus/command/ExitCommandTest.java b/src/test/java/terminus/command/ExitCommandTest.java index 32654593d3..8b7711611d 100644 --- a/src/test/java/terminus/command/ExitCommandTest.java +++ b/src/test/java/terminus/command/ExitCommandTest.java @@ -5,9 +5,11 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.common.CommonFormat; -import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidLinkException; import terminus.exception.InvalidTimeFormatException; +import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidDayException; import terminus.module.NusModule; import terminus.parser.MainCommandParser; import terminus.ui.Ui; @@ -26,7 +28,9 @@ void setUp() { } @Test - void execute_success() throws InvalidArgumentException, InvalidCommandException, InvalidTimeFormatException { + void execute_success() + throws InvalidArgumentException, InvalidCommandException, + InvalidTimeFormatException, InvalidLinkException, InvalidDayException { Command exitCommand = commandParser.parseCommand(CommonFormat.COMMAND_EXIT); CommandResult mainResult = exitCommand.execute(ui, nusModule); assertTrue(mainResult.isOk() && mainResult.isExit()); diff --git a/src/test/java/terminus/command/link/AddLinkCommandTest.java b/src/test/java/terminus/command/link/AddLinkCommandTest.java index 76a94a2805..d2d9f3c198 100644 --- a/src/test/java/terminus/command/link/AddLinkCommandTest.java +++ b/src/test/java/terminus/command/link/AddLinkCommandTest.java @@ -6,9 +6,11 @@ import terminus.command.CommandResult; import terminus.common.CommonFormat; import terminus.content.Link; -import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidLinkException; import terminus.exception.InvalidTimeFormatException; +import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidDayException; import terminus.module.NusModule; import terminus.parser.LinkCommandParser; import terminus.ui.Ui; @@ -35,29 +37,30 @@ void setUp() { @Test void parseArguments_addLinkCommand_success() { - String addLinkInput = "add \"test\" \"test_day\" \"00:00\" \"Test.com\""; + String addLinkInput = "add \"test\" \"Thursday\" \"00:00\" \"Test.com\""; ArrayList parsedArguments = CommonFormat.findArguments(addLinkInput); assertEquals("test", parsedArguments.get(0)); - assertEquals("test_day", parsedArguments.get(1)); + assertEquals("Thursday", parsedArguments.get(1)); assertEquals("00:00", parsedArguments.get(2)); assertEquals("Test.com", parsedArguments.get(3)); } @Test void execute_addLinkCommand_success() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { - Command addLinkCommand = linkCommandParser.parseCommand("add \"test\" \"test_day\" \"00:00\" \"Test.com\""); + throws InvalidCommandException, InvalidArgumentException, + InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + Command addLinkCommand = linkCommandParser.parseCommand("add \"test\" \"Monday\" \"00:00\" \"https://zoom.us/test\""); CommandResult addResult = addLinkCommand.execute(ui, nusModule); assertTrue(addResult.isOk()); assertEquals(1, nusModule.getContentManager(type).getTotalContents()); assertTrue(nusModule.getContentManager(type).getContentData(1).contains("test")); - assertTrue(nusModule.getContentManager(type).getContentData(1).contains("test_day")); + assertTrue(nusModule.getContentManager(type).getContentData(1).contains("Monday")); assertTrue(nusModule.getContentManager(type).getContentData(1).contains("00:00")); - assertTrue(nusModule.getContentManager(type).getContentData(1).contains("Test.com")); + assertTrue(nusModule.getContentManager(type).getContentData(1).contains("https://zoom.us/test")); for (int i = 0; i < 5; i++) { addLinkCommand = linkCommandParser.parseCommand( - "add \"test\" \"test_day\" \"00:00\" \"Test.com" + i + "\""); + "add \"test\" \"Saturday\" \"00:00\" \"https://zoom.us/test" + i + "\""); addResult = addLinkCommand.execute(ui, nusModule); assertTrue(addResult.isOk()); } diff --git a/src/test/java/terminus/command/note/AddNoteCommandTest.java b/src/test/java/terminus/command/note/AddNoteCommandTest.java index d97f0b5e57..61f1c25742 100644 --- a/src/test/java/terminus/command/note/AddNoteCommandTest.java +++ b/src/test/java/terminus/command/note/AddNoteCommandTest.java @@ -8,9 +8,11 @@ import terminus.command.Command; import terminus.command.CommandResult; import terminus.content.Note; -import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidLinkException; import terminus.exception.InvalidTimeFormatException; +import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidDayException; import terminus.module.NusModule; import terminus.parser.NoteCommandParser; import terminus.ui.Ui; @@ -32,7 +34,8 @@ void setUp() { @Test void execute_success() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException, + InvalidTimeFormatException, InvalidLinkException, InvalidDayException { Command addCommand = commandParser.parseCommand("add \"test\" \"test1\""); CommandResult addResult = addCommand.execute(ui, nusModule); assertTrue(addResult.isOk()); diff --git a/src/test/java/terminus/command/note/BackNoteCommandTest.java b/src/test/java/terminus/command/note/BackNoteCommandTest.java index 058e561978..a40eee10f3 100644 --- a/src/test/java/terminus/command/note/BackNoteCommandTest.java +++ b/src/test/java/terminus/command/note/BackNoteCommandTest.java @@ -6,9 +6,11 @@ import org.junit.jupiter.api.Test; import terminus.command.Command; import terminus.command.CommandResult; -import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidLinkException; import terminus.exception.InvalidTimeFormatException; +import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidDayException; import terminus.module.NusModule; import terminus.parser.MainCommandParser; import terminus.parser.NoteCommandParser; @@ -29,7 +31,8 @@ void setUp() { @Test void execute_success() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException, + InvalidTimeFormatException, InvalidLinkException, InvalidDayException { Command backCommand = commandParser.parseCommand("back"); CommandResult backResult = backCommand.execute(ui, nusModule); assertTrue(backResult.isOk()); diff --git a/src/test/java/terminus/command/note/DeleteNoteCommandTest.java b/src/test/java/terminus/command/note/DeleteNoteCommandTest.java index 31a6190198..3f0e55f9ac 100644 --- a/src/test/java/terminus/command/note/DeleteNoteCommandTest.java +++ b/src/test/java/terminus/command/note/DeleteNoteCommandTest.java @@ -9,9 +9,11 @@ import terminus.command.Command; import terminus.command.CommandResult; import terminus.content.Note; -import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidLinkException; import terminus.exception.InvalidTimeFormatException; +import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidDayException; import terminus.module.NusModule; import terminus.parser.NoteCommandParser; import terminus.ui.Ui; @@ -33,7 +35,8 @@ void setUp() { @Test void execute_success() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException, + InvalidTimeFormatException, InvalidLinkException, InvalidDayException { for (int i = 0; i < 5; i++) { Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); CommandResult addResult = addCommand.execute(ui, nusModule); @@ -56,7 +59,8 @@ void execute_success() @Test void execute_throwsException() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException, + InvalidTimeFormatException, InvalidLinkException, InvalidDayException { Command deleteCommand = commandParser.parseCommand("delete 100"); assertThrows(InvalidArgumentException.class, () -> deleteCommand.execute(ui, nusModule)); } diff --git a/src/test/java/terminus/parser/LinkCommandParserTest.java b/src/test/java/terminus/parser/LinkCommandParserTest.java index 03be93ff24..5682b07951 100644 --- a/src/test/java/terminus/parser/LinkCommandParserTest.java +++ b/src/test/java/terminus/parser/LinkCommandParserTest.java @@ -7,11 +7,12 @@ import terminus.command.HelpCommand; import terminus.command.ViewCommand; import terminus.command.zoomlink.AddLinkCommand; -import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidLinkException; import terminus.exception.InvalidTimeFormatException; +import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidDayException; import terminus.module.NusModule; -import terminus.ui.Ui; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -40,7 +41,8 @@ void parseCommand_invalidCommand_exceptionThrown() { @Test void parseCommand_resolveExitCommand_success() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException, + InvalidTimeFormatException, InvalidLinkException, InvalidDayException { assertTrue(linkCommandParser.parseCommand("exit") instanceof ExitCommand); assertTrue(linkCommandParser.parseCommand("eXiT") instanceof ExitCommand); assertTrue(linkCommandParser.parseCommand(" ExIt ") instanceof ExitCommand); @@ -49,7 +51,8 @@ void parseCommand_resolveExitCommand_success() @Test void parseCommand_resolveHelpCommand_success() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException, + InvalidTimeFormatException, InvalidLinkException, InvalidDayException { assertTrue(linkCommandParser.parseCommand("help") instanceof HelpCommand); assertTrue(linkCommandParser.parseCommand("HeLp") instanceof HelpCommand); assertTrue(linkCommandParser.parseCommand(" hElP ") instanceof HelpCommand); @@ -81,13 +84,14 @@ void parseCommand_resolveAddCommand_InvalidTimeFormatExceptionThrown() @Test void parseCommand_resolveAddCommand_success() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException, + InvalidTimeFormatException, InvalidLinkException, InvalidDayException { assertTrue(linkCommandParser.parseCommand( - "add \"test desc\" \"test day\" \"10:00\" \"Zoom.com\"") instanceof AddLinkCommand); + "add \"test desc\" \"Tuesday\" \"10:00\" \"https://zoom.us/test\"") instanceof AddLinkCommand); assertTrue(linkCommandParser.parseCommand( - "add \" test \" \" test1 \" \"10:00\" \" Zoom.com \"") instanceof AddLinkCommand); + "add \" test \" \"Wednesday\" \"10:00\" \" https://zoom.us/test \"") instanceof AddLinkCommand); assertTrue(linkCommandParser.parseCommand( - "add \"CS2113T Lecture\" \"Friday\" \"16:00\" \"nus-sg.zoom.com\"") instanceof AddLinkCommand); + "add \"CS2113T Lecture\" \"Friday\" \"16:00\" \"https://zoom.us/test\"") instanceof AddLinkCommand); } @Test @@ -100,7 +104,8 @@ void parseCommand_resolveDeleteCommand_exceptionThrown() @Test void parseCommand_resolveDeleteCommand_success() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException, + InvalidTimeFormatException, InvalidLinkException, InvalidDayException { assertTrue(linkCommandParser.parseCommand("delete 1") instanceof DeleteCommand); assertTrue(linkCommandParser.parseCommand("delete 2") instanceof DeleteCommand); } @@ -113,7 +118,8 @@ void parseCommand_resolveViewCommand_exceptionThrown() @Test void parseCommand_resolveViewCommand_success() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException, + InvalidTimeFormatException, InvalidLinkException, InvalidDayException { assertTrue(linkCommandParser.parseCommand("view") instanceof ViewCommand); assertTrue(linkCommandParser.parseCommand("view 1") instanceof ViewCommand); } diff --git a/src/test/java/terminus/parser/MainCommandParserTest.java b/src/test/java/terminus/parser/MainCommandParserTest.java index c7019651ac..9d74a5a811 100644 --- a/src/test/java/terminus/parser/MainCommandParserTest.java +++ b/src/test/java/terminus/parser/MainCommandParserTest.java @@ -8,9 +8,11 @@ import terminus.command.ExitCommand; import terminus.command.HelpCommand; import terminus.command.NotesCommand; -import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidLinkException; import terminus.exception.InvalidTimeFormatException; +import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidDayException; public class MainCommandParserTest { @@ -30,7 +32,8 @@ void parseCommand_invalidCommand_exceptionThrown() { @Test void parseCommand_resolveExitCommand_success() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException, + InvalidTimeFormatException, InvalidLinkException, InvalidDayException { assertTrue(commandParser.parseCommand("exit") instanceof ExitCommand); assertTrue(commandParser.parseCommand("EXIT") instanceof ExitCommand); assertTrue(commandParser.parseCommand(" exit ") instanceof ExitCommand); @@ -39,7 +42,8 @@ void parseCommand_resolveExitCommand_success() @Test void parseCommand_resolveHelpCommand_success() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException, + InvalidTimeFormatException, InvalidLinkException, InvalidDayException { assertTrue(commandParser.parseCommand("help") instanceof HelpCommand); assertTrue(commandParser.parseCommand("HELP") instanceof HelpCommand); assertTrue(commandParser.parseCommand(" help ") instanceof HelpCommand); @@ -54,7 +58,8 @@ void getCommandList_containsBasicCommands() { @Test void parseCommand_resolveNoteCommand_success() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException, + InvalidTimeFormatException, InvalidLinkException, InvalidDayException { assertTrue(commandParser.parseCommand("note") instanceof NotesCommand); assertTrue(commandParser.parseCommand("NOTE") instanceof NotesCommand); assertTrue(commandParser.parseCommand(" note ") instanceof NotesCommand); diff --git a/src/test/java/terminus/parser/NoteCommandParserTest.java b/src/test/java/terminus/parser/NoteCommandParserTest.java index 16f8711c4d..97afbe1a73 100644 --- a/src/test/java/terminus/parser/NoteCommandParserTest.java +++ b/src/test/java/terminus/parser/NoteCommandParserTest.java @@ -11,9 +11,11 @@ import terminus.command.HelpCommand; import terminus.command.ViewCommand; import terminus.command.note.AddNoteCommand; -import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidLinkException; import terminus.exception.InvalidTimeFormatException; +import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidDayException; import terminus.module.NusModule; import terminus.ui.Ui; @@ -42,7 +44,8 @@ void parseCommand_invalidCommand_exceptionThrown() { @Test void parseCommand_resolveExitCommand_success() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException, + InvalidTimeFormatException, InvalidLinkException, InvalidDayException { assertTrue(commandParser.parseCommand("exit") instanceof ExitCommand); assertTrue(commandParser.parseCommand("EXIT") instanceof ExitCommand); assertTrue(commandParser.parseCommand(" exit ") instanceof ExitCommand); @@ -51,7 +54,8 @@ void parseCommand_resolveExitCommand_success() @Test void parseCommand_resolveHelpCommand_success() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException, + InvalidTimeFormatException, InvalidLinkException, InvalidDayException { assertTrue(commandParser.parseCommand("help") instanceof HelpCommand); assertTrue(commandParser.parseCommand("HELP") instanceof HelpCommand); assertTrue(commandParser.parseCommand(" help ") instanceof HelpCommand); @@ -69,7 +73,8 @@ void parseCommand_resolveAddCommand_exceptionThrown() @Test void parseCommand_resolveAddCommand_success() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException, + InvalidTimeFormatException, InvalidLinkException, InvalidDayException { assertTrue(commandParser.parseCommand("add \"test\" \"test1\"") instanceof AddNoteCommand); assertTrue(commandParser.parseCommand("add \" test \" \" test1 \"") instanceof AddNoteCommand); assertTrue(commandParser.parseCommand("add \"username\" \"password\"") instanceof AddNoteCommand); @@ -85,7 +90,8 @@ void parseCommand_resolveDeleteCommand_exceptionThrown() @Test void parseCommand_resolveDeleteCommand_success() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException, + InvalidTimeFormatException, InvalidLinkException, InvalidDayException { assertTrue(commandParser.parseCommand("delete 1") instanceof DeleteCommand); assertTrue(commandParser.parseCommand("delete 2") instanceof DeleteCommand); } @@ -98,7 +104,8 @@ void parseCommand_resolveViewCommand_exceptionThrown() @Test void parseCommand_resolveViewCommand_success() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException, + InvalidTimeFormatException, InvalidLinkException, InvalidDayException { assertTrue(commandParser.parseCommand("view") instanceof ViewCommand); assertTrue(commandParser.parseCommand("view 1") instanceof ViewCommand); } diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index adbf9bf68d..33d82cc816 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -57,19 +57,19 @@ Format: schedule add "" "" "" ">> Command not found! Type 'help' for a list of commands. [] >>> List of Content --------------- -1. CS2113T Tutorial (Thursday, 10:00): zoom.nus.sg -2. CS2113T Lecture (Friday, 16:00): zoom.com +1. CS2113T Tutorial (Thursday, 10:00): https://zoom.us/test +2. CS2113T Lecture (Friday, 16:00): https://zoom.us/test Rerun the same command with an index behind to view the content. [] >>> Error: Content not found. -[] >>> CS2113T Lecture (Friday, 16:00): zoom.com +[] >>> CS2113T Lecture (Friday, 16:00): https://zoom.us/test [] >>> Error: Missing arguments. Format: schedule delete [] >>> Error: Content not found. [] >>> Your link on 'CS2113T Tutorial' has been deleted! [] >>> List of Content --------------- -1. CS2113T Lecture (Friday, 16:00): zoom.com +1. CS2113T Lecture (Friday, 16:00): https://zoom.us/test Rerun the same command with an index behind to view the content. [] >>> Command not found! Type 'help' for a list of commands. diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index 288d448e4b..d37ffe3911 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -15,8 +15,8 @@ help schedule add a schedule add a "Thursday" schedule add a "Thursday" "10:00" -schedule add "CS2113T Tutorial" "Thursday" "10:00" "zoom.nus.sg" -schedule add "CS2113T Lecture" "Friday" "16:00" "zoom.com" +schedule add "CS2113T Tutorial" "Thursday" "10:00" "https://zoom.us/test" +schedule add "CS2113T Lecture" "Friday" "16:00" "https://zoom.us/test" schedule invalid schedule view schedule view 4 From b06fb69fd1d68e2a37b56cc26c776c9d5c7dc5d6 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Tue, 12 Oct 2021 10:58:00 +0800 Subject: [PATCH 085/466] Add Junit tests to deal with invalid day and link --- .../parser/LinkCommandParserTest.java | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/src/test/java/terminus/parser/LinkCommandParserTest.java b/src/test/java/terminus/parser/LinkCommandParserTest.java index 5682b07951..f08c5bc6d7 100644 --- a/src/test/java/terminus/parser/LinkCommandParserTest.java +++ b/src/test/java/terminus/parser/LinkCommandParserTest.java @@ -73,13 +73,39 @@ void parseCommand_resolveAddCommand_InvalidArgumentExceptionThrown() void parseCommand_resolveAddCommand_InvalidTimeFormatExceptionThrown() throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { assertThrows(InvalidTimeFormatException.class, - () -> linkCommandParser.parseCommand("add \"test desc\" \"test day\" \"0:0\" \"zoom\"")); + () -> linkCommandParser.parseCommand("add \"test desc\" \"Friday\" \"0:0\" \"https://zoom.us/test\"")); assertThrows(InvalidTimeFormatException.class, - () -> linkCommandParser.parseCommand("add \"test desc\" \"test day\" \"0:0X\" \"zoom\"")); + () -> linkCommandParser.parseCommand("add \"test desc\" \"Saturday\" \"0:0X\" \"https://zoom.us/test\"")); assertThrows(InvalidTimeFormatException.class, - () -> linkCommandParser.parseCommand("add \"test desc\" \"test day\" \"0\" \"zoom\"")); + () -> linkCommandParser.parseCommand("add \"test desc\" \"Sunday\" \"0\" \"https://zoom.us/test\"")); assertThrows(InvalidTimeFormatException.class, - () -> linkCommandParser.parseCommand("add \"test desc\" \"test day\" \"14:0\" \"zoom\"")); + () -> linkCommandParser.parseCommand("add \"test desc\" \"Tuesday\" \"14:0\" \"https://zoom.us/test\"")); + } + + @Test + void parseCommand_resolveAddCommand_InvalidLinkExceptionThrown() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + assertThrows(InvalidLinkException.class, + () -> linkCommandParser.parseCommand("add \"test desc\" \"Friday\" \"10:00\" \"zoom.com\"")); + assertThrows(InvalidLinkException.class, + () -> linkCommandParser.parseCommand("add \"test desc\" \"Saturday\" \"12:30\" \"zoom.sg\"")); + assertThrows(InvalidLinkException.class, + () -> linkCommandParser.parseCommand("add \"test desc\" \"Sunday\" \"09:00\" \"invalidlink\"")); + assertThrows(InvalidLinkException.class, + () -> linkCommandParser.parseCommand("add \"test desc\" \"Tuesday\" \"14:00\" \"invalid link.com\"")); + } + + @Test + void parseCommand_resolveAddCommand_InvalidDayExceptionThrown() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + assertThrows(InvalidDayException.class, + () -> linkCommandParser.parseCommand("add \"test desc\" \"Today\" \"10:00\" \"https://zoom.us/test\"")); + assertThrows(InvalidDayException.class, + () -> linkCommandParser.parseCommand("add \"test desc\" \"Yesterday\" \"10:00\" \"https://zoom.us/test\"")); + assertThrows(InvalidDayException.class, + () -> linkCommandParser.parseCommand("add \"test desc\" \"Everyday\" \"10:00\" \"https://zoom.us/test\"")); + assertThrows(InvalidDayException.class, + () -> linkCommandParser.parseCommand("add \"test desc\" \"whenever\" \"10:00\" \"https://zoom.us/test\"")); } @Test From f916dae98feb9070f2c8fcd4adb689af1fc3f7fb Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Tue, 12 Oct 2021 12:04:22 +0800 Subject: [PATCH 086/466] Fix Style --- src/main/java/terminus/command/DeleteCommand.java | 3 ++- src/main/java/terminus/command/WorkspaceCommand.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/terminus/command/DeleteCommand.java b/src/main/java/terminus/command/DeleteCommand.java index 3dd6f91f48..0846143d60 100644 --- a/src/main/java/terminus/command/DeleteCommand.java +++ b/src/main/java/terminus/command/DeleteCommand.java @@ -11,6 +11,7 @@ import terminus.ui.Ui; public class DeleteCommand extends Command { + private Class type; private int itemNumber; @@ -51,7 +52,7 @@ public CommandResult execute(Ui ui, NusModule module) throws InvalidArgumentExce ContentManager contentManager = module.getContentManager(type); assert contentManager != null; TerminusLogger.info("Executing Delete Command"); - String deletedContentName = contentManager.deleteContent(itemNumber); + String deletedContentName = contentManager.deleteContent(itemNumber); assert deletedContentName != null && !deletedContentName.isBlank(); ui.printSection(String.format(Messages.MESSAGE_RESPONSE_DELETE, diff --git a/src/main/java/terminus/command/WorkspaceCommand.java b/src/main/java/terminus/command/WorkspaceCommand.java index 6e19db95bd..c6f2a509bd 100644 --- a/src/main/java/terminus/command/WorkspaceCommand.java +++ b/src/main/java/terminus/command/WorkspaceCommand.java @@ -50,7 +50,8 @@ public CommandResult execute(Ui ui, NusModule module) return new CommandResult(true, commandMap); } } - private boolean isNotNullOrBlank () { + + private boolean isNotNullOrBlank() { return arguments != null && !arguments.isBlank(); } } From 34d4fe979f56c64611cbad4fbb284ca92f10090c Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Tue, 12 Oct 2021 12:06:25 +0800 Subject: [PATCH 087/466] Typo Fix --- src/main/java/terminus/command/WorkspaceCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/terminus/command/WorkspaceCommand.java b/src/main/java/terminus/command/WorkspaceCommand.java index c6f2a509bd..bb45dac407 100644 --- a/src/main/java/terminus/command/WorkspaceCommand.java +++ b/src/main/java/terminus/command/WorkspaceCommand.java @@ -29,7 +29,7 @@ public WorkspaceCommand(CommandParser commandMap) { public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { assert commandMap != null; - TerminusLogger.info("Executing Delete Command"); + TerminusLogger.info("Executing Workspace Command"); if (isNotNullOrBlank()) { try { TerminusLogger.info("Parsing workspace command"); From 09b5742b8768f574bb64a9401c4124cb3ad65900 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 12 Oct 2021 12:41:12 +0800 Subject: [PATCH 088/466] Add logging to AddNoteCommand --- .../java/terminus/command/note/AddNoteCommand.java | 11 ++++++++++- src/main/java/terminus/content/ContentManager.java | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/terminus/command/note/AddNoteCommand.java b/src/main/java/terminus/command/note/AddNoteCommand.java index 508754f48a..847febcb9c 100644 --- a/src/main/java/terminus/command/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/note/AddNoteCommand.java @@ -11,6 +11,7 @@ import terminus.exception.InvalidCommandException; import terminus.module.NusModule; import terminus.ui.Ui; +import terminus.common.TerminusLogger; public class AddNoteCommand extends Command { @@ -35,22 +36,27 @@ public String getHelpMessage() { @Override public void parseArguments(String arguments) throws InvalidArgumentException { - // Perform required checks with regex + TerminusLogger.info("Parsing arguments to Add Note Command"); if (arguments == null || arguments.isBlank()) { + TerminusLogger.warning("Failed to parse arguments, arguments is empty"); throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } + // Regex to find arguments ArrayList argArray = CommonFormat.findArguments(arguments); if (!isValidNoteArguments(argArray)) { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } this.name = argArray.get(0); this.data = argArray.get(1); + TerminusLogger.info(String.format("Parsed argument (name = %s, data = %s) to Add Note Command", name, data)); } @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { + TerminusLogger.info("Executing Add Note Command"); ContentManager contentManager = module.getContentManager(Note.class); contentManager.add(new Note(name, data)); + TerminusLogger.info(String.format("Note(\"%s\",\"%s\") has been added", name, data)); ui.printSection(String.format(Messages.MESSAGE_RESPONSE_ADD, CommonFormat.COMMAND_NOTE, name)); return new CommandResult(true, false); } @@ -58,8 +64,11 @@ public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandExcep private boolean isValidNoteArguments(ArrayList argArray) { boolean isValid = true; if (argArray.size() != ADD_NOTE_ARGUMENTS) { + TerminusLogger.warning(String.format("Failed to find %d arguments, %d arguments found", + ADD_NOTE_ARGUMENTS, argArray.size())); isValid = false; } else if (CommonFormat.isArrayEmpty(argArray)) { + TerminusLogger.warning("Failed to parse arguments, some arguments found is empty"); isValid = false; } return isValid; diff --git a/src/main/java/terminus/content/ContentManager.java b/src/main/java/terminus/content/ContentManager.java index df697848fb..572ed59174 100644 --- a/src/main/java/terminus/content/ContentManager.java +++ b/src/main/java/terminus/content/ContentManager.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import terminus.common.Messages; import terminus.exception.InvalidArgumentException; +import terminus.common.TerminusLogger; public class ContentManager { From e8fa57fbdf0ee2b6ebb1bda0a66a7552d2759e18 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 12 Oct 2021 12:55:17 +0800 Subject: [PATCH 089/466] Add logging to NusModule --- src/main/java/terminus/module/NusModule.java | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/terminus/module/NusModule.java b/src/main/java/terminus/module/NusModule.java index f24166afdf..e36728a8f3 100644 --- a/src/main/java/terminus/module/NusModule.java +++ b/src/main/java/terminus/module/NusModule.java @@ -1,12 +1,10 @@ package terminus.module; -import java.time.LocalTime; -import java.util.ArrayList; +import terminus.common.TerminusLogger; import terminus.content.Content; import terminus.content.ContentManager; import terminus.content.Link; import terminus.content.Note; -import terminus.exception.InvalidArgumentException; public class NusModule { @@ -15,21 +13,25 @@ public class NusModule { private ContentManager linkManager; public NusModule() { - noteManager = new ContentManager(); - linkManager = new ContentManager(); + noteManager = new ContentManager<>(); + linkManager = new ContentManager<>(); } public ContentManager getContentManager(Class type) { + TerminusLogger.info(String.format("Get ContentManager from NusModule with provided class type: %s", type)); + ContentManager result = null; if (type == Note.class) { - return (ContentManager) this.noteManager; + result = (ContentManager) this.noteManager; } else if (type == Link.class) { - return (ContentManager) this.linkManager; + result = (ContentManager) this.linkManager; } else { - //error encountered + // Fatal error encountered + TerminusLogger.severe(String.format("Class type provided not found: %s", type)); assert false; } - return null; + TerminusLogger.info("ContentManager found"); + return result; } } From 1871f8cd47af701667469aee8fe5225d0e4a3406 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Tue, 12 Oct 2021 14:14:03 +0800 Subject: [PATCH 090/466] Add logging to AddLinkCommand --- .../java/terminus/command/zoomlink/AddLinkCommand.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index 144245fff2..d94afcc288 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -2,6 +2,7 @@ import terminus.command.Command; import terminus.command.CommandResult; +import terminus.common.TerminusLogger; import terminus.content.ContentManager; import terminus.content.Link; import terminus.exception.InvalidLinkException; @@ -64,12 +65,16 @@ public void parseArguments(String arguments) this.link = argArray.get(3); if (!isValidDay(this.day)) { + TerminusLogger.warning(String.format("Invalid Day: %s", this.day)); throw new InvalidDayException(String.format(Messages.ERROR_MESSAGE_INVALID_DAY, this.day)); } if (!isValidUrl(this.link)) { + TerminusLogger.warning(String.format("Invalid Link: %s", this.link)); throw new InvalidLinkException( String.format(Messages.ERROR_MESSAGE_INVALID_LINK, this.link)); } + TerminusLogger.info(String.format("Parsed arguments (description = %s, day = %s, startTime = %s, link = %s)" + + " to Add Link Command", description, day, startTime, link)); } @Override @@ -85,8 +90,11 @@ public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandExcep private boolean isValidScheduleArguments(ArrayList argArray) { boolean isValid = true; if (argArray.size() != ADD_SCHEDULE_ARGUMENTS) { + TerminusLogger.warning(String.format("Failed to find %d arguments, %d arguments found", + ADD_SCHEDULE_ARGUMENTS, argArray.size())); isValid = false; } else if (CommonFormat.isArrayEmpty(argArray)) { + TerminusLogger.warning("Failed to parse arguments, some arguments found is empty"); isValid = false; } return isValid; From f4ce1f176f3b7810b2bb79117cc5450f33de19d2 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 12 Oct 2021 15:41:16 +0800 Subject: [PATCH 091/466] Add comments to AddNoteCommand --- src/main/java/terminus/command/Command.java | 16 +++++------ .../terminus/command/note/AddNoteCommand.java | 27 +++++++++++++++++-- .../command/zoomlink/AddLinkCommand.java | 22 +++++---------- 3 files changed, 39 insertions(+), 26 deletions(-) diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java index bb491052aa..2b6919e2c8 100644 --- a/src/main/java/terminus/command/Command.java +++ b/src/main/java/terminus/command/Command.java @@ -9,7 +9,7 @@ public abstract class Command { protected String arguments; - + public Command() { } @@ -32,8 +32,8 @@ public Command() { * Parses remaining arguments for the command. * * @param arguments The string arguments to be parsed in to the respective fields. - * @throws InvalidArgumentException Exception for when arguments parsing fails - * @throws InvalidTimeFormatException Exception for when time format is invalid + * @throws InvalidArgumentException Exception for when arguments parsing fails. + * @throws InvalidTimeFormatException Exception for when time format is invalid. */ public void parseArguments(String arguments) throws InvalidArgumentException, InvalidTimeFormatException { this.arguments = arguments; @@ -43,12 +43,12 @@ public void parseArguments(String arguments) throws InvalidArgumentException, In * Executes the command. * Prints the required result to the Ui. * - * @param ui The Ui object to send messages to the users. - * @param module The NusModule contain the list of all notes and schedules. + * @param ui The Ui object to send messages to the users. + * @param module The NusModule contain the ContentManager of all notes and schedules. * @return The CommandResult object indicating the success of failure including additional options. - * @throws InvalidCommandException Exception for when the command could not be found. - * @throws InvalidArgumentException Exception for when arguments parsing fails - * @throws InvalidTimeFormatException Exception for when time format is invalid + * @throws InvalidCommandException Exception for when the command could not be found. + * @throws InvalidArgumentException Exception for when arguments parsing fails. + * @throws InvalidTimeFormatException Exception for when time format is invalid. */ public abstract CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException; diff --git a/src/main/java/terminus/command/note/AddNoteCommand.java b/src/main/java/terminus/command/note/AddNoteCommand.java index 508754f48a..74e9e0d752 100644 --- a/src/main/java/terminus/command/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/note/AddNoteCommand.java @@ -8,10 +8,12 @@ import terminus.content.ContentManager; import terminus.content.Note; import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidCommandException; import terminus.module.NusModule; import terminus.ui.Ui; +/** + * AddNoteCommand class which will manage the adding of new Notes from user command. + */ public class AddNoteCommand extends Command { private String name; @@ -33,6 +35,13 @@ public String getHelpMessage() { return Messages.MESSAGE_COMMAND_ADD; } + /** + * Parses the arguments into an AddNoteCommand object. + * The arguments' name and data are attributes for a new Note object. + * + * @param arguments The string arguments to be parsed in to the respective fields. + * @throws InvalidArgumentException Exception for when argument parsing fails. + */ @Override public void parseArguments(String arguments) throws InvalidArgumentException { // Perform required checks with regex @@ -47,14 +56,28 @@ public void parseArguments(String arguments) throws InvalidArgumentException { this.data = argArray.get(1); } + /** + * Executes the add Note command. + * Prints the relevant response to the Ui and a new Note will be added into the arraylist of Notes. + * + * @param ui The Ui object to send messages to the users. + * @param module The NusModule contain the ContentManager of all notes and schedules. + * @return CommandResult to indicate the success and additional information about the execution. + */ @Override - public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { + public CommandResult execute(Ui ui, NusModule module) { ContentManager contentManager = module.getContentManager(Note.class); contentManager.add(new Note(name, data)); ui.printSection(String.format(Messages.MESSAGE_RESPONSE_ADD, CommonFormat.COMMAND_NOTE, name)); return new CommandResult(true, false); } + /** + * Checks if arguments are non-empty and valid. + * + * @param argArray The command arguments in an array list. + * @return True if the appropriate number of arguments are present, false otherwise. + */ private boolean isValidNoteArguments(ArrayList argArray) { boolean isValid = true; if (argArray.size() != ADD_NOTE_ARGUMENTS) { diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index 640fd87ed9..a734cd8189 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -4,7 +4,6 @@ import terminus.command.CommandResult; import terminus.content.ContentManager; import terminus.content.Link; -import terminus.content.Note; import terminus.exception.InvalidTimeFormatException; import terminus.module.NusModule; import terminus.common.CommonFormat; @@ -32,32 +31,23 @@ public AddLinkCommand() { } - /** - * Returns the command format to Add a Link. - * - * @return The string containing the command format to add a link - */ @Override public String getFormat() { return CommonFormat.COMMAND_ADD_SCHEDULE_FORMAT; } - /** - * Returns the description of Add Link Command. - * - * @return The string containing the description of an add command - */ @Override public String getHelpMessage() { return Messages.MESSAGE_COMMAND_ADD; } /** - * Parses the arguments in an add link command to its respective description, day, start-time, and link. + * Parses the arguments in an AddLinkCommand object. + * The arguments' description, day, start-time, and link are attributes for a new Link object. * * @param arguments The string arguments to be parsed in to the respective fields. - * @throws InvalidArgumentException Exception for when argument parsing fails - * @throws InvalidTimeFormatException Exception for when time format is invalid + * @throws InvalidArgumentException Exception for when argument parsing fails. + * @throws InvalidTimeFormatException Exception for when time format is invalid. */ @Override public void parseArguments(String arguments) throws InvalidArgumentException, InvalidTimeFormatException { @@ -81,9 +71,9 @@ public void parseArguments(String arguments) throws InvalidArgumentException, In * Executes the add link command. * Prints the relevant response to the Ui. * - * @param ui The Ui object to send messages to the users. + * @param ui The Ui object to send messages to the users. * @param module The NusModule contain the list of all notes and schedules. - * @return CommandResult to indicate the success and additional information about the execution + * @return CommandResult to indicate the success and additional information about the execution. * @throws InvalidCommandException Exception for when the user command is not found * @throws InvalidArgumentException Exception for when the argument parsing fails */ From 659075e65a07ae689bd041f3d8349e71b6913079 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 12 Oct 2021 15:48:08 +0800 Subject: [PATCH 092/466] Update logging format for AddNoteCommand --- src/main/java/terminus/command/note/AddNoteCommand.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/terminus/command/note/AddNoteCommand.java b/src/main/java/terminus/command/note/AddNoteCommand.java index 847febcb9c..acde23c8b0 100644 --- a/src/main/java/terminus/command/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/note/AddNoteCommand.java @@ -36,9 +36,9 @@ public String getHelpMessage() { @Override public void parseArguments(String arguments) throws InvalidArgumentException { - TerminusLogger.info("Parsing arguments to Add Note Command"); + TerminusLogger.info("Parsing add note arguments"); if (arguments == null || arguments.isBlank()) { - TerminusLogger.warning("Failed to parse arguments, arguments is empty"); + TerminusLogger.warning("Failed to parse arguments: arguments is empty"); throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } // Regex to find arguments @@ -64,11 +64,11 @@ public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandExcep private boolean isValidNoteArguments(ArrayList argArray) { boolean isValid = true; if (argArray.size() != ADD_NOTE_ARGUMENTS) { - TerminusLogger.warning(String.format("Failed to find %d arguments, %d arguments found", + TerminusLogger.warning(String.format("Failed to find %d arguments: %d arguments found", ADD_NOTE_ARGUMENTS, argArray.size())); isValid = false; } else if (CommonFormat.isArrayEmpty(argArray)) { - TerminusLogger.warning("Failed to parse arguments, some arguments found is empty"); + TerminusLogger.warning("Failed to parse arguments: some arguments found is empty"); isValid = false; } return isValid; From 58f24f10d7135529d80dd5270873cf09f8b283a6 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Tue, 12 Oct 2021 15:58:11 +0800 Subject: [PATCH 093/466] Remove exception classes and use generic invalid argument exception --- src/main/java/terminus/Terminus.java | 6 +- src/main/java/terminus/command/Command.java | 10 +-- .../terminus/command/WorkspaceCommand.java | 7 +- .../command/zoomlink/AddLinkCommand.java | 10 +-- .../java/terminus/common/CommonFormat.java | 11 +-- .../java/terminus/content/ContentManager.java | 1 - .../exception/InvalidDayException.java | 8 --- .../exception/InvalidLinkException.java | 8 --- .../exception/InvalidTimeFormatException.java | 8 --- src/main/java/terminus/module/NusModule.java | 3 - .../java/terminus/parser/CommandParser.java | 7 +- .../terminus/command/ExitCommandTest.java | 7 +- .../command/link/AddLinkCommandTest.java | 7 +- .../command/note/AddNoteCommandTest.java | 7 +- .../command/note/BackNoteCommandTest.java | 7 +- .../command/note/DeleteNoteCommandTest.java | 11 +-- .../parser/LinkCommandParserTest.java | 68 +++---------------- .../parser/MainCommandParserTest.java | 15 +--- .../parser/NoteCommandParserTest.java | 27 +++----- 19 files changed, 36 insertions(+), 192 deletions(-) delete mode 100644 src/main/java/terminus/exception/InvalidDayException.java delete mode 100644 src/main/java/terminus/exception/InvalidLinkException.java delete mode 100644 src/main/java/terminus/exception/InvalidTimeFormatException.java diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index ef2bd00916..9e8b6b860f 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -5,11 +5,8 @@ import terminus.command.Command; import terminus.command.CommandResult; import terminus.common.TerminusLogger; -import terminus.exception.InvalidLinkException; -import terminus.exception.InvalidTimeFormatException; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidDayException; import terminus.module.NusModule; import terminus.parser.CommandParser; import terminus.parser.MainCommandParser; @@ -99,8 +96,7 @@ private void runCommandsUntilExit() { TerminusLogger.info("Saving data into file..."); this.moduleStorage.saveFile(nusModule); TerminusLogger.info("Save completed."); - } catch (InvalidCommandException | InvalidTimeFormatException - | InvalidLinkException | InvalidDayException e) { + } catch (InvalidCommandException e) { TerminusLogger.warning("Invalid input provided: " + input, e.getCause()); ui.printSection(e.getMessage()); } catch (InvalidArgumentException e) { diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java index d0c08fd535..129020a026 100644 --- a/src/main/java/terminus/command/Command.java +++ b/src/main/java/terminus/command/Command.java @@ -1,10 +1,7 @@ package terminus.command; -import terminus.exception.InvalidLinkException; -import terminus.exception.InvalidTimeFormatException; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidDayException; import terminus.module.NusModule; import terminus.ui.Ui; @@ -35,10 +32,9 @@ public Command() { * * @param arguments The string arguments to be parsed in to the respective fields. * @throws InvalidArgumentException Exception for when arguments parsing fails - * @throws InvalidTimeFormatException Exception for when time format is invalid */ public void parseArguments(String arguments) - throws InvalidArgumentException, InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + throws InvalidArgumentException { this.arguments = arguments; } @@ -51,9 +47,7 @@ public void parseArguments(String arguments) * @return The CommandResult object indicating the success of failure including additional options. * @throws InvalidCommandException Exception for when the command could not be found. * @throws InvalidArgumentException Exception for when arguments parsing fails - * @throws InvalidTimeFormatException Exception for when time format is invalid */ public abstract CommandResult execute(Ui ui, NusModule module) - throws InvalidCommandException, InvalidArgumentException, - InvalidTimeFormatException, InvalidLinkException, InvalidDayException; + throws InvalidCommandException, InvalidArgumentException; } diff --git a/src/main/java/terminus/command/WorkspaceCommand.java b/src/main/java/terminus/command/WorkspaceCommand.java index 0ab40e4f2c..fb3830db71 100644 --- a/src/main/java/terminus/command/WorkspaceCommand.java +++ b/src/main/java/terminus/command/WorkspaceCommand.java @@ -1,10 +1,7 @@ package terminus.command; -import terminus.exception.InvalidLinkException; -import terminus.exception.InvalidTimeFormatException; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidDayException; import terminus.module.NusModule; import terminus.parser.CommandParser; import terminus.ui.Ui; @@ -28,9 +25,7 @@ public WorkspaceCommand(CommandParser commandMap) { * @throws InvalidCommandException Exception for when the command could not be found. */ @Override - public CommandResult execute(Ui ui, NusModule module) - throws InvalidCommandException, InvalidArgumentException, - InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException, InvalidArgumentException { assert commandMap != null; if (arguments != null && !arguments.isBlank()) { try { diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index d94afcc288..5f7fe0c6da 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -5,11 +5,8 @@ import terminus.common.TerminusLogger; import terminus.content.ContentManager; import terminus.content.Link; -import terminus.exception.InvalidLinkException; -import terminus.exception.InvalidTimeFormatException; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidDayException; import terminus.module.NusModule; import terminus.common.CommonFormat; import terminus.common.Messages; @@ -45,8 +42,7 @@ public String getHelpMessage() { } @Override - public void parseArguments(String arguments) - throws InvalidArgumentException, InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + public void parseArguments(String arguments) throws InvalidArgumentException { // Perform required checks with regex if (arguments == null || arguments.isBlank()) { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); @@ -66,11 +62,11 @@ public void parseArguments(String arguments) if (!isValidDay(this.day)) { TerminusLogger.warning(String.format("Invalid Day: %s", this.day)); - throw new InvalidDayException(String.format(Messages.ERROR_MESSAGE_INVALID_DAY, this.day)); + throw new InvalidArgumentException(String.format(Messages.ERROR_MESSAGE_INVALID_DAY, this.day)); } if (!isValidUrl(this.link)) { TerminusLogger.warning(String.format("Invalid Link: %s", this.link)); - throw new InvalidLinkException( + throw new InvalidArgumentException( String.format(Messages.ERROR_MESSAGE_INVALID_LINK, this.link)); } TerminusLogger.info(String.format("Parsed arguments (description = %s, day = %s, startTime = %s, link = %s)" diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index f09a17a1cd..898f7d5608 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -1,12 +1,7 @@ package terminus.common; -import java.net.MalformedURLException; -import java.net.URISyntaxException; import java.net.URL; -import java.util.Arrays; -import terminus.exception.InvalidCommandException; -import terminus.exception.InvalidTimeFormatException; - +import terminus.exception.InvalidArgumentException; import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -51,9 +46,9 @@ public static boolean isArrayEmpty(ArrayList argArray) { return false; } - public static LocalTime localTimeConverter(String startTime) throws InvalidTimeFormatException { + public static LocalTime localTimeConverter(String startTime) throws InvalidArgumentException { if (startTime.length() != 5 || startTime.indexOf(":") != 2) { - throw new InvalidTimeFormatException( + throw new InvalidArgumentException( String.format(Messages.ERROR_MESSAGE_INVALID_TIME_FORMAT, LOCAL_TIME_FORMAT)); } DateTimeFormatter format = DateTimeFormatter.ofPattern(LOCAL_TIME_FORMAT); diff --git a/src/main/java/terminus/content/ContentManager.java b/src/main/java/terminus/content/ContentManager.java index df697848fb..8d18cf4bf4 100644 --- a/src/main/java/terminus/content/ContentManager.java +++ b/src/main/java/terminus/content/ContentManager.java @@ -1,6 +1,5 @@ package terminus.content; -import java.time.LocalTime; import java.util.ArrayList; import terminus.common.Messages; import terminus.exception.InvalidArgumentException; diff --git a/src/main/java/terminus/exception/InvalidDayException.java b/src/main/java/terminus/exception/InvalidDayException.java deleted file mode 100644 index fce96ad090..0000000000 --- a/src/main/java/terminus/exception/InvalidDayException.java +++ /dev/null @@ -1,8 +0,0 @@ -package terminus.exception; - -public class InvalidDayException extends Exception { - - public InvalidDayException(String message) { - super(message); - } -} diff --git a/src/main/java/terminus/exception/InvalidLinkException.java b/src/main/java/terminus/exception/InvalidLinkException.java deleted file mode 100644 index 3478911b83..0000000000 --- a/src/main/java/terminus/exception/InvalidLinkException.java +++ /dev/null @@ -1,8 +0,0 @@ -package terminus.exception; - -public class InvalidLinkException extends Exception { - - public InvalidLinkException(String message) { - super(message); - } -} diff --git a/src/main/java/terminus/exception/InvalidTimeFormatException.java b/src/main/java/terminus/exception/InvalidTimeFormatException.java deleted file mode 100644 index 938a19fd45..0000000000 --- a/src/main/java/terminus/exception/InvalidTimeFormatException.java +++ /dev/null @@ -1,8 +0,0 @@ -package terminus.exception; - -public class InvalidTimeFormatException extends Exception { - - public InvalidTimeFormatException(String message) { - super(message); - } -} diff --git a/src/main/java/terminus/module/NusModule.java b/src/main/java/terminus/module/NusModule.java index f24166afdf..8fbda43578 100644 --- a/src/main/java/terminus/module/NusModule.java +++ b/src/main/java/terminus/module/NusModule.java @@ -1,12 +1,9 @@ package terminus.module; -import java.time.LocalTime; -import java.util.ArrayList; import terminus.content.Content; import terminus.content.ContentManager; import terminus.content.Link; import terminus.content.Note; -import terminus.exception.InvalidArgumentException; public class NusModule { diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java index 504c19674a..fbd5634c61 100644 --- a/src/main/java/terminus/parser/CommandParser.java +++ b/src/main/java/terminus/parser/CommandParser.java @@ -6,11 +6,8 @@ import terminus.command.ExitCommand; import terminus.command.Command; import terminus.command.HelpCommand; -import terminus.exception.InvalidLinkException; -import terminus.exception.InvalidTimeFormatException; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidDayException; import terminus.module.NusModule; public abstract class CommandParser { @@ -39,12 +36,10 @@ public CommandParser(String workspace) { * @return The Command object to be executed * @throws InvalidCommandException if there is no command or empty command * @throws InvalidArgumentException Fails when arguments could not be parsed - * @throws InvalidTimeFormatException Fails when time format is invalid */ public Command parseCommand(String command) - throws InvalidCommandException, InvalidArgumentException, - InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + throws InvalidCommandException, InvalidArgumentException { String[] commandLine = command.strip().split(SPACE_DELIMITER, 2); assert commandLine.length <= 2 && commandLine.length > 0; diff --git a/src/test/java/terminus/command/ExitCommandTest.java b/src/test/java/terminus/command/ExitCommandTest.java index 8b7711611d..792f76ae79 100644 --- a/src/test/java/terminus/command/ExitCommandTest.java +++ b/src/test/java/terminus/command/ExitCommandTest.java @@ -5,11 +5,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.common.CommonFormat; -import terminus.exception.InvalidLinkException; -import terminus.exception.InvalidTimeFormatException; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidDayException; import terminus.module.NusModule; import terminus.parser.MainCommandParser; import terminus.ui.Ui; @@ -28,9 +25,7 @@ void setUp() { } @Test - void execute_success() - throws InvalidArgumentException, InvalidCommandException, - InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + void execute_success() throws InvalidArgumentException, InvalidCommandException { Command exitCommand = commandParser.parseCommand(CommonFormat.COMMAND_EXIT); CommandResult mainResult = exitCommand.execute(ui, nusModule); assertTrue(mainResult.isOk() && mainResult.isExit()); diff --git a/src/test/java/terminus/command/link/AddLinkCommandTest.java b/src/test/java/terminus/command/link/AddLinkCommandTest.java index d2d9f3c198..2661b038e5 100644 --- a/src/test/java/terminus/command/link/AddLinkCommandTest.java +++ b/src/test/java/terminus/command/link/AddLinkCommandTest.java @@ -6,11 +6,8 @@ import terminus.command.CommandResult; import terminus.common.CommonFormat; import terminus.content.Link; -import terminus.exception.InvalidLinkException; -import terminus.exception.InvalidTimeFormatException; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidDayException; import terminus.module.NusModule; import terminus.parser.LinkCommandParser; import terminus.ui.Ui; @@ -46,9 +43,7 @@ void parseArguments_addLinkCommand_success() { } @Test - void execute_addLinkCommand_success() - throws InvalidCommandException, InvalidArgumentException, - InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + void execute_addLinkCommand_success() throws InvalidCommandException, InvalidArgumentException { Command addLinkCommand = linkCommandParser.parseCommand("add \"test\" \"Monday\" \"00:00\" \"https://zoom.us/test\""); CommandResult addResult = addLinkCommand.execute(ui, nusModule); assertTrue(addResult.isOk()); diff --git a/src/test/java/terminus/command/note/AddNoteCommandTest.java b/src/test/java/terminus/command/note/AddNoteCommandTest.java index 61f1c25742..dd93c3e0d2 100644 --- a/src/test/java/terminus/command/note/AddNoteCommandTest.java +++ b/src/test/java/terminus/command/note/AddNoteCommandTest.java @@ -8,11 +8,8 @@ import terminus.command.Command; import terminus.command.CommandResult; import terminus.content.Note; -import terminus.exception.InvalidLinkException; -import terminus.exception.InvalidTimeFormatException; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidDayException; import terminus.module.NusModule; import terminus.parser.NoteCommandParser; import terminus.ui.Ui; @@ -33,9 +30,7 @@ void setUp() { } @Test - void execute_success() - throws InvalidCommandException, InvalidArgumentException, - InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + void execute_success() throws InvalidCommandException, InvalidArgumentException { Command addCommand = commandParser.parseCommand("add \"test\" \"test1\""); CommandResult addResult = addCommand.execute(ui, nusModule); assertTrue(addResult.isOk()); diff --git a/src/test/java/terminus/command/note/BackNoteCommandTest.java b/src/test/java/terminus/command/note/BackNoteCommandTest.java index a40eee10f3..db5b7fcd18 100644 --- a/src/test/java/terminus/command/note/BackNoteCommandTest.java +++ b/src/test/java/terminus/command/note/BackNoteCommandTest.java @@ -6,11 +6,8 @@ import org.junit.jupiter.api.Test; import terminus.command.Command; import terminus.command.CommandResult; -import terminus.exception.InvalidLinkException; -import terminus.exception.InvalidTimeFormatException; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidDayException; import terminus.module.NusModule; import terminus.parser.MainCommandParser; import terminus.parser.NoteCommandParser; @@ -30,9 +27,7 @@ void setUp() { } @Test - void execute_success() - throws InvalidCommandException, InvalidArgumentException, - InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + void execute_success() throws InvalidCommandException, InvalidArgumentException { Command backCommand = commandParser.parseCommand("back"); CommandResult backResult = backCommand.execute(ui, nusModule); assertTrue(backResult.isOk()); diff --git a/src/test/java/terminus/command/note/DeleteNoteCommandTest.java b/src/test/java/terminus/command/note/DeleteNoteCommandTest.java index 3f0e55f9ac..fc003b700d 100644 --- a/src/test/java/terminus/command/note/DeleteNoteCommandTest.java +++ b/src/test/java/terminus/command/note/DeleteNoteCommandTest.java @@ -9,11 +9,8 @@ import terminus.command.Command; import terminus.command.CommandResult; import terminus.content.Note; -import terminus.exception.InvalidLinkException; -import terminus.exception.InvalidTimeFormatException; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidDayException; import terminus.module.NusModule; import terminus.parser.NoteCommandParser; import terminus.ui.Ui; @@ -34,9 +31,7 @@ void setUp() { } @Test - void execute_success() - throws InvalidCommandException, InvalidArgumentException, - InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + void execute_success() throws InvalidCommandException, InvalidArgumentException { for (int i = 0; i < 5; i++) { Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); CommandResult addResult = addCommand.execute(ui, nusModule); @@ -58,9 +53,7 @@ void execute_success() } @Test - void execute_throwsException() - throws InvalidCommandException, InvalidArgumentException, - InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + void execute_throwsException() throws InvalidCommandException, InvalidArgumentException { Command deleteCommand = commandParser.parseCommand("delete 100"); assertThrows(InvalidArgumentException.class, () -> deleteCommand.execute(ui, nusModule)); } diff --git a/src/test/java/terminus/parser/LinkCommandParserTest.java b/src/test/java/terminus/parser/LinkCommandParserTest.java index f08c5bc6d7..76d56325b4 100644 --- a/src/test/java/terminus/parser/LinkCommandParserTest.java +++ b/src/test/java/terminus/parser/LinkCommandParserTest.java @@ -7,11 +7,8 @@ import terminus.command.HelpCommand; import terminus.command.ViewCommand; import terminus.command.zoomlink.AddLinkCommand; -import terminus.exception.InvalidLinkException; -import terminus.exception.InvalidTimeFormatException; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidDayException; import terminus.module.NusModule; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -40,9 +37,7 @@ void parseCommand_invalidCommand_exceptionThrown() { } @Test - void parseCommand_resolveExitCommand_success() - throws InvalidCommandException, InvalidArgumentException, - InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + void parseCommand_resolveExitCommand_success() throws InvalidCommandException, InvalidArgumentException { assertTrue(linkCommandParser.parseCommand("exit") instanceof ExitCommand); assertTrue(linkCommandParser.parseCommand("eXiT") instanceof ExitCommand); assertTrue(linkCommandParser.parseCommand(" ExIt ") instanceof ExitCommand); @@ -50,9 +45,7 @@ void parseCommand_resolveExitCommand_success() } @Test - void parseCommand_resolveHelpCommand_success() - throws InvalidCommandException, InvalidArgumentException, - InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + void parseCommand_resolveHelpCommand_success() throws InvalidCommandException, InvalidArgumentException { assertTrue(linkCommandParser.parseCommand("help") instanceof HelpCommand); assertTrue(linkCommandParser.parseCommand("HeLp") instanceof HelpCommand); assertTrue(linkCommandParser.parseCommand(" hElP ") instanceof HelpCommand); @@ -61,7 +54,7 @@ void parseCommand_resolveHelpCommand_success() @Test void parseCommand_resolveAddCommand_InvalidArgumentExceptionThrown() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException { assertThrows(InvalidArgumentException.class, () -> linkCommandParser.parseCommand("add")); assertThrows(InvalidArgumentException.class, () -> linkCommandParser.parseCommand("add \"test desc\"test day\"")); @@ -70,48 +63,7 @@ void parseCommand_resolveAddCommand_InvalidArgumentExceptionThrown() } @Test - void parseCommand_resolveAddCommand_InvalidTimeFormatExceptionThrown() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { - assertThrows(InvalidTimeFormatException.class, - () -> linkCommandParser.parseCommand("add \"test desc\" \"Friday\" \"0:0\" \"https://zoom.us/test\"")); - assertThrows(InvalidTimeFormatException.class, - () -> linkCommandParser.parseCommand("add \"test desc\" \"Saturday\" \"0:0X\" \"https://zoom.us/test\"")); - assertThrows(InvalidTimeFormatException.class, - () -> linkCommandParser.parseCommand("add \"test desc\" \"Sunday\" \"0\" \"https://zoom.us/test\"")); - assertThrows(InvalidTimeFormatException.class, - () -> linkCommandParser.parseCommand("add \"test desc\" \"Tuesday\" \"14:0\" \"https://zoom.us/test\"")); - } - - @Test - void parseCommand_resolveAddCommand_InvalidLinkExceptionThrown() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { - assertThrows(InvalidLinkException.class, - () -> linkCommandParser.parseCommand("add \"test desc\" \"Friday\" \"10:00\" \"zoom.com\"")); - assertThrows(InvalidLinkException.class, - () -> linkCommandParser.parseCommand("add \"test desc\" \"Saturday\" \"12:30\" \"zoom.sg\"")); - assertThrows(InvalidLinkException.class, - () -> linkCommandParser.parseCommand("add \"test desc\" \"Sunday\" \"09:00\" \"invalidlink\"")); - assertThrows(InvalidLinkException.class, - () -> linkCommandParser.parseCommand("add \"test desc\" \"Tuesday\" \"14:00\" \"invalid link.com\"")); - } - - @Test - void parseCommand_resolveAddCommand_InvalidDayExceptionThrown() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { - assertThrows(InvalidDayException.class, - () -> linkCommandParser.parseCommand("add \"test desc\" \"Today\" \"10:00\" \"https://zoom.us/test\"")); - assertThrows(InvalidDayException.class, - () -> linkCommandParser.parseCommand("add \"test desc\" \"Yesterday\" \"10:00\" \"https://zoom.us/test\"")); - assertThrows(InvalidDayException.class, - () -> linkCommandParser.parseCommand("add \"test desc\" \"Everyday\" \"10:00\" \"https://zoom.us/test\"")); - assertThrows(InvalidDayException.class, - () -> linkCommandParser.parseCommand("add \"test desc\" \"whenever\" \"10:00\" \"https://zoom.us/test\"")); - } - - @Test - void parseCommand_resolveAddCommand_success() - throws InvalidCommandException, InvalidArgumentException, - InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + void parseCommand_resolveAddCommand_success() throws InvalidCommandException, InvalidArgumentException { assertTrue(linkCommandParser.parseCommand( "add \"test desc\" \"Tuesday\" \"10:00\" \"https://zoom.us/test\"") instanceof AddLinkCommand); assertTrue(linkCommandParser.parseCommand( @@ -122,7 +74,7 @@ void parseCommand_resolveAddCommand_success() @Test void parseCommand_resolveDeleteCommand_exceptionThrown() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException { assertThrows(InvalidArgumentException.class, () -> linkCommandParser.parseCommand("delete")); assertThrows(InvalidArgumentException.class, () -> linkCommandParser.parseCommand("delete abcd")); assertThrows(InvalidArgumentException.class, () -> linkCommandParser.parseCommand("delete -1")); @@ -130,22 +82,18 @@ void parseCommand_resolveDeleteCommand_exceptionThrown() @Test void parseCommand_resolveDeleteCommand_success() - throws InvalidCommandException, InvalidArgumentException, - InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + throws InvalidCommandException, InvalidArgumentException { assertTrue(linkCommandParser.parseCommand("delete 1") instanceof DeleteCommand); assertTrue(linkCommandParser.parseCommand("delete 2") instanceof DeleteCommand); } @Test - void parseCommand_resolveViewCommand_exceptionThrown() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + void parseCommand_resolveViewCommand_exceptionThrown() throws InvalidCommandException, InvalidArgumentException { assertThrows(InvalidArgumentException.class, () -> linkCommandParser.parseCommand("view abcd")); } @Test - void parseCommand_resolveViewCommand_success() - throws InvalidCommandException, InvalidArgumentException, - InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + void parseCommand_resolveViewCommand_success() throws InvalidCommandException, InvalidArgumentException { assertTrue(linkCommandParser.parseCommand("view") instanceof ViewCommand); assertTrue(linkCommandParser.parseCommand("view 1") instanceof ViewCommand); } diff --git a/src/test/java/terminus/parser/MainCommandParserTest.java b/src/test/java/terminus/parser/MainCommandParserTest.java index 9d74a5a811..1503fd4d64 100644 --- a/src/test/java/terminus/parser/MainCommandParserTest.java +++ b/src/test/java/terminus/parser/MainCommandParserTest.java @@ -8,11 +8,8 @@ import terminus.command.ExitCommand; import terminus.command.HelpCommand; import terminus.command.NotesCommand; -import terminus.exception.InvalidLinkException; -import terminus.exception.InvalidTimeFormatException; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidDayException; public class MainCommandParserTest { @@ -31,9 +28,7 @@ void parseCommand_invalidCommand_exceptionThrown() { } @Test - void parseCommand_resolveExitCommand_success() - throws InvalidCommandException, InvalidArgumentException, - InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + void parseCommand_resolveExitCommand_success() throws InvalidCommandException, InvalidArgumentException { assertTrue(commandParser.parseCommand("exit") instanceof ExitCommand); assertTrue(commandParser.parseCommand("EXIT") instanceof ExitCommand); assertTrue(commandParser.parseCommand(" exit ") instanceof ExitCommand); @@ -41,9 +36,7 @@ void parseCommand_resolveExitCommand_success() } @Test - void parseCommand_resolveHelpCommand_success() - throws InvalidCommandException, InvalidArgumentException, - InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + void parseCommand_resolveHelpCommand_success() throws InvalidCommandException, InvalidArgumentException { assertTrue(commandParser.parseCommand("help") instanceof HelpCommand); assertTrue(commandParser.parseCommand("HELP") instanceof HelpCommand); assertTrue(commandParser.parseCommand(" help ") instanceof HelpCommand); @@ -57,9 +50,7 @@ void getCommandList_containsBasicCommands() { } @Test - void parseCommand_resolveNoteCommand_success() - throws InvalidCommandException, InvalidArgumentException, - InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + void parseCommand_resolveNoteCommand_success() throws InvalidCommandException, InvalidArgumentException { assertTrue(commandParser.parseCommand("note") instanceof NotesCommand); assertTrue(commandParser.parseCommand("NOTE") instanceof NotesCommand); assertTrue(commandParser.parseCommand(" note ") instanceof NotesCommand); diff --git a/src/test/java/terminus/parser/NoteCommandParserTest.java b/src/test/java/terminus/parser/NoteCommandParserTest.java index 97afbe1a73..4593fb6886 100644 --- a/src/test/java/terminus/parser/NoteCommandParserTest.java +++ b/src/test/java/terminus/parser/NoteCommandParserTest.java @@ -11,11 +11,8 @@ import terminus.command.HelpCommand; import terminus.command.ViewCommand; import terminus.command.note.AddNoteCommand; -import terminus.exception.InvalidLinkException; -import terminus.exception.InvalidTimeFormatException; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidDayException; import terminus.module.NusModule; import terminus.ui.Ui; @@ -44,8 +41,7 @@ void parseCommand_invalidCommand_exceptionThrown() { @Test void parseCommand_resolveExitCommand_success() - throws InvalidCommandException, InvalidArgumentException, - InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + throws InvalidCommandException, InvalidArgumentException { assertTrue(commandParser.parseCommand("exit") instanceof ExitCommand); assertTrue(commandParser.parseCommand("EXIT") instanceof ExitCommand); assertTrue(commandParser.parseCommand(" exit ") instanceof ExitCommand); @@ -54,8 +50,7 @@ void parseCommand_resolveExitCommand_success() @Test void parseCommand_resolveHelpCommand_success() - throws InvalidCommandException, InvalidArgumentException, - InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + throws InvalidCommandException, InvalidArgumentException { assertTrue(commandParser.parseCommand("help") instanceof HelpCommand); assertTrue(commandParser.parseCommand("HELP") instanceof HelpCommand); assertTrue(commandParser.parseCommand(" help ") instanceof HelpCommand); @@ -64,7 +59,7 @@ void parseCommand_resolveHelpCommand_success() @Test void parseCommand_resolveAddCommand_exceptionThrown() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException { assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("add")); assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("add \"test1\"test2\"")); assertThrows(InvalidArgumentException.class, @@ -72,17 +67,14 @@ void parseCommand_resolveAddCommand_exceptionThrown() } @Test - void parseCommand_resolveAddCommand_success() - throws InvalidCommandException, InvalidArgumentException, - InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + void parseCommand_resolveAddCommand_success() throws InvalidCommandException, InvalidArgumentException { assertTrue(commandParser.parseCommand("add \"test\" \"test1\"") instanceof AddNoteCommand); assertTrue(commandParser.parseCommand("add \" test \" \" test1 \"") instanceof AddNoteCommand); assertTrue(commandParser.parseCommand("add \"username\" \"password\"") instanceof AddNoteCommand); } @Test - void parseCommand_resolveDeleteCommand_exceptionThrown() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + void parseCommand_resolveDeleteCommand_exceptionThrown() throws InvalidCommandException, InvalidArgumentException { assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("delete")); assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("delete abcd")); assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("delete -5")); @@ -90,22 +82,19 @@ void parseCommand_resolveDeleteCommand_exceptionThrown() @Test void parseCommand_resolveDeleteCommand_success() - throws InvalidCommandException, InvalidArgumentException, - InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + throws InvalidCommandException, InvalidArgumentException { assertTrue(commandParser.parseCommand("delete 1") instanceof DeleteCommand); assertTrue(commandParser.parseCommand("delete 2") instanceof DeleteCommand); } @Test void parseCommand_resolveViewCommand_exceptionThrown() - throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + throws InvalidCommandException, InvalidArgumentException { assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("view abcd")); } @Test - void parseCommand_resolveViewCommand_success() - throws InvalidCommandException, InvalidArgumentException, - InvalidTimeFormatException, InvalidLinkException, InvalidDayException { + void parseCommand_resolveViewCommand_success() throws InvalidCommandException, InvalidArgumentException { assertTrue(commandParser.parseCommand("view") instanceof ViewCommand); assertTrue(commandParser.parseCommand("view 1") instanceof ViewCommand); } From 77011aba4293844fea0cc4876a39c06fd36e676f Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 12 Oct 2021 16:50:49 +0800 Subject: [PATCH 094/466] Add JUnit for some CommonFormat methods --- .../java/terminus/common/CommonFormat.java | 12 ++ .../terminus/common/CommonFormatTest.java | 129 ++++++++++++++++++ 2 files changed, 141 insertions(+) create mode 100644 src/test/java/terminus/common/CommonFormatTest.java diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index 2a2536dfa4..1fca2ac5e5 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -37,6 +37,9 @@ public class CommonFormat { */ public static ArrayList findArguments(String arg) { ArrayList argsArray = new ArrayList<>(); + if (arg == null) { + assert false; + } Pattern p = Pattern.compile("\"(.*?)\""); Matcher m = p.matcher(arg); while (m.find()) { @@ -52,7 +55,16 @@ public static ArrayList findArguments(String arg) { * @return True if array list is empty, false otherwise */ public static boolean isArrayEmpty(ArrayList argArray) { + if (argArray == null) { + assert false; + } + if (argArray.isEmpty()) { + return true; + } for (String s : argArray) { + if (s == null) { + assert false; + } if (s.isBlank()) { return true; } diff --git a/src/test/java/terminus/common/CommonFormatTest.java b/src/test/java/terminus/common/CommonFormatTest.java new file mode 100644 index 0000000000..899e5dbf89 --- /dev/null +++ b/src/test/java/terminus/common/CommonFormatTest.java @@ -0,0 +1,129 @@ +package terminus.common; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.ArrayList; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +public class CommonFormatTest { + + private ArrayList resultExpected; + + void reset() { + resultExpected = new ArrayList<>(); + } + + @BeforeEach + void setup() { + resultExpected = new ArrayList<>(); + } + + @Test + void findArguments_success() { + String input = "add \"test1\" \"test2\""; + resultExpected.add("test1"); + resultExpected.add("test2"); + ArrayList result = CommonFormat.findArguments(input); + assertEquals(2, result.size()); + assertEquals(resultExpected, result); + } + + @Test + void findArguments_missingDoubleQuotes() { + String input = "add \"test1\" \"test2"; + ArrayList result = CommonFormat.findArguments(input); + resultExpected.add("test1"); + assertEquals(1, result.size()); + assertEquals(resultExpected, result); + + reset(); + input = "add \"test1 test2"; + result = CommonFormat.findArguments(input); + assertEquals(0, result.size()); + assertEquals(resultExpected, result); + + reset(); + input = "add test1 test2"; + result = CommonFormat.findArguments(input); + assertEquals(0, result.size()); + assertEquals(resultExpected, result); + } + + @Test + void findArguments_extraDoubleQuotes() { + String input = "add \"test1\"\"\"test2\""; + ArrayList result = CommonFormat.findArguments(input); + resultExpected.add("test1"); + resultExpected.add(""); + assertEquals(2, result.size()); + assertEquals(resultExpected, result); + + reset(); + input = "add \"test1\" \"test2\"\""; + resultExpected.add("test1"); + resultExpected.add("test2"); + result = CommonFormat.findArguments(input); + assertEquals(2, result.size()); + assertEquals(resultExpected, result); + + reset(); + input = "add \"test1\" \"\"\"test2"; + result = CommonFormat.findArguments(input); + resultExpected.add("test1"); + resultExpected.add(""); + assertEquals(2, result.size()); + assertEquals(resultExpected, result); + } + + @Test + void findArguments_missingArgument() { + String input = ""; + ArrayList result = CommonFormat.findArguments(input); + assertEquals(0, result.size()); + assertEquals(resultExpected, result); + } + + @Test + void findArguments_nullArgument_exceptionThrown() { + String input = null; + assertThrows(AssertionError.class, () -> CommonFormat.findArguments(input)); + } + + @Test + void isArrayEmpty_success() { + resultExpected.add("test1"); + resultExpected.add("test2"); + assertFalse(CommonFormat.isArrayEmpty(resultExpected)); + } + + @Test + void isArrayEmpty_emptyElements() { + resultExpected.add("test1"); + resultExpected.add(""); + resultExpected.add("test2"); + assertTrue(CommonFormat.isArrayEmpty(resultExpected)); + + reset(); + System.out.println(resultExpected); + assertTrue(CommonFormat.isArrayEmpty(resultExpected)); + } + + @Test + void isArrayEmpty_nullElements_exceptionThrown() { + resultExpected.add("test1"); + resultExpected.add(null); + resultExpected.add("test2"); + assertThrows(AssertionError.class, () -> CommonFormat.isArrayEmpty(resultExpected)); + } + + @Test + void isArrayEmpty_nullArraylist_exceptionThrown() { + assertThrows(AssertionError.class, () -> CommonFormat.isArrayEmpty(null)); + } + +} From 3a9a4c8e6c32cf25feec35cd9dee3719417af933 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 12 Oct 2021 16:51:48 +0800 Subject: [PATCH 095/466] Fix logging message getContentManager --- src/main/java/terminus/module/NusModule.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/terminus/module/NusModule.java b/src/main/java/terminus/module/NusModule.java index e36728a8f3..95dd711522 100644 --- a/src/main/java/terminus/module/NusModule.java +++ b/src/main/java/terminus/module/NusModule.java @@ -29,6 +29,7 @@ public ContentManager getContentManager(Class type) { // Fatal error encountered TerminusLogger.severe(String.format("Class type provided not found: %s", type)); assert false; + return null; } TerminusLogger.info("ContentManager found"); return result; From fd5a777cd9075def0de8ce92e97d3e6a9ce74661 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 12 Oct 2021 17:26:36 +0800 Subject: [PATCH 096/466] Add JUnit test and assertion for all methods in CommonFormat class --- .../java/terminus/common/CommonFormat.java | 19 +++++++-- .../terminus/common/CommonFormatTest.java | 40 +++++++++++++++++++ 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index 1fca2ac5e5..2fbaa8aa28 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -1,5 +1,6 @@ package terminus.common; +import java.time.format.DateTimeParseException; import java.util.Arrays; import terminus.exception.InvalidCommandException; import terminus.exception.InvalidTimeFormatException; @@ -57,6 +58,7 @@ public static ArrayList findArguments(String arg) { public static boolean isArrayEmpty(ArrayList argArray) { if (argArray == null) { assert false; + return true; } if (argArray.isEmpty()) { return true; @@ -64,6 +66,7 @@ public static boolean isArrayEmpty(ArrayList argArray) { for (String s : argArray) { if (s == null) { assert false; + return true; } if (s.isBlank()) { return true; @@ -80,15 +83,25 @@ public static boolean isArrayEmpty(ArrayList argArray) { * @throws InvalidTimeFormatException Exception for when string does not follow the proper time format */ public static LocalTime convertToLocalTime(String startTime) throws InvalidTimeFormatException { - if (startTime.length() != 5 || startTime.indexOf(":") != 2) { + if (startTime == null) { + assert false; + return null; + } + try { + DateTimeFormatter format = DateTimeFormatter.ofPattern(LOCAL_TIME_FORMAT); + return LocalTime.parse(startTime, format); + } catch (DateTimeParseException e) { throw new InvalidTimeFormatException( String.format(Messages.ERROR_MESSAGE_INVALID_TIME_FORMAT, LOCAL_TIME_FORMAT)); } - DateTimeFormatter format = DateTimeFormatter.ofPattern(LOCAL_TIME_FORMAT); - return LocalTime.parse(startTime, format); + } public static String getClassName(T type) { + if (type == null) { + assert false; + return null; + } String result = type.toString(); String[] string = result.split("\\."); if (string.length > 0) { diff --git a/src/test/java/terminus/common/CommonFormatTest.java b/src/test/java/terminus/common/CommonFormatTest.java index 899e5dbf89..21b27fb701 100644 --- a/src/test/java/terminus/common/CommonFormatTest.java +++ b/src/test/java/terminus/common/CommonFormatTest.java @@ -6,9 +6,14 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import terminus.content.Link; +import terminus.content.Note; +import terminus.exception.InvalidTimeFormatException; public class CommonFormatTest { @@ -126,4 +131,39 @@ void isArrayEmpty_nullArraylist_exceptionThrown() { assertThrows(AssertionError.class, () -> CommonFormat.isArrayEmpty(null)); } + @Test + void getClassName_success() { + String result = CommonFormat.getClassName(Note.class); + assertEquals("Note", result); + result = CommonFormat.getClassName(Link.class); + assertEquals("Link", result); + } + + @Test + void getClassName_invalidInput() { + String result = CommonFormat.getClassName("test1"); + assertEquals("test1", result); + result = CommonFormat.getClassName("test1.2"); + assertEquals("2", result); + } + + @Test + void getClassName_nullInput_exceptionThrown() { + assertThrows(AssertionError.class, () -> CommonFormat.getClassName(null)); + } + + @Test + void convertToLocalTime_success() throws InvalidTimeFormatException { + String input = "11:56"; + assertTrue(CommonFormat.convertToLocalTime(input) instanceof LocalTime); + } + + @Test + void convertToLocalTime_invalidInput_exceptionThrown() { + assertThrows(InvalidTimeFormatException.class, () -> CommonFormat.convertToLocalTime("test")); + assertThrows(InvalidTimeFormatException.class, () -> CommonFormat.convertToLocalTime("25:10")); + assertThrows(InvalidTimeFormatException.class, () -> CommonFormat.convertToLocalTime("11-10")); + assertThrows(AssertionError.class, () -> CommonFormat.convertToLocalTime(null)); + } + } From 46fd1ec75aa1e2bcad10c573ce9413e60edb07fb Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Tue, 12 Oct 2021 17:27:07 +0800 Subject: [PATCH 097/466] Throw exception in catch block --- src/main/java/terminus/common/CommonFormat.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index 255eb6c33a..99b436b618 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -83,12 +83,13 @@ public static String getClassName(T type) { return result; } - public static boolean isValidUrl(String url) { + public static boolean isValidUrl(String url) throws InvalidArgumentException { try { new URL(url).toURI(); return true; } catch (Exception e) { - return false; + throw new InvalidArgumentException( + String.format(Messages.ERROR_MESSAGE_INVALID_LINK, url)); } } From 67f348435b674fcb6c7a639dc516b985ae9b1f04 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 12 Oct 2021 17:28:19 +0800 Subject: [PATCH 098/466] Update CommonFormatTest convertToLocalTime method success to test 24hr format time --- src/test/java/terminus/common/CommonFormatTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/terminus/common/CommonFormatTest.java b/src/test/java/terminus/common/CommonFormatTest.java index 21b27fb701..56f3f1f05d 100644 --- a/src/test/java/terminus/common/CommonFormatTest.java +++ b/src/test/java/terminus/common/CommonFormatTest.java @@ -154,8 +154,8 @@ void getClassName_nullInput_exceptionThrown() { @Test void convertToLocalTime_success() throws InvalidTimeFormatException { - String input = "11:56"; - assertTrue(CommonFormat.convertToLocalTime(input) instanceof LocalTime); + assertTrue(CommonFormat.convertToLocalTime("11:56") instanceof LocalTime); + assertTrue(CommonFormat.convertToLocalTime("22:56") instanceof LocalTime); } @Test From 9648c9323fc3bd0d4d8bb62dd920b274df571097 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 12 Oct 2021 17:36:18 +0800 Subject: [PATCH 099/466] Fix assertion in CommonFormat class --- .../java/terminus/common/CommonFormat.java | 25 ++++--------------- .../terminus/common/CommonFormatTest.java | 2 +- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index 2fbaa8aa28..cdffad623e 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -37,10 +37,8 @@ public class CommonFormat { * @return An array list containing the separated arguments */ public static ArrayList findArguments(String arg) { + assert arg != null; ArrayList argsArray = new ArrayList<>(); - if (arg == null) { - assert false; - } Pattern p = Pattern.compile("\"(.*?)\""); Matcher m = p.matcher(arg); while (m.find()) { @@ -56,19 +54,12 @@ public static ArrayList findArguments(String arg) { * @return True if array list is empty, false otherwise */ public static boolean isArrayEmpty(ArrayList argArray) { - if (argArray == null) { - assert false; - return true; - } + assert argArray != null; if (argArray.isEmpty()) { return true; } for (String s : argArray) { - if (s == null) { - assert false; - return true; - } - if (s.isBlank()) { + if (s == null || s.isBlank()) { return true; } } @@ -83,10 +74,7 @@ public static boolean isArrayEmpty(ArrayList argArray) { * @throws InvalidTimeFormatException Exception for when string does not follow the proper time format */ public static LocalTime convertToLocalTime(String startTime) throws InvalidTimeFormatException { - if (startTime == null) { - assert false; - return null; - } + assert startTime != null; try { DateTimeFormatter format = DateTimeFormatter.ofPattern(LOCAL_TIME_FORMAT); return LocalTime.parse(startTime, format); @@ -98,10 +86,7 @@ public static LocalTime convertToLocalTime(String startTime) throws InvalidTimeF } public static String getClassName(T type) { - if (type == null) { - assert false; - return null; - } + assert type != null; String result = type.toString(); String[] string = result.split("\\."); if (string.length > 0) { diff --git a/src/test/java/terminus/common/CommonFormatTest.java b/src/test/java/terminus/common/CommonFormatTest.java index 56f3f1f05d..c9ba14a670 100644 --- a/src/test/java/terminus/common/CommonFormatTest.java +++ b/src/test/java/terminus/common/CommonFormatTest.java @@ -123,7 +123,7 @@ void isArrayEmpty_nullElements_exceptionThrown() { resultExpected.add("test1"); resultExpected.add(null); resultExpected.add("test2"); - assertThrows(AssertionError.class, () -> CommonFormat.isArrayEmpty(resultExpected)); + assertTrue(CommonFormat.isArrayEmpty(resultExpected)); } @Test From 63002efa1216cd47766298bf2c8db346729da226 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Tue, 12 Oct 2021 17:55:12 +0800 Subject: [PATCH 100/466] Delete invalid assertion --- src/main/java/terminus/command/note/AddNoteCommand.java | 2 -- src/main/java/terminus/command/zoomlink/AddLinkCommand.java | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/main/java/terminus/command/note/AddNoteCommand.java b/src/main/java/terminus/command/note/AddNoteCommand.java index a438277663..5c0e4476c3 100644 --- a/src/main/java/terminus/command/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/note/AddNoteCommand.java @@ -43,8 +43,6 @@ public void parseArguments(String arguments) throws InvalidArgumentException { } // Regex to find arguments ArrayList argArray = CommonFormat.findArguments(arguments); - assert argArray.size() > 0; - if (!isValidNoteArguments(argArray)) { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index c17d8798be..cd00275dea 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -67,8 +67,6 @@ public void parseArguments(String arguments) throws InvalidArgumentException { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } ArrayList argArray = CommonFormat.findArguments(arguments); - assert argArray.size() > 0; - if (!isValidScheduleArguments(argArray)) { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } From dca262e5682759dc91166e7641b36ac949218e84 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 12 Oct 2021 18:19:06 +0800 Subject: [PATCH 101/466] Create ViewNoteCommandTest file --- .../command/note/ViewNoteCommandTest.java | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 src/test/java/terminus/command/note/ViewNoteCommandTest.java diff --git a/src/test/java/terminus/command/note/ViewNoteCommandTest.java b/src/test/java/terminus/command/note/ViewNoteCommandTest.java new file mode 100644 index 0000000000..a50f88571b --- /dev/null +++ b/src/test/java/terminus/command/note/ViewNoteCommandTest.java @@ -0,0 +1,57 @@ +package terminus.command.note; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.content.Note; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.exception.InvalidTimeFormatException; +import terminus.module.NusModule; +import terminus.parser.NoteCommandParser; +import terminus.ui.Ui; + +public class ViewNoteCommandTest { + private NoteCommandParser commandParser; + private NusModule nusModule; + private Ui ui; + + Class type = Note.class; + + @BeforeEach + void setUp() { + this.commandParser = NoteCommandParser.getInstance(); + this.nusModule = new NusModule(); + this.ui = new Ui(); + } + + @Test + void execute_viewAll_success() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + for (int i = 0; i < 5; i++) { + Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); + CommandResult addResult = addCommand.execute(ui, nusModule); + assertTrue(addResult.isOk()); + } + assertEquals(5, nusModule.getContentManager(type).getTotalContents()); + + Command viewCommand = commandParser.parseCommand("view"); + CommandResult result = viewCommand.execute(ui,nusModule); + + + + + } + + @Test + void execute_throwsException() + throws InvalidCommandException, InvalidArgumentException, InvalidTimeFormatException { + Command deleteCommand = commandParser.parseCommand("delete 100"); + assertThrows(InvalidArgumentException.class, () -> deleteCommand.execute(ui, nusModule)); + } +} From 00b9a4f04adefed33267100fc87ea94412c27ff8 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 12 Oct 2021 18:48:42 +0800 Subject: [PATCH 102/466] Fix InvalidTimeException checks and add checks for isValidDay and isValidUrl --- .../terminus/common/CommonFormatTest.java | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/test/java/terminus/common/CommonFormatTest.java b/src/test/java/terminus/common/CommonFormatTest.java index 63b557ae91..4bbcb2d9cf 100644 --- a/src/test/java/terminus/common/CommonFormatTest.java +++ b/src/test/java/terminus/common/CommonFormatTest.java @@ -166,4 +166,38 @@ void convertToLocalTime_invalidInput_exceptionThrown() { assertThrows(AssertionError.class, () -> CommonFormat.convertToLocalTime(null)); } + @Test + void isValidDay_success() { + assertTrue(CommonFormat.isValidDay("monday")); + assertTrue(CommonFormat.isValidDay("MoNdAy")); + assertTrue(CommonFormat.isValidDay("tuesday")); + assertTrue(CommonFormat.isValidDay("wednesday")); + assertTrue(CommonFormat.isValidDay("thursday")); + assertTrue(CommonFormat.isValidDay("friday")); + assertTrue(CommonFormat.isValidDay("saturday")); + assertTrue(CommonFormat.isValidDay("sunday")); + } + + @Test + void isValidDay_invalidInput() { + assertFalse(CommonFormat.isValidDay("mon")); + assertFalse(CommonFormat.isValidDay("test1")); + assertFalse(CommonFormat.isValidDay("wednesdey")); + assertFalse(CommonFormat.isValidDay("")); + assertFalse(CommonFormat.isValidDay(null)); + } + + @Test + void isValidUrl_success() throws InvalidArgumentException { + assertTrue(CommonFormat.isValidUrl("https://www.test.com")); + assertTrue(CommonFormat.isValidUrl("http://www.test.org")); + assertTrue(CommonFormat.isValidUrl("https://nus-sg.zoom.us/j/88433650229?pwd=NFg3WSl0UEQ5ZG05ZW1MZz09")); + } + + @Test + void isValidUrl_invalidInput_exceptionThrown() { + assertThrows(InvalidArgumentException.class, () -> CommonFormat.isValidUrl("")); + assertThrows(InvalidArgumentException.class, () -> CommonFormat.isValidUrl("..")); + } + } From 8a4c39643698ad2ff413c26417f59b8b66024153 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 12 Oct 2021 19:03:49 +0800 Subject: [PATCH 103/466] Add JUnit test for ViewNoteCommand --- .../command/note/ViewNoteCommandTest.java | 34 +++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/src/test/java/terminus/command/note/ViewNoteCommandTest.java b/src/test/java/terminus/command/note/ViewNoteCommandTest.java index 412affba7c..f454b477d7 100644 --- a/src/test/java/terminus/command/note/ViewNoteCommandTest.java +++ b/src/test/java/terminus/command/note/ViewNoteCommandTest.java @@ -16,6 +16,7 @@ import terminus.ui.Ui; public class ViewNoteCommandTest { + private NoteCommandParser commandParser; private NusModule nusModule; private Ui ui; @@ -40,12 +41,39 @@ void execute_viewAll_success() assertEquals(5, nusModule.getContentManager(type).getTotalContents()); Command viewCommand = commandParser.parseCommand("view"); - CommandResult result = viewCommand.execute(ui,nusModule); - - + CommandResult viewResult = viewCommand.execute(ui, nusModule); + assertTrue(viewResult.isOk()); + } + @Test + void execute_viewOne_success() + throws InvalidCommandException, InvalidArgumentException { + for (int i = 0; i < 5; i++) { + Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); + CommandResult addResult = addCommand.execute(ui, nusModule); + assertTrue(addResult.isOk()); + } + assertEquals(5, nusModule.getContentManager(type).getTotalContents()); + Command viewCommand = commandParser.parseCommand("view 1"); + CommandResult viewResult = viewCommand.execute(ui, nusModule); + assertTrue(viewResult.isOk()); } + @Test + void execute_viewOne_exceptionThrown() + throws InvalidCommandException, InvalidArgumentException { + for (int i = 0; i < 5; i++) { + Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); + CommandResult addResult = addCommand.execute(ui, nusModule); + assertTrue(addResult.isOk()); + } + assertEquals(5, nusModule.getContentManager(type).getTotalContents()); + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("view a")); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("view -1").execute(ui, nusModule)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("view 6").execute(ui, nusModule)); + } } From 0c353dd7cd789a2021f91c97c72a3d85e240163e Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 12 Oct 2021 19:07:21 +0800 Subject: [PATCH 104/466] Fix lamba indentation in ViewNoteCommandTest --- src/test/java/terminus/command/note/ViewNoteCommandTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/test/java/terminus/command/note/ViewNoteCommandTest.java b/src/test/java/terminus/command/note/ViewNoteCommandTest.java index f454b477d7..8cedc00c6a 100644 --- a/src/test/java/terminus/command/note/ViewNoteCommandTest.java +++ b/src/test/java/terminus/command/note/ViewNoteCommandTest.java @@ -72,8 +72,7 @@ void execute_viewOne_exceptionThrown() assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("view a")); assertThrows(InvalidArgumentException.class, - () -> commandParser.parseCommand("view -1").execute(ui, nusModule)); - assertThrows(InvalidArgumentException.class, - () -> commandParser.parseCommand("view 6").execute(ui, nusModule)); + () -> commandParser.parseCommand("view -1").execute(ui, nusModule)); + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("view 6").execute(ui, nusModule)); } } From 3194df5c0a42a76643183dae05857dc3081179b7 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Tue, 12 Oct 2021 19:07:28 +0800 Subject: [PATCH 105/466] Add JUnit test for back link command and delete link command --- .../command/link/AddLinkCommandTest.java | 6 +- .../command/link/BackLinkCommandTest.java | 38 ++++++++++++ .../command/link/DeleteLinkCommandTest.java | 61 +++++++++++++++++++ .../parser/LinkCommandParserTest.java | 6 ++ 4 files changed, 108 insertions(+), 3 deletions(-) create mode 100644 src/test/java/terminus/command/link/BackLinkCommandTest.java create mode 100644 src/test/java/terminus/command/link/DeleteLinkCommandTest.java diff --git a/src/test/java/terminus/command/link/AddLinkCommandTest.java b/src/test/java/terminus/command/link/AddLinkCommandTest.java index 2661b038e5..c87b2c8346 100644 --- a/src/test/java/terminus/command/link/AddLinkCommandTest.java +++ b/src/test/java/terminus/command/link/AddLinkCommandTest.java @@ -34,12 +34,12 @@ void setUp() { @Test void parseArguments_addLinkCommand_success() { - String addLinkInput = "add \"test\" \"Thursday\" \"00:00\" \"Test.com\""; + String addLinkInput = "add \"test\" \"Thursday\" \"00:00\" \"https://zoom.us/test\""; ArrayList parsedArguments = CommonFormat.findArguments(addLinkInput); assertEquals("test", parsedArguments.get(0)); assertEquals("Thursday", parsedArguments.get(1)); assertEquals("00:00", parsedArguments.get(2)); - assertEquals("Test.com", parsedArguments.get(3)); + assertEquals("https://zoom.us/test", parsedArguments.get(3)); } @Test @@ -55,7 +55,7 @@ void execute_addLinkCommand_success() throws InvalidCommandException, InvalidArg for (int i = 0; i < 5; i++) { addLinkCommand = linkCommandParser.parseCommand( - "add \"test\" \"Saturday\" \"00:00\" \"https://zoom.us/test" + i + "\""); + "add \"test\" \"Saturday\" \"00:00\" \"https://zoom.us/test\""); addResult = addLinkCommand.execute(ui, nusModule); assertTrue(addResult.isOk()); } diff --git a/src/test/java/terminus/command/link/BackLinkCommandTest.java b/src/test/java/terminus/command/link/BackLinkCommandTest.java new file mode 100644 index 0000000000..7cf14e9aa5 --- /dev/null +++ b/src/test/java/terminus/command/link/BackLinkCommandTest.java @@ -0,0 +1,38 @@ +package terminus.command.link; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.NusModule; +import terminus.parser.LinkCommandParser; +import terminus.parser.MainCommandParser; +import terminus.ui.Ui; + + +public class BackLinkCommandTest { + + private LinkCommandParser linkCommandParser; + private NusModule nusModule; + private Ui ui; + + @BeforeEach + void setUp() { + this.linkCommandParser = LinkCommandParser.getInstance(); + this.nusModule = new NusModule(); + this.ui = new Ui(); + } + + @Test + void execute_success() throws InvalidCommandException, InvalidArgumentException { + Command backCommand = linkCommandParser.parseCommand("back"); + CommandResult backResult = backCommand.execute(ui, nusModule); + assertTrue(backResult.isOk()); + assertTrue(backResult.getAdditionalData() instanceof MainCommandParser); + } + +} \ No newline at end of file diff --git a/src/test/java/terminus/command/link/DeleteLinkCommandTest.java b/src/test/java/terminus/command/link/DeleteLinkCommandTest.java new file mode 100644 index 0000000000..58d15b4fab --- /dev/null +++ b/src/test/java/terminus/command/link/DeleteLinkCommandTest.java @@ -0,0 +1,61 @@ +package terminus.command.link; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.content.Link; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.NusModule; +import terminus.parser.LinkCommandParser; +import terminus.ui.Ui; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class DeleteLinkCommandTest { + + private LinkCommandParser linkCommandParser; + private NusModule nusModule; + private Ui ui; + + Class type = Link.class; + + @BeforeEach + void setUp() { + this.linkCommandParser = LinkCommandParser.getInstance(); + this.nusModule = new NusModule(); + this.ui = new Ui(); + } + + @Test + void execute_success() throws InvalidCommandException, InvalidArgumentException { + for (int i = 0; i < 3; i++) { + Command addLinkCommand = linkCommandParser.parseCommand("add \"test_desc\" \"Monday\" \"12:00\" \"https://zoom.us/test\""); + CommandResult addResult = addLinkCommand.execute(ui, nusModule); + assertTrue(addResult.isOk()); + } + + assertEquals(3, nusModule.getContentManager(type).getTotalContents()); + + Command deleteLinkCommand = linkCommandParser.parseCommand("delete 1"); + CommandResult deleteResult = deleteLinkCommand.execute(ui, nusModule); + assertTrue(deleteResult.isOk()); + assertEquals(2, nusModule.getContentManager(type).getTotalContents()); + + for (int j = 0; j < 2; j++) { + deleteLinkCommand = linkCommandParser.parseCommand("delete 1"); + deleteResult = deleteLinkCommand.execute(ui, nusModule); + assertTrue(deleteResult.isOk()); + } + assertEquals(0, nusModule.getContentManager(type).getTotalContents()); + } + + @Test + void execute_throwsException() throws InvalidCommandException, InvalidArgumentException { + Command deleteLinkCommand = linkCommandParser.parseCommand("delete 20"); + assertThrows(InvalidArgumentException.class, () -> deleteLinkCommand.execute(ui, nusModule)); + } +} \ No newline at end of file diff --git a/src/test/java/terminus/parser/LinkCommandParserTest.java b/src/test/java/terminus/parser/LinkCommandParserTest.java index 76d56325b4..01bccbf929 100644 --- a/src/test/java/terminus/parser/LinkCommandParserTest.java +++ b/src/test/java/terminus/parser/LinkCommandParserTest.java @@ -60,6 +60,12 @@ void parseCommand_resolveAddCommand_InvalidArgumentExceptionThrown() () -> linkCommandParser.parseCommand("add \"test desc\"test day\"")); assertThrows(InvalidArgumentException.class, () -> linkCommandParser.parseCommand("add \"test desc\" \"test day\" \"00:00\"")); + assertThrows(InvalidArgumentException.class, + () -> linkCommandParser.parseCommand("add \"test desc\" \"today\" \"00:00\" \"https://zoom.us/test\"")); + assertThrows(InvalidArgumentException.class, + () -> linkCommandParser.parseCommand("add \"test desc\" \"monday\" \"x:30\" \"https://zoom.us/test\"")); + assertThrows(InvalidArgumentException.class, + () -> linkCommandParser.parseCommand("add \"test desc\" \"friday\" \"10:00\" \"zoom.test\"")); } @Test From eec8efe0a35c1aad1d428070e3fc1745fcb180cd Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Tue, 12 Oct 2021 20:47:18 +0800 Subject: [PATCH 106/466] Add unit testing and javadocs for ModuleStorage --- .../java/terminus/storage/ModuleStorage.java | 25 ++++++- .../terminus/storage/ModuleStorageTest.java | 75 +++++++++++++++++++ src/test/resources/malformedFile.json | 25 +++++++ src/test/resources/saveFile.json | 25 +++++++ src/test/resources/validFile.json | 25 +++++++ 5 files changed, 173 insertions(+), 2 deletions(-) create mode 100644 src/test/java/terminus/storage/ModuleStorageTest.java create mode 100644 src/test/resources/malformedFile.json create mode 100644 src/test/resources/saveFile.json create mode 100644 src/test/resources/validFile.json diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 9f10c735f1..2c6311a734 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -13,6 +13,10 @@ public class ModuleStorage { private final Path filePath; private final Gson gson; + /** + * Initialize the ModuleStorage with a specific Path to the file. + * @param filePath The Path to the file to store at. + */ public ModuleStorage(Path filePath) { this.filePath = filePath; this.gson = new GsonBuilder().setPrettyPrinting().create(); @@ -32,7 +36,14 @@ private void initializeFile() throws IOException { TerminusLogger.info(String.format("%s created.", filePath.getFileName().toString())); } } - + + /** + * Loads a JSON file and parses it as a NusModule object based on GSON. + * Returns null if the file does not exist or the file is not in a valid format. + * + * @return NusModule based on the contents of the file. + * @throws IOException When the file is inaccessible (e.g. file is locked by OS). + */ public NusModule loadFile() throws IOException { initializeFile(); if (!Files.isReadable(filePath)) { @@ -42,8 +53,18 @@ public NusModule loadFile() throws IOException { TerminusLogger.info("Decoding JSON to object"); return gson.fromJson(Files.newBufferedReader(filePath), NusModule.class); } - + + /** + * Saves NusModule instance into a JSON file based on GSON. + * Throws NullPointerException if the `module` is null. + * + * @param module The NusModule to convert to JSON file. + * @throws IOException When the file is inaccessible (e.g. file is locked by OS). + */ public void saveFile(NusModule module) throws IOException { + if (module == null) { + throw new NullPointerException("module cannot be null!"); + } initializeFile(); TerminusLogger.info("Converting NusModule object into String..."); String jsonString = gson.toJson(module); diff --git a/src/test/java/terminus/storage/ModuleStorageTest.java b/src/test/java/terminus/storage/ModuleStorageTest.java new file mode 100644 index 0000000000..b0104650b8 --- /dev/null +++ b/src/test/java/terminus/storage/ModuleStorageTest.java @@ -0,0 +1,75 @@ +package terminus.storage; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import com.google.gson.JsonSyntaxException; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.time.LocalTime; +import java.util.List; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.content.Link; +import terminus.content.Note; +import terminus.module.NusModule; + +public class ModuleStorageTest { + + private static final Path RESOURCE_FOLDER = Path.of("src", "test", "resources"); + private static final Path SAVE_FILE = RESOURCE_FOLDER.resolve("saveFile.json"); + private static final Path MALFORMED_FILE = RESOURCE_FOLDER.resolve("malformedFile.json"); + private static final Path VALID_FILE = RESOURCE_FOLDER.resolve("validFile.json"); + private NusModule nusModule; + + @BeforeEach + void setUp() { + nusModule = new NusModule(); + nusModule.getContentManager(Note.class).add(new Note("test", "test")); + nusModule.getContentManager(Link.class).add(new Link("test", "tuesday", + LocalTime.of(11, 11), "https://zoom.us/")); + } + + @Test + void loadFile_invalidJson_exceptionThrown() { + ModuleStorage moduleStorage = new ModuleStorage(MALFORMED_FILE); + assertThrows(JsonSyntaxException.class, moduleStorage::loadFile); + } + + @Test + void loadFile_success() throws IOException { + ModuleStorage moduleStorage = new ModuleStorage(VALID_FILE); + NusModule module = moduleStorage.loadFile(); + assertEquals(module.getContentManager(Note.class).listAllContents(), + nusModule.getContentManager(Note.class).listAllContents()); + assertEquals(module.getContentManager(Link.class).listAllContents(), + nusModule.getContentManager(Link.class).listAllContents()); + } + + @Test + void saveFile_nullArgument_exceptionThrown() { + ModuleStorage saveModuleStorage = new ModuleStorage(SAVE_FILE); + assertThrows(NullPointerException.class, () -> saveModuleStorage.saveFile(null)); + } + + @Test + void saveFile_success() throws IOException { + ModuleStorage saveModuleStorage = new ModuleStorage(SAVE_FILE); + saveModuleStorage.saveFile(nusModule); + assertTextFilesEqual(SAVE_FILE, VALID_FILE); + } + + /** + * Asserts whether the text in the two given files are the same. Ignores any + * differences in line endings + */ + public static void assertTextFilesEqual(Path path1, Path path2) throws IOException { + List list1 = Files.readAllLines(path1); + List list2 = Files.readAllLines(path2); + assertEquals(String.join("\n", list1), String.join("\n", list2)); + } +} diff --git a/src/test/resources/malformedFile.json b/src/test/resources/malformedFile.json new file mode 100644 index 0000000000..827cface1c --- /dev/null +++ b/src/test/resources/malformedFile.json @@ -0,0 +1,25 @@ +{ + "noteManager": { + "contents": [ + { + "name": "test", + "data": "test" + } + ] + } + "linkManager": { + "contents": [ + { + "day": "tuesday", + "startTime": { + "hour": 11, + "minute": 11, + "second": 0, + "nano": 0 + }, + "link": "https://zoom.us/", + "name": "test" + } + ] + } +} \ No newline at end of file diff --git a/src/test/resources/saveFile.json b/src/test/resources/saveFile.json new file mode 100644 index 0000000000..798ffd9eb4 --- /dev/null +++ b/src/test/resources/saveFile.json @@ -0,0 +1,25 @@ +{ + "noteManager": { + "contents": [ + { + "name": "test", + "data": "test" + } + ] + }, + "linkManager": { + "contents": [ + { + "day": "tuesday", + "startTime": { + "hour": 11, + "minute": 11, + "second": 0, + "nano": 0 + }, + "link": "https://zoom.us/", + "name": "test" + } + ] + } +} \ No newline at end of file diff --git a/src/test/resources/validFile.json b/src/test/resources/validFile.json new file mode 100644 index 0000000000..798ffd9eb4 --- /dev/null +++ b/src/test/resources/validFile.json @@ -0,0 +1,25 @@ +{ + "noteManager": { + "contents": [ + { + "name": "test", + "data": "test" + } + ] + }, + "linkManager": { + "contents": [ + { + "day": "tuesday", + "startTime": { + "hour": 11, + "minute": 11, + "second": 0, + "nano": 0 + }, + "link": "https://zoom.us/", + "name": "test" + } + ] + } +} \ No newline at end of file From 443657ad01aa73dc554860600326337428972278 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Tue, 12 Oct 2021 21:03:53 +0800 Subject: [PATCH 107/466] Update docs based on comments. --- src/main/java/terminus/storage/ModuleStorage.java | 2 +- src/test/java/terminus/storage/ModuleStorageTest.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 2c6311a734..6a06da2101 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -14,7 +14,7 @@ public class ModuleStorage { private final Gson gson; /** - * Initialize the ModuleStorage with a specific Path to the file. + * Initializes the ModuleStorage with a specific Path to the file. * @param filePath The Path to the file to store at. */ public ModuleStorage(Path filePath) { diff --git a/src/test/java/terminus/storage/ModuleStorageTest.java b/src/test/java/terminus/storage/ModuleStorageTest.java index b0104650b8..bc5433bb30 100644 --- a/src/test/java/terminus/storage/ModuleStorageTest.java +++ b/src/test/java/terminus/storage/ModuleStorageTest.java @@ -64,8 +64,9 @@ void saveFile_success() throws IOException { } /** - * Asserts whether the text in the two given files are the same. Ignores any - * differences in line endings + * Asserts whether the text in the two given files are the same. + * Ignores any differences in line endings. + * Taken from: https://github.com/se-edu/addressbook-level2/blob/master/test/java/seedu/addressbook/util/TestUtil.java#L128 */ public static void assertTextFilesEqual(Path path1, Path path2) throws IOException { List list1 = Files.readAllLines(path1); From 94a7e96834827bde0a9a8d4c3f530378fa8bd772 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Tue, 12 Oct 2021 21:05:49 +0800 Subject: [PATCH 108/466] Add Help Notes and Schedule command JUnit test --- .../terminus/command/HelpCommandTest.java | 41 ++++++++++++++ .../terminus/command/NotesCommandTest.java | 56 +++++++++++++++++++ .../terminus/command/ScheduleCommandTest.java | 55 ++++++++++++++++++ 3 files changed, 152 insertions(+) create mode 100644 src/test/java/terminus/command/HelpCommandTest.java create mode 100644 src/test/java/terminus/command/NotesCommandTest.java create mode 100644 src/test/java/terminus/command/ScheduleCommandTest.java diff --git a/src/test/java/terminus/command/HelpCommandTest.java b/src/test/java/terminus/command/HelpCommandTest.java new file mode 100644 index 0000000000..499c8d2977 --- /dev/null +++ b/src/test/java/terminus/command/HelpCommandTest.java @@ -0,0 +1,41 @@ +package terminus.command; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.NusModule; +import terminus.parser.LinkCommandParser; +import terminus.parser.MainCommandParser; +import terminus.parser.NoteCommandParser; +import terminus.ui.Ui; + +public class HelpCommandTest { + + private MainCommandParser mainCommandParser; + private NoteCommandParser noteCommandParser; + private LinkCommandParser linkCommandParser; + private Ui ui; + private NusModule nusModule; + + @BeforeEach + void setUp() { + mainCommandParser = MainCommandParser.getInstance(); + noteCommandParser = NoteCommandParser.getInstance(); + linkCommandParser = LinkCommandParser.getInstance(); + ui = new Ui(); + nusModule = new NusModule(); + } + + @Test + void execute_helpCommand_success() throws InvalidArgumentException, InvalidCommandException { + CommandResult result = mainCommandParser.parseCommand("help").execute(ui, nusModule); + assertTrue(result.isOk()); + result = noteCommandParser.parseCommand("help").execute(ui, nusModule); + assertTrue(result.isOk()); + result = linkCommandParser.parseCommand("help").execute(ui, nusModule); + assertTrue(result.isOk()); + } +} diff --git a/src/test/java/terminus/command/NotesCommandTest.java b/src/test/java/terminus/command/NotesCommandTest.java new file mode 100644 index 0000000000..34ded6f742 --- /dev/null +++ b/src/test/java/terminus/command/NotesCommandTest.java @@ -0,0 +1,56 @@ +package terminus.command; + +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.content.Link; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.NusModule; +import terminus.parser.LinkCommandParser; +import terminus.parser.MainCommandParser; +import terminus.ui.Ui; + +public class NotesCommandTest { + + private MainCommandParser commandParser; + private Ui ui; + private NusModule nusModule; + + @BeforeEach + void setUp() { + commandParser = MainCommandParser.getInstance(); + ui = new Ui(); + nusModule = new NusModule(); + } + + @Test + void execute_linkAdvance_success() throws InvalidArgumentException, InvalidCommandException { + Command mainCommand = commandParser.parseCommand("schedule"); + CommandResult changeResult = mainCommand.execute(ui, nusModule); + assertTrue(changeResult.isOk()); + assertTrue(changeResult.getAdditionalData() instanceof LinkCommandParser); + mainCommand = commandParser.parseCommand("schedule add \"test\" \"Thursday\" \"00:00\" \"https://zoom.us\""); + changeResult = mainCommand.execute(ui, nusModule); + assertTrue(changeResult.isOk()); + assertEquals(1, nusModule.getContentManager(Link.class).getTotalContents()); + mainCommand = commandParser.parseCommand("schedule view"); + changeResult = mainCommand.execute(ui, nusModule); + assertTrue(changeResult.isOk()); + } + + @Test + void execute_linkAdvance_throwsException() throws InvalidArgumentException, InvalidCommandException { + assertThrows(InvalidCommandException.class, + () -> commandParser.parseCommand("schedule -1").execute(ui, nusModule)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("schedule add \"test\" \"Thursday\" \"00:00\" \"test.com\"") + .execute(ui, nusModule)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("schedule delete -1").execute(ui, nusModule)); + + } +} diff --git a/src/test/java/terminus/command/ScheduleCommandTest.java b/src/test/java/terminus/command/ScheduleCommandTest.java new file mode 100644 index 0000000000..cb54ed9ae4 --- /dev/null +++ b/src/test/java/terminus/command/ScheduleCommandTest.java @@ -0,0 +1,55 @@ +package terminus.command; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.content.Note; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.NusModule; +import terminus.parser.MainCommandParser; +import terminus.parser.NoteCommandParser; +import terminus.ui.Ui; + +public class ScheduleCommandTest { + + private MainCommandParser commandParser; + private Ui ui; + private NusModule nusModule; + + @BeforeEach + void setUp() { + commandParser = MainCommandParser.getInstance(); + ui = new Ui(); + nusModule = new NusModule(); + } + + @Test + void execute_scheduleAdvance_success() throws InvalidArgumentException, InvalidCommandException { + Command mainCommand = commandParser.parseCommand("note"); + CommandResult changeResult = mainCommand.execute(ui, nusModule); + assertTrue(changeResult.isOk()); + assertTrue(changeResult.getAdditionalData() instanceof NoteCommandParser); + mainCommand = commandParser.parseCommand("note add \"username\" \"password\""); + changeResult = mainCommand.execute(ui, nusModule); + assertTrue(changeResult.isOk()); + assertEquals(1, nusModule.getContentManager(Note.class).getTotalContents()); + mainCommand = commandParser.parseCommand("note view"); + changeResult = mainCommand.execute(ui, nusModule); + assertTrue(changeResult.isOk()); + } + + @Test + void execute_scheduleAdvance_throwsException() throws InvalidArgumentException, InvalidCommandException { + assertThrows(InvalidCommandException.class, + () -> commandParser.parseCommand("schedule -1").execute(ui, nusModule)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("schedule view 100").execute(ui, nusModule)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("note delete -1").execute(ui, nusModule)); + + } +} From 68eb7d4f494338205aa5809342cdf0a60451664d Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Tue, 12 Oct 2021 21:08:31 +0800 Subject: [PATCH 109/466] Add JUnit test for view link command --- .../command/link/DeleteLinkCommandTest.java | 2 +- .../command/link/ViewLinkCommandTest.java | 81 +++++++++++++++++++ 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 src/test/java/terminus/command/link/ViewLinkCommandTest.java diff --git a/src/test/java/terminus/command/link/DeleteLinkCommandTest.java b/src/test/java/terminus/command/link/DeleteLinkCommandTest.java index 58d15b4fab..685f5baf58 100644 --- a/src/test/java/terminus/command/link/DeleteLinkCommandTest.java +++ b/src/test/java/terminus/command/link/DeleteLinkCommandTest.java @@ -31,7 +31,7 @@ void setUp() { } @Test - void execute_success() throws InvalidCommandException, InvalidArgumentException { + void execute_deleteLink_success() throws InvalidCommandException, InvalidArgumentException { for (int i = 0; i < 3; i++) { Command addLinkCommand = linkCommandParser.parseCommand("add \"test_desc\" \"Monday\" \"12:00\" \"https://zoom.us/test\""); CommandResult addResult = addLinkCommand.execute(ui, nusModule); diff --git a/src/test/java/terminus/command/link/ViewLinkCommandTest.java b/src/test/java/terminus/command/link/ViewLinkCommandTest.java new file mode 100644 index 0000000000..855bc34989 --- /dev/null +++ b/src/test/java/terminus/command/link/ViewLinkCommandTest.java @@ -0,0 +1,81 @@ +package terminus.command.link; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.content.Link; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.NusModule; +import terminus.parser.LinkCommandParser; +import terminus.ui.Ui; + +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +public class ViewLinkCommandTest { + + private LinkCommandParser linkCommandParser; + private NusModule nusModule; + private Ui ui; + + Class type = Link.class; + + @BeforeEach + void setUp() { + this.linkCommandParser = LinkCommandParser.getInstance(); + this.nusModule = new NusModule(); + this.ui = new Ui(); + } + + @Test + void execute_viewAll_success() throws InvalidCommandException, InvalidArgumentException { + for (int i = 0; i < 5; i++) { + Command addLinkCommand = linkCommandParser.parseCommand( + "add \"test\" \"Saturday\" \"00:00\" \"https://zoom.us/test\""); + CommandResult addLinkResult = addLinkCommand.execute(ui, nusModule); + assertTrue(addLinkResult.isOk()); + } + assertEquals(5, nusModule.getContentManager(type).getTotalContents()); + + Command viewLinkCommand = linkCommandParser.parseCommand("view"); + CommandResult viewLinkResult = viewLinkCommand.execute(ui, nusModule); + assertTrue(viewLinkResult.isOk()); + } + + @Test + void execute_viewLink_success() throws InvalidCommandException, InvalidArgumentException { + for (int i = 0; i < 5; i++) { + Command addLinkCommand = linkCommandParser.parseCommand( + "add \"test\" \"Saturday\" \"00:00\" \"https://zoom.us/test\""); + CommandResult addLinkResult = addLinkCommand.execute(ui, nusModule); + assertTrue(addLinkResult.isOk()); + } + assertEquals(5, nusModule.getContentManager(type).getTotalContents()); + + Command viewLinkCommand = linkCommandParser.parseCommand("view 1"); + CommandResult viewLinkResult = viewLinkCommand.execute(ui, nusModule); + assertTrue(viewLinkResult.isOk()); + + viewLinkCommand = linkCommandParser.parseCommand("view 5"); + viewLinkResult = viewLinkCommand.execute(ui, nusModule); + assertTrue(viewLinkResult.isOk()); + } + + @Test + void execute_viewLink_exceptionThrown() throws InvalidCommandException, InvalidArgumentException { + for (int i = 0; i < 5; i++) { + Command addLinkCommand = linkCommandParser.parseCommand( + "add \"test\" \"Saturday\" \"00:00\" \"https://zoom.us/test\""); + CommandResult addLinkResult = addLinkCommand.execute(ui, nusModule); + assertTrue(addLinkResult.isOk()); + } + assertEquals(5, nusModule.getContentManager(type).getTotalContents()); + + assertThrows(InvalidArgumentException.class, () -> linkCommandParser.parseCommand("view -1")); + assertThrows(InvalidArgumentException.class, () -> linkCommandParser.parseCommand("view X")); + assertThrows(InvalidCommandException.class, () -> linkCommandParser.parseCommand("viewwwww")); + } +} \ No newline at end of file From 81235a600a79bda37f2b2b80551bfb7841080ace Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Tue, 12 Oct 2021 21:11:35 +0800 Subject: [PATCH 110/466] Rename Tests --- src/test/java/terminus/command/link/DeleteLinkCommandTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/terminus/command/link/DeleteLinkCommandTest.java b/src/test/java/terminus/command/link/DeleteLinkCommandTest.java index 685f5baf58..575bdabe79 100644 --- a/src/test/java/terminus/command/link/DeleteLinkCommandTest.java +++ b/src/test/java/terminus/command/link/DeleteLinkCommandTest.java @@ -54,7 +54,7 @@ void execute_deleteLink_success() throws InvalidCommandException, InvalidArgumen } @Test - void execute_throwsException() throws InvalidCommandException, InvalidArgumentException { + void execute_deleteLink_throwsException() throws InvalidCommandException, InvalidArgumentException { Command deleteLinkCommand = linkCommandParser.parseCommand("delete 20"); assertThrows(InvalidArgumentException.class, () -> deleteLinkCommand.execute(ui, nusModule)); } From 7f0b3b4a9507f18d05962bd7c9721affc25b004c Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Tue, 12 Oct 2021 21:12:11 +0800 Subject: [PATCH 111/466] Add javadocs for TerminusLogger --- .../java/terminus/common/TerminusLogger.java | 56 +++++++++++++++++-- 1 file changed, 51 insertions(+), 5 deletions(-) diff --git a/src/main/java/terminus/common/TerminusLogger.java b/src/main/java/terminus/common/TerminusLogger.java index c2d89cb157..26e66b5d48 100644 --- a/src/main/java/terminus/common/TerminusLogger.java +++ b/src/main/java/terminus/common/TerminusLogger.java @@ -21,35 +21,81 @@ public static void initializeLogger() throws IOException { fileHandler.setLevel(Level.INFO); LOGGER.addHandler(fileHandler); } - + + /** + * Write a debug message to the Logger. + * Equivalent to Level.FINE. + * + * @param message The message to write to Logger. + */ public static void debug(String message) { LOGGER.fine(message); } - + + /** + * Write a verbose debug message to the Logger. + * Equivalent to Level.FINER. + * + * @param message The message to write to Logger. + */ public static void verboseDebug(String message) { LOGGER.finer(message); } - + + /** + * Write a very verbose debug message to the Logger. + * Mainly used for printing stack traces and non-important strings. + * Equivalent to Level.FINEST. + * + * @param message The message to write to Logger. + */ public static void veryVerboseDebug(String message) { LOGGER.finest(message); } + /** + * Write an information message to the Logger. + * + * @param message The message to write to Logger. + */ public static void info(String message) { LOGGER.info(message); } + /** + * Write a warning message to the Logger. + * + * @param message The message to write to Logger. + */ public static void warning(String message) { LOGGER.warning(message); } - + + /** + * Write a warning message with a Throwable to the Logger. + * + * @param message The message to write to Logger. + * @param throwable The Throwable to tag to the log message. + */ public static void warning(String message, Throwable throwable) { LOGGER.log(Level.WARNING, message, throwable); } + /** + * Write a severe message to the Logger. + * + * @param message The message to write to Logger. + */ public static void severe(String message) { LOGGER.severe(message); } - + + /** + * Write a warning message with a Throwable to the Logger. + * + * @param message The message to write to Logger. + * @param throwable The Throwable to tag to the log message. + */ public static void severe(String message, Throwable throwable) { LOGGER.log(Level.SEVERE, message, throwable); } From a7d8e98e12a33a78b6c59fe1248e328aa013de28 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Tue, 12 Oct 2021 21:17:35 +0800 Subject: [PATCH 112/466] Update verb of javadoc of TerminusLogger --- .../java/terminus/common/TerminusLogger.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/java/terminus/common/TerminusLogger.java b/src/main/java/terminus/common/TerminusLogger.java index 26e66b5d48..7c77c4c39d 100644 --- a/src/main/java/terminus/common/TerminusLogger.java +++ b/src/main/java/terminus/common/TerminusLogger.java @@ -10,7 +10,12 @@ public class TerminusLogger { private static final Logger LOGGER = Logger.getLogger("TermiNUS"); - + + /** + * Initializes TerminusLogger. + * + * @throws IOException When 'terminus.log' is unable to be written to. + */ public static void initializeLogger() throws IOException { LogManager.getLogManager().reset(); ConsoleHandler consoleHandler = new ConsoleHandler(); @@ -23,7 +28,7 @@ public static void initializeLogger() throws IOException { } /** - * Write a debug message to the Logger. + * Writes a debug message to the Logger. * Equivalent to Level.FINE. * * @param message The message to write to Logger. @@ -33,7 +38,7 @@ public static void debug(String message) { } /** - * Write a verbose debug message to the Logger. + * Writes a verbose debug message to the Logger. * Equivalent to Level.FINER. * * @param message The message to write to Logger. @@ -43,7 +48,7 @@ public static void verboseDebug(String message) { } /** - * Write a very verbose debug message to the Logger. + * Writes a very verbose debug message to the Logger. * Mainly used for printing stack traces and non-important strings. * Equivalent to Level.FINEST. * @@ -54,7 +59,7 @@ public static void veryVerboseDebug(String message) { } /** - * Write an information message to the Logger. + * Writes an information message to the Logger. * * @param message The message to write to Logger. */ @@ -63,7 +68,7 @@ public static void info(String message) { } /** - * Write a warning message to the Logger. + * Writes a warning message to the Logger. * * @param message The message to write to Logger. */ @@ -72,7 +77,7 @@ public static void warning(String message) { } /** - * Write a warning message with a Throwable to the Logger. + * Writes a warning message with a Throwable to the Logger. * * @param message The message to write to Logger. * @param throwable The Throwable to tag to the log message. @@ -82,7 +87,7 @@ public static void warning(String message, Throwable throwable) { } /** - * Write a severe message to the Logger. + * Writes a severe message to the Logger. * * @param message The message to write to Logger. */ @@ -91,7 +96,7 @@ public static void severe(String message) { } /** - * Write a warning message with a Throwable to the Logger. + * Writes a warning message with a Throwable to the Logger. * * @param message The message to write to Logger. * @param throwable The Throwable to tag to the log message. From 19e359328d3418b8af484ad2fe00d1717d0fde19 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 12 Oct 2021 21:18:35 +0800 Subject: [PATCH 113/466] Add comments to AddNoteCommand, DeleteCommand and ViewCommand --- .../java/terminus/command/DeleteCommand.java | 30 ++++++++++++++++-- .../java/terminus/command/ViewCommand.java | 31 +++++++++++++++++++ .../terminus/command/note/AddNoteCommand.java | 10 ++---- .../command/zoomlink/AddLinkCommand.java | 21 +++++-------- 4 files changed, 70 insertions(+), 22 deletions(-) diff --git a/src/main/java/terminus/command/DeleteCommand.java b/src/main/java/terminus/command/DeleteCommand.java index 0846143d60..5fa76d1c66 100644 --- a/src/main/java/terminus/command/DeleteCommand.java +++ b/src/main/java/terminus/command/DeleteCommand.java @@ -1,6 +1,5 @@ package terminus.command; -import java.util.Locale; import terminus.common.CommonFormat; import terminus.common.Messages; import terminus.common.TerminusLogger; @@ -10,11 +9,21 @@ import terminus.module.NusModule; import terminus.ui.Ui; +/** + * DeleteCommand generic class which will manage the deletion of Content specified by user command. + * + * @param Content object type. + */ public class DeleteCommand extends Command { private Class type; private int itemNumber; + /** + * Creates a DeleteCommand object with referenced to the provided class type. + * + * @param type Content object type. + */ public DeleteCommand(Class type) { this.type = type; } @@ -29,6 +38,13 @@ public String getHelpMessage() { return Messages.MESSAGE_COMMAND_DELETE; } + /** + * Parses the arguments to the DeleteCommand object. + * The arguments are attributes to identify a Content object in an ArrayList. + * + * @param arguments The string arguments to be parsed in to the respective fields. + * @throws InvalidArgumentException when argument provided is empty, non-numeric or less than 1. + */ @Override public void parseArguments(String arguments) throws InvalidArgumentException { if (arguments == null || arguments.isBlank()) { @@ -47,6 +63,15 @@ public void parseArguments(String arguments) throws InvalidArgumentException { } } + /** + * Executes the delete command. + * Prints the relevant response to the Ui and the specified Content object will be removed from the arraylist. + * + * @param ui The Ui object to send messages to the users. + * @param module The NusModule contain the ContentManager of all notes and schedules. + * @return CommandResult to indicate the success and additional information about the execution. + * @throws InvalidArgumentException when argument provided is index out of bounds of the ArrayList. + */ @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidArgumentException { ContentManager contentManager = module.getContentManager(type); @@ -54,7 +79,8 @@ public CommandResult execute(Ui ui, NusModule module) throws InvalidArgumentExce TerminusLogger.info("Executing Delete Command"); String deletedContentName = contentManager.deleteContent(itemNumber); assert deletedContentName != null && !deletedContentName.isBlank(); - + TerminusLogger.info( + String.format("%s(%s) has been deleted", CommonFormat.getClassName(type), deletedContentName)); ui.printSection(String.format(Messages.MESSAGE_RESPONSE_DELETE, CommonFormat.getClassName(type).toLowerCase(), deletedContentName)); return new CommandResult(true); diff --git a/src/main/java/terminus/command/ViewCommand.java b/src/main/java/terminus/command/ViewCommand.java index 7bfc0d321a..f6e97a590c 100644 --- a/src/main/java/terminus/command/ViewCommand.java +++ b/src/main/java/terminus/command/ViewCommand.java @@ -9,13 +9,27 @@ import terminus.module.NusModule; import terminus.ui.Ui; +/** + * ViewCommand generic class which will manage the viewing of Content information specified by user command. + * + * @param Content object type. + */ public class ViewCommand extends Command { private Class type; private int itemNumber; + + /** + * Determines whether to print the list of all Content objects or just the specified one. + */ private boolean displayAll; + /** + * Creates a ViewCommand object with referenced to the provided class type. + * + * @param type Content object type. + */ public ViewCommand(Class type) { this.type = type; this.displayAll = false; @@ -31,6 +45,14 @@ public String getHelpMessage() { return Messages.MESSAGE_COMMAND_VIEW; } + /** + * Parses the arguments to the ViewCommand object. + * The arguments are attributes to identify a Content object in an ArrayList. The arguments can be empty which + * refers to viewing a list all Content object in an ArrayList instead. + * + * @param arguments The string arguments to be parsed in to the respective fields. + * @throws InvalidArgumentException when a non-empty argument provided is non-numeric or less than 1. + */ @Override public void parseArguments(String arguments) throws InvalidArgumentException { if (arguments == null || arguments.isBlank()) { @@ -51,6 +73,15 @@ public void parseArguments(String arguments) throws InvalidArgumentException { } } + /** + * Executes the view command. + * Prints the relevant response to the Ui. + * + * @param ui The Ui object to send messages to the users. + * @param module The NusModule contain the ContentManager of all notes and schedules. + * @return CommandResult to indicate the success and additional information about the execution. + * @throws InvalidArgumentException when argument provided is index out of bounds of the ArrayList. + */ @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidArgumentException { StringBuilder result = new StringBuilder(); diff --git a/src/main/java/terminus/command/note/AddNoteCommand.java b/src/main/java/terminus/command/note/AddNoteCommand.java index b2857d8d92..2ee98894c6 100644 --- a/src/main/java/terminus/command/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/note/AddNoteCommand.java @@ -22,10 +22,6 @@ public class AddNoteCommand extends Command { private static final int ADD_NOTE_ARGUMENTS = 2; - public AddNoteCommand() { - - } - @Override public String getFormat() { return CommonFormat.COMMAND_ADD_NOTE_FORMAT; @@ -37,11 +33,11 @@ public String getHelpMessage() { } /** - * Parses the arguments into an AddNoteCommand object. - * The arguments' name and data are attributes for a new Note object. + * Parses the arguments to the AddNoteCommand object. + * The arguments are attributes for a new Note object. * * @param arguments The string arguments to be parsed in to the respective fields. - * @throws InvalidArgumentException Exception for when argument parsing fails. + * @throws InvalidArgumentException when arguments are empty or missing. */ @Override public void parseArguments(String arguments) throws InvalidArgumentException { diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index e8a1f9a6c6..51f39d86d4 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -16,6 +16,7 @@ import java.time.LocalTime; import java.util.ArrayList; + import static terminus.common.CommonFormat.isValidDay; import static terminus.common.CommonFormat.isValidUrl; @@ -31,10 +32,6 @@ public class AddLinkCommand extends Command { private static final int ADD_SCHEDULE_ARGUMENTS = 4; - public AddLinkCommand() { - - } - @Override public String getFormat() { return CommonFormat.COMMAND_ADD_SCHEDULE_FORMAT; @@ -46,19 +43,19 @@ public String getHelpMessage() { } /** - * Parses the arguments in an AddLinkCommand object. - * The arguments' description, day, start-time, and link are attributes for a new Link object. + * Parses the arguments to the AddLinkCommand object. + * The arguments are attributes for a new Link object. * * @param arguments The string arguments to be parsed in to the respective fields. - * @throws InvalidArgumentException Exception for when argument parsing fails - * @throws InvalidArgumentException Exception for when any argument is invalid + * @throws InvalidArgumentException when arguments are empty or missing. */ @Override public void parseArguments(String arguments) throws InvalidArgumentException { - // Perform required checks with regex + if (arguments == null || arguments.isBlank()) { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } + // Regex to find arguments ArrayList argArray = CommonFormat.findArguments(arguments); if (!isValidScheduleArguments(argArray)) { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); @@ -90,11 +87,9 @@ public void parseArguments(String arguments) throws InvalidArgumentException { * @param ui The Ui object to send messages to the users. * @param module The NusModule contain the list of all notes and schedules. * @return CommandResult to indicate the success and additional information about the execution. - * @throws InvalidCommandException Exception for when the user command is not found - * @throws InvalidArgumentException Exception for when the argument parsing fails */ @Override - public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException, InvalidArgumentException { + public CommandResult execute(Ui ui, NusModule module) { ContentManager contentManager = module.getContentManager(Link.class); assert contentManager != null; @@ -106,7 +101,7 @@ public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandExcep /** * Checks if arguments are non-empty and valid. * - * @param argArray The command arguments in an array list + * @param argArray The command arguments in an array list. * @return True if the appropriate number of arguments are present, false otherwise. */ private boolean isValidScheduleArguments(ArrayList argArray) { From d0b9453813e5f271a279fe77d6d76d0a39af0467 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Tue, 12 Oct 2021 21:41:05 +0800 Subject: [PATCH 114/466] Remove unuse imports and format code --- src/main/java/terminus/Terminus.java | 2 +- src/main/java/terminus/command/Command.java | 2 +- .../java/terminus/command/DeleteCommand.java | 3 +-- .../java/terminus/command/HelpCommand.java | 2 +- .../java/terminus/command/NotesCommand.java | 1 - .../java/terminus/command/TestCommand.java | 24 ------------------- .../java/terminus/command/ViewCommand.java | 2 +- .../terminus/command/note/AddNoteCommand.java | 2 +- .../command/zoomlink/AddLinkCommand.java | 16 ++++++------- .../java/terminus/common/CommonFormat.java | 4 ++-- src/main/java/terminus/common/Messages.java | 2 +- .../java/terminus/content/ContentManager.java | 1 - src/main/java/terminus/module/NusModule.java | 4 ++-- .../java/terminus/parser/CommandParser.java | 2 +- .../terminus/parser/LinkCommandParser.java | 4 ++-- .../terminus/parser/NoteCommandParser.java | 2 +- .../terminus/command/ExitCommandTest.java | 2 +- .../terminus/command/NotesCommandTest.java | 2 +- .../command/link/AddLinkCommandTest.java | 11 ++++----- .../command/link/DeleteLinkCommandTest.java | 8 +++---- .../command/link/ViewLinkCommandTest.java | 8 +++---- .../command/note/AddNoteCommandTest.java | 2 +- .../command/note/BackNoteCommandTest.java | 2 +- .../command/note/DeleteNoteCommandTest.java | 2 +- .../terminus/common/CommonFormatTest.java | 2 -- .../java/terminus/module/NusModuleTest.java | 4 ---- .../parser/LinkCommandParserTest.java | 10 ++++---- .../parser/MainCommandParserTest.java | 2 +- .../parser/NoteCommandParserTest.java | 2 +- .../terminus/storage/ModuleStorageTest.java | 3 --- 30 files changed, 48 insertions(+), 85 deletions(-) delete mode 100644 src/main/java/terminus/command/TestCommand.java diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 9e8b6b860f..1b995d3600 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -5,8 +5,8 @@ import terminus.command.Command; import terminus.command.CommandResult; import terminus.common.TerminusLogger; -import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; import terminus.module.NusModule; import terminus.parser.CommandParser; import terminus.parser.MainCommandParser; diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java index 129020a026..089b5f0082 100644 --- a/src/main/java/terminus/command/Command.java +++ b/src/main/java/terminus/command/Command.java @@ -1,7 +1,7 @@ package terminus.command; -import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; import terminus.module.NusModule; import terminus.ui.Ui; diff --git a/src/main/java/terminus/command/DeleteCommand.java b/src/main/java/terminus/command/DeleteCommand.java index 0846143d60..6be5a55886 100644 --- a/src/main/java/terminus/command/DeleteCommand.java +++ b/src/main/java/terminus/command/DeleteCommand.java @@ -1,6 +1,5 @@ package terminus.command; -import java.util.Locale; import terminus.common.CommonFormat; import terminus.common.Messages; import terminus.common.TerminusLogger; @@ -12,7 +11,7 @@ public class DeleteCommand extends Command { - private Class type; + private final Class type; private int itemNumber; public DeleteCommand(Class type) { diff --git a/src/main/java/terminus/command/HelpCommand.java b/src/main/java/terminus/command/HelpCommand.java index 21db8e67d3..2e6b6335f8 100644 --- a/src/main/java/terminus/command/HelpCommand.java +++ b/src/main/java/terminus/command/HelpCommand.java @@ -11,7 +11,7 @@ public class HelpCommand extends Command { public static final String HELP_MENU_MESSAGE = "\nHelp Menu\n---------"; - private CommandParser commandMap; + private final CommandParser commandMap; public HelpCommand(CommandParser commandMap) { this.commandMap = commandMap; diff --git a/src/main/java/terminus/command/NotesCommand.java b/src/main/java/terminus/command/NotesCommand.java index 5aee82c5b7..09fc39fc9a 100644 --- a/src/main/java/terminus/command/NotesCommand.java +++ b/src/main/java/terminus/command/NotesCommand.java @@ -2,7 +2,6 @@ import terminus.common.CommonFormat; import terminus.common.Messages; -import terminus.module.NusModule; import terminus.parser.NoteCommandParser; public class NotesCommand extends WorkspaceCommand { diff --git a/src/main/java/terminus/command/TestCommand.java b/src/main/java/terminus/command/TestCommand.java deleted file mode 100644 index fe34a2fe30..0000000000 --- a/src/main/java/terminus/command/TestCommand.java +++ /dev/null @@ -1,24 +0,0 @@ -package terminus.command; - -import terminus.module.NusModule; -import terminus.ui.Ui; - -@Deprecated -public class TestCommand extends Command { - - @Override - public String getFormat() { - return "test"; - } - - @Override - public String getHelpMessage() { - return "This is testing command."; - } - - @Override - public CommandResult execute(Ui ui, NusModule module) { - ui.printSection(arguments); - return new CommandResult(true,false); - } -} diff --git a/src/main/java/terminus/command/ViewCommand.java b/src/main/java/terminus/command/ViewCommand.java index 7bfc0d321a..0cdcf167ac 100644 --- a/src/main/java/terminus/command/ViewCommand.java +++ b/src/main/java/terminus/command/ViewCommand.java @@ -11,7 +11,7 @@ public class ViewCommand extends Command { - private Class type; + private final Class type; private int itemNumber; private boolean displayAll; diff --git a/src/main/java/terminus/command/note/AddNoteCommand.java b/src/main/java/terminus/command/note/AddNoteCommand.java index 5c0e4476c3..1e1f1980a1 100644 --- a/src/main/java/terminus/command/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/note/AddNoteCommand.java @@ -5,13 +5,13 @@ import terminus.command.CommandResult; import terminus.common.CommonFormat; import terminus.common.Messages; +import terminus.common.TerminusLogger; import terminus.content.ContentManager; import terminus.content.Note; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.NusModule; import terminus.ui.Ui; -import terminus.common.TerminusLogger; public class AddNoteCommand extends Command { diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index cd00275dea..165cc06eb9 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -1,22 +1,22 @@ package terminus.command.zoomlink; +import static terminus.common.CommonFormat.isValidDay; +import static terminus.common.CommonFormat.isValidUrl; + +import java.time.LocalTime; +import java.util.ArrayList; import terminus.command.Command; import terminus.command.CommandResult; +import terminus.common.CommonFormat; +import terminus.common.Messages; import terminus.common.TerminusLogger; import terminus.content.ContentManager; import terminus.content.Link; -import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; import terminus.module.NusModule; -import terminus.common.CommonFormat; -import terminus.common.Messages; import terminus.ui.Ui; -import java.time.LocalTime; -import java.util.ArrayList; -import static terminus.common.CommonFormat.isValidDay; -import static terminus.common.CommonFormat.isValidUrl; - /** * AddLinkCommand class which will manage the adding of new Links from user command. */ diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index a223b7bf08..510d5029c0 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -1,14 +1,14 @@ package terminus.common; -import java.time.format.DateTimeParseException; import java.net.URL; -import terminus.exception.InvalidArgumentException; import java.time.LocalTime; import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; import java.util.ArrayList; import java.util.regex.Matcher; import java.util.regex.Pattern; +import terminus.exception.InvalidArgumentException; public class CommonFormat { diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index 76a757eb21..809052173b 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -11,7 +11,7 @@ public class Messages { public static final String MESSAGE_COMMAND_NOTE = "Move to notes workspace."; public static final String MESSAGE_COMMAND_SCHEDULE = "Move to schedules workspace."; - public static final String MESSAGE_RESPONSE_DELETE = "Your %s on \'%s\' has been deleted!"; + public static final String MESSAGE_RESPONSE_DELETE = "Your %s on '%s' has been deleted!"; public static final String MESSAGE_RESPONSE_ADD = "Your %s on '%s' has been added!"; public static final String ERROR_MESSAGE_TAG = "Error: "; diff --git a/src/main/java/terminus/content/ContentManager.java b/src/main/java/terminus/content/ContentManager.java index 408690c038..8d18cf4bf4 100644 --- a/src/main/java/terminus/content/ContentManager.java +++ b/src/main/java/terminus/content/ContentManager.java @@ -3,7 +3,6 @@ import java.util.ArrayList; import terminus.common.Messages; import terminus.exception.InvalidArgumentException; -import terminus.common.TerminusLogger; public class ContentManager { diff --git a/src/main/java/terminus/module/NusModule.java b/src/main/java/terminus/module/NusModule.java index 95dd711522..9885da321f 100644 --- a/src/main/java/terminus/module/NusModule.java +++ b/src/main/java/terminus/module/NusModule.java @@ -9,8 +9,8 @@ public class NusModule { - private ContentManager noteManager; - private ContentManager linkManager; + private final ContentManager noteManager; + private final ContentManager linkManager; public NusModule() { noteManager = new ContentManager<>(); diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java index 486e8ebfac..150e565891 100644 --- a/src/main/java/terminus/parser/CommandParser.java +++ b/src/main/java/terminus/parser/CommandParser.java @@ -3,8 +3,8 @@ import java.util.HashMap; import java.util.Locale; import java.util.Set; -import terminus.command.ExitCommand; import terminus.command.Command; +import terminus.command.ExitCommand; import terminus.command.HelpCommand; import terminus.common.TerminusLogger; import terminus.exception.InvalidArgumentException; diff --git a/src/main/java/terminus/parser/LinkCommandParser.java b/src/main/java/terminus/parser/LinkCommandParser.java index d97b8704b8..45a03097d7 100644 --- a/src/main/java/terminus/parser/LinkCommandParser.java +++ b/src/main/java/terminus/parser/LinkCommandParser.java @@ -1,9 +1,9 @@ package terminus.parser; import terminus.command.BackCommand; -import terminus.command.zoomlink.AddLinkCommand; -import terminus.command.ViewCommand; import terminus.command.DeleteCommand; +import terminus.command.ViewCommand; +import terminus.command.zoomlink.AddLinkCommand; import terminus.common.CommonFormat; import terminus.common.Messages; import terminus.content.Link; diff --git a/src/main/java/terminus/parser/NoteCommandParser.java b/src/main/java/terminus/parser/NoteCommandParser.java index 75e8295121..4c6d4440ed 100644 --- a/src/main/java/terminus/parser/NoteCommandParser.java +++ b/src/main/java/terminus/parser/NoteCommandParser.java @@ -1,9 +1,9 @@ package terminus.parser; +import terminus.command.BackCommand; import terminus.command.DeleteCommand; import terminus.command.ViewCommand; import terminus.command.note.AddNoteCommand; -import terminus.command.BackCommand; import terminus.common.CommonFormat; import terminus.common.Messages; import terminus.content.Note; diff --git a/src/test/java/terminus/command/ExitCommandTest.java b/src/test/java/terminus/command/ExitCommandTest.java index 792f76ae79..90066d13df 100644 --- a/src/test/java/terminus/command/ExitCommandTest.java +++ b/src/test/java/terminus/command/ExitCommandTest.java @@ -5,8 +5,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.common.CommonFormat; -import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; import terminus.module.NusModule; import terminus.parser.MainCommandParser; import terminus.ui.Ui; diff --git a/src/test/java/terminus/command/NotesCommandTest.java b/src/test/java/terminus/command/NotesCommandTest.java index 34ded6f742..9c011e6757 100644 --- a/src/test/java/terminus/command/NotesCommandTest.java +++ b/src/test/java/terminus/command/NotesCommandTest.java @@ -1,8 +1,8 @@ package terminus.command; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/terminus/command/link/AddLinkCommandTest.java b/src/test/java/terminus/command/link/AddLinkCommandTest.java index c87b2c8346..ec615b8152 100644 --- a/src/test/java/terminus/command/link/AddLinkCommandTest.java +++ b/src/test/java/terminus/command/link/AddLinkCommandTest.java @@ -1,22 +1,21 @@ package terminus.command.link; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.ArrayList; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.command.Command; import terminus.command.CommandResult; import terminus.common.CommonFormat; import terminus.content.Link; -import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; import terminus.module.NusModule; import terminus.parser.LinkCommandParser; import terminus.ui.Ui; -import java.util.ArrayList; - -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class AddLinkCommandTest { private LinkCommandParser linkCommandParser; diff --git a/src/test/java/terminus/command/link/DeleteLinkCommandTest.java b/src/test/java/terminus/command/link/DeleteLinkCommandTest.java index 575bdabe79..516170407c 100644 --- a/src/test/java/terminus/command/link/DeleteLinkCommandTest.java +++ b/src/test/java/terminus/command/link/DeleteLinkCommandTest.java @@ -1,5 +1,9 @@ package terminus.command.link; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.command.Command; @@ -11,10 +15,6 @@ import terminus.parser.LinkCommandParser; import terminus.ui.Ui; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class DeleteLinkCommandTest { private LinkCommandParser linkCommandParser; diff --git a/src/test/java/terminus/command/link/ViewLinkCommandTest.java b/src/test/java/terminus/command/link/ViewLinkCommandTest.java index 855bc34989..39166fcec7 100644 --- a/src/test/java/terminus/command/link/ViewLinkCommandTest.java +++ b/src/test/java/terminus/command/link/ViewLinkCommandTest.java @@ -1,5 +1,9 @@ package terminus.command.link; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.command.Command; @@ -11,10 +15,6 @@ import terminus.parser.LinkCommandParser; import terminus.ui.Ui; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class ViewLinkCommandTest { private LinkCommandParser linkCommandParser; diff --git a/src/test/java/terminus/command/note/AddNoteCommandTest.java b/src/test/java/terminus/command/note/AddNoteCommandTest.java index dd93c3e0d2..d2e37192d0 100644 --- a/src/test/java/terminus/command/note/AddNoteCommandTest.java +++ b/src/test/java/terminus/command/note/AddNoteCommandTest.java @@ -8,8 +8,8 @@ import terminus.command.Command; import terminus.command.CommandResult; import terminus.content.Note; -import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; import terminus.module.NusModule; import terminus.parser.NoteCommandParser; import terminus.ui.Ui; diff --git a/src/test/java/terminus/command/note/BackNoteCommandTest.java b/src/test/java/terminus/command/note/BackNoteCommandTest.java index db5b7fcd18..ef71fba8c9 100644 --- a/src/test/java/terminus/command/note/BackNoteCommandTest.java +++ b/src/test/java/terminus/command/note/BackNoteCommandTest.java @@ -6,8 +6,8 @@ import org.junit.jupiter.api.Test; import terminus.command.Command; import terminus.command.CommandResult; -import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; import terminus.module.NusModule; import terminus.parser.MainCommandParser; import terminus.parser.NoteCommandParser; diff --git a/src/test/java/terminus/command/note/DeleteNoteCommandTest.java b/src/test/java/terminus/command/note/DeleteNoteCommandTest.java index fc003b700d..9d489212df 100644 --- a/src/test/java/terminus/command/note/DeleteNoteCommandTest.java +++ b/src/test/java/terminus/command/note/DeleteNoteCommandTest.java @@ -9,8 +9,8 @@ import terminus.command.Command; import terminus.command.CommandResult; import terminus.content.Note; -import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; import terminus.module.NusModule; import terminus.parser.NoteCommandParser; import terminus.ui.Ui; diff --git a/src/test/java/terminus/common/CommonFormatTest.java b/src/test/java/terminus/common/CommonFormatTest.java index 4bbcb2d9cf..7be55f5d2d 100644 --- a/src/test/java/terminus/common/CommonFormatTest.java +++ b/src/test/java/terminus/common/CommonFormatTest.java @@ -2,12 +2,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import java.time.LocalTime; -import java.time.format.DateTimeFormatter; import java.util.ArrayList; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/terminus/module/NusModuleTest.java b/src/test/java/terminus/module/NusModuleTest.java index 3ae221c221..66175e90bb 100644 --- a/src/test/java/terminus/module/NusModuleTest.java +++ b/src/test/java/terminus/module/NusModuleTest.java @@ -1,15 +1,11 @@ package terminus.module; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; import java.time.LocalTime; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import terminus.content.Content; import terminus.content.ContentManager; import terminus.content.Link; import terminus.content.Note; diff --git a/src/test/java/terminus/parser/LinkCommandParserTest.java b/src/test/java/terminus/parser/LinkCommandParserTest.java index 01bccbf929..cd0afddeef 100644 --- a/src/test/java/terminus/parser/LinkCommandParserTest.java +++ b/src/test/java/terminus/parser/LinkCommandParserTest.java @@ -1,5 +1,9 @@ package terminus.parser; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.command.DeleteCommand; @@ -7,14 +11,10 @@ import terminus.command.HelpCommand; import terminus.command.ViewCommand; import terminus.command.zoomlink.AddLinkCommand; -import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; import terminus.module.NusModule; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class LinkCommandParserTest { private LinkCommandParser linkCommandParser; diff --git a/src/test/java/terminus/parser/MainCommandParserTest.java b/src/test/java/terminus/parser/MainCommandParserTest.java index 1503fd4d64..2ab1556dbf 100644 --- a/src/test/java/terminus/parser/MainCommandParserTest.java +++ b/src/test/java/terminus/parser/MainCommandParserTest.java @@ -8,8 +8,8 @@ import terminus.command.ExitCommand; import terminus.command.HelpCommand; import terminus.command.NotesCommand; -import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; public class MainCommandParserTest { diff --git a/src/test/java/terminus/parser/NoteCommandParserTest.java b/src/test/java/terminus/parser/NoteCommandParserTest.java index 4593fb6886..2313f25ef9 100644 --- a/src/test/java/terminus/parser/NoteCommandParserTest.java +++ b/src/test/java/terminus/parser/NoteCommandParserTest.java @@ -11,8 +11,8 @@ import terminus.command.HelpCommand; import terminus.command.ViewCommand; import terminus.command.note.AddNoteCommand; -import terminus.exception.InvalidCommandException; import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; import terminus.module.NusModule; import terminus.ui.Ui; diff --git a/src/test/java/terminus/storage/ModuleStorageTest.java b/src/test/java/terminus/storage/ModuleStorageTest.java index bc5433bb30..bd3ec3136d 100644 --- a/src/test/java/terminus/storage/ModuleStorageTest.java +++ b/src/test/java/terminus/storage/ModuleStorageTest.java @@ -1,10 +1,7 @@ package terminus.storage; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; import com.google.gson.JsonSyntaxException; import java.io.IOException; From a3c8e0dc9f0d5fe650706754dbf6f09e980af42c Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Tue, 12 Oct 2021 21:54:23 +0800 Subject: [PATCH 115/466] Further refactor and slight improvements to code --- .../java/terminus/command/DeleteCommand.java | 3 +- .../terminus/command/note/AddNoteCommand.java | 5 +- .../command/zoomlink/AddLinkCommand.java | 11 ++- .../java/terminus/common/CommonFormat.java | 93 ------------------- .../java/terminus/common/CommonUtils.java | 92 ++++++++++++++++++ .../java/terminus/content/ContentManager.java | 8 +- .../command/link/AddLinkCommandTest.java | 4 +- .../terminus/common/CommonFormatTest.java | 86 ++++++++--------- 8 files changed, 152 insertions(+), 150 deletions(-) create mode 100644 src/main/java/terminus/common/CommonUtils.java diff --git a/src/main/java/terminus/command/DeleteCommand.java b/src/main/java/terminus/command/DeleteCommand.java index 6be5a55886..659b61d605 100644 --- a/src/main/java/terminus/command/DeleteCommand.java +++ b/src/main/java/terminus/command/DeleteCommand.java @@ -1,6 +1,7 @@ package terminus.command; import terminus.common.CommonFormat; +import terminus.common.CommonUtils; import terminus.common.Messages; import terminus.common.TerminusLogger; import terminus.content.Content; @@ -55,7 +56,7 @@ public CommandResult execute(Ui ui, NusModule module) throws InvalidArgumentExce assert deletedContentName != null && !deletedContentName.isBlank(); ui.printSection(String.format(Messages.MESSAGE_RESPONSE_DELETE, - CommonFormat.getClassName(type).toLowerCase(), deletedContentName)); + CommonUtils.getClassName(type).toLowerCase(), deletedContentName)); return new CommandResult(true); } } diff --git a/src/main/java/terminus/command/note/AddNoteCommand.java b/src/main/java/terminus/command/note/AddNoteCommand.java index 1e1f1980a1..8dfea8d7c4 100644 --- a/src/main/java/terminus/command/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/note/AddNoteCommand.java @@ -4,6 +4,7 @@ import terminus.command.Command; import terminus.command.CommandResult; import terminus.common.CommonFormat; +import terminus.common.CommonUtils; import terminus.common.Messages; import terminus.common.TerminusLogger; import terminus.content.ContentManager; @@ -42,7 +43,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } // Regex to find arguments - ArrayList argArray = CommonFormat.findArguments(arguments); + ArrayList argArray = CommonUtils.findArguments(arguments); if (!isValidNoteArguments(argArray)) { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } @@ -69,7 +70,7 @@ private boolean isValidNoteArguments(ArrayList argArray) { TerminusLogger.warning(String.format("Failed to find %d arguments: %d arguments found", ADD_NOTE_ARGUMENTS, argArray.size())); isValid = false; - } else if (CommonFormat.isArrayEmpty(argArray)) { + } else if (CommonUtils.isArrayEmpty(argArray)) { TerminusLogger.warning("Failed to parse arguments: some arguments found is empty"); isValid = false; } diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index 165cc06eb9..b1208cde7b 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -1,13 +1,14 @@ package terminus.command.zoomlink; -import static terminus.common.CommonFormat.isValidDay; -import static terminus.common.CommonFormat.isValidUrl; +import static terminus.common.CommonUtils.isValidDay; +import static terminus.common.CommonUtils.isValidUrl; import java.time.LocalTime; import java.util.ArrayList; import terminus.command.Command; import terminus.command.CommandResult; import terminus.common.CommonFormat; +import terminus.common.CommonUtils; import terminus.common.Messages; import terminus.common.TerminusLogger; import terminus.content.ContentManager; @@ -66,7 +67,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { if (arguments == null || arguments.isBlank()) { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } - ArrayList argArray = CommonFormat.findArguments(arguments); + ArrayList argArray = CommonUtils.findArguments(arguments); if (!isValidScheduleArguments(argArray)) { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } @@ -74,7 +75,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { this.description = argArray.get(0); this.day = argArray.get(1); - this.startTime = CommonFormat.convertToLocalTime(userStartTime); + this.startTime = CommonUtils.convertToLocalTime(userStartTime); this.link = argArray.get(3); if (!isValidDay(this.day)) { @@ -122,7 +123,7 @@ private boolean isValidScheduleArguments(ArrayList argArray) { TerminusLogger.warning(String.format("Failed to find %d arguments, %d arguments found", ADD_SCHEDULE_ARGUMENTS, argArray.size())); isValid = false; - } else if (CommonFormat.isArrayEmpty(argArray)) { + } else if (CommonUtils.isArrayEmpty(argArray)) { TerminusLogger.warning("Failed to parse arguments, some arguments found is empty"); isValid = false; } diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index 510d5029c0..5fa90d69a6 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -1,15 +1,6 @@ package terminus.common; -import java.net.URL; -import java.time.LocalTime; -import java.time.format.DateTimeFormatter; -import java.time.format.DateTimeParseException; -import java.util.ArrayList; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import terminus.exception.InvalidArgumentException; - public class CommonFormat { public static final String COMMAND_NOTE = "note"; @@ -28,88 +19,4 @@ public class CommonFormat { public static final String COMMAND_ADD_SCHEDULE_FORMAT = COMMAND_ADD + " \"\" " + "\"\" \"\" \"\""; public static final String COMMAND_ADD_NOTE_FORMAT = COMMAND_ADD + " \"\" \"\""; - - /** - * Method to get arguments. - * - * @param arg String containing the arguments - * @return An array list containing the separated arguments - */ - public static ArrayList findArguments(String arg) { - assert arg != null; - ArrayList argsArray = new ArrayList<>(); - Pattern p = Pattern.compile("\"(.*?)\""); - Matcher m = p.matcher(arg); - while (m.find()) { - argsArray.add(m.group(1)); - } - return argsArray; - } - - /** - * Checks if an array list is empty. - * - * @param argArray The array list to be checked - * @return True if array list is empty, false otherwise - */ - public static boolean isArrayEmpty(ArrayList argArray) { - assert argArray != null; - if (argArray.isEmpty()) { - return true; - } - for (String s : argArray) { - if (s == null || s.isBlank()) { - return true; - } - } - return false; - } - - /** - * Converts string to a LocalTime object. - * - * @param startTime The string to be converted to a LocalTime object - * @return A LocalTime object of the converted string - * @throws InvalidArgumentException Exception for when string does not follow the proper time format - */ - public static LocalTime convertToLocalTime(String startTime) throws InvalidArgumentException { - assert startTime != null; - try { - DateTimeFormatter format = DateTimeFormatter.ofPattern(LOCAL_TIME_FORMAT); - return LocalTime.parse(startTime, format); - } catch (DateTimeParseException e) { - throw new InvalidArgumentException( - String.format(Messages.ERROR_MESSAGE_INVALID_TIME_FORMAT, LOCAL_TIME_FORMAT)); - } - - } - - public static String getClassName(T type) { - assert type != null; - String result = type.toString(); - String[] string = result.split("\\."); - if (string.length > 0) { - result = string[string.length - 1]; - } - return result; - } - - public static boolean isValidUrl(String url) throws InvalidArgumentException { - try { - new URL(url).toURI(); - return true; - } catch (Exception e) { - throw new InvalidArgumentException( - String.format(Messages.ERROR_MESSAGE_INVALID_LINK, url)); - } - } - - public static boolean isValidDay(String day) { - for (DaysOfWeekEnum dayOfWeek : DaysOfWeekEnum.values()) { - if (dayOfWeek.name().equalsIgnoreCase(day)) { - return true; - } - } - return false; - } } diff --git a/src/main/java/terminus/common/CommonUtils.java b/src/main/java/terminus/common/CommonUtils.java new file mode 100644 index 0000000000..491010bf5e --- /dev/null +++ b/src/main/java/terminus/common/CommonUtils.java @@ -0,0 +1,92 @@ +package terminus.common; + +import java.net.URL; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; +import java.util.ArrayList; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import terminus.exception.InvalidArgumentException; + +public class CommonUtils { + + /** + * Method to get arguments. + * + * @param arg String containing the arguments + * @return An array list containing the separated arguments + */ + public static ArrayList findArguments(String arg) { + assert arg != null; + ArrayList argsArray = new ArrayList<>(); + Pattern p = Pattern.compile("\"(.*?)\""); + Matcher m = p.matcher(arg); + while (m.find()) { + argsArray.add(m.group(1)); + } + return argsArray; + } + + /** + * Checks if an array list is empty. + * + * @param argArray The array list to be checked + * @return True if array list is empty, false otherwise + */ + public static boolean isArrayEmpty(ArrayList argArray) { + assert argArray != null; + if (argArray.isEmpty()) { + return true; + } + return argArray.stream().anyMatch(x -> x == null || x.isBlank()); + } + + /** + * Converts string to a LocalTime object. + * + * @param startTime The string to be converted to a LocalTime object + * @return A LocalTime object of the converted string + * @throws InvalidArgumentException Exception for when string does not follow the proper time format + */ + public static LocalTime convertToLocalTime(String startTime) throws InvalidArgumentException { + assert startTime != null; + try { + DateTimeFormatter format = DateTimeFormatter.ofPattern(CommonFormat.LOCAL_TIME_FORMAT); + return LocalTime.parse(startTime, format); + } catch (DateTimeParseException e) { + throw new InvalidArgumentException( + String.format(Messages.ERROR_MESSAGE_INVALID_TIME_FORMAT, CommonFormat.LOCAL_TIME_FORMAT)); + } + + } + + public static String getClassName(T type) { + assert type != null; + String result = type.toString(); + String[] string = result.split("\\."); + if (string.length > 0) { + result = string[string.length - 1]; + } + return result; + } + + public static boolean isValidUrl(String url) throws InvalidArgumentException { + try { + new URL(url).toURI(); + return true; + } catch (Exception e) { + throw new InvalidArgumentException( + String.format(Messages.ERROR_MESSAGE_INVALID_LINK, url)); + } + } + + public static boolean isValidDay(String day) { + for (DaysOfWeekEnum dayOfWeek : DaysOfWeekEnum.values()) { + if (dayOfWeek.name().equalsIgnoreCase(day)) { + return true; + } + } + return false; + } +} diff --git a/src/main/java/terminus/content/ContentManager.java b/src/main/java/terminus/content/ContentManager.java index 8d18cf4bf4..d78f7494c4 100644 --- a/src/main/java/terminus/content/ContentManager.java +++ b/src/main/java/terminus/content/ContentManager.java @@ -35,14 +35,14 @@ public String listAllContents() { } public String getContentData(int contentNumber) throws InvalidArgumentException { - if (!isValidNumber(contentNumber)) { + if (isNotValidNumber(contentNumber)) { throw new InvalidArgumentException(Messages.ERROR_MESSAGE_EMPTY_CONTENTS); } return contents.get(contentNumber - 1).getDisplayInfo(); } public String deleteContent(int contentNumber) throws InvalidArgumentException { - if (!isValidNumber(contentNumber)) { + if (isNotValidNumber(contentNumber)) { throw new InvalidArgumentException(Messages.ERROR_MESSAGE_EMPTY_CONTENTS); } String deletedContentName = contents.get(contentNumber - 1).getName(); @@ -54,8 +54,8 @@ public void add(T content) { contents.add(content); } - private boolean isValidNumber(int number) { - return !(number < 1 || number > contents.size()); + private boolean isNotValidNumber(int number) { + return number < 1 || number > contents.size(); } diff --git a/src/test/java/terminus/command/link/AddLinkCommandTest.java b/src/test/java/terminus/command/link/AddLinkCommandTest.java index ec615b8152..7f9b01856c 100644 --- a/src/test/java/terminus/command/link/AddLinkCommandTest.java +++ b/src/test/java/terminus/command/link/AddLinkCommandTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import terminus.command.Command; import terminus.command.CommandResult; -import terminus.common.CommonFormat; +import terminus.common.CommonUtils; import terminus.content.Link; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; @@ -34,7 +34,7 @@ void setUp() { @Test void parseArguments_addLinkCommand_success() { String addLinkInput = "add \"test\" \"Thursday\" \"00:00\" \"https://zoom.us/test\""; - ArrayList parsedArguments = CommonFormat.findArguments(addLinkInput); + ArrayList parsedArguments = CommonUtils.findArguments(addLinkInput); assertEquals("test", parsedArguments.get(0)); assertEquals("Thursday", parsedArguments.get(1)); assertEquals("00:00", parsedArguments.get(2)); diff --git a/src/test/java/terminus/common/CommonFormatTest.java b/src/test/java/terminus/common/CommonFormatTest.java index 7be55f5d2d..f3bf33dbe1 100644 --- a/src/test/java/terminus/common/CommonFormatTest.java +++ b/src/test/java/terminus/common/CommonFormatTest.java @@ -31,7 +31,7 @@ void findArguments_success() { String input = "add \"test1\" \"test2\""; resultExpected.add("test1"); resultExpected.add("test2"); - ArrayList result = CommonFormat.findArguments(input); + ArrayList result = CommonUtils.findArguments(input); assertEquals(2, result.size()); assertEquals(resultExpected, result); } @@ -39,20 +39,20 @@ void findArguments_success() { @Test void findArguments_missingDoubleQuotes() { String input = "add \"test1\" \"test2"; - ArrayList result = CommonFormat.findArguments(input); + ArrayList result = CommonUtils.findArguments(input); resultExpected.add("test1"); assertEquals(1, result.size()); assertEquals(resultExpected, result); reset(); input = "add \"test1 test2"; - result = CommonFormat.findArguments(input); + result = CommonUtils.findArguments(input); assertEquals(0, result.size()); assertEquals(resultExpected, result); reset(); input = "add test1 test2"; - result = CommonFormat.findArguments(input); + result = CommonUtils.findArguments(input); assertEquals(0, result.size()); assertEquals(resultExpected, result); } @@ -60,7 +60,7 @@ void findArguments_missingDoubleQuotes() { @Test void findArguments_extraDoubleQuotes() { String input = "add \"test1\"\"\"test2\""; - ArrayList result = CommonFormat.findArguments(input); + ArrayList result = CommonUtils.findArguments(input); resultExpected.add("test1"); resultExpected.add(""); assertEquals(2, result.size()); @@ -70,13 +70,13 @@ void findArguments_extraDoubleQuotes() { input = "add \"test1\" \"test2\"\""; resultExpected.add("test1"); resultExpected.add("test2"); - result = CommonFormat.findArguments(input); + result = CommonUtils.findArguments(input); assertEquals(2, result.size()); assertEquals(resultExpected, result); reset(); input = "add \"test1\" \"\"\"test2"; - result = CommonFormat.findArguments(input); + result = CommonUtils.findArguments(input); resultExpected.add("test1"); resultExpected.add(""); assertEquals(2, result.size()); @@ -86,7 +86,7 @@ void findArguments_extraDoubleQuotes() { @Test void findArguments_missingArgument() { String input = ""; - ArrayList result = CommonFormat.findArguments(input); + ArrayList result = CommonUtils.findArguments(input); assertEquals(0, result.size()); assertEquals(resultExpected, result); } @@ -94,14 +94,14 @@ void findArguments_missingArgument() { @Test void findArguments_nullArgument_exceptionThrown() { String input = null; - assertThrows(AssertionError.class, () -> CommonFormat.findArguments(input)); + assertThrows(AssertionError.class, () -> CommonUtils.findArguments(input)); } @Test void isArrayEmpty_success() { resultExpected.add("test1"); resultExpected.add("test2"); - assertFalse(CommonFormat.isArrayEmpty(resultExpected)); + assertFalse(CommonUtils.isArrayEmpty(resultExpected)); } @Test @@ -109,11 +109,11 @@ void isArrayEmpty_emptyElements() { resultExpected.add("test1"); resultExpected.add(""); resultExpected.add("test2"); - assertTrue(CommonFormat.isArrayEmpty(resultExpected)); + assertTrue(CommonUtils.isArrayEmpty(resultExpected)); reset(); System.out.println(resultExpected); - assertTrue(CommonFormat.isArrayEmpty(resultExpected)); + assertTrue(CommonUtils.isArrayEmpty(resultExpected)); } @Test @@ -121,81 +121,81 @@ void isArrayEmpty_nullElements_exceptionThrown() { resultExpected.add("test1"); resultExpected.add(null); resultExpected.add("test2"); - assertTrue(CommonFormat.isArrayEmpty(resultExpected)); + assertTrue(CommonUtils.isArrayEmpty(resultExpected)); } @Test void isArrayEmpty_nullArraylist_exceptionThrown() { - assertThrows(AssertionError.class, () -> CommonFormat.isArrayEmpty(null)); + assertThrows(AssertionError.class, () -> CommonUtils.isArrayEmpty(null)); } @Test void getClassName_success() { - String result = CommonFormat.getClassName(Note.class); + String result = CommonUtils.getClassName(Note.class); assertEquals("Note", result); - result = CommonFormat.getClassName(Link.class); + result = CommonUtils.getClassName(Link.class); assertEquals("Link", result); } @Test void getClassName_invalidInput() { - String result = CommonFormat.getClassName("test1"); + String result = CommonUtils.getClassName("test1"); assertEquals("test1", result); - result = CommonFormat.getClassName("test1.2"); + result = CommonUtils.getClassName("test1.2"); assertEquals("2", result); } @Test void getClassName_nullInput_exceptionThrown() { - assertThrows(AssertionError.class, () -> CommonFormat.getClassName(null)); + assertThrows(AssertionError.class, () -> CommonUtils.getClassName(null)); } @Test void convertToLocalTime_success() throws InvalidArgumentException { - assertTrue(CommonFormat.convertToLocalTime("11:56") instanceof LocalTime); - assertTrue(CommonFormat.convertToLocalTime("22:56") instanceof LocalTime); + assertTrue(CommonUtils.convertToLocalTime("11:56") instanceof LocalTime); + assertTrue(CommonUtils.convertToLocalTime("22:56") instanceof LocalTime); } @Test void convertToLocalTime_invalidInput_exceptionThrown() { - assertThrows(InvalidArgumentException.class, () -> CommonFormat.convertToLocalTime("test")); - assertThrows(InvalidArgumentException.class, () -> CommonFormat.convertToLocalTime("25:10")); - assertThrows(InvalidArgumentException.class, () -> CommonFormat.convertToLocalTime("11-10")); - assertThrows(AssertionError.class, () -> CommonFormat.convertToLocalTime(null)); + assertThrows(InvalidArgumentException.class, () -> CommonUtils.convertToLocalTime("test")); + assertThrows(InvalidArgumentException.class, () -> CommonUtils.convertToLocalTime("25:10")); + assertThrows(InvalidArgumentException.class, () -> CommonUtils.convertToLocalTime("11-10")); + assertThrows(AssertionError.class, () -> CommonUtils.convertToLocalTime(null)); } @Test void isValidDay_success() { - assertTrue(CommonFormat.isValidDay("monday")); - assertTrue(CommonFormat.isValidDay("MoNdAy")); - assertTrue(CommonFormat.isValidDay("tuesday")); - assertTrue(CommonFormat.isValidDay("wednesday")); - assertTrue(CommonFormat.isValidDay("thursday")); - assertTrue(CommonFormat.isValidDay("friday")); - assertTrue(CommonFormat.isValidDay("saturday")); - assertTrue(CommonFormat.isValidDay("sunday")); + assertTrue(CommonUtils.isValidDay("monday")); + assertTrue(CommonUtils.isValidDay("MoNdAy")); + assertTrue(CommonUtils.isValidDay("tuesday")); + assertTrue(CommonUtils.isValidDay("wednesday")); + assertTrue(CommonUtils.isValidDay("thursday")); + assertTrue(CommonUtils.isValidDay("friday")); + assertTrue(CommonUtils.isValidDay("saturday")); + assertTrue(CommonUtils.isValidDay("sunday")); } @Test void isValidDay_invalidInput() { - assertFalse(CommonFormat.isValidDay("mon")); - assertFalse(CommonFormat.isValidDay("test1")); - assertFalse(CommonFormat.isValidDay("wednesdey")); - assertFalse(CommonFormat.isValidDay("")); - assertFalse(CommonFormat.isValidDay(null)); + assertFalse(CommonUtils.isValidDay("mon")); + assertFalse(CommonUtils.isValidDay("test1")); + assertFalse(CommonUtils.isValidDay("wednesdey")); + assertFalse(CommonUtils.isValidDay("")); + assertFalse(CommonUtils.isValidDay(null)); } @Test void isValidUrl_success() throws InvalidArgumentException { - assertTrue(CommonFormat.isValidUrl("https://www.test.com")); - assertTrue(CommonFormat.isValidUrl("http://www.test.org")); - assertTrue(CommonFormat.isValidUrl("https://nus-sg.zoom.us/j/88433650229?pwd=NFg3WSl0UEQ5ZG05ZW1MZz09")); + assertTrue(CommonUtils.isValidUrl("https://www.test.com")); + assertTrue(CommonUtils.isValidUrl("http://www.test.org")); + assertTrue(CommonUtils.isValidUrl("https://nus-sg.zoom.us/j/88433650229?pwd=NFg3WSl0UEQ5ZG05ZW1MZz09")); } @Test void isValidUrl_invalidInput_exceptionThrown() { - assertThrows(InvalidArgumentException.class, () -> CommonFormat.isValidUrl("")); - assertThrows(InvalidArgumentException.class, () -> CommonFormat.isValidUrl("..")); + assertThrows(InvalidArgumentException.class, () -> CommonUtils.isValidUrl("")); + assertThrows(InvalidArgumentException.class, () -> CommonUtils.isValidUrl("..")); } } From accf5f43d5e7c77b02572b376e277847cd05197f Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 12 Oct 2021 21:57:22 +0800 Subject: [PATCH 116/466] Fix and standerdise exisiting comments --- src/main/java/terminus/Terminus.java | 14 ++++---- src/main/java/terminus/command/Command.java | 6 ++-- .../java/terminus/command/CommandResult.java | 8 ++--- .../java/terminus/command/NotesCommand.java | 1 - .../terminus/command/ScheduleCommand.java | 4 +-- .../terminus/command/WorkspaceCommand.java | 9 ++--- .../java/terminus/common/CommonFormat.java | 31 ++++++++++------ src/main/java/terminus/content/Content.java | 23 ++++++------ src/main/java/terminus/content/Link.java | 35 ++----------------- .../java/terminus/parser/CommandParser.java | 21 +++++------ .../terminus/parser/LinkCommandParser.java | 6 ++-- 11 files changed, 72 insertions(+), 86 deletions(-) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 9e8b6b860f..775cb8d914 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -21,20 +21,20 @@ public class Terminus { private ModuleStorage moduleStorage; private NusModule nusModule; - + private static final String INVALID_ARGUMENT_FORMAT_MESSAGE = "Format: %s"; private static final Path DATA_DIRECTORY = Path.of(System.getProperty("user.dir"), "data"); private static final String MAIN_JSON = "main.json"; /** - * Main entry-point for the terminus.Terminus application. + * Enters the main entry-point for the terminus.Terminus application. */ public static void main(String[] args) { new Terminus().run(); } /** - * Start the program. + * Starts the program. */ public void run() { start(); @@ -50,7 +50,7 @@ private void start() { this.parser = MainCommandParser.getInstance(); this.workspace = ""; this.moduleStorage = new ModuleStorage(DATA_DIRECTORY.resolve(MAIN_JSON)); - + TerminusLogger.info("Loading file..."); this.nusModule = moduleStorage.loadFile(); } catch (IOException e) { @@ -80,7 +80,7 @@ private void runCommandsUntilExit() { try { currentCommand = parser.parseCommand(input); CommandResult result = currentCommand.execute(ui, nusModule); - + boolean isExitCommand = result.isOk() && result.isExit(); boolean isWorkspaceCommand = result.isOk() && result.getAdditionalData() != null; if (isExitCommand) { @@ -101,11 +101,11 @@ private void runCommandsUntilExit() { ui.printSection(e.getMessage()); } catch (InvalidArgumentException e) { TerminusLogger.warning("Invalid input provided: " + input, e.getCause()); - + // Check if the exception specified a correct command format for the user to follow. if (e.getFormat() != null) { // Print the format of the command along with the error message to the user. - ui.printSection(e.getMessage(), String.format(INVALID_ARGUMENT_FORMAT_MESSAGE, e.getFormat())); + ui.printSection(e.getMessage(), String.format(INVALID_ARGUMENT_FORMAT_MESSAGE, e.getFormat())); } else { ui.printSection(e.getMessage()); } diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java index adeddef6c6..d05ee6f1c2 100644 --- a/src/main/java/terminus/command/Command.java +++ b/src/main/java/terminus/command/Command.java @@ -31,7 +31,7 @@ public Command() { * Parses remaining arguments for the command. * * @param arguments The string arguments to be parsed in to the respective fields. - * @throws InvalidArgumentException Exception for when arguments parsing fails + * @throws InvalidArgumentException when arguments parsing fails. */ public void parseArguments(String arguments) throws InvalidArgumentException { @@ -45,8 +45,8 @@ public void parseArguments(String arguments) * @param ui The Ui object to send messages to the users. * @param module The NusModule contain the ContentManager of all notes and schedules. * @return The CommandResult object indicating the success of failure including additional options. - * @throws InvalidCommandException Exception for when the command could not be found. - * @throws InvalidArgumentException Exception for when arguments parsing fails + * @throws InvalidCommandException when the command could not be found. + * @throws InvalidArgumentException when arguments parsing fails. */ public abstract CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException, InvalidArgumentException; diff --git a/src/main/java/terminus/command/CommandResult.java b/src/main/java/terminus/command/CommandResult.java index 38454b5baf..80f02fdb06 100644 --- a/src/main/java/terminus/command/CommandResult.java +++ b/src/main/java/terminus/command/CommandResult.java @@ -36,7 +36,7 @@ public CommandResult(boolean isOk, boolean isExit, CommandParser additionalData, * Returns the CommandParser that is required to switch workspaces. * If additionalData will be null. * - * @return The CommandParser object for the workspace or else null + * @return The CommandParser object for the workspace or else null. */ public CommandParser getAdditionalData() { return additionalData; @@ -45,7 +45,7 @@ public CommandParser getAdditionalData() { /** * Returns the result of the command execution. * - * @return True if successful or else false + * @return True if successful or else false. */ public boolean isOk() { return isOk; @@ -54,7 +54,7 @@ public boolean isOk() { /** * Returns the result to exit or not. * - * @return True if 'exit' command is sent + * @return True if 'exit' command is sent. */ public boolean isExit() { return isExit; @@ -63,7 +63,7 @@ public boolean isExit() { /** * Returns the error message as a String. * - * @return The String object containing the error + * @return The String object containing the error. */ public String getErrorMessage() { return errorMessage; diff --git a/src/main/java/terminus/command/NotesCommand.java b/src/main/java/terminus/command/NotesCommand.java index 5aee82c5b7..09fc39fc9a 100644 --- a/src/main/java/terminus/command/NotesCommand.java +++ b/src/main/java/terminus/command/NotesCommand.java @@ -2,7 +2,6 @@ import terminus.common.CommonFormat; import terminus.common.Messages; -import terminus.module.NusModule; import terminus.parser.NoteCommandParser; public class NotesCommand extends WorkspaceCommand { diff --git a/src/main/java/terminus/command/ScheduleCommand.java b/src/main/java/terminus/command/ScheduleCommand.java index 9600eee0bf..e8e098d563 100644 --- a/src/main/java/terminus/command/ScheduleCommand.java +++ b/src/main/java/terminus/command/ScheduleCommand.java @@ -16,7 +16,7 @@ public ScheduleCommand() { /** * Returns the keyword for schedule-related commands. * - * @return The string containing the keyword for schedule-related commands + * @return The string containing the keyword for schedule-related commands. */ @Override public String getFormat() { @@ -26,7 +26,7 @@ public String getFormat() { /** * Returns the description for the command. * - * @return The string containing the description for this command + * @return The string containing the description for this command. */ @Override public String getHelpMessage() { diff --git a/src/main/java/terminus/command/WorkspaceCommand.java b/src/main/java/terminus/command/WorkspaceCommand.java index bca5a957b3..42ef05a3a3 100644 --- a/src/main/java/terminus/command/WorkspaceCommand.java +++ b/src/main/java/terminus/command/WorkspaceCommand.java @@ -17,12 +17,13 @@ public WorkspaceCommand(CommandParser commandMap) { } /** - * Returns the Command Result after execution. If no other arguments, returns the workspace. + * Returns the Command Result after execution. + * If no other arguments, returns the workspace. * - * @param ui The Ui object to send messages to the users. + * @param ui The Ui object to send messages to the users. * @param module The NusModule contain the list of all notes and schedules. - * @return The CommandResult containing success or failure of command and CommandParser Object - * @throws InvalidCommandException Exception for when the command could not be found. + * @return The CommandResult containing success or failure of command and CommandParser Object. + * @throws InvalidCommandException when the command could not be found. */ @Override public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException, InvalidArgumentException { diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index a223b7bf08..d8a69d603c 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -10,6 +10,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +/** + * CommonFormat class to manage methods and formats that are used across different packages. + */ public class CommonFormat { public static final String COMMAND_NOTE = "note"; @@ -30,10 +33,11 @@ public class CommonFormat { public static final String COMMAND_ADD_NOTE_FORMAT = COMMAND_ADD + " \"\" \"\""; /** - * Method to get arguments. + * Returns an ArrayList of String containing elements found based on regex. + * Matches any strings that is within a pair of double quotes. * - * @param arg String containing the arguments - * @return An array list containing the separated arguments + * @param arg String containing the arguments from inputs. + * @return An array list containing strings that is within a pair of double quotes from arg. */ public static ArrayList findArguments(String arg) { assert arg != null; @@ -47,10 +51,10 @@ public static ArrayList findArguments(String arg) { } /** - * Checks if an array list is empty. + * Checks if any elements in the ArrayList of String is empty. * - * @param argArray The array list to be checked - * @return True if array list is empty, false otherwise + * @param argArray The ArrayList to be checked. + * @return True if array list is empty, false otherwise. */ public static boolean isArrayEmpty(ArrayList argArray) { assert argArray != null; @@ -66,11 +70,11 @@ public static boolean isArrayEmpty(ArrayList argArray) { } /** - * Converts string to a LocalTime object. + * Returns a LocalTime object from a given string. * - * @param startTime The string to be converted to a LocalTime object - * @return A LocalTime object of the converted string - * @throws InvalidArgumentException Exception for when string does not follow the proper time format + * @param startTime The string to be converted to a LocalTime object. + * @return A LocalTime object of the converted string. + * @throws InvalidArgumentException when string does not follow the proper time format. */ public static LocalTime convertToLocalTime(String startTime) throws InvalidArgumentException { assert startTime != null; @@ -84,6 +88,13 @@ public static LocalTime convertToLocalTime(String startTime) throws InvalidArgum } + /** + * Returns the class name without its packages. + * + * @param type Content class type. + * @param Content object type. + * @return A string of the class name from the class type without its packages. + */ public static String getClassName(T type) { assert type != null; String result = type.toString(); diff --git a/src/main/java/terminus/content/Content.java b/src/main/java/terminus/content/Content.java index 0756baf8fe..f7a47f2085 100644 --- a/src/main/java/terminus/content/Content.java +++ b/src/main/java/terminus/content/Content.java @@ -1,5 +1,8 @@ package terminus.content; +/** + * Content class to represent any data related object. + */ public class Content { protected String name; @@ -13,21 +16,16 @@ public Content(String name) { } /** - * Initializes the Content object. + * Initializes a Content object. * - * @param name the name attribute of Content - * @param data the data attribute of Content + * @param name The name attribute of the Content. + * @param data The data attribute of the Content. */ public Content(String name, String data) { this.name = name; this.data = data; } - /** - * Returns the name attribute of the Content object. - * - * @return A string containing the name attribute of the Content object - */ public String getName() { return name; } @@ -45,14 +43,19 @@ public void setData(String data) { } /** - * Returns all the attributes of the Content object. + * Returns all the attributes of the Content object formatted by its display message. * - * @return A string containing all the attributes of the Content object + * @return A string containing all the attributes of the Content object. */ public String getDisplayInfo() { return String.format(DISPLAY_MESSAGE, name, data); } + /** + * Returns attributes of the Content object to be listed by the view command. + * + * @return A string containing attributes of the Content object based on the view command. + */ public String getViewDescription() { return this.name; } diff --git a/src/main/java/terminus/content/Link.java b/src/main/java/terminus/content/Link.java index b26cc6ccfc..4fef5c8483 100644 --- a/src/main/java/terminus/content/Link.java +++ b/src/main/java/terminus/content/Link.java @@ -21,56 +21,27 @@ public Link(String name, String day, LocalTime startTime, String link) { this.link = link; } - /** - * Returns the day of the Link object. - * - * @return A string containing the day of the Link object - */ + public String getDay() { return day; } - /** - * Sets the day of the Link object. - * - * @param day The new day to be set for the Link object - */ public void setDay(String day) { this.day = day; } - /** - * Returns the startTime of the Link object. - * - * @return A LocalTime object containing the startTime of the Link object - */ public LocalTime getStartTime() { return startTime; } - /** - * Sets the startTime of the Link object. - * - * @param startTime The new startTime to be set for the Link object - */ public void setStartTime(LocalTime startTime) { this.startTime = startTime; } - /** - * Returns the link of the Link object. - * - * @return A String containing the link of the Link object - */ public String getLink() { return link; } - /** - * Sets the link of the Link object. - * - * @param link The new link to be set for the Link object - */ public void setLink(String link) { this.link = link; } @@ -78,7 +49,7 @@ public void setLink(String link) { /** * Returns all the attributes of the Link object. * - * @return A string containing all the attributes of the Link object + * @return A string containing all the attributes of the Link object. */ @Override public String getDisplayInfo() { @@ -88,7 +59,7 @@ public String getDisplayInfo() { /** * Returns all the attributes' information of the Link object. * - * @return A method to display all the attributes of the Link object + * @return A method to display all the attributes of the Link object. */ @Override public String getViewDescription() { diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java index 486e8ebfac..c8e4a89ed5 100644 --- a/src/main/java/terminus/parser/CommandParser.java +++ b/src/main/java/terminus/parser/CommandParser.java @@ -18,9 +18,10 @@ public abstract class CommandParser { protected final HashMap commandMap; /** - * Initializes the commandMap. Adds some default commands to it. + * Initializes the commandMap. + * Adds some default commands to it. * - * @param workspace The name of the workspace + * @param workspace The name of the workspace. */ public CommandParser(String workspace) { this.commandMap = new HashMap<>(); @@ -33,10 +34,10 @@ public CommandParser(String workspace) { /** * Parses the command and its arguments. * - * @param command The user input command - * @return The Command object to be executed - * @throws InvalidCommandException if there is no command or empty command - * @throws InvalidArgumentException Fails when arguments could not be parsed + * @param command The user input command. + * @return The Command object to be executed. + * @throws InvalidCommandException when there is no command or empty command. + * @throws InvalidArgumentException when arguments could not be parsed. */ public Command parseCommand(String command) @@ -68,7 +69,7 @@ public Set getCommandList() { /** * Returns the list of items in the help menu. * - * @return Array of strings contain the help messages + * @return Array of strings contain the help messages. */ public String[] getHelpMenu() { return commandMap.entrySet() @@ -83,8 +84,8 @@ public String[] getHelpMenu() { /** * Adds a command to the commandMap. * - * @param cmdName The name of the command - * @param command The actual command object + * @param cmdName The name of the command. + * @param command The actual command object. */ protected void addCommand(String cmdName, Command command) { commandMap.put(cmdName, command); @@ -93,7 +94,7 @@ protected void addCommand(String cmdName, Command command) { /** * Returns the name of the current workspace. * - * @return The name of the workspace + * @return The name of the workspace. */ public String getWorkspace() { return workspace; diff --git a/src/main/java/terminus/parser/LinkCommandParser.java b/src/main/java/terminus/parser/LinkCommandParser.java index d97b8704b8..300a1d1c8d 100644 --- a/src/main/java/terminus/parser/LinkCommandParser.java +++ b/src/main/java/terminus/parser/LinkCommandParser.java @@ -21,7 +21,7 @@ public LinkCommandParser() { /** * Returns the command map for the schedule workspace. * - * @return A LinkCommandParser object which contains the command map for the schedule workspace + * @return A LinkCommandParser object which contains the command map for the schedule workspace. */ public static LinkCommandParser getInstance() { LinkCommandParser parser = new LinkCommandParser(); @@ -35,8 +35,8 @@ public static LinkCommandParser getInstance() { /** * Returns the opening description of the workspace. * - * @param module The current module containing the array list of all the links - * @return The string containing a description of the number of links in the workspace + * @param module The current module containing the array list of all the links. + * @return The string containing a description of the number of links in the workspace. */ @Override public String getWorkspaceBanner(NusModule module) { From 6f03d267c99f2c7239ed99c1cde39f52cfcb8b0e Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 12 Oct 2021 22:20:05 +0800 Subject: [PATCH 117/466] Fix CommonUtil conflics --- src/main/java/terminus/command/DeleteCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/terminus/command/DeleteCommand.java b/src/main/java/terminus/command/DeleteCommand.java index 3f579a1bbd..ea7711862d 100644 --- a/src/main/java/terminus/command/DeleteCommand.java +++ b/src/main/java/terminus/command/DeleteCommand.java @@ -81,7 +81,7 @@ public CommandResult execute(Ui ui, NusModule module) throws InvalidArgumentExce String deletedContentName = contentManager.deleteContent(itemNumber); assert deletedContentName != null && !deletedContentName.isBlank(); TerminusLogger.info( - String.format("%s(%s) has been deleted", CommonFormat.getClassName(type), deletedContentName)); + String.format("%s(%s) has been deleted", CommonUtils.getClassName(type), deletedContentName)); ui.printSection(String.format(Messages.MESSAGE_RESPONSE_DELETE, CommonUtils.getClassName(type).toLowerCase(), deletedContentName)); return new CommandResult(true); From 23b8e6887b98d31aeb28587ba6720d64cbef249c Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Tue, 12 Oct 2021 22:46:20 +0800 Subject: [PATCH 118/466] Fix JsonSyntaxException and JsonIOException --- src/main/java/terminus/Terminus.java | 17 ++++++++++++++--- .../java/terminus/storage/ModuleStorage.java | 4 +++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 9e8b6b860f..b3e2c3352b 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -1,5 +1,7 @@ package terminus; +import com.google.gson.JsonIOException; +import com.google.gson.JsonSyntaxException; import java.io.IOException; import java.nio.file.Path; import terminus.command.Command; @@ -15,6 +17,12 @@ public class Terminus { + public static final String[] INVALID_JSON_MESSAGE = { + "Invalid file data detected.", + "TermiNUS will still run, but the file will be overwritten when the next command is ran.", + "To save your current file, close your terminal (do not run exit).", + "Otherwise, you can continue using the program :)" + }; private Ui ui; private CommandParser parser; private String workspace; @@ -54,8 +62,11 @@ private void start() { TerminusLogger.info("Loading file..."); this.nusModule = moduleStorage.loadFile(); } catch (IOException e) { - TerminusLogger.warning("File loading has failed."); + TerminusLogger.warning("File loading has failed.", e.fillInStackTrace()); handleIoException(e); + } catch (JsonSyntaxException | JsonIOException e) { + TerminusLogger.severe("Invalid file data detected!", e.fillInStackTrace()); + ui.printSection(INVALID_JSON_MESSAGE); } finally { if (this.nusModule == null) { TerminusLogger.warning("File not found."); @@ -97,10 +108,10 @@ private void runCommandsUntilExit() { this.moduleStorage.saveFile(nusModule); TerminusLogger.info("Save completed."); } catch (InvalidCommandException e) { - TerminusLogger.warning("Invalid input provided: " + input, e.getCause()); + TerminusLogger.warning("Invalid input provided: " + input, e.fillInStackTrace()); ui.printSection(e.getMessage()); } catch (InvalidArgumentException e) { - TerminusLogger.warning("Invalid input provided: " + input, e.getCause()); + TerminusLogger.warning("Invalid input provided: " + input, e.fillInStackTrace()); // Check if the exception specified a correct command format for the user to follow. if (e.getFormat() != null) { diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 6a06da2101..5b7659ed97 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -2,6 +2,8 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.JsonIOException; +import com.google.gson.JsonSyntaxException; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -44,7 +46,7 @@ private void initializeFile() throws IOException { * @return NusModule based on the contents of the file. * @throws IOException When the file is inaccessible (e.g. file is locked by OS). */ - public NusModule loadFile() throws IOException { + public NusModule loadFile() throws IOException, JsonSyntaxException, JsonIOException { initializeFile(); if (!Files.isReadable(filePath)) { TerminusLogger.severe("File is does not exist or is not readable!"); From 1cc53a4c3c893b829deb296b2d957b869dc4911b Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Tue, 12 Oct 2021 22:50:00 +0800 Subject: [PATCH 119/466] Remove redundant throws --- src/main/java/terminus/storage/ModuleStorage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 5b7659ed97..289aa02866 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -46,7 +46,7 @@ private void initializeFile() throws IOException { * @return NusModule based on the contents of the file. * @throws IOException When the file is inaccessible (e.g. file is locked by OS). */ - public NusModule loadFile() throws IOException, JsonSyntaxException, JsonIOException { + public NusModule loadFile() throws IOException { initializeFile(); if (!Files.isReadable(filePath)) { TerminusLogger.severe("File is does not exist or is not readable!"); From 5f1acc4986fd72a69288ca191cefa9c9d57d6ca4 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Tue, 12 Oct 2021 22:50:51 +0800 Subject: [PATCH 120/466] Remove unused imports --- src/main/java/terminus/storage/ModuleStorage.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 289aa02866..6a06da2101 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -2,8 +2,6 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.google.gson.JsonIOException; -import com.google.gson.JsonSyntaxException; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; From 1fdddfaaedb3b9dbe366969b7d76eea10e6419d8 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 12 Oct 2021 23:21:56 +0800 Subject: [PATCH 121/466] Add comments to NusModule and ContentManager --- .../terminus/command/note/AddNoteCommand.java | 2 +- .../command/zoomlink/AddLinkCommand.java | 2 +- .../java/terminus/common/CommonUtils.java | 46 ++++++++++++++----- .../java/terminus/content/ContentManager.java | 38 +++++++++++++++ src/main/java/terminus/module/NusModule.java | 15 +++++- .../terminus/common/CommonFormatTest.java | 10 ++-- 6 files changed, 93 insertions(+), 20 deletions(-) diff --git a/src/main/java/terminus/command/note/AddNoteCommand.java b/src/main/java/terminus/command/note/AddNoteCommand.java index 5078ffbc59..0e481621f1 100644 --- a/src/main/java/terminus/command/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/note/AddNoteCommand.java @@ -89,7 +89,7 @@ private boolean isValidNoteArguments(ArrayList argArray) { TerminusLogger.warning(String.format("Failed to find %d arguments: %d arguments found", ADD_NOTE_ARGUMENTS, argArray.size())); isValid = false; - } else if (CommonUtils.isArrayEmpty(argArray)) { + } else if (CommonUtils.hasEmptyString(argArray)) { TerminusLogger.warning("Failed to parse arguments: some arguments found is empty"); isValid = false; } diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index cd17d373c3..bd8d265862 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -110,7 +110,7 @@ private boolean isValidScheduleArguments(ArrayList argArray) { TerminusLogger.warning(String.format("Failed to find %d arguments, %d arguments found", ADD_SCHEDULE_ARGUMENTS, argArray.size())); isValid = false; - } else if (CommonUtils.isArrayEmpty(argArray)) { + } else if (CommonUtils.hasEmptyString(argArray)) { TerminusLogger.warning("Failed to parse arguments, some arguments found is empty"); isValid = false; } diff --git a/src/main/java/terminus/common/CommonUtils.java b/src/main/java/terminus/common/CommonUtils.java index 491010bf5e..7e27f3df7d 100644 --- a/src/main/java/terminus/common/CommonUtils.java +++ b/src/main/java/terminus/common/CommonUtils.java @@ -9,13 +9,17 @@ import java.util.regex.Pattern; import terminus.exception.InvalidArgumentException; +/** + * CommonUtils class to manage methods that are used across different packages. + */ public class CommonUtils { /** - * Method to get arguments. + * Returns an ArrayList of String containing elements found based on regex. + * Matches any strings that is within a pair of double quotes. * - * @param arg String containing the arguments - * @return An array list containing the separated arguments + * @param arg String containing the arguments from inputs. + * @return An array list containing strings that is within a pair of double quotes from arg. */ public static ArrayList findArguments(String arg) { assert arg != null; @@ -29,12 +33,12 @@ public static ArrayList findArguments(String arg) { } /** - * Checks if an array list is empty. + * Checks if any elements in the ArrayList of String is empty. * - * @param argArray The array list to be checked - * @return True if array list is empty, false otherwise + * @param argArray The ArrayList to be checked. + * @return True if array list is empty, false otherwise. */ - public static boolean isArrayEmpty(ArrayList argArray) { + public static boolean hasEmptyString(ArrayList argArray) { assert argArray != null; if (argArray.isEmpty()) { return true; @@ -43,11 +47,11 @@ public static boolean isArrayEmpty(ArrayList argArray) { } /** - * Converts string to a LocalTime object. + * Returns a LocalTime object from a given string. * - * @param startTime The string to be converted to a LocalTime object - * @return A LocalTime object of the converted string - * @throws InvalidArgumentException Exception for when string does not follow the proper time format + * @param startTime The string to be converted to a LocalTime object. + * @return A LocalTime object of the converted string. + * @throws InvalidArgumentException when string does not follow the proper time format. */ public static LocalTime convertToLocalTime(String startTime) throws InvalidArgumentException { assert startTime != null; @@ -61,6 +65,13 @@ public static LocalTime convertToLocalTime(String startTime) throws InvalidArgum } + /** + * Returns the class name without its packages. + * + * @param type Content class type. + * @param Content object type. + * @return A string of the class name from the class type without its packages. + */ public static String getClassName(T type) { assert type != null; String result = type.toString(); @@ -71,6 +82,13 @@ public static String getClassName(T type) { return result; } + /** + * Checks if the given string is a valid url. + * + * @param url The string to be checked. + * @return True if url is valid, false otherwise. + * @throws InvalidArgumentException when given string is not a valid url. + */ public static boolean isValidUrl(String url) throws InvalidArgumentException { try { new URL(url).toURI(); @@ -81,6 +99,12 @@ public static boolean isValidUrl(String url) throws InvalidArgumentException { } } + /** + * Checks if the given string is a valid DaysOfWeekEnum type. + * + * @param day The string to be checked. + * @return True if day is a valid DaysOfWeekEnum type, false otherwise. + */ public static boolean isValidDay(String day) { for (DaysOfWeekEnum dayOfWeek : DaysOfWeekEnum.values()) { if (dayOfWeek.name().equalsIgnoreCase(day)) { diff --git a/src/main/java/terminus/content/ContentManager.java b/src/main/java/terminus/content/ContentManager.java index d78f7494c4..9886da0fe3 100644 --- a/src/main/java/terminus/content/ContentManager.java +++ b/src/main/java/terminus/content/ContentManager.java @@ -4,10 +4,19 @@ import terminus.common.Messages; import terminus.exception.InvalidArgumentException; +/** + * ContentManager class to manage any Content related object. + * + * @param Content object type. + */ public class ContentManager { private ArrayList contents; + /** + * Creates a ContentManager object. + * It will initialize a new ArrayList for its contents. + */ public ContentManager() { contents = new ArrayList<>(); } @@ -20,10 +29,20 @@ public ArrayList getContents() { return contents; } + /** + * Returns the total size of the ArrayList of type Content. + * + * @return The total size of ArrayList of type Content. + */ public int getTotalContents() { return contents.size(); } + /** + * Returns a string containing a list of all Content information from ArrayList contents. + * + * @return String of a list of all Content information in ArrayList contents. + */ public String listAllContents() { StringBuilder result = new StringBuilder(); int i = 1; @@ -34,6 +53,13 @@ public String listAllContents() { return result.toString(); } + /** + * Returns string of all information of a Content object. + * + * @param contentNumber Number to identify a element in the ArrayList. + * @return A String of all information of the specified Content object. + * @throws InvalidArgumentException when given number is ArrayOutOfBounds. + */ public String getContentData(int contentNumber) throws InvalidArgumentException { if (isNotValidNumber(contentNumber)) { throw new InvalidArgumentException(Messages.ERROR_MESSAGE_EMPTY_CONTENTS); @@ -41,6 +67,13 @@ public String getContentData(int contentNumber) throws InvalidArgumentException return contents.get(contentNumber - 1).getDisplayInfo(); } + /** + * Return deleted Content object name. + * + * @param contentNumber Number to identify a element in the ArrayList. + * @return The string name of the deleted Content object. + * @throws InvalidArgumentException when given contentNumber is ArrayOurOfBounds. + */ public String deleteContent(int contentNumber) throws InvalidArgumentException { if (isNotValidNumber(contentNumber)) { throw new InvalidArgumentException(Messages.ERROR_MESSAGE_EMPTY_CONTENTS); @@ -50,6 +83,11 @@ public String deleteContent(int contentNumber) throws InvalidArgumentException { return deletedContentName; } + /** + * Adds a Content object into the ArrayList contents. + * + * @param content The Content object to be added into the ArrayList contents. + */ public void add(T content) { contents.add(content); } diff --git a/src/main/java/terminus/module/NusModule.java b/src/main/java/terminus/module/NusModule.java index 9885da321f..271bc8aa7c 100644 --- a/src/main/java/terminus/module/NusModule.java +++ b/src/main/java/terminus/module/NusModule.java @@ -6,18 +6,29 @@ import terminus.content.Link; import terminus.content.Note; +/** + * NusModule class to represent a Module object. + */ public class NusModule { - private final ContentManager noteManager; private final ContentManager linkManager; + /** + * Creates a NusModule object. + */ public NusModule() { noteManager = new ContentManager<>(); linkManager = new ContentManager<>(); } - + /** + * Returns a ContentManager object based on the provided class type. + * + * @param type Content class type. + * @param Content object type. + * @return The ContentManager object based on the provided class type. + */ public ContentManager getContentManager(Class type) { TerminusLogger.info(String.format("Get ContentManager from NusModule with provided class type: %s", type)); ContentManager result = null; diff --git a/src/test/java/terminus/common/CommonFormatTest.java b/src/test/java/terminus/common/CommonFormatTest.java index f3bf33dbe1..19ef00868c 100644 --- a/src/test/java/terminus/common/CommonFormatTest.java +++ b/src/test/java/terminus/common/CommonFormatTest.java @@ -101,7 +101,7 @@ void findArguments_nullArgument_exceptionThrown() { void isArrayEmpty_success() { resultExpected.add("test1"); resultExpected.add("test2"); - assertFalse(CommonUtils.isArrayEmpty(resultExpected)); + assertFalse(CommonUtils.hasEmptyString(resultExpected)); } @Test @@ -109,11 +109,11 @@ void isArrayEmpty_emptyElements() { resultExpected.add("test1"); resultExpected.add(""); resultExpected.add("test2"); - assertTrue(CommonUtils.isArrayEmpty(resultExpected)); + assertTrue(CommonUtils.hasEmptyString(resultExpected)); reset(); System.out.println(resultExpected); - assertTrue(CommonUtils.isArrayEmpty(resultExpected)); + assertTrue(CommonUtils.hasEmptyString(resultExpected)); } @Test @@ -121,12 +121,12 @@ void isArrayEmpty_nullElements_exceptionThrown() { resultExpected.add("test1"); resultExpected.add(null); resultExpected.add("test2"); - assertTrue(CommonUtils.isArrayEmpty(resultExpected)); + assertTrue(CommonUtils.hasEmptyString(resultExpected)); } @Test void isArrayEmpty_nullArraylist_exceptionThrown() { - assertThrows(AssertionError.class, () -> CommonUtils.isArrayEmpty(null)); + assertThrows(AssertionError.class, () -> CommonUtils.hasEmptyString(null)); } @Test From 60710c803c61f49c1ab195d9b87d401aaa4b2cd6 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 12 Oct 2021 23:27:43 +0800 Subject: [PATCH 122/466] Fix indentation in Terminus class --- src/main/java/terminus/Terminus.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 838e6168d5..047078b617 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -18,10 +18,10 @@ public class Terminus { public static final String[] INVALID_JSON_MESSAGE = { - "Invalid file data detected.", - "TermiNUS will still run, but the file will be overwritten when the next command is ran.", - "To save your current file, close your terminal (do not run exit).", - "Otherwise, you can continue using the program :)" + "Invalid file data detected.", + "TermiNUS will still run, but the file will be overwritten when the next command is ran.", + "To save your current file, close your terminal (do not run exit).", + "Otherwise, you can continue using the program :)" }; private Ui ui; private CommandParser parser; From 626c4500484f08ba1fde20a830b2b0f0a688248a Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 12 Oct 2021 23:52:15 +0800 Subject: [PATCH 123/466] Fix spelling mistake in UG --- docs/UserGuide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 9f497b0593..cb710c66a8 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -26,7 +26,7 @@ The product aims to aid student in organizing their academic schedule and enhanc ## Getting Started 1. Ensure that you have Java 11 or above installed. -2. Down the latest version of `TermiNUS` from [here](https://github.com/AY2122S1-CS2113T-T10-2/tp). +2. Download the latest version of `TermiNUS` from [here](https://github.com/AY2122S1-CS2113T-T10-2/tp). 3. When you first start the program, you will be greeted with our banner: ``` From b407463a6d2ba00bebbdda7805bb4f12a39608a5 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 12 Oct 2021 23:57:19 +0800 Subject: [PATCH 124/466] Change link in download TermiNUS.jar --- docs/UserGuide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index cb710c66a8..2b07c45d14 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -26,7 +26,7 @@ The product aims to aid student in organizing their academic schedule and enhanc ## Getting Started 1. Ensure that you have Java 11 or above installed. -2. Download the latest version of `TermiNUS` from [here](https://github.com/AY2122S1-CS2113T-T10-2/tp). +2. Download the latest version of `TermiNUS` from [here](https://github.com/AY2122S1-CS2113T-T10-2/tp/releases/). 3. When you first start the program, you will be greeted with our banner: ``` From 9228a69f33221ce70effa7f9e28774ec19613894 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Sat, 16 Oct 2021 17:56:33 +0800 Subject: [PATCH 125/466] Overhaul Command Parsing --- src/main/java/terminus/Terminus.java | 12 +-- .../java/terminus/command/BackCommand.java | 22 +++-- src/main/java/terminus/command/Command.java | 16 +++- .../java/terminus/command/DeleteCommand.java | 6 +- .../java/terminus/command/ExitCommand.java | 4 +- src/main/java/terminus/command/GoCommand.java | 59 ++++++++++++++ .../java/terminus/command/HelpCommand.java | 4 +- .../terminus/command/InModuleCommand.java | 23 ++++++ .../java/terminus/command/ModuleCommand.java | 30 +++++++ .../java/terminus/command/NotesCommand.java | 2 +- .../terminus/command/ScheduleCommand.java | 2 +- .../java/terminus/command/ViewCommand.java | 12 +-- .../terminus/command/WorkspaceCommand.java | 19 +++-- .../command/module/AddModuleCommand.java | 77 ++++++++++++++++++ .../command/module/DeleteModuleCommand.java | 80 +++++++++++++++++++ .../command/module/ViewModuleCommand.java | 54 +++++++++++++ .../terminus/command/note/AddNoteCommand.java | 7 +- .../command/zoomlink/AddLinkCommand.java | 6 +- .../java/terminus/module/ModuleManager.java | 25 ++++++ src/main/java/terminus/module/NusModule.java | 1 - .../java/terminus/parser/CommandParser.java | 4 + .../parser/InModuleCommandParser.java | 35 ++++++++ .../terminus/parser/LinkCommandParser.java | 2 +- .../terminus/parser/MainCommandParser.java | 11 +-- .../terminus/parser/ModuleCommandParser.java | 34 ++++++++ .../parser/ModuleWorkspaceCommandParser.java | 44 ++++++++++ .../terminus/parser/NoteCommandParser.java | 2 +- .../java/terminus/storage/ModuleStorage.java | 13 +-- .../terminus/storage/ModuleStorageTest.java | 9 ++- 29 files changed, 558 insertions(+), 57 deletions(-) create mode 100644 src/main/java/terminus/command/GoCommand.java create mode 100644 src/main/java/terminus/command/InModuleCommand.java create mode 100644 src/main/java/terminus/command/ModuleCommand.java create mode 100644 src/main/java/terminus/command/module/AddModuleCommand.java create mode 100644 src/main/java/terminus/command/module/DeleteModuleCommand.java create mode 100644 src/main/java/terminus/command/module/ViewModuleCommand.java create mode 100644 src/main/java/terminus/module/ModuleManager.java create mode 100644 src/main/java/terminus/parser/InModuleCommandParser.java create mode 100644 src/main/java/terminus/parser/ModuleCommandParser.java create mode 100644 src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 047078b617..a6a136c5e7 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -9,6 +9,7 @@ import terminus.common.TerminusLogger; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; import terminus.module.NusModule; import terminus.parser.CommandParser; import terminus.parser.MainCommandParser; @@ -28,6 +29,7 @@ public class Terminus { private String workspace; private ModuleStorage moduleStorage; + private ModuleManager moduleManager; private NusModule nusModule; private static final String INVALID_ARGUMENT_FORMAT_MESSAGE = "Format: %s"; @@ -58,9 +60,9 @@ private void start() { this.parser = MainCommandParser.getInstance(); this.workspace = ""; this.moduleStorage = new ModuleStorage(DATA_DIRECTORY.resolve(MAIN_JSON)); - + this.moduleManager = new ModuleManager(); TerminusLogger.info("Loading file..."); - this.nusModule = moduleStorage.loadFile(); + this.moduleManager = moduleStorage.loadFile(); } catch (IOException e) { TerminusLogger.warning("File loading has failed.", e.fillInStackTrace()); handleIoException(e); @@ -90,7 +92,7 @@ private void runCommandsUntilExit() { Command currentCommand = null; try { currentCommand = parser.parseCommand(input); - CommandResult result = currentCommand.execute(ui, nusModule); + CommandResult result = currentCommand.execute(ui, moduleManager); boolean isExitCommand = result.isOk() && result.isExit(); boolean isWorkspaceCommand = result.isOk() && result.getAdditionalData() != null; @@ -105,7 +107,7 @@ private void runCommandsUntilExit() { ui.printSection(result.getErrorMessage()); } TerminusLogger.info("Saving data into file..."); - this.moduleStorage.saveFile(nusModule); + this.moduleStorage.saveFile(moduleManager); TerminusLogger.info("Save completed."); } catch (InvalidCommandException e) { TerminusLogger.warning("Invalid input provided: " + input, e.fillInStackTrace()); @@ -140,7 +142,7 @@ private void handleIoException(IOException e) { private void exit() { TerminusLogger.info("Saving data into file..."); try { - this.moduleStorage.saveFile(nusModule); + this.moduleStorage.saveFile(moduleManager); TerminusLogger.info("Save completed."); } catch (IOException e) { TerminusLogger.warning("File saving has failed."); diff --git a/src/main/java/terminus/command/BackCommand.java b/src/main/java/terminus/command/BackCommand.java index e13aa926bc..a02d901c0d 100644 --- a/src/main/java/terminus/command/BackCommand.java +++ b/src/main/java/terminus/command/BackCommand.java @@ -4,8 +4,9 @@ import terminus.common.Messages; import terminus.common.TerminusLogger; import terminus.exception.InvalidCommandException; -import terminus.module.NusModule; +import terminus.module.ModuleManager; import terminus.parser.MainCommandParser; +import terminus.parser.ModuleWorkspaceCommandParser; import terminus.ui.Ui; public class BackCommand extends Command { @@ -21,10 +22,21 @@ public String getHelpMessage() { } @Override - public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { + public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidCommandException { TerminusLogger.info("Executing Back Command"); - MainCommandParser mainParser = MainCommandParser.getInstance(); - TerminusLogger.info("Changing Workspace to:" + mainParser.getWorkspace()); - return new CommandResult(true, mainParser); + if (isModuleNameNullOrEmpty()) { + MainCommandParser mainParser = MainCommandParser.getInstance(); + TerminusLogger.info("Changing Workspace to:" + mainParser.getWorkspace()); + return new CommandResult(true, mainParser); + } else { + ModuleWorkspaceCommandParser moduleParser = ModuleWorkspaceCommandParser.getInstance(); + moduleParser.setWorkspace(getModuleName()); + return new CommandResult(true, moduleParser); + } + } + + private boolean isModuleNameNullOrEmpty() { + String moduleName = getModuleName(); + return moduleName == null || moduleName.isBlank(); } } diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java index b0cd8d7b4c..8383c83974 100644 --- a/src/main/java/terminus/command/Command.java +++ b/src/main/java/terminus/command/Command.java @@ -2,13 +2,13 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; -import terminus.module.NusModule; +import terminus.module.ModuleManager; import terminus.ui.Ui; public abstract class Command { protected String arguments; - + private String moduleName; public Command() { } @@ -43,11 +43,19 @@ public void parseArguments(String arguments) * Prints the required result to the Ui. * * @param ui The Ui object to send messages to the users. - * @param module The NusModule contain the ContentManager of all notes and schedules. + * @param moduleManager The NusModule contain the ContentManager of all notes and schedules. * @return The CommandResult object indicating the success of failure including additional options. * @throws InvalidCommandException when the command could not be found. * @throws InvalidArgumentException when arguments parsing fails. */ - public abstract CommandResult execute(Ui ui, NusModule module) + public abstract CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidCommandException, InvalidArgumentException; + + public String getModuleName() { + return moduleName; + } + + public void setModuleName(String moduleName) { + this.moduleName = moduleName; + } } diff --git a/src/main/java/terminus/command/DeleteCommand.java b/src/main/java/terminus/command/DeleteCommand.java index ea7711862d..24cb0debd7 100644 --- a/src/main/java/terminus/command/DeleteCommand.java +++ b/src/main/java/terminus/command/DeleteCommand.java @@ -7,6 +7,7 @@ import terminus.content.Content; import terminus.content.ContentManager; import terminus.exception.InvalidArgumentException; +import terminus.module.ModuleManager; import terminus.module.NusModule; import terminus.ui.Ui; @@ -69,12 +70,13 @@ public void parseArguments(String arguments) throws InvalidArgumentException { * Prints the relevant response to the Ui and the specified Content object will be removed from the arraylist. * * @param ui The Ui object to send messages to the users. - * @param module The NusModule contain the ContentManager of all notes and schedules. + * @param moduleManager The NusModule contain the ContentManager of all notes and schedules. * @return CommandResult to indicate the success and additional information about the execution. * @throws InvalidArgumentException when argument provided is index out of bounds of the ArrayList. */ @Override - public CommandResult execute(Ui ui, NusModule module) throws InvalidArgumentException { + public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidArgumentException { + NusModule module = moduleManager.getModule(getModuleName()); ContentManager contentManager = module.getContentManager(type); assert contentManager != null; TerminusLogger.info("Executing Delete Command"); diff --git a/src/main/java/terminus/command/ExitCommand.java b/src/main/java/terminus/command/ExitCommand.java index 7da5838a0f..b48363bc4d 100644 --- a/src/main/java/terminus/command/ExitCommand.java +++ b/src/main/java/terminus/command/ExitCommand.java @@ -4,7 +4,7 @@ import terminus.common.Messages; import terminus.common.TerminusLogger; import terminus.exception.InvalidCommandException; -import terminus.module.NusModule; +import terminus.module.ModuleManager; import terminus.ui.Ui; public class ExitCommand extends Command { @@ -20,7 +20,7 @@ public String getHelpMessage() { } @Override - public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { + public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidCommandException { TerminusLogger.info("Executing Exit Command"); return new CommandResult(true, true); } diff --git a/src/main/java/terminus/command/GoCommand.java b/src/main/java/terminus/command/GoCommand.java new file mode 100644 index 0000000000..83c86e6eb2 --- /dev/null +++ b/src/main/java/terminus/command/GoCommand.java @@ -0,0 +1,59 @@ +package terminus.command; + +import terminus.common.Messages; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; +import terminus.module.NusModule; +import terminus.parser.ModuleWorkspaceCommandParser; +import terminus.ui.Ui; + +public class GoCommand extends WorkspaceCommand{ + private String moduleName; + public GoCommand() { + super(ModuleWorkspaceCommandParser.getInstance()); + } + + /** + * Returns the format for the command. + * + * @return The String object holding the appropriate format for the command. + */ + @Override + public String getFormat() { + return "go "; + } + + /** + * Returns the description for the command. + * + * @return The String object containing the description for this command. + */ + @Override + public String getHelpMessage() { + return "Go to a specific module"; + } + + @Override + public void parseArguments(String arguments) throws InvalidArgumentException { + if (arguments == null || arguments.isBlank()) { + throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); + } + String[] args = arguments.strip().split("\\s+", 2); + moduleName = args[0]; + if (args.length > 1) { + super.parseArguments(args[1]); + } + } + + @Override + public CommandResult execute(Ui ui, ModuleManager moduleManager) + throws InvalidCommandException, InvalidArgumentException { + NusModule module = moduleManager.getModule(moduleName); + if (module == null) { + throw new InvalidArgumentException("Module not found! Type 'module view' for the list of modules."); + } + commandMap.setWorkspace(moduleName); + return super.execute(ui, moduleManager); + } +} diff --git a/src/main/java/terminus/command/HelpCommand.java b/src/main/java/terminus/command/HelpCommand.java index 2e6b6335f8..cc8785fa1f 100644 --- a/src/main/java/terminus/command/HelpCommand.java +++ b/src/main/java/terminus/command/HelpCommand.java @@ -4,7 +4,7 @@ import terminus.common.Messages; import terminus.common.TerminusLogger; import terminus.exception.InvalidCommandException; -import terminus.module.NusModule; +import terminus.module.ModuleManager; import terminus.parser.CommandParser; import terminus.ui.Ui; @@ -28,7 +28,7 @@ public String getHelpMessage() { } @Override - public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException { + public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidCommandException { TerminusLogger.info("Executing Help Command"); ui.printSection(HELP_MENU_MESSAGE); ui.printSection(commandMap.getHelpMenu()); diff --git a/src/main/java/terminus/command/InModuleCommand.java b/src/main/java/terminus/command/InModuleCommand.java new file mode 100644 index 0000000000..d76a7797c0 --- /dev/null +++ b/src/main/java/terminus/command/InModuleCommand.java @@ -0,0 +1,23 @@ +package terminus.command; + +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; +import terminus.parser.InModuleCommandParser; +import terminus.ui.Ui; + +public abstract class InModuleCommand extends WorkspaceCommand { + private InModuleCommandParser commandMap; + + public InModuleCommand(InModuleCommandParser commandMap) { + super(commandMap); + this.commandMap = commandMap; + } + + @Override + public CommandResult execute(Ui ui, ModuleManager moduleManager) + throws InvalidCommandException, InvalidArgumentException { + commandMap.setModuleName(getModuleName()); + return super.execute(ui, moduleManager); + } +} diff --git a/src/main/java/terminus/command/ModuleCommand.java b/src/main/java/terminus/command/ModuleCommand.java new file mode 100644 index 0000000000..77f5a6ca88 --- /dev/null +++ b/src/main/java/terminus/command/ModuleCommand.java @@ -0,0 +1,30 @@ +package terminus.command; + +import terminus.parser.ModuleCommandParser; + +public class ModuleCommand extends WorkspaceCommand { + + public ModuleCommand() { + super(ModuleCommandParser.getInstance()); + } + + /** + * Returns the format for the command. + * + * @return The String object holding the appropriate format for the command. + */ + @Override + public String getFormat() { + return "module"; + } + + /** + * Returns the description for the command. + * + * @return The String object containing the description for this command. + */ + @Override + public String getHelpMessage() { + return "Move to the module workspace"; + } +} diff --git a/src/main/java/terminus/command/NotesCommand.java b/src/main/java/terminus/command/NotesCommand.java index 09fc39fc9a..e27148372b 100644 --- a/src/main/java/terminus/command/NotesCommand.java +++ b/src/main/java/terminus/command/NotesCommand.java @@ -4,7 +4,7 @@ import terminus.common.Messages; import terminus.parser.NoteCommandParser; -public class NotesCommand extends WorkspaceCommand { +public class NotesCommand extends InModuleCommand { public NotesCommand() { super(NoteCommandParser.getInstance()); diff --git a/src/main/java/terminus/command/ScheduleCommand.java b/src/main/java/terminus/command/ScheduleCommand.java index e8e098d563..b50431ce20 100644 --- a/src/main/java/terminus/command/ScheduleCommand.java +++ b/src/main/java/terminus/command/ScheduleCommand.java @@ -7,7 +7,7 @@ /** * ScheduleCommand class to manage commands inside the Schedule workspace. */ -public class ScheduleCommand extends WorkspaceCommand { +public class ScheduleCommand extends InModuleCommand { public ScheduleCommand() { super(LinkCommandParser.getInstance()); diff --git a/src/main/java/terminus/command/ViewCommand.java b/src/main/java/terminus/command/ViewCommand.java index 7541581aa4..472f4d33e2 100644 --- a/src/main/java/terminus/command/ViewCommand.java +++ b/src/main/java/terminus/command/ViewCommand.java @@ -6,11 +6,12 @@ import terminus.content.Content; import terminus.content.ContentManager; import terminus.exception.InvalidArgumentException; +import terminus.module.ModuleManager; import terminus.module.NusModule; import terminus.ui.Ui; /** - * ViewCommand generic class which will manage the viewing of Content information specified by user command. + * ViewModuleCommand generic class which will manage the viewing of Content information specified by user command. * * @param Content object type. */ @@ -26,7 +27,7 @@ public class ViewCommand extends Command { private boolean displayAll; /** - * Creates a ViewCommand object with referenced to the provided class type. + * Creates a ViewModuleCommand object with referenced to the provided class type. * * @param type Content object type. */ @@ -46,7 +47,7 @@ public String getHelpMessage() { } /** - * Parses the arguments to the ViewCommand object. + * Parses the arguments to the ViewModuleCommand object. * The arguments are attributes to identify a Content object in an ArrayList. The arguments can be empty which * refers to viewing a list all Content object in an ArrayList instead. * @@ -78,13 +79,14 @@ public void parseArguments(String arguments) throws InvalidArgumentException { * Prints the relevant response to the Ui. * * @param ui The Ui object to send messages to the users. - * @param module The NusModule contain the ContentManager of all notes and schedules. + * @param moduleManager The NusModule contain the ContentManager of all notes and schedules. * @return CommandResult to indicate the success and additional information about the execution. * @throws InvalidArgumentException when argument provided is index out of bounds of the ArrayList. */ @Override - public CommandResult execute(Ui ui, NusModule module) throws InvalidArgumentException { + public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidArgumentException { StringBuilder result = new StringBuilder(); + NusModule module = moduleManager.getModule(getModuleName()); ContentManager contentManager = module.getContentManager(type); if (displayAll) { String fullList = contentManager.listAllContents(); diff --git a/src/main/java/terminus/command/WorkspaceCommand.java b/src/main/java/terminus/command/WorkspaceCommand.java index 42ef05a3a3..40bd0e9bbd 100644 --- a/src/main/java/terminus/command/WorkspaceCommand.java +++ b/src/main/java/terminus/command/WorkspaceCommand.java @@ -3,8 +3,9 @@ import terminus.common.TerminusLogger; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; -import terminus.module.NusModule; +import terminus.module.ModuleManager; import terminus.parser.CommandParser; +import terminus.parser.InModuleCommandParser; import terminus.ui.Ui; public abstract class WorkspaceCommand extends Command { @@ -16,23 +17,27 @@ public WorkspaceCommand(CommandParser commandMap) { this.commandMap = commandMap; } + public WorkspaceCommand(InModuleCommandParser commandMap) { + this.commandMap = commandMap; + } + /** - * Returns the Command Result after execution. - * If no other arguments, returns the workspace. + * Returns the Command Result after execution. If no other arguments, returns the workspace. * - * @param ui The Ui object to send messages to the users. - * @param module The NusModule contain the list of all notes and schedules. + * @param ui The Ui object to send messages to the users. + * @param moduleManager The NusModule contain the list of all notes and schedules. * @return The CommandResult containing success or failure of command and CommandParser Object. * @throws InvalidCommandException when the command could not be found. */ @Override - public CommandResult execute(Ui ui, NusModule module) throws InvalidCommandException, InvalidArgumentException { + public CommandResult execute(Ui ui, ModuleManager moduleManager) + throws InvalidCommandException, InvalidArgumentException { assert commandMap != null; TerminusLogger.info("Executing Workspace Command"); if (isNotNullOrBlank()) { try { TerminusLogger.info("Parsing workspace command"); - return commandMap.parseCommand(arguments).execute(ui, module); + return commandMap.parseCommand(arguments).execute(ui, moduleManager); } catch (InvalidArgumentException e) { if (e.getFormat() == null) { throw e; diff --git a/src/main/java/terminus/command/module/AddModuleCommand.java b/src/main/java/terminus/command/module/AddModuleCommand.java new file mode 100644 index 0000000000..666d03eb48 --- /dev/null +++ b/src/main/java/terminus/command/module/AddModuleCommand.java @@ -0,0 +1,77 @@ +package terminus.command.module; + +import java.util.ArrayList; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.common.CommonUtils; +import terminus.common.Messages; +import terminus.common.TerminusLogger; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; +import terminus.ui.Ui; + +public class AddModuleCommand extends Command { + private String moduleName; + /** + * Returns the format for the command. + * + * @return The String object holding the appropriate format for the command. + */ + @Override + public String getFormat() { + return "add \"\""; + } + + /** + * Returns the description for the command. + * + * @return The String object containing the description for this command. + */ + @Override + public String getHelpMessage() { + return "Adds a module"; + } + + @Override + public void parseArguments(String arguments) throws InvalidArgumentException { + if (arguments == null || arguments.isBlank()) { + TerminusLogger.warning("Failed to parse arguments: arguments is empty"); + throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); + } + ArrayList argArray = CommonUtils.findArguments(arguments); + if (!isValidModuleArguments(argArray)) { + throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); + } + + moduleName = argArray.get(0); + if (!moduleName.matches("\\S+")) { + throw new InvalidArgumentException("Module name cannot contain any whitespaces!"); + } + } + + /** + * Executes the command. Prints the required result to the Ui. + * + * @param ui The Ui object to send messages to the users. + * @param moduleManager The NusModule contain the ContentManager of all notes and schedules. + * @return The CommandResult object indicating the success of failure including additional options. + * @throws InvalidCommandException when the command could not be found. + * @throws InvalidArgumentException when arguments parsing fails. + */ + @Override + public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidCommandException, InvalidArgumentException { + moduleManager.setModule(moduleName); + ui.printSection(String.format("Module %s has been added",moduleName)); + return new CommandResult(true); + } + + private boolean isValidModuleArguments (ArrayList argArray) { + if(argArray.size() != 1) { + return false; + } else { + return !CommonUtils.hasEmptyString(argArray); + } + } +} + diff --git a/src/main/java/terminus/command/module/DeleteModuleCommand.java b/src/main/java/terminus/command/module/DeleteModuleCommand.java new file mode 100644 index 0000000000..009990da3e --- /dev/null +++ b/src/main/java/terminus/command/module/DeleteModuleCommand.java @@ -0,0 +1,80 @@ +package terminus.command.module; + +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.common.CommonFormat; +import terminus.common.Messages; +import terminus.common.TerminusLogger; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; +import terminus.ui.Ui; + +public class DeleteModuleCommand extends Command { + + private int itemNumber; + + /** + * Returns the format for the command. + * + * @return The String object holding the appropriate format for the command. + */ + @Override + public String getFormat() { + return CommonFormat.COMMAND_DELETE_FORMAT; + } + + /** + * Returns the description for the command. + * + * @return The String object containing the description for this command. + */ + @Override + public String getHelpMessage() { + return "Deletes a module"; + } + + @Override + public void parseArguments(String arguments) throws InvalidArgumentException { + if (arguments == null || arguments.isBlank()) { + throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); + } + TerminusLogger.info("Parsing delete arguments"); + try { + itemNumber = Integer.parseInt(arguments); + } catch (NumberFormatException e) { + TerminusLogger.warning(String.format("Failed to parse delete itemNumber : %s", arguments)); + throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_INVALID_NUMBER); + } + if (itemNumber <= 0) { + TerminusLogger.warning(String.format("Invalid itemNumber : %d", itemNumber)); + throw new InvalidArgumentException(Messages.ERROR_MESSAGE_INVALID_NUMBER); + } + } + + /** + * Executes the command. Prints the required result to the Ui. + * + * @param ui The Ui object to send messages to the users. + * @param moduleManager The NusModule contain the ContentManager of all notes and schedules. + * @return The CommandResult object indicating the success of failure including additional options. + * @throws InvalidCommandException when the command could not be found. + * @throws InvalidArgumentException when arguments parsing fails. + */ + @Override + public CommandResult execute(Ui ui, ModuleManager moduleManager) + throws InvalidCommandException, InvalidArgumentException { + if (!isValidIndex(itemNumber, moduleManager)) { + throw new InvalidArgumentException(Messages.ERROR_MESSAGE_EMPTY_CONTENTS); + } + String[] listOfModule = moduleManager.getAllModules(); + moduleManager.removeModule(listOfModule[itemNumber - 1]); + ui.printSection(String.format("Deleted module %s.",listOfModule[itemNumber - 1])); + return new CommandResult(true); + } + + private boolean isValidIndex(int index, ModuleManager moduleManager) { + String[] listOfModule = moduleManager.getAllModules(); + return listOfModule.length >= index && index > 0; + } +} diff --git a/src/main/java/terminus/command/module/ViewModuleCommand.java b/src/main/java/terminus/command/module/ViewModuleCommand.java new file mode 100644 index 0000000000..2093c8bf73 --- /dev/null +++ b/src/main/java/terminus/command/module/ViewModuleCommand.java @@ -0,0 +1,54 @@ +package terminus.command.module; + +import java.util.Arrays; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; +import terminus.ui.Ui; + +public class ViewModuleCommand extends Command { + + /** + * Returns the format for the command. + * + * @return The String object holding the appropriate format for the command. + */ + @Override + public String getFormat() { + return "view"; + } + + /** + * Returns the description for the command. + * + * @return The String object containing the description for this command. + */ + @Override + public String getHelpMessage() { + return "View all modules available"; + } + + /** + * Executes the command. Prints the required result to the Ui. + * + * @param ui The Ui object to send messages to the users. + * @param moduleManager The NusModule contain the ContentManager of all notes and schedules. + * @return The CommandResult object indicating the success of failure including additional options. + * @throws InvalidCommandException when the command could not be found. + * @throws InvalidArgumentException when arguments parsing fails. + */ + @Override + public CommandResult execute(Ui ui, ModuleManager moduleManager) + throws InvalidCommandException, InvalidArgumentException { + String[] modules = moduleManager.getAllModules(); + String[] listOfModules = IntStream.range(0, modules.length) + .mapToObj(i -> String.format("%d. %s", i + 1, modules[i])) + .toArray(String[]::new); + ui.printSection(listOfModules); + return new CommandResult(true); + } +} diff --git a/src/main/java/terminus/command/note/AddNoteCommand.java b/src/main/java/terminus/command/note/AddNoteCommand.java index 0e481621f1..9fc09a5210 100644 --- a/src/main/java/terminus/command/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/note/AddNoteCommand.java @@ -10,6 +10,7 @@ import terminus.content.ContentManager; import terminus.content.Note; import terminus.exception.InvalidArgumentException; +import terminus.module.ModuleManager; import terminus.module.NusModule; import terminus.ui.Ui; @@ -62,12 +63,12 @@ public void parseArguments(String arguments) throws InvalidArgumentException { * Prints the relevant response to the Ui and a new Note will be added into the arraylist of Notes. * * @param ui The Ui object to send messages to the users. - * @param module The NusModule contain the ContentManager of all notes and schedules. + * @param moduleManager The NusModule contain the ContentManager of all notes and schedules. * @return CommandResult to indicate the success and additional information about the execution. */ - public CommandResult execute(Ui ui, NusModule module) { + public CommandResult execute(Ui ui, ModuleManager moduleManager) { TerminusLogger.info("Executing Add Note Command"); - + NusModule module = moduleManager.getModule(getModuleName()); ContentManager contentManager = module.getContentManager(Note.class); assert contentManager != null; diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index bd8d265862..dfb971bcea 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -16,6 +16,7 @@ import terminus.exception.InvalidArgumentException; +import terminus.module.ModuleManager; import terminus.module.NusModule; import terminus.ui.Ui; @@ -85,11 +86,12 @@ public void parseArguments(String arguments) throws InvalidArgumentException { * Prints the relevant response to the Ui. * * @param ui The Ui object to send messages to the users. - * @param module The NusModule contain the list of all notes and schedules. + * @param moduleManager The NusModule contain the list of all notes and schedules. * @return CommandResult to indicate the success and additional information about the execution. */ @Override - public CommandResult execute(Ui ui, NusModule module) { + public CommandResult execute(Ui ui, ModuleManager moduleManager) { + NusModule module = moduleManager.getModule(getModuleName()); ContentManager contentManager = module.getContentManager(Link.class); assert contentManager != null; diff --git a/src/main/java/terminus/module/ModuleManager.java b/src/main/java/terminus/module/ModuleManager.java new file mode 100644 index 0000000000..ebe4c1329c --- /dev/null +++ b/src/main/java/terminus/module/ModuleManager.java @@ -0,0 +1,25 @@ +package terminus.module; + +import java.util.HashMap; +import java.util.Set; + +public class ModuleManager { + + private HashMap moduleMap; + + public ModuleManager () { + moduleMap = new HashMap<>(); + } + public NusModule getModule (String moduleName) { + return moduleMap.get(moduleName); + } + public void setModule(String moduleName) { + moduleMap.put(moduleName,new NusModule()); + } + public String[] getAllModules () { + return moduleMap.keySet().toArray(new String[0]); + } + public void removeModule (String moduleName) { + moduleMap.remove(moduleName); + } +} diff --git a/src/main/java/terminus/module/NusModule.java b/src/main/java/terminus/module/NusModule.java index 271bc8aa7c..55451ac93e 100644 --- a/src/main/java/terminus/module/NusModule.java +++ b/src/main/java/terminus/module/NusModule.java @@ -45,5 +45,4 @@ public ContentManager getContentManager(Class type) { TerminusLogger.info("ContentManager found"); return result; } - } diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java index e3e596e60c..3cc56e5470 100644 --- a/src/main/java/terminus/parser/CommandParser.java +++ b/src/main/java/terminus/parser/CommandParser.java @@ -99,4 +99,8 @@ protected void addCommand(String cmdName, Command command) { public String getWorkspace() { return workspace; } + + public void setWorkspace(String workspace) { + this.workspace = workspace; + } } \ No newline at end of file diff --git a/src/main/java/terminus/parser/InModuleCommandParser.java b/src/main/java/terminus/parser/InModuleCommandParser.java new file mode 100644 index 0000000000..6e3ab14a42 --- /dev/null +++ b/src/main/java/terminus/parser/InModuleCommandParser.java @@ -0,0 +1,35 @@ +package terminus.parser; + +import terminus.command.Command; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; + +public abstract class InModuleCommandParser extends CommandParser { + + private String moduleName; + + /** + * Initializes the commandMap. Adds some default commands to it. + * + * @param workspace The name of the workspace. + */ + public InModuleCommandParser(String workspace) { + super(workspace); + } + + public void setModuleName(String moduleName) { + this.moduleName = moduleName; + } + + @Override + public Command parseCommand(String command) throws InvalidCommandException, InvalidArgumentException { + Command cmd = super.parseCommand(command); + cmd.setModuleName(moduleName); + return cmd; + } + + @Override + public String getWorkspace() { + return moduleName + " > " + super.getWorkspace(); + } +} diff --git a/src/main/java/terminus/parser/LinkCommandParser.java b/src/main/java/terminus/parser/LinkCommandParser.java index aa0359c086..b351012608 100644 --- a/src/main/java/terminus/parser/LinkCommandParser.java +++ b/src/main/java/terminus/parser/LinkCommandParser.java @@ -12,7 +12,7 @@ /** * LinkCommandParser class to manage schedule-related commands. */ -public class LinkCommandParser extends CommandParser { +public class LinkCommandParser extends InModuleCommandParser { public LinkCommandParser() { super(CommonFormat.COMMAND_SCHEDULE); diff --git a/src/main/java/terminus/parser/MainCommandParser.java b/src/main/java/terminus/parser/MainCommandParser.java index 51bc62af16..e2c07dfefe 100644 --- a/src/main/java/terminus/parser/MainCommandParser.java +++ b/src/main/java/terminus/parser/MainCommandParser.java @@ -1,8 +1,7 @@ package terminus.parser; -import terminus.command.NotesCommand; -import terminus.command.ScheduleCommand; -import terminus.common.CommonFormat; +import terminus.command.GoCommand; +import terminus.command.ModuleCommand; import terminus.common.Messages; import terminus.module.NusModule; @@ -16,8 +15,10 @@ public MainCommandParser() { public static MainCommandParser getInstance() { MainCommandParser parser = PARSER; - parser.addCommand(CommonFormat.COMMAND_NOTE, new NotesCommand()); - parser.addCommand(CommonFormat.COMMAND_SCHEDULE, new ScheduleCommand()); + parser.addCommand("module", new ModuleCommand()); + parser.addCommand("go", new GoCommand()); +// parser.addCommand(CommonFormat.COMMAND_NOTE, new NotesCommand()); +// parser.addCommand(CommonFormat.COMMAND_SCHEDULE, new ScheduleCommand()); return parser; } diff --git a/src/main/java/terminus/parser/ModuleCommandParser.java b/src/main/java/terminus/parser/ModuleCommandParser.java new file mode 100644 index 0000000000..83bf49f64b --- /dev/null +++ b/src/main/java/terminus/parser/ModuleCommandParser.java @@ -0,0 +1,34 @@ +package terminus.parser; + +import terminus.command.BackCommand; +import terminus.command.module.AddModuleCommand; +import terminus.command.module.DeleteModuleCommand; +import terminus.command.module.ViewModuleCommand; +import terminus.common.CommonFormat; +import terminus.module.NusModule; + +public class ModuleCommandParser extends CommandParser { + + private static final ModuleCommandParser MODULE_PARSER = new ModuleCommandParser(); + + /** + * Initializes the commandMap. Adds some default commands to it. + */ + public ModuleCommandParser() { + super("module"); + } + + public static ModuleCommandParser getInstance() { + ModuleCommandParser parser = MODULE_PARSER; + parser.addCommand("add", new AddModuleCommand()); + parser.addCommand("view", new ViewModuleCommand()); + parser.addCommand("delete", new DeleteModuleCommand()); + parser.addCommand(CommonFormat.COMMAND_BACK, new BackCommand()); + return parser; + } + + @Override + public String getWorkspaceBanner(NusModule module) { + return "Welcome to the workspace module"; + } +} diff --git a/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java b/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java new file mode 100644 index 0000000000..4b7d82b350 --- /dev/null +++ b/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java @@ -0,0 +1,44 @@ +package terminus.parser; + +import terminus.command.BackCommand; +import terminus.command.Command; +import terminus.command.NotesCommand; +import terminus.command.ScheduleCommand; +import terminus.common.CommonFormat; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.NusModule; + +public class ModuleWorkspaceCommandParser extends CommandParser { + + private static final ModuleWorkspaceCommandParser PARSER = new ModuleWorkspaceCommandParser(); + + /** + * Initializes the commandMap. Adds some default commands to it. + */ + public ModuleWorkspaceCommandParser() { + super(""); + } + + public static ModuleWorkspaceCommandParser getInstance() { + ModuleWorkspaceCommandParser parser = new ModuleWorkspaceCommandParser(); + parser.addCommand(CommonFormat.COMMAND_BACK, new BackCommand()); + parser.addCommand(CommonFormat.COMMAND_NOTE, new NotesCommand()); + parser.addCommand(CommonFormat.COMMAND_SCHEDULE, new ScheduleCommand()); + return parser; + } + + @Override + public Command parseCommand(String command) throws InvalidCommandException, InvalidArgumentException { + Command cmd = super.parseCommand(command); + if (!(cmd instanceof BackCommand)) { + cmd.setModuleName(getWorkspace()); + } + return cmd; + } + + @Override + public String getWorkspaceBanner(NusModule module) { + return "Entering " + getWorkspace() + " workspace"; + } +} diff --git a/src/main/java/terminus/parser/NoteCommandParser.java b/src/main/java/terminus/parser/NoteCommandParser.java index 4c6d4440ed..9474c8d364 100644 --- a/src/main/java/terminus/parser/NoteCommandParser.java +++ b/src/main/java/terminus/parser/NoteCommandParser.java @@ -10,7 +10,7 @@ import terminus.module.NusModule; -public class NoteCommandParser extends CommandParser { +public class NoteCommandParser extends InModuleCommandParser { public NoteCommandParser() { super(CommonFormat.COMMAND_NOTE); diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 6a06da2101..9304aae132 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -6,6 +6,7 @@ import java.nio.file.Files; import java.nio.file.Path; import terminus.common.TerminusLogger; +import terminus.module.ModuleManager; import terminus.module.NusModule; public class ModuleStorage { @@ -44,30 +45,30 @@ private void initializeFile() throws IOException { * @return NusModule based on the contents of the file. * @throws IOException When the file is inaccessible (e.g. file is locked by OS). */ - public NusModule loadFile() throws IOException { + public ModuleManager loadFile() throws IOException { initializeFile(); if (!Files.isReadable(filePath)) { TerminusLogger.severe("File is does not exist or is not readable!"); return null; } TerminusLogger.info("Decoding JSON to object"); - return gson.fromJson(Files.newBufferedReader(filePath), NusModule.class); + return gson.fromJson(Files.newBufferedReader(filePath), ModuleManager.class); } /** * Saves NusModule instance into a JSON file based on GSON. * Throws NullPointerException if the `module` is null. * - * @param module The NusModule to convert to JSON file. + * @param moduleManager The ModuleManager to convert to JSON file. * @throws IOException When the file is inaccessible (e.g. file is locked by OS). */ - public void saveFile(NusModule module) throws IOException { - if (module == null) { + public void saveFile(ModuleManager moduleManager) throws IOException { + if (moduleManager == null) { throw new NullPointerException("module cannot be null!"); } initializeFile(); TerminusLogger.info("Converting NusModule object into String..."); - String jsonString = gson.toJson(module); + String jsonString = gson.toJson(moduleManager); TerminusLogger.info("String conversion completed."); TerminusLogger.info(String.format("Writing to file: %s", filePath.toString())); assert jsonString != null && !jsonString.isBlank() : "File saved is blank"; diff --git a/src/test/java/terminus/storage/ModuleStorageTest.java b/src/test/java/terminus/storage/ModuleStorageTest.java index bd3ec3136d..81a79f8af7 100644 --- a/src/test/java/terminus/storage/ModuleStorageTest.java +++ b/src/test/java/terminus/storage/ModuleStorageTest.java @@ -13,6 +13,7 @@ import org.junit.jupiter.api.Test; import terminus.content.Link; import terminus.content.Note; +import terminus.module.ModuleManager; import terminus.module.NusModule; public class ModuleStorageTest { @@ -21,7 +22,7 @@ public class ModuleStorageTest { private static final Path SAVE_FILE = RESOURCE_FOLDER.resolve("saveFile.json"); private static final Path MALFORMED_FILE = RESOURCE_FOLDER.resolve("malformedFile.json"); private static final Path VALID_FILE = RESOURCE_FOLDER.resolve("validFile.json"); - private NusModule nusModule; + private ModuleManager moduleManager; @BeforeEach void setUp() { @@ -55,9 +56,9 @@ void saveFile_nullArgument_exceptionThrown() { @Test void saveFile_success() throws IOException { - ModuleStorage saveModuleStorage = new ModuleStorage(SAVE_FILE); - saveModuleStorage.saveFile(nusModule); - assertTextFilesEqual(SAVE_FILE, VALID_FILE); +// ModuleStorage saveModuleStorage = new ModuleStorage(SAVE_FILE); +// saveModuleStorage.saveFile(nusModule); +// assertTextFilesEqual(SAVE_FILE, VALID_FILE); } /** From 3b3a11b7c11fc038b8848b566600124f1e4b39cc Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Sat, 16 Oct 2021 18:14:08 +0800 Subject: [PATCH 126/466] Minor code formatting and defensive code --- src/main/java/terminus/Terminus.java | 8 ++++---- .../java/terminus/command/BackCommand.java | 2 +- src/main/java/terminus/command/Command.java | 8 ++++---- .../java/terminus/command/DeleteCommand.java | 10 +++++----- .../java/terminus/command/InModuleCommand.java | 2 ++ .../java/terminus/command/ViewCommand.java | 11 +++++------ .../terminus/command/WorkspaceCommand.java | 4 ---- .../command/module/AddModuleCommand.java | 3 +++ .../java/terminus/module/ModuleManager.java | 16 ++++++++++------ src/main/java/terminus/module/NusModule.java | 2 +- .../java/terminus/parser/CommandParser.java | 5 ++--- .../terminus/parser/MainCommandParser.java | 2 -- .../parser/ModuleWorkspaceCommandParser.java | 2 +- .../java/terminus/storage/ModuleStorage.java | 18 +++++++++--------- 14 files changed, 47 insertions(+), 46 deletions(-) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index a6a136c5e7..e418238171 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -19,10 +19,10 @@ public class Terminus { public static final String[] INVALID_JSON_MESSAGE = { - "Invalid file data detected.", - "TermiNUS will still run, but the file will be overwritten when the next command is ran.", - "To save your current file, close your terminal (do not run exit).", - "Otherwise, you can continue using the program :)" + "Invalid file data detected.", + "TermiNUS will still run, but the file will be overwritten when the next command is ran.", + "To save your current file, close your terminal (do not run exit).", + "Otherwise, you can continue using the program :)" }; private Ui ui; private CommandParser parser; diff --git a/src/main/java/terminus/command/BackCommand.java b/src/main/java/terminus/command/BackCommand.java index a02d901c0d..6a2a8dde24 100644 --- a/src/main/java/terminus/command/BackCommand.java +++ b/src/main/java/terminus/command/BackCommand.java @@ -37,6 +37,6 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidC private boolean isModuleNameNullOrEmpty() { String moduleName = getModuleName(); - return moduleName == null || moduleName.isBlank(); + return moduleName == null || moduleName.isBlank(); } } diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java index 8383c83974..111d805300 100644 --- a/src/main/java/terminus/command/Command.java +++ b/src/main/java/terminus/command/Command.java @@ -9,6 +9,7 @@ public abstract class Command { protected String arguments; private String moduleName; + public Command() { } @@ -39,13 +40,12 @@ public void parseArguments(String arguments) } /** - * Executes the command. - * Prints the required result to the Ui. + * Executes the command. Prints the required result to the Ui. * - * @param ui The Ui object to send messages to the users. + * @param ui The Ui object to send messages to the users. * @param moduleManager The NusModule contain the ContentManager of all notes and schedules. * @return The CommandResult object indicating the success of failure including additional options. - * @throws InvalidCommandException when the command could not be found. + * @throws InvalidCommandException when the command could not be found. * @throws InvalidArgumentException when arguments parsing fails. */ public abstract CommandResult execute(Ui ui, ModuleManager moduleManager) diff --git a/src/main/java/terminus/command/DeleteCommand.java b/src/main/java/terminus/command/DeleteCommand.java index 24cb0debd7..18bce99831 100644 --- a/src/main/java/terminus/command/DeleteCommand.java +++ b/src/main/java/terminus/command/DeleteCommand.java @@ -41,8 +41,8 @@ public String getHelpMessage() { } /** - * Parses the arguments to the DeleteCommand object. - * The arguments are attributes to identify a Content object in an ArrayList. + * Parses the arguments to the DeleteCommand object. The arguments are attributes to identify a Content object in an + * ArrayList. * * @param arguments The string arguments to be parsed in to the respective fields. * @throws InvalidArgumentException when argument provided is empty, non-numeric or less than 1. @@ -66,10 +66,10 @@ public void parseArguments(String arguments) throws InvalidArgumentException { } /** - * Executes the delete command. - * Prints the relevant response to the Ui and the specified Content object will be removed from the arraylist. + * Executes the delete command. Prints the relevant response to the Ui and the specified Content object will be + * removed from the arraylist. * - * @param ui The Ui object to send messages to the users. + * @param ui The Ui object to send messages to the users. * @param moduleManager The NusModule contain the ContentManager of all notes and schedules. * @return CommandResult to indicate the success and additional information about the execution. * @throws InvalidArgumentException when argument provided is index out of bounds of the ArrayList. diff --git a/src/main/java/terminus/command/InModuleCommand.java b/src/main/java/terminus/command/InModuleCommand.java index d76a7797c0..a340d72f8b 100644 --- a/src/main/java/terminus/command/InModuleCommand.java +++ b/src/main/java/terminus/command/InModuleCommand.java @@ -3,10 +3,12 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; +import terminus.parser.CommandParser; import terminus.parser.InModuleCommandParser; import terminus.ui.Ui; public abstract class InModuleCommand extends WorkspaceCommand { + private InModuleCommandParser commandMap; public InModuleCommand(InModuleCommandParser commandMap) { diff --git a/src/main/java/terminus/command/ViewCommand.java b/src/main/java/terminus/command/ViewCommand.java index 472f4d33e2..1dadb297af 100644 --- a/src/main/java/terminus/command/ViewCommand.java +++ b/src/main/java/terminus/command/ViewCommand.java @@ -47,9 +47,9 @@ public String getHelpMessage() { } /** - * Parses the arguments to the ViewModuleCommand object. - * The arguments are attributes to identify a Content object in an ArrayList. The arguments can be empty which - * refers to viewing a list all Content object in an ArrayList instead. + * Parses the arguments to the ViewModuleCommand object. The arguments are attributes to identify a Content object + * in an ArrayList. The arguments can be empty which refers to viewing a list all Content object in an ArrayList + * instead. * * @param arguments The string arguments to be parsed in to the respective fields. * @throws InvalidArgumentException when a non-empty argument provided is non-numeric or less than 1. @@ -75,10 +75,9 @@ public void parseArguments(String arguments) throws InvalidArgumentException { } /** - * Executes the view command. - * Prints the relevant response to the Ui. + * Executes the view command. Prints the relevant response to the Ui. * - * @param ui The Ui object to send messages to the users. + * @param ui The Ui object to send messages to the users. * @param moduleManager The NusModule contain the ContentManager of all notes and schedules. * @return CommandResult to indicate the success and additional information about the execution. * @throws InvalidArgumentException when argument provided is index out of bounds of the ArrayList. diff --git a/src/main/java/terminus/command/WorkspaceCommand.java b/src/main/java/terminus/command/WorkspaceCommand.java index 40bd0e9bbd..3799ea81a8 100644 --- a/src/main/java/terminus/command/WorkspaceCommand.java +++ b/src/main/java/terminus/command/WorkspaceCommand.java @@ -5,7 +5,6 @@ import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; import terminus.parser.CommandParser; -import terminus.parser.InModuleCommandParser; import terminus.ui.Ui; public abstract class WorkspaceCommand extends Command { @@ -17,9 +16,6 @@ public WorkspaceCommand(CommandParser commandMap) { this.commandMap = commandMap; } - public WorkspaceCommand(InModuleCommandParser commandMap) { - this.commandMap = commandMap; - } /** * Returns the Command Result after execution. If no other arguments, returns the workspace. diff --git a/src/main/java/terminus/command/module/AddModuleCommand.java b/src/main/java/terminus/command/module/AddModuleCommand.java index 666d03eb48..1a5aea2ea3 100644 --- a/src/main/java/terminus/command/module/AddModuleCommand.java +++ b/src/main/java/terminus/command/module/AddModuleCommand.java @@ -61,6 +61,9 @@ public void parseArguments(String arguments) throws InvalidArgumentException { */ @Override public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidCommandException, InvalidArgumentException { + if (moduleManager.getModule(moduleName) != null) { + throw new InvalidArgumentException("Module already exist!"); + } moduleManager.setModule(moduleName); ui.printSection(String.format("Module %s has been added",moduleName)); return new CommandResult(true); diff --git a/src/main/java/terminus/module/ModuleManager.java b/src/main/java/terminus/module/ModuleManager.java index ebe4c1329c..2e69aa32ca 100644 --- a/src/main/java/terminus/module/ModuleManager.java +++ b/src/main/java/terminus/module/ModuleManager.java @@ -5,21 +5,25 @@ public class ModuleManager { - private HashMap moduleMap; + private HashMap moduleMap; - public ModuleManager () { + public ModuleManager() { moduleMap = new HashMap<>(); } - public NusModule getModule (String moduleName) { + + public NusModule getModule(String moduleName) { return moduleMap.get(moduleName); } + public void setModule(String moduleName) { - moduleMap.put(moduleName,new NusModule()); + moduleMap.put(moduleName, new NusModule()); } - public String[] getAllModules () { + + public String[] getAllModules() { return moduleMap.keySet().toArray(new String[0]); } - public void removeModule (String moduleName) { + + public void removeModule(String moduleName) { moduleMap.remove(moduleName); } } diff --git a/src/main/java/terminus/module/NusModule.java b/src/main/java/terminus/module/NusModule.java index 55451ac93e..2dfa1e580f 100644 --- a/src/main/java/terminus/module/NusModule.java +++ b/src/main/java/terminus/module/NusModule.java @@ -26,7 +26,7 @@ public NusModule() { * Returns a ContentManager object based on the provided class type. * * @param type Content class type. - * @param Content object type. + * @param Content object type. * @return The ContentManager object based on the provided class type. */ public ContentManager getContentManager(Class type) { diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java index 3cc56e5470..0492d91fb9 100644 --- a/src/main/java/terminus/parser/CommandParser.java +++ b/src/main/java/terminus/parser/CommandParser.java @@ -18,8 +18,7 @@ public abstract class CommandParser { protected final HashMap commandMap; /** - * Initializes the commandMap. - * Adds some default commands to it. + * Initializes the commandMap. Adds some default commands to it. * * @param workspace The name of the workspace. */ @@ -36,7 +35,7 @@ public CommandParser(String workspace) { * * @param command The user input command. * @return The Command object to be executed. - * @throws InvalidCommandException when there is no command or empty command. + * @throws InvalidCommandException when there is no command or empty command. * @throws InvalidArgumentException when arguments could not be parsed. */ diff --git a/src/main/java/terminus/parser/MainCommandParser.java b/src/main/java/terminus/parser/MainCommandParser.java index e2c07dfefe..e1db9d769b 100644 --- a/src/main/java/terminus/parser/MainCommandParser.java +++ b/src/main/java/terminus/parser/MainCommandParser.java @@ -17,8 +17,6 @@ public static MainCommandParser getInstance() { MainCommandParser parser = PARSER; parser.addCommand("module", new ModuleCommand()); parser.addCommand("go", new GoCommand()); -// parser.addCommand(CommonFormat.COMMAND_NOTE, new NotesCommand()); -// parser.addCommand(CommonFormat.COMMAND_SCHEDULE, new ScheduleCommand()); return parser; } diff --git a/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java b/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java index 4b7d82b350..8dbb1c44f0 100644 --- a/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java +++ b/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java @@ -30,7 +30,7 @@ public static ModuleWorkspaceCommandParser getInstance() { @Override public Command parseCommand(String command) throws InvalidCommandException, InvalidArgumentException { - Command cmd = super.parseCommand(command); + Command cmd = super.parseCommand(command); if (!(cmd instanceof BackCommand)) { cmd.setModuleName(getWorkspace()); } diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 9304aae132..c3e1471bf4 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -10,19 +10,20 @@ import terminus.module.NusModule; public class ModuleStorage { - + private final Path filePath; private final Gson gson; /** * Initializes the ModuleStorage with a specific Path to the file. + * * @param filePath The Path to the file to store at. */ public ModuleStorage(Path filePath) { this.filePath = filePath; this.gson = new GsonBuilder().setPrettyPrinting().create(); } - + private void initializeFile() throws IOException { assert filePath != null : "filePath should not be null"; if (!Files.isDirectory(filePath.getParent())) { @@ -39,9 +40,9 @@ private void initializeFile() throws IOException { } /** - * Loads a JSON file and parses it as a NusModule object based on GSON. - * Returns null if the file does not exist or the file is not in a valid format. - * + * Loads a JSON file and parses it as a NusModule object based on GSON. Returns null if the file does not exist or + * the file is not in a valid format. + * * @return NusModule based on the contents of the file. * @throws IOException When the file is inaccessible (e.g. file is locked by OS). */ @@ -56,9 +57,8 @@ public ModuleManager loadFile() throws IOException { } /** - * Saves NusModule instance into a JSON file based on GSON. - * Throws NullPointerException if the `module` is null. - * + * Saves NusModule instance into a JSON file based on GSON. Throws NullPointerException if the `module` is null. + * * @param moduleManager The ModuleManager to convert to JSON file. * @throws IOException When the file is inaccessible (e.g. file is locked by OS). */ @@ -74,5 +74,5 @@ public void saveFile(ModuleManager moduleManager) throws IOException { assert jsonString != null && !jsonString.isBlank() : "File saved is blank"; Files.writeString(filePath, jsonString); } - + } From 83ba48bacef62e3d34f99f8ff55440f989898026 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Sat, 16 Oct 2021 18:16:38 +0800 Subject: [PATCH 127/466] Remove Error Message --- src/main/java/terminus/Terminus.java | 2 -- .../java/terminus/command/CommandResult.java | 18 ++++-------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index e418238171..1db272a949 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -103,8 +103,6 @@ private void runCommandsUntilExit() { assert parser != null : "commandParser is not null"; workspace = parser.getWorkspace(); ui.printParserBanner(parser, nusModule); - } else if (!result.isOk()) { - ui.printSection(result.getErrorMessage()); } TerminusLogger.info("Saving data into file..."); this.moduleStorage.saveFile(moduleManager); diff --git a/src/main/java/terminus/command/CommandResult.java b/src/main/java/terminus/command/CommandResult.java index 80f02fdb06..590621b0db 100644 --- a/src/main/java/terminus/command/CommandResult.java +++ b/src/main/java/terminus/command/CommandResult.java @@ -7,28 +7,26 @@ public class CommandResult { protected CommandParser additionalData; protected boolean isOk; protected boolean isExit; - protected String errorMessage; public CommandResult(boolean isOk) { this(isOk, false); } public CommandResult(boolean isOk, boolean isExit) { - this(isOk, isExit, null, null); + this(isOk, isExit, null); } public CommandResult(boolean isOk, CommandParser additionalData) { - this(isOk, false, additionalData, null); + this(isOk, false, additionalData ); } public CommandResult(boolean isOk, String errorMessage) { - this(isOk, false, null, errorMessage); + this(isOk, false, null); } - public CommandResult(boolean isOk, boolean isExit, CommandParser additionalData, String errorMessage) { + public CommandResult(boolean isOk, boolean isExit, CommandParser additionalData) { this.additionalData = additionalData; this.isOk = isOk; - this.errorMessage = errorMessage; this.isExit = isExit; } @@ -60,12 +58,4 @@ public boolean isExit() { return isExit; } - /** - * Returns the error message as a String. - * - * @return The String object containing the error. - */ - public String getErrorMessage() { - return errorMessage; - } } From 7cf6716eb06a7b8fcd15705904d0138461e6178c Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Sat, 16 Oct 2021 23:10:30 +0800 Subject: [PATCH 128/466] Fix all Junit test --- .../terminus/command/NoteCommandTest.java | 60 +++++++++++++++++++ .../terminus/command/NotesCommandTest.java | 56 ----------------- .../terminus/command/ScheduleCommandTest.java | 44 ++++++++------ 3 files changed, 86 insertions(+), 74 deletions(-) create mode 100644 src/test/java/terminus/command/NoteCommandTest.java delete mode 100644 src/test/java/terminus/command/NotesCommandTest.java diff --git a/src/test/java/terminus/command/NoteCommandTest.java b/src/test/java/terminus/command/NoteCommandTest.java new file mode 100644 index 0000000000..90357d3ac1 --- /dev/null +++ b/src/test/java/terminus/command/NoteCommandTest.java @@ -0,0 +1,60 @@ +package terminus.command; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.content.Note; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; +import terminus.module.NusModule; +import terminus.parser.MainCommandParser; +import terminus.parser.NoteCommandParser; +import terminus.ui.Ui; + +public class ScheduleCommandTest { + + private MainCommandParser commandParser; + private Ui ui; + + private ModuleManager moduleManager; + + private String tempModule = "test"; + + @BeforeEach + void setUp() { + commandParser = MainCommandParser.getInstance(); + moduleManager = new ModuleManager(); + moduleManager.setModule(tempModule); + ui = new Ui(); + } + + @Test + void execute_scheduleAdvance_success() throws InvalidArgumentException, InvalidCommandException { + Command mainCommand = commandParser.parseCommand("go " + tempModule + " note"); + CommandResult changeResult = mainCommand.execute(ui, moduleManager); + assertTrue(changeResult.isOk()); + assertTrue(changeResult.getAdditionalData() instanceof NoteCommandParser); + mainCommand = commandParser.parseCommand("go " + tempModule + " note add \"username\" \"password\""); + changeResult = mainCommand.execute(ui, moduleManager); + assertTrue(changeResult.isOk()); + assertEquals(1, moduleManager.getModule(tempModule).getContentManager(Note.class).getTotalContents()); + mainCommand = commandParser.parseCommand("go " + tempModule + " note view"); + changeResult = mainCommand.execute(ui, moduleManager); + assertTrue(changeResult.isOk()); + } + + @Test + void execute_scheduleAdvance_throwsException() throws InvalidArgumentException, InvalidCommandException { + assertThrows(InvalidCommandException.class, + () -> commandParser.parseCommand("go " + tempModule + " note -1").execute(ui, moduleManager)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("go " + tempModule + " note view 100").execute(ui, moduleManager)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("go " + tempModule + " note delete -1").execute(ui, moduleManager)); + + } +} diff --git a/src/test/java/terminus/command/NotesCommandTest.java b/src/test/java/terminus/command/NotesCommandTest.java deleted file mode 100644 index 9c011e6757..0000000000 --- a/src/test/java/terminus/command/NotesCommandTest.java +++ /dev/null @@ -1,56 +0,0 @@ -package terminus.command; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import terminus.content.Link; -import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidCommandException; -import terminus.module.NusModule; -import terminus.parser.LinkCommandParser; -import terminus.parser.MainCommandParser; -import terminus.ui.Ui; - -public class NotesCommandTest { - - private MainCommandParser commandParser; - private Ui ui; - private NusModule nusModule; - - @BeforeEach - void setUp() { - commandParser = MainCommandParser.getInstance(); - ui = new Ui(); - nusModule = new NusModule(); - } - - @Test - void execute_linkAdvance_success() throws InvalidArgumentException, InvalidCommandException { - Command mainCommand = commandParser.parseCommand("schedule"); - CommandResult changeResult = mainCommand.execute(ui, nusModule); - assertTrue(changeResult.isOk()); - assertTrue(changeResult.getAdditionalData() instanceof LinkCommandParser); - mainCommand = commandParser.parseCommand("schedule add \"test\" \"Thursday\" \"00:00\" \"https://zoom.us\""); - changeResult = mainCommand.execute(ui, nusModule); - assertTrue(changeResult.isOk()); - assertEquals(1, nusModule.getContentManager(Link.class).getTotalContents()); - mainCommand = commandParser.parseCommand("schedule view"); - changeResult = mainCommand.execute(ui, nusModule); - assertTrue(changeResult.isOk()); - } - - @Test - void execute_linkAdvance_throwsException() throws InvalidArgumentException, InvalidCommandException { - assertThrows(InvalidCommandException.class, - () -> commandParser.parseCommand("schedule -1").execute(ui, nusModule)); - assertThrows(InvalidArgumentException.class, - () -> commandParser.parseCommand("schedule add \"test\" \"Thursday\" \"00:00\" \"test.com\"") - .execute(ui, nusModule)); - assertThrows(InvalidArgumentException.class, - () -> commandParser.parseCommand("schedule delete -1").execute(ui, nusModule)); - - } -} diff --git a/src/test/java/terminus/command/ScheduleCommandTest.java b/src/test/java/terminus/command/ScheduleCommandTest.java index cb54ed9ae4..f2cde5efe6 100644 --- a/src/test/java/terminus/command/ScheduleCommandTest.java +++ b/src/test/java/terminus/command/ScheduleCommandTest.java @@ -6,50 +6,58 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import terminus.content.Note; +import terminus.content.Link; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; import terminus.module.NusModule; +import terminus.parser.LinkCommandParser; import terminus.parser.MainCommandParser; -import terminus.parser.NoteCommandParser; import terminus.ui.Ui; -public class ScheduleCommandTest { +public class NotesCommandTest { private MainCommandParser commandParser; private Ui ui; - private NusModule nusModule; + private ModuleManager moduleManager; + + private String tempModule = "test"; @BeforeEach void setUp() { commandParser = MainCommandParser.getInstance(); + moduleManager = new ModuleManager(); + moduleManager.setModule(tempModule); ui = new Ui(); - nusModule = new NusModule(); } @Test - void execute_scheduleAdvance_success() throws InvalidArgumentException, InvalidCommandException { - Command mainCommand = commandParser.parseCommand("note"); - CommandResult changeResult = mainCommand.execute(ui, nusModule); + void execute_linkAdvance_success() throws InvalidArgumentException, InvalidCommandException { + Command mainCommand = commandParser.parseCommand("go " + tempModule + " schedule"); + CommandResult changeResult = mainCommand.execute(ui, moduleManager); assertTrue(changeResult.isOk()); - assertTrue(changeResult.getAdditionalData() instanceof NoteCommandParser); - mainCommand = commandParser.parseCommand("note add \"username\" \"password\""); - changeResult = mainCommand.execute(ui, nusModule); + assertTrue(changeResult.getAdditionalData() instanceof LinkCommandParser); + mainCommand = commandParser.parseCommand("go " + tempModule + " schedule add \"test\" \"Thursday\" \"00:00\" " + + "\"https://zoom.us\""); + changeResult = mainCommand.execute(ui, moduleManager); assertTrue(changeResult.isOk()); - assertEquals(1, nusModule.getContentManager(Note.class).getTotalContents()); - mainCommand = commandParser.parseCommand("note view"); - changeResult = mainCommand.execute(ui, nusModule); + assertEquals(1, moduleManager.getModule(tempModule).getContentManager(Link.class).getTotalContents()); + mainCommand = commandParser.parseCommand("go " + tempModule + " schedule view"); + changeResult = mainCommand.execute(ui, moduleManager); assertTrue(changeResult.isOk()); } @Test - void execute_scheduleAdvance_throwsException() throws InvalidArgumentException, InvalidCommandException { + void execute_linkAdvance_throwsException() throws InvalidArgumentException, InvalidCommandException { assertThrows(InvalidCommandException.class, - () -> commandParser.parseCommand("schedule -1").execute(ui, nusModule)); + () -> commandParser.parseCommand("go " + tempModule + " schedule -1").execute(ui, moduleManager)); assertThrows(InvalidArgumentException.class, - () -> commandParser.parseCommand("schedule view 100").execute(ui, nusModule)); + () -> commandParser.parseCommand( + "go " + tempModule + " schedule add \"test\" \"Thursday\" \"00:00\" \"test.com\"") + .execute(ui, moduleManager)); assertThrows(InvalidArgumentException.class, - () -> commandParser.parseCommand("note delete -1").execute(ui, nusModule)); + () -> commandParser.parseCommand("go " + tempModule + " schedule delete -1") + .execute(ui, moduleManager)); } } From b4adb52a1b6daf7198f57beacc63f827af6c4efe Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Sat, 16 Oct 2021 23:10:53 +0800 Subject: [PATCH 129/466] Fix all Junit test --- src/main/java/terminus/Terminus.java | 8 ++-- .../java/terminus/command/CommandResult.java | 6 +-- src/main/java/terminus/command/GoCommand.java | 14 +++--- .../command/module/AddModuleCommand.java | 15 +++--- .../terminus/command/ExitCommandTest.java | 29 ++++++++---- .../terminus/command/HelpCommandTest.java | 21 +++++++-- .../terminus/command/NoteCommandTest.java | 2 +- .../terminus/command/ScheduleCommandTest.java | 14 +++--- .../command/link/AddLinkCommandTest.java | 25 ++++++---- .../command/link/BackLinkCommandTest.java | 15 ++++-- .../command/link/DeleteLinkCommandTest.java | 23 ++++++---- .../command/link/ViewLinkCommandTest.java | 29 +++++++----- .../command/note/AddNoteCommandTest.java | 21 +++++---- .../command/note/BackNoteCommandTest.java | 15 ++++-- .../command/note/DeleteNoteCommandTest.java | 23 ++++++---- .../command/note/ViewNoteCommandTest.java | 30 +++++++----- .../parser/LinkCommandParserTest.java | 7 +-- .../parser/MainCommandParserTest.java | 25 ++++++---- .../parser/NoteCommandParserTest.java | 9 ++-- .../terminus/storage/ModuleStorageTest.java | 29 ++++++------ src/test/resources/saveFile.json | 46 ++++++++++--------- src/test/resources/validFile.json | 46 ++++++++++--------- 22 files changed, 273 insertions(+), 179 deletions(-) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 1db272a949..1817bdc50d 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -19,10 +19,10 @@ public class Terminus { public static final String[] INVALID_JSON_MESSAGE = { - "Invalid file data detected.", - "TermiNUS will still run, but the file will be overwritten when the next command is ran.", - "To save your current file, close your terminal (do not run exit).", - "Otherwise, you can continue using the program :)" + "Invalid file data detected.", + "TermiNUS will still run, but the file will be overwritten when the next command is ran.", + "To save your current file, close your terminal (do not run exit).", + "Otherwise, you can continue using the program :)" }; private Ui ui; private CommandParser parser; diff --git a/src/main/java/terminus/command/CommandResult.java b/src/main/java/terminus/command/CommandResult.java index 590621b0db..de6b682792 100644 --- a/src/main/java/terminus/command/CommandResult.java +++ b/src/main/java/terminus/command/CommandResult.java @@ -7,17 +7,17 @@ public class CommandResult { protected CommandParser additionalData; protected boolean isOk; protected boolean isExit; - + public CommandResult(boolean isOk) { this(isOk, false); } - + public CommandResult(boolean isOk, boolean isExit) { this(isOk, isExit, null); } public CommandResult(boolean isOk, CommandParser additionalData) { - this(isOk, false, additionalData ); + this(isOk, false, additionalData); } public CommandResult(boolean isOk, String errorMessage) { diff --git a/src/main/java/terminus/command/GoCommand.java b/src/main/java/terminus/command/GoCommand.java index 83c86e6eb2..ddd89fa129 100644 --- a/src/main/java/terminus/command/GoCommand.java +++ b/src/main/java/terminus/command/GoCommand.java @@ -8,8 +8,10 @@ import terminus.parser.ModuleWorkspaceCommandParser; import terminus.ui.Ui; -public class GoCommand extends WorkspaceCommand{ +public class GoCommand extends WorkspaceCommand { + private String moduleName; + public GoCommand() { super(ModuleWorkspaceCommandParser.getInstance()); } @@ -39,11 +41,11 @@ public void parseArguments(String arguments) throws InvalidArgumentException { if (arguments == null || arguments.isBlank()) { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } - String[] args = arguments.strip().split("\\s+", 2); - moduleName = args[0]; - if (args.length > 1) { - super.parseArguments(args[1]); - } + String[] args = arguments.strip().split("\\s+", 2); + moduleName = args[0]; + if (args.length > 1) { + super.parseArguments(args[1]); + } } @Override diff --git a/src/main/java/terminus/command/module/AddModuleCommand.java b/src/main/java/terminus/command/module/AddModuleCommand.java index 1a5aea2ea3..0464853526 100644 --- a/src/main/java/terminus/command/module/AddModuleCommand.java +++ b/src/main/java/terminus/command/module/AddModuleCommand.java @@ -12,7 +12,9 @@ import terminus.ui.Ui; public class AddModuleCommand extends Command { + private String moduleName; + /** * Returns the format for the command. * @@ -53,24 +55,25 @@ public void parseArguments(String arguments) throws InvalidArgumentException { /** * Executes the command. Prints the required result to the Ui. * - * @param ui The Ui object to send messages to the users. + * @param ui The Ui object to send messages to the users. * @param moduleManager The NusModule contain the ContentManager of all notes and schedules. * @return The CommandResult object indicating the success of failure including additional options. - * @throws InvalidCommandException when the command could not be found. + * @throws InvalidCommandException when the command could not be found. * @throws InvalidArgumentException when arguments parsing fails. */ @Override - public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidCommandException, InvalidArgumentException { + public CommandResult execute(Ui ui, ModuleManager moduleManager) + throws InvalidCommandException, InvalidArgumentException { if (moduleManager.getModule(moduleName) != null) { throw new InvalidArgumentException("Module already exist!"); } moduleManager.setModule(moduleName); - ui.printSection(String.format("Module %s has been added",moduleName)); + ui.printSection(String.format("Module %s has been added", moduleName)); return new CommandResult(true); } - private boolean isValidModuleArguments (ArrayList argArray) { - if(argArray.size() != 1) { + private boolean isValidModuleArguments(ArrayList argArray) { + if (argArray.size() != 1) { return false; } else { return !CommonUtils.hasEmptyString(argArray); diff --git a/src/test/java/terminus/command/ExitCommandTest.java b/src/test/java/terminus/command/ExitCommandTest.java index 90066d13df..b929768607 100644 --- a/src/test/java/terminus/command/ExitCommandTest.java +++ b/src/test/java/terminus/command/ExitCommandTest.java @@ -7,37 +7,50 @@ import terminus.common.CommonFormat; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; import terminus.module.NusModule; import terminus.parser.MainCommandParser; import terminus.ui.Ui; public class ExitCommandTest { - + private MainCommandParser commandParser; - private NusModule nusModule; + private ModuleManager moduleManager; private Ui ui; + private String tempModule = "test"; + @BeforeEach void setUp() { this.commandParser = MainCommandParser.getInstance(); - this.nusModule = new NusModule(); + this.moduleManager = new ModuleManager(); + moduleManager.setModule(tempModule); this.ui = new Ui(); } @Test void execute_success() throws InvalidArgumentException, InvalidCommandException { Command exitCommand = commandParser.parseCommand(CommonFormat.COMMAND_EXIT); - CommandResult mainResult = exitCommand.execute(ui, nusModule); + CommandResult mainResult = exitCommand.execute(ui, moduleManager); assertTrue(mainResult.isOk() && mainResult.isExit()); Command noteExitCommand = commandParser - .parseCommand(CommonFormat.COMMAND_NOTE + " " + CommonFormat.COMMAND_EXIT); - CommandResult noteResult = noteExitCommand.execute(ui, nusModule); + .parseCommand("go " + tempModule + " " + CommonFormat.COMMAND_NOTE + " " + CommonFormat.COMMAND_EXIT); + CommandResult noteResult = noteExitCommand.execute(ui, moduleManager); assertTrue(noteResult.isOk() && noteResult.isExit()); Command scheduleExitCommand = commandParser - .parseCommand(CommonFormat.COMMAND_SCHEDULE + " " + CommonFormat.COMMAND_EXIT); - CommandResult scheduleExitResult = scheduleExitCommand.execute(ui, nusModule); + .parseCommand("go " + tempModule + " " + CommonFormat.COMMAND_SCHEDULE + " " + CommonFormat.COMMAND_EXIT); + CommandResult scheduleExitResult = scheduleExitCommand.execute(ui, moduleManager); assertTrue(scheduleExitResult.isOk() && scheduleExitResult.isExit()); + + Command goCommandExitCommand = commandParser.parseCommand("go " + tempModule + " " + CommonFormat.COMMAND_EXIT); + CommandResult goCommandExitCommandResult = scheduleExitCommand.execute(ui, moduleManager); + assertTrue(goCommandExitCommandResult.isOk() && goCommandExitCommandResult.isExit()); + + Command moduleCommandExitCommand = + commandParser.parseCommand("module " + CommonFormat.COMMAND_EXIT); + CommandResult moduleCommandExitCommandResult = scheduleExitCommand.execute(ui, moduleManager); + assertTrue(moduleCommandExitCommandResult.isOk() && moduleCommandExitCommandResult.isExit()); } } diff --git a/src/test/java/terminus/command/HelpCommandTest.java b/src/test/java/terminus/command/HelpCommandTest.java index 499c8d2977..90829dae68 100644 --- a/src/test/java/terminus/command/HelpCommandTest.java +++ b/src/test/java/terminus/command/HelpCommandTest.java @@ -6,9 +6,11 @@ import org.junit.jupiter.api.Test; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; import terminus.module.NusModule; import terminus.parser.LinkCommandParser; import terminus.parser.MainCommandParser; +import terminus.parser.ModuleCommandParser; import terminus.parser.NoteCommandParser; import terminus.ui.Ui; @@ -17,25 +19,34 @@ public class HelpCommandTest { private MainCommandParser mainCommandParser; private NoteCommandParser noteCommandParser; private LinkCommandParser linkCommandParser; + private ModuleCommandParser moduleCommandParser; private Ui ui; - private NusModule nusModule; + private ModuleManager moduleManager; + + private String tempModule = "test"; @BeforeEach void setUp() { mainCommandParser = MainCommandParser.getInstance(); noteCommandParser = NoteCommandParser.getInstance(); + noteCommandParser.setModuleName(tempModule); linkCommandParser = LinkCommandParser.getInstance(); + linkCommandParser.setModuleName(tempModule); + moduleCommandParser = ModuleCommandParser.getInstance(); ui = new Ui(); - nusModule = new NusModule(); + moduleManager = new ModuleManager(); + moduleManager.setModule(tempModule); } @Test void execute_helpCommand_success() throws InvalidArgumentException, InvalidCommandException { - CommandResult result = mainCommandParser.parseCommand("help").execute(ui, nusModule); + CommandResult result = mainCommandParser.parseCommand("help").execute(ui, moduleManager); + assertTrue(result.isOk()); + result = noteCommandParser.parseCommand("help").execute(ui, moduleManager); assertTrue(result.isOk()); - result = noteCommandParser.parseCommand("help").execute(ui, nusModule); + result = linkCommandParser.parseCommand("help").execute(ui, moduleManager); assertTrue(result.isOk()); - result = linkCommandParser.parseCommand("help").execute(ui, nusModule); + result = moduleCommandParser.parseCommand("help").execute(ui, moduleManager); assertTrue(result.isOk()); } } diff --git a/src/test/java/terminus/command/NoteCommandTest.java b/src/test/java/terminus/command/NoteCommandTest.java index 90357d3ac1..76153f923c 100644 --- a/src/test/java/terminus/command/NoteCommandTest.java +++ b/src/test/java/terminus/command/NoteCommandTest.java @@ -15,7 +15,7 @@ import terminus.parser.NoteCommandParser; import terminus.ui.Ui; -public class ScheduleCommandTest { +public class NoteCommandTest { private MainCommandParser commandParser; private Ui ui; diff --git a/src/test/java/terminus/command/ScheduleCommandTest.java b/src/test/java/terminus/command/ScheduleCommandTest.java index f2cde5efe6..c03a711a86 100644 --- a/src/test/java/terminus/command/ScheduleCommandTest.java +++ b/src/test/java/terminus/command/ScheduleCommandTest.java @@ -15,7 +15,7 @@ import terminus.parser.MainCommandParser; import terminus.ui.Ui; -public class NotesCommandTest { +public class ScheduleCommandTest { private MainCommandParser commandParser; private Ui ui; @@ -50,14 +50,14 @@ void execute_linkAdvance_success() throws InvalidArgumentException, InvalidComma @Test void execute_linkAdvance_throwsException() throws InvalidArgumentException, InvalidCommandException { assertThrows(InvalidCommandException.class, - () -> commandParser.parseCommand("go " + tempModule + " schedule -1").execute(ui, moduleManager)); + () -> commandParser.parseCommand("go " + tempModule + " schedule -1").execute(ui, moduleManager)); assertThrows(InvalidArgumentException.class, - () -> commandParser.parseCommand( - "go " + tempModule + " schedule add \"test\" \"Thursday\" \"00:00\" \"test.com\"") - .execute(ui, moduleManager)); + () -> commandParser.parseCommand( + "go " + tempModule + " schedule add \"test\" \"Thursday\" \"00:00\" \"test.com\"") + .execute(ui, moduleManager)); assertThrows(InvalidArgumentException.class, - () -> commandParser.parseCommand("go " + tempModule + " schedule delete -1") - .execute(ui, moduleManager)); + () -> commandParser.parseCommand("go " + tempModule + " schedule delete -1") + .execute(ui, moduleManager)); } } diff --git a/src/test/java/terminus/command/link/AddLinkCommandTest.java b/src/test/java/terminus/command/link/AddLinkCommandTest.java index 7f9b01856c..733a22d803 100644 --- a/src/test/java/terminus/command/link/AddLinkCommandTest.java +++ b/src/test/java/terminus/command/link/AddLinkCommandTest.java @@ -12,6 +12,7 @@ import terminus.content.Link; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; import terminus.module.NusModule; import terminus.parser.LinkCommandParser; import terminus.ui.Ui; @@ -19,15 +20,19 @@ public class AddLinkCommandTest { private LinkCommandParser linkCommandParser; - private NusModule nusModule; + private ModuleManager moduleManager; private Ui ui; + private String tempModule = "test"; + Class type = Link.class; @BeforeEach void setUp() { + this.moduleManager = new ModuleManager(); + moduleManager.setModule(tempModule); this.linkCommandParser = LinkCommandParser.getInstance(); - this.nusModule = new NusModule(); + this.linkCommandParser.setModuleName(tempModule); this.ui = new Ui(); } @@ -44,20 +49,20 @@ void parseArguments_addLinkCommand_success() { @Test void execute_addLinkCommand_success() throws InvalidCommandException, InvalidArgumentException { Command addLinkCommand = linkCommandParser.parseCommand("add \"test\" \"Monday\" \"00:00\" \"https://zoom.us/test\""); - CommandResult addResult = addLinkCommand.execute(ui, nusModule); + CommandResult addResult = addLinkCommand.execute(ui, moduleManager); assertTrue(addResult.isOk()); - assertEquals(1, nusModule.getContentManager(type).getTotalContents()); - assertTrue(nusModule.getContentManager(type).getContentData(1).contains("test")); - assertTrue(nusModule.getContentManager(type).getContentData(1).contains("Monday")); - assertTrue(nusModule.getContentManager(type).getContentData(1).contains("00:00")); - assertTrue(nusModule.getContentManager(type).getContentData(1).contains("https://zoom.us/test")); + assertEquals(1, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); + assertTrue(moduleManager.getModule(tempModule).getContentManager(type).getContentData(1).contains("test")); + assertTrue(moduleManager.getModule(tempModule).getContentManager(type).getContentData(1).contains("Monday")); + assertTrue(moduleManager.getModule(tempModule).getContentManager(type).getContentData(1).contains("00:00")); + assertTrue(moduleManager.getModule(tempModule).getContentManager(type).getContentData(1).contains("https://zoom.us/test")); for (int i = 0; i < 5; i++) { addLinkCommand = linkCommandParser.parseCommand( "add \"test\" \"Saturday\" \"00:00\" \"https://zoom.us/test\""); - addResult = addLinkCommand.execute(ui, nusModule); + addResult = addLinkCommand.execute(ui, moduleManager); assertTrue(addResult.isOk()); } - assertEquals(6, nusModule.getContentManager(type).getTotalContents()); + assertEquals(6, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); } } \ No newline at end of file diff --git a/src/test/java/terminus/command/link/BackLinkCommandTest.java b/src/test/java/terminus/command/link/BackLinkCommandTest.java index 7cf14e9aa5..7aaa7bf1e6 100644 --- a/src/test/java/terminus/command/link/BackLinkCommandTest.java +++ b/src/test/java/terminus/command/link/BackLinkCommandTest.java @@ -8,31 +8,38 @@ import terminus.command.CommandResult; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; import terminus.module.NusModule; +import terminus.parser.InModuleCommandParser; import terminus.parser.LinkCommandParser; import terminus.parser.MainCommandParser; +import terminus.parser.ModuleWorkspaceCommandParser; import terminus.ui.Ui; public class BackLinkCommandTest { private LinkCommandParser linkCommandParser; - private NusModule nusModule; + private ModuleManager moduleManager; private Ui ui; + private String tempModule = "test"; + @BeforeEach void setUp() { this.linkCommandParser = LinkCommandParser.getInstance(); - this.nusModule = new NusModule(); + this.linkCommandParser.setModuleName(tempModule); + this.moduleManager = new ModuleManager(); + moduleManager.setModule(tempModule); this.ui = new Ui(); } @Test void execute_success() throws InvalidCommandException, InvalidArgumentException { Command backCommand = linkCommandParser.parseCommand("back"); - CommandResult backResult = backCommand.execute(ui, nusModule); + CommandResult backResult = backCommand.execute(ui, moduleManager); assertTrue(backResult.isOk()); - assertTrue(backResult.getAdditionalData() instanceof MainCommandParser); + assertTrue(backResult.getAdditionalData() instanceof ModuleWorkspaceCommandParser); } } \ No newline at end of file diff --git a/src/test/java/terminus/command/link/DeleteLinkCommandTest.java b/src/test/java/terminus/command/link/DeleteLinkCommandTest.java index 516170407c..e565124e09 100644 --- a/src/test/java/terminus/command/link/DeleteLinkCommandTest.java +++ b/src/test/java/terminus/command/link/DeleteLinkCommandTest.java @@ -11,6 +11,7 @@ import terminus.content.Link; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; import terminus.module.NusModule; import terminus.parser.LinkCommandParser; import terminus.ui.Ui; @@ -18,15 +19,19 @@ public class DeleteLinkCommandTest { private LinkCommandParser linkCommandParser; - private NusModule nusModule; + private ModuleManager moduleManager; private Ui ui; + private String tempModule = "test"; + Class type = Link.class; @BeforeEach void setUp() { + this.moduleManager = new ModuleManager(); + moduleManager.setModule(tempModule); this.linkCommandParser = LinkCommandParser.getInstance(); - this.nusModule = new NusModule(); + this.linkCommandParser.setModuleName(tempModule); this.ui = new Ui(); } @@ -34,28 +39,28 @@ void setUp() { void execute_deleteLink_success() throws InvalidCommandException, InvalidArgumentException { for (int i = 0; i < 3; i++) { Command addLinkCommand = linkCommandParser.parseCommand("add \"test_desc\" \"Monday\" \"12:00\" \"https://zoom.us/test\""); - CommandResult addResult = addLinkCommand.execute(ui, nusModule); + CommandResult addResult = addLinkCommand.execute(ui, moduleManager); assertTrue(addResult.isOk()); } - assertEquals(3, nusModule.getContentManager(type).getTotalContents()); + assertEquals(3, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); Command deleteLinkCommand = linkCommandParser.parseCommand("delete 1"); - CommandResult deleteResult = deleteLinkCommand.execute(ui, nusModule); + CommandResult deleteResult = deleteLinkCommand.execute(ui, moduleManager); assertTrue(deleteResult.isOk()); - assertEquals(2, nusModule.getContentManager(type).getTotalContents()); + assertEquals(2, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); for (int j = 0; j < 2; j++) { deleteLinkCommand = linkCommandParser.parseCommand("delete 1"); - deleteResult = deleteLinkCommand.execute(ui, nusModule); + deleteResult = deleteLinkCommand.execute(ui, moduleManager); assertTrue(deleteResult.isOk()); } - assertEquals(0, nusModule.getContentManager(type).getTotalContents()); + assertEquals(0, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); } @Test void execute_deleteLink_throwsException() throws InvalidCommandException, InvalidArgumentException { Command deleteLinkCommand = linkCommandParser.parseCommand("delete 20"); - assertThrows(InvalidArgumentException.class, () -> deleteLinkCommand.execute(ui, nusModule)); + assertThrows(InvalidArgumentException.class, () -> deleteLinkCommand.execute(ui, moduleManager)); } } \ No newline at end of file diff --git a/src/test/java/terminus/command/link/ViewLinkCommandTest.java b/src/test/java/terminus/command/link/ViewLinkCommandTest.java index 39166fcec7..bcdc17435b 100644 --- a/src/test/java/terminus/command/link/ViewLinkCommandTest.java +++ b/src/test/java/terminus/command/link/ViewLinkCommandTest.java @@ -11,22 +11,27 @@ import terminus.content.Link; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; import terminus.module.NusModule; import terminus.parser.LinkCommandParser; import terminus.ui.Ui; public class ViewLinkCommandTest { + Class type = Link.class; + private LinkCommandParser linkCommandParser; - private NusModule nusModule; + private ModuleManager moduleManager; private Ui ui; - Class type = Link.class; + private String tempModule = "test"; @BeforeEach void setUp() { this.linkCommandParser = LinkCommandParser.getInstance(); - this.nusModule = new NusModule(); + this.linkCommandParser.setModuleName(tempModule); + this.moduleManager = new ModuleManager(); + moduleManager.setModule(tempModule); this.ui = new Ui(); } @@ -35,13 +40,13 @@ void execute_viewAll_success() throws InvalidCommandException, InvalidArgumentEx for (int i = 0; i < 5; i++) { Command addLinkCommand = linkCommandParser.parseCommand( "add \"test\" \"Saturday\" \"00:00\" \"https://zoom.us/test\""); - CommandResult addLinkResult = addLinkCommand.execute(ui, nusModule); + CommandResult addLinkResult = addLinkCommand.execute(ui, moduleManager); assertTrue(addLinkResult.isOk()); } - assertEquals(5, nusModule.getContentManager(type).getTotalContents()); + assertEquals(5, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); Command viewLinkCommand = linkCommandParser.parseCommand("view"); - CommandResult viewLinkResult = viewLinkCommand.execute(ui, nusModule); + CommandResult viewLinkResult = viewLinkCommand.execute(ui, moduleManager); assertTrue(viewLinkResult.isOk()); } @@ -50,17 +55,17 @@ void execute_viewLink_success() throws InvalidCommandException, InvalidArgumentE for (int i = 0; i < 5; i++) { Command addLinkCommand = linkCommandParser.parseCommand( "add \"test\" \"Saturday\" \"00:00\" \"https://zoom.us/test\""); - CommandResult addLinkResult = addLinkCommand.execute(ui, nusModule); + CommandResult addLinkResult = addLinkCommand.execute(ui, moduleManager); assertTrue(addLinkResult.isOk()); } - assertEquals(5, nusModule.getContentManager(type).getTotalContents()); + assertEquals(5, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); Command viewLinkCommand = linkCommandParser.parseCommand("view 1"); - CommandResult viewLinkResult = viewLinkCommand.execute(ui, nusModule); + CommandResult viewLinkResult = viewLinkCommand.execute(ui, moduleManager); assertTrue(viewLinkResult.isOk()); viewLinkCommand = linkCommandParser.parseCommand("view 5"); - viewLinkResult = viewLinkCommand.execute(ui, nusModule); + viewLinkResult = viewLinkCommand.execute(ui, moduleManager); assertTrue(viewLinkResult.isOk()); } @@ -69,10 +74,10 @@ void execute_viewLink_exceptionThrown() throws InvalidCommandException, InvalidA for (int i = 0; i < 5; i++) { Command addLinkCommand = linkCommandParser.parseCommand( "add \"test\" \"Saturday\" \"00:00\" \"https://zoom.us/test\""); - CommandResult addLinkResult = addLinkCommand.execute(ui, nusModule); + CommandResult addLinkResult = addLinkCommand.execute(ui, moduleManager); assertTrue(addLinkResult.isOk()); } - assertEquals(5, nusModule.getContentManager(type).getTotalContents()); + assertEquals(5, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); assertThrows(InvalidArgumentException.class, () -> linkCommandParser.parseCommand("view -1")); assertThrows(InvalidArgumentException.class, () -> linkCommandParser.parseCommand("view X")); diff --git a/src/test/java/terminus/command/note/AddNoteCommandTest.java b/src/test/java/terminus/command/note/AddNoteCommandTest.java index d2e37192d0..8bed4df198 100644 --- a/src/test/java/terminus/command/note/AddNoteCommandTest.java +++ b/src/test/java/terminus/command/note/AddNoteCommandTest.java @@ -10,6 +10,7 @@ import terminus.content.Note; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; import terminus.module.NusModule; import terminus.parser.NoteCommandParser; import terminus.ui.Ui; @@ -17,31 +18,35 @@ public class AddNoteCommandTest { private NoteCommandParser commandParser; - private NusModule nusModule; + private ModuleManager moduleManager; private Ui ui; + private String tempModule = "test"; + Class type = Note.class; @BeforeEach void setUp() { + this.moduleManager = new ModuleManager(); + moduleManager.setModule(tempModule); this.commandParser = NoteCommandParser.getInstance(); - this.nusModule = new NusModule(); + this.commandParser.setModuleName(tempModule); this.ui = new Ui(); } @Test void execute_success() throws InvalidCommandException, InvalidArgumentException { Command addCommand = commandParser.parseCommand("add \"test\" \"test1\""); - CommandResult addResult = addCommand.execute(ui, nusModule); + CommandResult addResult = addCommand.execute(ui, moduleManager); assertTrue(addResult.isOk()); - assertEquals(1, nusModule.getContentManager(type).getTotalContents()); - assertTrue(nusModule.getContentManager(type).getContentData(1).contains("test")); - assertTrue(nusModule.getContentManager(type).getContentData(1).contains("test1")); + assertEquals(1, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); + assertTrue(moduleManager.getModule(tempModule).getContentManager(type).getContentData(1).contains("test")); + assertTrue(moduleManager.getModule(tempModule).getContentManager(type).getContentData(1).contains("test1")); for (int i = 0; i < 5; i++) { addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); - addResult = addCommand.execute(ui, nusModule); + addResult = addCommand.execute(ui, moduleManager); assertTrue(addResult.isOk()); } - assertEquals(6, nusModule.getContentManager(type).getTotalContents()); + assertEquals(6, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); } } diff --git a/src/test/java/terminus/command/note/BackNoteCommandTest.java b/src/test/java/terminus/command/note/BackNoteCommandTest.java index ef71fba8c9..6db0eb7bbf 100644 --- a/src/test/java/terminus/command/note/BackNoteCommandTest.java +++ b/src/test/java/terminus/command/note/BackNoteCommandTest.java @@ -8,29 +8,36 @@ import terminus.command.CommandResult; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; import terminus.module.NusModule; +import terminus.parser.InModuleCommandParser; import terminus.parser.MainCommandParser; +import terminus.parser.ModuleWorkspaceCommandParser; import terminus.parser.NoteCommandParser; import terminus.ui.Ui; public class BackNoteCommandTest { private NoteCommandParser commandParser; - private NusModule nusModule; + private ModuleManager moduleManager; private Ui ui; + private String tempModule = "test"; + @BeforeEach void setUp() { this.commandParser = NoteCommandParser.getInstance(); - this.nusModule = new NusModule(); + this.commandParser.setModuleName(tempModule); + this.moduleManager = new ModuleManager(); + moduleManager.setModule(tempModule); this.ui = new Ui(); } @Test void execute_success() throws InvalidCommandException, InvalidArgumentException { Command backCommand = commandParser.parseCommand("back"); - CommandResult backResult = backCommand.execute(ui, nusModule); + CommandResult backResult = backCommand.execute(ui, moduleManager); assertTrue(backResult.isOk()); - assertTrue(backResult.getAdditionalData() instanceof MainCommandParser); + assertTrue(backResult.getAdditionalData() instanceof ModuleWorkspaceCommandParser); } } diff --git a/src/test/java/terminus/command/note/DeleteNoteCommandTest.java b/src/test/java/terminus/command/note/DeleteNoteCommandTest.java index 9d489212df..d09a9d6b2f 100644 --- a/src/test/java/terminus/command/note/DeleteNoteCommandTest.java +++ b/src/test/java/terminus/command/note/DeleteNoteCommandTest.java @@ -11,6 +11,7 @@ import terminus.content.Note; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; import terminus.module.NusModule; import terminus.parser.NoteCommandParser; import terminus.ui.Ui; @@ -18,15 +19,19 @@ public class DeleteNoteCommandTest { private NoteCommandParser commandParser; - private NusModule nusModule; + private ModuleManager moduleManager; private Ui ui; + private String tempModule = "test"; + Class type = Note.class; @BeforeEach void setUp() { + this.moduleManager = new ModuleManager(); + moduleManager.setModule(tempModule); this.commandParser = NoteCommandParser.getInstance(); - this.nusModule = new NusModule(); + this.commandParser.setModuleName(tempModule); this.ui = new Ui(); } @@ -34,27 +39,27 @@ void setUp() { void execute_success() throws InvalidCommandException, InvalidArgumentException { for (int i = 0; i < 5; i++) { Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); - CommandResult addResult = addCommand.execute(ui, nusModule); + CommandResult addResult = addCommand.execute(ui, moduleManager); assertTrue(addResult.isOk()); } - assertEquals(5, nusModule.getContentManager(type).getTotalContents()); + assertEquals(5, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); Command deleteCommand = commandParser.parseCommand("delete 1"); - CommandResult deleteResult = deleteCommand.execute(ui, nusModule); + CommandResult deleteResult = deleteCommand.execute(ui, moduleManager); assertTrue(deleteResult.isOk()); - assertEquals(4, nusModule.getContentManager(type).getTotalContents()); + assertEquals(4, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); for (int i = 2; i < 4; i++) { deleteCommand = commandParser.parseCommand("delete " + i); - deleteResult = deleteCommand.execute(ui, nusModule); + deleteResult = deleteCommand.execute(ui, moduleManager); assertTrue(deleteResult.isOk()); } - assertEquals(2, nusModule.getContentManager(type).getTotalContents()); + assertEquals(2, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); } @Test void execute_throwsException() throws InvalidCommandException, InvalidArgumentException { Command deleteCommand = commandParser.parseCommand("delete 100"); - assertThrows(InvalidArgumentException.class, () -> deleteCommand.execute(ui, nusModule)); + assertThrows(InvalidArgumentException.class, () -> deleteCommand.execute(ui, moduleManager)); } } diff --git a/src/test/java/terminus/command/note/ViewNoteCommandTest.java b/src/test/java/terminus/command/note/ViewNoteCommandTest.java index 8cedc00c6a..411bb73c76 100644 --- a/src/test/java/terminus/command/note/ViewNoteCommandTest.java +++ b/src/test/java/terminus/command/note/ViewNoteCommandTest.java @@ -11,6 +11,7 @@ import terminus.content.Note; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; import terminus.module.NusModule; import terminus.parser.NoteCommandParser; import terminus.ui.Ui; @@ -18,15 +19,19 @@ public class ViewNoteCommandTest { private NoteCommandParser commandParser; - private NusModule nusModule; + private ModuleManager moduleManager; private Ui ui; + private String tempModule = "test"; + Class type = Note.class; @BeforeEach void setUp() { + this.moduleManager = new ModuleManager(); + moduleManager.setModule(tempModule); this.commandParser = NoteCommandParser.getInstance(); - this.nusModule = new NusModule(); + this.commandParser.setModuleName(tempModule); this.ui = new Ui(); } @@ -35,13 +40,13 @@ void execute_viewAll_success() throws InvalidCommandException, InvalidArgumentException { for (int i = 0; i < 5; i++) { Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); - CommandResult addResult = addCommand.execute(ui, nusModule); + CommandResult addResult = addCommand.execute(ui, moduleManager); assertTrue(addResult.isOk()); } - assertEquals(5, nusModule.getContentManager(type).getTotalContents()); + assertEquals(5, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); Command viewCommand = commandParser.parseCommand("view"); - CommandResult viewResult = viewCommand.execute(ui, nusModule); + CommandResult viewResult = viewCommand.execute(ui, moduleManager); assertTrue(viewResult.isOk()); } @@ -50,13 +55,13 @@ void execute_viewOne_success() throws InvalidCommandException, InvalidArgumentException { for (int i = 0; i < 5; i++) { Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); - CommandResult addResult = addCommand.execute(ui, nusModule); + CommandResult addResult = addCommand.execute(ui, moduleManager); assertTrue(addResult.isOk()); } - assertEquals(5, nusModule.getContentManager(type).getTotalContents()); + assertEquals(5, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); Command viewCommand = commandParser.parseCommand("view 1"); - CommandResult viewResult = viewCommand.execute(ui, nusModule); + CommandResult viewResult = viewCommand.execute(ui, moduleManager); assertTrue(viewResult.isOk()); } @@ -65,14 +70,15 @@ void execute_viewOne_exceptionThrown() throws InvalidCommandException, InvalidArgumentException { for (int i = 0; i < 5; i++) { Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); - CommandResult addResult = addCommand.execute(ui, nusModule); + CommandResult addResult = addCommand.execute(ui, moduleManager); assertTrue(addResult.isOk()); } - assertEquals(5, nusModule.getContentManager(type).getTotalContents()); + assertEquals(5, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("view a")); assertThrows(InvalidArgumentException.class, - () -> commandParser.parseCommand("view -1").execute(ui, nusModule)); - assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("view 6").execute(ui, nusModule)); + () -> commandParser.parseCommand("view -1").execute(ui, moduleManager)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("view 6").execute(ui, moduleManager)); } } diff --git a/src/test/java/terminus/parser/LinkCommandParserTest.java b/src/test/java/terminus/parser/LinkCommandParserTest.java index cd0afddeef..36f6f75ffe 100644 --- a/src/test/java/terminus/parser/LinkCommandParserTest.java +++ b/src/test/java/terminus/parser/LinkCommandParserTest.java @@ -18,12 +18,13 @@ public class LinkCommandParserTest { private LinkCommandParser linkCommandParser; - private NusModule nusModule; + + private String tempModule = "test"; @BeforeEach void setUp() { this.linkCommandParser = LinkCommandParser.getInstance(); - this.nusModule = new NusModule(); + this.linkCommandParser.setModuleName(tempModule); } @Test @@ -116,7 +117,7 @@ void getCommandList_containsBasicCommands() { @Test void getWorkspace_isSchedule() { - assertEquals("schedule", linkCommandParser.getWorkspace()); + assertEquals(tempModule + " > schedule", linkCommandParser.getWorkspace()); } @Test diff --git a/src/test/java/terminus/parser/MainCommandParserTest.java b/src/test/java/terminus/parser/MainCommandParserTest.java index 2ab1556dbf..e565ed11fe 100644 --- a/src/test/java/terminus/parser/MainCommandParserTest.java +++ b/src/test/java/terminus/parser/MainCommandParserTest.java @@ -6,18 +6,27 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.command.ExitCommand; +import terminus.command.GoCommand; import terminus.command.HelpCommand; import terminus.command.NotesCommand; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; +import terminus.ui.Ui; public class MainCommandParserTest { - + private MainCommandParser commandParser; + private ModuleManager moduleManager; + private String tempModule = "test"; + @BeforeEach void setUp() { this.commandParser = MainCommandParser.getInstance(); + moduleManager = new ModuleManager(); + moduleManager.setModule(tempModule); + } @Test @@ -34,7 +43,7 @@ void parseCommand_resolveExitCommand_success() throws InvalidCommandException, I assertTrue(commandParser.parseCommand(" exit ") instanceof ExitCommand); assertTrue(commandParser.parseCommand("eXiT a") instanceof ExitCommand); } - + @Test void parseCommand_resolveHelpCommand_success() throws InvalidCommandException, InvalidArgumentException { assertTrue(commandParser.parseCommand("help") instanceof HelpCommand); @@ -48,14 +57,14 @@ void getCommandList_containsBasicCommands() { assertTrue(commandParser.getCommandList().contains("exit")); assertTrue(commandParser.getCommandList().contains("help")); } - + @Test void parseCommand_resolveNoteCommand_success() throws InvalidCommandException, InvalidArgumentException { - assertTrue(commandParser.parseCommand("note") instanceof NotesCommand); - assertTrue(commandParser.parseCommand("NOTE") instanceof NotesCommand); - assertTrue(commandParser.parseCommand(" note ") instanceof NotesCommand); - assertTrue(commandParser.parseCommand("note help") instanceof NotesCommand); - assertTrue(commandParser.parseCommand("note exit") instanceof NotesCommand); + assertTrue(commandParser.parseCommand("go " + tempModule + " note") instanceof GoCommand); + assertTrue(commandParser.parseCommand("go " + tempModule + " NOTE") instanceof GoCommand); + assertTrue(commandParser.parseCommand("go " + tempModule + " note ") instanceof GoCommand); + assertTrue(commandParser.parseCommand("go " + tempModule + " note help") instanceof GoCommand); + assertTrue(commandParser.parseCommand("go " + tempModule + " note exit") instanceof GoCommand); } @Test diff --git a/src/test/java/terminus/parser/NoteCommandParserTest.java b/src/test/java/terminus/parser/NoteCommandParserTest.java index 2313f25ef9..e9dd963c09 100644 --- a/src/test/java/terminus/parser/NoteCommandParserTest.java +++ b/src/test/java/terminus/parser/NoteCommandParserTest.java @@ -19,14 +19,13 @@ public class NoteCommandParserTest { private NoteCommandParser commandParser; - private NusModule nusModule; - private Ui ui; + + private String tempModule = "test"; @BeforeEach void setUp() { this.commandParser = NoteCommandParser.getInstance(); - this.nusModule = new NusModule(); - this.ui = new Ui(); + this.commandParser.setModuleName(tempModule); } @Test @@ -111,7 +110,7 @@ void getCommandList_containsBasicCommands() { @Test void getWorkspace_isNote() { - assertEquals("note", commandParser.getWorkspace()); + assertEquals(tempModule + " > note", commandParser.getWorkspace()); } @Test diff --git a/src/test/java/terminus/storage/ModuleStorageTest.java b/src/test/java/terminus/storage/ModuleStorageTest.java index 81a79f8af7..2c5858a6d5 100644 --- a/src/test/java/terminus/storage/ModuleStorageTest.java +++ b/src/test/java/terminus/storage/ModuleStorageTest.java @@ -17,18 +17,21 @@ import terminus.module.NusModule; public class ModuleStorageTest { - + private static final Path RESOURCE_FOLDER = Path.of("src", "test", "resources"); private static final Path SAVE_FILE = RESOURCE_FOLDER.resolve("saveFile.json"); private static final Path MALFORMED_FILE = RESOURCE_FOLDER.resolve("malformedFile.json"); private static final Path VALID_FILE = RESOURCE_FOLDER.resolve("validFile.json"); private ModuleManager moduleManager; + private String tempModule = "test"; + @BeforeEach void setUp() { - nusModule = new NusModule(); - nusModule.getContentManager(Note.class).add(new Note("test", "test")); - nusModule.getContentManager(Link.class).add(new Link("test", "tuesday", + moduleManager = new ModuleManager(); + moduleManager.setModule(tempModule); + moduleManager.getModule(tempModule).getContentManager(Note.class).add(new Note("test", "test")); + moduleManager.getModule(tempModule).getContentManager(Link.class).add(new Link("test", "tuesday", LocalTime.of(11, 11), "https://zoom.us/")); } @@ -41,11 +44,11 @@ void loadFile_invalidJson_exceptionThrown() { @Test void loadFile_success() throws IOException { ModuleStorage moduleStorage = new ModuleStorage(VALID_FILE); - NusModule module = moduleStorage.loadFile(); - assertEquals(module.getContentManager(Note.class).listAllContents(), - nusModule.getContentManager(Note.class).listAllContents()); - assertEquals(module.getContentManager(Link.class).listAllContents(), - nusModule.getContentManager(Link.class).listAllContents()); + ModuleManager module = moduleStorage.loadFile(); + assertEquals(module.getModule(tempModule).getContentManager(Note.class).listAllContents(), + moduleManager.getModule(tempModule).getContentManager(Note.class).listAllContents()); + assertEquals(module.getModule(tempModule).getContentManager(Link.class).listAllContents(), + moduleManager.getModule(tempModule).getContentManager(Link.class).listAllContents()); } @Test @@ -53,12 +56,12 @@ void saveFile_nullArgument_exceptionThrown() { ModuleStorage saveModuleStorage = new ModuleStorage(SAVE_FILE); assertThrows(NullPointerException.class, () -> saveModuleStorage.saveFile(null)); } - + @Test void saveFile_success() throws IOException { -// ModuleStorage saveModuleStorage = new ModuleStorage(SAVE_FILE); -// saveModuleStorage.saveFile(nusModule); -// assertTextFilesEqual(SAVE_FILE, VALID_FILE); + ModuleStorage saveModuleStorage = new ModuleStorage(SAVE_FILE); + saveModuleStorage.saveFile(moduleManager); + assertTextFilesEqual(SAVE_FILE, VALID_FILE); } /** diff --git a/src/test/resources/saveFile.json b/src/test/resources/saveFile.json index 798ffd9eb4..df07f97b9b 100644 --- a/src/test/resources/saveFile.json +++ b/src/test/resources/saveFile.json @@ -1,25 +1,29 @@ { - "noteManager": { - "contents": [ - { - "name": "test", - "data": "test" + "moduleMap": { + "test": { + "noteManager": { + "contents": [ + { + "name": "test", + "data": "test" + } + ] + }, + "linkManager": { + "contents": [ + { + "day": "tuesday", + "startTime": { + "hour": 11, + "minute": 11, + "second": 0, + "nano": 0 + }, + "link": "https://zoom.us/", + "name": "test" + } + ] } - ] - }, - "linkManager": { - "contents": [ - { - "day": "tuesday", - "startTime": { - "hour": 11, - "minute": 11, - "second": 0, - "nano": 0 - }, - "link": "https://zoom.us/", - "name": "test" - } - ] + } } } \ No newline at end of file diff --git a/src/test/resources/validFile.json b/src/test/resources/validFile.json index 798ffd9eb4..df07f97b9b 100644 --- a/src/test/resources/validFile.json +++ b/src/test/resources/validFile.json @@ -1,25 +1,29 @@ { - "noteManager": { - "contents": [ - { - "name": "test", - "data": "test" + "moduleMap": { + "test": { + "noteManager": { + "contents": [ + { + "name": "test", + "data": "test" + } + ] + }, + "linkManager": { + "contents": [ + { + "day": "tuesday", + "startTime": { + "hour": 11, + "minute": 11, + "second": 0, + "nano": 0 + }, + "link": "https://zoom.us/", + "name": "test" + } + ] } - ] - }, - "linkManager": { - "contents": [ - { - "day": "tuesday", - "startTime": { - "hour": 11, - "minute": 11, - "second": 0, - "nano": 0 - }, - "link": "https://zoom.us/", - "name": "test" - } - ] + } } } \ No newline at end of file From 202cf3f67c018a6361e67e657d20620fdf877d0b Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Sat, 16 Oct 2021 23:33:13 +0800 Subject: [PATCH 130/466] Fix text-ui-test --- src/main/java/terminus/Terminus.java | 9 +- .../java/terminus/parser/CommandParser.java | 3 +- .../parser/InModuleCommandParser.java | 4 + .../terminus/parser/LinkCommandParser.java | 6 +- .../terminus/parser/MainCommandParser.java | 3 +- .../terminus/parser/ModuleCommandParser.java | 3 +- .../parser/ModuleWorkspaceCommandParser.java | 3 +- .../terminus/parser/NoteCommandParser.java | 6 +- src/main/java/terminus/ui/Ui.java | 5 +- text-ui-test/EXPECTED.TXT | 90 +++++++++++-------- text-ui-test/input.txt | 2 + 11 files changed, 81 insertions(+), 53 deletions(-) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 1817bdc50d..22205ee833 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -30,7 +30,6 @@ public class Terminus { private ModuleStorage moduleStorage; private ModuleManager moduleManager; - private NusModule nusModule; private static final String INVALID_ARGUMENT_FORMAT_MESSAGE = "Format: %s"; private static final Path DATA_DIRECTORY = Path.of(System.getProperty("user.dir"), "data"); @@ -70,14 +69,14 @@ private void start() { TerminusLogger.severe("Invalid file data detected!", e.fillInStackTrace()); ui.printSection(INVALID_JSON_MESSAGE); } finally { - if (this.nusModule == null) { + if (this.moduleManager == null) { TerminusLogger.warning("File not found."); TerminusLogger.warning("Creating new NusModule instance..."); - this.nusModule = new NusModule(); + this.moduleManager = new ModuleManager(); } else { TerminusLogger.info("File loaded."); } - this.ui.printParserBanner(this.parser, this.nusModule); + this.ui.printParserBanner(this.parser, this.moduleManager); } TerminusLogger.info("Terminus has started."); } @@ -102,7 +101,7 @@ private void runCommandsUntilExit() { parser = result.getAdditionalData(); assert parser != null : "commandParser is not null"; workspace = parser.getWorkspace(); - ui.printParserBanner(parser, nusModule); + ui.printParserBanner(parser, moduleManager); } TerminusLogger.info("Saving data into file..."); this.moduleStorage.saveFile(moduleManager); diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java index 0492d91fb9..10434cbf54 100644 --- a/src/main/java/terminus/parser/CommandParser.java +++ b/src/main/java/terminus/parser/CommandParser.java @@ -9,6 +9,7 @@ import terminus.common.TerminusLogger; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; import terminus.module.NusModule; public abstract class CommandParser { @@ -63,7 +64,7 @@ public Set getCommandList() { return commandMap.keySet(); } - public abstract String getWorkspaceBanner(NusModule module); + public abstract String getWorkspaceBanner(ModuleManager module); /** * Returns the list of items in the help menu. diff --git a/src/main/java/terminus/parser/InModuleCommandParser.java b/src/main/java/terminus/parser/InModuleCommandParser.java index 6e3ab14a42..6466dd22bd 100644 --- a/src/main/java/terminus/parser/InModuleCommandParser.java +++ b/src/main/java/terminus/parser/InModuleCommandParser.java @@ -17,6 +17,10 @@ public InModuleCommandParser(String workspace) { super(workspace); } + public String getModuleName() { + return moduleName; + } + public void setModuleName(String moduleName) { this.moduleName = moduleName; } diff --git a/src/main/java/terminus/parser/LinkCommandParser.java b/src/main/java/terminus/parser/LinkCommandParser.java index b351012608..2d7c0949b9 100644 --- a/src/main/java/terminus/parser/LinkCommandParser.java +++ b/src/main/java/terminus/parser/LinkCommandParser.java @@ -7,6 +7,7 @@ import terminus.common.CommonFormat; import terminus.common.Messages; import terminus.content.Link; +import terminus.module.ModuleManager; import terminus.module.NusModule; /** @@ -39,7 +40,8 @@ public static LinkCommandParser getInstance() { * @return The string containing a description of the number of links in the workspace. */ @Override - public String getWorkspaceBanner(NusModule module) { - return String.format(Messages.SCHEDULE_BANNER, module.getContentManager(Link.class).getContents().size()); + public String getWorkspaceBanner(ModuleManager module) { + return String.format(Messages.SCHEDULE_BANNER, + module.getModule(getModuleName()).getContentManager(Link.class).getContents().size()); } } diff --git a/src/main/java/terminus/parser/MainCommandParser.java b/src/main/java/terminus/parser/MainCommandParser.java index e1db9d769b..8761b9fd6b 100644 --- a/src/main/java/terminus/parser/MainCommandParser.java +++ b/src/main/java/terminus/parser/MainCommandParser.java @@ -3,6 +3,7 @@ import terminus.command.GoCommand; import terminus.command.ModuleCommand; import terminus.common.Messages; +import terminus.module.ModuleManager; import terminus.module.NusModule; public class MainCommandParser extends CommandParser { @@ -21,7 +22,7 @@ public static MainCommandParser getInstance() { } @Override - public String getWorkspaceBanner(NusModule module) { + public String getWorkspaceBanner(ModuleManager module) { return Messages.MAIN_BANNER; } } diff --git a/src/main/java/terminus/parser/ModuleCommandParser.java b/src/main/java/terminus/parser/ModuleCommandParser.java index 83bf49f64b..c2fbc335a0 100644 --- a/src/main/java/terminus/parser/ModuleCommandParser.java +++ b/src/main/java/terminus/parser/ModuleCommandParser.java @@ -5,6 +5,7 @@ import terminus.command.module.DeleteModuleCommand; import terminus.command.module.ViewModuleCommand; import terminus.common.CommonFormat; +import terminus.module.ModuleManager; import terminus.module.NusModule; public class ModuleCommandParser extends CommandParser { @@ -28,7 +29,7 @@ public static ModuleCommandParser getInstance() { } @Override - public String getWorkspaceBanner(NusModule module) { + public String getWorkspaceBanner(ModuleManager module) { return "Welcome to the workspace module"; } } diff --git a/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java b/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java index 8dbb1c44f0..a19954c7ca 100644 --- a/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java +++ b/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java @@ -7,6 +7,7 @@ import terminus.common.CommonFormat; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; import terminus.module.NusModule; public class ModuleWorkspaceCommandParser extends CommandParser { @@ -38,7 +39,7 @@ public Command parseCommand(String command) throws InvalidCommandException, Inva } @Override - public String getWorkspaceBanner(NusModule module) { + public String getWorkspaceBanner(ModuleManager module) { return "Entering " + getWorkspace() + " workspace"; } } diff --git a/src/main/java/terminus/parser/NoteCommandParser.java b/src/main/java/terminus/parser/NoteCommandParser.java index 9474c8d364..57b8f6da2c 100644 --- a/src/main/java/terminus/parser/NoteCommandParser.java +++ b/src/main/java/terminus/parser/NoteCommandParser.java @@ -7,6 +7,7 @@ import terminus.common.CommonFormat; import terminus.common.Messages; import terminus.content.Note; +import terminus.module.ModuleManager; import terminus.module.NusModule; @@ -26,7 +27,8 @@ public static NoteCommandParser getInstance() { } @Override - public String getWorkspaceBanner(NusModule module) { - return String.format(Messages.NOTE_BANNER, module.getContentManager(Note.class).getContents().size()); + public String getWorkspaceBanner(ModuleManager module) { + return String.format(Messages.NOTE_BANNER, + module.getModule(getModuleName()).getContentManager(Note.class).getContents().size()); } } diff --git a/src/main/java/terminus/ui/Ui.java b/src/main/java/terminus/ui/Ui.java index 22431fec2c..a3faed3e88 100644 --- a/src/main/java/terminus/ui/Ui.java +++ b/src/main/java/terminus/ui/Ui.java @@ -2,6 +2,7 @@ import java.util.Arrays; import java.util.Scanner; +import terminus.module.ModuleManager; import terminus.module.NusModule; import terminus.parser.CommandParser; @@ -18,10 +19,10 @@ public Ui() { /** * Prints the banner for a workspace, which includes all the commands in the parser. */ - public void printParserBanner(CommandParser parser, NusModule nusModule) { + public void printParserBanner(CommandParser parser, ModuleManager moduleManager) { printSection( "", - parser.getWorkspaceBanner(nusModule), + parser.getWorkspaceBanner(moduleManager), parser.getCommandList() .stream() .reduce("\nType any of the following to get started:\n", diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 33d82cc816..15d53c3a78 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -4,34 +4,45 @@ Welcome to TermiNUS! Type any of the following to get started: > exit > help -> note -> schedule +> module +> go [] >>> Command not found! Type 'help' for a list of commands. [] >>> Command not found! Type 'help' for a list of commands. [] >>> Command not found! Type 'help' for a list of commands. -[] >>> Error: Missing arguments. -Format: note add "" "" -[] >>> Your note on 'CS2113T' has been added! -[] >>> List of Content +[] >>> Module test has been added +[] >>> +Entering test workspace + +Type any of the following to get started: +> exit +> help +> note +> schedule +> back + +[test] >>> Error: Missing arguments. +Format: test > note add "" "" +[test] >>> Your note on 'CS2113T' has been added! +[test] >>> List of Content --------------- 1. CS2113T Rerun the same command with an index behind to view the content. -[] >>> Error: Invalid numerical value provided. -Format: note view {item number} -[] >>> Error: Content not found. -[] >>> Name: CS2113T +[test] >>> Error: Invalid numerical value provided. +Format: test > note view {item number} +[test] >>> Error: Content not found. +[test] >>> Name: CS2113T Content: Week 8 test -[] >>> Error: Missing arguments. -Format: note delete -[] >>> Error: Invalid numerical value provided. -Format: note delete -[] >>> Error: Content not found. -[] >>> Your note on 'CS2113T' has been deleted! -[] >>> +[test] >>> Error: Missing arguments. +Format: test > note delete +[test] >>> Error: Invalid numerical value provided. +Format: test > note delete +[test] >>> Error: Content not found. +[test] >>> Your note on 'CS2113T' has been deleted! +[test] >>> Help Menu --------- exit : Exits the program. @@ -46,33 +57,36 @@ Format: note schedule : Move to schedules workspace. Format: schedule -[] >>> Error: Missing arguments. -Format: schedule add "" "" "" "" -[] >>> Error: Missing arguments. -Format: schedule add "" "" "" "" -[] >>> Error: Missing arguments. -Format: schedule add "" "" "" "" -[] >>> Your schedule on 'CS2113T Tutorial' has been added! -[] >>> Your schedule on 'CS2113T Lecture' has been added! -[] >>> Command not found! Type 'help' for a list of commands. -[] >>> List of Content +back : Returns to the parent workspace. +Format: back + +[test] >>> Error: Missing arguments. +Format: test > schedule add "" "" "" "" +[test] >>> Error: Missing arguments. +Format: test > schedule add "" "" "" "" +[test] >>> Error: Missing arguments. +Format: test > schedule add "" "" "" "" +[test] >>> Your schedule on 'CS2113T Tutorial' has been added! +[test] >>> Your schedule on 'CS2113T Lecture' has been added! +[test] >>> Command not found! Type 'help' for a list of commands. +[test] >>> List of Content --------------- 1. CS2113T Tutorial (Thursday, 10:00): https://zoom.us/test 2. CS2113T Lecture (Friday, 16:00): https://zoom.us/test Rerun the same command with an index behind to view the content. -[] >>> Error: Content not found. -[] >>> CS2113T Lecture (Friday, 16:00): https://zoom.us/test -[] >>> Error: Missing arguments. -Format: schedule delete -[] >>> Error: Content not found. -[] >>> Your link on 'CS2113T Tutorial' has been deleted! -[] >>> List of Content +[test] >>> Error: Content not found. +[test] >>> CS2113T Lecture (Friday, 16:00): https://zoom.us/test +[test] >>> Error: Missing arguments. +Format: test > schedule delete +[test] >>> Error: Content not found. +[test] >>> Your link on 'CS2113T Tutorial' has been deleted! +[test] >>> List of Content --------------- 1. CS2113T Lecture (Friday, 16:00): https://zoom.us/test Rerun the same command with an index behind to view the content. -[] >>> Command not found! Type 'help' for a list of commands. -[] >>> Command not found! Type 'help' for a list of commands. -[] >>> Your link on 'CS2113T Lecture' has been deleted! -[] >>> Goodbye! +[test] >>> Command not found! Type 'help' for a list of commands. +[test] >>> Command not found! Type 'help' for a list of commands. +[test] >>> Your link on 'CS2113T Lecture' has been deleted! +[test] >>> Goodbye! diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index d37ffe3911..033868c752 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -1,6 +1,8 @@ invalid note invalid invalid +module add "test" +go test note add a note add "CS2113T" "Week 8 test" note view From 31f33a6ff25e2479b1cf87528e07df980c950634 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Sun, 17 Oct 2021 15:53:35 +0800 Subject: [PATCH 131/466] Update java docs --- .../java/terminus/command/BackCommand.java | 8 +++++++ src/main/java/terminus/command/Command.java | 14 +++++++++---- .../java/terminus/command/DeleteCommand.java | 4 ++-- src/main/java/terminus/command/GoCommand.java | 8 ++++--- ...leCommand.java => InnerModuleCommand.java} | 9 ++++---- .../java/terminus/command/NotesCommand.java | 2 +- .../terminus/command/ScheduleCommand.java | 2 +- .../java/terminus/command/ViewCommand.java | 3 ++- .../command/module/AddModuleCommand.java | 10 +++++---- .../command/module/DeleteModuleCommand.java | 18 +++++++++++----- .../command/module/ViewModuleCommand.java | 6 +++++- .../terminus/command/note/AddNoteCommand.java | 2 +- .../command/zoomlink/AddLinkCommand.java | 2 +- .../java/terminus/common/CommonUtils.java | 4 ++++ .../java/terminus/module/ModuleManager.java | 21 +++++++++++++++++++ .../java/terminus/parser/CommandParser.java | 7 ++++++- ...ser.java => InnerModuleCommandParser.java} | 19 +++++++++++++++-- .../terminus/parser/LinkCommandParser.java | 9 ++++---- .../terminus/parser/MainCommandParser.java | 2 +- .../terminus/parser/ModuleCommandParser.java | 4 ++-- .../parser/ModuleWorkspaceCommandParser.java | 3 +-- .../terminus/parser/NoteCommandParser.java | 7 +++---- 22 files changed, 118 insertions(+), 46 deletions(-) rename src/main/java/terminus/command/{InModuleCommand.java => InnerModuleCommand.java} (67%) rename src/main/java/terminus/parser/{InModuleCommandParser.java => InnerModuleCommandParser.java} (62%) diff --git a/src/main/java/terminus/command/BackCommand.java b/src/main/java/terminus/command/BackCommand.java index 6a2a8dde24..b10dca2fc4 100644 --- a/src/main/java/terminus/command/BackCommand.java +++ b/src/main/java/terminus/command/BackCommand.java @@ -21,6 +21,14 @@ public String getHelpMessage() { return Messages.MESSAGE_COMMAND_BACK; } + /** + * Returns a command result containing the CommandParser object + * + * @param ui The Ui object to send messages to the users. + * @param moduleManager The NusModule contain the ContentManager of all notes and schedules. + * @return CommandResult contains a CommandParser + * @throws InvalidCommandException + */ @Override public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidCommandException { TerminusLogger.info("Executing Back Command"); diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java index 111d805300..1c3cd092e1 100644 --- a/src/main/java/terminus/command/Command.java +++ b/src/main/java/terminus/command/Command.java @@ -10,10 +10,6 @@ public abstract class Command { protected String arguments; private String moduleName; - public Command() { - - } - /** * Returns the format for the command. * @@ -51,10 +47,20 @@ public void parseArguments(String arguments) public abstract CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidCommandException, InvalidArgumentException; + /** + * Returns the module name + * + * @return The String containing the module name + */ public String getModuleName() { return moduleName; } + /** + * Sets the module name + * + * @param moduleName The String containing the module name to set + */ public void setModuleName(String moduleName) { this.moduleName = moduleName; } diff --git a/src/main/java/terminus/command/DeleteCommand.java b/src/main/java/terminus/command/DeleteCommand.java index 18bce99831..0dfccdcd85 100644 --- a/src/main/java/terminus/command/DeleteCommand.java +++ b/src/main/java/terminus/command/DeleteCommand.java @@ -49,7 +49,7 @@ public String getHelpMessage() { */ @Override public void parseArguments(String arguments) throws InvalidArgumentException { - if (arguments == null || arguments.isBlank()) { + if (CommonUtils.isStringNullOrEmpty(arguments)) { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } TerminusLogger.info("Parsing delete arguments"); @@ -70,7 +70,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { * removed from the arraylist. * * @param ui The Ui object to send messages to the users. - * @param moduleManager The NusModule contain the ContentManager of all notes and schedules. + * @param moduleManager The ModuleManager that contains the NusModules. * @return CommandResult to indicate the success and additional information about the execution. * @throws InvalidArgumentException when argument provided is index out of bounds of the ArrayList. */ diff --git a/src/main/java/terminus/command/GoCommand.java b/src/main/java/terminus/command/GoCommand.java index ddd89fa129..9e643c4f8a 100644 --- a/src/main/java/terminus/command/GoCommand.java +++ b/src/main/java/terminus/command/GoCommand.java @@ -1,5 +1,6 @@ package terminus.command; +import terminus.common.CommonUtils; import terminus.common.Messages; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; @@ -10,6 +11,7 @@ public class GoCommand extends WorkspaceCommand { + public static final String SPACE_DELIMITER = "\\s+"; private String moduleName; public GoCommand() { @@ -33,15 +35,15 @@ public String getFormat() { */ @Override public String getHelpMessage() { - return "Go to a specific module"; + return "Go to a specific module's workspace"; } @Override public void parseArguments(String arguments) throws InvalidArgumentException { - if (arguments == null || arguments.isBlank()) { + if (CommonUtils.isStringNullOrEmpty(arguments)) { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } - String[] args = arguments.strip().split("\\s+", 2); + String[] args = arguments.strip().split(SPACE_DELIMITER, 2); moduleName = args[0]; if (args.length > 1) { super.parseArguments(args[1]); diff --git a/src/main/java/terminus/command/InModuleCommand.java b/src/main/java/terminus/command/InnerModuleCommand.java similarity index 67% rename from src/main/java/terminus/command/InModuleCommand.java rename to src/main/java/terminus/command/InnerModuleCommand.java index a340d72f8b..7ff4c78095 100644 --- a/src/main/java/terminus/command/InModuleCommand.java +++ b/src/main/java/terminus/command/InnerModuleCommand.java @@ -3,15 +3,14 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; -import terminus.parser.CommandParser; -import terminus.parser.InModuleCommandParser; +import terminus.parser.InnerModuleCommandParser; import terminus.ui.Ui; -public abstract class InModuleCommand extends WorkspaceCommand { +public abstract class InnerModuleCommand extends WorkspaceCommand { - private InModuleCommandParser commandMap; + private InnerModuleCommandParser commandMap; - public InModuleCommand(InModuleCommandParser commandMap) { + public InnerModuleCommand(InnerModuleCommandParser commandMap) { super(commandMap); this.commandMap = commandMap; } diff --git a/src/main/java/terminus/command/NotesCommand.java b/src/main/java/terminus/command/NotesCommand.java index e27148372b..6799eac572 100644 --- a/src/main/java/terminus/command/NotesCommand.java +++ b/src/main/java/terminus/command/NotesCommand.java @@ -4,7 +4,7 @@ import terminus.common.Messages; import terminus.parser.NoteCommandParser; -public class NotesCommand extends InModuleCommand { +public class NotesCommand extends InnerModuleCommand { public NotesCommand() { super(NoteCommandParser.getInstance()); diff --git a/src/main/java/terminus/command/ScheduleCommand.java b/src/main/java/terminus/command/ScheduleCommand.java index b50431ce20..52a87d4b68 100644 --- a/src/main/java/terminus/command/ScheduleCommand.java +++ b/src/main/java/terminus/command/ScheduleCommand.java @@ -7,7 +7,7 @@ /** * ScheduleCommand class to manage commands inside the Schedule workspace. */ -public class ScheduleCommand extends InModuleCommand { +public class ScheduleCommand extends InnerModuleCommand { public ScheduleCommand() { super(LinkCommandParser.getInstance()); diff --git a/src/main/java/terminus/command/ViewCommand.java b/src/main/java/terminus/command/ViewCommand.java index 1dadb297af..544c17b4bd 100644 --- a/src/main/java/terminus/command/ViewCommand.java +++ b/src/main/java/terminus/command/ViewCommand.java @@ -1,6 +1,7 @@ package terminus.command; import terminus.common.CommonFormat; +import terminus.common.CommonUtils; import terminus.common.Messages; import terminus.common.TerminusLogger; import terminus.content.Content; @@ -56,7 +57,7 @@ public String getHelpMessage() { */ @Override public void parseArguments(String arguments) throws InvalidArgumentException { - if (arguments == null || arguments.isBlank()) { + if (CommonUtils.isStringNullOrEmpty(arguments)) { displayAll = true; return; } diff --git a/src/main/java/terminus/command/module/AddModuleCommand.java b/src/main/java/terminus/command/module/AddModuleCommand.java index 0464853526..39ce0879cf 100644 --- a/src/main/java/terminus/command/module/AddModuleCommand.java +++ b/src/main/java/terminus/command/module/AddModuleCommand.java @@ -13,6 +13,8 @@ public class AddModuleCommand extends Command { + public static final String SPACE_DELIMITER = "\\S+"; + public static final int MODULE_ARGS_COUNT = 1; private String moduleName; /** @@ -37,7 +39,7 @@ public String getHelpMessage() { @Override public void parseArguments(String arguments) throws InvalidArgumentException { - if (arguments == null || arguments.isBlank()) { + if (CommonUtils.isStringNullOrEmpty(arguments)) { TerminusLogger.warning("Failed to parse arguments: arguments is empty"); throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } @@ -47,7 +49,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { } moduleName = argArray.get(0); - if (!moduleName.matches("\\S+")) { + if (!moduleName.matches(SPACE_DELIMITER)) { throw new InvalidArgumentException("Module name cannot contain any whitespaces!"); } } @@ -72,8 +74,8 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) return new CommandResult(true); } - private boolean isValidModuleArguments(ArrayList argArray) { - if (argArray.size() != 1) { + private boolean isValidModuleArguments (ArrayList argArray) { + if(argArray.size() != MODULE_ARGS_COUNT) { return false; } else { return !CommonUtils.hasEmptyString(argArray); diff --git a/src/main/java/terminus/command/module/DeleteModuleCommand.java b/src/main/java/terminus/command/module/DeleteModuleCommand.java index 009990da3e..1fb0de3781 100644 --- a/src/main/java/terminus/command/module/DeleteModuleCommand.java +++ b/src/main/java/terminus/command/module/DeleteModuleCommand.java @@ -3,6 +3,7 @@ import terminus.command.Command; import terminus.command.CommandResult; import terminus.common.CommonFormat; +import terminus.common.CommonUtils; import terminus.common.Messages; import terminus.common.TerminusLogger; import terminus.exception.InvalidArgumentException; @@ -36,7 +37,7 @@ public String getHelpMessage() { @Override public void parseArguments(String arguments) throws InvalidArgumentException { - if (arguments == null || arguments.isBlank()) { + if (CommonUtils.isStringNullOrEmpty(arguments)) { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } TerminusLogger.info("Parsing delete arguments"); @@ -64,17 +65,24 @@ public void parseArguments(String arguments) throws InvalidArgumentException { @Override public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidCommandException, InvalidArgumentException { - if (!isValidIndex(itemNumber, moduleManager)) { + String[] listOfModule = moduleManager.getAllModules(); + if (!isValidIndex(itemNumber, listOfModule)) { throw new InvalidArgumentException(Messages.ERROR_MESSAGE_EMPTY_CONTENTS); } - String[] listOfModule = moduleManager.getAllModules(); + moduleManager.removeModule(listOfModule[itemNumber - 1]); ui.printSection(String.format("Deleted module %s.",listOfModule[itemNumber - 1])); return new CommandResult(true); } - private boolean isValidIndex(int index, ModuleManager moduleManager) { - String[] listOfModule = moduleManager.getAllModules(); + /** + * Returns a boolean if the index give is valid + * + * @param index The index to check + * @param listOfModule The full list of modules + * @return True if the index is valid or else it is false + */ + private boolean isValidIndex(int index, String [] listOfModule) { return listOfModule.length >= index && index > 0; } } diff --git a/src/main/java/terminus/command/module/ViewModuleCommand.java b/src/main/java/terminus/command/module/ViewModuleCommand.java index 2093c8bf73..d4dde52f0f 100644 --- a/src/main/java/terminus/command/module/ViewModuleCommand.java +++ b/src/main/java/terminus/command/module/ViewModuleCommand.java @@ -48,7 +48,11 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) String[] listOfModules = IntStream.range(0, modules.length) .mapToObj(i -> String.format("%d. %s", i + 1, modules[i])) .toArray(String[]::new); - ui.printSection(listOfModules); + if (listOfModules.length == 0) { + ui.printSection("You do not have any modules"); + } else { + ui.printSection(listOfModules); + } return new CommandResult(true); } } diff --git a/src/main/java/terminus/command/note/AddNoteCommand.java b/src/main/java/terminus/command/note/AddNoteCommand.java index 9fc09a5210..f5271c6f54 100644 --- a/src/main/java/terminus/command/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/note/AddNoteCommand.java @@ -44,7 +44,7 @@ public String getHelpMessage() { @Override public void parseArguments(String arguments) throws InvalidArgumentException { TerminusLogger.info("Parsing add note arguments"); - if (arguments == null || arguments.isBlank()) { + if (CommonUtils.isStringNullOrEmpty(arguments)) { TerminusLogger.warning("Failed to parse arguments: arguments is empty"); throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java index dfb971bcea..0fcaa3f084 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/zoomlink/AddLinkCommand.java @@ -53,7 +53,7 @@ public String getHelpMessage() { @Override public void parseArguments(String arguments) throws InvalidArgumentException { - if (arguments == null || arguments.isBlank()) { + if (CommonUtils.isStringNullOrEmpty(arguments)) { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } diff --git a/src/main/java/terminus/common/CommonUtils.java b/src/main/java/terminus/common/CommonUtils.java index 7e27f3df7d..766ecf5871 100644 --- a/src/main/java/terminus/common/CommonUtils.java +++ b/src/main/java/terminus/common/CommonUtils.java @@ -113,4 +113,8 @@ public static boolean isValidDay(String day) { } return false; } + + public static boolean isStringNullOrEmpty(String string) { + return string == null || string.isBlank(); + } } diff --git a/src/main/java/terminus/module/ModuleManager.java b/src/main/java/terminus/module/ModuleManager.java index 2e69aa32ca..ebb8583b4d 100644 --- a/src/main/java/terminus/module/ModuleManager.java +++ b/src/main/java/terminus/module/ModuleManager.java @@ -11,18 +11,39 @@ public ModuleManager() { moduleMap = new HashMap<>(); } + /** + * Returns a NusModule Object given a module name + * + * @param moduleName The module name + * @return The NusModule Object for the given module name + */ public NusModule getModule(String moduleName) { return moduleMap.get(moduleName); } + /** + * Adds a new module to the moduleMap + * + * @param moduleName The module name of the new module + */ public void setModule(String moduleName) { moduleMap.put(moduleName, new NusModule()); } + /** + * Returns a String array contains the list of module names + * + * @return String array with the list of module names + */ public String[] getAllModules() { return moduleMap.keySet().toArray(new String[0]); } + /** + * Deletes the specified module + * + * @param moduleName The module name of the module to remove + */ public void removeModule(String moduleName) { moduleMap.remove(moduleName); } diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java index 10434cbf54..b0b46fd08d 100644 --- a/src/main/java/terminus/parser/CommandParser.java +++ b/src/main/java/terminus/parser/CommandParser.java @@ -64,7 +64,7 @@ public Set getCommandList() { return commandMap.keySet(); } - public abstract String getWorkspaceBanner(ModuleManager module); + public abstract String getWorkspaceBanner(ModuleManager moduleManager); /** * Returns the list of items in the help menu. @@ -100,6 +100,11 @@ public String getWorkspace() { return workspace; } + /** + * Sets the existing workspace for the module + * + * @param workspace The name of the workspace + */ public void setWorkspace(String workspace) { this.workspace = workspace; } diff --git a/src/main/java/terminus/parser/InModuleCommandParser.java b/src/main/java/terminus/parser/InnerModuleCommandParser.java similarity index 62% rename from src/main/java/terminus/parser/InModuleCommandParser.java rename to src/main/java/terminus/parser/InnerModuleCommandParser.java index 6466dd22bd..5a3c7fa2f1 100644 --- a/src/main/java/terminus/parser/InModuleCommandParser.java +++ b/src/main/java/terminus/parser/InnerModuleCommandParser.java @@ -4,7 +4,7 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; -public abstract class InModuleCommandParser extends CommandParser { +public abstract class InnerModuleCommandParser extends CommandParser { private String moduleName; @@ -13,14 +13,24 @@ public abstract class InModuleCommandParser extends CommandParser { * * @param workspace The name of the workspace. */ - public InModuleCommandParser(String workspace) { + public InnerModuleCommandParser(String workspace) { super(workspace); } + /** + * Returns the module name for the current workspace + * + * @return The string containing the module name + */ public String getModuleName() { return moduleName; } + /** + * Sets the module name for the current workspace + * + * @param moduleName The module name to set + */ public void setModuleName(String moduleName) { this.moduleName = moduleName; } @@ -32,6 +42,11 @@ public Command parseCommand(String command) throws InvalidCommandException, Inva return cmd; } + /** + * Returns a workspace that contains the moduleName and the current work space + * + * @return The consolidated workspace name + */ @Override public String getWorkspace() { return moduleName + " > " + super.getWorkspace(); diff --git a/src/main/java/terminus/parser/LinkCommandParser.java b/src/main/java/terminus/parser/LinkCommandParser.java index 2d7c0949b9..169f9e1747 100644 --- a/src/main/java/terminus/parser/LinkCommandParser.java +++ b/src/main/java/terminus/parser/LinkCommandParser.java @@ -8,12 +8,11 @@ import terminus.common.Messages; import terminus.content.Link; import terminus.module.ModuleManager; -import terminus.module.NusModule; /** * LinkCommandParser class to manage schedule-related commands. */ -public class LinkCommandParser extends InModuleCommandParser { +public class LinkCommandParser extends InnerModuleCommandParser { public LinkCommandParser() { super(CommonFormat.COMMAND_SCHEDULE); @@ -36,12 +35,12 @@ public static LinkCommandParser getInstance() { /** * Returns the opening description of the workspace. * - * @param module The current module containing the array list of all the links. + * @param moduleManager The current module containing the array list of all the links. * @return The string containing a description of the number of links in the workspace. */ @Override - public String getWorkspaceBanner(ModuleManager module) { + public String getWorkspaceBanner(ModuleManager moduleManager) { return String.format(Messages.SCHEDULE_BANNER, - module.getModule(getModuleName()).getContentManager(Link.class).getContents().size()); + moduleManager.getModule(getModuleName()).getContentManager(Link.class).getContents().size()); } } diff --git a/src/main/java/terminus/parser/MainCommandParser.java b/src/main/java/terminus/parser/MainCommandParser.java index 8761b9fd6b..b1d0db0d05 100644 --- a/src/main/java/terminus/parser/MainCommandParser.java +++ b/src/main/java/terminus/parser/MainCommandParser.java @@ -22,7 +22,7 @@ public static MainCommandParser getInstance() { } @Override - public String getWorkspaceBanner(ModuleManager module) { + public String getWorkspaceBanner(ModuleManager moduleManager) { return Messages.MAIN_BANNER; } } diff --git a/src/main/java/terminus/parser/ModuleCommandParser.java b/src/main/java/terminus/parser/ModuleCommandParser.java index c2fbc335a0..9a879d78fb 100644 --- a/src/main/java/terminus/parser/ModuleCommandParser.java +++ b/src/main/java/terminus/parser/ModuleCommandParser.java @@ -29,7 +29,7 @@ public static ModuleCommandParser getInstance() { } @Override - public String getWorkspaceBanner(ModuleManager module) { - return "Welcome to the workspace module"; + public String getWorkspaceBanner(ModuleManager moduleManager) { + return String.format("You have %d modules", moduleManager.getAllModules().length); } } diff --git a/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java b/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java index a19954c7ca..2413ded69c 100644 --- a/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java +++ b/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java @@ -8,7 +8,6 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; -import terminus.module.NusModule; public class ModuleWorkspaceCommandParser extends CommandParser { @@ -39,7 +38,7 @@ public Command parseCommand(String command) throws InvalidCommandException, Inva } @Override - public String getWorkspaceBanner(ModuleManager module) { + public String getWorkspaceBanner(ModuleManager moduleManager) { return "Entering " + getWorkspace() + " workspace"; } } diff --git a/src/main/java/terminus/parser/NoteCommandParser.java b/src/main/java/terminus/parser/NoteCommandParser.java index 57b8f6da2c..a5046457ae 100644 --- a/src/main/java/terminus/parser/NoteCommandParser.java +++ b/src/main/java/terminus/parser/NoteCommandParser.java @@ -8,10 +8,9 @@ import terminus.common.Messages; import terminus.content.Note; import terminus.module.ModuleManager; -import terminus.module.NusModule; -public class NoteCommandParser extends InModuleCommandParser { +public class NoteCommandParser extends InnerModuleCommandParser { public NoteCommandParser() { super(CommonFormat.COMMAND_NOTE); @@ -27,8 +26,8 @@ public static NoteCommandParser getInstance() { } @Override - public String getWorkspaceBanner(ModuleManager module) { + public String getWorkspaceBanner(ModuleManager moduleManager) { return String.format(Messages.NOTE_BANNER, - module.getModule(getModuleName()).getContentManager(Note.class).getContents().size()); + moduleManager.getModule(getModuleName()).getContentManager(Note.class).getContents().size()); } } From 5a0f04f514197ded96591d216af378b672f90e12 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Sun, 17 Oct 2021 18:28:12 +0800 Subject: [PATCH 132/466] JUnit testing for ModuleManager --- .../java/terminus/module/ModuleManager.java | 1 - .../terminus/command/HelpCommandTest.java | 1 - .../command/link/BackLinkCommandTest.java | 3 -- .../command/note/BackNoteCommandTest.java | 3 -- .../terminus/module/ModuleManagerTest.java | 39 +++++++++++++++++++ 5 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 src/test/java/terminus/module/ModuleManagerTest.java diff --git a/src/main/java/terminus/module/ModuleManager.java b/src/main/java/terminus/module/ModuleManager.java index ebb8583b4d..f48a7a3e21 100644 --- a/src/main/java/terminus/module/ModuleManager.java +++ b/src/main/java/terminus/module/ModuleManager.java @@ -1,7 +1,6 @@ package terminus.module; import java.util.HashMap; -import java.util.Set; public class ModuleManager { diff --git a/src/test/java/terminus/command/HelpCommandTest.java b/src/test/java/terminus/command/HelpCommandTest.java index 90829dae68..326cfb2eca 100644 --- a/src/test/java/terminus/command/HelpCommandTest.java +++ b/src/test/java/terminus/command/HelpCommandTest.java @@ -7,7 +7,6 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; -import terminus.module.NusModule; import terminus.parser.LinkCommandParser; import terminus.parser.MainCommandParser; import terminus.parser.ModuleCommandParser; diff --git a/src/test/java/terminus/command/link/BackLinkCommandTest.java b/src/test/java/terminus/command/link/BackLinkCommandTest.java index 7aaa7bf1e6..b3ce255c8c 100644 --- a/src/test/java/terminus/command/link/BackLinkCommandTest.java +++ b/src/test/java/terminus/command/link/BackLinkCommandTest.java @@ -9,10 +9,7 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; -import terminus.module.NusModule; -import terminus.parser.InModuleCommandParser; import terminus.parser.LinkCommandParser; -import terminus.parser.MainCommandParser; import terminus.parser.ModuleWorkspaceCommandParser; import terminus.ui.Ui; diff --git a/src/test/java/terminus/command/note/BackNoteCommandTest.java b/src/test/java/terminus/command/note/BackNoteCommandTest.java index 6db0eb7bbf..778a473f26 100644 --- a/src/test/java/terminus/command/note/BackNoteCommandTest.java +++ b/src/test/java/terminus/command/note/BackNoteCommandTest.java @@ -9,9 +9,6 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; -import terminus.module.NusModule; -import terminus.parser.InModuleCommandParser; -import terminus.parser.MainCommandParser; import terminus.parser.ModuleWorkspaceCommandParser; import terminus.parser.NoteCommandParser; import terminus.ui.Ui; diff --git a/src/test/java/terminus/module/ModuleManagerTest.java b/src/test/java/terminus/module/ModuleManagerTest.java new file mode 100644 index 0000000000..e34daf2dd1 --- /dev/null +++ b/src/test/java/terminus/module/ModuleManagerTest.java @@ -0,0 +1,39 @@ +package terminus.module; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Arrays; +import java.util.stream.IntStream; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +public class ModuleManagerTest { + + public static final String TEMP_MODULE = "Test"; + private ModuleManager moduleManager; + + @BeforeEach + void setUp() { + moduleManager = new ModuleManager(); + } + + @Test + void getModule_success() { + moduleManager.setModule(TEMP_MODULE); + assertNotNull(moduleManager.getModule(TEMP_MODULE)); + moduleManager.removeModule(TEMP_MODULE); + assertNull(moduleManager.getModule(TEMP_MODULE)); + } + + @Test + void getAllModules_success() { + IntStream.range(0, 5).forEach(i -> moduleManager.setModule(TEMP_MODULE + i)); + String [] listOfModules = moduleManager.getAllModules(); + assertEquals(5, listOfModules.length); + assertTrue(Arrays.asList(listOfModules).contains(TEMP_MODULE + 3)); + } + +} From 8889899fc6241ddaee8d19098d385b147d2e6603 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Sun, 17 Oct 2021 18:43:17 +0800 Subject: [PATCH 133/466] Update JavaDocs --- src/main/java/terminus/command/BackCommand.java | 4 ++-- src/main/java/terminus/command/Command.java | 4 ++-- .../java/terminus/command/module/AddModuleCommand.java | 8 ++++---- .../java/terminus/command/module/DeleteModuleCommand.java | 2 +- src/main/java/terminus/module/ModuleManager.java | 8 ++++---- src/main/java/terminus/parser/CommandParser.java | 2 +- .../java/terminus/parser/InnerModuleCommandParser.java | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/terminus/command/BackCommand.java b/src/main/java/terminus/command/BackCommand.java index b10dca2fc4..a69164de7c 100644 --- a/src/main/java/terminus/command/BackCommand.java +++ b/src/main/java/terminus/command/BackCommand.java @@ -22,12 +22,12 @@ public String getHelpMessage() { } /** - * Returns a command result containing the CommandParser object + * Returns a command result containing the CommandParser object. * * @param ui The Ui object to send messages to the users. * @param moduleManager The NusModule contain the ContentManager of all notes and schedules. * @return CommandResult contains a CommandParser - * @throws InvalidCommandException + * @throws InvalidCommandException Throws if the command is invalid */ @Override public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidCommandException { diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java index 1c3cd092e1..54c215ca49 100644 --- a/src/main/java/terminus/command/Command.java +++ b/src/main/java/terminus/command/Command.java @@ -48,7 +48,7 @@ public abstract CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidCommandException, InvalidArgumentException; /** - * Returns the module name + * Returns the module name. * * @return The String containing the module name */ @@ -57,7 +57,7 @@ public String getModuleName() { } /** - * Sets the module name + * Sets the module name. * * @param moduleName The String containing the module name to set */ diff --git a/src/main/java/terminus/command/module/AddModuleCommand.java b/src/main/java/terminus/command/module/AddModuleCommand.java index 39ce0879cf..9e2f760e99 100644 --- a/src/main/java/terminus/command/module/AddModuleCommand.java +++ b/src/main/java/terminus/command/module/AddModuleCommand.java @@ -57,10 +57,10 @@ public void parseArguments(String arguments) throws InvalidArgumentException { /** * Executes the command. Prints the required result to the Ui. * - * @param ui The Ui object to send messages to the users. + * @param ui The Ui object to send messages to the users. * @param moduleManager The NusModule contain the ContentManager of all notes and schedules. * @return The CommandResult object indicating the success of failure including additional options. - * @throws InvalidCommandException when the command could not be found. + * @throws InvalidCommandException when the command could not be found. * @throws InvalidArgumentException when arguments parsing fails. */ @Override @@ -74,8 +74,8 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) return new CommandResult(true); } - private boolean isValidModuleArguments (ArrayList argArray) { - if(argArray.size() != MODULE_ARGS_COUNT) { + private boolean isValidModuleArguments(ArrayList argArray) { + if (argArray.size() != MODULE_ARGS_COUNT) { return false; } else { return !CommonUtils.hasEmptyString(argArray); diff --git a/src/main/java/terminus/command/module/DeleteModuleCommand.java b/src/main/java/terminus/command/module/DeleteModuleCommand.java index 1fb0de3781..2d9b0a3016 100644 --- a/src/main/java/terminus/command/module/DeleteModuleCommand.java +++ b/src/main/java/terminus/command/module/DeleteModuleCommand.java @@ -76,7 +76,7 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) } /** - * Returns a boolean if the index give is valid + * Returns a boolean if the index give is valid. * * @param index The index to check * @param listOfModule The full list of modules diff --git a/src/main/java/terminus/module/ModuleManager.java b/src/main/java/terminus/module/ModuleManager.java index f48a7a3e21..9c94764146 100644 --- a/src/main/java/terminus/module/ModuleManager.java +++ b/src/main/java/terminus/module/ModuleManager.java @@ -11,7 +11,7 @@ public ModuleManager() { } /** - * Returns a NusModule Object given a module name + * Returns a NusModule Object given a module name. * * @param moduleName The module name * @return The NusModule Object for the given module name @@ -21,7 +21,7 @@ public NusModule getModule(String moduleName) { } /** - * Adds a new module to the moduleMap + * Adds a new module to the moduleMap. * * @param moduleName The module name of the new module */ @@ -30,7 +30,7 @@ public void setModule(String moduleName) { } /** - * Returns a String array contains the list of module names + * Returns a String array contains the list of module names. * * @return String array with the list of module names */ @@ -39,7 +39,7 @@ public String[] getAllModules() { } /** - * Deletes the specified module + * Deletes the specified module. * * @param moduleName The module name of the module to remove */ diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java index b0b46fd08d..5e3838f111 100644 --- a/src/main/java/terminus/parser/CommandParser.java +++ b/src/main/java/terminus/parser/CommandParser.java @@ -101,7 +101,7 @@ public String getWorkspace() { } /** - * Sets the existing workspace for the module + * Sets the existing workspace for the module. * * @param workspace The name of the workspace */ diff --git a/src/main/java/terminus/parser/InnerModuleCommandParser.java b/src/main/java/terminus/parser/InnerModuleCommandParser.java index 5a3c7fa2f1..6222c9931e 100644 --- a/src/main/java/terminus/parser/InnerModuleCommandParser.java +++ b/src/main/java/terminus/parser/InnerModuleCommandParser.java @@ -18,7 +18,7 @@ public InnerModuleCommandParser(String workspace) { } /** - * Returns the module name for the current workspace + * Returns the module name for the current workspace. * * @return The string containing the module name */ @@ -27,7 +27,7 @@ public String getModuleName() { } /** - * Sets the module name for the current workspace + * Sets the module name for the current workspace. * * @param moduleName The module name to set */ @@ -43,7 +43,7 @@ public Command parseCommand(String command) throws InvalidCommandException, Inva } /** - * Returns a workspace that contains the moduleName and the current work space + * Returns a workspace that contains the moduleName and the current work space. * * @return The consolidated workspace name */ From ea2d0a8fe025b7ef04ba03f7fae1fdadf72b9ff8 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Sun, 17 Oct 2021 21:51:22 +0800 Subject: [PATCH 134/466] Add module parsing JUnit test --- .../parser/ModuleCommandParserTest.java | 109 ++++++++++++++++++ .../ModuleWorkspaceCommandParserTest.java | 72 ++++++++++++ 2 files changed, 181 insertions(+) create mode 100644 src/test/java/terminus/parser/ModuleCommandParserTest.java create mode 100644 src/test/java/terminus/parser/ModuleWorkspaceCommandParserTest.java diff --git a/src/test/java/terminus/parser/ModuleCommandParserTest.java b/src/test/java/terminus/parser/ModuleCommandParserTest.java new file mode 100644 index 0000000000..97758b2847 --- /dev/null +++ b/src/test/java/terminus/parser/ModuleCommandParserTest.java @@ -0,0 +1,109 @@ +package terminus.parser; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.command.ExitCommand; +import terminus.command.HelpCommand; +import terminus.command.module.AddModuleCommand; +import terminus.command.module.DeleteModuleCommand; +import terminus.command.module.ViewModuleCommand; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; + +public class ModuleCommandParserTest { + + private ModuleCommandParser commandParser; + + @BeforeEach + void setUp() { + commandParser = ModuleCommandParser.getInstance(); + } + + @Test + void parseCommand_invalidCommand_exceptionThrown() { + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("ex it")); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("helpa")); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("adda")); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("vie wer")); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("deleterr")); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("")); + } + + @Test + void parseCommand_resolveExitCommand_success() + throws InvalidCommandException, InvalidArgumentException { + assertTrue(commandParser.parseCommand("exit") instanceof ExitCommand); + assertTrue(commandParser.parseCommand("EXIT") instanceof ExitCommand); + assertTrue(commandParser.parseCommand(" exit ") instanceof ExitCommand); + assertTrue(commandParser.parseCommand("eXiT a") instanceof ExitCommand); + } + + @Test + void parseCommand_resolveHelpCommand_success() + throws InvalidCommandException, InvalidArgumentException { + assertTrue(commandParser.parseCommand("help") instanceof HelpCommand); + assertTrue(commandParser.parseCommand("HELP") instanceof HelpCommand); + assertTrue(commandParser.parseCommand(" help ") instanceof HelpCommand); + assertTrue(commandParser.parseCommand("HeLp a") instanceof HelpCommand); + } + + @Test + void parseCommand_resolveAddCommand_exceptionThrown() + throws InvalidCommandException, InvalidArgumentException { + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("add")); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("add \"test\" \"test1\" ")); + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("add \" test \" ")); + } + + @Test + void parseCommand_resolveAddCommand_success() throws InvalidCommandException, InvalidArgumentException { + assertTrue(commandParser.parseCommand("add \"test\" ") instanceof AddModuleCommand); + assertTrue(commandParser.parseCommand("add \"username\"") instanceof AddModuleCommand); + assertTrue(commandParser.parseCommand("add \"test1\"test2\"") instanceof AddModuleCommand); + } + + @Test + void parseCommand_resolveDeleteCommand_exceptionThrown() throws InvalidCommandException, InvalidArgumentException { + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("delete")); + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("delete abcd")); + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("delete -5")); + } + + @Test + void parseCommand_resolveDeleteCommand_success() + throws InvalidCommandException, InvalidArgumentException { + assertTrue(commandParser.parseCommand("delete 1") instanceof DeleteModuleCommand); + assertTrue(commandParser.parseCommand("delete 2") instanceof DeleteModuleCommand); + } + + @Test + void parseCommand_resolveViewCommand_success() throws InvalidCommandException, InvalidArgumentException { + assertTrue(commandParser.parseCommand("view") instanceof ViewModuleCommand); + } + + @Test + void getCommandList_containsBasicCommands() { + assertTrue(commandParser.getCommandList().contains("exit")); + assertTrue(commandParser.getCommandList().contains("add")); + assertTrue(commandParser.getCommandList().contains("back")); + assertTrue(commandParser.getCommandList().contains("delete")); + assertTrue(commandParser.getCommandList().contains("view")); + assertTrue(commandParser.getCommandList().contains("help")); + } + + @Test + void getWorkspace_isModule() { + assertEquals("module", commandParser.getWorkspace()); + } + + @Test + void getHelpMenu_isNotEmpty() { + assertTrue(commandParser.getHelpMenu().length > 0); + } + +} diff --git a/src/test/java/terminus/parser/ModuleWorkspaceCommandParserTest.java b/src/test/java/terminus/parser/ModuleWorkspaceCommandParserTest.java new file mode 100644 index 0000000000..8de306e87e --- /dev/null +++ b/src/test/java/terminus/parser/ModuleWorkspaceCommandParserTest.java @@ -0,0 +1,72 @@ +package terminus.parser; + +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.command.ExitCommand; +import terminus.command.HelpCommand; +import terminus.command.NotesCommand; +import terminus.command.ScheduleCommand; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; + +public class ModuleWorkspaceCommandParserTest { + + private ModuleWorkspaceCommandParser commandParser; + + @BeforeEach + void setUp() { + commandParser = ModuleWorkspaceCommandParser.getInstance(); + commandParser.setWorkspace("2106"); + } + + @Test + void parseCommand_invalidCommand_exceptionThrown() { + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("ex it")); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("helpa")); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("adda")); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("vie wer")); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("deleterr")); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("")); + } + + @Test + void parseCommand_resolveExitCommand_success() + throws InvalidCommandException, InvalidArgumentException { + assertTrue(commandParser.parseCommand("exit") instanceof ExitCommand); + assertTrue(commandParser.parseCommand("EXIT") instanceof ExitCommand); + assertTrue(commandParser.parseCommand(" exit ") instanceof ExitCommand); + assertTrue(commandParser.parseCommand("eXiT a") instanceof ExitCommand); + } + + @Test + void parseCommand_resolveHelpCommand_success() + throws InvalidCommandException, InvalidArgumentException { + assertTrue(commandParser.parseCommand("help") instanceof HelpCommand); + assertTrue(commandParser.parseCommand("HELP") instanceof HelpCommand); + assertTrue(commandParser.parseCommand(" help ") instanceof HelpCommand); + assertTrue(commandParser.parseCommand("HeLp a") instanceof HelpCommand); + } + + @Test + void parseCommand_resolveNoteCommand_success() + throws InvalidCommandException, InvalidArgumentException { + assertTrue(commandParser.parseCommand("note") instanceof NotesCommand); + assertTrue(commandParser.parseCommand("note add \"test\" \"test\"") instanceof NotesCommand); + assertTrue(commandParser.parseCommand("note view") instanceof NotesCommand); + assertTrue(commandParser.parseCommand("note delete 1") instanceof NotesCommand); + } + + @Test + void parseCommand_resolveScheduleCommand_success() + throws InvalidCommandException, InvalidArgumentException { + assertTrue(commandParser.parseCommand("schedule") instanceof ScheduleCommand); + assertTrue(commandParser.parseCommand( + "schedule add \"test desc\" \"Tuesday\" \"10:00\" \"https://zoom.us/test\"") + instanceof ScheduleCommand); + assertTrue(commandParser.parseCommand("schedule view") instanceof ScheduleCommand); + assertTrue(commandParser.parseCommand("schedule delete 1") instanceof ScheduleCommand); + } +} From d90dcd581f7437f9df1d69425177f2f5c06e6cfb Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Mon, 18 Oct 2021 00:03:28 +0800 Subject: [PATCH 135/466] Add introduction and setup intellij in DG --- docs/DeveloperGuide.md | 64 +++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 20 deletions(-) diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index 64e1f0ed2b..7bffbc5209 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -1,38 +1,62 @@ # Developer Guide -## Acknowledgements +## Table of Content -{list here sources of all reused/adapted ideas, code, documentation, and third-party libraries -- include links to the original source as well} +## 1. Introduction -## Design & implementation +**Welcome to TermiNUS!** -{Describe the design and implementation of the product. Use UML diagrams and short code snippets where applicable.} +**TermiNUS** is a CLI (command line interface) program for NUS Students who wish to organize their +NUS academic materials through a CLI. The product aims to aid student in organizing their academic +schedule and enhancing their learning experiences. +**TermiNUS** is written in **Java 11** and uses the Object-Oriented Programming (OOP) paradigm which +provides us with means to structure a software program into organized and reusable pieces of codes, +making it more efficient for future improvements and revisions. -## Product scope -### Target user profile +### 1.1 Purpose -{Describe the target user profile} +This developer guide is for any developers who wish to contribute to **TermiNUS**. It contains the +overall architecture design of **TermiNUS** and it displays our main features implementation details +with the rationale and consideration for each. As of now, the guide is written for the current +release version of `TermiNUS of v1.0`. -### Value proposition +### 1.2 Using this Guide -{Describe the value proposition: what problem does it solve?} +Insert legends / special icons used here to aid in the guide later. -## User Stories +## 2. Setting up -|Version| As a ... | I want to ... | So that I can ...| -|--------|----------|---------------|------------------| -|v1.0|new user|see usage instructions|refer to them when I forget how to use the application| -|v2.0|user|find a to-do item by name|locate a to-do without having to go through the entire list| +### 2.1 Setting up the project in your computer -## Non-Functional Requirements +#### 2.1.1 Prerequisite -{Give non-functional requirements} +Before setting up the project, please do ensure you have the following items installed. -## Glossary +- [JDK 11](https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html) +- [IntelliJ IDEA](https://www.jetbrains.com/idea/download/) -* *glossary item* - Definition +`Java Development Kit ver 11 (JDK 11)` is the **environment / programming language** in which +TermiNUS is written with and `IntelliJ IDEA` will be the **integrated development environment ( +IDE)** platform for us to write the programming codes on. -## Instructions for manual testing +#### 2.1.2 Getting the project files -{Give instructions on how to do a manual product testing e.g., how to load sample data to be used for testing} +Go to [link](https://github.com/AY2122S1-CS2113T-T10-2/tp) and retrieve the `TermiNUS project file`. +You can do so by **forking** the project and **cloning** a copy into your computer. + +To learn more about github fork-clone feature please follow the guide +on [link](https://docs.github.com/en/get-started/quickstart/fork-a-repo). + +#### 2.1.3 Setting up on IntelliJ IDEA + +1. Open the application `IntelliJ IDEA`. +2. Inside `IntelliJ IDEA` navigate to `open project` button + 1. On the top left of the app, `File`→`Open...` +3. Locate and select the folder containing the files for **Terminus** that you have downloaded + earlier on. +4. Change the **Project SDK** that IntelliJ IDEA will be using. + 1. On the top left of the app, `File`→`Project Structure...` + 2. Under **Project SDK:** section, find and select JDK version 11. + Eg: `Amazon Corretto version 11.0.12`. + 3. Under **Project language level:**, select `SDK default`. From e4334842e29d003db05358dc04d0d84744d390f6 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Mon, 18 Oct 2021 16:01:27 +0800 Subject: [PATCH 136/466] Refactor code and Fixed error prompt bug --- .../terminus/command/InnerModuleCommand.java | 24 ----------- .../terminus/command/WorkspaceCommand.java | 18 ++------ .../command/{ => content}/DeleteCommand.java | 4 +- .../command/content/InnerModuleCommand.java | 41 +++++++++++++++++++ .../command/{ => content}/NotesCommand.java | 2 +- .../{ => content}/ScheduleCommand.java | 2 +- .../command/{ => content}/ViewCommand.java | 4 +- .../link}/AddLinkCommand.java | 2 +- .../{ => content}/note/AddNoteCommand.java | 2 +- .../command/{ => module}/ModuleCommand.java | 3 +- .../parser/InnerModuleCommandParser.java | 7 ++++ .../terminus/parser/LinkCommandParser.java | 6 +-- .../terminus/parser/MainCommandParser.java | 3 +- .../parser/ModuleWorkspaceCommandParser.java | 4 +- .../terminus/parser/NoteCommandParser.java | 6 +-- .../terminus/command/ModuleCommandTest.java | 23 +++++++++++ .../link/AddLinkCommandTest.java | 3 +- .../link/BackLinkCommandTest.java | 2 +- .../link/DeleteLinkCommandTest.java | 3 +- .../link/ViewLinkCommandTest.java | 3 +- .../note/AddNoteCommandTest.java | 3 +- .../note/BackNoteCommandTest.java | 2 +- .../note/DeleteNoteCommandTest.java | 3 +- .../note/ViewNoteCommandTest.java | 3 +- .../parser/LinkCommandParserTest.java | 7 ++-- .../parser/MainCommandParserTest.java | 2 - .../ModuleWorkspaceCommandParserTest.java | 4 +- .../parser/NoteCommandParserTest.java | 8 ++-- 28 files changed, 111 insertions(+), 83 deletions(-) delete mode 100644 src/main/java/terminus/command/InnerModuleCommand.java rename src/main/java/terminus/command/{ => content}/DeleteCommand.java (97%) create mode 100644 src/main/java/terminus/command/content/InnerModuleCommand.java rename src/main/java/terminus/command/{ => content}/NotesCommand.java (93%) rename src/main/java/terminus/command/{ => content}/ScheduleCommand.java (96%) rename src/main/java/terminus/command/{ => content}/ViewCommand.java (97%) rename src/main/java/terminus/command/{zoomlink => content/link}/AddLinkCommand.java (99%) rename src/main/java/terminus/command/{ => content}/note/AddNoteCommand.java (99%) rename src/main/java/terminus/command/{ => module}/ModuleCommand.java (89%) create mode 100644 src/test/java/terminus/command/ModuleCommandTest.java rename src/test/java/terminus/command/{ => content}/link/AddLinkCommandTest.java (97%) rename src/test/java/terminus/command/{ => content}/link/BackLinkCommandTest.java (97%) rename src/test/java/terminus/command/{ => content}/link/DeleteLinkCommandTest.java (97%) rename src/test/java/terminus/command/{ => content}/link/ViewLinkCommandTest.java (98%) rename src/test/java/terminus/command/{ => content}/note/AddNoteCommandTest.java (96%) rename src/test/java/terminus/command/{ => content}/note/BackNoteCommandTest.java (97%) rename src/test/java/terminus/command/{ => content}/note/DeleteNoteCommandTest.java (97%) rename src/test/java/terminus/command/{ => content}/note/ViewNoteCommandTest.java (98%) diff --git a/src/main/java/terminus/command/InnerModuleCommand.java b/src/main/java/terminus/command/InnerModuleCommand.java deleted file mode 100644 index 7ff4c78095..0000000000 --- a/src/main/java/terminus/command/InnerModuleCommand.java +++ /dev/null @@ -1,24 +0,0 @@ -package terminus.command; - -import terminus.exception.InvalidArgumentException; -import terminus.exception.InvalidCommandException; -import terminus.module.ModuleManager; -import terminus.parser.InnerModuleCommandParser; -import terminus.ui.Ui; - -public abstract class InnerModuleCommand extends WorkspaceCommand { - - private InnerModuleCommandParser commandMap; - - public InnerModuleCommand(InnerModuleCommandParser commandMap) { - super(commandMap); - this.commandMap = commandMap; - } - - @Override - public CommandResult execute(Ui ui, ModuleManager moduleManager) - throws InvalidCommandException, InvalidArgumentException { - commandMap.setModuleName(getModuleName()); - return super.execute(ui, moduleManager); - } -} diff --git a/src/main/java/terminus/command/WorkspaceCommand.java b/src/main/java/terminus/command/WorkspaceCommand.java index 3799ea81a8..a008fbf307 100644 --- a/src/main/java/terminus/command/WorkspaceCommand.java +++ b/src/main/java/terminus/command/WorkspaceCommand.java @@ -10,7 +10,7 @@ public abstract class WorkspaceCommand extends Command { protected CommandParser commandMap; - private static final String INVALID_ARGUMENT_FORMAT_MESSAGE = "%s %s"; + public WorkspaceCommand(CommandParser commandMap) { this.commandMap = commandMap; @@ -31,20 +31,8 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) assert commandMap != null; TerminusLogger.info("Executing Workspace Command"); if (isNotNullOrBlank()) { - try { - TerminusLogger.info("Parsing workspace command"); - return commandMap.parseCommand(arguments).execute(ui, moduleManager); - } catch (InvalidArgumentException e) { - if (e.getFormat() == null) { - throw e; - } - TerminusLogger.warning("Failed to parse command."); - TerminusLogger.warning(commandMap.getWorkspace() + " : " + e.getFormat()); - throw new InvalidArgumentException( - String.format(INVALID_ARGUMENT_FORMAT_MESSAGE, commandMap.getWorkspace(), e.getFormat()), - e.getMessage() - ); - } + TerminusLogger.info("Parsing workspace command"); + return commandMap.parseCommand(arguments).execute(ui, moduleManager); } else { TerminusLogger.info("Switching workspace to: " + commandMap.getWorkspace()); return new CommandResult(true, commandMap); diff --git a/src/main/java/terminus/command/DeleteCommand.java b/src/main/java/terminus/command/content/DeleteCommand.java similarity index 97% rename from src/main/java/terminus/command/DeleteCommand.java rename to src/main/java/terminus/command/content/DeleteCommand.java index 0dfccdcd85..a95b3d7e94 100644 --- a/src/main/java/terminus/command/DeleteCommand.java +++ b/src/main/java/terminus/command/content/DeleteCommand.java @@ -1,5 +1,7 @@ -package terminus.command; +package terminus.command.content; +import terminus.command.Command; +import terminus.command.CommandResult; import terminus.common.CommonFormat; import terminus.common.CommonUtils; import terminus.common.Messages; diff --git a/src/main/java/terminus/command/content/InnerModuleCommand.java b/src/main/java/terminus/command/content/InnerModuleCommand.java new file mode 100644 index 0000000000..769578de53 --- /dev/null +++ b/src/main/java/terminus/command/content/InnerModuleCommand.java @@ -0,0 +1,41 @@ +package terminus.command.content; + +import terminus.command.CommandResult; +import terminus.command.WorkspaceCommand; +import terminus.common.TerminusLogger; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; +import terminus.parser.InnerModuleCommandParser; +import terminus.ui.Ui; + +public abstract class InnerModuleCommand extends WorkspaceCommand { + + private InnerModuleCommandParser commandMap; + private static final String INVALID_ARGUMENT_FORMAT_MESSAGE = "%s %s"; + + public InnerModuleCommand(InnerModuleCommandParser commandMap) { + super(commandMap); + this.commandMap = commandMap; + } + + @Override + public CommandResult execute(Ui ui, ModuleManager moduleManager) + throws InvalidCommandException, InvalidArgumentException { + commandMap.setModuleName(getModuleName()); + try { + return super.execute(ui, moduleManager); + } catch (InvalidArgumentException e) { + if (e.getFormat() == null) { + throw e; + } + TerminusLogger.warning("Failed to parse command."); + TerminusLogger.warning(commandMap.getWorkspace() + " : " + e.getFormat()); + throw new InvalidArgumentException( + String.format(INVALID_ARGUMENT_FORMAT_MESSAGE,commandMap.getWorkspace(true), e.getFormat()), + e.getMessage() + ); + } + + } +} diff --git a/src/main/java/terminus/command/NotesCommand.java b/src/main/java/terminus/command/content/NotesCommand.java similarity index 93% rename from src/main/java/terminus/command/NotesCommand.java rename to src/main/java/terminus/command/content/NotesCommand.java index 6799eac572..109171b1f2 100644 --- a/src/main/java/terminus/command/NotesCommand.java +++ b/src/main/java/terminus/command/content/NotesCommand.java @@ -1,4 +1,4 @@ -package terminus.command; +package terminus.command.content; import terminus.common.CommonFormat; import terminus.common.Messages; diff --git a/src/main/java/terminus/command/ScheduleCommand.java b/src/main/java/terminus/command/content/ScheduleCommand.java similarity index 96% rename from src/main/java/terminus/command/ScheduleCommand.java rename to src/main/java/terminus/command/content/ScheduleCommand.java index 52a87d4b68..a47d298bf7 100644 --- a/src/main/java/terminus/command/ScheduleCommand.java +++ b/src/main/java/terminus/command/content/ScheduleCommand.java @@ -1,4 +1,4 @@ -package terminus.command; +package terminus.command.content; import terminus.common.CommonFormat; import terminus.common.Messages; diff --git a/src/main/java/terminus/command/ViewCommand.java b/src/main/java/terminus/command/content/ViewCommand.java similarity index 97% rename from src/main/java/terminus/command/ViewCommand.java rename to src/main/java/terminus/command/content/ViewCommand.java index 544c17b4bd..d414bb5cdf 100644 --- a/src/main/java/terminus/command/ViewCommand.java +++ b/src/main/java/terminus/command/content/ViewCommand.java @@ -1,5 +1,7 @@ -package terminus.command; +package terminus.command.content; +import terminus.command.Command; +import terminus.command.CommandResult; import terminus.common.CommonFormat; import terminus.common.CommonUtils; import terminus.common.Messages; diff --git a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java b/src/main/java/terminus/command/content/link/AddLinkCommand.java similarity index 99% rename from src/main/java/terminus/command/zoomlink/AddLinkCommand.java rename to src/main/java/terminus/command/content/link/AddLinkCommand.java index 0fcaa3f084..b41db3f851 100644 --- a/src/main/java/terminus/command/zoomlink/AddLinkCommand.java +++ b/src/main/java/terminus/command/content/link/AddLinkCommand.java @@ -1,4 +1,4 @@ -package terminus.command.zoomlink; +package terminus.command.content.link; import static terminus.common.CommonUtils.isValidDay; import static terminus.common.CommonUtils.isValidUrl; diff --git a/src/main/java/terminus/command/note/AddNoteCommand.java b/src/main/java/terminus/command/content/note/AddNoteCommand.java similarity index 99% rename from src/main/java/terminus/command/note/AddNoteCommand.java rename to src/main/java/terminus/command/content/note/AddNoteCommand.java index f5271c6f54..5647067ba4 100644 --- a/src/main/java/terminus/command/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/content/note/AddNoteCommand.java @@ -1,4 +1,4 @@ -package terminus.command.note; +package terminus.command.content.note; import java.util.ArrayList; import terminus.command.Command; diff --git a/src/main/java/terminus/command/ModuleCommand.java b/src/main/java/terminus/command/module/ModuleCommand.java similarity index 89% rename from src/main/java/terminus/command/ModuleCommand.java rename to src/main/java/terminus/command/module/ModuleCommand.java index 77f5a6ca88..52fbba1883 100644 --- a/src/main/java/terminus/command/ModuleCommand.java +++ b/src/main/java/terminus/command/module/ModuleCommand.java @@ -1,5 +1,6 @@ -package terminus.command; +package terminus.command.module; +import terminus.command.WorkspaceCommand; import terminus.parser.ModuleCommandParser; public class ModuleCommand extends WorkspaceCommand { diff --git a/src/main/java/terminus/parser/InnerModuleCommandParser.java b/src/main/java/terminus/parser/InnerModuleCommandParser.java index 6222c9931e..e1e7eb0a06 100644 --- a/src/main/java/terminus/parser/InnerModuleCommandParser.java +++ b/src/main/java/terminus/parser/InnerModuleCommandParser.java @@ -51,4 +51,11 @@ public Command parseCommand(String command) throws InvalidCommandException, Inva public String getWorkspace() { return moduleName + " > " + super.getWorkspace(); } + + public String getWorkspace(boolean isOriginal) { + if (isOriginal) { + return super.getWorkspace(); + } + return moduleName + " > " + super.getWorkspace(); + } } diff --git a/src/main/java/terminus/parser/LinkCommandParser.java b/src/main/java/terminus/parser/LinkCommandParser.java index 169f9e1747..f7ca2d1691 100644 --- a/src/main/java/terminus/parser/LinkCommandParser.java +++ b/src/main/java/terminus/parser/LinkCommandParser.java @@ -1,9 +1,9 @@ package terminus.parser; import terminus.command.BackCommand; -import terminus.command.DeleteCommand; -import terminus.command.ViewCommand; -import terminus.command.zoomlink.AddLinkCommand; +import terminus.command.content.DeleteCommand; +import terminus.command.content.ViewCommand; +import terminus.command.content.link.AddLinkCommand; import terminus.common.CommonFormat; import terminus.common.Messages; import terminus.content.Link; diff --git a/src/main/java/terminus/parser/MainCommandParser.java b/src/main/java/terminus/parser/MainCommandParser.java index b1d0db0d05..862aacd8c7 100644 --- a/src/main/java/terminus/parser/MainCommandParser.java +++ b/src/main/java/terminus/parser/MainCommandParser.java @@ -1,10 +1,9 @@ package terminus.parser; import terminus.command.GoCommand; -import terminus.command.ModuleCommand; +import terminus.command.module.ModuleCommand; import terminus.common.Messages; import terminus.module.ModuleManager; -import terminus.module.NusModule; public class MainCommandParser extends CommandParser { diff --git a/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java b/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java index 2413ded69c..62118f329c 100644 --- a/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java +++ b/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java @@ -2,8 +2,8 @@ import terminus.command.BackCommand; import terminus.command.Command; -import terminus.command.NotesCommand; -import terminus.command.ScheduleCommand; +import terminus.command.content.NotesCommand; +import terminus.command.content.ScheduleCommand; import terminus.common.CommonFormat; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; diff --git a/src/main/java/terminus/parser/NoteCommandParser.java b/src/main/java/terminus/parser/NoteCommandParser.java index a5046457ae..4a0e1bb13f 100644 --- a/src/main/java/terminus/parser/NoteCommandParser.java +++ b/src/main/java/terminus/parser/NoteCommandParser.java @@ -1,9 +1,9 @@ package terminus.parser; import terminus.command.BackCommand; -import terminus.command.DeleteCommand; -import terminus.command.ViewCommand; -import terminus.command.note.AddNoteCommand; +import terminus.command.content.DeleteCommand; +import terminus.command.content.ViewCommand; +import terminus.command.content.note.AddNoteCommand; import terminus.common.CommonFormat; import terminus.common.Messages; import terminus.content.Note; diff --git a/src/test/java/terminus/command/ModuleCommandTest.java b/src/test/java/terminus/command/ModuleCommandTest.java new file mode 100644 index 0000000000..8281f79d5a --- /dev/null +++ b/src/test/java/terminus/command/ModuleCommandTest.java @@ -0,0 +1,23 @@ +package terminus.command; + +import org.junit.jupiter.api.BeforeEach; +import terminus.module.ModuleManager; +import terminus.parser.MainCommandParser; +import terminus.parser.ModuleCommandParser; +import terminus.ui.Ui; + +public class ModuleCommandTest { + private ModuleCommandParser commandParser; + private Ui ui; + + private ModuleManager moduleManager; + + private String tempModule = "test"; + + @BeforeEach + void setUp() { + commandParser = ModuleCommandParser.getInstance(); + moduleManager = new ModuleManager(); + ui = new Ui(); + } +} diff --git a/src/test/java/terminus/command/link/AddLinkCommandTest.java b/src/test/java/terminus/command/content/link/AddLinkCommandTest.java similarity index 97% rename from src/test/java/terminus/command/link/AddLinkCommandTest.java rename to src/test/java/terminus/command/content/link/AddLinkCommandTest.java index 733a22d803..a31f69efa9 100644 --- a/src/test/java/terminus/command/link/AddLinkCommandTest.java +++ b/src/test/java/terminus/command/content/link/AddLinkCommandTest.java @@ -1,4 +1,4 @@ -package terminus.command.link; +package terminus.command.content.link; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -13,7 +13,6 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; -import terminus.module.NusModule; import terminus.parser.LinkCommandParser; import terminus.ui.Ui; diff --git a/src/test/java/terminus/command/link/BackLinkCommandTest.java b/src/test/java/terminus/command/content/link/BackLinkCommandTest.java similarity index 97% rename from src/test/java/terminus/command/link/BackLinkCommandTest.java rename to src/test/java/terminus/command/content/link/BackLinkCommandTest.java index b3ce255c8c..6fdf37ea8c 100644 --- a/src/test/java/terminus/command/link/BackLinkCommandTest.java +++ b/src/test/java/terminus/command/content/link/BackLinkCommandTest.java @@ -1,4 +1,4 @@ -package terminus.command.link; +package terminus.command.content.link; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/terminus/command/link/DeleteLinkCommandTest.java b/src/test/java/terminus/command/content/link/DeleteLinkCommandTest.java similarity index 97% rename from src/test/java/terminus/command/link/DeleteLinkCommandTest.java rename to src/test/java/terminus/command/content/link/DeleteLinkCommandTest.java index e565124e09..60133b91e4 100644 --- a/src/test/java/terminus/command/link/DeleteLinkCommandTest.java +++ b/src/test/java/terminus/command/content/link/DeleteLinkCommandTest.java @@ -1,4 +1,4 @@ -package terminus.command.link; +package terminus.command.content.link; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -12,7 +12,6 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; -import terminus.module.NusModule; import terminus.parser.LinkCommandParser; import terminus.ui.Ui; diff --git a/src/test/java/terminus/command/link/ViewLinkCommandTest.java b/src/test/java/terminus/command/content/link/ViewLinkCommandTest.java similarity index 98% rename from src/test/java/terminus/command/link/ViewLinkCommandTest.java rename to src/test/java/terminus/command/content/link/ViewLinkCommandTest.java index bcdc17435b..d51d7ac57c 100644 --- a/src/test/java/terminus/command/link/ViewLinkCommandTest.java +++ b/src/test/java/terminus/command/content/link/ViewLinkCommandTest.java @@ -1,4 +1,4 @@ -package terminus.command.link; +package terminus.command.content.link; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -12,7 +12,6 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; -import terminus.module.NusModule; import terminus.parser.LinkCommandParser; import terminus.ui.Ui; diff --git a/src/test/java/terminus/command/note/AddNoteCommandTest.java b/src/test/java/terminus/command/content/note/AddNoteCommandTest.java similarity index 96% rename from src/test/java/terminus/command/note/AddNoteCommandTest.java rename to src/test/java/terminus/command/content/note/AddNoteCommandTest.java index 8bed4df198..f25bee26bb 100644 --- a/src/test/java/terminus/command/note/AddNoteCommandTest.java +++ b/src/test/java/terminus/command/content/note/AddNoteCommandTest.java @@ -1,4 +1,4 @@ -package terminus.command.note; +package terminus.command.content.note; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -11,7 +11,6 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; -import terminus.module.NusModule; import terminus.parser.NoteCommandParser; import terminus.ui.Ui; diff --git a/src/test/java/terminus/command/note/BackNoteCommandTest.java b/src/test/java/terminus/command/content/note/BackNoteCommandTest.java similarity index 97% rename from src/test/java/terminus/command/note/BackNoteCommandTest.java rename to src/test/java/terminus/command/content/note/BackNoteCommandTest.java index 778a473f26..a0d2899dab 100644 --- a/src/test/java/terminus/command/note/BackNoteCommandTest.java +++ b/src/test/java/terminus/command/content/note/BackNoteCommandTest.java @@ -1,4 +1,4 @@ -package terminus.command.note; +package terminus.command.content.note; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/terminus/command/note/DeleteNoteCommandTest.java b/src/test/java/terminus/command/content/note/DeleteNoteCommandTest.java similarity index 97% rename from src/test/java/terminus/command/note/DeleteNoteCommandTest.java rename to src/test/java/terminus/command/content/note/DeleteNoteCommandTest.java index d09a9d6b2f..adc46f9667 100644 --- a/src/test/java/terminus/command/note/DeleteNoteCommandTest.java +++ b/src/test/java/terminus/command/content/note/DeleteNoteCommandTest.java @@ -1,4 +1,4 @@ -package terminus.command.note; +package terminus.command.content.note; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -12,7 +12,6 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; -import terminus.module.NusModule; import terminus.parser.NoteCommandParser; import terminus.ui.Ui; diff --git a/src/test/java/terminus/command/note/ViewNoteCommandTest.java b/src/test/java/terminus/command/content/note/ViewNoteCommandTest.java similarity index 98% rename from src/test/java/terminus/command/note/ViewNoteCommandTest.java rename to src/test/java/terminus/command/content/note/ViewNoteCommandTest.java index 411bb73c76..749c96f1c3 100644 --- a/src/test/java/terminus/command/note/ViewNoteCommandTest.java +++ b/src/test/java/terminus/command/content/note/ViewNoteCommandTest.java @@ -1,4 +1,4 @@ -package terminus.command.note; +package terminus.command.content.note; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -12,7 +12,6 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; -import terminus.module.NusModule; import terminus.parser.NoteCommandParser; import terminus.ui.Ui; diff --git a/src/test/java/terminus/parser/LinkCommandParserTest.java b/src/test/java/terminus/parser/LinkCommandParserTest.java index 36f6f75ffe..34818095f8 100644 --- a/src/test/java/terminus/parser/LinkCommandParserTest.java +++ b/src/test/java/terminus/parser/LinkCommandParserTest.java @@ -6,14 +6,13 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import terminus.command.DeleteCommand; +import terminus.command.content.DeleteCommand; import terminus.command.ExitCommand; import terminus.command.HelpCommand; -import terminus.command.ViewCommand; -import terminus.command.zoomlink.AddLinkCommand; +import terminus.command.content.ViewCommand; +import terminus.command.content.link.AddLinkCommand; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; -import terminus.module.NusModule; public class LinkCommandParserTest { diff --git a/src/test/java/terminus/parser/MainCommandParserTest.java b/src/test/java/terminus/parser/MainCommandParserTest.java index e565ed11fe..1f997ebb68 100644 --- a/src/test/java/terminus/parser/MainCommandParserTest.java +++ b/src/test/java/terminus/parser/MainCommandParserTest.java @@ -8,11 +8,9 @@ import terminus.command.ExitCommand; import terminus.command.GoCommand; import terminus.command.HelpCommand; -import terminus.command.NotesCommand; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; -import terminus.ui.Ui; public class MainCommandParserTest { diff --git a/src/test/java/terminus/parser/ModuleWorkspaceCommandParserTest.java b/src/test/java/terminus/parser/ModuleWorkspaceCommandParserTest.java index 8de306e87e..87162069bd 100644 --- a/src/test/java/terminus/parser/ModuleWorkspaceCommandParserTest.java +++ b/src/test/java/terminus/parser/ModuleWorkspaceCommandParserTest.java @@ -7,8 +7,8 @@ import org.junit.jupiter.api.Test; import terminus.command.ExitCommand; import terminus.command.HelpCommand; -import terminus.command.NotesCommand; -import terminus.command.ScheduleCommand; +import terminus.command.content.NotesCommand; +import terminus.command.content.ScheduleCommand; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; diff --git a/src/test/java/terminus/parser/NoteCommandParserTest.java b/src/test/java/terminus/parser/NoteCommandParserTest.java index e9dd963c09..5f015f0a35 100644 --- a/src/test/java/terminus/parser/NoteCommandParserTest.java +++ b/src/test/java/terminus/parser/NoteCommandParserTest.java @@ -6,15 +6,13 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import terminus.command.DeleteCommand; +import terminus.command.content.DeleteCommand; import terminus.command.ExitCommand; import terminus.command.HelpCommand; -import terminus.command.ViewCommand; -import terminus.command.note.AddNoteCommand; +import terminus.command.content.ViewCommand; +import terminus.command.content.note.AddNoteCommand; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; -import terminus.module.NusModule; -import terminus.ui.Ui; public class NoteCommandParserTest { From 6d0642541f4320ae19c5dad38198d4423afc4a4a Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Mon, 18 Oct 2021 16:17:08 +0800 Subject: [PATCH 137/466] Fix minor typo --- src/main/java/terminus/parser/InnerModuleCommandParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/terminus/parser/InnerModuleCommandParser.java b/src/main/java/terminus/parser/InnerModuleCommandParser.java index e1e7eb0a06..6e0d5777c1 100644 --- a/src/main/java/terminus/parser/InnerModuleCommandParser.java +++ b/src/main/java/terminus/parser/InnerModuleCommandParser.java @@ -49,7 +49,7 @@ public Command parseCommand(String command) throws InvalidCommandException, Inva */ @Override public String getWorkspace() { - return moduleName + " > " + super.getWorkspace(); + return getWorkspace(false); } public String getWorkspace(boolean isOriginal) { From 294d3c73523c1c7930c0ceff240dd885f687da8d Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Mon, 18 Oct 2021 17:25:02 +0800 Subject: [PATCH 138/466] Add coding style import guide in DG --- docs/DeveloperGuide.md | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index 7bffbc5209..ae46ba6ba7 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -60,3 +60,41 @@ on [link](https://docs.github.com/en/get-started/quickstart/fork-a-repo). 2. Under **Project SDK:** section, find and select JDK version 11. Eg: `Amazon Corretto version 11.0.12`. 3. Under **Project language level:**, select `SDK default`. +5. Verifying the setup + 1. After performing the steps above, locate the file `src/main/java/terminus/Terminus.java`, + right-click and select `Run 'Terminus.main()'`. + 2. If everything is correctly set up, you should see the following terminal. + ``` + Welcome to TermiNUS! + + Type any of the following to get started: + > exit + > help + > note + > schedule + + [] >>> + + ``` + +#### 2.1.4 Configuring the Coding Style + +Import the coding style xml file into your IntelliJ IDEA. + +1. Go to IntelliJ IDEA settings page. + 1. Located at the **top-right** of the app, click on the gear icon and select `Settings...`. +2. Under the settings page, locate the `Code Style` tab. + 1. `Editor`→`Code Style` +3. Once you are at the `Code Style` tab, you will need to import the file `CS2113TStyle.xml`. + 1. At the `Scheme` section, select the gear icon and select `Import Scheme` + →`IntelliJ IDEA code style XML`. + 2. Locate and select the `CS2113TStyle.xml` file which is included in the TermiNUS project. + 3. Once done, select `Apply` then `OK`. +4. Now your IntelliJ IDEA should follow our Coding Style. + +> :bulb: IntelliJ IDEA have certain shortcut key to aid in auto-formatting of code. +> Once you are done with a piece of code, highlight the section you have just written and press the +> key `CTRL + SHIFT + L`. + + + From 7465333435dc9cb7c9a697ba713d78886f54fbaa Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Mon, 18 Oct 2021 17:28:15 +0800 Subject: [PATCH 139/466] Add TOC --- docs/DeveloperGuide.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index ae46ba6ba7..6664965b36 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -2,6 +2,16 @@ ## Table of Content +- [1. Introduction](#1-introduction) + * [1.1 Purpose](#11-purpose) + * [1.2 Using this Guide](#12-using-this-guide) +- [2. Setting up](#2-setting-up) + * [2.1 Setting up the project in your computer](#21-setting-up-the-project-in-your-computer) + + [2.1.1 Prerequisite](#211-prerequisite) + + [2.1.2 Getting the project files](#212-getting-the-project-files) + + [2.1.3 Setting up on IntelliJ IDEA](#213-setting-up-on-intellij-idea) + + [2.1.4 Configuring the Coding Style](#214-configuring-the-coding-style) + ## 1. Introduction **Welcome to TermiNUS!** From 5a91856af934a2baeb7bc8438ee9f2fa5130639b Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Mon, 18 Oct 2021 22:08:37 +0800 Subject: [PATCH 140/466] Finish JUnit testing and update ui-text-testing --- .../java/terminus/command/GoCommandTest.java | 100 ++++++++++++++++++ .../terminus/command/ModuleCommandTest.java | 34 +++++- .../command/module/AddModuleCommandTest.java | 50 +++++++++ .../module/DeleteModuleCommandTest.java | 55 ++++++++++ .../command/module/ViewModuleCommandTest.java | 38 +++++++ text-ui-test/EXPECTED.TXT | 16 +-- 6 files changed, 283 insertions(+), 10 deletions(-) create mode 100644 src/test/java/terminus/command/GoCommandTest.java create mode 100644 src/test/java/terminus/command/module/AddModuleCommandTest.java create mode 100644 src/test/java/terminus/command/module/DeleteModuleCommandTest.java create mode 100644 src/test/java/terminus/command/module/ViewModuleCommandTest.java diff --git a/src/test/java/terminus/command/GoCommandTest.java b/src/test/java/terminus/command/GoCommandTest.java new file mode 100644 index 0000000000..cb2eaf7d1e --- /dev/null +++ b/src/test/java/terminus/command/GoCommandTest.java @@ -0,0 +1,100 @@ +package terminus.command; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.content.Link; +import terminus.content.Note; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; +import terminus.parser.LinkCommandParser; +import terminus.parser.MainCommandParser; +import terminus.parser.ModuleWorkspaceCommandParser; +import terminus.parser.NoteCommandParser; +import terminus.ui.Ui; + +public class GoCommandTest { + + private MainCommandParser commandParser; + private ModuleManager moduleManager; + private Ui ui; + + private String tempModule = "test"; + + @BeforeEach + void setUp() { + this.commandParser = MainCommandParser.getInstance(); + this.moduleManager = new ModuleManager(); + moduleManager.setModule(tempModule); + this.ui = new Ui(); + } + + @Test + void execute_go_success() throws InvalidArgumentException, InvalidCommandException { + Command cmd = commandParser.parseCommand("go " + tempModule); + CommandResult cmdResult = cmd.execute(ui, moduleManager); + assertTrue(cmdResult.isOk()); + assertTrue(cmdResult.getAdditionalData() instanceof ModuleWorkspaceCommandParser); + } + + @Test + void execute_go_throwsException() throws InvalidArgumentException, InvalidCommandException { + Command cmd = commandParser.parseCommand("go not_a_test"); + assertThrows(InvalidArgumentException.class, () -> cmd.execute(ui, moduleManager)); + } + + @Test + void execute_goAdvance_success() throws InvalidArgumentException, InvalidCommandException { + Command cmd = commandParser.parseCommand("go " + tempModule + " note"); + CommandResult cmdResult = cmd.execute(ui, moduleManager); + assertTrue(cmdResult.isOk()); + assertTrue(cmdResult.getAdditionalData() instanceof NoteCommandParser); + cmd = commandParser.parseCommand("go " + tempModule + " note add \"test\" \"test1\""); + cmdResult = cmd.execute(ui, moduleManager); + assertTrue(cmdResult.isOk()); + assertEquals(1, moduleManager.getModule(tempModule).getContentManager(Note.class).getTotalContents()); + cmd = commandParser.parseCommand("go " + tempModule + " note view"); + cmdResult = cmd.execute(ui, moduleManager); + assertTrue(cmdResult.isOk()); + cmd = commandParser.parseCommand("go " + tempModule + " note delete 1"); + cmdResult = cmd.execute(ui, moduleManager); + assertTrue(cmdResult.isOk()); + assertEquals(0, moduleManager.getModule(tempModule).getContentManager(Note.class).getTotalContents()); + cmd = commandParser.parseCommand("go " + tempModule + " schedule"); + cmdResult = cmd.execute(ui, moduleManager); + assertTrue(cmdResult.isOk()); + assertTrue(cmdResult.getAdditionalData() instanceof LinkCommandParser); + cmd = commandParser.parseCommand("go " + tempModule + " schedule add \"test\" \"Thursday\" \"00:00\" " + + "\"https://zoom.us\""); + cmdResult = cmd.execute(ui, moduleManager); + assertTrue(cmdResult.isOk()); + assertEquals(1, moduleManager.getModule(tempModule).getContentManager(Link.class).getTotalContents()); + cmd = commandParser.parseCommand("go " + tempModule + " schedule view"); + cmdResult = cmd.execute(ui, moduleManager); + assertTrue(cmdResult.isOk()); + cmd = commandParser.parseCommand("go " + tempModule + " schedule delete 1"); + cmdResult = cmd.execute(ui, moduleManager); + assertTrue(cmdResult.isOk()); + assertEquals(0, moduleManager.getModule(tempModule).getContentManager(Link.class).getTotalContents()); + } + + @Test + void execute_goAdvance_throwException() throws InvalidArgumentException, InvalidCommandException { + assertThrows(InvalidCommandException.class, + () -> commandParser.parseCommand("go " + tempModule + " note abcbd").execute(ui, moduleManager)); + assertThrows(InvalidCommandException.class, + () -> commandParser.parseCommand("go " + tempModule + " schedule abcbd").execute(ui, moduleManager)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("go " + tempModule + " schedule delete -1").execute(ui, + moduleManager)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("go " + tempModule + " note delete -1").execute(ui, moduleManager)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("go " + tempModule + " note view 100").execute(ui, moduleManager)); + + } +} diff --git a/src/test/java/terminus/command/ModuleCommandTest.java b/src/test/java/terminus/command/ModuleCommandTest.java index 8281f79d5a..640be1a6f9 100644 --- a/src/test/java/terminus/command/ModuleCommandTest.java +++ b/src/test/java/terminus/command/ModuleCommandTest.java @@ -1,13 +1,21 @@ package terminus.command; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; import terminus.parser.MainCommandParser; import terminus.parser.ModuleCommandParser; import terminus.ui.Ui; public class ModuleCommandTest { - private ModuleCommandParser commandParser; + + private MainCommandParser commandParser; private Ui ui; private ModuleManager moduleManager; @@ -16,8 +24,30 @@ public class ModuleCommandTest { @BeforeEach void setUp() { - commandParser = ModuleCommandParser.getInstance(); + commandParser = MainCommandParser.getInstance(); moduleManager = new ModuleManager(); ui = new Ui(); } + + @Test + void execute_module_success() throws InvalidArgumentException, InvalidCommandException { + Command cmd = commandParser.parseCommand("module"); + CommandResult cmdResult = cmd.execute(ui, moduleManager); + assertTrue(cmdResult.isOk()); + assertTrue(cmdResult.getAdditionalData() instanceof ModuleCommandParser); + cmd = commandParser.parseCommand("module add \"test\""); + cmdResult = cmd.execute(ui, moduleManager); + assertTrue(cmdResult.isOk()); + assertEquals(1, moduleManager.getAllModules().length); + } + + @Test + void execute_module_throwsException() throws InvalidArgumentException, InvalidCommandException { + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("module add").execute(ui, + moduleManager)); + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("module delete asd").execute(ui, + moduleManager)); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("module asdsasd").execute(ui, + moduleManager)); + } } diff --git a/src/test/java/terminus/command/module/AddModuleCommandTest.java b/src/test/java/terminus/command/module/AddModuleCommandTest.java new file mode 100644 index 0000000000..f741c0b65c --- /dev/null +++ b/src/test/java/terminus/command/module/AddModuleCommandTest.java @@ -0,0 +1,50 @@ +package terminus.command.module; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.content.Note; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; +import terminus.parser.ModuleCommandParser; +import terminus.parser.NoteCommandParser; +import terminus.ui.Ui; + +public class AddModuleCommandTest { + + private ModuleCommandParser commandParser; + private ModuleManager moduleManager; + private Ui ui; + + @BeforeEach + void setUp() { + this.moduleManager = new ModuleManager(); + this.commandParser = ModuleCommandParser.getInstance(); + this.ui = new Ui(); + } + + @Test + void execute_addModule_success() throws InvalidArgumentException, InvalidCommandException { + Command cmd = commandParser.parseCommand("add \"test\""); + CommandResult cmdResult = cmd.execute(ui, moduleManager); + assertTrue(cmdResult.isOk()); + assertNotNull(moduleManager.getModule("test")); + } + + @Test + void execute_addModule_throwsException() throws InvalidArgumentException, InvalidCommandException { + + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("add \"test\" \"test2\"").execute(ui, + moduleManager)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("add ").execute(ui, + moduleManager)); + } +} diff --git a/src/test/java/terminus/command/module/DeleteModuleCommandTest.java b/src/test/java/terminus/command/module/DeleteModuleCommandTest.java new file mode 100644 index 0000000000..e890bfc0d4 --- /dev/null +++ b/src/test/java/terminus/command/module/DeleteModuleCommandTest.java @@ -0,0 +1,55 @@ +package terminus.command.module; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; +import terminus.parser.ModuleCommandParser; +import terminus.ui.Ui; + +public class DeleteModuleCommandTest { + + private ModuleCommandParser commandParser; + private ModuleManager moduleManager; + private Ui ui; + + private static final String tempModule = "test"; + + @BeforeEach + void setUp() { + this.moduleManager = new ModuleManager(); + this.commandParser = ModuleCommandParser.getInstance(); + moduleManager.setModule(tempModule); + this.ui = new Ui(); + } + + @Test + void execute_deleteModule_success() throws InvalidArgumentException, InvalidCommandException { + Command cmd = commandParser.parseCommand("delete 1"); + CommandResult cmdResult = cmd.execute(ui, moduleManager); + assertTrue(cmdResult.isOk()); + assertNull(moduleManager.getModule(tempModule)); + } + + @Test + void execute_deleteModule_throwsException() throws InvalidArgumentException, InvalidCommandException { + + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("delete -1").execute(ui, + moduleManager)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("delete").execute(ui, + moduleManager)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("delete 100").execute(ui, + moduleManager)); + } +} diff --git a/src/test/java/terminus/command/module/ViewModuleCommandTest.java b/src/test/java/terminus/command/module/ViewModuleCommandTest.java new file mode 100644 index 0000000000..adea6797bd --- /dev/null +++ b/src/test/java/terminus/command/module/ViewModuleCommandTest.java @@ -0,0 +1,38 @@ +package terminus.command.module; + +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; +import terminus.parser.ModuleCommandParser; +import terminus.ui.Ui; + +public class ViewModuleCommandTest { + + private ModuleCommandParser commandParser; + private ModuleManager moduleManager; + private Ui ui; + + private static final String tempModule = "test"; + + @BeforeEach + void setUp() { + this.moduleManager = new ModuleManager(); + this.commandParser = ModuleCommandParser.getInstance(); + moduleManager.setModule(tempModule); + this.ui = new Ui(); + } + + @Test + void execute_viewModule_success() throws InvalidArgumentException, InvalidCommandException { + Command cmd = commandParser.parseCommand("view"); + CommandResult cmdResult = cmd.execute(ui, moduleManager); + assertTrue(cmdResult.isOk()); + } +} diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 15d53c3a78..aef4f07aa0 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -22,7 +22,7 @@ Type any of the following to get started: > back [test] >>> Error: Missing arguments. -Format: test > note add "" "" +Format: note add "" "" [test] >>> Your note on 'CS2113T' has been added! [test] >>> List of Content --------------- @@ -30,16 +30,16 @@ Format: test > note add "" "" Rerun the same command with an index behind to view the content. [test] >>> Error: Invalid numerical value provided. -Format: test > note view {item number} +Format: note view {item number} [test] >>> Error: Content not found. [test] >>> Name: CS2113T Content: Week 8 test [test] >>> Error: Missing arguments. -Format: test > note delete +Format: note delete [test] >>> Error: Invalid numerical value provided. -Format: test > note delete +Format: note delete [test] >>> Error: Content not found. [test] >>> Your note on 'CS2113T' has been deleted! [test] >>> @@ -61,11 +61,11 @@ back : Returns to the parent workspace. Format: back [test] >>> Error: Missing arguments. -Format: test > schedule add "" "" "" "" +Format: schedule add "" "" "" "" [test] >>> Error: Missing arguments. -Format: test > schedule add "" "" "" "" +Format: schedule add "" "" "" "" [test] >>> Error: Missing arguments. -Format: test > schedule add "" "" "" "" +Format: schedule add "" "" "" "" [test] >>> Your schedule on 'CS2113T Tutorial' has been added! [test] >>> Your schedule on 'CS2113T Lecture' has been added! [test] >>> Command not found! Type 'help' for a list of commands. @@ -78,7 +78,7 @@ Rerun the same command with an index behind to view the content. [test] >>> Error: Content not found. [test] >>> CS2113T Lecture (Friday, 16:00): https://zoom.us/test [test] >>> Error: Missing arguments. -Format: test > schedule delete +Format: schedule delete [test] >>> Error: Content not found. [test] >>> Your link on 'CS2113T Tutorial' has been deleted! [test] >>> List of Content From 55878f8bdf013d3abe04052341bd8961ca320b06 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Mon, 18 Oct 2021 23:14:09 +0800 Subject: [PATCH 141/466] Update note object to saved as file text instead --- .../java/terminus/common/CommonUtils.java | 23 +++++++ src/main/java/terminus/module/NusModule.java | 2 +- .../java/terminus/storage/ModuleStorage.java | 66 ++++++++++++++++++- 3 files changed, 89 insertions(+), 2 deletions(-) diff --git a/src/main/java/terminus/common/CommonUtils.java b/src/main/java/terminus/common/CommonUtils.java index 766ecf5871..6dc970cef5 100644 --- a/src/main/java/terminus/common/CommonUtils.java +++ b/src/main/java/terminus/common/CommonUtils.java @@ -1,6 +1,9 @@ package terminus.common; import java.net.URL; +import java.nio.file.InvalidPathException; +import java.nio.file.Path; +import java.nio.file.Paths; import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; @@ -117,4 +120,24 @@ public static boolean isValidDay(String day) { public static boolean isStringNullOrEmpty(String string) { return string == null || string.isBlank(); } + + /** + * Checks if the given name is a valid file name. + * + * @param name The string to be checked. + * @return True if name is a valid file name, false otherwise. + */ + public static boolean isValidFileName(String name) { + try { + Paths.get(name); + return true; + } catch (InvalidPathException e) { + return false; + } + } + + public static String getFileNameOnly(String filename) { + String[] string = filename.split("\\."); + return string[0]; + } } diff --git a/src/main/java/terminus/module/NusModule.java b/src/main/java/terminus/module/NusModule.java index 2dfa1e580f..1fdeb8e1a3 100644 --- a/src/main/java/terminus/module/NusModule.java +++ b/src/main/java/terminus/module/NusModule.java @@ -11,7 +11,7 @@ */ public class NusModule { - private final ContentManager noteManager; + private final transient ContentManager noteManager; private final ContentManager linkManager; /** diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index c3e1471bf4..19170f197b 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -2,10 +2,19 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import java.io.File; +import java.io.FileWriter; import java.io.IOException; +import java.io.PrintWriter; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import terminus.common.CommonUtils; import terminus.common.TerminusLogger; +import terminus.content.ContentManager; +import terminus.content.Note; import terminus.module.ModuleManager; import terminus.module.NusModule; @@ -53,7 +62,9 @@ public ModuleManager loadFile() throws IOException { return null; } TerminusLogger.info("Decoding JSON to object"); - return gson.fromJson(Files.newBufferedReader(filePath), ModuleManager.class); + ModuleManager moduleManager = gson.fromJson(Files.newBufferedReader(filePath), ModuleManager.class); + loadAllNotes(moduleManager); + return moduleManager; } /** @@ -73,6 +84,59 @@ public void saveFile(ModuleManager moduleManager) throws IOException { TerminusLogger.info(String.format("Writing to file: %s", filePath.toString())); assert jsonString != null && !jsonString.isBlank() : "File saved is blank"; Files.writeString(filePath, jsonString); + saveAllNotes(moduleManager); } + private void loadAllNotes(ModuleManager moduleManager) throws IOException { + Path modDirPath; + for (String mod : moduleManager.getAllModules()) { + modDirPath = Paths.get(filePath.getParent().toString(), mod); + // Check if module name is a valid file name + if (!CommonUtils.isValidFileName(mod)) { + moduleManager.removeModule(mod); + } + // Check if directory does not exist proceed to create directory, retrieve notes otherwise. + if (!Files.isDirectory(modDirPath)) { + Files.createDirectories(modDirPath); + } else { + loadNotesFromModule(moduleManager, modDirPath, mod); + } + } + } + + private void loadNotesFromModule(ModuleManager moduleManager, Path modDirPath, String mod) throws IOException { + File folder = new File(modDirPath.toString()); + File[] listOfFiles = folder.listFiles(); + ContentManager contentManager = moduleManager.getModule(mod).getContentManager(Note.class); + for (File file : listOfFiles) { + if (file.isFile()) { + contentManager.add(new Note(CommonUtils.getFileNameOnly(file.getName()), + Files.readString( + Paths.get(modDirPath.toString(), file.getName()), StandardCharsets.US_ASCII))); + } else { + file.delete(); + } + } + } + + private void saveAllNotes(ModuleManager moduleManager) throws IOException { + Path modDirPath; + for (String mod : moduleManager.getAllModules()) { + modDirPath = Paths.get(filePath.getParent().toString(), mod); + assert CommonUtils.isValidFileName(mod); + if (!Files.isDirectory(modDirPath)) { + Files.createDirectories(modDirPath); + } + ContentManager contentManager = moduleManager.getModule(mod).getContentManager(Note.class); + ArrayList noteArrayList = contentManager.getContents(); + for (Note note : noteArrayList) { + assert Files.isDirectory(modDirPath); + assert CommonUtils.isValidFileName(note.getName()); + Path filePath = Paths.get(modDirPath.toString(), note.getName() + ".txt"); + Files.writeString(filePath, note.getData()); + } + } + } + + } From 131f203b3cef2973a03b75d99ae855cbc88d3665 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Mon, 18 Oct 2021 23:46:24 +0800 Subject: [PATCH 142/466] Fix bug in GoCommand --- src/main/java/terminus/Terminus.java | 1 - src/main/java/terminus/command/GoCommand.java | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 22205ee833..30aa08385d 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -10,7 +10,6 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; -import terminus.module.NusModule; import terminus.parser.CommandParser; import terminus.parser.MainCommandParser; import terminus.storage.ModuleStorage; diff --git a/src/main/java/terminus/command/GoCommand.java b/src/main/java/terminus/command/GoCommand.java index 9e643c4f8a..bb5f7dccf7 100644 --- a/src/main/java/terminus/command/GoCommand.java +++ b/src/main/java/terminus/command/GoCommand.java @@ -47,6 +47,8 @@ public void parseArguments(String arguments) throws InvalidArgumentException { moduleName = args[0]; if (args.length > 1) { super.parseArguments(args[1]); + } else { + super.parseArguments(null); } } From ed89679c443cbba85e95b0ba115091f9e6d1cb13 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 19 Oct 2021 00:00:36 +0800 Subject: [PATCH 143/466] Update notes file method to cater single module --- .../java/terminus/storage/ModuleStorage.java | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 19170f197b..3ff32dfd6f 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -99,12 +99,14 @@ private void loadAllNotes(ModuleManager moduleManager) throws IOException { if (!Files.isDirectory(modDirPath)) { Files.createDirectories(modDirPath); } else { - loadNotesFromModule(moduleManager, modDirPath, mod); + loadNotesFromModule(moduleManager, mod); } } } - private void loadNotesFromModule(ModuleManager moduleManager, Path modDirPath, String mod) throws IOException { + private void loadNotesFromModule(ModuleManager moduleManager, String mod) throws IOException { + Path modDirPath; + modDirPath = Paths.get(filePath.getParent().toString(), mod); File folder = new File(modDirPath.toString()); File[] listOfFiles = folder.listFiles(); ContentManager contentManager = moduleManager.getModule(mod).getContentManager(Note.class); @@ -120,21 +122,25 @@ private void loadNotesFromModule(ModuleManager moduleManager, Path modDirPath, S } private void saveAllNotes(ModuleManager moduleManager) throws IOException { - Path modDirPath; for (String mod : moduleManager.getAllModules()) { - modDirPath = Paths.get(filePath.getParent().toString(), mod); - assert CommonUtils.isValidFileName(mod); - if (!Files.isDirectory(modDirPath)) { - Files.createDirectories(modDirPath); - } - ContentManager contentManager = moduleManager.getModule(mod).getContentManager(Note.class); - ArrayList noteArrayList = contentManager.getContents(); - for (Note note : noteArrayList) { - assert Files.isDirectory(modDirPath); - assert CommonUtils.isValidFileName(note.getName()); - Path filePath = Paths.get(modDirPath.toString(), note.getName() + ".txt"); - Files.writeString(filePath, note.getData()); - } + saveNotesFromModule(moduleManager, mod); + } + } + + private void saveNotesFromModule(ModuleManager moduleManager, String mod) throws IOException { + Path modDirPath; + modDirPath = Paths.get(filePath.getParent().toString(), mod); + assert CommonUtils.isValidFileName(mod); + if (!Files.isDirectory(modDirPath)) { + Files.createDirectories(modDirPath); + } + ContentManager contentManager = moduleManager.getModule(mod).getContentManager(Note.class); + ArrayList noteArrayList = contentManager.getContents(); + for (Note note : noteArrayList) { + assert Files.isDirectory(modDirPath); + assert CommonUtils.isValidFileName(note.getName()); + Path filePath = Paths.get(modDirPath.toString(), note.getName() + ".txt"); + Files.writeString(filePath, note.getData()); } } From 8d1bb14dc86dc1512eebc15d5cd84a7623ed8649 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 19 Oct 2021 00:04:57 +0800 Subject: [PATCH 144/466] Add purging data in content manager --- src/main/java/terminus/content/ContentManager.java | 4 +++- src/main/java/terminus/storage/ModuleStorage.java | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/terminus/content/ContentManager.java b/src/main/java/terminus/content/ContentManager.java index 9886da0fe3..2508dbd88a 100644 --- a/src/main/java/terminus/content/ContentManager.java +++ b/src/main/java/terminus/content/ContentManager.java @@ -96,5 +96,7 @@ private boolean isNotValidNumber(int number) { return number < 1 || number > contents.size(); } - + public void purgeData() { + this.contents = new ArrayList<>(); + } } diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 3ff32dfd6f..c57c5ce7cc 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -104,12 +104,13 @@ private void loadAllNotes(ModuleManager moduleManager) throws IOException { } } - private void loadNotesFromModule(ModuleManager moduleManager, String mod) throws IOException { + public void loadNotesFromModule(ModuleManager moduleManager, String mod) throws IOException { Path modDirPath; modDirPath = Paths.get(filePath.getParent().toString(), mod); File folder = new File(modDirPath.toString()); File[] listOfFiles = folder.listFiles(); ContentManager contentManager = moduleManager.getModule(mod).getContentManager(Note.class); + contentManager.purgeData(); for (File file : listOfFiles) { if (file.isFile()) { contentManager.add(new Note(CommonUtils.getFileNameOnly(file.getName()), @@ -127,7 +128,7 @@ private void saveAllNotes(ModuleManager moduleManager) throws IOException { } } - private void saveNotesFromModule(ModuleManager moduleManager, String mod) throws IOException { + public void saveNotesFromModule(ModuleManager moduleManager, String mod) throws IOException { Path modDirPath; modDirPath = Paths.get(filePath.getParent().toString(), mod); assert CommonUtils.isValidFileName(mod); From c88cbb62fb10f1f406800bde63276fdc1eed92f7 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Tue, 19 Oct 2021 00:25:05 +0800 Subject: [PATCH 145/466] Refactor code and add assertions --- src/main/java/terminus/Terminus.java | 15 ++++++++------- src/main/java/terminus/command/GoCommand.java | 4 ++-- .../terminus/command/content/DeleteCommand.java | 1 + .../command/content/InnerModuleCommand.java | 5 +++-- .../terminus/command/content/ViewCommand.java | 1 + .../command/content/link/AddLinkCommand.java | 3 +-- .../command/content/note/AddNoteCommand.java | 1 + .../command/module/AddModuleCommand.java | 16 ++++++++-------- .../command/module/DeleteModuleCommand.java | 4 ++-- .../terminus/command/module/ModuleCommand.java | 6 ++++-- .../command/module/ViewModuleCommand.java | 12 ++++++------ src/main/java/terminus/common/CommonFormat.java | 4 ++++ src/main/java/terminus/common/Messages.java | 12 ++++++++++++ src/main/java/terminus/parser/CommandParser.java | 1 - .../terminus/parser/ModuleCommandParser.java | 1 - .../java/terminus/storage/ModuleStorage.java | 1 - src/main/java/terminus/ui/Ui.java | 1 - .../java/terminus/command/ExitCommandTest.java | 1 - .../java/terminus/command/NoteCommandTest.java | 1 - .../terminus/command/ScheduleCommandTest.java | 1 - .../command/module/AddModuleCommandTest.java | 2 -- .../command/module/DeleteModuleCommandTest.java | 1 - .../command/module/ViewModuleCommandTest.java | 1 - .../terminus/parser/LinkCommandParserTest.java | 2 +- .../terminus/parser/NoteCommandParserTest.java | 2 +- .../java/terminus/storage/ModuleStorageTest.java | 1 - 26 files changed, 55 insertions(+), 45 deletions(-) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 30aa08385d..2629ca3394 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -6,6 +6,7 @@ import java.nio.file.Path; import terminus.command.Command; import terminus.command.CommandResult; +import terminus.common.Messages; import terminus.common.TerminusLogger; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; @@ -18,10 +19,10 @@ public class Terminus { public static final String[] INVALID_JSON_MESSAGE = { - "Invalid file data detected.", - "TermiNUS will still run, but the file will be overwritten when the next command is ran.", - "To save your current file, close your terminal (do not run exit).", - "Otherwise, you can continue using the program :)" + "Invalid file data detected.", + "TermiNUS will still run, but the file will be overwritten when the next command is ran.", + "To save your current file, close your terminal (do not run exit).", + "Otherwise, you can continue using the program :)" }; private Ui ui; private CommandParser parser; @@ -30,7 +31,6 @@ public class Terminus { private ModuleStorage moduleStorage; private ModuleManager moduleManager; - private static final String INVALID_ARGUMENT_FORMAT_MESSAGE = "Format: %s"; private static final Path DATA_DIRECTORY = Path.of(System.getProperty("user.dir"), "data"); private static final String MAIN_JSON = "main.json"; @@ -87,7 +87,7 @@ private void runCommandsUntilExit() { TerminusLogger.debug("User entered: " + input); assert input != null : "Input should not be null."; - Command currentCommand = null; + Command currentCommand; try { currentCommand = parser.parseCommand(input); CommandResult result = currentCommand.execute(ui, moduleManager); @@ -114,7 +114,8 @@ private void runCommandsUntilExit() { // Check if the exception specified a correct command format for the user to follow. if (e.getFormat() != null) { // Print the format of the command along with the error message to the user. - ui.printSection(e.getMessage(), String.format(INVALID_ARGUMENT_FORMAT_MESSAGE, e.getFormat())); + ui.printSection(e.getMessage(), + String.format(Messages.INVALID_ARGUMENT_FORMAT_MESSAGE, e.getFormat())); } else { ui.printSection(e.getMessage()); } diff --git a/src/main/java/terminus/command/GoCommand.java b/src/main/java/terminus/command/GoCommand.java index bb5f7dccf7..779f31d40b 100644 --- a/src/main/java/terminus/command/GoCommand.java +++ b/src/main/java/terminus/command/GoCommand.java @@ -1,5 +1,6 @@ package terminus.command; +import terminus.common.CommonFormat; import terminus.common.CommonUtils; import terminus.common.Messages; import terminus.exception.InvalidArgumentException; @@ -11,7 +12,6 @@ public class GoCommand extends WorkspaceCommand { - public static final String SPACE_DELIMITER = "\\s+"; private String moduleName; public GoCommand() { @@ -43,7 +43,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { if (CommonUtils.isStringNullOrEmpty(arguments)) { throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); } - String[] args = arguments.strip().split(SPACE_DELIMITER, 2); + String[] args = arguments.strip().split(CommonFormat.SPACE_DELIMITER, 2); moduleName = args[0]; if (args.length > 1) { super.parseArguments(args[1]); diff --git a/src/main/java/terminus/command/content/DeleteCommand.java b/src/main/java/terminus/command/content/DeleteCommand.java index a95b3d7e94..13bea8d823 100644 --- a/src/main/java/terminus/command/content/DeleteCommand.java +++ b/src/main/java/terminus/command/content/DeleteCommand.java @@ -78,6 +78,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { */ @Override public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidArgumentException { + assert getModuleName() != null; NusModule module = moduleManager.getModule(getModuleName()); ContentManager contentManager = module.getContentManager(type); assert contentManager != null; diff --git a/src/main/java/terminus/command/content/InnerModuleCommand.java b/src/main/java/terminus/command/content/InnerModuleCommand.java index 769578de53..91f19e49a7 100644 --- a/src/main/java/terminus/command/content/InnerModuleCommand.java +++ b/src/main/java/terminus/command/content/InnerModuleCommand.java @@ -2,6 +2,7 @@ import terminus.command.CommandResult; import terminus.command.WorkspaceCommand; +import terminus.common.Messages; import terminus.common.TerminusLogger; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; @@ -12,7 +13,6 @@ public abstract class InnerModuleCommand extends WorkspaceCommand { private InnerModuleCommandParser commandMap; - private static final String INVALID_ARGUMENT_FORMAT_MESSAGE = "%s %s"; public InnerModuleCommand(InnerModuleCommandParser commandMap) { super(commandMap); @@ -32,7 +32,8 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) TerminusLogger.warning("Failed to parse command."); TerminusLogger.warning(commandMap.getWorkspace() + " : " + e.getFormat()); throw new InvalidArgumentException( - String.format(INVALID_ARGUMENT_FORMAT_MESSAGE,commandMap.getWorkspace(true), e.getFormat()), + String.format(Messages.INVALID_ARGUMENT_FORMAT_MESSAGE_EXCEPTION, commandMap.getWorkspace(true), + e.getFormat()), e.getMessage() ); } diff --git a/src/main/java/terminus/command/content/ViewCommand.java b/src/main/java/terminus/command/content/ViewCommand.java index d414bb5cdf..02a02a29d2 100644 --- a/src/main/java/terminus/command/content/ViewCommand.java +++ b/src/main/java/terminus/command/content/ViewCommand.java @@ -88,6 +88,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { @Override public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidArgumentException { StringBuilder result = new StringBuilder(); + assert getModuleName() != null; NusModule module = moduleManager.getModule(getModuleName()); ContentManager contentManager = module.getContentManager(type); if (displayAll) { diff --git a/src/main/java/terminus/command/content/link/AddLinkCommand.java b/src/main/java/terminus/command/content/link/AddLinkCommand.java index b41db3f851..c8860b6a5f 100644 --- a/src/main/java/terminus/command/content/link/AddLinkCommand.java +++ b/src/main/java/terminus/command/content/link/AddLinkCommand.java @@ -13,9 +13,7 @@ import terminus.common.TerminusLogger; import terminus.content.ContentManager; import terminus.content.Link; - import terminus.exception.InvalidArgumentException; - import terminus.module.ModuleManager; import terminus.module.NusModule; import terminus.ui.Ui; @@ -91,6 +89,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { */ @Override public CommandResult execute(Ui ui, ModuleManager moduleManager) { + assert getModuleName() != null; NusModule module = moduleManager.getModule(getModuleName()); ContentManager contentManager = module.getContentManager(Link.class); assert contentManager != null; diff --git a/src/main/java/terminus/command/content/note/AddNoteCommand.java b/src/main/java/terminus/command/content/note/AddNoteCommand.java index 5647067ba4..31c7d337de 100644 --- a/src/main/java/terminus/command/content/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/content/note/AddNoteCommand.java @@ -67,6 +67,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { * @return CommandResult to indicate the success and additional information about the execution. */ public CommandResult execute(Ui ui, ModuleManager moduleManager) { + assert getModuleName() != null; TerminusLogger.info("Executing Add Note Command"); NusModule module = moduleManager.getModule(getModuleName()); ContentManager contentManager = module.getContentManager(Note.class); diff --git a/src/main/java/terminus/command/module/AddModuleCommand.java b/src/main/java/terminus/command/module/AddModuleCommand.java index 9e2f760e99..e9266b2cf9 100644 --- a/src/main/java/terminus/command/module/AddModuleCommand.java +++ b/src/main/java/terminus/command/module/AddModuleCommand.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import terminus.command.Command; import terminus.command.CommandResult; +import terminus.common.CommonFormat; import terminus.common.CommonUtils; import terminus.common.Messages; import terminus.common.TerminusLogger; @@ -13,8 +14,7 @@ public class AddModuleCommand extends Command { - public static final String SPACE_DELIMITER = "\\S+"; - public static final int MODULE_ARGS_COUNT = 1; + private static final int MODULE_ARGS_COUNT = 1; private String moduleName; /** @@ -24,7 +24,7 @@ public class AddModuleCommand extends Command { */ @Override public String getFormat() { - return "add \"\""; + return CommonFormat.COMMAND_ADD_MODULE_FORMAT; } /** @@ -34,7 +34,7 @@ public String getFormat() { */ @Override public String getHelpMessage() { - return "Adds a module"; + return Messages.MESSAGE_COMMAND_ADD_MODULE; } @Override @@ -49,8 +49,8 @@ public void parseArguments(String arguments) throws InvalidArgumentException { } moduleName = argArray.get(0); - if (!moduleName.matches(SPACE_DELIMITER)) { - throw new InvalidArgumentException("Module name cannot contain any whitespaces!"); + if (!moduleName.matches(CommonFormat.SPACE_DELIMITER)) { + throw new InvalidArgumentException(Messages.ERROR_MESSAGE_MODULE_WHITESPACE); } } @@ -67,10 +67,10 @@ public void parseArguments(String arguments) throws InvalidArgumentException { public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidCommandException, InvalidArgumentException { if (moduleManager.getModule(moduleName) != null) { - throw new InvalidArgumentException("Module already exist!"); + throw new InvalidArgumentException(Messages.ERROR_MESSAGE_MODULE_EXIST); } moduleManager.setModule(moduleName); - ui.printSection(String.format("Module %s has been added", moduleName)); + ui.printSection(String.format(Messages.MESSAGE_RESPONSE_MODULE_ADD, moduleName)); return new CommandResult(true); } diff --git a/src/main/java/terminus/command/module/DeleteModuleCommand.java b/src/main/java/terminus/command/module/DeleteModuleCommand.java index 2d9b0a3016..a585b115a9 100644 --- a/src/main/java/terminus/command/module/DeleteModuleCommand.java +++ b/src/main/java/terminus/command/module/DeleteModuleCommand.java @@ -32,7 +32,7 @@ public String getFormat() { */ @Override public String getHelpMessage() { - return "Deletes a module"; + return Messages.MESSAGE_COMMAND_MODULE_DELETE; } @Override @@ -71,7 +71,7 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) } moduleManager.removeModule(listOfModule[itemNumber - 1]); - ui.printSection(String.format("Deleted module %s.",listOfModule[itemNumber - 1])); + ui.printSection(String.format(Messages.MESSAGE_RESPONSE_MODULE_DELETE,listOfModule[itemNumber - 1])); return new CommandResult(true); } diff --git a/src/main/java/terminus/command/module/ModuleCommand.java b/src/main/java/terminus/command/module/ModuleCommand.java index 52fbba1883..1904f16afe 100644 --- a/src/main/java/terminus/command/module/ModuleCommand.java +++ b/src/main/java/terminus/command/module/ModuleCommand.java @@ -1,6 +1,8 @@ package terminus.command.module; import terminus.command.WorkspaceCommand; +import terminus.common.CommonFormat; +import terminus.common.Messages; import terminus.parser.ModuleCommandParser; public class ModuleCommand extends WorkspaceCommand { @@ -16,7 +18,7 @@ public ModuleCommand() { */ @Override public String getFormat() { - return "module"; + return CommonFormat.COMMAND_MODULE_FORMAT; } /** @@ -26,6 +28,6 @@ public String getFormat() { */ @Override public String getHelpMessage() { - return "Move to the module workspace"; + return Messages.MESSAGE_COMMAND_MODULE; } } diff --git a/src/main/java/terminus/command/module/ViewModuleCommand.java b/src/main/java/terminus/command/module/ViewModuleCommand.java index d4dde52f0f..8391616652 100644 --- a/src/main/java/terminus/command/module/ViewModuleCommand.java +++ b/src/main/java/terminus/command/module/ViewModuleCommand.java @@ -1,10 +1,10 @@ package terminus.command.module; -import java.util.Arrays; -import java.util.stream.Collectors; import java.util.stream.IntStream; import terminus.command.Command; import terminus.command.CommandResult; +import terminus.common.CommonFormat; +import terminus.common.Messages; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; @@ -19,7 +19,7 @@ public class ViewModuleCommand extends Command { */ @Override public String getFormat() { - return "view"; + return CommonFormat.COMMAND_VIEW_MODULE_FORMAT; } /** @@ -29,7 +29,7 @@ public String getFormat() { */ @Override public String getHelpMessage() { - return "View all modules available"; + return Messages.MESSAGE_COMMAND_MODULE_VIEW; } /** @@ -46,10 +46,10 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidCommandException, InvalidArgumentException { String[] modules = moduleManager.getAllModules(); String[] listOfModules = IntStream.range(0, modules.length) - .mapToObj(i -> String.format("%d. %s", i + 1, modules[i])) + .mapToObj(i -> String.format(Messages.MESSAGE_RESPONSE_MODULE_FORMAT, i + 1, modules[i])) .toArray(String[]::new); if (listOfModules.length == 0) { - ui.printSection("You do not have any modules"); + ui.printSection(Messages.MESSAGE_RESPONSE_NO_MODULES); } else { ui.printSection(listOfModules); } diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index bd7cb01b0e..320bf0ae52 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -23,4 +23,8 @@ public class CommonFormat { + "\"\" \"\" \"\""; public static final String COMMAND_ADD_NOTE_FORMAT = COMMAND_ADD + " \"\" \"\""; + public static final String SPACE_DELIMITER = "\\s+"; + public static final String COMMAND_MODULE_FORMAT = "module"; + public static final String COMMAND_ADD_MODULE_FORMAT = "add \"\""; + public static final String COMMAND_VIEW_MODULE_FORMAT = "view"; } diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index 809052173b..0e3a4078ed 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -28,4 +28,16 @@ public class Messages { public static final String MAIN_BANNER = "Welcome to TermiNUS!"; public static final String NOTE_BANNER = "You have %d note(s) inside this workspace."; public static final String SCHEDULE_BANNER = "You have %d link(s) in this workspace."; + public static final String INVALID_ARGUMENT_FORMAT_MESSAGE_EXCEPTION = "%s %s"; + public static final String INVALID_ARGUMENT_FORMAT_MESSAGE = "Format: %s"; + public static final String MESSAGE_COMMAND_MODULE = "Move to the module workspace"; + public static final String MESSAGE_COMMAND_ADD_MODULE = "Adds a module"; + public static final String ERROR_MESSAGE_MODULE_WHITESPACE = "Module name cannot contain any whitespaces!"; + public static final String ERROR_MESSAGE_MODULE_EXIST = "Module already exist!"; + public static final String MESSAGE_RESPONSE_MODULE_ADD = "Module %s has been added"; + public static final String MESSAGE_RESPONSE_MODULE_DELETE = "Deleted module %s."; + public static final String MESSAGE_COMMAND_MODULE_DELETE = "Deletes a module"; + public static final String MESSAGE_COMMAND_MODULE_VIEW = "View all modules available"; + public static final String MESSAGE_RESPONSE_MODULE_FORMAT = "%d. %s"; + public static final String MESSAGE_RESPONSE_NO_MODULES = "You do not have any modules."; } diff --git a/src/main/java/terminus/parser/CommandParser.java b/src/main/java/terminus/parser/CommandParser.java index 5e3838f111..bc2911e70c 100644 --- a/src/main/java/terminus/parser/CommandParser.java +++ b/src/main/java/terminus/parser/CommandParser.java @@ -10,7 +10,6 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; -import terminus.module.NusModule; public abstract class CommandParser { diff --git a/src/main/java/terminus/parser/ModuleCommandParser.java b/src/main/java/terminus/parser/ModuleCommandParser.java index 9a879d78fb..735ec9e75d 100644 --- a/src/main/java/terminus/parser/ModuleCommandParser.java +++ b/src/main/java/terminus/parser/ModuleCommandParser.java @@ -6,7 +6,6 @@ import terminus.command.module.ViewModuleCommand; import terminus.common.CommonFormat; import terminus.module.ModuleManager; -import terminus.module.NusModule; public class ModuleCommandParser extends CommandParser { diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index c3e1471bf4..e658a0f2e2 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -7,7 +7,6 @@ import java.nio.file.Path; import terminus.common.TerminusLogger; import terminus.module.ModuleManager; -import terminus.module.NusModule; public class ModuleStorage { diff --git a/src/main/java/terminus/ui/Ui.java b/src/main/java/terminus/ui/Ui.java index a3faed3e88..2c2badecb2 100644 --- a/src/main/java/terminus/ui/Ui.java +++ b/src/main/java/terminus/ui/Ui.java @@ -3,7 +3,6 @@ import java.util.Arrays; import java.util.Scanner; import terminus.module.ModuleManager; -import terminus.module.NusModule; import terminus.parser.CommandParser; public class Ui { diff --git a/src/test/java/terminus/command/ExitCommandTest.java b/src/test/java/terminus/command/ExitCommandTest.java index b929768607..89733af3cd 100644 --- a/src/test/java/terminus/command/ExitCommandTest.java +++ b/src/test/java/terminus/command/ExitCommandTest.java @@ -8,7 +8,6 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; -import terminus.module.NusModule; import terminus.parser.MainCommandParser; import terminus.ui.Ui; diff --git a/src/test/java/terminus/command/NoteCommandTest.java b/src/test/java/terminus/command/NoteCommandTest.java index 76153f923c..37f0c1d834 100644 --- a/src/test/java/terminus/command/NoteCommandTest.java +++ b/src/test/java/terminus/command/NoteCommandTest.java @@ -10,7 +10,6 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; -import terminus.module.NusModule; import terminus.parser.MainCommandParser; import terminus.parser.NoteCommandParser; import terminus.ui.Ui; diff --git a/src/test/java/terminus/command/ScheduleCommandTest.java b/src/test/java/terminus/command/ScheduleCommandTest.java index c03a711a86..8328ffcdeb 100644 --- a/src/test/java/terminus/command/ScheduleCommandTest.java +++ b/src/test/java/terminus/command/ScheduleCommandTest.java @@ -10,7 +10,6 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; -import terminus.module.NusModule; import terminus.parser.LinkCommandParser; import terminus.parser.MainCommandParser; import terminus.ui.Ui; diff --git a/src/test/java/terminus/command/module/AddModuleCommandTest.java b/src/test/java/terminus/command/module/AddModuleCommandTest.java index f741c0b65c..1f85f6011c 100644 --- a/src/test/java/terminus/command/module/AddModuleCommandTest.java +++ b/src/test/java/terminus/command/module/AddModuleCommandTest.java @@ -8,12 +8,10 @@ import org.junit.jupiter.api.Test; import terminus.command.Command; import terminus.command.CommandResult; -import terminus.content.Note; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; import terminus.parser.ModuleCommandParser; -import terminus.parser.NoteCommandParser; import terminus.ui.Ui; public class AddModuleCommandTest { diff --git a/src/test/java/terminus/command/module/DeleteModuleCommandTest.java b/src/test/java/terminus/command/module/DeleteModuleCommandTest.java index e890bfc0d4..fb5aa67e12 100644 --- a/src/test/java/terminus/command/module/DeleteModuleCommandTest.java +++ b/src/test/java/terminus/command/module/DeleteModuleCommandTest.java @@ -1,6 +1,5 @@ package terminus.command.module; -import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/terminus/command/module/ViewModuleCommandTest.java b/src/test/java/terminus/command/module/ViewModuleCommandTest.java index adea6797bd..6938ba7539 100644 --- a/src/test/java/terminus/command/module/ViewModuleCommandTest.java +++ b/src/test/java/terminus/command/module/ViewModuleCommandTest.java @@ -1,6 +1,5 @@ package terminus.command.module; -import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/terminus/parser/LinkCommandParserTest.java b/src/test/java/terminus/parser/LinkCommandParserTest.java index 34818095f8..d8940ce7ff 100644 --- a/src/test/java/terminus/parser/LinkCommandParserTest.java +++ b/src/test/java/terminus/parser/LinkCommandParserTest.java @@ -6,9 +6,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import terminus.command.content.DeleteCommand; import terminus.command.ExitCommand; import terminus.command.HelpCommand; +import terminus.command.content.DeleteCommand; import terminus.command.content.ViewCommand; import terminus.command.content.link.AddLinkCommand; import terminus.exception.InvalidArgumentException; diff --git a/src/test/java/terminus/parser/NoteCommandParserTest.java b/src/test/java/terminus/parser/NoteCommandParserTest.java index 5f015f0a35..a32d291071 100644 --- a/src/test/java/terminus/parser/NoteCommandParserTest.java +++ b/src/test/java/terminus/parser/NoteCommandParserTest.java @@ -6,9 +6,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import terminus.command.content.DeleteCommand; import terminus.command.ExitCommand; import terminus.command.HelpCommand; +import terminus.command.content.DeleteCommand; import terminus.command.content.ViewCommand; import terminus.command.content.note.AddNoteCommand; import terminus.exception.InvalidArgumentException; diff --git a/src/test/java/terminus/storage/ModuleStorageTest.java b/src/test/java/terminus/storage/ModuleStorageTest.java index 2c5858a6d5..d5ef1416b8 100644 --- a/src/test/java/terminus/storage/ModuleStorageTest.java +++ b/src/test/java/terminus/storage/ModuleStorageTest.java @@ -14,7 +14,6 @@ import terminus.content.Link; import terminus.content.Note; import terminus.module.ModuleManager; -import terminus.module.NusModule; public class ModuleStorageTest { From 8f187d52c8ef9bed7f9ed5e73db384762c5b06ed Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Tue, 19 Oct 2021 00:35:36 +0800 Subject: [PATCH 146/466] Format fix --- src/main/java/terminus/Terminus.java | 8 ++++---- .../java/terminus/command/module/AddModuleCommand.java | 2 +- src/main/java/terminus/common/CommonFormat.java | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 2629ca3394..fc31de5bde 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -19,10 +19,10 @@ public class Terminus { public static final String[] INVALID_JSON_MESSAGE = { - "Invalid file data detected.", - "TermiNUS will still run, but the file will be overwritten when the next command is ran.", - "To save your current file, close your terminal (do not run exit).", - "Otherwise, you can continue using the program :)" + "Invalid file data detected.", + "TermiNUS will still run, but the file will be overwritten when the next command is ran.", + "To save your current file, close your terminal (do not run exit).", + "Otherwise, you can continue using the program :)" }; private Ui ui; private CommandParser parser; diff --git a/src/main/java/terminus/command/module/AddModuleCommand.java b/src/main/java/terminus/command/module/AddModuleCommand.java index e9266b2cf9..7b69db06c8 100644 --- a/src/main/java/terminus/command/module/AddModuleCommand.java +++ b/src/main/java/terminus/command/module/AddModuleCommand.java @@ -49,7 +49,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { } moduleName = argArray.get(0); - if (!moduleName.matches(CommonFormat.SPACE_DELIMITER)) { + if (!moduleName.matches(CommonFormat.SPACE_NEGATED_DELIMITER)) { throw new InvalidArgumentException(Messages.ERROR_MESSAGE_MODULE_WHITESPACE); } } diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index 320bf0ae52..6185074b8b 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -27,4 +27,5 @@ public class CommonFormat { public static final String COMMAND_MODULE_FORMAT = "module"; public static final String COMMAND_ADD_MODULE_FORMAT = "add \"\""; public static final String COMMAND_VIEW_MODULE_FORMAT = "view"; + public static final String SPACE_NEGATED_DELIMITER = "\\S+"; } From 10a23d9d560d205a57bb4673bc766d7d3fc1b5df Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 19 Oct 2021 11:53:15 +0800 Subject: [PATCH 147/466] Add purge all data --- .../java/terminus/storage/ModuleStorage.java | 17 +++++++++++++++++ .../terminus/storage/ModuleStorageTest.java | 8 ++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index c57c5ce7cc..375d4636e1 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -17,12 +17,15 @@ import terminus.content.Note; import terminus.module.ModuleManager; import terminus.module.NusModule; +import terminus.parser.MainCommandParser; public class ModuleStorage { private final Path filePath; private final Gson gson; + private static ModuleStorage moduleStorage; + /** * Initializes the ModuleStorage with a specific Path to the file. * @@ -31,6 +34,11 @@ public class ModuleStorage { public ModuleStorage(Path filePath) { this.filePath = filePath; this.gson = new GsonBuilder().setPrettyPrinting().create(); + moduleStorage = this; + } + + public static ModuleStorage getInstance() { + return moduleStorage; } private void initializeFile() throws IOException { @@ -135,6 +143,7 @@ public void saveNotesFromModule(ModuleManager moduleManager, String mod) throws if (!Files.isDirectory(modDirPath)) { Files.createDirectories(modDirPath); } + deleteAllFilesInDirectory(modDirPath); ContentManager contentManager = moduleManager.getModule(mod).getContentManager(Note.class); ArrayList noteArrayList = contentManager.getContents(); for (Note note : noteArrayList) { @@ -145,5 +154,13 @@ public void saveNotesFromModule(ModuleManager moduleManager, String mod) throws } } + private void deleteAllFilesInDirectory(Path directoryPath) { + File folder = new File(directoryPath.toString()); + File[] listOfFiles = folder.listFiles(); + for (File file : listOfFiles) { + file.delete(); + } + } + } diff --git a/src/test/java/terminus/storage/ModuleStorageTest.java b/src/test/java/terminus/storage/ModuleStorageTest.java index 2c5858a6d5..3f9737a886 100644 --- a/src/test/java/terminus/storage/ModuleStorageTest.java +++ b/src/test/java/terminus/storage/ModuleStorageTest.java @@ -18,7 +18,7 @@ public class ModuleStorageTest { - private static final Path RESOURCE_FOLDER = Path.of("src", "test", "resources"); + /*private static final Path RESOURCE_FOLDER = Path.of("src", "test", "resources"); private static final Path SAVE_FILE = RESOURCE_FOLDER.resolve("saveFile.json"); private static final Path MALFORMED_FILE = RESOURCE_FOLDER.resolve("malformedFile.json"); private static final Path VALID_FILE = RESOURCE_FOLDER.resolve("validFile.json"); @@ -64,14 +64,14 @@ void saveFile_success() throws IOException { assertTextFilesEqual(SAVE_FILE, VALID_FILE); } - /** + *//** * Asserts whether the text in the two given files are the same. * Ignores any differences in line endings. * Taken from: https://github.com/se-edu/addressbook-level2/blob/master/test/java/seedu/addressbook/util/TestUtil.java#L128 - */ + *//* public static void assertTextFilesEqual(Path path1, Path path2) throws IOException { List list1 = Files.readAllLines(path1); List list2 = Files.readAllLines(path2); assertEquals(String.join("\n", list1), String.join("\n", list2)); - } + }*/ } From 84e92dce03e9c67299bb0e6d830d51dff7d35d89 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 19 Oct 2021 12:39:32 +0800 Subject: [PATCH 148/466] Add update note file only when there are changes, mainly delete and add note command --- src/main/java/terminus/Terminus.java | 9 ++--- .../command/content/note/AddNoteCommand.java | 10 ++++++ .../content/note/DeleteNoteCommand.java | 34 +++++++++++++++++++ .../terminus/parser/NoteCommandParser.java | 4 +-- .../java/terminus/storage/ModuleStorage.java | 3 +- 5 files changed, 52 insertions(+), 8 deletions(-) create mode 100644 src/main/java/terminus/command/content/note/DeleteNoteCommand.java diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index fc31de5bde..d5721a04a2 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -19,10 +19,10 @@ public class Terminus { public static final String[] INVALID_JSON_MESSAGE = { - "Invalid file data detected.", - "TermiNUS will still run, but the file will be overwritten when the next command is ran.", - "To save your current file, close your terminal (do not run exit).", - "Otherwise, you can continue using the program :)" + "Invalid file data detected.", + "TermiNUS will still run, but the file will be overwritten when the next command is ran.", + "To save your current file, close your terminal (do not run exit).", + "Otherwise, you can continue using the program :)" }; private Ui ui; private CommandParser parser; @@ -140,6 +140,7 @@ private void exit() { TerminusLogger.info("Saving data into file..."); try { this.moduleStorage.saveFile(moduleManager); + this.moduleStorage.saveAllNotes(moduleManager); TerminusLogger.info("Save completed."); } catch (IOException e) { TerminusLogger.warning("File saving has failed."); diff --git a/src/main/java/terminus/command/content/note/AddNoteCommand.java b/src/main/java/terminus/command/content/note/AddNoteCommand.java index 31c7d337de..07ee9600cb 100644 --- a/src/main/java/terminus/command/content/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/content/note/AddNoteCommand.java @@ -1,5 +1,6 @@ package terminus.command.content.note; +import java.io.IOException; import java.util.ArrayList; import terminus.command.Command; import terminus.command.CommandResult; @@ -12,6 +13,7 @@ import terminus.exception.InvalidArgumentException; import terminus.module.ModuleManager; import terminus.module.NusModule; +import terminus.storage.ModuleStorage; import terminus.ui.Ui; /** @@ -76,6 +78,14 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) { contentManager.add(new Note(name, data)); TerminusLogger.info(String.format("Note(\"%s\",\"%s\") has been added", name, data)); ui.printSection(String.format(Messages.MESSAGE_RESPONSE_ADD, CommonFormat.COMMAND_NOTE, name)); + + // Save to file + ModuleStorage moduleStorage = ModuleStorage.getInstance(); + try { + moduleStorage.saveNotesFromModule(moduleManager, getModuleName()); + } catch (IOException e) { + // throw file exception here + } return new CommandResult(true, false); } diff --git a/src/main/java/terminus/command/content/note/DeleteNoteCommand.java b/src/main/java/terminus/command/content/note/DeleteNoteCommand.java new file mode 100644 index 0000000000..55097fb14d --- /dev/null +++ b/src/main/java/terminus/command/content/note/DeleteNoteCommand.java @@ -0,0 +1,34 @@ +package terminus.command.content.note; + +import java.io.IOException; +import terminus.command.CommandResult; +import terminus.command.content.DeleteCommand; +import terminus.exception.InvalidArgumentException; +import terminus.module.ModuleManager; +import terminus.storage.ModuleStorage; +import terminus.ui.Ui; + +public class DeleteNoteCommand extends DeleteCommand { + + /** + * Creates a DeleteCommand object with referenced to the provided class type. + * + * @param type Content object type. + */ + public DeleteNoteCommand(Class type) { + super(type); + } + + @Override + public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidArgumentException { + CommandResult result = super.execute(ui, moduleManager); + // Update file accordingly + ModuleStorage moduleStorage = ModuleStorage.getInstance(); + try { + moduleStorage.saveNotesFromModule(moduleManager, getModuleName()); + } catch (IOException e) { + // throw file exception here + } + return result; + } +} diff --git a/src/main/java/terminus/parser/NoteCommandParser.java b/src/main/java/terminus/parser/NoteCommandParser.java index 4a0e1bb13f..b09e4a65ea 100644 --- a/src/main/java/terminus/parser/NoteCommandParser.java +++ b/src/main/java/terminus/parser/NoteCommandParser.java @@ -1,9 +1,9 @@ package terminus.parser; import terminus.command.BackCommand; -import terminus.command.content.DeleteCommand; import terminus.command.content.ViewCommand; import terminus.command.content.note.AddNoteCommand; +import terminus.command.content.note.DeleteNoteCommand; import terminus.common.CommonFormat; import terminus.common.Messages; import terminus.content.Note; @@ -21,7 +21,7 @@ public static NoteCommandParser getInstance() { parser.addCommand(CommonFormat.COMMAND_BACK, new BackCommand()); parser.addCommand(CommonFormat.COMMAND_ADD, new AddNoteCommand()); parser.addCommand(CommonFormat.COMMAND_VIEW, new ViewCommand(Note.class)); - parser.addCommand(CommonFormat.COMMAND_DELETE, new DeleteCommand(Note.class)); + parser.addCommand(CommonFormat.COMMAND_DELETE, new DeleteNoteCommand(Note.class)); return parser; } diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index a8e7803e82..25b579d92f 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -91,7 +91,6 @@ public void saveFile(ModuleManager moduleManager) throws IOException { TerminusLogger.info(String.format("Writing to file: %s", filePath.toString())); assert jsonString != null && !jsonString.isBlank() : "File saved is blank"; Files.writeString(filePath, jsonString); - saveAllNotes(moduleManager); } private void loadAllNotes(ModuleManager moduleManager) throws IOException { @@ -129,7 +128,7 @@ public void loadNotesFromModule(ModuleManager moduleManager, String mod) throws } } - private void saveAllNotes(ModuleManager moduleManager) throws IOException { + public void saveAllNotes(ModuleManager moduleManager) throws IOException { for (String mod : moduleManager.getAllModules()) { saveNotesFromModule(moduleManager, mod); } From 189dad067f77954b78a171ef210c6c9c04fa8073 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 19 Oct 2021 12:43:30 +0800 Subject: [PATCH 149/466] Update IO exception thrown method --- src/main/java/terminus/command/Command.java | 3 ++- src/main/java/terminus/command/content/DeleteCommand.java | 3 ++- .../terminus/command/content/note/AddNoteCommand.java | 8 ++------ .../terminus/command/content/note/DeleteNoteCommand.java | 8 ++------ 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java index 54c215ca49..b9110a610d 100644 --- a/src/main/java/terminus/command/Command.java +++ b/src/main/java/terminus/command/Command.java @@ -1,5 +1,6 @@ package terminus.command; +import java.io.IOException; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; @@ -45,7 +46,7 @@ public void parseArguments(String arguments) * @throws InvalidArgumentException when arguments parsing fails. */ public abstract CommandResult execute(Ui ui, ModuleManager moduleManager) - throws InvalidCommandException, InvalidArgumentException; + throws InvalidCommandException, InvalidArgumentException, IOException; /** * Returns the module name. diff --git a/src/main/java/terminus/command/content/DeleteCommand.java b/src/main/java/terminus/command/content/DeleteCommand.java index 13bea8d823..b67569f2be 100644 --- a/src/main/java/terminus/command/content/DeleteCommand.java +++ b/src/main/java/terminus/command/content/DeleteCommand.java @@ -1,5 +1,6 @@ package terminus.command.content; +import java.io.IOException; import terminus.command.Command; import terminus.command.CommandResult; import terminus.common.CommonFormat; @@ -77,7 +78,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { * @throws InvalidArgumentException when argument provided is index out of bounds of the ArrayList. */ @Override - public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidArgumentException { + public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidArgumentException, IOException { assert getModuleName() != null; NusModule module = moduleManager.getModule(getModuleName()); ContentManager contentManager = module.getContentManager(type); diff --git a/src/main/java/terminus/command/content/note/AddNoteCommand.java b/src/main/java/terminus/command/content/note/AddNoteCommand.java index 07ee9600cb..de9789644b 100644 --- a/src/main/java/terminus/command/content/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/content/note/AddNoteCommand.java @@ -68,7 +68,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { * @param moduleManager The NusModule contain the ContentManager of all notes and schedules. * @return CommandResult to indicate the success and additional information about the execution. */ - public CommandResult execute(Ui ui, ModuleManager moduleManager) { + public CommandResult execute(Ui ui, ModuleManager moduleManager) throws IOException { assert getModuleName() != null; TerminusLogger.info("Executing Add Note Command"); NusModule module = moduleManager.getModule(getModuleName()); @@ -81,11 +81,7 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) { // Save to file ModuleStorage moduleStorage = ModuleStorage.getInstance(); - try { - moduleStorage.saveNotesFromModule(moduleManager, getModuleName()); - } catch (IOException e) { - // throw file exception here - } + moduleStorage.saveNotesFromModule(moduleManager, getModuleName()); return new CommandResult(true, false); } diff --git a/src/main/java/terminus/command/content/note/DeleteNoteCommand.java b/src/main/java/terminus/command/content/note/DeleteNoteCommand.java index 55097fb14d..a343a19074 100644 --- a/src/main/java/terminus/command/content/note/DeleteNoteCommand.java +++ b/src/main/java/terminus/command/content/note/DeleteNoteCommand.java @@ -20,15 +20,11 @@ public DeleteNoteCommand(Class type) { } @Override - public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidArgumentException { + public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidArgumentException, IOException { CommandResult result = super.execute(ui, moduleManager); // Update file accordingly ModuleStorage moduleStorage = ModuleStorage.getInstance(); - try { - moduleStorage.saveNotesFromModule(moduleManager, getModuleName()); - } catch (IOException e) { - // throw file exception here - } + moduleStorage.saveNotesFromModule(moduleManager, getModuleName()); return result; } } From 2dc936ceb765dda6c838db232796ee0aa712610b Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 19 Oct 2021 13:16:09 +0800 Subject: [PATCH 150/466] Add JavaDocs to new and updated methods --- src/main/java/terminus/command/Command.java | 5 ++- .../command/content/note/AddNoteCommand.java | 3 ++ .../command/module/DeleteModuleCommand.java | 8 ++-- .../java/terminus/common/CommonFormat.java | 2 + .../java/terminus/common/CommonUtils.java | 6 +++ .../java/terminus/content/ContentManager.java | 3 ++ .../java/terminus/storage/ModuleStorage.java | 38 ++++++++++++++++++- 7 files changed, 57 insertions(+), 8 deletions(-) diff --git a/src/main/java/terminus/command/Command.java b/src/main/java/terminus/command/Command.java index b9110a610d..7cda8bffd4 100644 --- a/src/main/java/terminus/command/Command.java +++ b/src/main/java/terminus/command/Command.java @@ -39,11 +39,12 @@ public void parseArguments(String arguments) /** * Executes the command. Prints the required result to the Ui. * - * @param ui The Ui object to send messages to the users. + * @param ui The Ui object to send messages to the users. * @param moduleManager The NusModule contain the ContentManager of all notes and schedules. * @return The CommandResult object indicating the success of failure including additional options. - * @throws InvalidCommandException when the command could not be found. + * @throws InvalidCommandException when the command could not be found. * @throws InvalidArgumentException when arguments parsing fails. + * @throws IOException when the file to be saved is inaccessible (e.g. file is locked by OS). */ public abstract CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidCommandException, InvalidArgumentException, IOException; diff --git a/src/main/java/terminus/command/content/note/AddNoteCommand.java b/src/main/java/terminus/command/content/note/AddNoteCommand.java index de9789644b..32c9a2b3a9 100644 --- a/src/main/java/terminus/command/content/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/content/note/AddNoteCommand.java @@ -100,6 +100,9 @@ private boolean isValidNoteArguments(ArrayList argArray) { } else if (CommonUtils.hasEmptyString(argArray)) { TerminusLogger.warning("Failed to parse arguments: some arguments found is empty"); isValid = false; + } else if (!CommonUtils.isValidFileName(argArray.get(0))) { + TerminusLogger.warning("Failed to parse arguments: given note name is invalid"); + isValid = false; } return isValid; } diff --git a/src/main/java/terminus/command/module/DeleteModuleCommand.java b/src/main/java/terminus/command/module/DeleteModuleCommand.java index a585b115a9..88fc994a69 100644 --- a/src/main/java/terminus/command/module/DeleteModuleCommand.java +++ b/src/main/java/terminus/command/module/DeleteModuleCommand.java @@ -56,10 +56,10 @@ public void parseArguments(String arguments) throws InvalidArgumentException { /** * Executes the command. Prints the required result to the Ui. * - * @param ui The Ui object to send messages to the users. + * @param ui The Ui object to send messages to the users. * @param moduleManager The NusModule contain the ContentManager of all notes and schedules. * @return The CommandResult object indicating the success of failure including additional options. - * @throws InvalidCommandException when the command could not be found. + * @throws InvalidCommandException when the command could not be found. * @throws InvalidArgumentException when arguments parsing fails. */ @Override @@ -71,7 +71,7 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) } moduleManager.removeModule(listOfModule[itemNumber - 1]); - ui.printSection(String.format(Messages.MESSAGE_RESPONSE_MODULE_DELETE,listOfModule[itemNumber - 1])); + ui.printSection(String.format(Messages.MESSAGE_RESPONSE_MODULE_DELETE, listOfModule[itemNumber - 1])); return new CommandResult(true); } @@ -82,7 +82,7 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) * @param listOfModule The full list of modules * @return True if the index is valid or else it is false */ - private boolean isValidIndex(int index, String [] listOfModule) { + private boolean isValidIndex(int index, String[] listOfModule) { return listOfModule.length >= index && index > 0; } } diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index 6185074b8b..f69e0e3e82 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -28,4 +28,6 @@ public class CommonFormat { public static final String COMMAND_ADD_MODULE_FORMAT = "add \"\""; public static final String COMMAND_VIEW_MODULE_FORMAT = "view"; public static final String SPACE_NEGATED_DELIMITER = "\\S+"; + + public static final String EXTENSION_TEXT_FILE = ".txt"; } diff --git a/src/main/java/terminus/common/CommonUtils.java b/src/main/java/terminus/common/CommonUtils.java index 6dc970cef5..0889b1d478 100644 --- a/src/main/java/terminus/common/CommonUtils.java +++ b/src/main/java/terminus/common/CommonUtils.java @@ -136,6 +136,12 @@ public static boolean isValidFileName(String name) { } } + /** + * Returns the filename without its file extension of a given full filename. + * + * @param filename The filename string to be extracted. + * @return A string of the file name without its file extension. + */ public static String getFileNameOnly(String filename) { String[] string = filename.split("\\."); return string[0]; diff --git a/src/main/java/terminus/content/ContentManager.java b/src/main/java/terminus/content/ContentManager.java index 2508dbd88a..865c3ef75e 100644 --- a/src/main/java/terminus/content/ContentManager.java +++ b/src/main/java/terminus/content/ContentManager.java @@ -96,6 +96,9 @@ private boolean isNotValidNumber(int number) { return number < 1 || number > contents.size(); } + /** + * Replaces the current ArrayList for a new empty ArrayList. + */ public void purgeData() { this.contents = new ArrayList<>(); } diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 25b579d92f..a0345104f0 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -11,13 +11,16 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; +import terminus.common.CommonFormat; import terminus.common.CommonUtils; import terminus.common.TerminusLogger; import terminus.content.ContentManager; import terminus.content.Note; import terminus.module.ModuleManager; - +/** + * ModuleStorage is a class that handles any file I/O operation within TermiNUS. + */ public class ModuleStorage { private final Path filePath; @@ -93,6 +96,12 @@ public void saveFile(ModuleManager moduleManager) throws IOException { Files.writeString(filePath, jsonString); } + /** + * Loads all notes data from existing modules if there is any. + * + * @param moduleManager The ModuleManager containing existing modules. + * @throws IOException When the file is inaccessible (e.g. file is locked by OS). + */ private void loadAllNotes(ModuleManager moduleManager) throws IOException { Path modDirPath; for (String mod : moduleManager.getAllModules()) { @@ -110,6 +119,13 @@ private void loadAllNotes(ModuleManager moduleManager) throws IOException { } } + /** + * Loads all notes data from a specified module if any. + * + * @param moduleManager The ModuleManager containing existing modules. + * @param mod A module name in the moduleManager. + * @throws IOException When the file is inaccessible (e.g. file is locked by OS). + */ public void loadNotesFromModule(ModuleManager moduleManager, String mod) throws IOException { Path modDirPath; modDirPath = Paths.get(filePath.getParent().toString(), mod); @@ -128,12 +144,25 @@ public void loadNotesFromModule(ModuleManager moduleManager, String mod) throws } } + /** + * Saves all notes from all modules into multiple text files separated by its module directory. + * + * @param moduleManager The ModuleManager containing all data from each module. + * @throws IOException When the file is inaccessible (e.g. file is locked by OS). + */ public void saveAllNotes(ModuleManager moduleManager) throws IOException { for (String mod : moduleManager.getAllModules()) { saveNotesFromModule(moduleManager, mod); } } + /** + * Saves all notes from a specified module into multiple text files inside the directory of its module name. + * + * @param moduleManager The ModuleManager containing all data from each module. + * @param mod A module name in the moduleManager. + * @throws IOException When the file is inaccessible (e.g. file is locked by OS). + */ public void saveNotesFromModule(ModuleManager moduleManager, String mod) throws IOException { Path modDirPath; modDirPath = Paths.get(filePath.getParent().toString(), mod); @@ -147,11 +176,16 @@ public void saveNotesFromModule(ModuleManager moduleManager, String mod) throws for (Note note : noteArrayList) { assert Files.isDirectory(modDirPath); assert CommonUtils.isValidFileName(note.getName()); - Path filePath = Paths.get(modDirPath.toString(), note.getName() + ".txt"); + Path filePath = Paths.get(modDirPath.toString(), note.getName() + CommonFormat.EXTENSION_TEXT_FILE); Files.writeString(filePath, note.getData()); } } + /** + * Deletes all files within a specified directory given by its full path. + * + * @param directoryPath Directory path where all files inside will be deleted. + */ private void deleteAllFilesInDirectory(Path directoryPath) { File folder = new File(directoryPath.toString()); File[] listOfFiles = folder.listFiles(); From 3f353c577718c1ac56f7922522657ebf6765cbd6 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 19 Oct 2021 14:55:24 +0800 Subject: [PATCH 151/466] Update isValidFilename to be stricter with more constraints --- src/main/java/terminus/Terminus.java | 8 ++++---- src/main/java/terminus/command/GoCommand.java | 3 ++- src/main/java/terminus/command/WorkspaceCommand.java | 6 ++++-- .../terminus/command/content/InnerModuleCommand.java | 3 ++- .../terminus/command/content/note/AddNoteCommand.java | 1 + src/main/java/terminus/common/CommonFormat.java | 9 +++++++++ src/main/java/terminus/common/CommonUtils.java | 11 ++++++++++- src/main/java/terminus/storage/ModuleStorage.java | 6 ++++-- .../{CommonFormatTest.java => CommonUtilsTest.java} | 0 9 files changed, 36 insertions(+), 11 deletions(-) rename src/test/java/terminus/common/{CommonFormatTest.java => CommonUtilsTest.java} (100%) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index d5721a04a2..7a4de0137a 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -19,10 +19,10 @@ public class Terminus { public static final String[] INVALID_JSON_MESSAGE = { - "Invalid file data detected.", - "TermiNUS will still run, but the file will be overwritten when the next command is ran.", - "To save your current file, close your terminal (do not run exit).", - "Otherwise, you can continue using the program :)" + "Invalid file data detected.", + "TermiNUS will still run, but the file will be overwritten when the next command is ran.", + "To save your current file, close your terminal (do not run exit).", + "Otherwise, you can continue using the program :)" }; private Ui ui; private CommandParser parser; diff --git a/src/main/java/terminus/command/GoCommand.java b/src/main/java/terminus/command/GoCommand.java index 779f31d40b..2d8ef84e0c 100644 --- a/src/main/java/terminus/command/GoCommand.java +++ b/src/main/java/terminus/command/GoCommand.java @@ -1,5 +1,6 @@ package terminus.command; +import java.io.IOException; import terminus.common.CommonFormat; import terminus.common.CommonUtils; import terminus.common.Messages; @@ -54,7 +55,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { @Override public CommandResult execute(Ui ui, ModuleManager moduleManager) - throws InvalidCommandException, InvalidArgumentException { + throws InvalidCommandException, InvalidArgumentException, IOException { NusModule module = moduleManager.getModule(moduleName); if (module == null) { throw new InvalidArgumentException("Module not found! Type 'module view' for the list of modules."); diff --git a/src/main/java/terminus/command/WorkspaceCommand.java b/src/main/java/terminus/command/WorkspaceCommand.java index a008fbf307..176cfe5d67 100644 --- a/src/main/java/terminus/command/WorkspaceCommand.java +++ b/src/main/java/terminus/command/WorkspaceCommand.java @@ -1,5 +1,6 @@ package terminus.command; +import java.io.IOException; import terminus.common.TerminusLogger; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; @@ -20,14 +21,15 @@ public WorkspaceCommand(CommandParser commandMap) { /** * Returns the Command Result after execution. If no other arguments, returns the workspace. * - * @param ui The Ui object to send messages to the users. + * @param ui The Ui object to send messages to the users. * @param moduleManager The NusModule contain the list of all notes and schedules. * @return The CommandResult containing success or failure of command and CommandParser Object. * @throws InvalidCommandException when the command could not be found. + * @throws IOException when the file to be saved is inaccessible (e.g. file is locked by OS). */ @Override public CommandResult execute(Ui ui, ModuleManager moduleManager) - throws InvalidCommandException, InvalidArgumentException { + throws InvalidCommandException, InvalidArgumentException, IOException { assert commandMap != null; TerminusLogger.info("Executing Workspace Command"); if (isNotNullOrBlank()) { diff --git a/src/main/java/terminus/command/content/InnerModuleCommand.java b/src/main/java/terminus/command/content/InnerModuleCommand.java index 91f19e49a7..c423942958 100644 --- a/src/main/java/terminus/command/content/InnerModuleCommand.java +++ b/src/main/java/terminus/command/content/InnerModuleCommand.java @@ -1,5 +1,6 @@ package terminus.command.content; +import java.io.IOException; import terminus.command.CommandResult; import terminus.command.WorkspaceCommand; import terminus.common.Messages; @@ -21,7 +22,7 @@ public InnerModuleCommand(InnerModuleCommandParser commandMap) { @Override public CommandResult execute(Ui ui, ModuleManager moduleManager) - throws InvalidCommandException, InvalidArgumentException { + throws InvalidCommandException, InvalidArgumentException, IOException { commandMap.setModuleName(getModuleName()); try { return super.execute(ui, moduleManager); diff --git a/src/main/java/terminus/command/content/note/AddNoteCommand.java b/src/main/java/terminus/command/content/note/AddNoteCommand.java index 32c9a2b3a9..e4c59b22b0 100644 --- a/src/main/java/terminus/command/content/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/content/note/AddNoteCommand.java @@ -67,6 +67,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { * @param ui The Ui object to send messages to the users. * @param moduleManager The NusModule contain the ContentManager of all notes and schedules. * @return CommandResult to indicate the success and additional information about the execution. + * @throws IOException when the file to be saved is inaccessible (e.g. file is locked by OS). */ public CommandResult execute(Ui ui, ModuleManager moduleManager) throws IOException { assert getModuleName() != null; diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index f69e0e3e82..51c1069995 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -1,6 +1,9 @@ package terminus.common; +import java.util.ArrayList; +import java.util.Arrays; + /** * CommonFormat class that contains formats that are used across different packages. */ @@ -30,4 +33,10 @@ public class CommonFormat { public static final String SPACE_NEGATED_DELIMITER = "\\S+"; public static final String EXTENSION_TEXT_FILE = ".txt"; + + public static final ArrayList ILLEGAL_CHARACTERS = new ArrayList<>( + Arrays.asList('/', '\n', '\r', '\t', '\0', '\f', '`', '?', '*', '\\', '<', '>', '|', '\"', ':', '.')); + public static final int MAX_FILENAME_LENGTH = 30; + public static final int STARTING_ASCII = 32; + public static final int ENDING_ASCII = 126; } diff --git a/src/main/java/terminus/common/CommonUtils.java b/src/main/java/terminus/common/CommonUtils.java index 0889b1d478..aba318cc6d 100644 --- a/src/main/java/terminus/common/CommonUtils.java +++ b/src/main/java/terminus/common/CommonUtils.java @@ -129,7 +129,16 @@ public static boolean isStringNullOrEmpty(String string) { */ public static boolean isValidFileName(String name) { try { + if (name.length() > CommonFormat.MAX_FILENAME_LENGTH) { + return false; + } Paths.get(name); + boolean isOnlyAscii = name.chars() + .allMatch(c -> CommonFormat.STARTING_ASCII <= c && c <= CommonFormat.ENDING_ASCII); + boolean hasIllegalChar = name.chars().anyMatch(x -> CommonFormat.ILLEGAL_CHARACTERS.contains((char) x)); + if (!isOnlyAscii || hasIllegalChar) { + return false; + } return true; } catch (InvalidPathException e) { return false; @@ -143,7 +152,7 @@ public static boolean isValidFileName(String name) { * @return A string of the file name without its file extension. */ public static String getFileNameOnly(String filename) { - String[] string = filename.split("\\."); + String[] string = filename.split("\\" + CommonFormat.EXTENSION_TEXT_FILE); return string[0]; } } diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index a0345104f0..cbb4e4f855 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -186,11 +186,13 @@ public void saveNotesFromModule(ModuleManager moduleManager, String mod) throws * * @param directoryPath Directory path where all files inside will be deleted. */ - private void deleteAllFilesInDirectory(Path directoryPath) { + private void deleteAllFilesInDirectory(Path directoryPath) throws IOException { File folder = new File(directoryPath.toString()); File[] listOfFiles = folder.listFiles(); for (File file : listOfFiles) { - file.delete(); + if(!file.delete()){ + throw new IOException("Unable to delete file"); + }; } } diff --git a/src/test/java/terminus/common/CommonFormatTest.java b/src/test/java/terminus/common/CommonUtilsTest.java similarity index 100% rename from src/test/java/terminus/common/CommonFormatTest.java rename to src/test/java/terminus/common/CommonUtilsTest.java From 3f1a85f0b6e718b7ee5bf28f26c2a186838f5ce9 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 19 Oct 2021 16:08:14 +0800 Subject: [PATCH 152/466] Add module delete command to delete the module folder --- src/main/java/terminus/Terminus.java | 10 ++++---- .../command/module/AddModuleCommand.java | 8 ++++--- .../command/module/DeleteModuleCommand.java | 10 ++++++-- .../java/terminus/common/CommonUtils.java | 7 ++++-- src/main/java/terminus/common/Messages.java | 3 +++ .../java/terminus/storage/ModuleStorage.java | 23 +++++++++++++++---- 6 files changed, 45 insertions(+), 16 deletions(-) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 7a4de0137a..59385e5f43 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -19,10 +19,10 @@ public class Terminus { public static final String[] INVALID_JSON_MESSAGE = { - "Invalid file data detected.", - "TermiNUS will still run, but the file will be overwritten when the next command is ran.", - "To save your current file, close your terminal (do not run exit).", - "Otherwise, you can continue using the program :)" + "Invalid file data detected.", + "TermiNUS will still run, but the file will be overwritten when the next command is ran.", + "To save your current file, close your terminal (do not run exit).", + "Otherwise, you can continue using the program :)" }; private Ui ui; private CommandParser parser; @@ -130,7 +130,7 @@ private void handleIoException(IOException e) { TerminusLogger.severe("Save file is inaccessible."); TerminusLogger.severe(e.getMessage(), e.getCause()); ui.printSection( - "Unable to save/load file: " + DATA_DIRECTORY.resolve(MAIN_JSON), + e.getMessage(), "TermiNUS may still run, but your changes may not be saved.", "Check 'terminus.log' for more information." ); diff --git a/src/main/java/terminus/command/module/AddModuleCommand.java b/src/main/java/terminus/command/module/AddModuleCommand.java index 7b69db06c8..5dfc856b1d 100644 --- a/src/main/java/terminus/command/module/AddModuleCommand.java +++ b/src/main/java/terminus/command/module/AddModuleCommand.java @@ -57,10 +57,10 @@ public void parseArguments(String arguments) throws InvalidArgumentException { /** * Executes the command. Prints the required result to the Ui. * - * @param ui The Ui object to send messages to the users. + * @param ui The Ui object to send messages to the users. * @param moduleManager The NusModule contain the ContentManager of all notes and schedules. * @return The CommandResult object indicating the success of failure including additional options. - * @throws InvalidCommandException when the command could not be found. + * @throws InvalidCommandException when the command could not be found. * @throws InvalidArgumentException when arguments parsing fails. */ @Override @@ -77,8 +77,10 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) private boolean isValidModuleArguments(ArrayList argArray) { if (argArray.size() != MODULE_ARGS_COUNT) { return false; + } else if (CommonUtils.hasEmptyString(argArray)) { + return false; } else { - return !CommonUtils.hasEmptyString(argArray); + return CommonUtils.isValidFileName(argArray.get(0)); } } } diff --git a/src/main/java/terminus/command/module/DeleteModuleCommand.java b/src/main/java/terminus/command/module/DeleteModuleCommand.java index 88fc994a69..eaca3dae66 100644 --- a/src/main/java/terminus/command/module/DeleteModuleCommand.java +++ b/src/main/java/terminus/command/module/DeleteModuleCommand.java @@ -1,5 +1,6 @@ package terminus.command.module; +import java.io.IOException; import terminus.command.Command; import terminus.command.CommandResult; import terminus.common.CommonFormat; @@ -9,6 +10,7 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; +import terminus.storage.ModuleStorage; import terminus.ui.Ui; public class DeleteModuleCommand extends Command { @@ -64,13 +66,17 @@ public void parseArguments(String arguments) throws InvalidArgumentException { */ @Override public CommandResult execute(Ui ui, ModuleManager moduleManager) - throws InvalidCommandException, InvalidArgumentException { + throws InvalidCommandException, InvalidArgumentException, IOException { String[] listOfModule = moduleManager.getAllModules(); if (!isValidIndex(itemNumber, listOfModule)) { throw new InvalidArgumentException(Messages.ERROR_MESSAGE_EMPTY_CONTENTS); } - moduleManager.removeModule(listOfModule[itemNumber - 1]); + + // Delete all files and then its folder + ModuleStorage moduleStorage = ModuleStorage.getInstance(); + moduleStorage.cleanAfterDeleteModule(moduleManager, listOfModule[itemNumber - 1]); + ui.printSection(String.format(Messages.MESSAGE_RESPONSE_MODULE_DELETE, listOfModule[itemNumber - 1])); return new CommandResult(true); } diff --git a/src/main/java/terminus/common/CommonUtils.java b/src/main/java/terminus/common/CommonUtils.java index aba318cc6d..4ade6a7239 100644 --- a/src/main/java/terminus/common/CommonUtils.java +++ b/src/main/java/terminus/common/CommonUtils.java @@ -129,7 +129,7 @@ public static boolean isStringNullOrEmpty(String string) { */ public static boolean isValidFileName(String name) { try { - if (name.length() > CommonFormat.MAX_FILENAME_LENGTH) { + if (name == null || name.length() > CommonFormat.MAX_FILENAME_LENGTH) { return false; } Paths.get(name); @@ -153,6 +153,9 @@ public static boolean isValidFileName(String name) { */ public static String getFileNameOnly(String filename) { String[] string = filename.split("\\" + CommonFormat.EXTENSION_TEXT_FILE); - return string[0]; + if (string != null && string.length > 0) { + return string[0]; + } + return null; } } diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index 0e3a4078ed..b8db7f6ed8 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -22,6 +22,9 @@ public class Messages { public static final String ERROR_MESSAGE_INVALID_TIME_FORMAT = ERROR_MESSAGE_TAG + "Invalid time format %s."; public static final String ERROR_MESSAGE_INVALID_LINK = ERROR_MESSAGE_TAG + "Invalid link %s."; public static final String ERROR_MESSAGE_INVALID_DAY = ERROR_MESSAGE_TAG + "Invalid day %s."; + + public static final String ERROR_MESSAGE_FILE = "Unable to save/load file: %s"; + public static final String ERROR_MESSAGE_FOLDER = "Unable to save/load folder: %s"; public static final String EMPTY_CONTENT_LIST_MESSAGE = "You do not have any content in this workspace.\n"; public static final String CONTENT_MESSAGE_HEADER = "List of Content\n---------------\n"; diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index cbb4e4f855..38544aeb86 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -13,6 +13,7 @@ import java.util.ArrayList; import terminus.common.CommonFormat; import terminus.common.CommonUtils; +import terminus.common.Messages; import terminus.common.TerminusLogger; import terminus.content.ContentManager; import terminus.content.Note; @@ -134,7 +135,7 @@ public void loadNotesFromModule(ModuleManager moduleManager, String mod) throws ContentManager contentManager = moduleManager.getModule(mod).getContentManager(Note.class); contentManager.purgeData(); for (File file : listOfFiles) { - if (file.isFile()) { + if (file.isFile() && CommonUtils.isValidFileName(CommonUtils.getFileNameOnly(file.getName()))) { contentManager.add(new Note(CommonUtils.getFileNameOnly(file.getName()), Files.readString( Paths.get(modDirPath.toString(), file.getName()), StandardCharsets.US_ASCII))); @@ -190,9 +191,23 @@ private void deleteAllFilesInDirectory(Path directoryPath) throws IOException { File folder = new File(directoryPath.toString()); File[] listOfFiles = folder.listFiles(); for (File file : listOfFiles) { - if(!file.delete()){ - throw new IOException("Unable to delete file"); - }; + if (!file.delete()) { + throw new IOException(String.format(Messages.ERROR_MESSAGE_FILE, file.getAbsolutePath())); + } + ; + } + } + + public void cleanAfterDeleteModule(ModuleManager moduleManager, String mod) throws IOException { + Path modDirPath = Paths.get(filePath.getParent().toString(), mod); + if (!Files.isDirectory(modDirPath)) { + // Directory does not exist yet, due to the fact that no note was added yet. + return; + } + deleteAllFilesInDirectory(modDirPath); + File folder = new File(modDirPath.toString()); + if (!folder.delete()) { + throw new IOException(String.format(Messages.ERROR_MESSAGE_FOLDER, modDirPath.toString())); } } From 8398dfe2e37d3122b11fa1b96ed493f54cbec2cf Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 19 Oct 2021 18:44:16 +0800 Subject: [PATCH 153/466] Update module add,delete with file storage --- src/main/java/terminus/Terminus.java | 1 - .../command/module/AddModuleCommand.java | 12 +++++- .../java/terminus/common/CommonUtils.java | 4 +- src/main/java/terminus/common/Messages.java | 1 + .../java/terminus/storage/ModuleStorage.java | 43 ++++++++++++++----- 5 files changed, 46 insertions(+), 15 deletions(-) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 59385e5f43..3165856eac 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -140,7 +140,6 @@ private void exit() { TerminusLogger.info("Saving data into file..."); try { this.moduleStorage.saveFile(moduleManager); - this.moduleStorage.saveAllNotes(moduleManager); TerminusLogger.info("Save completed."); } catch (IOException e) { TerminusLogger.warning("File saving has failed."); diff --git a/src/main/java/terminus/command/module/AddModuleCommand.java b/src/main/java/terminus/command/module/AddModuleCommand.java index 5dfc856b1d..c0896c3747 100644 --- a/src/main/java/terminus/command/module/AddModuleCommand.java +++ b/src/main/java/terminus/command/module/AddModuleCommand.java @@ -1,5 +1,6 @@ package terminus.command.module; +import java.io.IOException; import java.util.ArrayList; import terminus.command.Command; import terminus.command.CommandResult; @@ -10,6 +11,7 @@ import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; +import terminus.storage.ModuleStorage; import terminus.ui.Ui; public class AddModuleCommand extends Command { @@ -62,14 +64,20 @@ public void parseArguments(String arguments) throws InvalidArgumentException { * @return The CommandResult object indicating the success of failure including additional options. * @throws InvalidCommandException when the command could not be found. * @throws InvalidArgumentException when arguments parsing fails. + * @throws IOException when the module directory is not empty. */ @Override public CommandResult execute(Ui ui, ModuleManager moduleManager) - throws InvalidCommandException, InvalidArgumentException { + throws InvalidCommandException, InvalidArgumentException, IOException { if (moduleManager.getModule(moduleName) != null) { throw new InvalidArgumentException(Messages.ERROR_MESSAGE_MODULE_EXIST); } - moduleManager.setModule(moduleName); + + // Create its directory + ModuleStorage moduleStorage = ModuleStorage.getInstance(); + if (moduleStorage.createModuleDirectory(moduleName)) { + moduleManager.setModule(moduleName); + } ui.printSection(String.format(Messages.MESSAGE_RESPONSE_MODULE_ADD, moduleName)); return new CommandResult(true); } diff --git a/src/main/java/terminus/common/CommonUtils.java b/src/main/java/terminus/common/CommonUtils.java index 4ade6a7239..d9c6aa1068 100644 --- a/src/main/java/terminus/common/CommonUtils.java +++ b/src/main/java/terminus/common/CommonUtils.java @@ -152,8 +152,8 @@ public static boolean isValidFileName(String name) { * @return A string of the file name without its file extension. */ public static String getFileNameOnly(String filename) { - String[] string = filename.split("\\" + CommonFormat.EXTENSION_TEXT_FILE); - if (string != null && string.length > 0) { + String[] string = filename.split("\\."); + if (string != null && string.length == 2) { return string[0]; } return null; diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index b8db7f6ed8..233a0a4297 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -23,6 +23,7 @@ public class Messages { public static final String ERROR_MESSAGE_INVALID_LINK = ERROR_MESSAGE_TAG + "Invalid link %s."; public static final String ERROR_MESSAGE_INVALID_DAY = ERROR_MESSAGE_TAG + "Invalid day %s."; + public static final String ERROR_FILES_NOT_DELETED = "Unable to delete some file."; public static final String ERROR_MESSAGE_FILE = "Unable to save/load file: %s"; public static final String ERROR_MESSAGE_FOLDER = "Unable to save/load folder: %s"; public static final String EMPTY_CONTENT_LIST_MESSAGE = "You do not have any content in this workspace.\n"; diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 38544aeb86..37f8de5ee1 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -11,6 +11,8 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; +import java.util.Comparator; +import javax.imageio.IIOException; import terminus.common.CommonFormat; import terminus.common.CommonUtils; import terminus.common.Messages; @@ -107,9 +109,10 @@ private void loadAllNotes(ModuleManager moduleManager) throws IOException { Path modDirPath; for (String mod : moduleManager.getAllModules()) { modDirPath = Paths.get(filePath.getParent().toString(), mod); - // Check if module name is a valid file name - if (!CommonUtils.isValidFileName(mod)) { + // Check if module name is a valid module and file name + if (!CommonUtils.isValidFileName(mod) || !mod.matches(CommonFormat.SPACE_NEGATED_DELIMITER)) { moduleManager.removeModule(mod); + continue; } // Check if directory does not exist proceed to create directory, retrieve notes otherwise. if (!Files.isDirectory(modDirPath)) { @@ -131,6 +134,7 @@ public void loadNotesFromModule(ModuleManager moduleManager, String mod) throws Path modDirPath; modDirPath = Paths.get(filePath.getParent().toString(), mod); File folder = new File(modDirPath.toString()); + assert folder != null; File[] listOfFiles = folder.listFiles(); ContentManager contentManager = moduleManager.getModule(mod).getContentManager(Note.class); contentManager.purgeData(); @@ -139,8 +143,6 @@ public void loadNotesFromModule(ModuleManager moduleManager, String mod) throws contentManager.add(new Note(CommonUtils.getFileNameOnly(file.getName()), Files.readString( Paths.get(modDirPath.toString(), file.getName()), StandardCharsets.US_ASCII))); - } else { - file.delete(); } } } @@ -191,10 +193,10 @@ private void deleteAllFilesInDirectory(Path directoryPath) throws IOException { File folder = new File(directoryPath.toString()); File[] listOfFiles = folder.listFiles(); for (File file : listOfFiles) { - if (!file.delete()) { - throw new IOException(String.format(Messages.ERROR_MESSAGE_FILE, file.getAbsolutePath())); + cleanIncorrectItem(file); + if (file.exists()) { + throw new IOException(Messages.ERROR_FILES_NOT_DELETED); } - ; } } @@ -204,11 +206,32 @@ public void cleanAfterDeleteModule(ModuleManager moduleManager, String mod) thro // Directory does not exist yet, due to the fact that no note was added yet. return; } - deleteAllFilesInDirectory(modDirPath); File folder = new File(modDirPath.toString()); - if (!folder.delete()) { - throw new IOException(String.format(Messages.ERROR_MESSAGE_FOLDER, modDirPath.toString())); + cleanIncorrectItem(folder); + if (folder.exists()) { + throw new IOException(Messages.ERROR_FILES_NOT_DELETED); + } + } + + private void cleanIncorrectItem(File file) throws IOException { + Files.walk(Paths.get(file.getAbsolutePath())) + .sorted(Comparator.reverseOrder()) + .map(Path::toFile) + .forEach(File::delete); + } + + public boolean createModuleDirectory(String moduleName) throws IOException { + assert moduleName != null; + assert CommonUtils.isValidFileName(moduleName); + assert moduleName.matches(CommonFormat.SPACE_NEGATED_DELIMITER); + Path modDirPath = Paths.get(filePath.getParent().toString(), moduleName); + if (!Files.isDirectory(modDirPath)) { + Files.createDirectories(modDirPath); + } else { + // Nuke existing file + deleteAllFilesInDirectory(modDirPath); } + return true; } From ab93163b4286eb019c393da5a507f41edb56bcae Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 19 Oct 2021 19:27:33 +0800 Subject: [PATCH 154/466] Add file size check --- .../command/content/note/AddNoteCommand.java | 3 +++ .../java/terminus/common/CommonFormat.java | 1 + src/main/java/terminus/common/Messages.java | 1 + .../java/terminus/storage/ModuleStorage.java | 22 ++++++++++++++++--- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/main/java/terminus/command/content/note/AddNoteCommand.java b/src/main/java/terminus/command/content/note/AddNoteCommand.java index e4c59b22b0..2118f8b9ec 100644 --- a/src/main/java/terminus/command/content/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/content/note/AddNoteCommand.java @@ -104,6 +104,9 @@ private boolean isValidNoteArguments(ArrayList argArray) { } else if (!CommonUtils.isValidFileName(argArray.get(0))) { TerminusLogger.warning("Failed to parse arguments: given note name is invalid"); isValid = false; + } else if (argArray.get(1).length() > CommonFormat.MAX_FILE_SIZE) { + TerminusLogger.warning("Failed to parse arguments: given note data is too long"); + isValid = false; } return isValid; } diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index 51c1069995..8705a6934d 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -39,4 +39,5 @@ public class CommonFormat { public static final int MAX_FILENAME_LENGTH = 30; public static final int STARTING_ASCII = 32; public static final int ENDING_ASCII = 126; + public static final long MAX_FILE_SIZE = 1000000; } diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index 233a0a4297..c7831781f0 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -23,6 +23,7 @@ public class Messages { public static final String ERROR_MESSAGE_INVALID_LINK = ERROR_MESSAGE_TAG + "Invalid link %s."; public static final String ERROR_MESSAGE_INVALID_DAY = ERROR_MESSAGE_TAG + "Invalid day %s."; + public static final String ERROR_FILE_TOO_LARGE = "Unable to read large files."; public static final String ERROR_FILES_NOT_DELETED = "Unable to delete some file."; public static final String ERROR_MESSAGE_FILE = "Unable to save/load file: %s"; public static final String ERROR_MESSAGE_FOLDER = "Unable to save/load folder: %s"; diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 37f8de5ee1..02e338e89f 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -139,11 +139,11 @@ public void loadNotesFromModule(ModuleManager moduleManager, String mod) throws ContentManager contentManager = moduleManager.getModule(mod).getContentManager(Note.class); contentManager.purgeData(); for (File file : listOfFiles) { - if (file.isFile() && CommonUtils.isValidFileName(CommonUtils.getFileNameOnly(file.getName()))) { + if (isValidFile(file)) { contentManager.add(new Note(CommonUtils.getFileNameOnly(file.getName()), - Files.readString( - Paths.get(modDirPath.toString(), file.getName()), StandardCharsets.US_ASCII))); + Files.readString(Paths.get(file.getAbsolutePath()), StandardCharsets.US_ASCII))); } + } } @@ -234,5 +234,21 @@ public boolean createModuleDirectory(String moduleName) throws IOException { return true; } + private boolean isValidFile(File file) throws IOException { + boolean isValid = true; + if (!file.isFile()) { + isValid = false; + } else if (!CommonUtils.isValidFileName(CommonUtils.getFileNameOnly(file.getName()))) { + isValid = false; + } else if (!isValidFileSize(file)) { + isValid = false; + } + return isValid; + } + + private boolean isValidFileSize(File file) throws IOException { + return Files.size(Paths.get(file.getAbsolutePath())) <= CommonFormat.MAX_FILE_SIZE; + } + } From 18934db6e16f48be96fb5a9e818a1be47663134b Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 19 Oct 2021 19:36:25 +0800 Subject: [PATCH 155/466] Add check for duplicate note name --- .../java/terminus/command/content/note/AddNoteCommand.java | 6 ++++-- src/main/java/terminus/common/Messages.java | 1 + src/main/java/terminus/content/ContentManager.java | 7 +++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/terminus/command/content/note/AddNoteCommand.java b/src/main/java/terminus/command/content/note/AddNoteCommand.java index 2118f8b9ec..c80d1d0e18 100644 --- a/src/main/java/terminus/command/content/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/content/note/AddNoteCommand.java @@ -69,13 +69,15 @@ public void parseArguments(String arguments) throws InvalidArgumentException { * @return CommandResult to indicate the success and additional information about the execution. * @throws IOException when the file to be saved is inaccessible (e.g. file is locked by OS). */ - public CommandResult execute(Ui ui, ModuleManager moduleManager) throws IOException { + public CommandResult execute(Ui ui, ModuleManager moduleManager) throws IOException, InvalidArgumentException { assert getModuleName() != null; TerminusLogger.info("Executing Add Note Command"); NusModule module = moduleManager.getModule(getModuleName()); ContentManager contentManager = module.getContentManager(Note.class); assert contentManager != null; - + if (contentManager.isDuplicateName(name)) { + throw new InvalidArgumentException(Messages.ERROR_MESSAGE_DUPLICATE_NAME); + } contentManager.add(new Note(name, data)); TerminusLogger.info(String.format("Note(\"%s\",\"%s\") has been added", name, data)); ui.printSection(String.format(Messages.MESSAGE_RESPONSE_ADD, CommonFormat.COMMAND_NOTE, name)); diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index c7831781f0..e162c3836f 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -22,6 +22,7 @@ public class Messages { public static final String ERROR_MESSAGE_INVALID_TIME_FORMAT = ERROR_MESSAGE_TAG + "Invalid time format %s."; public static final String ERROR_MESSAGE_INVALID_LINK = ERROR_MESSAGE_TAG + "Invalid link %s."; public static final String ERROR_MESSAGE_INVALID_DAY = ERROR_MESSAGE_TAG + "Invalid day %s."; + public static final String ERROR_MESSAGE_DUPLICATE_NAME = ERROR_MESSAGE_TAG + "Duplicate name found."; public static final String ERROR_FILE_TOO_LARGE = "Unable to read large files."; public static final String ERROR_FILES_NOT_DELETED = "Unable to delete some file."; diff --git a/src/main/java/terminus/content/ContentManager.java b/src/main/java/terminus/content/ContentManager.java index 865c3ef75e..58795e05e8 100644 --- a/src/main/java/terminus/content/ContentManager.java +++ b/src/main/java/terminus/content/ContentManager.java @@ -102,4 +102,11 @@ private boolean isNotValidNumber(int number) { public void purgeData() { this.contents = new ArrayList<>(); } + + public boolean isDuplicateName(String name) { + if (contents.size() < 1) { + return false; + } + return contents.stream().anyMatch(x -> x.getName().equals(name)); + } } From cfec99101a9ee849d237b2019d9d09d6bfbe6ea4 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Tue, 19 Oct 2021 20:35:48 +0800 Subject: [PATCH 156/466] Add Create, Update and Delete for Questions --- .../command/content/QuestionCommand.java | 22 +++++ .../content/question/AddQuestionCommand.java | 98 +++++++++++++++++++ .../java/terminus/common/CommonFormat.java | 4 + src/main/java/terminus/common/Messages.java | 3 + src/main/java/terminus/content/Question.java | 21 ++++ src/main/java/terminus/module/NusModule.java | 5 + .../parser/ModuleWorkspaceCommandParser.java | 2 + .../parser/QuestionCommandParser.java | 32 ++++++ 8 files changed, 187 insertions(+) create mode 100644 src/main/java/terminus/command/content/QuestionCommand.java create mode 100644 src/main/java/terminus/command/content/question/AddQuestionCommand.java create mode 100644 src/main/java/terminus/content/Question.java create mode 100644 src/main/java/terminus/parser/QuestionCommandParser.java diff --git a/src/main/java/terminus/command/content/QuestionCommand.java b/src/main/java/terminus/command/content/QuestionCommand.java new file mode 100644 index 0000000000..07f9354dd4 --- /dev/null +++ b/src/main/java/terminus/command/content/QuestionCommand.java @@ -0,0 +1,22 @@ +package terminus.command.content; + +import terminus.common.CommonFormat; +import terminus.common.Messages; +import terminus.parser.QuestionCommandParser; + +public class QuestionCommand extends InnerModuleCommand { + + public QuestionCommand() { + super(QuestionCommandParser.getInstance()); + } + + @Override + public String getFormat() { + return CommonFormat.COMMAND_QUESTION; + } + + @Override + public String getHelpMessage() { + return Messages.MESSAGE_COMMAND_QUESTION; + } +} diff --git a/src/main/java/terminus/command/content/question/AddQuestionCommand.java b/src/main/java/terminus/command/content/question/AddQuestionCommand.java new file mode 100644 index 0000000000..6e6d58da68 --- /dev/null +++ b/src/main/java/terminus/command/content/question/AddQuestionCommand.java @@ -0,0 +1,98 @@ +package terminus.command.content.question; + +import java.util.ArrayList; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.common.CommonFormat; +import terminus.common.CommonUtils; +import terminus.common.Messages; +import terminus.common.TerminusLogger; +import terminus.content.ContentManager; +import terminus.content.Question; +import terminus.exception.InvalidArgumentException; +import terminus.module.ModuleManager; +import terminus.module.NusModule; +import terminus.ui.Ui; + +public class AddQuestionCommand extends Command { + + private String question; + private String answer; + + private static final int ADD_NOTE_ARGUMENTS = 2; + + @Override + public String getFormat() { + return CommonFormat.COMMAND_ADD_QUESTION_FORMAT; + } + + @Override + public String getHelpMessage() { + return Messages.MESSAGE_COMMAND_ADD; + } + + /** + * Parses the arguments to the AddQuestionCommand object. + * The arguments are attributes for a new Question object. + * + * @param arguments The string arguments to be parsed in to the respective fields. + * @throws InvalidArgumentException when arguments are empty or missing. + */ + @Override + public void parseArguments(String arguments) throws InvalidArgumentException { + TerminusLogger.info("Parsing add question arguments"); + if (CommonUtils.isStringNullOrEmpty(arguments)) { + TerminusLogger.warning("Failed to parse arguments: arguments is empty"); + throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); + } + // Regex to find arguments + ArrayList argArray = CommonUtils.findArguments(arguments); + if (!isValidQuestionsArgument(argArray)) { + throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_MISSING_ARGUMENTS); + } + this.question = argArray.get(0); + this.answer = argArray.get(1); + TerminusLogger.info(String.format("Parsed argument (question = %s, answer = %s) to Add Question Command", + question, answer)); + } + + /** + * Executes the add Question command. + * Prints the relevant response to the Ui and a new Note will be added into the arraylist of Notes. + * + * @param ui The Ui object to send messages to the users. + * @param moduleManager The NusModule contain the ContentManager of all notes and schedules. + * @return CommandResult to indicate the success and additional information about the execution. + */ + public CommandResult execute(Ui ui, ModuleManager moduleManager) { + assert getModuleName() != null; + TerminusLogger.info("Executing Add Question Command"); + NusModule module = moduleManager.getModule(getModuleName()); + ContentManager contentManager = module.getContentManager(Question.class); + assert contentManager != null; + + contentManager.add(new Question(question, answer)); + TerminusLogger.info(String.format("Question (\"%s\",\"%s\") has been added", question, answer)); + ui.printSection(String.format(Messages.MESSAGE_RESPONSE_ADD, CommonFormat.COMMAND_QUESTION, question)); + return new CommandResult(true, false); + } + + /** + * Checks if arguments are non-empty and valid. + * + * @param argArray The command arguments in an array list. + * @return True if the appropriate number of arguments are present, false otherwise. + */ + private boolean isValidQuestionsArgument(ArrayList argArray) { + boolean isValid = true; + if (argArray.size() != ADD_NOTE_ARGUMENTS) { + TerminusLogger.warning(String.format("Failed to find %d arguments: %d arguments found", + ADD_NOTE_ARGUMENTS, argArray.size())); + isValid = false; + } else if (CommonUtils.hasEmptyString(argArray)) { + TerminusLogger.warning("Failed to parse arguments: some arguments found is empty"); + isValid = false; + } + return isValid; + } +} diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index 6185074b8b..4f22be9f62 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -14,6 +14,8 @@ public class CommonFormat { public static final String COMMAND_EXIT = "exit"; public static final String COMMAND_HELP = "help"; public static final String COMMAND_SCHEDULE = "schedule"; + public static final String COMMAND_QUESTION = "question"; + public static final String COMMAND_TEST = "test"; public static final String LOCAL_TIME_FORMAT = "HH:mm"; @@ -22,6 +24,8 @@ public class CommonFormat { public static final String COMMAND_ADD_SCHEDULE_FORMAT = COMMAND_ADD + " \"\" " + "\"\" \"\" \"\""; public static final String COMMAND_ADD_NOTE_FORMAT = COMMAND_ADD + " \"\" \"\""; + public static final String COMMAND_ADD_QUESTION_FORMAT = COMMAND_ADD + " \"\" \"\""; + public static final String COMMAND_TEST_QUESTION_FORMAT = COMMAND_TEST + " {question count}"; public static final String SPACE_DELIMITER = "\\s+"; public static final String COMMAND_MODULE_FORMAT = "module"; diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index 0e3a4078ed..d64760bb3e 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -10,6 +10,8 @@ public class Messages { public static final String MESSAGE_COMMAND_HELP = "Prints the help page."; public static final String MESSAGE_COMMAND_NOTE = "Move to notes workspace."; public static final String MESSAGE_COMMAND_SCHEDULE = "Move to schedules workspace."; + public static final String MESSAGE_COMMAND_QUESTION = "Move to questions workspace."; + public static final String MESSAGE_COMMAND_TEST_QUESTION = "Test yourself with Active Recall."; public static final String MESSAGE_RESPONSE_DELETE = "Your %s on '%s' has been deleted!"; public static final String MESSAGE_RESPONSE_ADD = "Your %s on '%s' has been added!"; @@ -28,6 +30,7 @@ public class Messages { public static final String MAIN_BANNER = "Welcome to TermiNUS!"; public static final String NOTE_BANNER = "You have %d note(s) inside this workspace."; public static final String SCHEDULE_BANNER = "You have %d link(s) in this workspace."; + public static final String QUESTION_BANNER = "You have %d question(s) in this workspace."; public static final String INVALID_ARGUMENT_FORMAT_MESSAGE_EXCEPTION = "%s %s"; public static final String INVALID_ARGUMENT_FORMAT_MESSAGE = "Format: %s"; public static final String MESSAGE_COMMAND_MODULE = "Move to the module workspace"; diff --git a/src/main/java/terminus/content/Question.java b/src/main/java/terminus/content/Question.java new file mode 100644 index 0000000000..53f199c03d --- /dev/null +++ b/src/main/java/terminus/content/Question.java @@ -0,0 +1,21 @@ +package terminus.content; + +public class Question extends Content { + + public static final String TYPE = "Q"; + + private double weight; + + public Question(String question, String answer) { + super(question, answer); + this.weight = 0.5; + } + + public double getWeight() { + return weight; + } + + public void setWeight(double weight) { + this.weight = weight; + } +} diff --git a/src/main/java/terminus/module/NusModule.java b/src/main/java/terminus/module/NusModule.java index 2dfa1e580f..63dc5545bb 100644 --- a/src/main/java/terminus/module/NusModule.java +++ b/src/main/java/terminus/module/NusModule.java @@ -5,6 +5,7 @@ import terminus.content.ContentManager; import terminus.content.Link; import terminus.content.Note; +import terminus.content.Question; /** * NusModule class to represent a Module object. @@ -13,6 +14,7 @@ public class NusModule { private final ContentManager noteManager; private final ContentManager linkManager; + private final ContentManager questionManager; /** * Creates a NusModule object. @@ -20,6 +22,7 @@ public class NusModule { public NusModule() { noteManager = new ContentManager<>(); linkManager = new ContentManager<>(); + questionManager = new ContentManager<>(); } /** @@ -36,6 +39,8 @@ public ContentManager getContentManager(Class type) { result = (ContentManager) this.noteManager; } else if (type == Link.class) { result = (ContentManager) this.linkManager; + } else if (type == Question.class) { + result = (ContentManager) this.questionManager; } else { // Fatal error encountered TerminusLogger.severe(String.format("Class type provided not found: %s", type)); diff --git a/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java b/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java index 62118f329c..16bb2888db 100644 --- a/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java +++ b/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java @@ -3,6 +3,7 @@ import terminus.command.BackCommand; import terminus.command.Command; import terminus.command.content.NotesCommand; +import terminus.command.content.QuestionCommand; import terminus.command.content.ScheduleCommand; import terminus.common.CommonFormat; import terminus.exception.InvalidArgumentException; @@ -25,6 +26,7 @@ public static ModuleWorkspaceCommandParser getInstance() { parser.addCommand(CommonFormat.COMMAND_BACK, new BackCommand()); parser.addCommand(CommonFormat.COMMAND_NOTE, new NotesCommand()); parser.addCommand(CommonFormat.COMMAND_SCHEDULE, new ScheduleCommand()); + parser.addCommand(CommonFormat.COMMAND_QUESTION, new QuestionCommand()); return parser; } diff --git a/src/main/java/terminus/parser/QuestionCommandParser.java b/src/main/java/terminus/parser/QuestionCommandParser.java new file mode 100644 index 0000000000..2d34028fc5 --- /dev/null +++ b/src/main/java/terminus/parser/QuestionCommandParser.java @@ -0,0 +1,32 @@ +package terminus.parser; + +import terminus.command.BackCommand; +import terminus.command.content.DeleteCommand; +import terminus.command.content.ViewCommand; +import terminus.command.content.question.AddQuestionCommand; +import terminus.common.CommonFormat; +import terminus.common.Messages; +import terminus.content.Question; +import terminus.module.ModuleManager; + +public class QuestionCommandParser extends InnerModuleCommandParser { + + public QuestionCommandParser() { + super(CommonFormat.COMMAND_QUESTION); + } + + public static QuestionCommandParser getInstance() { + QuestionCommandParser parser = new QuestionCommandParser(); + parser.addCommand(CommonFormat.COMMAND_BACK, new BackCommand()); + parser.addCommand(CommonFormat.COMMAND_ADD, new AddQuestionCommand()); + parser.addCommand(CommonFormat.COMMAND_VIEW, new ViewCommand<>(Question.class)); + parser.addCommand(CommonFormat.COMMAND_DELETE, new DeleteCommand<>(Question.class)); + return parser; + } + + @Override + public String getWorkspaceBanner(ModuleManager moduleManager) { + return String.format(Messages.QUESTION_BANNER, + moduleManager.getModule(getModuleName()).getContentManager(Question.class).getContents().size()); + } +} From c80f391f7545b50f63596de34ba09e9b658d08cb Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Tue, 19 Oct 2021 20:42:25 +0800 Subject: [PATCH 157/466] Enable assertions in gradle --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5ed27f919c..a2c7ee3f58 100644 --- a/build.gradle +++ b/build.gradle @@ -42,6 +42,7 @@ checkstyle { toolVersion = '8.23' } -run{ +run { standardInput = System.in + enableAssertions = true } From 937eb7b7e887345740b145dd0d3a086e8c76d997 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 19 Oct 2021 21:30:30 +0800 Subject: [PATCH 158/466] Fix file data to accept any characters even non-ascii --- src/main/java/terminus/storage/ModuleStorage.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 02e338e89f..3ee5fc0cbe 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -12,7 +12,6 @@ import java.nio.file.Paths; import java.util.ArrayList; import java.util.Comparator; -import javax.imageio.IIOException; import terminus.common.CommonFormat; import terminus.common.CommonUtils; import terminus.common.Messages; @@ -131,8 +130,7 @@ private void loadAllNotes(ModuleManager moduleManager) throws IOException { * @throws IOException When the file is inaccessible (e.g. file is locked by OS). */ public void loadNotesFromModule(ModuleManager moduleManager, String mod) throws IOException { - Path modDirPath; - modDirPath = Paths.get(filePath.getParent().toString(), mod); + Path modDirPath = Paths.get(filePath.getParent().toString(), mod); File folder = new File(modDirPath.toString()); assert folder != null; File[] listOfFiles = folder.listFiles(); @@ -141,9 +139,8 @@ public void loadNotesFromModule(ModuleManager moduleManager, String mod) throws for (File file : listOfFiles) { if (isValidFile(file)) { contentManager.add(new Note(CommonUtils.getFileNameOnly(file.getName()), - Files.readString(Paths.get(file.getAbsolutePath()), StandardCharsets.US_ASCII))); + Files.readString(Paths.get(file.getAbsolutePath())))); } - } } From 081820acb88e219e8ad86f6d3ebf345a0e59bf9d Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 19 Oct 2021 21:34:17 +0800 Subject: [PATCH 159/466] Fix indentation and class name change --- src/main/java/terminus/Terminus.java | 8 ++++---- src/test/java/terminus/common/CommonUtilsTest.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 3165856eac..84d9af4640 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -19,10 +19,10 @@ public class Terminus { public static final String[] INVALID_JSON_MESSAGE = { - "Invalid file data detected.", - "TermiNUS will still run, but the file will be overwritten when the next command is ran.", - "To save your current file, close your terminal (do not run exit).", - "Otherwise, you can continue using the program :)" + "Invalid file data detected.", + "TermiNUS will still run, but the file will be overwritten when the next command is ran.", + "To save your current file, close your terminal (do not run exit).", + "Otherwise, you can continue using the program :)" }; private Ui ui; private CommandParser parser; diff --git a/src/test/java/terminus/common/CommonUtilsTest.java b/src/test/java/terminus/common/CommonUtilsTest.java index 19ef00868c..17f42ce53a 100644 --- a/src/test/java/terminus/common/CommonUtilsTest.java +++ b/src/test/java/terminus/common/CommonUtilsTest.java @@ -13,7 +13,7 @@ import terminus.content.Note; import terminus.exception.InvalidArgumentException; -public class CommonFormatTest { +public class CommonUtilsTest { private ArrayList resultExpected; From c4bc66d7f560d18f5dff6b486238dd06726f2f8d Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 19 Oct 2021 22:33:18 +0800 Subject: [PATCH 160/466] Add javadocs to new methods --- .../command/module/DeleteModuleCommand.java | 3 +- .../java/terminus/storage/ModuleStorage.java | 84 ++++++++++++++----- 2 files changed, 66 insertions(+), 21 deletions(-) diff --git a/src/main/java/terminus/command/module/DeleteModuleCommand.java b/src/main/java/terminus/command/module/DeleteModuleCommand.java index eaca3dae66..b49ce70a82 100644 --- a/src/main/java/terminus/command/module/DeleteModuleCommand.java +++ b/src/main/java/terminus/command/module/DeleteModuleCommand.java @@ -63,6 +63,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { * @return The CommandResult object indicating the success of failure including additional options. * @throws InvalidCommandException when the command could not be found. * @throws InvalidArgumentException when arguments parsing fails. + * @throws IOException when files to be deleted is inaccessible (e.g. file is locked by OS). */ @Override public CommandResult execute(Ui ui, ModuleManager moduleManager) @@ -75,7 +76,7 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) // Delete all files and then its folder ModuleStorage moduleStorage = ModuleStorage.getInstance(); - moduleStorage.cleanAfterDeleteModule(moduleManager, listOfModule[itemNumber - 1]); + moduleStorage.cleanAfterDeleteModule(listOfModule[itemNumber - 1]); ui.printSection(String.format(Messages.MESSAGE_RESPONSE_MODULE_DELETE, listOfModule[itemNumber - 1])); return new CommandResult(true); diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 3ee5fc0cbe..9261a1027f 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -3,10 +3,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import java.io.File; -import java.io.FileWriter; import java.io.IOException; -import java.io.PrintWriter; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -41,10 +38,20 @@ public ModuleStorage(Path filePath) { moduleStorage = this; } + /** + * Returns the singleton object of ModuleStorage. + * + * @return ModuleStorage object of current session. + */ public static ModuleStorage getInstance() { return moduleStorage; } + /** + * Creates main data folder and main JSON object containing TermiNUS information. + * + * @throws IOException When the file is inaccessible (e.g. file is locked by OS). + */ private void initializeFile() throws IOException { assert filePath != null : "filePath should not be null"; if (!Files.isDirectory(filePath.getParent())) { @@ -61,8 +68,8 @@ private void initializeFile() throws IOException { } /** - * Loads a JSON file and parses it as a NusModule object based on GSON. Returns null if the file does not exist or - * the file is not in a valid format. + * Loads a JSON file and parses it as a ModuleManager object based on GSON followed by loading all notes content. + * Returns null if the file does not exist or the file is not in a valid format. * * @return NusModule based on the contents of the file. * @throws IOException When the file is inaccessible (e.g. file is locked by OS). @@ -75,6 +82,7 @@ public ModuleManager loadFile() throws IOException { } TerminusLogger.info("Decoding JSON to object"); ModuleManager moduleManager = gson.fromJson(Files.newBufferedReader(filePath), ModuleManager.class); + TerminusLogger.info("Loading notes content into ModuleManager"); loadAllNotes(moduleManager); return moduleManager; } @@ -90,7 +98,7 @@ public void saveFile(ModuleManager moduleManager) throws IOException { throw new NullPointerException("module cannot be null!"); } initializeFile(); - TerminusLogger.info("Converting NusModule object into String..."); + TerminusLogger.info("Converting ModuleManager object into String..."); String jsonString = gson.toJson(moduleManager); TerminusLogger.info("String conversion completed."); TerminusLogger.info(String.format("Writing to file: %s", filePath.toString())); @@ -110,13 +118,17 @@ private void loadAllNotes(ModuleManager moduleManager) throws IOException { modDirPath = Paths.get(filePath.getParent().toString(), mod); // Check if module name is a valid module and file name if (!CommonUtils.isValidFileName(mod) || !mod.matches(CommonFormat.SPACE_NEGATED_DELIMITER)) { + // Skip this module and remove from moduleManager + TerminusLogger.warning(String.format("Invalid module name detected: %s", mod)); moduleManager.removeModule(mod); continue; } - // Check if directory does not exist proceed to create directory, retrieve notes otherwise. - if (!Files.isDirectory(modDirPath)) { + // Check if directory does not exist and proceed to create directory, otherwise retrieve notes. + if (Files.notExists(modDirPath)) { + TerminusLogger.info("Creating directory: " + modDirPath); Files.createDirectories(modDirPath); } else { + // Load its notes file data if there is any. loadNotesFromModule(moduleManager, mod); } } @@ -138,8 +150,11 @@ public void loadNotesFromModule(ModuleManager moduleManager, String mod) throws contentManager.purgeData(); for (File file : listOfFiles) { if (isValidFile(file)) { + TerminusLogger.info(String.format("Loading note file %s.", file.getAbsolutePath())); contentManager.add(new Note(CommonUtils.getFileNameOnly(file.getName()), Files.readString(Paths.get(file.getAbsolutePath())))); + } else { + TerminusLogger.info(String.format("File %s is not a valid note file.", file.getAbsolutePath())); } } } @@ -164,13 +179,20 @@ public void saveAllNotes(ModuleManager moduleManager) throws IOException { * @throws IOException When the file is inaccessible (e.g. file is locked by OS). */ public void saveNotesFromModule(ModuleManager moduleManager, String mod) throws IOException { - Path modDirPath; - modDirPath = Paths.get(filePath.getParent().toString(), mod); + Path modDirPath = Paths.get(filePath.getParent().toString(), mod); assert CommonUtils.isValidFileName(mod); - if (!Files.isDirectory(modDirPath)) { + // Create module folder if it is missing. + if (Files.notExists(modDirPath)) { + TerminusLogger.info("Creating directory: " + modDirPath); Files.createDirectories(modDirPath); } + + // Remove all files within the folder, used when notes have been deleted. + TerminusLogger.info("Removing files from directory: " + modDirPath); deleteAllFilesInDirectory(modDirPath); + + // Write to its specific note files. + TerminusLogger.info("Adding note files into directory: " + modDirPath); ContentManager contentManager = moduleManager.getModule(mod).getContentManager(Note.class); ArrayList noteArrayList = contentManager.getContents(); for (Note note : noteArrayList) { @@ -178,6 +200,7 @@ public void saveNotesFromModule(ModuleManager moduleManager, String mod) throws assert CommonUtils.isValidFileName(note.getName()); Path filePath = Paths.get(modDirPath.toString(), note.getName() + CommonFormat.EXTENSION_TEXT_FILE); Files.writeString(filePath, note.getData()); + TerminusLogger.info("Added file: " + filePath); } } @@ -190,42 +213,63 @@ private void deleteAllFilesInDirectory(Path directoryPath) throws IOException { File folder = new File(directoryPath.toString()); File[] listOfFiles = folder.listFiles(); for (File file : listOfFiles) { - cleanIncorrectItem(file); + cleanAllFilesInclusive(file); if (file.exists()) { throw new IOException(Messages.ERROR_FILES_NOT_DELETED); } } } - public void cleanAfterDeleteModule(ModuleManager moduleManager, String mod) throws IOException { + /** + * Deletes all files from the deleted module folder. + * + * @param mod A module name in the moduleManager. + * @throws IOException When the file is inaccessible (e.g. file is locked by OS). + */ + public void cleanAfterDeleteModule(String mod) throws IOException { + TerminusLogger.info("Cleaning up deleted modules."); Path modDirPath = Paths.get(filePath.getParent().toString(), mod); - if (!Files.isDirectory(modDirPath)) { - // Directory does not exist yet, due to the fact that no note was added yet. + if (Files.notExists(modDirPath)) { + TerminusLogger.info("Directory does not exists: " + modDirPath); return; } File folder = new File(modDirPath.toString()); - cleanIncorrectItem(folder); + cleanAllFilesInclusive(folder); if (folder.exists()) { throw new IOException(Messages.ERROR_FILES_NOT_DELETED); } } - private void cleanIncorrectItem(File file) throws IOException { + /** + * Deletes all files within itself and itself from a specified file. + * + * @param file The file to be deleted. + * @throws IOException When the file is inaccessible (e.g. file is locked by OS). + */ + private void cleanAllFilesInclusive(File file) throws IOException { Files.walk(Paths.get(file.getAbsolutePath())) .sorted(Comparator.reverseOrder()) .map(Path::toFile) .forEach(File::delete); } + /** + * Creates a module directory and checks if directory is empty. + * + * @param moduleName The name of the directory to be created. + * @return True if the directory created is empty. + * @throws IOException When the file is inaccessible (e.g. file is locked by OS). + */ public boolean createModuleDirectory(String moduleName) throws IOException { assert moduleName != null; assert CommonUtils.isValidFileName(moduleName); assert moduleName.matches(CommonFormat.SPACE_NEGATED_DELIMITER); Path modDirPath = Paths.get(filePath.getParent().toString(), moduleName); - if (!Files.isDirectory(modDirPath)) { + if (Files.notExists(modDirPath)) { + TerminusLogger.info("Creating directory: " + modDirPath); Files.createDirectories(modDirPath); } else { - // Nuke existing file + TerminusLogger.info("Removing files from directory: " + modDirPath); deleteAllFilesInDirectory(modDirPath); } return true; @@ -233,7 +277,7 @@ public boolean createModuleDirectory(String moduleName) throws IOException { private boolean isValidFile(File file) throws IOException { boolean isValid = true; - if (!file.isFile()) { + if (!Files.isReadable(Paths.get(file.getAbsolutePath()))) { isValid = false; } else if (!CommonUtils.isValidFileName(CommonUtils.getFileNameOnly(file.getName()))) { isValid = false; From 3377683353d08bc1b2b5cb45885d910bc77b1dcb Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Tue, 19 Oct 2021 23:58:32 +0800 Subject: [PATCH 161/466] Add and fix JUnit test for note file system --- src/test/java/terminus/TestFilePath.java | 10 +++ .../terminus/command/ExitCommandTest.java | 3 +- .../java/terminus/command/GoCommandTest.java | 19 ++++- .../terminus/command/HelpCommandTest.java | 3 +- .../terminus/command/ModuleCommandTest.java | 15 +++- .../terminus/command/NoteCommandTest.java | 18 ++++- .../terminus/command/ScheduleCommandTest.java | 3 +- .../content/link/AddLinkCommandTest.java | 3 +- .../content/link/BackLinkCommandTest.java | 3 +- .../content/link/DeleteLinkCommandTest.java | 3 +- .../content/link/ViewLinkCommandTest.java | 7 +- .../content/note/AddNoteCommandTest.java | 76 +++++++++++++++++-- .../content/note/BackNoteCommandTest.java | 3 +- .../content/note/DeleteNoteCommandTest.java | 19 ++++- .../content/note/ViewNoteCommandTest.java | 27 +++++-- .../command/module/AddModuleCommandTest.java | 14 +++- .../module/DeleteModuleCommandTest.java | 17 ++++- .../command/module/ViewModuleCommandTest.java | 3 +- .../parser/NoteCommandParserTest.java | 1 - .../terminus/storage/ModuleStorageTest.java | 21 +++-- src/test/resources/saveFile.json | 8 -- src/test/resources/validFile.json | 8 -- 22 files changed, 225 insertions(+), 59 deletions(-) create mode 100644 src/test/java/terminus/TestFilePath.java diff --git a/src/test/java/terminus/TestFilePath.java b/src/test/java/terminus/TestFilePath.java new file mode 100644 index 0000000000..20b4903fbd --- /dev/null +++ b/src/test/java/terminus/TestFilePath.java @@ -0,0 +1,10 @@ +package terminus; + +import java.nio.file.Path; + +public class TestFilePath { + public static final Path RESOURCE_FOLDER = Path.of("src", "test", "resources"); + public static final Path SAVE_FILE = RESOURCE_FOLDER.resolve("saveFile.json"); + public static final Path MALFORMED_FILE = RESOURCE_FOLDER.resolve("malformedFile.json"); + public static final Path VALID_FILE = RESOURCE_FOLDER.resolve("validFile.json"); +} diff --git a/src/test/java/terminus/command/ExitCommandTest.java b/src/test/java/terminus/command/ExitCommandTest.java index 89733af3cd..16eb0acef4 100644 --- a/src/test/java/terminus/command/ExitCommandTest.java +++ b/src/test/java/terminus/command/ExitCommandTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.common.CommonFormat; @@ -28,7 +29,7 @@ void setUp() { } @Test - void execute_success() throws InvalidArgumentException, InvalidCommandException { + void execute_success() throws InvalidArgumentException, InvalidCommandException, IOException { Command exitCommand = commandParser.parseCommand(CommonFormat.COMMAND_EXIT); CommandResult mainResult = exitCommand.execute(ui, moduleManager); assertTrue(mainResult.isOk() && mainResult.isExit()); diff --git a/src/test/java/terminus/command/GoCommandTest.java b/src/test/java/terminus/command/GoCommandTest.java index cb2eaf7d1e..2834ef8b3e 100644 --- a/src/test/java/terminus/command/GoCommandTest.java +++ b/src/test/java/terminus/command/GoCommandTest.java @@ -4,8 +4,11 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import terminus.TestFilePath; import terminus.content.Link; import terminus.content.Note; import terminus.exception.InvalidArgumentException; @@ -15,6 +18,7 @@ import terminus.parser.MainCommandParser; import terminus.parser.ModuleWorkspaceCommandParser; import terminus.parser.NoteCommandParser; +import terminus.storage.ModuleStorage; import terminus.ui.Ui; public class GoCommandTest { @@ -22,19 +26,28 @@ public class GoCommandTest { private MainCommandParser commandParser; private ModuleManager moduleManager; private Ui ui; + private ModuleStorage moduleStorage; private String tempModule = "test"; @BeforeEach - void setUp() { + void setUp() throws IOException { + this.moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + this.moduleStorage.createModuleDirectory(tempModule); this.commandParser = MainCommandParser.getInstance(); this.moduleManager = new ModuleManager(); moduleManager.setModule(tempModule); this.ui = new Ui(); } + @AfterAll + static void reset() throws IOException { + ModuleStorage moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + moduleStorage.cleanAfterDeleteModule("test"); + } + @Test - void execute_go_success() throws InvalidArgumentException, InvalidCommandException { + void execute_go_success() throws InvalidArgumentException, InvalidCommandException, IOException { Command cmd = commandParser.parseCommand("go " + tempModule); CommandResult cmdResult = cmd.execute(ui, moduleManager); assertTrue(cmdResult.isOk()); @@ -48,7 +61,7 @@ void execute_go_throwsException() throws InvalidArgumentException, InvalidComman } @Test - void execute_goAdvance_success() throws InvalidArgumentException, InvalidCommandException { + void execute_goAdvance_success() throws InvalidArgumentException, InvalidCommandException, IOException { Command cmd = commandParser.parseCommand("go " + tempModule + " note"); CommandResult cmdResult = cmd.execute(ui, moduleManager); assertTrue(cmdResult.isOk()); diff --git a/src/test/java/terminus/command/HelpCommandTest.java b/src/test/java/terminus/command/HelpCommandTest.java index 326cfb2eca..d9039b7806 100644 --- a/src/test/java/terminus/command/HelpCommandTest.java +++ b/src/test/java/terminus/command/HelpCommandTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.exception.InvalidArgumentException; @@ -38,7 +39,7 @@ void setUp() { } @Test - void execute_helpCommand_success() throws InvalidArgumentException, InvalidCommandException { + void execute_helpCommand_success() throws InvalidArgumentException, InvalidCommandException, IOException { CommandResult result = mainCommandParser.parseCommand("help").execute(ui, moduleManager); assertTrue(result.isOk()); result = noteCommandParser.parseCommand("help").execute(ui, moduleManager); diff --git a/src/test/java/terminus/command/ModuleCommandTest.java b/src/test/java/terminus/command/ModuleCommandTest.java index 640be1a6f9..349dafc6ec 100644 --- a/src/test/java/terminus/command/ModuleCommandTest.java +++ b/src/test/java/terminus/command/ModuleCommandTest.java @@ -4,33 +4,44 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import terminus.TestFilePath; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; import terminus.parser.MainCommandParser; import terminus.parser.ModuleCommandParser; +import terminus.storage.ModuleStorage; import terminus.ui.Ui; public class ModuleCommandTest { private MainCommandParser commandParser; private Ui ui; - + private ModuleStorage moduleStorage; private ModuleManager moduleManager; private String tempModule = "test"; @BeforeEach void setUp() { + this.moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); commandParser = MainCommandParser.getInstance(); moduleManager = new ModuleManager(); ui = new Ui(); } + @AfterAll + static void reset() throws IOException { + ModuleStorage moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + moduleStorage.cleanAfterDeleteModule("test"); + } + @Test - void execute_module_success() throws InvalidArgumentException, InvalidCommandException { + void execute_module_success() throws InvalidArgumentException, InvalidCommandException, IOException { Command cmd = commandParser.parseCommand("module"); CommandResult cmdResult = cmd.execute(ui, moduleManager); assertTrue(cmdResult.isOk()); diff --git a/src/test/java/terminus/command/NoteCommandTest.java b/src/test/java/terminus/command/NoteCommandTest.java index 37f0c1d834..12b44bbdd6 100644 --- a/src/test/java/terminus/command/NoteCommandTest.java +++ b/src/test/java/terminus/command/NoteCommandTest.java @@ -4,35 +4,47 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import terminus.TestFilePath; import terminus.content.Note; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; import terminus.parser.MainCommandParser; import terminus.parser.NoteCommandParser; +import terminus.storage.ModuleStorage; import terminus.ui.Ui; public class NoteCommandTest { private MainCommandParser commandParser; private Ui ui; - private ModuleManager moduleManager; + private ModuleStorage moduleStorage; private String tempModule = "test"; @BeforeEach - void setUp() { + void setUp() throws IOException { + this.moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + this.moduleStorage.createModuleDirectory(tempModule); commandParser = MainCommandParser.getInstance(); moduleManager = new ModuleManager(); moduleManager.setModule(tempModule); ui = new Ui(); } + @AfterAll + static void reset() throws IOException { + ModuleStorage moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + moduleStorage.cleanAfterDeleteModule("test"); + } + @Test - void execute_scheduleAdvance_success() throws InvalidArgumentException, InvalidCommandException { + void execute_scheduleAdvance_success() throws InvalidArgumentException, InvalidCommandException, IOException { Command mainCommand = commandParser.parseCommand("go " + tempModule + " note"); CommandResult changeResult = mainCommand.execute(ui, moduleManager); assertTrue(changeResult.isOk()); diff --git a/src/test/java/terminus/command/ScheduleCommandTest.java b/src/test/java/terminus/command/ScheduleCommandTest.java index 8328ffcdeb..3853a61572 100644 --- a/src/test/java/terminus/command/ScheduleCommandTest.java +++ b/src/test/java/terminus/command/ScheduleCommandTest.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.content.Link; @@ -31,7 +32,7 @@ void setUp() { } @Test - void execute_linkAdvance_success() throws InvalidArgumentException, InvalidCommandException { + void execute_linkAdvance_success() throws InvalidArgumentException, InvalidCommandException, IOException { Command mainCommand = commandParser.parseCommand("go " + tempModule + " schedule"); CommandResult changeResult = mainCommand.execute(ui, moduleManager); assertTrue(changeResult.isOk()); diff --git a/src/test/java/terminus/command/content/link/AddLinkCommandTest.java b/src/test/java/terminus/command/content/link/AddLinkCommandTest.java index a31f69efa9..39e3274136 100644 --- a/src/test/java/terminus/command/content/link/AddLinkCommandTest.java +++ b/src/test/java/terminus/command/content/link/AddLinkCommandTest.java @@ -3,6 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; import java.util.ArrayList; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -46,7 +47,7 @@ void parseArguments_addLinkCommand_success() { } @Test - void execute_addLinkCommand_success() throws InvalidCommandException, InvalidArgumentException { + void execute_addLinkCommand_success() throws InvalidCommandException, InvalidArgumentException, IOException { Command addLinkCommand = linkCommandParser.parseCommand("add \"test\" \"Monday\" \"00:00\" \"https://zoom.us/test\""); CommandResult addResult = addLinkCommand.execute(ui, moduleManager); assertTrue(addResult.isOk()); diff --git a/src/test/java/terminus/command/content/link/BackLinkCommandTest.java b/src/test/java/terminus/command/content/link/BackLinkCommandTest.java index 6fdf37ea8c..e17fc5718b 100644 --- a/src/test/java/terminus/command/content/link/BackLinkCommandTest.java +++ b/src/test/java/terminus/command/content/link/BackLinkCommandTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.command.Command; @@ -32,7 +33,7 @@ void setUp() { } @Test - void execute_success() throws InvalidCommandException, InvalidArgumentException { + void execute_success() throws InvalidCommandException, InvalidArgumentException, IOException { Command backCommand = linkCommandParser.parseCommand("back"); CommandResult backResult = backCommand.execute(ui, moduleManager); assertTrue(backResult.isOk()); diff --git a/src/test/java/terminus/command/content/link/DeleteLinkCommandTest.java b/src/test/java/terminus/command/content/link/DeleteLinkCommandTest.java index 60133b91e4..863d7138f5 100644 --- a/src/test/java/terminus/command/content/link/DeleteLinkCommandTest.java +++ b/src/test/java/terminus/command/content/link/DeleteLinkCommandTest.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.command.Command; @@ -35,7 +36,7 @@ void setUp() { } @Test - void execute_deleteLink_success() throws InvalidCommandException, InvalidArgumentException { + void execute_deleteLink_success() throws InvalidCommandException, InvalidArgumentException, IOException { for (int i = 0; i < 3; i++) { Command addLinkCommand = linkCommandParser.parseCommand("add \"test_desc\" \"Monday\" \"12:00\" \"https://zoom.us/test\""); CommandResult addResult = addLinkCommand.execute(ui, moduleManager); diff --git a/src/test/java/terminus/command/content/link/ViewLinkCommandTest.java b/src/test/java/terminus/command/content/link/ViewLinkCommandTest.java index d51d7ac57c..ef977969cb 100644 --- a/src/test/java/terminus/command/content/link/ViewLinkCommandTest.java +++ b/src/test/java/terminus/command/content/link/ViewLinkCommandTest.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.command.Command; @@ -35,7 +36,7 @@ void setUp() { } @Test - void execute_viewAll_success() throws InvalidCommandException, InvalidArgumentException { + void execute_viewAll_success() throws InvalidCommandException, InvalidArgumentException, IOException { for (int i = 0; i < 5; i++) { Command addLinkCommand = linkCommandParser.parseCommand( "add \"test\" \"Saturday\" \"00:00\" \"https://zoom.us/test\""); @@ -50,7 +51,7 @@ void execute_viewAll_success() throws InvalidCommandException, InvalidArgumentEx } @Test - void execute_viewLink_success() throws InvalidCommandException, InvalidArgumentException { + void execute_viewLink_success() throws InvalidCommandException, InvalidArgumentException, IOException { for (int i = 0; i < 5; i++) { Command addLinkCommand = linkCommandParser.parseCommand( "add \"test\" \"Saturday\" \"00:00\" \"https://zoom.us/test\""); @@ -69,7 +70,7 @@ void execute_viewLink_success() throws InvalidCommandException, InvalidArgumentE } @Test - void execute_viewLink_exceptionThrown() throws InvalidCommandException, InvalidArgumentException { + void execute_viewLink_exceptionThrown() throws InvalidCommandException, InvalidArgumentException, IOException { for (int i = 0; i < 5; i++) { Command addLinkCommand = linkCommandParser.parseCommand( "add \"test\" \"Saturday\" \"00:00\" \"https://zoom.us/test\""); diff --git a/src/test/java/terminus/command/content/note/AddNoteCommandTest.java b/src/test/java/terminus/command/content/note/AddNoteCommandTest.java index f25bee26bb..70578e6a5a 100644 --- a/src/test/java/terminus/command/content/note/AddNoteCommandTest.java +++ b/src/test/java/terminus/command/content/note/AddNoteCommandTest.java @@ -1,10 +1,15 @@ package terminus.command.content.note; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import terminus.TestFilePath; import terminus.command.Command; import terminus.command.CommandResult; import terminus.content.Note; @@ -12,6 +17,7 @@ import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; import terminus.parser.NoteCommandParser; +import terminus.storage.ModuleStorage; import terminus.ui.Ui; public class AddNoteCommandTest { @@ -19,13 +25,17 @@ public class AddNoteCommandTest { private NoteCommandParser commandParser; private ModuleManager moduleManager; private Ui ui; + private ModuleStorage moduleStorage; + private String tempModule = "test"; Class type = Note.class; @BeforeEach - void setUp() { + void setUp() throws IOException { + this.moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + this.moduleStorage.createModuleDirectory(tempModule); this.moduleManager = new ModuleManager(); moduleManager.setModule(tempModule); this.commandParser = NoteCommandParser.getInstance(); @@ -33,19 +43,75 @@ void setUp() { this.ui = new Ui(); } + @AfterAll + static void reset() throws IOException { + ModuleStorage moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + moduleStorage.cleanAfterDeleteModule("test"); + } + @Test - void execute_success() throws InvalidCommandException, InvalidArgumentException { + void execute_success() throws InvalidCommandException, InvalidArgumentException, IOException { Command addCommand = commandParser.parseCommand("add \"test\" \"test1\""); CommandResult addResult = addCommand.execute(ui, moduleManager); assertTrue(addResult.isOk()); assertEquals(1, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); assertTrue(moduleManager.getModule(tempModule).getContentManager(type).getContentData(1).contains("test")); assertTrue(moduleManager.getModule(tempModule).getContentManager(type).getContentData(1).contains("test1")); + } + + @Test + void execute_success_multipleNotes() throws InvalidArgumentException, InvalidCommandException, IOException { for (int i = 0; i < 5; i++) { - addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); - addResult = addCommand.execute(ui, moduleManager); + Command addCommand = commandParser.parseCommand("add \"test" + i + "\" \"test" + i + "\""); + CommandResult addResult = addCommand.execute(ui, moduleManager); assertTrue(addResult.isOk()); } - assertEquals(6, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); + assertEquals(5, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); + } + + @Test + void execute_duplicateNoteName_exceptionThrown() throws InvalidArgumentException, InvalidCommandException, + IOException { + Command addCommand = commandParser.parseCommand("add \"test\" \"test\""); + CommandResult addResult = addCommand.execute(ui, moduleManager); + for (int i = 1; i < 5; i++) { + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("add \"test\" \"test\"").execute(ui, moduleManager)); + } + assertEquals(1, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); + } + + @Test + void execute_illegalNoteName_exceptionThrown() { + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("add \"\\uD83D\\uDC76 \" \"test\"").execute(ui, moduleManager)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("add \".......\" \"test\"").execute(ui, moduleManager)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("add \" test \" \"test\"").execute(ui, moduleManager)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("add \"\" \"test\"").execute(ui, moduleManager)); + String s = "a".repeat(31); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("add \"" + s + "\" \"test\"").execute(ui, moduleManager)); + } + + @Test + void execute_invalidArguments_exceptionThrown() { + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("add \" \"test\"").execute(ui, moduleManager)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("add \"t\" \"\"").execute(ui, moduleManager)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("add \"\" \"test\"").execute(ui, moduleManager)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("add \"test\" \"test\"\"\"").execute(ui, moduleManager)); + } + + @Test + void execute_longNoteData_exceptionThrown() { + String s = "a".repeat(1000001); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("add \"test\" \"" + s + "\"").execute(ui, moduleManager)); } } diff --git a/src/test/java/terminus/command/content/note/BackNoteCommandTest.java b/src/test/java/terminus/command/content/note/BackNoteCommandTest.java index a0d2899dab..e779a53fde 100644 --- a/src/test/java/terminus/command/content/note/BackNoteCommandTest.java +++ b/src/test/java/terminus/command/content/note/BackNoteCommandTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.command.Command; @@ -31,7 +32,7 @@ void setUp() { } @Test - void execute_success() throws InvalidCommandException, InvalidArgumentException { + void execute_success() throws InvalidCommandException, InvalidArgumentException, IOException { Command backCommand = commandParser.parseCommand("back"); CommandResult backResult = backCommand.execute(ui, moduleManager); assertTrue(backResult.isOk()); diff --git a/src/test/java/terminus/command/content/note/DeleteNoteCommandTest.java b/src/test/java/terminus/command/content/note/DeleteNoteCommandTest.java index adc46f9667..02dbd572e7 100644 --- a/src/test/java/terminus/command/content/note/DeleteNoteCommandTest.java +++ b/src/test/java/terminus/command/content/note/DeleteNoteCommandTest.java @@ -4,8 +4,11 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import terminus.TestFilePath; import terminus.command.Command; import terminus.command.CommandResult; import terminus.content.Note; @@ -13,6 +16,7 @@ import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; import terminus.parser.NoteCommandParser; +import terminus.storage.ModuleStorage; import terminus.ui.Ui; public class DeleteNoteCommandTest { @@ -20,13 +24,16 @@ public class DeleteNoteCommandTest { private NoteCommandParser commandParser; private ModuleManager moduleManager; private Ui ui; + private ModuleStorage moduleStorage; private String tempModule = "test"; Class type = Note.class; @BeforeEach - void setUp() { + void setUp() throws IOException { + this.moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + this.moduleStorage.createModuleDirectory(tempModule); this.moduleManager = new ModuleManager(); moduleManager.setModule(tempModule); this.commandParser = NoteCommandParser.getInstance(); @@ -34,10 +41,16 @@ void setUp() { this.ui = new Ui(); } + @AfterAll + static void reset() throws IOException { + ModuleStorage moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + moduleStorage.cleanAfterDeleteModule("test"); + } + @Test - void execute_success() throws InvalidCommandException, InvalidArgumentException { + void execute_success() throws InvalidCommandException, InvalidArgumentException, IOException { for (int i = 0; i < 5; i++) { - Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); + Command addCommand = commandParser.parseCommand("add \"test" + i + "\" \"test" + i + "\""); CommandResult addResult = addCommand.execute(ui, moduleManager); assertTrue(addResult.isOk()); } diff --git a/src/test/java/terminus/command/content/note/ViewNoteCommandTest.java b/src/test/java/terminus/command/content/note/ViewNoteCommandTest.java index 749c96f1c3..513f53a6b1 100644 --- a/src/test/java/terminus/command/content/note/ViewNoteCommandTest.java +++ b/src/test/java/terminus/command/content/note/ViewNoteCommandTest.java @@ -4,8 +4,11 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import terminus.TestFilePath; import terminus.command.Command; import terminus.command.CommandResult; import terminus.content.Note; @@ -13,6 +16,7 @@ import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; import terminus.parser.NoteCommandParser; +import terminus.storage.ModuleStorage; import terminus.ui.Ui; public class ViewNoteCommandTest { @@ -20,13 +24,16 @@ public class ViewNoteCommandTest { private NoteCommandParser commandParser; private ModuleManager moduleManager; private Ui ui; + private ModuleStorage moduleStorage; private String tempModule = "test"; Class type = Note.class; @BeforeEach - void setUp() { + void setUp() throws IOException { + this.moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + this.moduleStorage.createModuleDirectory(tempModule); this.moduleManager = new ModuleManager(); moduleManager.setModule(tempModule); this.commandParser = NoteCommandParser.getInstance(); @@ -34,11 +41,17 @@ void setUp() { this.ui = new Ui(); } + @AfterAll + static void reset() throws IOException { + ModuleStorage moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + moduleStorage.cleanAfterDeleteModule("test"); + } + @Test void execute_viewAll_success() - throws InvalidCommandException, InvalidArgumentException { + throws InvalidCommandException, InvalidArgumentException, IOException { for (int i = 0; i < 5; i++) { - Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); + Command addCommand = commandParser.parseCommand("add \"test" + i + "\" \"test" + i + "\""); CommandResult addResult = addCommand.execute(ui, moduleManager); assertTrue(addResult.isOk()); } @@ -51,9 +64,9 @@ void execute_viewAll_success() @Test void execute_viewOne_success() - throws InvalidCommandException, InvalidArgumentException { + throws InvalidCommandException, InvalidArgumentException, IOException { for (int i = 0; i < 5; i++) { - Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); + Command addCommand = commandParser.parseCommand("add \"test" + i + "\" \"test" + i + "\""); CommandResult addResult = addCommand.execute(ui, moduleManager); assertTrue(addResult.isOk()); } @@ -66,9 +79,9 @@ void execute_viewOne_success() @Test void execute_viewOne_exceptionThrown() - throws InvalidCommandException, InvalidArgumentException { + throws InvalidCommandException, InvalidArgumentException, IOException { for (int i = 0; i < 5; i++) { - Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); + Command addCommand = commandParser.parseCommand("add \"test" + i + "\" \"test" + i + "\""); CommandResult addResult = addCommand.execute(ui, moduleManager); assertTrue(addResult.isOk()); } diff --git a/src/test/java/terminus/command/module/AddModuleCommandTest.java b/src/test/java/terminus/command/module/AddModuleCommandTest.java index 1f85f6011c..1a1ec4ac2f 100644 --- a/src/test/java/terminus/command/module/AddModuleCommandTest.java +++ b/src/test/java/terminus/command/module/AddModuleCommandTest.java @@ -4,14 +4,18 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import terminus.TestFilePath; import terminus.command.Command; import terminus.command.CommandResult; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; import terminus.parser.ModuleCommandParser; +import terminus.storage.ModuleStorage; import terminus.ui.Ui; public class AddModuleCommandTest { @@ -19,16 +23,24 @@ public class AddModuleCommandTest { private ModuleCommandParser commandParser; private ModuleManager moduleManager; private Ui ui; + private ModuleStorage moduleStorage; @BeforeEach void setUp() { + this.moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); this.moduleManager = new ModuleManager(); this.commandParser = ModuleCommandParser.getInstance(); this.ui = new Ui(); } + @AfterAll + static void reset() throws IOException { + ModuleStorage moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + moduleStorage.cleanAfterDeleteModule("test"); + } + @Test - void execute_addModule_success() throws InvalidArgumentException, InvalidCommandException { + void execute_addModule_success() throws InvalidArgumentException, InvalidCommandException, IOException { Command cmd = commandParser.parseCommand("add \"test\""); CommandResult cmdResult = cmd.execute(ui, moduleManager); assertTrue(cmdResult.isOk()); diff --git a/src/test/java/terminus/command/module/DeleteModuleCommandTest.java b/src/test/java/terminus/command/module/DeleteModuleCommandTest.java index fb5aa67e12..47f3189baf 100644 --- a/src/test/java/terminus/command/module/DeleteModuleCommandTest.java +++ b/src/test/java/terminus/command/module/DeleteModuleCommandTest.java @@ -4,14 +4,18 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import terminus.TestFilePath; import terminus.command.Command; import terminus.command.CommandResult; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; import terminus.parser.ModuleCommandParser; +import terminus.storage.ModuleStorage; import terminus.ui.Ui; public class DeleteModuleCommandTest { @@ -19,19 +23,28 @@ public class DeleteModuleCommandTest { private ModuleCommandParser commandParser; private ModuleManager moduleManager; private Ui ui; + private ModuleStorage moduleStorage; private static final String tempModule = "test"; @BeforeEach - void setUp() { + void setUp() throws IOException { + this.moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + this.moduleStorage.createModuleDirectory(tempModule); this.moduleManager = new ModuleManager(); this.commandParser = ModuleCommandParser.getInstance(); moduleManager.setModule(tempModule); this.ui = new Ui(); } + @AfterAll + static void reset() throws IOException { + ModuleStorage moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + moduleStorage.cleanAfterDeleteModule("test"); + } + @Test - void execute_deleteModule_success() throws InvalidArgumentException, InvalidCommandException { + void execute_deleteModule_success() throws InvalidArgumentException, InvalidCommandException, IOException { Command cmd = commandParser.parseCommand("delete 1"); CommandResult cmdResult = cmd.execute(ui, moduleManager); assertTrue(cmdResult.isOk()); diff --git a/src/test/java/terminus/command/module/ViewModuleCommandTest.java b/src/test/java/terminus/command/module/ViewModuleCommandTest.java index 6938ba7539..8e7aa3919d 100644 --- a/src/test/java/terminus/command/module/ViewModuleCommandTest.java +++ b/src/test/java/terminus/command/module/ViewModuleCommandTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.command.Command; @@ -29,7 +30,7 @@ void setUp() { } @Test - void execute_viewModule_success() throws InvalidArgumentException, InvalidCommandException { + void execute_viewModule_success() throws InvalidArgumentException, InvalidCommandException, IOException { Command cmd = commandParser.parseCommand("view"); CommandResult cmdResult = cmd.execute(ui, moduleManager); assertTrue(cmdResult.isOk()); diff --git a/src/test/java/terminus/parser/NoteCommandParserTest.java b/src/test/java/terminus/parser/NoteCommandParserTest.java index a32d291071..7ecb0ca0f1 100644 --- a/src/test/java/terminus/parser/NoteCommandParserTest.java +++ b/src/test/java/terminus/parser/NoteCommandParserTest.java @@ -66,7 +66,6 @@ void parseCommand_resolveAddCommand_exceptionThrown() @Test void parseCommand_resolveAddCommand_success() throws InvalidCommandException, InvalidArgumentException { assertTrue(commandParser.parseCommand("add \"test\" \"test1\"") instanceof AddNoteCommand); - assertTrue(commandParser.parseCommand("add \" test \" \" test1 \"") instanceof AddNoteCommand); assertTrue(commandParser.parseCommand("add \"username\" \"password\"") instanceof AddNoteCommand); } diff --git a/src/test/java/terminus/storage/ModuleStorageTest.java b/src/test/java/terminus/storage/ModuleStorageTest.java index 51b4d8cebf..1f0a99928a 100644 --- a/src/test/java/terminus/storage/ModuleStorageTest.java +++ b/src/test/java/terminus/storage/ModuleStorageTest.java @@ -9,31 +9,42 @@ import java.nio.file.Path; import java.time.LocalTime; import java.util.List; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import terminus.TestFilePath; import terminus.content.Link; import terminus.content.Note; import terminus.module.ModuleManager; public class ModuleStorageTest { - /*private static final Path RESOURCE_FOLDER = Path.of("src", "test", "resources"); + private static final Path RESOURCE_FOLDER = Path.of("src", "test", "resources"); private static final Path SAVE_FILE = RESOURCE_FOLDER.resolve("saveFile.json"); private static final Path MALFORMED_FILE = RESOURCE_FOLDER.resolve("malformedFile.json"); private static final Path VALID_FILE = RESOURCE_FOLDER.resolve("validFile.json"); private ModuleManager moduleManager; + private ModuleStorage moduleStorage; private String tempModule = "test"; @BeforeEach - void setUp() { + void setUp() throws IOException { + this.moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); moduleManager = new ModuleManager(); moduleManager.setModule(tempModule); moduleManager.getModule(tempModule).getContentManager(Note.class).add(new Note("test", "test")); + moduleStorage.saveNotesFromModule(moduleManager,tempModule); moduleManager.getModule(tempModule).getContentManager(Link.class).add(new Link("test", "tuesday", LocalTime.of(11, 11), "https://zoom.us/")); } + @AfterAll + static void reset() throws IOException { + ModuleStorage moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + moduleStorage.cleanAfterDeleteModule("test"); + } + @Test void loadFile_invalidJson_exceptionThrown() { ModuleStorage moduleStorage = new ModuleStorage(MALFORMED_FILE); @@ -63,14 +74,14 @@ void saveFile_success() throws IOException { assertTextFilesEqual(SAVE_FILE, VALID_FILE); } - *//** + /** * Asserts whether the text in the two given files are the same. * Ignores any differences in line endings. * Taken from: https://github.com/se-edu/addressbook-level2/blob/master/test/java/seedu/addressbook/util/TestUtil.java#L128 - *//* + */ public static void assertTextFilesEqual(Path path1, Path path2) throws IOException { List list1 = Files.readAllLines(path1); List list2 = Files.readAllLines(path2); assertEquals(String.join("\n", list1), String.join("\n", list2)); - }*/ + } } diff --git a/src/test/resources/saveFile.json b/src/test/resources/saveFile.json index df07f97b9b..562b1ee6cc 100644 --- a/src/test/resources/saveFile.json +++ b/src/test/resources/saveFile.json @@ -1,14 +1,6 @@ { "moduleMap": { "test": { - "noteManager": { - "contents": [ - { - "name": "test", - "data": "test" - } - ] - }, "linkManager": { "contents": [ { diff --git a/src/test/resources/validFile.json b/src/test/resources/validFile.json index df07f97b9b..562b1ee6cc 100644 --- a/src/test/resources/validFile.json +++ b/src/test/resources/validFile.json @@ -1,14 +1,6 @@ { "moduleMap": { "test": { - "noteManager": { - "contents": [ - { - "name": "test", - "data": "test" - } - ] - }, "linkManager": { "contents": [ { From 458e096434d373a6648a66f7ce04dfcb81a3ea1e Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Wed, 20 Oct 2021 00:01:28 +0800 Subject: [PATCH 162/466] Fix Junit CI fail --- .../java/terminus/command/content/note/AddNoteCommandTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/java/terminus/command/content/note/AddNoteCommandTest.java b/src/test/java/terminus/command/content/note/AddNoteCommandTest.java index 70578e6a5a..c2c4c36340 100644 --- a/src/test/java/terminus/command/content/note/AddNoteCommandTest.java +++ b/src/test/java/terminus/command/content/note/AddNoteCommandTest.java @@ -87,8 +87,6 @@ void execute_illegalNoteName_exceptionThrown() { () -> commandParser.parseCommand("add \"\\uD83D\\uDC76 \" \"test\"").execute(ui, moduleManager)); assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("add \".......\" \"test\"").execute(ui, moduleManager)); - assertThrows(InvalidArgumentException.class, - () -> commandParser.parseCommand("add \" test \" \"test\"").execute(ui, moduleManager)); assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("add \"\" \"test\"").execute(ui, moduleManager)); String s = "a".repeat(31); From 0e02373d45d2be51cf78edb1ba1feb410904ff80 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Wed, 20 Oct 2021 00:09:04 +0800 Subject: [PATCH 163/466] Fix moduleManager is null bug from initial load --- src/main/java/terminus/storage/ModuleStorage.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 9261a1027f..95cdfc95a7 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -114,6 +114,9 @@ public void saveFile(ModuleManager moduleManager) throws IOException { */ private void loadAllNotes(ModuleManager moduleManager) throws IOException { Path modDirPath; + if(moduleManager == null){ + return; + } for (String mod : moduleManager.getAllModules()) { modDirPath = Paths.get(filePath.getParent().toString(), mod); // Check if module name is a valid module and file name From 6b861e55977f9e8847afa210b76f255c83f63118 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Wed, 20 Oct 2021 00:12:11 +0800 Subject: [PATCH 164/466] Fix indentation in moduleStorage --- src/main/java/terminus/storage/ModuleStorage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 95cdfc95a7..5a2ce0532b 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -114,7 +114,7 @@ public void saveFile(ModuleManager moduleManager) throws IOException { */ private void loadAllNotes(ModuleManager moduleManager) throws IOException { Path modDirPath; - if(moduleManager == null){ + if (moduleManager == null) { return; } for (String mod : moduleManager.getAllModules()) { From 68001d1b97577e59de104ec47fc579c664a60ec6 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Wed, 20 Oct 2021 01:06:59 +0800 Subject: [PATCH 165/466] Update singleton methods --- src/main/java/terminus/common/CommonFormat.java | 1 + .../java/terminus/parser/LinkCommandParser.java | 14 +++++++++----- .../java/terminus/parser/MainCommandParser.java | 10 ++++++---- .../terminus/parser/ModuleCommandParser.java | 16 +++++++++------- .../parser/ModuleWorkspaceCommandParser.java | 12 +++++++----- .../java/terminus/parser/NoteCommandParser.java | 14 +++++++++----- 6 files changed, 41 insertions(+), 26 deletions(-) diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index 6185074b8b..b2f928b96b 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -28,4 +28,5 @@ public class CommonFormat { public static final String COMMAND_ADD_MODULE_FORMAT = "add \"\""; public static final String COMMAND_VIEW_MODULE_FORMAT = "view"; public static final String SPACE_NEGATED_DELIMITER = "\\S+"; + public static final String COMMAND_MODULE = "module"; } diff --git a/src/main/java/terminus/parser/LinkCommandParser.java b/src/main/java/terminus/parser/LinkCommandParser.java index f7ca2d1691..2e585f13d5 100644 --- a/src/main/java/terminus/parser/LinkCommandParser.java +++ b/src/main/java/terminus/parser/LinkCommandParser.java @@ -14,6 +14,8 @@ */ public class LinkCommandParser extends InnerModuleCommandParser { + private static LinkCommandParser parser; + public LinkCommandParser() { super(CommonFormat.COMMAND_SCHEDULE); } @@ -24,11 +26,13 @@ public LinkCommandParser() { * @return A LinkCommandParser object which contains the command map for the schedule workspace. */ public static LinkCommandParser getInstance() { - LinkCommandParser parser = new LinkCommandParser(); - parser.addCommand(CommonFormat.COMMAND_BACK, new BackCommand()); - parser.addCommand(CommonFormat.COMMAND_ADD, new AddLinkCommand()); - parser.addCommand(CommonFormat.COMMAND_VIEW, new ViewCommand(Link.class)); - parser.addCommand(CommonFormat.COMMAND_DELETE, new DeleteCommand(Link.class)); + if (parser == null) { + parser = new LinkCommandParser(); + parser.addCommand(CommonFormat.COMMAND_BACK, new BackCommand()); + parser.addCommand(CommonFormat.COMMAND_ADD, new AddLinkCommand()); + parser.addCommand(CommonFormat.COMMAND_VIEW, new ViewCommand(Link.class)); + parser.addCommand(CommonFormat.COMMAND_DELETE, new DeleteCommand(Link.class)); + } return parser; } diff --git a/src/main/java/terminus/parser/MainCommandParser.java b/src/main/java/terminus/parser/MainCommandParser.java index 862aacd8c7..58e38ed803 100644 --- a/src/main/java/terminus/parser/MainCommandParser.java +++ b/src/main/java/terminus/parser/MainCommandParser.java @@ -7,16 +7,18 @@ public class MainCommandParser extends CommandParser { - private static final MainCommandParser PARSER = new MainCommandParser(); + private static MainCommandParser parser; public MainCommandParser() { super(""); } public static MainCommandParser getInstance() { - MainCommandParser parser = PARSER; - parser.addCommand("module", new ModuleCommand()); - parser.addCommand("go", new GoCommand()); + if (parser == null) { + parser = new MainCommandParser(); + parser.addCommand("module", new ModuleCommand()); + parser.addCommand("go", new GoCommand()); + } return parser; } diff --git a/src/main/java/terminus/parser/ModuleCommandParser.java b/src/main/java/terminus/parser/ModuleCommandParser.java index 735ec9e75d..ad341d5532 100644 --- a/src/main/java/terminus/parser/ModuleCommandParser.java +++ b/src/main/java/terminus/parser/ModuleCommandParser.java @@ -9,21 +9,23 @@ public class ModuleCommandParser extends CommandParser { - private static final ModuleCommandParser MODULE_PARSER = new ModuleCommandParser(); + private static ModuleCommandParser parser; /** * Initializes the commandMap. Adds some default commands to it. */ public ModuleCommandParser() { - super("module"); + super(CommonFormat.COMMAND_MODULE); } public static ModuleCommandParser getInstance() { - ModuleCommandParser parser = MODULE_PARSER; - parser.addCommand("add", new AddModuleCommand()); - parser.addCommand("view", new ViewModuleCommand()); - parser.addCommand("delete", new DeleteModuleCommand()); - parser.addCommand(CommonFormat.COMMAND_BACK, new BackCommand()); + if (parser == null) { + parser = new ModuleCommandParser(); + parser.addCommand(CommonFormat.COMMAND_ADD, new AddModuleCommand()); + parser.addCommand(CommonFormat.COMMAND_VIEW, new ViewModuleCommand()); + parser.addCommand(CommonFormat.COMMAND_DELETE, new DeleteModuleCommand()); + parser.addCommand(CommonFormat.COMMAND_BACK, new BackCommand()); + } return parser; } diff --git a/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java b/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java index 62118f329c..9de754ced1 100644 --- a/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java +++ b/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java @@ -11,7 +11,7 @@ public class ModuleWorkspaceCommandParser extends CommandParser { - private static final ModuleWorkspaceCommandParser PARSER = new ModuleWorkspaceCommandParser(); + private static ModuleWorkspaceCommandParser parser; /** * Initializes the commandMap. Adds some default commands to it. @@ -21,10 +21,12 @@ public ModuleWorkspaceCommandParser() { } public static ModuleWorkspaceCommandParser getInstance() { - ModuleWorkspaceCommandParser parser = new ModuleWorkspaceCommandParser(); - parser.addCommand(CommonFormat.COMMAND_BACK, new BackCommand()); - parser.addCommand(CommonFormat.COMMAND_NOTE, new NotesCommand()); - parser.addCommand(CommonFormat.COMMAND_SCHEDULE, new ScheduleCommand()); + if (parser == null) { + parser = new ModuleWorkspaceCommandParser(); + parser.addCommand(CommonFormat.COMMAND_BACK, new BackCommand()); + parser.addCommand(CommonFormat.COMMAND_NOTE, new NotesCommand()); + parser.addCommand(CommonFormat.COMMAND_SCHEDULE, new ScheduleCommand()); + } return parser; } diff --git a/src/main/java/terminus/parser/NoteCommandParser.java b/src/main/java/terminus/parser/NoteCommandParser.java index 4a0e1bb13f..ab69d3a2f9 100644 --- a/src/main/java/terminus/parser/NoteCommandParser.java +++ b/src/main/java/terminus/parser/NoteCommandParser.java @@ -12,16 +12,20 @@ public class NoteCommandParser extends InnerModuleCommandParser { + private static NoteCommandParser parser; + public NoteCommandParser() { super(CommonFormat.COMMAND_NOTE); } public static NoteCommandParser getInstance() { - NoteCommandParser parser = new NoteCommandParser(); - parser.addCommand(CommonFormat.COMMAND_BACK, new BackCommand()); - parser.addCommand(CommonFormat.COMMAND_ADD, new AddNoteCommand()); - parser.addCommand(CommonFormat.COMMAND_VIEW, new ViewCommand(Note.class)); - parser.addCommand(CommonFormat.COMMAND_DELETE, new DeleteCommand(Note.class)); + if (parser == null) { + parser = new NoteCommandParser(); + parser.addCommand(CommonFormat.COMMAND_BACK, new BackCommand()); + parser.addCommand(CommonFormat.COMMAND_ADD, new AddNoteCommand()); + parser.addCommand(CommonFormat.COMMAND_VIEW, new ViewCommand(Note.class)); + parser.addCommand(CommonFormat.COMMAND_DELETE, new DeleteCommand(Note.class)); + } return parser; } From 2c250d2faafe72395d9dca0533490fe27d7665bb Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Wed, 20 Oct 2021 01:11:56 +0800 Subject: [PATCH 166/466] Refactor MainCommandParser --- src/main/java/terminus/common/CommonFormat.java | 1 + src/main/java/terminus/parser/MainCommandParser.java | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index b2f928b96b..57ca417d9d 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -29,4 +29,5 @@ public class CommonFormat { public static final String COMMAND_VIEW_MODULE_FORMAT = "view"; public static final String SPACE_NEGATED_DELIMITER = "\\S+"; public static final String COMMAND_MODULE = "module"; + public static final String COMMAND_GO = "go"; } diff --git a/src/main/java/terminus/parser/MainCommandParser.java b/src/main/java/terminus/parser/MainCommandParser.java index 58e38ed803..5703329c87 100644 --- a/src/main/java/terminus/parser/MainCommandParser.java +++ b/src/main/java/terminus/parser/MainCommandParser.java @@ -2,6 +2,7 @@ import terminus.command.GoCommand; import terminus.command.module.ModuleCommand; +import terminus.common.CommonFormat; import terminus.common.Messages; import terminus.module.ModuleManager; @@ -16,8 +17,8 @@ public MainCommandParser() { public static MainCommandParser getInstance() { if (parser == null) { parser = new MainCommandParser(); - parser.addCommand("module", new ModuleCommand()); - parser.addCommand("go", new GoCommand()); + parser.addCommand(CommonFormat.COMMAND_MODULE, new ModuleCommand()); + parser.addCommand(CommonFormat.COMMAND_GO, new GoCommand()); } return parser; } From 46caa88f604ba7ec9910f32140c18e80b35fa9da Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Wed, 20 Oct 2021 01:31:47 +0800 Subject: [PATCH 167/466] Draft of Module class diagram --- docs/Module.puml | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 docs/Module.puml diff --git a/docs/Module.puml b/docs/Module.puml new file mode 100644 index 0000000000..166f309671 --- /dev/null +++ b/docs/Module.puml @@ -0,0 +1,64 @@ +@startuml +'https://plantuml.com/class-diagram + + + +'abstract class DGS +'abstract AbstractCollection +'interface List +'interface Collection +' +'List <|-- AbstractList +'Collection -- AbstractCollection +' +'Collection <|- List +'AbstractCollection <|- AbstractList +'AbstractList <|-- ArrayList + +Content <|-- Note +Content <|-- Link +ContentManager --> "0..*" Content +ContentManager .. Note +ContentManager .. Link + +NusModule -> ContentManager: noteManager +NusModule -> ContentManager: linkManager + +ModuleManager --> "0..*" NusModule : has > + +class ModuleManager { + + getAllModules(): String [] + + getModule(moduleName: String): NusModule + + removeModule(moduleName: String): void + + setModule(moduleName: String): void +} + +class NusModule { + + getContentManager (type: Class): ContentManager +} + +class ContentManager { + + add(content: T): void + + deleteContent(contentNumber: int): String + + getContentData(contentNumber: int): String + + getContents(contents: ArrayList ): String + + getTotalContents() : int + + listAllContents(): String + + setContent(contents: ArrayList ): void +} + +class Content { + # name: String + # data: String + + Content(name: String) +} + +class Link { + - day: String + - startTime: LocalTime + - link: String +} + +class Note { +} +@enduml \ No newline at end of file From 631384cb6ef8704e7616b913908bea1d0231b81d Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Wed, 20 Oct 2021 07:11:20 +0800 Subject: [PATCH 168/466] Implement view weekly Timetable --- .../terminus/command/TimetableCommand.java | 55 +++++++++++++++++++ .../java/terminus/common/CommonFormat.java | 2 + src/main/java/terminus/common/Messages.java | 1 + .../terminus/parser/MainCommandParser.java | 2 + 4 files changed, 60 insertions(+) create mode 100644 src/main/java/terminus/command/TimetableCommand.java diff --git a/src/main/java/terminus/command/TimetableCommand.java b/src/main/java/terminus/command/TimetableCommand.java new file mode 100644 index 0000000000..551961749a --- /dev/null +++ b/src/main/java/terminus/command/TimetableCommand.java @@ -0,0 +1,55 @@ +package terminus.command; + +import terminus.common.CommonFormat; +import terminus.common.Messages; +import terminus.common.TerminusLogger; +import terminus.content.ContentManager; +import terminus.content.Link; +import terminus.exception.InvalidArgumentException; +import terminus.module.ModuleManager; +import terminus.module.NusModule; +import terminus.ui.Ui; + +import static terminus.common.CommonUtils.isStringNullOrEmpty; +import static terminus.common.CommonUtils.isValidDay; + +public class TimetableCommand extends Command { + private String day; + + public TimetableCommand() { + + } + + public String getFormat() { + return CommonFormat.COMMAND_TIMETABLE_FORMAT; + } + + public String getHelpMessage() { + return Messages.MESSAGE_COMMAND_TIMETABLE; + } + + public void parseArguments(String arguments) throws InvalidArgumentException { + day = arguments; + if (!isStringNullOrEmpty(day) && !isValidDay(day)) { + TerminusLogger.warning(String.format("Invalid Day: %s", day)); + throw new InvalidArgumentException(String.format(Messages.ERROR_MESSAGE_INVALID_DAY, day)); + } + } + + public CommandResult execute(Ui ui, ModuleManager moduleManager) { + String[] modules = moduleManager.getAllModules(); + StringBuilder result = new StringBuilder(); + for (String moduleName : modules) { + NusModule module = moduleManager.getModule(moduleName); + ContentManager contentManager = module.getContentManager(Link.class); + String schedules = contentManager.listAllContents(); + result.append(schedules); + } + + if (result.toString().isBlank()) { + result.append(Messages.EMPTY_CONTENT_LIST_MESSAGE); + } + ui.printSection(result.toString()); + return new CommandResult(true, false); + } +} diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index 6185074b8b..979412047a 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -14,6 +14,7 @@ public class CommonFormat { public static final String COMMAND_EXIT = "exit"; public static final String COMMAND_HELP = "help"; public static final String COMMAND_SCHEDULE = "schedule"; + public static final String COMMAND_TIMETABLE = "timetable"; public static final String LOCAL_TIME_FORMAT = "HH:mm"; @@ -22,6 +23,7 @@ public class CommonFormat { public static final String COMMAND_ADD_SCHEDULE_FORMAT = COMMAND_ADD + " \"\" " + "\"\" \"\" \"\""; public static final String COMMAND_ADD_NOTE_FORMAT = COMMAND_ADD + " \"\" \"\""; + public static final String COMMAND_TIMETABLE_FORMAT = COMMAND_TIMETABLE + " {day}"; public static final String SPACE_DELIMITER = "\\s+"; public static final String COMMAND_MODULE_FORMAT = "module"; diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index 0e3a4078ed..694d467e03 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -10,6 +10,7 @@ public class Messages { public static final String MESSAGE_COMMAND_HELP = "Prints the help page."; public static final String MESSAGE_COMMAND_NOTE = "Move to notes workspace."; public static final String MESSAGE_COMMAND_SCHEDULE = "Move to schedules workspace."; + public static final String MESSAGE_COMMAND_TIMETABLE = "Displays all your schedule."; public static final String MESSAGE_RESPONSE_DELETE = "Your %s on '%s' has been deleted!"; public static final String MESSAGE_RESPONSE_ADD = "Your %s on '%s' has been added!"; diff --git a/src/main/java/terminus/parser/MainCommandParser.java b/src/main/java/terminus/parser/MainCommandParser.java index 862aacd8c7..12b7bc8e09 100644 --- a/src/main/java/terminus/parser/MainCommandParser.java +++ b/src/main/java/terminus/parser/MainCommandParser.java @@ -1,6 +1,7 @@ package terminus.parser; import terminus.command.GoCommand; +import terminus.command.TimetableCommand; import terminus.command.module.ModuleCommand; import terminus.common.Messages; import terminus.module.ModuleManager; @@ -17,6 +18,7 @@ public static MainCommandParser getInstance() { MainCommandParser parser = PARSER; parser.addCommand("module", new ModuleCommand()); parser.addCommand("go", new GoCommand()); + parser.addCommand("timetable", new TimetableCommand()); return parser; } From 070894cff6d598908f8e57fa8cc533d255e8c2ee Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Wed, 20 Oct 2021 08:05:20 +0800 Subject: [PATCH 169/466] Fix indexing bug for weekly schedule --- .../java/terminus/command/TimetableCommand.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/terminus/command/TimetableCommand.java b/src/main/java/terminus/command/TimetableCommand.java index 551961749a..385221ebe0 100644 --- a/src/main/java/terminus/command/TimetableCommand.java +++ b/src/main/java/terminus/command/TimetableCommand.java @@ -16,6 +16,8 @@ public class TimetableCommand extends Command { private String day; + static int index = 0; + public TimetableCommand() { } @@ -36,14 +38,22 @@ public void parseArguments(String arguments) throws InvalidArgumentException { } } + public StringBuilder listAllSchedule( ContentManager contentManager) { + StringBuilder schedules = new StringBuilder(); + for (Link schedule : contentManager.getContents()) { + index++; + schedules.append(String.format("%d. %s\n", index, schedule.getViewDescription())); + } + return schedules; + } + public CommandResult execute(Ui ui, ModuleManager moduleManager) { String[] modules = moduleManager.getAllModules(); StringBuilder result = new StringBuilder(); for (String moduleName : modules) { NusModule module = moduleManager.getModule(moduleName); ContentManager contentManager = module.getContentManager(Link.class); - String schedules = contentManager.listAllContents(); - result.append(schedules); + result.append(listAllSchedule(contentManager)); } if (result.toString().isBlank()) { From aab008fca3a79f86910a4e5cddea029b46c909da Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Wed, 20 Oct 2021 08:10:16 +0800 Subject: [PATCH 170/466] Add index reset --- src/main/java/terminus/command/TimetableCommand.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/terminus/command/TimetableCommand.java b/src/main/java/terminus/command/TimetableCommand.java index 385221ebe0..46c5368d11 100644 --- a/src/main/java/terminus/command/TimetableCommand.java +++ b/src/main/java/terminus/command/TimetableCommand.java @@ -59,6 +59,8 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) { if (result.toString().isBlank()) { result.append(Messages.EMPTY_CONTENT_LIST_MESSAGE); } + + index = 0; ui.printSection(result.toString()); return new CommandResult(true, false); } From 710cc7529d8bcfdddf1737a96b72c35a03c2cd94 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Wed, 20 Oct 2021 08:31:32 +0800 Subject: [PATCH 171/466] Implement viewing daily schedules --- .../terminus/command/TimetableCommand.java | 39 +++++++++++++++++-- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/src/main/java/terminus/command/TimetableCommand.java b/src/main/java/terminus/command/TimetableCommand.java index 46c5368d11..0a359d9ae4 100644 --- a/src/main/java/terminus/command/TimetableCommand.java +++ b/src/main/java/terminus/command/TimetableCommand.java @@ -15,7 +15,6 @@ public class TimetableCommand extends Command { private String day; - static int index = 0; public TimetableCommand() { @@ -38,7 +37,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { } } - public StringBuilder listAllSchedule( ContentManager contentManager) { + public StringBuilder listAllSchedule (ContentManager contentManager) { StringBuilder schedules = new StringBuilder(); for (Link schedule : contentManager.getContents()) { index++; @@ -47,19 +46,51 @@ public StringBuilder listAllSchedule( ContentManager contentManager) { return schedules; } - public CommandResult execute(Ui ui, ModuleManager moduleManager) { + public StringBuilder listDailySchedule (ContentManager contentManager) { + StringBuilder dailySchedule = new StringBuilder(); + for (Link schedule : contentManager.getContents()) { + if (schedule.getDay().equalsIgnoreCase(day)) { + index++; + dailySchedule.append(String.format("%d. %s\n", index, schedule.getViewDescription())); + } + } + return dailySchedule; + } + + public void getWeeklySchedule (StringBuilder result, ModuleManager moduleManager) { String[] modules = moduleManager.getAllModules(); - StringBuilder result = new StringBuilder(); for (String moduleName : modules) { NusModule module = moduleManager.getModule(moduleName); ContentManager contentManager = module.getContentManager(Link.class); result.append(listAllSchedule(contentManager)); } + } + public void getDailySchedule (StringBuilder result, ModuleManager moduleManager) { + String[] modules = moduleManager.getAllModules(); + for (String moduleName : modules) { + NusModule module = moduleManager.getModule(moduleName); + ContentManager contentManager = module.getContentManager(Link.class); + result.append(listDailySchedule(contentManager)); + } + } + + public void checkEmptySchedule (StringBuilder result) { if (result.toString().isBlank()) { result.append(Messages.EMPTY_CONTENT_LIST_MESSAGE); } + } + + public CommandResult execute(Ui ui, ModuleManager moduleManager) { + StringBuilder result = new StringBuilder(); + + if (isStringNullOrEmpty(day)) { + getWeeklySchedule(result, moduleManager); + } else { + getDailySchedule(result, moduleManager); + } + checkEmptySchedule(result); index = 0; ui.printSection(result.toString()); return new CommandResult(true, false); From 390617e768b259a877583bffa8cde7869983f7b0 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Wed, 20 Oct 2021 11:37:32 +0800 Subject: [PATCH 172/466] Update save notes method to cater failed deletion --- src/main/java/terminus/Terminus.java | 1 + .../command/content/note/AddNoteCommand.java | 2 +- .../command/content/note/DeleteNoteCommand.java | 2 +- src/main/java/terminus/storage/ModuleStorage.java | 12 +++++++----- .../java/terminus/storage/ModuleStorageTest.java | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index 84d9af4640..c9cba3c0bf 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -140,6 +140,7 @@ private void exit() { TerminusLogger.info("Saving data into file..."); try { this.moduleStorage.saveFile(moduleManager); + this.moduleStorage.saveAllNotes(moduleManager); TerminusLogger.info("Save completed."); } catch (IOException e) { TerminusLogger.warning("File saving has failed."); diff --git a/src/main/java/terminus/command/content/note/AddNoteCommand.java b/src/main/java/terminus/command/content/note/AddNoteCommand.java index c80d1d0e18..1a7fbe368e 100644 --- a/src/main/java/terminus/command/content/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/content/note/AddNoteCommand.java @@ -84,7 +84,7 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) throws IOExcept // Save to file ModuleStorage moduleStorage = ModuleStorage.getInstance(); - moduleStorage.saveNotesFromModule(moduleManager, getModuleName()); + moduleStorage.saveNotesFromModule(moduleManager, getModuleName(), false); return new CommandResult(true, false); } diff --git a/src/main/java/terminus/command/content/note/DeleteNoteCommand.java b/src/main/java/terminus/command/content/note/DeleteNoteCommand.java index a343a19074..338d475387 100644 --- a/src/main/java/terminus/command/content/note/DeleteNoteCommand.java +++ b/src/main/java/terminus/command/content/note/DeleteNoteCommand.java @@ -24,7 +24,7 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidA CommandResult result = super.execute(ui, moduleManager); // Update file accordingly ModuleStorage moduleStorage = ModuleStorage.getInstance(); - moduleStorage.saveNotesFromModule(moduleManager, getModuleName()); + moduleStorage.saveNotesFromModule(moduleManager, getModuleName(),true); return result; } } diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 5a2ce0532b..d749b21fca 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -170,7 +170,7 @@ public void loadNotesFromModule(ModuleManager moduleManager, String mod) throws */ public void saveAllNotes(ModuleManager moduleManager) throws IOException { for (String mod : moduleManager.getAllModules()) { - saveNotesFromModule(moduleManager, mod); + saveNotesFromModule(moduleManager, mod, false); } } @@ -181,7 +181,7 @@ public void saveAllNotes(ModuleManager moduleManager) throws IOException { * @param mod A module name in the moduleManager. * @throws IOException When the file is inaccessible (e.g. file is locked by OS). */ - public void saveNotesFromModule(ModuleManager moduleManager, String mod) throws IOException { + public void saveNotesFromModule(ModuleManager moduleManager, String mod, Boolean toDeleteAll) throws IOException { Path modDirPath = Paths.get(filePath.getParent().toString(), mod); assert CommonUtils.isValidFileName(mod); // Create module folder if it is missing. @@ -190,9 +190,11 @@ public void saveNotesFromModule(ModuleManager moduleManager, String mod) throws Files.createDirectories(modDirPath); } - // Remove all files within the folder, used when notes have been deleted. - TerminusLogger.info("Removing files from directory: " + modDirPath); - deleteAllFilesInDirectory(modDirPath); + if (toDeleteAll) { + // Remove all files within the folder, used when notes have been deleted. + TerminusLogger.info("Removing files from directory: " + modDirPath); + deleteAllFilesInDirectory(modDirPath); + } // Write to its specific note files. TerminusLogger.info("Adding note files into directory: " + modDirPath); diff --git a/src/test/java/terminus/storage/ModuleStorageTest.java b/src/test/java/terminus/storage/ModuleStorageTest.java index 1f0a99928a..cdcc875b4d 100644 --- a/src/test/java/terminus/storage/ModuleStorageTest.java +++ b/src/test/java/terminus/storage/ModuleStorageTest.java @@ -34,7 +34,7 @@ void setUp() throws IOException { moduleManager = new ModuleManager(); moduleManager.setModule(tempModule); moduleManager.getModule(tempModule).getContentManager(Note.class).add(new Note("test", "test")); - moduleStorage.saveNotesFromModule(moduleManager,tempModule); + moduleStorage.saveNotesFromModule(moduleManager,tempModule,true); moduleManager.getModule(tempModule).getContentManager(Link.class).add(new Link("test", "tuesday", LocalTime.of(11, 11), "https://zoom.us/")); } From 2fbeaf0f16009cd082a663a3e4ce0c7d5d11cef1 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Wed, 20 Oct 2021 11:41:08 +0800 Subject: [PATCH 173/466] Update java docs for save notes method that takes in a boolean now --- src/main/java/terminus/storage/ModuleStorage.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index d749b21fca..7a84a8ee18 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -179,6 +179,7 @@ public void saveAllNotes(ModuleManager moduleManager) throws IOException { * * @param moduleManager The ModuleManager containing all data from each module. * @param mod A module name in the moduleManager. + * @param toDeleteAll True if files in directory should be removed first, otherwise false. * @throws IOException When the file is inaccessible (e.g. file is locked by OS). */ public void saveNotesFromModule(ModuleManager moduleManager, String mod, Boolean toDeleteAll) throws IOException { From 31cf0733016bfd25135fb7a170a5ab4b0deecebc Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Wed, 20 Oct 2021 16:34:20 +0800 Subject: [PATCH 174/466] Update timetable format --- .../terminus/command/TimetableCommand.java | 37 +++++++------------ 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/src/main/java/terminus/command/TimetableCommand.java b/src/main/java/terminus/command/TimetableCommand.java index 0a359d9ae4..1ad84a4090 100644 --- a/src/main/java/terminus/command/TimetableCommand.java +++ b/src/main/java/terminus/command/TimetableCommand.java @@ -1,6 +1,7 @@ package terminus.command; import terminus.common.CommonFormat; +import terminus.common.DaysOfWeekEnum; import terminus.common.Messages; import terminus.common.TerminusLogger; import terminus.content.ContentManager; @@ -15,7 +16,6 @@ public class TimetableCommand extends Command { private String day; - static int index = 0; public TimetableCommand() { @@ -37,45 +37,37 @@ public void parseArguments(String arguments) throws InvalidArgumentException { } } - public StringBuilder listAllSchedule (ContentManager contentManager) { - StringBuilder schedules = new StringBuilder(); - for (Link schedule : contentManager.getContents()) { - index++; - schedules.append(String.format("%d. %s\n", index, schedule.getViewDescription())); - } - return schedules; - } - - public StringBuilder listDailySchedule (ContentManager contentManager) { + public StringBuilder listDailySchedule(ContentManager contentManager) { StringBuilder dailySchedule = new StringBuilder(); + int i = 0; for (Link schedule : contentManager.getContents()) { if (schedule.getDay().equalsIgnoreCase(day)) { - index++; - dailySchedule.append(String.format("%d. %s\n", index, schedule.getViewDescription())); + i++; + dailySchedule.append(String.format("%d. %s\n", i, schedule.getViewDescription())); } } return dailySchedule; } - public void getWeeklySchedule (StringBuilder result, ModuleManager moduleManager) { + public void getDailySchedule(StringBuilder result, ModuleManager moduleManager) { String[] modules = moduleManager.getAllModules(); for (String moduleName : modules) { NusModule module = moduleManager.getModule(moduleName); ContentManager contentManager = module.getContentManager(Link.class); - result.append(listAllSchedule(contentManager)); + result.append(listDailySchedule(contentManager)); } } - public void getDailySchedule (StringBuilder result, ModuleManager moduleManager) { - String[] modules = moduleManager.getAllModules(); - for (String moduleName : modules) { - NusModule module = moduleManager.getModule(moduleName); - ContentManager contentManager = module.getContentManager(Link.class); - result.append(listDailySchedule(contentManager)); + public void getWeeklySchedule(StringBuilder result, ModuleManager moduleManager) { + for (DaysOfWeekEnum currentDay : DaysOfWeekEnum.values()) { + day = currentDay.toString(); + String header = String.format("%s:\n", day); + result.append(header); + getDailySchedule(result, moduleManager); } } - public void checkEmptySchedule (StringBuilder result) { + public void checkEmptySchedule(StringBuilder result) { if (result.toString().isBlank()) { result.append(Messages.EMPTY_CONTENT_LIST_MESSAGE); } @@ -91,7 +83,6 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) { } checkEmptySchedule(result); - index = 0; ui.printSection(result.toString()); return new CommandResult(true, false); } From a7cedb2f2d86c03806a669b98805871786d6c510 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Wed, 20 Oct 2021 17:44:52 +0800 Subject: [PATCH 175/466] Update delete and add note to affect that specfic file only. --- .../command/content/DeleteCommand.java | 5 +- .../command/content/note/AddNoteCommand.java | 5 +- .../content/note/DeleteNoteCommand.java | 2 +- .../java/terminus/storage/ModuleStorage.java | 46 +++++++++++++++++-- 4 files changed, 51 insertions(+), 7 deletions(-) diff --git a/src/main/java/terminus/command/content/DeleteCommand.java b/src/main/java/terminus/command/content/DeleteCommand.java index b67569f2be..90b2b089a9 100644 --- a/src/main/java/terminus/command/content/DeleteCommand.java +++ b/src/main/java/terminus/command/content/DeleteCommand.java @@ -24,6 +24,8 @@ public class DeleteCommand extends Command { private final Class type; private int itemNumber; + protected String deletedContentName; + /** * Creates a DeleteCommand object with referenced to the provided class type. * @@ -76,6 +78,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { * @param moduleManager The ModuleManager that contains the NusModules. * @return CommandResult to indicate the success and additional information about the execution. * @throws InvalidArgumentException when argument provided is index out of bounds of the ArrayList. + * @throws IOException when file is inaccessible. */ @Override public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidArgumentException, IOException { @@ -84,7 +87,7 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidA ContentManager contentManager = module.getContentManager(type); assert contentManager != null; TerminusLogger.info("Executing Delete Command"); - String deletedContentName = contentManager.deleteContent(itemNumber); + this.deletedContentName = contentManager.deleteContent(itemNumber); assert deletedContentName != null && !deletedContentName.isBlank(); TerminusLogger.info( String.format("%s(%s) has been deleted", CommonUtils.getClassName(type), deletedContentName)); diff --git a/src/main/java/terminus/command/content/note/AddNoteCommand.java b/src/main/java/terminus/command/content/note/AddNoteCommand.java index 1a7fbe368e..07e5d56d55 100644 --- a/src/main/java/terminus/command/content/note/AddNoteCommand.java +++ b/src/main/java/terminus/command/content/note/AddNoteCommand.java @@ -78,13 +78,14 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) throws IOExcept if (contentManager.isDuplicateName(name)) { throw new InvalidArgumentException(Messages.ERROR_MESSAGE_DUPLICATE_NAME); } - contentManager.add(new Note(name, data)); + Note newNote = new Note(name, data); + contentManager.add(newNote); TerminusLogger.info(String.format("Note(\"%s\",\"%s\") has been added", name, data)); ui.printSection(String.format(Messages.MESSAGE_RESPONSE_ADD, CommonFormat.COMMAND_NOTE, name)); // Save to file ModuleStorage moduleStorage = ModuleStorage.getInstance(); - moduleStorage.saveNotesFromModule(moduleManager, getModuleName(), false); + moduleStorage.addNoteFromModule(getModuleName(), newNote); return new CommandResult(true, false); } diff --git a/src/main/java/terminus/command/content/note/DeleteNoteCommand.java b/src/main/java/terminus/command/content/note/DeleteNoteCommand.java index 338d475387..ffa3420f4d 100644 --- a/src/main/java/terminus/command/content/note/DeleteNoteCommand.java +++ b/src/main/java/terminus/command/content/note/DeleteNoteCommand.java @@ -24,7 +24,7 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) throws InvalidA CommandResult result = super.execute(ui, moduleManager); // Update file accordingly ModuleStorage moduleStorage = ModuleStorage.getInstance(); - moduleStorage.saveNotesFromModule(moduleManager, getModuleName(),true); + moduleStorage.removeNoteFromModule(getModuleName(), super.deletedContentName); return result; } } diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 7a84a8ee18..cffcb76a96 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -204,16 +204,50 @@ public void saveNotesFromModule(ModuleManager moduleManager, String mod, Boolean for (Note note : noteArrayList) { assert Files.isDirectory(modDirPath); assert CommonUtils.isValidFileName(note.getName()); - Path filePath = Paths.get(modDirPath.toString(), note.getName() + CommonFormat.EXTENSION_TEXT_FILE); - Files.writeString(filePath, note.getData()); - TerminusLogger.info("Added file: " + filePath); + createNoteFile(modDirPath, note); } } + /** + * Removes deleted note file from module folder. + * + * @param moduleName The module name related to the new note. + * @param noteName The note removed from moduleManager. + * @throws IOException When the file is inaccessible (e.g. file is locked by OS). + */ + public void removeNoteFromModule(String moduleName, String noteName) throws IOException { + Path modDirPath = Paths.get(filePath.getParent().toString(), moduleName); + if (Files.notExists(modDirPath)) { + TerminusLogger.info("Module directory not found: " + modDirPath); + return; + } + File deleteFile = new File( + Paths.get(modDirPath.toString(), noteName + CommonFormat.EXTENSION_TEXT_FILE).toString()); + deleteFile.delete(); + } + + /** + * Add new notes file into module folder. + * + * @param moduleName The module name related to the new note. + * @param newNote The new note added to moduleManager. + * @throws IOException When the file is inaccessible (e.g. file is locked by OS). + */ + public void addNoteFromModule(String moduleName, Note newNote) throws IOException { + Path modDirPath = Paths.get(filePath.getParent().toString(), moduleName); + if (Files.notExists(modDirPath)) { + TerminusLogger.info("Creating directory: " + modDirPath); + Files.createDirectories(modDirPath); + } + createNoteFile(modDirPath, newNote); + + } + /** * Deletes all files within a specified directory given by its full path. * * @param directoryPath Directory path where all files inside will be deleted. + * @throws IOException When the file is inaccessible (e.g. file is locked by OS). */ private void deleteAllFilesInDirectory(Path directoryPath) throws IOException { File folder = new File(directoryPath.toString()); @@ -297,5 +331,11 @@ private boolean isValidFileSize(File file) throws IOException { return Files.size(Paths.get(file.getAbsolutePath())) <= CommonFormat.MAX_FILE_SIZE; } + private void createNoteFile(Path modDirPath, Note note) throws IOException { + Path filePath = Paths.get(modDirPath.toString(), note.getName() + CommonFormat.EXTENSION_TEXT_FILE); + Files.writeString(filePath, note.getData()); + TerminusLogger.info("Added file: " + filePath); + } + } From 865fd84e5c07e7195841a981bf521d1956e8d748 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Wed, 20 Oct 2021 17:54:42 +0800 Subject: [PATCH 176/466] Update logger message --- src/main/java/terminus/storage/ModuleStorage.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index cffcb76a96..265537b78e 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -223,6 +223,7 @@ public void removeNoteFromModule(String moduleName, String noteName) throws IOEx } File deleteFile = new File( Paths.get(modDirPath.toString(), noteName + CommonFormat.EXTENSION_TEXT_FILE).toString()); + TerminusLogger.info("Removing file: " + deleteFile.getAbsolutePath()); deleteFile.delete(); } From cf75508bdce1b052fd444e3b36211fc1b4ba07d2 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Wed, 20 Oct 2021 19:17:04 +0800 Subject: [PATCH 177/466] Update JUnit test for modulestorage --- .../content/note/DeleteNoteCommand.java | 5 - .../java/terminus/common/CommonUtils.java | 20 ++-- src/main/java/terminus/common/Messages.java | 3 +- .../java/terminus/storage/ModuleStorage.java | 4 +- .../java/terminus/common/CommonUtilsTest.java | 38 ++++++++ .../terminus/storage/ModuleStorageTest.java | 96 ++++++++++++++++++- 6 files changed, 147 insertions(+), 19 deletions(-) diff --git a/src/main/java/terminus/command/content/note/DeleteNoteCommand.java b/src/main/java/terminus/command/content/note/DeleteNoteCommand.java index ffa3420f4d..4ad1863541 100644 --- a/src/main/java/terminus/command/content/note/DeleteNoteCommand.java +++ b/src/main/java/terminus/command/content/note/DeleteNoteCommand.java @@ -10,11 +10,6 @@ public class DeleteNoteCommand extends DeleteCommand { - /** - * Creates a DeleteCommand object with referenced to the provided class type. - * - * @param type Content object type. - */ public DeleteNoteCommand(Class type) { super(type); } diff --git a/src/main/java/terminus/common/CommonUtils.java b/src/main/java/terminus/common/CommonUtils.java index d9c6aa1068..ef0572b3b1 100644 --- a/src/main/java/terminus/common/CommonUtils.java +++ b/src/main/java/terminus/common/CommonUtils.java @@ -128,17 +128,18 @@ public static boolean isStringNullOrEmpty(String string) { * @return True if name is a valid file name, false otherwise. */ public static boolean isValidFileName(String name) { + + if (name == null || name.isBlank() || name.length() > CommonFormat.MAX_FILENAME_LENGTH) { + return false; + } + boolean isOnlyAscii = name.chars() + .allMatch(c -> CommonFormat.STARTING_ASCII <= c && c <= CommonFormat.ENDING_ASCII); + boolean hasIllegalChar = name.chars().anyMatch(x -> CommonFormat.ILLEGAL_CHARACTERS.contains((char) x)); + if (!isOnlyAscii || hasIllegalChar) { + return false; + } try { - if (name == null || name.length() > CommonFormat.MAX_FILENAME_LENGTH) { - return false; - } Paths.get(name); - boolean isOnlyAscii = name.chars() - .allMatch(c -> CommonFormat.STARTING_ASCII <= c && c <= CommonFormat.ENDING_ASCII); - boolean hasIllegalChar = name.chars().anyMatch(x -> CommonFormat.ILLEGAL_CHARACTERS.contains((char) x)); - if (!isOnlyAscii || hasIllegalChar) { - return false; - } return true; } catch (InvalidPathException e) { return false; @@ -152,6 +153,7 @@ public static boolean isValidFileName(String name) { * @return A string of the file name without its file extension. */ public static String getFileNameOnly(String filename) { + assert filename != null; String[] string = filename.split("\\."); if (string != null && string.length == 2) { return string[0]; diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index e162c3836f..6c26311d2c 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -25,12 +25,13 @@ public class Messages { public static final String ERROR_MESSAGE_DUPLICATE_NAME = ERROR_MESSAGE_TAG + "Duplicate name found."; public static final String ERROR_FILE_TOO_LARGE = "Unable to read large files."; + public static final String ERROR_FILE_NOT_DELETED = "Unable to delete the file."; public static final String ERROR_FILES_NOT_DELETED = "Unable to delete some file."; public static final String ERROR_MESSAGE_FILE = "Unable to save/load file: %s"; public static final String ERROR_MESSAGE_FOLDER = "Unable to save/load folder: %s"; public static final String EMPTY_CONTENT_LIST_MESSAGE = "You do not have any content in this workspace.\n"; public static final String CONTENT_MESSAGE_HEADER = "List of Content\n---------------\n"; - + public static final String MAIN_BANNER = "Welcome to TermiNUS!"; public static final String NOTE_BANNER = "You have %d note(s) inside this workspace."; public static final String SCHEDULE_BANNER = "You have %d link(s) in this workspace."; diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 265537b78e..6cf63cbbfa 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -224,7 +224,9 @@ public void removeNoteFromModule(String moduleName, String noteName) throws IOEx File deleteFile = new File( Paths.get(modDirPath.toString(), noteName + CommonFormat.EXTENSION_TEXT_FILE).toString()); TerminusLogger.info("Removing file: " + deleteFile.getAbsolutePath()); - deleteFile.delete(); + if (!deleteFile.delete()) { + throw new IOException(Messages.ERROR_FILE_NOT_DELETED); + } } /** diff --git a/src/test/java/terminus/common/CommonUtilsTest.java b/src/test/java/terminus/common/CommonUtilsTest.java index 17f42ce53a..0e88e8bc49 100644 --- a/src/test/java/terminus/common/CommonUtilsTest.java +++ b/src/test/java/terminus/common/CommonUtilsTest.java @@ -198,4 +198,42 @@ void isValidUrl_invalidInput_exceptionThrown() { assertThrows(InvalidArgumentException.class, () -> CommonUtils.isValidUrl("..")); } + @Test + void isStringNullOrEmpty_success() { + assertTrue(CommonUtils.isStringNullOrEmpty(null)); + assertTrue(CommonUtils.isStringNullOrEmpty("")); + assertFalse(CommonUtils.isStringNullOrEmpty("test")); + } + + @Test + void isValidFileName_success() { + assertTrue(CommonUtils.isValidFileName("test")); + assertTrue(CommonUtils.isValidFileName("CS2113T")); + } + + @Test + void isValidFileName_invalidFileName() { + assertFalse(CommonUtils.isValidFileName("")); + assertFalse(CommonUtils.isValidFileName(null)); + assertFalse(CommonUtils.isValidFileName("\\uD83D\\uDE00")); + String s = "a".repeat(31); + assertFalse(CommonUtils.isValidFileName(s)); + } + + @Test + void getFileNameOnly_success() { + assertEquals("test", CommonUtils.getFileNameOnly("test.txt")); + } + + @Test + void getFileNameOnly_invalidFileName() { + assertEquals(null, CommonUtils.getFileNameOnly("test.txt.txt")); + assertEquals(null, CommonUtils.getFileNameOnly("")); + } + + @Test + void getFileNameOnly_nullInput_exceptionThrown() { + assertThrows(AssertionError.class, () -> CommonUtils.getFileNameOnly(null)); + } + } diff --git a/src/test/java/terminus/storage/ModuleStorageTest.java b/src/test/java/terminus/storage/ModuleStorageTest.java index cdcc875b4d..5cd467ca10 100644 --- a/src/test/java/terminus/storage/ModuleStorageTest.java +++ b/src/test/java/terminus/storage/ModuleStorageTest.java @@ -1,18 +1,23 @@ package terminus.storage; 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 com.google.gson.JsonSyntaxException; +import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.Paths; import java.time.LocalTime; import java.util.List; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.TestFilePath; +import terminus.content.ContentManager; import terminus.content.Link; import terminus.content.Note; import terminus.module.ModuleManager; @@ -30,18 +35,18 @@ public class ModuleStorageTest { @BeforeEach void setUp() throws IOException { - this.moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + this.moduleStorage = new ModuleStorage(SAVE_FILE); moduleManager = new ModuleManager(); moduleManager.setModule(tempModule); moduleManager.getModule(tempModule).getContentManager(Note.class).add(new Note("test", "test")); - moduleStorage.saveNotesFromModule(moduleManager,tempModule,true); + moduleStorage.saveNotesFromModule(moduleManager, tempModule, true); moduleManager.getModule(tempModule).getContentManager(Link.class).add(new Link("test", "tuesday", LocalTime.of(11, 11), "https://zoom.us/")); } @AfterAll static void reset() throws IOException { - ModuleStorage moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + ModuleStorage moduleStorage = new ModuleStorage(SAVE_FILE); moduleStorage.cleanAfterDeleteModule("test"); } @@ -74,6 +79,91 @@ void saveFile_success() throws IOException { assertTextFilesEqual(SAVE_FILE, VALID_FILE); } + @Test + void removeNoteFromModule_success() throws IOException { + File deletedFile = new File(Paths.get(RESOURCE_FOLDER.toString(), tempModule, "test.txt").toString()); + assertTrue(deletedFile.exists()); + moduleStorage.removeNoteFromModule(tempModule, "test"); + assertFalse(deletedFile.exists()); + } + + @Test + void addNoteFromModule_success() throws IOException { + File file = new File(Paths.get(RESOURCE_FOLDER.toString(), tempModule, "test1.txt").toString()); + assertFalse(file.exists()); + this.moduleStorage.addNoteFromModule(tempModule, new Note("test1", "test1")); + assertTrue(file.exists()); + } + + @Test + void createModuleDirectory_success() throws IOException { + File file = new File(Paths.get(RESOURCE_FOLDER.toString(), "newmod").toString()); + assertFalse(file.exists()); + this.moduleStorage.createModuleDirectory("newmod"); + assertTrue(file.exists()); + moduleStorage.cleanAfterDeleteModule("newmod"); + } + + @Test + void createModuleDirectory_invalidModuleName_exceptionThrown() { + assertThrows(AssertionError.class, () -> this.moduleStorage.createModuleDirectory("new mod")); + assertThrows(AssertionError.class, () -> this.moduleStorage.createModuleDirectory("")); + assertThrows(AssertionError.class, () -> this.moduleStorage.createModuleDirectory(null)); + } + + @Test + void cleanAfterDeleteModule_success() throws IOException { + File file = new File(Paths.get(RESOURCE_FOLDER.toString(), "newmod").toString()); + this.moduleStorage.createModuleDirectory("newmod"); + assertTrue(file.exists()); + moduleStorage.cleanAfterDeleteModule("newmod"); + assertFalse(file.exists()); + } + + @Test + void saveAllNotes_success() throws IOException { + ContentManager noteManager = this.moduleManager.getModule(tempModule).getContentManager(Note.class); + Note note1 = new Note("a", "test"); + Note note2 = new Note("b", "test"); + Note note3 = new Note("c", "test"); + File file1 = new File(Paths.get(RESOURCE_FOLDER.toString(), tempModule, "a.txt").toString()); + File file2 = new File(Paths.get(RESOURCE_FOLDER.toString(), tempModule, "b.txt").toString()); + File file3 = new File(Paths.get(RESOURCE_FOLDER.toString(), tempModule, "c.txt").toString()); + noteManager.add(note1); + noteManager.add(note2); + noteManager.add(note3); + this.moduleStorage.cleanAfterDeleteModule(tempModule); + assertFalse(file1.exists()); + assertFalse(file2.exists()); + assertFalse(file3.exists()); + this.moduleStorage.saveAllNotes(this.moduleManager); + assertTrue(file1.exists()); + assertTrue(file2.exists()); + assertTrue(file3.exists()); + } + + @Test + void loadAllNotes_success() throws IOException { + Note note1 = new Note("a", "test"); + Note note2 = new Note("b", "test"); + Note note3 = new Note("c", "test"); + File file1 = new File(Paths.get(RESOURCE_FOLDER.toString(), tempModule, "a.txt").toString()); + File file2 = new File(Paths.get(RESOURCE_FOLDER.toString(), tempModule, "b.txt").toString()); + File file3 = new File(Paths.get(RESOURCE_FOLDER.toString(), tempModule, "c.txt").toString()); + this.moduleStorage.addNoteFromModule(tempModule, note1); + this.moduleStorage.addNoteFromModule(tempModule, note2); + this.moduleStorage.addNoteFromModule(tempModule, note3); + assertTrue(file1.exists()); + assertTrue(file2.exists()); + assertTrue(file3.exists()); + assertEquals(1, + this.moduleManager.getModule(tempModule).getContentManager(Note.class).getTotalContents()); + this.moduleManager = this.moduleStorage.loadFile(); + assertEquals(4, + this.moduleManager.getModule(tempModule).getContentManager(Note.class).getTotalContents()); + } + + /** * Asserts whether the text in the two given files are the same. * Ignores any differences in line endings. From bc1758d10dcec1d7dabf3f104bdf59669a62a698 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Wed, 20 Oct 2021 19:20:20 +0800 Subject: [PATCH 178/466] Fix checkstyle in JUnit --- .../java/terminus/storage/ModuleStorageTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/terminus/storage/ModuleStorageTest.java b/src/test/java/terminus/storage/ModuleStorageTest.java index 5cd467ca10..da2c002e8a 100644 --- a/src/test/java/terminus/storage/ModuleStorageTest.java +++ b/src/test/java/terminus/storage/ModuleStorageTest.java @@ -126,13 +126,13 @@ void saveAllNotes_success() throws IOException { Note note1 = new Note("a", "test"); Note note2 = new Note("b", "test"); Note note3 = new Note("c", "test"); - File file1 = new File(Paths.get(RESOURCE_FOLDER.toString(), tempModule, "a.txt").toString()); - File file2 = new File(Paths.get(RESOURCE_FOLDER.toString(), tempModule, "b.txt").toString()); - File file3 = new File(Paths.get(RESOURCE_FOLDER.toString(), tempModule, "c.txt").toString()); noteManager.add(note1); noteManager.add(note2); noteManager.add(note3); this.moduleStorage.cleanAfterDeleteModule(tempModule); + File file1 = new File(Paths.get(RESOURCE_FOLDER.toString(), tempModule, "a.txt").toString()); + File file2 = new File(Paths.get(RESOURCE_FOLDER.toString(), tempModule, "b.txt").toString()); + File file3 = new File(Paths.get(RESOURCE_FOLDER.toString(), tempModule, "c.txt").toString()); assertFalse(file1.exists()); assertFalse(file2.exists()); assertFalse(file3.exists()); @@ -147,12 +147,12 @@ void loadAllNotes_success() throws IOException { Note note1 = new Note("a", "test"); Note note2 = new Note("b", "test"); Note note3 = new Note("c", "test"); - File file1 = new File(Paths.get(RESOURCE_FOLDER.toString(), tempModule, "a.txt").toString()); - File file2 = new File(Paths.get(RESOURCE_FOLDER.toString(), tempModule, "b.txt").toString()); - File file3 = new File(Paths.get(RESOURCE_FOLDER.toString(), tempModule, "c.txt").toString()); this.moduleStorage.addNoteFromModule(tempModule, note1); this.moduleStorage.addNoteFromModule(tempModule, note2); this.moduleStorage.addNoteFromModule(tempModule, note3); + File file1 = new File(Paths.get(RESOURCE_FOLDER.toString(), tempModule, "a.txt").toString()); + File file2 = new File(Paths.get(RESOURCE_FOLDER.toString(), tempModule, "b.txt").toString()); + File file3 = new File(Paths.get(RESOURCE_FOLDER.toString(), tempModule, "c.txt").toString()); assertTrue(file1.exists()); assertTrue(file2.exists()); assertTrue(file3.exists()); From aeebe3de9061c7d4a84ab9df133621dffb5d16fb Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Wed, 20 Oct 2021 20:01:05 +0800 Subject: [PATCH 179/466] Add environment for active recall --- .../activerecall/GameEnvironment.java | 103 ++++++++++++++++++ .../activerecall/QuestionGenerator.java | 52 +++++++++ .../command/content/question/TestCommand.java | 69 ++++++++++++ src/main/java/terminus/common/Messages.java | 3 + src/main/java/terminus/content/Question.java | 8 ++ .../parser/QuestionCommandParser.java | 2 + src/main/java/terminus/ui/Ui.java | 13 ++- src/test/resources/saveFile.json | 3 + 8 files changed, 251 insertions(+), 2 deletions(-) create mode 100644 src/main/java/terminus/activerecall/GameEnvironment.java create mode 100644 src/main/java/terminus/activerecall/QuestionGenerator.java create mode 100644 src/main/java/terminus/command/content/question/TestCommand.java diff --git a/src/main/java/terminus/activerecall/GameEnvironment.java b/src/main/java/terminus/activerecall/GameEnvironment.java new file mode 100644 index 0000000000..004cdc2a8d --- /dev/null +++ b/src/main/java/terminus/activerecall/GameEnvironment.java @@ -0,0 +1,103 @@ +package terminus.activerecall; + +import java.time.Duration; +import java.time.Instant; +import java.util.List; +import terminus.common.Messages; +import terminus.content.Question; +import terminus.ui.Ui; + +public class GameEnvironment { + + private final Ui ui; + private final QuestionGenerator questionGenerator; + + public GameEnvironment(Ui ui, List questionList, int questionCount) { + this.ui = ui; + this.questionGenerator = new QuestionGenerator(questionList, questionCount); + } + + public void run() { + showPreGameInformation(); + while (questionGenerator.hasNext()) { + Question question = questionGenerator.next(); + promptQuestion(question); + int difficulty = getUserFeedback(); + if (difficulty == -1) { + break; + } + postQuestionFeedback(); + } + ui.printSection("Ending the training session.", "Returning you back to main program."); + } + + private void showPreGameInformation() { + int questions = questionGenerator.getQuestionPool(); + ui.printSection( + "---[Active Recall]---", + "", + "We will be starting your active recall training session.", + String.format("This session will consist of %d questions.", questions), + "" + ); + ui.getUserInput(Messages.ACTIVE_RECALL_ENTER_TO_CONTINUE_MESSAGE); + } + + private void promptQuestion(Question question) { + Instant start = Instant.now(); + ui.printSection( + "", + "---", + "", + "Question:", + question.getQuestion(), + "" + ); + ui.getUserInput("Press [Enter] to reveal the answer."); + + long duration = Duration.between(start, Instant.now()).getSeconds(); + ui.printSection( + String.format("You took %d seconds to reveal the answer.", duration), + "", + "Answer:", + question.getAnswer() + ); + } + + private int getUserFeedback() { + int difficulty = 0; + do { + ui.printSection( + "", + "How did you find the question? (Compare against past attempts if any)", + "[1] Easy; [2] Normal; [3] Hard; [E] Exit" + ); + String input = ui.getUserInput("[1/2/3/E] >> "); + switch (input) { + case "1": + case "2": + case "3": + difficulty = Integer.parseInt(input); + break; + case "e": + case "E": + difficulty = -1; + } + + if (difficulty == 0) { + ui.printSection("Invalid input provided!"); + } + } while (difficulty == 0); + assert difficulty <= 3 && difficulty >= -1; + return difficulty; + } + + private void postQuestionFeedback() { + // TODO: Tweak Question Difficulty Here + ui.printSection(""); + if (questionGenerator.hasNext()) { + ui.getUserInput(Messages.ACTIVE_RECALL_ENTER_TO_CONTINUE_MESSAGE); + } + } + +} diff --git a/src/main/java/terminus/activerecall/QuestionGenerator.java b/src/main/java/terminus/activerecall/QuestionGenerator.java new file mode 100644 index 0000000000..f799de5521 --- /dev/null +++ b/src/main/java/terminus/activerecall/QuestionGenerator.java @@ -0,0 +1,52 @@ +package terminus.activerecall; + +import java.util.List; +import java.util.NavigableMap; +import java.util.Random; +import java.util.TreeMap; +import terminus.content.Question; + +public class QuestionGenerator { + + private final NavigableMap questionBank = new TreeMap<>(); + private final Random random; + private double total = 0; + private int questionCount; + + public QuestionGenerator(List questionBank, int questionCount) { + this(questionBank, questionCount, new Random()); + } + + public QuestionGenerator(List questionBank, int questionCount, Random random) { + this.questionCount = questionCount; + this.random = random; + questionBank.forEach(this::addQuestion); + } + + private void addQuestion(Question question) { + total += question.getWeight(); + questionBank.put(total, question); + } + + public int getQuestionPool() { + return Math.min(questionBank.size(), questionCount); + } + + public boolean hasNext() { + return questionCount > 0 && !(total <= 0) && !questionBank.isEmpty(); + } + + public Question next() { + if (!hasNext()) { + return null; + } + double key = random.nextDouble() * total; + Question question = questionBank.higherEntry(key).getValue(); + + questionBank.remove(question.getWeight(), question); + total -= question.getWeight(); + questionCount -= 1; + + return question; + } +} diff --git a/src/main/java/terminus/command/content/question/TestCommand.java b/src/main/java/terminus/command/content/question/TestCommand.java new file mode 100644 index 0000000000..21e24b0e98 --- /dev/null +++ b/src/main/java/terminus/command/content/question/TestCommand.java @@ -0,0 +1,69 @@ +package terminus.command.content.question; + +import java.util.ArrayList; +import terminus.activerecall.GameEnvironment; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.common.CommonFormat; +import terminus.common.CommonUtils; +import terminus.common.Messages; +import terminus.common.TerminusLogger; +import terminus.content.ContentManager; +import terminus.content.Question; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; +import terminus.module.NusModule; +import terminus.ui.Ui; + +public class TestCommand extends Command { + + private int questionCount; + + @Override + public String getFormat() { + return CommonFormat.COMMAND_TEST_QUESTION_FORMAT; + } + + @Override + public String getHelpMessage() { + return Messages.MESSAGE_COMMAND_TEST_QUESTION; + } + + @Override + public void parseArguments(String arguments) throws InvalidArgumentException { + if (CommonUtils.isStringNullOrEmpty(arguments)) { + this.questionCount = 10; + return; + } + TerminusLogger.info("Parsing question test arguments"); + try { + questionCount = Integer.parseInt(arguments); + } catch (NumberFormatException e) { + TerminusLogger.warning(String.format("Failed to parse number of questions : %s", arguments)); + throw new InvalidArgumentException(this.getFormat(), Messages.ERROR_MESSAGE_INVALID_NUMBER); + } + if (questionCount <= 0) { + TerminusLogger.warning(String.format("Invalid number of questions : %d", questionCount)); + throw new InvalidArgumentException(Messages.ERROR_MESSAGE_INVALID_NUMBER); + } + } + + @Override + public CommandResult execute(Ui ui, ModuleManager moduleManager) + throws InvalidArgumentException, InvalidCommandException { + assert getModuleName() != null; + assert questionCount > 0; + NusModule module = moduleManager.getModule(getModuleName()); + ContentManager contentManager = module.getContentManager(Question.class); + ArrayList questions = contentManager.getContents(); + if (questions.isEmpty()) { + throw new InvalidCommandException(Messages.NO_QUESTIONS_ERROR_MESSAGE); + } + + new GameEnvironment(ui, questions, questionCount).run(); + + return new CommandResult(true); + } + +} diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index d64760bb3e..8b46c49672 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -43,4 +43,7 @@ public class Messages { public static final String MESSAGE_COMMAND_MODULE_VIEW = "View all modules available"; public static final String MESSAGE_RESPONSE_MODULE_FORMAT = "%d. %s"; public static final String MESSAGE_RESPONSE_NO_MODULES = "You do not have any modules."; + public static final String NO_QUESTIONS_ERROR_MESSAGE = + "There are no questions to be tested on. Type 'questions add' to get started"; + public static final String ACTIVE_RECALL_ENTER_TO_CONTINUE_MESSAGE = "When you are ready, press [Enter] to continue."; } diff --git a/src/main/java/terminus/content/Question.java b/src/main/java/terminus/content/Question.java index 53f199c03d..7549d813d9 100644 --- a/src/main/java/terminus/content/Question.java +++ b/src/main/java/terminus/content/Question.java @@ -10,6 +10,14 @@ public Question(String question, String answer) { super(question, answer); this.weight = 0.5; } + + public String getQuestion() { + return this.name; + } + + public String getAnswer() { + return this.data; + } public double getWeight() { return weight; diff --git a/src/main/java/terminus/parser/QuestionCommandParser.java b/src/main/java/terminus/parser/QuestionCommandParser.java index 2d34028fc5..3faa3c4f43 100644 --- a/src/main/java/terminus/parser/QuestionCommandParser.java +++ b/src/main/java/terminus/parser/QuestionCommandParser.java @@ -4,6 +4,7 @@ import terminus.command.content.DeleteCommand; import terminus.command.content.ViewCommand; import terminus.command.content.question.AddQuestionCommand; +import terminus.command.content.question.TestCommand; import terminus.common.CommonFormat; import terminus.common.Messages; import terminus.content.Question; @@ -21,6 +22,7 @@ public static QuestionCommandParser getInstance() { parser.addCommand(CommonFormat.COMMAND_ADD, new AddQuestionCommand()); parser.addCommand(CommonFormat.COMMAND_VIEW, new ViewCommand<>(Question.class)); parser.addCommand(CommonFormat.COMMAND_DELETE, new DeleteCommand<>(Question.class)); + parser.addCommand(CommonFormat.COMMAND_TEST, new TestCommand()); return parser; } diff --git a/src/main/java/terminus/ui/Ui.java b/src/main/java/terminus/ui/Ui.java index 2c2badecb2..361fed3402 100644 --- a/src/main/java/terminus/ui/Ui.java +++ b/src/main/java/terminus/ui/Ui.java @@ -40,8 +40,7 @@ public String requestCommand(String workspaceName) { if (validatedWorkspaceName == null) { validatedWorkspaceName = ""; } - System.out.printf(PROMPT, validatedWorkspaceName); - return scanner.nextLine(); + return getUserInput(String.format(PROMPT, validatedWorkspaceName)); } /** @@ -59,4 +58,14 @@ public void printSection(String... strings) { public void printExitMessage() { System.out.println("Goodbye!"); } + + /** + * Get the input of the user through the Scanner. + * + * @return The user input from the Scanner. + */ + public String getUserInput(String prompt) { + System.out.print(prompt); + return scanner.nextLine(); + } } diff --git a/src/test/resources/saveFile.json b/src/test/resources/saveFile.json index df07f97b9b..e138957b92 100644 --- a/src/test/resources/saveFile.json +++ b/src/test/resources/saveFile.json @@ -23,6 +23,9 @@ "name": "test" } ] + }, + "questionManager": { + "contents": [] } } } From dc4410466a3f5ac659d4696841eca2469bf77bad Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Wed, 20 Oct 2021 20:33:43 +0800 Subject: [PATCH 180/466] Modify welcome banner to include user schedule for the day --- .../terminus/command/TimetableCommand.java | 37 ++++++++++++------- .../java/terminus/common/CommonFormat.java | 5 ++- .../java/terminus/common/CommonUtils.java | 11 ++++++ .../java/terminus/common/DaysOfWeekEnum.java | 4 +- src/main/java/terminus/common/Messages.java | 4 +- .../terminus/parser/MainCommandParser.java | 22 ++++++++++- 6 files changed, 63 insertions(+), 20 deletions(-) diff --git a/src/main/java/terminus/command/TimetableCommand.java b/src/main/java/terminus/command/TimetableCommand.java index f56d9a1b0d..1dca4c5094 100644 --- a/src/main/java/terminus/command/TimetableCommand.java +++ b/src/main/java/terminus/command/TimetableCommand.java @@ -16,6 +16,7 @@ public class TimetableCommand extends Command { private String day; + static int index = 0; public TimetableCommand() { @@ -59,13 +60,12 @@ public void parseArguments(String arguments) throws InvalidArgumentException { * @param contentManager ContentManager object containing all user's links * @return StringBuilder of all the schedules for the particular day */ - public StringBuilder listDailySchedule(ContentManager contentManager) { + public static StringBuilder listDailySchedule(ContentManager contentManager, String currentDay) { StringBuilder dailySchedule = new StringBuilder(); - int i = 0; for (Link schedule : contentManager.getContents()) { - if (schedule.getDay().equalsIgnoreCase(day)) { - i++; - dailySchedule.append(String.format("%d. %s\n", i, schedule.getViewDescription())); + if (schedule.getDay().equalsIgnoreCase(currentDay)) { + index++; + dailySchedule.append(String.format("%d. %s\n", index, schedule.getViewDescription())); } } return dailySchedule; @@ -77,16 +77,19 @@ public StringBuilder listDailySchedule(ContentManager contentManager) { * @param result The string containing the retrieved user schedule * @param moduleManager ModuleManager object containing all the module from which the schedules are retrieved */ - public void getDailySchedule(StringBuilder result, ModuleManager moduleManager) { + public static boolean getDailySchedule(StringBuilder result, ModuleManager moduleManager, String today) { String[] modules = moduleManager.getAllModules(); + for (String moduleName : modules) { NusModule module = moduleManager.getModule(moduleName); ContentManager contentManager = module.getContentManager(Link.class); - if (listDailySchedule(contentManager).length() != 0) { - String header = String.format("%s:\n", day); - result.append(header.toUpperCase()); - result.append(listDailySchedule(contentManager)); - } + result.append(listDailySchedule(contentManager, today)); + } + index = 0; + if (result.toString().isEmpty()) { + return false; + } else { + return true; } } @@ -98,8 +101,15 @@ public void getDailySchedule(StringBuilder result, ModuleManager moduleManager) */ public void getWeeklySchedule(StringBuilder result, ModuleManager moduleManager) { for (DaysOfWeekEnum currentDay : DaysOfWeekEnum.values()) { + StringBuilder dailyResult = new StringBuilder(); day = currentDay.toString(); - getDailySchedule(result, moduleManager); + String today = day; + if (getDailySchedule(dailyResult, moduleManager, today)) { + String header = String.format("%s:\n", day); + result.append(header.toUpperCase()); + result.append(dailyResult); + } + index = 0; } } @@ -127,7 +137,8 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) { if (isStringNullOrEmpty(day)) { getWeeklySchedule(result, moduleManager); } else { - getDailySchedule(result, moduleManager); + String currentDay = day; + getDailySchedule(result, moduleManager, currentDay); } checkEmptySchedule(result); diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index 1043a51d4e..c429a61dc5 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -15,6 +15,8 @@ public class CommonFormat { public static final String COMMAND_HELP = "help"; public static final String COMMAND_SCHEDULE = "schedule"; public static final String COMMAND_TIMETABLE = "timetable"; + public static final String COMMAND_MODULE = "module"; + public static final String COMMAND_GO = "go"; public static final String LOCAL_TIME_FORMAT = "HH:mm"; @@ -30,6 +32,5 @@ public class CommonFormat { public static final String COMMAND_ADD_MODULE_FORMAT = "add \"\""; public static final String COMMAND_VIEW_MODULE_FORMAT = "view"; public static final String SPACE_NEGATED_DELIMITER = "\\S+"; - public static final String COMMAND_MODULE = "module"; - public static final String COMMAND_GO = "go"; + } diff --git a/src/main/java/terminus/common/CommonUtils.java b/src/main/java/terminus/common/CommonUtils.java index 766ecf5871..104020971e 100644 --- a/src/main/java/terminus/common/CommonUtils.java +++ b/src/main/java/terminus/common/CommonUtils.java @@ -1,6 +1,7 @@ package terminus.common; import java.net.URL; +import java.time.LocalDate; import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; @@ -117,4 +118,14 @@ public static boolean isValidDay(String day) { public static boolean isStringNullOrEmpty(String string) { return string == null || string.isBlank(); } + + /** + * Function to get today's day of the week. + * + * @return A string indicating today's day + */ + public static String getCurrentDay() { + String currentDay = LocalDate.now().getDayOfWeek().toString(); + return currentDay; + } } diff --git a/src/main/java/terminus/common/DaysOfWeekEnum.java b/src/main/java/terminus/common/DaysOfWeekEnum.java index 9579ead132..c5105ebf3b 100644 --- a/src/main/java/terminus/common/DaysOfWeekEnum.java +++ b/src/main/java/terminus/common/DaysOfWeekEnum.java @@ -1,11 +1,11 @@ package terminus.common; public enum DaysOfWeekEnum { - SUNDAY, MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, - SATURDAY + SATURDAY, + SUNDAY } diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index 694d467e03..cafc6360a6 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -26,7 +26,8 @@ public class Messages { public static final String EMPTY_CONTENT_LIST_MESSAGE = "You do not have any content in this workspace.\n"; public static final String CONTENT_MESSAGE_HEADER = "List of Content\n---------------\n"; - public static final String MAIN_BANNER = "Welcome to TermiNUS!"; + public static final String MAIN_BANNER = "Welcome to TermiNUS!\n"; + public static final String MAIN_REMINDER = "This is your schedule today:\n"; public static final String NOTE_BANNER = "You have %d note(s) inside this workspace."; public static final String SCHEDULE_BANNER = "You have %d link(s) in this workspace."; public static final String INVALID_ARGUMENT_FORMAT_MESSAGE_EXCEPTION = "%s %s"; @@ -41,4 +42,5 @@ public class Messages { public static final String MESSAGE_COMMAND_MODULE_VIEW = "View all modules available"; public static final String MESSAGE_RESPONSE_MODULE_FORMAT = "%d. %s"; public static final String MESSAGE_RESPONSE_NO_MODULES = "You do not have any modules."; + public static final String MESSAGE_EMPTY_DAILY_SCHEDULE = "You have no schedule for today."; } diff --git a/src/main/java/terminus/parser/MainCommandParser.java b/src/main/java/terminus/parser/MainCommandParser.java index 1e75338c50..4242f9c64d 100644 --- a/src/main/java/terminus/parser/MainCommandParser.java +++ b/src/main/java/terminus/parser/MainCommandParser.java @@ -7,6 +7,9 @@ import terminus.common.Messages; import terminus.module.ModuleManager; +import static terminus.command.TimetableCommand.getDailySchedule; +import static terminus.common.CommonUtils.getCurrentDay; + public class MainCommandParser extends CommandParser { private static MainCommandParser parser; @@ -20,13 +23,28 @@ public static MainCommandParser getInstance() { parser = new MainCommandParser(); parser.addCommand(CommonFormat.COMMAND_MODULE, new ModuleCommand()); parser.addCommand(CommonFormat.COMMAND_GO, new GoCommand()); - parser.addCommand("timetable", new TimetableCommand()); + parser.addCommand(CommonFormat.COMMAND_TIMETABLE, new TimetableCommand()); } return parser; } @Override public String getWorkspaceBanner(ModuleManager moduleManager) { - return Messages.MAIN_BANNER; + String mainReminder = getMainReminder(moduleManager); + return Messages.MAIN_BANNER + mainReminder; + } + + public String getMainReminder(ModuleManager moduleManager) { + StringBuilder result = new StringBuilder(); + StringBuilder dailySchedule = new StringBuilder(); + String currentDay = getCurrentDay(); + + if (getDailySchedule(dailySchedule, moduleManager, currentDay)) { + result.append(Messages.MAIN_REMINDER); + result.append(dailySchedule); + } else { + result.append(Messages.MESSAGE_EMPTY_DAILY_SCHEDULE); + } + return result.toString(); } } From 10da0f541bc4255ee458e5c0ac0473abc839118a Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Wed, 20 Oct 2021 20:49:07 +0800 Subject: [PATCH 181/466] Add assertions and logging --- src/main/java/terminus/command/TimetableCommand.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/terminus/command/TimetableCommand.java b/src/main/java/terminus/command/TimetableCommand.java index 1dca4c5094..409d128eb2 100644 --- a/src/main/java/terminus/command/TimetableCommand.java +++ b/src/main/java/terminus/command/TimetableCommand.java @@ -52,6 +52,7 @@ public void parseArguments(String arguments) throws InvalidArgumentException { TerminusLogger.warning(String.format("Invalid Day: %s", day)); throw new InvalidArgumentException(String.format(Messages.ERROR_MESSAGE_INVALID_DAY, day)); } + TerminusLogger.info(String.format("Parsed arguments (day = %s) to Timetable Command", day)); } /** @@ -83,7 +84,9 @@ public static boolean getDailySchedule(StringBuilder result, ModuleManager modul for (String moduleName : modules) { NusModule module = moduleManager.getModule(moduleName); ContentManager contentManager = module.getContentManager(Link.class); + assert contentManager != null; result.append(listDailySchedule(contentManager, today)); + TerminusLogger.info(String.format("Successfully acquire %s's schedule for %s", moduleName, today)); } index = 0; if (result.toString().isEmpty()) { @@ -105,9 +108,12 @@ public void getWeeklySchedule(StringBuilder result, ModuleManager moduleManager) day = currentDay.toString(); String today = day; if (getDailySchedule(dailyResult, moduleManager, today)) { + assert dailyResult != null; String header = String.format("%s:\n", day); result.append(header.toUpperCase()); result.append(dailyResult); + assert result != null; + TerminusLogger.info(String.format("Successfully acquire %s's schedule", day)); } index = 0; } @@ -120,6 +126,7 @@ public void getWeeklySchedule(StringBuilder result, ModuleManager moduleManager) */ public void checkEmptySchedule(StringBuilder result) { if (result.toString().isBlank()) { + TerminusLogger.info("There is no schedule in the user's timetable"); result.append(Messages.EMPTY_CONTENT_LIST_MESSAGE); } } @@ -137,6 +144,7 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) { if (isStringNullOrEmpty(day)) { getWeeklySchedule(result, moduleManager); } else { + assert day != null; String currentDay = day; getDailySchedule(result, moduleManager, currentDay); } From 3a7060ffe468afd6d03857175ac79ee861645880 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Wed, 20 Oct 2021 21:43:25 +0800 Subject: [PATCH 182/466] Add ability to tweak weights based on user input --- .../activerecall/DifficultyTweaker.java | 51 +++++++++++++++++++ .../activerecall/GameEnvironment.java | 28 +++++----- src/main/java/terminus/common/Messages.java | 9 +++- src/test/resources/malformedFile.json | 3 ++ src/test/resources/validFile.json | 3 ++ 5 files changed, 81 insertions(+), 13 deletions(-) create mode 100644 src/main/java/terminus/activerecall/DifficultyTweaker.java diff --git a/src/main/java/terminus/activerecall/DifficultyTweaker.java b/src/main/java/terminus/activerecall/DifficultyTweaker.java new file mode 100644 index 0000000000..0abf680437 --- /dev/null +++ b/src/main/java/terminus/activerecall/DifficultyTweaker.java @@ -0,0 +1,51 @@ +package terminus.activerecall; + +public class DifficultyTweaker { + + private static final double MIN_VALUE = 0.2; + private static final double MAX_VALUE = 0.9; + private static final double MAX_INCREASE = 0.45; + private static final double GROWTH_RATE = 8; + private static final double LOG_CURVE_MIDPOINT = 0.4; + + /** + * Get the value to increment or decrement by based on the logistic curve. + * + * @param x The difficulty difference + * @return The increment or decrement to apply to the question randomness weight. + */ + private static double getCurveValue(double x) { + double exponentValue = -1 * DifficultyTweaker.GROWTH_RATE * (x - DifficultyTweaker.LOG_CURVE_MIDPOINT); + double denominator = (1 + Math.exp(exponentValue)); + return DifficultyTweaker.MAX_INCREASE / denominator; + } + + /** + * Get the new randomness weightage of the question if the question is deemed easy. + * + * @param initial The current randomness weightage of the question + * @return The new randomness weightage of the question + */ + public static double tweakEasyQuestionDifficulty(double initial) { + if (initial <= MIN_VALUE) { + return MIN_VALUE; + } + double difference = initial - MIN_VALUE; + return initial - getCurveValue(difference); + } + + /** + * Get the new randomness weightage of the question if the question is deemed hard. + * + * @param initial The current randomness weightage of the question + * @return The new randomness weightage of the question + */ + public static double tweakHardQuestionDifficulty(double initial) { + if (initial >= MAX_VALUE) { + return MAX_VALUE; + } + double difference = MAX_VALUE - initial; + return initial + getCurveValue(difference); + } + +} diff --git a/src/main/java/terminus/activerecall/GameEnvironment.java b/src/main/java/terminus/activerecall/GameEnvironment.java index 004cdc2a8d..40e696a6ae 100644 --- a/src/main/java/terminus/activerecall/GameEnvironment.java +++ b/src/main/java/terminus/activerecall/GameEnvironment.java @@ -26,9 +26,9 @@ public void run() { if (difficulty == -1) { break; } - postQuestionFeedback(); + postQuestionFeedback(question, difficulty); } - ui.printSection("Ending the training session.", "Returning you back to main program."); + ui.printSection(Messages.ACTIVE_RECALL_SESSION_END_MESSAGE); } private void showPreGameInformation() { @@ -53,7 +53,7 @@ private void promptQuestion(Question question) { question.getQuestion(), "" ); - ui.getUserInput("Press [Enter] to reveal the answer."); + ui.getUserInput(Messages.ACTIVE_RECALL_ENTER_TO_CONTINUE_MESSAGE); long duration = Duration.between(start, Instant.now()).getSeconds(); ui.printSection( @@ -67,13 +67,9 @@ private void promptQuestion(Question question) { private int getUserFeedback() { int difficulty = 0; do { - ui.printSection( - "", - "How did you find the question? (Compare against past attempts if any)", - "[1] Easy; [2] Normal; [3] Hard; [E] Exit" - ); + ui.printSection(Messages.ACTIVE_RECALL_ASK_QUESTION_DIFFICULTY_MESSAGE); String input = ui.getUserInput("[1/2/3/E] >> "); - switch (input) { + switch (input.trim()) { case "1": case "2": case "3": @@ -82,18 +78,26 @@ private int getUserFeedback() { case "e": case "E": difficulty = -1; + break; + default: + break; } if (difficulty == 0) { - ui.printSection("Invalid input provided!"); + ui.printSection(Messages.ERROR_MESSAGE_INVALID_INPUT); } } while (difficulty == 0); assert difficulty <= 3 && difficulty >= -1; return difficulty; } - private void postQuestionFeedback() { - // TODO: Tweak Question Difficulty Here + private void postQuestionFeedback(Question question, int difficulty) { + assert difficulty >= 1 && difficulty <= 3; + if (difficulty == 1) { + question.setWeight(DifficultyTweaker.tweakEasyQuestionDifficulty(question.getWeight())); + } else if (difficulty == 3) { + question.setWeight(DifficultyTweaker.tweakHardQuestionDifficulty(question.getWeight())); + } ui.printSection(""); if (questionGenerator.hasNext()) { ui.getUserInput(Messages.ACTIVE_RECALL_ENTER_TO_CONTINUE_MESSAGE); diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index 8b46c49672..eb981f3466 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -18,6 +18,7 @@ public class Messages { public static final String ERROR_MESSAGE_TAG = "Error: "; + public static final String ERROR_MESSAGE_INVALID_INPUT = ERROR_MESSAGE_TAG + "Invalid input provided."; public static final String ERROR_MESSAGE_MISSING_ARGUMENTS = ERROR_MESSAGE_TAG + "Missing arguments."; public static final String ERROR_MESSAGE_EMPTY_CONTENTS = ERROR_MESSAGE_TAG + "Content not found."; public static final String ERROR_MESSAGE_INVALID_NUMBER = ERROR_MESSAGE_TAG + "Invalid numerical value provided."; @@ -45,5 +46,11 @@ public class Messages { public static final String MESSAGE_RESPONSE_NO_MODULES = "You do not have any modules."; public static final String NO_QUESTIONS_ERROR_MESSAGE = "There are no questions to be tested on. Type 'questions add' to get started"; - public static final String ACTIVE_RECALL_ENTER_TO_CONTINUE_MESSAGE = "When you are ready, press [Enter] to continue."; + public static final String ACTIVE_RECALL_ENTER_TO_CONTINUE_MESSAGE = + "When you are ready, press [Enter] to continue."; + public static final String[] ACTIVE_RECALL_SESSION_END_MESSAGE = {"This training session has ended.", + "Returning you back to main program."}; + public static final String[] ACTIVE_RECALL_ASK_QUESTION_DIFFICULTY_MESSAGE = {"", + "How did you find the question? (Compare against past attempts if any)", + "[1] Easy; [2] Normal / Same; [3] Hard; [E] Exit"}; } diff --git a/src/test/resources/malformedFile.json b/src/test/resources/malformedFile.json index 827cface1c..51fb674d80 100644 --- a/src/test/resources/malformedFile.json +++ b/src/test/resources/malformedFile.json @@ -21,5 +21,8 @@ "name": "test" } ] + }, + "questionManager": { + "contents": [] } } \ No newline at end of file diff --git a/src/test/resources/validFile.json b/src/test/resources/validFile.json index df07f97b9b..e138957b92 100644 --- a/src/test/resources/validFile.json +++ b/src/test/resources/validFile.json @@ -23,6 +23,9 @@ "name": "test" } ] + }, + "questionManager": { + "contents": [] } } } From 0a0bc989415e218477e661c9e275b980680a9e71 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Wed, 20 Oct 2021 21:50:06 +0800 Subject: [PATCH 183/466] Add JUnit Test --- .../command/TimetableCommandTest.java | 125 ++++++++++++++++++ text-ui-test/EXPECTED.TXT | 2 + 2 files changed, 127 insertions(+) create mode 100644 src/test/java/terminus/command/TimetableCommandTest.java diff --git a/src/test/java/terminus/command/TimetableCommandTest.java b/src/test/java/terminus/command/TimetableCommandTest.java new file mode 100644 index 0000000000..0cd97e4bc6 --- /dev/null +++ b/src/test/java/terminus/command/TimetableCommandTest.java @@ -0,0 +1,125 @@ +package terminus.command; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; +import terminus.parser.LinkCommandParser; +import terminus.parser.MainCommandParser; +import terminus.ui.Ui; + +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertThrows; + +public class TimetableCommandTest { + + private MainCommandParser mainCommandParser; + private LinkCommandParser linkCommandParser; + private ModuleManager moduleManager; + private Ui ui; + + private String tempModule1 = "test1"; + + @BeforeEach + void setUp() { + this.mainCommandParser = mainCommandParser.getInstance(); + this.linkCommandParser = LinkCommandParser.getInstance(); + this.linkCommandParser.setModuleName(tempModule1); + this.moduleManager = new ModuleManager(); + moduleManager.setModule(tempModule1); + this.ui = new Ui(); + } + + @Test + void execute_viewWeekly_success() throws InvalidArgumentException, InvalidCommandException { + for (int i = 0; i < 5; i++) { + Command addLinkCommand = linkCommandParser.parseCommand( + "add \"test\" \"Saturday\" \"00:00\" \"https://zoom.us/test\""); + CommandResult addLinkResult = addLinkCommand.execute(ui, moduleManager); + assertTrue(addLinkResult.isOk()); + } + + Command timetableCommand = mainCommandParser.parseCommand("timetable"); + CommandResult timetableResult = timetableCommand.execute(ui, moduleManager); + assertTrue(timetableResult.isOk()); + + for (int i = 0; i < 5; i++) { + Command addLinkCommand = linkCommandParser.parseCommand( + "add \"test\" \"Friday\" \"00:00\" \"https://zoom.us/test\""); + CommandResult addLinkResult = addLinkCommand.execute(ui, moduleManager); + assertTrue(addLinkResult.isOk()); + } + + Command timetableCommand1 = mainCommandParser.parseCommand("timetable"); + CommandResult timetableResult1 = timetableCommand1.execute(ui, moduleManager); + assertTrue(timetableResult1.isOk()); + + for (int i = 0; i < 5; i++) { + Command addLinkCommand = linkCommandParser.parseCommand( + "add \"test\" \"Sunday\" \"00:00\" \"https://zoom.us/test\""); + CommandResult addLinkResult = addLinkCommand.execute(ui, moduleManager); + assertTrue(addLinkResult.isOk()); + } + + Command timetableCommand2 = mainCommandParser.parseCommand("timetable"); + CommandResult timetableResult2 = timetableCommand2.execute(ui, moduleManager); + assertTrue(timetableResult2.isOk()); + } + + @Test + void execute_viewDaily_success() throws InvalidArgumentException, InvalidCommandException { + for (int i = 0; i < 5; i++) { + Command addLinkCommand = linkCommandParser.parseCommand( + "add \"test\" \"Tuesday\" \"00:00\" \"https://zoom.us/test\""); + CommandResult addLinkResult = addLinkCommand.execute(ui, moduleManager); + assertTrue(addLinkResult.isOk()); + } + + for (int i = 0; i < 5; i++) { + Command addLinkCommand = linkCommandParser.parseCommand( + "add \"test\" \"Wednesday\" \"00:00\" \"https://zoom.us/test\""); + CommandResult addLinkResult = addLinkCommand.execute(ui, moduleManager); + assertTrue(addLinkResult.isOk()); + } + + for (int i = 0; i < 5; i++) { + Command addLinkCommand = linkCommandParser.parseCommand( + "add \"test\" \"Thursday\" \"00:00\" \"https://zoom.us/test\""); + CommandResult addLinkResult = addLinkCommand.execute(ui, moduleManager); + assertTrue(addLinkResult.isOk()); + } + + Command timetableCommand = mainCommandParser.parseCommand("timetable Saturday"); + CommandResult timetableResult = timetableCommand.execute(ui, moduleManager); + assertTrue(timetableResult.isOk()); + + Command timetableCommand1 = mainCommandParser.parseCommand("timetable Saturday"); + CommandResult timetableResult1 = timetableCommand1.execute(ui, moduleManager); + assertTrue(timetableResult1.isOk()); + + Command timetableCommand2 = mainCommandParser.parseCommand("timetable Saturday"); + CommandResult timetableResult2 = timetableCommand2.execute(ui, moduleManager); + assertTrue(timetableResult2.isOk()); + + Command timetableCommand3 = mainCommandParser.parseCommand("timetable Saturday"); + CommandResult timetableResult3 = timetableCommand3.execute(ui, moduleManager); + assertTrue(timetableResult3.isOk()); + } + + @Test + void execute_viewDaily_exceptionThrown() throws InvalidArgumentException, InvalidCommandException { + for (int i = 0; i < 5; i++) { + Command addLinkCommand = linkCommandParser.parseCommand( + "add \"test\" \"Saturday\" \"00:00\" \"https://zoom.us/test\""); + CommandResult addLinkResult = addLinkCommand.execute(ui, moduleManager); + assertTrue(addLinkResult.isOk()); + } + + assertThrows(InvalidArgumentException.class, () -> mainCommandParser.parseCommand("timetable -1")); + assertThrows(InvalidArgumentException.class, () -> mainCommandParser.parseCommand("timetable .")); + assertThrows(InvalidArgumentException.class, () -> mainCommandParser.parseCommand("timetable today")); + assertThrows(InvalidArgumentException.class, () -> mainCommandParser.parseCommand("timetable mondayyy")); + assertThrows(InvalidArgumentException.class, () -> mainCommandParser.parseCommand("timetable yesterday")); + } +} \ No newline at end of file diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index aef4f07aa0..ebadaa595f 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -1,11 +1,13 @@ Welcome to TermiNUS! +You have no schedule for today. Type any of the following to get started: > exit > help > module > go +> timetable [] >>> Command not found! Type 'help' for a list of commands. [] >>> Command not found! Type 'help' for a list of commands. From 63f5eb5a01b2d72b6f55595a88434250c80cb82c Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Wed, 20 Oct 2021 23:00:14 +0800 Subject: [PATCH 184/466] Abstract methods to separate timetable class --- .../terminus/command/TimetableCommand.java | 93 ++----------------- .../terminus/parser/MainCommandParser.java | 2 +- .../java/terminus/timetable/Timetable.java | 89 ++++++++++++++++++ 3 files changed, 98 insertions(+), 86 deletions(-) create mode 100644 src/main/java/terminus/timetable/Timetable.java diff --git a/src/main/java/terminus/command/TimetableCommand.java b/src/main/java/terminus/command/TimetableCommand.java index 409d128eb2..8575656d33 100644 --- a/src/main/java/terminus/command/TimetableCommand.java +++ b/src/main/java/terminus/command/TimetableCommand.java @@ -1,32 +1,28 @@ package terminus.command; import terminus.common.CommonFormat; -import terminus.common.DaysOfWeekEnum; import terminus.common.Messages; import terminus.common.TerminusLogger; -import terminus.content.ContentManager; -import terminus.content.Link; import terminus.exception.InvalidArgumentException; import terminus.module.ModuleManager; -import terminus.module.NusModule; import terminus.ui.Ui; import static terminus.common.CommonUtils.isStringNullOrEmpty; import static terminus.common.CommonUtils.isValidDay; +import static terminus.timetable.Timetable.getWeeklySchedule; +import static terminus.timetable.Timetable.getDailySchedule; +import static terminus.timetable.Timetable.checkEmptySchedule; public class TimetableCommand extends Command { - private String day; - static int index = 0; - - public TimetableCommand() { - } + private String day; /** * Returns the format of the command. * * @return The string object holding the appropriate format for the timetable command */ + @Override public String getFormat() { return CommonFormat.COMMAND_TIMETABLE_FORMAT; } @@ -36,6 +32,7 @@ public String getFormat() { * * @return The String object containing the description for the timetable command. */ + @Override public String getHelpMessage() { return Messages.MESSAGE_COMMAND_TIMETABLE; } @@ -46,6 +43,7 @@ public String getHelpMessage() { * @param arguments The string arguments to be parsed in to the respective fields. * @throws InvalidArgumentException when arguments are invalid */ + @Override public void parseArguments(String arguments) throws InvalidArgumentException { day = arguments; if (!isStringNullOrEmpty(day) && !isValidDay(day)) { @@ -55,82 +53,6 @@ public void parseArguments(String arguments) throws InvalidArgumentException { TerminusLogger.info(String.format("Parsed arguments (day = %s) to Timetable Command", day)); } - /** - * Lists all the schedule for a particular day. - * - * @param contentManager ContentManager object containing all user's links - * @return StringBuilder of all the schedules for the particular day - */ - public static StringBuilder listDailySchedule(ContentManager contentManager, String currentDay) { - StringBuilder dailySchedule = new StringBuilder(); - for (Link schedule : contentManager.getContents()) { - if (schedule.getDay().equalsIgnoreCase(currentDay)) { - index++; - dailySchedule.append(String.format("%d. %s\n", index, schedule.getViewDescription())); - } - } - return dailySchedule; - } - - /** - * Retrieve and format all the user's schedule for the particular day. - * - * @param result The string containing the retrieved user schedule - * @param moduleManager ModuleManager object containing all the module from which the schedules are retrieved - */ - public static boolean getDailySchedule(StringBuilder result, ModuleManager moduleManager, String today) { - String[] modules = moduleManager.getAllModules(); - - for (String moduleName : modules) { - NusModule module = moduleManager.getModule(moduleName); - ContentManager contentManager = module.getContentManager(Link.class); - assert contentManager != null; - result.append(listDailySchedule(contentManager, today)); - TerminusLogger.info(String.format("Successfully acquire %s's schedule for %s", moduleName, today)); - } - index = 0; - if (result.toString().isEmpty()) { - return false; - } else { - return true; - } - } - - /** - * Retrieve and format all the user's schedule for the week. - * - * @param result The string containing the retrieved user schedule - * @param moduleManager ModuleManager object containing all the module from which the schedules are retrieved - */ - public void getWeeklySchedule(StringBuilder result, ModuleManager moduleManager) { - for (DaysOfWeekEnum currentDay : DaysOfWeekEnum.values()) { - StringBuilder dailyResult = new StringBuilder(); - day = currentDay.toString(); - String today = day; - if (getDailySchedule(dailyResult, moduleManager, today)) { - assert dailyResult != null; - String header = String.format("%s:\n", day); - result.append(header.toUpperCase()); - result.append(dailyResult); - assert result != null; - TerminusLogger.info(String.format("Successfully acquire %s's schedule", day)); - } - index = 0; - } - } - - /** - * Print empty message for empty user schedule. - * - * @param result The string containing the retrieved user schedule - */ - public void checkEmptySchedule(StringBuilder result) { - if (result.toString().isBlank()) { - TerminusLogger.info("There is no schedule in the user's timetable"); - result.append(Messages.EMPTY_CONTENT_LIST_MESSAGE); - } - } - /** * Executes the timetable command. Prints the relevant response to the Ui. * @@ -138,6 +60,7 @@ public void checkEmptySchedule(StringBuilder result) { * @param moduleManager The NusModule contain the ContentManager of all notes and schedules. * @return CommandResult to indicate the success and additional information about the execution. */ + @Override public CommandResult execute(Ui ui, ModuleManager moduleManager) { StringBuilder result = new StringBuilder(); diff --git a/src/main/java/terminus/parser/MainCommandParser.java b/src/main/java/terminus/parser/MainCommandParser.java index 4242f9c64d..1a2ab222ae 100644 --- a/src/main/java/terminus/parser/MainCommandParser.java +++ b/src/main/java/terminus/parser/MainCommandParser.java @@ -7,8 +7,8 @@ import terminus.common.Messages; import terminus.module.ModuleManager; -import static terminus.command.TimetableCommand.getDailySchedule; import static terminus.common.CommonUtils.getCurrentDay; +import static terminus.timetable.Timetable.getDailySchedule; public class MainCommandParser extends CommandParser { diff --git a/src/main/java/terminus/timetable/Timetable.java b/src/main/java/terminus/timetable/Timetable.java new file mode 100644 index 0000000000..90f5a9dd80 --- /dev/null +++ b/src/main/java/terminus/timetable/Timetable.java @@ -0,0 +1,89 @@ +package terminus.timetable; + +import terminus.common.DaysOfWeekEnum; +import terminus.common.Messages; +import terminus.common.TerminusLogger; +import terminus.content.ContentManager; +import terminus.content.Link; +import terminus.module.ModuleManager; +import terminus.module.NusModule; + +public class Timetable { + + private static int index = 0; + + /** + * Lists all the schedule for a particular day. + * + * @param contentManager ContentManager object containing all user's links + * @return StringBuilder of all the schedules for the particular day + */ + public static StringBuilder listDailySchedule(ContentManager contentManager, String currentDay) { + StringBuilder dailySchedule = new StringBuilder(); + for (Link schedule : contentManager.getContents()) { + if (schedule.getDay().equalsIgnoreCase(currentDay)) { + index++; + dailySchedule.append(String.format("%d. %s\n", index, schedule.getViewDescription())); + } + } + return dailySchedule; + } + + /** + * Retrieve and format all the user's schedule for the particular day. + * + * @param result The string containing the retrieved user schedule + * @param moduleManager ModuleManager object containing all the module from which the schedules are retrieved + */ + public static boolean getDailySchedule(StringBuilder result, ModuleManager moduleManager, String today) { + String[] modules = moduleManager.getAllModules(); + + for (String moduleName : modules) { + NusModule module = moduleManager.getModule(moduleName); + ContentManager contentManager = module.getContentManager(Link.class); + assert contentManager != null; + result.append(listDailySchedule(contentManager, today)); + TerminusLogger.info(String.format("Successfully acquire %s's schedule for %s", moduleName, today)); + } + index = 0; + if (result.toString().isEmpty()) { + return false; + } else { + return true; + } + } + + /** + * Retrieve and format all the user's schedule for the week. + * + * @param result The string containing the retrieved user schedule + * @param moduleManager ModuleManager object containing all the module from which the schedules are retrieved + */ + public static void getWeeklySchedule(StringBuilder result, ModuleManager moduleManager) { + for (DaysOfWeekEnum currentDay : DaysOfWeekEnum.values()) { + StringBuilder dailyResult = new StringBuilder(); + String today = currentDay.toString(); + if (getDailySchedule(dailyResult, moduleManager, today)) { + assert dailyResult != null; + String header = String.format("%s:\n", today); + result.append(header.toUpperCase()); + result.append(dailyResult); + assert result != null; + TerminusLogger.info(String.format("Successfully acquire %s's schedule", today)); + } + index = 0; + } + } + + /** + * Print empty message for empty user schedule. + * + * @param result The string containing the retrieved user schedule + */ + public static void checkEmptySchedule(StringBuilder result) { + if (result.toString().isBlank()) { + TerminusLogger.info("There is no schedule in the user's timetable"); + result.append(Messages.EMPTY_CONTENT_LIST_MESSAGE); + } + } +} From 6ba33b3b7d6cfe6164c1d0480fe8b164dfa14055 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Wed, 20 Oct 2021 23:04:02 +0800 Subject: [PATCH 185/466] Update instance method --- src/main/java/terminus/storage/ModuleStorage.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 6cf63cbbfa..e7271cf32e 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -44,6 +44,9 @@ public ModuleStorage(Path filePath) { * @return ModuleStorage object of current session. */ public static ModuleStorage getInstance() { + if (moduleStorage == null) { + moduleStorage = new ModuleStorage(Path.of(System.getProperty("user.dir"), "data")); + } return moduleStorage; } From a46759253db56d23dbcd47ed6e6e604c98b6a986 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Wed, 20 Oct 2021 23:42:03 +0800 Subject: [PATCH 186/466] Fix singleton for moduleStorage to private constructor --- src/main/java/terminus/Terminus.java | 3 ++- .../java/terminus/storage/ModuleStorage.java | 18 +++++++++------ .../java/terminus/command/GoCommandTest.java | 5 ++-- .../terminus/command/ModuleCommandTest.java | 5 ++-- .../terminus/command/NoteCommandTest.java | 5 ++-- .../content/note/AddNoteCommandTest.java | 5 ++-- .../content/note/DeleteNoteCommandTest.java | 5 ++-- .../content/note/ViewNoteCommandTest.java | 5 ++-- .../command/module/AddModuleCommandTest.java | 5 ++-- .../module/DeleteModuleCommandTest.java | 5 ++-- .../terminus/storage/ModuleStorageTest.java | 23 ++++++++++++------- 11 files changed, 52 insertions(+), 32 deletions(-) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index c9cba3c0bf..e6e0e222d6 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -57,7 +57,8 @@ private void start() { this.ui = new Ui(); this.parser = MainCommandParser.getInstance(); this.workspace = ""; - this.moduleStorage = new ModuleStorage(DATA_DIRECTORY.resolve(MAIN_JSON)); + this.moduleStorage = ModuleStorage.getInstance(); + this.moduleStorage.init(DATA_DIRECTORY.resolve(MAIN_JSON)); this.moduleManager = new ModuleManager(); TerminusLogger.info("Loading file..."); this.moduleManager = moduleStorage.loadFile(); diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index e7271cf32e..16c8464eb2 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -22,22 +22,26 @@ */ public class ModuleStorage { - private final Path filePath; + private Path filePath; private final Gson gson; private static ModuleStorage moduleStorage; + private ModuleStorage() { + this.filePath = null; + this.gson = new GsonBuilder().setPrettyPrinting().create(); + } + /** - * Initializes the ModuleStorage with a specific Path to the file. + * Stores the given filepath for the singleton ModuleStorage. * - * @param filePath The Path to the file to store at. + * @param filePath The path to the file to store at. */ - public ModuleStorage(Path filePath) { + public void init(Path filePath) { this.filePath = filePath; - this.gson = new GsonBuilder().setPrettyPrinting().create(); - moduleStorage = this; } + /** * Returns the singleton object of ModuleStorage. * @@ -45,7 +49,7 @@ public ModuleStorage(Path filePath) { */ public static ModuleStorage getInstance() { if (moduleStorage == null) { - moduleStorage = new ModuleStorage(Path.of(System.getProperty("user.dir"), "data")); + moduleStorage = new ModuleStorage(); } return moduleStorage; } diff --git a/src/test/java/terminus/command/GoCommandTest.java b/src/test/java/terminus/command/GoCommandTest.java index 2834ef8b3e..900d348c7c 100644 --- a/src/test/java/terminus/command/GoCommandTest.java +++ b/src/test/java/terminus/command/GoCommandTest.java @@ -32,7 +32,8 @@ public class GoCommandTest { @BeforeEach void setUp() throws IOException { - this.moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + this.moduleStorage = ModuleStorage.getInstance(); + this.moduleStorage.init(TestFilePath.SAVE_FILE); this.moduleStorage.createModuleDirectory(tempModule); this.commandParser = MainCommandParser.getInstance(); this.moduleManager = new ModuleManager(); @@ -42,7 +43,7 @@ void setUp() throws IOException { @AfterAll static void reset() throws IOException { - ModuleStorage moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + ModuleStorage moduleStorage = ModuleStorage.getInstance(); moduleStorage.cleanAfterDeleteModule("test"); } diff --git a/src/test/java/terminus/command/ModuleCommandTest.java b/src/test/java/terminus/command/ModuleCommandTest.java index 349dafc6ec..7432663434 100644 --- a/src/test/java/terminus/command/ModuleCommandTest.java +++ b/src/test/java/terminus/command/ModuleCommandTest.java @@ -28,7 +28,8 @@ public class ModuleCommandTest { @BeforeEach void setUp() { - this.moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + this.moduleStorage = ModuleStorage.getInstance(); + this.moduleStorage.init(TestFilePath.SAVE_FILE); commandParser = MainCommandParser.getInstance(); moduleManager = new ModuleManager(); ui = new Ui(); @@ -36,7 +37,7 @@ void setUp() { @AfterAll static void reset() throws IOException { - ModuleStorage moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + ModuleStorage moduleStorage = ModuleStorage.getInstance(); moduleStorage.cleanAfterDeleteModule("test"); } diff --git a/src/test/java/terminus/command/NoteCommandTest.java b/src/test/java/terminus/command/NoteCommandTest.java index 12b44bbdd6..0f30892a6c 100644 --- a/src/test/java/terminus/command/NoteCommandTest.java +++ b/src/test/java/terminus/command/NoteCommandTest.java @@ -29,7 +29,8 @@ public class NoteCommandTest { @BeforeEach void setUp() throws IOException { - this.moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + this.moduleStorage = ModuleStorage.getInstance(); + this.moduleStorage.init(TestFilePath.SAVE_FILE); this.moduleStorage.createModuleDirectory(tempModule); commandParser = MainCommandParser.getInstance(); moduleManager = new ModuleManager(); @@ -39,7 +40,7 @@ void setUp() throws IOException { @AfterAll static void reset() throws IOException { - ModuleStorage moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + ModuleStorage moduleStorage = ModuleStorage.getInstance(); moduleStorage.cleanAfterDeleteModule("test"); } diff --git a/src/test/java/terminus/command/content/note/AddNoteCommandTest.java b/src/test/java/terminus/command/content/note/AddNoteCommandTest.java index c2c4c36340..13a350c814 100644 --- a/src/test/java/terminus/command/content/note/AddNoteCommandTest.java +++ b/src/test/java/terminus/command/content/note/AddNoteCommandTest.java @@ -34,7 +34,8 @@ public class AddNoteCommandTest { @BeforeEach void setUp() throws IOException { - this.moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + this.moduleStorage = ModuleStorage.getInstance(); + this.moduleStorage.init(TestFilePath.SAVE_FILE); this.moduleStorage.createModuleDirectory(tempModule); this.moduleManager = new ModuleManager(); moduleManager.setModule(tempModule); @@ -45,7 +46,7 @@ void setUp() throws IOException { @AfterAll static void reset() throws IOException { - ModuleStorage moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + ModuleStorage moduleStorage = ModuleStorage.getInstance(); moduleStorage.cleanAfterDeleteModule("test"); } diff --git a/src/test/java/terminus/command/content/note/DeleteNoteCommandTest.java b/src/test/java/terminus/command/content/note/DeleteNoteCommandTest.java index 02dbd572e7..20c36d3fc5 100644 --- a/src/test/java/terminus/command/content/note/DeleteNoteCommandTest.java +++ b/src/test/java/terminus/command/content/note/DeleteNoteCommandTest.java @@ -32,7 +32,8 @@ public class DeleteNoteCommandTest { @BeforeEach void setUp() throws IOException { - this.moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + this.moduleStorage = ModuleStorage.getInstance(); + this.moduleStorage.init(TestFilePath.SAVE_FILE); this.moduleStorage.createModuleDirectory(tempModule); this.moduleManager = new ModuleManager(); moduleManager.setModule(tempModule); @@ -43,7 +44,7 @@ void setUp() throws IOException { @AfterAll static void reset() throws IOException { - ModuleStorage moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + ModuleStorage moduleStorage = ModuleStorage.getInstance(); moduleStorage.cleanAfterDeleteModule("test"); } diff --git a/src/test/java/terminus/command/content/note/ViewNoteCommandTest.java b/src/test/java/terminus/command/content/note/ViewNoteCommandTest.java index 513f53a6b1..071e75fe34 100644 --- a/src/test/java/terminus/command/content/note/ViewNoteCommandTest.java +++ b/src/test/java/terminus/command/content/note/ViewNoteCommandTest.java @@ -32,7 +32,8 @@ public class ViewNoteCommandTest { @BeforeEach void setUp() throws IOException { - this.moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + this.moduleStorage = ModuleStorage.getInstance(); + this.moduleStorage.init(TestFilePath.SAVE_FILE); this.moduleStorage.createModuleDirectory(tempModule); this.moduleManager = new ModuleManager(); moduleManager.setModule(tempModule); @@ -43,7 +44,7 @@ void setUp() throws IOException { @AfterAll static void reset() throws IOException { - ModuleStorage moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + ModuleStorage moduleStorage = ModuleStorage.getInstance(); moduleStorage.cleanAfterDeleteModule("test"); } diff --git a/src/test/java/terminus/command/module/AddModuleCommandTest.java b/src/test/java/terminus/command/module/AddModuleCommandTest.java index 1a1ec4ac2f..d15dfa8e01 100644 --- a/src/test/java/terminus/command/module/AddModuleCommandTest.java +++ b/src/test/java/terminus/command/module/AddModuleCommandTest.java @@ -27,7 +27,8 @@ public class AddModuleCommandTest { @BeforeEach void setUp() { - this.moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + this.moduleStorage = ModuleStorage.getInstance(); + this.moduleStorage.init(TestFilePath.SAVE_FILE); this.moduleManager = new ModuleManager(); this.commandParser = ModuleCommandParser.getInstance(); this.ui = new Ui(); @@ -35,7 +36,7 @@ void setUp() { @AfterAll static void reset() throws IOException { - ModuleStorage moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + ModuleStorage moduleStorage = ModuleStorage.getInstance(); moduleStorage.cleanAfterDeleteModule("test"); } diff --git a/src/test/java/terminus/command/module/DeleteModuleCommandTest.java b/src/test/java/terminus/command/module/DeleteModuleCommandTest.java index 47f3189baf..ae3fe72d47 100644 --- a/src/test/java/terminus/command/module/DeleteModuleCommandTest.java +++ b/src/test/java/terminus/command/module/DeleteModuleCommandTest.java @@ -29,7 +29,8 @@ public class DeleteModuleCommandTest { @BeforeEach void setUp() throws IOException { - this.moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + this.moduleStorage = ModuleStorage.getInstance(); + this.moduleStorage.init(TestFilePath.SAVE_FILE); this.moduleStorage.createModuleDirectory(tempModule); this.moduleManager = new ModuleManager(); this.commandParser = ModuleCommandParser.getInstance(); @@ -39,7 +40,7 @@ void setUp() throws IOException { @AfterAll static void reset() throws IOException { - ModuleStorage moduleStorage = new ModuleStorage(TestFilePath.SAVE_FILE); + ModuleStorage moduleStorage = ModuleStorage.getInstance(); moduleStorage.cleanAfterDeleteModule("test"); } diff --git a/src/test/java/terminus/storage/ModuleStorageTest.java b/src/test/java/terminus/storage/ModuleStorageTest.java index da2c002e8a..f9a214d9e8 100644 --- a/src/test/java/terminus/storage/ModuleStorageTest.java +++ b/src/test/java/terminus/storage/ModuleStorageTest.java @@ -14,6 +14,7 @@ import java.time.LocalTime; import java.util.List; import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.TestFilePath; @@ -35,7 +36,8 @@ public class ModuleStorageTest { @BeforeEach void setUp() throws IOException { - this.moduleStorage = new ModuleStorage(SAVE_FILE); + this.moduleStorage = ModuleStorage.getInstance(); + this.moduleStorage.init(SAVE_FILE); moduleManager = new ModuleManager(); moduleManager.setModule(tempModule); moduleManager.getModule(tempModule).getContentManager(Note.class).add(new Note("test", "test")); @@ -44,21 +46,26 @@ void setUp() throws IOException { LocalTime.of(11, 11), "https://zoom.us/")); } + @AfterEach + void reset_filepath() { + this.moduleStorage.init(SAVE_FILE); + } + @AfterAll static void reset() throws IOException { - ModuleStorage moduleStorage = new ModuleStorage(SAVE_FILE); + ModuleStorage moduleStorage = ModuleStorage.getInstance(); moduleStorage.cleanAfterDeleteModule("test"); } @Test void loadFile_invalidJson_exceptionThrown() { - ModuleStorage moduleStorage = new ModuleStorage(MALFORMED_FILE); + this.moduleStorage.init(MALFORMED_FILE); assertThrows(JsonSyntaxException.class, moduleStorage::loadFile); } @Test void loadFile_success() throws IOException { - ModuleStorage moduleStorage = new ModuleStorage(VALID_FILE); + this.moduleStorage.init(VALID_FILE); ModuleManager module = moduleStorage.loadFile(); assertEquals(module.getModule(tempModule).getContentManager(Note.class).listAllContents(), moduleManager.getModule(tempModule).getContentManager(Note.class).listAllContents()); @@ -68,14 +75,14 @@ void loadFile_success() throws IOException { @Test void saveFile_nullArgument_exceptionThrown() { - ModuleStorage saveModuleStorage = new ModuleStorage(SAVE_FILE); - assertThrows(NullPointerException.class, () -> saveModuleStorage.saveFile(null)); + this.moduleStorage.init(SAVE_FILE); + assertThrows(NullPointerException.class, () -> moduleStorage.saveFile(null)); } @Test void saveFile_success() throws IOException { - ModuleStorage saveModuleStorage = new ModuleStorage(SAVE_FILE); - saveModuleStorage.saveFile(moduleManager); + this.moduleStorage.init(SAVE_FILE); + moduleStorage.saveFile(moduleManager); assertTextFilesEqual(SAVE_FILE, VALID_FILE); } From e8a0b41663bcf43345ce24b10663a501b5feeb72 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Wed, 20 Oct 2021 23:48:06 +0800 Subject: [PATCH 187/466] Address PR comments --- .../terminus/command/TimetableCommand.java | 15 +++++------ .../terminus/parser/MainCommandParser.java | 5 ++-- .../java/terminus/timetable/Timetable.java | 27 ++++++++++--------- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/main/java/terminus/command/TimetableCommand.java b/src/main/java/terminus/command/TimetableCommand.java index 8575656d33..2065175942 100644 --- a/src/main/java/terminus/command/TimetableCommand.java +++ b/src/main/java/terminus/command/TimetableCommand.java @@ -5,13 +5,11 @@ import terminus.common.TerminusLogger; import terminus.exception.InvalidArgumentException; import terminus.module.ModuleManager; +import terminus.timetable.Timetable; import terminus.ui.Ui; import static terminus.common.CommonUtils.isStringNullOrEmpty; import static terminus.common.CommonUtils.isValidDay; -import static terminus.timetable.Timetable.getWeeklySchedule; -import static terminus.timetable.Timetable.getDailySchedule; -import static terminus.timetable.Timetable.checkEmptySchedule; public class TimetableCommand extends Command { @@ -20,7 +18,7 @@ public class TimetableCommand extends Command { /** * Returns the format of the command. * - * @return The string object holding the appropriate format for the timetable command + * @return The string object holding the appropriate format for the timetable command. */ @Override public String getFormat() { @@ -41,7 +39,7 @@ public String getHelpMessage() { * Parses remaining arguments for the timetable command. * * @param arguments The string arguments to be parsed in to the respective fields. - * @throws InvalidArgumentException when arguments are invalid + * @throws InvalidArgumentException when arguments are invalid. */ @Override public void parseArguments(String arguments) throws InvalidArgumentException { @@ -63,16 +61,17 @@ public void parseArguments(String arguments) throws InvalidArgumentException { @Override public CommandResult execute(Ui ui, ModuleManager moduleManager) { StringBuilder result = new StringBuilder(); + Timetable timetable = new Timetable(); if (isStringNullOrEmpty(day)) { - getWeeklySchedule(result, moduleManager); + timetable.getWeeklySchedule(result, moduleManager); } else { assert day != null; String currentDay = day; - getDailySchedule(result, moduleManager, currentDay); + timetable.getDailySchedule(result, moduleManager, currentDay); } - checkEmptySchedule(result); + timetable.checkEmptySchedule(result); ui.printSection(result.toString()); return new CommandResult(true, false); } diff --git a/src/main/java/terminus/parser/MainCommandParser.java b/src/main/java/terminus/parser/MainCommandParser.java index 1a2ab222ae..59c3b22b0d 100644 --- a/src/main/java/terminus/parser/MainCommandParser.java +++ b/src/main/java/terminus/parser/MainCommandParser.java @@ -6,9 +6,9 @@ import terminus.common.CommonFormat; import terminus.common.Messages; import terminus.module.ModuleManager; +import terminus.timetable.Timetable; import static terminus.common.CommonUtils.getCurrentDay; -import static terminus.timetable.Timetable.getDailySchedule; public class MainCommandParser extends CommandParser { @@ -38,8 +38,9 @@ public String getMainReminder(ModuleManager moduleManager) { StringBuilder result = new StringBuilder(); StringBuilder dailySchedule = new StringBuilder(); String currentDay = getCurrentDay(); + Timetable timetable = new Timetable(); - if (getDailySchedule(dailySchedule, moduleManager, currentDay)) { + if (timetable.getDailySchedule(dailySchedule, moduleManager, currentDay)) { result.append(Messages.MAIN_REMINDER); result.append(dailySchedule); } else { diff --git a/src/main/java/terminus/timetable/Timetable.java b/src/main/java/terminus/timetable/Timetable.java index 90f5a9dd80..9c628b72a1 100644 --- a/src/main/java/terminus/timetable/Timetable.java +++ b/src/main/java/terminus/timetable/Timetable.java @@ -10,15 +10,18 @@ public class Timetable { - private static int index = 0; + private int index = 0; + + public Timetable() { + } /** * Lists all the schedule for a particular day. * - * @param contentManager ContentManager object containing all user's links - * @return StringBuilder of all the schedules for the particular day + * @param contentManager ContentManager object containing all user's links. + * @return StringBuilder of all the schedules for the particular day. */ - public static StringBuilder listDailySchedule(ContentManager contentManager, String currentDay) { + public StringBuilder listDailySchedule(ContentManager contentManager, String currentDay) { StringBuilder dailySchedule = new StringBuilder(); for (Link schedule : contentManager.getContents()) { if (schedule.getDay().equalsIgnoreCase(currentDay)) { @@ -32,10 +35,10 @@ public static StringBuilder listDailySchedule(ContentManager contentManage /** * Retrieve and format all the user's schedule for the particular day. * - * @param result The string containing the retrieved user schedule - * @param moduleManager ModuleManager object containing all the module from which the schedules are retrieved + * @param result The string containing the retrieved user schedule. + * @param moduleManager ModuleManager object containing all the module from which the schedules are retrieved. */ - public static boolean getDailySchedule(StringBuilder result, ModuleManager moduleManager, String today) { + public boolean getDailySchedule(StringBuilder result, ModuleManager moduleManager, String today) { String[] modules = moduleManager.getAllModules(); for (String moduleName : modules) { @@ -56,10 +59,10 @@ public static boolean getDailySchedule(StringBuilder result, ModuleManager modul /** * Retrieve and format all the user's schedule for the week. * - * @param result The string containing the retrieved user schedule - * @param moduleManager ModuleManager object containing all the module from which the schedules are retrieved + * @param result The string containing the retrieved user schedule. + * @param moduleManager ModuleManager object containing all the module from which the schedules are retrieved. */ - public static void getWeeklySchedule(StringBuilder result, ModuleManager moduleManager) { + public void getWeeklySchedule(StringBuilder result, ModuleManager moduleManager) { for (DaysOfWeekEnum currentDay : DaysOfWeekEnum.values()) { StringBuilder dailyResult = new StringBuilder(); String today = currentDay.toString(); @@ -78,9 +81,9 @@ public static void getWeeklySchedule(StringBuilder result, ModuleManager moduleM /** * Print empty message for empty user schedule. * - * @param result The string containing the retrieved user schedule + * @param result The string containing the retrieved user schedule. */ - public static void checkEmptySchedule(StringBuilder result) { + public void checkEmptySchedule(StringBuilder result) { if (result.toString().isBlank()) { TerminusLogger.info("There is no schedule in the user's timetable"); result.append(Messages.EMPTY_CONTENT_LIST_MESSAGE); From 937fd632374ca1bdd5fe77db6fdc729dbd943b45 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Wed, 20 Oct 2021 23:51:45 +0800 Subject: [PATCH 188/466] Change all singleton constructors to private --- src/main/java/terminus/parser/LinkCommandParser.java | 2 +- src/main/java/terminus/parser/MainCommandParser.java | 2 +- src/main/java/terminus/parser/ModuleCommandParser.java | 2 +- src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java | 2 +- src/main/java/terminus/parser/NoteCommandParser.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/terminus/parser/LinkCommandParser.java b/src/main/java/terminus/parser/LinkCommandParser.java index 2e585f13d5..f2e738998a 100644 --- a/src/main/java/terminus/parser/LinkCommandParser.java +++ b/src/main/java/terminus/parser/LinkCommandParser.java @@ -16,7 +16,7 @@ public class LinkCommandParser extends InnerModuleCommandParser { private static LinkCommandParser parser; - public LinkCommandParser() { + private LinkCommandParser() { super(CommonFormat.COMMAND_SCHEDULE); } diff --git a/src/main/java/terminus/parser/MainCommandParser.java b/src/main/java/terminus/parser/MainCommandParser.java index 5703329c87..8ddbdc831c 100644 --- a/src/main/java/terminus/parser/MainCommandParser.java +++ b/src/main/java/terminus/parser/MainCommandParser.java @@ -10,7 +10,7 @@ public class MainCommandParser extends CommandParser { private static MainCommandParser parser; - public MainCommandParser() { + private MainCommandParser() { super(""); } diff --git a/src/main/java/terminus/parser/ModuleCommandParser.java b/src/main/java/terminus/parser/ModuleCommandParser.java index ad341d5532..47e20ceee4 100644 --- a/src/main/java/terminus/parser/ModuleCommandParser.java +++ b/src/main/java/terminus/parser/ModuleCommandParser.java @@ -14,7 +14,7 @@ public class ModuleCommandParser extends CommandParser { /** * Initializes the commandMap. Adds some default commands to it. */ - public ModuleCommandParser() { + private ModuleCommandParser() { super(CommonFormat.COMMAND_MODULE); } diff --git a/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java b/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java index 9de754ced1..42eda76059 100644 --- a/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java +++ b/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java @@ -16,7 +16,7 @@ public class ModuleWorkspaceCommandParser extends CommandParser { /** * Initializes the commandMap. Adds some default commands to it. */ - public ModuleWorkspaceCommandParser() { + private ModuleWorkspaceCommandParser() { super(""); } diff --git a/src/main/java/terminus/parser/NoteCommandParser.java b/src/main/java/terminus/parser/NoteCommandParser.java index 44a5486d94..33fd67789e 100644 --- a/src/main/java/terminus/parser/NoteCommandParser.java +++ b/src/main/java/terminus/parser/NoteCommandParser.java @@ -14,7 +14,7 @@ public class NoteCommandParser extends InnerModuleCommandParser { private static NoteCommandParser parser; - public NoteCommandParser() { + private NoteCommandParser() { super(CommonFormat.COMMAND_NOTE); } From ee73ce425821630909c86d2b44a641120db112b7 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Thu, 21 Oct 2021 00:03:55 +0800 Subject: [PATCH 189/466] Fix JUnit test for exit command test --- src/test/java/terminus/command/ExitCommandTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/terminus/command/ExitCommandTest.java b/src/test/java/terminus/command/ExitCommandTest.java index 16eb0acef4..cb1b5d3949 100644 --- a/src/test/java/terminus/command/ExitCommandTest.java +++ b/src/test/java/terminus/command/ExitCommandTest.java @@ -45,12 +45,12 @@ void execute_success() throws InvalidArgumentException, InvalidCommandException, assertTrue(scheduleExitResult.isOk() && scheduleExitResult.isExit()); Command goCommandExitCommand = commandParser.parseCommand("go " + tempModule + " " + CommonFormat.COMMAND_EXIT); - CommandResult goCommandExitCommandResult = scheduleExitCommand.execute(ui, moduleManager); + CommandResult goCommandExitCommandResult = goCommandExitCommand.execute(ui, moduleManager); assertTrue(goCommandExitCommandResult.isOk() && goCommandExitCommandResult.isExit()); Command moduleCommandExitCommand = commandParser.parseCommand("module " + CommonFormat.COMMAND_EXIT); - CommandResult moduleCommandExitCommandResult = scheduleExitCommand.execute(ui, moduleManager); + CommandResult moduleCommandExitCommandResult = moduleCommandExitCommand.execute(ui, moduleManager); assertTrue(moduleCommandExitCommandResult.isOk() && moduleCommandExitCommandResult.isExit()); } } From bfeb4de1e044a3604e2f9ee31a4c26c27781c729 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Thu, 21 Oct 2021 02:08:41 +0800 Subject: [PATCH 190/466] Add JUnit testing and Javadocs Modify code to PR comments. --- ...tyTweaker.java => DifficultyModifier.java} | 10 +- .../activerecall/GameEnvironment.java | 54 +++++--- .../activerecall/QuestionGenerator.java | 46 +++++- .../command/content/question/TestCommand.java | 2 +- .../parser/ModuleWorkspaceCommandParser.java | 1 + .../parser/QuestionCommandParser.java | 16 ++- src/main/java/terminus/ui/Ui.java | 7 +- .../activerecall/DifficultyModifierTest.java | 26 ++++ .../activerecall/GameEnvironmentTest.java | 93 +++++++++++++ .../activerecall/QuestionGeneratorTest.java | 71 ++++++++++ .../terminus/command/QuestionCommandTest.java | 59 ++++++++ .../question/AddQuestionCommandTest.java | 52 +++++++ .../question/BackQuestionCommandTest.java | 41 ++++++ .../question/DeleteQuestionCommandTest.java | 66 +++++++++ .../content/question/TestCommandTest.java | 54 ++++++++ .../question/ViewQuestionCommandTest.java | 85 ++++++++++++ .../parser/QuestionCommandParserTest.java | 131 ++++++++++++++++++ 17 files changed, 774 insertions(+), 40 deletions(-) rename src/main/java/terminus/activerecall/{DifficultyTweaker.java => DifficultyModifier.java} (81%) create mode 100644 src/test/java/terminus/activerecall/DifficultyModifierTest.java create mode 100644 src/test/java/terminus/activerecall/GameEnvironmentTest.java create mode 100644 src/test/java/terminus/activerecall/QuestionGeneratorTest.java create mode 100644 src/test/java/terminus/command/QuestionCommandTest.java create mode 100644 src/test/java/terminus/command/content/question/AddQuestionCommandTest.java create mode 100644 src/test/java/terminus/command/content/question/BackQuestionCommandTest.java create mode 100644 src/test/java/terminus/command/content/question/DeleteQuestionCommandTest.java create mode 100644 src/test/java/terminus/command/content/question/TestCommandTest.java create mode 100644 src/test/java/terminus/command/content/question/ViewQuestionCommandTest.java create mode 100644 src/test/java/terminus/parser/QuestionCommandParserTest.java diff --git a/src/main/java/terminus/activerecall/DifficultyTweaker.java b/src/main/java/terminus/activerecall/DifficultyModifier.java similarity index 81% rename from src/main/java/terminus/activerecall/DifficultyTweaker.java rename to src/main/java/terminus/activerecall/DifficultyModifier.java index 0abf680437..112e63a732 100644 --- a/src/main/java/terminus/activerecall/DifficultyTweaker.java +++ b/src/main/java/terminus/activerecall/DifficultyModifier.java @@ -1,6 +1,6 @@ package terminus.activerecall; -public class DifficultyTweaker { +public class DifficultyModifier { private static final double MIN_VALUE = 0.2; private static final double MAX_VALUE = 0.9; @@ -15,9 +15,9 @@ public class DifficultyTweaker { * @return The increment or decrement to apply to the question randomness weight. */ private static double getCurveValue(double x) { - double exponentValue = -1 * DifficultyTweaker.GROWTH_RATE * (x - DifficultyTweaker.LOG_CURVE_MIDPOINT); + double exponentValue = -1 * DifficultyModifier.GROWTH_RATE * (x - DifficultyModifier.LOG_CURVE_MIDPOINT); double denominator = (1 + Math.exp(exponentValue)); - return DifficultyTweaker.MAX_INCREASE / denominator; + return DifficultyModifier.MAX_INCREASE / denominator; } /** @@ -31,7 +31,7 @@ public static double tweakEasyQuestionDifficulty(double initial) { return MIN_VALUE; } double difference = initial - MIN_VALUE; - return initial - getCurveValue(difference); + return Math.max(MIN_VALUE, initial - getCurveValue(difference)); } /** @@ -45,7 +45,7 @@ public static double tweakHardQuestionDifficulty(double initial) { return MAX_VALUE; } double difference = MAX_VALUE - initial; - return initial + getCurveValue(difference); + return Math.min(MAX_VALUE, initial + getCurveValue(difference)); } } diff --git a/src/main/java/terminus/activerecall/GameEnvironment.java b/src/main/java/terminus/activerecall/GameEnvironment.java index 40e696a6ae..9964bb58c3 100644 --- a/src/main/java/terminus/activerecall/GameEnvironment.java +++ b/src/main/java/terminus/activerecall/GameEnvironment.java @@ -3,6 +3,8 @@ import java.time.Duration; import java.time.Instant; import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import terminus.common.Messages; import terminus.content.Question; import terminus.ui.Ui; @@ -12,11 +14,14 @@ public class GameEnvironment { private final Ui ui; private final QuestionGenerator questionGenerator; - public GameEnvironment(Ui ui, List questionList, int questionCount) { + GameEnvironment(Ui ui, QuestionGenerator generator) { this.ui = ui; - this.questionGenerator = new QuestionGenerator(questionList, questionCount); + this.questionGenerator = generator; } - + + /** + * Starts the active recall session. + */ public void run() { showPreGameInformation(); while (questionGenerator.hasNext()) { @@ -32,7 +37,7 @@ public void run() { } private void showPreGameInformation() { - int questions = questionGenerator.getQuestionPool(); + int questions = questionGenerator.getQuestionPoolSize(); ui.printSection( "---[Active Recall]---", "", @@ -68,24 +73,18 @@ private int getUserFeedback() { int difficulty = 0; do { ui.printSection(Messages.ACTIVE_RECALL_ASK_QUESTION_DIFFICULTY_MESSAGE); - String input = ui.getUserInput("[1/2/3/E] >> "); - switch (input.trim()) { - case "1": - case "2": - case "3": - difficulty = Integer.parseInt(input); - break; - case "e": - case "E": + String input = ui.getUserInput("[1/2/3/E] >> ").trim().toLowerCase(); + Pattern inputPattern = Pattern.compile("^[123e]$"); + Matcher matcher = inputPattern.matcher(input); + if (!matcher.matches()) { + ui.printSection(Messages.ERROR_MESSAGE_INVALID_INPUT); + continue; + } else if (input.equalsIgnoreCase("e")) { difficulty = -1; break; - default: - break; } + difficulty = Integer.parseInt(input); - if (difficulty == 0) { - ui.printSection(Messages.ERROR_MESSAGE_INVALID_INPUT); - } } while (difficulty == 0); assert difficulty <= 3 && difficulty >= -1; return difficulty; @@ -93,10 +92,13 @@ private int getUserFeedback() { private void postQuestionFeedback(Question question, int difficulty) { assert difficulty >= 1 && difficulty <= 3; + double weight = question.getWeight(); if (difficulty == 1) { - question.setWeight(DifficultyTweaker.tweakEasyQuestionDifficulty(question.getWeight())); + double newWeight = DifficultyModifier.tweakEasyQuestionDifficulty(weight); + question.setWeight(newWeight); } else if (difficulty == 3) { - question.setWeight(DifficultyTweaker.tweakHardQuestionDifficulty(question.getWeight())); + double newWeight = DifficultyModifier.tweakHardQuestionDifficulty(weight); + question.setWeight(newWeight); } ui.printSection(""); if (questionGenerator.hasNext()) { @@ -104,4 +106,16 @@ private void postQuestionFeedback(Question question, int difficulty) { } } + /** + * Create a new GameEnvironment instance. + * + * @param ui The UI to handle all input and output. + * @param questions The list of questions to ask from. + * @param questionCount The maximum number of questions. + * @return The new GameEnvironment to start the Active Recall. + */ + public static GameEnvironment createNewEnvironment(Ui ui, List questions, int questionCount) { + return new GameEnvironment(ui, new QuestionGenerator(questions, questionCount)); + } + } diff --git a/src/main/java/terminus/activerecall/QuestionGenerator.java b/src/main/java/terminus/activerecall/QuestionGenerator.java index f799de5521..c94df6cc16 100644 --- a/src/main/java/terminus/activerecall/QuestionGenerator.java +++ b/src/main/java/terminus/activerecall/QuestionGenerator.java @@ -1,6 +1,7 @@ package terminus.activerecall; import java.util.List; +import java.util.Map.Entry; import java.util.NavigableMap; import java.util.Random; import java.util.TreeMap; @@ -13,10 +14,23 @@ public class QuestionGenerator { private double total = 0; private int questionCount; + /** + * Instantiates a QuestionGenerator. + * + * @param questionBank The list of questions to pick from. + * @param questionCount The maximum number of questions to pull. + */ public QuestionGenerator(List questionBank, int questionCount) { this(questionBank, questionCount, new Random()); } + /** + * Instantiates a QuestionGenerator with a specific Random generator. + * + * @param questionBank The list of questions to pick from. + * @param questionCount The maximum number of questions to pull. + * @param random The random generator to determine the order of questions. + */ public QuestionGenerator(List questionBank, int questionCount, Random random) { this.questionCount = questionCount; this.random = random; @@ -27,23 +41,41 @@ private void addQuestion(Question question) { total += question.getWeight(); questionBank.put(total, question); } - - public int getQuestionPool() { + + /** + * Gets the size of the question pool. + * + * @return The size of the question pool. + */ + public int getQuestionPoolSize() { return Math.min(questionBank.size(), questionCount); } - + + /** + * Checks if there are still questions left in the pool, + * or if the maximum number of questions have been asked. + * + * @return Return false if there are no questions left, or if the maximum number of questions have been asked. + */ public boolean hasNext() { return questionCount > 0 && !(total <= 0) && !questionBank.isEmpty(); } - + + /** + * Gets the next question from the question pool randomly. + * + * @return The next question from the question pool. + * @throws NullPointerException When there are no questions left. + */ public Question next() { if (!hasNext()) { - return null; + throw new NullPointerException("There are no questions left."); } double key = random.nextDouble() * total; - Question question = questionBank.higherEntry(key).getValue(); + Entry keyValuePair = questionBank.higherEntry(key); + Question question = keyValuePair.getValue(); - questionBank.remove(question.getWeight(), question); + questionBank.remove(keyValuePair.getKey(), question); total -= question.getWeight(); questionCount -= 1; diff --git a/src/main/java/terminus/command/content/question/TestCommand.java b/src/main/java/terminus/command/content/question/TestCommand.java index 21e24b0e98..04c18076fe 100644 --- a/src/main/java/terminus/command/content/question/TestCommand.java +++ b/src/main/java/terminus/command/content/question/TestCommand.java @@ -61,7 +61,7 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) throw new InvalidCommandException(Messages.NO_QUESTIONS_ERROR_MESSAGE); } - new GameEnvironment(ui, questions, questionCount).run(); + GameEnvironment.createNewEnvironment(ui, questions, questionCount).run(); return new CommandResult(true); } diff --git a/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java b/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java index eaa58c2f9e..907f058fc8 100644 --- a/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java +++ b/src/main/java/terminus/parser/ModuleWorkspaceCommandParser.java @@ -27,6 +27,7 @@ public static ModuleWorkspaceCommandParser getInstance() { parser.addCommand(CommonFormat.COMMAND_BACK, new BackCommand()); parser.addCommand(CommonFormat.COMMAND_NOTE, new NotesCommand()); parser.addCommand(CommonFormat.COMMAND_SCHEDULE, new ScheduleCommand()); + parser.addCommand(CommonFormat.COMMAND_QUESTION, new QuestionCommand()); } return parser; } diff --git a/src/main/java/terminus/parser/QuestionCommandParser.java b/src/main/java/terminus/parser/QuestionCommandParser.java index 3faa3c4f43..cfd70e3b28 100644 --- a/src/main/java/terminus/parser/QuestionCommandParser.java +++ b/src/main/java/terminus/parser/QuestionCommandParser.java @@ -12,17 +12,21 @@ public class QuestionCommandParser extends InnerModuleCommandParser { + private static QuestionCommandParser parser; + public QuestionCommandParser() { super(CommonFormat.COMMAND_QUESTION); } public static QuestionCommandParser getInstance() { - QuestionCommandParser parser = new QuestionCommandParser(); - parser.addCommand(CommonFormat.COMMAND_BACK, new BackCommand()); - parser.addCommand(CommonFormat.COMMAND_ADD, new AddQuestionCommand()); - parser.addCommand(CommonFormat.COMMAND_VIEW, new ViewCommand<>(Question.class)); - parser.addCommand(CommonFormat.COMMAND_DELETE, new DeleteCommand<>(Question.class)); - parser.addCommand(CommonFormat.COMMAND_TEST, new TestCommand()); + if (parser == null) { + parser = new QuestionCommandParser(); + parser.addCommand(CommonFormat.COMMAND_BACK, new BackCommand()); + parser.addCommand(CommonFormat.COMMAND_ADD, new AddQuestionCommand()); + parser.addCommand(CommonFormat.COMMAND_VIEW, new ViewCommand<>(Question.class)); + parser.addCommand(CommonFormat.COMMAND_DELETE, new DeleteCommand<>(Question.class)); + parser.addCommand(CommonFormat.COMMAND_TEST, new TestCommand()); + } return parser; } diff --git a/src/main/java/terminus/ui/Ui.java b/src/main/java/terminus/ui/Ui.java index 361fed3402..15ea8571b3 100644 --- a/src/main/java/terminus/ui/Ui.java +++ b/src/main/java/terminus/ui/Ui.java @@ -1,5 +1,6 @@ package terminus.ui; +import java.io.InputStream; import java.util.Arrays; import java.util.Scanner; import terminus.module.ModuleManager; @@ -12,7 +13,11 @@ public class Ui { private final Scanner scanner; public Ui() { - this.scanner = new Scanner(System.in); + this(System.in); + } + + public Ui(InputStream in) { + this.scanner = new Scanner(in); } /** diff --git a/src/test/java/terminus/activerecall/DifficultyModifierTest.java b/src/test/java/terminus/activerecall/DifficultyModifierTest.java new file mode 100644 index 0000000000..4136fe14c6 --- /dev/null +++ b/src/test/java/terminus/activerecall/DifficultyModifierTest.java @@ -0,0 +1,26 @@ +package terminus.activerecall; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + +public class DifficultyModifierTest { + + @Test + void tweakEasyQuestionDifficulty_lowerThanMinValue_returnMinValue() { + assertEquals(0.2, DifficultyModifier.tweakEasyQuestionDifficulty(0.1)); + assertEquals(0.2, DifficultyModifier.tweakEasyQuestionDifficulty(0.2)); + assertEquals(0.2, DifficultyModifier.tweakEasyQuestionDifficulty(0)); + assertEquals(0.2, DifficultyModifier.tweakEasyQuestionDifficulty(Double.MIN_VALUE)); + } + + @Test + void tweakHardQuestionDifficulty_higherThanMaxValue_returnMaxValue() { + assertEquals(0.9, DifficultyModifier.tweakHardQuestionDifficulty(1)); + assertEquals(0.9, DifficultyModifier.tweakHardQuestionDifficulty(0.9)); + assertEquals(0.9, DifficultyModifier.tweakHardQuestionDifficulty(100000)); + assertEquals(0.9, DifficultyModifier.tweakHardQuestionDifficulty(Double.MAX_VALUE)); + } + + +} diff --git a/src/test/java/terminus/activerecall/GameEnvironmentTest.java b/src/test/java/terminus/activerecall/GameEnvironmentTest.java new file mode 100644 index 0000000000..0c80df8a45 --- /dev/null +++ b/src/test/java/terminus/activerecall/GameEnvironmentTest.java @@ -0,0 +1,93 @@ +package terminus.activerecall; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.content.Question; +import terminus.ui.Ui; + +public class GameEnvironmentTest { + + private Random random; + private static final String LS = System.lineSeparator(); + + @BeforeEach + void setUp() { + random = new Random(); + random.setSeed(1L); + } + + @Test + void run_exit_success() { + String input = String.format("%s%s2%s%s%se%s", LS, LS, LS, LS, LS, LS); + InputStream in = new ByteArrayInputStream(input.getBytes()); + Ui ui = new Ui(in); + List questions = new ArrayList<>(); + for (int i = 0; i < 5; i++) { + questions.add(new Question("test " + i, "answer " + i)); + } + QuestionGenerator questionGenerator = new QuestionGenerator(questions, 3, random); + GameEnvironment gameEnvironment = new GameEnvironment(ui, questionGenerator); + gameEnvironment.run(); + for (int i = 0; i < 5; i++) { + assertEquals(0.5, questions.get(i).getWeight()); + } + } + + @Test + void run_ignoreGarbageInput_success() { + String input = String.format("%s%sasdf%s2%s%s%sasdf%se%s", LS, LS, LS, LS, LS, LS, LS, LS); + InputStream in = new ByteArrayInputStream(input.getBytes()); + Ui ui = new Ui(in); + List questions = new ArrayList<>(); + for (int i = 0; i < 5; i++) { + questions.add(new Question("test " + i, "answer " + i)); + } + QuestionGenerator questionGenerator = new QuestionGenerator(questions, 3, random); + GameEnvironment gameEnvironment = new GameEnvironment(ui, questionGenerator); + gameEnvironment.run(); + for (int i = 0; i < 5; i++) { + assertEquals(0.5, questions.get(i).getWeight()); + } + } + + + @Test + void run_reweigh_success() { + String input = String.format("%s%s3%s%s%s2%s%s%s1%s%s%s2%s%s%s2%s", LS, LS, LS, LS, LS, LS, LS, LS, LS, LS, + LS, LS, LS, LS, LS); + InputStream in = new ByteArrayInputStream(input.getBytes()); + Ui ui = new Ui(in); + List questions = new ArrayList<>(); + for (int i = 0; i < 5; i++) { + questions.add(new Question("test " + i, "answer " + i)); + } + QuestionGenerator questionGenerator = new QuestionGenerator(questions, 10, random); + GameEnvironment gameEnvironment = new GameEnvironment(ui, questionGenerator); + gameEnvironment.run(); + double highNewWeight = DifficultyModifier.tweakHardQuestionDifficulty(0.5); + double lowNewWeight = DifficultyModifier.tweakEasyQuestionDifficulty(0.5); + int high = 0; + int same = 0; + int low = 0; + for (int i = 0; i < 5; i++) { + if (questions.get(i).getWeight() == highNewWeight) { + high++; + } else if (questions.get(i).getWeight() == 0.5) { + same++; + } else if (questions.get(i).getWeight() == lowNewWeight) { + low++; + } + } + assertEquals(1, high); + assertEquals(1, low); + assertEquals(3, same); + } +} diff --git a/src/test/java/terminus/activerecall/QuestionGeneratorTest.java b/src/test/java/terminus/activerecall/QuestionGeneratorTest.java new file mode 100644 index 0000000000..7cb076fed3 --- /dev/null +++ b/src/test/java/terminus/activerecall/QuestionGeneratorTest.java @@ -0,0 +1,71 @@ +package terminus.activerecall; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.content.Question; + +public class QuestionGeneratorTest { + + private Random random; + + @BeforeEach + void setUp() { + random = new Random(); + random.setSeed(1L); + } + + @Test + void hasNext_noQuestions_returnsFalse() { + QuestionGenerator questionGenerator = new QuestionGenerator(new ArrayList<>(), 10); + assertFalse(questionGenerator.hasNext()); + } + + @Test + void next_noQuestions_throwsException() { + QuestionGenerator questionGenerator = new QuestionGenerator(new ArrayList<>(), 10); + assertThrows(NullPointerException.class, questionGenerator::next); + } + + @Test + void next_success() { + List questions = new ArrayList<>(); + for (int i = 0; i < 10; i++) { + questions.add(new Question("test " + i, "answer " + i)); + } + QuestionGenerator questionGenerator = new QuestionGenerator(questions, 10, random); + for (int i = 0; i < 10; i++) { + Question question = questionGenerator.next(); + questions.remove(question); + } + assertTrue(questions.isEmpty()); + + for (int i = 0; i < 10; i++) { + questions.add(new Question("test " + i, "answer " + i)); + } + questionGenerator = new QuestionGenerator(questions, 100, random); + for (int i = 0; i < 10; i++) { + questions.remove(questionGenerator.next()); + } + assertTrue(questions.isEmpty()); + assertFalse(questionGenerator.hasNext()); + + + for (int i = 0; i < 10; i++) { + questions.add(new Question("test " + i, "answer " + i)); + } + questionGenerator = new QuestionGenerator(questions, 5, random); + for (int i = 0; i < 5; i++) { + questions.remove(questionGenerator.next()); + } + assertEquals(5, questions.size()); + assertFalse(questionGenerator.hasNext()); + } +} diff --git a/src/test/java/terminus/command/QuestionCommandTest.java b/src/test/java/terminus/command/QuestionCommandTest.java new file mode 100644 index 0000000000..b896f781cd --- /dev/null +++ b/src/test/java/terminus/command/QuestionCommandTest.java @@ -0,0 +1,59 @@ +package terminus.command; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.content.Question; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; +import terminus.parser.MainCommandParser; +import terminus.parser.QuestionCommandParser; +import terminus.ui.Ui; + +public class QuestionCommandTest { + + private MainCommandParser commandParser; + private Ui ui; + + private ModuleManager moduleManager; + + private String tempModule = "test"; + + @BeforeEach + void setUp() { + commandParser = MainCommandParser.getInstance(); + moduleManager = new ModuleManager(); + moduleManager.setModule(tempModule); + ui = new Ui(); + } + + @Test + void execute_success() throws InvalidArgumentException, InvalidCommandException { + Command mainCommand = commandParser.parseCommand("go " + tempModule + " question"); + CommandResult changeResult = mainCommand.execute(ui, moduleManager); + assertTrue(changeResult.isOk()); + assertTrue(changeResult.getAdditionalData() instanceof QuestionCommandParser); + mainCommand = commandParser.parseCommand("go " + tempModule + " question add \"username\" \"password\""); + changeResult = mainCommand.execute(ui, moduleManager); + assertTrue(changeResult.isOk()); + assertEquals(1, moduleManager.getModule(tempModule).getContentManager(Question.class).getTotalContents()); + mainCommand = commandParser.parseCommand("go " + tempModule + " question view"); + changeResult = mainCommand.execute(ui, moduleManager); + assertTrue(changeResult.isOk()); + } + + @Test + void execute_throwsException() { + assertThrows(InvalidCommandException.class, + () -> commandParser.parseCommand("go " + tempModule + " question -1").execute(ui, moduleManager)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("go " + tempModule + " question view 100").execute(ui, moduleManager)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("go " + tempModule + " question delete -1").execute(ui, moduleManager)); + + } +} diff --git a/src/test/java/terminus/command/content/question/AddQuestionCommandTest.java b/src/test/java/terminus/command/content/question/AddQuestionCommandTest.java new file mode 100644 index 0000000000..17237b9f74 --- /dev/null +++ b/src/test/java/terminus/command/content/question/AddQuestionCommandTest.java @@ -0,0 +1,52 @@ +package terminus.command.content.question; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.content.Question; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; +import terminus.parser.NoteCommandParser; +import terminus.parser.QuestionCommandParser; +import terminus.ui.Ui; + +public class AddQuestionCommandTest { + + private QuestionCommandParser commandParser; + private ModuleManager moduleManager; + private Ui ui; + + private final String tempModule = "test"; + + Class type = Question.class; + + @BeforeEach + void setUp() { + this.moduleManager = new ModuleManager(); + moduleManager.setModule(tempModule); + this.commandParser = QuestionCommandParser.getInstance(); + this.commandParser.setModuleName(tempModule); + this.ui = new Ui(); + } + + @Test + void execute_success() throws InvalidCommandException, InvalidArgumentException { + Command addCommand = commandParser.parseCommand("add \"test\" \"test1\""); + CommandResult addResult = addCommand.execute(ui, moduleManager); + assertTrue(addResult.isOk()); + assertEquals(1, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); + assertTrue(moduleManager.getModule(tempModule).getContentManager(type).getContentData(1).contains("test")); + assertTrue(moduleManager.getModule(tempModule).getContentManager(type).getContentData(1).contains("test1")); + for (int i = 0; i < 5; i++) { + addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); + addResult = addCommand.execute(ui, moduleManager); + assertTrue(addResult.isOk()); + } + assertEquals(6, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); + } +} diff --git a/src/test/java/terminus/command/content/question/BackQuestionCommandTest.java b/src/test/java/terminus/command/content/question/BackQuestionCommandTest.java new file mode 100644 index 0000000000..ad6b23ff59 --- /dev/null +++ b/src/test/java/terminus/command/content/question/BackQuestionCommandTest.java @@ -0,0 +1,41 @@ +package terminus.command.content.question; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; +import terminus.parser.ModuleWorkspaceCommandParser; +import terminus.parser.NoteCommandParser; +import terminus.parser.QuestionCommandParser; +import terminus.ui.Ui; + +public class BackQuestionCommandTest { + + private QuestionCommandParser commandParser; + private ModuleManager moduleManager; + private Ui ui; + + private String tempModule = "test"; + + @BeforeEach + void setUp() { + this.commandParser = QuestionCommandParser.getInstance(); + this.commandParser.setModuleName(tempModule); + this.moduleManager = new ModuleManager(); + moduleManager.setModule(tempModule); + this.ui = new Ui(); + } + + @Test + void execute_success() throws InvalidCommandException, InvalidArgumentException { + Command backCommand = commandParser.parseCommand("back"); + CommandResult backResult = backCommand.execute(ui, moduleManager); + assertTrue(backResult.isOk()); + assertTrue(backResult.getAdditionalData() instanceof ModuleWorkspaceCommandParser); + } +} diff --git a/src/test/java/terminus/command/content/question/DeleteQuestionCommandTest.java b/src/test/java/terminus/command/content/question/DeleteQuestionCommandTest.java new file mode 100644 index 0000000000..e733cb5798 --- /dev/null +++ b/src/test/java/terminus/command/content/question/DeleteQuestionCommandTest.java @@ -0,0 +1,66 @@ +package terminus.command.content.question; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.content.Note; +import terminus.content.Question; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; +import terminus.parser.NoteCommandParser; +import terminus.parser.QuestionCommandParser; +import terminus.ui.Ui; + +public class DeleteQuestionCommandTest { + + private QuestionCommandParser commandParser; + private ModuleManager moduleManager; + private Ui ui; + + private final String tempModule = "test"; + + Class type = Question.class; + + @BeforeEach + void setUp() { + this.moduleManager = new ModuleManager(); + moduleManager.setModule(tempModule); + this.commandParser = QuestionCommandParser.getInstance(); + this.commandParser.setModuleName(tempModule); + this.ui = new Ui(); + } + + @Test + void execute_success() throws InvalidCommandException, InvalidArgumentException { + for (int i = 0; i < 5; i++) { + Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); + CommandResult addResult = addCommand.execute(ui, moduleManager); + assertTrue(addResult.isOk()); + } + + assertEquals(5, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); + + Command deleteCommand = commandParser.parseCommand("delete 1"); + CommandResult deleteResult = deleteCommand.execute(ui, moduleManager); + assertTrue(deleteResult.isOk()); + assertEquals(4, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); + for (int i = 2; i < 4; i++) { + deleteCommand = commandParser.parseCommand("delete " + i); + deleteResult = deleteCommand.execute(ui, moduleManager); + assertTrue(deleteResult.isOk()); + } + assertEquals(2, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); + } + + @Test + void execute_throwsException() throws InvalidCommandException, InvalidArgumentException { + Command deleteCommand = commandParser.parseCommand("delete 100"); + assertThrows(InvalidArgumentException.class, () -> deleteCommand.execute(ui, moduleManager)); + } +} diff --git a/src/test/java/terminus/command/content/question/TestCommandTest.java b/src/test/java/terminus/command/content/question/TestCommandTest.java new file mode 100644 index 0000000000..c3ce1b02fe --- /dev/null +++ b/src/test/java/terminus/command/content/question/TestCommandTest.java @@ -0,0 +1,54 @@ +package terminus.command.content.question; + +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; +import terminus.parser.QuestionCommandParser; +import terminus.ui.Ui; + +public class TestCommandTest { + + private QuestionCommandParser commandParser; + private ModuleManager moduleManager; + private Ui ui; + private final String tempModule = "test"; + + @BeforeEach + void setUp() { + this.moduleManager = new ModuleManager(); + moduleManager.setModule(tempModule); + this.commandParser = QuestionCommandParser.getInstance(); + this.commandParser.setModuleName(tempModule); + this.ui = new Ui(); + } + + @Test + void execute_noQuestions_exceptionThrown() throws InvalidArgumentException, InvalidCommandException { + Command command = commandParser.parseCommand("test"); + assertThrows(InvalidCommandException.class, () -> command.execute(ui, moduleManager)); + } + + @Test + void execute_success() throws InvalidArgumentException, InvalidCommandException { + for (int i = 0; i < 4; i++) { + Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); + CommandResult addResult = addCommand.execute(ui, moduleManager); + assertTrue(addResult.isOk()); + } + Command command = commandParser.parseCommand("test"); + String input = String.format("%s%s2%s%s%se%s", System.lineSeparator(), System.lineSeparator(), + System.lineSeparator(), System.lineSeparator(), System.lineSeparator(), System.lineSeparator()); + InputStream in = new ByteArrayInputStream(input.getBytes()); + this.ui = new Ui(in); + assertTrue(command.execute(ui, moduleManager).isOk()); + } +} diff --git a/src/test/java/terminus/command/content/question/ViewQuestionCommandTest.java b/src/test/java/terminus/command/content/question/ViewQuestionCommandTest.java new file mode 100644 index 0000000000..f3e8e175ef --- /dev/null +++ b/src/test/java/terminus/command/content/question/ViewQuestionCommandTest.java @@ -0,0 +1,85 @@ +package terminus.command.content.question; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.command.Command; +import terminus.command.CommandResult; +import terminus.content.Note; +import terminus.content.Question; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; +import terminus.module.ModuleManager; +import terminus.parser.NoteCommandParser; +import terminus.parser.QuestionCommandParser; +import terminus.ui.Ui; + +public class ViewQuestionCommandTest { + + private QuestionCommandParser commandParser; + private ModuleManager moduleManager; + private Ui ui; + + private String tempModule = "test"; + + Class type = Question.class; + + @BeforeEach + void setUp() { + this.moduleManager = new ModuleManager(); + moduleManager.setModule(tempModule); + this.commandParser = QuestionCommandParser.getInstance(); + this.commandParser.setModuleName(tempModule); + this.ui = new Ui(); + } + + @Test + void execute_viewAll_success() + throws InvalidCommandException, InvalidArgumentException { + for (int i = 0; i < 5; i++) { + Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); + CommandResult addResult = addCommand.execute(ui, moduleManager); + assertTrue(addResult.isOk()); + } + assertEquals(5, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); + + Command viewCommand = commandParser.parseCommand("view"); + CommandResult viewResult = viewCommand.execute(ui, moduleManager); + assertTrue(viewResult.isOk()); + } + + @Test + void execute_viewOne_success() + throws InvalidCommandException, InvalidArgumentException { + for (int i = 0; i < 5; i++) { + Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); + CommandResult addResult = addCommand.execute(ui, moduleManager); + assertTrue(addResult.isOk()); + } + assertEquals(5, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); + + Command viewCommand = commandParser.parseCommand("view 1"); + CommandResult viewResult = viewCommand.execute(ui, moduleManager); + assertTrue(viewResult.isOk()); + } + + @Test + void execute_viewOne_exceptionThrown() + throws InvalidCommandException, InvalidArgumentException { + for (int i = 0; i < 5; i++) { + Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); + CommandResult addResult = addCommand.execute(ui, moduleManager); + assertTrue(addResult.isOk()); + } + assertEquals(5, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); + + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("view a")); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("view -1").execute(ui, moduleManager)); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("view 6").execute(ui, moduleManager)); + } +} diff --git a/src/test/java/terminus/parser/QuestionCommandParserTest.java b/src/test/java/terminus/parser/QuestionCommandParserTest.java new file mode 100644 index 0000000000..5221158d55 --- /dev/null +++ b/src/test/java/terminus/parser/QuestionCommandParserTest.java @@ -0,0 +1,131 @@ +package terminus.parser; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.command.ExitCommand; +import terminus.command.HelpCommand; +import terminus.command.content.DeleteCommand; +import terminus.command.content.ViewCommand; +import terminus.command.content.note.AddNoteCommand; +import terminus.command.content.question.AddQuestionCommand; +import terminus.command.content.question.TestCommand; +import terminus.exception.InvalidArgumentException; +import terminus.exception.InvalidCommandException; + +public class QuestionCommandParserTest { + + private QuestionCommandParser commandParser; + + private final String tempModule = "test"; + + @BeforeEach + void setUp() { + this.commandParser = QuestionCommandParser.getInstance(); + this.commandParser.setModuleName(tempModule); + } + + @Test + void parseCommand_invalidCommand_exceptionThrown() { + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("ex it")); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("helpa")); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("adda")); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("vie wer")); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("deleterr")); + assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("")); + } + + @Test + void parseCommand_resolveExitCommand_success() + throws InvalidCommandException, InvalidArgumentException { + assertTrue(commandParser.parseCommand("exit") instanceof ExitCommand); + assertTrue(commandParser.parseCommand("EXIT") instanceof ExitCommand); + assertTrue(commandParser.parseCommand(" exit ") instanceof ExitCommand); + assertTrue(commandParser.parseCommand("eXiT a") instanceof ExitCommand); + } + + @Test + void parseCommand_resolveHelpCommand_success() + throws InvalidCommandException, InvalidArgumentException { + assertTrue(commandParser.parseCommand("help") instanceof HelpCommand); + assertTrue(commandParser.parseCommand("HELP") instanceof HelpCommand); + assertTrue(commandParser.parseCommand(" help ") instanceof HelpCommand); + assertTrue(commandParser.parseCommand("HeLp a") instanceof HelpCommand); + } + + @Test + void parseCommand_resolveAddCommand_exceptionThrown() { + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("add")); + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("add \"test1\"test2\"")); + assertThrows(InvalidArgumentException.class, + () -> commandParser.parseCommand("add \"test\" \"test1\" \"test2\"")); + } + + @Test + void parseCommand_resolveAddCommand_success() throws InvalidCommandException, InvalidArgumentException { + assertTrue(commandParser.parseCommand("add \"test\" \"test1\"") instanceof AddQuestionCommand); + assertTrue(commandParser.parseCommand("add \" test \" \" test1 \"") instanceof AddQuestionCommand); + assertTrue(commandParser.parseCommand("add \"username\" \"password\"") instanceof AddQuestionCommand); + } + + @Test + void parseCommand_resolveDeleteCommand_exceptionThrown() throws InvalidCommandException, InvalidArgumentException { + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("delete")); + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("delete abcd")); + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("delete -5")); + } + + @Test + void parseCommand_resolveDeleteCommand_success() + throws InvalidCommandException, InvalidArgumentException { + assertTrue(commandParser.parseCommand("delete 1") instanceof DeleteCommand); + assertTrue(commandParser.parseCommand("delete 2") instanceof DeleteCommand); + } + + @Test + void parseCommand_resolveViewCommand_exceptionThrown() { + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("view abcd")); + } + + @Test + void parseCommand_resolveViewCommand_success() throws InvalidCommandException, InvalidArgumentException { + assertTrue(commandParser.parseCommand("view") instanceof ViewCommand); + assertTrue(commandParser.parseCommand("view 1") instanceof ViewCommand); + } + + + @Test + void parseCommand_resolveTestCommand_exceptionThrown() { + assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("test abcd")); + } + + @Test + void parseCommand_resolveTestCommand_success() throws InvalidCommandException, InvalidArgumentException { + assertTrue(commandParser.parseCommand("test") instanceof TestCommand); + assertTrue(commandParser.parseCommand("test 1") instanceof TestCommand); + } + + @Test + void getCommandList_containsBasicCommands() { + assertTrue(commandParser.getCommandList().contains("exit")); + assertTrue(commandParser.getCommandList().contains("add")); + assertTrue(commandParser.getCommandList().contains("back")); + assertTrue(commandParser.getCommandList().contains("delete")); + assertTrue(commandParser.getCommandList().contains("view")); + assertTrue(commandParser.getCommandList().contains("help")); + assertTrue(commandParser.getCommandList().contains("test")); + } + + @Test + void getWorkspace_isNote() { + assertEquals(tempModule + " > question", commandParser.getWorkspace()); + } + + @Test + void getHelpMenu_isNotEmpty() { + assertTrue(commandParser.getHelpMenu().length > 0); + } +} From 1aeabc633747fe556a5532ee406f215a702d19e2 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Thu, 21 Oct 2021 02:11:18 +0800 Subject: [PATCH 191/466] Update text-ui-test to include question help text --- text-ui-test/EXPECTED.TXT | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index aef4f07aa0..1698285fdb 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -19,6 +19,7 @@ Type any of the following to get started: > help > note > schedule +> question > back [test] >>> Error: Missing arguments. @@ -57,6 +58,9 @@ Format: note schedule : Move to schedules workspace. Format: schedule +question : Move to questions workspace. +Format: question + back : Returns to the parent workspace. Format: back From fbfe174c978f7c88839c738a367dfaacc76e40f7 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Thu, 21 Oct 2021 02:30:06 +0800 Subject: [PATCH 192/466] Fix design issues --- .../terminus/command/TimetableCommand.java | 11 ++-- src/main/java/terminus/common/Messages.java | 1 + .../terminus/parser/MainCommandParser.java | 6 +- .../java/terminus/timetable/Timetable.java | 60 +++++++++++-------- 4 files changed, 44 insertions(+), 34 deletions(-) diff --git a/src/main/java/terminus/command/TimetableCommand.java b/src/main/java/terminus/command/TimetableCommand.java index 2065175942..e1099f9836 100644 --- a/src/main/java/terminus/command/TimetableCommand.java +++ b/src/main/java/terminus/command/TimetableCommand.java @@ -61,17 +61,16 @@ public void parseArguments(String arguments) throws InvalidArgumentException { @Override public CommandResult execute(Ui ui, ModuleManager moduleManager) { StringBuilder result = new StringBuilder(); - Timetable timetable = new Timetable(); + Timetable timetable = new Timetable(moduleManager); + String schedule; if (isStringNullOrEmpty(day)) { - timetable.getWeeklySchedule(result, moduleManager); + schedule = timetable.getWeeklySchedule(); } else { assert day != null; - String currentDay = day; - timetable.getDailySchedule(result, moduleManager, currentDay); + schedule = timetable.getDailySchedule(day); } - - timetable.checkEmptySchedule(result); + result.append(timetable.checkEmptySchedule(schedule, day)); ui.printSection(result.toString()); return new CommandResult(true, false); } diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index cafc6360a6..eba560183e 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -25,6 +25,7 @@ public class Messages { public static final String ERROR_MESSAGE_INVALID_DAY = ERROR_MESSAGE_TAG + "Invalid day %s."; public static final String EMPTY_CONTENT_LIST_MESSAGE = "You do not have any content in this workspace.\n"; public static final String CONTENT_MESSAGE_HEADER = "List of Content\n---------------\n"; + public static final String EMPTY_SCHEDULE_FOR_THE_DAY = "You have no schedule for %s\n"; public static final String MAIN_BANNER = "Welcome to TermiNUS!\n"; public static final String MAIN_REMINDER = "This is your schedule today:\n"; diff --git a/src/main/java/terminus/parser/MainCommandParser.java b/src/main/java/terminus/parser/MainCommandParser.java index 59c3b22b0d..d0fdd3e760 100644 --- a/src/main/java/terminus/parser/MainCommandParser.java +++ b/src/main/java/terminus/parser/MainCommandParser.java @@ -36,11 +36,11 @@ public String getWorkspaceBanner(ModuleManager moduleManager) { public String getMainReminder(ModuleManager moduleManager) { StringBuilder result = new StringBuilder(); - StringBuilder dailySchedule = new StringBuilder(); String currentDay = getCurrentDay(); - Timetable timetable = new Timetable(); + Timetable timetable = new Timetable(moduleManager); + String dailySchedule = timetable.getDailySchedule(currentDay); - if (timetable.getDailySchedule(dailySchedule, moduleManager, currentDay)) { + if (dailySchedule != null) { result.append(Messages.MAIN_REMINDER); result.append(dailySchedule); } else { diff --git a/src/main/java/terminus/timetable/Timetable.java b/src/main/java/terminus/timetable/Timetable.java index 9c628b72a1..0ec0de6d29 100644 --- a/src/main/java/terminus/timetable/Timetable.java +++ b/src/main/java/terminus/timetable/Timetable.java @@ -7,21 +7,27 @@ import terminus.content.Link; import terminus.module.ModuleManager; import terminus.module.NusModule; +import terminus.ui.Ui; + +import static terminus.common.CommonUtils.isStringNullOrEmpty; public class Timetable { + private ModuleManager moduleManager; private int index = 0; - public Timetable() { + public Timetable(ModuleManager moduleManager) { + this.moduleManager = moduleManager; } /** * Lists all the schedule for a particular day. * * @param contentManager ContentManager object containing all user's links. - * @return StringBuilder of all the schedules for the particular day. + * @param currentDay The particular day at which the schedules are selected from. + * @return String String object containing all the schedules for the particular day. */ - public StringBuilder listDailySchedule(ContentManager contentManager, String currentDay) { + private String listDailySchedule(ContentManager contentManager, String currentDay) { StringBuilder dailySchedule = new StringBuilder(); for (Link schedule : contentManager.getContents()) { if (schedule.getDay().equalsIgnoreCase(currentDay)) { @@ -29,64 +35,68 @@ public StringBuilder listDailySchedule(ContentManager contentManager, Stri dailySchedule.append(String.format("%d. %s\n", index, schedule.getViewDescription())); } } - return dailySchedule; + return dailySchedule.toString(); } /** * Retrieve and format all the user's schedule for the particular day. * - * @param result The string containing the retrieved user schedule. - * @param moduleManager ModuleManager object containing all the module from which the schedules are retrieved. + * @param today The particular day at which the schedules are selected from. + * @return String String object containing all the schedules for the day */ - public boolean getDailySchedule(StringBuilder result, ModuleManager moduleManager, String today) { + public String getDailySchedule(String today) { String[] modules = moduleManager.getAllModules(); + StringBuilder schedule = new StringBuilder(); for (String moduleName : modules) { NusModule module = moduleManager.getModule(moduleName); ContentManager contentManager = module.getContentManager(Link.class); assert contentManager != null; - result.append(listDailySchedule(contentManager, today)); + schedule.append(listDailySchedule(contentManager, today)); TerminusLogger.info(String.format("Successfully acquire %s's schedule for %s", moduleName, today)); } index = 0; - if (result.toString().isEmpty()) { - return false; - } else { - return true; + + if (isStringNullOrEmpty(schedule.toString())) { + return null; } + return schedule.toString(); } /** * Retrieve and format all the user's schedule for the week. * - * @param result The string containing the retrieved user schedule. - * @param moduleManager ModuleManager object containing all the module from which the schedules are retrieved. + * @return String string object containing all the user's schedule for the week */ - public void getWeeklySchedule(StringBuilder result, ModuleManager moduleManager) { + public String getWeeklySchedule() { + StringBuilder dailyResult = new StringBuilder(); for (DaysOfWeekEnum currentDay : DaysOfWeekEnum.values()) { - StringBuilder dailyResult = new StringBuilder(); String today = currentDay.toString(); - if (getDailySchedule(dailyResult, moduleManager, today)) { - assert dailyResult != null; + String dailySchedule = getDailySchedule(today); + if (!isStringNullOrEmpty(dailySchedule)) { + assert dailySchedule != null; String header = String.format("%s:\n", today); - result.append(header.toUpperCase()); - result.append(dailyResult); - assert result != null; + dailyResult.append(header.toUpperCase()); + dailyResult.append(dailySchedule); + assert dailyResult != null; TerminusLogger.info(String.format("Successfully acquire %s's schedule", today)); } index = 0; } + return dailyResult.toString(); } /** * Print empty message for empty user schedule. * - * @param result The string containing the retrieved user schedule. + * @param schedule The string containing the retrieved user schedule. + * @param day The day corresponding to the retrieved schedule */ - public void checkEmptySchedule(StringBuilder result) { - if (result.toString().isBlank()) { + public String checkEmptySchedule(String schedule, String day) { + if (schedule == null) { TerminusLogger.info("There is no schedule in the user's timetable"); - result.append(Messages.EMPTY_CONTENT_LIST_MESSAGE); + schedule = String.format(Messages.EMPTY_SCHEDULE_FOR_THE_DAY, day); } + return schedule; } } From 1ac884bc75d3d73c022fd566d10e163746c854dd Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Thu, 21 Oct 2021 10:44:11 +0800 Subject: [PATCH 193/466] Use streams --- .../java/terminus/timetable/Timetable.java | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/src/main/java/terminus/timetable/Timetable.java b/src/main/java/terminus/timetable/Timetable.java index 0ec0de6d29..7f816163ab 100644 --- a/src/main/java/terminus/timetable/Timetable.java +++ b/src/main/java/terminus/timetable/Timetable.java @@ -9,6 +9,9 @@ import terminus.module.NusModule; import terminus.ui.Ui; +import java.util.Arrays; +import java.util.stream.Stream; + import static terminus.common.CommonUtils.isStringNullOrEmpty; public class Timetable { @@ -24,17 +27,19 @@ public Timetable(ModuleManager moduleManager) { * Lists all the schedule for a particular day. * * @param contentManager ContentManager object containing all user's links. - * @param currentDay The particular day at which the schedules are selected from. + * @param currentDay The particular day at which the schedules are selected from. * @return String String object containing all the schedules for the particular day. */ private String listDailySchedule(ContentManager contentManager, String currentDay) { StringBuilder dailySchedule = new StringBuilder(); - for (Link schedule : contentManager.getContents()) { - if (schedule.getDay().equalsIgnoreCase(currentDay)) { - index++; - dailySchedule.append(String.format("%d. %s\n", index, schedule.getViewDescription())); - } - } + + contentManager.getContents() + .stream() + .filter(x -> x.getDay().equalsIgnoreCase(currentDay)) + .forEach(x -> { + index++; + dailySchedule.append(String.format("%d. %s\n", index, x.getViewDescription())); + }); return dailySchedule.toString(); } @@ -45,16 +50,17 @@ private String listDailySchedule(ContentManager contentManager, String cur * @return String String object containing all the schedules for the day */ public String getDailySchedule(String today) { - String[] modules = moduleManager.getAllModules(); StringBuilder schedule = new StringBuilder(); + String[] modules = moduleManager.getAllModules(); + Stream stream = Arrays.stream(modules); - for (String moduleName : modules) { - NusModule module = moduleManager.getModule(moduleName); + stream.forEach(x -> { + NusModule module = moduleManager.getModule(x); ContentManager contentManager = module.getContentManager(Link.class); assert contentManager != null; schedule.append(listDailySchedule(contentManager, today)); - TerminusLogger.info(String.format("Successfully acquire %s's schedule for %s", moduleName, today)); - } + TerminusLogger.info(String.format("Successfully acquire %s's schedule for %s", x, today)); + }); index = 0; if (isStringNullOrEmpty(schedule.toString())) { @@ -70,6 +76,7 @@ public String getDailySchedule(String today) { */ public String getWeeklySchedule() { StringBuilder dailyResult = new StringBuilder(); + for (DaysOfWeekEnum currentDay : DaysOfWeekEnum.values()) { String today = currentDay.toString(); String dailySchedule = getDailySchedule(today); @@ -90,7 +97,7 @@ public String getWeeklySchedule() { * Print empty message for empty user schedule. * * @param schedule The string containing the retrieved user schedule. - * @param day The day corresponding to the retrieved schedule + * @param day The day corresponding to the retrieved schedule */ public String checkEmptySchedule(String schedule, String day) { if (schedule == null) { From 39822331fed374762839451cc81b7c1edf8ac990 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Thu, 21 Oct 2021 11:43:13 +0800 Subject: [PATCH 194/466] Fix IOException message and fix Junit method name --- src/main/java/terminus/Terminus.java | 2 +- src/main/java/terminus/storage/ModuleStorage.java | 6 +++--- src/test/java/terminus/command/NoteCommandTest.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index e6e0e222d6..d45ab35303 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -131,7 +131,7 @@ private void handleIoException(IOException e) { TerminusLogger.severe("Save file is inaccessible."); TerminusLogger.severe(e.getMessage(), e.getCause()); ui.printSection( - e.getMessage(), + String.format(Messages.ERROR_MESSAGE_FILE, e.getMessage()), "TermiNUS may still run, but your changes may not be saved.", "Check 'terminus.log' for more information." ); diff --git a/src/main/java/terminus/storage/ModuleStorage.java b/src/main/java/terminus/storage/ModuleStorage.java index 16c8464eb2..645d73d348 100644 --- a/src/main/java/terminus/storage/ModuleStorage.java +++ b/src/main/java/terminus/storage/ModuleStorage.java @@ -232,7 +232,7 @@ public void removeNoteFromModule(String moduleName, String noteName) throws IOEx Paths.get(modDirPath.toString(), noteName + CommonFormat.EXTENSION_TEXT_FILE).toString()); TerminusLogger.info("Removing file: " + deleteFile.getAbsolutePath()); if (!deleteFile.delete()) { - throw new IOException(Messages.ERROR_FILE_NOT_DELETED); + throw new IOException(deleteFile.getAbsolutePath()); } } @@ -265,7 +265,7 @@ private void deleteAllFilesInDirectory(Path directoryPath) throws IOException { for (File file : listOfFiles) { cleanAllFilesInclusive(file); if (file.exists()) { - throw new IOException(Messages.ERROR_FILES_NOT_DELETED); + throw new IOException(file.getAbsolutePath()); } } } @@ -286,7 +286,7 @@ public void cleanAfterDeleteModule(String mod) throws IOException { File folder = new File(modDirPath.toString()); cleanAllFilesInclusive(folder); if (folder.exists()) { - throw new IOException(Messages.ERROR_FILES_NOT_DELETED); + throw new IOException(folder.getAbsolutePath()); } } diff --git a/src/test/java/terminus/command/NoteCommandTest.java b/src/test/java/terminus/command/NoteCommandTest.java index 0f30892a6c..83a806596d 100644 --- a/src/test/java/terminus/command/NoteCommandTest.java +++ b/src/test/java/terminus/command/NoteCommandTest.java @@ -45,7 +45,7 @@ static void reset() throws IOException { } @Test - void execute_scheduleAdvance_success() throws InvalidArgumentException, InvalidCommandException, IOException { + void execute_noteAdvance_success() throws InvalidArgumentException, InvalidCommandException, IOException { Command mainCommand = commandParser.parseCommand("go " + tempModule + " note"); CommandResult changeResult = mainCommand.execute(ui, moduleManager); assertTrue(changeResult.isOk()); @@ -60,7 +60,7 @@ void execute_scheduleAdvance_success() throws InvalidArgumentException, InvalidC } @Test - void execute_scheduleAdvance_throwsException() throws InvalidArgumentException, InvalidCommandException { + void execute_noteAdvance_throwsException() throws InvalidArgumentException, InvalidCommandException { assertThrows(InvalidCommandException.class, () -> commandParser.parseCommand("go " + tempModule + " note -1").execute(ui, moduleManager)); assertThrows(InvalidArgumentException.class, From d05c810c21eccb8ae842dcc109e9e639c384f530 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Thu, 21 Oct 2021 12:10:29 +0800 Subject: [PATCH 195/466] Add safety checks for questions --- .../terminus/activerecall/DifficultyModifier.java | 4 ++-- .../terminus/activerecall/QuestionGenerator.java | 1 + src/main/java/terminus/content/Question.java | 14 ++++++++++++-- .../terminus/parser/QuestionCommandParser.java | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/terminus/activerecall/DifficultyModifier.java b/src/main/java/terminus/activerecall/DifficultyModifier.java index 112e63a732..3b8ae1cf9f 100644 --- a/src/main/java/terminus/activerecall/DifficultyModifier.java +++ b/src/main/java/terminus/activerecall/DifficultyModifier.java @@ -2,8 +2,8 @@ public class DifficultyModifier { - private static final double MIN_VALUE = 0.2; - private static final double MAX_VALUE = 0.9; + public static final double MIN_VALUE = 0.2; + public static final double MAX_VALUE = 0.9; private static final double MAX_INCREASE = 0.45; private static final double GROWTH_RATE = 8; private static final double LOG_CURVE_MIDPOINT = 0.4; diff --git a/src/main/java/terminus/activerecall/QuestionGenerator.java b/src/main/java/terminus/activerecall/QuestionGenerator.java index c94df6cc16..9ccc26befa 100644 --- a/src/main/java/terminus/activerecall/QuestionGenerator.java +++ b/src/main/java/terminus/activerecall/QuestionGenerator.java @@ -38,6 +38,7 @@ public QuestionGenerator(List questionBank, int questionCount, Random } private void addQuestion(Question question) { + assert question.getWeight() > 0; total += question.getWeight(); questionBank.put(total, question); } diff --git a/src/main/java/terminus/content/Question.java b/src/main/java/terminus/content/Question.java index 7549d813d9..1c79527c26 100644 --- a/src/main/java/terminus/content/Question.java +++ b/src/main/java/terminus/content/Question.java @@ -1,8 +1,8 @@ package terminus.content; -public class Question extends Content { +import terminus.activerecall.DifficultyModifier; - public static final String TYPE = "Q"; +public class Question extends Content { private double weight; @@ -19,11 +19,21 @@ public String getAnswer() { return this.data; } + private void setWeightSafely() { + if (weight < DifficultyModifier.MIN_VALUE) { + this.weight = DifficultyModifier.MIN_VALUE; + } else if (weight > DifficultyModifier.MAX_VALUE) { + this.weight = DifficultyModifier.MAX_VALUE; + } + } + public double getWeight() { + setWeightSafely(); return weight; } public void setWeight(double weight) { this.weight = weight; + setWeightSafely(); } } diff --git a/src/main/java/terminus/parser/QuestionCommandParser.java b/src/main/java/terminus/parser/QuestionCommandParser.java index cfd70e3b28..2f823d21c8 100644 --- a/src/main/java/terminus/parser/QuestionCommandParser.java +++ b/src/main/java/terminus/parser/QuestionCommandParser.java @@ -14,7 +14,7 @@ public class QuestionCommandParser extends InnerModuleCommandParser { private static QuestionCommandParser parser; - public QuestionCommandParser() { + private QuestionCommandParser() { super(CommonFormat.COMMAND_QUESTION); } From 0549ea22afb101cbf780d9f3c3359c41e444d73c Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Thu, 21 Oct 2021 12:12:19 +0800 Subject: [PATCH 196/466] Update DG --- docs/DeveloperGuide.md | 28 +++++++++++++++- docs/attachments/Module.png | Bin 0 -> 38421 bytes docs/uml/Module.puml | 65 ++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 docs/attachments/Module.png create mode 100644 docs/uml/Module.puml diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index 6664965b36..ac042f977e 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -106,5 +106,31 @@ Import the coding style xml file into your IntelliJ IDEA. > Once you are done with a piece of code, highlight the section you have just written and press the > key `CTRL + SHIFT + L`. - +## 3. Design + +### 3.1 Architecture + +### 3.2 Module Components +![](attachments/Module.png) + +The Module Components consists of the `ModuleManager` which contains a collection of `NusModule`. +The `NusModule` consist of `ContentManager` which help to manage `Link` and `Note`. +The `ContentManager` accepts a `Content` type generic which `Link` and `Note` inherit from. + +The `ModuleManager` is passed to the `Command` so that they can make any changes for specific +`NusModule`. A `HashMap` is used to implement the `name` (String) to `NusModule`, +key-value referencing for `ModuleManager`. The underlying `NusModule` stores multiple `ContentManager` which uses a +`ArrayList` to store any require `Content` type object like `Note` or `Link`. + +The abstract `Content` class was implemented to allow easier creation of features that +had common functionality to be managed by `ContentManager`. While `ContentManger` is able to +manage a specific type of `Content`, `NusModule` was made to interface with the different types of +content for each module as each module can contain multiple types of different `Content`. +`ModuleManager` is made to identify which `NusModule` belong to which specific module name. + +Other alternative consideration for implementing was to store multiple `ArrayList` +with different Objects without a common parent (standalone object) inside of `NusModule`. +This would be a more viable solution if our Objects did not share many common methods between them. +However, since many of the object like `Note` and `Link` share common attributes and require similar +functionality, a common parent `Content` was implemented. diff --git a/docs/attachments/Module.png b/docs/attachments/Module.png new file mode 100644 index 0000000000000000000000000000000000000000..fd4ae0a44c81218bad942a944183b0035cbb6e19 GIT binary patch literal 38421 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 Zi}60XnqL0eZ}1F~)N^^ULXkI~{|^vj#rgmM literal 0 HcmV?d00001 diff --git a/docs/uml/Module.puml b/docs/uml/Module.puml new file mode 100644 index 0000000000..cf78605170 --- /dev/null +++ b/docs/uml/Module.puml @@ -0,0 +1,65 @@ +@startuml +'https://plantuml.com/class-diagram + + + +'abstract class DGS +'abstract AbstractCollection +'interface List +'interface Collection +' +'List <|-- AbstractList +'Collection -- AbstractCollection +' +'Collection <|- List +'AbstractCollection <|- AbstractList +'AbstractList <|-- ArrayList + +Content <|-- Note +Content <|-- Link +ContentManager --> "0..*" Content +ContentManager ..> Note +ContentManager ..> Link + +NusModule -> ContentManager: noteManager +NusModule -> ContentManager: linkManager + +ModuleManager --> "0..*" NusModule : has > + + +class ModuleManager { + + getAllModules(): String [] + + getModule(moduleName: String): NusModule + + removeModule(moduleName: String): void + + setModule(moduleName: String): void +} + +class NusModule { + + getContentManager (type: Class): ContentManager +} + +class ContentManager { + + add(content: T): void + + deleteContent(contentNumber: int): String + + getContentData(contentNumber: int): String + + getContents(contents: ArrayList ): String + + getTotalContents() : int + + listAllContents(): String + + setContent(contents: ArrayList ): void +} + +abstract class Content { + # name: String + # data: String +} + +class Link { + - day: String + - startTime: LocalTime + - link: String +} + +class Note { +} + +@enduml \ No newline at end of file From f0df628a934c75a12bab4a96c5a4eddf1663b96b Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Thu, 21 Oct 2021 12:19:10 +0800 Subject: [PATCH 197/466] Fix Junit testing --- src/test/java/terminus/command/QuestionCommandTest.java | 3 ++- .../command/content/question/AddQuestionCommandTest.java | 3 ++- .../command/content/question/BackQuestionCommandTest.java | 3 ++- .../content/question/DeleteQuestionCommandTest.java | 3 ++- .../terminus/command/content/question/TestCommandTest.java | 3 ++- .../command/content/question/ViewQuestionCommandTest.java | 7 ++++--- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/test/java/terminus/command/QuestionCommandTest.java b/src/test/java/terminus/command/QuestionCommandTest.java index b896f781cd..8079817722 100644 --- a/src/test/java/terminus/command/QuestionCommandTest.java +++ b/src/test/java/terminus/command/QuestionCommandTest.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.content.Question; @@ -32,7 +33,7 @@ void setUp() { } @Test - void execute_success() throws InvalidArgumentException, InvalidCommandException { + void execute_success() throws InvalidArgumentException, InvalidCommandException, IOException { Command mainCommand = commandParser.parseCommand("go " + tempModule + " question"); CommandResult changeResult = mainCommand.execute(ui, moduleManager); assertTrue(changeResult.isOk()); diff --git a/src/test/java/terminus/command/content/question/AddQuestionCommandTest.java b/src/test/java/terminus/command/content/question/AddQuestionCommandTest.java index 17237b9f74..2eb7f7a2f5 100644 --- a/src/test/java/terminus/command/content/question/AddQuestionCommandTest.java +++ b/src/test/java/terminus/command/content/question/AddQuestionCommandTest.java @@ -3,6 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.command.Command; @@ -35,7 +36,7 @@ void setUp() { } @Test - void execute_success() throws InvalidCommandException, InvalidArgumentException { + void execute_success() throws InvalidCommandException, InvalidArgumentException, IOException { Command addCommand = commandParser.parseCommand("add \"test\" \"test1\""); CommandResult addResult = addCommand.execute(ui, moduleManager); assertTrue(addResult.isOk()); diff --git a/src/test/java/terminus/command/content/question/BackQuestionCommandTest.java b/src/test/java/terminus/command/content/question/BackQuestionCommandTest.java index ad6b23ff59..1967f8983b 100644 --- a/src/test/java/terminus/command/content/question/BackQuestionCommandTest.java +++ b/src/test/java/terminus/command/content/question/BackQuestionCommandTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.command.Command; @@ -32,7 +33,7 @@ void setUp() { } @Test - void execute_success() throws InvalidCommandException, InvalidArgumentException { + void execute_success() throws InvalidCommandException, InvalidArgumentException, IOException { Command backCommand = commandParser.parseCommand("back"); CommandResult backResult = backCommand.execute(ui, moduleManager); assertTrue(backResult.isOk()); diff --git a/src/test/java/terminus/command/content/question/DeleteQuestionCommandTest.java b/src/test/java/terminus/command/content/question/DeleteQuestionCommandTest.java index e733cb5798..70206b98cc 100644 --- a/src/test/java/terminus/command/content/question/DeleteQuestionCommandTest.java +++ b/src/test/java/terminus/command/content/question/DeleteQuestionCommandTest.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.command.Command; @@ -37,7 +38,7 @@ void setUp() { } @Test - void execute_success() throws InvalidCommandException, InvalidArgumentException { + void execute_success() throws InvalidCommandException, InvalidArgumentException, IOException { for (int i = 0; i < 5; i++) { Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); CommandResult addResult = addCommand.execute(ui, moduleManager); diff --git a/src/test/java/terminus/command/content/question/TestCommandTest.java b/src/test/java/terminus/command/content/question/TestCommandTest.java index c3ce1b02fe..4923785ae3 100644 --- a/src/test/java/terminus/command/content/question/TestCommandTest.java +++ b/src/test/java/terminus/command/content/question/TestCommandTest.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayInputStream; +import java.io.IOException; import java.io.InputStream; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -38,7 +39,7 @@ void execute_noQuestions_exceptionThrown() throws InvalidArgumentException, Inva } @Test - void execute_success() throws InvalidArgumentException, InvalidCommandException { + void execute_success() throws InvalidArgumentException, InvalidCommandException, IOException { for (int i = 0; i < 4; i++) { Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); CommandResult addResult = addCommand.execute(ui, moduleManager); diff --git a/src/test/java/terminus/command/content/question/ViewQuestionCommandTest.java b/src/test/java/terminus/command/content/question/ViewQuestionCommandTest.java index f3e8e175ef..6ddbead2fc 100644 --- a/src/test/java/terminus/command/content/question/ViewQuestionCommandTest.java +++ b/src/test/java/terminus/command/content/question/ViewQuestionCommandTest.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.io.IOException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import terminus.command.Command; @@ -38,7 +39,7 @@ void setUp() { @Test void execute_viewAll_success() - throws InvalidCommandException, InvalidArgumentException { + throws InvalidCommandException, InvalidArgumentException, IOException { for (int i = 0; i < 5; i++) { Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); CommandResult addResult = addCommand.execute(ui, moduleManager); @@ -53,7 +54,7 @@ void execute_viewAll_success() @Test void execute_viewOne_success() - throws InvalidCommandException, InvalidArgumentException { + throws InvalidCommandException, InvalidArgumentException, IOException { for (int i = 0; i < 5; i++) { Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); CommandResult addResult = addCommand.execute(ui, moduleManager); @@ -68,7 +69,7 @@ void execute_viewOne_success() @Test void execute_viewOne_exceptionThrown() - throws InvalidCommandException, InvalidArgumentException { + throws InvalidCommandException, InvalidArgumentException, IOException { for (int i = 0; i < 5; i++) { Command addCommand = commandParser.parseCommand("add \"test\" \"test" + i + "\""); CommandResult addResult = addCommand.execute(ui, moduleManager); From 9aa3260e65182edc4dce0608254c2650c9d58f8b Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Thu, 21 Oct 2021 12:24:16 +0800 Subject: [PATCH 198/466] Add ability to silence Logger to only show Warnings and above --- src/main/java/terminus/common/TerminusLogger.java | 11 +++++++++++ .../command/content/note/AddNoteCommandTest.java | 2 ++ 2 files changed, 13 insertions(+) diff --git a/src/main/java/terminus/common/TerminusLogger.java b/src/main/java/terminus/common/TerminusLogger.java index 7c77c4c39d..1ea676b7c1 100644 --- a/src/main/java/terminus/common/TerminusLogger.java +++ b/src/main/java/terminus/common/TerminusLogger.java @@ -26,6 +26,17 @@ public static void initializeLogger() throws IOException { fileHandler.setLevel(Level.INFO); LOGGER.addHandler(fileHandler); } + + /** + * Initializes TerminusLogger that prints only warnings and above. + * + */ + public static void initializeLoggerWarnings() { + LogManager.getLogManager().reset(); + ConsoleHandler consoleHandler = new ConsoleHandler(); + consoleHandler.setLevel(Level.WARNING); + LOGGER.addHandler(consoleHandler); + } /** * Writes a debug message to the Logger. diff --git a/src/test/java/terminus/command/content/note/AddNoteCommandTest.java b/src/test/java/terminus/command/content/note/AddNoteCommandTest.java index 13a350c814..f1dc99122e 100644 --- a/src/test/java/terminus/command/content/note/AddNoteCommandTest.java +++ b/src/test/java/terminus/command/content/note/AddNoteCommandTest.java @@ -12,6 +12,7 @@ import terminus.TestFilePath; import terminus.command.Command; import terminus.command.CommandResult; +import terminus.common.TerminusLogger; import terminus.content.Note; import terminus.exception.InvalidArgumentException; import terminus.exception.InvalidCommandException; @@ -109,6 +110,7 @@ void execute_invalidArguments_exceptionThrown() { @Test void execute_longNoteData_exceptionThrown() { + TerminusLogger.initializeLoggerWarnings(); String s = "a".repeat(1000001); assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("add \"test\" \"" + s + "\"").execute(ui, moduleManager)); From 1dfa9955af8b03930021db8a2c396940b2a2fbe2 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Thu, 21 Oct 2021 13:20:42 +0800 Subject: [PATCH 199/466] Update developer guide --- docs/DeveloperGuide.md | 55 +++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index ac042f977e..58bfe783f8 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -11,6 +11,27 @@ + [2.1.2 Getting the project files](#212-getting-the-project-files) + [2.1.3 Setting up on IntelliJ IDEA](#213-setting-up-on-intellij-idea) + [2.1.4 Configuring the Coding Style](#214-configuring-the-coding-style) +- [3. Design](#3-design) + * [3.1 Architecture](#31-architecture) + * [3.2 UI](#32-ui-component) + * [3.3 Parser](#33-parser-component) + * [3.4 Command](#34-command-component) + * [3.5 Module](#35-module-component) + * [3.6 Content](#36-content-component) + * [3.7 Active Recall](#37-active-recall-component) + * [3.8 Storage](#38-storage-component) +- [4. Implementation]() + * [4.1 Timetable]() + * [4.2 Active Recall]() + * [4.3 Workspace]() + * [4.4 Adding and Deleting Content]() + * [4.5 Storage]() +- [5. Documentation, Logging, Testing and DevOps]() +- [Appendix A: Product Scope]() +- [Appendix B: User Stories ]() +- [Appendix C: Non Functional Requirements]() +- [Appendix D: Glossary]() +- [Appendix E: Instructions for Manual Testing]() ## 1. Introduction @@ -110,27 +131,27 @@ Import the coding style xml file into your IntelliJ IDEA. ### 3.1 Architecture -### 3.2 Module Components +### 3.2 UI Component + +### 3.3 Parser Component + +### 3.4 Command Component + +### 3.5 Module Component ![](attachments/Module.png) -The Module Components consists of the `ModuleManager` which contains a collection of `NusModule`. +The Module Components consists of the `ModuleManager` which contains a collection of `NusModule` and +maps a module name to a specific `NusModule`. The `NusModule` consist of `ContentManager` which help to manage `Link` and `Note`. -The `ContentManager` accepts a `Content` type generic which `Link` and `Note` inherit from. +The `ContentManager` accepts a `Content` type generic +and manages an `ArrayList` of `Content` either being a `Note` or a `Link`. -The `ModuleManager` is passed to the `Command` so that they can make any changes for specific -`NusModule`. A `HashMap` is used to implement the `name` (String) to `NusModule`, -key-value referencing for `ModuleManager`. The underlying `NusModule` stores multiple `ContentManager` which uses a -`ArrayList` to store any require `Content` type object like `Note` or `Link`. +The `ModuleManager` +- add,delete or retrieve a specific `NusModule` +- list all module names -The abstract `Content` class was implemented to allow easier creation of features that -had common functionality to be managed by `ContentManager`. While `ContentManger` is able to -manage a specific type of `Content`, `NusModule` was made to interface with the different types of -content for each module as each module can contain multiple types of different `Content`. -`ModuleManager` is made to identify which `NusModule` belong to which specific module name. +### 3.6 Content Component -Other alternative consideration for implementing was to store multiple `ArrayList` -with different Objects without a common parent (standalone object) inside of `NusModule`. -This would be a more viable solution if our Objects did not share many common methods between them. -However, since many of the object like `Note` and `Link` share common attributes and require similar -functionality, a common parent `Content` was implemented. +### 3.7 Active Recall Component +### 3.8 Storage Component \ No newline at end of file From 1cc3b7633da8ab276ce34ee3c221a75447a2a753 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Thu, 21 Oct 2021 13:23:20 +0800 Subject: [PATCH 200/466] Remove duplicated file --- docs/Module.puml | 64 ------------------------------------------------ 1 file changed, 64 deletions(-) delete mode 100644 docs/Module.puml diff --git a/docs/Module.puml b/docs/Module.puml deleted file mode 100644 index 166f309671..0000000000 --- a/docs/Module.puml +++ /dev/null @@ -1,64 +0,0 @@ -@startuml -'https://plantuml.com/class-diagram - - - -'abstract class DGS -'abstract AbstractCollection -'interface List -'interface Collection -' -'List <|-- AbstractList -'Collection -- AbstractCollection -' -'Collection <|- List -'AbstractCollection <|- AbstractList -'AbstractList <|-- ArrayList - -Content <|-- Note -Content <|-- Link -ContentManager --> "0..*" Content -ContentManager .. Note -ContentManager .. Link - -NusModule -> ContentManager: noteManager -NusModule -> ContentManager: linkManager - -ModuleManager --> "0..*" NusModule : has > - -class ModuleManager { - + getAllModules(): String [] - + getModule(moduleName: String): NusModule - + removeModule(moduleName: String): void - + setModule(moduleName: String): void -} - -class NusModule { - + getContentManager (type: Class): ContentManager -} - -class ContentManager { - + add(content: T): void - + deleteContent(contentNumber: int): String - + getContentData(contentNumber: int): String - + getContents(contents: ArrayList ): String - + getTotalContents() : int - + listAllContents(): String - + setContent(contents: ArrayList ): void -} - -class Content { - # name: String - # data: String - + Content(name: String) -} - -class Link { - - day: String - - startTime: LocalTime - - link: String -} - -class Note { -} -@enduml \ No newline at end of file From cf5d3e0e99069b9510c2945efa3dbc25de3c9076 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Thu, 21 Oct 2021 15:12:33 +0800 Subject: [PATCH 201/466] Update Content and Module DG --- docs/DeveloperGuide.md | 21 ++++++++++++++---- docs/attachments/Content.png | Bin 0 -> 35301 bytes docs/attachments/Module.png | Bin 38421 -> 25092 bytes docs/uml/Content.puml | 42 +++++++++++++++++++++++++++++++++++ docs/uml/Module.puml | 35 ++++------------------------- 5 files changed, 63 insertions(+), 35 deletions(-) create mode 100644 docs/attachments/Content.png create mode 100644 docs/uml/Content.puml diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index 58bfe783f8..cb435c8d6a 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -95,6 +95,7 @@ on [link](https://docs.github.com/en/get-started/quickstart/fork-a-repo). 1. After performing the steps above, locate the file `src/main/java/terminus/Terminus.java`, right-click and select `Run 'Terminus.main()'`. 2. If everything is correctly set up, you should see the following terminal. + ``` Welcome to TermiNUS! @@ -105,7 +106,6 @@ on [link](https://docs.github.com/en/get-started/quickstart/fork-a-repo). > schedule [] >>> - ``` #### 2.1.4 Configuring the Coding Style @@ -143,14 +143,27 @@ Import the coding style xml file into your IntelliJ IDEA. The Module Components consists of the `ModuleManager` which contains a collection of `NusModule` and maps a module name to a specific `NusModule`. The `NusModule` consist of `ContentManager` which help to manage `Link` and `Note`. -The `ContentManager` accepts a `Content` type generic -and manages an `ArrayList` of `Content` either being a `Note` or a `Link`. +The `ContentManager` accepts a `Content` type generic which is from the Content Component The `ModuleManager` -- add,delete or retrieve a specific `NusModule` +- add, delete or retrieve a specific `NusModule` - list all module names +- grants access to the different types of content stored by `NusModule` ### 3.6 Content Component +![](attachments/Content.png) + +The Content Component consist of objects such as `Link`, `Questions` and `Note` +which inherit from the abstract `Content` class. The `ContentManager` allows a generic +`` which must belong to the `Content` type or its children. The +`ContentManager` manages an `ArrayList` of Content type and provide the following functionality: + +- adding of any Content type +- removing any Content +- accessing the Content and the inner data attribute +- getting the total number of content +- listing all contents +- accessing the arraylist of contents ### 3.7 Active Recall Component diff --git a/docs/attachments/Content.png b/docs/attachments/Content.png new file mode 100644 index 0000000000000000000000000000000000000000..4dff419690cc47ffbe907f41b8a4711708d686a9 GIT binary patch literal 35301 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 literal 0 HcmV?d00001 diff --git a/docs/attachments/Module.png b/docs/attachments/Module.png index fd4ae0a44c81218bad942a944183b0035cbb6e19..0ea2fc7f21c436e730704ae234e52ef8e29b17a0 100644 GIT binary patch literal 25092 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 Zi}60XnqL0eZ}1F~)N^^ULXkI~{|^vj#rgmM diff --git a/docs/uml/Content.puml b/docs/uml/Content.puml new file mode 100644 index 0000000000..00ebba9eba --- /dev/null +++ b/docs/uml/Content.puml @@ -0,0 +1,42 @@ +@startuml + +Content <|-- Note +Content <|-- Link +Content <|-- Question + +ContentManager --> "0..*" Content : contents +ContentManager ..> Note +ContentManager ..> Link +ContentManager ..> Question + + +!startsub CONTENTMANAGER +class ContentManager { + + add(content: T): void + + deleteContent(contentNumber: int): String + + getContentData(contentNumber: int): String + + getContents(contents: ArrayList ): String + + getTotalContents() : int + + listAllContents(): String + + setContent(contents: ArrayList ): void +} +!endsub +abstract class Content { + # name: String + # data: String +} + +class Link { + - day: String + - startTime: LocalTime + - link: String + + Link(name: String, day: String, startTime: LocalTime, link: String) +} + +class Note + +class Question { + - weight: double + + Question(question: String, answer: String) +} +@enduml \ No newline at end of file diff --git a/docs/uml/Module.puml b/docs/uml/Module.puml index cf78605170..eb91536cd8 100644 --- a/docs/uml/Module.puml +++ b/docs/uml/Module.puml @@ -15,18 +15,13 @@ 'AbstractCollection <|- AbstractList 'AbstractList <|-- ArrayList -Content <|-- Note -Content <|-- Link -ContentManager --> "0..*" Content -ContentManager ..> Note -ContentManager ..> Link -NusModule -> ContentManager: noteManager -NusModule -> ContentManager: linkManager +NusModule -> "1" ContentManager: noteManager +NusModule -> "1" ContentManager: linkManager +NusModule -> "1" ContentManager: questionManager ModuleManager --> "0..*" NusModule : has > - class ModuleManager { + getAllModules(): String [] + getModule(moduleName: String): NusModule @@ -38,28 +33,6 @@ class NusModule { + getContentManager (type: Class): ContentManager } -class ContentManager { - + add(content: T): void - + deleteContent(contentNumber: int): String - + getContentData(contentNumber: int): String - + getContents(contents: ArrayList ): String - + getTotalContents() : int - + listAllContents(): String - + setContent(contents: ArrayList ): void -} - -abstract class Content { - # name: String - # data: String -} - -class Link { - - day: String - - startTime: LocalTime - - link: String -} - -class Note { -} + !includesub Content.puml!CONTENTMANAGER @enduml \ No newline at end of file From b89683a4c8fd354fdbb265d62aa4d21bd4d678e4 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Thu, 21 Oct 2021 19:28:25 +0800 Subject: [PATCH 202/466] Update Developer Guide, Implementation(4.1 - Timetable) --- docs/DeveloperGuide.md | 28 +++++++++-- docs/attachments/Timetable.png | Bin 0 -> 77397 bytes docs/uml/Timetable.puml | 44 ++++++++++++++++++ .../java/terminus/timetable/Timetable.java | 1 - 4 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 docs/attachments/Timetable.png create mode 100644 docs/uml/Timetable.puml diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index 58bfe783f8..c92c1885a4 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -20,8 +20,8 @@ * [3.6 Content](#36-content-component) * [3.7 Active Recall](#37-active-recall-component) * [3.8 Storage](#38-storage-component) -- [4. Implementation]() - * [4.1 Timetable]() +- [4. Implementation](#4-implementation) + * [4.1 Timetable](#41-timetable) * [4.2 Active Recall]() * [4.3 Workspace]() * [4.4 Adding and Deleting Content]() @@ -154,4 +154,26 @@ The `ModuleManager` ### 3.7 Active Recall Component -### 3.8 Storage Component \ No newline at end of file +### 3.8 Storage Component + +## 4. Implementation + +### 4.1 Timetable + +The `timetable` feature is one of TermiNUS' features which can be accessed from the main workspace. + +The `timetable` feature has 2 variations: +- **Daily** Timetable +- **Weekly** timetable. + +The following sequence diagram shows how the timetable operation works: +![](attachments/Timetable.png) + +The **Daily** and **Weekly** `timetable` feature differs by a user argument which is parsed as the `day`. + +The **Daily** `timetable` feature works by iterating through a collection of `NusModule` which are stored inside a `ModuleManager`. +Within the `NusModule`, the `ContentManager`, which stores all the `Link` is accessed. +All the `Link` inside `ContentManager` is iterated through to acquire all the schedule which has the same attribute `day` as the user argument. + +The **Weekly** `timetable` feature is an extension of the **Daily** `timetable` feature. +It is implemented by iterating through a `DaysOfWeekEnum` and acquires the **daily** `timetable` for each day in the week. \ No newline at end of file diff --git a/docs/attachments/Timetable.png b/docs/attachments/Timetable.png new file mode 100644 index 0000000000000000000000000000000000000000..0571e596912ee3c15e6b0da0ece685dbf701cb8b GIT binary patch literal 77397 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 literal 0 HcmV?d00001 diff --git a/docs/uml/Timetable.puml b/docs/uml/Timetable.puml new file mode 100644 index 0000000000..86b413b019 --- /dev/null +++ b/docs/uml/Timetable.puml @@ -0,0 +1,44 @@ +@startuml +Activate Timetable #FFBBBB +Timetable -> ModuleManager: getAllModules() +Activate ModuleManager #FFBBBB +Timetable -> StringBuilder: <> +Activate StringBuilder #FFBBBB +ModuleManager -> NusModule: getAllModules() +Activate NusModule #FFBBBB +NusModule --> ModuleManager: modules + + +loop For each NusModule in modules + ModuleManager -> NusModule: getModule(NusModule) + + NusModule -> ContentManager : getContentManager() + Activate ContentManager #FFBBBB + + loop For each Link in ContentManager + + ContentManager -> Link: getContents() + Activate Link #FFBBBB + + Link->Link: getDay() + Activate Link #DarkSalmon + Link --> Link: currentDay + + alt if currentDay equals to user argument Day + Deactivate Link + + Link -> Link: getViewDescription() + Activate Link #DarkSalmon + + Link --> Link: description + Deactivate Link + Link -> StringBuilder: append(description) + end +end +end +StringBuilder -> StringBuilder: toString() +Activate StringBuilder #DarkSalmon +StringBuilder --> StringBuilder: dailySchedule +Deactivate StringBuilder +StringBuilder --> Timetable: dailySchedule +@enduml diff --git a/src/main/java/terminus/timetable/Timetable.java b/src/main/java/terminus/timetable/Timetable.java index 7f816163ab..bbc9a436f4 100644 --- a/src/main/java/terminus/timetable/Timetable.java +++ b/src/main/java/terminus/timetable/Timetable.java @@ -7,7 +7,6 @@ import terminus.content.Link; import terminus.module.ModuleManager; import terminus.module.NusModule; -import terminus.ui.Ui; import java.util.Arrays; import java.util.stream.Stream; From d88565f09cbfe1d024fe34590b39c58227d6d264 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Thu, 21 Oct 2021 21:27:24 +0800 Subject: [PATCH 203/466] Add storage component UML --- docs/uml/storage/Storage.puml | 52 +++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 docs/uml/storage/Storage.puml diff --git a/docs/uml/storage/Storage.puml b/docs/uml/storage/Storage.puml new file mode 100644 index 0000000000..f5d0812147 --- /dev/null +++ b/docs/uml/storage/Storage.puml @@ -0,0 +1,52 @@ +@startuml +'https://plantuml.com/class-diagram + + + +'abstract class DGS +'abstract AbstractCollection +'interface List +'interface Collection +' +'List <|-- AbstractList +'Collection -- AbstractCollection +' +'Collection <|- List +'AbstractCollection <|- AbstractList +'AbstractList <|-- ArrayList + +Terminus "1" --> "1 " ModuleStorage: moduleStorage + +Command "0..* " ..> "0..1 " ModuleStorage: uses > + +class Terminus { + + main(): void {static} + + run(): void + - start(): void + - runUntilCommandExit(): void + - handleIoException(e: IOException): void + - exit(): void +} + +class ModuleStorage { + - filePath: Path + - gson: Gson + - ModuleStorage() + + init(filePath: Path): void + + getInstance(): ModuleStorage {static} + + loadFile(): ModuleManager + + saveFile(moduleManager: ModuleManager): void + + loadNotesFromModule(moduleManager: ModuleManager, mod: String): void + + saveAllNotes(moduleManager: ModuleManager): void + + saveNotesFromModule(moduleManager: ModuleManager, mod: String, toDeleteAll: Boolean): void + + removeNoteFromModule(moduleName: String, noteName, String): void + + addNoteFromModule(moduleName: String, newNote: Note): void + + createModuleDirectory(moduleName: String): boolean + + cleanAfterDeleteModule(mod: String): void +} + +abstract Command { + +} + +@enduml \ No newline at end of file From 68014f64bff3b0453979cb5e1e446cbbac5ca86c Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Thu, 21 Oct 2021 21:43:29 +0800 Subject: [PATCH 204/466] Update DG for storage component --- docs/DeveloperGuide.md | 58 ++++++++++++++++---------- docs/attachments/StorageComponent.png | Bin 0 -> 25438 bytes 2 files changed, 36 insertions(+), 22 deletions(-) create mode 100644 docs/attachments/StorageComponent.png diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index 58bfe783f8..9f7ceb0273 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -12,26 +12,26 @@ + [2.1.3 Setting up on IntelliJ IDEA](#213-setting-up-on-intellij-idea) + [2.1.4 Configuring the Coding Style](#214-configuring-the-coding-style) - [3. Design](#3-design) - * [3.1 Architecture](#31-architecture) - * [3.2 UI](#32-ui-component) - * [3.3 Parser](#33-parser-component) - * [3.4 Command](#34-command-component) - * [3.5 Module](#35-module-component) - * [3.6 Content](#36-content-component) - * [3.7 Active Recall](#37-active-recall-component) - * [3.8 Storage](#38-storage-component) + * [3.1 Architecture](#31-architecture) + * [3.2 UI](#32-ui-component) + * [3.3 Parser](#33-parser-component) + * [3.4 Command](#34-command-component) + * [3.5 Module](#35-module-component) + * [3.6 Content](#36-content-component) + * [3.7 Active Recall](#37-active-recall-component) + * [3.8 Storage](#38-storage-component) - [4. Implementation]() - * [4.1 Timetable]() - * [4.2 Active Recall]() - * [4.3 Workspace]() - * [4.4 Adding and Deleting Content]() - * [4.5 Storage]() + * [4.1 Timetable]() + * [4.2 Active Recall]() + * [4.3 Workspace]() + * [4.4 Adding and Deleting Content]() + * [4.5 Storage]() - [5. Documentation, Logging, Testing and DevOps]() - [Appendix A: Product Scope]() - [Appendix B: User Stories ]() - [Appendix C: Non Functional Requirements]() - [Appendix D: Glossary]() -- [Appendix E: Instructions for Manual Testing]() +- [Appendix E: Instructions for Manual Testing]() ## 1. Introduction @@ -123,8 +123,8 @@ Import the coding style xml file into your IntelliJ IDEA. 3. Once done, select `Apply` then `OK`. 4. Now your IntelliJ IDEA should follow our Coding Style. -> :bulb: IntelliJ IDEA have certain shortcut key to aid in auto-formatting of code. -> Once you are done with a piece of code, highlight the section you have just written and press the +> :bulb: IntelliJ IDEA have certain shortcut key to aid in auto-formatting of code. +> Once you are done with a piece of code, highlight the section you have just written and press the > key `CTRL + SHIFT + L`. ## 3. Design @@ -136,17 +136,18 @@ Import the coding style xml file into your IntelliJ IDEA. ### 3.3 Parser Component ### 3.4 Command Component - + ### 3.5 Module Component + ![](attachments/Module.png) The Module Components consists of the `ModuleManager` which contains a collection of `NusModule` and -maps a module name to a specific `NusModule`. -The `NusModule` consist of `ContentManager` which help to manage `Link` and `Note`. -The `ContentManager` accepts a `Content` type generic -and manages an `ArrayList` of `Content` either being a `Note` or a `Link`. +maps a module name to a specific `NusModule`. The `NusModule` consist of `ContentManager` which help +to manage `Link` and `Note`. The `ContentManager` accepts a `Content` type generic and manages +an `ArrayList` of `Content` either being a `Note` or a `Link`. The `ModuleManager` + - add,delete or retrieve a specific `NusModule` - list all module names @@ -154,4 +155,17 @@ The `ModuleManager` ### 3.7 Active Recall Component -### 3.8 Storage Component \ No newline at end of file +### 3.8 Storage Component + +![](attachments/StorageComponent.png) + +The Module Storage handles any file I/O operations of TermiNUS. + +The `ModuleStorage` component: + +- can create folder for each module provided by the user. +- can save modules, schedules and links data in a `.json` file. +- can save notes into multiple `.txt` files. + +`TermiNUS` saved these data as either a `.json` or `.txt` file so users will be able to edit saved +data easily with any available text editor. \ No newline at end of file diff --git a/docs/attachments/StorageComponent.png b/docs/attachments/StorageComponent.png new file mode 100644 index 0000000000000000000000000000000000000000..c3e768b04a5f8c4f2dfc537be42badbbce391f24 GIT binary patch literal 25438 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%0DW2cM~) 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 literal 0 HcmV?d00001 From 9660d6c1f9e197c5735cea367d1b62b02c37dd34 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Thu, 21 Oct 2021 22:59:13 +0800 Subject: [PATCH 205/466] Update gradle.yml --- .github/workflows/gradle.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index fd8c44d086..a3c31ff671 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -47,4 +47,10 @@ jobs: if: always() && runner.os == 'Windows' working-directory: ${{ github.workspace }}/text-ui-test shell: cmd - run: runtest.bat \ No newline at end of file + run: runtest.bat + + - uses: codecov/codecov-action@v1 + if: runner.os == 'Linux' + with: + file: ${{ github.workspace }}/build/reports/jacoco/coverage/coverage.xml + fail_ci_if_error: true From e7c9ce4f504335cbbcc6e4df5b495209e676f756 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Thu, 21 Oct 2021 23:18:01 +0800 Subject: [PATCH 206/466] Update build.gradle --- build.gradle | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/build.gradle b/build.gradle index a2c7ee3f58..955a80cb25 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ plugins { id 'java' id 'application' id 'checkstyle' + id 'jacoco' id 'com.github.johnrengelman.shadow' version '5.1.0' } @@ -27,6 +28,22 @@ test { showStackTraces true showStandardStreams = false } + finalizedBy jacocoTestReport +} + +task coverage(type: JacocoReport) { + sourceDirectories.from files(sourceSets.main.allSource.srcDirs) + classDirectories.from files(sourceSets.main.output) + executionData.from files(jacocoTestReport.executionData) + afterEvaluate { + classDirectories.from files(classDirectories.files.collect { + fileTree(dir: it, exclude: ['**/*.jar']) + }) + } + reports { + html.required = true + xml.required = true + } } application { From fdccd2f1513bf027a3ca3b56ff0a4f5c894c7b20 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Thu, 21 Oct 2021 23:21:57 +0800 Subject: [PATCH 207/466] Update UML Sequence Diagram --- docs/attachments/Timetable.png | Bin 77397 -> 127339 bytes docs/uml/Timetable.puml | 121 +++++++++++++++++++++++++++++++-- 2 files changed, 114 insertions(+), 7 deletions(-) diff --git a/docs/attachments/Timetable.png b/docs/attachments/Timetable.png index 0571e596912ee3c15e6b0da0ece685dbf701cb8b..e62a5cc12c392ea270b19e594efae5e8e39c9ea3 100644 GIT binary patch literal 127339 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%0Ds=Q^b*(LMbO4Y*XK57ZEu7Kn0O#= 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 diff --git a/docs/uml/Timetable.puml b/docs/uml/Timetable.puml index 86b413b019..7719afe24a 100644 --- a/docs/uml/Timetable.puml +++ b/docs/uml/Timetable.puml @@ -1,30 +1,58 @@ @startuml +Activate TimetableCommand #FFBBBB +create StringBuilder +TimetableCommand -> StringBuilder: StringBuilder() +Activate StringBuilder #FFBBBB +StringBuilder --> TimetableCommand +Deactivate StringBuilder + +create Timetable +TimetableCommand -> Timetable: Timetable(moduleManager) +Activate Timetable #FFBBBB +Timetable --> TimetableCommand +Deactivate Timetable +Deactivate TimetableCommand + + +alt isStringNullOrEmpty(day) +TimetableCommand -> Timetable: getWeeklySchedule() +Activate TimetableCommand #FFBBBB Activate Timetable #FFBBBB + +loop For each day in DaysOfWeekEnum + +Timetable -> StringBuilder: StringBuilder() +Activate StringBuilder #FFBBBB +StringBuilder --> Timetable +Deactivate StringBuilder + Timetable -> ModuleManager: getAllModules() Activate ModuleManager #FFBBBB -Timetable -> StringBuilder: <> -Activate StringBuilder #FFBBBB -ModuleManager -> NusModule: getAllModules() -Activate NusModule #FFBBBB NusModule --> ModuleManager: modules - +Activate NusModule #FFBBBB loop For each NusModule in modules ModuleManager -> NusModule: getModule(NusModule) + + Deactivate ModuleManager + NusModule -> ContentManager : getContentManager() + Activate ContentManager #FFBBBB + Deactivate NusModule loop For each Link in ContentManager ContentManager -> Link: getContents() Activate Link #FFBBBB + Deactivate ContentManager Link->Link: getDay() Activate Link #DarkSalmon Link --> Link: currentDay - alt if currentDay equals to user argument Day + opt if currentDay equals to user argument Day Deactivate Link Link -> Link: getViewDescription() @@ -33,12 +61,91 @@ loop For each NusModule in modules Link --> Link: description Deactivate Link Link -> StringBuilder: append(description) + Activate StringBuilder #FFBBBB + Deactivate Link end + end +StringBuilder -> StringBuilder: toString() +Activate StringBuilder #DarkSalmon +StringBuilder --> StringBuilder: dailySchedule +Deactivate StringBuilder +StringBuilder --> Timetable: dailySchedule +Deactivate StringBuilder +end +end + + +Timetable --> TimetableCommand: weeklyScehdule +Deactivate Timetable +Deactivate TimetableCommand + + +else isStringNullOrEmpty(day) +TimetableCommand -> Timetable: getDailySchedule() +Activate TimetableCommand #FFBBBB +Activate Timetable #FFBBBB + +Timetable -> StringBuilder: StringBuilder() +Activate StringBuilder #FFBBBB +StringBuilder --> Timetable +Deactivate StringBuilder + +Timetable -> ModuleManager: getAllModules() +Activate ModuleManager #FFBBBB +NusModule --> ModuleManager: modules +Activate NusModule #FFBBBB + +loop For each NusModule in modules + ModuleManager -> NusModule: getModule(NusModule) + + + Deactivate ModuleManager + + NusModule -> ContentManager : getContentManager() + + Activate ContentManager #FFBBBB + Deactivate NusModule + + loop For each Link in ContentManager + + ContentManager -> Link: getContents() + Activate Link #FFBBBB + Deactivate ContentManager + + Link->Link: getDay() + Activate Link #DarkSalmon + Link --> Link: currentDay + + opt if currentDay equals to user argument Day + Deactivate Link + + Link -> Link: getViewDescription() + Activate Link #DarkSalmon + + Link --> Link: description + Deactivate Link + Link -> StringBuilder: append(description) + Activate StringBuilder #FFBBBB + Deactivate Link + end + end StringBuilder -> StringBuilder: toString() Activate StringBuilder #DarkSalmon -StringBuilder --> StringBuilder: dailySchedule +StringBuilder --> StringBuilder: dailySchedule Deactivate StringBuilder StringBuilder --> Timetable: dailySchedule +Deactivate StringBuilder +Timetable --> TimetableCommand: DailyScedule +Deactivate Timetable +Deactivate TimetableCommand +end + + + + + +end + @enduml From 2a631299201df979bb79a45be708b0674487fc87 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Thu, 21 Oct 2021 23:29:51 +0800 Subject: [PATCH 208/466] Update gradle.yml --- .github/workflows/gradle.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index a3c31ff671..fe46f4cc36 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -48,9 +48,4 @@ jobs: working-directory: ${{ github.workspace }}/text-ui-test shell: cmd run: runtest.bat - - - uses: codecov/codecov-action@v1 - if: runner.os == 'Linux' - with: - file: ${{ github.workspace }}/build/reports/jacoco/coverage/coverage.xml - fail_ci_if_error: true + From 452e0df2e98f6cb8b5f499870b3dd7f7dd0a8bc7 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Thu, 21 Oct 2021 23:30:16 +0800 Subject: [PATCH 209/466] Update build.gradle --- build.gradle | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/build.gradle b/build.gradle index 955a80cb25..a2c7ee3f58 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,6 @@ plugins { id 'java' id 'application' id 'checkstyle' - id 'jacoco' id 'com.github.johnrengelman.shadow' version '5.1.0' } @@ -28,22 +27,6 @@ test { showStackTraces true showStandardStreams = false } - finalizedBy jacocoTestReport -} - -task coverage(type: JacocoReport) { - sourceDirectories.from files(sourceSets.main.allSource.srcDirs) - classDirectories.from files(sourceSets.main.output) - executionData.from files(jacocoTestReport.executionData) - afterEvaluate { - classDirectories.from files(classDirectories.files.collect { - fileTree(dir: it, exclude: ['**/*.jar']) - }) - } - reports { - html.required = true - xml.required = true - } } application { From 6cc9a23d9e62e7ace2a5a039436bee3c8ae833c0 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Thu, 21 Oct 2021 23:51:22 +0800 Subject: [PATCH 210/466] Use reference frames --- docs/attachments/Timetable.png | Bin 127339 -> 82529 bytes docs/uml/Timetable.puml | 59 ++------------------------------- 2 files changed, 3 insertions(+), 56 deletions(-) diff --git a/docs/attachments/Timetable.png b/docs/attachments/Timetable.png index e62a5cc12c392ea270b19e594efae5e8e39c9ea3..2a983fb8f71ef5a76f8803ed66a01c07c8c4b4ce 100644 GIT binary patch literal 82529 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

|c6FR#xQVmnD3d5gW2ECK4hR$X9rV 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 JS?83{1ORSh5rY5# literal 0 HcmV?d00001 diff --git a/docs/uml/storage/AddModuleStorage.puml b/docs/uml/storage/AddModuleStorage.puml index c67b20219a..75e252af8a 100644 --- a/docs/uml/storage/AddModuleStorage.puml +++ b/docs/uml/storage/AddModuleStorage.puml @@ -1,22 +1,45 @@ @startuml 'https://plantuml.com/sequence-diagram +participant ":ModuleManager" as ModuleManager participant ":AddModuleCommand" as AddModuleCommand participant ":ModuleStorage" as ModuleStorage -> AddModuleCommand : execute(ui, moduleManager) activate AddModuleCommand - group ref [Refer to Add Module Section] - ||| + ref over AddModuleCommand + Refer to Add Module Command Section end ||| AddModuleCommand -> ModuleStorage : getInstance() activate ModuleStorage ||| - return ":ModuleStorage" - Deactivate ModuleStorage + return :ModuleStorage AddModuleCommand -> ModuleStorage : createModuleDirectory() - + activate ModuleStorage + ||| + alt does file exists + ModuleStorage -> : Files.createDirectories(filepath:Path) + else else + ModuleStorage -> ModuleStorage : deleteAllFilesInDirectory(filepath:Path) + activate ModuleStorage + Deactivate ModuleStorage + end + return :Boolean + opt [if :Boolean is true] + AddModuleCommand -> ModuleManager : setModule(moduleName:String) + activate ModuleManager + ref over ModuleManager + Refer to Set Module Section + end + Deactivate ModuleManager + end + ref over AddModuleCommand + Refer to Add Module Command Section + end +return CommandResult(isOk: Boolean) +Deactivate AddModuleCommand +||| diff --git a/docs/uml/storage/AddNoteCommand_Storage_SequenceDiagram.puml b/docs/uml/storage/AddNoteCommand_Storage_SequenceDiagram.puml new file mode 100644 index 0000000000..c97656fdbf --- /dev/null +++ b/docs/uml/storage/AddNoteCommand_Storage_SequenceDiagram.puml @@ -0,0 +1,34 @@ +@startuml +'https://plantuml.com/sequence-diagram + +participant ":AddNoteCommand" as AddNoteCommand +participant ":ModuleStorage" as ModuleStorage + +-> AddNoteCommand : execute(ui, moduleManager) +activate AddNoteCommand + ref over AddNoteCommand + Refer to Add Note Command Section + end + ||| + AddNoteCommand -> ModuleStorage : getInstance() + activate ModuleStorage + ||| + return :ModuleStorage + AddNoteCommand -> AddNoteCommand : getModuleName() + activate AddNoteCommand + return moduleName:String + AddNoteCommand -> ModuleStorage : addNoteFromModule(moduleName:String, newNote: Note) + activate ModuleStorage + ||| + opt module folder does not exists + ModuleStorage -> : Files.createDirectories(filepath:Path) + end + ModuleStorage -> ModuleStorage :createNoteFile(modDirPath:Path, newNote:Note) + activate ModuleStorage + ModuleStorage -> : Files.writeString(filePath: Path, note.getData():String) + Deactivate ModuleStorage + +return CommandResult(isOk: Boolean) +Deactivate AddNoteCommand +||| +@enduml \ No newline at end of file diff --git a/docs/uml/storage/DeleteModuleCommand_Storage_SequenceDiagram.puml b/docs/uml/storage/DeleteModuleCommand_Storage_SequenceDiagram.puml new file mode 100644 index 0000000000..5dccdba140 --- /dev/null +++ b/docs/uml/storage/DeleteModuleCommand_Storage_SequenceDiagram.puml @@ -0,0 +1,48 @@ +@startuml +'https://plantuml.com/sequence-diagram + +participant ":DeleteModuleCommand" as DeleteModuleCommand +participant ":ModuleStorage" as ModuleStorage + +-> DeleteModuleCommand : execute(ui, moduleManager) +activate DeleteModuleCommand + ref over DeleteModuleCommand + Refer to Delete Module Command Section + end + ||| + DeleteModuleCommand -> ModuleStorage : getInstance() + activate ModuleStorage + ||| + return :ModuleStorage + DeleteModuleCommand -> ModuleStorage : cleanAfterDeleteModule(:String) + activate ModuleStorage + ||| + alt folder does not exists + ref over ModuleStorage + Folder is already deleted. + Return. + end + else else + ModuleStorage -> ModuleStorage : cleanAllFilesInclusive(folder:Path) + activate ModuleStorage + opt folder still exists + ModuleStorage -> ModuleStorage + note left: IOException thrown + end + end + Deactivate ModuleStorage + return + + + ref over DeleteModuleCommand + Refer to Delete Module Command Section + end +return CommandResult(isOk: Boolean) +Deactivate DeleteModuleCommand +||| + + + + + +@enduml \ No newline at end of file diff --git a/docs/uml/storage/StorageInitializeSequenceDiagram.puml b/docs/uml/storage/StorageInitializeSequenceDiagram.puml new file mode 100644 index 0000000000..412bcde066 --- /dev/null +++ b/docs/uml/storage/StorageInitializeSequenceDiagram.puml @@ -0,0 +1,73 @@ +@startuml +'https://plantuml.com/sequence-diagram + +participant ":Terminus" as Terminus +participant ":ModuleStorage" as ModuleStorage + +ref over Terminus +Refer to main program flow. +end +activate Terminus +||| +Terminus -> Terminus : start() +activate Terminus +||| +Terminus -> ModuleStorage : getInstance() +activate ModuleStorage + opt ModuleStorage has not been created yet + ModuleStorage -> ModuleStorage : ModuleStorage() + activate ModuleStorage + return moduleStorage: ModuleStorage + end + return moduleStorage: ModuleStorage +Terminus -> ModuleStorage : init(:Path) +note left: passes the filepath of the main json file +activate ModuleStorage +Deactivate ModuleStorage +Terminus -> ModuleStorage : loadFile() +activate ModuleStorage +ModuleStorage -> ModuleStorage : initializeFile(); + activate ModuleStorage + note right: create files accordingly for first time run + return + alt json file is not readable + ||| + ref over ModuleStorage + Fatal error, return null + end + else else + ref over ModuleStorage + load json data into ModuleManager using GsonBuilder + end + ModuleStorage -> ModuleStorage : loadAllNotes(moduleManager:ModuleManager) + activate ModuleStorage + loop each module item in moduleManager + ref over ModuleStorage + Refer to valid Module Name Section + end + note right: filter module from json file + ||| + alt module name is not valid + ModuleStorage -> ModuleManager : removeMod(mod:String) + else else + alt module folder does not exists + ModuleStorage -> : Files.createDirectories(modDirPath: Path); + else else + ModuleStorage -> ModuleStorage : loadNotesFromModule(moduleManager:ModuleManager, mod:String) + activate ModuleStorage + ref over ModuleStorage + Refer to Reload Notes Command Section. + end + return + end + return + end + return : ModuleManager + end + end + + + + + +@enduml \ No newline at end of file From 8b0dcaf9566fdbf4b084cdcc7ce3a3581d0ae341 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Fri, 22 Oct 2021 13:15:49 +0800 Subject: [PATCH 223/466] Add initialize storage implementation in DG --- docs/DeveloperGuide.md | 54 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index 862573ffb3..14bab7a419 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -25,7 +25,8 @@ * [4.2 Active Recall](#42-active-recall-implementation) * [4.3 Workspace]() * [4.4 Adding and Deleting Content]() - * [4.5 Storage]() + * [4.5 Storage](#45-storage-implementation) + + [4.5.1 Initialize Storage](#451-initialize-storage-implementation) - [5. Documentation, Logging, Testing and DevOps]() - [Appendix A: Product Scope]() - [Appendix B: User Stories ]() @@ -324,3 +325,54 @@ Once the adjustment of weights of the question is done, the process is repeated questions left inside `QuestionGenerator`. Otherwise, the Active Recall session will be terminated, and the input will be passed back to the `CommandParser`. +### 4.5 Storage Implementation + +To view the high-level diagram, head to +[3.8 Storage](#38-storage-component). + +#### 4.5.1 Initialize Storage Implementation + +![](attachments/StorageInitializeSequenceDiagram.png) + +When `Terminus` just started, it will need to initialize a ModuleStorage object and loads any +related data from the `data` directory containing all previously saved data if any. + +Firstly, `Terminus` will initialise an instance of `ModuleStorage` which is a singleton class +object. `Terminus` will then set the filepath of the `ModuleStorage` with the main `.json` file +filepath which contains data such as `module`, `questions` and `schedules`. `Terminus` do so by +calling the `init()` function provided by `ModuleStorage`. + +Next, `Terminus` will proceed to load any data from the `data` directory by calling `loadFile()` +provided by `ModuleStorage`. Within the `ModuleStorage` method `loadFile()`, it will first check if +the main directory of `data` exists. This is because for first time execution of `Terminus`, there +should not be any `data` folder within the same folder in which `Terminus` was executed from. Hence, +if no `data` directory was found, it will create a `data` directory and create the main `.json` +file as well. However, if `data` directory exists, it will locate the main `.json` file within +the `data` directory. This main `.json` file is very important in telling `Terminus` what `modules` +does it have before this current execution of `Terminus`. + +After which, the main `.json` contents will be loaded into `ModuleManager` by using +plugin `GsonBuilder`. This `ModuleManager` will then be used throughout the execution of `Terminus`. +For more information, please refer to ModuleManager Section. + +Next, `ModuleStorage` will proceed to load any note data from the `modules` stated within +the `ModuleManager` object. Firstly, due to the restriction of `Terminus workspace`, it will filter +out any `modules` whose name does not fit the criteria of a valid `module` name. Subsequently, it +will check if the `module` has an existing folder with the same name as the provided `module` name. +If no folder was found that means that it does not have any note data and hence it will create a +folder for that `module` and proceed to check on other `modules` in the `ModuleManager`. If the +specified `module` folder was found, it will proceed to load any `.txt` file within that folder as +note data for that `module`. + +`Note data` is stored in such a format where the `name` of the `.txt` +file is the `name` of the note and the `contents` of the `.txt` file will be the data for +that `Note` object. For example, if a `module` has **5** `Note` objects in Terminus, it should +have **5** `text` files in its `module` folder. + +These `.txt` files are then processed accordingly, checking whether if its **accessible**, **less +than 1MB** and **filename is a valid note name**. They are then loaded as `Note` object for +the `module`. For the rest that failed the criteria of a valid `Note` object, these files will then +be ignored. + +Lastly, after `ModuleStorage` has loaded all content data for all `modules` in the ModuleManager, it +will return the `ModuleManager` back to `Terminus` for further operations. From 4e57426f36ee9e8721a4e44b39900879940f77de Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Fri, 22 Oct 2021 13:52:59 +0800 Subject: [PATCH 224/466] Update text --- docs/DeveloperGuide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index 14bab7a419..211c652efb 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -335,7 +335,7 @@ To view the high-level diagram, head to ![](attachments/StorageInitializeSequenceDiagram.png) When `Terminus` just started, it will need to initialize a ModuleStorage object and loads any -related data from the `data` directory containing all previously saved data if any. +related data from the `data` directory containing all previously saved data. Firstly, `Terminus` will initialise an instance of `ModuleStorage` which is a singleton class object. `Terminus` will then set the filepath of the `ModuleStorage` with the main `.json` file From a8bdf1532fed07ab44b7df1c29240a43a5bc3d9c Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Fri, 22 Oct 2021 19:43:22 +0800 Subject: [PATCH 225/466] Update introduction, add purpose of document --- docs/UserGuide.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 15d3f2eeb4..96aa9902f4 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -2,8 +2,15 @@ ## Introduction -TermiNUS is a CLI (command line interface) program for NUS Students who wish to organize their NUS academic materials through a CLI. -The product aims to aid student in organizing their academic schedule and enhancing their learning experiences. +TermiNUS is a CLI (command line interface) program for NUS Students who wish to consolidate their +NUS academic materials such as zoom links, questions and notes for the modules that they are taking. +With TermiNUS, it aims to aid Students and improve their learning experiences while studying in NUS. + +## Purpose + +This documents aims to provide you with instruction on how to use `TermiNUS` and tips & tricks +included to improve your experiences while using it. The document will bring you through a +detailed guide on all existing commands as well as aiding you in installing `TerminNUS`. ## Contents * [Getting Start](#Getting-Started) @@ -31,7 +38,7 @@ The product aims to aid student in organizing their academic schedule and enhanc ## Getting Started -1. Ensure that you have Java 11 or above installed. +1. Ensure that you have Java 11 or above installed. You can 2. Download the latest version of `TermiNUS` from [here](https://github.com/AY2122S1-CS2113T-T10-2/tp/releases/). 3. When you first start the program, you will be greeted with our banner: From f00c45d0bc6f3df0a123884991d35bfba96bf2bf Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Fri, 22 Oct 2021 20:17:33 +0800 Subject: [PATCH 226/466] Add using this guide, update getting started --- docs/UserGuide.md | 163 +++++++++++++++++++++++++++++++--------------- 1 file changed, 110 insertions(+), 53 deletions(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 96aa9902f4..c02ca0f08c 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -1,18 +1,7 @@ # TermiNUS User Guide -## Introduction - -TermiNUS is a CLI (command line interface) program for NUS Students who wish to consolidate their -NUS academic materials such as zoom links, questions and notes for the modules that they are taking. -With TermiNUS, it aims to aid Students and improve their learning experiences while studying in NUS. +## Table of Contents -## Purpose - -This documents aims to provide you with instruction on how to use `TermiNUS` and tips & tricks -included to improve your experiences while using it. The document will bring you through a -detailed guide on all existing commands as well as aiding you in installing `TerminNUS`. - -## Contents * [Getting Start](#Getting-Started) * [Section: Note](#Section:-Note) * [Accessing Note : `note`](#Accessing-Note) @@ -36,38 +25,79 @@ detailed guide on all existing commands as well as aiding you in installing `Ter * [Command Summary](#Command-Summary) * [Advanced Command Summary](#Advanced-Command-Summary) +## Introduction + +TermiNUS is a CLI (command line interface) program for NUS Students who wish to consolidate their +NUS academic materials such as zoom links, questions and notes for the modules that they are taking. +With TermiNUS, it aims to aid Students and improve their learning experiences while studying in NUS. + +## Purpose + +This documents aims to provide you with instruction on how to use `TermiNUS` and tips & tricks +included to improve your experiences while using it. The document will bring you through a detailed +guide on all existing commands as well as aiding you in installing `TerminNUS`. + +--- + ## Getting Started -1. Ensure that you have Java 11 or above installed. You can -2. Download the latest version of `TermiNUS` from [here](https://github.com/AY2122S1-CS2113T-T10-2/tp/releases/). -3. When you first start the program, you will be greeted with our banner: +1. Ensure that you + have [Java 11](https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html) or + above installed. +2. Download the latest version of `TermiNUS.jar` + from [here](https://github.com/AY2122S1-CS2113T-T10-2/tp/releases/). +3. Copy the file to the folder you want to use for `Terminus`. + 1. This is because `Terminus` will store all its saved data in the folder it is currently in. +4. Open your command prompt and go into the folder containing the `TermiNUS.jar` file. + 1. You can do so by `win + R` and run `cmd`. + 2. Next, a console will appear, type in the following `cd C:/folder` where `folder` is the + folder containing the `TermiNUS.jar` file. +5. Next to run `TermiNUS`, in the command prompt type in `java -jar TermiNUS.jar`. +6. When you first start the `TermiNUS`, you will be greeted with our banner: ``` - Welcome to TermiNUS! + Welcome to TermiNUS! + You have no schedule for today. + + Type any of the following to get started: + > exit + > help + > module + > go + > timetable - Type any of the following to get started: - > note - > schedule - > help - > exit - - [] >>> + [] >>> ``` -4. To get started, you can run the following commands: - - note - - schedule - - help - - exit +7. To get started, you can run the following commands: -___ + - module + - go + - timetable + - help + - exit +8. For more information of each command, please refer to the [Features](#Section:-Note) below. + +___ + +## Using this Guide + +Along the way, you might encounter commands with specific brackets around some arguments such +as `{}` and `<>`. The below table represents what each means. + +| Command options | Description | +| ----------- | ----------- | +| `{argument}` | This means the argument is optional.| +| `` | This means the argument is compulsory.| + +--- ## Section: Note ### Accessing Note + **Format:** `note` -Accessing the note workspace -After running the note command, you can see the following: +Accessing the note workspace After running the note command, you can see the following: ``` [] >>> note @@ -85,8 +115,10 @@ Type any of the following to get started: ``` ### Adding a Note + **Format:** `add "" ""` -Adding a note when in the note workspace +Adding a note when in the note workspace + ``` [note] >>> add “Remind Cabbin” “Cabbin was here” Note has been added! @@ -94,8 +126,10 @@ Note has been added! ``` ### Delete a Note + **Format:** `delete ` Deletes the specified note given by its index. + ``` [note] >>> delete 1 Note `Remind Cabbin` has been deleted! @@ -103,9 +137,11 @@ Note `Remind Cabbin` has been deleted! ``` ### View Note + **Format:** `view` or `view {index}` Two ways to use this command simply running view or view [index] View by itself will list all notes + ``` [note] >>> view You have 3 notes inside: @@ -126,12 +162,13 @@ Content: Cabbin was here [note] >>> ``` - ## Section: Schedule ### Accessing Schedule + **Format:** `schedule` After running the schedule command, you can see the following: + ``` [] >>> schedule You have 0 link(s) in this workspace. @@ -148,8 +185,10 @@ Type any of the following to get started: ``` ### Adding a Schedule + **Format:** `add "" "" "" ""` Adding a new schedule when in the schedule’s workspace + ``` [schedule] >>> add “Module1 Tut1” "Thursday" "10:00" "https://zoom.us/test" You have added Module1 Tut’s scheduled zoom link! @@ -157,8 +196,10 @@ You have added Module1 Tut’s scheduled zoom link! ``` ### Delete a Schedule + **Format:** `delete ` Delete schedule when in the schedule’s workspace + ``` [schedule] >>> delete 1 You have deleted your 1st schedule. @@ -167,8 +208,10 @@ Schedule `Module1 Tut, Thursday, 10:00, https://zoom.us/test` has been deleted! ``` ### View Schedule + **Format:** `view` View all schedules when in the schedule’s workspace + ``` [schedule] >>> view You have 3 schedules inside: @@ -179,13 +222,12 @@ You have 3 schedules inside: [schedule] >>> ``` - ## Section: Question ### Accessing Question + **Format:** `question` -Accessing the question workspace -After running the question command, you can see the following: +Accessing the question workspace After running the question command, you can see the following: ``` [] >>> question @@ -205,8 +247,10 @@ Type any of the following to get started: ``` ### Adding a Question + **Format:** `add "" ""` Adding a question when in the question workspace + ``` [question] >>> add "What is 1+1?" "2" Your question on 'What is 1+1?' has been added! @@ -214,8 +258,10 @@ Your question on 'What is 1+1?' has been added! ``` ### Delete a Question + **Format:** `delete ` Deletes the specified question given by its index. + ``` [question] >>> delete 1 Your question on 'What is 1+1?' has been deleted! @@ -223,9 +269,11 @@ Your question on 'What is 1+1?' has been deleted! ``` ### View Question + **Format:** `view` or `view {index}` Two ways to use this command simply running view or view [index] View by itself will list all questions + ``` [question] >>> view List of Content @@ -250,14 +298,15 @@ Placing different data regions into different frames ``` ### Testing Yourself with Active Recall + **Format:** `test` or `test {count}` You can start an Active Recall session by running the `test` command. -By default, it will test 10 questions (or less if there are not enough questions). You may specify -how many questions you wish to run in that session by keying in the number of questions after the +By default, it will test 10 questions (or less if there are not enough questions). You may specify +how many questions you wish to run in that session by keying in the number of questions after the `test` command. -When you begin, you will be prompted with the following (do note that the question pool may be +When you begin, you will be prompted with the following (do note that the question pool may be smaller if there are not enough questions in the workspace). Press the Enter key to start. @@ -271,7 +320,7 @@ This session will consist of 3 questions. When you are ready, press [Enter] to continue. ``` -The first question will be displayed, and once you are ready to reveal the answer, press the +The first question will be displayed, and once you are ready to reveal the answer, press the Enter key again. ``` @@ -283,8 +332,8 @@ What is segmentation? When you are ready, press [Enter] to continue. ``` -After revealing the answer, provide feedback to TermiNUS to allow it to know if the question should -appear more often in the future. +After revealing the answer, provide feedback to TermiNUS to allow it to know if the question should +appear more often in the future. - Key in `1` if you felt it was easy. - Key in `2` if you felt it was normal. @@ -302,7 +351,7 @@ How did you find the question? (Compare against past attempts if any) [1/2/3/E] >> ``` -After choosing your difficulty, you may proceed to reveal the next question by pressing +After choosing your difficulty, you may proceed to reveal the next question by pressing Enter key again. ``` @@ -311,7 +360,7 @@ After choosing your difficulty, you may proceed to reveal the next question by p When you are ready, press [Enter] to continue. ``` -Once the question pool is empty, or when you decided to stop, TermiNUS will drop you back into the +Once the question pool is empty, or when you decided to stop, TermiNUS will drop you back into the command prompt. ``` @@ -321,14 +370,17 @@ Returning you back to main program. ``` ## Exiting the Program + **Format:** `exit` To exit the program, simply run the following command: + ``` [] >>> exit Goodbye! ``` ## Accessing Help + **Format:** `help` Depending on your current workspace, you may get different help messages. The following shows the help message in the main workspace: @@ -356,25 +408,29 @@ Running `help [command]` will print the help for the specific workspace. ``` ## Advanced Usage of Commands -User can access workspace command directly without entering its environment. Seen below are some command examples. -A workspace command is a command that will bring you to its own workspace. Current workspace command includes notes and schedules. +User can access workspace command directly without entering its environment. Seen below are some +command examples. -Command syntax: +A workspace command is a command that will bring you to its own workspace. Current workspace command +includes notes and schedules. +Command syntax: Adding a note without entering the note workspace. + ``` [] >>> note add “Remind Cabbin” “Cabbin was here” Note has been added! [] >>> ``` -Adding a schedule without entering the schedule workspace. +Adding a schedule without entering the schedule workspace. + ```dtd [] >>> schedule add “Module1 Tut” Thursday 10:00 https://zoom.us/test -You have added Module1 Tut’s scheduled zoom link! -[] >>> + You have added Module1 Tut’s scheduled zoom link! + [] >>> ``` ___ @@ -383,7 +439,7 @@ ___ ___ -## Command Summary +## Command Summary | **Action** | **Format, Examples** | | ------------ | ------------- | @@ -397,12 +453,13 @@ ___ ___ -## Advanced Command Summary +## Advanced Command Summary | **Action** | **Format, Examples** | | ------------ | ------------- | |**add note**|`note add "" ""`
e.g. `note add note1 note_content`| -|**add schedule**|`schedule add "" "" "" ""`
e.g. `schedule add “Module1 Tut” "Thursday" "10:00" "https://zoom.us/test"`| +|**add +schedule**|`schedule add "" "" "" ""`
e.g. `schedule add “Module1 Tut” "Thursday" "10:00" "https://zoom.us/test"`| |**delete note**|`note delete `
e.g. `note delete 1`| |**delete schedule**|`schedule delete `
e.g. `schedule delete 1`| |**view note**|`note view` or `note view {index}`
e.g. `note view 1`| From dcb0857e9857abc8f8a42dd3581bbfe7e50d4c59 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Fri, 22 Oct 2021 21:28:00 +0800 Subject: [PATCH 227/466] Add module workspace command --- docs/UserGuide.md | 112 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 108 insertions(+), 4 deletions(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index c02ca0f08c..003c992a98 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -82,16 +82,120 @@ ___ ## Using this Guide -Along the way, you might encounter commands with specific brackets around some arguments such -as `{}` and `<>`. The below table represents what each means. +Along the way, you might encounter commands with specific brackets around some values such as `{}` +and `<>`. + +The below table represents what each means. | Command options | Description | | ----------- | ----------- | -| `{argument}` | This means the argument is optional.| -| `` | This means the argument is compulsory.| +| `{value}` | The value is optional, and including it may provide different results.| +| `` | The value is required for the command to work properly.| +|`index`|A number identifying an item in TermiNUS. This index can only be viewed using the `view` command.| + +Terminologies used throughout this guide: + +| Terminology | Description | +| ----------- | ----------- | +| workspace | A workspace is the environment in which you are currently assessing. For example, when you want to access some files inside a folder, you will need to enter the folder first. As such the folder is a **workspace**.| +|module|A module refers to a NUS module. For example, `CS2113T` is a module.| --- +## Section: Module + +All commands related to the workspace `Module` will be displayed in these section. These commands +enable users to create, delete and view `modules` within TermiNUS. + +### Accessing the module workspace + +**Format:** `module` + +Example: `module` + +Expected Output: + +``` +[] >>> module + +You have 0 modules + +Type any of the following to get started: +> add +> exit +> help +> view +> back +> delete + +[module] >>> +``` + +List of Module workspace commands: + +| Command | Description | +| ----------- | ----------- | +|add|add a module in TermiNUS| +|delete|delete a module in TermiNUS| +|view|view modules information currently in TermiNUS| +|help|view all commands and its usage within the module workspace| +|back|escape and return to the default workspace| +|exit|exit and closes TermiNUS| + +### Adding a new module + +**Format:** `add ""` + +Adds a module when in the module workspace. + +> 💡 When executing this command, it will add the module into TermiNUS and creates a folder with the module code. + +> ❗ If there exists a folder with the same code of the newly added module, all contents in that folder will be wiped. + +Example: `add "CS2113T"` + +Expected Output: + +``` +[module] >>> add "CS2113T" +Module CS2113T has been added +[module] >>> +``` + +### Deleting a module + +**Format:** `delete ` + +Deletes the specified module given by its **index** when in the module workspace. + +Example: `delete 1` + +Expected Output: + +``` +[module] >>> delete 1 +Deleted module CS2113T. +[module] >>> +``` + +### Viewing module information + +**Format:** `view` + +Views all modules when in the module workspace. + +Example: `view` + +Expected Output: + +``` +[module] >>> view +1. CS2113T +2. CS2106 +[module] >>> +``` + + ## Section: Note ### Accessing Note From 126df20ae22e19c0207549003969d80b85bb2020 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Fri, 22 Oct 2021 22:17:27 +0800 Subject: [PATCH 228/466] Add section module workspace, basically the go command --- docs/UserGuide.md | 67 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 58 insertions(+), 9 deletions(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 003c992a98..da446f21aa 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -102,12 +102,12 @@ Terminologies used throughout this guide: --- -## Section: Module +## Section: Module Management -All commands related to the workspace `Module` will be displayed in these section. These commands +All commands related to the workspace `Module Management` will be displayed in these section. These commands enable users to create, delete and view `modules` within TermiNUS. -### Accessing the module workspace +### Accessing the module management workspace **Format:** `module` @@ -131,14 +131,14 @@ Type any of the following to get started: [module] >>> ``` -List of Module workspace commands: +List of Module Management workspace commands: | Command | Description | | ----------- | ----------- | |add|add a module in TermiNUS| |delete|delete a module in TermiNUS| |view|view modules information currently in TermiNUS| -|help|view all commands and its usage within the module workspace| +|help|view all commands and their usage within the module management workspace| |back|escape and return to the default workspace| |exit|exit and closes TermiNUS| @@ -146,7 +146,7 @@ List of Module workspace commands: **Format:** `add ""` -Adds a module when in the module workspace. +Adds a module when in the module management workspace. > 💡 When executing this command, it will add the module into TermiNUS and creates a folder with the module code. @@ -166,7 +166,9 @@ Module CS2113T has been added **Format:** `delete ` -Deletes the specified module given by its **index** when in the module workspace. +Deletes the specified module given by its **index** when in the module management workspace. + +> ❗ When the specified module is being deleted, all contents in its folder will be wiped. Example: `delete 1` @@ -182,9 +184,9 @@ Deleted module CS2113T. **Format:** `view` -Views all modules when in the module workspace. +Views all modules when in the module management workspace. -Example: `view` +Example: `view` Expected Output: @@ -195,6 +197,53 @@ Expected Output: [module] >>> ``` +--- + +## Section: Module + +All commands related to accessing the existing modules in TermiNUS. These commands enable users to +enter the module workspace in Terminus. + +> 💡 The module mentioned here are the modules created within the **module management workspace**. Please refer to [Section: Module Management](#section-module-management) for more information. + +List of Module workspace commands: + +| Command | Description | +| ----------- | ----------- | +|note|enter the note workspace| +|schedule|enter the schedule workspace| +|question|enter the question workspace| +|help|view all commands and their usage within its module workspace| +|back|escape and return to the default workspace| +|exit|exit and closes TermiNUS| + +### Accessing module workspace + +**Format:** `go ` + +Enters the module workspace to access data within the module. + +Example: `go CS2113T` + +Expected Output: + +``` +[] >>> go CS2113T + +Entering CS2113T workspace + +Type any of the following to get started: +> exit +> help +> note +> schedule +> question +> back + +[CS2113T] >>> +``` + +--- ## Section: Note From 8e5e0fc842d82b1c6a57e65e962809270a9358c4 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Fri, 22 Oct 2021 22:25:22 +0800 Subject: [PATCH 229/466] Address PR comments, add JavaDoc, and fix JUnitTests --- .../command/content/link/AddLinkCommand.java | 10 +++---- src/main/java/terminus/common/Messages.java | 3 ++- .../terminus/timetable/ConflictManager.java | 27 ++++++++++++------- .../java/terminus/command/GoCommandTest.java | 2 +- .../terminus/command/ScheduleCommandTest.java | 4 +-- .../command/TimetableCommandTest.java | 14 +++++----- .../content/link/AddLinkCommandTest.java | 10 ++++--- .../content/link/DeleteLinkCommandTest.java | 2 +- .../content/link/ViewLinkCommandTest.java | 6 ++--- .../terminus/content/ContentManagerTest.java | 14 +++++----- .../java/terminus/module/NusModuleTest.java | 2 +- .../parser/LinkCommandParserTest.java | 12 ++++----- .../terminus/storage/ModuleStorageTest.java | 2 +- src/test/resources/saveFile.json | 1 + src/test/resources/validFile.json | 1 + 15 files changed, 62 insertions(+), 48 deletions(-) diff --git a/src/main/java/terminus/command/content/link/AddLinkCommand.java b/src/main/java/terminus/command/content/link/AddLinkCommand.java index 8a12213f0f..3f4119c963 100644 --- a/src/main/java/terminus/command/content/link/AddLinkCommand.java +++ b/src/main/java/terminus/command/content/link/AddLinkCommand.java @@ -16,8 +16,9 @@ import terminus.timetable.ConflictManager; import terminus.ui.Ui; -import static terminus.common.CommonUtils.*; - +import static terminus.common.CommonUtils.isValidDuration; +import static terminus.common.CommonUtils.isValidDay; +import static terminus.common.CommonUtils.isValidUrl; /** * AddLinkCommand class which will manage the adding of new Links from user command. @@ -73,9 +74,8 @@ public void parseArguments(String arguments) throws InvalidArgumentException { throw new InvalidArgumentException(String.format(Messages.ERROR_MESSAGE_INVALID_DAY, this.day)); } if (!isValidUrl(this.link)) { - TerminusLogger.warning(String.format("Invalid Link: %s", this.link)); - throw new InvalidArgumentException( - String.format(Messages.ERROR_MESSAGE_INVALID_LINK, this.link)); + TerminusLogger.warning(String.format("Invalid Link: %s", this.link)); + throw new InvalidArgumentException(String.format(Messages.ERROR_MESSAGE_INVALID_LINK, this.link)); } isValidDuration(startTime, duration); TerminusLogger.info(String.format("Parsed arguments (description = %s, day = %s, startTime = %s, link = %s)" diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index 99b1fceea2..dd621c2f4b 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -27,7 +27,8 @@ public class Messages { public static final String ERROR_MESSAGE_INVALID_LINK = ERROR_MESSAGE_TAG + "Invalid link %s."; public static final String ERROR_MESSAGE_INVALID_DAY = ERROR_MESSAGE_TAG + "Invalid day %s."; public static final String ERROR_MESSAGE_INVALID_DURATION = ERROR_MESSAGE_TAG + "Invalid duration %d."; - public static final String ERROR_MESSAGE_SCHEDULE_OVERFLOW = ERROR_MESSAGE_TAG + "Please set schedules on separate days."; + public static final String ERROR_MESSAGE_SCHEDULE_OVERFLOW = ERROR_MESSAGE_TAG + + "Please set schedules on separate days."; public static final String ERROR_MESSAGE_DUPLICATE_NAME = ERROR_MESSAGE_TAG + "Duplicate name found."; public static final String ERROR_FILE_TOO_LARGE = "Unable to read large files."; diff --git a/src/main/java/terminus/timetable/ConflictManager.java b/src/main/java/terminus/timetable/ConflictManager.java index 272f4777f6..d14e77b951 100644 --- a/src/main/java/terminus/timetable/ConflictManager.java +++ b/src/main/java/terminus/timetable/ConflictManager.java @@ -19,13 +19,18 @@ public ConflictManager(ModuleManager moduleManager, Link newLink) { this.newLink = newLink; } + /** + * Retrieve all the Link from all the user Modules. + * + * @return An ArrayList of all the user Links. + */ public ArrayList getAllLinks() { ArrayList currentLinks = new ArrayList(); String[] modules = moduleManager.getAllModules(); Stream stream = Arrays.stream(modules); stream.forEach(x -> { - NusModule module = moduleManager.getModule(x); + NusModule module = moduleManager.getModule(x); ContentManager contentManager = module.getContentManager(Link.class); assert contentManager != null; currentLinks.addAll(contentManager.getContents()); @@ -34,18 +39,22 @@ public ArrayList getAllLinks() { return currentLinks; } - + /** + * Retrieve all the conflicting Links with the newly added Link. + * + * @return A string object of all the conflicting Link details. + */ public String getConflictingSchedule() { ArrayList currentLinks = getAllLinks(); StringBuilder conflictList = new StringBuilder(); - currentLinks.stream().forEach(x -> { - boolean hasConflict = newLink.getEndTime().compareTo(x.getStartTime()) > 0 && newLink.getStartTime().compareTo(x.getEndTime()) < 0; - boolean isSameDay = newLink.getDay().equalsIgnoreCase(x.getDay()); - if (isSameDay && hasConflict) { - conflictList.append(String.format("%s\n", x.getViewDescription())); - } - }); + currentLinks.stream() + .filter(x -> newLink.getDay().equalsIgnoreCase(x.getDay())) + .filter(x -> newLink.getEndTime().compareTo(x.getStartTime()) > 0) + .filter(x -> newLink.getStartTime().compareTo(x.getEndTime()) < 0) + .forEach(x -> { + conflictList.append(String.format("%s\n", x.getViewDescription())); + }); return conflictList.toString(); } } diff --git a/src/test/java/terminus/command/GoCommandTest.java b/src/test/java/terminus/command/GoCommandTest.java index 900d348c7c..022a2873f1 100644 --- a/src/test/java/terminus/command/GoCommandTest.java +++ b/src/test/java/terminus/command/GoCommandTest.java @@ -83,7 +83,7 @@ void execute_goAdvance_success() throws InvalidArgumentException, InvalidCommand assertTrue(cmdResult.isOk()); assertTrue(cmdResult.getAdditionalData() instanceof LinkCommandParser); cmd = commandParser.parseCommand("go " + tempModule + " schedule add \"test\" \"Thursday\" \"00:00\" " - + "\"https://zoom.us\""); + + "\"2\" \"https://zoom.us\""); cmdResult = cmd.execute(ui, moduleManager); assertTrue(cmdResult.isOk()); assertEquals(1, moduleManager.getModule(tempModule).getContentManager(Link.class).getTotalContents()); diff --git a/src/test/java/terminus/command/ScheduleCommandTest.java b/src/test/java/terminus/command/ScheduleCommandTest.java index 3853a61572..e55a83892e 100644 --- a/src/test/java/terminus/command/ScheduleCommandTest.java +++ b/src/test/java/terminus/command/ScheduleCommandTest.java @@ -38,7 +38,7 @@ void execute_linkAdvance_success() throws InvalidArgumentException, InvalidComma assertTrue(changeResult.isOk()); assertTrue(changeResult.getAdditionalData() instanceof LinkCommandParser); mainCommand = commandParser.parseCommand("go " + tempModule + " schedule add \"test\" \"Thursday\" \"00:00\" " - + "\"https://zoom.us\""); + + "\"3\" \"https://zoom.us\""); changeResult = mainCommand.execute(ui, moduleManager); assertTrue(changeResult.isOk()); assertEquals(1, moduleManager.getModule(tempModule).getContentManager(Link.class).getTotalContents()); @@ -53,7 +53,7 @@ void execute_linkAdvance_throwsException() throws InvalidArgumentException, Inva () -> commandParser.parseCommand("go " + tempModule + " schedule -1").execute(ui, moduleManager)); assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand( - "go " + tempModule + " schedule add \"test\" \"Thursday\" \"00:00\" \"test.com\"") + "go " + tempModule + " schedule add \"test\" \"Thursday\" \"00:00\" \"2\" \"test.com\"") .execute(ui, moduleManager)); assertThrows(InvalidArgumentException.class, () -> commandParser.parseCommand("go " + tempModule + " schedule delete -1") diff --git a/src/test/java/terminus/command/TimetableCommandTest.java b/src/test/java/terminus/command/TimetableCommandTest.java index 7e2c7b774a..7cc513cf75 100644 --- a/src/test/java/terminus/command/TimetableCommandTest.java +++ b/src/test/java/terminus/command/TimetableCommandTest.java @@ -36,7 +36,7 @@ void setUp() { void execute_viewWeekly_success() throws InvalidArgumentException, InvalidCommandException, IOException { for (int i = 0; i < 5; i++) { Command addLinkCommand = linkCommandParser.parseCommand( - "add \"test\" \"Saturday\" \"00:00\" \"https://zoom.us/test\""); + "add \"test\" \"Saturday\" \"00:00\" \"2\" \"https://zoom.us/test\""); CommandResult addLinkResult = addLinkCommand.execute(ui, moduleManager); assertTrue(addLinkResult.isOk()); } @@ -47,7 +47,7 @@ void execute_viewWeekly_success() throws InvalidArgumentException, InvalidComman for (int i = 0; i < 5; i++) { Command addLinkCommand = linkCommandParser.parseCommand( - "add \"test\" \"Friday\" \"00:00\" \"https://zoom.us/test\""); + "add \"test\" \"Friday\" \"00:00\" \"3\" \"https://zoom.us/test\""); CommandResult addLinkResult = addLinkCommand.execute(ui, moduleManager); assertTrue(addLinkResult.isOk()); } @@ -58,7 +58,7 @@ void execute_viewWeekly_success() throws InvalidArgumentException, InvalidComman for (int i = 0; i < 5; i++) { Command addLinkCommand = linkCommandParser.parseCommand( - "add \"test\" \"Sunday\" \"00:00\" \"https://zoom.us/test\""); + "add \"test\" \"Sunday\" \"00:00\" \"5\" \"https://zoom.us/test\""); CommandResult addLinkResult = addLinkCommand.execute(ui, moduleManager); assertTrue(addLinkResult.isOk()); } @@ -72,21 +72,21 @@ void execute_viewWeekly_success() throws InvalidArgumentException, InvalidComman void execute_viewDaily_success() throws InvalidArgumentException, InvalidCommandException, IOException { for (int i = 0; i < 5; i++) { Command addLinkCommand = linkCommandParser.parseCommand( - "add \"test\" \"Tuesday\" \"00:00\" \"https://zoom.us/test\""); + "add \"test\" \"Tuesday\" \"00:00\" \"4\" \"https://zoom.us/test\""); CommandResult addLinkResult = addLinkCommand.execute(ui, moduleManager); assertTrue(addLinkResult.isOk()); } for (int i = 0; i < 5; i++) { Command addLinkCommand = linkCommandParser.parseCommand( - "add \"test\" \"Wednesday\" \"00:00\" \"https://zoom.us/test\""); + "add \"test\" \"Wednesday\" \"00:00\" \"3\" \"https://zoom.us/test\""); CommandResult addLinkResult = addLinkCommand.execute(ui, moduleManager); assertTrue(addLinkResult.isOk()); } for (int i = 0; i < 5; i++) { Command addLinkCommand = linkCommandParser.parseCommand( - "add \"test\" \"Thursday\" \"00:00\" \"https://zoom.us/test\""); + "add \"test\" \"Thursday\" \"00:00\" \"2\" \"https://zoom.us/test\""); CommandResult addLinkResult = addLinkCommand.execute(ui, moduleManager); assertTrue(addLinkResult.isOk()); } @@ -112,7 +112,7 @@ void execute_viewDaily_success() throws InvalidArgumentException, InvalidCommand void execute_viewDaily_exceptionThrown() throws InvalidArgumentException, InvalidCommandException, IOException { for (int i = 0; i < 5; i++) { Command addLinkCommand = linkCommandParser.parseCommand( - "add \"test\" \"Saturday\" \"00:00\" \"https://zoom.us/test\""); + "add \"test\" \"Saturday\" \"00:00\" \"4\" \"https://zoom.us/test\""); CommandResult addLinkResult = addLinkCommand.execute(ui, moduleManager); assertTrue(addLinkResult.isOk()); } diff --git a/src/test/java/terminus/command/content/link/AddLinkCommandTest.java b/src/test/java/terminus/command/content/link/AddLinkCommandTest.java index 39e3274136..0a5a3e2b93 100644 --- a/src/test/java/terminus/command/content/link/AddLinkCommandTest.java +++ b/src/test/java/terminus/command/content/link/AddLinkCommandTest.java @@ -38,28 +38,30 @@ void setUp() { @Test void parseArguments_addLinkCommand_success() { - String addLinkInput = "add \"test\" \"Thursday\" \"00:00\" \"https://zoom.us/test\""; + String addLinkInput = "add \"test\" \"Thursday\" \"00:00\" \"2\"\"https://zoom.us/test\""; ArrayList parsedArguments = CommonUtils.findArguments(addLinkInput); assertEquals("test", parsedArguments.get(0)); assertEquals("Thursday", parsedArguments.get(1)); assertEquals("00:00", parsedArguments.get(2)); - assertEquals("https://zoom.us/test", parsedArguments.get(3)); + assertEquals("2", parsedArguments.get(3)); + assertEquals("https://zoom.us/test", parsedArguments.get(4)); } @Test void execute_addLinkCommand_success() throws InvalidCommandException, InvalidArgumentException, IOException { - Command addLinkCommand = linkCommandParser.parseCommand("add \"test\" \"Monday\" \"00:00\" \"https://zoom.us/test\""); + Command addLinkCommand = linkCommandParser.parseCommand("add \"test\" \"Monday\" \"00:00\" \"2\" \"https://zoom.us/test\""); CommandResult addResult = addLinkCommand.execute(ui, moduleManager); assertTrue(addResult.isOk()); assertEquals(1, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); assertTrue(moduleManager.getModule(tempModule).getContentManager(type).getContentData(1).contains("test")); assertTrue(moduleManager.getModule(tempModule).getContentManager(type).getContentData(1).contains("Monday")); assertTrue(moduleManager.getModule(tempModule).getContentManager(type).getContentData(1).contains("00:00")); + assertTrue(moduleManager.getModule(tempModule).getContentManager(type).getContentData(1).contains("2")); assertTrue(moduleManager.getModule(tempModule).getContentManager(type).getContentData(1).contains("https://zoom.us/test")); for (int i = 0; i < 5; i++) { addLinkCommand = linkCommandParser.parseCommand( - "add \"test\" \"Saturday\" \"00:00\" \"https://zoom.us/test\""); + "add \"test\" \"Saturday\" \"00:00\" \"2\" \"https://zoom.us/test\""); addResult = addLinkCommand.execute(ui, moduleManager); assertTrue(addResult.isOk()); } diff --git a/src/test/java/terminus/command/content/link/DeleteLinkCommandTest.java b/src/test/java/terminus/command/content/link/DeleteLinkCommandTest.java index 863d7138f5..c2a5706af9 100644 --- a/src/test/java/terminus/command/content/link/DeleteLinkCommandTest.java +++ b/src/test/java/terminus/command/content/link/DeleteLinkCommandTest.java @@ -38,7 +38,7 @@ void setUp() { @Test void execute_deleteLink_success() throws InvalidCommandException, InvalidArgumentException, IOException { for (int i = 0; i < 3; i++) { - Command addLinkCommand = linkCommandParser.parseCommand("add \"test_desc\" \"Monday\" \"12:00\" \"https://zoom.us/test\""); + Command addLinkCommand = linkCommandParser.parseCommand("add \"test_desc\" \"Monday\" \"12:00\" \"1\" \"https://zoom.us/test\""); CommandResult addResult = addLinkCommand.execute(ui, moduleManager); assertTrue(addResult.isOk()); } diff --git a/src/test/java/terminus/command/content/link/ViewLinkCommandTest.java b/src/test/java/terminus/command/content/link/ViewLinkCommandTest.java index ef977969cb..4a0dfabce1 100644 --- a/src/test/java/terminus/command/content/link/ViewLinkCommandTest.java +++ b/src/test/java/terminus/command/content/link/ViewLinkCommandTest.java @@ -39,7 +39,7 @@ void setUp() { void execute_viewAll_success() throws InvalidCommandException, InvalidArgumentException, IOException { for (int i = 0; i < 5; i++) { Command addLinkCommand = linkCommandParser.parseCommand( - "add \"test\" \"Saturday\" \"00:00\" \"https://zoom.us/test\""); + "add \"test\" \"Saturday\" \"00:00\" \"1\" \"https://zoom.us/test\""); CommandResult addLinkResult = addLinkCommand.execute(ui, moduleManager); assertTrue(addLinkResult.isOk()); } @@ -54,7 +54,7 @@ void execute_viewAll_success() throws InvalidCommandException, InvalidArgumentEx void execute_viewLink_success() throws InvalidCommandException, InvalidArgumentException, IOException { for (int i = 0; i < 5; i++) { Command addLinkCommand = linkCommandParser.parseCommand( - "add \"test\" \"Saturday\" \"00:00\" \"https://zoom.us/test\""); + "add \"test\" \"Saturday\" \"00:00\" \"3\" \"https://zoom.us/test\""); CommandResult addLinkResult = addLinkCommand.execute(ui, moduleManager); assertTrue(addLinkResult.isOk()); } @@ -73,7 +73,7 @@ void execute_viewLink_success() throws InvalidCommandException, InvalidArgumentE void execute_viewLink_exceptionThrown() throws InvalidCommandException, InvalidArgumentException, IOException { for (int i = 0; i < 5; i++) { Command addLinkCommand = linkCommandParser.parseCommand( - "add \"test\" \"Saturday\" \"00:00\" \"https://zoom.us/test\""); + "add \"test\" \"Saturday\" \"00:00\" \"2\" \"https://zoom.us/test\""); CommandResult addLinkResult = addLinkCommand.execute(ui, moduleManager); assertTrue(addLinkResult.isOk()); } diff --git a/src/test/java/terminus/content/ContentManagerTest.java b/src/test/java/terminus/content/ContentManagerTest.java index 2acaa91033..8a3f988dc6 100644 --- a/src/test/java/terminus/content/ContentManagerTest.java +++ b/src/test/java/terminus/content/ContentManagerTest.java @@ -30,14 +30,14 @@ void addContent_note_success() throws InvalidArgumentException { @Test void addContent_link_success() throws InvalidArgumentException { - Link link = new Link("test", "monday", LocalTime.now(), "test.com"); + Link link = new Link("test", "monday", LocalTime.now(), 1, "test.com"); linkContentManager.add(link); assertEquals(link.getDisplayInfo(), linkContentManager.getContentData(1)); } @Test void deleteContent_link_success() throws InvalidArgumentException { - Link link = new Link("test", "monday", LocalTime.now(), "test.com"); + Link link = new Link("test", "monday", LocalTime.now(), 1, "test.com"); linkContentManager.add(link); assertEquals(1, linkContentManager.getTotalContents()); assertSame(link.getName(), linkContentManager.deleteContent(1)); @@ -55,7 +55,7 @@ void deleteContent_note_success() throws InvalidArgumentException { @Test void deleteContent_exceptionThrown() throws InvalidArgumentException { - Link link = new Link("test", "monday", LocalTime.now(), "test.com"); + Link link = new Link("test", "monday", LocalTime.now(), 2, "test.com"); linkContentManager.add(link); assertThrows(InvalidArgumentException.class, () -> linkContentManager.deleteContent(-1)); assertThrows(InvalidArgumentException.class, () -> linkContentManager.deleteContent(0)); @@ -71,7 +71,7 @@ void getContent_note_success() throws InvalidArgumentException { @Test void getContent_link_success() throws InvalidArgumentException { - Link link = new Link("test", "monday", LocalTime.now(), "test.com"); + Link link = new Link("test", "monday", LocalTime.now(), 1,"test.com"); linkContentManager.add(link); assertEquals(link.getDisplayInfo(), linkContentManager.getContentData(1)); } @@ -114,9 +114,9 @@ void listContent_note_success() { @Test void listContent_link_success() { - Link link1 = new Link("test1", "monday", LocalTime.now(), "test.com"); - Link link2 = new Link("test2", "monday", LocalTime.now(), "test.com"); - Link link3 = new Link("test3", "monday", LocalTime.now(), "test.com"); + Link link1 = new Link("test1", "monday", LocalTime.now(), 1, "test.com"); + Link link2 = new Link("test2", "monday", LocalTime.now(), 2, "test.com"); + Link link3 = new Link("test3", "monday", LocalTime.now(), 3, "test.com"); linkContentManager.add(link1); linkContentManager.add(link2); linkContentManager.add(link3); diff --git a/src/test/java/terminus/module/NusModuleTest.java b/src/test/java/terminus/module/NusModuleTest.java index 66175e90bb..444ebde2be 100644 --- a/src/test/java/terminus/module/NusModuleTest.java +++ b/src/test/java/terminus/module/NusModuleTest.java @@ -25,7 +25,7 @@ void getContent_success() throws InvalidArgumentException { ContentManager noteContentManager = module.getContentManager(Note.class); ContentManager linkContentManager = module.getContentManager(Link.class); Note note = new Note("test1", "test1"); - Link link = new Link("test1", "test1", LocalTime.now(), "test1"); + Link link = new Link("test1", "test1", LocalTime.now(), 2, "test1"); noteContentManager.add(note); linkContentManager.add(link); assertEquals(note.getDisplayInfo(), noteContentManager.getContentData(1)); diff --git a/src/test/java/terminus/parser/LinkCommandParserTest.java b/src/test/java/terminus/parser/LinkCommandParserTest.java index d8940ce7ff..dba2c98c2b 100644 --- a/src/test/java/terminus/parser/LinkCommandParserTest.java +++ b/src/test/java/terminus/parser/LinkCommandParserTest.java @@ -61,21 +61,21 @@ void parseCommand_resolveAddCommand_InvalidArgumentExceptionThrown() assertThrows(InvalidArgumentException.class, () -> linkCommandParser.parseCommand("add \"test desc\" \"test day\" \"00:00\"")); assertThrows(InvalidArgumentException.class, - () -> linkCommandParser.parseCommand("add \"test desc\" \"today\" \"00:00\" \"https://zoom.us/test\"")); + () -> linkCommandParser.parseCommand("add \"test desc\" \"today\" \"00:00\" \"2\" \"https://zoom.us/test\"")); assertThrows(InvalidArgumentException.class, - () -> linkCommandParser.parseCommand("add \"test desc\" \"monday\" \"x:30\" \"https://zoom.us/test\"")); + () -> linkCommandParser.parseCommand("add \"test desc\" \"monday\" \"x:30\" \"3\" \"https://zoom.us/test\"")); assertThrows(InvalidArgumentException.class, - () -> linkCommandParser.parseCommand("add \"test desc\" \"friday\" \"10:00\" \"zoom.test\"")); + () -> linkCommandParser.parseCommand("add \"test desc\" \"friday\" \"10:00\" \"1\" \"zoom.test\"")); } @Test void parseCommand_resolveAddCommand_success() throws InvalidCommandException, InvalidArgumentException { assertTrue(linkCommandParser.parseCommand( - "add \"test desc\" \"Tuesday\" \"10:00\" \"https://zoom.us/test\"") instanceof AddLinkCommand); + "add \"test desc\" \"Tuesday\" \"10:00\" \"1\" \"https://zoom.us/test\"") instanceof AddLinkCommand); assertTrue(linkCommandParser.parseCommand( - "add \" test \" \"Wednesday\" \"10:00\" \" https://zoom.us/test \"") instanceof AddLinkCommand); + "add \" test \" \"Wednesday\" \"10:00\" \"2\" \" https://zoom.us/test \"") instanceof AddLinkCommand); assertTrue(linkCommandParser.parseCommand( - "add \"CS2113T Lecture\" \"Friday\" \"16:00\" \"https://zoom.us/test\"") instanceof AddLinkCommand); + "add \"CS2113T Lecture\" \"Friday\" \"16:00\" \"3\" \"https://zoom.us/test\"") instanceof AddLinkCommand); } @Test diff --git a/src/test/java/terminus/storage/ModuleStorageTest.java b/src/test/java/terminus/storage/ModuleStorageTest.java index f9a214d9e8..5665f5136b 100644 --- a/src/test/java/terminus/storage/ModuleStorageTest.java +++ b/src/test/java/terminus/storage/ModuleStorageTest.java @@ -43,7 +43,7 @@ void setUp() throws IOException { moduleManager.getModule(tempModule).getContentManager(Note.class).add(new Note("test", "test")); moduleStorage.saveNotesFromModule(moduleManager, tempModule, true); moduleManager.getModule(tempModule).getContentManager(Link.class).add(new Link("test", "tuesday", - LocalTime.of(11, 11), "https://zoom.us/")); + LocalTime.of(11, 11), 2, "https://zoom.us/")); } @AfterEach diff --git a/src/test/resources/saveFile.json b/src/test/resources/saveFile.json index d0310ad8e9..7803d1a8c1 100644 --- a/src/test/resources/saveFile.json +++ b/src/test/resources/saveFile.json @@ -11,6 +11,7 @@ "second": 0, "nano": 0 }, + "duration": 2, "link": "https://zoom.us/", "name": "test" } diff --git a/src/test/resources/validFile.json b/src/test/resources/validFile.json index d0310ad8e9..7803d1a8c1 100644 --- a/src/test/resources/validFile.json +++ b/src/test/resources/validFile.json @@ -11,6 +11,7 @@ "second": 0, "nano": 0 }, + "duration": 2, "link": "https://zoom.us/", "name": "test" } From 5780038e5061ddc9e3daca8571401fcbd2c2f383 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Fri, 22 Oct 2021 23:55:58 +0800 Subject: [PATCH 230/466] Update note section in UG --- docs/UserGuide.md | 142 +++++++++++++++++++++++++++++++--------------- 1 file changed, 96 insertions(+), 46 deletions(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index da446f21aa..1a5d4704b3 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -111,6 +111,8 @@ enable users to create, delete and view `modules` within TermiNUS. **Format:** `module` +Enters the Module Management workspace. + Example: `module` Expected Output: @@ -206,17 +208,6 @@ enter the module workspace in Terminus. > 💡 The module mentioned here are the modules created within the **module management workspace**. Please refer to [Section: Module Management](#section-module-management) for more information. -List of Module workspace commands: - -| Command | Description | -| ----------- | ----------- | -|note|enter the note workspace| -|schedule|enter the schedule workspace| -|question|enter the question workspace| -|help|view all commands and their usage within its module workspace| -|back|escape and return to the default workspace| -|exit|exit and closes TermiNUS| - ### Accessing module workspace **Format:** `go ` @@ -243,78 +234,137 @@ Type any of the following to get started: [CS2113T] >>> ``` +List of Module workspace commands: + +| Command | Description | +| ----------- | ----------- | +|note|enter the note workspace| +|schedule|enter the schedule workspace| +|question|enter the question workspace| +|help|view all commands and their usage within its module workspace| +|back|escape and return to the default workspace| +|exit|exit and closes TermiNUS| + --- ## Section: Note -### Accessing Note +All commands related to the workspace `Note` will be displayed in these section. These commands +enable users to create, delete and view `notes` within the module. -**Format:** `note` -Accessing the note workspace After running the note command, you can see the following: +### Accessing note workspace + +**Format:** `note` + +Enters the Note workspace. + +Example: `note` + +Expected Output: ``` -[] >>> note -You have 0 note(s) inside this workspace +[CS2113T] >>> note -Type any of the following to get started: -> add +You have 0 note(s) inside this workspace. + +Type any of the following to get started: +> add > exit > help > view > back -> delete - -[note] >>> +> delete + +[CS2113T > note] >>> ``` +List of Note workspace commands: + +| Command | Description | +| ----------- | ----------- | +|add|add a note for the module| +|delete|delete a note from the module| +|view|view notes information from the module| +|help|view all commands and their usage in the note workspace| +|back|escape and return to the module workspace| +|exit|exit and closes TermiNUS| + ### Adding a Note **Format:** `add "" ""` -Adding a note when in the note workspace + +Adds a note when in the note workspace. + +> 💡 When executing this command, it will add the note into its module and creates a `.txt` file inside the module folder. The `.txt` file will be named after the newly added note name. + +> ❗ If there exists a file with the same name of the newly added note, all contents in that file will be overwritten. + +Example: `add "coding style" "switch case identation should be aligned."` + +Expected Output: ``` -[note] >>> add “Remind Cabbin” “Cabbin was here” -Note has been added! -[note] >>> +[CS2113T > note] >>> add "coding style" "switch case identation should be aligned." +Your note on 'coding style' has been added! +[CS2113T > note] >>> ``` -### Delete a Note +### Deleting a Note -**Format:** `delete ` -Deletes the specified note given by its index. +**Format:** `delete ` + +Deletes the specified note given by its **index** when in the note workspace. + +> ❗ When the specified note is being deleted, the file that stores the note will be deleted. + +Example: `delete 1` + +Expected Output: ``` -[note] >>> delete 1 -Note `Remind Cabbin` has been deleted! -[note] >>> +[CS2113T > note] >>> delete 1 +Your note on 'coding style' has been deleted! +[CS2113T > note] >>> ``` -### View Note +### Viewing note information -**Format:** `view` or `view {index}` -Two ways to use this command simply running view or view [index] -View by itself will list all notes +**Format:** `view {index}` + +Views a list of note in the module or views all information for that specific note. + +Two ways to use this command simply running view or view [index] View by itself will list all notes + +Example 1: `view` + +Expected Output 1: ``` -[note] >>> view -You have 3 notes inside: -1. Remind Cabbin -2. Name1 -3. Name2 +[CS2113T > note] >>> view +List of Content +--------------- +1. coding style +2. coding comments -[note] >>> +Rerun the same command with an index behind to view the content. +[CS2113T > note] >>> ``` -The second way to use view is with an index view [index] +Example 2: `view 1` + +Expected Output 2: ``` -[note] >>> view 1 -Name: Remind Cabbin -Content: Cabbin was here +[CS2113T > note] >>> view 1 +Name: coding style +Content: +switch case identation should be aligned. -[note] >>> +[CS2113T > note] >>> ``` +--- + ## Section: Schedule ### Accessing Schedule From b23cbc822b5612a81b34fd46555caa1ad55d7113 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Sat, 23 Oct 2021 01:41:53 +0800 Subject: [PATCH 231/466] Add JUnit Test for conflict manager class --- .../content/link/AddLinkCommandTest.java | 16 +++++-- .../timetable/ConflictManagerTest.java | 46 +++++++++++++++++++ 2 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 src/test/java/terminus/timetable/ConflictManagerTest.java diff --git a/src/test/java/terminus/command/content/link/AddLinkCommandTest.java b/src/test/java/terminus/command/content/link/AddLinkCommandTest.java index 0a5a3e2b93..d038ab541c 100644 --- a/src/test/java/terminus/command/content/link/AddLinkCommandTest.java +++ b/src/test/java/terminus/command/content/link/AddLinkCommandTest.java @@ -1,9 +1,7 @@ package terminus.command.content.link; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - import java.io.IOException; +import java.time.LocalTime; import java.util.ArrayList; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -15,8 +13,13 @@ import terminus.exception.InvalidCommandException; import terminus.module.ModuleManager; import terminus.parser.LinkCommandParser; +import terminus.timetable.ConflictManager; import terminus.ui.Ui; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class AddLinkCommandTest { private LinkCommandParser linkCommandParser; @@ -24,7 +27,6 @@ public class AddLinkCommandTest { private Ui ui; private String tempModule = "test"; - Class type = Link.class; @BeforeEach @@ -59,11 +61,15 @@ void execute_addLinkCommand_success() throws InvalidCommandException, InvalidArg assertTrue(moduleManager.getModule(tempModule).getContentManager(type).getContentData(1).contains("2")); assertTrue(moduleManager.getModule(tempModule).getContentManager(type).getContentData(1).contains("https://zoom.us/test")); + Link newLink = new Link("test conflict", "Saturday", LocalTime.of(9, 00), 3, "https://zoom.us/test"); + ConflictManager conflictManager = new ConflictManager(moduleManager, newLink); + for (int i = 0; i < 5; i++) { addLinkCommand = linkCommandParser.parseCommand( - "add \"test\" \"Saturday\" \"00:00\" \"2\" \"https://zoom.us/test\""); + "add \"test\" \"Saturday\" \"10:00\" \"2\" \"https://zoom.us/test\""); addResult = addLinkCommand.execute(ui, moduleManager); assertTrue(addResult.isOk()); + assertNotNull(conflictManager.getConflictingSchedule()); } assertEquals(6, moduleManager.getModule(tempModule).getContentManager(type).getTotalContents()); } diff --git a/src/test/java/terminus/timetable/ConflictManagerTest.java b/src/test/java/terminus/timetable/ConflictManagerTest.java new file mode 100644 index 0000000000..14ec8272a2 --- /dev/null +++ b/src/test/java/terminus/timetable/ConflictManagerTest.java @@ -0,0 +1,46 @@ +package terminus.timetable; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import terminus.content.Link; +import terminus.module.ModuleManager; + +import java.time.LocalTime; +import java.util.ArrayList; + +import static org.junit.jupiter.api.Assertions.assertNotNull; + +class ConflictManagerTest { + + private ModuleManager moduleManager; + private ConflictManager conflictManager; + private Link newLink; + private ArrayList currentLinks; + + @BeforeEach + void setUp() { + this.moduleManager = new ModuleManager(); + this.newLink = new Link("test conflict", "Saturday", LocalTime.of(9, 00), 3, "https://zoom.us/test"); + this.currentLinks = new ArrayList(); + } + + @Test + void execute_getAllLinks_success() { + conflictManager = new ConflictManager(moduleManager, newLink); + + for (int i = 0; i < 4; i++) { + currentLinks.add(new Link("test conflict", "Friday", LocalTime.of(7, 00), 2, "https://zoom.us/test")); + assertNotNull(conflictManager.getAllLinks()); + } + } + + @Test + void execute_getConflictingSchedule_success() { + conflictManager = new ConflictManager(moduleManager, newLink); + + for (int i = 0; i < 4; i++) { + currentLinks.add(new Link("test conflict", "Saturday", LocalTime.of(8, 00), 2, "https://zoom.us/test")); + assertNotNull(conflictManager.getConflictingSchedule()); + } + } +} \ No newline at end of file From d269a474da319c88aaa93e441a27da9a8f6f0e72 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Sat, 23 Oct 2021 02:00:39 +0800 Subject: [PATCH 232/466] Fix Bug on empty timetable message, update text-ui-test --- src/main/java/terminus/common/Messages.java | 3 ++- .../java/terminus/timetable/Timetable.java | 10 ++++++++- text-ui-test/EXPECTED.TXT | 22 +++++++++++-------- text-ui-test/input.txt | 4 ++-- 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index dd621c2f4b..bcddcd0bf7 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -39,7 +39,8 @@ public class Messages { public static final String EMPTY_CONTENT_LIST_MESSAGE = "You do not have any content in this workspace.\n"; public static final String CONTENT_MESSAGE_HEADER = "List of Content\n---------------\n"; - public static final String EMPTY_SCHEDULE_FOR_THE_DAY = "You have no schedule for %s\n"; + public static final String EMPTY_SCHEDULE_FOR_THE_DAY = "You have no schedule for %s.\n"; + public static final String EMPTY_SCHEDULE_FOR_THE_WEEK = "You have no schedule for the week.\n"; public static final String MAIN_BANNER = "Welcome to TermiNUS!\n"; public static final String MAIN_REMINDER = "This is your schedule today:\n"; diff --git a/src/main/java/terminus/timetable/Timetable.java b/src/main/java/terminus/timetable/Timetable.java index bbc9a436f4..439578617e 100644 --- a/src/main/java/terminus/timetable/Timetable.java +++ b/src/main/java/terminus/timetable/Timetable.java @@ -89,6 +89,11 @@ public String getWeeklySchedule() { } index = 0; } + //return dailyResult.toString(); + + if (isStringNullOrEmpty(dailyResult.toString())) { + return null; + } return dailyResult.toString(); } @@ -99,9 +104,12 @@ public String getWeeklySchedule() { * @param day The day corresponding to the retrieved schedule */ public String checkEmptySchedule(String schedule, String day) { - if (schedule == null) { + if (schedule == null && day != null) { TerminusLogger.info("There is no schedule in the user's timetable"); schedule = String.format(Messages.EMPTY_SCHEDULE_FOR_THE_DAY, day); + } else if (schedule == null && day == null) { + TerminusLogger.info("There is no schedule in the user's timetable"); + schedule = Messages.EMPTY_SCHEDULE_FOR_THE_WEEK; } return schedule; } diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index ebfaf7bdb9..4dbd5e1203 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -67,29 +67,33 @@ back : Returns to the parent workspace. Format: back [test] >>> Error: Missing arguments. -Format: schedule add "" "" "" "" +Format: schedule add "" "" "" "" "" [test] >>> Error: Missing arguments. -Format: schedule add "" "" "" "" +Format: schedule add "" "" "" "" "" [test] >>> Error: Missing arguments. -Format: schedule add "" "" "" "" -[test] >>> Your schedule on 'CS2113T Tutorial' has been added! -[test] >>> Your schedule on 'CS2113T Lecture' has been added! +Format: schedule add "" "" "" "" "" +[test] >>> Your new schedule has conflicts with: + +Your schedule on 'CS2113T Tutorial' has been added! +[test] >>> Your new schedule has conflicts with: + +Your schedule on 'CS2113T Lecture' has been added! [test] >>> Command not found! Type 'help' for a list of commands. [test] >>> List of Content --------------- -1. CS2113T Tutorial (Thursday, 10:00): https://zoom.us/test -2. CS2113T Lecture (Friday, 16:00): https://zoom.us/test +1. CS2113T Tutorial (Thursday, 10:00 - 12:00): https://zoom.us/test +2. CS2113T Lecture (Friday, 16:00 - 18:00): https://zoom.us/test Rerun the same command with an index behind to view the content. [test] >>> Error: Content not found. -[test] >>> CS2113T Lecture (Friday, 16:00): https://zoom.us/test +[test] >>> CS2113T Lecture (Friday, 16:00 - 18:00): https://zoom.us/test [test] >>> Error: Missing arguments. Format: schedule delete [test] >>> Error: Content not found. [test] >>> Your link on 'CS2113T Tutorial' has been deleted! [test] >>> List of Content --------------- -1. CS2113T Lecture (Friday, 16:00): https://zoom.us/test +1. CS2113T Lecture (Friday, 16:00 - 18:00): https://zoom.us/test Rerun the same command with an index behind to view the content. [test] >>> Command not found! Type 'help' for a list of commands. diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index 033868c752..51d1e9e5ae 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -17,8 +17,8 @@ help schedule add a schedule add a "Thursday" schedule add a "Thursday" "10:00" -schedule add "CS2113T Tutorial" "Thursday" "10:00" "https://zoom.us/test" -schedule add "CS2113T Lecture" "Friday" "16:00" "https://zoom.us/test" +schedule add "CS2113T Tutorial" "Thursday" "10:00" "2" "https://zoom.us/test" +schedule add "CS2113T Lecture" "Friday" "16:00" "2" "https://zoom.us/test" schedule invalid schedule view schedule view 4 From 53fd533d6540f164842803daa3faef314400ed5f Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Sat, 23 Oct 2021 02:15:18 +0800 Subject: [PATCH 233/466] Update UG fully except TOC --- docs/UserGuide.md | 415 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 289 insertions(+), 126 deletions(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 1a5d4704b3..9a8105dd16 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -92,20 +92,23 @@ The below table represents what each means. | `{value}` | The value is optional, and including it may provide different results.| | `` | The value is required for the command to work properly.| |`index`|A number identifying an item in TermiNUS. This index can only be viewed using the `view` command.| +|`start_time`|The `start time` must be in a **HH:mm** format which follows the **24-hournotation**. For example, `14:20` is valid which represents `2:20 pm`.| +|`day`|The `day` must be a day spelled out fully. For example, `Monday`, `Tuesday`, `Wednesday`, `Thursday`, `Friday`, `Saturday` and `Sunday` are the only **7** valid days.| Terminologies used throughout this guide: | Terminology | Description | | ----------- | ----------- | | workspace | A workspace is the environment in which you are currently assessing. For example, when you want to access some files inside a folder, you will need to enter the folder first. As such the folder is a **workspace**.| +|default workspace|The very first workspace when executing the TermiNUS program.| |module|A module refers to a NUS module. For example, `CS2113T` is a module.| --- ## Section: Module Management -All commands related to the workspace `Module Management` will be displayed in these section. These commands -enable users to create, delete and view `modules` within TermiNUS. +All commands related to the workspace `Module Management` will be displayed in this section. These +commands enable users to create, delete and view `modules` within TermiNUS. ### Accessing the module management workspace @@ -146,10 +149,12 @@ List of Module Management workspace commands: ### Adding a new module -**Format:** `add ""` +**Format:** `add ""` Adds a module when in the module management workspace. +> ⚠️The `` cannot be more than **30** characters and cannot have any `spaces` in it. + > 💡 When executing this command, it will add the module into TermiNUS and creates a folder with the module code. > ❗ If there exists a folder with the same code of the newly added module, all contents in that folder will be wiped. @@ -210,7 +215,7 @@ enter the module workspace in Terminus. ### Accessing module workspace -**Format:** `go ` +**Format:** `go ` Enters the module workspace to access data within the module. @@ -249,7 +254,7 @@ List of Module workspace commands: ## Section: Note -All commands related to the workspace `Note` will be displayed in these section. These commands +All commands related to the workspace `Note` will be displayed in this section. These commands enable users to create, delete and view `notes` within the module. ### Accessing note workspace @@ -291,15 +296,17 @@ List of Note workspace commands: ### Adding a Note -**Format:** `add "" ""` +**Format:** `add "" ""` Adds a note when in the note workspace. +> ⚠️The `` cannot be more than **30** characters. + > 💡 When executing this command, it will add the note into its module and creates a `.txt` file inside the module folder. The `.txt` file will be named after the newly added note name. > ❗ If there exists a file with the same name of the newly added note, all contents in that file will be overwritten. -Example: `add "coding style" "switch case identation should be aligned."` +Example: `add "coding style" "switch case identation should be aligned."` Expected Output: @@ -329,11 +336,10 @@ Your note on 'coding style' has been deleted! ### Viewing note information -**Format:** `view {index}` - -Views a list of note in the module or views all information for that specific note. +**Format:** `view {index}` -Two ways to use this command simply running view or view [index] View by itself will list all notes +Views a list of notes in the module or views all information for that specific note when in the note +workspace. Example 1: `view` @@ -367,73 +373,124 @@ switch case identation should be aligned. ## Section: Schedule -### Accessing Schedule +All commands related to the workspace `Schedule` will be displayed in this section. These commands +enable users to create, delete and view `schedule` within the module. + +### Accessing schedule workspace + +**Format:** `schedule` -**Format:** `schedule` -After running the schedule command, you can see the following: +Enters the Schedule workspace. + +Example: `schedule` + +Expected Output: ``` -[] >>> schedule +[CS2113T] >>> schedule + You have 0 link(s) in this workspace. -Type any of the following to get started: -> add -> edit +Type any of the following to get started: +> add +> exit > help > view > back -> delete +> delete -[schedule] >>> +[CS2113T > schedule] >>> ``` +List of Schedule workspace commands: + +| Command | Description | +| ----------- | ----------- | +|add|add a schedule for the module| +|delete|delete a schedule from the module| +|view|view schedule information from the module| +|help|view all commands and their usage in the schedule workspace| +|back|escape and return to the module workspace| +|exit|exit and closes TermiNUS| + ### Adding a Schedule -**Format:** `add "" "" "" ""` -Adding a new schedule when in the schedule’s workspace +**Format:** `add "" "" "" ""` + +Adds a schedule when in the schedule workspace. + +> ⚠️The `` must be a valid **day spelled fully**. For example, `monday` is a valid day but `mon` is not. + +> ⚠️The `` must be in a **HH:mm** format which follows the **24-hour notation**. For example, `14:20` is valid which represents `2:20 pm`. + +Example: `add "CS2113T Tutorial 1" "Thursday" "10:00" "https://zoom.us/test"` + +Expected Output: ``` -[schedule] >>> add “Module1 Tut1” "Thursday" "10:00" "https://zoom.us/test" -You have added Module1 Tut’s scheduled zoom link! -[schedule] >>> +[CS2113T > schedule] >>> add "CS2113T Tutorial 1" "Thursday" "10:00" "https://zoom.us/test" +Your schedule on 'CS2113T Tutorial 1' has been added! +[CS2113T > schedule] >>> ``` -### Delete a Schedule +### Deleting a Schedule -**Format:** `delete ` -Delete schedule when in the schedule’s workspace +**Format:** `delete ` + +Deletes the specified schedule given by its **index** when in the schedule workspace. + +Example: `delete 1` + +Expected Output: ``` -[schedule] >>> delete 1 -You have deleted your 1st schedule. -Schedule `Module1 Tut, Thursday, 10:00, https://zoom.us/test` has been deleted! -[schedule] >>> +[CS2113T > schedule] >>> delete 1 +Your link on 'CS2113T Tutorial 1' has been deleted! +[CS2113T > schedule] >>> ``` -### View Schedule +### Viewing schedule information + +**Format:** `view` + +Views a list of schedules in the module when in the schedule workspace. -**Format:** `view` -View all schedules when in the schedule’s workspace +Example: `view` + +Expected Output: ``` -[schedule] >>> view -You have 3 schedules inside: -1. Module1 Tut, Thursday, 10:00, https://zoom.us/test -2. Module2 Lecture, Friday, 14:00, https://zoom.us/test -3. Module1 Tut1, Thursday, 10:00, https://zoom.us/test +[CS2113T > schedule] >>> view +List of Content +--------------- +1. CS2113T Tutorial 1 (Thursday, 10:00): https://zoom.us/test +2. CS2113T Lab 1 (Friday, 12:30): https://zoom.us/test -[schedule] >>> +Rerun the same command with an index behind to view the content. +[CS2113T > schedule] >>> ``` +--- + ## Section: Question -### Accessing Question +All commands related to the workspace Question will be displayed in this section. These commands +enable users to create, delete and view questions within the module. + +In addition, users can test themselves with the question added into the module. -**Format:** `question` -Accessing the question workspace After running the question command, you can see the following: +### Accessing question workspace + +**Format:** `question` + +Enters the Question workspace. + +Example: `question` + +Expected Output: ``` -[] >>> question +[CS2113T] >>> question You have 0 question(s) in this workspace. @@ -445,64 +502,81 @@ Type any of the following to get started: > test > back > delete - -[question] >>> + +[CS2113T > question] >>> ``` ### Adding a Question -**Format:** `add "" ""` -Adding a question when in the question workspace +**Format:** `add "" ""` + +Adds a question when in the question workspace. + +Example: `add "What is 1+1?" "2"` + +Expected Output: ``` -[question] >>> add "What is 1+1?" "2" +[CS2113T > question] >>> add "What is 1+1?" "2" Your question on 'What is 1+1?' has been added! -[question] >>> +[CS2113T > question] >>> ``` -### Delete a Question +### Deleting a Question -**Format:** `delete ` -Deletes the specified question given by its index. +**Format:** `delete ` + +Deletes the specified question given by its **index** when in the question workspace. + +Example: `delete 1` + +Expected Output: ``` -[question] >>> delete 1 +[CS2113T > question] >>> delete 1 Your question on 'What is 1+1?' has been deleted! -[question] >>> +[CS2113T > question] >>> ``` -### View Question +### Viewing question information + +**Format:** `view {index}` -**Format:** `view` or `view {index}` -Two ways to use this command simply running view or view [index] -View by itself will list all questions +Views a list of questions in the module or views all information for that specific question when in +the question workspace. + +Example 1: `view` + +Expected Output 1: ``` -[question] >>> view +[CS2113T > question] >>> view List of Content --------------- -1. What is segmentation? -2. What is paging? -3. What is the pro of Fixed Partitioning in Contiguous Memory allocation? +1. What is EP? +2. What is UML? +3. What is SUT? Rerun the same command with an index behind to view the content. -[question] >>> +[CS2113T > question] >>> ``` -The second way to use view is with an index view [index] +Example 2: `view 1` + +Expected Output 2: ``` -[question] >>> view 1 -Name: What is segmentation? +[CS2113T > question] >>> view 1 +Name: What is EP? Content: -Placing different data regions into different frames +Equivalence partitioning -[question] >>> +[CS2113T > question] >>> ``` ### Testing Yourself with Active Recall -**Format:** `test` or `test {count}` +**Format:** `test {count}` You can start an Active Recall session by running the `test` command. By default, it will test 10 questions (or less if there are not enough questions). You may specify @@ -514,7 +588,7 @@ smaller if there are not enough questions in the workspace). Press the Ente start. ``` -[question] >>> test 3 +[CS2113T > question] >>> test 3 ---[Active Recall]--- We will be starting your active recall training session. @@ -530,7 +604,7 @@ The first question will be displayed, and once you are ready to reveal the answe --- Question: -What is segmentation? +What is EP? When you are ready, press [Enter] to continue. ``` @@ -547,7 +621,7 @@ appear more often in the future. You took 172 seconds to reveal the answer. Answer: -Placing different data regions into different frames +Equivalence partitioning How did you find the question? (Compare against past attempts if any) [1] Easy; [2] Normal / Same; [3] Hard; [E] Exit @@ -569,12 +643,79 @@ command prompt. ``` This training session has ended. Returning you back to main program. -[question] >>> +[CS2113T > question] >>> ``` -## Exiting the Program +--- + +## Displaying all schedules across all modules + +**Format:** `timetable {day}` + +Displays all schedules from all modules in TermiNUS or displays certain schedules that falls on the +specified day. + +> ⚠️The `` must be a valid **day spelled fully**. For example, `monday` is a valid day but `mon` is not. + +Example 1: `timetable` + +Expected Output 2: + +``` +[] >>> timetable +THURSDAY: +1. CS2113T Tutorial 1 (Thursday, 10:00): https://zoom.us/test +FRIDAY: +1. CS2113T Lab 1 (Friday, 12:30): https://zoom.us/test + +[] >>> +``` + +Example 2: `timetable thursday` + +Expected Output 2: + +``` +[] >>> timetable thursday +1. CS2113T Tutorial 1 (Thursday, 10:00): https://zoom.us/test + +[] >>> +``` + +## Returning to previous workspace + +**Format:** `back` + +Returns to the previous workspace prior to the current workspace you are in. + +> 💡 The **default** workspace is the only workspace that has no `back` command. This is because this workspace is the very first workspace of TermiNUS. + +Example: `back` from note workspace + +Expected Output: + +``` +[CS2113T > note] >>> back + +Entering CS2113T workspace + +Type any of the following to get started: +> exit +> help +> note +> schedule +> question +> back + +[CS2113T] >>> +``` + +> 💡 Notice how the workspace indicator changes from `[CS2113T > note]` to `[CS2113T]`. + +## Exiting TermiNUS + +**Format:** `exit` -**Format:** `exit` To exit the program, simply run the following command: ``` @@ -584,56 +725,72 @@ Goodbye! ## Accessing Help -**Format:** `help` +**Format:** `help` + Depending on your current workspace, you may get different help messages. -The following shows the help message in the main workspace: +The following shows the help message in the default workspace: ``` -[] >>> help +[] >>> help + +Help Menu +--------- +exit : Exits the program. +Format: exit -You can run the following commands in the workspace: -> note - - Access all your notes that you have made. -> schedule - - Access all your schedules that you have scheduled. -> help - - Prints this. -> quit - - Quits TermiNUS +help : Prints the help page. +Format: help -You can also run the following to quickly do certain tasks: -> note add Water “Drinking more water will make me hydrated” -> schedule view +module : Move to the module workspace +Format: module -Running `help [command]` will print the help for the specific workspace. +go : Go to a specific module's workspace +Format: go + +timetable : Displays all your schedule. +Format: timetable {day} [] >>> ``` ## Advanced Usage of Commands -User can access workspace command directly without entering its environment. Seen below are some +**Format:** ` ` + +Users can access workspace command directly without entering its environment. Seen below are some command examples. A workspace command is a command that will bring you to its own workspace. Current workspace command -includes notes and schedules. +includes note, schedule, question, and module. + +> 💡 To access the module in TermiNUS, you will need to use the `go` command. For more information, please refer to [Section: Module](#section-module). + +> ⚠️This advance command do not allow any chaining with the `back` command. -Command syntax: +Example: -Adding a note without entering the note workspace. +- Adding a note without entering the note workspace. ``` -[] >>> note add “Remind Cabbin” “Cabbin was here” -Note has been added! -[] >>> +[CS2113T] >>> note add "Advance command" "Advance command is cool" +Your note on 'Advance command' has been added! +[CS2113T] >>> +``` + +- Adding a schedule without entering the schedule workspace. + +``` +[CS2113T] >>> schedule add "Lecture" "Friday" "16:00" "https://zoom.us/test" +Your schedule on 'Lecture' has been added! +[CS2113T] >>> ``` -Adding a schedule without entering the schedule workspace. +- Adding a question without entering the module workspace. -```dtd -[] >>> schedule add “Module1 Tut” Thursday 10:00 https://zoom.us/test - You have added Module1 Tut’s scheduled zoom link! - [] >>> +``` +[] >>> go CS2113T question add "What is Java?" "It is a programming language." +Your question on 'What is Java?' has been added! +[] >>> ``` ___ @@ -642,31 +799,37 @@ ___ ___ -## Command Summary +## Workspace Command Summary -| **Action** | **Format, Examples** | -| ------------ | ------------- | -|**access note workspace**|`note`| -|**access schedule workspace**|`schedule`| -|**add**|`add "" ""`
e.g. `add note1 note_content`| -|**delete**|`delete `
e.g. `delete 1`| -|**view**|`view` or `view {index}`
e.g. `view` or `view 1`| -|**help**|`help`| -|**exit**|`exit`| +| Action | Format| Examples | +| ----------- | ----------- |----------- | +|access **module management** workspace|`module`|-| +|access **module** workspace|`go ` | `go CS2113T`| +|access **note** workspace|`note`|-| +|access **schedule** workspace|`schedule`|-| +|access **question** workspace|`question`|-| ___ -## Advanced Command Summary - -| **Action** | **Format, Examples** | -| ------------ | ------------- | -|**add note**|`note add "" ""`
e.g. `note add note1 note_content`| -|**add -schedule**|`schedule add "" "" "" ""`
e.g. `schedule add “Module1 Tut” "Thursday" "10:00" "https://zoom.us/test"`| -|**delete note**|`note delete `
e.g. `note delete 1`| -|**delete schedule**|`schedule delete `
e.g. `schedule delete 1`| -|**view note**|`note view` or `note view {index}`
e.g. `note view 1`| -|**view schedule**|`schedule view`
e.g. `schedule view`| +## Command Summary + +| Workspace | Action | Format| Examples | +| ----------- | ----------- | ----------- |----------- | +|module management|add module|`add ""`|`add "CS2113T"`| +|note|add note|`add "" ""`|`add "Note1" "Hello world."`| +|schedule|add schedule|`add "" "" "" ""`|`add "CS2113T Tutorial 1" "Thursday" "10:00" "https://zoom.us/test"`| +|question|add question|`add "" ""`|`add "What is 1+1?" "2"`| +|question|active learning|`test {count}`|`test`, `test 3`| +|default|view timetable|`timetable {day}`|`timetable`, `timetable Thursday`| +|**ALL** except module|delete item|`delete `|`delete 1`| +|**ALL** except module|view item information|`view {index}`|`view`, `view 1`| +|**ALL**|help|`help`|-| +|**ALL** except default|go back to previous workspace|`back`|-| +|**ALL**|exit the program|`exit`|-| + +--- + + From 74a3e6d57b971a95660a44cd72bce28dd3b21a87 Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Sat, 23 Oct 2021 02:25:03 +0800 Subject: [PATCH 234/466] Update TOC and add TOC command --- docs/UserGuide.md | 72 +++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/docs/UserGuide.md b/docs/UserGuide.md index 9a8105dd16..e94303a4e7 100644 --- a/docs/UserGuide.md +++ b/docs/UserGuide.md @@ -2,28 +2,41 @@ ## Table of Contents -* [Getting Start](#Getting-Started) -* [Section: Note](#Section:-Note) - * [Accessing Note : `note`](#Accessing-Note) - * [Adding a note : `add "" ""`](#Adding-a-Note) - * [Delete a note : `delete `](#Delete-a-Note) - * [View note : `view {index}`](#View-Note) -* [Section: Schedule](#Section:-Schedule) - * [Accessing Schedule : `schedule`](#Accessing-Schedule) - * [Adding a Schedule : `add "" "" "" ""`](#Adding-a-Schedule) - * [Delete a Schedule : `delete `](#Delete-a-Schedule) - * [View Schedule : `view`](#View-Schedule) -* [Section: Question](#Section:-Question) - * [Accessing Question : `note`](#Accessing-Note) - * [Adding a Question : `add "" ""`](#Adding-a-Question) - * [Delete a Question : `delete `](#Delete-a-Question) - * [View Question : `view {index}`](#View-Question) - * [Testing Yourself with Active Recall: `test {count}`](#Testing-Yourself-with-Active-Recall) -* [Exiting the Program: `exit`](#Exiting-the-Program) -* [Accessing Help: `help`](#Accessing-Help) -* [FAQ](#faq) -* [Command Summary](#Command-Summary) -* [Advanced Command Summary](#Advanced-Command-Summary) +- [Introduction](#introduction) +- [Purpose](#purpose) +- [Getting Started](#getting-started) +- [Using this Guide](#using-this-guide) +- [Section: Module Management](#section--module-management) + * [Accessing the module management workspace : `module`](#accessing-the-module-management-workspace) + * [Adding a new module : `add ""`](#adding-a-new-module) + * [Deleting a module : `delete `](#deleting-a-module) + * [Viewing module information `view`](#viewing-module-information) +- [Section: Module](#section--module) + * [Accessing module workspace : `go `](#accessing-module-workspace) +- [Section: Note](#section--note) + * [Accessing note workspace : `note`](#accessing-note-workspace) + * [Adding a Note : `add "" ""`](#adding-a-note) + * [Deleting a Note : `delete `](#deleting-a-note) + * [Viewing note information : `view {index}`](#viewing-note-information) +- [Section: Schedule](#section--schedule) + * [Accessing schedule workspace : `schedule`](#accessing-schedule-workspace) + * [Adding a Schedule : `add "" "" "" ""`](#adding-a-schedule) + * [Deleting a Schedule : `delete `](#deleting-a-schedule) + * [Viewing schedule information : `view`](#viewing-schedule-information) +- [Section: Question](#section--question) + * [Accessing question workspace : `question`](#accessing-question-workspace) + * [Adding a Question : `add "" ""` ](#adding-a-question) + * [Deleting a Question : `delete `](#deleting-a-question) + * [Viewing question information : `view {index}`](#viewing-question-information) + * [Testing Yourself with Active Recall : `test {count}`](#testing-yourself-with-active-recall) +- [Displaying all schedules across all modules : `timetable {day}`](#displaying-all-schedules-across-all-modules) +- [Returning to previous workspace : `back`](#returning-to-previous-workspace) +- [Exiting TermiNUS : `exit`](#exiting-terminus) +- [Accessing Help : `help`](#accessing-help) +- [Advanced Usage of Commands](#advanced-usage-of-commands) +- [FAQ](#faq) +- [Workspace Command Summary](#workspace-command-summary) +- [Command Summary](#command-summary) ## Introduction @@ -831,18 +844,3 @@ ___ - - - - - - - - - - - - - - - From cb68436ae40ad6e51dc7c15f4664f1bf3cf81756 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Sat, 23 Oct 2021 02:42:58 +0800 Subject: [PATCH 235/466] Update Workspace implementation DG --- docs/DeveloperGuide.md | 112 ++++++++++++++++++ .../CommandDetailedClassDiagram.png | Bin 0 -> 48678 bytes docs/attachments/CommandExecution.png | Bin 0 -> 71744 bytes .../ParserDetailedClassDiagram.png | Bin 0 -> 33266 bytes docs/uml/CommandClassDiagram.puml | 2 +- docs/uml/CommandDetailedClassDiagram.puml | 30 +++++ docs/uml/CommandExecution.puml | 53 +++++++++ docs/uml/ParserClassDiagram.puml | 2 +- docs/uml/ParserDetailedClassDiagram.puml | 29 +++++ 9 files changed, 226 insertions(+), 2 deletions(-) create mode 100644 docs/attachments/CommandDetailedClassDiagram.png create mode 100644 docs/attachments/CommandExecution.png create mode 100644 docs/attachments/ParserDetailedClassDiagram.png create mode 100644 docs/uml/CommandDetailedClassDiagram.puml create mode 100644 docs/uml/CommandExecution.puml create mode 100644 docs/uml/ParserDetailedClassDiagram.puml diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index 862573ffb3..c43c49a745 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -324,3 +324,115 @@ Once the adjustment of weights of the question is done, the process is repeated questions left inside `QuestionGenerator`. Otherwise, the Active Recall session will be terminated, and the input will be passed back to the `CommandParser`. +### 4.3 Workspace Implementation + +This workspace feature aims to provide users with a better experience in navigating the different +features TermiNUS has to offer, and caters for both users which enjoy using a particular feature or +prefer typing commands in a single step. +- [ ] Alternative implementation, interface which allows command and command parser inherit from +- [ ] Alternative implementation, create a individual class for each command no common parent + +#### 4.3.1 Current Implementation +The workspace feature was implemented with the idea of a single command input as well as a multiple +step input. For example, running 3 separate commands `go Module` -> `note` -> +`add "Content Name" "Content"` would perform the same functionality as a single command +`go Module note add "Content Name" "Content"`. This workspace feature implemented in the Command and +CommandParser component. + + +![](attachments/CommandDetailedClassDiagram.png) + +The `Command` class in fact has an abstract child `WorkspaceCommand` and grandchild +`InnerModuleCommand` that inherit from it. In general, aside from the `Command` classes in the +diagram, all other `XYZCommand` children simply inherit from `Command` itself. Each `Command` child + +The `WorkspaceCommand` class which inherits from `Command` and requires a `CommandParser` in its +constructor as this command helps with the workspace implementation. When the command is executed, +it will check if there are any arguments to the command. If there are arguments, it will pass the +remaining arguments the initialised `commandMap` and attempt to parse and execute the command. +In the case of error, an exception will be thrown and caught in the `Terminus` class. +In the case where there is no arguments, the program will store the `commandMap` in the +`CommandResult` `additionalData` attribute and returns that `CommandResult` to the `Terminus` class. +The `Terminus` class checks if the `CommandResult` contains a `additionData` and replaces its own +`CommandParser` with the `CommandParser` stored in `additionalData`. This command helps `Terminus` +to change and beware of workspace changes + +The `InnerModuleCommand` class inherits from the `WorkspaceCommand`. +It functions identical the `WorkspaceCommand` but has some subtle differences such as requiring a +`InnerModuleCommandParser` which inherits from a `CommandParser` but can store another +attribute called `moduleName`. The `InnerModuleCommand` `execute` function will set the initialized +`InnerModuleCommandParser`'s`moduleName` attribute using its own stored `moduleName` attribute. +This `InnerModuleCommand` purpose to enable any `InnerModuleCommandParser` to be aware of which +module and pass this module to any of the subsequent commands it may parse. + +The `GoCommand` in particular is a special `WorkspaceCommand` which has a unique feature that sets +the `ModuleWorkspaceCommandParser` class `workspace` attribute to a specific module name and after +validating that the module exists. This command starts the storing of the module name that the +subsequent commands may use identify the module data to retrieve. + +![](attachments/ParserDetailedClassDiagram.png) + +The `CommandParser` class has an abstract child `InnerModuleCommandParser` class that inherit from +it. Other than the `CommandParser` classes mentioned in the diagram above, all other +`XYZCommandParser` inherit from the `CommandParser` class directly. Each `CommandParser` class +contains a `HashMap` which helps in parsing and return the specific `Command` +object back. + +The `InnerModuleCommandParser` functions similar to a regular `CommandParser` but stores and +extra attribute called `moduleName`. This attribute will be set in all `Commands` that are parsed +with the `parseCommand` function. The `moduleName` allows all it's `Commands` to be aware of which +module they need to retrieve the stored data. + +The `ModuleWorkspaceCommandParser` is a special `CommandParser` that sets the `moduleName` +attribute for all the subsequent commands, so that they become aware of what module they are +modifying. + +To explain the concept, more clearly we will be explaining how the input from the user +`go Module note add "Content Name" "Content"` will be executed. + +![](attachments/CommandExecution.png) + +**Step 1:** After receiving the user input in `Terminus`, `MainCommandParser` is called to parse the input +with the `parseCommand` function which return the specific `Command` class. In this case `GoCommand` +is returned. It will then call the `GoCommand`'s `execute` function to run the command. +Note the remaining arguments is `Module note add "Content Name" "Content"` + +**Step 2:** The `GoCommand` validates the Module name stored as the `arguments` attribute of +the `GoCommand` and sets the workspace of the stored `commandMap` with the value of the module name. +This is done so via the `setWorkspace` function, and for this scenario the workspace for +`ModuleWorkspaceCommandParser` is set. +Note the remaining arguments is `note add "Content Name" "Content"` and the module name is `Module` + +**Step 3:** Similar to step 1 but with a different `CommandParser`, the +`ModuleWorkspaceCommandParser` parses the remaining arguments from `GoCommand` as a command +and sets the `NoteCommand`'s `moduleName` attribute to the value of the module name stored in its +workspace. It then executes the `NoteCommand` `execute` function. +Note the remaining arguments is `add "Content Name" "Content"` and the module name is `Module` +> 📝 **Note:** If the remaining arguments is empty, `ModuleWorkspaceCommandParser` will be stored +> inside of `CommandResult` and returned to `Terminus`. `Terminus` will then replace its +> `commandParser` with `ModuleWorkspaceCommandParser`, changing the workspace. + +**Step 4:** Similar to step 1, the `NoteCommand` `setsModule` for the `NoteCommandParser` that is +stored in the `commandMap` attribute and parses the remaining arguments +`add "Content Name" "Content"` which results in a `AddNoteCommand`. The `execute` function of +`AddNoteCommand` performs the needed modification to the `NusModule` for the module with the name +`Module`. The `execute` function then returns a `CommandResult` that is propagated to `Terminus`. +> 📝 **Note:** If the remaining arguments is empty, `NoteCommandParser` will be stored +> inside of `CommandResult` and returned to `Terminus`. `Terminus` will then replace its +> `commandParser` with `NoteCommandParser`, changing the workspace. + +#### 4.3.2 Design considerations +This section shows the design considerations that were taken into account when implementing +the command parsing. +Aspect: **Usability for other fellow developers** +Since a `Command` class is required for almost all functionalities in TermiNUS ensuring that the +Custom commands and Command Parsers should be easy for others to implement. + +| Approach | Pros | Cons| +| --- |---|---| +| Single Command Parser with all Commands inherit from a single `Command` Class, a large switch statement to separate commands.| Easy to implement and `execute` function for each class has higher flexibility as they can have different arguments| When extending to multilevel workspace can be tedious to implement.| +| Multiple Command Parsers each with its own set of commands, require separate managing. | Easy to create new workspace and add command specific the to workspace.| Implementation can be tedious and difficult to upgrade and manage. +Eventually the team decide to go with the second implementation, as we require multi-level +workspaces and would like to create our own workspace for each feature. Aside from that the +`Command` provide common functionality that many commands need hence reducing repetition of code. + diff --git a/docs/attachments/CommandDetailedClassDiagram.png b/docs/attachments/CommandDetailedClassDiagram.png new file mode 100644 index 0000000000000000000000000000000000000000..38d8263b16f6ba86e84df0063a911aa0114db02c GIT binary patch literal 48678 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 literal 0 HcmV?d00001 diff --git a/docs/attachments/CommandExecution.png b/docs/attachments/CommandExecution.png new file mode 100644 index 0000000000000000000000000000000000000000..37f4014094aca3c467622028e5cbcbc97c2f0944 GIT binary patch literal 71744 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 C^i5j; literal 0 HcmV?d00001 diff --git a/docs/attachments/ParserDetailedClassDiagram.png b/docs/attachments/ParserDetailedClassDiagram.png new file mode 100644 index 0000000000000000000000000000000000000000..c2dadf7260c48b61cb42684b9f287c6fad75cda9 GIT binary patch literal 33266 zcmZ5|1yq$=*EQ18NO!kLcXv0^Al*nSAl(wu-Jx_zN~feWNSAb{H2fRy>;2yMALEYU zg~NHy^X$FW+H=h{=lQ6tD20rGj{pGyfh;2}t_lGG$piuMObi|p{Km`Dy#oA0=OUry zVq)*$Zfj=l0wHDg*38Ms#mtn{*qzkU#l?Y_iOIp%=&g&Zo$V_VdpmSy9zt*xWGi(o zm%qP8FZO=N^&@a5GYJ(ZP9^%K!HHj9{p}|tCPEalKk68+Ymvt zM=!$hp**rF^@H+iS<|c!hg-dlZwSiev87O)lb2*=zpb%^hS~@)OZK~(JCMIXSVs*k z?`rKs6OpDOACeoU{78$aVqv4@^jQV@Y&>S2U~fXE>}=Ly^)}$zl1B?BsiZlyqE$pkA-S8Spt4c`t~}@Mi{msA1P*?}MZQuZk|}3m6I941;yLcp zgv~RdT4WW^!5#Ao7e`z|rv?90dNDgw(E@^>u^UL0^-Z?<-0f9WyBVC-hMye*%te1^ zL35_oo{IHz#?{=@=wan~e8Cvk&2%@mM%hMnrnPbZLgGi9@v&o7)W*Z?lVGw^Yhc<(hUw*k@!lsxOVPDGgf`EEj%d1`nubSX) zduv3R%rF81!pBBNTtwZ?V7~=U3rnU^uyy3|(Ejo;BcrM5{b>YS9-Fz!GYVRNZ5E53 zKps-bq36yhg@w4%^yKukxbTqlJn)+@laIzUi0X#NU#ANhMv}UGI$+^%(zIBMFCTxPyd%iTq^nW+SR!shcPpIpt^GO z8EHWOWTsnUe3a%jR0(=O4w<2N^W$Xn|MyGj$V@7tVMRm>Rt}0x5)BH-KYuD6X{by| z_pyI6!p&PN5*}PUI2c^nT1hp}kfd#UdwcI^MZxFKX6EMfB(%j#47PwYH5nb z1aUNdd>*f^+~8FuC3!C5v?6hlkUOlqCo}UU5BD+_7Z=H-kE2!9)Dog}t|9(>npR}; zT-;>ehdsr@n5ZZvOH0}Xij6!C!FKCzL(9<9FOtumDVCRi+C9N}wSRe{T|~^}wmYeK z(PtcbM@J_m8M*8D=pF4*>=!d7?F-gp6m3Hx()((4&*mpeQE!C~NB^Kribu2I-gM*? zML5~%)<%y)*4rk#dA$pDD2kGpe{NzR4S%Xc6Uv8;wR66Pg^jCXzQNJ%RNv#=lE+lq z0ueDzr`9_%d_E`{gGO(6vdF(H8CS`2YAef!)5-Lbh;MTwgRgV^tAUQr@#zMJvd+O= z!r~$h`Qyp2VRLg=>&ZgOk)t(MIQ5F)|GG`tNL95c6kNkd-?lb2(|iI*1`YY+V=c-e zPwF?z9PpHs`&D&s!`g>Z#4^&q=r>f72x2s+e^H1;-&tX{+@0)zZ+1hkGVSMv&J+@g zq$K3DwTzF$2*3OA`z6-(Dz4oUzg!D7tfU6TKN}QJ!r@QvvOBrI+JzRFL#v^2(d26L zu=xHBHPu0j*R58GMkFnPOHd#*E1S7|1q#v2@d+`dj5!{!Mn-bS(4p7?=T18PMy(D3 zQO>^k8ml0B3C!z?H$t|ydW=*Xp&njHA4?@6|AY#ykTtYXp;|#$zQ<>Cn|U5SK58~L zf8*bW`mMIJZUdXUyYTuv4u%(>h|V0he^tLwjLrMCot^!Io1LvhY*t>OWVvBA3L<}d zrb^-MTSQLVT2<9GxGdcEAVc0b^d3Wv$Px{w%Usq7%iJ4 zBtdTJr)v_>#?cdlHna2fAK}%!3&;9m7N<&#+)O!M{K;eSZ>khFdtXpc0w#aCiaVb* z-u^CAj^g6~ivJvB8!mpXUXhBT;>$aN3pb)F_KFLuerw8qlE&$?q&(5TYg8&JfAIGu z_!f=4i2{8hA}J2;xi;Hpr7X@}9^~Y|D>bUd z!Ruriu&^fNb)tZVOcVrny?vJE=K&=c7>mteB9Sfsk<5&*b#GI%vbfC#gfZfFxfyt7 z2~K`}zer&(YAdtb+O|aP=CV{qbj_|KMJ-pffzJ>+V)JUWt2Y0l%stl5s`xjLwu|sD z4(1c(zom1%y%G~;W$ipWUCWjM>qntfYmH^JjDEHy^r$H;oa1FbRjl&%ZD~n~$zUQf zi2(02yQ{TuAHCN7aDGM|_GtBRj_8_~U>h{50@ecqZ6zQ!e(6c0Q$mMCC%!uvLbsfs zwq4|fA{&)C{mJ;+A1%hUi-n;z#7UhQc zcnVsK*IxI$t&YFu3h!FI7+$`VcfgX^8({r+Lkp};%{AaQbNYl zgm#m42iFDq4xavsT3%t|PcZ4_Bs2e6-c$31@N`ra5tJuf_Cku&$K$S_j*d;^N3jDt<|pR{e4{c=kc5Eep7Nub8^KAhbzxTm`T}O^w)d8{VXTS{oDbQqjl_N`Bnn# z_xmH_ka~8TX=a%Xx173I>w{qTGs)aw0^UnkL+91?3HHu)*vbDYbCS$ z!yWs^bA&n1?NMGg#^=vJC<_LPs2-4uY;}hFGsLCfo$OU$p|P2Kk8XRs_i=c&2F`;1 zlJ{G~j)f}5xj4<`^sl`|hrTGVSrX)j_6Y7XMQ>p^MPtv>{D7jGw>|?Cn$aYyHnL zf7OJp_QCw@ectk)LJ9vr*D3+8{jIJ3Q=vrye-lQ<-&%d>(4mLY3;s>pr>HO|RAkqj zmLssmY-|+kcr`Dxim3kkZz~LtFZzV!Z^Sk?dQ#GUW-xb{A1 zWrn=-F!QGW`*FFr9I0#;+}Gs4e|uS(@Pd@@jpFNKO5wC~$P%<$TYE?5wBC0J(qtt4 zguGw7X?pc=@mFX>sDnhNTERQnwxXEovmuZ%k@!=;K)Cz+v+ey)2WKqLry14ujRmzg_4&iAQ`cp8S4an`V`s%9}-ar zXP$+0g}e_aR!E&BxrTzuh{3QFuS zXBOWYhN@~x;Xdj#&!AkZ2+Fp4-#h&JUK^9Y#B2UM_HX>`T0_IZ2WtDAQWCZff|8hx z0XAc?8P8YD)Yq$kaUT|W7yi0Pzlk*iUS@l$gu_lgggG$mG+pQ@psTsLp+64J<LQI!``eI;W3JMOw=+}7U zjj$8SgkzlJZ+PUCOP*~-LGE=(o#)l4<4So@;@Kkei#XBtj@%Wa@TH%`vgN1gMk79sVq%{Di^5jqPnalSO#? z=u5Z@FIDi+mT(D)5VH8cnE;R|8rh8~ph}@i6!xao6LKIVScFtN(naBK=_)LVNoU@U zCWKyD_Pm&CvkadC!1jvk%a^GF1%j9T=CsP$cDihC67ZLYi*w!iya%meT>x0WF1vA_ z`0{;vS|JA;l_XfWu(WhnY~7$WLOjKFPs47q&+>dbbNr}{U@Wb1wX3PtcD7O?9JZ)P zD(NMjW`SbD+7vu~F#eho0F)xD;#Ttd(SNt9r$oiTfN+R6D2JqtO}NdSd5r)ShFE~t zuUa}~C6)GceZ6~NFrUl2C!Vf=8`1NGT+{&NRBT*$r=C~H{l!y63F`HJ!X6tV-u=uX z7yTEC&>BRtZ{A(!O;X6kef($uN>gR+LGy>p7Z>X0{r|=ZuPTN4H}b!c{y!zCxeZi@ z(}({+Tv85WRyp5N$tS$~-EbMyidn9IKpV6Vm$CJT?Zex1g8%D%{@%r(ChG6f|LK_i ze%6C>BsfoRFY7s3iUe(@D?tYD;>m_>joc2U^I(>0o!rVMc;j-GGBAc0Q1wO~C8c_( z3$(h05hb|vf(lS)XQNT3)6?oTztpgrmAvhGzAfn(J`e< zF@H9@2gK35U*Dop%;0tF{d67LKNJxfwX9$>N=3QfKM>aHb^_69G3@ryIWDdxhwAbW zCT!|}loKp#sOL57>F(<`fN{f!sFX1g@~0H7yxz*x_AKX!?VLHQPA^(SWtEp=;G9SjEi(&1^LL0}Xu~3NvNfQD!;+6LH z7hAm|5+(vdpT*9xPA8l^CtrzBb3BMtM4XQ^X4ZN&O~NNMn`1*1D>NBFj2E;EKZ%C4J#I2bBmHYs35M_~z!q=J)Ot zzIZ-uTc))bHKu=Cm`#VPSSB_jes+4jJqAEKIVr~`qo}j9EZf-Z7zKI9dp}VruxN5E zG6ncP&%A1}QZu0`u*we|wU37&C#?v`tx#?)vT{AgYK)m?3gP3h74$_o4&oXVOM zxO||?Acd^_C>HFJIG>Ti7DCM50Q>BU5Of~CJ>7j?6JPL3G?jvNh57hi>T(jV7Qgn9 ztjiH=YR~uhP~p4yrg`RYkm>Pb*C!%I$^-(xJKD(oorn7pKq$oDo?EGbgCQQt2JzAS zKqq8(ilOuIYNx=y2!EnrzEhZn+9L>5GPUcCBofPlRs^h8k!xk@0gaOB3QXTy$Xem& zXk_fj_!E^m=xa}f6Au1a=wX@evs_R0p)tqv+3MTLii?Y%k8le9C{yM7*FE9zBv}b7 z5qM(w?1dY9O|bU?YKP0H{`DcRIzJX-#dc#W_&cO!D_PP(?~i{DFoyom3N=?yPU&ni z>T;^b>)rgt8G()XpYsW|znT(;3IjxcKlT^_qmhhE zWZ&~_%2QXJTI(8{pT_X0l=Q2Yw=dj1UP-FJ=V_@@`1sK1;rsjbJ;$((Mxc2vnUYSd zf~N;BE2EpQS$;>MNH#DSl2ZTyUxI8;O=-%YN87iREAcMWcDy@z>Gopp=cfg96&7hy zezpsnm;wLq->0%^8=xm?N!y7L7kY67g!Fv+9lc@3+#WYut zTB!?OB;?NtLJ1~%q7o~m(XL=yh%p1%5P_D&7 z#yoo6bky4HyyX^xf(;N!5N~HsOww|*I}{5Rcu^q}Ly4kD$AU0Eab?P_!_>C7VFDDEB3_!NRt7H||) zZZkcExfIo`Pf9+LapqUf&7+XUUL$DkgAaJm7g>%ZL`vU zM?S4;BxWFSyEP4U>#Z`Xeut6g9jIqz4f!{MN?));PAl_YaL$Z^gE8G{e}-CoO<9^~ zL!=*|SwA`&ta$s{5b3$6a3nM}A1{O5~0&Hq;=HdxJ24`qQ^#i1yRMg|xQXD0i`0G;d?V zN96soJY^1iB75l+sMWMGaM% zmo>@;`!xSzX+iPG^CTXgDk46e_Elx2@#N0;bY7y$tIv@E=pvp0&EKm1*m}6qzdbH) z9lqa4Ru(nQmwejyi?UgkpRNjFk7TP7ZVUcB9gz$olRpdp4Wa)z%w!cJPtP!t7zymn zUi&OG2!d)@WI^lr32#D9Rly;d#UxbgYmN&p!QRehoiMul?e8j3LbBm(ZRg%JR6ZWe zcSFHxFr0?sxg7lh#bb%fj*MzUy3PAQr~a*c9EXd7JHcN#bt1?y&<9@-g|YIh*XY}~ zs?#H?ot>N-QY4;qjApsak4gE@V{1*}KW^?~~jZO!K)sbYxHIWZzLd$GUkI^itp2=dOY6 zMxk{wv(|MYPl_v-heqkJP`}B^?dn}9+(5yh1k7<#Y6UHZort}%)pi&P5rPkDI6|LK zSKwU+pDs1chrB>gQY|m?R4plbD*wa(ta({eJ}xQ&=EHdtsY0X7SXg+~)&!{~jf1UB ztw7eL1}=gK_LtXfU1XS32qL7IHYlZB_OQYPE6>i4?2$Dg5)p&tOQVFv<-@U&0e^$z_patI{4NwN(qmF*o6tR?D8QRRdAFn6^_*tMx6wzrl##1N+SV^Yh^$7?Vh(7#YngZ=Ube^+|5! z9$X=|(bHK~&@N0(sSKIXv{ppY)>({bP)$iTV*f>7lT+|0(CiSB#cBoS0G|7ISWouB zQ|yf@<9xO0=+HI9J~+5NTy8_iGYLh=nE4!zCBF-j#%PRMvBvL0oF{?d(d}gI8Jf|z zvcQY{i?u|itV#ea3vuMxkVtITiq!Z-Zd7R4Q7JrTwrg#O3a{(HG>W@7j3Bw9QV`L<}gg$7Rk=j?d&A1;bX zP&Oi|L=!a2QUlG$D`FBE38IQcKejzSFgPg$Bke@+4h{w;cWmd$vumHTv5U1Fg99p? z>oj@X_FtA9tP_+$L@(dFn(VBvq93F=v)L;zl9+BqnX|$XKKUPs

sHwu6XPT)H2jw9 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%0Ds=Q^b*(LMbO4Y*XK57ZEu7Kn0O#= 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 Timetable: Timetable(moduleManager) Activate Timetable #FFBBBB Timetable --> TimetableCommand Deactivate Timetable -Deactivate TimetableCommand alt isStringNullOrEmpty(day) TimetableCommand -> Timetable: getWeeklySchedule() -Activate TimetableCommand #FFBBBB Activate Timetable #FFBBBB -loop For each day in DaysOfWeekEnum - Timetable -> StringBuilder: StringBuilder() Activate StringBuilder #FFBBBB StringBuilder --> Timetable Deactivate StringBuilder -Timetable -> ModuleManager: getAllModules() -Activate ModuleManager #FFBBBB -NusModule --> ModuleManager: modules -Activate NusModule #FFBBBB - -loop For each NusModule in modules - ModuleManager -> NusModule: getModule(NusModule) - - - Deactivate ModuleManager - - NusModule -> ContentManager : getContentManager() - - Activate ContentManager #FFBBBB - Deactivate NusModule - - loop For each Link in ContentManager - - ContentManager -> Link: getContents() - Activate Link #FFBBBB - Deactivate ContentManager - - Link->Link: getDay() - Activate Link #DarkSalmon - Link --> Link: currentDay - - opt if currentDay equals to user argument Day - Deactivate Link - - Link -> Link: getViewDescription() - Activate Link #DarkSalmon - - Link --> Link: description - Deactivate Link - Link -> StringBuilder: append(description) - Activate StringBuilder #FFBBBB - Deactivate Link - end - -end -StringBuilder -> StringBuilder: toString() -Activate StringBuilder #DarkSalmon -StringBuilder --> StringBuilder: dailySchedule -Deactivate StringBuilder -StringBuilder --> Timetable: dailySchedule -Deactivate StringBuilder -end +loop For each day in DaysOfWeekEnum +ref over TimetableCommand, StringBuilder, Timetable, ModuleManager, NusModule, ContentManager, Link: getDailySchedule end - - Timetable --> TimetableCommand: weeklyScehdule Deactivate Timetable -Deactivate TimetableCommand -else isStringNullOrEmpty(day) +else else TimetableCommand -> Timetable: getDailySchedule() -Activate TimetableCommand #FFBBBB Activate Timetable #FFBBBB Timetable -> StringBuilder: StringBuilder() From 8e4fe5eaa64e5d4abda2a29db7965d2b91f74e2f Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Thu, 21 Oct 2021 23:51:36 +0800 Subject: [PATCH 211/466] Add seq diagram for add mod --- docs/uml/storage/AddModuleStorage.puml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 docs/uml/storage/AddModuleStorage.puml diff --git a/docs/uml/storage/AddModuleStorage.puml b/docs/uml/storage/AddModuleStorage.puml new file mode 100644 index 0000000000..c67b20219a --- /dev/null +++ b/docs/uml/storage/AddModuleStorage.puml @@ -0,0 +1,25 @@ +@startuml +'https://plantuml.com/sequence-diagram + +participant ":AddModuleCommand" as AddModuleCommand +participant ":ModuleStorage" as ModuleStorage + +-> AddModuleCommand : execute(ui, moduleManager) +activate AddModuleCommand + group ref [Refer to Add Module Section] + ||| + end + ||| + AddModuleCommand -> ModuleStorage : getInstance() + activate ModuleStorage + ||| + return ":ModuleStorage" + Deactivate ModuleStorage + AddModuleCommand -> ModuleStorage : createModuleDirectory() + + + + + + +@enduml \ No newline at end of file From c1ada40eca866261d7b5fe814a05404dc6c6a2c4 Mon Sep 17 00:00:00 2001 From: 3m0W33D Date: Fri, 22 Oct 2021 01:50:44 +0800 Subject: [PATCH 212/466] Update DG for Parser and Command Component --- docs/DeveloperGuide.md | 32 ++++++++++++++++--- docs/attachments/CommandClassDiagram.png | Bin 0 -> 44388 bytes docs/attachments/ParserClassDiagram.png | Bin 0 -> 30932 bytes docs/uml/CommandClassDiagram.puml | 38 +++++++++++++++++++++++ docs/uml/MainInit.puml | 27 ++++++++++++++++ docs/uml/MainLogic.puml | 35 +++++++++++++++++++++ docs/uml/Module.puml | 3 +- docs/uml/ParserClassDiagram.puml | 23 ++++++++++++++ src/main/java/terminus/Terminus.java | 1 - 9 files changed, 153 insertions(+), 6 deletions(-) create mode 100644 docs/attachments/CommandClassDiagram.png create mode 100644 docs/attachments/ParserClassDiagram.png create mode 100644 docs/uml/CommandClassDiagram.puml create mode 100644 docs/uml/MainInit.puml create mode 100644 docs/uml/MainLogic.puml create mode 100644 docs/uml/ParserClassDiagram.puml diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index a472845fe4..862573ffb3 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -123,7 +123,7 @@ Import the coding style xml file into your IntelliJ IDEA. 3. Once done, select `Apply` then `OK`. 4. Now your IntelliJ IDEA should follow our Coding Style. -> :bulb: IntelliJ IDEA have certain shortcut key to aid in auto-formatting of code. +> 💡 IntelliJ IDEA have certain shortcut key to aid in auto-formatting of code. > Once you are done with a piece of code, highlight the section you have just written and press the > key `CTRL + SHIFT + L`. @@ -134,8 +134,32 @@ Import the coding style xml file into your IntelliJ IDEA. ### 3.2 UI Component ### 3.3 Parser Component +![](attachments/ParserClassDiagram.png) + +The CommandParser Component consist the the `CommandParser` and multiple `XYZCommandParser`, +each representing a specific type command parser. The `CommandParser` will receive a command in +`parseCommand` function and check the according `HashMap` before +returning the according `Command` object back. + +The `CommandParser` implements the following functionality: +- parsing the command string and giving the respective `Command` object +- Keeps track of the workspace +- Provides functionality to list all commands for the help `Command` + ### 3.4 Command Component +![](attachments/CommandClassDiagram.png) + +The Command Component `Command` class, `CommandResult` class and multiple `XYZCommand` +each representing a specific type of command. Each `Command` will `parseArguments` and set them +to private variables, and then `execute` would run specific operation specified by `XYZCommand`. +The `Command` would then modify the required changes in `ModuleManager` and +print the required to be output to `Ui` before returning a `CommandResult`. + +The `CommandResult` will contains certain attributes to indicate if the `Terminus` loop should be +terminated or if the `CommandParser` might require changing through the `additionData` attribute. +The `CommandParser` maybe used to change workspace. + ### 3.5 Module Component @@ -143,10 +167,10 @@ Import the coding style xml file into your IntelliJ IDEA. The Module Components consists of the `ModuleManager` which contains a collection of `NusModule` and maps a module name to a specific `NusModule`. -The `NusModule` consist of `ContentManager` which help to manage `Link` and `Note`. +The `NusModule` consist of `ContentManager` which help to manage `Content`. The `ContentManager` accepts a `Content` type generic which is from the Content Component -The `ModuleManager` +The `ModuleManager` implements the below functionality: - add, delete or retrieve a specific `NusModule` - list all module names - grants access to the different types of content stored by `NusModule` @@ -154,7 +178,7 @@ The `ModuleManager` ### 3.6 Content Component ![](attachments/Content.png) -The Content Component consist of objects such as `Link`, `Questions` and `Note` +The Content Component consist of objects such as `Link`, `Question` and `Note` which inherit from the abstract `Content` class. The `ContentManager` allows a generic `` which must belong to the `Content` type or its children. The `ContentManager` manages an `ArrayList` of Content type and provide the following functionality: diff --git a/docs/attachments/CommandClassDiagram.png b/docs/attachments/CommandClassDiagram.png new file mode 100644 index 0000000000000000000000000000000000000000..172611c87529650129c85932fef3064598251633 GIT binary patch literal 44388 zcmb?@byQVryRRTf2?zp$ba!`4cZeV*C0z@UPNhp4=}rMDDe08%?(Xi6`=a~%&Ufy) zf8Bc>jRX5}EF7ewFGe)`hx;D`RztS_h(-C&yZOxp1+yxmeDT$BKrlYRuI?gEaFStUJ z%bK(QdVp>oVn_7Acx(j5Qhd#igD# z!LZ76Sw+#8Ib4jAn-C^dStXJ2aV2ouQ)8uBndFtv`G6{%DWXchnEPsA;@($|1e&d;f z`*^E1Tf&pW(6BHCDXD7P4S8{KaR&zuM|q(aS!8b>ALuDRC!#OS*MJQajdcR>=jF?& z=xCTqURv5<-dyl(=zqS(Ger|BI`;O^K(Tl9H*rj>muzk82Buo|O|wyJMh;!QGvDe= zl>x*ZBOgPQ@1o%fa({oXr>Cb|`%X!Tg@xspEut3@Ig|?o2JQ7`wR4ew2Z|3n4&I=y zb(7!@v`EI&esZ{ZnSsx~$AUXV9wkGI=KfE&FyDTU#5|g9kS}t**oU3L2ML`T-M6+|&M4M7gtJnn4szOW z%HC;K>0Eio0k6@O0uqwYd)NLkirZa&FZJBr5?j>^_6!aO1!s*hYkHeqx&xj@ZyEwEQ z=py?!MdN2hW`CvJ zXx~@NHOoB{L7L@w`#lv43|$1}_WZ)UJngca_{5oVK5d?}^777n6}e3=>3d-?|HqD zR9WW~?keISF`1?MHETLA5s)H5&2e8~xed&+OAzsIHLyj2}Wu zBH5pBS+-+wB%`9+tiH<8?}LN&6SYk)SHqQWk1UX0cXAfdYx(r52IYrq=O_3%I!z%V z^X+l=heP5N{N0gUerg|I=h0#v5gD1xceydBgyIppVFZ@9x3jx@h4yykb@j2L;t;dR zl9-~R^9a&JB=x1C%qft-XY%Lh)N#&Buo>`J`H-UdiK7KHs?TEz}zw-7O>p8HI5E@Z55?&RO5(>?f(s z%a@tV`qyNXH@P_kG^+a(&ydZu>tDmHy)R4%4^~3_p=)eh;jq`6l+^a?*PNf!w(NHvxB-B^YeMp89$lN*Wjkj`$1ypt*gQa z+#jG4N#Xn*Qc_N&xOsWy6%^nQ!w3oAy`zmy@qp=$k7v%$&v)F%qgd1NxPr~cRDxW#;(P@~5=y(R|%a|R{M%8I*2g_*Efdz;f(vCdP(_V#BADR`94J}^3( zGdWpbX>9)ts8bxj)?66Y}<1|x}ja+3UY4>YP7c2{pn?jFIKLvSP;*9L=*^kTEOzvDHK3R4} zl1F{`a8J@~*mIx6ZOcW?%c~I2cXiRC{9R)V<~bWerKvs+M)@kTsv)tl@w1v5c2-h!boAG+&-a@Y@q9RZFmOlQG$n)GCS)(N zaFDi)rg*G%ztz{Dh2RobS4$0~h*?cCb+lx>u6~{6ezP8oCFgXp|H0`}+}(W+tlk$e z8~B)OQseg4CaZ1`K)dN7Tl&CUDzqUz$T zuXw7)zARgYQqT>%Lburo8QDGuI=}btrflNBXw`>nNqCN8!o;bzCA9i_`M5OV5EpYpzMeKuxjJ#Z|DLA6=Qx&6AuG4}EYJDs*i$^jY@$F_e`g%F zB&d9+|LyUsKh@mpY}Q#PYT$ugaB$Ys<9r77_&Ge2BNva&&;;Y9cU7dclez@9h?-)z zjKKZOL5JhD%|>cVC+lLs+8Z|%@_aV3x+zql%dbrQoY?!D1TUY?D4^7Rib`xU(W=H7 z^!TK<(X}w>K%4CoYY)TZA+)$Cl?vX>QS^#E{2BVhuY}0n*>5DUXa#kix}^?d+(zlxj4T^5SmKxAQcpdu3V`CWe^H*xC}UPkWWPeks>oVFrQT0~!QLi}oDKhGIh zM>RXmW&M-_qf_c%k_P+i`uKTnz;wO*!4#n#V+b$oU2dy39Lm@>GW(EqrnE{+;@u0M z0r);!;}n$VmTckudcDX{Y!ww1cJ{bc5RnNeST^j_LxUG{bP~?aU5Olh=A+*$b8=kz z5{w{_k1%-GZV!F z%0(7rrBiivtJ?Lue0+GsPJ0@I=X=34%7gyr@suC&1RF4?{XHDEhJ*M9;>!@rFvTLk ziWNrH!$2hGM6fy+c_Bc`Hh^z5P0n=B0^V@!V1Qb;qN@G(&0I}pVeZ8DZ}eJlj^K}K<#fXViURX0P7l%lm*x#?^xER6C$>~KNAEM}L1`3h zP8X10lDDK6cQVyVvqzQx#Qz1o{?8fLzx$A0)?7&U92^@nm`bq>y@ zn2No`vKXXK)A8x(%;Su5C{Npt;^9p@yYy48?e22%^W#(TdAP~S6@GBJMx!z|YX6>} z9|^}IauuuN;b{i@{tHW-6H{L-!Ln>Fo*8ngH{)+H})ofbIkf2_4ib>uQ0;BI_0eb6=osJ?TKh6`p-M82 zou#GA0l|gh+h^`K4qHv0D#))#KQzvx&9@Mgq7wa(|2rwfB3$-&Jd^Agh`y0IGXy&@ z9RJ#CLmw4QCJ~CF8e$=H*|bh=Yo2gjGld)Iil_#+V#-^cjwF|%sQz^;=G7B($8EcAt>oa4!s2{<;G3sdk&l3Ff^IR=&O&8^ zj4?ZBJdna438Pw+Bw(}rgz5`|5d)k5m~r20C|K2r##f9fl3o^477oK%P_E}(QE8r@ z^98E8V#}%9T?*408m~_;kk4s?zHdOE&Hf>*2&VsRq+}NJW}DnGJj%Y=q?sR;zU7^c zeRc{7M|aZ*rvJD2pyQU6B>G~{mRi;~2orfAY3gjfZz}H{oJeZf&yU1hCW^0?BgK|w z1l-(D%qt;t7F)wz0RGdfF=>m4BrAhiB)Aqa`$=A^4qEjm1g`JK1C{df`T%|&p4gfX zrcsCjOrce}%s45eRw|#oy}H0KRX~;Dvt9j;^M~(Suz3`RqiZ}0n~VfumRN;PX5(|8 zk|y5DJMSNGZagcXrx(VUwbs24srhcijR>zcSLgf`AHR@Bg(j46A*@=ktKJn&_YFJy zSRzNE?dc{KIvYECfA3el?%s+;MUTTp6Fr(QsT?fBaK;BqOKRy}0?ZvM1qn>->9|?z zYdvs)rD+vwhZJhQYNE;VidWCx7*L2z0CO`wIk~vjbL%DP=4y56ke;1A^h13v_|?e) z)^oH=Z75!NEW8HSaI;+%jJLvPvxq!CZ>geZ|LMkqd{tD8SC>|egbQ08rE|WK#!YBF zo=(Oe3?Dbv$3Ml9@t@+zH9+stuIaR=t*2USOJ8A;Jqw>Vg`0Ypxs`(J~%wg z#LT=sl!;vTZQLs;2oYa2JzD*rdym_`x&kx9X8m5liX8!Bj2k<>CeoQy7AoKUrT4c5#s*0{c@q-230zO~t<6+Rzlrm1i=tgk(m`2G-1aykX z0tPE97jm($#eiO`=6EqhufgW?3DjZS#C8e_anR+_9DB}x$+pe72BxHh=5Dy5qDq+1 zu#Ms`1KM&hoc*n+s4_WuY_4`GD<`-|huuv1?K@gH`%XDNDN4ihA~mfhC-jk>$Kp(UFo)WrSXbIDkh`Mau#VA&J+b(?}LBBh6K- zz`(L}D`V*Wj2)HWLtrp_$mEJwJLx zE3I^33IP0lnt+I+4M*^58MKG<3!V6=sLhRy@#-?zrHyqlpZbmcM5^tLR|}%T^6$5 zwW=l0F@FkXt=rWo)Ki}EAExbUW4pU<8;HYWV;(2#bQs$8JoK%$-lhFLGJY+fcf~pR zB3{!xq-SRSHjN*d20S(WzAf-+kv4L7)IBBjCFI4cs+m5^glxll%bDX;(w=gnQX6@n zd3+3MslRLcxeFxvrwo9j?JpQs&t@%WG$3;|L_998X4}M}sLyb)H_@W5mw!|D4+9`$ zO_Jo*(7bCA#^b}h=6(bDTF=ghy3LE*tFEP1*Wvf}i%tE2fBkY~%&^}vA}h*y&p_68 zx7ITWA&AN#=nCkAeY+CnPC!u-03cIxr;@hz#67WXM#MCMPz;pGwgrJ9!1k=u1p~ zj@*+NuL4~rqd7*Y5bC%&*fKlIMr9Hb6Z1^8vtpb3NUVF3n1ebt0=s7O@bVoQ} zCG>wO9k~!SByL<#ca$cIG1bPY2W^9;m${<>H^t@bx16tos+U9~F9E9sk@Qi(Q^<0G zOd){Je+3Ih+7&(wcVc3&q^_nWp~9ZD-~AfnE%XdNM*iVn7V?arQ+i5e_s7Zp94|x? zk%k8SnZ}l<2==3}`a9(g$dJ#_e>|bEh*rv*RF@DD$y7)cXlQ7FO|Uuz9W%(E<{WSt zN#<}}SSG#9XzAbmJd0U!a&kN4g#`r#v@>pCB-0i7luL~TVT6J_VQ9Y~;ASh+IE=s5 zdz+_3j)a6{x{gb8d2@q{gOit+=j-bmq5JV;Mqy!LXebJ{<0J!upP!#FKDZ+;ZX%Ed z?mxd2gYsv3)N_OQ0n|`>ez{iNRak5Ay$Mll_60Z@ZiCt$7!Lqv)-pj)%JVOZ`R@ZRGtdxa4Z}goqcjHr&QhZ^BStE zwLn}{#0oq~t-aaBqJJI9Qs?JaqY%#$P!|$%R-`DjFkLeQI=-y$U!{nLM#rO-{0LFf)H7fb~-1!sOiveWlgSPVjB@}C3*Xo-Zo zr>1OL{V!k~<>z^LLR~=RRo)+?eHdsa+h8|QJXvh6P~2D+6D&D?;hCc=GS~@vXtP6b z+kowV>kYY4qKoK6-zxvr0cxefr3#WlBPIX>cE62#lTss5S!=C#zyC&%nUMB-P_q5# z=;(Bn6=SOz>vzdxP>U<=?d-k=1pIQ?dtD2CxHUp)Wp&W~jke6&cZ1TuMA9waYM}wX zUA5kYUH1nwB_F?so-TtnADSQiS4X3`k{LbiEnzFwIBK%({UG63p*9%O ze*bJS>3Q3Q8cZ|&5jC>@WHdC~E<)SFAKN-LtBmLmyQkM@I8;pq4Gl$-NvlM9QT8gw zjIQ`KMty?4Ge3T)DXB|H1dA?WdiBIA;4`J^1I>XfqoCk!d(1Qk)j)*iL1_FNmE@j{ zP3@A5*PjlA#ga$_>(D_au3NjxxKd(oBo_S<)Slco1$}8GUA8+rJ32LXTY%QAw1?<> zA>(p9fByXT`i%ChB#^@GtG7n{wdyt{ z=FfMh&X-!hgKdC{HyNMzEr0?eBTtkPvJ>U$Io0t7@J%rTdeOaK!=4LZ1}^ zF--|=iT~pCpxtWIp|SmWWdBvW8wc#@gIVs|o#OmQfjfA3BrIIhvBJ_kJ_d_A zGI|wgDqX)94jn)(c5&fJ=AAJxNYbUTnBO%pQJe4m5eY0EbmvnlMD)7Q(3o#3?w>5F zEWYbYm|I%Pb^e?vhO^}mg<)@Ij!R55Gs}0}9%W%adjZqD)~b!35j7v^d*_&1wNL`TG4yR4m z^I>_g>-<5hFL{0WBb=kg&`w<3Ta>H)EftPZ8xTM-VnI*g4(?C8Rfa%@0enm3w0grR ze58YzV6UAdkHWm`rq_GCo4A!Ec8k;Eg%)ZPO_ZGm76291X7y+3mG(2>AQTrB8ClK+ z*vha(XGq$V$*<=H3z-$BpXBc5^6}a%J*?E>v_QWAmww6q^>`^s-8n$Vcv*w$lnV|8 zRS1{ADMS|pemXpq&!IV|+SQ~Ob2cKE!UuJX0%pNihYv<;iwr>?Gr@iP3(_@ z)Hc1J@LH%a^50Nj1B?&^`v@X~4e*Jn4`1Or)t7NUFb4t7O)mGxQItHJ&D)u1HW5vS zDF!+M2G5SO8~NGaAFclk%lH4dysn!E)L(WcrbTgezR&k=V3C9GJxqv?@6w`s_7}-G zvEL8}ECMG>$>E4*$H35VEMFxU*YN1_Xa#Jl?A+Ye9d9_)U%|f@UjQ)Wi&hK>JR09- z_1kU+ZNp@IUI#kux;R{V5-vcEmG#;Rz?y+U{WIEv>Kj)lkHw|Bx_TB?4Ce3mU9y7j zV^K61z>nXy+GE#VC=BZhMNrJ4{la0HpqeR;33Mz#EgD?x6N-r7^1go$S6u|!Se{A` z9mjZL(fP^oi7hVo&sX@2k&;$DqN+tO4x59*GBT}gZQmurI1aJA>Ro4s*pU{x&`4cc z^wL*uF%*8HsO_bT_zSpSN7trpVsQCrS`g-LOv7nsBQLd>pYKLwS)UkD;Xr)klQo9F zeHQQadt*M)pTug+hM`ez5(jkYB3ZkomIeT;X@MkK{oVCqyvoYoW?C;AxOO>oJfXq} zntbtKp-53BY@pOu4;b`)IZC&U5#?nJv?*L-j_#iV3XrD8c&!a7880tny?5#J?T|M_ z0)^yRMBVxtIUH=Er}og8htgq4OH0P|&V=!%n3&Sio<(2*MC$~f7whxoi--L=ZmOpJ z0FN3$>o;l1Kd)<4l#hsaW*a|$zC2v2g3K*5P+1 zdNY;2pYOTDixibUa$um9q9vVHS;eN+*=`KmtXvO&3v3b>@x3@0Xmqmao^qCsqQKg9 zP^7{j1e5)iAZWdM$MRPHLqKK^b?iZqmSLGbbgul#I&z#&H1Uk()G~~(L|De7Lu_9G zm;{1h#N?Q>E920}$kAyM&||)5W@5hHW*|)oUo;0o-+V&C>w~%4q)|JYE2QE41PyK_ zN_u+q?aiH?XU~d^Tp`0R>FJS8_kPt5K!!4iqeX;g)7j;X$R?%(z5jH2wQwKIj~ zuPQ66apg>U_xb8L4+-llWunPs$#`F4x?(`^46?m^>O8{Q=%@%#m;qTq4|_6#vPHT3 zJDS>?%;70b(_7eDUCX&mU_Ax$9$y}n0>w*@6PL4+Nbp{2mv4)n)Z_&4quqe+&j3e8 z(TwUTC_U&mty$BBn(2zjh(Ny+Qk~L-Qz_Ptw|E6Zz|ZA`KZ24=nJIqe zr{!(NYK)>Ff9{WYcc&VOx#j&u7(v`n0BlaBw`>E2^%)b(CdL$cwaE^w)+_g&Fezd8 zb5%Nmu7^2R3+>$8A$v1b-jYe8RX~4;uK@l!9BPrT9Xx@&c%6`U!XZ{KEu9ygycvT! z%hpNDoc-2RN)vzRYBp3Ci6gRXiuc99Wm2mzg z4@D`iV)KyAXd2)%wBf({OcWa`G>D*7pUyWuc&Ib%%v>y<3b%5^aAmZfm29sz)W_Q}hfG z>Ew&;`tRU(MMa-m5zc`=0CdGKobK0buN&ZiBtn6%IS)L^sB0smZZR6xyPJ^z=*%=$|n0|P5 z0*fAjHqafU)!?@M1qz>dij}=NH}YIcR6+vj12u+r!&k%YC*eb&2?;&V-gV%BBq3=f z1CyN0b<%r+A08DuHQUnX*j2%W5l zlvYC8<`ok;Vpb^~GJ1QlfmPD)Fy&=yKUbsvjTYB4%BZS!UrIxRtU3-C5opX`ko<9; zuQO8(!a@0>NB(vDs1r7{2^*VD3&bJiskMp-j&rU_}uCr>xmfjx_=P0Wbifl&GN z*7~=D{jOKJ(@bTIW)(v~=zI!LVctbiv*x^1qR{e}bl^>UNm)s+c}|H9zbw#9D57nw zsypFN?{OX7S!X%^V;^`xjdw8*HxN*<_4EjOi@&ghKB4x;eB$3M$~E@|v3DC3hXArY z_+K!~?l?oqvGiP!-U}%7bW|36Pc70JLzG&{+oxnxa`%4~wou8l;_@0nR-be{A!I$0 z#~6ibtozM}PD0Bj&Zy$%uZv`LHl#3!^Yb$8z`QqwYKUkted60Ds`H8d4AfR&i9}_C za0{i}>nFbTuCY-M!t)j8IK2dlYV|Jdgr85j+?-km)92E9=U*hH?iQa)gh4#Tc0*W( zhliaW?)j(%ovh10iitQpu5X7fs|`hL_IyqZ6g;)D#>RTdVWBtaK4kyk@AYaSO>|C8 z3+$Yg;o86rs%dNQ`@0KWFm)IEVg|+?k5<^Mc2jfuoEPj0F?8imO-{`SGS!Y!yCi6A zxsro{)Kolyx?HxCi9alWsx!}iTRC^sdrEX;XBr0-<13h%9`l*b+dcDVmsH1dBMP{2?rvx?!RCCuBO<$|@>d1KW0#TkxmGLm3E%fuNgz zRY&xPZSZ7bzoJ_LDxk>ap=G1Erug(EkseK01(UCUkLlIIdR(=(MNKmDovP* zxu~OAVFpcrfmc{s+U$>dR01!{O1E6DSnHs|6_Uyy{4958tpc88Z-&$Oe(LFmisE7< zjHUyxDPQQzxxJZ_g667<0#$D>?+MSIMtj=mdg6eR#SG`-A2t^TGrsM}?n%Ej8qEDfT|OYh5aaMa8$88m?TXuP8vz0~H1 zr7L>6Z3vgB3rZ2f%|`&3Okz%b1mLNn!~bgLvUyIBwV_7`9D2TI!xiP*C5eD%_u~RwipeMfkN5 z5D;RQ9Eom)3XQ0u^e^f5V!-TRer@&jpb};(Kj$QoNbB+Tw%Pc2Naw*0sl++S1Ui+^ z-`iWw?}~b40EL|W?x_RLc8jn3YX3Le^{?8s4isAHFu!L2_V^b4w{-p?BES~;%Qhko z|Ja3p*ap}He;6Ipza9W+$AHdz|CNjXyH)X*3jMWO;z?Zh4`)2y&$LH7?u`ta*R|c) z#^x`txP!P@LrxA)U8Kb9w{HZ30^%uJa2nu|s*$-B+V*iJUNP+MOb*ou!@2`XvOlL8 zHB;0F?B1gI6c14i(sIBIsBTskH{c{5yOJw>Ye~f{kNCtGl=f#2cvec(6E=yAuU}sR z;nL1MqW9g-VEP#i4Nb2}%_nk26_sy%R1*CkpH=MI)a>BwDlMWOG2Ta0CUCdO;*d_l& zAK}ypKXcswaD9Jw1vDRSUIpT?eyEN&6LgVjeUDJzhQ!0e`ca)Xc&>+C@@?X_pU)q? zTaeo)KFZ%YfpiF9lt*e(ggRZ;;e2WW$AglsP>t$Y5`LYgE)-fok#YL1UyS z2Y_Ifg&(-x+rJ8?`LBwPK4vUssw`~s)rJP!+Ng+#J~MV#S^-R;lBX0w_YvkSKIKdH zlc)K|gh>iM&Rm4`>A>_6>H!5nJal($W8+zbW|eSYRLrlp1RmDADe#OtKxT>2>?rYP ziY69TCCv~t>HlsZPk^>#8Y=pd;&h=@pSeCr^7c@YX%pQT0aQ3O9*`+e3=KIWV9DCa zl6neOBw3}1!fQJp0ZznO>i+-J_*ST%YT)hll3B#6sXpaIXnZ0hY&n>=4pJ@Qp7|;_ z_ikLY1=ok?+haspT9!_(+oLFwKDCaFq=FP%J3AEQdxEYGoN+Wxwe~yEl5Z7K#l2Mv z)JMLSKar~kbi0iHP$_(pg++dM;Q-W$`!HD$*a~+{PR?!G{)12V8r^Xz_0i@;A}*`# z!s|dc@uNdgf2s5n#2Je^>Civlck_YiZ#FW!V$Cy5=4^W$WrBisXnCA)ZokczFq~V?Pj> z>0gO|Y%Dhsv?%()Yaxq%9z1;<+K9_IR);9-3kX*|;`jH3x4C@7Wug#BB+y8?>{)Uw zEE7`%8(#@DE2N^6SGLBpk%@C{i0e57@qZVCO`geSOH-t}`lm!>IPYuh_?LVpOLR6U zZCj`&_K#SI7x0iB98{!i{x4uihOSuzBm$O#=LECaBK}w)z_dzFrcYsOZsuVnBv&{) zQ9LWdmB3LbQdH?<8Idqi1S_Nj7khrFr+l{kO>8;$4KB`>h-fNACFb^9W z9jY$~Cx7@=f{K-$LqHO11QMxTx7*{Dg=^Keu9qX6rrrIaPj?V zQ1Gedh@F4o#@43&p~3BmL-^=G?^mcQQLEqpe?mOXKSp}V+W64u!EEFMrssXy*4wTm zzNFylC4CZ(1nsq<%!2{bT;o81-2k(GfyeQK7kf>}yQZz<=F3UUWN1Lb|2AS7!#Ijm z(Qf~Am?6HZ2{DDtZ+D%)(_Xf$E87#29eq@^wH@gQ3loCkqq^!cKHJ6trDWxB2^p{! zZx+!US)8^8*_WRNJf9Z)_^~|zg5vYS$2YfE(7EcYWzxkuslwYU~mS{DqVemjx{#RhvO5h_*ic!9@f#Dsh! z-L)+J-HIAY4_Xb5$gjf*+Yv%Gei~31ZJ9Ywtlzs}npgrcnnbG1$KQVi6c|)|jfb0q z7YWU%jFGLDd5M8wAhJ=9#AX7 zw>wYTiF>ZE*NdU0LM`wkXV3Rw=`vj5gB=d~i&^!A9{__5Xq$it=gihkA#g}D^!aoT z5)SjLx!m7sZ+eHw>7!H6Gz@J|4!QIv4FQRJpg$Dg%x6wI*3Ut82mWHP$E~RNo#P&L zeL9bQ{>@eOTqEII5Z(ZX1f=f3A%@ON2~JQcEkJAUBxv!ivqHENvK1%4S=E!rCb^93 zlz4->8u${fse|4o<_qInkW2s?$=>dd&c?SWc$3_~&3^qua z$>#izJq+4BH0;(%>gRj4>Q63f-QtfK`@t?#x>do>v}ey;K&yG-*(-`ja>OVV@_KB1 zc-Uli((BfpgQC4>c6PL_Eg*|L14IbETzFwMaWjkKSui}F2GIIxfF7t^U<8e$OmCFFh5ves#wf`3nD6!Y1pjh~kj+^6rvkyc5AjCyGMF1$FlJF3Lzz^c zaM+w|A}$%pUPMfy@S6^zUC&Zk=ZXrVm`!asP$PrD5acg<%30;V`2MyYNNZcah}a*d`ruR}3T}Q3;o|v>qI+O(@YH*a`8(Mcc${er8Alu>0ug4Z~^uq={0`2ASE#&;JTQAPUSx2?MR9BWGB&G2DzB124she6r$5&b1SqQ9#-2v|KpS# z!DQ}(^|G!0kI3Oip2%^;}C?Kb*g8gqw zg8!*C7w|=XRXFov8y3huttOC+BOZfGy#3CaxG+q-M_tTDQ;Aai4>_cnx&8BII=Ia*DEq+8h1e@Mn}#w;!{quKVZ`uDI zn4)4}>s#w+uHv6h#2G+*B%g}=_{&kVl-Lg+k6V?a?xmwN4;29P?4 z=2*=q`Klg|;>z>-;=DTC-m4c?Q0N%3ZSeOewF~@8?Gl`16Duh2TXL7l^|EJvie;C~ zRYWwK`Bk7nzefnJX1M$;8RI1-7HBtNCOe01T1F*bx<=)Gsk@|IxT}W`vIZ ziK&C0U|zgg!8IK(HAyR9{rcD0+UV9yRcnjy%0fektsS1&`jqEW-kY1^-Y%(Auoe|e z^w)JL_?bGtqZSWRkXcaXme#whJse?>07oK(Z~?XZ5RpMh97!fd_WF_;>IXL&t^;A* zPhct@$Es&UM?VQ*vYPV3fTqp|=SdbX2U6zxAU+swZtt7WbiGc;w=zX9-~b!>gJ)eB zQ2tS}H%rIUg!;VUCcK(!oQ4KKaCcO%-}cZ~zvKMs`bVaFjK-^Pg(fIq#3rqcr{2{(&r#`^M8y z2c$=-epSmQGOwUMCLd6BRMTL&G}G9PG_BX^wE2K60NI}%+7;rEP_pQnO2~+ zo6B0>r#-5z6!KOPb1b>+HLbf#jIPE#B~j=q%eE1c>$|ZrSW_VVN~NaBDJ|dM$b`Vt z^&v91xVWeMIemBxIFM$jA$}zNm+ykrbCcur%89=UfZljxojNYDb@e!3aCm0Yev;ZV zRHgv6*ucntRX zjQ5d{axy=ZpwKfJBdG_MKQ;XHmaEnf1BkuAOT3gF;^U;c^ix=&Cq4UsuOV4&)ddWK zSM&+i2ih>bJq9Uzb2E?20?2c3rb{X;5z$msRE}w18E6y^p+-xjdlt+1YHrRLK>lE| zkmg6}TZ7$O{rA|J)h9#fT6~uegDcT_1Jr|>SsfUxl3OTc{*AlI^sVy4k6nSx_WY^k zG#jc}ktSzw9XQ|hH#G4J1U~F`jC#sv|1-JJKhF>(_)iD!OsRdt@BFC_(3AD`9Kcrr z8WvrC7}}Z~($Lg=dE9)q)BM8I4#i4LkmAWYy%rcF;NgysjBL$LQIM{{xY|!H-&|}U zS$NiCe&Wtd*K=MM^p9aot@*TOm-9M$V}P(jJ@zp>7%s0%2m;xEql1!UhPiPmwj`ho z@1y}iz%V)W&$w8g7*S%=0VAa8VaV9ttqxVK{4syH|4uZdd3KhJNxN4CIgQh*UqemV zo9n;E1jA^Q)jN9s-&MAj<*jM27)g8?Ar&j@GmeYhsf!0M-(->tT8o)+7JB+f^_`;? zeUJgGFjwXO>`~n2plHbOS0)A+;-wJH95^viy<426JY9AUru=Ms44k9Gi(aY_51|PU z*)$`kI)9sCOZ;ceUtJM@s5I6!?InN>;=e`8WZ5#<3asZnj=xiM3;!!fksnldgzT7` zsA+3y^#L7pgW|m)HTUJ0N5y-m1rU|r9@FxH!2;4WA17fSDbtUW$7oP&DaG5Up#IZ_+RS5m5eL;Z9!4O=SlUb_kU-jeRCBzUa5gMdep&kEc|H(-AW_ z9-|IG-v`MGB`HaDiOLO>hNX9(N38K<=YdgNStLZcmv zVRxbV*E$bn4GO!s0zsyPgzZC`S|ih7?iL^ltv+l)fzvR+jIIBI!95<&gv81qff z%mp~1{}TV?5FDCs0H-L6qiCPYC~r}x^>w*8Dowi-KlnijCR}xs8_EJKQpTSXU5M;?-5e3EqoB8{T z)2(EXzpHhiFVJaxrX>OS7|L{NuseARy}9riRoazGiTJl0Pg1)7pJUE21AP<%0s?$| zvkMEK8I=+)cV{uvrYII{%_}`w9GOWN7nS{A63E}2p4#o}D&iS9?F0DI?#oq^^oiJu zMRe0lG(7j;LRe56D&2EL4G}DQEgol(Y~JEYqt{HLdCvx%X%I4&BLU}Z07~#~0pLDe z;A98Co~N4iG?~|*yr>g{K;SEhpgt?~Q;8HaDKOccXFK>)w8JD}KL4el0c$x*rNN_~ z&A8u0U*8+}(e1zYD84;fn4R6|V{ce@ZAKnCJb)8eRS;ivO1V_-w4;@q$5{Q#XeYd^WY(XrhVF7N zA_Q8jb=}>yM3-|Vs;lMn36P`-=l5n_c}8)tv!gtZ=35qhaOc@gm+*O<1}Uf%UUG6+ zab0j6*9naha%g}Rmf}(9es3pZ{k2Q3>c%Zt#Y$Zwcy;II3*hoWHje|*`ttCDKvvN z7lQfQ?vz2$5iQlK?eRaD4f z!O32b_iVarVgMnr$;JiDb5*i=YFF1CAm@6HJ#7?zoptlRAZ7~WV^8JR)+s;$es8ig zZa1OOa^z&=!b{}(lp1YbLwyVtMceVrEWD_QV+)rJejOo{c$7G7Vr>)w>11e=9{)JNlV=Zdwyj=_;g|W2|ZrIVmSYO-|ASwND`4doD4`=(T!jfNb_#e&w5&K5d zgyhy$nL+#m9VSyTSKj`RXL!5Z(%gA}mcW4*(6Q+$^}x1?+(=q!)xrd*BCX|Z%V{;1 z#`z&y7FZ2n3roqLQyMa<=^i(@Ra0f&SC|Ve3OCX4yJ4%;yBPlC{-UCp1YMqiLlTn3 z;Jo^$r4|9IETF?754*d9P~O*2$zgeNit84~CtP+QvH^DhBDS%YPJ|^XS(J;}Z~mIb zqOW}%ny9^=vI3c#jx-m=!fSUIoIFaaLgz$`DFuF#!OL<3JE`zmRGn8#(Yo`WvU1+< z@2Ku`zP#q@Xal$r0ow2Mpc zfPbu%QP6yj;^NPqH-fX}mzS5=S$15NMy_8HEYmc0nm%0>gW;<}SGsPJLdoSxI<%fP zemwN=y-d_QiE&?+yJk-UWY$df#YGFjtO(8zYdh9}_r^CvmJ2yQbfm5RD0#PV`*qjjRpjQK1F5fKfejQXM+z+^qDeVvv)wtYf|qhYKj2| zy?~$-&T?t7{B>)EXeBA4G+F#a;X;4yBKsu!xBt=TP1pz@qIu}St zcXyX`H|v{A-}jvJ|NFYwdtb_0&wR!l;~p``xMwdsMqFm5FA6h7TiRpHt7;vG>nEI- z8!ZpB=(O|C6?YIAh0^~xw6$A8uTL%h;kRAvwCmhnvif2Phz@z?v&{$ofZj@XFr)^C zAE_;5-T~YOtvx8Bj=A#H;XL`f;HdBV?z$N?_So2v#=Ev!`M5!gZ%k(k=Cj!{I6z9xY|&W zEJ?PGw`mF<|8E^KHt+v0`Xjz02-NqPPD&D$G%S7Y+9p6WC zx67;Qfuv;GSAUpo5zO%RNfCf~c!ClVQdbrnbM%JN5HTy zAo_x07@T3nT!Ch;N4L_nV5%#CZMxCT15^aT*|U=q?yr|F2R3w$=O81Uhfpv$%8mFD z6^MIZ-D7Ro1WX(Z=X^{|lm{pK$rz0(k*{=KLV4x2OH$E@iC}GNarg%dk^b=B7XB3w z$N^xMP&DIYSBHWcH^H;*cp%#VDBb6XMdt1OTm_AF^fllvd`~j&Bch^6FhkNu893FS{m=J771vb(qJf&nOF~Xfb2!b^iPgYc}(Nm%i zgOIG2BD{2w>CDe*uBFSysyai^@XEhgsag5ix4!b62jaZUByGV6)g zHrHP&8bmQS5@+A;wxCqk*VQSgUufVRb=eS^;h(P7_sN3zW})7hnF31UbDQXgfG%8` z4ZoZCr3wnBg~2Q<1^Mg(Gpks&U37QD8z>P}0%rtd*EaB^#Xc~CMV@$p%BM8oaT2Wt>+ zf-1*fXMyHoZIA>qHp0 zlM{lNNzZV;Y8p6XjC0c0*DrXH;cGbf&8#mG`f$t9sRDcZIujd~aRa&1mPrD2_N0*sIdaW*=4O;lTwE!01!a=VTbf7nmIwX6ot zRvu~G6;<7y;`Qj$)|=?oB@4tseJMS{9~W0&VKZj_nT_w%wY2*B`smDPH?d|R123n)*A(_afe@=7OIcJs*8F(OqNf!Z%N&|>uJB?bEFEH;dTJB%k zX-i&xAYQZQ5pAjRiaxBUzJ(@lEP228H@-z65V@@;srTD6%u3j;-$lhqe)_u9pM*|K zEJGyv9|0CS2^bmaa<_|B%*)9+UUTXJ6Nk^!fLlvWPA)I!R4f!1ZEfk~goYphW|=;t zY|*`0pVq25$g943N62cUQ#;(+i}^zTqmOEN@@4mQ6!phCWU$!<sm=&0319k+p)3i#BJG{7jX01rec^XI zm{)rKJW!hyaAS3#TR*)G_ytA^Xi%_W4}B1{_YEhl0OvD0OYrJksMi zHF4I&3^-biqMbCsn_}`HX)%iL*XCOR?=fv zS653*%e=e0>r>bL+50*}?(O>6Q3g6Xgt+(5pFj8Z_I|86nU0EzIa(|66H4s{*CI4; z;kk})VW<6)+z4|0dc%$pOU{W%JzbQXWTRr^2)k=J)d&8=oB|5f=A^ph|GalaWo7;U zy!Wq}88B`1s?4P2;cRCNXtJS^Q9U0$pf+Q+rS>s5Gn1lJRa0xBGkFjrN%Fkq7bu!H z6eFiNY>Fb=5F@HZA-5F!Oh!Qd6E8iwCd-|XFQHKq*TGJqhSKc z?3>m2SVI!xb9Z(#%4VnS5C-v${F&y`ZYJOsK(8r)C}}q02mKuc)QH-UC=C3^2GZo= zHqpaVCB0RATC)y$@V!())WCP*u6Uxilj89Q*X>tyQ_C$eM6->>4K9#6%mu&)swTX5 z-?g`M0v2&>Ubx+B!@5WuS*b_um^B8!g;;z0z$3pj(D*k#lERi{09iC5GaLjmq(pjn z!hTKzzJ-ZYz|eKeMBwC{%q<|)i0ay;>4nEmvsj$@9oL|@OLNwj z@P5_J2Tk#?@5`fxJwNaZEyrNK=o6vNDB3%QOC49)D2UpV3{#XIou^ZTb|R)?n>J-B zV0iisha5IyEGBS}QW3xVI(DJ#$E)%MA7_MAvF$U0!7_WAe$E?D1fIE|dql=H8U+2ySehejGx7%{g_&u30JeI`M`}d_?s+4> zuqIj5ExF9~MbSc!ftoBTVM}3$19CYWVAvHKj_>zILS(l6@MW+=h%B`1N@a)GFh-{A zrwDC_TH=>iD(B5m1DUvBYglB#W@h15Gm5Ao@#=T#7%Ox?;0D`2*mq?eTYbZ*>e4QP zMvE#9^GMGJc9m;ixMjHJ4IW})rC((!b{Ku4R&?wEU+JEt7zxLLSLU2VgZkAQEEW6P z=G`*VWliX+*dTV^7k6A&Vd#rMWw&J}8SJMhAj6^XY9G%}TB@0=Sp8t=#WixMh3 z_bI`rT?$bu_^%Si;8HWvvGmumq&|}+b*mxoZ;8*=BZe7PFN}>)10C2&{r*8x((T8_ zN6a*Yg{|OvPY%yKQX7)1(0KV+fy&*_n&fw#MgajHmc3Tq zhy;O5STK=`7xNMPnJgv6 zC!u$v_rD{IzS?`hb{iGrY+e)|CijT80t*fq7MI^%FQB4AB(Dk@?|drGgD)?$9Khz$ z0?0T;J)2kj`HQLt``Wqbx)5j(SPXHP>~}Kwwr8%&a|DA%!PH^uFo6hWdTkA6fT)5t zHaa?!G0H7`cUN&y9E>n@ZJ=uE-!)ES92#o|HZ}VKmmTJeu(<*8?lTIZ4qFY%Oj9Tq zb8~gADJ^Ahsz^-YL`vl$AP^OEAK3aKz+A~6th?=PyHdkpza+Ch`b`pIR_+YKr ze$;EE?lf#ksexZQc&S2Oy(goOjOPI;A(}nUT|RtRc{?#S78w!oMu&sd{W*SS8p|bM zoQfc0V?T>6pbOJH-q^prGL8JqPkwT9Vhb}we7y9@YegWWh6Z7JBliSHKyoEue{*?Q zR#F10&TElG9C6DaLi7aBfOvbLpoC79wLsy~RXsdBCQ6Oc?%d^R5jAPJxJD)?brlr4 z#>c;0J7&CkUiKhyyaZV($S1st3MnV@&Y7=2rVxXE7Z{PTiGiO)Hf?vXO26%XAw@s{h&CcPdYQj zygqf3gS2P*=UdLt)1h*!h5fy~f2M!ZA%d`{M`&+vDDai6-#h5qE?koPiQ--n{JwU| z(J<8gWv5-O?rp@$QC1#~?26RTfP%M=56zNfDImUbCW3b5Da8i{2Da*ZczFfwGyH0K zxUmM)vQ*;U)792f>3R*E-rk}C$u>D;cTg(<>h5C-1bYq9|_rpO0w+9 z#}b3uz&R23qwJ3#kFTXly$V((3fv~?97w>Lw z8#cIvfA{}_U&d}2y?-_p>ltLsaMx#aK?O(}TJBCFBd)mVPhP!z_3Hj~NPz$4Wh|s|h&K@0W z3H34ET00z(&;4(YYv3;3(S-!3{UxrMux9wFj|_feQ}-upq zso{?g&3=qy_mm4vH0Ju~fPeRJSS^pMs;DTczd?V8GFM{@-hmhg$8mp_uOYBw0&N)X zzvJuOYH>b1_w)W9D>`0Fm*VtmLVm9m06qX}2@%KD4u5}tczc}ghrRy({;-v|bjLx1 zy}i$lRMayoR}G={ARKfK9DRbMl_>aZh0YzMpwJG1^qgo;qnN8$oZbt6sEOAU9Hrby zOVB7@s=p!*JR*Xk!gB6&M$NbH;Un-z)ZlQwDaSv1O3gINIv$gWjr$y1I`$D74Ye%V z2@Z2CuKqUtyHn^>x>FMiSAq6~=DEhD+omBg=a!6&3IU$mgM|aHTDA13q7eg14RTRL z6|Mamt&8x2=uC3xxWHGZp<=HG4}X*ZNn%u}J|<2L(lNTtSbkJr3mgu=HM{(0@_L`! z3t$#Oi$!2811?TRU=RTd4~0T9Sg^4ky(v@)*m z%vM{YAR@jqH;+Tfe2*L~)ZN=HD*R5@U8syFQeZ^kY~0~sUg+VgGQ!Ewac;D@u;VJ? z<4m1mT|Urxfw&<9KYG+7?tb*h$toJrWA>*4lDBYpmS6mN@I+WdsC1@odP0`>Ne=*+ zWxA`YwdiZQenxx=ZV{nn2OoCcKq7YGf-yYqOjlRez(9#@>pPnmytlm8qQF#I~A!B1>&K*gU z6NO|oCf|3iPOWPa=}Ap47(T^SRf5;m#!7H)+d!=Nk zuL3nTs?4&})q_ul{7;SG1jmOhTT`>fb;ErJtPAjWB8XOYBJfsri14Pe?-sp?HJd1! zD#);Pf8U>eZ>hSX&R;7GO>!m|#X$`gL*T2Wfa9w@mF)GtX{lamByCRGQk_E$rYSEw z-R?8Jon~sgiODp7I`F`Cx4}*nbWuKs4L$}w0{d9}@|)HJrXdIyh5VwZXX-+TBr#r+ z^xM)s(SCUx&lU5#LyfX?p_2zaT~AWP0Lf&m@p)Io@%bmwERCP{tV9JHdSZ$jqbugH zU18dqp56ox^&m5ay5B5o-1)UEZZ5LyPvPzHgBL-O9I#cOHV!~l=v)I!0SF|@#mxr0xk>CxeZBWMNQ4!&DJ|Qgpe)y?=ZSooi zRivvvfd@=JgA&qU^CJKWw81ORl#6}UyfpDrQ-RWb1n((` zNofqB)XnD+XR!(GZn|CG9)6|4=ef27PmNszv_}Nq6N!|_&vwy+hdn%s7JD!>19MST z#3e3@b`K#*`XVIhR9I{mrHNgd`V0m3>ko`i-~%{?ebY|FV!-bpV`+_De4uP@ygu@R zHul@eP-9R2uVT97Q3%&p{%W+rH`R;DTQ_?E!cB*A1ug_jQvX2yrzRKCXL+YB5V4iP z@6LP3i14u(JC?dHQwFg(Oe_Sb_a3{wfMS(?el6wYwDtsMA}`?z>-SN?56LC8!3oeD z961?VBwm?``L@}~6H~bj8H+ZG`bW`bQiYQsaK{$%Inl`)xu-=!`8Y zV%sQ8)xb}dyZ8O%F&8A~n@C3LPX@Ys@kWvrrs+ez%})6`};@zn699@(4nf~*HiEuh`Uj6cGG0rhjh62#EMeVLa(LQ;^5(y*?gcHi%^ z>DuIu#|W`)RdOK8K_#!Cz{|s}y`(uQR{>11 z-cf|hqigrD19EEid%yATH{kyJhE5R4FY~E2Bh@81n44^k0G%_L#?4?;+A|L}r4dKQ zo@~u!5wOd;i;trH6a;f(RBL1!^;^}=UDIHDR<8pr=z{5F4D1(fPc?0z9JRXJo_0D+ zq`HF7s=6MvdDf9b{7ecofMW3)&U~N;IuE>pnOM*3S{m%IEx61m?9Y#Fn~}ESmbS{g zZjQJb;Z`JvDG^Y2X-*g0V^;T<6TsV$X3ncXt1mk;&QVrOj%cwr9}UU7BA%gFp@I#O zh4vDk6T)}-WBx1~E9_gjondNA7KEPGlvfzVCE5M*I>JUB^S7XbnZ#$gqpmJMzJ@Xdheu^piuCqxm#(>cD>)u+!rhZokrCGXie-A{0G5#J=AQ;BPd#K{0GARt-faR? z0jHCQAD>iUMsy|cpBMkMmUYuM5_xu%6AOUkeSOrUdEtvtKZto_+7lXkth1}t%d)9H z9?=(#Y<`iF)R`F3WlO@-r;$ccCmKMW`qK>Q`j zI9T!ogJo`G&rJ#jXvdFr$LF&{L6kxptGlsea2YfkBKtZ=x8+8qLj(iou_XGQ)sdaz zv8$i${KM2{29Rz$wb0$cr{U2In4tmR5d6LFa_if|KnTE)N(DW;zwY@->TUmM=hU0K zSjEWG{Ev!&V8UKk&*Pa3%z(xyK?rW%a=F+vt1+Zs85a4HZgJ8tbmY0}cU3FJ%I z7DZP;C+58xGSt&_83S`mT)|4UcYZC zEpNwJ`5`!be_CFV0j(GHT9N3II5%^q{tT{Z_N>l~TO*+XIkPc^_>i z{2ED1b)+ynPF<1DFnY&p&)V zTG!OD^-?`{(y@K(C@npn#O>hcngIvE>WynEIuP**9c^9y0=wDD(g+vez##ZzbFf!M z@T}*`zt>nwnJ{orm(J$AY~F0Ee2AOp2*W-o_WglBNu-oBI9d?rT8Uvat5D3gE1|p>S~Fl%)tHCO-W1~#Sv9o28qy%z%gBW zwxx5YD_>y#D~Jv%13vG@gR>`tq;YF2PV}R~4WwKTNgqf|@JH>wS8mqyD9Y2a$#I+5 z6xPFe&G~rW25(p}wY{vvxixrKUArcp9Qh&;)glPN>VRb=EvVT2BRTF>h{2$Y)I&mJ z`a(@62exIF>_C)kM0|fzhVta^-+)e(p-n{zFbAr2wS1PIegxLkz9p-BS?_p-4^Y#= zP%wRS@OfC#VXhBWEvfT`XEV{4*2M7sNVUw4V<~GqJ^@_j7u+Vp26(0tF#lzJU0RS| zBF`ul9N#*^ds*!RXIkxb>^UnTo(Jth=+!G#FLcN$;wz52%ozXb+&3F#Vo`zQeo=Q6 zNoB&?URS3|Ao0m>s+JR-AH(h-K@$mQ-1j zrm&#IxZpY!Y8_z&=!ED3V+P(G0( zel2(JS;b3yv4~4_=QB=P_FzQ7C$L9mJQT{IJLr2aT=I%13W78v=3OVCv{Z*P*6g*r z+G*r<_TKq)Qye!~-}lDSJcavdz{-lU+ulnJh<6G+(n)B@4Z1ntGe9VOr#D55ZBlDT zxX?Fs8Cj&m((4?UXSW1F<9)=AFpdb$dRqvYHN)}%McDS*7(^CL!2Zy6X9q=zlfHwf zm({TDHK2RDIE2P>1T&|QE9DbXgryn;r;v2HKDq60aU$9$D}8M(X;vna^=YWLgQJNe zzF~j}6A=HjIBoRWj4xB~BHWOs^stBs981xUV&l7gbmASL(1pA`;_&^HS@^OVm#Iyu zFMm|gVRiCPnb)|DdSnmUEpozcD-nxDz0)`79Zz610%+K|91vKO8V@9WSdaImN7cb1 z8O6i5eZAZUh{Xq!k8$3iJ~4jWpvx%(^du;dP|VwXJ(SAapS{2fbhtqmn`KVYvmaXS zU2&N#6`8CKz$75MkuZqv7}ocbxe(Mc9|y+?*k=m(-rdrpek*y&CB$<|T-DXSrUSu- zyt_xL&C3lb?@_El%`&GCuJt>tSK)EqTy?oaa*h=kp2>bTbkn*sBQdK9+PIC zdYQ2;hvBpoKbQ@se3sy3e^H`aLW}15=L}q!bkXQm*5D_RD7&uHJ?1T~_9vglhC7a} z&8S_X4`+VpZ7RvQ=WwhB9>6U50=rW=Ow}}gu@8Une-H?KPKTV%3At99{-4(Yn%myz zw%W2an8ZQFdKS?2ifs_@0&{TJ>j0gg*BH_i2^r{pp8c#|JtvUbm?k#GL*;?bb+Qr# z)QyW>L#nEhUsa03Q5aTR$;qWCk6oX(pz0{sFIn&i<(R_3Vf-0C&K77^tjBcq2nj^O zh*_?-_L{A-M6@?DitOmJpDg^Wwym_l8>}i{aV^?t+w8Z&&X8=5tasdidq1@G*@gHI zzsYzx;3#$fSPcu77(W^J+wrqLZh)Ddvc^0??+CBk8JSOe?GN*JvMDEKra4*l=KL%i zg2?vz)g@B)ke5OzkB{P(hA8kVYh3rO=#9Q>);GHOB{=Cg0Zmj=*C^>7i;(hY&?!dd zG55wNIN$Gy5194R`EkXqjTw$X>hv%SeuR^D9a>%(DE z(S*KGm}?PO$tcIP1=gr9nB}OH%=2!Vp8M#{)lt zt#9F1yHq~gj5AhAGYVcEH8eYBt-URfBqw6ed-!Kh8CTa|7SGI5aLe6bplPzl(ZSaenL?P)M^#M5Z2 zIYz5$Q?<%?v}&)vVkXVs*3%j9I|^LGHx49ouHL*hG!9>^D#=uHC^2qA(&{cmGcEHv zd_PR)moM{2rJ^CCPFg5+6FCR_)l?b|wy#1Eelz@%dnI!`PoD0O=r?4C+lxa|fl{43 z#T)>X>?Y!|zspRP=Blk(0Eikj@P_iDH86$0_0Z>HQbR#vgNKa;^-*tBUpDyM`X}i{ z>KQX*j+$^W9?jR=f-?KlODh;)7wZ`a)P4mhBd()0C$8%6w`l1C@}DtLTu$~OY7>*MsRbHPO+lz zbih<^f{EkEcyB+%Tiv_3=UkZQLmJ1dL(jxK2x66u8$K?Ws}MW-aMD(C<2{Kcr+V4R z5}kFJ$ojbCMz<|F{EAgjQy`+O6j=4QAHhaZo`=TuUs6Khx}-xtk?G!lh^8%->lW}1 zlAuDD^2kij8Yf#;`xBCL#Uy}NL(;R!)sz{XlAj_%cDWLnfOkPEcvRBey%7^K1zeWK ze)0R%l!Dl&RN7}1f#ME)mcBk4aiBGj*-lj`8Lk{yI5-N9w`6;FwA}5`_XmUQ#`!5_2 zcdXH)2JdUxA}s<{o>Sh6^`HpjMAGw!MyqF=cSkZ*>Z7&xRK(nQ7MZp$f4<>9M&(9_ ziIzH5V2=S(*`a4@G8_!Jv~sJ zlT5Z8$p{I~Sl-Mb#j6czxwdO75R{0LJ=U;eun~+?&G-97Xr5}0OlZ|Z#KMRVcz)D_ zkTYYz)m59|lCQ!SI=lngJQZJvy6N$oS^55a>mP$jvonIjq_IZf#tma)R1${ja|r)@Swc@-%rf0(3NT5@YX6WJ^dVH!jk4 zjLFk3c$R8zMf{4}(nE-SND{U@0=Eh6el*pmC;E%hQT)SiFr^kYBS|YLB}`?894_a- zftm#`_cYI^I&tFgS7-*ikc=*|`Dc%B%|`}9nvZ=o@~WBtt}W5Y?DCi^zDDP;#&4iv zcxn2(B1yfsqkDB}3?33t0`cB~U|WR>%lXM{0Y8b_I!p7b#EB96vyI4v_`=alu_bch zs)8iFK?x;|jH36c-)-N0-0lDHm@ zBdzGRKl{8lQBz^y_EU*IZQ|POz9;!)_$w3`Y3m(^0-Cca%;5K zA{rC1-~9l77EHtB;V5Cl)gRP=u-$JwdEuP zDom=VCQJni5<4l@m6`8`mphlmhRf@)HhZ~A(d2=*=`c}HT~Fe6#K`ad8DE{mUDprz z>}i@y?WRhVoSd$x{DL75o*zy^$Bxh~!@4gUe0}UexYg6LmLW`V*30rOD2S*%0_C>G z_V)K|_1JZU%?l!gQhoWHt3Q91Q$<4SAFerfzowl<7LFsOB9_I3px$herT$g6K1E;3 zw&^F|C*p>ny9HPEt)k^WyKu#u?MBY?7+Y6$xP0*C97dx}aO#eU*0N8@y zXzk<7mh8$mxW?G%?~eoqc>_AIB>J<5l%gp_!Vp(Z9!`gr%v^UC8r$<#os}9)T3(#A z^dS6;#94#|rRYpCgFhe>Q$k$2J`-&8CB-&A+encbaqW@o$yOR+L$`DU@cJUVKK9Aq zjeIN=SBd+T^y)}JDk9nZz_{K;k8Z0O?W8BZ&a98YWpDb^(!2Kn3r{*$+$<15p+dWE zVv(PUfOyrEX5<;=}obfJ)Va9V1_qN;TFAYJ3x~b`uc%%{LpMR-th- zn0g7Iq%4!x&-7UPEtFlqGv~DN9C~emXp*0|x{Sz1#hu5fjZa)xZrYv-!Wcx7_0s1a z=IT{OP8!_rHC-a5_0w02S*+~xG?-ylCZ%u!6qe?|UhJ^_0Y@Q_uE@=KkgPNWb62NG z`xpdjRaO(rdov~8$TGky$1#GMBmTL57BF<@+0!;ZCu58%&TWJ*Ga*J)pQKOOlHt)e zM9*^uvVTbZ>&`hq~`Ih*nPhx0$*PhMMDxeTNpoNb9PUm^=R5uvNep)e*{lq!&r z9LI#H^0FrfaH|C|$kj6Cbpo9Dx+zbZ08<}gH+n{IVdlF5w@y{t_7}3UZlr1$N!-+`HvQ_f~DgMiCRZo>AU6D4kTFX|V)4o&= z;hSHwGr;G2ZXug~L^tb+S_ppi3QhYd*z)>r!{~M4m!+B2JWR9f%$wT(kyh~ppWDf3 z=P)V#=&EStyPwOzN&XfqFgIh^JLDJry5L3Yw^+0Pej7mT6BmUsm9BN2mC8VI#aBcm z8s8g1k#D#tXmM?3;CF!I6pD=cv9FyY2E(u0dcTKj7R9Suj_gZkJZ|9+1F4olC~g+6 zRGh8Kz7lRK{j*>sBDU&lQ2c*_w5qTBac^GyS3LSg&UCT5-@3tKLc|Mj$NG<~jOda$ zHq{h^b6Vu~Oe$>*&h6f(?zG}duxy8bg5mxT2~_=rrjFfVoCFLWp4DYYbt*)gP-50~vP%v@bu!C`R&l?9l!K07t%@?)lX76ySgDgpb!{ z9kWQ_q}{?Uim=GD-+uPnYPSq8764Z2wTlmWVAYm8p;>xaV>O|V;0 zeoSR6fAF-E(%r`deom03RcaEY@mnucJ>n(j3RIo;9H3o9Dw(BrM6?r603FHBqj3*N z`m2UysO|Guixz`6lmU8=X>gSJ_UNQkH6Womb1D$+Bvi)-!w(|!NAh?Ar2nIZuownj zfqN8gTl@5*3n5=^JE!aVRjV#SCtEW0)@03L4icUw6~Gt%$@vtL&}(X3W@(tWkd^1g zwcK(kx|SAhbncm*o}TXLkli-7va$l?-gCOjt&}&rNBzBk|DTVyaDo~KgP|L5@uK;D zVK@-&J06Hw46F{SBFS>~_=EL)@o-ZZI~D3vKw->?BQ_*o%fs4uz=#~);znLpR#ISX zbv3&Hv?i%aBy&b{`|?z%nXz7{sS%B(7bic6<0i+ z*_6#3*`<&;AzN}xO->!@&w$NMIescQO2G5taq3xGD%YFDQE9ip8kR0Wg%*qZbRHg_ z5c^xVLU(Nq;yPQCaZ_C`D16x2$$^{=-4Zv8$085ZA8z*fOfs4frDGP>4-HcKPe>-KilM<*(v}}Fh-@Z*3_jdTNP}%P$`HOs(FZi+?Gn&WuTKpA2AYLY@90M* ztFFC!dR4-x#JB{@ybxZqtOulT&XZ*uSX55jM#|D=1g~OzUQ89?S>vq#7Hr8?-y{2= zX!f64j|VOhRZG1}N}OgX-8}&F(J`zS$w%TE5#GTgvGgnZ3wFIP%lyP zzB$7JcXz6o@tRO*eQA=c?vF@w53FkbU@d{CZL?maqm@Ihrsl>J&#%Kas5juIwI60? zPHE8M>)IZ|H_;nVGR&_SG)pO5#kh|3*l>I0xaiAm7QCkn|>dt{w;h4}j~&V6{PNH$`zOwG71@XB>}a>gd%fi_lgE9WXOw{|n}3uI!GPUzR) zD#`J&r3omLe8m8@kC+ytW=A@Cwl-9=IQN}zxUy?))*u%Dnlk1 z3M%kZlKVcbh+P5PRgC-H6;t^8j_aapyJwVKtr#3l>XrGo0SFQsuLdj3@Up+t$zP?5 zk|ZbGvQRcX{rD)`o1x|WZ&*DGD$ba)bAw4&BY4h;m#6N{QohrXhheB6c5P~&`+-S_ zQ+4lOKJ-q)3;=D8>`0YPTwJo%_zE1Z*?HVlruZ=J)n zVxCng+-B~;fWz@ZU3Ny(f1@d-mVJ&*%gKQNLr0z|NluyUwqNxC30hww=3vGgvTCaM zef#m+QW7uO|MvyPON|Ep);yZZ4vE0UEHO@E1`I0h&|g9A)PS?Ctl(unpSw=kSkVPc z)>3H$Nk4)Mk;P{(9g1--0)157pS}3^F1XZf8=i$$oCo&707)IC8KKxJJ#}SPkT6BlT3lEMzqzmi2K+x zc_l1jA=F@}{qvie8%_A2k*3o=hJkh&`!dKSZqjh&=v?oZAx1d=|^Xn zAj_bA;a|MDtSB%1$d=DU+GL0LE|MxYk43ix@y30$;ybjg1g}=tZz0z_NdL#?Lnqer z7&k<4ViI1(62Tz|oVB|>+P`JdaL2_eiWHP=Dog$%r0HrSetQ4rfk=w#whM{J5s4Bb z2zQ-A3LM2-~5Nd0J?AJJersXG@^PT=i1= zBl={q9-W}OW9Bsy57TH>bByp&k#T`eRO}~N(vLN%91)PG;_bJsqxuyp--kB+j6z=HZ9Mdh3iG*N*1=#cdgz5~;I z8}=(jxX78Ht(lZ&Ev9L*3_AN~LTiUXQAQThNIM~4p>G(QCNSi6*lZW$ez{N@v&n;< zDTpK4zuA|-azAOnwo=k@9(z=8RnRz`Yua}3LK%o1M3ybNQW3@h_DwTidU|f1mFuDQ zptH6Uq(j=px?I%$84RAT{As>JQ4o2>yh_b^g6H-F87Yp*^O|ixz+J6)*K`T*&guPX zjq4nKfg#)&4j#~+h)W6iVvd1%{;^VI0LxzDp^n3cg;5sVGO1Zxs&IRu3c8g=WZ8}9 z;l9<^69A)S&Lg19OYci^`vA)QVStzUXh?#N8eB>fvN^C@-$2L=jtjtzREmQ_&hib7 zdj7~VJjt`Mgavj5I-Rj9$=7GocL zSxj_EZa_8|0UKUG8=Jaf`CjfSLqv23BelQzx%x8h<*6-d6z>y<>DC{0`sHk^vd1a-zMy z%cp98Kv3}w7E}~`1vZZ`z$P|yKi`+A>VJ9}h9l0XhHSp!JEsAv%)=eLb6^uCnPTp8 z6;a<(;oIw%AbNu|AwpCjN_QJ} zAm-{Zq74oYf56VM-#`qA4E$iIxe6=VxRIH_|33nxPXrrPq>(k~lG59N=HuviSEpjH#( zghD_+?UP zxw}oahM?eEzJsDj0nS4Nj&Tp$RF&1qvyDGa9>Ml;9YzPzmcX6l7=YkL+G>PBn+@8d zn3-)U-bTgCfRH6`HMV(*gy?d&9sWzF>B_5dBe*06#VM7w?kR;xTFIgbz$AKrNjBf> zpAJBC=q<*kr_axKTM{Lpkx1z4i~{A)>#?3smh5T(5EuR+3Xee4d&=>O`^h^2pFaHL z(l_(E(5*4+GIu-uscZf5$?^wErivBSNrhfcqca zp&PVeZz&uq3}eQ)7&38sZ#nVp@aWPROp`nQ8OH)q=;T*9A8yVojb|oK#M@Q9z*z%-Y0N8xr~li$^$ODS2>CCa9NXA*%}+%#h{jm!KTQpanyX z{n*E}jQ}a0_wOQ=H7zGPQK#L=VV!#h4=^m zjL#)KM=Kdd<8BANN^x&7uI|{Mih}&d)%YIsg}%vF z;5J>YVhq#YG?$>!BNYuWA0wgsxBSyaOGn~z3UW1YB-v@tjcz|5c6{anMyXp_SWUA( zUE2`mtxCmbg^mv@DQ5mo$A$)=1v1{+9D~0p}aio_kf%#2>FS3E=$Qjgk2Tn_B<_eoSFBrZiM%jUz#{Rb!kzQ<# z^9I4{m9iEQ!J2lg#PIUz5#hH8K5pFtr=sevSWh-f(oTLmLly>eHl?LTH`LxQUm6a- za*Kk@v+}ysl3a6m-k`=C+!Njxr+Mi9*06IZFwpKR%>IAW^Bru-(^mhjhl2_r?SA?T zJ`)#^4x9UtnB>lQZJj{mn^dU!hCxovrZikMZPS5^b$dXOQ4GW8<`d4`@K zAzSw&*owCbAu6In{h;z46}_~#vqOnr6*lXyKRG%s*D0v8j>UT=+9db=P1N|GF9rHu zvk?}Ftdj+mGpV~l-Iw!Css&$m9ZWz#a1vbghSEw& zmRS#hUX|{zpra^AzI=b_WqhCBfJ1HH`x|41?*CbDUz#kfRVaRy?^J2Yw%E2eOu`kpO%B&A zL&a^y#RI%e~&X#fItep%MIAB@Rrt9fsiww)_!r79@FiyR_H zu^v6)BM>jOCO0tv+Kv-=XT6M5-0~0+FZ{`@`IUMk6BK=aDZf;+f5{}zKp#rEA>mr{ zWxkEq{i&>MY@~1Jn6pfdI9pA{@OtD|?KySQ=m)z$;{fgC_?!UXd}VWnwF`B^xExWc zW0kjao0;qvz3zqT6w~)*_g^BNEe_KD0qAPnrXqg0v?AciiUI}`M(59@=zS66Uf?~p zpm0c3CFgD>|Eobe*-2V?kc&K#kO&z-D?DnqE0hgOqE8gEAGAPlY7-9V;s|xJ$!>UF zaBSQs-40HzfYq&!LNr&3BXa0sg_7$OvJKuSp}`Bkyle%7*))!w&1(QTrkbAyYHk&| zV}T|2<_2FG!SAY;Xc}vX$MbG!fs-lmizQISTP`m+g$L0TbE5==cb-W2+l&boAsJ9iSl#<@+B z(^6+#wR5#uB5k1t!fyI`feTb$O{BV3)=Y3hA;(Ete#(5ktZbcYATy!%p^~{{k|yPN%P}U;}n^M|cFT%o9@?WzF>e^poHJWI4o| zG3l^L#vbfDrH_AN0#Z_heAyTRPOJZ_xgNc_&26Ne*Y37^S{;Sqoh&=Ph!MDMiFBk~;r_U+?m8GQxjHz7VR}3+2{01TNkBSa1PITlhwthb_wiG69n_?cU_>x;w1=j>wP{A=Yt5{L{NfY)q<* zXI+%rV|T?U&z;o8q=Qs|iVE}hrqiG>rwF@h#?8dsxO}E6L_$0Ct>}?Uu4YriF1gRd z%XhD!wDgRx^t!tkf5b6Y;zrBA%5%1%Us~H7T9Ga6PgRWGDJ8h~X75Sw@I9*RD>b@F zjrJc5plkI_#IV^X9EqFpnVlZ{K|yD8tacEXck(3p7H|y_Y@_<4eSI+rrnns@RX6Bp zD%+jStFVl$N|hujE7cK!KsNZ6_x-xo3yQ&>tc3+P?OTnN~S>wT7JtAo0&^HRr|SHrQ?7a9S2OZ`bgT17-~%{O34 z3Px!s_@aDup5a4o=5JcV3HEI3Yxu!eb3t~ClBkzU?c5yNoCXitPH65?y&ZBu8I@1|gXsxtC>>faNL z9K}@%CiT5XYEpIHJ`)3w>90x|m`q4k^sqE2 z1<^&n2k55|2SK5=5l=mcuJxh2LBN`@d$UquvY}o0t6G%5(u3IHn)Fhi?OLpge8ru% zGS+&@gyJrC~na%ZK-Md|*HIqPOuOa2Kk5LPG$xIe4Bn>4l zbFm-JAvxlINgJ}N=%UAgx_?`>|MtEDVRIkmftXOH5&b4<>ujb zlf_aBNdv>T#>2zaViP{~nQ4wwW({rsnO4NOV-rc5ltq~K(m?%Aepqvt4!lCQ<)Y|{8 zgB<6DNR(0f64MpmkIfc4>4N@%XD*bshmt&Ji*4cc2Hju+)PhP;RO9 z5jx{GKKF&vgZqat3ir{XYEbSN?Z}S-7G{3ektqNxjsSum! zy_Gt}iR+ExcCy58FO#VvBp#rn6c8F)hR%5ZU4XN+biG6-RHlT7yOV}mqc9t-fI`LjwQ=b119u15?J41A7oAw_4gHB1Bj+<^6iw>m)ay?nmq>0> z(z6Fkd%(3yHld_ZOb`g^IYkA9V}rj1&B*xs{}Ob0X5-wOea}mlEhW5wrf3FR>NIxK zXVZ-0GJd*+*5)msmihm>b>X4UFPFXIWQVxqbHu84Vy_BXVMmbp(iq6;lqI z*{?q%*laqIt6snl9;$EC_~YN5qhIj{sAp6?(>0pxA#?i2&^FB&i+~dOD(fBpZd+Dnw>SC2XO{3J~Z7b5&fQAbWdNI`acq)PA1i8 zsFQi+hWi}u9xq?D5U3OZZi9yEsT}Q>0xj}C$XtdWPY;)snHek>H-D*a7;@DJdwc6_ z@tv7_;U$&&@g@YX%cSK%uVYgGvH-t!q?#H@RU!uC)=%emKi$)wu@PA`T)p(tZkRD~C z>1uix%dxquSxP3NprzOVo*US4_xUj5lLa@_Gpz#Q>^^DjvMk<9!JWqd6(#BP;B0*e z%h&!5Tff<)`CHYx5~K0aEjX zS81#$b|T6&5mj;b34|x>_eAJf2E^F!Zp#ToF+@(=1i}%3*j6NK^>m`(=DcWcz|FALb2z*SdAL6x2=awq`Ja!fzH^x1~{?iQQtypi}0 zu*;F>>fLQmmmu;9>W5D4n;uNL4>P-$jew(Rx+Dbb=*|;iKhtM0zLGY(D17Wr{Iim{ z8yc+3?iYMJbtITte7Mhj5sY__tUR^UlM($xI08|xjlNSHHeq|Q-*!RY)98_*){uPg zT6??1iTeo_N^Q*Jds3zqp2Z;bJlnez{uQk<`FeOz9p|y|&>Xj`DR~wMKbhC%5!{m zOvrqE$Ru1RZDSgzx|V>zjsm9ipptv2Z&#Jmz_HS}OZ;_{_?FuI{A2WXWRW!hz{RKY zCj=ALOeJC7{5AP5vfxIGH3s7iVPZbF^x#H_h3(Ut^M@H&Z zIz7>V?ns>;77bO|)05Mr+cB13Lc^rnu9Vwxq$D=;jAf~{T>FP0t_ZWl$=zX(6H3a3 zNn$HCfafWoYXX1~KJO9$j8yY>u$PEL3Vo@#4sna+;Q9+>Dlk#Q6&qwZkJnjx76oi@ z2$}6W|o<=rot!egq01xY*0?E>Y<)E+}V?-fY4~z_kuxVvs_92%d9xkJh$` z>`D&t2;c*rp*@mNdo>@XC(cBL6N>!Sg@h;Z6x{eF9|2K<3G#_}N~&+{Y+Aw$s$o2& z3V^+>aH*N-4yAkCyqZrnzTXy;=?zh!rr8B0T;iTiF$whChq6!}$dYL!zFc;ou{A_z z&rh9z-s|K_6+1cNh`i)QydHy^!)+B?QriQ!!}T*CTbI+sNBYj2gBB<#es+unARmO) zwqRO@x$?K9s?thwp6u&X4iM^qZMa8*oys`?c52W|uv2Rih8_Yl8i@9W;4U7)N*%YW zqI4f9Ie|KfvRNt%$9|7V%{vl(%h`?Np4Siju6xPXF5&Oq2>U&3W_LS0Uj4|_&t?r< zM5K)FB zG$?sZ-_asS!K1!vLq1FT=wOfysBFY`jfH{Ks@&r;~pPmNRL<>C{mWQ9;xiMX`+aVI((vU0lxCVR{W30B5;eoy01Kl z^}6rxuka}8&g^|Z9X6^FDhf~7q5JS3V^eD)7D)z>GZ;OJwqE*r+H8cQXe{a;!O2s3 zaMl%vzcZD9_4tSo+ez<9J+SB|Lgbk2|4*uQ69UXVO0=d;qN;Y{FtvrBG^ZYAeE%(a z*iPN~ojr57E&w&al==002tnl^x8QWW0Q@~98%cgG7Ui8$Y_BaX;3nqN87*y(y}0*r zTJy*vWI(p>pBz&;Z`kDY{g!R>iRt5n)dp#z7GH@7vIVjUK${ybeGe8=*g+5O^|+)9 zR3|2jUyW^3t-e;qc)n1zK%0g8qJlHQ0=Zp{j@&ypo}NWj5>Puu<;G*NBj(k{B&0*> zJGBbx3mXSy`hx}4=<2BeDMbSjxA%~M`>r?9NcV1eh7ToO3NxV8*W-ZRcv`!&Gf}@u zv3fdHcWa&9;8Hr~ZRkc15%~Q`Sl<1;fi8oR5mC0dEl$S4m0DaXY@gtl{;6 zz=oM&0}y{|$D7LB*dPEUdtufqXqSi`ht|RXkFgs}&2t*p*4ROT<(R8nJ@!wP`~wUQrUv*07m0E!+-_baOzjQi z&(sKhDxTJu02Y60DCCmdPqoBLlO-4}VZ=ZWlVYO4Q+CEuY^m{27EO_t-FZkA zi6^~<2MV-b4!0tQ3Vuwc);N5u6=Y|JN$!68lZ6>)>}pjdY9THdD>9BLN0Eg^IBB)c z)rM1yci!B(moW`kQlUl6N70RqffHHk`dkc({Hl5aA=Mo+Yxv5)uMgDoL!nR+5fN6_ zKyxmqjIuoLIbPr8A1m3Yok+V%*Vv$XdOl&{a*t_hkel}VRI|S~>Bu(nBJ}x3w<%MV zmMa~B?sU2y*IpI|^iun`a1}=ID!YusQRUJ80%>2b5Hc#yqOrJpisT~2qF-Uv+ab!B zcL8W*wh?8qQ(KS1^Oi19*9M+}VQLPfL0EipTmD>hCL7^QcnUbmqPf8Tzcph19CUP{ z;9IiVs)rJ($%4)U6*8Yy-32Kf-K}Xa_TT%;Gs3I>N*2O(e&s!>t6CXb=K-6*wYyRI zd=-K^B*pS+QQV833q2fL2Hb!bSr(m$oi;dui`loMX>8&&d7aa^319kRD2|Db|IiNr z8Tx#Jd^AGcFE=lM`q)EiA;Fcqa7zLZoWIoqs`D|>TY`;59UZs#nygkQJSL`z=j=P& zuyFN-%lj$bGxK5~PhIH>S%4^w1pr_7$3PK1HG$CNVt$4i&t1OpcqbZ8D_L{ij$biL z&`TQ%7?3Rm!!TsY8{lPH)>Oxy`($~xrl3MXaMwXNzeqSg@}eJQ<{tTH7)3sQ$!w6Aau7j=gv(?C31f9 z5`%D6D`szJ_m_mV8yg*Zc~oaB%m{1SY>ATVSW!z+?wD3ji5!+nk1)O+nb_Wn#CdSe z9+5On$A;3n@4?gQCKDU(TFxO_bIhNuO2F?+-03+>4|*mXRG)QHh_+>BWW1jS_BGB$ z?0-w3wjp@>Oehi8@#jp^wh%H?l*{#o_>R*xOgdMR2Va#1sbD&9Y4_-dAMdz zYf~hikPNWZkc_U)kq|0pl1iq=Sn$zHw7M%hP#8)$OEA_hZRA$SuaTo-O$R_p5U1W1 z@)^&mk11!ECeY%qj#LCIOu+U%!vY%XrSKh5+28lwq78C-#@QOlwt>kf=33 zG%gWkS|)}ujlY?bI1%IRKWFwvxq0G5!n1kw_xlWq5b<%`vg zF!}Qr7O<6}(7LWJS4LthBYW{?V5EeJSpv?WLk~QGVfQYTl5z^=8*l^v*Cz;#N>mf= z=ZmIlLit3OJ;D`1^R)nBKLVsTsNnu`pQmoBxkr``hHqNy zHA;UbAGC7;_m#Pz_mXw-%ll|7L4T$`p~rbQ#z965m$8`di_peM}waw z%Q{YI9d~f)vAS~5FN*Ld!WTvd-N=r9ngz{NjxHj$G6yuyql+%*hwhWyx4x2)Pa}Gs P2z*o&H56XSU4QsL+Dppd literal 0 HcmV?d00001 diff --git a/docs/attachments/ParserClassDiagram.png b/docs/attachments/ParserClassDiagram.png new file mode 100644 index 0000000000000000000000000000000000000000..385d8ac990e779325a380a10bc40b88a98891fbb GIT binary patch literal 30932 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 "1" CommandResult: returns > +Command ..> "1" ModuleManager: modifies +Command ..> "1" Ui: uses +CommandResult ..> "0..1" CommandParser: contains > +CommandParser -> "2..*" Command: has > + +!startsub COMMAND +abstract class Command { + # arguments: String + - moduleName: String + + {abstract} getFormat(): String + + {abstract} getHelpMessage(): String + + parseArguments(arguments: String): void + + {abstract} execute(ui: Ui, moduleManager: ModuleManager): CommandResult + +} +!endsub + +class XYZCommand extends Command { + + execute(ui: Ui, moduleManager: ModuleManager): CommandResult + + getHelpMessage(): String + + getFormat(): String +} + +class CommandResult { + # additionalData: CommandParser + # isOk: boolean + # isExit: boolean + + isExit(): boolean + + getAdditionalData(): CommandParser +} + +class Ui +!includesub Module.puml!MODULEMANAGER +!includesub ParserClassDiagram.puml!COMMANDPARSER +@enduml \ No newline at end of file diff --git a/docs/uml/MainInit.puml b/docs/uml/MainInit.puml new file mode 100644 index 0000000000..a21e50aba7 --- /dev/null +++ b/docs/uml/MainInit.puml @@ -0,0 +1,27 @@ +@startuml +'https://plantuml.com/sequence-diagram + +autoactivate on +mainframe sd start + Terminus -> Terminus: start() + create Ui + Terminus -> Ui + return + Terminus -> CommandParser : getInstance() + create Command + CommandParser -> Command + return + return CommandParser + Terminus -> ModuleStorage : getInstance () + return ModuleStorage + Terminus -> ModuleStorage: init (filePath) + return + Terminus -> ModuleStorage: loadFile() + return ModuleManager + opt moduleManager == null + create ModuleManager + Terminus -> ModuleManager + return + end + return +@enduml \ No newline at end of file diff --git a/docs/uml/MainLogic.puml b/docs/uml/MainLogic.puml new file mode 100644 index 0000000000..240ec8f81b --- /dev/null +++ b/docs/uml/MainLogic.puml @@ -0,0 +1,35 @@ +@startuml +participant ":Terminus" as Terminus +participant ":Ui" as Ui +participant ":CommandParser" as CommandParser +participant ":ModuleStorage" as ModuleStorage +participant ":ModuleManager" as ModuleManager + +autoactivate on + +-> Terminus: run() + ref over Terminus, Command: start + Terminus -> Terminus : runCommandsUntilExit() + loop True + Terminus -> Ui : requestCommand () + return String + Terminus -> CommandParser: parseCommand(command) + return Command + Terminus -> Command : execute(ui, moduleManager) + create CommandResult + Command -> CommandResult + return + return CommandResult + break isExitCommand == true + note over Terminus, CommandResult : Breaks out of loop and Returns runCommandsUntilExit() + end + opt result.getAdditionalData() != null + Terminus -> CommandResult: result.getAdditionalData() + return CommandParser + Terminus -> CommandParser: getWorkspace() + return String + end + end + return + +@enduml \ No newline at end of file diff --git a/docs/uml/Module.puml b/docs/uml/Module.puml index eb91536cd8..1d62e26ecb 100644 --- a/docs/uml/Module.puml +++ b/docs/uml/Module.puml @@ -21,13 +21,14 @@ NusModule -> "1" ContentManager: linkManager NusModule -> "1" ContentManager: questionManager ModuleManager --> "0..*" NusModule : has > - +!startsub MODULEMANAGER class ModuleManager { + getAllModules(): String [] + getModule(moduleName: String): NusModule + removeModule(moduleName: String): void + setModule(moduleName: String): void } +!endsub class NusModule { + getContentManager (type: Class): ContentManager diff --git a/docs/uml/ParserClassDiagram.puml b/docs/uml/ParserClassDiagram.puml new file mode 100644 index 0000000000..ec498daf1c --- /dev/null +++ b/docs/uml/ParserClassDiagram.puml @@ -0,0 +1,23 @@ +@startuml + +CommandParser --> "2..*" Command: has > +Terminus -> "0..1" CommandParser: commandParser + +!startsub COMMANDPARSER +abstract class CommandParser { + - workplace: String + + CommandParser(workspace: String) + + {abstract} parseCommand(command: String): Command + + getHelpMenu(): String[] +} +!endsub +class XYZCommandParser extends CommandParser { +- commandParser: XYZCommandParser ++ parseCommand(command: String): Command ++ {static} getInstance(): XYZCommandParser +} + +class Terminus + +!includesub CommandClassDiagram.puml!COMMAND +@enduml \ No newline at end of file diff --git a/src/main/java/terminus/Terminus.java b/src/main/java/terminus/Terminus.java index d45ab35303..720203c66c 100644 --- a/src/main/java/terminus/Terminus.java +++ b/src/main/java/terminus/Terminus.java @@ -59,7 +59,6 @@ private void start() { this.workspace = ""; this.moduleStorage = ModuleStorage.getInstance(); this.moduleStorage.init(DATA_DIRECTORY.resolve(MAIN_JSON)); - this.moduleManager = new ModuleManager(); TerminusLogger.info("Loading file..."); this.moduleManager = moduleStorage.loadFile(); } catch (IOException e) { From 1470ee4511f231bc316e2a63c5b142f4abbe9532 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Fri, 22 Oct 2021 02:19:39 +0800 Subject: [PATCH 213/466] Update gradle.yml --- .github/workflows/gradle.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index fe46f4cc36..ce64971163 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -31,7 +31,7 @@ jobs: java-package: jdk+fx - name: Build and check with Gradle - run: ./gradlew check + run: ./gradlew check coverage - name: Perform IO redirection test (*NIX) if: runner.os == 'Linux' @@ -48,4 +48,10 @@ jobs: working-directory: ${{ github.workspace }}/text-ui-test shell: cmd run: runtest.bat + + - uses: codecov/codecov-action@v1 + if: runner.os == 'Linux' + with: + file: ${{ github.workspace }}/build/reports/jacoco/coverage/coverage.xml + fail_ci_if_error: true From a9b83412fd8b7d98ff4ea7bdad6584a546796439 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Fri, 22 Oct 2021 02:21:07 +0800 Subject: [PATCH 214/466] Update build.gradle --- build.gradle | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/build.gradle b/build.gradle index a2c7ee3f58..6e65cfc00a 100644 --- a/build.gradle +++ b/build.gradle @@ -27,8 +27,23 @@ test { showStackTraces true showStandardStreams = false } + finalizedBy jacocoTestReport } +task coverage(type: JacocoReport) { + sourceDirectories.from files(sourceSets.main.allSource.srcDirs) + classDirectories.from files(sourceSets.main.output) + executionData.from files(jacocoTestReport.executionData) + afterEvaluate { + classDirectories.from files(classDirectories.files.collect { + fileTree(dir: it, exclude: ['**/*.jar']) + }) + } + reports { + html.required = true + xml.required = true + } +} application { mainClassName = "terminus.Terminus" } From c944fdfa28572c8c0a3236cfa3cf8c45bae3ebfa Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Fri, 22 Oct 2021 02:22:31 +0800 Subject: [PATCH 215/466] Update build.gradle --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index a2c7ee3f58..fc600b9cc5 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ plugins { id 'java' id 'application' id 'checkstyle' + id 'jacoco' id 'com.github.johnrengelman.shadow' version '5.1.0' } From f053dc726219aec42633bcfd41d0223fa95e937b Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Fri, 22 Oct 2021 02:24:00 +0800 Subject: [PATCH 216/466] Update build.gradle --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index fc600b9cc5..a2c7ee3f58 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,6 @@ plugins { id 'java' id 'application' id 'checkstyle' - id 'jacoco' id 'com.github.johnrengelman.shadow' version '5.1.0' } From 6d2e6e326ba039c241eba28965d295a0d939cb77 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Fri, 22 Oct 2021 02:24:17 +0800 Subject: [PATCH 217/466] Update build.gradle --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 6e65cfc00a..1ddf1dc071 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ plugins { id 'java' id 'application' id 'checkstyle' + id 'jacoco' id 'com.github.johnrengelman.shadow' version '5.1.0' } From 305c9d55f48c0c68d98eb8ad4d90f3db6afadca9 Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Fri, 22 Oct 2021 02:45:19 +0800 Subject: [PATCH 218/466] Update gradle.yml --- .github/workflows/gradle.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index ce64971163..253c8c22df 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -33,6 +33,12 @@ jobs: - name: Build and check with Gradle run: ./gradlew check coverage + - uses: codecov/codecov-action@v1 + if: runner.os == 'Linux' + with: + file: ${{ github.workspace }}/build/reports/jacoco/coverage/coverage.xml + fail_ci_if_error: true + - name: Perform IO redirection test (*NIX) if: runner.os == 'Linux' working-directory: ${{ github.workspace }}/text-ui-test @@ -49,9 +55,3 @@ jobs: shell: cmd run: runtest.bat - - uses: codecov/codecov-action@v1 - if: runner.os == 'Linux' - with: - file: ${{ github.workspace }}/build/reports/jacoco/coverage/coverage.xml - fail_ci_if_error: true - From bd20ad9deaea027bcd3ede09ff177ea8a49331df Mon Sep 17 00:00:00 2001 From: Kelvin Neo <2332196+kelvneo@users.noreply.github.com> Date: Fri, 22 Oct 2021 02:45:35 +0800 Subject: [PATCH 219/466] Update build.gradle --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 1ddf1dc071..955a80cb25 100644 --- a/build.gradle +++ b/build.gradle @@ -45,6 +45,7 @@ task coverage(type: JacocoReport) { xml.required = true } } + application { mainClassName = "terminus.Terminus" } From d2985d9d3f0a016bdc666eaa32a81603bff9d330 Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Fri, 22 Oct 2021 10:17:51 +0800 Subject: [PATCH 220/466] Add duration argument for link --- .../command/content/link/AddLinkCommand.java | 20 ++++++++++--------- .../java/terminus/common/CommonFormat.java | 2 +- .../java/terminus/common/CommonUtils.java | 10 ++++++++++ src/main/java/terminus/common/Messages.java | 2 ++ src/main/java/terminus/content/Link.java | 17 +++++++++++++--- 5 files changed, 38 insertions(+), 13 deletions(-) diff --git a/src/main/java/terminus/command/content/link/AddLinkCommand.java b/src/main/java/terminus/command/content/link/AddLinkCommand.java index c8860b6a5f..c78dbb8b43 100644 --- a/src/main/java/terminus/command/content/link/AddLinkCommand.java +++ b/src/main/java/terminus/command/content/link/AddLinkCommand.java @@ -1,8 +1,5 @@ package terminus.command.content.link; -import static terminus.common.CommonUtils.isValidDay; -import static terminus.common.CommonUtils.isValidUrl; - import java.time.LocalTime; import java.util.ArrayList; import terminus.command.Command; @@ -18,6 +15,8 @@ import terminus.module.NusModule; import terminus.ui.Ui; +import static terminus.common.CommonUtils.*; + /** * AddLinkCommand class which will manage the adding of new Links from user command. @@ -27,9 +26,10 @@ public class AddLinkCommand extends Command { private String description; private String day; private LocalTime startTime; + private int duration; private String link; - private static final int ADD_SCHEDULE_ARGUMENTS = 4; + private static final int ADD_SCHEDULE_ARGUMENTS = 5; @Override public String getFormat() { @@ -64,17 +64,19 @@ public void parseArguments(String arguments) throws InvalidArgumentException { this.description = argArray.get(0); this.day = argArray.get(1); this.startTime = CommonUtils.convertToLocalTime(userStartTime); - this.link = argArray.get(3); + this.duration = Integer.parseInt(argArray.get(3)); + this.link = argArray.get(4); if (!isValidDay(this.day)) { TerminusLogger.warning(String.format("Invalid Day: %s", this.day)); throw new InvalidArgumentException(String.format(Messages.ERROR_MESSAGE_INVALID_DAY, this.day)); } if (!isValidUrl(this.link)) { - TerminusLogger.warning(String.format("Invalid Link: %s", this.link)); - throw new InvalidArgumentException( - String.format(Messages.ERROR_MESSAGE_INVALID_LINK, this.link)); + TerminusLogger.warning(String.format("Invalid Link: %s", this.link)); + throw new InvalidArgumentException( + String.format(Messages.ERROR_MESSAGE_INVALID_LINK, this.link)); } + isValidDuration(startTime, duration); TerminusLogger.info(String.format("Parsed arguments (description = %s, day = %s, startTime = %s, link = %s)" + " to Add Link Command", description, day, startTime, link)); } @@ -94,7 +96,7 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) { ContentManager contentManager = module.getContentManager(Link.class); assert contentManager != null; - contentManager.add(new Link(description, day, startTime, link)); + contentManager.add(new Link(description, day, startTime, duration, link)); ui.printSection(String.format(Messages.MESSAGE_RESPONSE_ADD, CommonFormat.COMMAND_SCHEDULE, description)); return new CommandResult(true, false); } diff --git a/src/main/java/terminus/common/CommonFormat.java b/src/main/java/terminus/common/CommonFormat.java index 12484372a8..6ddc5d434b 100644 --- a/src/main/java/terminus/common/CommonFormat.java +++ b/src/main/java/terminus/common/CommonFormat.java @@ -28,7 +28,7 @@ public class CommonFormat { public static final String COMMAND_DELETE_FORMAT = COMMAND_DELETE + " "; public static final String COMMAND_VIEW_FORMAT = COMMAND_VIEW + " {item number}"; public static final String COMMAND_ADD_SCHEDULE_FORMAT = COMMAND_ADD + " \"\" " - + "\"\" \"\" \"\""; + + "\"\" \"\" \"\" \"\""; public static final String COMMAND_ADD_NOTE_FORMAT = COMMAND_ADD + " \"\" \"\""; public static final String COMMAND_ADD_QUESTION_FORMAT = COMMAND_ADD + " \"\" \"\""; public static final String COMMAND_TEST_QUESTION_FORMAT = COMMAND_TEST + " {question count}"; diff --git a/src/main/java/terminus/common/CommonUtils.java b/src/main/java/terminus/common/CommonUtils.java index 00ce12e401..a55c82a655 100644 --- a/src/main/java/terminus/common/CommonUtils.java +++ b/src/main/java/terminus/common/CommonUtils.java @@ -117,6 +117,16 @@ public static boolean isValidDay(String day) { return false; } + public static boolean isValidDuration(LocalTime startTime, int duration) throws InvalidArgumentException { + LocalTime endTime = startTime.plusHours(duration); + if (duration < 0) { + throw new InvalidArgumentException(String.format(Messages.ERROR_MESSAGE_INVALID_DURATION, duration)); + } else if (startTime.getHour() > endTime.getHour()) { + throw new InvalidArgumentException(Messages.ERROR_MESSAGE_SCHEDULE_OVERFLOW); + } + return true; + } + public static boolean isStringNullOrEmpty(String string) { return string == null || string.isBlank(); } diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index 7545c7166b..1a6db2c9d9 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -26,6 +26,8 @@ public class Messages { public static final String ERROR_MESSAGE_INVALID_TIME_FORMAT = ERROR_MESSAGE_TAG + "Invalid time format %s."; public static final String ERROR_MESSAGE_INVALID_LINK = ERROR_MESSAGE_TAG + "Invalid link %s."; public static final String ERROR_MESSAGE_INVALID_DAY = ERROR_MESSAGE_TAG + "Invalid day %s."; + public static final String ERROR_MESSAGE_INVALID_DURATION = ERROR_MESSAGE_TAG + "Invalid duration %d."; + public static final String ERROR_MESSAGE_SCHEDULE_OVERFLOW = ERROR_MESSAGE_TAG + "Please set schedule on a separate day."; public static final String ERROR_MESSAGE_DUPLICATE_NAME = ERROR_MESSAGE_TAG + "Duplicate name found."; public static final String ERROR_FILE_TOO_LARGE = "Unable to read large files."; diff --git a/src/main/java/terminus/content/Link.java b/src/main/java/terminus/content/Link.java index 4fef5c8483..59ab846f1f 100644 --- a/src/main/java/terminus/content/Link.java +++ b/src/main/java/terminus/content/Link.java @@ -9,15 +9,17 @@ public class Link extends Content { private String day; private LocalTime startTime; + private int duration; private String link; public static final String TYPE = "Z"; - private static final String DISPLAY_LINK_MESSAGE = "%s (%s, %s): %s"; + private static final String DISPLAY_LINK_MESSAGE = "%s (%s, %s - %s): %s"; - public Link(String name, String day, LocalTime startTime, String link) { + public Link(String name, String day, LocalTime startTime, int duration, String link) { super(name); this.day = day; this.startTime = startTime; + this.duration = duration; this.link = link; } @@ -38,6 +40,14 @@ public void setStartTime(LocalTime startTime) { this.startTime = startTime; } + public int getDuration() { + return duration; + } + + public void setDuration(int duration) { + this.duration = duration; + } + public String getLink() { return link; } @@ -53,7 +63,8 @@ public void setLink(String link) { */ @Override public String getDisplayInfo() { - return String.format(DISPLAY_LINK_MESSAGE, this.name, day, startTime, link); + LocalTime endTime = startTime.plusHours(duration); + return String.format(DISPLAY_LINK_MESSAGE, this.name, day, startTime, endTime, link); } /** From 4a4b0472532f5f9b54cd37ef0c9d7a7aeaba0b4a Mon Sep 17 00:00:00 2001 From: LouisLouis19 Date: Fri, 22 Oct 2021 12:54:33 +0800 Subject: [PATCH 221/466] Implement conflict manager when users add new link --- .../command/content/link/AddLinkCommand.java | 12 ++++- src/main/java/terminus/common/Messages.java | 3 +- src/main/java/terminus/content/Link.java | 8 ++- .../terminus/timetable/ConflictManager.java | 51 +++++++++++++++++++ 4 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 src/main/java/terminus/timetable/ConflictManager.java diff --git a/src/main/java/terminus/command/content/link/AddLinkCommand.java b/src/main/java/terminus/command/content/link/AddLinkCommand.java index c78dbb8b43..8a12213f0f 100644 --- a/src/main/java/terminus/command/content/link/AddLinkCommand.java +++ b/src/main/java/terminus/command/content/link/AddLinkCommand.java @@ -13,6 +13,7 @@ import terminus.exception.InvalidArgumentException; import terminus.module.ModuleManager; import terminus.module.NusModule; +import terminus.timetable.ConflictManager; import terminus.ui.Ui; import static terminus.common.CommonUtils.*; @@ -96,8 +97,17 @@ public CommandResult execute(Ui ui, ModuleManager moduleManager) { ContentManager contentManager = module.getContentManager(Link.class); assert contentManager != null; - contentManager.add(new Link(description, day, startTime, duration, link)); + Link newLink = new Link(description, day, startTime, duration, link); + ConflictManager scheduleConflict = new ConflictManager(moduleManager, newLink); + + if (scheduleConflict.getConflictingSchedule() != null) { + String conflicts = scheduleConflict.getConflictingSchedule(); + ui.printSection(Messages.MESSAGE_CONFLICTING_SCHEDULE); + ui.printSection(conflicts); + } + contentManager.add(newLink); ui.printSection(String.format(Messages.MESSAGE_RESPONSE_ADD, CommonFormat.COMMAND_SCHEDULE, description)); + return new CommandResult(true, false); } diff --git a/src/main/java/terminus/common/Messages.java b/src/main/java/terminus/common/Messages.java index 1a6db2c9d9..99b1fceea2 100644 --- a/src/main/java/terminus/common/Messages.java +++ b/src/main/java/terminus/common/Messages.java @@ -27,7 +27,7 @@ public class Messages { public static final String ERROR_MESSAGE_INVALID_LINK = ERROR_MESSAGE_TAG + "Invalid link %s."; public static final String ERROR_MESSAGE_INVALID_DAY = ERROR_MESSAGE_TAG + "Invalid day %s."; public static final String ERROR_MESSAGE_INVALID_DURATION = ERROR_MESSAGE_TAG + "Invalid duration %d."; - public static final String ERROR_MESSAGE_SCHEDULE_OVERFLOW = ERROR_MESSAGE_TAG + "Please set schedule on a separate day."; + public static final String ERROR_MESSAGE_SCHEDULE_OVERFLOW = ERROR_MESSAGE_TAG + "Please set schedules on separate days."; public static final String ERROR_MESSAGE_DUPLICATE_NAME = ERROR_MESSAGE_TAG + "Duplicate name found."; public static final String ERROR_FILE_TOO_LARGE = "Unable to read large files."; @@ -67,4 +67,5 @@ public class Messages { "How did you find the question? (Compare against past attempts if any)", "[1] Easy; [2] Normal / Same; [3] Hard; [E] Exit"}; public static final String MESSAGE_EMPTY_DAILY_SCHEDULE = "You have no schedule for today."; + public static final String MESSAGE_CONFLICTING_SCHEDULE = "Your new schedule has conflicts with:"; } diff --git a/src/main/java/terminus/content/Link.java b/src/main/java/terminus/content/Link.java index 59ab846f1f..7fa7a98e09 100644 --- a/src/main/java/terminus/content/Link.java +++ b/src/main/java/terminus/content/Link.java @@ -56,6 +56,11 @@ public void setLink(String link) { this.link = link; } + public LocalTime getEndTime() { + LocalTime endTime = startTime.plusHours(duration); + return endTime; + } + /** * Returns all the attributes of the Link object. * @@ -63,8 +68,7 @@ public void setLink(String link) { */ @Override public String getDisplayInfo() { - LocalTime endTime = startTime.plusHours(duration); - return String.format(DISPLAY_LINK_MESSAGE, this.name, day, startTime, endTime, link); + return String.format(DISPLAY_LINK_MESSAGE, this.name, day, startTime, getEndTime(), link); } /** diff --git a/src/main/java/terminus/timetable/ConflictManager.java b/src/main/java/terminus/timetable/ConflictManager.java new file mode 100644 index 0000000000..272f4777f6 --- /dev/null +++ b/src/main/java/terminus/timetable/ConflictManager.java @@ -0,0 +1,51 @@ +package terminus.timetable; + +import terminus.content.ContentManager; +import terminus.content.Link; +import terminus.module.ModuleManager; +import terminus.module.NusModule; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.stream.Stream; + +public class ConflictManager { + + private ModuleManager moduleManager; + private Link newLink; + + public ConflictManager(ModuleManager moduleManager, Link newLink) { + this.moduleManager = moduleManager; + this.newLink = newLink; + } + + public ArrayList getAllLinks() { + ArrayList currentLinks = new ArrayList(); + String[] modules = moduleManager.getAllModules(); + Stream stream = Arrays.stream(modules); + + stream.forEach(x -> { + NusModule module = moduleManager.getModule(x); + ContentManager contentManager = module.getContentManager(Link.class); + assert contentManager != null; + currentLinks.addAll(contentManager.getContents()); + }); + + return currentLinks; + } + + + public String getConflictingSchedule() { + ArrayList currentLinks = getAllLinks(); + StringBuilder conflictList = new StringBuilder(); + + currentLinks.stream().forEach(x -> { + boolean hasConflict = newLink.getEndTime().compareTo(x.getStartTime()) > 0 && newLink.getStartTime().compareTo(x.getEndTime()) < 0; + boolean isSameDay = newLink.getDay().equalsIgnoreCase(x.getDay()); + if (isSameDay && hasConflict) { + conflictList.append(String.format("%s\n", x.getViewDescription())); + } + }); + return conflictList.toString(); + } +} From c274bdf85f57e542a2ec0237a1a4bcf911d89f8f Mon Sep 17 00:00:00 2001 From: Woolicious98 Date: Fri, 22 Oct 2021 13:08:44 +0800 Subject: [PATCH 222/466] Add some storage seq UML --- .../StorageInitializeSequenceDiagram.png | Bin 0 -> 73518 bytes docs/uml/storage/AddModuleStorage.puml | 33 ++++++-- ...ddNoteCommand_Storage_SequenceDiagram.puml | 34 ++++++++ ...ModuleCommand_Storage_SequenceDiagram.puml | 48 ++++++++++++ .../StorageInitializeSequenceDiagram.puml | 73 ++++++++++++++++++ 5 files changed, 183 insertions(+), 5 deletions(-) create mode 100644 docs/attachments/StorageInitializeSequenceDiagram.png create mode 100644 docs/uml/storage/AddNoteCommand_Storage_SequenceDiagram.puml create mode 100644 docs/uml/storage/DeleteModuleCommand_Storage_SequenceDiagram.puml create mode 100644 docs/uml/storage/StorageInitializeSequenceDiagram.puml diff --git a/docs/attachments/StorageInitializeSequenceDiagram.png b/docs/attachments/StorageInitializeSequenceDiagram.png new file mode 100644 index 0000000000000000000000000000000000000000..f944442af1d1bb5211850e5eb21272c15fc4ca46 GIT binary patch literal 73518 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