nus-cs2103-AY2223S1 · johnbenedictyan · May 24, 2020 · Aug 16, 2022 · Aug 16, 2022 · Aug 16, 2022
diff --git a/src/main/java/duke/Duke.java b/src/main/java/duke/Duke.java
@@ -5,12 +5,8 @@
 import duke.commands.ErrorCommand;
 import duke.commands.ExitCommand;
 import duke.commands.tasks.BaseTaskCommand;
-import duke.exceptions.IncorrectArgumentException;
-import duke.exceptions.InvalidDateTimeException;
-import duke.exceptions.InvalidTaskSpecificationException;
-import duke.exceptions.MissingArgumentException;
 import duke.exceptions.NoCommandException;
-import duke.exceptions.UnknownCommandException;
+import duke.exceptions.ParseException;
 import duke.parser.Parser;
 import duke.storage.Storage;
 import duke.tasklist.TaskList;
@@ -69,8 +65,7 @@ private void runCommandLoopUntilExitCommand() {
             String userCommandText = ui.getUserCommand();
             try {
                 command = parser.parse(userCommandText);
-            } catch (MissingArgumentException | InvalidDateTimeException | InvalidTaskSpecificationException
-                    | IncorrectArgumentException | UnknownCommandException | NoCommandException e) {
+            } catch (NoCommandException | ParseException e) {
                 command = new ErrorCommand(e.getMessage());
             }
             CommandResult result = runCommand(command);
@@ -158,8 +153,7 @@ public String getResponse(String text) {
         BaseCommand command;
         try {
             command = parser.parse(text);
-        } catch (MissingArgumentException | InvalidDateTimeException | InvalidTaskSpecificationException
-                | IncorrectArgumentException | UnknownCommandException | NoCommandException e) {
+        } catch (NoCommandException | ParseException e) {
             command = new ErrorCommand(e.getMessage());
         }
         CommandResult result = runCommand(command);

diff --git a/src/main/java/duke/commands/ExitCommand.java b/src/main/java/duke/commands/ExitCommand.java
@@ -4,6 +4,8 @@
  * ExitCommand Class
  */
 public class ExitCommand implements BaseCommand {
+    public static final String COMMAND_WORD = "exit";
+
     @Override
     public CommandResult execute() {
         String successMessage = "Thank you for using aladdin services!\n";

diff --git a/src/main/java/duke/commands/tasks/AddDeadlineCommand.java b/src/main/java/duke/commands/tasks/AddDeadlineCommand.java
@@ -0,0 +1,23 @@
+package duke.commands.tasks;
+
+import duke.commands.CommandResult;
+import duke.domain.Deadline;
+
+public class AddDeadlineCommand extends BaseTaskCommand {
+    public static final String COMMAND_WORD = "deadline";
+    public static final String SUBCOMMAND_WORD = " by ";
+    private final Deadline deadline;
+    private String successMessage = "This task has been successfully added!\n";
+
+    public AddDeadlineCommand(Deadline deadline) {
+        this.deadline = deadline;
+    }
+
+    @Override
+    public CommandResult execute() {
+        this.taskList.addTask(deadline);
+        successMessage = String.format("%s%s%s", successMessage, "\n", deadline);
+        return new CommandResult(super.formatOutputString(successMessage));
+    }
+
+}
diff --git a/src/main/java/duke/commands/tasks/AddEventCommand.java b/src/main/java/duke/commands/tasks/AddEventCommand.java
@@ -0,0 +1,23 @@
+package duke.commands.tasks;
+
+import duke.commands.CommandResult;
+import duke.domain.Event;
+
+public class AddEventCommand extends BaseTaskCommand {
+    public static final String COMMAND_WORD = "event";
+    public static final String SUBCOMMAND_WORD = " at ";
+    private final Event event;
+    private String successMessage = "This task has been successfully added!\n";
+
+    public AddEventCommand(Event event) {
+        this.event = event;
+    }
+
+    @Override
+    public CommandResult execute() {
+        this.taskList.addTask(event);
+        successMessage = String.format("%s%s%s", successMessage, "\n", event);
+        return new CommandResult(super.formatOutputString(successMessage));
+    }
+
+}
diff --git a/src/main/java/duke/commands/tasks/AddTaskCommand.java b/src/main/java/duke/commands/tasks/AddTaskCommand.java
diff --git a/src/main/java/duke/commands/tasks/AddTodoCommand.java b/src/main/java/duke/commands/tasks/AddTodoCommand.java
@@ -0,0 +1,22 @@
+package duke.commands.tasks;
+
+import duke.commands.CommandResult;
+import duke.domain.Todo;
+
+public class AddTodoCommand extends BaseTaskCommand {
+    public static final String COMMAND_WORD = "todo";
+    private final Todo todo;
+    private String successMessage = "This task has been successfully added!\n";
+
+    public AddTodoCommand(Todo todo) {
+        this.todo = todo;
+    }
+
+    @Override
+    public CommandResult execute() {
+        this.taskList.addTask(todo);
+        successMessage = String.format("%s%s%s", successMessage, "\n", todo);
+        return new CommandResult(super.formatOutputString(successMessage));
+    }
+
+}
diff --git a/src/main/java/duke/commands/tasks/DeleteTaskCommand.java b/src/main/java/duke/commands/tasks/DeleteTaskCommand.java
@@ -1,21 +1,23 @@
 package duke.commands.tasks;
 
 import duke.commands.CommandResult;
-import duke.domain.Task;
+import duke.domain.task.Task;
+import duke.domain.task.TaskIndex;
 import duke.exceptions.TaskNotFoundException;
 
 /**
  * DeleteTaskCommand class
  */
 public class DeleteTaskCommand extends BaseTaskCommand {
+    public static final String COMMAND_WORD = "delete";
     private String successMessage = "This task has been successfully deleted!\n";
     private String errorMessage = "An error occurred when deleting this task:\n";
-    private final int taskIndex;
+    private final TaskIndex taskIndex;
 
     /**
      *
      */
-    public DeleteTaskCommand(Integer taskIndex) {
+    public DeleteTaskCommand(TaskIndex taskIndex) {
         this.taskIndex = taskIndex;
     }
 

diff --git a/src/main/java/duke/commands/tasks/FindTaskCommand.java b/src/main/java/duke/commands/tasks/FindTaskCommand.java
@@ -6,6 +6,7 @@
  * Find Task Command Class
  */
 public class FindTaskCommand extends BaseTaskCommand {
+    public static final String COMMAND_WORD = "find";
     private final String searchTerm;
     private String successMessage = "Here are the matching tasks:\n";
 

diff --git a/src/main/java/duke/commands/tasks/ListTasksAfterCommand.java b/src/main/java/duke/commands/tasks/ListTasksAfterCommand.java
@@ -8,6 +8,7 @@
  * ListTasksAfterCommand class
  */
 public class ListTasksAfterCommand extends ListTasksCommand {
+    public static final String SUBCOMMAND_WORD = "/after ";
     private final LocalDateTime dateTime;
     private String successMessage = "Here are your tasks:\n";
 

diff --git a/src/main/java/duke/commands/tasks/ListTasksBeforeCommand.java b/src/main/java/duke/commands/tasks/ListTasksBeforeCommand.java
@@ -8,6 +8,7 @@
  * ListTasksBeforeCommand class
  */
 public class ListTasksBeforeCommand extends ListTasksCommand {
+    public static final String SUBCOMMAND_WORD = "/before ";
     private final LocalDateTime dateTime;
     private String successMessage = "Here are your tasks:\n";
 

diff --git a/src/main/java/duke/commands/tasks/ListTasksCommand.java b/src/main/java/duke/commands/tasks/ListTasksCommand.java
@@ -6,6 +6,7 @@
  * ListTasksCommand Class
  */
 public class ListTasksCommand extends BaseTaskCommand {
+    public static final String COMMAND_WORD = "list";
     private String successMessage = "Here are your tasks:\n";
 
     @Override

diff --git a/src/main/java/duke/commands/tasks/MarkTaskCommand.java b/src/main/java/duke/commands/tasks/MarkTaskCommand.java
@@ -1,21 +1,23 @@
 package duke.commands.tasks;
 
 import duke.commands.CommandResult;
-import duke.domain.Task;
+import duke.domain.task.Task;
+import duke.domain.task.TaskIndex;
 import duke.exceptions.TaskNotFoundException;
 
 /**
  * MarkTaskCommand Class
  */
 public class MarkTaskCommand extends BaseTaskCommand {
+    public static final String COMMAND_WORD = "mark";
     private String successMessage = "This task has been successfully marked!\n";
     private String errorMessage = "An error occurred when marking this task:\n";
-    private final Integer taskIndex;
+    private final TaskIndex taskIndex;
 
     /**
      *
      */
-    public MarkTaskCommand(Integer taskIndex) {
+    public MarkTaskCommand(TaskIndex taskIndex) {
         this.taskIndex = taskIndex;
     }
 

diff --git a/src/main/java/duke/commands/tasks/UnmarkTaskCommand.java b/src/main/java/duke/commands/tasks/UnmarkTaskCommand.java
@@ -1,21 +1,23 @@
 package duke.commands.tasks;
 
 import duke.commands.CommandResult;
-import duke.domain.Task;
+import duke.domain.task.Task;
+import duke.domain.task.TaskIndex;
 import duke.exceptions.TaskNotFoundException;
 
 /**
  * UnmarkTaskCommand class
  */
 public class UnmarkTaskCommand extends BaseTaskCommand {
+    public static final String COMMAND_WORD = "unmark";
     private String successMessage = "This task has been successfully unmarked!\n";
     private String errorMessage = "An error occurred when unmarking this task:\n";
-    private final Integer taskIndex;
+    private final TaskIndex taskIndex;
 
     /**
      *
      */
-    public UnmarkTaskCommand(Integer taskIndex) {
+    public UnmarkTaskCommand(TaskIndex taskIndex) {
         this.taskIndex = taskIndex;
     }
 

diff --git a/src/main/java/duke/data/tasks.txt b/src/main/java/duke/data/tasks.txt
@@ -1 +1,3 @@
 T@@@0@@@read book@@@$_$
+T@@@0@@@ buy book@@@$_$
+T@@@0@@@ read book@@@$_$
diff --git a/src/main/java/duke/domain/Deadline.java b/src/main/java/duke/domain/Deadline.java
@@ -3,6 +3,8 @@
 import java.time.LocalDateTime;
 import java.util.Objects;
 
+import duke.domain.task.Task;
+
 /**
  * The type Deadline.
  */

diff --git a/src/main/java/duke/domain/Event.java b/src/main/java/duke/domain/Event.java
@@ -3,6 +3,8 @@
 import java.time.LocalDateTime;
 import java.util.Objects;
 
+import duke.domain.task.Task;
+
 /**
  * The type Event.
  */

diff --git a/src/main/java/duke/domain/Todo.java b/src/main/java/duke/domain/Todo.java
@@ -2,6 +2,8 @@
 
 import java.util.Objects;
 
+import duke.domain.task.Task;
+
 /**
  * The type Todo.
  */

diff --git a/src/main/java/duke/domain/Task.java → src/main/java/duke/domain/task/Task.java b/src/main/java/duke/domain/Task.java → src/main/java/duke/domain/task/Task.java
@@ -1,10 +1,13 @@
-package duke.domain;
+package duke.domain.task;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.util.Objects;
 
+import duke.domain.Deadline;
+import duke.domain.Event;
+import duke.domain.Todo;
 import duke.exceptions.InvalidDateTimeException;
 import duke.exceptions.InvalidTaskSpecificationException;
 

diff --git a/src/main/java/duke/domain/task/TaskDescription.java b/src/main/java/duke/domain/task/TaskDescription.java
@@ -0,0 +1,17 @@
+package duke.domain.task;
+
+public class TaskDescription {
+    public static final String MESSAGE_CONSTRAINTS = "Names should only contain alphanumeric characters and spaces, and it should not be blank";
+
+    public static final String VALIDATION_REGEX = "[\\p{Alnum}][\\p{Alnum} ]*";
+
+    public final String taskDescription;
+
+    public TaskDescription(String description) {
+        taskDescription = description;
+    }
+
+    public static boolean isValid(String test) {
+        return test.matches(VALIDATION_REGEX);
+    }
+}
diff --git a/src/main/java/duke/domain/task/TaskIndex.java b/src/main/java/duke/domain/task/TaskIndex.java
@@ -0,0 +1,30 @@
+package duke.domain.task;
+
+import duke.exceptions.TaskIndexOutOfBoundsException;
+
+public class TaskIndex {
+    private final int zeroBasedTaskIndex;
+
+    private TaskIndex(int zeroBasedTaskIndex) {
+        if (zeroBasedTaskIndex < 0) {
+            throw new TaskIndexOutOfBoundsException();
+        }
+        this.zeroBasedTaskIndex = zeroBasedTaskIndex;
+    }
+
+    public int getZeroBased() {
+        return zeroBasedTaskIndex;
+    }
+
+    public int getOneBased() {
+        return zeroBasedTaskIndex + 1;
+    }
+
+    public static TaskIndex fromZeroBased(int zeroBasedTaskIndex) {
+        return new TaskIndex(zeroBasedTaskIndex);
+    }
+
+    public static TaskIndex fromOneBased(int oneBasedTaskIndex) {
+        return new TaskIndex(oneBasedTaskIndex - 1);
+    }
+}
diff --git a/src/main/java/duke/exceptions/NoCommandException.java b/src/main/java/duke/exceptions/NoCommandException.java
@@ -8,7 +8,7 @@ public class NoCommandException extends DukeException {
     /**
      * No command found exception constructor.
      */
-    public NoCommandException(String errorString) {
-        super(errorString);
+    public NoCommandException() {
+        super("Please enter a command");
     }
 }
diff --git a/src/main/java/duke/exceptions/ParseException.java b/src/main/java/duke/exceptions/ParseException.java
@@ -0,0 +1,7 @@
+package duke.exceptions;
+
+public class ParseException extends DukeException {
+    public ParseException(String errorString) {
+        super(errorString);
+    }
+}
diff --git a/src/main/java/duke/exceptions/TaskIndexOutOfBoundsException.java b/src/main/java/duke/exceptions/TaskIndexOutOfBoundsException.java
@@ -0,0 +1,20 @@
+package duke.exceptions;
+
+public class TaskIndexOutOfBoundsException extends RuntimeException {
+    public TaskIndexOutOfBoundsException() {
+        super("Index is out of range");
+    }
+
+    public TaskIndexOutOfBoundsException(String s) {
+        super(s);
+    }
+
+    public TaskIndexOutOfBoundsException(int index) {
+        super("Index out of range: " + index);
+    }
+
+    public TaskIndexOutOfBoundsException(long index) {
+        super("Index out of range: " + index);
+    }
+
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,8 @@ @@
     import java.util.Objects;
+    import duke.domain.task.Task;
     /**
      * The type Todo.
      */
@@ Expand Down @@