Branch kk filter by status

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

@@ -0,0 +1,8 @@
+package seedu.address.logic.commands;
+
+/**
+ * Sets predicates that filter article book
+ */
+public class SetCommand {
+    public static final String COMMAND_WORD = "set";
+}

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

@@ -0,0 +1,44 @@
+package seedu.address.logic.commands.articlecommands;
+
+import static java.util.Objects.requireNonNull;
+import static seedu.address.model.Model.PREDICATE_SHOW_ALL_ARTICLES;
+
+import java.util.function.Predicate;
+
+import seedu.address.logic.commands.CommandResult;
+import seedu.address.model.Model;
+import seedu.address.model.article.Article;
+import seedu.address.model.article.ArticleMatchesStatusPredicate;
+import seedu.address.model.article.exceptions.InvalidStatusException;
+
+/**
+ * Use to set filter for Articles
+ */
+public class SetArticleCommand extends ArticleCommand {
+    public static final String COMMAND_WORD = "set";
+
+    public static final String COMMAND_PREFIX = "-a";
+
+    public static final String MESSAGE_SUCCESS = "Filter Updated";
+    private Predicate<Article> finalPredicate;
+
+    /**
+     * Constructs a SetArticleCommand object.
+     * @param status The status to be filtered by.
+     */
+    public SetArticleCommand(String status) {
+        try {
+            finalPredicate = new ArticleMatchesStatusPredicate(status);
+        } catch (InvalidStatusException e) {
+            finalPredicate = PREDICATE_SHOW_ALL_ARTICLES;
+        }
+    }
+
+    @Override
+    public CommandResult execute(Model model) {
+        requireNonNull(model);
+        model.getFilter().updateFilter(finalPredicate);
+        model.updateFilteredArticleList(finalPredicate);
+        return new CommandResult(MESSAGE_SUCCESS);
+    }
+}

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

@@ -15,6 +15,7 @@
 import seedu.address.logic.commands.articlecommands.EditArticleCommand;
 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;
 
@@ -36,6 +37,7 @@
      * @return the command based on the user input
      * @throws ParseException if the user input does not conform the expected format
      */
