Skip to content

Commit 517efb1

Browse files
committed
Update adapter API usage
1 parent 147c674 commit 517efb1

4 files changed

Lines changed: 10 additions & 19 deletions

File tree

src/Engine.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,6 @@ public function createIndex($name, array $options = []): void
151151
*/
152152
public function deleteIndex($name): void
153153
{
154-
$this->indexManager->drop($name);
154+
$this->indexManager->delete($name);
155155
}
156156
}

tests/Integration/OpenSearchScoutDriverTest.php

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22

33
use DirectoryTree\OpenSearchAdapter\Indices\IndexManager;
4+
use DirectoryTree\OpenSearchAdapter\Indices\Mapping;
45
use DirectoryTree\OpenSearchScoutDriver\Tests\Fixtures\Client;
56
use Illuminate\Database\Schema\Blueprint;
67
use Illuminate\Support\Facades\Schema;
@@ -26,30 +27,20 @@
2627
$this->indexManager = app(IndexManager::class);
2728

2829
if ($this->indexManager->exists($this->indexName)) {
29-
$this->indexManager->drop($this->indexName);
30+
$this->indexManager->delete($this->indexName);
3031
}
3132

3233
app(EngineManager::class)->engine('opensearch')->createIndex($this->indexName);
3334

34-
$this->indexManager->putMappingRaw($this->indexName, [
35-
'properties' => [
36-
'name' => [
37-
'type' => 'text',
38-
'fielddata' => true,
39-
],
40-
'email' => [
41-
'type' => 'keyword',
42-
],
43-
'__soft_deleted' => [
44-
'type' => 'integer',
45-
],
46-
],
47-
]);
35+
$this->indexManager->putMapping($this->indexName, (new Mapping)
36+
->text('name', ['fielddata' => true])
37+
->keyword('email')
38+
->integer('__soft_deleted'));
4839
});
4940

5041
afterEach(function (): void {
5142
if (isset($this->indexManager, $this->indexName) && $this->indexManager->exists($this->indexName)) {
52-
$this->indexManager->drop($this->indexName);
43+
$this->indexManager->delete($this->indexName);
5344
}
5445

5546
Schema::dropIfExists('clients');

tests/Unit/EngineTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
it('creates and deletes indexes', function () {
135135
$indexManager = Mockery::mock(IndexManager::class);
136136
$indexManager->shouldReceive('create')->once()->with(Mockery::type(IndexBlueprint::class));
137-
$indexManager->shouldReceive('drop')->once()->with('clients');
137+
$indexManager->shouldReceive('delete')->once()->with('clients');
138138

139139
$engine = new Engine(
140140
Mockery::mock(DocumentManager::class),

tests/Unit/Factories/DocumentFactoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
expect($documents)->toHaveCount(2)
1717
->and($documents->first())->toBeInstanceOf(Document::class)
1818
->and($documents->first()->id())->toBe('1')
19-
->and($documents->first()->content())->toBe(['name' => 'John', 'email' => 'john@example.com']);
19+
->and($documents->first()->source())->toBe(['name' => 'John', 'email' => 'john@example.com']);
2020
});
2121

2222
it('rejects restricted document fields', function () {

0 commit comments

Comments
 (0)