Subscribe to laravel events

config/config.php

@@ -19,6 +19,7 @@
 use Bavix\Wallet\Internal\Repository\TransferRepository;
 use Bavix\Wallet\Internal\Repository\WalletRepository;
 use Bavix\Wallet\Internal\Service\ClockService;
+use Bavix\Wallet\Internal\Service\ConnectionService;
 use Bavix\Wallet\Internal\Service\DatabaseService;
 use Bavix\Wallet\Internal\Service\DispatcherService;
 use Bavix\Wallet\Internal\Service\JsonService;
@@ -82,6 +83,7 @@
      */
     'internal' => [
         'clock' => ClockService::class,
+        'connection' => ConnectionService::class,
         'database' => DatabaseService::class,
         'dispatcher' => DispatcherService::class,
         'json' => JsonService::class,

src/Internal/Exceptions/ExceptionInterface.php

@@ -32,5 +32,8 @@ interface ExceptionInterface extends Throwable
 
     public const MODEL_NOT_FOUND = 1 << 11;
 
+    /**
+     * @deprecated no longer used
+     */
     public const TRANSACTION_START = 1 << 12;
 }

src/Internal/Exceptions/TransactionRollbackException.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bavix\Wallet\Internal\Exceptions;
+
+use InvalidArgumentException;
+
+final class TransactionRollbackException extends InvalidArgumentException implements ExceptionInterface
+{
+    public function __construct(
+        private mixed $result
+    ) {
+        parent::__construct();
+    }
+
+    public function getResult(): mixed
+    {
+        return $this->result;
+    }
+}

src/Internal/Exceptions/TransactionStartException.php

@@ -6,6 +6,10 @@
 
 use LogicException;
 
+/**
+ * @deprecated no longer used
+ * @codeCoverageIgnore
+ */
 final class TransactionStartException extends LogicException implements LogicExceptionInterface
 {
 }

src/Internal/Listeners/TransactionBeginningListener.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bavix\Wallet\Internal\Listeners;
+
+use Bavix\Wallet\Internal\Service\ConnectionServiceInterface;
+use Bavix\Wallet\Services\RegulatorServiceInterface;
+
+final class TransactionBeginningListener
+{
+    public function __construct(
+        private ConnectionServiceInterface $connectionService,
+        private RegulatorServiceInterface $regulatorService
+    ) {
+    }
+
+    public function __invoke(): void
+    {
+        if ($this->connectionService->get()->transactionLevel() === 1) {
+            $this->regulatorService->purge();
+        }
+    }
+}

src/Internal/Listeners/TransactionCommittedListener.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bavix\Wallet\Internal\Listeners;
+
+use Bavix\Wallet\Services\RegulatorServiceInterface;
+
+final class TransactionCommittedListener
+{
+    public function __construct(
+        private RegulatorServiceInterface $regulatorService
+    ) {
+    }
+
+    public function __invoke(): void
+    {
+        $this->regulatorService->approve();
+    }
+}

src/Internal/Listeners/TransactionRolledBackListener.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bavix\Wallet\Internal\Listeners;
+
+use Bavix\Wallet\Services\RegulatorServiceInterface;
+
+final class TransactionRolledBackListener
+{
+    public function __construct(
+        private RegulatorServiceInterface $regulatorService
+    ) {
+    }
+
+    public function __invoke(): void
+    {
+        $this->regulatorService->purge();
+    }
+}

src/Internal/Service/ConnectionService.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bavix\Wallet\Internal\Service;
+
+use Illuminate\Database\ConnectionInterface;
+use Illuminate\Database\ConnectionResolverInterface;
+
+/**
+ * @internal
+ */
+final class ConnectionService implements ConnectionServiceInterface
+{
+    private ConnectionInterface $connection;
+
+    public function __construct(ConnectionResolverInterface $connectionResolver)
+    {
+        $this->connection = $connectionResolver->connection(config('wallet.database.connection'));
+    }
+
+    public function get(): ConnectionInterface
+    {
+        return $this->connection;
+    }
+}

src/Internal/Service/ConnectionServiceInterface.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bavix\Wallet\Internal\Service;
+
+use Illuminate\Database\ConnectionInterface;
+
+interface ConnectionServiceInterface
+{
+    public function get(): ConnectionInterface;
+}

src/Internal/Service/DatabaseService.php

@@ -6,24 +6,17 @@
 
 use Bavix\Wallet\Internal\Exceptions\ExceptionInterface;
 use Bavix\Wallet\Internal\Exceptions\TransactionFailedException;
-use Bavix\Wallet\Internal\Exceptions\TransactionStartException;
+use Bavix\Wallet\Internal\Exceptions\TransactionRollbackException;
 use Bavix\Wallet\Services\RegulatorServiceInterface;