+    @SuppressWarnings("checkstyle:Regexp")
     public static Command parseCommand(String userInput) throws ParseException {
         final Matcher matcher = BASIC_COMMAND_FORMAT.matcher(userInput.trim());
         if (!matcher.matches()) {
@@ -70,6 +72,9 @@
         case SortArticleCommand.COMMAND_WORD:
             return new SortArticleCommandParser().parse(arguments);
 
+        case SetArticleCommand.COMMAND_WORD:
+            return new SetArticleCommandParser().parse(arguments);
+
         default:
             logger.finer("This user input caused a ParseException: " + userInput);
             throw new ParseException(MESSAGE_UNKNOWN_COMMAND);

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

@@ -0,0 +1,28 @@
+package seedu.address.logic.parser;
+
+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.parser.exceptions.ParseException;
+
+/**
+ * Parses input arguments and creates a SetArticleCommand object
+ */
+public class SetArticleCommandParser implements Parser<SetArticleCommand> {
+
+    @Override
+    public SetArticleCommand parse(String userInput) throws ParseException {
+        ArgumentMultimap argMultimap = ArgumentTokenizer.tokenize(userInput, PREFIX_STATUS);
+        if (!arePrefixesPresent(argMultimap, PREFIX_STATUS)) {
+            throw new ParseException("The set command does not follow the correct format");
+        }
+        String status = argMultimap.getValue(PREFIX_STATUS).get();
+        return new SetArticleCommand(status);
+    }
+
+    private static boolean arePrefixesPresent(ArgumentMultimap argumentMultimap, Prefix... prefixes) {
+        return Stream.of(prefixes).allMatch(prefix -> argumentMultimap.getValue(prefix).isPresent());
+    }
+}

src/main/java/seedu/address/model/ArticleFilter.java

@@ -0,0 +1,23 @@
+package seedu.address.model;
+
+import static seedu.address.model.Model.PREDICATE_SHOW_ALL_ARTICLES;
+
+import java.util.function.Predicate;
+
+import seedu.address.model.article.Article;
+
+/**
+ * Use to filter through ArticleBook
+ */
+public class ArticleFilter implements Filter {
+    private Predicate<Article> finalPredicate;
+    public ArticleFilter() {
+        finalPredicate = PREDICATE_SHOW_ALL_ARTICLES;
+    }
+    public void updateFilter(Predicate<Article> newPredicate) {
+        finalPredicate = newPredicate;
+    }
+    public Predicate<Article> getFinalPredicate() {
+        return finalPredicate;
+    }
+}

src/main/java/seedu/address/model/Filter.java

@@ -0,0 +1,7 @@
+package seedu.address.model;
+
+/**
+ * Used to sieve through lists.
+ */
+public interface Filter {
+}

src/main/java/seedu/address/model/Model.java

@@ -142,4 +142,5 @@ public interface Model {
      * @throws NullPointerException if {@code predicate} is null.
      */
     void updateFilteredArticleList(Predicate<Article> predicate);
+    ArticleFilter getFilter();
 }

src/main/java/seedu/address/model/ModelManager.java

@@ -25,6 +25,7 @@
     private final UserPrefs userPrefs;
     private final FilteredList<Person> filteredPersons;
     private final FilteredList<Article> filteredArticles;
+    private final ArticleFilter filter;
 
     /**
      * Initializes a ModelManager with the given addressBook and userPrefs.
@@ -39,6 +40,7 @@
         this.userPrefs = new UserPrefs(userPrefs);
         filteredPersons = new FilteredList<>(this.addressBook.getPersonList());
         filteredArticles = new FilteredList<>(this.articleBook.getArticleList());
+        filter = new ArticleFilter();
     }
 
     public ModelManager() {
@@ -79,7 +81,6 @@
         requireNonNull(addressBookFilePath);
         userPrefs.setAddressBookFilePath(addressBookFilePath);
     }
-
     //=========== AddressBook ================================================================================
 
     @Override
@@ -193,6 +194,7 @@
     @Override
     public void updateFilteredArticleList(Predicate<Article> predicate) {
         requireNonNull(predicate);
+        predicate = predicate.and(filter.getFinalPredicate());
         filteredArticles.setPredicate(predicate);
     }
 
@@ -215,4 +217,7 @@
                 && filteredArticles.equals(otherModelManager.filteredArticles);
     }
 
+    public ArticleFilter getFilter() {
+        return filter;
+    }
 }

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

@@ -0,0 +1,52 @@
+package seedu.address.model.article;
+
+import java.util.function.Predicate;
+
+import seedu.address.model.article.exceptions.InvalidStatusException;
+
+/**
+ * Ensures that an {@code Article}'s {@code Status} matches the given status
+ */
+public class ArticleMatchesStatusPredicate implements Predicate<Article> {
+    private Article.Status status;
+
+    /**
+     * Constructs an ArticleMatchesStatusPredicate
+     * @param s The string representation of the status
+     * @throws InvalidStatusException thrown when status entered is invalid.
+     */
+    public ArticleMatchesStatusPredicate(String s) throws InvalidStatusException {
+        if (s.equals("PUBLISHED")) {
+            status = Article.Status.PUBLISHED;
+        } else if (s.equals("DRAFT")) {
+            status = Article.Status.DRAFT;
+        } else if (s.equals("ARCHIVED")) {
+            status = Article.Status.ARCHIVED;
+        } else {
+            throw new InvalidStatusException();
+        }
+    }
+
+    @Override
+    public boolean test(Article article) {
+        return this.status.equals(article.getStatus());
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+
+        // instanceof handles nulls
+        if (!(other instanceof TitleContainsKeywordsPredicate)) {
+            return false;
+        }
+
+        ArticleMatchesStatusPredicate otherArticleMatchesStatusPredicate = (ArticleMatchesStatusPredicate) other;
+        return this.status.equals(otherArticleMatchesStatusPredicate.getStatus());
+    }
+    public Article.Status getStatus() {
+        return this.status;
+    }
+}

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

@@ -7,7 +7,7 @@
 import seedu.address.commons.util.ToStringBuilder;
 
 /**
- * Tests that a {@code Person}'s {@code Name} matches any of the keywords given.
+ * Tests that an {@code Article}'s {@code Title} matches any of the keywords given.
  */
 public class TitleContainsKeywordsPredicate implements Predicate<Article> {
     private final List<String> keywords;

src/main/java/seedu/address/model/article/exceptions/InvalidStatusException.java

@@ -0,0 +1,10 @@
+package seedu.address.model.article.exceptions;
+
+/**
+ * Signals that status entered is not a valid one.
+ */
+public class InvalidStatusException extends RuntimeException {
+    public InvalidStatusException() {
+        super("The status is invalid");
+    }
+}

src/test/java/seedu/address/logic/commands/AddCommandTest.java

@@ -19,6 +19,7 @@
 import seedu.address.logic.Messages;
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.model.AddressBook;
+import seedu.address.model.ArticleFilter;
 import seedu.address.model.Model;
 import seedu.address.model.ReadOnlyAddressBook;
 import seedu.address.model.ReadOnlyArticleBook;
@@ -209,6 +210,10 @@ public void setArticle(Article target, Article editedArticle) {
         public void sortArticleBook(String prefix) {
             throw new AssertionError("This method should not be called.");
         }
+        @Override
+        public ArticleFilter getFilter() {
+            throw new AssertionError("This method should not be called.");
+        }
     }
 
     /**