Merge pull request #7954 from magento-gl/Arrows_BugFixDelivery

sidolov · web-flow · commit f06b47920e0f · 2022-11-14T09:00:34.000-06:00
Arrows bug fix delivery
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/checkout/placeOrderCaptcha.js b/app/code/Magento/Checkout/view/frontend/web/js/view/checkout/placeOrderCaptcha.js
@@ -20,7 +20,6 @@ function (defaultCaptcha, captchaList, _, placeOrderHooks) {
 
             this._super();
             currentCaptcha = captchaList.getCaptchaByFormId(this.formId);
-
             if (currentCaptcha != null) {
                 currentCaptcha.setIsVisible(true);
                 this.setCurrentCaptcha(currentCaptcha);
@@ -29,9 +28,11 @@ function (defaultCaptcha, captchaList, _, placeOrderHooks) {
                         headers['X-Captcha'] = self.captchaValue()();
                     }
                 });
-                placeOrderHooks.afterRequestListeners.push(function () {
-                    self.refresh();
-                });
+                if (self.isRequired()) {
+                    placeOrderHooks.afterRequestListeners.push(function () {
+                        self.refresh();
+                    });
+                }
             }
         }
     });
diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -24,6 +24,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
 use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
+use Magento\Framework\Lock\LockManagerInterface;
 use Magento\Framework\Model\AbstractExtensibleModel;
 use Magento\Framework\Validator\Exception as ValidatorException;
 use Magento\Payment\Model\Method\AbstractMethod;
