fix: update TypicalVisits and ModelManager not updating visitList

NatLeong · Apr 13, 2024 · 09cd23c · 09cd23c
1 parent 4fead52
commit 09cd23c
Show file tree

Hide file tree

Showing 18 changed files with 42 additions and 40 deletions.
diff --git a/src/main/java/seedu/address/model/ImmuniMate.java b/src/main/java/seedu/address/model/ImmuniMate.java
@@ -71,6 +71,7 @@ public void resetData(ReadOnlyImmuniMate newData) {
         requireNonNull(newData);
 
         setPersons(newData.getPersonList());
+        setVisits(newData.getVisitList());
     }
 
     //// person-level operations

diff --git a/src/main/java/seedu/address/model/ModelManager.java b/src/main/java/seedu/address/model/ModelManager.java
@@ -35,8 +35,9 @@ public ModelManager(ReadOnlyImmuniMate immuniMate, ReadOnlyUserPrefs userPrefs)
 
         this.immuniMate = new ImmuniMate(immuniMate);
         this.userPrefs = new UserPrefs(userPrefs);
-        filteredPersons = new FilteredList<>(this.immuniMate.getPersonList());
         filteredVisits = new FilteredList<>(this.immuniMate.getVisitList());
+        filteredPersons = new FilteredList<>(this.immuniMate.getPersonList());
+
     }
 
     public ModelManager() {

diff --git a/src/test/java/seedu/address/logic/commands/AddVisitCommandIntegrationTest.java b/src/test/java/seedu/address/logic/commands/AddVisitCommandIntegrationTest.java
@@ -2,7 +2,7 @@
 
 import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
 import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalPersons.getTypicalPersonsAddressBook;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -23,7 +23,7 @@ public class AddVisitCommandIntegrationTest {
 
     @BeforeEach
     public void setUp() {
-        model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+        model = new ModelManager(getTypicalPersonsAddressBook(), new UserPrefs());
     }
 
     @Test

diff --git a/src/test/java/seedu/address/logic/commands/CheckCommandTest.java b/src/test/java/seedu/address/logic/commands/CheckCommandTest.java
@@ -18,17 +18,17 @@
 import seedu.address.model.UserPrefs;
 import seedu.address.model.person.Nric;
 import seedu.address.model.person.NricContainsKeywordsPredicate;
-import seedu.address.model.visit.Visit;
 import seedu.address.model.visit.VisitContainsNricPredicate;
 import seedu.address.testutil.TypicalVisits;
 
 public class CheckCommandTest {
 
-    private final Model model = new ModelManager(TypicalVisits.getTypicalVisitAddressBook(), new UserPrefs());
-    private final Model expectedModel = new ModelManager(TypicalVisits.getTypicalVisitAddressBook(), new UserPrefs());
-
+    private final Model model = new ModelManager(TypicalVisits.getTypicalCombinedAddressBook(), new UserPrefs());
+    private final Model expectedModel = new ModelManager(
+        TypicalVisits.getTypicalCombinedAddressBook(), new UserPrefs());
     @Test
     void execute_validVisitNric_success() {
+
         StringBuilder stringBuilder = new StringBuilder();
         stringBuilder.append(ALICE.getName()).append(" (NRIC: ").append(VISIT_ALICE.getNric()).append("):\n");
         stringBuilder.append(Messages.formatCheck(VISIT_ALICE)).append("\n");

diff --git a/src/test/java/seedu/address/logic/commands/ClearCommandTest.java b/src/test/java/seedu/address/logic/commands/ClearCommandTest.java
@@ -1,7 +1,7 @@
 package seedu.address.logic.commands;
 
 import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalPersons.getTypicalPersonsAddressBook;
 
 import org.junit.jupiter.api.Test;
 
@@ -22,8 +22,8 @@ public void execute_emptyAddressBook_success() {
 
     @Test
     public void execute_nonEmptyAddressBook_success() {
-        Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
-        Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+        Model model = new ModelManager(getTypicalPersonsAddressBook(), new UserPrefs());
+        Model expectedModel = new ModelManager(getTypicalPersonsAddressBook(), new UserPrefs());
         expectedModel.setImmuniMate(new ImmuniMate());
 
         assertCommandSuccess(new ClearCommand(), model, ClearCommand.MESSAGE_SUCCESS, expectedModel);

diff --git a/src/test/java/seedu/address/logic/commands/CreateCommandIntegrationTest.java b/src/test/java/seedu/address/logic/commands/CreateCommandIntegrationTest.java
@@ -2,7 +2,7 @@
 
 import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
 import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalPersons.getTypicalPersonsAddressBook;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -23,7 +23,7 @@ public class CreateCommandIntegrationTest {
 
     @BeforeEach
     public void setUp() {
-        model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+        model = new ModelManager(getTypicalPersonsAddressBook(), new UserPrefs());
     }
 
     @Test

diff --git a/src/test/java/seedu/address/logic/commands/DeleteCommandTest.java b/src/test/java/seedu/address/logic/commands/DeleteCommandTest.java
@@ -9,7 +9,7 @@
 import static seedu.address.logic.commands.CommandTestUtil.showPersonWithNric;
 import static seedu.address.testutil.TypicalPersons.ALICE;
 import static seedu.address.testutil.TypicalPersons.BOB;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalPersons.getTypicalPersonsAddressBook;
 
 import org.junit.jupiter.api.Test;
 
@@ -26,7 +26,7 @@
  */
 public class DeleteCommandTest {
 
-    private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+    private Model model = new ModelManager(getTypicalPersonsAddressBook(), new UserPrefs());
 
     @Test
     public void execute_validNricUnfilteredList_success() {

diff --git a/src/test/java/seedu/address/logic/commands/DeleteInfoCommandTest.java b/src/test/java/seedu/address/logic/commands/DeleteInfoCommandTest.java
@@ -9,7 +9,7 @@
 import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
 import static seedu.address.testutil.Assert.assertThrows;
 import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalPersons.getTypicalPersonsAddressBook;
 
 import org.junit.jupiter.api.Test;
 
@@ -23,7 +23,7 @@
 
 
 public class DeleteInfoCommandTest {
-    private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+    private Model model = new ModelManager(getTypicalPersonsAddressBook(), new UserPrefs());
 
     @Test
     public void constructor_emptyInput_throwsException() {

diff --git a/src/test/java/seedu/address/logic/commands/FindCommandTest.java b/src/test/java/seedu/address/logic/commands/FindCommandTest.java
@@ -7,7 +7,7 @@
 import static seedu.address.testutil.TypicalPersons.CARL;
 import static seedu.address.testutil.TypicalPersons.ELLE;
 import static seedu.address.testutil.TypicalPersons.FIONA;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalPersons.getTypicalPersonsAddressBook;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -26,8 +26,8 @@
  */
 public class FindCommandTest {
 
-    private final Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
-    private final Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+    private final Model model = new ModelManager(getTypicalPersonsAddressBook(), new UserPrefs());
+    private final Model expectedModel = new ModelManager(getTypicalPersonsAddressBook(), new UserPrefs());
 
     @Test
     public void equals() {

diff --git a/src/test/java/seedu/address/logic/commands/ListCommandTest.java b/src/test/java/seedu/address/logic/commands/ListCommandTest.java
@@ -3,7 +3,7 @@
 import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
 import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
 import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalPersons.getTypicalPersonsAddressBook;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -22,7 +22,7 @@ public class ListCommandTest {
 
     @BeforeEach
     public void setUp() {
-        model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+        model = new ModelManager(getTypicalPersonsAddressBook(), new UserPrefs());
         expectedModel = new ModelManager(model.getImmuniMate(), new UserPrefs());
     }
 

diff --git a/src/test/java/seedu/address/logic/commands/ReadCommandTest.java b/src/test/java/seedu/address/logic/commands/ReadCommandTest.java
@@ -8,7 +8,7 @@
 import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
 import static seedu.address.logic.commands.ReadCommand.MESSAGE_READ_PERSON_SUCCESS;
 import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalPersons.getTypicalPersonsAddressBook;
 
 import org.junit.jupiter.api.Test;
 
@@ -21,8 +21,8 @@
 
 public class ReadCommandTest {
 
-    private final Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
-    private final Model expectedModel = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+    private final Model model = new ModelManager(getTypicalPersonsAddressBook(), new UserPrefs());
+    private final Model expectedModel = new ModelManager(getTypicalPersonsAddressBook(), new UserPrefs());
     @Test
     void execute_validNric_success() {
         String expectedMessage = String.format(MESSAGE_READ_PERSON_SUCCESS, Messages.format(ALICE));

diff --git a/src/test/java/seedu/address/logic/commands/UpdateCommandTest.java b/src/test/java/seedu/address/logic/commands/UpdateCommandTest.java
@@ -20,7 +20,7 @@
 import static seedu.address.logic.commands.CommandTestUtil.showPersonAtIndex;
 import static seedu.address.testutil.TypicalIndexes.INDEX_FIRST_PERSON;
 import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalPersons.getTypicalPersonsAddressBook;
 
 import org.junit.jupiter.api.Test;
 
@@ -41,7 +41,7 @@
  */
 public class UpdateCommandTest {
 
-    private Model model = new ModelManager(getTypicalAddressBook(), new UserPrefs());
+    private Model model = new ModelManager(getTypicalPersonsAddressBook(), new UserPrefs());
 
     @Test
     public void execute_allFieldsSpecifiedUnfilteredList_success() {

diff --git a/src/test/java/seedu/address/model/AddressBookTest.java b/src/test/java/seedu/address/model/AddressBookTest.java
@@ -6,7 +6,7 @@
 import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_BOB;
 import static seedu.address.testutil.Assert.assertThrows;
 import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalPersons.getTypicalPersonsAddressBook;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -38,7 +38,7 @@ public void resetData_null_throwsNullPointerException() {
 
     @Test
     public void resetData_withValidReadOnlyAddressBook_replacesData() {
-        ImmuniMate newData = getTypicalAddressBook();
+        ImmuniMate newData = getTypicalPersonsAddressBook();
         addressBook.resetData(newData);
         assertEquals(newData, addressBook);
     }

diff --git a/src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java b/src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java
@@ -6,7 +6,7 @@
 import static seedu.address.testutil.TypicalPersons.ALICE;
 import static seedu.address.testutil.TypicalPersons.HOON;
 import static seedu.address.testutil.TypicalPersons.IDA;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalPersons.getTypicalPersonsAddressBook;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -63,7 +63,7 @@ public void readAddressBook_invalidAndValidPersonAddressBook_throwDataLoadingExc
     @Test
     public void readAndSaveAddressBook_allInOrder_success() throws Exception {
         Path filePath = testFolder.resolve("TempAddressBook.json");
-        ImmuniMate original = getTypicalAddressBook();
+        ImmuniMate original = getTypicalPersonsAddressBook();
         JsonAddressBookStorage jsonAddressBookStorage = new JsonAddressBookStorage(filePath);
 
         // Save in new file and read back

diff --git a/src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java b/src/test/java/seedu/address/storage/JsonSerializableAddressBookTest.java
@@ -27,7 +27,7 @@ public void toModelType_typicalPersonsFile_success() throws Exception {
         JsonSerializableAddressBook dataFromFile = JsonUtil.readJsonFile(TYPICAL_PERSONS_FILE,
                 JsonSerializableAddressBook.class).get();
         ImmuniMate addressBookFromFile = dataFromFile.toModelType();
-        ImmuniMate typicalPersonsAddressBook = TypicalPersons.getTypicalAddressBook();
+        ImmuniMate typicalPersonsAddressBook = TypicalPersons.getTypicalPersonsAddressBook();
         assertEquals(addressBookFromFile, typicalPersonsAddressBook);
     }
 

diff --git a/src/test/java/seedu/address/storage/StorageManagerTest.java b/src/test/java/seedu/address/storage/StorageManagerTest.java
@@ -2,7 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalPersons.getTypicalPersonsAddressBook;
 
 import java.nio.file.Path;
 
@@ -54,7 +54,7 @@ public void addressBookReadSave() throws Exception {
          * {@link JsonAddressBookStorage} class.
          * More extensive testing of UserPref saving/reading is done in {@link JsonAddressBookStorageTest} class.
          */
-        ImmuniMate original = getTypicalAddressBook();
+        ImmuniMate original = getTypicalPersonsAddressBook();
         storageManager.saveAddressBook(original);
         ReadOnlyImmuniMate retrieved = storageManager.readAddressBook().get();
         assertEquals(original, new ImmuniMate(retrieved));

diff --git a/src/test/java/seedu/address/testutil/TypicalPersons.java b/src/test/java/seedu/address/testutil/TypicalPersons.java
@@ -96,7 +96,7 @@ private TypicalPersons() {} // prevents instantiation
     /**
      * Returns an {@code AddressBook} with all the typical persons.
      */
-    public static ImmuniMate getTypicalAddressBook() {
+    public static ImmuniMate getTypicalPersonsAddressBook() {
         ImmuniMate ab = new ImmuniMate();
         for (Person person : getTypicalPersons()) {
             ab.addPerson(person);

diff --git a/src/test/java/seedu/address/testutil/TypicalVisits.java b/src/test/java/seedu/address/testutil/TypicalVisits.java
@@ -41,8 +41,8 @@ public class TypicalVisits {
         .withSymptom("Fever, Headache, Nausea, Vomiting").withDiagnosis("Dengue").withStatus("UNWELL").build();
     public static final Visit VISIT_ALICE_3 = new VisitBuilder().withNric("T0139571B").withDateOfVisit("2024-03-23")
         .withSymptom("Dark Urine, Joint pain, Pale stool").withDiagnosis("Hepatitis B").withStatus("PENDING").build();
-    public static final Visit VISIT_BENSON_3 = new VisitBuilder().withNric("T0439571C").withDateOfVisit("2023-01-02").withSymptom("Headache")
-            .withDiagnosis("NIL").withStatus("HEALTHY").build();
+    public static final Visit VISIT_BENSON_3 = new VisitBuilder().withNric("T0439571C").withDateOfVisit("2023-01-02")
+        .withSymptom("Headache").withDiagnosis("NIL").withStatus("HEALTHY").build();
     public static final Visit VISIT_CARL_3 =
         new VisitBuilder().withNric("T0284994B").withDateOfVisit("2024-10-29").withSymptom("Slight Headache")
             .withDiagnosis("Recovered").withStatus("HEALTHY").build();
@@ -61,7 +61,7 @@ private TypicalVisits() {
     /**
      * Returns an {@code AddressBook} with all the typical visits.
      */
-    public ImmuniMate getTypicalAddressBook() {
+    public ImmuniMate getTypicalVisitsAddressBook() {
         ImmuniMate ab = new ImmuniMate();
         for (Visit visit : getTypicalVisits()) {
             ab.addVisit(visit);
@@ -72,8 +72,8 @@ public ImmuniMate getTypicalAddressBook() {
     /**
      * Returns an {@code AddressBook} with all the typical visits and typical persons.
      */
-    public static ImmuniMate getTypicalVisitAddressBook() {
-        ImmuniMate ab = TypicalPersons.getTypicalAddressBook();
+    public static ImmuniMate getTypicalCombinedAddressBook() {
+        ImmuniMate ab = TypicalPersons.getTypicalPersonsAddressBook();
         for (Visit visit : getTypicalVisits()) {
             ab.addVisit(visit);
         }
@@ -83,6 +83,6 @@ public static ImmuniMate getTypicalVisitAddressBook() {
     public static List<Visit> getTypicalVisits() {
         return new ArrayList<>(
             Arrays.asList(VISIT_ALICE, VISIT_ALICE_2, VISIT_ALICE_3, VISIT_BENSON, VISIT_BENSON_2, VISIT_BENSON_3,
-                VISIT_CARL, VISIT_CARL_2, VISIT_CARL_3, VISIT_AMY, VISIT_BOB));
+                VISIT_CARL, VISIT_CARL_2, VISIT_CARL_3));
     }
 }