Merge pull request #99 from m1oojv/megan/filter-task-by-status

feat: Filter task list by task status
AY2324S1-CS2103T-T10-2 · Oct 27, 2023 · 9d66aa2 · 9d66aa2
2 parents 21bf265 + 785d3dc
commit 9d66aa2
Show file tree

Hide file tree

Showing 12 changed files with 204 additions and 15 deletions.
diff --git a/src/main/java/seedu/address/logic/commands/EditTaskCommand.java b/src/main/java/seedu/address/logic/commands/EditTaskCommand.java
@@ -21,6 +21,7 @@
 import seedu.address.model.Model;
 import seedu.address.model.tag.Tag;
 import seedu.address.model.task.Note;
+import seedu.address.model.task.Status;
 import seedu.address.model.task.Task;
 import seedu.address.model.task.Title;
 
@@ -91,9 +92,10 @@ private static Task createEditedTask(Task taskToEdit, EditTaskDescriptor editTas
 
         Title updatedTitle = editTaskDescriptor.getTitle().orElse(taskToEdit.getTitle());
         Note updatedNote = editTaskDescriptor.getNote().orElse(taskToEdit.getNote());
+        Status taskStatus = taskToEdit.getStatus();
         Set<Tag> updatedTags = editTaskDescriptor.getTags().orElse(taskToEdit.getTags());
 
-        return new Task(updatedTitle, updatedNote, updatedTags);
+        return new Task(updatedTitle, updatedNote, taskStatus, updatedTags);
     }
 
     @Override

diff --git a/src/main/java/seedu/address/logic/commands/FindDoneCommand.java b/src/main/java/seedu/address/logic/commands/FindDoneCommand.java
@@ -0,0 +1,30 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.model.Model.PREDICATE_SHOW_DONE_TASKS;
+
+import seedu.address.logic.Messages;
+import seedu.address.model.Model;
+import seedu.address.model.task.Status;
+
+/**
+ * Finds and lists all task in address book whose status is {@link Status#STATUS_DONE}.
+ */
+public class FindDoneCommand extends Command {
+
+    public static final String COMMAND_WORD = "findDone";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all tasks whose status is marked as "
+            + "done and displays them as a list with index numbers.\n"
+            + "Example: " + COMMAND_WORD;
+
+    public FindDoneCommand() {}
+
+    @Override
+    public CommandResult execute(Model model) {
+        requireNonNull(model);
+        model.updateFilteredTaskList(PREDICATE_SHOW_DONE_TASKS);
+        return new CommandResult(
+                String.format(Messages.MESSAGE_TASKS_LISTED_OVERVIEW, model.getFilteredTaskList().size()));
+    }
+}
diff --git a/src/main/java/seedu/address/logic/commands/FindNotDoneCommand.java b/src/main/java/seedu/address/logic/commands/FindNotDoneCommand.java
@@ -0,0 +1,30 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.model.Model.PREDICATE_SHOW_NOT_DONE_TASKS;
+
+import seedu.address.logic.Messages;
+import seedu.address.model.Model;
+import seedu.address.model.task.Status;
+
+/**
+ * Finds and lists all task in address book whose status is {@link Status#STATUS_NOT_DONE}.
+ */
+public class FindNotDoneCommand extends Command {
+
+    public static final String COMMAND_WORD = "findNotDone";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all tasks whose status is marked as "
+            + "not done and displays them as a list with index numbers.\n"
+            + "Example: " + COMMAND_WORD;
+
+    public FindNotDoneCommand() {}
+
+    @Override
+    public CommandResult execute(Model model) {
+        requireNonNull(model);
+        model.updateFilteredTaskList(PREDICATE_SHOW_NOT_DONE_TASKS);
+        return new CommandResult(
+                String.format(Messages.MESSAGE_TASKS_LISTED_OVERVIEW, model.getFilteredTaskList().size()));
+    }
+}
diff --git a/src/main/java/seedu/address/logic/parser/AddressBookParser.java b/src/main/java/seedu/address/logic/parser/AddressBookParser.java
@@ -18,6 +18,8 @@
 import seedu.address.logic.commands.EditPersonCommand;
 import seedu.address.logic.commands.EditTaskCommand;
 import seedu.address.logic.commands.ExitCommand;
+import seedu.address.logic.commands.FindDoneCommand;
+import seedu.address.logic.commands.FindNotDoneCommand;
 import seedu.address.logic.commands.FindPersonCommand;
 import seedu.address.logic.commands.FindTaskCommand;
 import seedu.address.logic.commands.HelpCommand;
