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

Support for script fields #204

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

Support for script fields #204

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
2 changes: 1 addition & 1 deletion src/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Client extends ElasticaClient
private IndexNameMapper $indexNameMapper;

/**
* @see \JoliCode\Elastically\Factory::buildClient
* @see Factory::buildClient
*/
public function __construct($config = [], ?LoggerInterface $logger = null, ?ResultSetBuilder $resultSetBuilder = null, ?IndexNameMapper $indexNameMapper = null)
{
Expand Down
15 changes: 8 additions & 7 deletions src/ResultSetBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ public function buildResultSet(Response $response, Query $query): ResultSet
* @throws ExceptionInterface
* @throws SerializerExceptionInterface
*/
public function buildModelFromIndexAndData(string $indexName, $source)
public function buildModelFromIndexAndData(string $indexName, $source, $fields)
{
return $this->buildModel($source, $indexName, []);
return $this->buildModel($source, $fields, $indexName, []);
}

/**
Expand All @@ -75,7 +75,7 @@ public function buildModelFromIndexAndData(string $indexName, $source)
*/
public function buildModelFromDocument(ElasticaDocument $document)
{
return $this->buildModel($document->getData(), $document->getIndex(), [
return $this->buildModel($document->getData(), $document->hasFields() ? $document->getFields() : [], $document->getIndex(), [
self::DOCUMENT_KEY => $document,
]);
}
Expand All @@ -90,7 +90,7 @@ private function buildModelFromResult(Result $result)
throw new RuntimeException('Returned index is empty. Check your "filter_path".');
}

return $this->buildModel($result->getSource(), $result->getIndex(), [
return $this->buildModel($result->getSource(), $result->hasFields() ? $result->getFields() : [], $result->getIndex(), [
self::RESULT_KEY => $result,
]);
}
Expand All @@ -99,16 +99,17 @@ private function buildModelFromResult(Result $result)
* @throws ExceptionInterface
* @throws SerializerExceptionInterface
*/
private function buildModel($source, string $indexName, array $context)
private function buildModel($source, $fields, string $indexName, array $context)
{
if (!$source) {
if (!$source && !$fields) {
return null;
}

$class = $this->indexNameMapper->getClassFromIndexName($this->indexNameMapper->getPureIndexName($indexName));

$context = array_merge($this->contextBuilder->buildContext($class), $context);
$fieldsFlat = array_map(fn ($field) => reset($field), $fields);

return $this->denormalizer->denormalize($source, $class, null, $context);
return $this->denormalizer->denormalize(array_merge($source, $fieldsFlat), $class, null, $context);
}
}
2 changes: 1 addition & 1 deletion tests/ResultSetBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ public function testBuildModelFromIndexAndData(): void
;

$resultSetBuilder = new ResultSetBuilder($indexNameMapper, $contextBuilder, $denormalizer);
$resultSetBuilder->buildModelFromIndexAndData('indexName', ['id' => 1234]);
$resultSetBuilder->buildModelFromIndexAndData('indexName', ['id' => 1234], []);
}
}
39 changes: 39 additions & 0 deletions tests/SearchTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

use Elastica\Document as ElasticaDocument;
use Elastica\Query;
use Elastica\Script\Script;
use Elastica\Script\ScriptFields;
use JoliCode\Elastically\Factory;
use JoliCode\Elastically\Model\Document;
use JoliCode\Elastically\Result;
Expand Down Expand Up @@ -123,6 +125,43 @@ public function testMyOwnSerializer(): void
$this->assertInstanceOf(ElasticaDocument::class, $results->getDocuments()[0]);
$this->assertInstanceOf(SearchTestDto::class, $results->getResults()[0]->getModel());
}

public function testSearchWithScriptedField(): void
{
$indexName = mb_strtolower(__FUNCTION__);

$factory = $this->getFactory(null, [
Factory::CONFIG_INDEX_CLASS_MAPPING => [
$indexName => SearchTestDto::class,
],
]);
$indexer = $factory->buildIndexer();
$client = $factory->buildClient();

$dto = new SearchTestDto();
$dto->bar = 'coucou unicorns';

$indexer->scheduleIndex($indexName, new Document('f', $dto));
$indexer->flush();

$indexer->refresh($indexName);

$query = Query::create('unicorns');
$query->setSource(true);

$scriptField = new Script('params._source.bar == \'coucou unicorns\'');
$scriptFields = new ScriptFields();
$scriptFields->addScript('foo', $scriptField);
$query->setScriptFields($scriptFields);
$results = $client->getIndex($indexName)->search($query);

$this->assertSame(1, $results->getTotalHits());

$this->assertInstanceOf(Result::class, $results->getResults()[0]);
$this->assertInstanceOf(ElasticaDocument::class, $results->getDocuments()[0]);
$this->assertInstanceOf(SearchTestDto::class, $results->getResults()[0]->getModel());
$this->assertTrue($results->getResults()[0]->getModel()->foo);
}
}

class SearchTestDummySerializer implements SerializerInterface, DenormalizerInterface
Expand Down
Loading