Merge pull request #132 from alfaloo/debug

Bug fix

Author: Alteqa

src/main/java/seedu/address/logic/parser/ParserUtil.java

@@ -188,9 +188,10 @@ public static Set<Tag> parseTags(Collection<String> tags) throws ParseException
     public static AppointmentDateTime parseAppointmentDateTime(String apptDateTime) throws ParseException {
         requireNonNull(apptDateTime);
         String trimmedDate = apptDateTime.trim();
-        if (!AppointmentDateTime.isValidDate(trimmedDate)) {
+        String datetime = trimmedDate.substring(0, 11) + trimmedDate.substring(11).strip();
+        if (!AppointmentDateTime.isValidDate(datetime)) {
             throw new ParseException(AppointmentDateTime.MESSAGE_CONSTRAINTS);
         }
-        return new AppointmentDateTime(trimmedDate);
+        return new AppointmentDateTime(datetime);
     }
 }

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

@@ -14,7 +14,7 @@
 public class UserPrefs implements ReadOnlyUserPrefs {
 
     private GuiSettings guiSettings = new GuiSettings();
-    private Path addressBookFilePath = Paths.get("data" , "medicli.json");
+    private Path addressBookFilePath = Paths.get("data" , "addressbook.json");
 
     /**
      * Creates a {@code UserPrefs} with default values.

src/main/java/seedu/address/storage/JsonAdaptedAppointment.java

@@ -41,7 +41,7 @@ public JsonAdaptedAppointment(@JsonProperty("doctorNric") String doctorNric,
     public JsonAdaptedAppointment(Appointment source) {
         doctorNric = source.getDoctorNric().toString();
         patientNric = source.getPatientNric().toString();
-        appointmentDateTime = source.getAppointmentDateTime().appointmentDateTime.toString();
+        appointmentDateTime = source.getAppointmentDateTime().toString();
         appointmentId = source.getAppointmentId().toString();
     }
 

src/test/data/JsonUserPrefsStorageTest/ExtraValuesUserPref.json

@@ -9,5 +9,5 @@
       "z" : 99
     }
   },
-  "addressBookFilePath" : "medicli.json"
+  "addressBookFilePath" : "addressbook.json"
 }

src/test/data/JsonUserPrefsStorageTest/TypicalUserPref.json

@@ -7,5 +7,5 @@
       "y" : 100
     }
   },
-  "addressBookFilePath" : "medicli.json"
+  "addressBookFilePath" : "addressbook.json"
 }

src/test/java/seedu/address/logic/LogicManagerTest.java

@@ -50,7 +50,7 @@ public class LogicManagerTest {
     @BeforeEach
     public void setUp() {
         JsonAddressBookStorage addressBookStorage =
-                new JsonAddressBookStorage(temporaryFolder.resolve("mediCli.json"));
+                new JsonAddressBookStorage(temporaryFolder.resolve("addressbook.json"));
         JsonUserPrefsStorage userPrefsStorage = new JsonUserPrefsStorage(temporaryFolder.resolve("userPrefs.json"));
         StorageManager storage = new StorageManager(addressBookStorage, userPrefsStorage);
         logic = new LogicManager(model, storage);

src/test/java/seedu/address/storage/JsonAdaptedAppointmentTest.java

@@ -25,7 +25,7 @@ public class JsonAdaptedAppointmentTest {
     private static final String VALID_NRIC_1 = APPOINTMENT_1.getPatientNric().toString();
     private static final String VALID_NRIC_2 = APPOINTMENT_1.getDoctorNric().toString();
     private static final String VALID_DATE_A = APPOINTMENT_1.getAppointmentDateTime().toString();
-    private static final String VALID_DATE_B = APPOINTMENT_1.getAppointmentDateTime().appointmentDateTime.toString();
+    private static final String VALID_DATE_B = APPOINTMENT_1.getAppointmentDateTime().toString();
     private static final String VALID_APPOINTMENT_ID = APPOINTMENT_1.getAppointmentId().toString();
 
     /**

src/test/java/seedu/address/storage/JsonUserPrefsStorageTest.java

@@ -73,7 +73,7 @@ public void readUserPrefs_extraValuesInFile_extraValuesIgnored() throws DataLoad
     private UserPrefs getTypicalUserPrefs() {
         UserPrefs userPrefs = new UserPrefs();
         userPrefs.setGuiSettings(new GuiSettings(1000, 500, 300, 100));
-        userPrefs.setAddressBookFilePath(Paths.get("medicli.json"));
+        userPrefs.setAddressBookFilePath(Paths.get("addressbook.json"));
         return userPrefs;
     }