Add method to check for personId existing in address book

AY2425S1-CS2103T-W10-2 · Nov 6, 2024 · ecef01f · ecef01f
1 parent 5b5fca9
commit ecef01f
Show file tree

Hide file tree

Showing 13 changed files with 95 additions and 7 deletions.
diff --git a/src/main/java/seedu/address/logic/commands/AddAppointmentCommand.java b/src/main/java/seedu/address/logic/commands/AddAppointmentCommand.java
@@ -62,7 +62,22 @@ public AddAppointmentCommand(AppointmentDescriptor appointmentDescriptor, int pe
      */
     @Override
     protected boolean alreadyExists(Model model) {
-        return model.hasAppointment(appointmentDescriptor);
+        return model.hasAppointment(appointmentDescriptor) && checkPersonIdExists(model);
+    }
+
+    /**
+     * Gets the person and throws exception if it does not exist.
+     */
+    protected Person getPerson(Model model) throws CommandException {
+        Optional<Person> personOptional = model.findPerson(personId);
+        return personOptional.orElseThrow(() -> new CommandException(getPersonIdDoesNotExistMessage()));
+    }
+
+    /**
+     * Checks if personId exists inside model
+     */
+    protected boolean checkPersonIdExists(Model model) {
+        return model.hasPersonWithPersonId(personId);
     }
 
     /**
@@ -73,11 +88,7 @@ protected boolean alreadyExists(Model model) {
      */
     @Override
     protected void addEntity(Model model) throws CommandException {
-        Optional<Person> personOptional = model.findPerson(personId);
-        if (personOptional.isEmpty()) {
-            throw new CommandException(getPersonIdDoesNotExistMessage());
-        }
-        model.addAppointment(personOptional.get(), appointmentDescriptor);
+        model.addAppointment(getPerson(model), appointmentDescriptor);
     }
 
     /**

diff --git a/src/main/java/seedu/address/model/AddressBook.java b/src/main/java/seedu/address/model/AddressBook.java
@@ -89,7 +89,6 @@ public boolean hasPerson(PersonDescriptor personDescriptor) {
         return persons.contains(personDescriptor);
     }
 
-
     /**
      * Adds a person to the address book.
      * The person must not already exist in the address book.
@@ -134,6 +133,11 @@ public Optional<Person> findPerson(int personId) {
         return persons.findPerson(personId);
     }
 
+    @Override
+    public boolean hasPersonWithPersonId(int personId) {
+        return persons.hasPersonWithPersonId(personId);
+    }
+
     //// util methods
 
     @Override

diff --git a/src/main/java/seedu/address/model/Model.java b/src/main/java/seedu/address/model/Model.java
@@ -74,6 +74,11 @@ public interface Model {
      */
     Optional<Person> findPerson(int personId);
 
+    /**
+     * Checks if the model has a person with the personId
+     */
+    boolean hasPersonWithPersonId(int personId);
+
     /**
      * Deletes the given person.
      * The person must exist in the address book.

diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java
@@ -139,6 +139,11 @@ public Optional<Person> findPerson(int personId) {
         return addressBook.findPerson(personId);
     }
 
+    @Override
+    public boolean hasPersonWithPersonId(int personId) {
+        return addressBook.hasPersonWithPersonId(personId);
+    }
+
     @Override
     public Person addPerson(PersonDescriptor personDescriptor) {
         Person person = addressBook.addPerson(personDescriptor);

diff --git a/src/main/java/seedu/address/model/ReadOnlyAddressBook.java b/src/main/java/seedu/address/model/ReadOnlyAddressBook.java
@@ -22,6 +22,11 @@ public interface ReadOnlyAddressBook {
      */
     Optional<Person> findPerson(int personId);
 
+    /**
+     * Returns true if personId exists in the person observable list
+     */
+    boolean hasPersonWithPersonId(int personId);
+
     /**
      * Returns the next person ID
      */

diff --git a/src/main/java/seedu/address/model/person/UniquePersonList.java b/src/main/java/seedu/address/model/person/UniquePersonList.java
@@ -114,6 +114,15 @@ public Optional<Person> findPerson(int personId) {
                 .filter(person -> person.getPersonId() == personId)
                 .findFirst();
     }
+
+    /**
+     * Finds the person with corresponding person ID, if exists.
+     */
+    public boolean hasPersonWithPersonId(int personId) {
+        return internalList.stream()
+            .anyMatch(person -> person.getPersonId() == personId);
+    }
+
     /**
      * Returns the backing list as an unmodifiable {@code ObservableList}.
      */

diff --git a/src/test/java/seedu/address/logic/commands/AddAppointmentCommandTest.java b/src/test/java/seedu/address/logic/commands/AddAppointmentCommandTest.java
@@ -213,6 +213,11 @@ public Optional<Person> findPerson(int personId) {
             return Optional.of(BENSON_P);
         }
 
+        @Override
+        public boolean hasPersonWithPersonId(int personId) {
+            return true;
+        }
+
         @Override
         public void deleteAppointment(Appointment target) {
             throw new AssertionError("This method should not be called.");

diff --git a/src/test/java/seedu/address/logic/commands/AddPersonCommandTest.java b/src/test/java/seedu/address/logic/commands/AddPersonCommandTest.java
@@ -204,6 +204,11 @@ public Optional<Person> findPerson(int personId) {
             throw new AssertionError("This method should not be called.");
         }
 
+        @Override
+        public boolean hasPersonWithPersonId(int personId) {
+            throw new AssertionError("This method should not be called.");
+        }
+
         @Override
         public void deleteAppointment(Appointment target) {
             throw new AssertionError("This method should not be called.");

diff --git a/src/test/java/seedu/address/model/AddressBookTest.java b/src/test/java/seedu/address/model/AddressBookTest.java
@@ -114,6 +114,12 @@ public Optional<Person> findPerson(int personId) {
                           .findFirst();
         }
 
+        @Override
+        public boolean hasPersonWithPersonId(int personId) {
+            return persons.stream()
+                          .anyMatch(person -> person.getPersonId() == personId);
+        }
+
         @Override
         public int getNextPersonId() {
             return persons.size();

diff --git a/src/test/java/seedu/address/model/ModelManagerTest.java b/src/test/java/seedu/address/model/ModelManagerTest.java
@@ -92,6 +92,21 @@ public void hasPerson_personInAddressBook_returnsTrue() {
         assertTrue(modelManager.hasPerson(ALICE));
     }
 
+    @Test
+    public void hasPersonWithPersonId_returnsFalse() {
+        // EP: invalid personId value
+        assertFalse(modelManager.hasPersonWithPersonId(-1));
+        // EP: personId not existing in book
+        assertFalse(modelManager.hasPersonWithPersonId(1000));
+    }
+
+    @Test
+    public void hasPersonWithPersonId_returnsTrue() {
+        // EP: has person inside
+        modelManager.addPerson(ALICE);
+        assertTrue(modelManager.hasPersonWithPersonId(0));
+    }
+
     @Test
     public void getFilteredPersonList_modifyList_throwsUnsupportedOperationException() {
         assertThrows(UnsupportedOperationException.class, () -> modelManager.getFilteredPersonList().remove(0));

diff --git a/src/test/java/seedu/address/storage/JsonAdaptedAppointmentTest.java b/src/test/java/seedu/address/storage/JsonAdaptedAppointmentTest.java
@@ -159,6 +159,12 @@ public Optional<Person> findPerson(int personId) {
                     .findFirst();
         }
 
+        @Override
+        public boolean hasPersonWithPersonId(int personId) {
+            return persons.stream()
+                .anyMatch(person -> person.getPersonId() == personId);
+        }
+
         @Override
         public int getNextPersonId() {
             return persons.size();

diff --git a/src/test/java/seedu/address/storage/JsonAppointmentBookStorageTest.java b/src/test/java/seedu/address/storage/JsonAppointmentBookStorageTest.java
@@ -110,6 +110,12 @@ public Optional<Person> findPerson(int personId) {
                           .findFirst();
         }
 
+        @Override
+        public boolean hasPersonWithPersonId(int personId) {
+            return persons.stream()
+                .anyMatch(person -> person.getPersonId() == personId);
+        }
+
         @Override
         public int getNextPersonId() {
             return persons.size();

diff --git a/src/test/java/seedu/address/storage/JsonSerializableAppointmentBookTest.java b/src/test/java/seedu/address/storage/JsonSerializableAppointmentBookTest.java
@@ -105,6 +105,12 @@ public Optional<Person> findPerson(int personId) {
                           .findFirst();
         }
 
+        @Override
+        public boolean hasPersonWithPersonId(int personId) {
+            return persons.stream()
+                .anyMatch(person -> person.getPersonId() == personId);
+        }
+
         @Override
         public int getNextPersonId() {
             return persons.size();