Merge branch 'master' into chore/cicd-errors

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

@@ -0,0 +1,243 @@
+package seedu.address.logic.commands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_PRICE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
+import static seedu.address.model.Model.PREDICATE_SHOW_ALL_PROPERTIES;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.commons.util.CollectionUtil;
+import seedu.address.commons.util.ToStringBuilder;
+import seedu.address.logic.Messages;
+import seedu.address.logic.commands.exceptions.CommandException;
+import seedu.address.model.Model;
+import seedu.address.model.property.Price;
+import seedu.address.model.property.PropAddress;
+import seedu.address.model.property.PropName;
+import seedu.address.model.property.PropPhone;
+import seedu.address.model.property.Property;
+import seedu.address.model.tag.Tag;
+
+/**
+ * Edits the details of an existing property in the Price book.
+ */
+public class EditPropertyCommand extends Command {
+
+    public static final String COMMAND_WORD = "editprop";
+
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the details of the property identified "
+            + "by the index number used in the displayed property list. "
+            + "Existing values will be overwritten by the input values.\n"
+            + "Parameters: INDEX (must be a positive integer) "
+            + "[" + PREFIX_NAME + "NAME] "
+            + "[" + PREFIX_PHONE + "PHONE] "
+            + "[" + PREFIX_ADDRESS + "ADDRESS] "
+            + "[" + PREFIX_PRICE + "PRICE] "
+            + "[" + PREFIX_TAG + "TAG]...\n"
+            + "Example: " + COMMAND_WORD + " 1 "
+            + PREFIX_PHONE + "91234567 "
+            + PREFIX_ADDRESS + "311, Clementi Ave 2, #02-25";
+
+    public static final String MESSAGE_EDIT_PROPERTY_SUCCESS = "Edited property: %1$s";
+    public static final String MESSAGE_NOT_EDITED = "At least one field to edit must be provided.";
+    public static final String MESSAGE_DUPLICATE_PROPERTY = "This property already exists in PropertyMatch.";
+
+    private final Index index;
+    private final EditPropertyDescriptor editPropertyDescriptor;
+
+    /**
+     * @param index of the property in the filtered property list to edit
+     * @param editPropertyDescriptor details to edit the property with
+     */
+    public EditPropertyCommand(Index index, EditPropertyDescriptor editPropertyDescriptor) {
+        requireNonNull(index);
+        requireNonNull(editPropertyDescriptor);
+
+        this.index = index;
+        this.editPropertyDescriptor = new EditPropertyDescriptor(editPropertyDescriptor);
+    }
+
+    @Override
+    public CommandResult execute(Model model) throws CommandException {
+        requireNonNull(model);
+        List<Property> lastShownList = model.getFilteredPropertyList();
+
+        if (index.getZeroBased() >= lastShownList.size()) {
+            throw new CommandException(Messages.MESSAGE_INVALID_PROPERTY_DISPLAYED_INDEX);
+        }
+
+        Property propertyToEdit = lastShownList.get(index.getZeroBased());
+        Property editedproperty = createEditedproperty(propertyToEdit, editPropertyDescriptor);
+
+        if (!propertyToEdit.isSameProperty(editedproperty) && model.hasProperty(editedproperty)) {
+            throw new CommandException(MESSAGE_DUPLICATE_PROPERTY);
+        }
+
+        model.setProperty(propertyToEdit, editedproperty);
+        model.updateFilteredPropertyList(PREDICATE_SHOW_ALL_PROPERTIES);
+        return new CommandResult(String.format(MESSAGE_EDIT_PROPERTY_SUCCESS, Messages.format(editedproperty)));
+    }
+
+    /**
+     * Creates and returns a {@code property} with the details of {@code propertyToEdit}
+     * edited with {@code editpropertyDescriptor}.
+     */
+    private static Property createEditedproperty(Property propertyToEdit,
+                                                 EditPropertyDescriptor editpropertyDescriptor) {
+        assert propertyToEdit != null;
+
+        PropName updatedName = editpropertyDescriptor.getName().orElse(propertyToEdit.getName());
+        PropPhone updatedPhone = editpropertyDescriptor.getPhone().orElse(propertyToEdit.getPhone());
+        PropAddress updatedAddress = editpropertyDescriptor.getAddress().orElse(propertyToEdit.getAddress());
+        Price updatedPrice = editpropertyDescriptor.getPrice().orElse(propertyToEdit.getPrice());
+        Set<Tag> updatedTags = editpropertyDescriptor.getTags().orElse(propertyToEdit.getTags());
+
+        return new Property(updatedName, updatedAddress, updatedPhone, updatedPrice, updatedTags);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+
+        // instanceof handles nulls
+        if (!(other instanceof EditPropertyCommand)) {
+            return false;
+        }
+
+        EditPropertyCommand otherEditCommand = (EditPropertyCommand) other;
+        return index.equals(otherEditCommand.index)
+                && editPropertyDescriptor.equals(otherEditCommand.editPropertyDescriptor);
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .add("index", index)
+                .add("editPropertyDescriptor", editPropertyDescriptor)
+                .toString();
+    }
+
+    /**
+     * Stores the details to edit the property with. Each non-empty field value will replace the
+     * corresponding field value of the property.
+     */
+    public static class EditPropertyDescriptor {
+        private PropName name;
+        private PropPhone phone;
+        private PropAddress address;
+        private Price price;
+        private Set<Tag> tags;
+
+        public EditPropertyDescriptor() {}
+
+        /**
+         * Copy constructor.
+         * A defensive copy of {@code tags} is used internally.
+         */
+        public EditPropertyDescriptor(EditPropertyDescriptor toCopy) {
+            setName(toCopy.name);
+            setPhone(toCopy.phone);
+            setAddress(toCopy.address);
+            setPrice(toCopy.price);
+            setTags(toCopy.tags);
+        }
+
+        /**
+         * Returns true if at least one field is edited.
+         */
+        public boolean isAnyFieldEdited() {
+            return CollectionUtil.isAnyNonNull(name, phone, address, price, tags);
+        }
+
+        public void setName(PropName name) {
+            this.name = name;
+        }
+
+        public Optional<PropName> getName() {
+            return Optional.ofNullable(name);
+        }
+
+        public void setPhone(PropPhone phone) {
+            this.phone = phone;
+        }
+
+        public Optional<PropPhone> getPhone() {
+            return Optional.ofNullable(phone);
+        }
+
+        public void setAddress(PropAddress address) {
+            this.address = address;
+        }
+
+        public Optional<PropAddress> getAddress() {
+            return Optional.ofNullable(address);
+        }
+
+        public void setPrice(Price price) {
+            this.price = price;
+        }
+
+        public Optional<Price> getPrice() {
+            return Optional.ofNullable(price);
+        }
+
+        /**
+         * Sets {@code tags} to this object's {@code tags}.
+         * A defensive copy of {@code tags} is used internally.
+         */
+        public void setTags(Set<Tag> tags) {
+            this.tags = (tags != null) ? new HashSet<>(tags) : null;
+        }
+
+        /**
+         * Returns an unmodifiable tag set, which throws {@code UnsupportedOperationException}
+         * if modification is attempted.
+         * Returns {@code Optional#empty()} if {@code tags} is null.
+         */
+        public Optional<Set<Tag>> getTags() {
+            return (tags != null) ? Optional.of(Collections.unmodifiableSet(tags)) : Optional.empty();
+        }
+
+        @Override
+        public boolean equals(Object other) {
+            if (other == this) {
+                return true;
+            }
+
+            // instanceof handles nulls
+            if (!(other instanceof EditPropertyDescriptor)) {
+                return false;
+            }
+
+            EditPropertyDescriptor otherEditpropertyDescriptor = (EditPropertyDescriptor) other;
+            return Objects.equals(name, otherEditpropertyDescriptor.name)
+                    && Objects.equals(phone, otherEditpropertyDescriptor.phone)
+                    && Objects.equals(address, otherEditpropertyDescriptor.address)
+                    && Objects.equals(price, otherEditpropertyDescriptor.price)
+                    && Objects.equals(tags, otherEditpropertyDescriptor.tags);
+        }
+
+        @Override
+        public String toString() {
+            return new ToStringBuilder(this)
+                    .add("name", name)
+                    .add("phone", phone)
+                    .add("address", address)
+                    .add("price", price)
+                    .add("tags", tags)
+                    .toString();
+        }
+    }
+}

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

