feat!: add iso 20022 compatibility

.gitignore

@@ -83,3 +83,5 @@ typings/
 # https://devspace.sh/
 devspace*
 .devspace/**.*
+
+.rush

.ncurc.yaml

@@ -1,4 +1,5 @@
 ## Add a comment indicating the reason for each rejected dependency upgrade added to this list, and what should be done to resolve it (i.e. handle it through a story, etc).
 reject: [
-  "json-rules-engine"
+  "json-rules-engine",
+  "eslint"
 ]

Dockerfile

@@ -17,7 +17,7 @@ USER root
 WORKDIR /opt/app
 
 RUN apk --no-cache add git
-RUN apk add --no-cache -t build-dependencies make gcc g++ py3-setuptools python3 libtool openssl-dev autoconf automake bash \
+RUN apk add --no-cache -t build-dependencies make gcc g++ python3 py3-setuptools libtool openssl-dev autoconf automake bash \
     && cd $(npm root -g)/npm
 
 COPY package.json package-lock.json* /opt/app/

audit-ci.jsonc

@@ -4,11 +4,6 @@
   // Only use one of ["low": true, "moderate": true, "high": true, "critical": true]
   "moderate": true,
   "allowlist": [
-    "GHSA-qgmg-gppg-76g5",  // https://github.com/advisories/GHSA-qgmg-gppg-76g5 Mock data generator for swagger api, not a security concern at this time.
-    "GHSA-c429-5p7v-vgjp",  // https://github.com/advisories/GHSA-c429-5p7v-vgjp
-    "GHSA-8hc4-vh64-cxmj",  // https://github.com/advisories/GHSA-8hc4-vh64-cxmj
-    "GHSA-952p-6rrq-rcjv",  // https://github.com/advisories/GHSA-952p-6rrq-rcjv
-    "GHSA-pppg-cpfq-h7wr",  // https://github.com/advisories/GHSA-pppg-cpfq-h7wr Patch not released yet
-    "GHSA-3xgq-45jj-v275"   // https://github.com/advisories/GHSA-3xgq-45jj-v275
+    "GHSA-mwcw-c2x4-8c55"  // https://github.com/advisories/GHSA-mwcw-c2x4-8c55
   ]
-}
+}

config/default.json

@@ -5,6 +5,7 @@
   },
   "HOSTNAME": "http://quoting-service",
   "LISTEN_ADDRESS": "0.0.0.0",
+  "API_TYPE": "fspiop",
   "PORT": 3002,
   "MONITORING_PORT": 3003,
   "AMOUNT": {
@@ -89,6 +90,16 @@
       ]
     }
   },
+  "ORIGINAL_PAYLOAD_STORAGE": "",
+  "PAYLOAD_CACHE": {
+    "enabled": true,
+    "type": "redis-cluster",
+    "connectionConfig": {
+      "cluster": [
+        { "host": "localhost", "port": 6379 }
+      ]
+    }
+  },
   "LOG_LEVEL": "info",
   "KAFKA": {
     "CONSUMER": {

docker-compose.yml

@@ -20,7 +20,6 @@ x-quoting-service: &quotingServiceBase
     - CSL_LOG_TRANSPORT=file
   volumes:
     - ./docker/quoting-service/default.json:/opt/app/config/default.json
-    #  think, how to use ./config/default.json inside docker-compose
     - ./secrets/:/opt/app/secrets/
   depends_on:
     <<: *dependsOnMysqlAndKafka
@@ -58,9 +57,24 @@ services:
       - "19229:9229"
     container_name: qs_quoting-service
 
+  quoting-service-iso:
+    <<: *quotingServiceBase
+    command: npm start
+    environment:
+      - LOG_LEVEL=debug
+      - QUOTE_API_TYPE=iso20022
+#      - QUOTE_ORIGINAL_PAYLOAD_STORAGE=redis
+      - QUOTE_ORIGINAL_PAYLOAD_STORAGE=kafka
+    ports:
+      - "13002:3002"
+      - "39229:9229"
+    container_name: qs_quoting-service-iso
+
   quoting-service-handler:
     <<: *quotingServiceBase
     command: npm run start:handlers:debug
+    environment:
+      - LOG_LEVEL=debug
     ports:
       - "3003:3003"
       - "29229:9229"
@@ -113,6 +127,7 @@ services:
 
 #  To use with proxyCache.type === 'redis-cluster'
   redis-node-0:
+    container_name: redis-node-0
     <<: *REDIS_NODE
     environment:
       <<: *REDIS_ENVS
@@ -125,34 +140,39 @@ services:
       - redis-node-4
       - redis-node-5
   redis-node-1:
+    container_name: redis-node-1
     <<: *REDIS_NODE
     environment:
       <<: *REDIS_ENVS
       REDIS_PORT_NUMBER: 6380
     ports:
       - "16380:16380"
   redis-node-2:
+    container_name: redis-node-2
     <<: *REDIS_NODE
     environment:
       <<: *REDIS_ENVS
       REDIS_PORT_NUMBER: 6381
     ports:
       - "16381:16381"
   redis-node-3:
+    container_name: redis-node-3
     <<: *REDIS_NODE
     environment:
       <<: *REDIS_ENVS
       REDIS_PORT_NUMBER: 6382
     ports:
       - "16382:16382"
   redis-node-4:
+    container_name: redis-node-4
     <<: *REDIS_NODE
     environment:
       <<: *REDIS_ENVS
       REDIS_PORT_NUMBER: 6383
     ports:
       - "16383:16383"
   redis-node-5:
+    container_name: redis-node-5
     <<: *REDIS_NODE
     environment:
       <<: *REDIS_ENVS

docker/quoting-service/default.json

@@ -5,6 +5,7 @@
   },
   "HOSTNAME": "http://quoting-service",
   "LISTEN_ADDRESS": "0.0.0.0",
+  "LOG_LEVEL": "debug",
   "PORT": 3002,
   "MONITORING_PORT": 3003,
   "AMOUNT": {
@@ -13,15 +14,18 @@
   },
   "PROTOCOL_VERSIONS": {
     "CONTENT": {
-      "DEFAULT": "1.1",
+      "DEFAULT": "2.0",
       "VALIDATELIST": [
+        "2.0",
         "1.1",
         "1.0"
       ]
     },
     "ACCEPT": {
-      "DEFAULT": "1",
+      "DEFAULT": "2",
       "VALIDATELIST": [
+        "2",
+        "2.0",
         "1",
         "1.0",
         "1.1"
@@ -86,6 +90,16 @@
       ]
     }
   },
+  "ORIGINAL_PAYLOAD_STORAGE": "",
+  "PAYLOAD_CACHE": {
+    "enabled": true,
+    "type": "redis-cluster",
+    "connectionConfig": {
+      "cluster": [
+        { "host": "redis-node-0", "port": 6379 }
+      ]
+    }
+  },
   "KAFKA": {
     "CONSUMER": {
       "QUOTE": {

jest.config.js

@@ -1,7 +1,9 @@
-const path = require('path')
+process.env.LOG_LEVEL = 'debug'
 
 module.exports = {
   verbose: true,
+  clearMocks: true, // to avoid jest.clearAllMocks() in afterEach
+
   collectCoverageFrom: [
     '**/src/**/**/*.js'
   ],
@@ -15,9 +17,5 @@ module.exports = {
       branches: 90,
       lines: 90
     }
-  },
-  globals: {
-    __SRC__: path.resolve(__dirname, 'src'),
-    __ROOT__: path.resolve(__dirname)
   }
 }