search api updated for filter

src/controllers/explorer.controller.ts

@@ -11,24 +11,47 @@ export const searchData = async (
   next: NextFunction,
 ): Promise<void> => {
   try {
+    const queryData: any = {};
+    if (req.query.fromNetwork) {
+      queryData.networkId = req.query.fromNetwork;
+    }
+    if (req.query.toNetwork) {
+      queryData.remoteNetworkId = req.query.toNetwork;
+    }
+    if (req.query.fromDate && req.query.tDate) {
+      queryData.$and = [
+        { timestamp: { $gte: req.query.fromDate } },
+        { timestamp: { $lte: req.query.toDate } },
+      ];
+    } else if (req.query.fromDate) {
+      queryData.timestamp = { $gte: req.query.fromDate };
+    } else if (req.query.toDate) {
+      queryData.timestamp = { $lte: req.query.toDate };
+    }
     if (
       Web3.utils.isHex(req.query.data as string) &&
       isTransactionOrBlockHash(req.query.data as string)
     ) {
       let hash;
-      hash = await transactionsService.getTransaction(req.query.data as string);
-      if (!hash) {
-        hash = await blockService.getBlockByBlockHash(req.query.data as string);
+      hash = await transactionsService.getTransactionByQuery({
+        ...queryData,
+        hash: req.query.data,
+      });
+      if (!hash.length) {
+        hash = await blockService.getBlockByQuery({
+          ...queryData,
+          blockHash: req.query.data,
+        });
       }
-      if (!hash) {
-        next(new ApiError(httpStatus.BAD_REQUEST, 'Not Found'));
+      if (!hash.length) {
+        return next(new ApiError(httpStatus.BAD_REQUEST, 'Not Found'));
       }
       res.send(hash);
     } else if (Web3.utils.isAddress(req.query.data as string)) {
       const account = await accountService.getAccount(req.query.data as string);
       res.send(account);
     } else {
-      next(new ApiError(httpStatus.BAD_REQUEST, 'Not Found'));
+      return next(new ApiError(httpStatus.BAD_REQUEST, 'Not Found'));
     }
   } catch (error) {
     next(error);

src/services/block.service.ts

@@ -22,6 +22,13 @@ export const getBlockByBlockHash = async (
   return block;
 };
 
+export const getBlockByQuery = async (
+  query: Object,
+): Promise<QuantumPortalMinedBlockDocument[]> => {
+  const block = await QuantumPortalMinedBlockModel.find(query);
+  return block;
+};
+
 export const getBlockTxsByBlockHash = async (
   blockHash: string,
   page: number,

src/services/transaction.service.ts

@@ -43,3 +43,10 @@ export const getTransaction = async (
   });
   return tx;
 };
+
+export const getTransactionByQuery = async (
+  query: Object,
+): Promise<QuantumPortalRemoteTransaction[]> => {
+  const tx = await QuantumPortalRemoteTransactionModel.find(query);
+  return tx;
+};

src/validations/explorer.validation.ts

@@ -3,5 +3,9 @@ import Joi from 'joi';
 export const searchData = {
   query: Joi.object().keys({
     data: Joi.string().required(),
+    fromNetwork: Joi.string(),
+    toNetwork: Joi.string(),
+    fromDate: Joi.number(),
+    toDate: Joi.number(),
   }),
 };