Merge pull request #85 from Kappaccinoh/delete-appointment-recursively

Delete appointment recursively

Author: ararchch

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

@@ -21,6 +21,7 @@ public class DeleteCommand extends Command {
 
     public static final String MESSAGE_USAGE = COMMAND_WORD
             + ": Deletes the person identified by the index number used in the displayed person list.\n"
+            + "*Note that this also deletes all appointments associated with the person in the appointments list"
             + "Parameters: INDEX (must be a positive integer)\n"
             + "Example: " + COMMAND_WORD + " 1";
 

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

@@ -126,13 +126,20 @@ public void setAppointment(Appointment target, Appointment editedAppointment) {
     }
 
     /**
-     * Removes {@code key} from this {@code AddressBook}.
+     * Removes {@code key} from this {@code AddressBook} and removes all appointments
+     * which involve Person {@code key}, both patient and doctor.
      * {@code key} must exist in the address book.
      */
     public void removePerson(Person key) {
+        List<Appointment> appointmentsToDelete = getAppointmentByPerson(key);
+        appointmentsToDelete.forEach(appointments::remove);
         persons.remove(key);
     }
 
+    public List<Appointment> getAppointmentByPerson(Person person) {
+        return appointments.contains(person);
+    }
+
     public void addAppointment(Appointment appointment) {
         appointments.add(appointment);
     }

src/main/java/seedu/address/model/appointment/Appointment.java

@@ -7,6 +7,7 @@
 
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.model.person.Nric;
+import seedu.address.model.person.Person;
 
 /**
  * Appointment class that describes an appointment
@@ -68,7 +69,7 @@ public Appointment(Nric doctorNric, Nric patientNric, AppointmentDate appointmen
      * @param appointmentDate Date to check validity of
      * @return boolean if appointment is valid or not
      */
-    private boolean isValidAppointment(AppointmentDate appointmentDate) {
+    public boolean isValidAppointment(AppointmentDate appointmentDate) {
         AppointmentDate currentDate = new AppointmentDate(LocalDate.now());
         return appointmentDate.compareTo(currentDate) > -1;
     }
@@ -117,6 +118,18 @@ public boolean isSameAppointment(Appointment appt) {
                 && appt.getAppointmentDate().equals(this.getAppointmentDate());
     }
 
+    /**
+     * Checks if the given {@code Person} is associated with this appointment either as a doctor or a patient.
+     *
+     * @param person The {@code Person} to check if associated with this appointment.
+     * @return {@code true} if the person's NRIC matches either the doctor's NRIC or the patient's NRIC,
+     *         {@code false} otherwise.
+     */
+    public boolean appointmentContainsPerson(Person person) {
+        return person.getNric().equals(this.doctorNric)
+                || person.getNric().equals(this.patientNric);
+    }
+
     @Override
     public boolean equals(Object appt) {
         if (appt == this) {

src/main/java/seedu/address/model/appointment/UniqueAppointmentList.java

@@ -5,11 +5,13 @@
 
 import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import seedu.address.model.appointment.exceptions.AppointmentNotFoundException;
 import seedu.address.model.appointment.exceptions.DuplicateAppointmentException;
+import seedu.address.model.person.Person;
 
 /**
  * A list of appointments that enforces uniqueness between its elements and does not allow nulls.
@@ -29,16 +31,28 @@ public class UniqueAppointmentList implements Iterable<Appointment> {
             FXCollections.unmodifiableObservableList(internalList);
 
     /**
-     * Returns true if the list contains an equivalent person as the given argument.
+     * Returns true if the list contains an equivalent appointment as the given argument.
      */
     public boolean contains(Appointment toCheck) {
         requireNonNull(toCheck);
         return internalList.stream().anyMatch(toCheck::isSameAppointment);
     }
 
     /**
-     * Adds a person to the list.
-     * The person must not already exist in the list.
+     * Returns a list of appointments if the appointment contains the person. Checked via person's NRIC
+     * @param person target person
+     * @return list of appointments
+     */
+    public List<Appointment> contains(Person person) {
+        requireNonNull(person);
+        return internalList.stream()
+                .filter(appointment -> appointment.appointmentContainsPerson(person))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * Adds an appointment to the list.
+     * The appointment must not already exist in the list.
      */
     public void add(Appointment toAdd) {
         requireNonNull(toAdd);
@@ -49,9 +63,10 @@ public void add(Appointment toAdd) {
     }
 
     /**
-     * Replaces the person {@code target} in the list with {@code editedPerson}.
+     * Replaces the appointment {@code target} in the list with {@code editedAppointment}.
      * {@code target} must exist in the list.
-     * The person identity of {@code editedPerson} must not be the same as another existing person in the list.
+     * The appointment details of {@code editedAppointment} must not be the same as another
+     * existing appointment in the list.
      */
     public void setAppointment(Appointment target, Appointment editedAppointment) {
         requireAllNonNull(target, editedAppointment);
@@ -69,8 +84,8 @@ public void setAppointment(Appointment target, Appointment editedAppointment) {
     }
 
     /**
-     * Removes the equivalent person from the list.
-     * The person must exist in the list.
+     * Removes the equivalent appointment from the list.
+     * The appointment must exist in the list.
      */
     public void remove(Appointment toRemove) {
         requireNonNull(toRemove);
@@ -85,8 +100,8 @@ public void setPersons(UniqueAppointmentList replacement) {
     }
 
     /**
-     * Replaces the contents of this list with {@code persons}.
-     * {@code persons} must not contain duplicate persons.
+     * Replaces the contents of this list with {@code appointments}.
+     * {@code appointments} must not contain duplicate appointments.
      */
     public void setAppointments(List<Appointment> appointments) {
         requireAllNonNull(appointments);
@@ -135,7 +150,7 @@ public String toString() {
     }
 
     /**
-     * Returns true if {@code persons} contains only unique persons.
+     * Returns true if {@code appointments} contains only unique appointments.
      */
     private boolean appointmentsAreUnique(List<Appointment> appointments) {
         for (int i = 0; i < appointments.size() - 1; i++) {

src/test/java/seedu/address/model/appointment/AppointmentTest.java

@@ -1,30 +1,118 @@
 package seedu.address.model.appointment;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.time.LocalDate;
+
 import org.junit.jupiter.api.Test;
 
+import seedu.address.model.person.Nric;
+import seedu.address.model.person.Person;
+import seedu.address.testutil.DoctorBuilder;
+import seedu.address.testutil.PatientBuilder;
+
 class AppointmentTest {
 
     @Test
-    void getDoctoNric() {
+    void getDoctorNric() {
+        Nric doctorNric = new Nric("S1234567A");
+        Appointment appointment = new Appointment(doctorNric, new Nric("T1234567A"),
+                new AppointmentDate(LocalDate.now()));
+        assertEquals(doctorNric, appointment.getDoctorNric());
     }
 
     @Test
     void getPatientNric() {
+        Nric patientNric = new Nric("T1234567A");
+        Appointment appointment = new Appointment(new Nric("S1234567A"), patientNric,
+                new AppointmentDate(LocalDate.now()));
+        assertEquals(patientNric, appointment.getPatientNric());
     }
 
     @Test
     void getAppointmentId() {
+        AppointmentId appointmentId = new AppointmentId();
+        Appointment appointment = new Appointment(new Nric("S1234567A"), new Nric("T1234567A"),
+                new AppointmentDate(LocalDate.now()), appointmentId);
+        assertEquals(appointmentId, appointment.getAppointmentId());
     }
 
     @Test
     void getAppointmentDate() {
+        AppointmentDate appointmentDate = new AppointmentDate(LocalDate.now());
+        Appointment appointment = new Appointment(new Nric("S1234567A"), new Nric("T1234567A"), appointmentDate);
+        assertEquals(appointmentDate, appointment.getAppointmentDate());
+    }
+
+    @Test
+    void isValidAppointment_validDate_returnsTrue() {
+        AppointmentDate futureDate = new AppointmentDate(LocalDate.now().plusDays(1));
+        Appointment appointment = new Appointment(new Nric("S1234567A"), new Nric("T1234567A"), futureDate);
+
+        assertTrue(appointment.isValidAppointment(futureDate));
+    }
+
+    @Test
+    void isValidAppointment_pastDate_returnsFalse() {
+        AppointmentDate pastDate = new AppointmentDate(LocalDate.now().minusDays(1));
+        // Use assertThrows to check if IllegalArgumentException is thrown
+        assertThrows(IllegalArgumentException.class, () -> {
+            new Appointment(new Nric("S1234567A"), new Nric("T1234567A"), pastDate);
+        });
     }
 
     @Test
     void isSameAppointment() {
+        Nric doctorNric = new Nric("S1234567A");
+        Nric patientNric = new Nric("T1234567A");
+        AppointmentDate appointmentDate = new AppointmentDate(LocalDate.now());
+        Appointment appointment1 = new Appointment(doctorNric, patientNric, appointmentDate);
+        Appointment appointment2 = new Appointment(doctorNric, patientNric, appointmentDate);
+        assertTrue(appointment1.isSameAppointment(appointment2));
+    }
+
+    @Test
+    void appointmentContainsPerson() {
+        Nric doctorNric = new Nric("S1234567A");
+        Nric patientNric = new Nric("T1234567A");
+        AppointmentDate appointmentDate = new AppointmentDate(LocalDate.now());
+        Appointment appointment = new Appointment(doctorNric, patientNric, appointmentDate);
+
+        // False Doctor and Patient
+        Person doctor = new DoctorBuilder().withNric("S7654321A").build();
+        Person patient = new PatientBuilder().withNric("T7654321A").build();
+        assertFalse(appointment.appointmentContainsPerson(doctor));
+        assertFalse(appointment.appointmentContainsPerson(patient));
+
+        // True Doctor and Patient
+        doctor = new DoctorBuilder().withNric("S1234567A").build();
+        patient = new PatientBuilder().withNric("T1234567A").build();
+        assertTrue(appointment.appointmentContainsPerson(doctor));
+        assertTrue(appointment.appointmentContainsPerson(patient));
+    }
+
+    @Test
+    void testEquals() {
+        Nric doctorNric = new Nric("S1234567A");
+        Nric patientNric = new Nric("T1234567A");
+        AppointmentDate appointmentDate = new AppointmentDate(LocalDate.now());
+        Appointment appointment1 = new Appointment(doctorNric, patientNric, appointmentDate);
+        Appointment appointment2 = new Appointment(doctorNric, patientNric, appointmentDate);
+        assertEquals(appointment1, appointment2);
     }
 
     @Test
     void testToString() {
+        Nric doctorNric = new Nric("S1234567A");
+        Nric patientNric = new Nric("T1234567A");
+        AppointmentDate appointmentDate = new AppointmentDate(LocalDate.now());
+        AppointmentId appointmentId = new AppointmentId();
+        Appointment appointment = new Appointment(doctorNric, patientNric, appointmentDate, appointmentId);
+        String expectedString = "seedu.address.model.appointment.Appointment{Date=" + appointmentDate + ", Doctor="
+                + doctorNric + ", Patient=" + patientNric + ", Id=" + appointmentId + "}";
+        assertEquals(expectedString, appointment.toString());
     }
 }

src/test/java/seedu/address/model/appointment/UniqueAppointmentListTest.java

@@ -24,7 +24,7 @@ public class UniqueAppointmentListTest {
 
     @Test
     public void contains_nullAppointment_throwsNullPointerException() {
-        assertThrows(NullPointerException.class, () -> uniqueAppointmentList.contains(null));
+        assertThrows(NullPointerException.class, () -> uniqueAppointmentList.contains((Appointment) null));
     }
 
     @Test