Merge pull request #4 from tensaida/B-DoWithinPeriodTasks

Add support for Do within a period tasks

Author: tensaida

data/tasks.txt

@@ -1,5 +1 @@
-D;yo;X;2020-02-02
-T;andre; 
-T;commit to github; 
-T;haha; 
-D;im done; ;1999-10-10
+W;tiffani are you watching me; ;2020-01-01;2020-02-01

src/main/java/drake/Parser.java

@@ -10,6 +10,7 @@
 import drake.commands.MarkCommand;
 import drake.commands.TodoCommand;
 import drake.commands.UnmarkCommand;
+import drake.commands.WithinCommand;
 
 /**
  * Command parser.
@@ -53,6 +54,8 @@ public static Command parse(String fullInput) throws UnknownCommandException,
             return new ByeCommand();
         case "find":
             return new FindCommand(fullInput);
+        case "within":
+            return new WithinCommand(fullInput);
         default:
             throw new UnknownCommandException();
         }

src/main/java/drake/Storage.java

@@ -10,6 +10,7 @@
 
 import drake.commands.CommandType;
 import drake.tasks.Deadline;
+import drake.tasks.DoWithinPeriod;
 import drake.tasks.Event;
 import drake.tasks.Task;
 import drake.tasks.Todo;
@@ -71,6 +72,13 @@ public List<Task> fileToList() throws UnknownCommandException {
                 }
                 list.add(event);
                 break;
+            case "W":
+                DoWithinPeriod doWithinPeriod = new DoWithinPeriod(taskParts[1], taskParts[3], taskParts[4]);
+                if (taskParts[2].equals("X")) {
+                    doWithinPeriod.markAsDone();
+                }
+                list.add(doWithinPeriod);
+                break;
             default:
                 throw new UnknownCommandException();
             }

src/main/java/drake/commands/WithinCommand.java

@@ -0,0 +1,60 @@
+package drake.commands;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import drake.DrakeException;
+import drake.IncompatibleCommandException;
+import drake.Storage;
+import drake.TaskList;
+import drake.Ui;
+import drake.tasks.DoWithinPeriod;
+import drake.tasks.Task;
+
+/**
+ * Represents the within command to create a new DoWithinPeriod task.
+ */
+public class WithinCommand extends CreateTaskCommand {
+
+    private static final Pattern descriptionPattern =
+            Pattern.compile("(?<taskName>.*) /range (?<from>.*) (?<to>.*)");
+    /**
+     * Constructor.
+     *
+     * @param fullInput The input given by the user.
+     */
+    public WithinCommand(String fullInput) {
+        super(fullInput);
+        assert fullInput.startsWith("within");
+    }
+
+    /**
+     * Executes the command to create a new deadline task, saving the new task and
+     * printing the size of the task list after execution.
+     *
+     * @param tasks   The task list before the command is executed.
+     * @param ui      Gives access to the UI of the program.
+     * @param storage Gives access to local storage.
+     * @return The list of replies
+     * @throws IOException    when there is an issue with the IO.
+     * @throws DrakeException when there is inappropriate input or save file issues.
+     */
+    @Override
+    public List<String> execute(TaskList tasks, Ui ui, Storage storage) throws DrakeException, IOException {
+        ArrayList<String> reply = new ArrayList<>();
+        Matcher match = descriptionPattern.matcher(description);
+        if (!match.matches()) {
+            throw new IncompatibleCommandException("I need two dates!");
+        }
+        reply.add("I've added this task:");
+        Task addedTask = tasks.addTask(new DoWithinPeriod(match.group("taskName"),
+                match.group("from"), match.group("to")));
+        reply.add(addedTask.toString());
+        storage.addTask(addedTask);
+        reply.addAll(super.execute(tasks, ui, storage));
+        return reply;
+    }
+}

src/main/java/drake/tasks/DoWithinPeriod.java

@@ -0,0 +1,43 @@
+package drake.tasks;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Represents tasks that need to be done with a certain period.
+ */
+public class DoWithinPeriod extends Task {
+
+    private final LocalDate from;
+    private final LocalDate to;
+
+    /**
+     * Constructor.
+     * @param description The task description.
+     * @param from The starting date of the period.
+     * @param to The ending date of the period.
+     */
+    public DoWithinPeriod(String description, String from, String to) {
+        super(description);
+        this.from = LocalDate.parse(from);
+        this.to = LocalDate.parse(to);
+    }
+
+    @Override
+    public List<String> toList() {
+        List<String> result = new ArrayList<>();
+        result.add("W");
+        result.addAll(super.toList());
+        result.add(from.toString());
+        result.add(to.toString());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "[W]" + super.toString() + " (from: " + from.format(DateTimeFormatter.ofPattern("dd MMM yyyy")) + ", "
+                + "to: " + to.format(DateTimeFormatter.ofPattern("dd MMM yyyy")) + ")";
+    }
+}