Merge remote-tracking branch 'origin/2.4-develop' into Arrows_Delivery_07162024

Author: nishant04412

app/code/Magento/Authorization/Test/Fixture/Role.php

@@ -13,6 +13,7 @@
 use Magento\Authorization\Model\RulesFactory;
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Framework\DataObject;
+use Magento\TestFramework\Fixture\Api\DataMerger;
 use Magento\TestFramework\Fixture\Data\ProcessorInterface;
 use Magento\TestFramework\Fixture\RevertibleDataFixtureInterface;
 
@@ -25,13 +26,16 @@ class Role implements RevertibleDataFixtureInterface
         'role_name' => 'Role Name %uniqid%',
         'role_type' => Group::ROLE_TYPE,
         'user_id' => 0,
-        'user_type' => UserContextInterface::USER_TYPE_ADMIN
+        'user_type' => UserContextInterface::USER_TYPE_ADMIN,
+        'pid' => 0,
+        'gws_is_all' => 1,
+        'gws_websites' => null,
+        'gws_store_groups' => null,
+        'resources' => self::RESOURCES
     ];
 
-    private const DEFAULT_DATA_RULES = [
-        'id' => null,
-        'role_id' => null,
-        'resources' => ['Magento_Backend::all']
+    private const RESOURCES = [
+        'Magento_Backend::all'
     ];
 
     /**
@@ -54,39 +58,59 @@ class Role implements RevertibleDataFixtureInterface
      */
     private $rulesFactory;
 
+    /**
+     * @var DataMerger
+     */
+    private $dataMerger;
+
     /**
      * @param RoleFactory $roleFactory
      * @param RoleResource $roleResourceModel
      * @param RulesFactory $rulesFactory
      * @param ProcessorInterface $dataProcessor
+     * @param DataMerger $dataMerger
      */
     public function __construct(
         RoleFactory        $roleFactory,
         RoleResource       $roleResourceModel,
         RulesFactory       $rulesFactory,
-        ProcessorInterface $dataProcessor
+        ProcessorInterface $dataProcessor,
+        DataMerger         $dataMerger
     ) {
         $this->roleFactory = $roleFactory;
         $this->roleResourceModel = $roleResourceModel;
         $this->rulesFactory = $rulesFactory;
         $this->dataProcessor = $dataProcessor;
+        $this->dataMerger = $dataMerger;
     }
 
     /**
      * @inheritdoc
      */
     public function apply(array $data = []): ?DataObject
     {
+        $data = $this->prepareData($data);
+
+        $websites = $this->convertGwsWebsiteStoreGroups($data['gws_websites']);
+        $storeGroups = $this->convertGwsWebsiteStoreGroups($data['gws_store_groups']);
+
         $role = $this->roleFactory->create();
-        $role->setData($this->prepareData(array_diff_key($data, self::DEFAULT_DATA_RULES)));
-        $this->roleResourceModel->save($role);
+        $role->setRoleName($data['role_name'])
+            ->setRoleType($data['role_type'])
+            ->setPid($data['pid'])
+            ->setUserType($data['user_type'])
+            ->setGwsIsAll($data['gws_is_all'])
+            ->setGwsWebsites($websites)
+            ->setGwsStoreGroups($storeGroups);
+
+        $result = $role->save();
 
-        $rules = $this->rulesFactory->create();
-        $rules->setRoleId($role->getId() ?? null);
-        $rules->setResources($data['resources'] ?? self::DEFAULT_DATA_RULES['resources']);
-        $rules->saveRel();
+        $this->rulesFactory->create()
+            ->setRoleId($result['role_id'])
+            ->setResources($data['resources'] ?? self::RESOURCES)
+            ->saveRel();
 
-        return $role;
+        return $result;
     }
 
     /**
@@ -110,7 +134,26 @@ public function revert(DataObject $data): void
      */
     private function prepareData(array $data): array
     {
-        $data = array_merge(self::DEFAULT_DATA, $data);
+        $data = $this->dataMerger->merge(self::DEFAULT_DATA, $data);
         return $this->dataProcessor->process($this, $data);
     }
+
+    /**
+     * Convert GWS websites and store groups to string
+     *
+     * @param $data
+     * @return string|null
+     */
+    private function convertGwsWebsiteStoreGroups($data): ?string
+    {
+        if (isset($data)) {
+            if (is_array($data)) {
+                return implode(',', $data);
+            }
+            if (is_string($data)) {
+                return $data;
+            }
+        }
+        return null;
+    }
 }

app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php

@@ -152,7 +152,7 @@ protected function _getNodeJson($node, $level = 0)
         if (in_array($node->getId(), $this->getSelectedCategories())) {
             $item['checked'] = true;
         }
-        $item['is_anchor'] = (int)$node->getIsAnchor();
+        $item['is_anchor'] = $node->getIsAnchor() !== null ? (int) $node->getIsAnchor() : 1;
         $item['url_key'] = $node->getData('url_key');
         return $item;
     }

app/code/Magento/Catalog/Model/ResourceModel/Product/GetCategories.php

@@ -0,0 +1,62 @@
+<?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\ResourceModel\Product;
+
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer as CategoryProductTableMaintainer;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Store\Model\StoreManagerInterface;
+
+class GetCategories
+{
+    /**
+     * @param ResourceConnection $resource
+     * @param CategoryProductTableMaintainer $categoryProductTableMaintainer
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        private readonly ResourceConnection $resource,
+        private readonly CategoryProductTableMaintainer $categoryProductTableMaintainer,
+        private readonly StoreManagerInterface $storeManager
+    ) {
+    }
+
+    /**
+     * Returns list of categories ids for provided products
+     *
+     * @param int[] $productList
+     * @return int[]
+     */
+    public function execute(array $productList): array
+    {
+        $connection = $this->resource->getConnection();
+        $categories = [];
+        foreach ($this->storeManager->getStores() as $store) {
+            $select = $connection->select()->from(
+                ['category_product_index' => $this->categoryProductTableMaintainer->getMainTable((int)$store->getId())],
+                ['category_product_index.category_id']
+            );
+            $select->where('category_product_index.product_id IN (?)', $productList, \Zend_Db::INT_TYPE);
+            $select->distinct(true);
+
+            $categories += array_fill_keys($connection->fetchCol($select), true);
+        }
+
+        return array_keys($categories);
+    }
+}