Refactor Birthday parsing and fix inaccurate javadoc headers

AY2324S2-CS2103T-T16-2 · Mar 17, 2024 · 7b4a3d9 · 7b4a3d9
1 parent e010a0c
commit 7b4a3d9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/main/java/seedu/address/logic/parser/ParserUtil.java b/src/main/java/seedu/address/logic/parser/ParserUtil.java
@@ -125,10 +125,14 @@ public static Set<Tag> parseTags(Collection<String> tags) throws ParseException
     }
 
     /**
-     * Parses {@code Optional<String> birthday} into a {@code Optional<LocalDate>}.
+     * Parses {@code String birthday} into a {@code Birthday}.
      */
     public static Birthday parseBirthday(String birthday) throws ParseException {
-        requireNonNull(birthday);
-        return new Birthday(birthday);
+        birthday = birthday == null ? "" : birthday;
+        String trimmedBirthday = birthday.trim();
+        if (!Birthday.isValidBirthday(trimmedBirthday)) {
+            throw new ParseException(Birthday.BIRTHDAY_CONSTRAINTS);
+        }
+        return new Birthday(trimmedBirthday);
     }
 }
diff --git a/src/main/java/seedu/address/model/person/Birthday.java b/src/main/java/seedu/address/model/person/Birthday.java
@@ -1,5 +1,6 @@
 package seedu.address.model.person;
 
+import static java.util.Objects.requireNonNull;
 import static seedu.address.commons.util.AppUtil.checkArgument;
 
 import java.time.LocalDate;
@@ -26,7 +27,7 @@ public class Birthday {
      * @param birthday A valid birthday, or an empty string.
      */
     public Birthday(String birthday) {
-        birthday = birthday == null ? "" : birthday;
+        requireNonNull(birthday);
         if (birthday.isBlank()) {
             this.birthday = null;
             return;
@@ -37,7 +38,7 @@ public Birthday(String birthday) {
 
 
     /**
-     * Returns true if a given string is a valid name.
+     * Returns true if a given string is a valid birthday.
      */
     public static boolean isValidBirthday(String test) {
         if (test == null || test.isBlank()) {

diff --git a/src/main/java/seedu/address/storage/JsonAdaptedPerson.java b/src/main/java/seedu/address/storage/JsonAdaptedPerson.java
@@ -121,7 +121,7 @@ public Person toModelType() throws IllegalValueException {
         if (!Birthday.isValidBirthday(birthday)) {
             throw new IllegalValueException(Birthday.BIRTHDAY_CONSTRAINTS);
         }
-        final Birthday modelBirthday = new Birthday(birthday);
+        final Birthday modelBirthday = new Birthday(Optional.ofNullable(birthday).orElse(""));
 
         return new Person(modelName, modelPhone, modelEmail, modelAddress, modelRemark, modelTags, modelBirthday);
     }