fix: advanced search using amount range returns no results for multipayment

app/Services/Search/Concerns/FiltersMultiPaymentValueRange.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Services\Search\Concerns;
+
+use Illuminate\Database\Eloquent\Builder;
+
+trait FiltersMultiPaymentValueRange
+{
+    /**
+     * @param Builder         $query
+     * @param string|int|null $from
+     * @param string|int|null $to
+     * @param bool            $useSatoshi
+     *
+     * @return Builder
+     */
+    private function queryMultiPaymentValueRange(Builder $query, $from, $to, bool $useSatoshi = true): Builder
+    {
+        if (is_null($from) && is_null($to)) {
+            return $query;
+        }
+
+        $query->where('amount', '=', 0);
+
+        $query->whereExists(function (\Illuminate\Database\Query\Builder $qq) use ($useSatoshi, $to, $from): void {
+            $qq->selectRaw('i.id')
+               ->fromRaw("( SELECT id, (jsonb_array_elements(asset -> 'payments') ->> 'amount')::bigint am FROM transactions t WHERE t.id = id ) i")
+               ->whereRaw('i.id = transactions.id')
+               ->groupBy('i.id')
+               ->when(! is_null($from) && $from > 0, function ($q) use ($useSatoshi, $from): void {
+                   $q->havingRaw('sum(am) >= ?', [
+                       (int) $from * ($useSatoshi ? 1e8 : 1),
+                   ]);
+               })
+               ->when(! is_null($to) && $to > 0, function ($q) use ($useSatoshi, $to): void {
+                   $q->havingRaw('sum(am) <= ?', [
+                       (int) $to * ($useSatoshi ? 1e8 : 1),
+                   ]);
+               });
+        });
+
+        return $query;
+    }
+}

app/Services/Search/TransactionSearch.php

@@ -42,6 +42,7 @@
 use App\Models\Scopes\VoteScope;
 use App\Models\Transaction;
 use App\Services\Search\Concerns\FiltersDateRange;
+use App\Services\Search\Concerns\FiltersMultiPaymentValueRange;
 use App\Services\Search\Concerns\FiltersValueRange;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Arr;
@@ -50,6 +51,7 @@ final class TransactionSearch implements Search
 {
     use FiltersDateRange;
     use FiltersValueRange;
+    use FiltersMultiPaymentValueRange;
 
     private array $scopes = [
         'businessEntityRegistration'    => BusinessEntityRegistrationScope::class,
@@ -91,22 +93,29 @@ final class TransactionSearch implements Search
 
     public function search(array $parameters): Builder
     {
-        $query = Transaction::query();
+        $query          = Transaction::query();
+        $isMultiPayment = false;
 
         if (Arr::has($parameters, 'transactionType')) {
             if (Arr::get($parameters, 'transactionType') !== 'all') {
                 $scopeClass = $this->scopes[$parameters['transactionType']];
 
                 /* @var \Illuminate\Database\Eloquent\Model */
                 $query = $query->withScope($scopeClass);
+
+                $isMultiPayment = $scopeClass === MultiPaymentScope::class;
             }
         }
 
         if (! is_null(Arr::get($parameters, 'term'))) {
             $query->where('id', $parameters['term']);
         }
 
-        $this->queryValueRange($query, 'amount', Arr::get($parameters, 'amountFrom'), Arr::get($parameters, 'amountTo'));
+        if ($isMultiPayment) {
+            $this->queryMultiPaymentValueRange($query, Arr::get($parameters, 'amountFrom'), Arr::get($parameters, 'amountTo'));
+        } else {
+            $this->queryValueRange($query, 'amount', Arr::get($parameters, 'amountFrom'), Arr::get($parameters, 'amountTo'));
+        }
 
         $this->queryValueRange($query, 'fee', Arr::get($parameters, 'feeFrom'), Arr::get($parameters, 'feeTo'));
 
@@ -116,6 +125,7 @@ public function search(array $parameters): Builder
             $query->where('vendor_field', $parameters['smartBridge']);
         }
 
+//        $query->dump();
         return $query;
     }
 }

config/explorer.php

@@ -12,29 +12,29 @@
             'alias'            => env('EXPLORER_NETWORK_ALIAS', 'mainnet'),
             'currency'         => env('EXPLORER_NETWORK_CURRENCY', 'ARK'),
             'currencySymbol'   => env('EXPLORER_NETWORK_CURRENCY_SYMBOL', 'Ѧ'),
-            'confirmations'    => env('EXPLORER_NETWORK_CONFIRMATIONS', 51),
+            'confirmations'    => intval(env('EXPLORER_NETWORK_CONFIRMATIONS', 51)),
             'knownWallets'     => env('EXPLORER_NETWORK_KNOWN_WALLETS', 'https://raw.githubusercontent.com/ArkEcosystem/common/master/mainnet/known-wallets-extended.json'),
             'canBeExchanged'   => env('EXPLORER_NETWORK_CAN_BE_EXCHANGED', true),
             'usesMarketsquare' => env('EXPLORER_NETWORK_USES_MARKETSQUARE', false),
             'epoch'            => env('EXPLORER_NETWORK_EPOCH', '2017-03-21T13:00:00.000Z'),
