Merge pull request #109 from lidofinance/feature/si-835-implementatio…

…n-buffer feature: added request info to response
lidofinance · Oct 16, 2023 · 5b1c89a · 5b1c89a
2 parents ff2aff8 + db6a083
commit 5b1c89a
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 6 deletions.
diff --git a/src/http/request-time/dto/request-time-by-request-id.dto.ts b/src/http/request-time/dto/request-time-by-request-id.dto.ts
@@ -1,4 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
+import { RequestDto } from './request.dto';
 
 export class RequestTimeByRequestIdDto {
   @ApiProperty({
@@ -7,12 +8,6 @@ export class RequestTimeByRequestIdDto {
   })
   ms: number;
 
-  @ApiProperty({
-    example: 5,
-    description: 'Request Id',
-  })
-  requestId: string;
-
   @ApiProperty({
     example: '2023-10-04T15:14:24.202Z',
     description: 'Withdrawal At',
@@ -27,4 +22,21 @@ export class RequestTimeByRequestIdDto {
     ms: number;
     withdrawalAt: string;
   };
+
+  @ApiProperty({
+    example: 5,
+    description: 'Request Id',
+  })
+  requestId: string;
+
+  @ApiProperty({
+    example: {
+      id: '1',
+      amountOfStETH: '2',
+      amountOfShares: '2',
+      timestamp: '2023-10-04T15:14:24.202Z',
+    },
+    description: 'Request',
+  })
+  request: RequestDto;
 }
diff --git a/src/http/request-time/dto/request.dto.ts b/src/http/request-time/dto/request.dto.ts
@@ -0,0 +1,17 @@
+import { WithdrawalRequest } from '../../../storage/queue-info/queue-info.types';
+
+export class RequestDto {
+  id: string;
+  amountOfStETH: string;
+  amountOfShares: string;
+  timestamp: string;
+}
+
+export const transformToRequestDto = (request: WithdrawalRequest): RequestDto => {
+  return {
+    id: request.id.toString(),
+    amountOfStETH: request.amountOfStETH.toString(),
+    amountOfShares: request.amountOfStETH.toString(),
+    timestamp: new Date(request.timestamp.toNumber() * 1000).toISOString(),
+  };
+};
diff --git a/src/http/request-time/request-time.service.ts b/src/http/request-time/request-time.service.ts
@@ -24,6 +24,7 @@ import { RequestTimeV2Dto } from './dto/request-time-v2.dto';
 import { LOGGER_PROVIDER } from '@lido-nestjs/logger';
 import { RequestTimeByRequestIdDto } from './dto/request-time-by-request-id.dto';
 import { WithdrawalRequest } from '../../storage/queue-info/queue-info.types';
+import { transformToRequestDto } from './dto/request.dto';
 
 @Injectable()
 export class RequestTimeService {
@@ -130,6 +131,7 @@ export class RequestTimeService {
 
     return {
       requestId: request.id.toString(),
+      request: transformToRequestDto(request),
       ms: toTimeWithdrawal,
       withdrawalAt: new Date(requestTimestamp + toTimeWithdrawal).toISOString(),
       withVEBO: {