nus-cs2113-AY2021S1 · Colin386 · Nov 7, 2020 · Nov 7, 2020 · Nov 7, 2020 · Nov 7, 2020
diff --git a/.gitignore b/.gitignore
@@ -13,5 +13,8 @@ src/main/resources/docs/
 *.iml
 bin/
 
+src/main/java/META-INF
+data
+
 /text-ui-test/ACTUAL.txt
 text-ui-test/EXPECTED-UNIX.TXT
diff --git a/_config.yml b/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-cayman
diff --git a/build.gradle b/build.gradle
@@ -43,4 +43,5 @@ checkstyle {
 
 run{
     standardInput = System.in
+    enableAssertions = true
 }
diff --git a/data/goal.txt b/data/goal.txt
@@ -0,0 +1 @@
+hello there
diff --git a/docs/AboutUs.md b/docs/AboutUs.md
@@ -2,8 +2,10 @@
 
 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) | Colin Ng | [Github](https://github.com/Colin386) | [Portfolio](docs/team/colinNg.md)
+![](https://via.placeholder.com/100.png?text=Photo) | Marcus Tan | [Github](https://github.com/marcursor) | [Portfolio](docs/team/marcustan.md)
+![](https://via.placeholder.com/100.png?text=Photo) | Matthew Gani | [Github](https://github.com/matthewgani) | [Portfolio](docs/team/matthewgani.md)
+![](https://via.placeholder.com/100.png?text=Photo) | Low Qing Ning | [Github](https://github.com/ninggggx99) | [Portfolio](docs/team/lowqingning.md)
+![](https://via.placeholder.com/100.png?text=Photo) | Marcus Ng | [Github](https://github.com/reinbowl) | [Portfolio](team/marcusng.md)
+
+
diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
diff --git a/docs/diagrams/Architecture.jpg b/docs/diagrams/Architecture.jpg
diff --git a/docs/diagrams/CheckCommand_seq_diagram.jpg b/docs/diagrams/CheckCommand_seq_diagram.jpg
diff --git a/docs/diagrams/Command.jpg b/docs/diagrams/Command.jpg
diff --git a/docs/diagrams/DeadlineScenario.jpg b/docs/diagrams/DeadlineScenario.jpg
diff --git a/docs/diagrams/DeadlineSequenceDiagram.jpg b/docs/diagrams/DeadlineSequenceDiagram.jpg
diff --git a/docs/diagrams/GoalExecuteSequenceDiagram.jpg b/docs/diagrams/GoalExecuteSequenceDiagram.jpg
diff --git a/docs/diagrams/GoalParseSequenceDiagram.jpg b/docs/diagrams/GoalParseSequenceDiagram.jpg
diff --git a/docs/diagrams/ListParseSequenceDiagram.jpg b/docs/diagrams/ListParseSequenceDiagram.jpg
diff --git a/docs/diagrams/Parser_diagram.jpg b/docs/diagrams/Parser_diagram.jpg
diff --git a/docs/diagrams/RepeatScenario.jpg b/docs/diagrams/RepeatScenario.jpg
diff --git a/docs/diagrams/UserData_diagram.jpg b/docs/diagrams/UserData_diagram.jpg
diff --git a/docs/diagrams/addCommand.jpg b/docs/diagrams/addCommand.jpg
diff --git a/docs/diagrams/classDiagramStorage.jpg b/docs/diagrams/classDiagramStorage.jpg
diff --git a/docs/diagrams/getDate_seq_diagram.jpg b/docs/diagrams/getDate_seq_diagram.jpg
diff --git a/docs/diagrams/repeatstep1.jpg b/docs/diagrams/repeatstep1.jpg
diff --git a/docs/diagrams/repeatstep2.jpg b/docs/diagrams/repeatstep2.jpg
diff --git a/docs/diagrams/repeatstep3.jpg b/docs/diagrams/repeatstep3.jpg
diff --git a/docs/diagrams/repeatstep4.jpg b/docs/diagrams/repeatstep4.jpg
diff --git a/docs/diagrams/repeatstep5.jpg b/docs/diagrams/repeatstep5.jpg
diff --git a/docs/diagrams/repeatstep6.jpg b/docs/diagrams/repeatstep6.jpg
diff --git a/docs/diagrams/repeatstep7.jpg b/docs/diagrams/repeatstep7.jpg
diff --git a/docs/diagrams/storageOverall.jpg b/docs/diagrams/storageOverall.jpg
diff --git a/docs/team/colinNg.md b/docs/team/colinNg.md
@@ -0,0 +1,7 @@
+# Colin Ng - Project Portfolio Page
+
+## Overview
+
+
+### Summary of Contributions
+Changed about us file
diff --git a/docs/team/lowqingning.md b/docs/team/lowqingning.md
@@ -0,0 +1,6 @@
+# Low Qing Ning - Project Portfolio Page
+
+## Overview
+
+
+### Summary of Contributions
diff --git a/docs/team/marcusng.md b/docs/team/marcusng.md
@@ -0,0 +1,6 @@
+# Marcus Ng - Project Portfolio Page
+
+## Overview
+
+
+### Summary of Contributions
diff --git a/docs/team/marcustan.md b/docs/team/marcustan.md
@@ -0,0 +1,6 @@
+# Marcus Tan - Project Portfolio Page
+
+## Overview
+
+
+### Summary of Contributions
diff --git a/docs/team/johndoe.md → docs/team/matthewgani.md b/docs/team/johndoe.md → docs/team/matthewgani.md
diff --git a/goalStoreTest/goal.txt b/goalStoreTest/goal.txt
@@ -0,0 +1 @@
+Float like a bumblebee
diff --git a/src/main/java/seedu/duke/Duke.java b/src/main/java/seedu/duke/Duke.java
@@ -1,13 +1,89 @@
 package seedu.duke;
 
+import seedu.duke.command.Command;
+import seedu.duke.command.ReminderCommand;
+import seedu.duke.data.UserData;
+import seedu.duke.event.EventList;
+import seedu.duke.exception.DukeException;
+import seedu.duke.parser.Parser;
+import seedu.duke.storage.Storage;
+import seedu.duke.storage.StorageParser;
+import seedu.duke.ui.Ui;
+
+import java.nio.file.Path;
 import java.util.Scanner;
 
 public class Duke {
+
+    private Storage storage;
+    private UserData data;
+    private Ui ui;
+    private Command com;
+    private Parser currentParse;
+
+    //Location refers to the "data" directory stored in the folder of this application
+    private static final String FILELOCATION = "data";
+
+
+    /**
+     * Constructor for the Schedule components.
+     *
+     * @param filePath is a string containing the location of where the data text files are to be stored
+     */
+    public Duke(String filePath) {
+        ui = new Ui();
+
+        storage = new Storage(filePath, ui);
+
+        data = new UserData();
+
+        currentParse = new Parser();
+
+    }
+
     /**
-     * Main entry-point for the java.duke.Duke application.
+     * Main run function. Loops until the bye command is entered.
      */
-    public static void main(String[] args) {
-        String logo = " ____        _        \n"
+    public void run() {
+
+        ui.printWelcomeMessage();
+        storage.loadAll(data);
+        ui.printDividerLine();
+        try {
+            Command reminder = currentParse.parse("reminder");
+            reminder.execute(data, ui, storage);
+        } catch (DukeException e) {
+            ui.printErrorMessage(e.getMessage());
+        }
+
+        boolean isExit = false;
+        while (!isExit) {
+            try {
+
+                ui.printDividerLine();
+                String userInput = ui.receiveCommand();
+                ui.printDividerLine();
+                Command c = currentParse.parse(userInput);
+                isExit = c.isExit();
+
+                c.execute(data, ui, storage);
+
+            } catch (DukeException e) {
+                ui.printErrorMessage(e.getMessage());
+            }
+        }
+        storage.saveAll(data);
+        ui.printByeMessage();
+
+    }
+
+    /**
+     * Main function where the program starts.
+     *
+     * @param args No arguments entered so far
+     */
+    public static void main(String[] args) throws Exception {
+        /*String logo = " ____        _        \n"
                 + "|  _ \\ _   _| | _____ \n"
                 + "| | | | | | | |/ / _ \\\n"
                 + "| |_| | |_| |   <  __/\n"
@@ -16,6 +92,10 @@ public static void main(String[] args) {
         System.out.println("What is your name?");
 
         Scanner in = new Scanner(System.in);
-        System.out.println("Hello " + in.nextLine());
+        System.out.println("Hello " + in.nextLine());*/
+        Duke duke = new Duke(FILELOCATION);
+        duke.run();
     }
+
+
 }
diff --git a/src/main/java/seedu/duke/command/AddCommand.java b/src/main/java/seedu/duke/command/AddCommand.java
@@ -0,0 +1,217 @@
+package seedu.duke.command;
+
+import seedu.duke.data.UserData;
+import seedu.duke.event.Personal;
+import seedu.duke.event.Timetable;
+import seedu.duke.event.Zoom;
+import seedu.duke.exception.DukeException;
+import seedu.duke.exception.DateErrorException;
+import seedu.duke.exception.TimeErrorException;
+import seedu.duke.exception.WrongNumberOfArgumentsException;
+import seedu.duke.exception.EventAddErrorException;
+import seedu.duke.parser.DateTimeParser;
+import seedu.duke.storage.Storage;
+import seedu.duke.ui.Ui;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.Arrays;
+
+
+/**
+ * Command to add events.
+ */
+public class AddCommand extends Command {
+    private String eventType;
+    private String argument;
+    private Boolean isInvalidEventType = false;
+
+    /**
+     * Constructor for adding events seedu.duke
+     *
+     * @param command from user input
+     */
+    public AddCommand(String command) {
+        this.isExit = false;
+        if (command == null || command.equals("") || command.equals(" ")) {
+            isInvalidEventType = true;
+        } else {
+            String[] commandWords = command.split(" ");
+            String tempEventType = commandWords[0].toLowerCase();
+            switch (tempEventType) {
+            case "zoom":
+                eventType = "Zoom";
+                break;
+            case "personal":
+                eventType = "Personal";
+                break;
+            case "timetable":
+                eventType = "Timetable";
+                break;
+            default:
+                isInvalidEventType = true;
+                break;
+            }
+            String[] argumentWords = Arrays.copyOfRange(commandWords, 1, commandWords.length);
+            argument = String.join(" ", argumentWords);
+        }
+    }
+
+    /**
+     * Adds an event to individual eventLists.
+     *
+     * @param data    object of UserData class containing user's data.
+     * @param ui      containing the responses to print.
+     * @param storage with the save file path to write to.
+     */
+    @Override
+    public void execute(UserData data, Ui ui, Storage storage) throws DukeException {
+        if (argument == null) {
+            throw new EventAddErrorException("Wrong format for the add command!");
+        }
+        if (isInvalidEventType) {
+            throw new EventAddErrorException("Invalid event type to be added!");
+        }
+        if (argument.equals("")) {
+            throw new EventAddErrorException("Empty description for the event!");
+        }
+
+        try {
+            String[] argumentWords = argument.split(";");
+            switch (eventType) {
+            case "Personal":
+                addPersonal(data, ui, argumentWords);
+                ui.printEventAddedMessage(data.getEventList(eventType).getNewestEvent());
+                storage.saveFile(storage.getFileLocation(eventType), data, eventType);
+                break;
+            case "Zoom":
+                addZoom(data, ui, argumentWords);
+                ui.printEventAddedMessage(data.getEventList(eventType).getNewestEvent());
+                storage.saveFile(storage.getFileLocation(eventType), data, eventType);
+                break;
+            case "Timetable":
+                addTimetable(data, ui, argumentWords);
+                ui.printEventAddedMessage(data.getEventList(eventType).getNewestEvent());
+                storage.saveFile(storage.getFileLocation(eventType), data, eventType);
+                break;
+            default:
+                throw new EventAddErrorException("Invalid event type to be added!");
+            }
+        } catch (DukeException e) {
+            e.printErrorMessage();
+        }
+    }
+
+    /**
+     * Adds a Timetable event.
+     *
+     * @param data          object of UserData class containing user's data.
+     * @param ui            containing the responses to print.
+     * @param argumentWords String array containing user input arguments
+     * @return Boolean that confirms if the event was added
+     */
+    private void addTimetable(UserData data, Ui ui, String[] argumentWords) throws DukeException {
+        if (argumentWords.length == 3 || argumentWords.length == 4) {
+            // 2 cases: description & date & time , description & location & date & time
+            if (argumentWords.length == 3) {
+                try {
+                    LocalDate localDate = DateTimeParser.dateParser(argumentWords[1].trim());
+                    assert localDate != null : "date is not detected after parsing";
+                    LocalTime localTime = DateTimeParser.timeParser(argumentWords[2].trim());
+                    assert localTime != null : "time is not detected after parsing";
+                    data.addToEventList("Timetable", new Timetable(argumentWords[0].trim(), localDate, localTime));
+                } catch (DateErrorException e) {
+                    throw new DateErrorException("Something is wrong with the date!");
+                } catch (TimeErrorException e) {
+                    throw new TimeErrorException("Something is wrong with the time!");
+                }
+            } else {
+                try {
+                    LocalDate localDate = DateTimeParser.dateParser(argumentWords[2].trim());
+                    assert localDate != null : "date is not detected after parsing";
+                    LocalTime localTime = DateTimeParser.timeParser(argumentWords[3].trim());
+                    assert localTime != null : "time is not detected after parsing";
+                    data.addToEventList("Timetable", new Timetable(argumentWords[0].trim(),
+                            argumentWords[1].trim(), localDate, localTime));
+                } catch (DateErrorException e) {
+                    throw new DateErrorException("Something is wrong with the date!");
+                } catch (TimeErrorException e) {
+                    throw new TimeErrorException("Something is wrong with the time!");
+                }
+            }
+        } else {
+            throw new WrongNumberOfArgumentsException("Incorrect number of parameters for Timetable event!");
+        }
+    }
+
+    /**
+     * Adds a Personal event.
+     *
+     * @param data          object of UserData class containing user's data.
+     * @param ui            containing the responses to print.
+     * @param argumentWords String array containing user input arguments
+     * @return Boolean that confirms if the event was added
+     */
+    private void addPersonal(UserData data, Ui ui, String[] argumentWords) throws DukeException {
+        if (argumentWords.length >= 1 && argumentWords.length <= 3) {
+            // 3 cases: only description, description and date, description and date and time
+            if (argumentWords.length == 1) {
+                data.addToEventList("Personal", new Personal(argumentWords[0].trim()));
+            } else if (argumentWords.length == 2) {
+                try {
+                    LocalDate localDate = DateTimeParser.dateParser(argumentWords[1].trim());
+                    assert localDate != null : "date is not detected after parsing";
+                    data.addToEventList("Personal", new Personal(argumentWords[0].trim(), localDate));
+                } catch (DateErrorException e) {
+                    throw new DateErrorException("Something is wrong with the date!");
+                }
+            } else {
+                try {
+                    LocalDate localDate = DateTimeParser.dateParser(argumentWords[1].trim());
+                    assert localDate != null : "date is not detected after parsing";
+                    LocalTime localTime = DateTimeParser.timeParser(argumentWords[2].trim());
+                    assert localTime != null : "time is not detected after parsing";
+                    data.addToEventList("Personal", new Personal(argumentWords[0].trim(), localDate, localTime));
+                } catch (DateErrorException e) {
+                    throw new DateErrorException("Something is wrong with the date!");
+                } catch (TimeErrorException e) {
+                    throw new TimeErrorException("Something is wrong with the time!");
+                }
+            }
+        } else {
+            throw new WrongNumberOfArgumentsException("Incorrect number of parameters for Personal event!");
+        }
+    }
+
+    /**
+     * Adds a Zoom event.
+     *
+     * @param data          object of UserData class containing user's data.
+     * @param ui            containing the responses to print.
+     * @param argumentWords String array containing user input arguments
+     * @return Boolean that confirms if the event was added
+     */
+    private void addZoom(UserData data, Ui ui, String[] argumentWords) throws DukeException {
+        if (argumentWords.length == 2 || argumentWords.length == 4) {
+            // 2 cases: only have description & zoomlink , have description,zoomlink, date,time
+            if (argumentWords.length == 2) {
+                data.addToEventList("Zoom", new Zoom(argumentWords[0].trim(), argumentWords[1].trim()));
+            } else {
+                try {
+                    LocalDate localDate = DateTimeParser.dateParser(argumentWords[2].trim());
+                    assert localDate != null : "date is not detected after parsing";
+                    LocalTime localTime = DateTimeParser.timeParser(argumentWords[3].trim());
+                    assert localTime != null : "time is not detected after parsing";
+                    data.addToEventList("Zoom", new Zoom(argumentWords[0].trim(),
+                            argumentWords[1].trim(), localDate, localTime));
+                } catch (DateErrorException e) {
+                    throw new DateErrorException("Something is wrong with the date!");
+                } catch (TimeErrorException e) {
+                    throw new TimeErrorException("Something is wrong with the time!");
+                }
+            }
+        } else {
+            throw new WrongNumberOfArgumentsException("Incorrect number of parameters for Zoom event!");
+        }
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,4 +43,5 @@ checkstyle { @@
     run{
         standardInput = System.in
+        enableAssertions = true
     }