Merge pull request #5679 from magento-honey-badgers/MC-21228

[honey] 2.4.0 Combined PR

Author: cpartica

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdvanceCatalogSearchBundleBySkuWithHyphenTest.xml

@@ -19,7 +19,7 @@
             <group value="Bundle"/>
             <group value="SearchEngineElasticsearch"/>
             <skip>
-                <issueId value="MC-21228"/>
+                <issueId value="MC-34217"/>
             </skip>
         </annotations>
         <before>

app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

@@ -35,6 +35,10 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
+    <entity name="ApiSimpleProductWithNoSpace" type="product" extends="ApiSimpleProduct">
+        <data key="name">TestFooBar</data>
+        <data key="sku" unique="suffix">foobar</data>
+    </entity>
     <entity name="ApiSimpleProductWithSpecCharInName" type="product" extends="ApiSimpleProduct">
         <data key="name">Pursuit Lumaflex&#38;trade; Tone Band</data>
         <data key="sku" unique="suffix">x&#38;trade;</data>
@@ -68,6 +72,9 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
+    <entity name="ProductForPartialSearch" extends="SimpleProduct" type="product">
+        <data key="sku">partialTestSku</data>
+    </entity>
     <entity name="ProductWithSpecialSymbols" extends="SimpleProduct" type="product">
         <data key="name">SimpleProduct -+~/\\&lt;&gt;\’“:*\$#@()!,.?`=%&amp;^</data>
     </entity>

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontAdvanceCatalogSearchSimpleProductBySkuWithHyphenTest.xml

@@ -19,7 +19,7 @@
             <group value="Catalog"/>
             <group value="SearchEngineElasticsearch"/>
             <skip>
-                <issueId value="MC-21228"/>
+                <issueId value="MC-34217"/>
             </skip>
         </annotations>
         <before>

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontAdvanceCatalogSearchVirtualProductBySkuWithHyphenTest.xml

@@ -19,7 +19,7 @@
             <group value="Catalog"/>
             <group value="SearchEngineElasticsearch"/>
             <skip>
-                <issueId value="MC-21228"/>
+                <issueId value="MC-34217"/>
             </skip>
         </annotations>
         <before>

app/code/Magento/CatalogCmsGraphQl/Model/Resolver/Category/Block.php

@@ -11,6 +11,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\CmsGraphQl\Model\Resolver\DataProvider\Block as BlockProvider;
@@ -48,18 +49,19 @@ public function resolve(
         }
         /** @var Category $category */
         $category = $value['model'];
-        $blockId = $category->getLandingPage();
+        $blockId = (int)$category->getLandingPage();
+        $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
 
         if (empty($blockId)) {
             return null;
         }
 
         try {
-            $block = $this->blockProvider->getData($blockId);
+            $blockData = $this->blockProvider->getBlockById($blockId, $storeId);
         } catch (NoSuchEntityException $e) {
-            return null;
+            return new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
         }
 
-        return $block;
+        return $blockData;
     }
 }

app/code/Magento/CatalogGraphQl/etc/schema.graphqls

@@ -245,7 +245,7 @@ interface CategoryInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model
     level: Int @doc(description: "Indicates the depth of the category within the tree.")
     created_at: String @doc(description: "Timestamp indicating when the category was created.")
     updated_at: String @doc(description: "Timestamp indicating when the category was updated.")
