nus-cs2103-AY2425S2 · dingZvel · Sep 11, 2023 · Feb 9, 2024 · Feb 9, 2024 · Feb 9, 2024
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
@@ -297,10 +297,12 @@ _Details coming soon ..._
 
 Action     | Format, Examples
 -----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------
-**Add**    | `add n/NAME p/PHONE_NUMBER e/EMAIL a/ADDRESS [t/TAG]…` <br> e.g., `add n/James Ho p/22224444 e/jamesho@example.com a/123, Clementi Rd, 1234665 t/friend t/colleague`
+**Add**    | `add name/NAME phone/PHONE_NUMBER email/EMAIL address/ADDRESS [tag/TAG] [pref/PRRODUCT_PREFERENCE] [freq/PRODUCT_FREQUENCY]…` <br> e.g., `add name/James Ho phone/22224444 email/jamesho@example.com address/123, Clementi Rd, 1234665 tag/friend tag/colleague pref/Shampoo freq/10`
 **Clear**  | `clear`
 **Delete** | `delete INDEX`<br> e.g., `delete 3`
-**Edit**   | `edit INDEX [n/NAME] [p/PHONE_NUMBER] [e/EMAIL] [a/ADDRESS] [t/TAG]…`<br> e.g.,`edit 2 n/James Lee e/jameslee@example.com`
-**Find**   | `find KEYWORD [MORE_KEYWORDS]`<br> e.g., `find James Jake`
+**Edit**   | `edit INDEX [name/NAME] [phone/PHONE_NUMBER] [email/EMAIL] [address/ADDRESS] [tag/TAG] [pref/PRODUCT_PREFERENCE] [freq/PRODUCT_FREQUENCY]…`<br> e.g.,`edit 2 name/James Lee email/jameslee@example.com`
+**Find**   | `find KEYWORD [MORE_KEYWORDS]`<br> e.g., `find James Jake`, `find friends`, `find shampoo`
 **List**   | `list`
 **Help**   | `help`
+**Rank**   | `rank KEYWORD` <br> e.g., `rank total` `rank name`
+**Expand** | `expand INDEX` <br> e.g., `expand 1`
diff --git a/src/main/java/seedu/address/logic/commands/CommandResult.java b/src/main/java/seedu/address/logic/commands/CommandResult.java
    }

    public boolean isShowExpandedView() {
        return showExpandedView;
    }

    public Client getExpandedClient() {
        return expandedClient;
    }

    @Override
diff --git a/src/main/java/seedu/address/logic/commands/ExpandCommand.java b/src/main/java/seedu/address/logic/commands/ExpandCommand.java

    private final Index targetIndex;

    public ExpandCommand(Index targetIndex) {
        this.targetIndex = targetIndex;
    }

    @Override
    public CommandResult execute(Model model) throws CommandException {
        requireNonNull(model);
        List<Client> filteredList = model.getSortedFilteredClientList();

        if (targetIndex.getZeroBased() >= filteredList.size()) {
            throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
        }

        Client clientToExpand = filteredList.get(targetIndex.getZeroBased());
        return new CommandResult(
                String.format(MESSAGE_EXPAND_CLIENT_SUCCESS, clientToExpand.getName()),
                false,
                false,
                true,
diff --git a/src/main/java/seedu/address/logic/parser/AddressBookParser.java b/src/main/java/seedu/address/logic/parser/AddressBookParser.java
            return new HelpCommand();

        case RankCommand.COMMAND_WORD:
            return new RankCommandParser().parse(arguments);

        case ExpandCommand.COMMAND_WORD:
            return new ExpandCommandParser().parse(arguments);

        default:
            logger.finer("This user input caused a ParseException: " + userInput);
diff --git a/src/main/java/seedu/address/logic/parser/EditCommandParser.java b/src/main/java/seedu/address/logic/parser/EditCommandParser.java
        }
        Optional<Frequency> frequency = ParserUtil.parseFrequency(argMultimap.getValue(PREFIX_FREQUENCY));
        if (argMultimap.getValue(PREFIX_PREFERENCE).isPresent()) {
            editClientDescriptor.setProductPreference(ParserUtil.parseProductPreference(
                    argMultimap.getValue(PREFIX_PREFERENCE), frequency));
        }
        if (argMultimap.getValue(PREFIX_FREQUENCY).isPresent()
                && !argMultimap.getValue(PREFIX_PREFERENCE).isPresent()) {
            throw new ParseException(EditCommand.MESSAGE_FREQUENCY_NOT_ALLOWED);
        }

        parseTagsForEdit(argMultimap.getAllValues(PREFIX_TAG)).ifPresent(editClientDescriptor::setTags);
diff --git a/src/main/java/seedu/address/logic/parser/ExpandCommandParser.java b/src/main/java/seedu/address/logic/parser/ExpandCommandParser.java
 /**
 * Parse the input and creates an ExpandCommand
 */
 public class ExpandCommandParser implements Parser<ExpandCommand> {
    /**
     * Parses the given {@code String} of arguments in the context of the DeleteCommand
     * and returns a ExpandCommand object for execution.
     * @throws ParseException if the user input does not conform the expected format
     */
    public ExpandCommand parse(String args) throws ParseException {
        Index index = ParserUtil.parseIndex(args);
        return new ExpandCommand(index);
    }
 }
diff --git a/src/main/java/seedu/address/model/AddressBook.java b/src/main/java/seedu/address/model/AddressBook.java

    @Override
    public int hashCode() {
        return clients.hashCode();
    }
 }
