-
Notifications
You must be signed in to change notification settings - Fork 340
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.
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
Fix: typesense missing scoutmetadata #868
Draft
arminwinkt
wants to merge
11
commits into
laravel:10.x
Choose a base branch
from
arminwinkt:fix/typesense-missing-scoutmetadata
base: 10.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+159
−0
Draft
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
7c4fd18
fix: missing scout metadata for typesense search
arminwinkt acb57e3
Merge pull request #1 from arminwinkt/fix/typesenses-missing-metadata
arminwinkt 27191c8
Revert "fix: missing scout metadata for typesense search"
arminwinkt e3283cb
Merge pull request #2 from arminwinkt/revert-1-fix/typesenses-missing…
arminwinkt 8e70c54
fix: missing scout metadata for typesense search
arminwinkt 558ff31
fix: add more unittest for mapping scout metadata
arminwinkt 3841436
Merge branch 'laravel:10.x' into 10.x
arminwinkt bddac47
Merge branch '10.x' into fix/typesense-missing-scoutmetadata
arminwinkt bcbc773
fix: add more unittest for mapping scout metadata
arminwinkt c8a7bb8
fix: add more unittest for mapping scout metadata
arminwinkt 5fd05e0
fix: add more unittest for mapping scout metadata
arminwinkt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -392,6 +392,19 @@ public function map(Builder $builder, $results, $model) | |
->filter(static function ($model) use ($objectIds) { | ||
return in_array($model->getScoutKey(), $objectIds, false); | ||
}) | ||
->map(static function ($model) use ($hits, $objectIdPositions) { | ||
$result = $hits[$objectIdPositions[$model->getScoutKey()]] ?? []; | ||
|
||
foreach ($result as $key => $value) { | ||
if ($key === 'document') { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you add a test for this case specifically? |
||
continue; | ||
} | ||
|
||
$model->withScoutMetadata($key, $value); | ||
} | ||
|
||
return $model; | ||
}) | ||
->sortBy(static function ($model) use ($objectIdPositions) { | ||
return $objectIdPositions[$model->getScoutKey()]; | ||
}) | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -183,6 +183,42 @@ public function test_map_ids_method(): void | |
$this->assertEquals([1, 2, 3], $mappedIds->toArray()); | ||
} | ||
|
||
public function test_map_correctly_maps_results_to_models() | ||
{ | ||
$engine = new TypesenseEngine($this->createMock(TypesenseClient::class)); | ||
|
||
$model = m::mock(stdClass::class); | ||
$model->shouldReceive(['getScoutKeyName' => 'id']); | ||
$model->shouldReceive('getScoutModelsByIds')->andReturn( | ||
Collection::make([ | ||
new SearchableModel([ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you add some more response data to verify handling of multiple results? |
||
'id' => 1, | ||
'name' => 'test', | ||
]), | ||
]) | ||
); | ||
|
||
$builder = m::mock(Builder::class); | ||
|
||
$results = $engine->map($builder, [ | ||
'found' => 1, | ||
'hits' => [ | ||
[ | ||
'document' => ['id' => 1, 'name' => 'test'], | ||
'geo_distance_meters' => ['location' => 5], | ||
'highlights' => [], | ||
], | ||
], | ||
], $model); | ||
|
||
$this->assertCount(1, $results); | ||
$this->assertEquals(['id' => 1, 'name' => 'test'], $results->first()->toArray()); | ||
$this->assertEquals( | ||
['geo_distance_meters' => ['location' => 5], 'highlights' => []], | ||
$results->first()->scoutMetadata() | ||
); | ||
} | ||
|
||
public function test_get_total_count_method(): void | ||
{ | ||
// Sample search results with 'found' key | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There should be a test for the fallback of the empty array