allow search for all fields including tags

A little hacky because I created another overloading method to allow for comparisons of other fields without disrupting the current methods and qualifiers. Do let me know if there are better ways to do this!
CS2103AUG2016-F10-C3 · Oct 31, 2016 · 6afee99 · 6afee99
1 parent c51e4d5
commit 6afee99
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 12 deletions.
diff --git a/src/main/java/seedu/gtd/logic/commands/FindCommand.java b/src/main/java/seedu/gtd/logic/commands/FindCommand.java
@@ -13,7 +13,7 @@ public class FindCommand extends Command {
     public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all tasks whose names contain any of "
             + "the specified keywords (case-sensitive) and displays them as a list with index numbers.\n"
             + "Parameters: KEYWORD [MORE_KEYWORDS]...\n"
-            + "Example: " + COMMAND_WORD + " alice bob charlie";
+            + "Example: " + COMMAND_WORD + " cs2103";
 
     //@@author A0146130W
     private final String keywords;
@@ -36,10 +36,11 @@ public CommandResult execute() {
         model.updateFilteredTaskList(keywords, keywordSet);
 
         if(model.getFilteredTaskList().isEmpty()) {
-        	model.updateFilteredTaskList(keywordSet);
-        	if(!model.getFilteredTaskList().isEmpty()) return new CommandResult(getMessageForTaskListShownSummaryIfExactPhraseNotFound(model.getFilteredTaskList().size()));
-        }        
-
+        	model.updateFilteredTaskList(keywords, "cmd");
+        	if(!model.getFilteredTaskList().isEmpty()) {
+        		return new CommandResult(getMessageForTaskListShownSummaryIfExactPhraseNotFound(model.getFilteredTaskList().size()));
+        	}
+        }
         return new CommandResult(getMessageForTaskListShownSummary(model.getFilteredTaskList().size()));
     }
 }
diff --git a/src/main/java/seedu/gtd/model/Model.java b/src/main/java/seedu/gtd/model/Model.java
@@ -38,4 +38,7 @@ public interface Model {
 
     /** Updates the filter of the filtered task list to filter by the given keywords*/
 	void updateFilteredTaskList(Set<String> keywordSet);
+
+	/** Updates the filter of the filtered task list to filter by the given keywords*/
+	void updateFilteredTaskList(String keywords, String cmd);
 }
diff --git a/src/main/java/seedu/gtd/model/ModelManager.java b/src/main/java/seedu/gtd/model/ModelManager.java
@@ -7,10 +7,13 @@
 import seedu.gtd.commons.events.model.AddressBookChangedEvent;
 import seedu.gtd.commons.util.StringUtil;
 import seedu.gtd.model.task.Task;
+import seedu.gtd.model.tag.Tag;
+import seedu.gtd.model.tag.UniqueTagList;
 import seedu.gtd.model.task.ReadOnlyTask;
 import seedu.gtd.model.task.UniqueTaskList;
 import seedu.gtd.model.task.UniqueTaskList.TaskNotFoundException;
 
+import java.util.Arrays;
 import java.util.Set;
 import java.util.logging.Logger;
 
