Merge pull request #126 from ktzy0305/docs-UserGuide

Bug Fix: RSVP
AY2324S1-CS2103-F13-3 · Nov 3, 2023 · 103f576 · 103f576
2 parents b002310 + a6016f0
commit 103f576
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/main/java/seedu/address/logic/commands/DeleteCommand.java b/src/main/java/seedu/address/logic/commands/DeleteCommand.java
@@ -12,6 +12,7 @@
 import seedu.address.model.Model;
 import seedu.address.model.event.Event;
 import seedu.address.model.person.Person;
+import seedu.address.model.rsvp.Rsvp;
 
 /**
  * Deletes a person identified using it's displayed index from the address book.
@@ -45,7 +46,7 @@ public CommandResult execute(Model model) throws CommandException {
         Person personToDelete = lastShownList.get(targetIndex.getZeroBased());
         model.deletePerson(personToDelete);
 
-        // Check if event contains vendorToDelete, if true, remove vendor from the event's vendor list
+        // Check if event contains person, if true, remove person from the event's vendor list
         for (Event event : model.getAddressBook().getEventList()) {
             if (event.getPersons().contains(personToDelete)) {
                 List<Person> editedPersonList = new ArrayList<>(event.getPersons());
@@ -54,6 +55,13 @@ public CommandResult execute(Model model) throws CommandException {
                         event.getFromDate(), event.getToDate(), event.getNote(), editedPersonList,
                         event.getVendors(), event.getVenue());
                 model.setEvent(event, updatedEvent);
+
+                // Find the Rsvp object to remove
+                Rsvp existingRsvp = model.findRsvp(event, personToDelete);
+
+                if (existingRsvp != null) {
+                    model.deleteRsvp(existingRsvp);
+                }
             }
         }
 

diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java
@@ -154,7 +154,7 @@ public void addPerson(Person person) {
 
     @Override
     public Person getPerson(Index index) throws CommandException {
-        if (index.getZeroBased() > addressBook.getPersonList().size()) {
+        if (index.getZeroBased() >= addressBook.getPersonList().size()) {
             throw new CommandException(Messages.MESSAGE_INVALID_PERSON_DISPLAYED_INDEX);
         }
         filteredPersons.setPredicate(PREDICATE_SHOW_ALL_PERSONS);
@@ -204,7 +204,7 @@ public Venue getVenue(Index index) throws CommandException {
             return null;
         }
 
-        if (index.getZeroBased() > addressBook.getVenueList().size()) {
+        if (index.getZeroBased() >= addressBook.getVenueList().size()) {
             throw new CommandException(Messages.MESSAGE_INVALID_VENUE_DISPLAYED_INDEX);
         }
 
@@ -302,7 +302,7 @@ public void setVendor(Vendor target, Vendor editedVendor) {
 
     @Override
     public Vendor getVendor(Index index) throws CommandException {
-        if (index.getZeroBased() > addressBook.getVendorList().size()) {
+        if (index.getZeroBased() >= addressBook.getVendorList().size()) {
             throw new CommandException(Messages.MESSAGE_INVALID_VENDOR_DISPLAYED_INDEX);
         }
         filteredVendors.setPredicate(PREDICATE_SHOW_ALL_VENDOR);