add query assembler's

rez1dent3 · rez1dent3 · commit 395ae64c52c9 · 2021-11-16T19:02:26.000+03:00
diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php
@@ -2,9 +2,12 @@
 
 namespace PHPSTORM_META {
 
+    use Bavix\Wallet\Internal\Assembler\AvailabilityDtoAssemblerInterface;
     use Bavix\Wallet\Internal\Assembler\TransactionDtoAssemblerInterface;
+    use Bavix\Wallet\Internal\Assembler\TransactionQueryAssemblerInterface;
     use Bavix\Wallet\Internal\Assembler\TransferDtoAssemblerInterface;
     use Bavix\Wallet\Internal\Assembler\TransferLazyDtoAssemblerInterface;
+    use Bavix\Wallet\Internal\Assembler\TransferQueryAssemblerInterface;
     use Bavix\Wallet\Internal\Repository\TransactionRepositoryInterface;
     use Bavix\Wallet\Internal\Repository\TransferRepositoryInterface;
     use Bavix\Wallet\Services\AtomicService;
@@ -40,9 +43,13 @@
 
     override(\app(0), map([
         // internal.assembler
+        AvailabilityDtoAssemblerInterface::class => AvailabilityDtoAssemblerInterface::class,
         TransactionDtoAssemblerInterface::class => TransactionDtoAssemblerInterface::class,
         TransferDtoAssemblerInterface::class => TransferDtoAssemblerInterface::class,
         TransferLazyDtoAssemblerInterface::class => TransferLazyDtoAssemblerInterface::class,
+        // internal.query in assembler
+        TransactionQueryAssemblerInterface::class => TransactionQueryAssemblerInterface::class,
+        TransferQueryAssemblerInterface::class => TransferQueryAssemblerInterface::class,
 
         // internal.repositories
         TransactionRepositoryInterface::class => TransactionRepositoryInterface::class,
diff --git a/config/config.php b/config/config.php
@@ -4,8 +4,10 @@
 
 use Bavix\Wallet\Internal\Assembler\AvailabilityDtoAssembler;
 use Bavix\Wallet\Internal\Assembler\TransactionDtoAssembler;
+use Bavix\Wallet\Internal\Assembler\TransactionQueryAssembler;
 use Bavix\Wallet\Internal\Assembler\TransferDtoAssembler;
 use Bavix\Wallet\Internal\Assembler\TransferLazyDtoAssembler;
+use Bavix\Wallet\Internal\Assembler\TransferQueryAssembler;
 use Bavix\Wallet\Internal\Repository\TransactionRepository;
 use Bavix\Wallet\Internal\Repository\TransferRepository;
 use Bavix\Wallet\Internal\Service\DatabaseService;
@@ -109,6 +111,8 @@
         'transaction' => TransactionDtoAssembler::class,
         'transfer_lazy' => TransferLazyDtoAssembler::class,
         'transfer' => TransferDtoAssembler::class,
+        'transaction_query' => TransactionQueryAssembler::class,
+        'transfer_query' => TransferQueryAssembler::class,
     ],
 
     /**
diff --git a/depfile.yaml b/depfile.yaml
@@ -52,6 +52,16 @@ layers:
       - type: className
         regex: ^Bavix\\.*\\Internal\\Assembler\\.*DtoAssemblerInterface$
 
+  - name: QueryInterface
+    collectors:
+      - type: className
+        regex: ^Bavix\\.*Internal\\Query\\.*QueryInterface$
+
+  - name: Query
+    collectors:
+      - type: className
+        regex: ^Bavix\\.*Internal\\Query\\.*Query$
+
   - name: RepositoryInterface
     collectors:
       - type: className
@@ -163,12 +173,18 @@ ruleset:
     - ServiceInterface
     - DtoInterface
 
+  QueryInterface:
+  Query:
+    - QueryInterface
+
   RepositoryInterface:
+    - QueryInterface
     - DtoInterface
     - Model
   Repository:
     - RepositoryInterface
     - TransformInterface
+    - QueryInterface
     - DtoInterface
     - Model
 
@@ -191,11 +207,14 @@ ruleset:
     - Model
 
   AssemblerDtoInterface:
+    - QueryInterface
     - EloquentModel
     - DtoInterface
     - Contract
   AssemblerDto:
     - AssemblerDtoInterface
+    - QueryInterface
+    - Query
     - ServiceInterface
     - EloquentModel
     - DtoInterface
diff --git a/src/Internal/Assembler/TransactionQueryAssembler.php b/src/Internal/Assembler/TransactionQueryAssembler.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bavix\Wallet\Internal\Assembler;
+
+use Bavix\Wallet\Internal\Query\TransactionQuery;
+use Bavix\Wallet\Internal\Query\TransactionQueryInterface;
+
+final class TransactionQueryAssembler implements TransactionQueryAssemblerInterface
+{
+    /** @param non-empty-array<int|string, string> $uuids */
+    public function create(array $uuids): TransactionQueryInterface
+    {
+        return new TransactionQuery($uuids);
+    }
+}
diff --git a/src/Internal/Assembler/TransactionQueryAssemblerInterface.php b/src/Internal/Assembler/TransactionQueryAssemblerInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bavix\Wallet\Internal\Assembler;
+
+use Bavix\Wallet\Internal\Query\TransactionQueryInterface;
+
+interface TransactionQueryAssemblerInterface
+{
+    /** @param non-empty-array<int|string, string> $uuids */
+    public function create(array $uuids): TransactionQueryInterface;
+}
diff --git a/src/Internal/Assembler/TransferQueryAssembler.php b/src/Internal/Assembler/TransferQueryAssembler.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bavix\Wallet\Internal\Assembler;
+
+use Bavix\Wallet\Internal\Query\TransferQuery;
+use Bavix\Wallet\Internal\Query\TransferQueryInterface;
+
+final class TransferQueryAssembler implements TransferQueryAssemblerInterface
+{
+    /** @param non-empty-array<int|string, string> $uuids */
+    public function create(array $uuids): TransferQueryInterface
+    {
+        return new TransferQuery($uuids);
+    }
+}
diff --git a/src/Internal/Assembler/TransferQueryAssemblerInterface.php b/src/Internal/Assembler/TransferQueryAssemblerInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bavix\Wallet\Internal\Assembler;
+
+use Bavix\Wallet\Internal\Query\TransferQueryInterface;
+
+interface TransferQueryAssemblerInterface
+{
+    /** @param non-empty-array<int|string, string> $uuids */
+    public function create(array $uuids): TransferQueryInterface;
+}
diff --git a/src/Internal/Query/TransactionQuery.php b/src/Internal/Query/TransactionQuery.php
@@ -5,7 +5,7 @@
 namespace Bavix\Wallet\Internal\Query;
 
 /** @psalm-immutable */
-final class TransactionQuery
+final class TransactionQuery implements TransactionQueryInterface
 {
     /** @var non-empty-array<int|string, string> */
     private array $uuids;
diff --git a/src/Internal/Query/TransactionQueryInterface.php b/src/Internal/Query/TransactionQueryInterface.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bavix\Wallet\Internal\Query;
+
+interface TransactionQueryInterface
+{
+    /** @return non-empty-array<int|string, string> */
+    public function getUuids(): array;
+}
diff --git a/src/Internal/Query/TransferQuery.php b/src/Internal/Query/TransferQuery.php
@@ -5,7 +5,7 @@
 namespace Bavix\Wallet\Internal\Query;
 
 /** @psalm-immutable */
-final class TransferQuery
+final class TransferQuery implements TransferQueryInterface
 {
     /** @var non-empty-array<int|string, string> */
     private array $uuids;
diff --git a/src/Internal/Query/TransferQueryInterface.php b/src/Internal/Query/TransferQueryInterface.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bavix\Wallet\Internal\Query;
+
+interface TransferQueryInterface
+{
+    /** @return non-empty-array<int|string, string> */
+    public function getUuids(): array;
+}
diff --git a/src/Internal/Repository/TransactionRepository.php b/src/Internal/Repository/TransactionRepository.php
@@ -5,7 +5,7 @@
 namespace Bavix\Wallet\Internal\Repository;
 
 use Bavix\Wallet\Internal\Dto\TransactionDtoInterface;
-use Bavix\Wallet\Internal\Query\TransactionQuery;
+use Bavix\Wallet\Internal\Query\TransactionQueryInterface;
 use Bavix\Wallet\Internal\Transform\TransactionDtoTransformerInterface;
 use Bavix\Wallet\Models\Transaction;
 
@@ -33,7 +33,7 @@ public function insert(array $objects): void
     }
 
     /** @return Transaction[] */
-    public function findBy(TransactionQuery $query): array
+    public function findBy(TransactionQueryInterface $query): array
     {
         return $this->transaction->newQuery()
             ->whereIn('uuid', $query->getUuids())
diff --git a/src/Internal/Repository/TransactionRepositoryInterface.php b/src/Internal/Repository/TransactionRepositoryInterface.php
@@ -5,7 +5,7 @@
 namespace Bavix\Wallet\Internal\Repository;
 
 use Bavix\Wallet\Internal\Dto\TransactionDtoInterface;
-use Bavix\Wallet\Internal\Query\TransactionQuery;
+use Bavix\Wallet\Internal\Query\TransactionQueryInterface;
 use Bavix\Wallet\Models\Transaction;
 
 interface TransactionRepositoryInterface
@@ -16,5 +16,5 @@ interface TransactionRepositoryInterface
     public function insert(array $objects): void;
 
     /** @return Transaction[] */
-    public function findBy(TransactionQuery $query): array;
+    public function findBy(TransactionQueryInterface $query): array;
 }
diff --git a/src/Internal/Repository/TransferRepository.php b/src/Internal/Repository/TransferRepository.php
@@ -5,7 +5,7 @@
 namespace Bavix\Wallet\Internal\Repository;
 
 use Bavix\Wallet\Internal\Dto\TransferDtoInterface;
-use Bavix\Wallet\Internal\Query\TransferQuery;
+use Bavix\Wallet\Internal\Query\TransferQueryInterface;
 use Bavix\Wallet\Internal\Transform\TransferDtoTransformerInterface;
 use Bavix\Wallet\Models\Transfer;
 
@@ -33,7 +33,7 @@ public function insert(array $objects): void
     }
 
     /** @return Transfer[] */
-    public function findBy(TransferQuery $query): array
+    public function findBy(TransferQueryInterface $query): array
     {
         return $this->transfer->newQuery()
             ->whereIn('uuid', $query->getUuids())
diff --git a/src/Internal/Repository/TransferRepositoryInterface.php b/src/Internal/Repository/TransferRepositoryInterface.php
@@ -5,7 +5,7 @@
 namespace Bavix\Wallet\Internal\Repository;
 
 use Bavix\Wallet\Internal\Dto\TransferDtoInterface;
-use Bavix\Wallet\Internal\Query\TransferQuery;
+use Bavix\Wallet\Internal\Query\TransferQueryInterface;
 use Bavix\Wallet\Models\Transfer;
 
 interface TransferRepositoryInterface
@@ -16,5 +16,5 @@ interface TransferRepositoryInterface
     public function insert(array $objects): void;
 
     /** @return Transfer[] */
-    public function findBy(TransferQuery $query): array;
+    public function findBy(TransferQueryInterface $query): array;
 }
diff --git a/src/Services/AtmService.php b/src/Services/AtmService.php
@@ -4,10 +4,10 @@
 
 namespace Bavix\Wallet\Services;
 
+use Bavix\Wallet\Internal\Assembler\TransactionQueryAssemblerInterface;
+use Bavix\Wallet\Internal\Assembler\TransferQueryAssemblerInterface;
 use Bavix\Wallet\Internal\Dto\TransactionDtoInterface;
 use Bavix\Wallet\Internal\Dto\TransferDtoInterface;
-use Bavix\Wallet\Internal\Query\TransactionQuery;
-use Bavix\Wallet\Internal\Query\TransferQuery;
 use Bavix\Wallet\Internal\Repository\TransactionRepositoryInterface;
 use Bavix\Wallet\Internal\Repository\TransferRepositoryInterface;
 use Bavix\Wallet\Models\Transaction;
@@ -16,15 +16,21 @@
 /** @psalm-internal */
 final class AtmService implements AtmServiceInterface
 {
+    private TransactionQueryAssemblerInterface $transactionQueryAssembler;
+    private TransferQueryAssemblerInterface $transferQueryAssembler;
     private TransactionRepositoryInterface $transactionRepository;
     private TransferRepositoryInterface $transferRepository;
     private AssistantServiceInterface $assistantService;
 
     public function __construct(
+        TransactionQueryAssemblerInterface $transactionQueryAssembler,
+        TransferQueryAssemblerInterface $transferQueryAssembler,
         TransactionRepositoryInterface $transactionRepository,
         TransferRepositoryInterface $transferRepository,
         AssistantServiceInterface $assistantService
     ) {
+        $this->transactionQueryAssembler = $transactionQueryAssembler;
+        $this->transferQueryAssembler = $transferQueryAssembler;
         $this->transactionRepository = $transactionRepository;
         $this->transferRepository = $transferRepository;
         $this->assistantService = $assistantService;
@@ -39,8 +45,7 @@ public function makeTransactions(array $objects): array
     {
         $this->transactionRepository->insert($objects);
         $uuids = $this->assistantService->getUuids($objects);
-        $query = new TransactionQuery($uuids);
-
+        $query = $this->transactionQueryAssembler->create($uuids);
         $items = $this->transactionRepository->findBy($query);
         assert(count($items) > 0);
 
@@ -61,8 +66,7 @@ public function makeTransfers(array $objects): array
     {
         $this->transferRepository->insert($objects);
         $uuids = $this->assistantService->getUuids($objects);
-        $query = new TransferQuery($uuids);
-
+        $query = $this->transferQueryAssembler->create($uuids);
         $items = $this->transferRepository->findBy($query);
         assert(count($items) > 0);
 
diff --git a/src/WalletServiceProvider.php b/src/WalletServiceProvider.php
@@ -8,10 +8,14 @@
 use Bavix\Wallet\Internal\Assembler\AvailabilityDtoAssemblerInterface;
 use Bavix\Wallet\Internal\Assembler\TransactionDtoAssembler;
 use Bavix\Wallet\Internal\Assembler\TransactionDtoAssemblerInterface;
+use Bavix\Wallet\Internal\Assembler\TransactionQueryAssembler;
+use Bavix\Wallet\Internal\Assembler\TransactionQueryAssemblerInterface;
 use Bavix\Wallet\Internal\Assembler\TransferDtoAssembler;
 use Bavix\Wallet\Internal\Assembler\TransferDtoAssemblerInterface;
 use Bavix\Wallet\Internal\Assembler\TransferLazyDtoAssembler;
 use Bavix\Wallet\Internal\Assembler\TransferLazyDtoAssemblerInterface;
+use Bavix\Wallet\Internal\Assembler\TransferQueryAssembler;
+use Bavix\Wallet\Internal\Assembler\TransferQueryAssemblerInterface;
 use Bavix\Wallet\Internal\Repository\TransactionRepository;
 use Bavix\Wallet\Internal\Repository\TransactionRepositoryInterface;
 use Bavix\Wallet\Internal\Repository\TransferRepository;
@@ -194,6 +198,16 @@ private function assemblers(array $configure): void
             TransferDtoAssemblerInterface::class,
             $configure['transfer'] ?? TransferDtoAssembler::class
         );
+
+        $this->app->singleton(
+            TransactionQueryAssemblerInterface::class,
+            $configure['transaction_query'] ?? TransactionQueryAssembler::class
+        );
+
+        $this->app->singleton(
+            TransferQueryAssemblerInterface::class,
+            $configure['transfer_query'] ?? TransferQueryAssembler::class
+        );
     }
 
     private function transformers(array $configure): void

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace Bavix\Wallet\Internal\Query;`
`6`	`6`
`7`	`7`	`/** @psalm-immutable */`
`8`		`-final class TransactionQuery`
	`8`	`+final class TransactionQuery implements TransactionQueryInterface`
`9`	`9`	`{`
`10`	`10`	`/** @var non-empty-array<int\|string, string> */`
`11`	`11`	`private array $uuids;`