Merge branch 'master' into enable-assertions

Author: chrystalquek

src/main/java/seedu/address/logic/commands/deliverable/EditCommand.java

@@ -104,10 +104,13 @@ private static Deliverable createEditedDeliverable(
 
         Deadline updatedDeadline = editDeliverableDescriptor.getDeadline().orElse(deliverableToEdit.getDeadline());
 
+        boolean updatedIsComplete = deliverableToEdit.getIsComplete();
+
         // Contacts takes optional String
         Contacts updatedContacts = editDeliverableDescriptor.getContacts().orElse(deliverableToEdit.getContacts());
 
-        return new Deliverable(updatedTitle, updatedMilestone, updatedDesc, updatedDeadline, updatedContacts);
+        return new Deliverable(
+                updatedTitle, updatedMilestone, updatedDesc, updatedDeadline, updatedIsComplete, updatedContacts);
     }
 
     @Override
@@ -137,6 +140,7 @@ public static class EditDeliverableDescriptor {
         private Milestone milestone;
         private OptionalDescription description;
         private Deadline deadline;
+        private boolean isComplete;
         private Contacts contacts;
 
         public EditDeliverableDescriptor() {
@@ -152,6 +156,7 @@ public EditDeliverableDescriptor(EditDeliverableDescriptor toCopy) {
             setMilestone(toCopy.milestone);
             setDescription(toCopy.description);
             setDeadline(toCopy.deadline);
+            setIsComplete(toCopy.isComplete);
             setContacts(toCopy.contacts);
         }
 
@@ -194,6 +199,14 @@ public Optional<Deadline> getDeadline() {
             return Optional.ofNullable(deadline);
         }
 
+        public void setIsComplete(boolean isComplete) {
+            this.isComplete = isComplete;
+        }
+
+        public Optional<Boolean> getIsComplete() {
+            return Optional.ofNullable(this.isComplete);
+        }
+
         public void setContacts(Contacts contact) {
             this.contacts = contact;
         }
@@ -222,6 +235,7 @@ public boolean equals(Object other) {
                     && getMilestone().equals(e.getMilestone())
                     && getDescription().equals(e.getDescription())
                     && getDeadline().equals(e.getDeadline())
+                    && getIsComplete().equals(e.getIsComplete())
                     && getContacts().equals(e.getContacts());
         }