diff --git a/src/main/java/seedu/address/model/client/Frequency.java b/src/main/java/seedu/address/model/client/Frequency.java

    @Override
    public String toString() {
        return Integer.toString(frequency);
    }

    @Override
diff --git a/src/main/java/seedu/address/model/client/UniqueClientList.java b/src/main/java/seedu/address/model/client/UniqueClientList.java

    @Override
    public Iterator<Client> iterator() {
        return internalList.iterator();
    }

    @Override
    public boolean equals(Object other) {
        if (other == this) {
            return true;
        }

        // instanceof handles nulls
        if (!(other instanceof UniqueClientList)) {
            return false;
        }

        UniqueClientList otherUniqueClientList = (UniqueClientList) other;

    @Override
    public int hashCode() {
        return internalList.hashCode();
    }

    @Override
diff --git a/src/main/java/seedu/address/model/util/SampleDataUtil.java b/src/main/java/seedu/address/model/util/SampleDataUtil.java
 */
 public class SampleDataUtil {
    public static Client[] getSampleClients() {
        return new Client[] {
            new Client(new Name("Alex Yeoh"), new Phone("87438807"), new Email("alexyeoh@example.com"),
                new Address("Blk 30 Geylang Street 29, #06-40"),
                getTagSet("friends"), Optional.of(new ProductPreference("tea bag", new Frequency(2)))),
            new Client(new Name("Bernice Yu"), new Phone("99272758"), new Email("berniceyu@example.com"),
                new Address("Blk 30 Lorong 3 Serangoon Gardens, #07-18"),
                getTagSet("colleagues", "friends"), Optional.of(new ProductPreference("coffee", new Frequency(1)))),
            new Client(new Name("Charlotte Oliveiro"), new Phone("93210283"), new Email("charlotte@example.com"),
                new Address("Blk 11 Ang Mo Kio Street 74, #11-04"),
                getTagSet("neighbours"), Optional.of(new ProductPreference("iphone", new Frequency(3)))),
            new Client(new Name("David Li"), new Phone("91031282"), new Email("lidavid@example.com"),
                new Address("Blk 436 Serangoon Gardens Street 26, #16-43"),
                getTagSet("family"), Optional.of(new ProductPreference("tea bag", new Frequency(0)))),
            new Client(new Name("Irfan Ibrahim"), new Phone("92492021"), new Email("irfan@example.com"),
                new Address("Blk 47 Tampines Street 20, #17-35"),
                getTagSet("classmates"), Optional.of(new ProductPreference("cherry", new Frequency(1)))),
            new Client(new Name("Roy Balakrishnan"), new Phone("92624417"), new Email("royb@example.com"),
                new Address("Blk 45 Aljunied Street 85, #11-31"),
                getTagSet("colleagues"), Optional.of(new ProductPreference("mango", new Frequency(4))))
        };
    }

    public static ReadOnlyAddressBook getSampleAddressBook() {
        AddressBook sampleAb = new AddressBook();
        for (Client sampleClient : getSampleClients()) {
            sampleAb.addClient(sampleClient);
        }
        return sampleAb;
    }
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedClient.java b/src/main/java/seedu/address/storage/JsonAdaptedClient.java
        }

        if (!Frequency.isValidFrequency(frequency)) {
            throw new IllegalValueException(Frequency.MESSAGE_CONSTRAINTS);
        }
        final Frequency productFrequency = new Frequency(frequency);

diff --git a/src/main/java/seedu/address/ui/ClientCard.java b/src/main/java/seedu/address/ui/ClientCard.java
     * Creates a {@code ClientCode} with the given {@code Client} and index to display.
     */
    public ClientCard(Client client, int displayedIndex) {
        super(FXML);
        this.client = client;
        id.setText(displayedIndex + ". ");
        name.setText(client.getName().fullName);
        phone.setText(client.getPhone().value);
        address.setText(client.getAddress().value);
        email.setText(client.getEmail().value);
        client.getTags().stream()
                .sorted(Comparator.comparing(tag -> tag.tagName))
                .forEach(tag -> tags.getChildren().add(new Label(tag.tagName)));
        totalPurchase.getChildren().add(new Label("total purchase: " + String.valueOf(client.getTotalPurchase())));
        if (client.getProductPreference().isPresent()) {
            productPreferenceWithFrequency.getChildren()
                    .add(new Label(client.getProductPreference()
                            .map(ProductPreference::toString).orElse("") + ": "
                            + client.getProductPreference().get().frequency));
        }
    }
 }
