fix unit cases and patch bug

Author: Babichev Maxim

src/Interfaces/Discount.php

@@ -8,5 +8,5 @@ interface Discount extends Product
      * @param Customer $customer
      * @return int
      */
-    public function getDiscountProduct(Customer $customer): int;
+    public function getPersonalDiscount(Customer $customer): int;
 }

src/Services/CommonService.php

@@ -12,6 +12,7 @@
 use Bavix\Wallet\Objects\Bring;
 use Bavix\Wallet\Objects\Operation;
 use Bavix\Wallet\Traits\HasWallet;
+use function max;
 use function app;
 use function compact;
 
@@ -47,7 +48,7 @@ public function forceTransfer(Wallet $from, Wallet $to, int $amount, ?array $met
         return app(LockService::class)->lock($this, __FUNCTION__, function () use ($from, $to, $amount, $meta, $status) {
             $from = app(WalletService::class)->getWallet($from);
             $discount = app(WalletService::class)->discount($from, $to);
-            $amount -= $discount;
+            $amount = max(0, $amount - $discount);
 
             $fee = app(WalletService::class)->fee($to, $amount);
             $withdraw = $this->forceWithdraw($from, $amount + $fee, $meta);

src/Services/WalletService.php

@@ -25,7 +25,7 @@ class WalletService
     public function discount(Wallet $customer, Wallet $product): int
     {
         if ($customer instanceof Customer && $product instanceof Discount) {
-            return $product->getDiscountProduct($customer);
+            return $product->getPersonalDiscount($customer);
         }
 
         // without discount

tests/DiscountTest.php

@@ -35,7 +35,7 @@ public function testPay(): void
 
         $this->assertEquals(
             $buyer->balance,
-            $product->getDiscountProduct($buyer)
+            $product->getPersonalDiscount($buyer)
         );
 
         /**
@@ -71,10 +71,10 @@ public function testRefund(): void
     {
         /**
          * @var Buyer $buyer
-         * @var Item $product
+         * @var ItemDiscount $product
          */
         $buyer = factory(Buyer::class)->create();
-        $product = factory(Item::class)->create([
+        $product = factory(ItemDiscount::class)->create([
             'quantity' => 1,
         ]);
 
@@ -98,8 +98,12 @@ public function testRefund(): void
 
         $transfer = $buyer->pay($product);
         $this->assertNotNull($transfer);
-        $this->assertEquals($buyer->balance, 0);
-        $this->assertEquals($product->balance, $product->getAmountProduct($buyer));
+        $this->assertEquals($buyer->balance, $product->getPersonalDiscount($buyer));
+        $this->assertEquals(
+            $product->balance,
+            $product->getAmountProduct($buyer) - $product->getPersonalDiscount($buyer)
+        );
+
         $this->assertEquals($transfer->status, Transfer::STATUS_PAID);
 
         $this->assertTrue($buyer->refund($product));
@@ -117,10 +121,10 @@ public function testForceRefund(): void
     {
         /**
          * @var Buyer $buyer
-         * @var Item $product
+         * @var ItemDiscount $product
          */
         $buyer = factory(Buyer::class)->create();
-        $product = factory(Item::class)->create([
+        $product = factory(ItemDiscount::class)->create([
             'quantity' => 1,
         ]);
 
@@ -130,16 +134,23 @@ public function testForceRefund(): void
         $this->assertEquals($buyer->balance, $product->getAmountProduct($buyer));
 
         $buyer->pay($product);
-        $this->assertEquals($buyer->balance, 0);
-        $this->assertEquals($product->balance, $product->getAmountProduct($buyer));
+        $this->assertEquals($buyer->balance, $product->getPersonalDiscount($buyer));
+
+        $this->assertEquals(
+            $product->balance,
+            $product->getAmountProduct($buyer) - $product->getPersonalDiscount($buyer)
+        );
 
         $product->withdraw($product->balance);
         $this->assertEquals($product->balance, 0);
 
         $this->assertFalse($buyer->safeRefund($product));
         $this->assertTrue($buyer->forceRefund($product));
 
-        $this->assertEquals($product->balance, -$product->getAmountProduct($buyer));
+        $this->assertEquals(
+            $product->balance, -($product->getAmountProduct($buyer) - $product->getPersonalDiscount($buyer))
+        );
+
         $this->assertEquals($buyer->balance, $product->getAmountProduct($buyer));
         $product->deposit(-$product->balance);
         $buyer->withdraw($buyer->balance);
@@ -157,10 +168,10 @@ public function testOutOfStock(): void
 
         /**
          * @var Buyer $buyer
-         * @var Item $product
+         * @var ItemDiscount $product
          */
         $buyer = factory(Buyer::class)->create();
-        $product = factory(Item::class)->create([
+        $product = factory(ItemDiscount::class)->create([
             'quantity' => 1,
         ]);
 
@@ -176,17 +187,19 @@ public function testForcePay(): void
     {
         /**
          * @var Buyer $buyer
-         * @var Item $product
+         * @var ItemDiscount $product
          */
         $buyer = factory(Buyer::class)->create();
-        $product = factory(Item::class)->create([
+        $product = factory(ItemDiscount::class)->create([
             'quantity' => 1,
         ]);
 
         $this->assertEquals($buyer->balance, 0);
         $buyer->forcePay($product);
 
-        $this->assertEquals($buyer->balance, -$product->getAmountProduct($buyer));
+        $this->assertEquals(
+            $buyer->balance, -($product->getAmountProduct($buyer) - $product->getPersonalDiscount($buyer))
+        );
 
         $buyer->deposit(-$buyer->balance);
         $this->assertEquals($buyer->balance, 0);
@@ -199,10 +212,10 @@ public function testPayFree(): void
     {
         /**
          * @var Buyer $buyer
-         * @var Item $product
+         * @var ItemDiscount $product
          */
         $buyer = factory(Buyer::class)->create();
-        $product = factory(Item::class)->create([
+        $product = factory(ItemDiscount::class)->create([
             'quantity' => 1,
         ]);
 
@@ -224,10 +237,10 @@ public function testFreePay(): void
     {
         /**
          * @var Buyer $buyer
-         * @var Item $product
+         * @var ItemDiscount $product
          */
         $buyer = factory(Buyer::class)->create();
-        $product = factory(Item::class)->create([
+        $product = factory(ItemDiscount::class)->create([
             'quantity' => 1,
         ]);
 
@@ -255,10 +268,10 @@ public function testPayFreeOutOfStock(): void
 
         /**
          * @var Buyer $buyer
-         * @var Item $product
+         * @var ItemDiscount $product
          */
         $buyer = factory(Buyer::class)->create();
-        $product = factory(Item::class)->create([
+        $product = factory(ItemDiscount::class)->create([
             'quantity' => 1,
         ]);
 

tests/Models/ItemDiscount.php

@@ -22,7 +22,7 @@ public function getTable(): string
      * @param Customer $customer
      * @return int
      */
-    public function getDiscountProduct(Customer $customer): int
+    public function getPersonalDiscount(Customer $customer): int
     {
         $wallet = app(WalletService::class)
             ->getWallet($customer);