Merge remote-tracking branch 'tier4/ACP2E-2857' into PR_10_JAN_2024

Author: o-dubovyk

app/code/Magento/Catalog/Model/Category/Attribute/Backend/DefaultSortby.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Category\Attribute\Backend;
+
+class DefaultSortby extends Sortby
+{
+}

app/code/Magento/Catalog/Setup/Patch/Data/UpdateDefaultSortyByBackendType.php

@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Setup\Patch\Data;
+
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\Catalog\Setup\CategorySetupFactory;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchInterface;
+
+class UpdateDefaultSortyByBackendType implements DataPatchInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CategorySetupFactory
+     */
+    private $categorySetupFactory;
+
+    /**
+     * PatchInitial constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param CategorySetupFactory $categorySetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        CategorySetupFactory $categorySetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->categorySetupFactory = $categorySetupFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply(): UpdateDefaultSortyByBackendType
+    {
+        $mediaBackendModel = \Magento\Catalog\Model\Category\Attribute\Backend\DefaultSortby::class;
+        /** @var CategorySetup $categorySetup */
+        $categorySetup = $this->categorySetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $categorySetup->updateAttribute(
+            'catalog_category',
+            'default_sort_by',
+            'backend_model',
+            $mediaBackendModel
+        );
+
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}

app/code/Magento/Catalog/Test/Fixture/Category.php

@@ -27,7 +27,7 @@ class Category implements RevertibleDataFixtureInterface
         'include_in_menu' => true,
         'available_sort_by' => [],
         'custom_attributes' => [
-            'default_sort_by' => ['name']
+            'default_sort_by' => 'position'
         ],
         'extension_attributes' => [],
         'created_at' => null,

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

@@ -740,6 +740,7 @@
                 <item name="Magento\Catalog\Model\Product\Attribute\Backend\Category" xsi:type="string">int[]</item>
                 <item name="Magento\Catalog\Model\Product\Attribute\Backend\Stock" xsi:type="string">Magento\CatalogInventory\Api\Data\StockItemInterface[]</item>
                 <item name="Magento\Catalog\Model\Category\Attribute\Backend\Sortby" xsi:type="string">string[]</item>
+                <item name="Magento\Catalog\Model\Category\Attribute\Backend\DefaultSortby" xsi:type="string">string</item>
             </argument>
         </arguments>
     </type>

dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php

@@ -269,20 +269,21 @@ public function testUpdate()
         $this->createdCategories = [$categoryId];
     }
 
-    /**
-     * @magentoApiDataFixture Magento/Catalog/_files/category.php
-     */
+    #[
+        DataFixture(CategoryFixture::class, as: 'category')
+    ]
     public function testUpdateWithDefaultSortByAttribute()
     {
-        $categoryId = 333;
+        $category = $this->fixtures->get('category');
+        $categoryId = $category->getId();
         $categoryData = [
             'name' => 'Update Category Test With default_sort_by Attribute',
             'is_active' => true,
             "available_sort_by" => [],
             'custom_attributes' => [
                 [
                     'attribute_code' => 'default_sort_by',
-                    'value' => ["name"],
+                    'value' => "price"
                 ],
             ],
         ];
@@ -293,7 +294,7 @@ public function testUpdateWithDefaultSortByAttribute()
         $category = $model->load($categoryId);
         $this->assertTrue((bool)$category->getIsActive(), 'Category "is_active" must equal to true');
         $this->assertEquals("Update Category Test With default_sort_by Attribute", $category->getName());
-        $this->assertEquals("name", $category->getDefaultSortBy());
+        $this->assertEquals("price", $category->getDefaultSortBy());
         $this->createdCategories = [$categoryId];
     }
 

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductAttributeTypeTest.php

@@ -156,7 +156,7 @@ public function testComplexAttributeTypeResolver()
             'catalog_product'
         ];
         $attributeTypes = [
-            'String[]',
+            'String',
             'String[]',
             'Int',
             'CatalogInventoryDataStockItemInterface[]',

dev/tests/integration/framework/Magento/TestFramework/ApplicationStateComparator/_files/state-skip-list.php

@@ -314,6 +314,7 @@
         Magento\Catalog\Model\Category\Attribute\Backend\Image\Interceptor::class => null,
         Magento\Catalog\Model\Attribute\Backend\Startdate\Interceptor::class => null,
         Magento\Eav\Model\Entity\Attribute\Backend\Datetime\Interceptor::class => null,
+        Magento\Catalog\Model\Category\Attribute\Backend\DefaultSortby\Interceptor::class => null,
         Magento\Catalog\Model\Category\Attribute\Backend\Sortby\Interceptor::class => null,
         Magento\Catalog\Model\Category\Attribute\Backend\LayoutUpdate\Interceptor::class => null,
         Magento\Catalog\Model\Attribute\Backend\Customlayoutupdate\Interceptor::class => null,

dev/tests/integration/testsuite/Magento/Eav/Model/TypeLocatorTest.php

@@ -193,7 +193,7 @@ public function getExpectedAttributeTypesProvider(): array
                     'custom_design_to' => 'string',
                     'available_sort_by' => 'string[]',
                     'page_layout' => 'string',
-                    'default_sort_by' => 'string[]',
+                    'default_sort_by' => 'string',
                     'filter_price_range' => 'double',
                     'custom_layout_update' => 'string',
                 ]