Merge branch 'ACP2E-278' of https://github.com/magento-l3/magento2ce into PR-2-2021-25-11

Author: chittima

app/code/Magento/Checkout/Model/Plugin/RecollectQuoteOnCustomerGroupChange.php

@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Model\Plugin;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Customer;
+use Magento\Customer\Model\ResourceModel\Customer as CustomerResource;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Quote;
+
+/**
+ * Recollect quote when customer group updated through API
+ */
+class RecollectQuoteOnCustomerGroupChange
+{
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $cartRepository;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * Initialize Constructor
+     *
+     * @param CartRepositoryInterface $cartRepository
+     * @param CustomerRepositoryInterface $customerRepository
+     */
+    public function __construct(
+        CartRepositoryInterface $cartRepository,
+        CustomerRepositoryInterface $customerRepository
+    ) {
+        $this->cartRepository = $cartRepository;
+        $this->customerRepository = $customerRepository;
+    }
+
+    /**
+     * Plugin around create customer that triggers to update and recollect all customer cart
+     *
+     * @param CustomerResource $subject
+     * @param callable $proceed
+     * @param AbstractModel $customer
+     * @return CustomerResource
+     *
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundSave(
+        CustomerResource $subject,
+        callable $proceed,
+        AbstractModel $customer
+    ): CustomerResource {
+        $customerId = $customer->getId() ?: $customer->getEntityId();
+        /** @var Customer $customer */
+        if ($customerId && empty($customer->getTaxvat())) {
+            try {
+                $prevCustomerData = $this->customerRepository->getById($customerId);
+                $previousCustomerData = $prevCustomerData->__toArray();
+            } catch (NoSuchEntityException $e) {
+                $previousCustomerData = [];
+            }
+        }
+
+        $result = $proceed($customer);
+
+        if (!empty($previousCustomerData)
+            && $previousCustomerData['group_id'] !== null
+            && $previousCustomerData['group_id'] != $customer->getGroupId()
+            && empty($previousCustomerData['taxvat'])
+        ) {
+            try {
+                /** @var Quote $quote */
+                $quote = $this->cartRepository->getActiveForCustomer($customer->getId());
+                $quote->setCustomerGroupId($customer->getGroupId());
+                $quote->collectTotals();
+                $this->cartRepository->save($quote);
+                // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
+            } catch (NoSuchEntityException $e) {
+                //no active cart for customer
+            }
+        }
+
+        return $result;
+    }
+}

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

@@ -53,4 +53,7 @@
                 type="Magento\Checkout\Model\CaptchaPaymentProcessingRateLimiter" />
     <preference for="Magento\Checkout\Api\PaymentSavingRateLimiterInterface"
                 type="Magento\Checkout\Model\CaptchaPaymentSavingRateLimiter" />
+    <type name="Magento\Customer\Model\ResourceModel\Customer">
+        <plugin name="recollect_quote_on_customer_group_change" type="Magento\Checkout\Model\Plugin\RecollectQuoteOnCustomerGroupChange"/>
+    </type>
 </config>

dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php

@@ -44,6 +44,8 @@ class CustomerRepositoryTest extends WebapiAbstract
 
     private const STUB_INVALID_CUSTOMER_GROUP_ID = 777;
 
+    private const STUB_RETAILER_GROUP_ID = 3;
+
     /**
      * @var CustomerRepositoryInterface
      */
@@ -517,6 +519,40 @@ public function testUpdateCustomerWithInvalidGroupId(): void
         }
     }
 
+    /**
+     * Test customer update quote with valid customer group id change
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     *
+     * @return void
+     */
+    public function testUpdateCustomerQuoteOnGroupIdChange(): void
+    {
+        $customerId = 1;
+        $customerData = $this->dataObjectProcessor->buildOutputDataArray(
+            $this->getCustomerData($customerId),
+            Customer::class
+        );
+        $customerData[Customer::GROUP_ID] = self::STUB_RETAILER_GROUP_ID;
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH . '/' . $customerId,
+                'httpMethod' => Request::HTTP_METHOD_PUT,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_NAME . 'Save',
+            ],
+        ];
+
+        $requestData['customer'] = $customerData;
+
+        $updateResults = $this->_webApiCall($serviceInfo, $requestData);
+        $this->assertEquals($updateResults['group_id'], self::STUB_RETAILER_GROUP_ID);
+    }
+
     /**
      * Test customer create with invalid customer group id
      *
@@ -1069,8 +1105,11 @@ protected function _createCustomer(?array $additionalData = [])
      *
      * @dataProvider customerDataProvider
      */
-    public function testCreateCustomerWithInvalidCustomerFirstName(string $fieldName, string $fieldValue, string $expectedMessage): void
-    {
+    public function testCreateCustomerWithInvalidCustomerFirstName(
+        string $fieldName,
+        string $fieldValue,
+        string $expectedMessage
+    ): void {
         $customerData = $this->dataObjectProcessor->buildOutputDataArray(
             $this->customerHelper->createSampleCustomerDataObject(),
             Customer::class