fix bugs

Author: rez1dent3

src/Models/Transaction.php

@@ -20,6 +20,9 @@
 class Transaction extends Model
 {
 
+    public const TYPE_DEPOSIT = 'deposit';
+    public const TYPE_WITHDRAW = 'withdraw';
+
     /**
      * @var array
      */

src/Traits/HasWallet.php

@@ -55,7 +55,7 @@ private function checkAmount(int $amount): void
     public function forceWithdraw(int $amount, ?array $meta = null, bool $confirmed = true): Transaction
     {
         $this->checkAmount($amount);
-        return $this->change(-$amount, $meta, $confirmed);
+        return $this->change(Transaction::TYPE_WITHDRAW, -$amount, $meta, $confirmed);
     }
 
     /**
@@ -70,7 +70,7 @@ public function forceWithdraw(int $amount, ?array $meta = null, bool $confirmed
     public function deposit(int $amount, ?array $meta = null, bool $confirmed = true): Transaction
     {
         $this->checkAmount($amount);
-        return $this->change($amount, $meta, $confirmed);
+        return $this->change(Transaction::TYPE_DEPOSIT, $amount, $meta, $confirmed);
     }
 
     /**
@@ -190,15 +190,16 @@ protected function assemble(Wallet $wallet, Transaction $withdraw, Transaction $
     /**
      * this method adds a new transaction to the translation table
      *
+     * @param string $type
      * @param int $amount
      * @param array|null $meta
      * @param bool $confirmed
      * @return Transaction
      * @throws
      */
-    protected function change(int $amount, ?array $meta, bool $confirmed): Transaction
+    protected function change(string $type, int $amount, ?array $meta, bool $confirmed): Transaction
     {
-        return DB::transaction(function () use ($amount, $meta, $confirmed) {
+        return DB::transaction(function () use ($type, $amount, $meta, $confirmed) {
 
             $wallet = $this;
             if (!($this instanceof WalletModel)) {
@@ -210,7 +211,7 @@ protected function change(int $amount, ?array $meta, bool $confirmed): Transacti
             }
 
             return $this->transactions()->create([
-                'type' => $amount > 0 ? 'deposit' : 'withdraw',
+                'type' => $type,
                 'wallet_id' => $wallet->getKey(),
                 'uuid' => Uuid::uuid4()->toString(),
                 'confirmed' => $confirmed,

tests/migrations/2014_10_12_000000_create_users_table.php

@@ -7,7 +7,7 @@
 class CreateUsersTable extends Migration
 {
     /**
-     * Run the migrations_v2.
+     * Run the migrations.
      *
      * @return void
      */
@@ -22,7 +22,7 @@ public function up()
     }
 
     /**
-     * Reverse the migrations_v2.
+     * Reverse the migrations.
      *
      * @return void
      */

tests/migrations/2018_11_08_214421_create_items_table.php

@@ -7,7 +7,7 @@
 class CreateItemsTable extends Migration
 {
     /**
-     * Run the migrations_v2.
+     * Run the migrations.
      *
      * @return void
      */
@@ -23,7 +23,7 @@ public function up()
     }
 
     /**
-     * Reverse the migrations_v2.
+     * Reverse the migrations.
      *
      * @return void
      */