@@ -15,6 +15,7 @@
 import seedu.address.logic.commands.DeleteCustomerCommand;
 import seedu.address.logic.commands.DeletePropertyCommand;
 import seedu.address.logic.commands.EditCommand;
+import seedu.address.logic.commands.EditPropertyCommand;
 import seedu.address.logic.commands.ExitCommand;
 import seedu.address.logic.commands.FindCommand;
 import seedu.address.logic.commands.HelpCommand;
@@ -65,6 +66,9 @@ public Command parseCommand(String userInput) throws ParseException {
         case EditCommand.COMMAND_WORD:
             return new EditCommandParser().parse(arguments);
 
+        case EditPropertyCommand.COMMAND_WORD:
+            return new EditPropertyCommandParser().parse(arguments);
+
         case DeletePropertyCommand.COMMAND_WORD:
             return new DeletePropertyCommandParser().parse(arguments);
 

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

@@ -0,0 +1,86 @@
+package seedu.address.logic.parser;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_PRICE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+
+import seedu.address.commons.core.index.Index;
+import seedu.address.logic.commands.EditPropertyCommand;
+import seedu.address.logic.commands.EditPropertyCommand.EditPropertyDescriptor;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.tag.Tag;
+
+/**
+ * Parses input arguments and creates a new EditCommand object
+ */
+public class EditPropertyCommandParser implements Parser<EditPropertyCommand> {
+
+    /**
+     * Parses the given {@code String} of arguments in the context of the EditCommand
+     * and returns an EditCommand object for execution.
+     * @throws ParseException if the user input does not conform the expected format
+     */
+    public EditPropertyCommand parse(String args) throws ParseException {
+        requireNonNull(args);
+        ArgumentMultimap argMultimap =
+                ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_PHONE, PREFIX_ADDRESS, PREFIX_PRICE, PREFIX_TAG);
+
+        Index index;
+
+        try {
+            index = ParserUtil.parseIndex(argMultimap.getPreamble());
+        } catch (ParseException pe) {
+            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT,
+                    EditPropertyCommand.MESSAGE_USAGE), pe);
+        }
+
+        argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_NAME, PREFIX_PHONE, PREFIX_ADDRESS, PREFIX_PRICE);
+
+        EditPropertyDescriptor editPropertyDescriptor = new EditPropertyDescriptor();
+
+        if (argMultimap.getValue(PREFIX_NAME).isPresent()) {
+            editPropertyDescriptor.setName(ParserUtil.parsePropName(argMultimap.getValue(PREFIX_NAME).get()));
+        }
+        if (argMultimap.getValue(PREFIX_PHONE).isPresent()) {
+            editPropertyDescriptor.setPhone(ParserUtil.parsePropPhone(argMultimap.getValue(PREFIX_PHONE).get()));
+        }
+        if (argMultimap.getValue(PREFIX_ADDRESS).isPresent()) {
+            editPropertyDescriptor.setAddress(ParserUtil.parsePropAddress(argMultimap.getValue(PREFIX_ADDRESS).get()));
+        }
+        if (argMultimap.getValue(PREFIX_PRICE).isPresent()) {
+            editPropertyDescriptor.setPrice(ParserUtil.parsePrice(argMultimap.getValue(PREFIX_PRICE).get()));
+        }
+        parseTagsForEdit(argMultimap.getAllValues(PREFIX_TAG)).ifPresent(editPropertyDescriptor::setTags);
+
+        if (!editPropertyDescriptor.isAnyFieldEdited()) {
+            throw new ParseException(EditPropertyCommand.MESSAGE_NOT_EDITED);
+        }
+
+        return new EditPropertyCommand(index, editPropertyDescriptor);
+    }
+
+    /**
+     * Parses {@code Collection<String> tags} into a {@code Set<Tag>} if {@code tags} is non-empty.
+     * If {@code tags} contain only one element which is an empty string, it will be parsed into a
+     * {@code Set<Tag>} containing zero tags.
+     */
+    private Optional<Set<Tag>> parseTagsForEdit(Collection<String> tags) throws ParseException {
+        assert tags != null;
+
+        if (tags.isEmpty()) {
+            return Optional.empty();
+        }
+        Collection<String> tagSet = tags.size() == 1 && tags.contains("") ? Collections.emptySet() : tags;
+        return Optional.of(ParserUtil.parseTags(tagSet));
+    }
+
+}

