Fix problem with deleting reservations

macopedia · Nov 26, 2020 · fee17d2 · fee17d2
1 parent 8018b2b
commit fee17d2
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 45 deletions.
diff --git a/Api/Data/AllegroReservationsInterface.php b/Api/Data/AllegroReservationsInterface.php
@@ -12,9 +12,9 @@ interface AllegroReservationsInterface
     public function placeReservation(CheckoutFormInterface $checkoutForm): void;
 
     /**
-     * @param CheckoutFormInterface $checkoutForm
+     * @param string $checkoutFormId
      * @return void
      * @throws \Exception
      */
-    public function compensateReservation(CheckoutFormInterface $checkoutForm): void;
+    public function compensateReservation(string $checkoutFormId): void;
 }
diff --git a/Controller/Adminhtml/Reservations/Delete.php b/Controller/Adminhtml/Reservations/Delete.php
@@ -16,7 +16,6 @@
 use Magento\Ui\Component\MassAction\Filter;
 use Macopedia\Allegro\Model\ResourceModel\Reservation\CollectionFactory;
 use Macopedia\Allegro\Model\OrderImporter\AllegroReservation;
-use Macopedia\Allegro\Model\CheckoutFormRepository;
 
 /**
  * Delete controller class
@@ -35,32 +34,26 @@ class Delete extends Action
     /** @var AllegroReservation */
     private $allegroReservation;
 
-    /** @var CheckoutFormRepository */
-    private $checkoutFormRepository;
-
     /**
      * Delete constructor.
      * @param Action\Context $context
      * @param Logger $logger
      * @param Filter $filter
      * @param CollectionFactory $collectionFactory
      * @param AllegroReservation $allegroReservation
-     * @param CheckoutFormRepository $checkoutFormRepository
      */
     public function __construct(
         Action\Context $context,
         Logger $logger,
         Filter $filter,
         CollectionFactory $collectionFactory,
-        AllegroReservation $allegroReservation,
-        CheckoutFormRepository $checkoutFormRepository
+        AllegroReservation $allegroReservation
     ) {
         parent::__construct($context);
         $this->logger = $logger;
         $this->filter = $filter;
         $this->collectionFactory = $collectionFactory;
         $this->allegroReservation = $allegroReservation;
-        $this->checkoutFormRepository = $checkoutFormRepository;
     }
 
     /**
@@ -83,8 +76,7 @@ public function execute()
             $checkoutFormId = $item->getCheckoutFormId();
             $reservationId = $item->getReservationId();
             try {
-                $checkoutForm = $this->checkoutFormRepository->get($checkoutFormId);
-                $this->allegroReservation->compensateReservation($checkoutForm);
+                $this->allegroReservation->compensateReservation($checkoutFormId);
                 $this->logger->info(__("Reservation with ID: %1 has been successfully deleted", $reservationId));
                 $this->messageManager->addSuccessMessage(__(
                     "Reservation with ID: %1 has been successfully deleted",

diff --git a/Model/AllegroPrice.php b/Model/AllegroPrice.php
@@ -3,7 +3,6 @@
 
 namespace Macopedia\Allegro\Model;
 
-
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Eav\Model\Config;
@@ -73,7 +72,7 @@ public function getByProductId(string $productId, int $storeId = 0)
         ];
 
         $price = $connection->fetchOne($select, $bind);
-        if (is_null($price)) {
+        if (!$price) {
             throw new AllegroPriceGettingException(
                 "Error while trying to get Allegro price for product with id {$productId}",
                 1603885321
@@ -88,7 +87,7 @@ public function getByProductId(string $productId, int $storeId = 0)
      */
     protected function getPriceAttributeCode()
     {
-        return $this->config->getPriceAttributeCode();;
+        return $this->config->getPriceAttributeCode();
     }
 
     /**

diff --git a/Model/AllegroPriceGettingException.php b/Model/AllegroPriceGettingException.php
@@ -3,7 +3,6 @@
 
 namespace Macopedia\Allegro\Model;
 
-
 class AllegroPriceGettingException extends \Exception
 {
 

diff --git a/Model/OrderImporter/AllegroReservation.php b/Model/OrderImporter/AllegroReservation.php
@@ -8,12 +8,9 @@
 use Macopedia\Allegro\Api\Data\CheckoutForm\LineItemInterface;
 use Macopedia\Allegro\Api\Data\CheckoutFormInterface;
 use Macopedia\Allegro\Logger\Logger;
-use Macopedia\Allegro\Model\Api\ClientException;
-use Macopedia\Allegro\Model\CheckoutFormRepository;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\InventorySalesApi\Api\Data\SalesChannelInterface;
 use Magento\InventorySalesApi\Api\Data\SalesChannelInterfaceFactory;
 use Magento\InventorySalesApi\Api\Data\SalesEventInterface;
@@ -72,9 +69,6 @@ class AllegroReservation implements AllegroReservationsInterface
     /** @var SearchCriteriaBuilder  */
     private $searchCriteriaBuilder;
 
