Skip to content

[5.x] Fix error with disallowed words in Comb search driver #11336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasonvarga merged 5 commits into from
Jan 22, 2025
Merged

[5.x] Fix error with disallowed words in Comb search driver #11336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
623e8c3
Add test
duncanmcclean Jan 9, 2025
dc1dd61
Flatten arrays when stringing pruned results together.
duncanmcclean Jan 9, 2025
dfd8032
Merge branch '5.x' into fix/excluded-words-error
jasonvarga Jan 22, 2025
7079447
remove unnecessary error handling in test
jasonvarga Jan 22, 2025
6f43378
Add test for non-arrays which worked before this pr
jasonvarga Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/Search/Comb/Comb.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,11 @@ private function removeDisallowedMatches($params)

// string pruned results together
foreach ($item['pruned'] as $pruned) {
$record .= ' '.$pruned;
if (is_array($pruned)) {
$record .= ' '.$this->flattenArray($pruned);
} else {
$record .= ' '.$pruned;
}
}

// check for disallowed
Expand Down
28 changes: 28 additions & 0 deletions tests/Search/CombTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,34 @@ public function it_can_search_for_umlauts()
$this->assertSame(2, $result['info']['total_results']);
}

#[Test]
public function it_filters_out_results_with_disallowed_words()
{
$comb = new Comb([
['title' => 'Pizza', 'ingredients' => 'Tomato, Cheese, Bread'],
['title' => 'Tomato Soup', 'ingredients' => 'Tomato, Water, Salt'],
['title' => 'Chicken & Sweetcorn Soup', 'ingredients' => 'Chicken, Sweetcorn, Water'],
]);

$results = $comb->lookUp('soup -tomato');

$this->assertEquals(['Chicken & Sweetcorn Soup'], collect($results['data'] ?? [])->pluck('data.title')->all());
}

#[Test]
public function it_filters_out_results_with_disallowed_words_where_results_are_arrays()
{
$comb = new Comb([
['title' => 'Pizza', 'ingredients' => ['Tomato', 'Cheese', 'Bread']],
['title' => 'Tomato Soup', 'ingredients' => ['Tomato', 'Water', 'Salt']],
['title' => 'Chicken & Sweetcorn Soup', 'ingredients' => ['Chicken', 'Sweetcorn', 'Water']],
]);

$results = $comb->lookUp('soup -tomato');

$this->assertEquals(['Chicken & Sweetcorn Soup'], collect($results['data'] ?? [])->pluck('data.title')->all());
}

public static function searchesProvider()
{
return [
Expand Down
Loading