allow deletion of unconfirmed operations without forceDelete

Author: rez1dent3

src/Internal/Observers/TransactionObserver.php

@@ -6,6 +6,7 @@
 
 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;
@@ -24,6 +25,15 @@ final class TransactionObserver
      */
     public function deleting(Transaction $model): bool
     {
-        return $model->wallet->resetConfirm($model);
+        return $this->safeResetConfirm($model->wallet, $model);
+    }
+
+    private function safeResetConfirm(Wallet $model, Transaction $transaction): bool 
+    {
+        try {
+            return $model->resetConfirm($transaction);
+        } catch (UnconfirmedInvalid) {
+            return true;
+        }
     }
 }

src/Internal/Observers/TransferObserver.php

@@ -6,9 +6,11 @@
 
 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;
@@ -31,8 +33,17 @@ 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 $this->safeResetConfirm($model->from, $model->withdraw)
+                && $this->safeResetConfirm($model->to, $model->deposit);
         });
     }
+
+    private function safeResetConfirm(Wallet $model, Transaction $transaction): bool 
+    {
+        try {
+            return $model->resetConfirm($transaction);
+        } catch (UnconfirmedInvalid) {
+            return true;
+        }
+    }
 }

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();