fix: remove unused params and fix cache keys

Author: grinry

apps/indexer/src/app/plugins/cache.ts

@@ -54,7 +54,7 @@ export type RouteCacheOptions = {
    */
   backgroundRevalidate?: boolean;
   /** Build a custom cache key based on request */
-  key?: (req: FastifyRequest) => string;
+  key?: (req: FastifyRequest<any, any, any, any>) => string;
 };
 
 export type RedisCachePluginOptions = {

apps/indexer/src/app/routes/_chain/routes.ts

@@ -16,7 +16,11 @@ import {
   fetchUserReserves,
   selectPoolById,
 } from '../../../libs/loaders/money-market';
-import { paginationResponse, paginationSchema } from '../../../libs/pagination';
+import {
+  paginationResponse,
+  paginationSchema,
+  paginationSchemaQuery,
+} from '../../../libs/pagination';
 import { ZodFastifyInstance } from '../../../libs/server';
 import { ze } from '../../../libs/validators/validators';
 
@@ -33,7 +37,8 @@ export default async function (fastify: ZodFastifyInstance) {
       },
       config: {
         cache: {
-          key: (req) => `chain:${req.chain.chainId}:tokens`,
+          key: (req) =>
+            `chain:${req.chain.chainId}:tokens:${paginationSchemaQuery(req.query)}`,
           ttlSeconds: 30,
           enabled: true,
         },
@@ -58,7 +63,9 @@ export default async function (fastify: ZodFastifyInstance) {
     '/money-market',
     {
       config: {
-        cache: true,
+        cache: {
+          key: (req) => `chain:${req.chain.chainId}:money-market:pools`,
+        },
       },
     },
     async (req, reply) => {
@@ -81,13 +88,15 @@ export default async function (fastify: ZodFastifyInstance) {
     '/money-market/:pool/reserves',
     {
       schema: {
-        querystring: paginationSchema,
         params: z.object({
           pool: z.string(),
         }),
       },
       config: {
-        cache: false,
+        cache: {
+          key: (req: FastifyRequest<{ Params: { pool: string } }>) =>
+            `chain:${req.chain.chainId}:money-market:reserves:${req.params.pool}`,
+        },
       },
     },
     async (req: FastifyRequest<{ Params: { pool: string } }>, reply) => {
@@ -151,40 +160,28 @@ export default async function (fastify: ZodFastifyInstance) {
           isActive: item.isActive,
           isFroze: item.isFrozen,
           // eModes: item.eModes,
-          i: item,
         };
       });
 
       return { data: { reservesData: items, baseCurrencyData } };
-
-      // return {
-      //   data: items
-      //     .map((item) => ({
-      //       ...item,
-      //       token: tokens.find((t) => t.address === item.underlyingAsset),
-      //     }))
-      //     .filter((i) => i.token),
-      //   nextCursor: null,
-      //   count: items.length,
-      // };
     },
   );
 
   fastify.get(
     '/money-market/:pool/user/:address/positions',
     {
       schema: {
-        querystring: paginationSchema,
         params: z.object({
           pool: z.string(),
           address: ze.address,
         }),
       },
       config: {
         cache: {
-          enabled: false,
-          ttlSeconds: 10,
-          staleTtlSeconds: 15,
+          key: (
+            req: FastifyRequest<{ Params: { pool: string; address: string } }>,
+          ) =>
+            `chain:${req.chain.chainId}:money-market:user-positions:${req.params.pool}:${req.params.address}`,
         },
       },
     },
@@ -442,7 +439,6 @@ export default async function (fastify: ZodFastifyInstance) {
             userEmodeCategoryId: summary.userEmodeCategoryId,
             isInIsolationMode: summary.isInIsolationMode,
           },
-          reservesData,
         },
       };
     },

apps/indexer/src/libs/pagination.ts

@@ -39,3 +39,6 @@ export const paginationResponse = <T>(
     count: items.length,
   };
 };
+
+export const paginationSchemaQuery = (d: any) =>
+  JSON.stringify({ limit: d.limit, cursor: d.cursor, search: d.search });