-    product_count: Int @doc(description: "The number of products in the category.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\ProductsCount")
+    product_count: Int @doc(description: "The number of products in the category that are marked as visible. By default, in complex products, parent products are visible, but their child products are not.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\ProductsCount")
     default_sort_by: String @doc(description: "The attribute to use for sorting.")
     products(
         pageSize: Int = 20 @doc(description: "Specifies the maximum number of results to return at once. This attribute is optional."),
@@ -299,7 +299,7 @@ type SimpleProduct implements ProductInterface, PhysicalProductInterface, Custom
 type Products @doc(description: "The Products object is the top-level object returned in a product search.") {
     items: [ProductInterface] @doc(description: "An array of products that match the specified search criteria.")
     page_info: SearchResultPageInfo @doc(description: "An object that includes the page_info and currentPage values specified in the query.")
-    total_count: Int @doc(description: "The number of products returned.")
+    total_count: Int @doc(description: "The number of products that are marked as visible. By default, in complex products, parent products are visible, but their child products are not.")
     filters: [LayerFilter] @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\LayerFilters") @doc(description: "Layered navigation filters array.") @deprecated(reason: "Use aggregations instead")
     aggregations: [Aggregation] @doc(description: "Layered navigation aggregations.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Aggregations")
     sort_fields: SortFields @doc(description: "An object that includes the default sort field and all available sort fields.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\SortFields")
@@ -308,7 +308,7 @@ type Products @doc(description: "The Products object is the top-level object ret
 type CategoryProducts @doc(description: "The category products object returned in the Category query.") {
     items: [ProductInterface] @doc(description: "An array of products that are assigned to the category.")
     page_info: SearchResultPageInfo @doc(description: "An object that includes the page_info and currentPage values specified in the query.")
-    total_count: Int @doc(description: "The number of products returned.")
+    total_count: Int @doc(description: "The number of products in the category that are marked as visible. By default, in complex products, parent products are visible, but their child products are not.")
 }
 
 input ProductAttributeFilterInput @doc(description: "ProductAttributeFilterInput defines the filters to be used in the search. A filter contains at least one attribute, a comparison operator, and the value that is being searched for.") {

app/code/Magento/CatalogGraphQl/etc/search_request.xml

@@ -15,6 +15,7 @@
         <queries>
             <query xsi:type="boolQuery" name="graphql_product_search_with_aggregation" boost="1">
                 <queryReference clause="should" ref="search" />
+                <queryReference clause="should" ref="partial_search" />
                 <queryReference clause="must" ref="category"/>
                 <queryReference clause="must" ref="price"/>
                 <queryReference clause="must" ref="visibility"/>
@@ -23,6 +24,11 @@
                 <match field="sku"/>
                 <match field="*"/>
             </query>
+            <query xsi:type="matchQuery" value="$search_term$" name="partial_search">
+                <match field="*"/>
+                <match field="name" matchCondition="match_phrase_prefix"/>
+                <match field="sku" matchCondition="match_phrase_prefix"/>
+            </query>
             <query name="category" xsi:type="filteredQuery">
                 <filterReference clause="must" ref="category_filter"/>
             </query>
@@ -61,6 +67,7 @@
         <queries>
             <query xsi:type="boolQuery" name="graphql_product_search" boost="1">
                 <queryReference clause="should" ref="search" />
+                <queryReference clause="should" ref="partial_search" />
                 <queryReference clause="must" ref="category"/>
                 <queryReference clause="must" ref="price"/>
                 <queryReference clause="must" ref="visibility"/>
@@ -69,6 +76,11 @@
                 <match field="sku"/>
                 <match field="*"/>
             </query>
+            <query xsi:type="matchQuery" value="$search_term$" name="partial_search">
+                <match field="*"/>
+                <match field="name" matchCondition="match_phrase_prefix"/>
+                <match field="sku" matchCondition="match_phrase_prefix"/>
+            </query>
             <query name="category" xsi:type="filteredQuery">
                 <filterReference clause="must" ref="category_filter"/>
             </query>

app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml

@@ -19,13 +19,11 @@
             <useCaseId value="MAGETWO-58764"/>
             <group value="CatalogSearch"/>
             <group value="SearchEngineElasticsearch"/>
-            <skip>
-                <issueId value="MC-21228"/>
-            </skip>
+
         </annotations>
         <before>
             <createData entity="ApiCategory" stepKey="createCategory"/>
-            <createData entity="ApiSimpleProduct" stepKey="createProduct">
+            <createData entity="productAlphabeticalB" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -39,7 +37,8 @@
         <actionGroup ref="SetMinimalQueryLengthActionGroup" stepKey="setMinQueryLength"/>
         <comment userInput="Go to Storefront and search for product" stepKey="searchProdUsingMinQueryLength"/>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
-        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="s" stepKey="fillAttribute"/>
+        <comment userInput="Quick search by single character and avoid using ES stopwords" stepKey="commentQuickSearch"/>
+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="B" stepKey="fillAttribute"/>
         <waitForPageLoad stepKey="waitForSearchTextBox"/>
         <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
         <waitForPageLoad stepKey="waitForSearch"/>

app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchProductByNameWithThreeLettersTest.xml

@@ -17,9 +17,6 @@
             <group value="CatalogSearch"/>
             <group value="SearchEngineElasticsearch"/>
             <group value="mtf_migrated"/>
-            <skip>
-                <issueId value="MC-21228"/>
-            </skip>
         </annotations>
         <executeJS function="var s = '$createSimpleProduct.name$'; var ret=s.substring(0,3); return ret;" stepKey="getFirstThreeLetters" before="searchStorefront"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">

app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchTwoProductsWithSameWeightTest.xml

@@ -17,9 +17,6 @@
             <group value="CatalogSearch"/>
             <group value="SearchEngineElasticsearch"/>
             <group value="mtf_migrated"/>
-            <skip>
-                <issueId value="MC-21228"/>
-            </skip>
         </annotations>
         <before>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
@@ -31,7 +28,6 @@
             </createData>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
 
-
             <!-- Create and Assign Attribute to product1-->
             <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToProduct1">
                 <argument name="productId" value="$product1.id$"/>
@@ -79,18 +75,19 @@
             <deleteData stepKey="deleteProduct1" createDataKey="product1"/>
             <deleteData stepKey="deleteProduct2" createDataKey="product2"/>
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
+
         </after>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="{{_defaultProduct.name}}"/>
         </actionGroup>
         <actionGroup ref="StorefrontQuickSearchCheckProductNameInGridActionGroup" stepKey="assertProduct1Position">
             <argument name="productName" value="$product1.name$"/>
-            <argument name="index" value="2"/>
+            <argument name="index" value="1"/>
         </actionGroup>
         <actionGroup ref="StorefrontQuickSearchCheckProductNameInGridActionGroup" stepKey="assertProduct2Position">
             <argument name="productName" value="$product2.name$"/>
-            <argument name="index" value="1"/>
+            <argument name="index" value="2"/>
         </actionGroup>
     </test>
 </tests>