@@ -51,6 +52,10 @@
  */
 class QuoteManagement implements CartManagementInterface
 {
+    private const LOCK_PREFIX = 'PLACE_ORDER_';
+
+    private const LOCK_TIMEOUT = 10;
+
     /**
      * @var EventManager
      */
@@ -151,6 +156,11 @@ class QuoteManagement implements CartManagementInterface
      */
     protected $quoteFactory;
 
+    /**
+     * @var LockManagerInterface
+     */
+    private $lockManager;
+
     /**
      * @var QuoteIdMaskFactory
      */
@@ -201,6 +211,7 @@ class QuoteManagement implements CartManagementInterface
      * @param AddressRepositoryInterface|null $addressRepository
      * @param RequestInterface|null $request
      * @param RemoteAddress $remoteAddress
+     * @param LockManagerInterface $lockManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -227,7 +238,8 @@ public function __construct(
         QuoteIdMaskFactory $quoteIdMaskFactory = null,
         AddressRepositoryInterface $addressRepository = null,
         RequestInterface $request = null,
-        RemoteAddress $remoteAddress = null
+        RemoteAddress $remoteAddress = null,
+        LockManagerInterface $lockManager = null
     ) {
         $this->eventManager = $eventManager;
         $this->submitQuoteValidator = $submitQuoteValidator;
@@ -257,6 +269,8 @@ public function __construct(
             ->get(RequestInterface::class);
         $this->remoteAddress = $remoteAddress ?: ObjectManager::getInstance()
             ->get(RemoteAddress::class);
+        $this->lockManager = $lockManager ?: ObjectManager::getInstance()
+            ->get(LockManagerInterface::class);
     }
 
     /**
@@ -584,25 +598,29 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
         $order->setCustomerFirstname($quote->getCustomerFirstname());
         $order->setCustomerMiddlename($quote->getCustomerMiddlename());
         $order->setCustomerLastname($quote->getCustomerLastname());
-
         if ($quote->getOrigOrderId()) {
             $order->setEntityId($quote->getOrigOrderId());
         }
-
         if ($quote->getReservedOrderId()) {
             $order->setIncrementId($quote->getReservedOrderId());
         }
-
         $this->submitQuoteValidator->validateOrder($order);
-
         $this->eventManager->dispatch(
             'sales_model_service_quote_submit_before',
             [
                 'order' => $order,
                 'quote' => $quote
             ]
         );
+
+        $lockedName = self::LOCK_PREFIX . $quote->getId();
+        if ($this->lockManager->isLocked($lockedName)) {
+            throw new LocalizedException(__(
+                'A server error stopped your order from being placed. Please try to place your order again.'
+            ));
+        }
         try {
+            $this->lockManager->lock($lockedName, self::LOCK_TIMEOUT);
             $order = $this->orderManagement->place($order);
             $quote->setIsActive(false);
             $this->eventManager->dispatch(
@@ -613,7 +631,9 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
                 ]
             );
             $this->quoteRepository->save($quote);
+            $this->lockManager->unlock($lockedName);
         } catch (\Exception $e) {
+            $this->lockManager->unlock($lockedName);
             $this->rollbackAddresses($quote, $order, $e);
             throw $e;
         }
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
@@ -25,6 +25,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
 use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
+use Magento\Framework\Lock\LockManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\CustomerManagement;
@@ -196,6 +197,11 @@ class QuoteManagementTest extends TestCase
      */
     private $quoteIdMaskFactoryMock;
 
+    /**
+     * @var LockManagerInterface|MockObject
+     */
+    private $lockManagerMock;
+
     /**
      * @inheriDoc
      *
@@ -292,6 +298,9 @@ protected function setUp(): void
         $this->addressRepositoryMock = $this->getMockBuilder(AddressRepositoryInterface::class)
             ->getMockForAbstractClass();
 
+        $this->lockManagerMock = $this->getMockBuilder(LockManagerInterface::class)
+            ->getMockForAbstractClass();
+
         $this->model = $objectManager->getObject(
             QuoteManagement::class,
             [
@@ -315,7 +324,8 @@ protected function setUp(): void
                 'customerSession' => $this->customerSessionMock,
                 'accountManagement' => $this->accountManagementMock,
                 'quoteFactory' => $this->quoteFactoryMock,
-                'addressRepository' => $this->addressRepositoryMock
+                'addressRepository' => $this->addressRepositoryMock,
+                'lockManager' => $this->lockManagerMock
             ]
         );
 
@@ -761,7 +771,8 @@ public function testSubmit(): void
             $customerId,
             $quoteId,
             $quoteItems,
-            $shippingAddress
+            $shippingAddress,
+            false
         );
 
         $this->submitQuoteValidator->expects($this->once())
@@ -826,6 +837,7 @@ public function testSubmit(): void
                     ['order' => $order, 'quote' => $quote]
                 ]
             );
+        $this->lockManagerMock->method('isLocked')->willReturn(false);
         $this->quoteRepositoryMock->expects($this->once())->method('save')->with($quote);
         $this->assertEquals($order, $this->model->submit($quote, $orderData));
     }
@@ -1063,7 +1075,8 @@ protected function getQuote(
         int $customerId,
         int $id,
         array $quoteItems,
-        Address $shippingAddress = null
+        Address $shippingAddress = null,
+        bool $setIsActive
     ): MockObject {
         $quote = $this->getMockBuilder(Quote::class)
             ->addMethods(['getCustomerEmail', 'getCustomerId'])
@@ -1085,9 +1098,11 @@ protected function getQuote(
             )
             ->disableOriginalConstructor()
             ->getMock();
-        $quote->expects($this->once())
-            ->method('setIsActive')
-            ->with(false);
+        if ($setIsActive) {
+            $quote->expects($this->once())
+                ->method('setIsActive')
+                ->with(false);
+        }
         $quote->expects($this->any())
             ->method('getAllVisibleItems')
             ->willReturn($quoteItems);
@@ -1129,7 +1144,7 @@ protected function getQuote(
         $quote->expects($this->any())
             ->method('getCustomer')
             ->willReturn($customer);
-        $quote->expects($this->once())
+        $quote->expects($this->exactly(2))
             ->method('getId')
             ->willReturn($id);
         $this->customerRepositoryMock->expects($this->any())->method('getById')->willReturn($customer);
@@ -1292,7 +1307,8 @@ public function testSubmitForCustomer(): void
             $customerId,
             $quoteId,
             $quoteItems,
-            $shippingAddress
+            $shippingAddress,
+            false
         );
 
         $this->submitQuoteValidator->method('validateQuote')
@@ -1386,4 +1402,110 @@ private function createPartialMockForAbstractClass(string $className, array $met
             $methods
         );
     }
+
+    /**
+     * @return void
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testSubmitWithLockException(): void
+    {
+        $orderData = [];
+        $isGuest = true;
+        $isVirtual = false;
+        $customerId = 1;
+        $quoteId = 1;
+        $quoteItem = $this->createMock(Item::class);
+        $billingAddress = $this->createMock(Address::class);
+        $shippingAddress = $this->getMockBuilder(Address::class)
+            ->addMethods(['getQuoteId'])
+            ->onlyMethods(['getShippingMethod', 'getId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $payment = $this->createMock(Payment::class);
+        $baseOrder = $this->getMockForAbstractClass(OrderInterface::class);
+        $convertedBilling = $this->createPartialMockForAbstractClass(OrderAddressInterface::class, ['setData']);
+        $convertedShipping = $this->createPartialMockForAbstractClass(OrderAddressInterface::class, ['setData']);
+        $convertedPayment = $this->getMockForAbstractClass(OrderPaymentInterface::class);
+        $convertedQuoteItem = $this->getMockForAbstractClass(OrderItemInterface::class);
+        $addresses = [$convertedShipping, $convertedBilling];
+        $quoteItems = [$quoteItem];
+        $convertedItems = [$convertedQuoteItem];
+        $quote = $this->getQuote(
+            $isGuest,
+            $isVirtual,
+            $billingAddress,
+            $payment,
+            $customerId,
+            $quoteId,
+            $quoteItems,
+            $shippingAddress,
+            false
+        );
+
+        $this->submitQuoteValidator->expects($this->once())
+            ->method('validateQuote')
+            ->with($quote);
+        $this->quoteAddressToOrder->expects($this->once())
+            ->method('convert')
+            ->with($shippingAddress, $orderData)
+            ->willReturn($baseOrder);
+        $this->quoteAddressToOrderAddress
+            ->method('convert')
+            ->withConsecutive(
+                [
+                    $shippingAddress,
+                    [
+                        'address_type' => 'shipping',
+                        'email' => 'customer@example.com'
+                    ]
+                ],
+                [
+                    $billingAddress,
+                    [
+                        'address_type' => 'billing',
+                        'email' => 'customer@example.com'
+                    ]
+                ]
+            )->willReturnOnConsecutiveCalls($convertedShipping, $convertedBilling);
+        $billingAddress->expects($this->once())->method('getId')->willReturn(4);
+        $convertedBilling->expects($this->once())->method('setData')->with('quote_address_id', 4);
+
+        $this->quoteItemToOrderItem->expects($this->once())->method('convert')
+            ->with($quoteItem, ['parent_item' => null])
+            ->willReturn($convertedQuoteItem);
+        $this->quotePaymentToOrderPayment->expects($this->once())->method('convert')->with($payment)
+            ->willReturn($convertedPayment);
+        $shippingAddress->expects($this->once())->method('getShippingMethod')->willReturn('free');
+        $shippingAddress->expects($this->once())->method('getId')->willReturn(5);
+        $convertedShipping->expects($this->once())->method('setData')->with('quote_address_id', 5);
+        $order = $this->prepareOrderFactory(
+            $baseOrder,
+            $convertedBilling,
+            $addresses,
+            $convertedPayment,
+            $convertedItems,
+            $quoteId,
+            $convertedShipping
+        );
+
+        $this->eventManager
+            ->method('dispatch')
+            ->withConsecutive(
+                [
+                    'sales_model_service_quote_submit_before',
+                    ['order' => $order, 'quote' => $quote]
+                ],
+                [
+                    'sales_model_service_quote_submit_success',
+                    ['order' => $order, 'quote' => $quote]
+                ]
+            );
+        $this->lockManagerMock->method('isLocked')->willReturn(true);
+
+        $this->expectExceptionMessage(
+            'A server error stopped your order from being placed. Please try to place your order again.'
+        );
+        $this->assertEquals($order, $this->model->submit($quote, $orderData));
+    }
 }
diff --git a/app/code/Magento/Webapi/Model/ServiceMetadata.php b/app/code/Magento/Webapi/Model/ServiceMetadata.php
@@ -201,7 +201,7 @@ public function getServiceMetadata($serviceName)
     {
         $servicesConfig = $this->getServicesConfig();
         if (!isset($servicesConfig[$serviceName]) || !is_array($servicesConfig[$serviceName])) {
-            throw new RuntimeException(__('Requested service is not available: "%1"', $serviceName)->render());
+            throw new RuntimeException((string)__('Requested service is not available: "%1"', $serviceName)->render());
         }
         return $servicesConfig[$serviceName];
     }
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
@@ -263,6 +263,7 @@ protected function runTest()
             $resetConfig = $this->resetAddedSection($initialConfig, $currentConfig, $cacheSaltPathChunks);
             $resetFileContents = $this->formatter->format($resetConfig);
             $directoryWrite = $this->filesystem->getDirectoryWrite(DirectoryList::CONFIG);
+            sleep(4);
             $directoryWrite->writeFile($this->envConfigPath, $resetFileContents);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ public function getServiceMetadata($serviceName)`
`201`	`201`	`{`
`202`	`202`	`$servicesConfig = $this->getServicesConfig();`
`203`	`203`	`if (!isset($servicesConfig[$serviceName]) \|\| !is_array($servicesConfig[$serviceName])) {`
`204`		`- throw new RuntimeException(__('Requested service is not available: "%1"', $serviceName)->render());`
	`204`	`+ throw new RuntimeException((string)__('Requested service is not available: "%1"', $serviceName)->render());`
`205`	`205`	`}`
`206`	`206`	`return $servicesConfig[$serviceName];`
`207`	`207`	`}`
Original file line number	Diff line number	Diff line change
`@@ -263,6 +263,7 @@ protected function runTest()`
`263`	`263`	`$resetConfig = $this->resetAddedSection($initialConfig, $currentConfig, $cacheSaltPathChunks);`
`264`	`264`	`$resetFileContents = $this->formatter->format($resetConfig);`
`265`	`265`	`$directoryWrite = $this->filesystem->getDirectoryWrite(DirectoryList::CONFIG);`
	`266`	`+ sleep(4);`
`266`	`267`	`$directoryWrite->writeFile($this->envConfigPath, $resetFileContents);`
`267`	`268`	`}`
`268`	`269`	`}`