diff --git a/src/main/java/seedu/address/ui/ClientDetailPanel.java b/src/main/java/seedu/address/ui/ClientDetailPanel.java
     * @param client
     */
    public ClientDetailPanel(Client client) {
        super(FXML);
        name.setText(client.getName().fullName);
        phone.setText("Phone: " + client.getPhone().value);
        email.setText("Email: " + client.getEmail().value);
        address.setText("Address: " + client.getAddress().value);
        if (client.getProductPreference().isPresent()) {
            productPreference.setText("Preferred Products: " + client.getProductPreference()
                    .map(ProductPreference::toString).orElse(""));
            frequency.setText("Purchase Frequency: " + client.getProductPreference().get().getFrequency());
        }
    }
 }
diff --git a/src/main/java/seedu/address/ui/ClientListPanel.java b/src/main/java/seedu/address/ui/ClientListPanel.java
 */
 public class ClientListPanel extends UiPart<Region> {
    private static final String FXML = "ClientListPanel.fxml";
    private final Logger logger = LogsCenter.getLogger(ClientListPanel.class);

    @FXML
    private ListView<Client> clientListView;
     * Creates a {@code ClientListPanel} with the given {@code ObservableList}.
     */
    public ClientListPanel(ObservableList<Client> clientList) {
        super(FXML);
        clientListView.setItems(clientList);
        clientListView.setCellFactory(listView -> new ClientListViewCell());
    }

    /**
     * Custom {@code ListCell} that displays the graphics of a {@code Client} using a {@code ClientCard}.
     */
    class ClientListViewCell extends ListCell<Client> {
        @Override
        protected void updateItem(Client client, boolean empty) {
            super.updateItem(client, empty);

            if (empty || client == null) {
                setGraphic(null);
                setText(null);
            } else {
                setGraphic(new ClientCard(client, getIndex() + 1).getRoot());
            }
        }
    }

 }
