MC-16239: Search result page contain 24k results

- fix default template for mapping

Author: vgoncharenko

app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php

@@ -266,6 +266,16 @@ public function addFieldsMapping(array $fields, $index, $entityType)
                                 ],
                             ],
                         ],
+                        [
+                            'position_mapping' => [
+                                'match' => 'position_*',
+                                'match_mapping_type' => 'string',
+                                'mapping' => [
+                                    'type' => 'integer',
+                                    'index' => false,
+                                ],
+                            ],
+                        ],
                         [
                             'string_mapping' => [
                                 'match' => '*',
@@ -275,16 +285,7 @@ public function addFieldsMapping(array $fields, $index, $entityType)
                                     'index' => false,
                                 ]),
                             ],
-                        ],
-                        [
-                            'position_mapping' => [
-                                'match' => 'position_*',
-                                'match_mapping_type' => 'string',
-                                'mapping' => [
-                                    'type' => 'int',
-                                ],
-                            ],
-                        ],
+                        ]
                     ],
                 ],
             ],

app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php

@@ -252,29 +252,31 @@ public function addFieldsMapping(array $fields, $index, $entityType)
                                 'match' => 'price_*',
                                 'match_mapping' => 'string',
                                 'mapping' => [
-                                    'type' => 'float'
+                                    'type' => 'float',
+                                    'store' => true
                                 ],
                             ],
                         ],
                         [
-                            'string_mapping' => [
-                                'match' => '*',
+                            'position_mapping' => [
+                                'match' => 'position_*',
                                 'match_mapping' => 'string',
                                 'mapping' => [
-                                    'type' => 'string',
+                                    'type' => 'integer',
                                     'index' => 'no'
                                 ],
                             ],
                         ],
                         [
-                            'position_mapping' => [
-                                'match' => 'position_*',
+                            'string_mapping' => [
+                                'match' => '*',
                                 'match_mapping' => 'string',
                                 'mapping' => [
-                                    'type' => 'int'
+                                    'type' => 'string',
+                                    'index' => 'no'
                                 ],
                             ],
-                        ],
+                        ]
                     ],
                 ],
             ],

app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php

@@ -362,21 +362,22 @@ public function testAddFieldsMapping()
                                 ],
                             ],
                             [
-                                'string_mapping' => [
-                                    'match' => '*',
+                                'position_mapping' => [
+                                    'match' => 'position_*',
                                     'match_mapping_type' => 'string',
                                     'mapping' => [
-                                        'type' => 'text',
-                                        'index' => false,
+                                        'type' => 'integer',
+                                        'index' => false
                                     ],
                                 ],
                             ],
                             [
-                                'position_mapping' => [
-                                    'match' => 'position_*',
+                                'string_mapping' => [
+                                    'match' => '*',
                                     'match_mapping_type' => 'string',
                                     'mapping' => [
-                                        'type' => 'int',
+                                        'type' => 'text',
+                                        'index' => false,
                                     ],
                                 ],
                             ],
@@ -429,24 +430,25 @@ public function testAddFieldsMappingFailure()
                                 ],
                             ],
                             [
-                                'string_mapping' => [
-                                    'match' => '*',
+                                'position_mapping' => [
+                                    'match' => 'position_*',
                                     'match_mapping_type' => 'string',
                                     'mapping' => [
-                                        'type' => 'text',
-                                        'index' => false,
+                                        'type' => 'integer',
+                                        'index' => false
                                     ],
                                 ],
                             ],
                             [
-                                'position_mapping' => [
-                                    'match' => 'position_*',
+                                'string_mapping' => [
+                                    'match' => '*',
                                     'match_mapping_type' => 'string',
                                     'mapping' => [
-                                        'type' => 'int',
+                                        'type' => 'text',
+                                        'index' => false,
                                     ],
                                 ],
-                            ],
+                            ]
                         ],
                     ],
                 ],

app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php

@@ -262,22 +262,23 @@ public function addFieldsMapping(array $fields, $index, $entityType)
                             ],
                         ],
                         [
-                            'string_mapping' => [
-                                'match' => '*',
+                            'position_mapping' => [
+                                'match' => 'position_*',
                                 'match_mapping_type' => 'string',
                                 'mapping' => [
-                                    'type' => 'text',
+                                    'type' => 'integer',
                                     'index' => false,
-                                    'copy_to' => '_search'
                                 ],
                             ],
                         ],
                         [
-                            'position_mapping' => [
-                                'match' => 'position_*',
+                            'string_mapping' => [
+                                'match' => '*',
                                 'match_mapping_type' => 'string',
                                 'mapping' => [
-                                    'type' => 'int',
+                                    'type' => 'text',
+                                    'index' => false,
+                                    'copy_to' => '_search'
                                 ],
                             ],
                         ],

app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php

@@ -361,25 +361,26 @@ public function testAddFieldsMapping()
                                 ],
                             ],
                             [
-                                'string_mapping' => [
-                                    'match' => '*',
+                                'position_mapping' => [
+                                    'match' => 'position_*',
                                     'match_mapping_type' => 'string',
                                     'mapping' => [
-                                        'type' => 'text',
-                                        'index' => false,
-                                        'copy_to' => '_search'
+                                        'type' => 'integer',
+                                        'index' => false
                                     ],
                                 ],
                             ],
                             [
-                                'position_mapping' => [
-                                    'match' => 'position_*',
+                                'string_mapping' => [
+                                    'match' => '*',
                                     'match_mapping_type' => 'string',
                                     'mapping' => [
-                                        'type' => 'int',
+                                        'type' => 'text',
+                                        'index' => false,
+                                        'copy_to' => '_search'
                                     ],
                                 ],
-                            ],
+                            ]
                         ],
                     ],
                 ],
@@ -428,25 +429,26 @@ public function testAddFieldsMappingFailure()
                                 ],
                             ],
                             [
-                                'string_mapping' => [
-                                    'match' => '*',
+                                'position_mapping' => [
+                                    'match' => 'position_*',
                                     'match_mapping_type' => 'string',
                                     'mapping' => [
-                                        'type' => 'text',
-                                        'index' => false,
-                                        'copy_to' => '_search'
+                                        'type' => 'integer',
+                                        'index' => false
                                     ],
                                 ],
                             ],
                             [
-                                'position_mapping' => [
-                                    'match' => 'position_*',
+                                'string_mapping' => [
+                                    'match' => '*',
                                     'match_mapping_type' => 'string',
                                     'mapping' => [
-                                        'type' => 'int',
+                                        'type' => 'text',
+                                        'index' => false,
+                                        'copy_to' => '_search'
                                     ],
                                 ],
-                            ],
+                            ]
                         ],
                     ],
                 ],