-            'delegateCount'    => env('EXPLORER_NETWORK_DELEGATE_COUNT', 51),
-            'blockTime'        => env('EXPLORER_NETWORK_BLOCK_TIME', 8),
-            'blockReward'      => env('EXPLORER_NETWORK_BLOCK_REWARD', 2),
-            'base58Prefix'     => env('EXPLORER_NETWORK_BASE58_PREFIX', 23),
+            'delegateCount'    => intval(env('EXPLORER_NETWORK_DELEGATE_COUNT', 51)),
+            'blockTime'        => intval(env('EXPLORER_NETWORK_BLOCK_TIME', 8)),
+            'blockReward'      => intval(env('EXPLORER_NETWORK_BLOCK_REWARD', 2)),
+            'base58Prefix'     => intval(env('EXPLORER_NETWORK_BASE58_PREFIX', 23)),
         ],
         'development' => [
             'name'             => env('EXPLORER_NETWORK_NAME', 'ARK Development Network'),
             'alias'            => env('EXPLORER_NETWORK_ALIAS', 'devnet'),
             'currency'         => env('EXPLORER_NETWORK_CURRENCY', 'DARK'),
             'currencySymbol'   => env('EXPLORER_NETWORK_CURRENCY_SYMBOL', 'DѦ'),
-            'confirmations'    => env('EXPLORER_NETWORK_CONFIRMATIONS', 51),
+            'confirmations'    => intval(env('EXPLORER_NETWORK_CONFIRMATIONS', 51)),
             'canBeExchanged'   => env('EXPLORER_NETWORK_CAN_BE_EXCHANGED', false),
             'usesMarketsquare' => env('EXPLORER_NETWORK_USES_MARKETSQUARE', false),
             'epoch'            => env('EXPLORER_NETWORK_EPOCH', '2017-03-21T13:00:00.000Z'),
-            'delegateCount'    => env('EXPLORER_NETWORK_DELEGATE_COUNT', 51),
-            'blockTime'        => env('EXPLORER_NETWORK_BLOCK_TIME', 8),
-            'blockReward'      => env('EXPLORER_NETWORK_BLOCK_REWARD', 2),
-            'base58Prefix'     => env('EXPLORER_NETWORK_BASE58_PREFIX', 30),
+            'delegateCount'    => intval(env('EXPLORER_NETWORK_DELEGATE_COUNT', 51)),
+            'blockTime'        => intval(env('EXPLORER_NETWORK_BLOCK_TIME', 8)),
+            'blockReward'      => intval(env('EXPLORER_NETWORK_BLOCK_REWARD', 2)),
+            'base58Prefix'     => intval(env('EXPLORER_NETWORK_BASE58_PREFIX', 30)),
         ],
     ],
 

tests/Unit/Services/Search/TransactionSearchTest.php

@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+use App\Enums\CoreTransactionTypeEnum;
+use App\Enums\TransactionTypeGroupEnum;
 use App\Models\Transaction;
 use App\Services\Search\TransactionSearch;
 
@@ -84,7 +86,7 @@
     expect($result->get())->toHaveCount(10);
 });
 
-it('should search for blocks by amount minimum', function () {
+it('should search for transactions by amount minimum', function () {
     Transaction::factory(10)->create(['amount' => 1000 * 1e8]);
     Transaction::factory(10)->create(['amount' => 2000 * 1e8]);
 
@@ -95,7 +97,7 @@
     expect($result->get())->toHaveCount(10);
 });
 
-it('should search for blocks by amount maximum', function () {
+it('should search for transactions by amount maximum', function () {
     Transaction::factory(10)->create(['amount' => 1000 * 1e8]);
     Transaction::factory(10)->create(['amount' => 2000 * 1e8]);
 
@@ -106,7 +108,7 @@
     expect($result->get())->toHaveCount(10);
 });
 
-it('should search for blocks by amount range', function () {
+it('should search for transactions by amount range', function () {
     Transaction::factory(10)->create(['amount' => 1000 * 1e8]);
     Transaction::factory(10)->create(['amount' => 2000 * 1e8]);
 
@@ -118,7 +120,30 @@
     expect($result->get())->toHaveCount(10);
 });
 
-it('should search for blocks by fee minimum', function () {
+it('should search for multipayment transactions by amount range', function () {
+    Transaction::factory()->create([
+        'type_group' => TransactionTypeGroupEnum::CORE,
+        'type'       => CoreTransactionTypeEnum::MULTI_PAYMENT,
+        'amount'     => 0,
+        'asset'      => [
+            'payments' => [
+                ['amount' => 750 * 1e8, 'recipientId' => 'D61mfSggzbvQgTUe6JhYKH2doHaqJ3Dyib'],
+                ['amount' => 251 * 1e8, 'recipientId' => 'DFJ5Z51F1euNNdRUQJKQVdG4h495LZkc6T'],
+            ],
+        ],
+    ]);
+    Transaction::factory()->create(['amount' => 2000 * 1e8]);
+
+    $result = (new TransactionSearch())->search([
+        'transactionType' => 'multiPayment',
+        'amountFrom'      => 900,
+        'amountTo'        => 1100,
+    ]);
+
+    expect($result->get())->toHaveCount(1);
+});
+
+it('should search for transactions by fee minimum', function () {
     Transaction::factory(10)->create(['fee' => 1000 * 1e8]);
     Transaction::factory(10)->create(['fee' => 2000 * 1e8]);
 
@@ -129,7 +154,7 @@
     expect($result->get())->toHaveCount(10);
 });
 
-it('should search for blocks by fee maximum', function () {
+it('should search for transactions by fee maximum', function () {
     Transaction::factory(10)->create(['fee' => 1000 * 1e8]);
     Transaction::factory(10)->create(['fee' => 2000 * 1e8]);
 
@@ -140,7 +165,7 @@
     expect($result->get())->toHaveCount(10);
 });
 
-it('should search for blocks by fee range', function () {
+it('should search for transactions by fee range', function () {
     Transaction::factory(10)->create(['fee' => 1000 * 1e8]);
     Transaction::factory(10)->create(['fee' => 2000 * 1e8]);