Merge pull request rairprotocol#110 from rairprotocol/109-start-and-e…

…nd-limits-to-token-numbers-endpoint 109 - start and end limits to token numbers endpoint
mfrosi · Jul 12, 2024 · 84716ad · 84716ad
2 parents 8568f7d + bb4856a
commit 84716ad
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 4 deletions.
diff --git a/rair-node/bin/api/nft/nft.Controller.js b/rair-node/bin/api/nft/nft.Controller.js
@@ -56,12 +56,13 @@ router.get(
     '/network/:networkId/:contract/:product',
     validation(['nftContract', 'nftProduct'], 'params'),
     findContractAndProductMiddleware,
-    validation(['getTokensByContractProduct', 'resaleFlag', 'metadataSearch'], 'query'),
+    validation(['getTokensByContractProduct', 'resaleFlag', 'metadataSearch', 'tokenLimits'], 'query'),
     getTokensForProduct,
 );
 router.get(
     '/network/:networkId/:contract/:product/numbers',
     validation(['nftContract', 'nftProduct'], 'params'),
+    validation(['tokenLimits'], 'query'),
     findContractAndProductMiddleware,
     getTokenNumbers,
 );

diff --git a/rair-node/bin/api/nft/nft.Service.js b/rair-node/bin/api/nft/nft.Service.js
@@ -376,6 +376,22 @@ module.exports = {
     getTokenNumbers: async (req, res, next) => {
       try {
         const { contract, product } = req;
+        const { fromToken, toToken } = req.query;
+        const tokenLimitFilter = [];
+        if (fromToken) {
+          tokenLimitFilter.push(
+            {
+              $gte: ['$token', fromToken],
+            },
+          );
+        }
+        if (toToken) {
+          tokenLimitFilter.push(
+            {
+              $lte: ['$token', toToken],
+            },
+          );
+        }
         const offerData = await Offer.aggregate([
           {
             $match: {
@@ -392,7 +408,14 @@ module.exports = {
               as: 'tokens',
               pipeline: [{
                 $match: {
-                  $expr: { $eq: ['$offer', '$$offerIndex'] },
+                  $expr: {
+                    $and: [
+                      {
+                        $eq: ['$offer', '$$offerIndex'],
+                      },
+                      ...tokenLimitFilter,
+                    ],
+                  },
                   contract: contract._id,
                 },
               },

diff --git a/rair-node/bin/schemas/commonApiSchemas.js b/rair-node/bin/schemas/commonApiSchemas.js
@@ -27,4 +27,8 @@ module.exports = {
     metadataSearch: () => ({
         metadataFilters: Joi.string(),
     }),
+    tokenLimits: () => ({
+        fromToken: Joi.string(),
+        toToken: Joi.string(),
+    }),
 };
diff --git a/rair-node/bin/schemas/getTokensByContractProduct.js b/rair-node/bin/schemas/getTokensByContractProduct.js
@@ -1,8 +1,6 @@
 const Joi = require('joi');
 
 module.exports = () => ({
-  fromToken: Joi.string(),
-  toToken: Joi.string(),
   limit: Joi.number(),
   forSale: Joi.any()
     .valid('true', 'false'),

diff --git a/rair-node/bin/schemas/index.js b/rair-node/bin/schemas/index.js
@@ -56,6 +56,7 @@ const {
   userAddress,
   resaleFlag,
   metadataSearch,
+  tokenLimits,
 } = require('./commonApiSchemas');
 const {
   fullContracts,
@@ -139,6 +140,7 @@ module.exports = {
   userAddress,
   resaleFlag,
   metadataSearch,
+  tokenLimits,
 
   // Contract schemas
   fullContracts,