diff --git a/src/main/java/seedu/address/ui/MainWindow.java b/src/main/java/seedu/address/ui/MainWindow.java
     * Fills up all the placeholders of this window.
     */
    void fillInnerParts() {
        showListView();

        resultDisplay = new ResultDisplay();
        resultDisplayPlaceholder.getChildren().add(resultDisplay.getRoot());
     */
    private void handleCommandResult(CommandResult commandResult) {
        if (commandResult.isShowExpandedView()) {
            showExpandedView(commandResult.getExpandedClient());
        } else {
            showListView();
        }
    }

    private void showExpandedView(Client client) {
        viewContainer.getChildren().clear();
        clientDetailPanel = new ClientDetailPanel(client);
        viewContainer.getChildren().add(clientDetailPanel.getRoot());
    }

    private void showListView() {
        viewContainer.getChildren().clear();
        clientListPanel = new ClientListPanel(logic.getSortedFilteredClientList());
        viewContainer.getChildren().add(clientListPanel.getRoot());
    }

    public ClientListPanel getClientListPanel() {
        return clientListPanel;
    }

    /**
                handleExit();
            }

            handleCommandResult(commandResult);

            return commandResult;
        } catch (CommandException | ParseException e) {
	}

	public boolean isShowExpandedView() {
	return showExpandedView;
Check warning on line 73 in src/main/java/seedu/address/logic/commands/CommandResult.java Codecov / codecov/patch src/main/java/seedu/address/logic/commands/CommandResult.java#L73 `Added line #L73 was not covered by tests`
	}

	public Client getExpandedClient() {
	return expandedClient;
Check warning on line 77 in src/main/java/seedu/address/logic/commands/CommandResult.java Codecov / codecov/patch src/main/java/seedu/address/logic/commands/CommandResult.java#L77 `Added line #L77 was not covered by tests`
	}

	@Override

	private final Index targetIndex;

	public ExpandCommand(Index targetIndex) {
	this.targetIndex = targetIndex;
	}
Check warning on line 29 in src/main/java/seedu/address/logic/commands/ExpandCommand.java Codecov / codecov/patch src/main/java/seedu/address/logic/commands/ExpandCommand.java#L27-L29 `Added lines #L27 - L29 were not covered by tests`

	@Override
	public CommandResult execute(Model model) throws CommandException {
	requireNonNull(model);
	List<Client> filteredList = model.getSortedFilteredClientList();
Check warning on line 34 in src/main/java/seedu/address/logic/commands/ExpandCommand.java Codecov / codecov/patch src/main/java/seedu/address/logic/commands/ExpandCommand.java#L33-L34 `Added lines #L33 - L34 were not covered by tests`

	if (targetIndex.getZeroBased() >= filteredList.size()) {
	throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
Check warning on line 37 in src/main/java/seedu/address/logic/commands/ExpandCommand.java Codecov / codecov/patch src/main/java/seedu/address/logic/commands/ExpandCommand.java#L37 `Added line #L37 was not covered by tests`
	}

	Client clientToExpand = filteredList.get(targetIndex.getZeroBased());
	return new CommandResult(
	String.format(MESSAGE_EXPAND_CLIENT_SUCCESS, clientToExpand.getName()),
Check warning on line 42 in src/main/java/seedu/address/logic/commands/ExpandCommand.java Codecov / codecov/patch src/main/java/seedu/address/logic/commands/ExpandCommand.java#L40-L42 `Added lines #L40 - L42 were not covered by tests`
	false,
	false,
	true,
	return new HelpCommand();

	case RankCommand.COMMAND_WORD:
	return new RankCommandParser().parse(arguments);
Check warning on line 83 in src/main/java/seedu/address/logic/parser/AddressBookParser.java Codecov / codecov/patch src/main/java/seedu/address/logic/parser/AddressBookParser.java#L83 `Added line #L83 was not covered by tests`

	case ExpandCommand.COMMAND_WORD:
	return new ExpandCommandParser().parse(arguments);
Check warning on line 86 in src/main/java/seedu/address/logic/parser/AddressBookParser.java Codecov / codecov/patch src/main/java/seedu/address/logic/parser/AddressBookParser.java#L86 `Added line #L86 was not covered by tests`

	default:
	logger.finer("This user input caused a ParseException: " + userInput);
	}
	Optional<Frequency> frequency = ParserUtil.parseFrequency(argMultimap.getValue(PREFIX_FREQUENCY));
	if (argMultimap.getValue(PREFIX_PREFERENCE).isPresent()) {
	editClientDescriptor.setProductPreference(ParserUtil.parseProductPreference(
	argMultimap.getValue(PREFIX_PREFERENCE), frequency));
Check warning on line 68 in src/main/java/seedu/address/logic/parser/EditCommandParser.java Codecov / codecov/patch src/main/java/seedu/address/logic/parser/EditCommandParser.java#L67-L68 `Added lines #L67 - L68 were not covered by tests`
	}
	if (argMultimap.getValue(PREFIX_FREQUENCY).isPresent()
	&& !argMultimap.getValue(PREFIX_PREFERENCE).isPresent()) {
	throw new ParseException(EditCommand.MESSAGE_FREQUENCY_NOT_ALLOWED);
Check warning on line 72 in src/main/java/seedu/address/logic/parser/EditCommandParser.java Codecov / codecov/patch src/main/java/seedu/address/logic/parser/EditCommandParser.java#L72 `Added line #L72 was not covered by tests`
	}

	parseTagsForEdit(argMultimap.getAllValues(PREFIX_TAG)).ifPresent(editClientDescriptor::setTags);
	/**
	* Parse the input and creates an ExpandCommand
	*/
	public class ExpandCommandParser implements Parser<ExpandCommand> {
Check warning on line 10 in src/main/java/seedu/address/logic/parser/ExpandCommandParser.java Codecov / codecov/patch src/main/java/seedu/address/logic/parser/ExpandCommandParser.java#L10 `Added line #L10 was not covered by tests`
	/**
	* Parses the given {@code String} of arguments in the context of the DeleteCommand
	* and returns a ExpandCommand object for execution.
	* @throws ParseException if the user input does not conform the expected format
	*/
	public ExpandCommand parse(String args) throws ParseException {
	Index index = ParserUtil.parseIndex(args);
	return new ExpandCommand(index);
Check warning on line 18 in src/main/java/seedu/address/logic/parser/ExpandCommandParser.java Codecov / codecov/patch src/main/java/seedu/address/logic/parser/ExpandCommandParser.java#L17-L18 `Added lines #L17 - L18 were not covered by tests`
	}
	}

	@Override
	public int hashCode() {
	return clients.hashCode();
Check warning on line 128 in src/main/java/seedu/address/model/AddressBook.java Codecov / codecov/patch src/main/java/seedu/address/model/AddressBook.java#L128 `Added line #L128 was not covered by tests`
	}
	}

	@Override
	public String toString() {
	return Integer.toString(frequency);
Check warning on line 31 in src/main/java/seedu/address/model/client/Frequency.java Codecov / codecov/patch src/main/java/seedu/address/model/client/Frequency.java#L31 `Added line #L31 was not covered by tests`
	}

	@Override

	@Override
	public Iterator<Client> iterator() {
	return internalList.iterator();
Check warning on line 109 in src/main/java/seedu/address/model/client/UniqueClientList.java Codecov / codecov/patch src/main/java/seedu/address/model/client/UniqueClientList.java#L109 `Added line #L109 was not covered by tests`
	}

	@Override
	public boolean equals(Object other) {
	if (other == this) {
	return true;
Check warning on line 115 in src/main/java/seedu/address/model/client/UniqueClientList.java Codecov / codecov/patch src/main/java/seedu/address/model/client/UniqueClientList.java#L115 `Added line #L115 was not covered by tests`
	}

	// instanceof handles nulls
	if (!(other instanceof UniqueClientList)) {
	return false;
Check warning on line 120 in src/main/java/seedu/address/model/client/UniqueClientList.java Codecov / codecov/patch src/main/java/seedu/address/model/client/UniqueClientList.java#L120 `Added line #L120 was not covered by tests`
	}

	UniqueClientList otherUniqueClientList = (UniqueClientList) other;

	@Override
	public int hashCode() {
	return internalList.hashCode();
Check warning on line 129 in src/main/java/seedu/address/model/client/UniqueClientList.java Codecov / codecov/patch src/main/java/seedu/address/model/client/UniqueClientList.java#L129 `Added line #L129 was not covered by tests`
	}

	@Override
	*/
	public class SampleDataUtil {
	public static Client[] getSampleClients() {
	return new Client[] {
Check warning on line 24 in src/main/java/seedu/address/model/util/SampleDataUtil.java Codecov / codecov/patch src/main/java/seedu/address/model/util/SampleDataUtil.java#L24 `Added line #L24 was not covered by tests`
	new Client(new Name("Alex Yeoh"), new Phone("87438807"), new Email("alexyeoh@example.com"),
	new Address("Blk 30 Geylang Street 29, #06-40"),
	getTagSet("friends"), Optional.of(new ProductPreference("tea bag", new Frequency(2)))),
Check warning on line 27 in src/main/java/seedu/address/model/util/SampleDataUtil.java Codecov / codecov/patch src/main/java/seedu/address/model/util/SampleDataUtil.java#L27 `Added line #L27 was not covered by tests`
	new Client(new Name("Bernice Yu"), new Phone("99272758"), new Email("berniceyu@example.com"),
	new Address("Blk 30 Lorong 3 Serangoon Gardens, #07-18"),
	getTagSet("colleagues", "friends"), Optional.of(new ProductPreference("coffee", new Frequency(1)))),
Check warning on line 30 in src/main/java/seedu/address/model/util/SampleDataUtil.java Codecov / codecov/patch src/main/java/seedu/address/model/util/SampleDataUtil.java#L30 `Added line #L30 was not covered by tests`
	new Client(new Name("Charlotte Oliveiro"), new Phone("93210283"), new Email("charlotte@example.com"),
	new Address("Blk 11 Ang Mo Kio Street 74, #11-04"),
	getTagSet("neighbours"), Optional.of(new ProductPreference("iphone", new Frequency(3)))),
Check warning on line 33 in src/main/java/seedu/address/model/util/SampleDataUtil.java Codecov / codecov/patch src/main/java/seedu/address/model/util/SampleDataUtil.java#L33 `Added line #L33 was not covered by tests`
	new Client(new Name("David Li"), new Phone("91031282"), new Email("lidavid@example.com"),
	new Address("Blk 436 Serangoon Gardens Street 26, #16-43"),
	getTagSet("family"), Optional.of(new ProductPreference("tea bag", new Frequency(0)))),
Check warning on line 36 in src/main/java/seedu/address/model/util/SampleDataUtil.java Codecov / codecov/patch src/main/java/seedu/address/model/util/SampleDataUtil.java#L36 `Added line #L36 was not covered by tests`
	new Client(new Name("Irfan Ibrahim"), new Phone("92492021"), new Email("irfan@example.com"),
	new Address("Blk 47 Tampines Street 20, #17-35"),
	getTagSet("classmates"), Optional.of(new ProductPreference("cherry", new Frequency(1)))),
Check warning on line 39 in src/main/java/seedu/address/model/util/SampleDataUtil.java Codecov / codecov/patch src/main/java/seedu/address/model/util/SampleDataUtil.java#L39 `Added line #L39 was not covered by tests`
	new Client(new Name("Roy Balakrishnan"), new Phone("92624417"), new Email("royb@example.com"),
	new Address("Blk 45 Aljunied Street 85, #11-31"),
	getTagSet("colleagues"), Optional.of(new ProductPreference("mango", new Frequency(4))))
Check warning on line 42 in src/main/java/seedu/address/model/util/SampleDataUtil.java Codecov / codecov/patch src/main/java/seedu/address/model/util/SampleDataUtil.java#L42 `Added line #L42 was not covered by tests`
	};
	}

	public static ReadOnlyAddressBook getSampleAddressBook() {
	AddressBook sampleAb = new AddressBook();
	for (Client sampleClient : getSampleClients()) {
	sampleAb.addClient(sampleClient);
Check warning on line 49 in src/main/java/seedu/address/model/util/SampleDataUtil.java Codecov / codecov/patch src/main/java/seedu/address/model/util/SampleDataUtil.java#L49 `Added line #L49 was not covered by tests`
	}
	return sampleAb;
	}
	}

	if (!Frequency.isValidFrequency(frequency)) {
	throw new IllegalValueException(Frequency.MESSAGE_CONSTRAINTS);
Check warning on line 131 in src/main/java/seedu/address/storage/JsonAdaptedClient.java Codecov / codecov/patch src/main/java/seedu/address/storage/JsonAdaptedClient.java#L131 `Added line #L131 was not covered by tests`
	}
	final Frequency productFrequency = new Frequency(frequency);