@@ -100,6 +102,12 @@ public Command parseCommand(String userInput) throws ParseException {
         case FindTaskCommand.COMMAND_WORD:
             return new FindTaskCommandParser().parse(arguments);
 
+        case FindDoneCommand.COMMAND_WORD:
+            return new FindDoneCommand();
+
+        case FindNotDoneCommand.COMMAND_WORD:
+            return new FindNotDoneCommand();
+
         case DeleteAllTaskCommand.COMMAND_WORD:
             return new DeleteAllTaskCommand();
 

diff --git a/src/main/java/seedu/address/model/Model.java b/src/main/java/seedu/address/model/Model.java
@@ -6,6 +6,7 @@
 import javafx.collections.ObservableList;
 import seedu.address.commons.core.GuiSettings;
 import seedu.address.model.person.Person;
+import seedu.address.model.task.Status;
 import seedu.address.model.task.Task;
 
 /**
@@ -17,6 +18,8 @@ public interface Model {
      */
     Predicate<Person> PREDICATE_SHOW_ALL_PERSONS = unused -> true;
     Predicate<Task> PREDICATE_SHOW_ALL_TASKS = unused -> true;
+    Predicate<Task> PREDICATE_SHOW_DONE_TASKS = task -> task.getStatus().equals(Status.STATUS_DONE);
+    Predicate<Task> PREDICATE_SHOW_NOT_DONE_TASKS = task -> task.getStatus().equals(Status.STATUS_NOT_DONE);
 
     /**
      * Returns the user prefs.

diff --git a/src/main/java/seedu/address/model/task/Task.java b/src/main/java/seedu/address/model/task/Task.java
@@ -31,7 +31,7 @@ public Task(Title title, Note note, Set<Tag> tags) {
         requireAllNonNull(title, note, tags);
         this.title = title;
         this.note = note;
-        this.status = new Status(Status.TaskStatus.NOT_DONE);
+        this.status = Status.STATUS_NOT_DONE;
         this.tags.addAll(tags);
     }
 
@@ -67,14 +67,14 @@ public Status getStatus() {
      * Updates the Status of the Task as Done.
      */
     public Task markDone() {
-        return new Task(title, note, new Status(Status.TaskStatus.DONE), tags);
+        return new Task(title, note, Status.STATUS_DONE, tags);
     }
 
     /**
      * Updates the Status of the Task as not Done.
      */
     public Task unmarkDone() {
-        return new Task(title, note, new Status(Status.TaskStatus.NOT_DONE), tags);
+        return new Task(title, note, Status.STATUS_NOT_DONE, tags);
     }
 
     /**

diff --git a/src/test/java/seedu/address/logic/commands/FindDoneCommandTest.java b/src/test/java/seedu/address/logic/commands/FindDoneCommandTest.java
@@ -0,0 +1,53 @@
+package seedu.address.logic.commands;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static seedu.address.logic.Messages.MESSAGE_TASKS_LISTED_OVERVIEW;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.model.Model.PREDICATE_SHOW_DONE_TASKS;
+import static seedu.address.testutil.TypicalTasks.BUDGET;
+import static seedu.address.testutil.TypicalTasks.ENTERTAINMENT;
+import static seedu.address.testutil.TypicalTasks.FUNDING;
+import static seedu.address.testutil.TypicalTasks.GUESTLIST;
+import static seedu.address.testutil.TypicalTasks.HOSPITALITY;
+import static seedu.address.testutil.TypicalTasks.getTypicalAddressBook;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.task.Task;
+
+/**
+ * Contains integration tests (interaction with the Model) for {@code FindDoneCommand}.
+ */
+public class FindDoneCommandTest {
+    private final Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+    private final Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+
+    @Test
+    public void execute_noTasksFound() {
+        String expectedMessage = String.format(MESSAGE_TASKS_LISTED_OVERVIEW, 0);
+        FindDoneCommand command = new FindDoneCommand();
+        for (Task task : expectedModel.getFilteredTaskList()) {
+            expectedModel.unmarkTask(task);
+            model.unmarkTask(task);
+        }
+        expectedModel.updateFilteredTaskList(PREDICATE_SHOW_DONE_TASKS);
+        assertCommandSuccess(command, model, expectedMessage, expectedModel);
+        assertEquals(Collections.emptyList(), model.getFilteredTaskList());
+    }
+
+    @Test
+    public void execute_multipleTasksFound() {
+        String expectedMessage = String.format(MESSAGE_TASKS_LISTED_OVERVIEW, 5);
+        FindDoneCommand command = new FindDoneCommand();
+        expectedModel.updateFilteredTaskList(PREDICATE_SHOW_DONE_TASKS);
+        assertCommandSuccess(command, model, expectedMessage, expectedModel);
+        assertEquals(Arrays.asList(BUDGET, ENTERTAINMENT, FUNDING, GUESTLIST, HOSPITALITY),
+                model.getFilteredTaskList());
+    }
+}
diff --git a/src/test/java/seedu/address/logic/commands/FindNotDoneCommandTest.java b/src/test/java/seedu/address/logic/commands/FindNotDoneCommandTest.java
@@ -0,0 +1,52 @@
+package seedu.address.logic.commands;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static seedu.address.logic.Messages.MESSAGE_TASKS_LISTED_OVERVIEW;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.model.Model.PREDICATE_SHOW_NOT_DONE_TASKS;
+import static seedu.address.testutil.TypicalTasks.AGENDA;
+import static seedu.address.testutil.TypicalTasks.CATERING;
+import static seedu.address.testutil.TypicalTasks.DRAFT;
+import static seedu.address.testutil.TypicalTasks.INVITATION;
+import static seedu.address.testutil.TypicalTasks.getTypicalAddressBook;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.model.Model;
+import seedu.address.model.ModelManager;
+import seedu.address.model.UserPrefs;
+import seedu.address.model.task.Task;
+
+/**
+ * Contains integration tests (interaction with the Model) for {@code FindNotDoneCommand}.
+ */
+public class FindNotDoneCommandTest {
+    private final Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+    private final Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+
+    @Test
+    public void execute_noTasksFound() {
+        String expectedMessage = String.format(MESSAGE_TASKS_LISTED_OVERVIEW, 0);
+        FindNotDoneCommand command = new FindNotDoneCommand();
+        for (Task task : expectedModel.getFilteredTaskList()) {
+            expectedModel.markTask(task);
+            model.markTask(task);
+        }
+        expectedModel.updateFilteredTaskList(PREDICATE_SHOW_NOT_DONE_TASKS);
+        assertCommandSuccess(command, model, expectedMessage, expectedModel);
+        assertEquals(Collections.emptyList(), model.getFilteredTaskList());
+    }
+
+    @Test
+    public void execute_multipleTasksFound() {
+        String expectedMessage = String.format(MESSAGE_TASKS_LISTED_OVERVIEW, 4);
+        FindNotDoneCommand command = new FindNotDoneCommand();
+        expectedModel.updateFilteredTaskList(PREDICATE_SHOW_NOT_DONE_TASKS);
+        assertCommandSuccess(command, model, expectedMessage, expectedModel);
+        assertEquals(Arrays.asList(AGENDA, CATERING, DRAFT, INVITATION),
+                model.getFilteredTaskList());
+    }
+}
diff --git a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java b/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
@@ -23,6 +23,8 @@
 import seedu.address.logic.commands.EditTaskCommand;
 import seedu.address.logic.commands.EditTaskCommand.EditTaskDescriptor;
 import seedu.address.logic.commands.ExitCommand;
+import seedu.address.logic.commands.FindDoneCommand;
+import seedu.address.logic.commands.FindNotDoneCommand;
 import seedu.address.logic.commands.FindPersonCommand;
 import seedu.address.logic.commands.FindTaskCommand;
 import seedu.address.logic.commands.HelpCommand;
@@ -122,6 +124,18 @@ public void parseCommand_findTask() throws Exception {
         assertEquals(new FindTaskCommand(new TaskContainsKeywordsPredicate(keywords)), command);
     }
 
+    @Test
+    public void parseCommand_findDone() throws Exception {
+        assertTrue(parser.parseCommand(FindDoneCommand.COMMAND_WORD) instanceof FindDoneCommand);
+        assertTrue(parser.parseCommand(FindDoneCommand.COMMAND_WORD + " 3") instanceof FindDoneCommand);
+    }
+
+    @Test
+    public void parseCommand_findNotDone() throws Exception {
+        assertTrue(parser.parseCommand(FindNotDoneCommand.COMMAND_WORD) instanceof FindNotDoneCommand);
+        assertTrue(parser.parseCommand(FindNotDoneCommand.COMMAND_WORD + " 3") instanceof FindNotDoneCommand);
+    }
+
     @Test
     public void parseCommand_markTask() throws Exception {
         MarkTaskCommand command = (MarkTaskCommand) parser.parseCommand(

diff --git a/src/test/java/seedu/address/model/ModelManagerTest.java b/src/test/java/seedu/address/model/ModelManagerTest.java
@@ -18,7 +18,6 @@
 import seedu.address.commons.core.GuiSettings;
 import seedu.address.model.person.NameContainsKeywordsPredicate;
 import seedu.address.model.task.Status;
-import seedu.address.model.task.Status.TaskStatus;
 import seedu.address.model.task.Task;
 import seedu.address.testutil.AddressBookBuilder;
 
@@ -118,9 +117,9 @@ public void markTask_validTask_success() {
         modelManager.addTask(AGENDA);
         Task markedTask = modelManager.markTask(AGENDA);
 
-        assertTrue(markedTask.getStatus().equals(new Status(TaskStatus.DONE)));
+        assertTrue(markedTask.getStatus().equals(Status.STATUS_DONE));
 
-        assertTrue(modelManager.getFilteredTaskList().get(0).getStatus().equals(new Status(TaskStatus.DONE)));
+        assertTrue(modelManager.getFilteredTaskList().get(0).getStatus().equals(Status.STATUS_DONE));
     }
 
     @Test
@@ -129,10 +128,9 @@ public void unmarkTask_validTask_success() {
         Task markedTask = modelManager.markTask(AGENDA);
         Task unmarkedTask = modelManager.unmarkTask(markedTask);
 
-        assertTrue(unmarkedTask.getStatus().equals(new Status(TaskStatus.NOT_DONE)));
+        assertTrue(unmarkedTask.getStatus().equals(Status.STATUS_NOT_DONE));
 
-        assertTrue(modelManager.getFilteredTaskList().get(0).getStatus().equals(
-                new Status(TaskStatus.NOT_DONE)));
+        assertTrue(modelManager.getFilteredTaskList().get(0).getStatus().equals(Status.STATUS_NOT_DONE));
     }
 
     @Test

diff --git a/src/test/java/seedu/address/model/task/TaskTest.java b/src/test/java/seedu/address/model/task/TaskTest.java
@@ -11,15 +11,15 @@
 public class TaskTest {
 
     private static final Task TEST_TASK = new Task(new Title("Test Task 1"), new Note("Test Note 1"),
-            new Status(Status.TaskStatus.DONE), getTagSet("Test1"));
+            Status.STATUS_DONE, getTagSet("Test1"));
     private static final Task TEST_TASK_SAME = new Task(new Title("Test Task 1"), new Note("Test Note 1"),
-            new Status(Status.TaskStatus.DONE), getTagSet("Test1"));
+            Status.STATUS_DONE, getTagSet("Test1"));
     private static final Task TEST_TASK_TITLE = new Task(new Title("Test Task 1"), new Note("Test Note 2"), getTagSet(
             "Test2"));
     private static final Task TEST_TASK_NOTE = new Task(new Title("Test Task 1"), new Note("Test Note 1"), getTagSet(
             "Test2"));
     private static final Task TEST_TASK_STATUS = new Task(new Title("Test Task 1"), new Note("Test Note 1"),
-            new Status(Status.TaskStatus.DONE), getTagSet("Test2"));
+            Status.STATUS_DONE, getTagSet("Test2"));
     private static final Task TEST_TASK_DIFFERENT = new Task(new Title("Test Task 2"), new Note("Test Note 2"),
             getTagSet("Test2"));
 

diff --git a/src/test/java/seedu/address/testutil/TaskBuilder.java b/src/test/java/seedu/address/testutil/TaskBuilder.java
@@ -6,7 +6,6 @@
 import seedu.address.model.tag.Tag;
 import seedu.address.model.task.Note;
 import seedu.address.model.task.Status;
-import seedu.address.model.task.Status.TaskStatus;
 import seedu.address.model.task.Task;
 import seedu.address.model.task.Title;
 import seedu.address.model.util.SampleDataUtil;
@@ -30,7 +29,7 @@ public class TaskBuilder {
     public TaskBuilder() {
         title = new Title(DEFAULT_TITLE);
         note = new Note(DEFAULT_NOTE);
-        status = new Status(TaskStatus.NOT_DONE);
+        status = Status.STATUS_NOT_DONE;
         tags = new HashSet<>();
     }