MCP-595: [MCP-304] [QA] [BUG] Order cannot be processed if customer is deleted

Author: andimov

app/code/Magento/Quote/Model/QuoteManagement.php

@@ -381,10 +381,13 @@ protected function createCustomerCart($customerId, $storeId)
 
     /**
      * @inheritdoc
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
     {
         $quote = $this->quoteRepository->getActive($cartId);
+        $customer = $quote->getCustomer();
+
         if ($paymentMethod) {
             $paymentMethod->setChecks(
                 [
@@ -403,18 +406,22 @@ public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
             $quote->collectTotals();
         }
 
-        if ($quote->getCheckoutMethod() === self::METHOD_GUEST || !$quote->getCustomer()) {
+        if ($quote->getCheckoutMethod() === self::METHOD_GUEST || !$customer) {
             $quote->setCustomerId(null);
-            $quote->setCustomerEmail($quote->getBillingAddress()->getEmail());
-            if ($quote->getCustomerFirstname() === null && $quote->getCustomerLastname() === null) {
-                $quote->setCustomerFirstname($quote->getBillingAddress()->getFirstname());
-                $quote->setCustomerLastname($quote->getBillingAddress()->getLastname());
-                if ($quote->getBillingAddress()->getMiddlename() === null) {
-                    $quote->setCustomerMiddlename($quote->getBillingAddress()->getMiddlename());
+            $billingAddress = $quote->getBillingAddress();
+            $quote->setCustomerEmail($billingAddress ? $billingAddress->getEmail() : null);
+            if ($quote->getCustomerFirstname() === null
+                && $quote->getCustomerLastname() === null
+                && $billingAddress
+            ) {
+                $quote->setCustomerFirstname($billingAddress->getFirstname());
+                $quote->setCustomerLastname($billingAddress->getLastname());
+                if ($billingAddress->getMiddlename() === null) {
+                    $quote->setCustomerMiddlename($billingAddress->getMiddlename());
                 }
             }
             $quote->setCustomerIsGuest(true);
-            $groupId = $quote->getCustomer()->getGroupId() ?: GroupInterface::NOT_LOGGED_IN_ID;
+            $groupId = $customer ? $customer->getGroupId() : GroupInterface::NOT_LOGGED_IN_ID;
             $quote->setCustomerGroupId($groupId);
         }
 

app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php

@@ -18,6 +18,7 @@
 use Magento\Customer\Api\Data\GroupInterface;
 use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\CustomerFactory;
+use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Event\ManagerInterface;
@@ -274,7 +275,7 @@ protected function setUp(): void
             )
             ->disableOriginalConstructor()
             ->getMock();
-        $this->customerSessionMock = $this->createMock(\Magento\Customer\Model\Session::class);
+        $this->customerSessionMock = $this->createMock(CustomerSession::class);
         $this->accountManagementMock = $this->getMockForAbstractClass(AccountManagementInterface::class);
 
         $this->quoteFactoryMock = $this->createPartialMock(QuoteFactory::class, ['create']);
@@ -737,11 +738,9 @@ public function testSubmit(): void
         $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,
@@ -976,9 +975,6 @@ public function testPlaceOrder(): void
         $this->quoteMock->expects($this->once())
             ->method('getCheckoutMethod')
             ->willReturn(Onepage::METHOD_CUSTOMER);
-        $this->quoteMock->expects($this->never())
-            ->method('setCustomerIsGuest')
-            ->with(true);
 
         $this->remoteAddressMock
             ->method('getRemoteAddress')