Merge pull request #291 from yugan01/check-prefix-validity

Check prefix validity
nus-cs2103-AY2425S1 · Nov 7, 2024 · 5b4ba3b · 5b4ba3b
2 parents 0eeddd5 + 27d4da4
commit 5b4ba3b
Show file tree

Hide file tree

Showing 12 changed files with 128 additions and 10 deletions.
diff --git a/src/main/java/seedu/address/logic/parser/AddCommandParser.java b/src/main/java/seedu/address/logic/parser/AddCommandParser.java
@@ -1,6 +1,7 @@
 package seedu.address.logic.parser;
 
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.ArgumentTokenizer.checkPrefixPresentAndValidPrefix;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_BIRTHDATE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_NRIC;
@@ -29,6 +30,9 @@ public class AddCommandParser implements Parser<AddCommand> {
      * @throws ParseException if the user input does not conform the expected format
      */
     public AddCommand parse(String args) throws ParseException {
+        checkPrefixPresentAndValidPrefix(args, AddCommand.MESSAGE_USAGE, PREFIX_NAME, PREFIX_NRIC, PREFIX_SEX,
+                PREFIX_BIRTHDATE, PREFIX_PHONE);
+
         ArgumentMultimap argMultimap =
                 ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_NRIC, PREFIX_SEX,
                         PREFIX_BIRTHDATE, PREFIX_PHONE);

diff --git a/src/main/java/seedu/address/logic/parser/AddFCommandParser.java b/src/main/java/seedu/address/logic/parser/AddFCommandParser.java
@@ -1,6 +1,7 @@
 package seedu.address.logic.parser;
 
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.ArgumentTokenizer.checkPrefixPresentAndValidPrefix;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ALLERGY;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_BIRTHDATE;
@@ -47,7 +48,14 @@ public class AddFCommandParser implements Parser<AddFCommand> {
      * @throws ParseException if the user input does not conform the expected format
      */
     public AddFCommand parse(String args) throws ParseException {
+
         assert args != null : "Argument cannot be null";
+
+        checkPrefixPresentAndValidPrefix(args, AddFCommand.MESSAGE_USAGE, PREFIX_NAME, PREFIX_NRIC, PREFIX_SEX,
+                PREFIX_BIRTHDATE, PREFIX_EMAIL, PREFIX_PHONE, PREFIX_ADDRESS, PREFIX_ALLERGY,
+                PREFIX_BLOODTYPE, PREFIX_EXISTINGCONDITION, PREFIX_NOTE, PREFIX_NOKNAME, PREFIX_NOKPHONE,
+                PREFIX_HEALTHRISK);
+
         ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_NRIC, PREFIX_SEX,
                 PREFIX_BIRTHDATE, PREFIX_EMAIL, PREFIX_PHONE, PREFIX_ADDRESS, PREFIX_ALLERGY,
                 PREFIX_BLOODTYPE, PREFIX_EXISTINGCONDITION, PREFIX_NOTE, PREFIX_NOKNAME, PREFIX_NOKPHONE,

diff --git a/src/main/java/seedu/address/logic/parser/ArgumentTokenizer.java b/src/main/java/seedu/address/logic/parser/ArgumentTokenizer.java
@@ -1,9 +1,16 @@
 package seedu.address.logic.parser;
 
+import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import seedu.address.logic.parser.exceptions.ParseException;
+
+
 
 /**
  * Tokenizes arguments string of the form: {@code preamble <prefix>value <prefix>value ...}<br>
@@ -28,6 +35,74 @@ public static ArgumentMultimap tokenize(String argsString, Prefix... prefixes) {
         return extractArguments(argsString, positions);
     }
 
+    /**
+     * Checks an arguments string whether the prefixes provided are valid and there is at least a prefix present.
+     *
+     * @param argsString Arguments string of the form: {@code preamble <prefix>value <prefix>value ...}
+     * @param prefixes   Prefixes to tokenize the arguments string with
+     */
+    public static void checkPrefixPresentAndValidPrefix(String argsString, String messageUsage, Prefix... prefixes)
+            throws ParseException {
+        if (argsString.trim().isEmpty()) {
+            throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, messageUsage));
+        }
+        String[] splitArgs = argsString.split("\\|");
+
+        checkPrefixesPresent(splitArgs, messageUsage);
+        checkValidPrefix(splitArgs, prefixes);
+
+    }
+
+    /**
+     * Checks an arguments string whether there is at least a prefix present.
+     *
+     * @param splitArgs Array of String split by "|"
+     * @param messageUsage String to be returned if no valid prefixes are found
+     */
+    public static void checkPrefixesPresent(String[] splitArgs, String messageUsage) throws ParseException {
+        if (splitArgs.length == 1) {
+            throw new ParseException("No valid prefixes found \n" + messageUsage);
+        }
+    }
+
+    /**
+     * Checks an arguments string whether the prefixes provided are valid.
+     *
+     * @param splitArgs Array of String split by "|"
+     * @param prefixes   Prefixes to tokenize the arguments string with
+     */
+    public static void checkValidPrefix(String[] splitArgs, Prefix... prefixes) throws ParseException {
+        List<String> prefixesPresent = Arrays.stream(splitArgs, 0, splitArgs.length - 1)
+                .map(ArgumentTokenizer::getPrefix).toList();
+
+        for (String prefixString : prefixesPresent) {
+            checkEachPrefix(prefixString, prefixes);
+        }
+    }
+
+    public static String getPrefix(String arg) {
+        String[] splitSingleArg = arg.split(" ");
+        return splitSingleArg[splitSingleArg.length - 1];
+    }
+
+    /**
+     * Checks an arguments string whether a single prefix provided are valid.
+     *
+     * @param prefixString String representation of a prefix provided by user
+     * @param prefixes   Prefixes to tokenize the arguments string with
+     */
+    public static void checkEachPrefix(String prefixString, Prefix... prefixes) throws ParseException {
+
+        Stream<String> prefixStrings = Arrays.stream(prefixes).map(Prefix::getPrefix)
+                .map(prefix -> prefix.substring(0, prefix.length() - 1));
+
+        boolean isValid = prefixStrings.anyMatch(prefixString::equals);
+
+        if (!isValid) {
+            throw new ParseException("Prefix " + prefixString + " is invalid");
+        }
+    }
+
     /**
      * Finds all zero-based prefix positions in the given arguments string.
      *

diff --git a/src/main/java/seedu/address/logic/parser/BookApptCommandParser.java b/src/main/java/seedu/address/logic/parser/BookApptCommandParser.java
@@ -2,6 +2,7 @@
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.ArgumentTokenizer.checkPrefixPresentAndValidPrefix;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_DATETIME;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_HEALTHSERVICE;
 
@@ -31,6 +32,10 @@ public BookApptCommand parse(String args) throws ParseException {
         requireNonNull(args);
         assert args != null : "Arguments cannot be null";
         logger.info("Parsing BookApptCommand");
+
+        checkPrefixPresentAndValidPrefix(args, BookApptCommand.MESSAGE_USAGE,
+                PREFIX_DATETIME, PREFIX_HEALTHSERVICE);
+
         ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, PREFIX_DATETIME,
             PREFIX_HEALTHSERVICE);
 

diff --git a/src/main/java/seedu/address/logic/parser/DeleteApptCommandParser.java b/src/main/java/seedu/address/logic/parser/DeleteApptCommandParser.java
@@ -2,6 +2,7 @@
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.ArgumentTokenizer.checkPrefixPresentAndValidPrefix;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_DATETIME;
 
 import java.time.LocalDateTime;
@@ -28,6 +29,9 @@ public DeleteApptCommand parse(String args) throws ParseException {
         requireNonNull(args);
         assert args != null : "Arguments cannot be null";
         logger.info("Parsing DeleteApptCommand");
+
+        checkPrefixPresentAndValidPrefix(args, DeleteApptCommand.MESSAGE_USAGE, PREFIX_DATETIME);
+
         ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(args, PREFIX_DATETIME);
 
         if (!arePrefixesPresent(argMultimap, PREFIX_DATETIME)

diff --git a/src/main/java/seedu/address/logic/parser/EditCommandParser.java b/src/main/java/seedu/address/logic/parser/EditCommandParser.java
@@ -2,6 +2,7 @@
 
 import static java.util.Objects.requireNonNull;
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.ArgumentTokenizer.checkPrefixPresentAndValidPrefix;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ALLERGY;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_BIRTHDATE;
@@ -41,6 +42,12 @@ public class EditCommandParser implements Parser<EditCommand> {
     public EditCommand parse(String args) throws ParseException {
         logger.info("Attempting to parse EditCommand arguments.");
         requireNonNull(args);
+
+        checkPrefixPresentAndValidPrefix(args, EditCommand.MESSAGE_USAGE, PREFIX_NAME, PREFIX_NRIC, PREFIX_BIRTHDATE,
+                PREFIX_SEX, PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS, PREFIX_BLOODTYPE, PREFIX_NOKNAME,
+                PREFIX_NOKPHONE, PREFIX_ALLERGY, PREFIX_REMOVEALLERGY, PREFIX_HEALTHRISK, PREFIX_EXISTINGCONDITION,
+                PREFIX_NOTE);
+
         ArgumentMultimap argMultimap =
                 ArgumentTokenizer.tokenize(args, PREFIX_NAME, PREFIX_NRIC, PREFIX_BIRTHDATE, PREFIX_SEX,
                         PREFIX_PHONE, PREFIX_EMAIL, PREFIX_ADDRESS, PREFIX_BLOODTYPE, PREFIX_NOKNAME, PREFIX_NOKPHONE,
@@ -52,6 +59,7 @@ public EditCommand parse(String args) throws ParseException {
             logger.warning("No NRIC provided in input.");
             throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, EditCommand.MESSAGE_NRIC_EMPTY));
         }
+
         try {
             assert !argMultimap.getPreamble().isEmpty();
             nric = ParserUtil.parseNric(argMultimap.getPreamble());

diff --git a/src/main/java/seedu/address/logic/parser/FilterCommandParser.java b/src/main/java/seedu/address/logic/parser/FilterCommandParser.java
@@ -1,6 +1,7 @@
 package seedu.address.logic.parser;
 
 import static seedu.address.logic.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+import static seedu.address.logic.parser.ArgumentTokenizer.checkPrefixPresentAndValidPrefix;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ENDDATE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_HEALTHSERVICE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_STARTDATE;
@@ -25,6 +26,10 @@ public class FilterCommandParser implements Parser<FilterCommand> {
      * @throws ParseException if the user input does not conform the expected format
      */
     public FilterCommand parse(String args) throws ParseException {
+
+        checkPrefixPresentAndValidPrefix(args, FilterCommand.MESSAGE_USAGE,
+                PREFIX_STARTDATE, PREFIX_ENDDATE, PREFIX_HEALTHSERVICE);
+
         ArgumentMultimap argMultimap =
                 ArgumentTokenizer.tokenize(args, PREFIX_STARTDATE, PREFIX_ENDDATE, PREFIX_HEALTHSERVICE);
 

diff --git a/src/main/java/seedu/address/model/patient/BloodType.java b/src/main/java/seedu/address/model/patient/BloodType.java
@@ -9,7 +9,8 @@
  * {@link #isValidBloodType(String)}
  */
 public class BloodType {
-    public static final String MESSAGE_CONSTRAINTS = "Blood type must be either A/B/AB/O followed by the Rhesus factor";
+    public static final String MESSAGE_CONSTRAINTS = "Blood type must be either A/B/AB/O followed by the"
+            + " Rhesus factor (+/-)";
     public static final String VALIDATION_REGEX = "^(A|B|AB|O)[+-]$";
 
     public final String value;

diff --git a/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java b/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java
@@ -137,6 +137,7 @@ public void parse_repeatedValue_failure() {
     @Test
     public void parse_compulsoryFieldMissing_failure() {
         String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddCommand.MESSAGE_USAGE);
+        String expectedMessageForNoPrefix = String.format("No valid prefixes found \n" + AddCommand.MESSAGE_USAGE);
 
         // missing name prefix
         assertParseFailure(parser, VALID_NAME_BOB + NRIC_DESC_BOB + SEX_DESC_BOB + BIRTHDATE_DESC_BOB
@@ -160,7 +161,7 @@ public void parse_compulsoryFieldMissing_failure() {
 
         // all prefixes missing
         assertParseFailure(parser, VALID_NAME_BOB + VALID_NRIC_BOB + VALID_SEX_BOB + VALID_BIRTHDATE_BOB
-                + VALID_PHONE_BOB, expectedMessage);
+                + VALID_PHONE_BOB, expectedMessageForNoPrefix);
     }
 
     @Test

diff --git a/src/test/java/seedu/address/logic/parser/AddFCommandParserTest.java b/src/test/java/seedu/address/logic/parser/AddFCommandParserTest.java
@@ -245,6 +245,7 @@ public void parse_repeatedNonAllergyValue_failure() {
     @Test
     public void parse_compulsoryFieldMissing_failure() {
         String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, AddFCommand.MESSAGE_USAGE);
+        String expectedMessageForNoPrefix = String.format("No valid prefixes found \n" + AddFCommand.MESSAGE_USAGE);
 
         // missing name prefix
         assertParseFailure(parser, VALID_NAME_BOB + NRIC_DESC_BOB + SEX_DESC_BOB + BIRTHDATE_DESC_BOB
@@ -268,7 +269,7 @@ public void parse_compulsoryFieldMissing_failure() {
 
         // all prefixes missing
         assertParseFailure(parser, VALID_NAME_BOB + VALID_NRIC_BOB + VALID_SEX_BOB + VALID_BIRTHDATE_BOB
-                        + VALID_PHONE_BOB, expectedMessage);
+                        + VALID_PHONE_BOB, expectedMessageForNoPrefix);
     }
 
     @Test

diff --git a/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java b/src/test/java/seedu/address/logic/parser/EditCommandParserTest.java
@@ -52,6 +52,7 @@
 import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_SEX_AMY;
 import static seedu.address.logic.commands.EditCommand.MESSAGE_NRIC_EMPTY;
+import static seedu.address.logic.commands.EditCommand.MESSAGE_USAGE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_BIRTHDATE;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_BLOODTYPE;
@@ -95,10 +96,15 @@ public void parse_missingParts_failure() {
         assertParseFailure(parser, NAME_DESC_AMY + SEX_DESC_AMY + BIRTHDATE_DESC_AMY, MESSAGE_EMPTY_NRIC);
 
         // no field specified
-        assertParseFailure(parser, VALID_NRIC_AMY, EditCommand.MESSAGE_NOT_EDITED);
+        String expectedMessageForNoFields = "No valid prefixes found \n" + MESSAGE_USAGE;
+        assertParseFailure(parser, VALID_NRIC_AMY, expectedMessageForNoFields);
 
         // no NRIC and no field specified
-        assertParseFailure(parser, "", MESSAGE_EMPTY_NRIC);
+        String expectedMessageForNoNricAndNoFields = String.format(MESSAGE_INVALID_COMMAND_FORMAT, MESSAGE_USAGE);
+        assertParseFailure(parser, "", expectedMessageForNoNricAndNoFields);
+
+        // field specified but no NRIC
+        assertParseFailure(parser, NRIC_DESC_AMY, MESSAGE_EMPTY_NRIC);
     }
 
     @Test

diff --git a/src/test/java/seedu/address/logic/parser/FilterCommandParserTest.java b/src/test/java/seedu/address/logic/parser/FilterCommandParserTest.java
@@ -32,8 +32,8 @@ public class FilterCommandParserTest {
 
     @Test
     public void parse_emptyArg_throwsParseException() {
-        assertParseFailure(parser, " ", String.format(MESSAGE_INVALID_COMMAND_FORMAT,
-                FilterCommand.MESSAGE_USAGE));
+        String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, FilterCommand.MESSAGE_USAGE);
+        assertParseFailure(parser, " ", expectedMessage);
     }
 
     @Test
@@ -95,13 +95,13 @@ public void parse_compulsoryFieldMissing_failure() {
         String expectedMessage = String.format(MESSAGE_INVALID_COMMAND_FORMAT, FilterCommand.MESSAGE_USAGE);
 
         // missing end date prefix with start date present
-        assertParseFailure(parser, " sd/2000-10-10", expectedMessage);
+        assertParseFailure(parser, validStartdate, expectedMessage);
 
         // missing end date prefix with health service present
-        assertParseFailure(parser, " h/Blood Test", expectedMessage);
+        assertParseFailure(parser, validHealthService, expectedMessage);
 
         // missing end date prefix with start date and health service present
-        assertParseFailure(parser, " sd/2000-10-10 h/Blood Test", expectedMessage);
+        assertParseFailure(parser, validStartdate + validHealthService, expectedMessage);
 
     }