Merge pull request AY2324S1-CS2103T-W08-3#191

wamps-jp · Nov 13, 2023 · 78d5577 · 78d5577
2 parents 8debdcf + b210936
commit 78d5577
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/main/java/seedu/address/logic/parser/ReminderCommandParser.java b/src/main/java/seedu/address/logic/parser/ReminderCommandParser.java
@@ -21,6 +21,8 @@ public ReminderCommand parse(String args) throws ParseException {
                 ArgumentTokenizer.tokenize(args,
                         ReminderCommand.AUTOCOMPLETE_SUPPLIER.getAllPossibleFlags().toArray(Flag[]::new));
 
+        argMultimap.verifyAtMostOneOfFlagsUsedOutOf(FLAG_EARLIEST, FLAG_LATEST);
+
         if (argMultimap.hasFlag(FLAG_EARLIEST)) {
             return new ReminderCommand(true);
         } else if (argMultimap.hasFlag(FLAG_LATEST)) {

diff --git a/src/main/java/seedu/address/logic/parser/SortCommandParser.java b/src/main/java/seedu/address/logic/parser/SortCommandParser.java
@@ -2,6 +2,7 @@
 
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
 import static seedu.address.logic.parser.CliSyntax.FLAG_ADDRESS;
+import static seedu.address.logic.parser.CliSyntax.FLAG_ASCENDING;
 import static seedu.address.logic.parser.CliSyntax.FLAG_DEADLINE;
 import static seedu.address.logic.parser.CliSyntax.FLAG_DESCENDING;
 import static seedu.address.logic.parser.CliSyntax.FLAG_EMAIL;
@@ -48,6 +49,11 @@ public SortCommand parse(String args) throws ParseException {
                 ArgumentTokenizer.tokenize(args,
                         SortCommand.AUTOCOMPLETE_SUPPLIER.getAllPossibleFlags().toArray(Flag[]::new));
 
+        argMultimap.verifyAtMostOneOfFlagsUsedOutOf(FLAG_NONE, FLAG_ADDRESS, FLAG_EMAIL,
+                FLAG_ID, FLAG_NAME, FLAG_PHONE, FLAG_URL, FLAG_DEADLINE, FLAG_STAGE, FLAG_STALE,
+                FLAG_STATUS, FLAG_TITLE);
+        argMultimap.verifyAtMostOneOfFlagsUsedOutOf(FLAG_NONE, FLAG_ASCENDING, FLAG_DESCENDING);
+
         if (argMultimap.hasFlag(FLAG_NONE)) {
             return new SortCommand(null, null, true);
         }
@@ -59,7 +65,7 @@ public SortCommand parse(String args) throws ParseException {
         if (argMultimap.hasFlag(FLAG_DESCENDING)) {
             isReverse = true;
         }
-        //I feel there should be a more elegant way to write this.
+
         if (argMultimap.hasFlag(FLAG_ADDRESS)) {
             if (isReverse) {
                 contactComparator = COMPARATOR_ADDRESS_REVERSED;