-use Illuminate\Database\ConnectionInterface;
-use Illuminate\Database\ConnectionResolverInterface;
 use Illuminate\Database\RecordsNotFoundException;
 use Throwable;
 
 final class DatabaseService implements DatabaseServiceInterface
 {
-    private ConnectionInterface $connection;
-
-    private bool $init = false;
-
     public function __construct(
-        ConnectionResolverInterface $connectionResolver,
+        private ConnectionServiceInterface $connectionService,
         private RegulatorServiceInterface $regulatorService
     ) {
-        $this->connection = $connectionResolver->connection(config('wallet.database.connection'));
     }
 
     /**
@@ -33,39 +26,25 @@ public function __construct(
      */
     public function transaction(callable $callback): mixed
     {
-        $level = $this->connection->transactionLevel();
-        if ($level > 0 && ! $this->init) {
-            throw new TransactionStartException(
-                'Working inside an embedded transaction is not possible. https://bavix.github.io/laravel-wallet/#/transaction',
-                ExceptionInterface::TRANSACTION_START,
-            );
-        }
-
-        if ($level > 0) {
+        $connection = $this->connectionService->get();
+        if ($connection->transactionLevel() > 0) {
             return $callback();
         }
 
-        $this->init = true;
-
         try {
-            $this->regulatorService->purge();
-
-            return $this->connection->transaction(function () use ($callback) {
+            return $connection->transaction(function () use ($callback) {
                 $result = $callback();
-                $this->init = false;
-
-                if ($result === false) {
-                    return false;
-                }
 
-                if (is_countable($result) && count($result) === 0) {
-                    return $result;
+                if ($result === false || (is_countable($result) && count($result) === 0)) {
+                    throw new TransactionRollbackException($result);
                 }
 
                 $this->regulatorService->approve();
 
                 return $result;
             });
+        } catch (TransactionRollbackException $rollbackException) {
+            return $rollbackException->getResult();
         } catch (RecordsNotFoundException|ExceptionInterface $exception) {
             throw $exception;
         } catch (Throwable $throwable) {
@@ -74,9 +53,6 @@ public function transaction(callable $callback): mixed
                 ExceptionInterface::TRANSACTION_FAILED,
                 $throwable
             );
-        } finally {
-            $this->regulatorService->purge();
-            $this->init = false;
         }
     }
 }

src/WalletServiceProvider.php

@@ -46,6 +46,8 @@
 use Bavix\Wallet\Internal\Repository\WalletRepositoryInterface;
 use Bavix\Wallet\Internal\Service\ClockService;
 use Bavix\Wallet\Internal\Service\ClockServiceInterface;
+use Bavix\Wallet\Internal\Service\ConnectionService;
+use Bavix\Wallet\Internal\Service\ConnectionServiceInterface;
 use Bavix\Wallet\Internal\Service\DatabaseService;
 use Bavix\Wallet\Internal\Service\DatabaseServiceInterface;
 use Bavix\Wallet\Internal\Service\DispatcherService;
@@ -109,6 +111,10 @@
 use function dirname;
 use function function_exists;
 use Illuminate\Contracts\Cache\Factory as CacheFactory;
+use Illuminate\Database\Events\TransactionBeginning;
+use Illuminate\Database\Events\TransactionCommitted;
+use Illuminate\Database\Events\TransactionRolledBack;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Support\ServiceProvider;
 
 final class WalletServiceProvider extends ServiceProvider
@@ -122,6 +128,10 @@ public function boot(): void
     {
         $this->loadTranslationsFrom(dirname(__DIR__) . '/resources/lang', 'wallet');
 
+        Event::listen(TransactionBeginning::class, Internal\Listeners\TransactionBeginningListener::class);
+        Event::listen(TransactionCommitted::class, Internal\Listeners\TransactionCommittedListener::class);
+        Event::listen(TransactionRolledBack::class, Internal\Listeners\TransactionRolledBackListener::class);
+
         if (! $this->app->runningInConsole()) {
             return;
         }
@@ -213,6 +223,7 @@ private function internal(array $configure): void
             ->giveConfig('wallet.cache.ttl');
 
         $this->app->singleton(ClockServiceInterface::class, $configure['clock'] ?? ClockService::class);
+        $this->app->singleton(ConnectionServiceInterface::class, $configure['connection'] ?? ConnectionService::class);
         $this->app->singleton(DatabaseServiceInterface::class, $configure['database'] ?? DatabaseService::class);
         $this->app->singleton(DispatcherServiceInterface::class, $configure['dispatcher'] ?? DispatcherService::class);
         $this->app->singleton(JsonServiceInterface::class, $configure['json'] ?? JsonService::class);

tests/Units/Domain/EventTest.php

@@ -77,7 +77,6 @@ public function testBalanceUpdatedThrowDateListener(): void
 
         // unit
         $this->expectException(UnknownEventException::class);
-        $this->expectExceptionMessage(ClockFakeService::FAKE_DATETIME);
         $this->expectExceptionCode(789);
 
         $buyer->deposit(789);

tests/Units/Service/DatabaseTest.php

@@ -6,10 +6,8 @@
 
 use Bavix\Wallet\Internal\Exceptions\ExceptionInterface;
 use Bavix\Wallet\Internal\Exceptions\TransactionFailedException;
-use Bavix\Wallet\Internal\Exceptions\TransactionStartException;
 use Bavix\Wallet\Internal\Service\DatabaseServiceInterface;
 use Bavix\Wallet\Test\Infra\TestCase;
-use Illuminate\Support\Facades\DB;
 
 /**
  * @internal
@@ -29,29 +27,4 @@ public function testCheckCode(): void
             throw new \RuntimeException('hello');
         });
     }
-
-    /**
-     * @throws ExceptionInterface
-     */
-    public function testCheckInTransaction(): void
-    {
-        $this->expectException(TransactionStartException::class);
-        $this->expectExceptionCode(ExceptionInterface::TRANSACTION_START);
-
-        DB::beginTransaction();
-        app(DatabaseServiceInterface::class)->transaction(static fn (): int => 42);
-    }
-
-    public function testInterceptionErrorStartTransaction(): void
-    {
-        try {
-            DB::beginTransaction();
-            app(DatabaseServiceInterface::class)->transaction(static fn (): int => 42);
-            self::fail(__METHOD__);
-        } catch (TransactionStartException) {
-            DB::rollBack(0); // for success
-            $result = app(DatabaseServiceInterface::class)->transaction(static fn (): int => 42);
-            self::assertSame(42, $result);
-        }
-    }
 }