Merge pull request #85 from ryanlimdx/fix-list

Fix list
AY2324S2-CS2103T-F10-1 · Apr 4, 2024 · f450a36 · f450a36
2 parents 32990d5 + c6445ab
commit f450a36
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/src/main/java/seedu/address/logic/parser/ListCommandParser.java b/src/main/java/seedu/address/logic/parser/ListCommandParser.java
@@ -28,10 +28,15 @@ public ListCommand parse(String args) throws ParseException {
 
         ArgumentMultimap argMultimap =
                 ArgumentTokenizer.tokenize(args, PREFIX_TAG, PREFIX_WARD);
+
+        if (!argMultimap.getPreamble().isEmpty()) {
+            throw new ParseException(
+                    String.format(MESSAGE_INVALID_COMMAND_FORMAT, ListCommand.MESSAGE_USAGE));
+        }
         argMultimap.verifyNoDuplicatePrefixesFor(PREFIX_WARD);
         List<String> tagList = ParserUtil
                 .parseTagsKeywords(argMultimap.getAllValues(PREFIX_TAG));
-        String ward = argMultimap.getValue(PREFIX_WARD).orElse("");
+        String ward = ParserUtil.parseWard(argMultimap.getValue(PREFIX_WARD).orElse(null)).toString();
 
         if (ward.isEmpty() && tagList.isEmpty()) {
             throw new ParseException(

diff --git a/src/main/java/seedu/address/logic/parser/ParserUtil.java b/src/main/java/seedu/address/logic/parser/ParserUtil.java
@@ -86,8 +86,12 @@ public static Set<Tag> parseTags(Collection<String> tags) throws ParseException
      */
     public static List<String> parseTagsKeywords(Collection<String> tags) throws ParseException {
         requireNonNull(tags);
-        final List<String> tagSet = new ArrayList<>(tags);
-        return tagSet;
+        Set <Tag> tagSet = parseTags(tags);
+        List<String> tagNames = new ArrayList<>();
+        for (Tag tag : tagSet) {
+            tagNames.add(tag.getTagName());
+        }
+        return tagNames;
     }
 
     /**
@@ -113,7 +117,6 @@ public static Dob parseDob(String dob) throws ParseException {
      */
     public static Ic parseIc(String ic) throws ParseException {
         requireNonNull(ic);
-        // Todo: Error handling
         String trimmedIc = ic.trim();
         if (!Ic.isValidIc(trimmedIc)) {
             throw new ParseException(Ic.MESSAGE_CONSTRAINTS);

diff --git a/src/main/java/seedu/address/model/tag/Tag.java b/src/main/java/seedu/address/model/tag/Tag.java
@@ -59,4 +59,11 @@ public String toString() {
         return '[' + tagName + ']';
     }
 
+    /**
+     * Returns the tag name.
+     */
+    public String getTagName() {
+        return tagName;
+    }
+
 }
diff --git a/src/test/java/seedu/address/logic/parser/ListCommandParserTest.java b/src/test/java/seedu/address/logic/parser/ListCommandParserTest.java
@@ -36,7 +36,7 @@ public void parse_validArgs_returnsListCommand() {
         // no leading and trailing whitespaces
         ListCommand expectedListCommand =
                 new ListCommand(
-                        new ListKeywordsPredicate(Arrays.asList(VALID_TAG_DIABETES, VALID_TAG_FALL_RISK),
+                        new ListKeywordsPredicate(Arrays.asList(VALID_TAG_FALL_RISK, VALID_TAG_DIABETES),
                                 VALID_WARD_BOB));
         assertParseSuccess(parser, TAG_DESC_DIABETES
                 + TAG_DESC_FALL_RISK + WARD_DESC_BOB, expectedListCommand);