-    /** @var CheckoutFormRepository */
-    private $checkoutFormRepository;
-
     /** @var Logger */
     private $logger;
 
@@ -90,7 +84,6 @@ class AllegroReservation implements AllegroReservationsInterface
      * @param ResourceConnection $resource
      * @param Configuration $configuration
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
-     * @param CheckoutFormRepository $checkoutFormRepository
      * @param Logger $logger
      */
     public function __construct(
@@ -104,7 +97,6 @@ public function __construct(
         ResourceConnection $resource,
         Configuration $configuration,
         SearchCriteriaBuilder $searchCriteriaBuilder,
-        CheckoutFormRepository $checkoutFormRepository,
         Logger $logger
     ) {
         $this->productRepository = $productRepository;
@@ -117,7 +109,6 @@ public function __construct(
         $this->resource = $resource;
         $this->configuration = $configuration;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
-        $this->checkoutFormRepository = $checkoutFormRepository;
         $this->logger = $logger;
     }
 
@@ -132,7 +123,7 @@ public function placeReservation(CheckoutFormInterface $checkoutForm): void
                 return;
             }
             $this->placeReservationsForSalesEvent->execute(
-                $this->getItemsToSell($checkoutForm, false),
+                $this->getItemsToReserve($checkoutForm),
                 $this->getSalesChannel(),
                 $this->getSalesEvent(self::ALLEGRO_EVENT_RESERVATION_PLACED, $checkoutForm->getId())
             );
@@ -146,23 +137,23 @@ public function placeReservation(CheckoutFormInterface $checkoutForm): void
     }
 
     /**
-     * @param CheckoutFormInterface $checkoutForm
-     * @throws \Exception
+     * @param string $checkoutFormId
+     * @throws ReservationPlacingException
      */
