Merge pull request nus-cs2103-AY2021S1#67 from Licheng-Wu/branch-Find-exercises

Add find exercises feature

Author: khor-jingqian

src/main/java/seedu/address/logic/commands/FindExercisesCommand.java

@@ -0,0 +1,42 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+
+import seedu.address.commons.core.Messages;
+import seedu.address.model.Model;
+import seedu.address.model.person.ExerciseNameContainsKeywordsPredicate;
+
+/**
+ * Finds and lists all exercises in fitNUS whose name contains any of the argument keywords.
+ * Keyword matching is case insensitive.
+ */
+public class FindExercisesCommand extends Command {
+
+    public static final String COMMAND_WORD = "find_exercises";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all exercises whose names contain any of "
+            + "the specified keywords (case-insensitive) and displays them as a list with index numbers.\n"
+            + "Parameters: KEYWORD [MORE_KEYWORDS]...\n"
+            + "Example: " + COMMAND_WORD + " bench press";
+
+    private final ExerciseNameContainsKeywordsPredicate predicate;
+
+    public FindExercisesCommand(ExerciseNameContainsKeywordsPredicate predicate) {
+        this.predicate = predicate;
+    }
+
+    @Override
+    public CommandResult execute(Model model) {
+        requireNonNull(model);
+        model.updateFilteredExerciseList(predicate);
+        return new CommandResult(
+                String.format(Messages.MESSAGE_EXERCISES_LISTED_OVERVIEW, model.getFilteredExerciseList().size()));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof FindExercisesCommand // instanceof handles nulls
+                && predicate.equals(((FindExercisesCommand) other).predicate)); // state check
+    }
+}

src/main/java/seedu/address/logic/parser/AddressBookParser.java

@@ -17,6 +17,7 @@
 import seedu.address.logic.commands.ExerciseDeleteCommand;
 import seedu.address.logic.commands.ExitCommand;
 import seedu.address.logic.commands.FindCommand;
+import seedu.address.logic.commands.FindExercisesCommand;
 import seedu.address.logic.commands.HelpCommand;
 import seedu.address.logic.commands.LessonAddCommand;
 import seedu.address.logic.commands.LessonDeleteCommand;
@@ -78,6 +79,9 @@ public Command parseCommand(String userInput) throws ParseException {
         case FindCommand.COMMAND_WORD:
             return new FindCommandParser().parse(arguments);
 
+        case FindExercisesCommand.COMMAND_WORD:
+            return new FindExercisesCommandParser().parse(arguments);
+
         case ListCommand.COMMAND_WORD:
             return new ListCommand();
 

src/main/java/seedu/address/logic/parser/FindExercisesCommandParser.java

@@ -0,0 +1,33 @@
+package seedu.address.logic.parser;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+
+import java.util.Arrays;
+
+import seedu.address.logic.commands.FindExercisesCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.person.ExerciseNameContainsKeywordsPredicate;
+
+/**
+ * Parses input arguments and creates a new FindExercisesCommand object
+ */
+public class FindExercisesCommandParser implements Parser<FindExercisesCommand> {
+
+    /**
+     * Parses the given {@code String} of arguments in the context of the FindExercisesCommand
+     * and returns a FindExercisesCommand object for execution.
+     * @throws ParseException if the user input does not conform the expected format
+     */
+    public FindExercisesCommand parse(String args) throws ParseException {
+        String trimmedArgs = args.trim();
+        if (trimmedArgs.isEmpty()) {
+            throw new ParseException(
+                    String.format(MESSAGE_INVALID_COMMAND_FORMAT, FindExercisesCommand.MESSAGE_USAGE));
+        }
+
+        String[] nameKeywords = trimmedArgs.split("\\s+");
+
+        return new FindExercisesCommand(new ExerciseNameContainsKeywordsPredicate(Arrays.asList(nameKeywords)));
+    }
+
+}

src/main/java/seedu/address/model/person/ExerciseNameContainsKeywordsPredicate.java

@@ -0,0 +1,31 @@
+package seedu.address.model.person;
+
+import java.util.List;
+import java.util.function.Predicate;
+
+import seedu.address.commons.util.StringUtil;
+
+/**
+ * Tests that a {@code Exercise}'s {@code Name} matches any of the keywords given.
+ */
+public class ExerciseNameContainsKeywordsPredicate implements Predicate<Exercise> {
+    private final List<String> keywords;
+
+    public ExerciseNameContainsKeywordsPredicate(List<String> keywords) {
+        this.keywords = keywords;
+    }
+
+    @Override
+    public boolean test(Exercise exercise) {
+        return keywords.stream()
+                .anyMatch(keyword -> StringUtil.containsWordIgnoreCase(exercise.getName().fullName, keyword));
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other == this // short circuit if same object
+                || (other instanceof ExerciseNameContainsKeywordsPredicate // instanceof handles nulls
+                && keywords.equals(((ExerciseNameContainsKeywordsPredicate) other).keywords)); // state check
+    }
+
+}

src/main/resources/view/MainWindow.fxml

@@ -57,7 +57,7 @@
                 <StackPane fx:id="personListPanelPlaceholder" VBox.vgrow="ALWAYS" />
               </VBox>
 
-        <VBox fx:id="routineList" styleClass="pane-with-border" minWidth="340" prefWidth="340" VBox.vgrow="ALWAYS">
+        <VBox fx:id="routineList" styleClass="pane-with-border" minWidth="200" prefWidth="340" VBox.vgrow="ALWAYS">
           <padding>
             <Insets top="10" right="10" bottom="10" left="10" />
           </padding>