Dynamic caching

BirthdayResearch · Mar 28, 2023 · 52f19d8 · 52f19d8
1 parent bf45346
commit 52f19d8
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 19 deletions.
diff --git a/apps/server/src/ethereum/controllers/TransactionsController.ts b/apps/server/src/ethereum/controllers/TransactionsController.ts
@@ -15,9 +15,20 @@ export class TransactionsController {
   async getTransactions(
     @Query(new ValidationPipe()) { fromDate, toDate }: TransactionsQueryDto,
   ): Promise<TransactionsDto[] | undefined> {
+    const dateFrom = new Date(fromDate);
+    const dateTo = new Date(toDate);
+    const today = new Date();
+
+    const isTodayOrInFuture = dateTo >= today;
+    const cacheTtl = isTodayOrInFuture ? 5 * 60_000 : 3600_000 * 24; // 5 minutes if toDate is today or in the future, 1 day otherwise
+
     const cacheKey = `ETH_TX_${fromDate}_${toDate}`;
-    return this.cache.get(cacheKey, async () => this.ethereumTransactionsService.getTransactions(fromDate, toDate), {
-      ttl: 3600_000 * 24, // 1 day
-    });
+    return this.cache.get(
+      cacheKey,
+      async () => this.ethereumTransactionsService.getTransactions(dateFrom, dateTo, today),
+      {
+        ttl: cacheTtl,
+      },
+    );
   }
 }
diff --git a/apps/server/src/ethereum/services/EthereumTransactionsService.ts b/apps/server/src/ethereum/services/EthereumTransactionsService.ts
@@ -2,21 +2,14 @@ import { BadRequestException, HttpException, HttpStatus, Injectable } from '@nes
 
 import { SupportedEVMTokenSymbols } from '../../AppConfig';
 import { PrismaService } from '../../PrismaService';
-import { TransactionsDto, TransactionsQueryDto } from '../EthereumInterface';
+import { TransactionsDto } from '../EthereumInterface';
 
 @Injectable()
 export class EthereumTransactionsService {
   constructor(private prisma: PrismaService) {}
 
-  async getTransactions(
-    fromDate: TransactionsQueryDto['fromDate'],
-    toDate: TransactionsQueryDto['toDate'],
-  ): Promise<TransactionsDto[]> {
+  async getTransactions(dateFrom: Date, dateTo: Date, today: Date): Promise<TransactionsDto[]> {
     try {
-      const dateFrom = new Date(fromDate);
-      const dateTo = new Date(toDate);
-      const today = new Date();
-
       if (dateFrom > today) {
         throw new BadRequestException(`Cannot query future date`);
       }
@@ -46,8 +39,9 @@ export class EthereumTransactionsService {
     } catch (e: any) {
       throw new HttpException(
         {
-          status: e.code || HttpStatus.INTERNAL_SERVER_ERROR,
-          error: `API call for Ethereum transactions was unsuccessful: ${e.message}`,
+          statusCode: e.status ?? HttpStatus.INTERNAL_SERVER_ERROR,
+          error: `API call for Ethereum transactions was unsuccessful`,
+          message: e.message,
         },
         HttpStatus.INTERNAL_SERVER_ERROR,
         {

diff --git a/apps/server/test-i9n/testing/ethereum/Transactions.i9n.ts b/apps/server/test-i9n/testing/ethereum/Transactions.i9n.ts
@@ -66,15 +66,29 @@ describe('Transactions Service Test', () => {
     expect(parsedPayload.message).toStrictEqual(['toDate must be a valid ISO 8601 date string']);
   });
 
-  it(`should throw an error if future date is provided`, async () => {
+  it(`should throw an error if fromDate is in the future`, async () => {
     const txReceipt = await testing.inject({
       method: 'GET',
       url: `/ethereum/transactions?fromDate=2033-03-15&toDate=2033-03-16`,
     });
 
-    expect(JSON.parse(txReceipt.payload).status).toStrictEqual(500);
-    expect(JSON.parse(txReceipt.payload).error).toStrictEqual(
-      'API call for Ethereum transactions was unsuccessful: Cannot query future date',
-    );
+    const parsedPayload = JSON.parse(txReceipt.payload);
+
+    expect(parsedPayload.statusCode).toStrictEqual(400);
+    expect(parsedPayload.error).toStrictEqual('API call for Ethereum transactions was unsuccessful');
+    expect(parsedPayload.message).toStrictEqual('Cannot query future date');
+  });
+
+  it(`should throw an error fromDate is more recent than toDate`, async () => {
+    const txReceipt = await testing.inject({
+      method: 'GET',
+      url: `/ethereum/transactions?fromDate=2023-03-15&toDate=2023-03-14`,
+    });
+
+    const parsedPayload = JSON.parse(txReceipt.payload);
+
+    expect(parsedPayload.statusCode).toStrictEqual(400);
+    expect(parsedPayload.error).toStrictEqual('API call for Ethereum transactions was unsuccessful');
+    expect(parsedPayload.message).toStrictEqual('fromDate cannot be more recent than toDate');
   });
 });