-    public function compensateReservation(CheckoutFormInterface $checkoutForm): void
+    public function compensateReservation(string $checkoutFormId): void
     {
         try {
             if (!$this->configuration->areReservationsEnabled()) {
                 return;
             }
             $this->placeReservationsForSalesEvent->execute(
-                $this->getItemsToSell($checkoutForm, true),
+                $this->getItemsToCompensate($checkoutFormId),
                 $this->getSalesChannel(),
-                $this->getSalesEvent(self::ALLEGRO_EVENT_RESERVATION_COMPENSATED, $checkoutForm->getId())
+                $this->getSalesEvent(self::ALLEGRO_EVENT_RESERVATION_COMPENSATED, $checkoutFormId)
             );
         } catch (\Exception $e) {
             throw new ReservationPlacingException(
-                "Error while compensating reservation for order with id [{$checkoutForm->getId()}]",
+                "Error while compensating reservation for order with id [{$checkoutFormId}]",
                 1589540303,
                 $e
             );
@@ -180,8 +171,7 @@ public function cleanOldReservations()
         foreach ($reservations as $reservation) {
             $checkoutFormId = $reservation->getCheckoutFormId();
             try {
-                $checkoutForm = $this->checkoutFormRepository->get($checkoutFormId);
-                $this->compensateReservation($checkoutForm);
+                $this->compensateReservation($checkoutFormId);
             } catch (\Exception $e) {
                 $this->logger->exception(
                     $e,
@@ -235,6 +225,23 @@ private function getSalesChannel(): SalesChannelInterface
      * @throws NoSuchEntityException
      */
     private function getProductsSku(string $checkoutFormId): array
+    {
+        $reservations = $this->reservationRepository->getByCheckoutFormId($checkoutFormId);
+        $productsSku = [];
+
+        foreach ($reservations as $reservation) {
+            array_push($productsSku, $reservation->getSku());
+        }
+
+        return $productsSku;
+    }
+
+    /**
+     * @param string $checkoutFormId
+     * @return array
+     * @throws NoSuchEntityException
+     */
+    private function getProductsData(string $checkoutFormId): array
     {
         $reservations = $this->reservationRepository->getByCheckoutFormId($checkoutFormId);
 
@@ -250,22 +257,22 @@ private function getProductsSku(string $checkoutFormId): array
 
         $query = $connection
             ->select()
-            ->from($originalReservations, ['sku'])
+            ->from($originalReservations)
+            ->columns(['sku', 'quantity'])
             ->where('reservation_id IN (?)', $reservationsIds);
 
-        return $connection->fetchCol($query);
+        return $connection->fetchAll($query);
     }
 
     /**
      * @param CheckoutFormInterface $checkoutForm
-     * @param bool $compensate
      * @return array
      * @throws CreatorItemsException
      * @throws NoSuchEntityException
      */
-    private function getItemsToSell(CheckoutFormInterface $checkoutForm, bool $compensate = false): array
+    private function getItemsToReserve(CheckoutFormInterface $checkoutForm): array
     {
-        $itemsToSell = [];
+        $itemsToReserve = [];
         $productsSku = $this->getProductsSku($checkoutForm->getId());
 
         /** @var LineItemInterface $lineItem */
@@ -278,14 +285,34 @@ private function getItemsToSell(CheckoutFormInterface $checkoutForm, bool $compe
                 throw new CreatorItemsException("Product for requested offer id {$offerId} does not exist");
             }
 
-            if (in_array($sku, $productsSku) === $compensate) {
-                $itemsToSell[] = $this->itemsToSellFactory->create([
+            if (!in_array($sku, $productsSku)) {
+                $itemsToReserve[] = $this->itemsToSellFactory->create([
                     'sku' => $sku,
-                    'qty' => $compensate ? (float)$lineItem->getQty() : -(float)$lineItem->getQty()
+                    'qty' => -(float)$lineItem->getQty()
                 ]);
             }
         }
 
-        return $itemsToSell;
+        return $itemsToReserve;
+    }
+
+    /**
+     * @param string $checkoutFormId
+     * @return array
+     * @throws NoSuchEntityException
+     */
+    private function getItemsToCompensate(string $checkoutFormId)
+    {
+        $products = $this->getProductsData($checkoutFormId);
+        $itemsToCompensate = [];
+
+        foreach ($products as $product) {
+            $itemsToCompensate[] = $this->itemsToSellFactory->create([
+                'sku' => $product['sku'],
+                'qty' => -(float)$product['quantity']
+            ]);
+        }
+
+        return $itemsToCompensate;
     }
 }
diff --git a/Model/OrderImporter/Processor.php b/Model/OrderImporter/Processor.php
@@ -97,11 +97,11 @@ public function processOrder(CheckoutFormInterface $checkoutForm): void
 
             if ($checkoutForm->getStatus() === Status::ALLEGRO_READY_FOR_PROCESSING) {
                 if (!$this->tryToGetOrder($checkoutForm->getId())) {
-                    $this->allegroReservation->compensateReservation($checkoutForm);
+                    $this->allegroReservation->compensateReservation($checkoutForm->getId());
                     $this->tryCreateOrder($checkoutForm);
                 }
             } elseif ($checkoutForm->getStatus() === Status::ALLEGRO_CANCELLED) {
-                $this->allegroReservation->compensateReservation($checkoutForm);
+                $this->allegroReservation->compensateReservation($checkoutForm->getId());
             } else {
                 $this->allegroReservation->placeReservation($checkoutForm);
             }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,7 +3,6 @@

		namespace Macopedia\Allegro\Model;


		class AllegroPriceGettingException extends \Exception
		{

Expand Down