Fix rule set params (#11)

enjin · Aug 10, 2023 · 5c14efc · 5c14efc
1 parent 80e055d
commit 5c14efc
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 73 deletions.
diff --git a/src/GraphQL/Mutations/InsertRuleSetMutation.php b/src/GraphQL/Mutations/InsertRuleSetMutation.php
@@ -58,7 +58,7 @@ public function args(): array
                 'description' => __('enjin-platform-fuel-tanks::mutation.schedule_mutate_freeze_state.args.ruleSetId'),
             ],
             'dispatchRules' => [
-                'type' => GraphQL::type('[DispatchRuleInputType!]'),
+                'type' => GraphQL::type('DispatchRuleInputType!'),
                 'description' => __('enjin-platform-fuel-tanks::input_type.dispatch_rule.description'),
             ],
             ...$this->getIdempotencyField(),
@@ -101,7 +101,7 @@ protected function rules(array $args = []): array
                 new MaxBigInt(Hex::MAX_UINT32),
                 new RuleSetNotExists(),
             ],
-            ...$this->dispatchRules($args),
+            ...$this->dispatchRules($args, '', false),
         ];
     }
 }
diff --git a/src/GraphQL/Traits/HasFuelTankValidationRules.php b/src/GraphQL/Traits/HasFuelTankValidationRules.php
@@ -82,28 +82,30 @@ protected function validationRules(array $args = [], array $except = [], string
     /**
      * Get the dispatch rules validation rules.
      */
-    protected function dispatchRules(array $args = [], string $attributePrefix = ''): array
+    protected function dispatchRules(array $args = [], string $attributePrefix = '', $isArray = true): array
     {
+        $array = $isArray ? '.*' : '';
+
         return [
-            ...$this->commonRules("{$attributePrefix}dispatchRules.*", $args),
-            "{$attributePrefix}dispatchRules.*.whitelistedCollections.*" => [
+            ...$this->commonRules("{$attributePrefix}dispatchRules{$array}", $args),
+            "{$attributePrefix}dispatchRules{$array}.whitelistedCollections.*" => [
                 'bail',
                 'distinct',
                 'max:255',
                 Rule::exists('collections', 'collection_chain_id'),
             ],
-            "{$attributePrefix}dispatchRules.*.whitelistedCollections" => [
+            "{$attributePrefix}dispatchRules{$array}.whitelistedCollections" => [
                 'nullable',
                 'array',
                 'min:1',
             ],
-            "{$attributePrefix}dispatchRules.*.maxFuelBurnPerTransaction" => [
+            "{$attributePrefix}dispatchRules{$array}.maxFuelBurnPerTransaction" => [
                 'bail',
                 new MinBigInt(),
                 new MaxBigInt(Hex::MAX_UINT128),
             ],
-            ...$this->commonRules("{$attributePrefix}dispatchRules.*.userFuelBudget"),
-            ...$this->commonRules("{$attributePrefix}dispatchRules.*.tankFuelBudget"),
+            ...$this->commonRules("{$attributePrefix}dispatchRules{$array}.userFuelBudget"),
+            ...$this->commonRules("{$attributePrefix}dispatchRules{$array}.tankFuelBudget"),
         ];
     }
 }
diff --git a/src/Services/TransactionService.php b/src/Services/TransactionService.php
@@ -86,7 +86,7 @@ public function insertRuleSet(array $args): Model
             'encoded_data' => $this->codec->encode()->insertRuleSet(
                 $account,
                 Arr::get($args, 'ruleSetId'),
-                $this->setDispatchRulesParams($args)
+                $this->setDispatchRulesParams(Arr::get($args, 'dispatchRules', [])),
             ),
             'method' => 'InsertRuleSet',
         ]);