Update not searchable field test to fail on elastic and opensearch co…

…rrectly

packages/seal-elasticsearch-adapter/Tests/ElasticsearchSchemaManagerTest.php

@@ -35,7 +35,6 @@ public function testSimpleElasticsearchMapping(): void
         $this->assertSame([
             'id' => [
                 'type' => 'keyword',
-                'index' => false,
             ],
             'title' => [
                 'type' => 'text',
@@ -94,7 +93,6 @@ public function testComplexElasticsearchMapping(): void
             ],
             'categoryIds' => [
                 'type' => 'integer',
-                'index' => false,
             ],
             'comments' => [
                 'properties' => [
@@ -109,7 +107,6 @@ public function testComplexElasticsearchMapping(): void
             ],
             'commentsCount' => [
                 'type' => 'integer',
-                'index' => false,
             ],
             'created' => [
                 'type' => 'date',
@@ -142,9 +139,16 @@ public function testComplexElasticsearchMapping(): void
                     ],
                 ],
             ],
+            'internalTags' => [
+                'type' => 'text',
+                'fields' => [
+                    'raw' => [
+                        'type' => 'keyword',
+                    ],
+                ],
+            ],
             'rating' => [
                 'type' => 'float',
-                'index' => false,
             ],
             'tags' => [
                 'type' => 'text',
@@ -159,7 +163,6 @@ public function testComplexElasticsearchMapping(): void
             ],
             'uuid' => [
                 'type' => 'keyword',
-                'index' => false,
             ],
         ], $mapping[$index->name]['mappings']['properties']);
     }

packages/seal-opensearch-adapter/OpensearchSchemaManager.php

@@ -68,12 +68,13 @@ private function createPropertiesMapping(array $fields): array
         foreach ($fields as $name => $field) {
             // TODO recheck doc_values https://github.com/schranz-search/schranz-search/issues/65
             $index = $field->searchable || $field->filterable || $field->sortable;
+            $doc_values = $field->filterable || $field->sortable;
 
             match (true) {
                 $field instanceof Field\IdentifierField => $properties[$name] = [
                     'type' => 'keyword',
                     'index' => $index,
-                    'doc_values' => $field->filterable,
+                    'doc_values' => $doc_values,
                 ],
                 $field instanceof Field\TextField => $properties[$name] = \array_replace([
                     'type' => 'text',
@@ -82,30 +83,30 @@ private function createPropertiesMapping(array $fields): array
                     'fields' => [
                         'raw' => [
                             'type' => 'keyword',
-                            'index' => $field->searchable || $field->filterable,
-                            'doc_values' => $field->filterable,
+                            'index' => true,
+                            'doc_values' => true,
                         ],
                     ],
                 ] : []),
                 $field instanceof Field\BooleanField => $properties[$name] = [
                     'type' => 'boolean',
                     'index' => $index,
-                    'doc_values' => $field->filterable,
+                    'doc_values' => $doc_values,
                 ],
                 $field instanceof Field\DateTimeField => $properties[$name] = [
                     'type' => 'date',
                     'index' => $index,
-                    'doc_values' => $field->filterable,
+                    'doc_values' => $doc_values,
                 ],
                 $field instanceof Field\IntegerField => $properties[$name] = [
                     'type' => 'integer',
                     'index' => $index,
-                    'doc_values' => $field->filterable,
+                    'doc_values' => $doc_values,
                 ],
                 $field instanceof Field\FloatField => $properties[$name] = [
                     'type' => 'float',
                     'index' => $index,
-                    'doc_values' => $field->filterable,
+                    'doc_values' => $doc_values,
                 ],
                 $field instanceof Field\ObjectField => $properties[$name] = [
                     'type' => 'object',

packages/seal-opensearch-adapter/Tests/OpensearchSchemaManagerTest.php

@@ -139,6 +139,14 @@ public function testComplexOpensearchMapping(): void
                     ],
                 ],
             ],
+            'internalTags' => [
+                'type' => 'text',
+                'fields' => [
+                    'raw' => [
+                        'type' => 'keyword',
+                    ],
+                ],
+            ],
             'rating' => [
                 'type' => 'float',
             ],

packages/seal/Testing/AbstractConnectionTestCase.php

@@ -215,7 +215,7 @@ public function testNoneSearchableFields(): void
 
         $search = new SearchBuilder($schema, self::$connection);
         $search->addIndex(TestingHelper::INDEX_COMPLEX);
-        $search->addFilter(new Condition\SearchCondition('admin.nonesearchablefield@localhost'));
+        $search->addFilter(new Condition\SearchCondition('Nonesearchable'));
 
         $this->assertCount(0, [...$search->getResult()]);
     }

packages/seal/Testing/TestingHelper.php

@@ -53,6 +53,7 @@ public static function createSchema(): Schema
                 'text' => new Field\TextField('text'),
             ], multiple: true),
             'tags' => new Field\TextField('tags', multiple: true, filterable: true),
+            'internalTags' => new Field\TextField('internalTags', multiple: true, searchable: false, filterable: true),
             'categoryIds' => new Field\IntegerField('categoryIds', multiple: true, searchable: false, filterable: true),
         ];
 
@@ -138,6 +139,7 @@ public static function createComplexFixtures(): array
                     ],
                 ],
                 'tags' => ['Tech', 'UI'],
+                'internalTags' => ['Internal', 'Nonesearchable'],
                 'categoryIds' => [1, 2],
             ],
             [

packages/seal/Tests/Marshaller/MarshallerTest.php

@@ -88,6 +88,7 @@ private function getRawDocument(): array
                 ],
             ],
             'tags' => ['Tech', 'UI'],
+            'internalTags' => ['Internal', 'Nonesearchable'],
             'categoryIds' => [1, 2],
         ];
     }