Fix Bug - Delivery details not updated

src/main/java/seedu/address/logic/commands/customer/CustomerEditCommand.java

@@ -11,19 +11,27 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 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.CommandResult;
+import seedu.address.logic.commands.delivery.DeliveryEditCommand.DeliveryEditDescriptor;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.Model;
 import seedu.address.model.customer.Address;
 import seedu.address.model.customer.Customer;
 import seedu.address.model.customer.Email;
 import seedu.address.model.customer.Name;
 import seedu.address.model.customer.Phone;
+import seedu.address.model.delivery.Delivery;
+import seedu.address.model.delivery.DeliveryDate;
+import seedu.address.model.delivery.DeliveryName;
+import seedu.address.model.delivery.DeliveryStatus;
+import seedu.address.model.delivery.Note;
+import seedu.address.model.delivery.OrderDate;
 
 /**
  * Edits the details of an existing customer in the address book.
@@ -100,7 +108,11 @@ public CommandResult execute(Model model) throws CommandException {
             throw new CommandException(MESSAGE_DUPLICATE_PERSON);
         } else {
             model.setCustomer(customerToEdit, editedCustomer);
+
+            // update delivery associated with the edited customer
+            updateDelivery(model, editedCustomer);
             model.updateFilteredCustomerList(PREDICATE_SHOW_ALL_CUSTOMERS);
+
             return new CommandResult(String.format(MESSAGE_EDIT_PERSON_SUCCESS,
                     Messages.format(editedCustomer)), true);
         }
@@ -125,6 +137,51 @@ private static Customer createEditedCustomer(Customer customerToEdit,
                 updatedEmail, updatedAddress);
     }
 
+    /**
+     * Updates all the deliveries associated with the customer with new customer details.
+     */
+    protected static void updateDelivery(Model model, Customer editedCustomer) {
+        int customerId = editedCustomer.getCustomerId();
+        Stream<Delivery> deliveries = model.getDeliveryByCustomerId(customerId);
+        deliveries.forEach(d -> {
+            DeliveryEditDescriptor descriptor = new DeliveryEditDescriptor();
+            descriptor.setCustomerId(customerId);
+            Delivery editedDelivery = createEditedDelivery(d, descriptor, editedCustomer);
+            model.setDelivery(d, editedDelivery);
+        });
+    }
+
+    /**
+     * Creates and returns a {@code Delivery} with the customer details edited.
+     *
+     * @param deliveryToEdit         {@code Delivery} which the command edits.
+     * @param deliveryEditDescriptor {@code editDeliveryDescriptor} details to edit the delivery with.
+     * @param editedCustomer         {@code Customer} which the delivery is associated with.
+     */
+    private static Delivery createEditedDelivery(Delivery deliveryToEdit, DeliveryEditDescriptor
+            deliveryEditDescriptor, Customer editedCustomer) {
+
+        assert deliveryToEdit != null;
+
+        DeliveryName updatedDeliveryName =
+                deliveryEditDescriptor.getDeliveryName().orElse(deliveryToEdit.getName());
+
+        OrderDate orderDate = deliveryToEdit.getOrderDate();
+
+        DeliveryDate updatedDeliveryDate =
+                deliveryEditDescriptor.getDeliveryDate().orElse(deliveryToEdit.getDeliveryDate());
+
+        DeliveryStatus updatedDeliveryStatus =
+                deliveryEditDescriptor.getStatus().orElse(deliveryToEdit.getStatus());
+
+        Note updatedNote = deliveryEditDescriptor.getNote().orElse(deliveryToEdit.getNote());
+
+        return new Delivery(deliveryToEdit.getDeliveryId(), updatedDeliveryName, editedCustomer, orderDate,
+                updatedDeliveryDate,
+                updatedDeliveryStatus,
+                updatedNote);
+    }
+
     @Override
     public boolean equals(Object other) {
         if (other == this) {

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

@@ -4,6 +4,7 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 import javafx.collections.ObservableList;
 import seedu.address.commons.util.ToStringBuilder;
@@ -124,6 +125,10 @@ public Optional<Delivery> getById(int id) {
         return deliveries.getById(id);
     }
 
+    public Stream<Delivery> getByCustomerId(int id) {
+        return deliveries.getByCustomerId(id);
+    }
+
     @Override
     public boolean equals(Object other) {
         if (other == this) {

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

@@ -4,6 +4,7 @@
 import java.util.Comparator;
 import java.util.Optional;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 import javafx.collections.ObservableList;
 import seedu.address.commons.core.GuiSettings;
@@ -168,6 +169,14 @@ public interface Model {
      */
     Optional<Delivery> getDelivery(int id);
 
+    /**
+     * Returns an optional containing a delivery with the given customer id.
+     *
+     * @param id the id of the customer
+     * @return the stream containing deliveries with the given customer id
+     */
+    public Stream<Delivery> getDeliveryByCustomerId(int id);
+
     /**
      * Returns true if a delivery with the same identity as {@code delivery} exists in the address book.
      */

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

@@ -9,6 +9,7 @@
 import java.util.function.Predicate;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -385,6 +386,11 @@ public Optional<Delivery> getDelivery(int id) {
         return this.deliveryBook.getById(id);
     }
 
+    @Override
+    public Stream<Delivery> getDeliveryByCustomerId(int id) {
+        return this.deliveryBook.getByCustomerId(id);
+    }
+
     @Override
     public boolean hasDelivery(Delivery delivery) {
         requireNonNull(delivery);

src/main/java/seedu/address/model/delivery/Delivery.java

@@ -21,7 +21,6 @@
     private OrderDate orderDate;
     private DeliveryDate deliveryDate;
     private DeliveryStatus status;
-    private Address address; //The address of the delivery, which is automatically tied to Customer's address.
     private Note note;
 
 
@@ -47,7 +46,6 @@
         this.deliveryDate = deliveryDate;
         this.status = status;
         this.note = note;
-        this.address = customer.getAddress();
     }
 
 
@@ -71,7 +69,6 @@
         this.orderDate = orderDate;
         this.deliveryDate = deliveryDate;
         this.status = status;
-        this.address = customer.getAddress();
     }
 
     /**
@@ -93,7 +90,6 @@
         this.orderDate = orderDate;
         this.deliveryDate = deliveryDate;
         this.status = status;
-        this.address = customer.getAddress();
     }
 
 
@@ -119,7 +115,6 @@
         this.deliveryDate = deliveryDate;
         this.status = status;
         this.note = note;
-        this.address = customer.getAddress();
     }
 
     public void setOrderDate(OrderDate orderDate) {
@@ -167,7 +162,7 @@
     }
 
     public Address getAddress() {
-        return address;
+        return customer.getAddress();
     }
 
     public Note getNote() {
@@ -219,12 +214,12 @@
                 && Objects.equals(otherDelivery.note, note)
                 && otherDelivery.orderDate.equals(orderDate)
                 && otherDelivery.status.equals(status)
-                && otherDelivery.address.equals(address);
+                && otherDelivery.getAddress().equals(customer.getAddress());
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(deliveryId, name, customer, orderDate, deliveryDate, address);
+        return Objects.hash(deliveryId, name, customer, orderDate, deliveryDate);
     }
 
     @Override
@@ -234,7 +229,7 @@
                 .add("customer", customer)
                 .add("orderedAt", orderDate)
                 .add("deliveredAt", deliveryDate)
-                .add("address:", address)
+                .add("address:", customer.getAddress())
                 .add("note:", Optional.ofNullable(note)
                         .map(n -> String.format("\n Note:%s", n)).orElse(""))
                 .toString();

src/main/java/seedu/address/model/delivery/UniqueDeliveryList.java

@@ -7,6 +7,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -116,6 +117,16 @@ public Optional<Delivery> getById(int id) {
         return Optional.empty();
     }
 
+    /**
+     * Retrieves delivery by its id
+     *
+     * @param id The id of the delivery to be retrieved
+     * @return Optional containing the delivery if it exists
+     */
+    public Stream<Delivery> getByCustomerId(int id) {
+        return internalList.stream().filter(d -> d.getCustomerId() == id);
+    }
+
     /**
      * Returns the backing list as an unmodifiable {@code ObservableList}.
      */

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

@@ -13,6 +13,7 @@
 import java.util.Comparator;
 import java.util.Optional;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
 
@@ -291,6 +292,11 @@ public Optional<Delivery> getDelivery(int id) {
             return Optional.empty();
         }
 
+        @Override
+        public Stream<Delivery> getDeliveryByCustomerId(int id) {
+            throw new AssertionError("This method should not be called.");
+        };
+
         @Override
         public boolean hasDelivery(Delivery delivery) {
             throw new AssertionError("This method should not be called.");

src/test/java/seedu/address/logic/commands/customer/CustomerAddCommandTest.java

@@ -13,6 +13,7 @@
 import java.util.Comparator;
 import java.util.Optional;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
 
@@ -233,6 +234,11 @@ public Optional<Delivery> getDelivery(int id) {
             throw new AssertionError("This method should not be called.");
         }
 
+        @Override
+        public Stream<Delivery> getDeliveryByCustomerId(int id) {
+            throw new AssertionError("This method should not be called.");
+        };
+
         @Override
         public boolean hasDelivery(Delivery delivery) {
             throw new AssertionError("This method should not be called.");

src/test/java/seedu/address/logic/commands/customer/CustomerEditCommandTest.java

@@ -49,11 +49,13 @@ public void execute_allFieldsSpecifiedUnfilteredList_success() {
 
         System.out.println(editedCustomer);
         System.out.println(editCommand);
+        System.out.println(expectedMessage);
 
         Model expectedModel = new ModelManager(new AddressBook(model.getAddressBook()),
                 new DeliveryBook(model.getDeliveryBook()),
                 new UserPrefs(), model.getUserLoginStatus());
         expectedModel.setCustomer(model.getFilteredCustomerList().get(0), editedCustomer);
+        CustomerEditCommand.updateDelivery(expectedModel, editedCustomer);
 
         assertCommandSuccess(editCommand, model, expectedMessage, expectedModel, true);
     }
@@ -77,6 +79,7 @@ public void execute_someFieldsSpecifiedUnfilteredList_success() {
                 new DeliveryBook(model.getDeliveryBook()),
                 new UserPrefs(), model.getUserLoginStatus());
         expectedModel.setCustomer(lastCustomer, editedCustomer);
+        CustomerEditCommand.updateDelivery(expectedModel, editedCustomer);
 
         assertCommandSuccess(editCommand, model, expectedMessage, expectedModel, true);
     }
@@ -117,6 +120,7 @@ public void execute_filteredList_success() {
                 new DeliveryBook(model.getDeliveryBook()),
                 new UserPrefs(), model.getUserLoginStatus());
         expectedModel.setCustomer(model.getFilteredCustomerList().get(0), editedCustomer);
+        CustomerEditCommand.updateDelivery(expectedModel, editedCustomer);
 
         assertCommandSuccess(editCommand, model, expectedMessage, expectedModel, true);
     }