Merge pull request #190 from AY2223S1-CS2103T-W16-4/feat-viewclient-b…

…y-product

ListClient by product

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

@@ -4,21 +4,34 @@
 import static seedu.address.model.Model.PREDICATE_SHOW_ALL_CLIENTS;
 
 import seedu.address.model.Model;
+import seedu.address.model.product.Product;
 
 /**
  * Lists all persons in MyInsuRec to the user.
  */
 public class ListClientCommand extends Command {
 
     public static final String COMMAND_WORD = "listClient";
-
     public static final String MESSAGE_SUCCESS = "Listed all clients";
+    private final Object object;
+
+    public ListClientCommand() {
+        this.object = null;
+    }
+
+    public ListClientCommand(Product product) {
+        this.object = product;
+    }
 
 
     @Override
     public CommandResult execute(Model model) {
         requireNonNull(model);
-        model.updateFilteredClientList(PREDICATE_SHOW_ALL_CLIENTS);
+        if (this.object == null) {
+            model.updateFilteredClientList(PREDICATE_SHOW_ALL_CLIENTS);
+        } else if (this.object instanceof Product) {
+            model.updateFilteredClientList(client -> client.hasProduct((Product) object));
+        }
         return new CommandResult(MESSAGE_SUCCESS, CommandSpecific.CLIENT);
     }
 }

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

@@ -26,7 +26,7 @@ public class ViewClientCommand extends Command {
     private final Index targetIndex;
 
     /**
-     * Creates an AddCommand to add the specified {@code Client}
+     * Creates an ViewClientCommand to view the specified {@code Client}
      */
     public ViewClientCommand(Index targetIndex) {
         this.targetIndex = targetIndex;

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

@@ -55,8 +55,8 @@ public AddClientCommand parse(String args) throws ParseException {
                 ? Optional.of(new Birthday(ParserUtil.parseDate(
                         argMultimap.getValue(PREFIX_BIRTHDAY).get(), "birthday")))
                 : Optional.empty();
-        Set<Product> product = ParserUtil.parseProducts(argMultimap.getAllValues(PREFIX_PRODUCT));
-        Client client = new Client(name, phone, email, address, birthday, product);
+        Set<Product> products = ParserUtil.parseProducts(argMultimap.getAllValues(PREFIX_PRODUCT));
+        Client client = new Client(name, phone, email, address, birthday, products);
         return new AddClientCommand(client);
     }
 

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

@@ -0,0 +1,38 @@
+package seedu.address.logic.parser;
+
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_PRODUCT;
+
+import java.util.stream.Stream;
+
+import seedu.address.logic.commands.ListClientCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.product.Product;
+
+/**
+ * Parses input arguments and creates a new ListClientCommand object
+ */
+public class ListClientCommandParser {
+
+    /**
+     * Parses the given {@code String} of arguments in the context of the ViewMeetingCommand
+     * and returns a ViewMeetingCommand object for execution.
+     * @throws ParseException if the user input does not conform the expected format
+     */
+    public ListClientCommand parse(String args) throws ParseException {
+        requireNonNull(args);
+        ArgumentMultimap argumentMultimap = ArgumentTokenizer.tokenize(args, PREFIX_PRODUCT);
+
+        if (!arePrefixesPresent(argumentMultimap, PREFIX_PRODUCT)) {
+            return new ListClientCommand();
+        } else {
+            Product product = ParserUtil.parseProduct(argumentMultimap.getValue(PREFIX_PRODUCT).get());
+            return new ListClientCommand(product);
+        }
+    }
+
+    private static boolean arePrefixesPresent(ArgumentMultimap argumentMultimap, Prefix... prefixes) {
+        return Stream.of(prefixes).allMatch(prefix -> argumentMultimap.getValue(prefix).isPresent());
+    }
+}

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

@@ -71,7 +71,7 @@ public Command parseCommand(String userInput) throws ParseException {
             return new FindCommandParser().parse(arguments);
 
         case ListClientCommand.COMMAND_WORD:
-            return new ListClientCommand();
+            return new ListClientCommandParser().parse(arguments);
 
         case ViewMeetingCommand.COMMAND_WORD:
             return new ViewMeetingCommandParser().parse(arguments);

src/test/java/seedu/address/logic/commands/ListClientCommandTest.java

@@ -28,12 +28,14 @@ public void setUp() {
 
     @Test
     public void execute_listIsNotFiltered_showsSameList() {
-        assertCommandSuccess(new ListClientCommand(), model, ListClientCommand.MESSAGE_SUCCESS, expectedModel);
+        assertCommandSuccess(new ListClientCommand(),
+                model, ListClientCommand.MESSAGE_SUCCESS, expectedModel);
     }
 
     @Test
     public void execute_listIsFiltered_showsEverything() {
         showClientAtIndex(model, INDEX_FIRST_ELEMENT);
-        assertCommandSuccess(new ListClientCommand(), model, ListClientCommand.MESSAGE_SUCCESS, expectedModel);
+        assertCommandSuccess(new ListClientCommand(),
+                model, ListClientCommand.MESSAGE_SUCCESS, expectedModel);
     }
 }