[PLA-1612] Fix external id empty (#134)

enjin · Feb 15, 2024 · e46a0ff · e46a0ff
1 parent a3e80f8
commit e46a0ff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/GraphQL/Schemas/Primary/Mutations/MarkAndListPendingTransactionsMutation.php b/src/GraphQL/Schemas/Primary/Mutations/MarkAndListPendingTransactionsMutation.php
@@ -68,7 +68,8 @@ public function args(): array
      */
     public function resolve($root, array $args, $context, ResolveInfo $resolveInfo, Closure $getSelectFields, TransactionService $transactionService): mixed
     {
-        $transactions = Transaction::where('state', '=', TransactionState::PENDING->name)
+        $transactions = Transaction::loadSelectFields($resolveInfo, $this->name)
+            ->where('state', '=', TransactionState::PENDING->name)
             ->when(
                 $args['accounts'] ?? false,
                 function (Builder $query) use ($args) {
@@ -84,8 +85,12 @@ function (Builder $query) {
             )->cursorPaginateWithTotal('id', $args['first'], false);
 
         if (true === $args['markAsProcessing'] || null === $args['markAsProcessing']) {
-            $transactionsToMark = clone $transactions['items']->getCollection();
-            $transactionsToMark->each(fn ($transaction) => $transactionService->update($transaction, ['state' => TransactionState::PROCESSING->name]));
+            $transactions['items']->getCollection()->each(
+                fn ($transaction) => $transactionService->update(
+                    clone $transaction,
+                    ['state' => TransactionState::PROCESSING->name]
+                )
+            );
         }
 
         return $transactions;

diff --git a/src/Models/Laravel/Traits/EagerLoadSelectFields.php b/src/Models/Laravel/Traits/EagerLoadSelectFields.php
@@ -398,9 +398,10 @@ public static function selectFields(ResolveInfo $resolveInfo, string $query): ar
                 break;
             case 'GetTransaction':
             case 'GetTransactions':
+            case 'MarkAndListPendingTransactions':
                 [$select, $with, $withCount] = static::loadTransaction(
                     $queryPlan,
-                    $query == 'GetTransactions' ? 'edges.fields.node.fields' : '',
+                    in_array($query, ['GetTransactions', 'MarkAndListPendingTransactions']) ? 'edges.fields.node.fields' : '',
                     [],
                     null,
                     true