Add more data formats for schedule command

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

@@ -65,16 +65,15 @@
 
             model.deletePerson(personToDelete);
             return new CommandResult(String.format(MESSAGE_DELETE_PERSON_SUCCESS, Messages.format(personToDelete)));
-        }
-        else {
+        } else {
             List<Person> peopleToDelete = new ArrayList<Person>();
             Set<Group> deletedGroup = new HashSet<Group>();
             deletedGroup.add(group);
 
 
             for (int i = 0; i < lastShownList.size(); i++) {
-                if (lastShownList.get(i).getGroups().equals(deletedGroup) ) {
+                if (lastShownList.get(i).getGroups().equals(deletedGroup)) {
                     peopleToDelete.add(lastShownList.get(i));
                 }
             }
             System.out.println(lastShownList.size());
@@ -83,10 +82,10 @@
             }
 
             for (int i = 0; i < peopleToDelete.size(); i++) {
                 model.deletePerson(peopleToDelete.get(i));
             }
 
             return new CommandResult(String.format(MESSAGE_DELETE_GROUP_SUCCESS, this.group.groupName));
         }
     }
 
@@ -104,11 +103,10 @@
         DeleteCommand otherDeleteCommand = (DeleteCommand) other;
         if (nusId != null) {
             return nusId.equals(otherDeleteCommand.nusId);
-        }
-        else if (group != null) {
+        } else if (group != null) {
             return group.equals(otherDeleteCommand.group);
         }
         return false;
     }
 
     @Override
@@ -117,12 +115,11 @@
             return new ToStringBuilder(this)
                     .add("targetNusId", nusId.toString())
                     .toString();
-        }
-        else if (group != null) {
+        } else if (group != null) {
             return new ToStringBuilder(this)
                     .add("targetGroup", group.toString())
                     .toString();
         }
         return null;
     }
 }

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

@@ -28,27 +28,18 @@
         try {
 
             if (argMultimap.getValue(PREFIX_NUSID).isPresent() && argMultimap.getValue(PREFIX_GROUP).isPresent()) {
                 throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteCommand.MESSAGE_USAGE));
-            }
-            else if (argMultimap.getValue(PREFIX_GROUP).isPresent()) {
+            } else if (argMultimap.getValue(PREFIX_GROUP).isPresent()) {
                 return new DeleteCommand(ParserUtil.parseGroup(argMultimap.getValue(PREFIX_GROUP).get()));
-            }
-            else if (argMultimap.getValue(PREFIX_NUSID).isPresent()) {
+            } else if (argMultimap.getValue(PREFIX_NUSID).isPresent()) {
                 return new DeleteCommand(ParserUtil.parseNusId(argMultimap.getValue(PREFIX_NUSID).get()));
 
-            }
-
-            else {
+            } else {
                 throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteCommand.MESSAGE_USAGE));
             }
-
-
-
-
         } catch (ParseException pe) {
             throw new ParseException(
                     String.format(MESSAGE_INVALID_COMMAND_FORMAT, DeleteCommand.MESSAGE_USAGE), pe);
         }
     }
-
 }

src/main/java/seedu/address/model/person/Schedule.java

@@ -3,20 +3,27 @@
 import static java.util.Objects.requireNonNull;
 import static seedu.address.commons.util.AppUtil.checkArgument;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Represents a Person's schedule in the address book with the user.
  * Guarantees: immutable; is valid as declared in {@link #isValidSchedule(String)}
  */
 public class Schedule {
 
     public static final String MESSAGE_CONSTRAINTS =
-            "Schedule should contain only dates formatted as DD/MM/YYYY or DD-MM-YYYY";
+            "Schedule should contain only dates formatted as DD/MM/YYYY, DD-MM-YYYY, "
+                    + "DD.MM.YYYY, DD MMM YYYY, MMM DD, YYYY";
 
     /*
      * Date should be formatted as DD/MM/YYYY or DD-MM-YYYY
      */
-    public static final String VALIDATION_REGEX_WITH_DATA =
-            "^([0]?[1-9]|[1|2][0-9]|[3][0|1])[./-]([0]?[1-9]|[1][0-2])[./-]([0-9]{4}|[0-9]{2})$";
+    public static final List<String> VALIDATION_REGEX_WITH_DATA = new ArrayList<>(
+            List.of(
+                    "^([0]?[1-9]|[1|2][0-9]|[3][0|1])[./-]([0]?[1-9]|[1][0-2])[./-]([0-9]{4}|[0-9]{2})$",
+                    "^(0?[1-9]|[1-2][0-9]|3[01])\\s+(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\\s+\\d{4}$",
+                    "^(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\\s+(0?[1-9]|[1-2][0-9]|3[01]),\\s+\\d{4}$"));
 
     public static final String VALIDATION_REGEX_WITHOUT_DATA = "^$";
 
@@ -39,7 +46,12 @@ public Schedule(String date) {
      * Returns true if a given string is a valid date.
      */
     public static boolean isValidSchedule(String test) {
-        return test.matches(VALIDATION_REGEX_WITH_DATA) || test.matches(VALIDATION_REGEX_WITHOUT_DATA);
+        for (String regex : VALIDATION_REGEX_WITH_DATA) {
+            if (test.matches(regex)) {
+                return true;
+            }
+        }
+        return test.matches(VALIDATION_REGEX_WITHOUT_DATA);
     }