fix(csi-1170): fix supportedCurrencies check for RECEIVE amountType

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 setup: true
 orbs:
-  build: mojaloop/[email protected].50
+  build: mojaloop/[email protected].55
 workflows:
   setup:
     jobs:

docker-compose.pm4ml.yml

@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
 
   sdk-scheme-adapter-api-svc:

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.7'
 networks:
   mojaloop-net:
     name: mojaloop-net

modules/api-svc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-api-svc",
-  "version": "21.0.0-snapshot.1",
+  "version": "21.0.0-snapshot.19",
   "description": "An adapter for connecting to Mojaloop API enabled switches.",
   "main": "src/index.js",
   "types": "src/index.d.ts",

modules/api-svc/src/lib/dto.js

@@ -27,7 +27,7 @@
 /*eslint quote-props: ["error", "as-needed"]*/
 const config = require('../config');
 const randomUUID = require('@mojaloop/central-services-shared').Util.id(config.idGenerator);
-const { Directions, SDKStateEnum} = require('./model/common');
+const { Directions, SDKStateEnum, AmountTypes } = require('./model/common');
 
 const quoteRequestStateDto = (request) => ({
     // transferId: this follows the slightly dodgy assumption that transferId will be same as this transactionId.
@@ -56,24 +56,41 @@ const fxQuoteRequestStateDto = (request) => ({
  * @param data {object} - "state" of inbound transaction request
  * Supports only single FXP and currency for now
  */
-const outboundPostFxQuotePayloadDto = (data) => Object.freeze({
-    conversionRequestId: randomUUID(),
-    conversionTerms: {
-        conversionId: randomUUID(), // should be the same as commitRequestId from fxTransfer
-        initiatingFsp: data.from.fspId,
-        determiningTransferId: data.transferId,
-        counterPartyFsp: data.fxProviders[0],
-        amountType: data.amountType,
-        sourceAmount: {
+const outboundPostFxQuotePayloadDto = (data) => {
+    let sourceAmount, targetAmount;
+
+    sourceAmount = {
+        currency: data.currency,
+        amount: data.amount
+    };
+    targetAmount = {
+        currency: data.supportedCurrencies[0],
+    };
+
+    if (data.amountType === AmountTypes.RECEIVE && !config.supportedCurrencies.includes(data.currency)) {
+        sourceAmount = {
+            currency: config.supportedCurrencies[0],
+        };
+        targetAmount = {
             currency: data.currency,
             amount: data.amount
-        },
-        targetAmount: {
-            currency: data.supportedCurrencies[0],
-        },
-        expiration: data.fxQuoteExpiration,
+        };
     }
-});
+
+    return Object.freeze({
+        conversionRequestId: randomUUID(),
+        conversionTerms: {
+            conversionId: randomUUID(), // should be the same as commitRequestId from fxTransfer
+            initiatingFsp: data.from.fspId,
+            determiningTransferId: data.transferId,
+            counterPartyFsp: data.fxProviders[0],
+            amountType: data.amountType,
+            sourceAmount,
+            targetAmount,
+            expiration: data.fxQuoteExpiration,
+        }
+    });
+};
 
 /**
  * @param data {object} - "state" of inbound transaction request

modules/api-svc/src/lib/model/OutboundTransfersModel.js

@@ -70,6 +70,7 @@ class OutboundTransfersModel {
         this._multiplePartiesResponseSeconds = config.multiplePartiesResponseSeconds;
         this._sendFinalNotificationIfRequested = config.sendFinalNotificationIfRequested;
         this._apiType = config.apiType;
+        this._supportedCurrencies = config.supportedCurrencies;
 
         if (this._autoAcceptParty && this._multiplePartiesResponse) {
             throw new Error('Conflicting config options provided: autoAcceptParty and multiplePartiesResponse');
@@ -391,13 +392,13 @@ class OutboundTransfersModel {
                         }
                         this.data.to.dateOfBirth = payee.personalInfo.dateOfBirth;
                     }
-
+                    
                     if (Array.isArray(payee.supportedCurrencies)) {
                         if (!payee.supportedCurrencies.length) {
                             throw new Error(ErrorMessages.noSupportedCurrencies);
                         }
 
-                        this.data.needFx = !payee.supportedCurrencies.includes(this.data.currency);
+                        this.data.needFx = this._isFxNeeded(this._supportedCurrencies, payee.supportedCurrencies, this.data.currency, this.data.amountType);
                         this.data.supportedCurrencies = payee.supportedCurrencies;
                     }
 
@@ -1210,6 +1211,34 @@ class OutboundTransfersModel {
         return modifiedData;
     }
 
+    /**
+     * Determines if FX is needed for the transfer
+     * 
+     * @param {Array} payerCurrencies - Array of supported currencies for the payer
+     * @param {Array} payeeCurrencies - Array of supported currencies for the payee
+     * @param {string} amountCurrency - Currency of the amount being transferred
+     * @param {string} amountType - Type of the amount being transferred (SEND/RECEIVE)
+     * @returns {boolean} - true if FX is needed, false if not
+     */
+    _isFxNeeded(payerCurrencies, payeeCurrencies, amountCurrency, amountType) {
+        if (payerCurrencies.includes(amountCurrency) && payeeCurrencies.includes(amountCurrency)) {
+            return false;
+        }
+        const intersection = payerCurrencies.filter(currency => payeeCurrencies.includes(currency));
+        if(intersection.length > 0 && !intersection.includes(amountCurrency)) {
+            return true;
+        }
+        if (amountType === AmountTypes.RECEIVE) {
+            if (!payerCurrencies.includes(amountCurrency)) {
+                return true;
+            }
+        }
+        if (!payeeCurrencies.includes(amountCurrency)) {
+            return true;
+        }
+
+        return false;
+    }
 
     /**
      * Loads a transfer model from cache for resumption of the transfer process

modules/api-svc/src/lib/model/common/Enums.js

@@ -112,7 +112,7 @@ const ErrorMessages = Object.freeze({
     noSupportedCurrencies: 'No payee supportedCurrencies received',
     responseMissedExpiryDeadline: 'Response missed expiry deadline',
     quoteRejectedByBackend: 'Quote rejected by backend',
-    fxQuoteRejectedByBackend: 'FX quote rejected by backend',
+    fxQuoteRejectedByBackend: 'FX quote rejected by backend'
 });
 
 const AmountTypes = Object.freeze({

modules/api-svc/test/unit/lib/model/data/defaultConfig.json

@@ -57,5 +57,6 @@
     "port": 4004
   },
   "getServicesFxpResponse": ["fxp_id"],
-  "apiType": "fspiop"
+  "apiType": "fspiop",
+  "supportedCurrencies": ["XXX"]
 }

modules/outbound-command-event-handler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-outbound-command-event-handler",
-  "version": "0.3.0-snapshot.1",
+  "version": "0.3.0-snapshot.18",
   "description": "Mojaloop sdk scheme adapter command event handler",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/sdk-scheme-adapter/",

modules/outbound-domain-event-handler/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mojaloop/sdk-scheme-adapter-outbound-domain-event-handler",
-    "version": "0.3.0-snapshot.1",
+    "version": "0.3.0-snapshot.18",
     "description": "mojaloop sdk scheme adapter outbound domain event handler",
     "license": "Apache-2.0",
     "homepage": "https://github.com/mojaloop/sdk-scheme-adapter/",

modules/private-shared-lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-private-shared-lib",
-  "version": "0.4.0-snapshot.1",
+  "version": "0.4.0-snapshot.18",
   "description": "SDK Scheme Adapter private shared library.",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/accounts-and-balances-bc/tree/main/modules/private-types",

test/func/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.7'
 networks:
   mojaloop-net:
     name: mojaloop-net

test/func/ttk-tests-docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.7'
 networks:
   mojaloop-net:
     name: mojaloop-net