@@ -109,6 +112,11 @@ public void updateFilteredTaskList(String keywords, Set<String> keywordSet){
     public void updateFilteredTaskList(Set<String> keywordSet) {
     	updateFilteredTaskList(new PredicateExpression(new NameQualifier(keywordSet)));
     }
+
+    @Override
+    public void updateFilteredTaskList(String keywords, String cmd) {
+    	updateFilteredTaskList(new PredicateExpression(new otherFieldsNameQualifier(keywords, cmd)));
+    }
 
     private void updateFilteredTaskList(Expression expression) {
         filteredTasks.setPredicate(expression::satisfies);
@@ -154,10 +162,10 @@ private class NameQualifier implements Qualifier {
 
         @Override
         public boolean run(ReadOnlyTask task) {
-            return keywordSet.stream()
-                    .filter(keyword -> StringUtil.containsIgnoreCase(task.getName().fullName, keyword))
-                    .findAny()
-                    .isPresent();
+        	return keywordSet.stream()
+            .filter(keyword -> StringUtil.containsIgnoreCase(task.getName().fullName, keyword))
+            .findAny()
+            .isPresent();
         }
 
         @Override
@@ -166,6 +174,38 @@ public String toString() {
         }
     }
 
+    private class otherFieldsNameQualifier implements Qualifier {
+        protected String nameKeyWords;
+
+        otherFieldsNameQualifier(String keywords, String cmd) {
+            this.nameKeyWords = keywords;
+        }
+
+        @Override
+        public boolean run(ReadOnlyTask task) {
+        	String taskFullNameLowerCase = task.getName().fullName.toLowerCase();
+        	String priority = task.getPriority().toString();
+        	String address = task.getAddress().toString().toLowerCase();
+        	String dueDate = task.getDueDate().toString();
+        	UniqueTagList tagsList = task.getTags();
+
+        	boolean nameMatch = taskFullNameLowerCase.contains(nameKeyWords.toLowerCase());
+        	boolean addressMatch = address.contains(nameKeyWords.toLowerCase());
+        	boolean priorityMatch = priority.contains(nameKeyWords);
+        	boolean dueDateMatch = dueDate.contains(nameKeyWords);
+        	boolean tagsMatch = tagsList.containSearch(nameKeyWords.toLowerCase());
+        	boolean eachWordMatch = false;
+
+        	String[] eachWord = nameKeyWords.split(" ");
+        	for (String word : eachWord) {
+        		System.out.println("each: " + word);
+        		eachWordMatch = eachWordMatch || taskFullNameLowerCase.contains(word.toLowerCase());
+        	}
+
+            return eachWordMatch || nameMatch || addressMatch || priorityMatch || dueDateMatch || tagsMatch;
+        }
+    }
+
     private class orderedNameQualifier extends NameQualifier implements Qualifier {
 		private String nameKeyWords;
 
@@ -177,14 +217,13 @@ private class orderedNameQualifier extends NameQualifier implements Qualifier {
         @Override
         public boolean run(ReadOnlyTask task) {
         	String taskFullNameLowerCase = task.getName().fullName.toLowerCase();
-        	boolean orderMatch = taskFullNameLowerCase.contains(nameKeyWords.toLowerCase());
+        	boolean nameMatch = taskFullNameLowerCase.contains(nameKeyWords.toLowerCase());
 
         	boolean eachWordMatch = keywordSet.stream()
             .filter(keyword -> StringUtil.containsIgnoreCase(task.getName().fullName, keyword))
             .findAny()
             .isPresent();
-
-            return eachWordMatch && orderMatch;
+        	return eachWordMatch && nameMatch;
         }
     }
 }
diff --git a/src/main/java/seedu/gtd/model/tag/UniqueTagList.java b/src/main/java/seedu/gtd/model/tag/UniqueTagList.java
@@ -3,6 +3,7 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import seedu.gtd.commons.exceptions.DuplicateDataException;
+import seedu.gtd.commons.exceptions.IllegalValueException;
 import seedu.gtd.commons.util.CollectionUtil;
 
 import java.util.*;
@@ -105,6 +106,25 @@ public boolean contains(Tag toCheck) {
         assert toCheck != null;
         return internalList.contains(toCheck);
     }
+
+
+
+    public boolean containSearch(String toCheck) {
+        assert toCheck != null;
+        boolean containsTag = true;
+        try {
+        	String[] tagsArray = toCheck.split(" ");
+
+        	for (String tag : tagsArray) {
+        		System.out.println(tag);
+        		Tag searchTag = new Tag(tag);
+        		containsTag = containsTag && internalList.contains(searchTag);
+        	}
+        	return containsTag;
+		} catch (IllegalValueException e) {
+			return false;
+		}
+    }
 
     /**
      * Adds a Tag to the list.