ENGCOM-5728: group_id overridden if set #23764

Author: sidolov

app/code/Magento/Customer/Model/CustomerExtractor.php

@@ -1,16 +1,19 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Model;
 
 use Magento\Customer\Api\CustomerMetadataInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Api\GroupManagementInterface;
 use Magento\Framework\App\RequestInterface;
 
+/**
+ * Customer Extractor model.
+ */
 class CustomerExtractor
 {
     /**
@@ -60,6 +63,8 @@ public function __construct(
     }
 
     /**
+     * Creates a Customer object populated with the given form code and request data.
+     *
      * @param string $formCode
      * @param RequestInterface $request
      * @param array $attributeValues
@@ -80,23 +85,26 @@ public function extract(
         $customerData = $customerForm->compactData($customerData);
 
         $allowedAttributes = $customerForm->getAllowedAttributes();
-        $isGroupIdEmpty = isset($allowedAttributes['group_id']);
+        $isGroupIdEmpty = !isset($allowedAttributes['group_id']);
 
         $customerDataObject = $this->customerFactory->create();
         $this->dataObjectHelper->populateWithArray(
             $customerDataObject,
             $customerData,
             \Magento\Customer\Api\Data\CustomerInterface::class
         );
+        
         $store = $this->storeManager->getStore();
+        $storeId = $store->getId();
+        
         if ($isGroupIdEmpty) {
             $customerDataObject->setGroupId(
-                $this->customerGroupManagement->getDefaultGroup($store->getId())->getId()
+                $this->customerGroupManagement->getDefaultGroup($storeId)->getId()
             );
         }
 
         $customerDataObject->setWebsiteId($store->getWebsiteId());
-        $customerDataObject->setStoreId($store->getId());
+        $customerDataObject->setStoreId($storeId);
 
         return $customerDataObject;
     }

app/code/Magento/Customer/Test/Unit/Model/CustomerExtractorTest.php

@@ -3,10 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Test\Unit\Model;
 
 use Magento\Customer\Model\CustomerExtractor;
 
+/**
+ * Unit test CustomerExtractorTest
+ */
 class CustomerExtractorTest extends \PHPUnit\Framework\TestCase
 {
     /** @var CustomerExtractor */
@@ -137,19 +141,9 @@ public function testExtract()
         $this->storeManager->expects($this->once())
             ->method('getStore')
             ->willReturn($this->store);
-        $this->store->expects($this->exactly(2))
-            ->method('getId')
-            ->willReturn(1);
-        $this->customerGroupManagement->expects($this->once())
-            ->method('getDefaultGroup')
-            ->with(1)
-            ->willReturn($this->customerGroup);
-        $this->customerGroup->expects($this->once())
+        $this->store->expects($this->once())
             ->method('getId')
             ->willReturn(1);
-        $this->customerData->expects($this->once())
-            ->method('setGroupId')
-            ->with(1);
         $this->store->expects($this->once())
             ->method('getWebsiteId')
             ->willReturn(1);