Merge pull request #972 from bavix/971-bavixwalletexceptionsunconfirm…

…edinvalid-confirmation-has-already-been-reset allow deletion of unconfirmed operations without forceDelete
bavix · Jul 8, 2024 · 9eae261 · 9eae261
2 parents bda3ca1 + 270d348
commit 9eae261
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/src/Internal/Observers/TransactionObserver.php b/src/Internal/Observers/TransactionObserver.php
@@ -24,6 +24,6 @@ final class TransactionObserver
      */
     public function deleting(Transaction $model): bool
     {
-        return $model->wallet->resetConfirm($model);
+        return $model->wallet->safeResetConfirm($model);
     }
 }
diff --git a/src/Internal/Observers/TransferObserver.php b/src/Internal/Observers/TransferObserver.php
@@ -31,8 +31,8 @@ public function __construct(
     public function deleting(Transfer $model): bool
     {
         return $this->atomicService->blocks([$model->from, $model->to], function () use ($model) {
-            return $model->from->resetConfirm($model->withdraw)
-                && $model->to->resetConfirm($model->deposit);
+            return $model->from->safeResetConfirm($model->withdraw)
+                && $model->to->safeResetConfirm($model->deposit);
         });
     }
 }
diff --git a/src/Traits/CanConfirm.php b/src/Traits/CanConfirm.php
@@ -54,6 +54,8 @@ public function safeConfirm(Transaction $transaction): bool
     {
         try {
             return $this->confirm($transaction);
+        } catch (ConfirmedInvalid) {
+            return true;
         } catch (ExceptionInterface) {
             return false;
         }
@@ -99,6 +101,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

diff --git a/tests/Units/Domain/SoftDeletesTest.php b/tests/Units/Domain/SoftDeletesTest.php
@@ -4,7 +4,6 @@
 
 namespace Bavix\Wallet\Test\Units\Domain;
 
-use Bavix\Wallet\Exceptions\UnconfirmedInvalid;
 use Bavix\Wallet\Test\Infra\Factories\BuyerFactory;
 use Bavix\Wallet\Test\Infra\Models\Buyer;
 use Bavix\Wallet\Test\Infra\TestCase;
@@ -87,8 +86,6 @@ public function testTransactionDelete(): void
 
     public function testTransactionDeleteIfNotConfirmed(): void
     {
-        $this->expectException(UnconfirmedInvalid::class);
-
         /** @var Buyer $buyer */
         $buyer = BuyerFactory::new()->create();
         self::assertFalse($buyer->relationLoaded('wallet'));
@@ -141,8 +138,6 @@ public function testTransferDelete(): void
 
     public function testTransferDeleteIfNotConfirmed(): void
     {
-        $this->expectException(UnconfirmedInvalid::class);
-
         /** @var Buyer $user1 */
         /** @var Buyer $user2 */
         [$user1, $user2] = BuyerFactory::times(2)->create();