Filter articles by tag

src/main/java/seedu/address/logic/commands/articlecommands/SetArticleCommand.java → src/main/java/seedu/address/logic/commands/articlecommands/FilterArticleCommand.java

@@ -12,25 +12,27 @@
 import seedu.address.model.Model;
 import seedu.address.model.article.Article;
 import seedu.address.model.article.ArticleMatchesStatusPredicate;
+import seedu.address.model.article.ArticleMatchesTagPredicate;
 import seedu.address.model.article.ArticleMatchesTimePeriodPredicate;
 import seedu.address.model.article.exceptions.InvalidStatusException;
+import seedu.address.model.tag.Tag;
 
 /**
  * Use to set filter for Articles
  */
-public class SetArticleCommand extends ArticleCommand {
-    public static final String COMMAND_WORD = "set";
+public class FilterArticleCommand extends ArticleCommand {
+    public static final String COMMAND_WORD = "filter";
 
     public static final String COMMAND_PREFIX = "-a";
 
-    public static final String MESSAGE_SUCCESS = "Filter Updated";
+    public static final String MESSAGE_SUCCESS = "filter online";
     private Predicate<Article> finalPredicate;
 
     /**
-     * Constructs a SetArticleCommand object.
+     * Constructs a FilterArticleCommand object.
      * @param status The status to be filtered by.
      */
-    public SetArticleCommand(String status, String start, String end) {
+    public FilterArticleCommand(String status, String tagName, String start, String end) throws ParseException {
         try {
             finalPredicate = new ArticleMatchesStatusPredicate(status);
         } catch (InvalidStatusException e) {
@@ -42,7 +44,14 @@
             Predicate<Article> timePredicate = new ArticleMatchesTimePeriodPredicate(startDate, endDate);
             finalPredicate = finalPredicate.and(timePredicate);
         } catch (ParseException e) {
-            finalPredicate = finalPredicate;
+            if (!start.equals("") && end.equals("")) {
+                throw e;
+            }
+        }
+        if (!tagName.trim().equals("")) {
+            Tag tag = new Tag(tagName);
+            Predicate<Article> tagPredicate = new ArticleMatchesTagPredicate(tag);
+            finalPredicate = finalPredicate.and(tagPredicate);
         }
     }
 

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

@@ -13,9 +13,9 @@
 import seedu.address.logic.commands.articlecommands.AddArticleCommand;
 import seedu.address.logic.commands.articlecommands.DeleteArticleCommand;
 import seedu.address.logic.commands.articlecommands.EditArticleCommand;
+import seedu.address.logic.commands.articlecommands.FilterArticleCommand;
 import seedu.address.logic.commands.articlecommands.FindArticleCommand;
 import seedu.address.logic.commands.articlecommands.ListArticleCommand;
-import seedu.address.logic.commands.articlecommands.SetArticleCommand;
 import seedu.address.logic.commands.articlecommands.SortArticleCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
 
@@ -72,8 +72,8 @@
         case SortArticleCommand.COMMAND_WORD:
             return new SortArticleCommandParser().parse(arguments);
 
-        case SetArticleCommand.COMMAND_WORD:
-            return new SetArticleCommandParser().parse(arguments);
+        case FilterArticleCommand.COMMAND_WORD:
+            return new FilterArticleCommandParser().parse(arguments);
 
         default:
             logger.finer("This user input caused a ParseException: " + userInput);

src/main/java/seedu/address/logic/parser/SetArticleCommandParser.java → src/main/java/seedu/address/logic/parser/FilterArticleCommandParser.java

@@ -1,29 +1,32 @@
 package seedu.address.logic.parser;
 
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ARTICLETAG;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_END;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_START;
 import static seedu.address.logic.parser.CliSyntax.PREFIX_STATUS;
 
 import java.util.stream.Stream;
 
-import seedu.address.logic.commands.articlecommands.SetArticleCommand;
+import seedu.address.logic.commands.articlecommands.FilterArticleCommand;
 import seedu.address.logic.parser.exceptions.ParseException;
 
 /**
- * Parses input arguments and creates a SetArticleCommand object
+ * Parses input arguments and creates a FilterArticleCommand object
  */
-public class SetArticleCommandParser implements Parser<SetArticleCommand> {
+public class FilterArticleCommandParser implements Parser<FilterArticleCommand> {
 
     @Override
-    public SetArticleCommand parse(String userInput) throws ParseException {
-        ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(userInput, PREFIX_STATUS, PREFIX_START, PREFIX_END);
-        if (!arePrefixesPresent(argMultimap, PREFIX_STATUS, PREFIX_START, PREFIX_END)) {
-            throw new ParseException("The set command does not follow the correct format");
+    public FilterArticleCommand parse(String userInput) throws ParseException {
+        ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(userInput, PREFIX_STATUS,
+                PREFIX_ARTICLETAG, PREFIX_START, PREFIX_END);
+        if (!arePrefixesPresent(argMultimap, PREFIX_STATUS, PREFIX_ARTICLETAG, PREFIX_START, PREFIX_END)) {
+            throw new ParseException("The filter command does not follow the correct format");
         }
         String status = argMultimap.getValue(PREFIX_STATUS).get();
+        String tagName = argMultimap.getValue(PREFIX_ARTICLETAG).get();
         String start = argMultimap.getValue(PREFIX_START).get();
         String end = argMultimap.getValue(PREFIX_END).get();
-        return new SetArticleCommand(status, start, end);
+        return new FilterArticleCommand(status, tagName, start, end);
     }
 
     private static boolean arePrefixesPresent(ArgumentMultimap argumentMultimap, Prefix... prefixes) {

src/main/java/seedu/address/model/article/ArticleMatchesStatusPredicate.java

@@ -1,5 +1,6 @@
 package seedu.address.model.article;
 
+
 import java.util.function.Predicate;
 
 import seedu.address.model.article.exceptions.InvalidStatusException;
@@ -29,6 +30,8 @@ public ArticleMatchesStatusPredicate(String s) throws InvalidStatusException {
 
     @Override
     public boolean test(Article article) {
+        //Check that article is not null.
+        assert (article instanceof Article);
         return this.status.equals(article.getStatus());
     }
 

src/main/java/seedu/address/model/article/ArticleMatchesTagPredicate.java

@@ -0,0 +1,33 @@
+package seedu.address.model.article;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.Set;
+import java.util.function.Predicate;
+
+import seedu.address.model.tag.Tag;
+
+/**
+ * Checks if article has matching tag
+ */
+public class ArticleMatchesTagPredicate implements Predicate<Article> {
+    private Tag tag;
+    public ArticleMatchesTagPredicate(Tag tag) {
+        this.tag = tag;
+    }
+
+    @Override
+    public boolean test(Article article) {
+        requireNonNull(article);
+        Set<Tag> others = article.getTags();
+        boolean isMatch = false;
+        requireNonNull(tag);
+        for (Tag other : others) {
+            requireNonNull(other);
+            if (other.equals(tag)) {
+                isMatch = true;
+            }
+        }
+        return isMatch;
+    }
+}