Update Find Command #83

jonahtanjz · 2020-10-20T04:43:42Z

Tokenize Find command
Make each prefix in Find command optional
Add ExpirySearchPredicate, PrioritySearchPredicate and TagSearchPredicate
Parse arguments in Find command to generate the respective Predicates
Add JUnit tests for new Find command feature
Add JUnit tests for ExpirySearchPredicate, PrioritySearchPredicate and TagSearchPredicate

…arser to methods

…mand

…ExpiryDateSearchPredicate and PrioritySearchPredicate

codecov-io · 2020-10-20T07:10:11Z

Codecov Report

Merging #83 into master will increase coverage by 0.46%.
The diff coverage is 82.60%.

@@             Coverage Diff              @@
##             master      #83      +/-   ##
============================================
+ Coverage     71.62%   72.08%   +0.46%     
- Complexity      398      435      +37     
============================================
  Files            69       72       +3     
  Lines          1237     1322      +85     
  Branches        121      144      +23     
============================================
+ Hits            886      953      +67     
  Misses          319      319              
- Partials         32       50      +18

Impacted Files	Coverage Δ	Complexity Δ
...del/food/DescriptionContainsKeywordsPredicate.java	`80.00% <0.00%> (-20.00%)`	`8.00 <0.00> (+1.00)`	⬇️
...eedu/simplykitchen/logic/commands/FindCommand.java	`73.33% <72.00%> (-26.67%)`	`8.00 <2.00> (+2.00)`	⬇️
...ykitchen/model/food/ExpiryDateSearchPredicate.java	`75.00% <75.00%> (ø)`	`6.00 <6.00> (?)`
...plykitchen/model/food/PrioritySearchPredicate.java	`75.00% <75.00%> (ø)`	`7.00 <7.00> (?)`
...du/simplykitchen/model/tag/TagSearchPredicate.java	`78.57% <78.57%> (ø)`	`9.00 <9.00> (?)`
.../simplykitchen/logic/parser/FindCommandParser.java	`100.00% <100.00%> (ø)`	`15.00 <14.00> (+12.00)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a2a7f17...9f48473. Read the comment docs.

…SHOW_ALL_FOODS

bchenghi

The changes look great! I left a few comments below.

bchenghi · 2020-10-21T07:22:19Z

src/main/java/seedu/simplykitchen/model/tag/TagSearchPredicate.java

+        return tagsToFind.stream()
+                .anyMatch(tagToFind -> {
+                    for (Tag tag : food.getTags()) {
+                        if (StringUtil.containsWordIgnoreCase(tag.tagName, tagToFind.tagName)) {


Since a single tag can have multiple words, so containsWordIgnoreCase will throw an error if its argument has multiple words?

Yup good catch! Fixed

bchenghi · 2020-10-21T07:30:52Z

src/main/java/seedu/simplykitchen/model/food/ExpiryDateSearchPredicate.java

+ * Tests that a {@code Food}'s {@code Priority} matches the search given.
+ */
+public class ExpiryDateSearchPredicate implements Predicate<Food> {
+    private static Logger logger = Logger.getLogger("ExpiryDateSearchPredicate.class");


Should this be LogsCenter.getLogger(ExpiryDateSearchPredicate.Class) instead?

Alright changed.

bchenghi · 2020-10-21T07:43:08Z

src/test/java/seedu/simplykitchen/logic/commands/FindCommandTest.java

@@ -57,28 +89,142 @@ public void equals() {
    @Test
    public void execute_zeroKeywords_noFoodFound() {


Very minor, but for consistency, do you think this should be execute_zeroDescriptionKeywords_noFoodFound()?

Changed. Thanks

bchenghi · 2020-10-21T07:44:33Z

src/test/java/seedu/simplykitchen/logic/commands/FindCommandTest.java

+    }
+
+    @Test
+    public void execute_multipleTagsSearch_multipleFoodsFound() {


Should we include tags with spaces as well?

Alright. Added new tests

…ultiple words

bchenghi

LGTM

jonahtanjz added 21 commits October 18, 2020 15:01

Add PrioritySearchPredicate class

bec6a34

Add tokenizer for find command

6a94a64

Filter list by description and priority

ee50e80

Filter list by description, priority and expiry

6a6b3d7

Filter list by description, priority, expiry and tags

eaf9457

Rename predicate class for Tag

317f547

Fix error in class name

fce4440

Throw parse exception for empty Find command

8fe9395

Change null to use Optional and abstracted predicates in FindCommandP…

8d68297

…arser to methods

Rename TagsContainsKeywordsPredicate class to TagSearchPredicate

f9b77c7

Update JUnit test for FindCommandTest to work with new Find command

1cc4515

Update JUnit test for FindCommandParserTest to work with new Find com…

dcdf608

…mand

Update JUnit test for FoodInventoryParserTest to work with Find command

49bbbc0

Add JUnit tests for new Find command

2b562dd

Add checks for preamble in Find command

f8d31ee

Add JUnit test for PrioritySearchPredicate

0b77654

Add JUnit test for ExpiryDateSearchPredicate

f4feba0

Add JUnit test for TagSearchPredicate

2231a99

Edit comment in Junit tests

a55e05e

Fix code style issue in JUnit tests

b48414a

Fix code style issue in main

8586f0d

jonahtanjz self-assigned this Oct 20, 2020

jonahtanjz added 7 commits October 20, 2020 14:10

Add assertions in FindCommand, DescriptionContainsKeywordsPredicate, …

8efdcaf

…ExpiryDateSearchPredicate and PrioritySearchPredicate

Rename keywords to tags in TagSearchPredicate

238f582

Rename tags to tagsToFind and add assertion in TagSearchPredicate

e579fcd

Update code styling

daf095a

Add logging to ExpiryDateSearchPredicate

848c7a5

Add search date to logging in ExpiryDateSearchPredicate

5335f36

Update logging message in ExpiryDateSearchPredicate

9f48473

jonahtanjz added this to the v1.3 milestone Oct 20, 2020

jonahtanjz added 3 commits October 20, 2020 21:59

Edit class name of logger in ExpiryDateSearchPredicate

797e31b

Change initial Predicate in combinePredicate method to use PREDICATE_…

63cb56f

…SHOW_ALL_FOODS

Rename variable in TypicalFood from 'ab' to 'fi'

29c0dd8

bchenghi self-requested a review October 21, 2020 07:13

Change whitespaces to use tabs and newline in FindCommandParserTest

07108df

bchenghi reviewed Oct 21, 2020

View reviewed changes

jonahtanjz added 5 commits October 21, 2020 16:30

Fix description not working with whitespaces in Find command

bfa90c8

Fix issue with multiple words in Tag in Find command

074d934

Change logger to use LogsCenter in ExpiryDateSearchPredicate

35cd8ca

Add new Tag for Anchovies in TypicalFood and add test for Tags with m…

fd89b12

…ultiple words

Update code styling

e0197ed

bchenghi approved these changes Oct 21, 2020

View reviewed changes

jonahtanjz added priority.High A high priority task (Must do) type.Task A task - Something that needs to be done, but not a story, bug, or an epic labels Oct 21, 2020

jonahtanjz added this to To Do in Week 10 via automation Oct 21, 2020

jonahtanjz moved this from To Do to In Progress (Jonah) in Week 10 Oct 21, 2020

Merge branch 'master' into branch-find-by-expiry-priority

6ac0358

bchenghi merged commit 391aeb4 into AY2021S1-CS2103T-F13-4:master Oct 22, 2020

Week 10 automation moved this from In Progress (Jonah) to Done Oct 22, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Find Command #83

Update Find Command #83

jonahtanjz commented Oct 20, 2020 •

edited

codecov-io commented Oct 20, 2020

bchenghi left a comment

bchenghi Oct 21, 2020

jonahtanjz Oct 21, 2020

bchenghi Oct 21, 2020

jonahtanjz Oct 21, 2020

bchenghi Oct 21, 2020

jonahtanjz Oct 21, 2020

bchenghi Oct 21, 2020

jonahtanjz Oct 21, 2020

bchenghi left a comment

		@@ -57,28 +89,142 @@ public void equals() {
		@Test
		public void execute_zeroKeywords_noFoodFound() {

Update Find Command #83

Update Find Command #83

Conversation

jonahtanjz commented Oct 20, 2020 • edited

codecov-io commented Oct 20, 2020

Codecov Report

bchenghi left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bchenghi left a comment

Choose a reason for hiding this comment

jonahtanjz commented Oct 20, 2020 •

edited