Extend functionality to Find Command to search in specific Role Lists #89
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Support find command filtering separately for volunteers and befriendees. Added testcases to test for find by role.
CJerrong
approved these changes
Mar 28, 2024
Comment on lines
40
to
58
| if (searchVolunteer && searchBefriendee) { | ||
| model.updateFilteredPersonList(predicate); | ||
| return new CommandResult( | ||
| String.format(Messages.MESSAGE_PERSONS_LISTED_OVERVIEW, model.getFilteredPersonList().size())); | ||
|
|
||
| } else if (searchVolunteer) { | ||
| model.updateFilteredVolunteerList(predicate); | ||
| return new CommandResult( | ||
| String.format(Messages.MESSAGE_PERSONS_LISTED_OVERVIEW_WITH_ROLE, | ||
| model.getFilteredVolunteerList().size(), | ||
| "volunteer")); | ||
|
|
||
| } else if (searchBefriendee) { | ||
| model.updateFilteredBefriendeeList(predicate); | ||
| return new CommandResult( | ||
| String.format(Messages.MESSAGE_PERSONS_LISTED_OVERVIEW_WITH_ROLE, | ||
| model.getFilteredBefriendeeList().size(), | ||
| "befriendee")); | ||
| } |
There was a problem hiding this comment.
Really like the avoidance of deep nesting here.
Comment on lines
62
to
63
| boolean searchVolunteer = false; | ||
| boolean searchBefriendee = false; |
There was a problem hiding this comment.
Could perhaps rename these boolean variables to be more boolean sounding
Comment on lines
93
to
105
| /** | ||
| * Updates the filter of the filtered volunteer list to filter by the given {@code predicate}. | ||
| * Befriendee list is not filtered. | ||
| * @throws NullPointerException if {@code predicate} is null. | ||
| */ | ||
| void updateFilteredVolunteerList(Predicate<Person> predicate); | ||
|
|
||
| /** | ||
| * Updates the filter of the filtered befriendee list to filter by the given {@code predicate}. | ||
| * Volunteer list is not filtered. | ||
| * @throws NullPointerException if {@code predicate} is null. | ||
| */ | ||
| void updateFilteredBefriendeeList(Predicate<Person> predicate); |
There was a problem hiding this comment.
Not sure if these commands have been phased out through jia en's latest pr, may have to refactor this.
Comment on lines
150
to
168
| filteredBefriendees.setPredicate(person -> predicate.test(person) && person.isBefriendee()); | ||
| } | ||
|
|
||
| @Override | ||
| public void updateFilteredVolunteerList(Predicate<Person> predicate) { | ||
| requireNonNull(predicate); | ||
|
|
||
| // Only apply predicate to volunteers | ||
| filteredPersons.setPredicate(person -> person.isBefriendee() || predicate.test(person)); | ||
| filteredVolunteers.setPredicate(person -> predicate.test(person) && person.isVolunteer()); | ||
| } | ||
|
|
||
| @Override | ||
| public void updateFilteredBefriendeeList(Predicate<Person> predicate) { | ||
| requireNonNull(predicate); | ||
|
|
||
| // Only apply predicate to befriendees | ||
| filteredPersons.setPredicate(person -> predicate.test(person) || person.isVolunteer()); | ||
| filteredBefriendees.setPredicate(person -> predicate.test(person) && person.isBefriendee()); |
There was a problem hiding this comment.
May have to move this functionality down into the Datastore structure
There was a problem hiding this comment.
Done! Thank you for the insight!
Resolve Merge Conflicts resulting from refactoring of storage
Rename booleans for better clarity
gerteck
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Support find command filtering separately for volunteers and befriendees.
Added testcases to test for find by role.
Current Format:
find KEYWORD [MORE_KEYWORDS]
Added feature: Filter separately for volunteer and befriendee, while not clearing the other list. This is to faciliate pairing and unpairing operations using the index.
find r/volunteer KEYWORD [MORE_KEYWORDS]find r/befriendee KEYWORD [MORE_KEYWORDS]Action: Will find given person in the list of the respective role, and leave other list untouched.
Closes #74