Fixing controller conection on the register flyover scenario

rsksmart · Nov 18, 2024 · c39f548 · c39f548
1 parent 21f484d
commit c39f548
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 31 deletions.
diff --git a/src/__tests__/unit/register.controller.unit.ts b/src/__tests__/unit/register.controller.unit.ts
@@ -16,23 +16,20 @@ describe('RegisterController', () => {
   let registerFlyover: sinon.SinonStub;
   let get: sinon.SinonStub;
   let payload = new RegisterPayload({
-    sessionId: '43ef33c59294d5033d96cb25b8f94723',
     txHash: '0x',
     type: constants.TX_TYPE_PEGIN,
     value: 0.005,
     wallet: 'liquality',
     fee: 0.000001,
   });
   let pegoutPayload = new RegisterPayload({
-    sessionId: '',
     txHash: '0xb',
     type: constants.TX_TYPE_PEGOUT,
     value: 0.004,
     wallet: 'liquality',
     fee: 0.000002,
   });
   let flyoverPayload = new RegisterPayload({
-    sessionId: '',
     txHash: '0xc',
     type: constants.TX_TYPE_PEGOUT,
     value: 0.005,
@@ -42,6 +39,27 @@ describe('RegisterController', () => {
     details: {
       blocksToCompleteTransaction: 2,
     },
+    quote: {
+        callFeeOnWei: 800n,
+        depositAddr: "testDeposit",
+        depositConfirmations: 200,
+        depositDateLimit: 49800,
+        expireBlocks: 100,
+        expireDate: 49850,
+        productFeeAmountOnWei: 6300n,
+        transferConfirmations: 80,
+        transferTime: 50600,
+        valueOnWei: 18450n,
+        agreementTimestamp: 1620000000,
+        gasFeeOnWei: 1000000000000000000n,
+        nonce: 1n,
+        penaltyFeeOnWei: 1000000000000000000n,
+        btcRefundAddress: "testBtcRefund",
+        lbcAddress: "testLbc",
+        lpBtcAddress: "testLpBtc",
+        rskRefundAddress: "testRskRefund",
+        liquidityProviderRskAddress: "testLiquidityProviderRsk",
+    },
   });
   beforeEach(reset);
   function reset() {
@@ -60,26 +78,16 @@ describe('RegisterController', () => {
     );
   }
 
-  it('should register a pegin with a valid sessionId', async () => {
+  it('should register a pegin', async () => {
     register.resolves(true);
     get.resolves('43ef33c59294d5033d96cb25b8f94723');
     await registerController.register(payload);
     const result = await context.result;
-    sinon.assert.called(sessionRepository.stubs.get);
     sinon.assert.called(register);
     expect(result.statusCode).to.equal(200);
   });
 
-  it('should not register a pegin with an invalid sessionId', async () => {
-    get.resolves(null);
-    await registerController.register(payload);
-    const result = await context.result;
-    sinon.assert.called(sessionRepository.stubs.get);
-    sinon.assert.notCalled(register);
-    expect(result.statusCode).to.equal(200);
-  });
-
-  it('should register a pegout with any sessionId', async () => {
+  it('should register a pegout', async () => {
     await registerController.register(pegoutPayload);
     const result = await context.result;
     sinon.assert.called(register);

diff --git a/src/controllers/register.controller.ts b/src/controllers/register.controller.ts
@@ -6,7 +6,6 @@ import {ServicesBindings} from '../dependency-injection-bindings';
 import {RegisterPayload} from '../models';
 import {RegisterService, FlyoverService} from '../services';
 import {SessionRepository} from '../repositories';
-import * as constants from '../constants';
 
 export class RegisterController {
   logger: Logger;
@@ -38,16 +37,11 @@ export class RegisterController {
     })
     payload: RegisterPayload,
   ): Promise<Response> {
-    const {sessionId, type, provider} = payload;
-    let session;
-    if (sessionId) {
-      session = await this.sessionRepository.get(sessionId);
-    }
-    if (session != null || type === constants.TX_TYPE_PEGOUT) {
-      await this.registerService.register(payload);
-    }
+    const {provider} = payload;
     if (provider) {
       await this.flyoverService.register(payload);
+    } else {
+      await this.registerService.register(payload);
     }
     return this.response.status(200).send();
   }

diff --git a/src/models/register-payload.model.ts b/src/models/register-payload.model.ts
@@ -1,13 +1,8 @@
 import {Model, model, property} from '@loopback/repository';
+import { QuoteDbModel } from './quote-db.model';
 
 @model()
 export class RegisterPayload extends Model {
-  @property({
-    type: 'string',
-    required: true,
-  })
-  sessionId: string;
-
   @property({
     type: 'string',
     required: true,
@@ -66,6 +61,11 @@ export class RegisterPayload extends Model {
     type: 'string',
   })
   quoteHash?: string;
+
+  @property({
+    type: 'object',
+  })
+  quote?: QuoteDbModel;
 
   constructor(data?: Partial<RegisterPayload>) { //NOSONAR
     super(data);

diff --git a/src/services/flyover.service.ts b/src/services/flyover.service.ts
@@ -1,5 +1,5 @@
 import mongoose, { Schema } from 'mongoose';
-import {RegisterPayload} from '../models';
+import {QuoteDbModel, RegisterPayload} from '../models';
 import {FlyoverStatusModel} from '../models/flyover-status.model';
 import {MongoDbDataService} from './mongodb-data.service';
 import { RskNodeService } from './rsk-node.service';
@@ -87,6 +87,7 @@ export class FlyoverService extends MongoDbDataService<FlyoverStatusModel, Flyov
     flyoverStatus.recipientAddress = payload?.details?.recipientAddress ?? '';
     flyoverStatus.blockToBeFinished = currentBlock + Number(payload?.details?.blocksToCompleteTransaction ?? 0);
     flyoverStatus.quoteHash = payload?.quoteHash ?? '';
+    flyoverStatus.quote = payload?.quote ?? {} as QuoteDbModel;
     return this.set(flyoverStatus);
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -2,6 +2,7 @@
   "$schema": "http://json.schemastore.org/tsconfig",
   "extends": "@loopback/build/config/tsconfig.common.json",
   "compilerOptions": {
+    "target": "es2020",
     "esModuleInterop": true,
     "experimentalDecorators": true,
     "outDir": "dist",