From b4dcd9571c95dee730095303e2769bf8d2d8d311 Mon Sep 17 00:00:00 2001
From: Daniel Subiabre <daniel.subiabre@platoniq.net>
Date: Tue, 19 Nov 2024 14:52:15 +0100
Subject: [PATCH] Consistent save = income / spend = expenditure var naming for
 wallet usage

---
 src/EventListener/WalletTransactionsListener.php |  8 ++++----
 src/Gateway/Wallet/WalletGateway.php             | 10 +++-------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/EventListener/WalletTransactionsListener.php b/src/EventListener/WalletTransactionsListener.php
index 33e6939..d8c845a 100644
--- a/src/EventListener/WalletTransactionsListener.php
+++ b/src/EventListener/WalletTransactionsListener.php
@@ -21,7 +21,7 @@ final class WalletTransactionsListener
     ) {}
 
     /**
-     * Generates a WalletStatement for User-received Transactions.
+     * Generates an income statement for User-received Transactions.
      */
     public function processTransaction(
         Transaction $transaction,
@@ -31,13 +31,13 @@ final class WalletTransactionsListener
             return;
         }
 
-        $statement = $this->wallet->save($transaction);
+        $income = $this->wallet->save($transaction);
 
-        if ($statement->getId() !== null) {
+        if ($income->getId() !== null) {
             return;
         }
 
-        $event->getObjectManager()->persist($statement);
+        $event->getObjectManager()->persist($income);
         $event->getObjectManager()->flush();
     }
 }
diff --git a/src/Gateway/Wallet/WalletGateway.php b/src/Gateway/Wallet/WalletGateway.php
index 2ca2f2c..2cf8e2c 100644
--- a/src/Gateway/Wallet/WalletGateway.php
+++ b/src/Gateway/Wallet/WalletGateway.php
@@ -52,18 +52,14 @@ class WalletGateway implements GatewayInterface
             $transaction->setOrigin($origin);
             $transaction->setTarget($charge->getTarget());
 
-            $outgoing = new WalletStatement();
-            $outgoing->setTransaction($transaction);
-            $outgoing->setDirection(StatementDirection::Outgoing);
+            $expenditure = $this->wallet->spend($transaction);
 
-            $outgoing = $this->wallet->spend($transaction);
+            $this->entityManager->persist($expenditure);
+            $this->entityManager->flush();
         }
 
         $checkout = $this->checkoutService->chargeCheckout($checkout);
 
-        $this->entityManager->persist($checkout);
-        $this->entityManager->flush();
-
         return $checkout;
     }