Merge pull request #20 from KozakSerhii/9910-send-missing-orders

origin/9910-send-missing-orders

Author: magefan

Model/Transaction/Log.php

@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magefan ([email protected]). All rights reserved.
+ * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
+ */
+
+declare(strict_types=1);
+
+namespace Magefan\GoogleTagManager\Model\Transaction;
+
+use Magefan\GoogleTagManager\Model\ResourceModel\Transaction\CollectionFactory as TransactionCollectionFactory;
+use Magefan\GoogleTagManager\Model\TransactionFactory;
+use Magefan\GoogleTagManager\Model\TransactionRepository;
+use Magento\Sales\Model\Order;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Psr\Log\LoggerInterface;
+
+class Log
+{
+
+    /**
+     * @var TransactionCollectionFactory
+     */
+    protected $transactionCollectionFactory;
+
+    /**
+     * @var TransactionFactory
+     */
+    protected $transactionFactory;
+
+    /**
+     * @var TransactionRepository
+     */
+    protected $transactionRepository;
+
+    /**
+     * @var LoggerInterface
+     */
+    protected $logger;
+
+    /**
+     * Log constructor.
+     * @param TransactionCollectionFactory $transactionCollectionFactory
+     * @param TransactionFactory $transactionFactory
+     * @param TransactionRepository $transactionRepository
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        TransactionCollectionFactory $transactionCollectionFactory,
+        TransactionFactory $transactionFactory,
+        TransactionRepository $transactionRepository,
+        LoggerInterface $logger
+    ) {
+        $this->transactionCollectionFactory = $transactionCollectionFactory;
+        $this->transactionFactory = $transactionFactory;
+        $this->transactionRepository = $transactionRepository;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @param Order $order
+     * @param string $requester
+     * @return void
+     */
+    public function logTransaction(\Magento\Sales\Api\Data\OrderInterface $order, string $requester)
+    {
+        $transactionModel = $this->transactionFactory->create();
+
+        $transactionModel->setTransactionId((string)$order->getIncrementId());
+        $transactionModel->setStoreId((int)$order->getStoreId());
+        $transactionModel->setRequester($requester);
+
+        try {
+            $this->transactionRepository->save($transactionModel);
+        } catch (CouldNotSaveException $e) {
+            $this->logger->log("Magefan_GoogleTagManager error while logging transaction id: " . $order->getIncrementId()
+                . ' and requester: ' . $requester);
+        }
+    }
+}

Plugin/Magefan/GoogleTagManager/Api/DataLayer/PurchaseInterface.php

@@ -15,6 +15,7 @@
 use Magento\Sales\Model\Order;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Psr\Log\LoggerInterface;
+use Magefan\GoogleTagManager\Model\Transaction\Log;
 
 class PurchaseInterface
 {
@@ -24,36 +25,21 @@ class PurchaseInterface
     protected $transactionCollectionFactory;
 
     /**
-     * @var TransactionFactory
+     * @var Log
      */
-    protected $transactionFactory;
-
-    /**
-     * @var TransactionRepository
-     */
-    protected $transactionRepository;
-
-    /**
-     * @var LoggerInterface
-     */
-    protected $logger;
+    protected $transactionLogger;
 
     /**
+     * PurchaseInterface constructor.
      * @param TransactionCollectionFactory $transactionCollectionFactory
-     * @param TransactionFactory $transactionFactory
-     * @param TransactionRepository $transactionRepository
-     * @param LoggerInterface $logger
+     * @param Log $transactionLogger
      */
     public function __construct(
         TransactionCollectionFactory $transactionCollectionFactory,
-        TransactionFactory $transactionFactory,
-        TransactionRepository $transactionRepository,
-        LoggerInterface $logger
+        Log $transactionLogger
     ) {
         $this->transactionCollectionFactory = $transactionCollectionFactory;
-        $this->transactionFactory = $transactionFactory;
-        $this->transactionRepository = $transactionRepository;
-        $this->logger = $logger;
+        $this->transactionLogger = $transactionLogger;
     }
 
     /**
@@ -66,7 +52,7 @@ public function __construct(
     public function aroundGet(Subject $subject, $proceed, Order $order, string $requester = '')
     {
         if ($this->isTransactionIdUniqueForRequester($requester, $order)) {
-            $this->logTransaction($order, $requester);
+            $this->transactionLogger->logTransaction($order, $requester);
             return $proceed($order, $requester);
         } else {
             return [];
@@ -97,25 +83,4 @@ protected function isTransactionIdUniqueForRequester(string $requester, Order $o
 
         return true;
     }
-
-    /**
-     * @param Order $order
-     * @param string $requester
-     * @return void
-     */
-    protected function logTransaction(Order $order, string $requester)
-    {
-        $transactionModel = $this->transactionFactory->create();
-
-        $transactionModel->setTransactionId((string)$order->getIncrementId());
-        $transactionModel->setStoreId((int)$order->getStoreId());
-        $transactionModel->setRequester($requester);
-
-        try {
-            $this->transactionRepository->save($transactionModel);
-        } catch (CouldNotSaveException $e) {
-            $this->logger->log("Magefan_GoogleTagManager error while logging transaction id: " . $order->getIncrementId()
-                . ' and requester: ' . $requester);
-        }
-    }
 }