Merge remote-tracking branch 'origin/AC-13691' into spartans_pr_28042025

Author: glo60612

app/code/Magento/OpenSearch/Plugin/SearchAdapter/Query/Builder/MatchQueryPlugin.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\OpenSearch\Plugin\SearchAdapter\Query\Builder;
+
+use Magento\Elasticsearch\SearchAdapter\Query\Builder\QueryInterface as BaseMatchQuery;
+use Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider;
+
+/**
+ * Modifications for sanitize search query and output result when name attribute disabled from search
+ */
+class MatchQueryPlugin
+{
+    /**
+     * @var DataProvider
+     */
+    private $dataProvider;
+
+    /**
+     * Constructor
+     *
+     * @param DataProvider $dataProvider
+     */
+    public function __construct(
+        DataProvider $dataProvider
+    ) {
+        $this->dataProvider = $dataProvider;
+    }
+
+    /**
+     * After build plugin to modify selectQuery
+     *
+     * @param BaseMatchQuery $subject
+     * @param array $selectQuery
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterBuild(
+        BaseMatchQuery $subject,
+        $selectQuery,
+    ): array {
+
+        $nameIsSearchable = $this->dataProvider->getSearchableAttribute('name')->getIsSearchable();
+        if ($nameIsSearchable == 0) {
+            if (isset($selectQuery['bool']['should'][0]['match_phrase_prefix']['name']['query'])) {
+                $requestQueryValue = $selectQuery['bool']['should'][0]['match_phrase_prefix']['name']['query'];
+                if (!empty($requestQueryValue) &&
+                    str_contains($requestQueryValue, ' ') || str_contains($requestQueryValue, '-')) {
+                    $requestQueryValue = str_replace(['-', ' '], '', $requestQueryValue);
+                }
+                $selectQuery['bool']['should'][0]['match_phrase_prefix']['name']['query'] = $requestQueryValue;
+            }
+        }
+        return $selectQuery;
+    }
+}

app/code/Magento/OpenSearch/etc/di.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -287,4 +287,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Elasticsearch\SearchAdapter\Query\Builder\QueryInterface">
+        <plugin name="sanitize_search_string" type="Magento\OpenSearch\Plugin\SearchAdapter\Query\Builder\MatchQueryPlugin" />
+    </type>
 </config>