update deptrac rules

Author: rez1dent3

.phpstorm.meta.php

@@ -9,7 +9,8 @@
     use Bavix\Wallet\Internal\Repository\TransferRepositoryInterface;
     use Bavix\Wallet\Services\CastServiceInterface;
     use Bavix\Wallet\Internal\Service\JsonServiceInterface;
-    use Bavix\Wallet\Internal\Service\PrepareServiceInterface;
+    use Bavix\Wallet\Services\DiscountServiceInterface;
+    use Bavix\Wallet\Services\PrepareServiceInterface;
     use Bavix\Wallet\Internal\Transform\TransactionDtoTransformerInterface;
     use Bavix\Wallet\Internal\Transform\TransferDtoTransformerInterface;
     use Bavix\Wallet\Models\Transaction;
@@ -33,6 +34,7 @@
     use Bavix\Wallet\Services\CommonServiceLegacy;
     use Bavix\Wallet\Services\LockServiceLegacy;
     use Bavix\Wallet\Services\MetaServiceLegacy;
+    use Bavix\Wallet\Services\TaxServiceInterface;
     use Bavix\Wallet\Services\WalletServiceLegacy;
 
     override(\app(0), map([
@@ -50,7 +52,6 @@
         JsonServiceInterface::class => JsonServiceInterface::class,
         LockServiceInterface::class => LockServiceInterface::class,
         MathServiceInterface::class => MathServiceInterface::class,
-        PrepareServiceInterface::class => PrepareServiceInterface::class,
         StorageServiceInterface::class => StorageServiceInterface::class,
         TranslatorServiceInterface::class => TranslatorServiceInterface::class,
         UuidServiceInterface::class => UuidServiceInterface::class,
@@ -74,8 +75,11 @@
         BookkeeperServiceInterface::class => BookkeeperServiceInterface::class,
         CastServiceInterface::class => CastServiceInterface::class,
         ConsistencyServiceInterface::class => ConsistencyServiceInterface::class,
+        DiscountServiceInterface::class => DiscountServiceInterface::class,
         ExchangeServiceInterface::class => ExchangeServiceInterface::class,
+        PrepareServiceInterface::class => PrepareServiceInterface::class,
         PurchaseServiceInterface::class => PurchaseServiceInterface::class,
+        TaxServiceInterface::class => TaxServiceInterface::class,
 
         // lagacy.services
         CommonServiceLegacy::class => CommonServiceLegacy::class,

config/config.php

@@ -11,7 +11,6 @@
 use Bavix\Wallet\Internal\Service\JsonService;
 use Bavix\Wallet\Internal\Service\LockService;
 use Bavix\Wallet\Internal\Service\MathService;
-use Bavix\Wallet\Internal\Service\PrepareService;
 use Bavix\Wallet\Internal\Service\StorageService;
 use Bavix\Wallet\Internal\Service\TranslatorService;
 use Bavix\Wallet\Internal\Service\UuidService;
@@ -26,8 +25,11 @@
 use Bavix\Wallet\Services\BookkeeperService;
 use Bavix\Wallet\Services\CastService;
 use Bavix\Wallet\Services\ConsistencyService;
+use Bavix\Wallet\Services\DiscountService;
 use Bavix\Wallet\Services\ExchangeService;
+use Bavix\Wallet\Services\PrepareService;
 use Bavix\Wallet\Services\PurchaseService;
+use Bavix\Wallet\Services\TaxService;
 
 return [
     /**
@@ -58,7 +60,6 @@
         'json' => JsonService::class,
         'lock' => LockService::class,
         'math' => MathService::class,
-        'prepare' => PrepareService::class,
         'storage' => StorageService::class,
         'translator' => TranslatorService::class,
         'uuid' => UuidService::class,
@@ -74,8 +75,11 @@
         'bookkeeper' => BookkeeperService::class,
         'cast' => CastService::class,
         'consistency' => ConsistencyService::class,
+        'discount' => DiscountService::class,
         'exchange' => ExchangeService::class,
+        'prepare' => PrepareService::class,
         'purchase' => PurchaseService::class,
+        'tax' => TaxService::class,
     ],
 
     /**

depfile.yaml

@@ -10,18 +10,45 @@ layers:
   - name: UI
     collectors:
       - type: className
-        regex: ^Bavix\\.*Traits.*
+        regex: ^Bavix\\.*\\Traits\\.*
+
+  # internal
+  - name: AssemblerDto
+    collectors:
+      - type: className
+        regex: ^Bavix\\.*\\Internal\\Assembler\\.*DtoAssembler$
+
+  - name: AssemblerDtoInterface
+    collectors:
+      - type: className
+        regex: ^Bavix\\.*\\Internal\\Assembler\\.*DtoAssemblerInterface$
+
+  - name: RepositoryInterface
+    collectors:
+      - type: className
+        regex: ^Bavix\\.*Internal\\Repository\\.*RepositoryInterface$
 
   - name: Repository
     collectors:
       - type: className
         regex: ^Bavix\\.*Internal\\Repository\\.*Repository$
 
+  - name: Transform
+    collectors:
+      - type: className
+        regex: ^Bavix\\.*Internal\\Transform\\.*DtoTransformer$
+
+  - name: TransformInterface
+    collectors:
+      - type: className
+        regex: ^Bavix\\.*Internal\\Transform\\.*DtoTransformerInterface$
+
   - name: Infra
     collectors:
       - type: className
         regex: ^Bavix\\.*Internal\\Service\\.*Service$
 
+  # contracts
   - name: Service
     collectors:
       - type: className
@@ -34,6 +61,7 @@ layers:
       - type: className
         regex: ^Bavix\\.*Services\\.*ServiceInterface$
 
+  # framework
   - name: ModelNotFoundException
     collectors:
       - type: className
@@ -56,20 +84,33 @@ layers:
 
 ruleset:
   UI:
+    - AssemblerDtoInterface # delete as soon as possible
     - ModelNotFoundException
     - ServiceInterface
     - Legacy # delete as soon as possible
   Infra:
     - ServiceInterface
     - Config
     - Cache
-    - Legacy
   ServiceInterface:
     - EloquentModel
+  Transform:
+    - TransformInterface
+    - Infra
+  Repository:
+    - RepositoryInterface
+    - TransformInterface
   Service:
+    - AssemblerDtoInterface
+    - RepositoryInterface
     - ServiceInterface
-    - Repository
     - EloquentModel
   Legacy:
+    - AssemblerDtoInterface
+    - ServiceInterface
+  AssemblerDtoInterface:
+    - EloquentModel
+  AssemblerDto:
+    - AssemblerDtoInterface
     - ServiceInterface
     - EloquentModel

src/Services/CommonServiceLegacy.php

@@ -10,7 +10,6 @@
 use Bavix\Wallet\Internal\Dto\TransactionDto;
 use Bavix\Wallet\Internal\Dto\TransferLazyDto;
 use Bavix\Wallet\Internal\Service\DatabaseServiceInterface;
-use Bavix\Wallet\Internal\Service\PrepareServiceInterface;
 use Bavix\Wallet\Models\Transaction;
 use Bavix\Wallet\Models\Transfer;
 use Bavix\Wallet\Models\Wallet as WalletModel;

src/Services/DiscountService.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bavix\Wallet\Services;
+
+use Bavix\Wallet\Interfaces\Customer;
+use Bavix\Wallet\Interfaces\Discount;
+use Bavix\Wallet\Interfaces\Wallet;
+
+final class DiscountService implements DiscountServiceInterface
+{
+    public function getDiscount(Wallet $customer, Wallet $product): int
+    {
+        if ($customer instanceof Customer && $product instanceof Discount) {
+            return (int) $product->getPersonalDiscount($customer);
+        }
+
+        return 0;
+    }
+}

src/Services/DiscountServiceInterface.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bavix\Wallet\Services;
+
+use Bavix\Wallet\Interfaces\Wallet;
+
+interface DiscountServiceInterface
+{
+    public function getDiscount(Wallet $customer, Wallet $product): int;
+}

src/Services/LockServiceLegacy.php

@@ -7,7 +7,6 @@
 use Bavix\Wallet\Internal\Service\LockServiceInterface;
 use Closure;
 use function get_class;
-use Illuminate\Database\Eloquent\Model;
 
 /**
  * @deprecated
@@ -25,10 +24,16 @@ public function __construct(LockServiceInterface $lockService)
     /**
      * @return mixed
      */
-    public function lock(Model $self, Closure $closure)
+    public function lock(object $self, Closure $closure)
     {
+        assert(method_exists($self, 'getKey'));
+        $key = $self->getKey();
+        if (method_exists($self, 'getUuid')) {
+            $key = $self->getUuid();
+        }
+
         return $this->lockService->block(
-            'legacy_'.get_class($self).$self->getKey(),
+            'legacy_'.get_class($self).$key,
             $closure
         );
     }

src/Internal/Service/PrepareService.php renamed to src/Services/PrepareService.php

@@ -2,41 +2,42 @@
 
 declare(strict_types=1);
 
-namespace Bavix\Wallet\Internal\Service;
+namespace Bavix\Wallet\Services;
 
 use Bavix\Wallet\Interfaces\Wallet;
 use Bavix\Wallet\Internal\Assembler\TransactionDtoAssemblerInterface;
 use Bavix\Wallet\Internal\Assembler\TransferLazyDtoAssemblerInterface;
 use Bavix\Wallet\Internal\Dto\TransactionDto;
 use Bavix\Wallet\Internal\Dto\TransferLazyDto;
+use Bavix\Wallet\Internal\Service\MathServiceInterface;
 use Bavix\Wallet\Models\Transaction;
-use Bavix\Wallet\Services\CastServiceInterface;
-use Bavix\Wallet\Services\ConsistencyServiceInterface;
-use Bavix\Wallet\Services\WalletServiceLegacy;
 
 final class PrepareService implements PrepareServiceInterface
 {
     private TransferLazyDtoAssemblerInterface $transferLazyDtoAssembler;
     private TransactionDtoAssemblerInterface $transactionDtoAssembler;
+    private DiscountServiceInterface $personalDiscountService;
     private ConsistencyServiceInterface $consistencyService;
-    private WalletServiceLegacy $walletService;
     private CastServiceInterface $castService;
     private MathServiceInterface $mathService;
+    private TaxServiceInterface $taxService;
 
     public function __construct(
         TransferLazyDtoAssemblerInterface $transferLazyDtoAssembler,
         TransactionDtoAssemblerInterface $transactionDtoAssembler,
+        DiscountServiceInterface $personalDiscountService,
         ConsistencyServiceInterface $consistencyService,
-        WalletServiceLegacy $walletService,
         CastServiceInterface $castService,
-        MathServiceInterface $mathService
+        MathServiceInterface $mathService,
+        TaxServiceInterface $taxService
     ) {
         $this->transferLazyDtoAssembler = $transferLazyDtoAssembler;
         $this->transactionDtoAssembler = $transactionDtoAssembler;
+        $this->personalDiscountService = $personalDiscountService;
         $this->consistencyService = $consistencyService;
-        $this->walletService = $walletService;
         $this->castService = $castService;
         $this->mathService = $mathService;
+        $this->taxService = $taxService;
     }
 
     public function deposit(Wallet $wallet, string $amount, ?array $meta, bool $confirmed = true): TransactionDto
@@ -72,9 +73,9 @@ public function withdraw(Wallet $wallet, string $amount, ?array $meta, bool $con
      */
     public function transferLazy(Wallet $from, Wallet $to, string $status, $amount, ?array $meta = null): TransferLazyDto
     {
-        $discount = $this->walletService->discount($from, $to);
+        $discount = $this->personalDiscountService->getDiscount($from, $to);
         $from = $this->castService->getWallet($from);
-        $fee = $this->walletService->fee($to, $amount);
+        $fee = $this->taxService->getFee($to, $amount);
 
         $amountWithoutDiscount = $this->mathService->sub($amount, $discount);
         $depositAmount = $this->mathService->compare($amountWithoutDiscount, 0) === -1 ? '0' : $amountWithoutDiscount;

src/Internal/Service/PrepareServiceInterface.php renamed to src/Services/PrepareServiceInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Bavix\Wallet\Internal\Service;
+namespace Bavix\Wallet\Services;
 
 use Bavix\Wallet\Interfaces\Wallet;
 use Bavix\Wallet\Internal\Dto\TransactionDto;

src/Services/TaxService.php

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bavix\Wallet\Services;
+
+use Bavix\Wallet\Interfaces\MinimalTaxable;
+use Bavix\Wallet\Interfaces\Taxable;
+use Bavix\Wallet\Interfaces\Wallet;
+use Bavix\Wallet\Internal\Service\MathServiceInterface;
+
+final class TaxService implements TaxServiceInterface
+{
+    private MathServiceInterface $mathService;
+    private CastServiceInterface $castService;
+
+    public function __construct(
+        MathServiceInterface $mathService,
+        CastServiceInterface $castService
+    ) {
+        $this->mathService = $mathService;
+        $this->castService = $castService;
+    }
+
+    /**
+     * @param float|int|string $amount
+     */
+    public function getFee(Wallet $wallet, $amount): string
+    {
+        $fee = 0;
+        if ($wallet instanceof Taxable) {
+            $fee = $this->mathService->floor(
+                $this->mathService->div(
+                    $this->mathService->mul($amount, $wallet->getFeePercent(), 0),
+                    100,
+                    $this->castService->getWallet($wallet)->decimal_places
+                )
+            );
+        }
+
+        /**
+         * Added minimum commission condition.
+         *
+         * @see https://github.com/bavix/laravel-wallet/issues/64#issuecomment-514483143
+         */
+        if ($wallet instanceof MinimalTaxable) {
+            $minimal = $wallet->getMinimalFee();
+            if ($this->mathService->compare($fee, $minimal) === -1) {
+                $fee = $minimal;
+            }
+        }
+
+        return (string) $fee;
+    }
+}