src/main/java/seedu/address/model/ReadOnlyAddressBook.java

@@ -13,5 +13,4 @@ public interface ReadOnlyAddressBook {
      * This list will not contain any duplicate customers.
      */
     ObservableList<Customer> getCustomerList();
-
 }

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

@@ -2,13 +2,13 @@
 
 import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
 import static seedu.address.testutil.TypicalCustomers.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalProperties.getTypicalPropertyBook;
 
 import org.junit.jupiter.api.Test;
 
 import seedu.address.model.AddressBook;
 import seedu.address.model.Model;
 import seedu.address.model.ModelManager;
-import seedu.address.model.PropertyBook;
 import seedu.address.model.UserPrefs;
 
 public class ClearCommandTest {
@@ -23,8 +23,8 @@ public void execute_emptyAddressBook_success() {
 
     @Test
     public void execute_nonEmptyAddressBook_success() {
-        Model model = new ModelManager(getTypicalAddressBook(), new PropertyBook(), new UserPrefs());
-        Model expectedModel = new ModelManager(getTypicalAddressBook(), new PropertyBook(), new UserPrefs());
+        Model model = new ModelManager(getTypicalAddressBook(), getTypicalPropertyBook(), new UserPrefs());
+        Model expectedModel = new ModelManager(getTypicalAddressBook(), getTypicalPropertyBook(), new UserPrefs());
         expectedModel.setAddressBook(new AddressBook());
 
         assertCommandSuccess(new ClearCommand(), model, ClearCommand.MESSAGE_SUCCESS, expectedModel);