Refactored Transaction Logger

Author: ihorvansach

Model/Transaction/Log.php

@@ -11,7 +11,7 @@
 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\Sales\Api\Data\OrderInterface as Order;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Psr\Log\LoggerInterface;
 
@@ -62,7 +62,7 @@ public function __construct(
      * @param string $requester
      * @return void
      */
-    public function logTransaction(\Magento\Sales\Api\Data\OrderInterface $order, string $requester)
+    public function logTransaction(Order $order, string $requester)
     {
         $transactionModel = $this->transactionFactory->create();
 
@@ -77,4 +77,29 @@ public function logTransaction(\Magento\Sales\Api\Data\OrderInterface $order, st
                 . ' and requester: ' . $requester);
         }
     }
+
+    /**
+     * @param Order $order
+     * @param string $requester
+     * @return void
+     */
+    public function isTransactionUnique(Order $order, string $requester): bool
+    {
+        $transactionsForRequesterByTransactionId = $this->transactionFactory->create()->getCollection()->addFieldToFilter(
+            'requester',
+            $requester
+        )->addFieldToFilter(
+            'transaction_id',
+            (string)$order->getIncrementId()
+        )->addFieldToFilter(
+            'store_id',
+            (int)$order->getStoreId()
+        );
+
+        if (count($transactionsForRequesterByTransactionId)) {
+            return false;
+        }
+
+        return true;
+    }
 }

Model/TransactionRepository.php

@@ -10,7 +10,6 @@
 
 use Magefan\GoogleTagManager\Model\ResourceModel\Transaction as ResourceTransaction;
 use Magefan\GoogleTagManager\Model\TransactionFactory;
-use Magefan\GoogleTagManager\Model\Transaction;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
 

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

@@ -9,78 +9,40 @@
 namespace Magefan\GoogleTagManager\Plugin\Magefan\GoogleTagManager\Api\DataLayer;
 
 use Magefan\GoogleTagManager\Api\DataLayer\PurchaseInterface as Subject;
-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;
-use Magefan\GoogleTagManager\Model\Transaction\Log;
+use Magefan\GoogleTagManager\Model\Transaction\Log as TransactionLog;
 
 class PurchaseInterface
 {
     /**
-     * @var TransactionCollectionFactory
+     * @var TransactionLog
      */
-    protected $transactionCollectionFactory;
+    protected $transactionLog;
 
     /**
-     * @var Log
-     */
-    protected $transactionLogger;
-
-    /**
-     * PurchaseInterface constructor.
-     * @param TransactionCollectionFactory $transactionCollectionFactory
-     * @param Log $transactionLogger
+     * @param TransactionLog $transactionLog
      */
     public function __construct(
-        TransactionCollectionFactory $transactionCollectionFactory,
-        Log $transactionLogger
+        TransactionLog $transactionLog
     ) {
-        $this->transactionCollectionFactory = $transactionCollectionFactory;
-        $this->transactionLogger = $transactionLogger;
+        $this->transactionLog = $transactionLog;
     }
 
     /**
      * @param Subject $subject
      * @param $proceed
      * @param Order $order
      * @param string $requester
-     * @return array|mixed
+     * @return array
      */
-    public function aroundGet(Subject $subject, $proceed, Order $order, string $requester = '')
+    public function aroundGet(Subject $subject, $proceed, Order $order, string $requester = ''): array
     {
-        if ($this->isTransactionIdUniqueForRequester($requester, $order)) {
-            $this->transactionLogger->logTransaction($order, $requester);
+        if ($this->transactionLog->isTransactionUnique($order, $requester)) {
+            $this->transactionLog->logTransaction($order, $requester);
             return $proceed($order, $requester);
         } else {
             return [];
         }
     }
-
-    /**
-     * @param string $requester
-     * @param string $transactionId
-     * @return bool
-     */
-    protected function isTransactionIdUniqueForRequester(string $requester, Order $order): bool
-    {
-        $transactionsForRequesterByTransactionId = $this->transactionCollectionFactory->create()->addFieldToFilter(
-            'requester',
-            $requester
-        )->addFieldToFilter(
-            'transaction_id',
-            (string)$order->getIncrementId()
-        )->addFieldToFilter(
-            'store_id',
-            (int)$order->getStoreId()
-        );
-
-        if (count($transactionsForRequesterByTransactionId)) {
-            return false;
-        }
-
-        return true;
-    }
 }