Accept native currency on Make or Take (#2)

enjin · Jul 11, 2023 · 9dc00ea · 9dc00ea
1 parent 306aabb
commit 9dc00ea
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 17 deletions.
diff --git a/src/GraphQL/Mutations/CreateListingMutation.php b/src/GraphQL/Mutations/CreateListingMutation.php
@@ -101,36 +101,42 @@ public function resolve(
         );
     }
 
+    protected function makeOrTakeRule(?string $collectionId = null, ?bool $isMake = true): array
+    {
+        $makeOrTake = $isMake ? 'makeAssetId' : 'takeAssetId';
+
+        return $collectionId === '0' ? [] : [
+            $makeOrTake . '.collectionId' => [
+                'bail',
+                'required_with:' . $makeOrTake . '.tokenId',
+                new MinBigInt(),
+                new MaxBigInt(Hex::MAX_UINT128),
+                Rule::exists('collections', 'collection_chain_id'),
+            ],
+        ];
+    }
+
     /**
      * Get the mutation's request validation rules.
      */
     protected function rules(array $args = []): array
     {
+        $makeRule = $this->makeOrTakeRule($makeCollection = Arr::get($args, 'makeAssetId.collectionId'));
+        $takeRule = $this->makeOrTakeRule($takeCollection = Arr::get($args, 'takeAssetId.collectionId'), false);
+
         return [
             'account' => [
                 'bail',
                 'filled',
                 'max:255',
                 new ValidSubstrateAddress(),
             ],
-            'makeAssetId.collectionId' => [
-                'bail',
-                'required_with:makeAssetId.tokenId',
-                new MinBigInt(),
-                new MaxBigInt(Hex::MAX_UINT128),
-                Rule::exists('collections', 'collection_chain_id'),
-            ],
+            'makeAssetId' => new TokenExistsInCollection($makeCollection),
+            ...$makeRule,
             ...$this->getTokenFieldRules('makeAssetId'),
-            'makeAssetId' => new TokenExistsInCollection(Arr::get($args, 'makeAssetId.collectionId')),
-            'takeAssetId.collectionId' => [
-                'bail',
-                'required_with:takeAsset.tokenId',
-                new MinBigInt(),
-                new MaxBigInt(Hex::MAX_UINT128),
-                Rule::exists('collections', 'collection_chain_id'),
-            ],
+            'takeAssetId' => new TokenExistsInCollection($takeCollection),
+            ...$takeRule,
             ...$this->getTokenFieldRules('takeAssetId'),
-            'takeAssetId' => new TokenExistsInCollection(Arr::get($args, 'takeAssetId.collectionId')),
             'amount' => [
                 'bail',
                 new MinBigInt(1),

diff --git a/src/Rules/TokenExistsInCollection.php b/src/Rules/TokenExistsInCollection.php
@@ -25,7 +25,11 @@ public function __construct(protected ?string $collectionId)
      */
     public function validate(string $attribute, mixed $value, Closure $fail): void
     {
-        if (!$this->collectionId) {
+        if (is_null($this->collectionId)) {
+            return;
+        }
+
+        if ($this->collectionId == 0 && $this->encodeTokenId($value) == 0) {
             return;
         }