Skip to content

Accept opensearch responses without a _source field #17

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
merged 1 commit into from
Jul 9, 2025
Merged

Accept opensearch responses without a _source field #17

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
24 changes: 14 additions & 10 deletions src/Driver/OpenSearch/OpenSearch.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,14 +150,16 @@ public function get(string $modelClass, mixed $id, ?ModelInterface $model = null
throw $e;
}

if (!isset($response->_source) || !is_object($response->_source)) {
throw new SerializeException("Received invalid document _source from OpenSearch");
}
if (!isset($response->_id) || !is_string($response->_id)) {
throw new SerializeException("Received invalid document _id from OpenSearch");
}

$data = get_object_vars($response->_source);
if (isset($response->_source) && is_object($response->_source)) {
$data = get_object_vars($response->_source);
} else {
$data = [];
}

$data[$modelClass::getIdField()] = $response->_id;

if ($model) {
Expand Down Expand Up @@ -214,19 +216,21 @@ public function search(Search $search): SearchResult

$result = new SearchResult(true);
foreach ($response->hits->hits as $resultDocument) {
if (!isset($resultDocument->_source) || !is_object($resultDocument->_source)) {
throw new SerializeException("Received invalid document _source from OpenSearch");
}
if (!isset($resultDocument->_id) || !is_string($resultDocument->_id)) {
throw new SerializeException("Received invalid document _id from OpenSearch");
}

$data = $resultDocument->_source;
$data->{$modelClassName::getIdField()} = $resultDocument->_id;
if (isset($resultDocument->_source) && is_object($resultDocument->_source)) {
$data = get_object_vars($resultDocument->_source);
} else {
$data = [];
}

$data[$modelClassName::getIdField()] = $resultDocument->_id;

/** @var ModelInterface $model */
$model = new $modelClassName();
$model->applyData(get_object_vars($resultDocument->_source));
$model->applyData($data);
$result->add($model);
}
return $result;
Expand Down
Loading