Merge pull request #1684 from buckaroo-it/BTI-1214-Magento-2-Review-and-improve-Magento-2-plugin-code-quality-through-refactoring

Bti 1214 magento 2 review and improve magento 2 plugin code quality through refactoring

Author: vegimcarkaxhija

Controller/Adminhtml/PayLink/Index.php

@@ -108,7 +108,6 @@ public function execute(): ResultInterface
         $payment = $order->getPayment();
         $currentPayment = $payment->getMethod();
         $payment->setMethod('buckaroo_magento2_payperemail');
-        $payment->save();
         $order->save();
 
         try {
@@ -132,7 +131,6 @@ public function execute(): ResultInterface
         } finally {
             $payment = $order->getPayment();
             $payment->setMethod($currentPayment);
-            $payment->save();
             $order->save();
         }
 

Model/Giftcard/Response/Giftcard.php

@@ -340,7 +340,6 @@ protected function cancelOrder()
             $this->orderManagement->cancel($order->getEntityId());
             $order->addCommentToStatusHistory($this->getErrorMessage())
                 ->setIsCustomerNotified(false)
-                ->setEntityName('invoice')
                 ->save();
             $this->rollbackAllPartialPayments($order);
         }

Model/Push/DefaultProcessor.php

@@ -903,8 +903,7 @@ private function reactivateCanceledOrder(): bool
             ));
         }
 
-        // 7. Save payment and order changes
-        $this->payment->save();
+        // 7. Save order changes (payment is persisted by the order save cascade)
         $this->order->save();
 
         $this->logger->addDebug(sprintf(

Model/Push/GroupTransactionPushProcessor.php

@@ -271,7 +271,6 @@ protected function cancelOrder(string $reservedOrderId, string $historyComment =
 
             $order->addCommentToStatusHistory(__($historyComment))
                 ->setIsCustomerNotified(false)
-                ->setEntityName('invoice')
                 ->save();
         }
     }

Model/Push/PayPerEmailProcessor.php

@@ -226,7 +226,6 @@ private function receivePushCheckPayLink(): void
             && $this->pushTransactionType->getStatusKey() == 'BUCKAROO_MAGENTO2_STATUSCODE_SUCCESS'
         ) {
             $this->payment->setMethod('buckaroo_magento2_payperemail');
-            $this->payment->save();
             $this->order->save();
         }
     }
@@ -332,7 +331,6 @@ private function saveActualPaymentMethodAndKeyForRefund(string $transactionKey,
             $transactionKey
         );
         $this->payment->setMethod('buckaroo_magento2_' . $transactionMethod);
-        $this->payment->save();
         $this->order->save();
     }
 

Model/Service/CancelOrder.php

@@ -73,7 +73,6 @@ public function cancelPreviousPendingOrder(PaymentDataObjectInterface $paymentDO
                         __('Canceled on browser back button')
                     )
                         ->setIsCustomerNotified(false)
-                        ->setEntityName('invoice')
                         ->save();
                 } finally {
                     if ($originalRequestOnVoid !== null) {

Observer/RestoreQuote.php

@@ -122,8 +122,6 @@ public function execute(Observer $observer): void
             }
 
             if ($this->isCartKeepAlive($lastRealOrder)) {
-                $this->prepareQuoteShippingAddress();
-
                 $isNewPending = $this->isNewPendingLastOrder($lastRealOrder, $payment);
                 $canRestoreSpam = $this->canRestoreFailedFromSpam();
                 $isCanceledWithRedirect = $this->isCanceledLastOrderWithRedirect($lastRealOrder, $payment);
@@ -239,23 +237,6 @@ private function isCartKeepAlive($lastRealOrder): bool
         return $this->accountConfig->getCartKeepAlive($lastRealOrder->getStore());
     }
 
-    /**
-     * Prepare quote and shipping address if needed
-     */
-    private function prepareQuoteShippingAddress(): void
-    {
-        if ($this->checkoutSession->getQuote()
-            && $this->checkoutSession->getQuote()->getId()
-            && ($quote = $this->quoteRepository->getActive($this->checkoutSession->getQuote()->getId()))
-        ) {
-            if ($shippingAddress = $quote->getShippingAddress()) {
-                if (!$shippingAddress->getShippingMethod()) {
-                    $shippingAddress->load($shippingAddress->getAddressId());
-                }
-            }
-        }
-    }
-
     /**
      * Skip restore quote
      *

Plugin/ShippingMethodManagement.php

@@ -106,17 +106,6 @@ public function beforeGet($cartId): void
                 if ($quote && $quote->getId()) {
                     $quote = $this->quoteRepository->getActive((int)$quote->getId());
                     if ($shippingAddress = $quote->getShippingAddress()) {
-                        if (!$shippingAddress->getShippingMethod()) {
-                            $this->logger->addDebug(sprintf(
-                                '[SET_SHIPPING] | [Plugin] | [%s:%s] - SET SHIPPING ADDRESS - Ensures that '
-                                . 'the shipping address is loaded. | lastRealOrder: %s | shippingAddressId: %s',
-                                __METHOD__,
-                                __LINE__,
-                                $lastRealOrder->getIncrementId(),
-                                $shippingAddress->getAddressId()
-                            ));
-                            $shippingAddress->load($shippingAddress->getAddressId());
-                        }
                         $shippingAddress->setCollectShippingRates(true);
                     }
                 }

Service/Push/OrderRequestService.php

@@ -339,9 +339,7 @@ public function updateOrderStatus(
                 $this->order->setStatus($newStatus);
                 $this->order->addCommentToStatusHistory($description)
                     ->setIsCustomerNotified(false)
-                    ->setEntityName('invoice')
-                    ->setStatus($newStatus)
-                    ->save();
+                    ->setStatus($newStatus);
                 $this->order->save();
             } else {
                 $this->order->addCommentToStatusHistory($description, $newStatus);
@@ -351,7 +349,6 @@ public function updateOrderStatus(
             if ($dontSaveOrderUponSuccessPush) {
                 $this->order->addCommentToStatusHistory($description)
                     ->setIsCustomerNotified(false)
-                    ->setEntityName('invoice')
                     ->save();
             } else {
                 $this->order->addCommentToStatusHistory($description);

Service/Sales/Quote/Recreate.php

@@ -205,7 +205,6 @@ public function recreateById($quoteId)
                     $this->checkoutSession->unsRedirectUrl();
                     $this->checkoutSession->unsLastQuoteId();
 
-                    $quote->save();
                     $this->cartRepository->save($quote);
 
                     return $quote;