fix safeResetConfirm

bavix · Jul 8, 2024 · f4d66aa · f4d66aa
1 parent cf2c845
commit f4d66aa
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 25 deletions.
diff --git a/src/Internal/Observers/TransactionObserver.php b/src/Internal/Observers/TransactionObserver.php
@@ -6,7 +6,6 @@
 
 use Bavix\Wallet\Exceptions\UnconfirmedInvalid;
 use Bavix\Wallet\Exceptions\WalletOwnerInvalid;
-use Bavix\Wallet\Interfaces\Wallet;
 use Bavix\Wallet\Internal\Exceptions\ExceptionInterface;
 use Bavix\Wallet\Internal\Exceptions\RecordNotFoundException;
 use Bavix\Wallet\Internal\Exceptions\TransactionFailedException;
@@ -25,15 +24,6 @@ final class TransactionObserver
      */
     public function deleting(Transaction $model): bool
     {
-        return $this->safeResetConfirm($model->wallet, $model);
-    }
-
-    private function safeResetConfirm(Wallet $model, Transaction $transaction): bool 
-    {
-        try {
-            return $model->resetConfirm($transaction);
-        } catch (UnconfirmedInvalid) {
-            return true;
-        }
+        return $model->wallet->safeResetConfirm($model);
     }
 }
diff --git a/src/Internal/Observers/TransferObserver.php b/src/Internal/Observers/TransferObserver.php
@@ -6,11 +6,9 @@
 
 use Bavix\Wallet\Exceptions\UnconfirmedInvalid;
 use Bavix\Wallet\Exceptions\WalletOwnerInvalid;
-use Bavix\Wallet\Interfaces\Wallet;
 use Bavix\Wallet\Internal\Exceptions\ExceptionInterface;
 use Bavix\Wallet\Internal\Exceptions\RecordNotFoundException;
 use Bavix\Wallet\Internal\Exceptions\TransactionFailedException;
-use Bavix\Wallet\Models\Transaction;
 use Bavix\Wallet\Models\Transfer;
 use Bavix\Wallet\Services\AtomicServiceInterface;
 use Illuminate\Database\RecordsNotFoundException;
@@ -33,17 +31,8 @@ public function __construct(
     public function deleting(Transfer $model): bool
     {
         return $this->atomicService->blocks([$model->from, $model->to], function () use ($model) {
-            return $this->safeResetConfirm($model->from, $model->withdraw)
-                && $this->safeResetConfirm($model->to, $model->deposit);
+            return $model->from->safeResetConfirm($model->withdraw)
+                && $model->to->safeResetConfirm($model->deposit);
         });
     }
-
-    private function safeResetConfirm(Wallet $model, Transaction $transaction): bool 
-    {
-        try {
-            return $model->resetConfirm($transaction);
-        } catch (UnconfirmedInvalid) {
-            return true;
-        }
-    }
 }
diff --git a/src/Traits/CanConfirm.php b/src/Traits/CanConfirm.php
@@ -99,6 +99,8 @@ public function safeResetConfirm(Transaction $transaction): bool
     {
         try {
             return $this->resetConfirm($transaction);
+        } catch (UnconfirmedInvalid) {
+            return true;
         } catch (ExceptionInterface) {
             return false;
         }

diff --git a/tests/Units/Domain/ConfirmTest.php b/tests/Units/Domain/ConfirmTest.php
@@ -195,7 +195,7 @@ public function testSafeUnconfirmed(): void
         $transaction = $wallet->deposit(1000, null, false);
         self::assertSame(0, $wallet->balanceInt);
         self::assertFalse($transaction->confirmed);
-        self::assertFalse($wallet->safeResetConfirm($transaction));
+        self::assertTrue($wallet->safeResetConfirm($transaction));
     }
 
     public function testWalletOwnerInvalid(): void