Skip to content
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

Allow setting source (fields) from options #293

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow setting source (fields) from options #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions src/ElasticSearch/SearchFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ public static function create(Builder $builder, array $enforceOptions = []): Sea
if (array_key_exists('size', $options)) {
$search->setSize($options['size']);
}
if (array_key_exists('source', $options)) {
$search->setSource($options['source']);
}
if (! empty($builder->orders)) {
foreach ($builder->orders as $order) {
$search->addSort(new FieldSort($order['column'], $order['direction']));
Expand Down Expand Up @@ -153,6 +156,7 @@ private static function supportedOptions(Builder $builder): array
{
return Arr::only($builder->options, [
'from',
'source',
]);
}
}
2 changes: 1 addition & 1 deletion tests/TestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function setUp(): void

$this->withFactories(database_path('factories'));

Artisan::call('migrate:fresh', ['--database' => 'mysql']);
Artisan::call('migrate:fresh', ['--database' => env('DB_CONNECTION', 'mysql')]);
}

/**
Expand Down
12 changes: 12 additions & 0 deletions tests/Unit/ElasticSearch/SearchFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,16 @@ public function test_both_parameters_dont_take_effect_on_pagination(): void
$this->assertEquals($expectedSize, $search->getSize());
$this->assertEquals($expectedFrom, $search->getFrom());
}

public function test_source_can_be_set_from_options(): void
{
$builder = new Builder(new Product(), '*');
$builder->options([
'source' => $expectedFields = ['title', 'price'],
]);

$search = SearchFactory::create($builder);

$this->assertEquals($expectedFields, $search->isSource());
}
}
Loading