ACP2E-3038: adjusted role fixture, removed new role fixture

Author: alzota

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 = isset($data['gws_websites']) ? implode(',', $data['gws_websites']) : implode(',', []);
+        $storeGroups = isset($data['gws_store_groups']) ? implode(',', $data['gws_store_groups']) : implode(',', []);
+
         $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,7 @@ 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);
     }
 }