diff --git a/.circleci/config.yml b/.circleci/config.yml index 378589967..3f2da6420 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,1059 +1,11 @@ -# CircleCI v2 Config version: 2.1 - -## -# orbs -# -# Orbs used in this pipeline -## +setup: true orbs: - anchore: anchore/anchore-engine@1.9.0 - slack: circleci/slack@4.12.5 # Ref: https://github.com/mojaloop/ci-config/tree/main/slack-templates - pr-tools: mojaloop/pr-tools@0.1.10 # Ref: https://github.com/mojaloop/ci-config/ - gh: circleci/github-cli@2.2.0 - -## -# defaults -# -# YAML defaults templates, in alphabetical order -## -defaults_docker_Dependencies: &defaults_docker_Dependencies | - apk --no-cache add bash - apk --no-cache add git - apk --no-cache add ca-certificates - apk --no-cache add curl - apk --no-cache add openssh-client - apk --no-cache add -t build-dependencies make gcc g++ python3 libtool autoconf automake jq - apk --no-cache add -t openssl ncurses coreutils libgcc linux-headers grep util-linux binutils findutils - apk --no-cache add librdkafka-dev - -## Default 'default-machine' executor dependencies -defaults_machine_Dependencies: &defaults_machine_Dependencies | - ## Add Package Repos - ## Ref: https://docs.confluent.io/platform/current/installation/installing_cp/deb-ubuntu.html#get-the-software - wget -qO - https://packages.confluent.io/deb/7.4/archive.key | sudo apt-key add - - sudo add-apt-repository -y "deb https://packages.confluent.io/clients/deb $(lsb_release -cs) main" - - ## Install deps - sudo apt install -y librdkafka-dev curl bash musl-dev libsasl2-dev - sudo ln -s /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1 - -defaults_awsCliDependencies: &defaults_awsCliDependencies | - apk --no-cache add aws-cli - -defaults_license_scanner: &defaults_license_scanner - name: Install and set up license-scanner - command: | - git clone https://github.com/mojaloop/license-scanner /tmp/license-scanner - cd /tmp/license-scanner && make build default-files set-up - -defaults_npm_auth: &defaults_npm_auth - name: Update NPM registry auth token - command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > .npmrc - -defaults_npm_publish_release: &defaults_npm_publish_release - name: Publish NPM $RELEASE_TAG artifact - command: | - source $BASH_ENV - echo "Publishing tag $RELEASE_TAG" - npm publish --tag $RELEASE_TAG --access public - -defaults_export_version_from_package: &defaults_export_version_from_package - name: Format the changelog into the github release body and get release tag - command: | - git diff --no-indent-heuristic main~1 HEAD CHANGELOG.md | sed -n '/^+[^+]/ s/^+//p' > /tmp/changes - echo 'export RELEASE_CHANGES=`cat /tmp/changes`' >> $BASH_ENV - echo 'export RELEASE_TAG=`cat package-lock.json | jq -r .version`' >> $BASH_ENV - -defaults_configure_git: &defaults_configure_git - name: Configure git - command: | - git config user.email ${GIT_CI_EMAIL} - git config user.name ${GIT_CI_USER} - -defaults_configure_nvmrc: &defaults_configure_nvmrc - name: Configure NVMRC - command: | - if [ -z "$NVMRC_VERSION" ]; then - echo "==> Configuring NVMRC_VERSION!" - - export ENV_DOT_PROFILE=$HOME/.profile - touch $ENV_DOT_PROFILE - - export NVMRC_VERSION=$(cat $CIRCLE_WORKING_DIRECTORY/.nvmrc) - echo "export NVMRC_VERSION=$NVMRC_VERSION" >> $ENV_DOT_PROFILE - fi - echo "NVMRC_VERSION=$NVMRC_VERSION" - -defaults_configure_nvm: &defaults_configure_nvm - name: Configure NVM - command: | - cd $HOME - export ENV_DOT_PROFILE=$HOME/.profile - touch $ENV_DOT_PROFILE - echo "1. Check/Set NVM_DIR env variable" - if [ -z "$NVM_DIR" ]; then - export NVM_DIR="$HOME/.nvm" - echo "==> NVM_DIR has been exported - $NVM_DIR" - else - echo "==> NVM_DIR already exists - $NVM_DIR" - fi - echo "2. Check/Set NVMRC_VERSION env variable" - if [ -z "$NVMRC_VERSION" ]; then - echo "==> Configuring NVMRC_VERSION!" - export NVMRC_VERSION=$(cat $CIRCLE_WORKING_DIRECTORY/.nvmrc) - echo "export NVMRC_VERSION=$NVMRC_VERSION" >> $ENV_DOT_PROFILE - fi - echo "3. Configure NVM" - ## Lets check if an existing NVM_DIR exists, if it does lets skil - if [ -e "$NVM_DIR" ]; then - echo "==> $NVM_DIR exists. Skipping steps 3!" - # echo "5. Executing $NVM_DIR/nvm.sh" - # [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" - else - echo "==> $NVM_DIR does not exists. Executing steps 4-5!" - echo "4. Installing NVM" - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash - echo "5. Executing $NVM_DIR/nvm.sh" - [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" - fi - ## Ref: https://github.com/nvm-sh/nvm/issues/1102#issuecomment-550572252 - if [ ! -z "$NVM_ARCH_UNOFFICIAL_OVERRIDE" ]; then - echo "==> Handle NVM_ARCH_UNOFFICIAL_OVERRIDE=$NVM_ARCH_UNOFFICIAL_OVERRIDE!" - echo "nvm_get_arch() { nvm_echo \"${NVM_ARCH_UNOFFICIAL_OVERRIDE}\"; }" >> $ENV_DOT_PROFILE - echo "export NVM_NODEJS_ORG_MIRROR=https://unofficial-builds.nodejs.org/download/release" >> $ENV_DOT_PROFILE - source $ENV_DOT_PROFILE - fi - echo "6. Setup Node version" - if [ -n "$NVMRC_VERSION" ]; then - echo "==> Installing Node version: $NVMRC_VERSION" - nvm install $NVMRC_VERSION - nvm alias default $NVMRC_VERSION - nvm use $NVMRC_VERSION - cd $CIRCLE_WORKING_DIRECTORY - else - echo "==> ERROR - NVMRC_VERSION has not been set! - NVMRC_VERSION: $NVMRC_VERSION" - exit 1 - fi - -defaults_display_versions: &defaults_display_versions - name: Display Versions - command: | - echo "What is the active version of Nodejs?" - echo "node: $(node --version)" - echo "yarn: $(yarn --version)" - echo "npm: $(npm --version)" - echo "nvm: $(nvm --version)" - -defaults_environment: &defaults_environment - ## env var for nx to set main branch - MAIN_BRANCH_NAME: main - ## Disable LIBRDKAFKA build since we install it via general dependencies - # BUILD_LIBRDKAFKA: 0 - -## -# Executors -# -# CircleCI Executors -## -executors: - default-docker: - working_directory: &WORKING_DIR /home/circleci/project - shell: "/bin/sh -leo pipefail" ## Ref: https://circleci.com/docs/env-vars/#alpine-linux - environment: - BASH_ENV: /etc/profile ## Ref: https://circleci.com/docs/env-vars/#alpine-linux - NVM_ARCH_UNOFFICIAL_OVERRIDE: x64-musl ## Ref: https://github.com/nvm-sh/nvm/issues/1102#issuecomment-550572252 - docker: - - image: node:18-alpine3.19 # Ref: https://hub.docker.com/_/node?tab=tags&page=1&name=alpine - - default-machine: - working_directory: *WORKING_DIR - shell: "/bin/bash -leo pipefail" - machine: - image: ubuntu-2204:2023.04.2 # Ref: https://circleci.com/developer/machine/image/ubuntu-2204 - -## -# Jobs -# -# A map of CircleCI jobs -## -jobs: - setup: - executor: default-docker - environment: - <<: *defaults_environment - steps: - - run: - name: Install general dependencies - command: *defaults_docker_Dependencies - - checkout - - run: - <<: *defaults_configure_nvm - - run: - <<: *defaults_display_versions - - run: - name: Update NPM install - command: npm ci - - save_cache: - key: dependency-cache-{{ .Environment.CIRCLE_SHA1 }} - paths: - - node_modules - - test-dependencies: - executor: default-docker - environment: - <<: *defaults_environment - steps: - - run: - name: Install general dependencies - command: *defaults_docker_Dependencies - - checkout - - run: - <<: *defaults_configure_nvm - - run: - <<: *defaults_display_versions - - restore_cache: - key: dependency-cache-{{ .Environment.CIRCLE_SHA1 }} - - run: - name: Execute dependency tests - command: npm run dep:check - - test-lint: - executor: default-docker - environment: - <<: *defaults_environment - steps: - - run: - name: Install general dependencies - command: *defaults_docker_Dependencies - - checkout - - run: - <<: *defaults_configure_nvm - - run: - <<: *defaults_display_versions - - restore_cache: - key: dependency-cache-{{ .Environment.CIRCLE_SHA1 }} - - run: - name: Execute lint tests - command: npm run lint - - test-unit: - executor: default-docker - environment: - <<: *defaults_environment - steps: - - run: - name: Install general dependencies - command: *defaults_docker_Dependencies - - checkout - - run: - <<: *defaults_configure_nvm - - run: - <<: *defaults_display_versions - - restore_cache: - key: dependency-cache-{{ .Environment.CIRCLE_SHA1 }} - - run: - # This is needed for legacy core tests. Remove this once 'tape' is fully deprecated. - name: Install tape, tapes and tap-xunit - command: npm install tape tapes tap-xunit - - run: - name: Create dir for test results - command: mkdir -p ./test/results - - run: - name: Execute unit tests - command: npm -s run test:xunit - - store_artifacts: - path: ./test/results - destination: test - - store_test_results: - path: ./test/results - - test-coverage: - executor: default-docker - environment: - <<: *defaults_environment - steps: - - run: - name: Install general dependencies - command: *defaults_docker_Dependencies - - run: - name: Install AWS CLI dependencies - command: *defaults_awsCliDependencies - - checkout - - run: - <<: *defaults_configure_nvm - - run: - <<: *defaults_display_versions - - restore_cache: - key: dependency-cache-{{ .Environment.CIRCLE_SHA1 }} - - run: - name: Execute code coverage check - command: npm -s run test:coverage-check - - store_artifacts: - path: coverage - destination: test - - store_test_results: - path: coverage - - build-local: - executor: default-machine - environment: - <<: *defaults_environment - steps: - - checkout - - run: - <<: *defaults_configure_nvmrc - - run: - <<: *defaults_display_versions - - run: - name: Build Docker local image - command: | - source ~/.profile - export DOCKER_NODE_VERSION="$NVMRC_VERSION-alpine" - echo "export DOCKER_NODE_VERSION=$NVMRC_VERSION-alpine" >> $BASH_ENV - echo "Building Docker image: ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:local --build-arg NODE_VERSION=$DOCKER_NODE_VERSION" - docker build -t ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:local --build-arg NODE_VERSION=$DOCKER_NODE_VERSION . - - run: - name: Save docker image to workspace - command: docker save -o /tmp/docker-image.tar ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:local - - persist_to_workspace: - root: /tmp - paths: - - ./docker-image.tar - - test-integration: - executor: default-machine - environment: - <<: *defaults_environment - steps: - - run: - name: Install general dependencies - command: *defaults_machine_Dependencies - - checkout - - run: - <<: *defaults_configure_nvm - - run: - <<: *defaults_display_versions - - restore_cache: - key: dependency-cache-{{ .Environment.CIRCLE_SHA1 }} - - attach_workspace: - at: /tmp - - run: - name: Create dir for test results - command: mkdir -p ./test/results - - run: - name: Execute integration tests - command: | - # Set Node version to default (Note: this is needed on Ubuntu) - nvm use default - npm ci - - echo "Running integration tests...." - bash ./test/scripts/test-integration.sh - environment: - ENDPOINT_URL: http://localhost:4545/notification - UV_THREADPOOL_SIZE: 12 - WAIT_FOR_REBALANCE: 20 - TEST_INT_RETRY_COUNT: 30 - TEST_INT_RETRY_DELAY: 2 - TEST_INT_REBALANCE_DELAY: 20000 - - store_artifacts: - path: ./test/results - destination: test - - store_test_results: - path: ./test/results - - test-functional: - executor: default-machine - environment: - ML_CORE_TEST_HARNESS_DIR: /tmp/ml-core-test-harness - steps: - - checkout - - attach_workspace: - at: /tmp - - run: - name: Load the pre-built docker image from workspace - command: docker load -i /tmp/docker-image.tar - - run: - name: Execute TTK functional tests - command: bash ./test/scripts/test-functional.sh - - store_artifacts: - path: /tmp/ml-core-test-harness/reports - destination: test - - vulnerability-check: - executor: default-docker - environment: - <<: *defaults_environment - steps: - - run: - name: Install general dependencies - command: *defaults_docker_Dependencies - - checkout - - run: - <<: *defaults_configure_nvm - - run: - <<: *defaults_display_versions - - restore_cache: - key: dependency-cache-{{ .Environment.CIRCLE_SHA1 }} - - run: - name: Create dir for test results - command: mkdir -p ./audit/results - - run: - name: Check for new npm vulnerabilities - command: npm run audit:check -- -o json > ./audit/results/auditResults.json - - store_artifacts: - path: ./audit/results - destination: audit - - audit-licenses: - executor: default-docker - environment: - <<: *defaults_environment - steps: - - run: - name: Install general dependencies - command: *defaults_docker_Dependencies - - run: - <<: *defaults_license_scanner - - checkout - - restore_cache: - key: dependency-cache-{{ .Environment.CIRCLE_SHA1 }} - - run: - name: Run the license-scanner - command: cd /tmp/license-scanner && pathToRepo=$CIRCLE_WORKING_DIRECTORY make run - - store_artifacts: - path: /tmp/license-scanner/results - destination: licenses - - license-scan: - executor: default-machine - environment: - <<: *defaults_environment - steps: - - attach_workspace: - at: /tmp - - run: - name: Load the pre-built docker image from workspace - command: docker load -i /tmp/docker-image.tar - - run: - <<: *defaults_license_scanner - - run: - name: Run the license-scanner - command: cd /tmp/license-scanner && mode=docker dockerImages=${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:local make run - - store_artifacts: - path: /tmp/license-scanner/results - destination: licenses - - image-scan: - executor: anchore/anchore_engine - shell: /bin/sh -leo pipefail ## Ref: https://circleci.com/docs/env-vars/#alpine-linux - environment: - <<: *defaults_environment - BASH_ENV: /etc/profile ## Ref: https://circleci.com/docs/env-vars/#alpine-linux - ENV: ~/.profile - NVM_ARCH_UNOFFICIAL_OVERRIDE: x64-musl ## Ref: https://github.com/nvm-sh/nvm/issues/1102#issuecomment-550572252 - working_directory: *WORKING_DIR - steps: - - setup_remote_docker - - attach_workspace: - at: /tmp - - run: - name: Install docker dependencies for anchore - command: | - apk add --update py-pip docker python3-dev libffi-dev openssl-dev gcc libc-dev make jq curl bash - - run: - name: Install AWS CLI dependencies - command: *defaults_awsCliDependencies - - checkout - - run: - name: Setup Slack config - command: | - echo "export SLACK_PROJECT_NAME=${CIRCLE_PROJECT_REPONAME}" >> $BASH_ENV - echo "export SLACK_RELEASE_TYPE='GitHub Release'" >> $BASH_ENV - echo "export SLACK_RELEASE_TAG='${RELEASE_TAG} on ${CIRCLE_BRANCH} branch'" >> $BASH_ENV - echo "export SLACK_BUILD_ID=${CIRCLE_BUILD_NUM}" >> $BASH_ENV - echo "export SLACK_CI_URL=${CIRCLE_BUILD_URL}" >> $BASH_ENV - echo "export SLACK_CUSTOM_MSG='Anchore Image Scan failed for: \`${DOCKER_ORG}/${CIRCLE_PROJECT_REPONAME}:${CIRCLE_TAG}\`'" >> $BASH_ENV - - run: - <<: *defaults_configure_nvm - - run: - <<: *defaults_display_versions - - run: - name: Install general dependencies - command: *defaults_docker_Dependencies - - run: - name: Load the pre-built docker image from workspace - command: docker load -i /tmp/docker-image.tar - - run: - name: Download the mojaloop/ci-config repo - command: | - git clone https://github.com/mojaloop/ci-config /tmp/ci-config - # Generate the mojaloop anchore-policy - cd /tmp/ci-config/container-scanning && ./mojaloop-policy-generator.js /tmp/mojaloop-policy.json - - run: - name: Pull base image locally - command: | - echo "Pulling docker image: node:$NVMRC_VERSION-alpine" - docker pull node:$NVMRC_VERSION-alpine - ## Analyze the base and derived image - ## Note: It seems images are scanned in parallel, so preloading the base image result doesn't give us any real performance gain - - anchore/analyze_local_image: - # Force the older version, version 0.7.0 was just published, and is broken - anchore_version: v0.6.1 - image_name: "docker.io/node:$NVMRC_VERSION-alpine ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:local" - policy_failure: false - timeout: '500' - # Note: if the generated policy is invalid, this will fallback to the default policy, which we don't want! - policy_bundle_file_path: /tmp/mojaloop-policy.json - - run: - name: Upload Anchore reports to s3 - command: | - aws s3 cp anchore-reports ${AWS_S3_DIR_ANCHORE_REPORTS}/${CIRCLE_PROJECT_REPONAME}/ --recursive - aws s3 rm ${AWS_S3_DIR_ANCHORE_REPORTS}/latest/ --recursive --exclude "*" --include "${CIRCLE_PROJECT_REPONAME}*" - aws s3 cp anchore-reports ${AWS_S3_DIR_ANCHORE_REPORTS}/latest/ --recursive - - run: - name: Evaluate failures - command: /tmp/ci-config/container-scanning/anchore-result-diff.js anchore-reports/node_${NVMRC_VERSION}-alpine-policy.json anchore-reports/${CIRCLE_PROJECT_REPONAME}*-policy.json - - store_artifacts: - path: anchore-reports - - slack/notify: - event: fail - template: SLACK_TEMP_RELEASE_FAILURE - - release: - executor: default-docker - environment: - <<: *defaults_environment - steps: - - run: - name: Install general dependencies - command: *defaults_docker_Dependencies - - checkout - - restore_cache: - keys: - - dependency-cache-{{ .Environment.CIRCLE_SHA1 }} - - run: - <<: *defaults_configure_git - - run: - name: Setup Slack config - command: | - echo "export SLACK_PROJECT_NAME=${CIRCLE_PROJECT_REPONAME}" >> $BASH_ENV - echo "export SLACK_RELEASE_TYPE='GitHub Release'" >> $BASH_ENV - echo "export SLACK_RELEASE_TAG='${RELEASE_TAG} on ${CIRCLE_BRANCH} branch'" >> $BASH_ENV - echo "export SLACK_BUILD_ID=${CIRCLE_BUILD_NUM}" >> $BASH_ENV - echo "export SLACK_CI_URL=${CIRCLE_BUILD_URL}" >> $BASH_ENV - - run: - name: Generate changelog and bump package version - command: npm run release -- --no-verify - - run: - name: Push the release - command: git push --follow-tags origin ${CIRCLE_BRANCH} - - slack/notify: - event: fail - template: SLACK_TEMP_RELEASE_FAILURE - - github-release: - executor: default-machine - shell: "/bin/bash -eo pipefail" - environment: - <<: *defaults_environment - steps: - - run: - name: Install git - command: | - sudo apt-get update && sudo apt-get install -y git - - gh/install - - checkout - - run: - <<: *defaults_configure_git - - run: - name: Fetch updated release branch - command: | - git fetch origin - git checkout origin/${CIRCLE_BRANCH} - - run: - <<: *defaults_export_version_from_package - - run: - name: Check the release changes - command: | - echo "Changes are: ${RELEASE_CHANGES}" - - run: - name: Setup Slack config - command: | - echo "export SLACK_PROJECT_NAME=${CIRCLE_PROJECT_REPONAME}" >> $BASH_ENV - echo "export SLACK_RELEASE_TYPE='Github Release'" >> $BASH_ENV - echo "export SLACK_RELEASE_TAG=v${RELEASE_TAG}" >> $BASH_ENV - echo "export SLACK_RELEASE_URL=https://github.com/mojaloop/${CIRCLE_PROJECT_REPONAME}/releases/tag/v${RELEASE_TAG}" >> $BASH_ENV - echo "export SLACK_BUILD_ID=${CIRCLE_BUILD_NUM}" >> $BASH_ENV - echo "export SLACK_CI_URL=${CIRCLE_BUILD_URL}" >> $BASH_ENV - - run: - name: Create Release - command: | - gh release create "v${RELEASE_TAG}" --title "v${RELEASE_TAG} Release" --draft=false --notes "${RELEASE_CHANGES}" ./CHANGELOG.md - - slack/notify: - event: pass - template: SLACK_TEMP_RELEASE_SUCCESS - - slack/notify: - event: fail - template: SLACK_TEMP_RELEASE_FAILURE - - publish-docker: - executor: default-machine - shell: "/bin/bash -eo pipefail" - environment: - <<: *defaults_environment - steps: - - checkout - - run: - name: Setup for LATEST release - command: | - echo "export RELEASE_TAG=$RELEASE_TAG_PROD" >> $BASH_ENV - echo "RELEASE_TAG=$RELEASE_TAG_PROD" - - PACKAGE_VERSION=$(cat package-lock.json | jq -r .version) - echo "export PACKAGE_VERSION=${PACKAGE_VERSION}" >> $BASH_ENV - echo "PACKAGE_VERSION=${PACKAGE_VERSION}" - - run: - name: Setup Slack config - command: | - echo "export SLACK_PROJECT_NAME=${CIRCLE_PROJECT_REPONAME}" >> $BASH_ENV - echo "export SLACK_RELEASE_TYPE='Docker Release'" >> $BASH_ENV - echo "export SLACK_RELEASE_TAG=v${CIRCLE_TAG:1}" >> $BASH_ENV - echo "export SLACK_BUILD_ID=${CIRCLE_BUILD_NUM}" >> $BASH_ENV - echo "export SLACK_CI_URL=${CIRCLE_BUILD_URL}" >> $BASH_ENV - - attach_workspace: - at: /tmp - - run: - name: Load the pre-built docker image from workspace - command: | - docker load -i /tmp/docker-image.tar - - run: - name: Login to Docker Hub - command: docker login -u $DOCKER_USER -p $DOCKER_PASS - - run: - name: Re-tag pre built image - command: | - docker tag ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:local ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG - docker tag ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:local ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG - - run: - name: Publish Docker image $CIRCLE_TAG & Latest tag to Docker Hub - command: | - echo "Publishing ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG" - docker push ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG - echo "Publishing ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG" - docker push ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG - - run: - name: Set Image Digest - command: | - IMAGE_DIGEST=$(docker inspect ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:v${CIRCLE_TAG:1} | jq '.[0].RepoDigests | .[]') - echo "IMAGE_DIGEST=${IMAGE_DIGEST}" - echo "export IMAGE_DIGEST=${IMAGE_DIGEST}" >> $BASH_ENV - - run: - name: Update Slack config - command: | - echo "export SLACK_RELEASE_URL='https://hub.docker.com/layers/${CIRCLE_PROJECT_REPONAME}/${DOCKER_ORG}/${CIRCLE_PROJECT_REPONAME}/v${CIRCLE_TAG:1}/images/${IMAGE_DIGEST}?context=explore'" | sed -r "s/${DOCKER_ORG}\/${CIRCLE_PROJECT_REPONAME}@sha256:/sha256-/g" >> $BASH_ENV - - slack/notify: - event: pass - template: SLACK_TEMP_RELEASE_SUCCESS - - slack/notify: - event: fail - template: SLACK_TEMP_RELEASE_FAILURE - - publish-docker-snapshot: - executor: default-machine - shell: "/bin/bash -eo pipefail" - environment: - <<: *defaults_environment - steps: - - checkout - - run: - name: Setup for SNAPSHOT release - command: | - echo "export RELEASE_TAG=$RELEASE_TAG_SNAPSHOT" >> $BASH_ENV - echo "RELEASE_TAG=$RELEASE_TAG_SNAPSHOT" - - PACKAGE_VERSION=$(cat package-lock.json | jq -r .version) - echo "export PACKAGE_VERSION=${PACKAGE_VERSION}" >> $BASH_ENV - echo "PACKAGE_VERSION=${PACKAGE_VERSION}" - - run: - name: Setup Slack config - command: | - echo "export SLACK_PROJECT_NAME=${CIRCLE_PROJECT_REPONAME}" >> $BASH_ENV - echo "export SLACK_RELEASE_TYPE='Docker Release'" >> $BASH_ENV - echo "export SLACK_RELEASE_TAG=v${CIRCLE_TAG:1}" >> $BASH_ENV - echo "export SLACK_BUILD_ID=${CIRCLE_BUILD_NUM}" >> $BASH_ENV - echo "export SLACK_CI_URL=${CIRCLE_BUILD_URL}" >> $BASH_ENV - - attach_workspace: - at: /tmp - - run: - name: Load the pre-built docker image from workspace - command: | - docker load -i /tmp/docker-image.tar - - run: - name: Login to Docker Hub - command: docker login -u $DOCKER_USER -p $DOCKER_PASS - - run: - name: Re-tag pre built image - command: | - docker tag ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:local ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG - docker tag ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:local ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG - - run: - name: Publish Docker image $CIRCLE_TAG & Latest tag to Docker Hub - command: | - echo "Publishing ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG" - docker push ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG - echo "Publishing ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG" - docker push ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:$RELEASE_TAG - - run: - name: Set Image Digest - command: | - IMAGE_DIGEST=$(docker inspect ${DOCKER_ORG:-mojaloop}/$CIRCLE_PROJECT_REPONAME:v${CIRCLE_TAG:1} | jq '.[0].RepoDigests | .[]') - echo "IMAGE_DIGEST=${IMAGE_DIGEST}" - echo "export IMAGE_DIGEST=${IMAGE_DIGEST}" >> $BASH_ENV - - run: - name: Update Slack config - command: | - echo "export SLACK_RELEASE_URL='https://hub.docker.com/layers/${CIRCLE_PROJECT_REPONAME}/${DOCKER_ORG}/${CIRCLE_PROJECT_REPONAME}/v${CIRCLE_TAG:1}/images/${IMAGE_DIGEST}?context=explore'" | sed -r "s/${DOCKER_ORG}\/${CIRCLE_PROJECT_REPONAME}@sha256:/sha256-/g" >> $BASH_ENV - - slack/notify: - event: pass - template: SLACK_TEMP_RELEASE_SUCCESS - - slack/notify: - event: fail - template: SLACK_TEMP_RELEASE_FAILURE - - publish-npm: - executor: default-docker - environment: - <<: *defaults_environment - steps: - - run: - name: Install general dependencies - command: *defaults_docker_Dependencies - - checkout - - restore_cache: - key: dependency-cache-{{ .Environment.CIRCLE_SHA1 }} - - run: - name: Setup for LATEST release - command: | - echo "export RELEASE_TAG=$RELEASE_TAG_PROD" >> $BASH_ENV - echo "RELEASE_TAG=$RELEASE_TAG_PROD" - PACKAGE_VERSION=$(cat package-lock.json | jq -r .version) - echo "export PACKAGE_VERSION=${PACKAGE_VERSION}" >> $BASH_ENV - echo "PACKAGE_VERSION=${PACKAGE_VERSION}" - - run: - name: Setup Slack config - command: | - echo "export SLACK_PROJECT_NAME=${CIRCLE_PROJECT_REPONAME}" >> $BASH_ENV - echo "export SLACK_RELEASE_TYPE='NPM Release'" >> $BASH_ENV - echo "export SLACK_RELEASE_TAG=v${CIRCLE_TAG:1}" >> $BASH_ENV - echo "export SLACK_RELEASE_URL=https://www.npmjs.com/package/@mojaloop/${CIRCLE_PROJECT_REPONAME}/v/${CIRCLE_TAG:1}" >> $BASH_ENV - echo "export SLACK_BUILD_ID=${CIRCLE_BUILD_NUM}" >> $BASH_ENV - echo "export SLACK_CI_URL=${CIRCLE_BUILD_URL}" >> $BASH_ENV - - run: - <<: *defaults_npm_auth - - run: - <<: *defaults_npm_publish_release - - slack/notify: - event: pass - template: SLACK_TEMP_RELEASE_SUCCESS - - slack/notify: - event: fail - template: SLACK_TEMP_RELEASE_FAILURE - - publish-npm-snapshot: - executor: default-docker - environment: - <<: *defaults_environment - steps: - - run: - name: Install general dependencies - command: *defaults_docker_Dependencies - - checkout - - restore_cache: - key: dependency-cache-{{ .Environment.CIRCLE_SHA1 }} - - run: - name: Setup for SNAPSHOT release - command: | - echo "export RELEASE_TAG=${RELEASE_TAG_SNAPSHOT}" >> $BASH_ENV - echo "RELEASE_TAG=${RELEASE_TAG_SNAPSHOT}" - echo "Override package version: ${CIRCLE_TAG:1}" - npx standard-version --skip.tag --skip.commit --skip.changelog --release-as ${CIRCLE_TAG:1} - PACKAGE_VERSION=$(cat package-lock.json | jq -r .version) - echo "export PACKAGE_VERSION=${PACKAGE_VERSION}" >> $BASH_ENV - echo "PACKAGE_VERSION=${PACKAGE_VERSION}" - - run: - name: Setup Slack config - command: | - echo "export SLACK_PROJECT_NAME=${CIRCLE_PROJECT_REPONAME}" >> $BASH_ENV - echo "export SLACK_RELEASE_TYPE='NPM Snapshot'" >> $BASH_ENV - echo "export SLACK_RELEASE_TAG=v${CIRCLE_TAG:1}" >> $BASH_ENV - echo "export SLACK_RELEASE_URL=https://www.npmjs.com/package/@mojaloop/${CIRCLE_PROJECT_REPONAME}/v/${CIRCLE_TAG:1}" >> $BASH_ENV - echo "export SLACK_BUILD_ID=${CIRCLE_BUILD_NUM}" >> $BASH_ENV - echo "export SLACK_CI_URL=${CIRCLE_BUILD_URL}" >> $BASH_ENV - - run: - <<: *defaults_npm_auth - - run: - <<: *defaults_npm_publish_release - - slack/notify: - event: pass - template: SLACK_TEMP_RELEASE_SUCCESS - - slack/notify: - event: fail - template: SLACK_TEMP_RELEASE_FAILURE - -## -# Workflows -# -# CircleCI Workflow config -## + build: mojaloop/build@1.0.22 workflows: - build_and_test: + setup: jobs: - - pr-tools/pr-title-check: - context: org-global - - setup: - context: org-global - filters: - tags: - only: /.*/ - branches: - ignore: - - /feature*/ - - /bugfix*/ - - test-dependencies: - context: org-global - requires: - - setup - filters: - tags: - ignore: /.*/ - branches: - ignore: - - main - - test-lint: - context: org-global - requires: - - setup - filters: - tags: - only: /.*/ - branches: - ignore: - - /feature*/ - - /bugfix*/ - - test-unit: - context: org-global - requires: - - setup - filters: - tags: - only: /.*/ - branches: - ignore: - - /feature*/ - - /bugfix*/ - - test-coverage: - context: org-global - requires: - - setup - filters: - tags: - only: /.*/ - branches: - ignore: - - /feature*/ - - /bugfix*/ - - test-integration: - context: org-global - requires: - - setup - - build-local - filters: - tags: - only: /.*/ - branches: - ignore: - - /feature*/ - - /bugfix*/ - - test-functional: - context: org-global - requires: - - setup - - build-local - filters: - tags: - only: /.*/ - branches: - ignore: - - /feature*/ - - /bugfix*/ - - vulnerability-check: - context: org-global - requires: - - setup - filters: - tags: - only: /.*/ - branches: - ignore: - - /feature*/ - - /bugfix*/ - - audit-licenses: - context: org-global - requires: - - setup - filters: - tags: - only: /.*/ - branches: - ignore: - - /feature*/ - - /bugfix*/ - - build-local: - context: org-global - requires: - - setup - filters: - tags: - only: /.*/ - branches: - ignore: - - /feature*/ - - /bugfix*/ - - license-scan: - context: org-global - requires: - - build-local - filters: - tags: - only: /v[0-9]+(\.[0-9]+)*(\-snapshot(\.[0-9]+)?)?(\-hotfix(\.[0-9]+)?)?(\-perf(\.[0-9]+)?)?/ - branches: - ignore: - - /.*/ - - image-scan: - context: org-global - requires: - - build-local - filters: - tags: - only: /v[0-9]+(\.[0-9]+)*(\-snapshot(\.[0-9]+)?)?(\-hotfix(\.[0-9]+)?)?(\-perf(\.[0-9]+)?)?/ - branches: - ignore: - - /.*/ - # New commits to main release automatically - - release: - context: org-global - requires: - - pr-tools/pr-title-check - ## Only do this check on PRs - # - test-dependencies - - test-lint - - test-unit - - test-coverage - - test-integration - - test-functional - - vulnerability-check - - audit-licenses - - license-scan - - image-scan - filters: - branches: - only: - - main - - /release\/v.*/ - - github-release: - context: org-global - requires: - - release - filters: - branches: - only: - - main - - /release\/v.*/ - - publish-docker: - context: org-global - requires: - - build-local - - pr-tools/pr-title-check - ## Only do this check on PRs - # - test-dependencies - - test-lint - - test-unit - - test-coverage - - test-integration - - test-functional - - vulnerability-check - - audit-licenses - - license-scan - - image-scan - filters: - tags: - only: /v[0-9]+(\.[0-9]+)*/ - branches: - ignore: - - /.*/ - - publish-docker-snapshot: - context: org-global - requires: - - build-local - - pr-tools/pr-title-check - ## Only do this check on PRs - # - test-dependencies - - test-lint - - test-unit - - test-coverage - - test-integration - - test-functional - - vulnerability-check - - audit-licenses - - license-scan - - image-scan - filters: - tags: - only: /v[0-9]+(\.[0-9]+)*\-snapshot+((\.[0-9]+)?)/ - branches: - ignore: - - /.*/ - - publish-npm: - context: org-global - requires: - - pr-tools/pr-title-check - ## Only do this check on PRs - # - test-dependencies - - test-lint - - test-unit - - test-coverage - - test-integration - - test-functional - - vulnerability-check - - audit-licenses - - license-scan - - image-scan - filters: - tags: - only: /v[0-9]+(\.[0-9]+)*/ - branches: - ignore: - - /.*/ - - publish-npm-snapshot: - context: org-global - requires: - - pr-tools/pr-title-check - ## Only do this check on PRs - # - test-dependencies - - test-lint - - test-unit - - test-coverage - - test-integration - - test-functional - - vulnerability-check - - audit-licenses - - license-scan - - image-scan + - build/workflow: filters: tags: - only: /v[0-9]+(\.[0-9]+)*\-snapshot+((\.[0-9]+)?)/ - branches: - ignore: - - /.*/ + only: /v\d+(\.\d+){2}(-[a-zA-Z-][0-9a-zA-Z-]*\.\d+)?/ diff --git a/.ncurc.yaml b/.ncurc.yaml index 79ef9049b..c3fd0c385 100644 --- a/.ncurc.yaml +++ b/.ncurc.yaml @@ -9,5 +9,7 @@ reject: [ "get-port", # sinon v17.0.1 causes 58 tests to fail. This will need to be resolved in a future story. # Issue is tracked here: https://github.com/mojaloop/project/issues/3616 - "sinon" + "sinon", + # glob >= 11 requires node >= 20 + "glob" ] diff --git a/.nvmrc b/.nvmrc index 4a1f488b6..561a1e9a8 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.17.1 +18.20.3 diff --git a/.nycrc.yml b/.nycrc.yml index 0b43be976..7add54979 100644 --- a/.nycrc.yml +++ b/.nycrc.yml @@ -17,5 +17,20 @@ exclude: [ "**/node_modules/**", '**/migrations/**', '**/ddl/**', - '**/bulk*/**' + '**/bulk*/**', + 'src/shared/logger/**', + 'src/shared/loggingPlugin.js', + 'src/shared/constants.js', + 'src/domain/position/index.js', + 'src/domain/position/binProcessor.js', + 'src/handlers/positions/handler.js', + 'src/handlers/transfers/createRemittanceEntity.js', + 'src/handlers/transfers/FxFulfilService.js', + 'src/models/position/batch.js', + 'src/models/fxTransfer/**', + 'src/models/participant/externalParticipantCached.js', # todo: figure out why it shows only 50% coverage in Branch + 'src/models/transfer/facade.js', ## add more test coverage + 'src/shared/fspiopErrorFactory.js', + 'src/lib/proxyCache.js' # todo: remove this line after adding test coverage ] +## todo: increase test coverage before merging feat/fx-impl to main branch diff --git a/Dockerfile b/Dockerfile index d1207c0cd..b7cbc27aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,26 +3,27 @@ ARG NODE_VERSION=lts-alpine # NOTE: Ensure you set NODE_VERSION Build Argument as follows... # -# export NODE_VERSION="$(cat .nvmrc)-alpine" \ -# docker build \ -# --build-arg NODE_VERSION=$NODE_VERSION \ -# -t mojaloop/central-ledger:local \ -# . \ +# export NODE_VERSION="$(cat .nvmrc)-alpine" +# docker build \ +# --build-arg NODE_VERSION=$NODE_VERSION \ +# -t mojaloop/central-ledger:local \ +# . # # Build Image -FROM node:${NODE_VERSION} as builder +FROM node:${NODE_VERSION} AS builder WORKDIR /opt/app RUN apk --no-cache add git -RUN apk add --no-cache -t build-dependencies make gcc g++ 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 \ && npm install -g node-gyp COPY package.json package-lock.json* /opt/app/ RUN npm ci +RUN npm prune --omit=dev FROM node:${NODE_VERSION} WORKDIR /opt/app @@ -32,7 +33,7 @@ RUN mkdir ./logs && touch ./logs/combined.log RUN ln -sf /dev/stdout ./logs/combined.log # Create a non-root user: ml-user -RUN adduser -D ml-user +RUN adduser -D ml-user USER ml-user COPY --chown=ml-user --from=builder /opt/app . @@ -43,7 +44,5 @@ COPY migrations /opt/app/migrations COPY seeds /opt/app/seeds COPY test /opt/app/test -RUN npm prune --production - EXPOSE 3001 CMD ["npm", "run", "start"] diff --git a/README.md b/README.md index b38144ab2..3523eff6f 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ Or via docker build directly: ```bash docker build \ - --build-arg NODE_VERSION="$(cat .nvmrc)-alpine" \ + --build-arg NODE_VERSION="$(cat .nvmrc)-alpine3.19" \ -t mojaloop/ml-api-adapter:local \ . ``` @@ -113,12 +113,14 @@ NOTE: Only POSITION.PREPARE and POSITION.COMMIT is supported at this time, with Batch processing can be enabled in the transfer execution flow. Follow the steps below to enable batch processing for a more efficient transfer execution: +Note: The position messages with action 'FX_PREPARE', 'FX_COMMIT' and 'FX_TIMEOUT_RESERVED' are only supported in batch processing. + - **Step 1:** **Create a New Kafka Topic** Create a new Kafka topic named `topic-transfer-position-batch` to handle batch processing events. - **Step 2:** **Configure Action Type Mapping** - Point the prepare handler to the newly created topic for the action type `prepare` using the `KAFKA.EVENT_TYPE_ACTION_TOPIC_MAP` configuration as shown below: + Point the prepare handler to the newly created topic for the action types those are supported in batch processing using the `KAFKA.EVENT_TYPE_ACTION_TOPIC_MAP` configuration as shown below: ``` "KAFKA": { "EVENT_TYPE_ACTION_TOPIC_MAP" : { @@ -126,8 +128,12 @@ Batch processing can be enabled in the transfer execution flow. Follow the steps "PREPARE": "topic-transfer-position-batch", "BULK_PREPARE": "topic-transfer-position", "COMMIT": "topic-transfer-position-batch", + "FX_COMMIT": "topic-transfer-position-batch", "BULK_COMMIT": "topic-transfer-position", "RESERVE": "topic-transfer-position", + "FX_PREPARE": "topic-transfer-position-batch", + "TIMEOUT_RESERVED": "topic-transfer-position-batch", + "FX_TIMEOUT_RESERVED": "topic-transfer-position-batch" } } } @@ -185,7 +191,8 @@ If you want to run integration tests in a repetitive manner, you can startup the Start containers required for Integration Tests ```bash - docker-compose -f docker-compose.yml up -d mysql kafka init-kafka kafka-debug-console + source ./docker/env.sh + docker compose up -d mysql kafka init-kafka redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5 ``` Run wait script which will report once all required containers are up and running @@ -220,7 +227,8 @@ If you want to run integration tests in a repetitive manner, you can startup the Start containers required for Integration Tests, including a `central-ledger` container which will be used as a proxy shell. ```bash - docker-compose -f docker-compose.yml -f docker-compose.integration.yml up -d kafka mysql central-ledger + source ./docker/env.sh + docker-compose -f docker-compose.yml -f docker-compose.integration.yml up -d kafka mysql central-ledger init-kafka redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5 ``` Run the Integration Tests from the `central-ledger` container @@ -235,24 +243,42 @@ If you want to run override position topic tests you can repeat the above and us #### For running integration tests for batch processing interactively - Run dependecies -``` -docker-compose up -d mysql kafka init-kafka kafka-debug-console +```bash +source ./docker/env.sh +docker compose up -d mysql kafka init-kafka redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5 npm run wait-4-docker ``` - Run central-ledger services ``` nvm use npm run migrate -env "CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__PREPARE=topic-transfer-position-batch" npm start +export CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__PREPARE=topic-transfer-position-batch +export CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__COMMIT=topic-transfer-position-batch +export CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__RESERVE=topic-transfer-position-batch +export CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__TIMEOUT_RESERVED=topic-transfer-position-batch +export CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__FX_TIMEOUT_RESERVED=topic-transfer-position-batch +export CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__ABORT=topic-transfer-position-batch +export CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__FX_ABORT=topic-transfer-position-batch +npm start ``` - Additionally, run position batch handler in a new terminal ``` +nvm use export CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__PREPARE=topic-transfer-position-batch +export CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__FX_PREPARE=topic-transfer-position-batch export CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__COMMIT=topic-transfer-position-batch +export CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__TIMEOUT_RESERVED=topic-transfer-position-batch +export CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__FX_TIMEOUT_RESERVED=topic-transfer-position-batch +export CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__ABORT=topic-transfer-position-batch +export CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__FX_ABORT=topic-transfer-position-batch export CLEDG_HANDLERS__API__DISABLED=true node src/handlers/index.js handler --positionbatch ``` -- Run tests using `npx tape 'test/integration-override/**/handlerBatch.test.js'` +- Run tests using the following commands in a new terminal +``` +nvm use +npm run test:int-override +``` If you want to just run all of the integration suite non-interactively then use npm run `test:integration`. @@ -263,7 +289,11 @@ It will handle docker start up, migration, service starting and testing. Be sure If you want to run functional tests locally utilizing the [ml-core-test-harness](https://github.com/mojaloop/ml-core-test-harness), you can run the following commands: ```bash -docker build -t mojaloop/central-ledger:local . +export NODE_VERSION="$(cat .nvmrc)-alpine" +docker build \ + --build-arg NODE_VERSION=$NODE_VERSION \ + -t mojaloop/central-ledger:local \ + . ``` ```bash diff --git a/audit-ci.jsonc b/audit-ci.jsonc index a6d37cc53..c75bb449a 100644 --- a/audit-ci.jsonc +++ b/audit-ci.jsonc @@ -4,6 +4,20 @@ // Only use one of ["low": true, "moderate": true, "high": true, "critical": true] "moderate": true, "allowlist": [ // NOTE: Please add as much information as possible to any items added to the allowList - "GHSA-w5p7-h5w8-2hfq" // tap-spec>tap-out>trim; This has been analyzed and this is acceptable as it is used to run tests. + "GHSA-w5p7-h5w8-2hfq", // tap-spec>tap-out>trim; This has been analyzed and this is acceptable as it is used to run tests. + "GHSA-2mvq-xp48-4c77", // https://github.com/advisories/GHSA-2mvq-xp48-4c77 + "GHSA-5854-jvxx-2cg9", // https://github.com/advisories/GHSA-5854-jvxx-2cg9 + "GHSA-7hx8-2rxv-66xv", // https://github.com/advisories/GHSA-7hx8-2rxv-66xv + "GHSA-c429-5p7v-vgjp", // https://github.com/advisories/GHSA-c429-5p7v-vgjp + "GHSA-g64q-3vg8-8f93", // https://github.com/advisories/GHSA-g64q-3vg8-8f93 + "GHSA-mg85-8mv5-ffjr", // https://github.com/advisories/GHSA-mg85-8mv5-ffjr + "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-9wv6-86v2-598j", // https://github.com/advisories/GHSA-9wv6-86v2-598j + "GHSA-qwcr-r2fm-qrc7", // https://github.com/advisories/GHSA-qwcr-r2fm-qrc7 + "GHSA-cm22-4g7w-348p", // https://github.com/advisories/GHSA-cm22-4g7w-348p + "GHSA-m6fv-jmcg-4jfg", // https://github.com/advisories/GHSA-m6fv-jmcg-4jfg + "GHSA-qw6h-vgh9-j6wx", // https://github.com/advisories/GHSA-qw6h-vgh9-j6wx + "GHSA-3xgq-45jj-v275" // High vulnerability https://github.com/advisories/GHSA-3xgq-45jj-v275 ignoring for now since devDependency ] -} \ No newline at end of file +} diff --git a/config/default.json b/config/default.json index a244a7b1f..fae0711ea 100644 --- a/config/default.json +++ b/config/default.json @@ -78,20 +78,36 @@ }, "INTERNAL_TRANSFER_VALIDITY_SECONDS": "432000", "ENABLE_ON_US_TRANSFERS": false, + "PAYEE_PARTICIPANT_CURRENCY_VALIDATION_ENABLED": false, "CACHE": { "CACHE_ENABLED": false, "MAX_BYTE_SIZE": 10000000, "EXPIRES_IN_MS": 1000 }, + "PROXY_CACHE": { + "enabled": true, + "type": "redis-cluster", + "proxyConfig": { + "cluster": [ + { "host": "localhost", "port": 6379 } + ] + } + }, "API_DOC_ENDPOINTS_ENABLED": true, "KAFKA": { "EVENT_TYPE_ACTION_TOPIC_MAP" : { "POSITION":{ "PREPARE": null, + "FX_PREPARE": "topic-transfer-position-batch", "BULK_PREPARE": null, "COMMIT": null, "BULK_COMMIT": null, - "RESERVE": null + "RESERVE": null, + "FX_RESERVE": "topic-transfer-position-batch", + "TIMEOUT_RESERVED": null, + "FX_TIMEOUT_RESERVED": "topic-transfer-position-batch", + "ABORT": null, + "FX_ABORT": "topic-transfer-position-batch" } }, "TOPIC_TEMPLATES": { diff --git a/docker-compose.yml b/docker-compose.yml index 89c1c33ae..1ed34ac16 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,22 @@ -version: "3.7" - networks: cl-mojaloop-net: name: cl-mojaloop-net + +# @see https://uninterrupted.tech/blog/hassle-free-redis-cluster-deployment-using-docker/ +x-redis-node: &REDIS_NODE + image: docker.io/bitnami/redis-cluster:6.2.14 + environment: &REDIS_ENVS + ALLOW_EMPTY_PASSWORD: yes + REDIS_CLUSTER_DYNAMIC_IPS: no + REDIS_CLUSTER_ANNOUNCE_IP: ${REDIS_CLUSTER_ANNOUNCE_IP} + REDIS_NODES: redis-node-0:6379 redis-node-1:9301 redis-node-2:9302 redis-node-3:9303 redis-node-4:9304 redis-node-5:9305 + healthcheck: + test: [ "CMD", "redis-cli", "ping" ] + timeout: 2s + networks: + - cl-mojaloop-net + services: central-ledger: image: mojaloop/central-ledger:local @@ -31,10 +44,14 @@ services: - CLEDG_MONGODB__DISABLED=false networks: - cl-mojaloop-net + extra_hosts: + - "redis-node-0:host-gateway" depends_on: - mysql - kafka - objstore + - redis-node-0 + # - redis healthcheck: test: ["CMD", "sh", "-c" ,"apk --no-cache add curl", "&&", "curl", "http://localhost:3001/health"] timeout: 20s @@ -94,6 +111,77 @@ services: retries: 10 start_period: 40s interval: 30s + + redis-node-0: + <<: *REDIS_NODE + environment: + <<: *REDIS_ENVS + REDIS_CLUSTER_CREATOR: yes + REDIS_PORT_NUMBER: 6379 + depends_on: + - redis-node-1 + - redis-node-2 + ports: + - "6379:6379" + - "16379:16379" + redis-node-1: + <<: *REDIS_NODE + environment: + <<: *REDIS_ENVS + REDIS_PORT_NUMBER: 9301 + ports: + - "9301:9301" + - "19301:19301" + redis-node-2: + <<: *REDIS_NODE + environment: + <<: *REDIS_ENVS + REDIS_PORT_NUMBER: 9302 + ports: + - "9302:9302" + - "19302:19302" + redis-node-3: + <<: *REDIS_NODE + environment: + <<: *REDIS_ENVS + REDIS_PORT_NUMBER: 9303 + ports: + - "9303:9303" + - "19303:19303" + redis-node-4: + <<: *REDIS_NODE + environment: + <<: *REDIS_ENVS + REDIS_PORT_NUMBER: 9304 + ports: + - "9304:9304" + - "19304:19304" + redis-node-5: + <<: *REDIS_NODE + environment: + <<: *REDIS_ENVS + REDIS_PORT_NUMBER: 9305 + ports: + - "9305:9305" + - "19305:19305" + +## To be used with proxyCache.type === 'redis' +# redis: +# image: redis:6.2.4-alpine +# restart: "unless-stopped" +# environment: +# <<: *REDIS_ENVS +# REDIS_CLUSTER_CREATOR: yes +# depends_on: +# - redis-node-1 +# - redis-node-2 +# - redis-node-3 +# - redis-node-4 +# - redis-node-5 +# ports: +# - "6379:6379" +# networks: +# - cl-mojaloop-net mockserver: image: jamesdbloom/mockserver diff --git a/docker/central-ledger/default.json b/docker/central-ledger/default.json index 5571f464a..a8b233332 100644 --- a/docker/central-ledger/default.json +++ b/docker/central-ledger/default.json @@ -82,6 +82,15 @@ "MAX_BYTE_SIZE": 10000000, "EXPIRES_IN_MS": 1000 }, + "PROXY_CACHE": { + "enabled": true, + "type": "redis-cluster", + "proxyConfig": { + "cluster": [ + { "host": "redis-node-0", "port": 6379 } + ] + } + }, "KAFKA": { "TOPIC_TEMPLATES": { "PARTICIPANT_TOPIC_TEMPLATE": { diff --git a/docker/config-modifier/configs/central-ledger.js b/docker/config-modifier/configs/central-ledger.js index 904c98ba8..902498719 100644 --- a/docker/config-modifier/configs/central-ledger.js +++ b/docker/config-modifier/configs/central-ledger.js @@ -12,7 +12,25 @@ module.exports = { PASSWORD: '', DATABASE: 'mlos' }, + PROXY_CACHE: { + enabled: true, + type: 'redis', + proxyConfig: { + cluster: undefined, + host: 'redis', + port: 6379 + } + }, KAFKA: { + EVENT_TYPE_ACTION_TOPIC_MAP: { + POSITION: { + PREPARE: 'topic-transfer-position-batch', + BULK_PREPARE: null, + COMMIT: 'topic-transfer-position-batch', + BULK_COMMIT: null, + RESERVE: 'topic-transfer-position-batch' + } + }, CONSUMER: { BULK: { PREPARE: { @@ -72,6 +90,13 @@ module.exports = { 'metadata.broker.list': 'kafka:29092' } } + }, + POSITION_BATCH: { + config: { + rdkafkaConf: { + 'metadata.broker.list': 'kafka:29092' + } + } } }, ADMIN: { diff --git a/docker/env.sh b/docker/env.sh new file mode 100755 index 000000000..d3e0da0e4 --- /dev/null +++ b/docker/env.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# Retrieve the external IP address of the host machine (on macOS) +# or the IP address of the docker0 interface (on Linux) +get_external_ip() { + if [ "$(uname)" = "Linux" ]; then + echo "$(ip addr show docker0 | grep 'inet ' | awk '{print $2}' | cut -d/ -f1)" + else + # Need to find a way to support Windows here + echo "$(route get ifconfig.me | grep interface | sed -e 's/.*: //' | xargs ipconfig getifaddr)" + fi +} + +# set/override dynamic variables +export REDIS_CLUSTER_ANNOUNCE_IP=$(get_external_ip) diff --git a/docker/kafka/scripts/provision.sh b/docker/kafka/scripts/provision.sh index 14a08c2aa..41485addc 100644 --- a/docker/kafka/scripts/provision.sh +++ b/docker/kafka/scripts/provision.sh @@ -25,8 +25,11 @@ topics=( "topic-bulk-prepare" "topic-bulk-fulfil" "topic-bulk-processing" - "topic-bulk-get", + "topic-bulk-get" "topic-transfer-position-batch" + "topic-fx-quotes-post" + "topic-fx-quotes-put" + "topic-fx-quotes-get" ) # Loop through the topics and create them using kafka-topics.sh diff --git a/docker/ml-api-adapter/default.json b/docker/ml-api-adapter/default.json index e701c2891..d58b20fce 100644 --- a/docker/ml-api-adapter/default.json +++ b/docker/ml-api-adapter/default.json @@ -1,4 +1,8 @@ { + "HUB_PARTICIPANT": { + "ID": 1, + "NAME": "Hub" + }, "PORT": 3000, "HOSTNAME": "http://ml-api-adapter", "ENDPOINT_SOURCE_URL": "http://host.docker.internal:3001", @@ -13,7 +17,6 @@ }, "JWS": { "JWS_SIGN": false, - "FSPIOP_SOURCE_TO_SIGN": "switch", "JWS_SIGNING_KEY_PATH": "secrets/jwsSigningKey.key" } }, diff --git a/documentation/db/erd-transfer-timeout.png b/documentation/db/erd-transfer-timeout.png new file mode 100644 index 000000000..b8da0b8c7 Binary files /dev/null and b/documentation/db/erd-transfer-timeout.png differ diff --git a/documentation/db/erd-transfer-timeout.txt b/documentation/db/erd-transfer-timeout.txt new file mode 100644 index 000000000..ee441981f --- /dev/null +++ b/documentation/db/erd-transfer-timeout.txt @@ -0,0 +1,81 @@ +# Visualize on https://erd.surge.sh +# or https://quick-erd.surge.sh +# +# Relationship Types +# - - one to one +# -< - one to many +# >- - many to one +# >-< - many to many +# -0 - one to zero or one +# 0- - zero or one to one +# 0-0 - zero or one to zero or one +# -0< - one to zero or many +# >0- - zero or many to one +# +//////////////////////////////////// + +transfer +--------------------- +transferId varchar(36) PK +amount decimal(18,4) +currencyId varchar(3) FK - currency.currencyId +ilpCondition varchar(256) +expirationDate datetime +createdDate datetime + + +transferStateChange__TSC +--------------------- +transferStateChangeId bigint UN AI PK +transferId varchar(36) FK >- transfer.transferId +transferStateId varchar(50) FK - transferState.transferStateId +reason varchar(512) +createdDate datetime + + +transferTimeout__TT +--------------------- +transferTimeoutId bigint UN AI PK +transferId varchar(36) UNIQUE FK - transfer.transferId +expirationDate datetime +createdDate datetime + + +transferError__TE +--------------------- +transferId varchar(36) PK +transferStateChangeId bigint UN FK - transferStateChange.transferStateChangeId +errorCode int UN +errorDescription varchar(128) +createdDate datetime + + +segment +--------------------- +segmentId int UN AI PK +segmentType varchar(50) +enumeration int +tableName varchar(50) +value bigint +changedDate datetime +# row example: 1, 'timeout', 0, 'transferStateChange', 255, '2024-04-24 18:07:15' + + +expiringTransfer +--------------------- +expiringTransferId bigint UN AI PK +transferId varchar(36) UNIQUE FK - transfer.transferId +expirationDate datetime INDEX +createdDate datetime +# todo: clarify, how we use this table + + + +# transfer (557, 340) +# segment (348, 608) +# expiringTransfer (1033, 574) +# view: (5, -16) +# zoom: 1.089 +# transferStateChange__TSC (38, 236) +# transferTimeout__TT (974, 204) +# transferError__TE (518, 34) diff --git a/documentation/fx-implementation/README.md b/documentation/fx-implementation/README.md new file mode 100644 index 000000000..299fe740c --- /dev/null +++ b/documentation/fx-implementation/README.md @@ -0,0 +1,48 @@ +# FX Implementation + +## Implementation for Payer-Side Currency Conversion (Happy Path Only) + +We have developed functionality for foreign exchange (FX) transfer focusing on a specific scenario: Payer-side currency conversion. + +### Testing using ml-core-test-harness + +![Test Scenario](./assets/test-scenario.drawio.svg) + +To test the functionality, you can utilize [mojaloop/ml-core-test-harness](https://github.com/mojaloop/ml-core-test-harness): + +1. Clone the repository: + ``` + git clone https://github.com/mojaloop/ml-core-test-harness.git + ``` +2. Checkout to the branch `feat/fx-impl`: + ``` + git checkout feat/fx-impl + ``` +3. Run the services: + ``` + docker-compose --profile all-services --profile ttk-provisioning --profile ttk-tests --profile debug up -d + ``` +4. Open the testing toolkit web UI at `http://localhost:9660`. +5. Navigate to `Test Runner`, click on `Collection Manager`, and import the folder `docker/ml-testing-toolkit/test-cases/collections`. +6. Select the file `fxp/payer_conversion.json`. +7. Run the test case by clicking on the `Run` button. +8. Verify that all tests have passed. +9. Observe the sequence of requests and responses in each item of the test case. +10. Open the last item, `Get Accounts for FXP AFTER transfer`, and go to `Scripts->Console Logs` to observe the position movements of different participant accounts, as shown below: + ``` + "Payer Position BWP : 0 -> 300 (300)" + + "Payee Position TZS : 0 -> -48000 (-48000)" + + "FXP Source Currency BWP : 0 -> -300 (-300)" + + "FXP Target Currency TZS : 0 -> 48000 (48000)" + ``` + +### Implementation + +The implementation follows the information available in the repository [mojaloop/currency-conversion](https://github.com/mojaloop/currency-conversion). + +The flow diagram below illustrates the transfer with payer-side currency conversion: + +![FX Position Movements](./assets/fx-position-movements.drawio.svg) diff --git a/documentation/fx-implementation/assets/fx-position-movements.drawio.svg b/documentation/fx-implementation/assets/fx-position-movements.drawio.svg new file mode 100644 index 000000000..cd09ab325 --- /dev/null +++ b/documentation/fx-implementation/assets/fx-position-movements.drawio.svg @@ -0,0 +1,4 @@ + + + +
Prepare Handler
Prepare Handler
topic-transfer-prepare
topic-transfer-prepare
ML API Adapter
ML API Adapter
1. POST /FxTransfers
1. POST /FxTransfers
4. POST /transfers
4. POST /transfers
2. fx-prepare
2. fx-prep...
topic-transfer-position
topic-transfer-position
3. fx-prepare
3. fx-prepare
Position Handler
Position Handler
topic-notification-event
topic-notification-event
FXP
FXP
Payee
Payee
Payer
Payer
Payer
Payer
Fulfil Handler
Fulfil Handler
5. prepare
5. prepare
6. prepare
6. prepare
topic-transfer-fulfil
topic-transfer-fulfil
7. fulfil
7. fulfil
8. commit
8. commit
Position Handler
Position Handler
9. commit
9. commit
FXP Target
FXP Target
Payee
Payee
FXP Source
FXP SourceText is not SVG - cannot display \ No newline at end of file diff --git a/documentation/fx-implementation/assets/test-scenario.drawio.svg b/documentation/fx-implementation/assets/test-scenario.drawio.svg new file mode 100644 index 000000000..4cb969e4e --- /dev/null +++ b/documentation/fx-implementation/assets/test-scenario.drawio.svg @@ -0,0 +1,4 @@ + + + +
ML Switch
ML Switch
TTK
(Payer)
TTK...
1. POST /fxTransfer
1. POST /fxTransfer
3. PUT /fxTransfer
3. PUT /fxTransfer
5. POST /transfer
5. POST /transfer
TTK
(FXP)
TTK...
TTK
(Payee)
TTK...
4. PUT /fxTransfer
4. PUT /fxTransfer
7. PUT /transfer
7. PUT /transfer
8. PUT /transfer
8. PUT /transfer
2. POST /fxTransfer
2. POST /fxTransfer
Payer position
Payer position
ML Core Test Harness
ML Core Test Harness
FXP Target Position
FXP Target Posi...
6. POST /transfer
6. POST /transfer
Payee Position
Payee Position
FXP Source Position
FXP Source Posi...Text is not SVG - cannot display \ No newline at end of file diff --git a/documentation/sequence-diagrams/Handler - FX timeout.plantuml b/documentation/sequence-diagrams/Handler - FX timeout.plantuml new file mode 100644 index 000000000..0cb2f3e97 --- /dev/null +++ b/documentation/sequence-diagrams/Handler - FX timeout.plantuml @@ -0,0 +1,123 @@ +@startuml +title Transfer/ FX transfer Timeout-Handler Flow + +autonumber +hide footbox +skinparam ParticipantPadding 10 + +box "Central Services" #MistyRose +participant "Timeout \n handler (cron)" as toh +participant "Position \n handler" as ph +database "central-ledger\nDB" as clDb +end box +box Kafka +queue "topic-\n transfer-position" as topicTP +queue "topic-\n notification-event" as topicNE +end box +box "ML API Adapter Services" #LightBlue +participant "Notification \n handler" as nh +end box +participant "FXP" as fxp +actor "DFSP_1 \nPayer" as payer +actor "DFSP_2 \nPayee" as payee + +legend +DB tables: + +TT - transferTimeout fxTT - fxTransferTimeout +TSC - transferStateChange fxTSC - fxTransferStateChange +TE - transferError fxTE - fxTransferError +end legend + + +autonumber 1 +toh --> toh : run on cronTime\n HANDLERS_TIMEOUT_TIMEXP (default: 15sec) +activate toh +toh -> clDb : cleanup TT for transfers in particular states: \n [COMMITTED, ABORTED, RECEIVED_FULFIL, RECEIVED_REJECT, RESERVED_TIMEOUT] + +toh -> clDb : Insert (transferId, expirationDate) into TT for transfers in particular states:\n [RECEIVED_PREPARE, RESERVED] +toh -> clDb : Insert EXPIRED_PREPARED state into TSC for transfers in RECEIVED_PREPARE states +toh -> clDb : Insert RESERVED_TIMEOUT state into TSC for transfers in RESERVED state +toh -> clDb : Insert expired error info into TE + +toh -> clDb : get expired transfers details from TT + +toh --> toh : for each expired transfer +activate toh +autonumber 8.1 +alt state === EXPIRED_PREPARED +toh ->o topicNE : produce notification timeout-received message +else state === RESERVED_TIMEOUT +toh ->o topicTP : produce position timeout-reserved message +end +toh -> clDb : find related fxTransfer using cyril and check if it's NOT expeired yet +alt related NOT expired fxTransfer found +toh -> clDb : Upsert row with (fxTransferId, expirationDate) into fxTT +note right: expirationDate === transfer.expirationDate \n OR now? +alt fxState === RESERVED or RECEIVED_FULFIL_DEPENDENT +toh -> clDb : Update fxState to RESERVED_TIMEOUT into fxTSC +toh ->o topicTP : produce position fx-timeout-reserved message +else fxState === RECEIVED_PREPARE +toh -> clDb : Update fxState to EXPIRED_PREPARED into fxTSC +toh ->o topicNE : produce notification fx-timeout-received message +end +end +deactivate toh +deactivate toh + +autonumber 9 +toh --> toh : run fxTimeout logic on cronTime\n HANDLERS_TIMEOUT_TIMEXP (default: 15sec) +activate toh +toh -> clDb : cleanup fxTT for fxTransfers in particular states: \n [COMMITTED, ABORTED, RECEIVED_FULFIL_DEPENDENT, RECEIVED_REJECT, RESERVED_TIMEOUT] + +toh -> clDb : Insert (fxTransferId, expirationDate) into fxTT for fxTransfers in particular states:\n [RECEIVED_PREPARE, RESERVED] +toh -> clDb : Insert EXPIRED_PREPARED state into fxTSC for fxTransfers in RECEIVED_PREPARE states +toh -> clDb : Insert RESERVED_TIMEOUT state into fxTSC for fxTransfers in RESERVED state +toh -> clDb : Insert expired error info into fxTE + +toh -> clDb : get expired fxTransfers details from fxTT + +toh --> toh : for each expired fxTransfer +activate toh +autonumber 16.1 +alt state === EXPIRED_PREPARED +toh ->o topicNE : produce notification fx-timeout-received message +else state === RESERVED_TIMEOUT +toh ->o topicTP : produce position fx-timeout-reserved message +end +toh -> clDb : find related transfer using cyril and check it's NOT expired yet +note right: think, what if related transfer is already commited? +alt related NOT expired transfer found +toh -> clDb : Upsert (transferId, expirationDate) into TT +toh -> clDb : Insert expired error info into TE +alt state === RECEIVED_PREPARE +toh -> clDb : Insert EXPIRED_PREPARED state into TSC with reason "related fxTransfer expired" +toh ->o topicNE : produce notification timeout-received message +else state === RESERVED +toh -> clDb : Insert RESERVED_TIMEOUT state into TSC with reason "related fxTransfer expired" +toh ->o topicTP : produce position timeout-reserved message +end +end + +deactivate toh +deactivate toh + +autonumber 17 +topicNE o-> nh : consume notification\n message +activate nh +nh -> payer : send error notification\n callback to payer +deactivate nh + +topicTP o-> ph : consume position timeout/fx-timeout\n message +activate ph +ph --> ph : process timeout / fx-timeout transfer +ph ->o topicNE : produce notification timeout / fx-timeout messages + +deactivate ph + +topicNE o-> nh : consume notification\n message +activate nh +nh -> payee : send error notification\n callback to payee +deactivate nh + +@enduml diff --git a/documentation/sequence-diagrams/Handler - FX timeout.png b/documentation/sequence-diagrams/Handler - FX timeout.png new file mode 100644 index 000000000..0074d43a5 Binary files /dev/null and b/documentation/sequence-diagrams/Handler - FX timeout.png differ diff --git a/documentation/sequence-diagrams/Handler - timeout.plantuml b/documentation/sequence-diagrams/Handler - timeout.plantuml new file mode 100644 index 000000000..3042a1540 --- /dev/null +++ b/documentation/sequence-diagrams/Handler - timeout.plantuml @@ -0,0 +1,81 @@ +@startuml +title Transfer Timeout-Handler Flow \n(current impl.) + +autonumber +hide footbox +skinparam ParticipantPadding 10 + +box "Central Services" #MistyRose +participant "Timeout \n handler (cron)" as toh +participant "Position \n handler" as ph +database "central-ledger\nDB" as clDb +end box +box Kafka +queue "topic-\n transfer-position" as topicTP +queue "topic-\n notification-event" as topicNE +end box +box "ML API Adapter Services" #LightBlue +participant "Notification \n handler" as nh +end box +actor "DFSP_1 \nPayer" as payer +actor "DFSP_2 \nPayee" as payee + +toh --> toh : run on cronTime\n HANDLERS_TIMEOUT_TIMEXP +activate toh +toh --> toh : cleanup transferTimeout (TT) +note right : TT innerJoin TSC\n where TSC.transferStateId in [...] +activate toh +autonumber 2.1 +toh -> clDb : delete from TT by ttIdList +note right : table: TT (transferTimeout) +deactivate toh + +autonumber 3 +toh -> clDb : get segmentId, intervalMin, intervalMax +note right : tables:\n segment,\n TSC (transferStateChange) + +toh --> toh : update timeoutExpireReserved and get expiredTransfers +activate toh +autonumber 6.1 +toh -> clDb : Insert expirationDate into TT\n for transfers in [intervalMin, ... intervalMax] +note right : table: TT +toh -> clDb : Insert EXPIRED_PREPARED into TSC for RECEIVED_PREPARE state +note right : table: TSC +toh -> clDb : Insert RESERVED_TIMEOUT into TSC for RESERVED state +note right : table: TSC +toh -> clDb : Insert error info into transferError (TE) +note right : table: TE +toh -> clDb : get expired transfers details from TT +note right : TT innerJoin other tables +deactivate toh + +autonumber 7 +toh --> toh : for each expiredTransfer +activate toh +alt state === EXPIRED_PREPARED +autonumber 7.1 +toh ->o topicNE : produce notification timeout-received message +else state === RESERVED_TIMEOUT +autonumber 7.1 +toh ->o topicTP : produce position timeout-reserved message +end +deactivate toh +deactivate toh + +autonumber 8 +topicNE o-> nh : consume notification\n message +activate nh +nh -> payer : send notification\n callback to payer +deactivate nh + +topicTP o-> ph : consume position timeout\n message +activate ph +ph --> ph : process position timeout +ph ->o topicNE +deactivate ph +topicNE o-> nh : consume notification\n message +activate nh +nh -> payee : send notification\n callback to payee +deactivate nh + +@enduml diff --git a/documentation/sequence-diagrams/Handler - timeout.png b/documentation/sequence-diagrams/Handler - timeout.png new file mode 100644 index 000000000..eb43611b4 Binary files /dev/null and b/documentation/sequence-diagrams/Handler - timeout.png differ diff --git a/documentation/state-diagrams/transfer-ML-spec-states-diagram.png b/documentation/state-diagrams/transfer-ML-spec-states-diagram.png new file mode 100644 index 000000000..2313c91cc Binary files /dev/null and b/documentation/state-diagrams/transfer-ML-spec-states-diagram.png differ diff --git a/documentation/state-diagrams/transfer-internal-states-diagram.png b/documentation/state-diagrams/transfer-internal-states-diagram.png new file mode 100644 index 000000000..d2d7b3245 Binary files /dev/null and b/documentation/state-diagrams/transfer-internal-states-diagram.png differ diff --git a/documentation/state-diagrams/transfer-internal-states.plantuml b/documentation/state-diagrams/transfer-internal-states.plantuml new file mode 100644 index 000000000..5636e94d1 --- /dev/null +++ b/documentation/state-diagrams/transfer-internal-states.plantuml @@ -0,0 +1,74 @@ +@startuml + +state RECEIVED { + state RECEIVED_PREPARE { + } +} + +state RESERVED_ { + state RESERVED { + } + state RESERVED_FORWARDED { + } + state RECEIVED_FULFIL { + } + state RECEIVED_FULFIL_DEPENDENT { + } + state RESERVED_TIMEOUT { + } + state RECEIVED_REJECT { + } + state RECEIVED_ERROR { + } +} + +state COMMITTED { +} + +state ABORTED { + state ABORTED_ERROR { + } + state ABORTED_REJECTED { + } + state EXPIRED_PREPARED { + } + state EXPIRED_RESERVED { + } + state FAILED { + } + state INVALID { + } +} + +RECEIVED_FULFIL_DEPENDENT : only FX-transfer +RECEIVED_FULFIL : only transfer + +[*] --> RECEIVED_PREPARE : Transfer Prepare Request [Prepare handler] \n (validation & dupl.check passed) +[*] --> INVALID : Validation failed \n [Prepare handler] +RECEIVED_PREPARE --> RESERVED : [Position handler]: Liquidity check passed, \n funds reserved +RESERVED --> RECEIVED_REJECT : Reject callback from Payee with status "ABORTED" + +RECEIVED_FULFIL --> COMMITTED : Transfer committed [Position handler] \n (commit funds, assign T. to settlement window) +RECEIVED_REJECT --> ABORTED_REJECTED : Transfer Aborted by Payee +RECEIVED_ERROR --> ABORTED_ERROR : Hub aborts T. +RECEIVED_PREPARE --> EXPIRED_PREPARED : Timeout handler \n detects T. being EXPIRED + +RESERVED --> RECEIVED_FULFIL : Fulfil callback from Payee \n with status "COMMITTED" \n [Fulfil handler]: \n fulfilment check passed +RESERVED --> RECEIVED_ERROR : Fulfil callback from Payee fails validation\n [Fulfil handler] +RESERVED --> RECEIVED_FULFIL_DEPENDENT : Recieved FX transfer fulfilment +RESERVED --> RESERVED_FORWARDED : A Proxy participant has acknowledged the transfer to be forwarded +RESERVED --> RESERVED_TIMEOUT : Timeout handler + +RESERVED_FORWARDED --> RECEIVED_FULFIL : Fulfil callback from Payee \n with status "COMMITTED" \n [Fulfil handler]: \n fulfilment check passed +RESERVED_FORWARDED --> RECEIVED_ERROR : Fulfil callback from Payee fails validation\n [Fulfil handler] +RESERVED_FORWARDED --> RECEIVED_FULFIL_DEPENDENT : Recieved FX transfer fulfilment + +RECEIVED_FULFIL_DEPENDENT --> COMMITTED : Dependant transfer committed [Position handler] \n (commit funds, assign T. to settlement window) +RECEIVED_FULFIL_DEPENDENT --> RESERVED_TIMEOUT : Dependant transfer is timed out + +RESERVED_TIMEOUT --> EXPIRED_RESERVED : Hub aborts T. due to being EXPIRED + +COMMITTED --> [*] +ABORTED --> [*] + +@enduml diff --git a/documentation/state-diagrams/transfer-states.plantuml b/documentation/state-diagrams/transfer-states.plantuml new file mode 100644 index 000000000..d945d1506 --- /dev/null +++ b/documentation/state-diagrams/transfer-states.plantuml @@ -0,0 +1,13 @@ +@startuml +hide empty description + +[*] --> RECEIVED : Transfer Prepare Request +RECEIVED --> RESERVED : Net debit cap limit check passed +RECEIVED --> ABORTED : Failed validation OR timeout +RESERVED --> ABORTED : Abort response from Payee +RESERVED --> COMMITTED : Fulfil Response from Payee + +COMMITTED --> [*] +ABORTED --> [*] + +@enduml diff --git a/migrations/310204_transferParticipant-participantId.js b/migrations/310204_transferParticipant-participantId.js new file mode 100644 index 000000000..fee87e99f --- /dev/null +++ b/migrations/310204_transferParticipant-participantId.js @@ -0,0 +1,52 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Infitx + - Vijaya Kumar Guthi + -------------- + ******/ + +'use strict' + +exports.up = async (knex) => { + return await knex.schema.hasTable('transferParticipant').then(function(exists) { + if (exists) { + return knex.schema.alterTable('transferParticipant', (t) => { + t.integer('participantId').unsigned().notNullable() + // Disabling this as its throwing error while running the migration with existing data in the table + // t.foreign('participantId').references('participantId').inTable('participant') + t.index('participantId') + t.integer('participantCurrencyId').unsigned().nullable().alter() + }) + } + }) +} + +exports.down = async (knex) => { + return await knex.schema.hasTable('transferParticipant').then(function(exists) { + if (exists) { + return knex.schema.alterTable('transferParticipant', (t) => { + t.dropIndex('participantId') + t.dropColumn('participantId') + t.integer('participantCurrencyId').unsigned().notNullable().alter() + }) + } + }) +} diff --git a/migrations/310403_participantPositionChange-participantCurrencyId.js b/migrations/310403_participantPositionChange-participantCurrencyId.js new file mode 100644 index 000000000..e25a9ffd1 --- /dev/null +++ b/migrations/310403_participantPositionChange-participantCurrencyId.js @@ -0,0 +1,47 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * ModusBox + - Vijaya Kumar Guthi + -------------- + ******/ + +'use strict' + +exports.up = async (knex) => { + return await knex.schema.hasTable('participantPositionChange').then(function(exists) { + if (exists) { + return knex.schema.alterTable('participantPositionChange', (t) => { + t.integer('participantCurrencyId').unsigned().notNullable() + t.foreign('participantCurrencyId').references('participantCurrencyId').inTable('participantCurrency') + }) + } + }) +} + +exports.down = async (knex) => { + return await knex.schema.hasTable('participantPositionChange').then(function(exists) { + if (exists) { + return knex.schema.alterTable('participantPositionChange', (t) => { + t.dropColumn('participantCurrencyId') + }) + } + }) +} diff --git a/migrations/310404_participantPositionChange-change.js b/migrations/310404_participantPositionChange-change.js new file mode 100644 index 000000000..81632f9e3 --- /dev/null +++ b/migrations/310404_participantPositionChange-change.js @@ -0,0 +1,46 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * ModusBox + - Vijaya Kumar Guthi + -------------- + ******/ + +'use strict' + +exports.up = async (knex) => { + return await knex.schema.hasTable('participantPositionChange').then(function(exists) { + if (exists) { + return knex.schema.alterTable('participantPositionChange', (t) => { + t.decimal('change', 18, 2).notNullable() + }) + } + }) +} + +exports.down = async (knex) => { + return await knex.schema.hasTable('participantPositionChange').then(function(exists) { + if (exists) { + return knex.schema.alterTable('participantPositionChange', (t) => { + t.dropColumn('change') + }) + } + }) +} diff --git a/migrations/600010_fxTransferType.js b/migrations/600010_fxTransferType.js new file mode 100644 index 000000000..767667df9 --- /dev/null +++ b/migrations/600010_fxTransferType.js @@ -0,0 +1,43 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + -------------- + ******/ + +'use strict' + +exports.up = async (knex) => { + return await knex.schema.hasTable('fxTransferType').then(function(exists) { + if (!exists) { + return knex.schema.createTable('fxTransferType', (t) => { + t.increments('fxTransferTypeId').primary().notNullable() + t.string('name', 50).notNullable() + t.string('description', 512).defaultTo(null).nullable() + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable() + }) + } + }) +} + +exports.down = function (knex) { + return knex.schema.dropTableIfExists('fxParticipantCurrencyType') +} diff --git a/migrations/600011_fxTransferType-indexes.js b/migrations/600011_fxTransferType-indexes.js new file mode 100644 index 000000000..9d7cbabab --- /dev/null +++ b/migrations/600011_fxTransferType-indexes.js @@ -0,0 +1,38 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + -------------- + ******/ + +'use strict' + +exports.up = function (knex) { + return knex.schema.table('fxTransferType', (t) => { + t.unique('name') + }) +} + +exports.down = function (knex) { + return knex.schema.table('fxTransferType', (t) => { + t.dropUnique('name') + }) +} diff --git a/migrations/600012_fxParticipantCurrencyType.js b/migrations/600012_fxParticipantCurrencyType.js new file mode 100644 index 000000000..1efd6bf52 --- /dev/null +++ b/migrations/600012_fxParticipantCurrencyType.js @@ -0,0 +1,43 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + -------------- + ******/ + +'use strict' + +exports.up = async (knex) => { + return await knex.schema.hasTable('fxParticipantCurrencyType').then(function(exists) { + if (!exists) { + return knex.schema.createTable('fxParticipantCurrencyType', (t) => { + t.increments('fxParticipantCurrencyTypeId').primary().notNullable() + t.string('name', 50).notNullable() + t.string('description', 512).defaultTo(null).nullable() + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable() + }) + } + }) +} + +exports.down = function (knex) { + return knex.schema.dropTableIfExists('fxParticipantCurrencyType') +} diff --git a/migrations/600013_fxParticipantCurrencyType-indexes.js b/migrations/600013_fxParticipantCurrencyType-indexes.js new file mode 100644 index 000000000..c77743674 --- /dev/null +++ b/migrations/600013_fxParticipantCurrencyType-indexes.js @@ -0,0 +1,38 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + -------------- + ******/ + +'use strict' + +exports.up = function (knex) { + return knex.schema.table('fxParticipantCurrencyType', (t) => { + t.unique('name') + }) +} + +exports.down = function (knex) { + return knex.schema.table('fxParticipantCurrencyType', (t) => { + t.dropUnique('name') + }) +} diff --git a/migrations/600100_fxTransferDuplicateCheck.js b/migrations/600100_fxTransferDuplicateCheck.js new file mode 100644 index 000000000..e7260830a --- /dev/null +++ b/migrations/600100_fxTransferDuplicateCheck.js @@ -0,0 +1,42 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * INFITX + - Vijay Kumar Guthi + -------------- + ******/ + + 'use strict' + +exports.up = async (knex) => { + return await knex.schema.hasTable('fxTransferDuplicateCheck').then(function(exists) { + if (!exists) { + return knex.schema.createTable('fxTransferDuplicateCheck', (t) => { + t.string('commitRequestId', 36).primary().notNullable() + t.string('hash', 256).notNullable() + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable() + }) + } + }) +} + +exports.down = function (knex) { + return knex.schema.dropTableIfExists('fxTransferDuplicateCheck') +} diff --git a/migrations/600110_fxTransferErrorDuplicateCheck.js.js b/migrations/600110_fxTransferErrorDuplicateCheck.js.js new file mode 100644 index 000000000..2906a1d5a --- /dev/null +++ b/migrations/600110_fxTransferErrorDuplicateCheck.js.js @@ -0,0 +1,17 @@ +'use strict' + +exports.up = async (knex) => { + return await knex.schema.hasTable('fxTransferErrorDuplicateCheck').then(function(exists) { + if (!exists) { + return knex.schema.createTable('fxTransferErrorDuplicateCheck', (t) => { + t.string('commitRequestId', 36).primary().notNullable() + t.string('hash', 256).notNullable() + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable() + }) + } + }) +} + +exports.down = function (knex) { + return knex.schema.dropTableIfExists('fxTransferErrorDuplicateCheck') +} diff --git a/migrations/600200_fxTransfer.js b/migrations/600200_fxTransfer.js new file mode 100644 index 000000000..161b4e27b --- /dev/null +++ b/migrations/600200_fxTransfer.js @@ -0,0 +1,51 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * INFITX + - Vijay Kumar Guthi + -------------- + ******/ + + 'use strict' + +exports.up = async (knex) => { + return await knex.schema.hasTable('fxTransfer').then(function(exists) { + if (!exists) { + return knex.schema.createTable('fxTransfer', (t) => { + t.string('commitRequestId', 36).primary().notNullable() + t.foreign('commitRequestId').references('commitRequestId').inTable('fxTransferDuplicateCheck') + t.string('determiningTransferId', 36).defaultTo(null).nullable() + t.decimal('sourceAmount', 18, 4).notNullable() + t.decimal('targetAmount', 18, 4).notNullable() + t.string('sourceCurrency', 3).notNullable() + t.foreign('sourceCurrency').references('currencyId').inTable('currency') + t.string('targetCurrency', 3).notNullable() + t.foreign('targetCurrency').references('currencyId').inTable('currency') + t.string('ilpCondition', 256).notNullable() + t.dateTime('expirationDate').notNullable() + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable() + }) + } + }) +} + +exports.down = function (knex) { + return knex.schema.dropTableIfExists('fxTransfer') +} diff --git a/migrations/600201_fxTransfer-indexes.js b/migrations/600201_fxTransfer-indexes.js new file mode 100644 index 000000000..541c8fb02 --- /dev/null +++ b/migrations/600201_fxTransfer-indexes.js @@ -0,0 +1,40 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * INFITX + - Vijay Kumar Guthi + -------------- + ******/ + +'use strict' + +exports.up = function (knex) { + return knex.schema.table('fxTransfer', (t) => { + t.index('sourceCurrency') + t.index('targetCurrency') + }) +} + +exports.down = function (knex) { + return knex.schema.table('fxTransfer', (t) => { + t.dropIndex('sourceCurrency') + t.dropIndex('targetCurrency') + }) +} diff --git a/migrations/600400_fxTransferStateChange.js b/migrations/600400_fxTransferStateChange.js new file mode 100644 index 000000000..bd028ab5e --- /dev/null +++ b/migrations/600400_fxTransferStateChange.js @@ -0,0 +1,46 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * INFITX + - Vijay Kumar Guthi + -------------- + ******/ + +'use strict' + +exports.up = async (knex) => { + return await knex.schema.hasTable('fxTransferStateChange').then(function(exists) { + if (!exists) { + return knex.schema.createTable('fxTransferStateChange', (t) => { + t.bigIncrements('fxTransferStateChangeId').primary().notNullable() + t.string('commitRequestId', 36).notNullable() + t.foreign('commitRequestId').references('commitRequestId').inTable('fxTransfer') + t.string('transferStateId', 50).notNullable() + t.foreign('transferStateId').references('transferStateId').inTable('transferState') + t.string('reason', 512).defaultTo(null).nullable() + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable() + }) + } + }) +} + +exports.down = function (knex) { + return knex.schema.dropTableIfExists('fxTransferStateChange') +} diff --git a/migrations/600401_fxTransferStateChange-indexes.js b/migrations/600401_fxTransferStateChange-indexes.js new file mode 100644 index 000000000..03ffdb66f --- /dev/null +++ b/migrations/600401_fxTransferStateChange-indexes.js @@ -0,0 +1,40 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * INFITX + - Vijay Kumar Guthi + -------------- + ******/ + +'use strict' + +exports.up = function (knex) { + return knex.schema.table('fxTransferStateChange', (t) => { + t.index('commitRequestId') + t.index('transferStateId') + }) +} + +exports.down = function (knex) { + return knex.schema.table('fxTransferStateChange', (t) => { + t.dropIndex('commitRequestId') + t.dropIndex('transferStateId') + }) +} diff --git a/migrations/600501_fxWatchList.js b/migrations/600501_fxWatchList.js new file mode 100644 index 000000000..167d32628 --- /dev/null +++ b/migrations/600501_fxWatchList.js @@ -0,0 +1,46 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * INFITX + - Vijay Kumar Guthi + -------------- + ******/ + + 'use strict' + +exports.up = async (knex) => { + return await knex.schema.hasTable('fxWatchList').then(function(exists) { + if (!exists) { + return knex.schema.createTable('fxWatchList', (t) => { + t.bigIncrements('fxWatchListId').primary().notNullable() + t.string('commitRequestId', 36).notNullable() + t.foreign('commitRequestId').references('commitRequestId').inTable('fxTransfer') + t.string('determiningTransferId', 36).notNullable() + t.integer('fxTransferTypeId').unsigned().notNullable() + t.foreign('fxTransferTypeId').references('fxTransferTypeId').inTable('fxTransferType') + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable() + }) + } + }) +} + +exports.down = function (knex) { + return knex.schema.dropTableIfExists('fxWatchList') +} diff --git a/migrations/600502_fxWatchList-indexes.js b/migrations/600502_fxWatchList-indexes.js new file mode 100644 index 000000000..84bbf5a22 --- /dev/null +++ b/migrations/600502_fxWatchList-indexes.js @@ -0,0 +1,40 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * INFITX + - Vijay Kumar Guthi + -------------- + ******/ + +'use strict' + +exports.up = function (knex) { + return knex.schema.table('fxWatchList', (t) => { + t.index('commitRequestId') + t.index('determiningTransferId') + }) +} + +exports.down = function (knex) { + return knex.schema.table('fxWatchList', (t) => { + t.dropIndex('commitRequestId') + t.dropIndex('determiningTransferId') + }) +} diff --git a/migrations/600600_fxTransferFulfilmentDuplicateCheck.js b/migrations/600600_fxTransferFulfilmentDuplicateCheck.js new file mode 100644 index 000000000..c907eca28 --- /dev/null +++ b/migrations/600600_fxTransferFulfilmentDuplicateCheck.js @@ -0,0 +1,43 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + -------------- + ******/ + +'use strict' + +exports.up = async (knex) => { + return await knex.schema.hasTable('fxTransferFulfilmentDuplicateCheck').then(function(exists) { + if (!exists) { + return knex.schema.createTable('fxTransferFulfilmentDuplicateCheck', (t) => { + t.string('commitRequestId', 36).primary().notNullable() + t.foreign('commitRequestId').references('commitRequestId').inTable('fxTransfer') + t.string('hash', 256).nullable() + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable() + }) + } + }) +} + +exports.down = function (knex) { + return knex.schema.dropTableIfExists('fxTransferFulfilmentDuplicateCheck') +} diff --git a/migrations/600601_fxTransferFulfilmentDuplicateCheck-indexes.js b/migrations/600601_fxTransferFulfilmentDuplicateCheck-indexes.js new file mode 100644 index 000000000..dc265fd63 --- /dev/null +++ b/migrations/600601_fxTransferFulfilmentDuplicateCheck-indexes.js @@ -0,0 +1,38 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + -------------- + ******/ + +'use strict' + +exports.up = function (knex) { + return knex.schema.table('fxTransferFulfilmentDuplicateCheck', (t) => { + t.index('commitRequestId') + }) +} + +exports.down = function (knex) { + return knex.schema.table('fxTransferFulfilmentDuplicateCheck', (t) => { + t.dropIndex('commitRequestId') + }) +} diff --git a/migrations/600700_fxTransferFulfilment.js b/migrations/600700_fxTransferFulfilment.js new file mode 100644 index 000000000..d20b680c6 --- /dev/null +++ b/migrations/600700_fxTransferFulfilment.js @@ -0,0 +1,47 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + -------------- + ******/ + +'use strict' + +exports.up = async (knex) => { + return await knex.schema.hasTable('fxTransferFulfilment').then(function(exists) { + if (!exists) { + return knex.schema.createTable('fxTransferFulfilment', (t) => { + t.string('commitRequestId', 36).primary().notNullable() + t.foreign('commitRequestId').references('commitRequestId').inTable('fxTransfer') + t.string('ilpFulfilment', 256).nullable() + t.dateTime('completedDate').notNullable() + t.boolean('isValid').nullable() + t.bigInteger('settlementWindowId').unsigned().nullable() + t.foreign('settlementWindowId').references('settlementWindowId').inTable('settlementWindow') + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable() + }) + } + }) +} + +exports.down = function (knex) { + return knex.schema.dropTableIfExists('fxTransferFulfilment') +} diff --git a/migrations/600701_fxTransferFulfilment-indexes.js b/migrations/600701_fxTransferFulfilment-indexes.js new file mode 100644 index 000000000..e32b93de9 --- /dev/null +++ b/migrations/600701_fxTransferFulfilment-indexes.js @@ -0,0 +1,42 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + -------------- + ******/ + +'use strict' + +exports.up = function (knex) { + return knex.schema.table('fxTransferFulfilment', (t) => { + t.index('commitRequestId') + t.index('settlementWindowId') + t.unique(['commitRequestId', 'ilpFulfilment']) + }) +} + +exports.down = function (knex) { + return knex.schema.table('fxTransferFulfilment', (t) => { + t.dropIndex('transferId') + t.dropIndex('settlementWindowId') + t.unique(['transferId', 'ilpFulfilment']) + }) +} diff --git a/migrations/600800_fxTransferExtension.js b/migrations/600800_fxTransferExtension.js new file mode 100644 index 000000000..2bb0845cb --- /dev/null +++ b/migrations/600800_fxTransferExtension.js @@ -0,0 +1,47 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Infitx + - Kalin Krustev + -------------- + ******/ + +'use strict' + +exports.up = async (knex) => { + return await knex.schema.hasTable('fxTransferExtension').then(function(exists) { + if (!exists) { + return knex.schema.createTable('fxTransferExtension', (t) => { + t.bigIncrements('fxTransferExtensionId').primary().notNullable() + t.string('commitRequestId', 36).notNullable() + t.foreign('commitRequestId').references('commitRequestId').inTable('fxTransfer') + t.boolean('isFulfilment').defaultTo(false).notNullable() + t.boolean('isError').defaultTo(false).notNullable() + t.string('key', 128).notNullable() + t.text('value').notNullable() + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable() + }) + } + }) +} + +exports.down = function (knex) { + return knex.schema.dropTableIfExists('fxTransferExtension') +} diff --git a/migrations/601400_fxTransferTimeout.js b/migrations/601400_fxTransferTimeout.js new file mode 100644 index 000000000..90bc01ac5 --- /dev/null +++ b/migrations/601400_fxTransferTimeout.js @@ -0,0 +1,43 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + - Eugen Klymniuk + -------------- + ******/ + +'use strict' + +exports.up = async (knex) => { + return await knex.schema.hasTable('fxTransferTimeout').then(function(exists) { + if (!exists) { + return knex.schema.createTable('fxTransferTimeout', (t) => { + t.bigIncrements('fxTransferTimeoutId').primary().notNullable() + t.string('commitRequestId', 36).notNullable() + t.foreign('commitRequestId').references('commitRequestId').inTable('fxTransfer') + t.dateTime('expirationDate').notNullable() + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable() + }) + } + }) +} + +exports.down = function (knex) { + return knex.schema.dropTableIfExists('fxTransferTimeout') +} diff --git a/migrations/601401_fxTransferTimeout-indexes.js b/migrations/601401_fxTransferTimeout-indexes.js new file mode 100644 index 000000000..6a85c66d2 --- /dev/null +++ b/migrations/601401_fxTransferTimeout-indexes.js @@ -0,0 +1,37 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + - Eugen Klymniuk + -------------- + ******/ + +'use strict' + +exports.up = function (knex) { + return knex.schema.table('fxTransferTimeout', (t) => { + t.unique('commitRequestId') + }) +} + +exports.down = function (knex) { + return knex.schema.table('fxTransferTimeout', (t) => { + t.dropUnique('commitRequestId') + }) +} diff --git a/migrations/601500_fxTransferError.js b/migrations/601500_fxTransferError.js new file mode 100644 index 000000000..ce53eaef6 --- /dev/null +++ b/migrations/601500_fxTransferError.js @@ -0,0 +1,44 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + - Eugen Klymniuk + -------------- + ******/ + +'use strict' + +exports.up = async (knex) => { + return await knex.schema.hasTable('fxTransferError').then(function(exists) { + if (!exists) { + return knex.schema.createTable('fxTransferError', (t) => { + t.string('commitRequestId', 36).primary().notNullable() + t.bigInteger('fxTransferStateChangeId').unsigned().notNullable() + t.foreign('fxTransferStateChangeId').references('fxTransferStateChangeId').inTable('fxTransferStateChange') + t.integer('errorCode').unsigned().notNullable() + t.string('errorDescription', 128).notNullable() + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable() + }) + } + }) +} + +exports.down = function (knex) { + return knex.schema.dropTableIfExists('fxTransferError') +} diff --git a/migrations/601501_fxTransferError-indexes.js b/migrations/601501_fxTransferError-indexes.js new file mode 100644 index 000000000..a63f278f9 --- /dev/null +++ b/migrations/601501_fxTransferError-indexes.js @@ -0,0 +1,37 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + - Eugen Klymniuk + -------------- + ******/ + +'use strict' + +exports.up = function (knex) { + return knex.schema.table('fxTransferError', (t) => { + t.index('fxTransferStateChangeId') + }) +} + +exports.down = function (knex) { + return knex.schema.table('fxTransferError', (t) => { + t.dropIndex('fxTransferStateChangeId') + }) +} diff --git a/migrations/610200_fxTransferParticipant.js b/migrations/610200_fxTransferParticipant.js new file mode 100644 index 000000000..40b15f4ad --- /dev/null +++ b/migrations/610200_fxTransferParticipant.js @@ -0,0 +1,52 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * INFITX + - Vijay Kumar Guthi + -------------- + ******/ + +'use strict' + +exports.up = async (knex) => { + return await knex.schema.hasTable('fxTransferParticipant').then(function(exists) { + if (!exists) { + return knex.schema.createTable('fxTransferParticipant', (t) => { + t.bigIncrements('fxTransferParticipantId').primary().notNullable() + t.string('commitRequestId', 36).notNullable() + t.foreign('commitRequestId').references('commitRequestId').inTable('fxTransfer') + t.integer('participantCurrencyId').unsigned().notNullable() + t.foreign('participantCurrencyId').references('participantCurrencyId').inTable('participantCurrency') + t.integer('transferParticipantRoleTypeId').unsigned().notNullable() + t.foreign('transferParticipantRoleTypeId').references('transferParticipantRoleTypeId').inTable('transferParticipantRoleType') + t.integer('ledgerEntryTypeId').unsigned().notNullable() + t.foreign('ledgerEntryTypeId').references('ledgerEntryTypeId').inTable('ledgerEntryType') + t.integer('fxParticipantCurrencyTypeId').unsigned() + t.foreign('fxParticipantCurrencyTypeId').references('fxParticipantCurrencyTypeId').inTable('fxParticipantCurrencyType') + t.decimal('amount', 18, 4).notNullable() + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable() + }) + } + }) +} + +exports.down = function (knex) { + return knex.schema.dropTableIfExists('fxTransferParticipant') +} diff --git a/migrations/610201_fxTransferParticipant-indexes.js b/migrations/610201_fxTransferParticipant-indexes.js new file mode 100644 index 000000000..3f413afff --- /dev/null +++ b/migrations/610201_fxTransferParticipant-indexes.js @@ -0,0 +1,44 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * INFITX + - Vijay Kumar Guthi + -------------- + ******/ + +'use strict' + +exports.up = function (knex) { + return knex.schema.table('fxTransferParticipant', (t) => { + t.index('commitRequestId') + t.index('participantCurrencyId') + t.index('transferParticipantRoleTypeId') + t.index('ledgerEntryTypeId') + }) +} + +exports.down = function (knex) { + return knex.schema.table('fxTransferParticipant', (t) => { + t.dropIndex('commitRequestId') + t.dropIndex('participantCurrencyId') + t.dropIndex('transferParticipantRoleTypeId') + t.dropIndex('ledgerEntryTypeId') + }) +} diff --git a/migrations/610202_fxTransferParticipant-participantId.js b/migrations/610202_fxTransferParticipant-participantId.js new file mode 100644 index 000000000..15000ac7e --- /dev/null +++ b/migrations/610202_fxTransferParticipant-participantId.js @@ -0,0 +1,52 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * INFITX + - Vijay Kumar Guthi + -------------- + ******/ + +'use strict' + +exports.up = async (knex) => { + return await knex.schema.hasTable('fxTransferParticipant').then(function(exists) { + if (exists) { + return knex.schema.alterTable('fxTransferParticipant', (t) => { + t.integer('participantId').unsigned().notNullable() + // Disabling this as its throwing error while running the migration with existing data in the table + // t.foreign('participantId').references('participantId').inTable('participant') + t.index('participantId') + t.integer('participantCurrencyId').unsigned().nullable().alter() + }) + } + }) +} + +exports.down = async (knex) => { + return await knex.schema.hasTable('fxTransferParticipant').then(function(exists) { + if (exists) { + return knex.schema.alterTable('fxTransferParticipant', (t) => { + t.dropIndex('participantId') + t.dropColumn('participantId') + t.integer('participantCurrencyId').unsigned().notNullable().alter() + }) + } + }) +} diff --git a/migrations/610403_participantPositionChange-fxTransfer.js b/migrations/610403_participantPositionChange-fxTransfer.js new file mode 100644 index 000000000..bdf853c96 --- /dev/null +++ b/migrations/610403_participantPositionChange-fxTransfer.js @@ -0,0 +1,46 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * INFITX + - Vijay Kumar Guthi + -------------- + ******/ + +'use strict' + +exports.up = async (knex) => { + return await knex.schema.hasTable('participantPositionChange').then(function(exists) { + if (exists) { + return knex.schema.alterTable('participantPositionChange', (t) => { + t.bigInteger('transferStateChangeId').unsigned().defaultTo(null).alter() + t.bigInteger('fxTransferStateChangeId').unsigned().defaultTo(null) + t.foreign('fxTransferStateChangeId').references('fxTransferStateChangeId').inTable('fxTransferStateChange') + }) + } + }) +} + +exports.down = function (knex) { + return knex.schema.alterTable('participantPositionChange', (t) => { + t.dropForeign('fxTransferStateChangeId') + t.dropColumn('fxTransferStateChangeId') + t.bigInteger('transferStateChangeId').unsigned().notNullable().alter() + }) +} diff --git a/migrations/800101_feature-fixSubIdRef.js b/migrations/800101_feature-fixSubIdRef.js index 3a0f410df..085b6ae71 100644 --- a/migrations/800101_feature-fixSubIdRef.js +++ b/migrations/800101_feature-fixSubIdRef.js @@ -24,8 +24,8 @@ Contributors * Gates Foundation - Name Surname - * ModusBox - - Vijay Kumar Guthi + * Infitx + - Vijay Kumar Guthi -------------- ******/ diff --git a/migrations/910101_feature904DataMigration.js b/migrations/910101_feature904DataMigration.js index e798759e1..6d3c1ffbd 100644 --- a/migrations/910101_feature904DataMigration.js +++ b/migrations/910101_feature904DataMigration.js @@ -44,62 +44,56 @@ const tableNameSuffix = Time.getYMDString(new Date()) */ const migrateData = async (knex) => { return knex.transaction(async trx => { - try { - let exists = false - exists = await knex.schema.hasTable(`transferExtension${tableNameSuffix}`) - if (exists) { - await knex.transacting(trx).raw(` - insert into transferExtension (transferExtensionId, transferId, \`key\`, \`value\`, isFulfilment, isError, createdDate) - select te.transferExtensionId, te.transferId, te.\`key\`, te.\`value\`, - case when te.transferFulfilmentId is null then 0 else 1 end, - case when te.transferErrorId is null then 0 else 1 end, - te.createdDate - from transferExtension${tableNameSuffix} as te`) - } - exists = await knex.schema.hasTable(`transferFulfilmentDuplicateCheck${tableNameSuffix}`) && - await knex.schema.hasTable(`transferFulfilment${tableNameSuffix}`) - if (exists) { - await knex.transacting(trx).raw(` - insert into transferFulfilmentDuplicateCheck (transferId, \`hash\`, createdDate) - select transferId, \`hash\`, createdDate from transferFulfilmentDuplicateCheck${tableNameSuffix} - where transferFulfilmentId in( - select transferFulfilmentId - from ( - select transferFulfilmentId, transferId, ilpFulfilment, completedDate, isValid, settlementWindowId, createdDate, - row_number() over(partition by transferId order by isValid desc, createdDate) rowNumber - from transferFulfilment${tableNameSuffix}) t - where t.rowNumber = 1)`) - } - exists = await knex.schema.hasTable(`transferFulfilment${tableNameSuffix}`) - if (exists) { - await knex.transacting(trx).raw(` - insert into transferFulfilment (transferId, ilpFulfilment, completedDate, isValid, settlementWindowId, createdDate) - select t.transferId, t.ilpFulfilment, t.completedDate, t.isValid, t.settlementWindowId, t.createdDate + let exists = false + exists = await knex.schema.hasTable(`transferExtension${tableNameSuffix}`) + if (exists) { + await knex.transacting(trx).raw(` + insert into transferExtension (transferExtensionId, transferId, \`key\`, \`value\`, isFulfilment, isError, createdDate) + select te.transferExtensionId, te.transferId, te.\`key\`, te.\`value\`, + case when te.transferFulfilmentId is null then 0 else 1 end, + case when te.transferErrorId is null then 0 else 1 end, + te.createdDate + from transferExtension${tableNameSuffix} as te`) + } + exists = await knex.schema.hasTable(`transferFulfilmentDuplicateCheck${tableNameSuffix}`) && + await knex.schema.hasTable(`transferFulfilment${tableNameSuffix}`) + if (exists) { + await knex.transacting(trx).raw(` + insert into transferFulfilmentDuplicateCheck (transferId, \`hash\`, createdDate) + select transferId, \`hash\`, createdDate from transferFulfilmentDuplicateCheck${tableNameSuffix} + where transferFulfilmentId in( + select transferFulfilmentId from ( select transferFulfilmentId, transferId, ilpFulfilment, completedDate, isValid, settlementWindowId, createdDate, row_number() over(partition by transferId order by isValid desc, createdDate) rowNumber from transferFulfilment${tableNameSuffix}) t - where t.rowNumber = 1`) - } - exists = await knex.schema.hasTable(`transferErrorDuplicateCheck${tableNameSuffix}`) - if (exists) { - await knex.transacting(trx).raw(` - insert into transferErrorDuplicateCheck (transferId, \`hash\`, createdDate) - select transferId, \`hash\`, createdDate - from transferErrorDuplicateCheck${tableNameSuffix}`) - } - exists = await knex.schema.hasTable(`transferError${tableNameSuffix}`) - if (exists) { - await knex.transacting(trx).raw(` - insert into transferError (transferId, transferStateChangeId, errorCode, errorDescription, createdDate) - select tsc.transferId, te.transferStateChangeId, te.errorCode, te.errorDescription, te.createdDate - from transferError${tableNameSuffix} te - join transferStateChange tsc on tsc.transferStateChangeId = te.transferStateChangeId`) - } - await trx.commit - } catch (err) { - await trx.rollback - throw err + where t.rowNumber = 1)`) + } + exists = await knex.schema.hasTable(`transferFulfilment${tableNameSuffix}`) + if (exists) { + await knex.transacting(trx).raw(` + insert into transferFulfilment (transferId, ilpFulfilment, completedDate, isValid, settlementWindowId, createdDate) + select t.transferId, t.ilpFulfilment, t.completedDate, t.isValid, t.settlementWindowId, t.createdDate + from ( + select transferFulfilmentId, transferId, ilpFulfilment, completedDate, isValid, settlementWindowId, createdDate, + row_number() over(partition by transferId order by isValid desc, createdDate) rowNumber + from transferFulfilment${tableNameSuffix}) t + where t.rowNumber = 1`) + } + exists = await knex.schema.hasTable(`transferErrorDuplicateCheck${tableNameSuffix}`) + if (exists) { + await knex.transacting(trx).raw(` + insert into transferErrorDuplicateCheck (transferId, \`hash\`, createdDate) + select transferId, \`hash\`, createdDate + from transferErrorDuplicateCheck${tableNameSuffix}`) + } + exists = await knex.schema.hasTable(`transferError${tableNameSuffix}`) + if (exists) { + await knex.transacting(trx).raw(` + insert into transferError (transferId, transferStateChangeId, errorCode, errorDescription, createdDate) + select tsc.transferId, te.transferStateChangeId, te.errorCode, te.errorDescription, te.createdDate + from transferError${tableNameSuffix} te + join transferStateChange tsc on tsc.transferStateChangeId = te.transferStateChangeId`) } }) } diff --git a/migrations/910102_feature949DataMigration.js b/migrations/910102_feature949DataMigration.js index 30bc7dee4..2bcb7e0f6 100644 --- a/migrations/910102_feature949DataMigration.js +++ b/migrations/910102_feature949DataMigration.js @@ -41,232 +41,226 @@ const RUN_DATA_MIGRATIONS = Config.DB_RUN_DATA_MIGRATIONS */ const migrateData = async (knex) => { return knex.transaction(async trx => { - try { - await knex.raw('update currency set scale = \'2\' where currencyId = \'AED\'').transacting(trx) - await knex.raw('update currency set scale = \'4\' where currencyId = \'AFA\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'AFN\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'ALL\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'AMD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'ANG\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'AOA\'').transacting(trx) - await knex.raw('update currency set scale = \'4\' where currencyId = \'AOR\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'ARS\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'AUD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'AWG\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'AZN\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'BAM\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'BBD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'BDT\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'BGN\'').transacting(trx) - await knex.raw('update currency set scale = \'3\' where currencyId = \'BHD\'').transacting(trx) - await knex.raw('update currency set scale = \'0\' where currencyId = \'BIF\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'BMD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'BND\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'BOB\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'BRL\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'BSD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'BTN\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'BWP\'').transacting(trx) - await knex.raw('update currency set scale = \'4\' where currencyId = \'BYN\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'BZD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'CAD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'CDF\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'CHF\'').transacting(trx) - await knex.raw('update currency set scale = \'0\' where currencyId = \'CLP\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'CNY\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'COP\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'CRC\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'CUC\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'CUP\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'CVE\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'CZK\'').transacting(trx) - await knex.raw('update currency set scale = \'0\' where currencyId = \'DJF\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'DKK\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'DOP\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'DZD\'').transacting(trx) - await knex.raw('update currency set scale = \'4\' where currencyId = \'EEK\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'EGP\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'ERN\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'ETB\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'EUR\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'FJD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'FKP\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'GBP\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'GEL\'').transacting(trx) - await knex.raw('update currency set scale = \'4\' where currencyId = \'GGP\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'GHS\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'GIP\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'GMD\'').transacting(trx) - await knex.raw('update currency set scale = \'0\' where currencyId = \'GNF\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'GTQ\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'GYD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'HKD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'HNL\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'HRK\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'HTG\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'HUF\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'IDR\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'ILS\'').transacting(trx) - await knex.raw('update currency set scale = \'4\' where currencyId = \'IMP\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'INR\'').transacting(trx) - await knex.raw('update currency set scale = \'3\' where currencyId = \'IQD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'IRR\'').transacting(trx) - await knex.raw('update currency set scale = \'0\' where currencyId = \'ISK\'').transacting(trx) - await knex.raw('update currency set scale = \'4\' where currencyId = \'JEP\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'JMD\'').transacting(trx) - await knex.raw('update currency set scale = \'3\' where currencyId = \'JOD\'').transacting(trx) - await knex.raw('update currency set scale = \'0\' where currencyId = \'JPY\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'KES\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'KGS\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'KHR\'').transacting(trx) - await knex.raw('update currency set scale = \'0\' where currencyId = \'KMF\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'KPW\'').transacting(trx) - await knex.raw('update currency set scale = \'0\' where currencyId = \'KRW\'').transacting(trx) - await knex.raw('update currency set scale = \'3\' where currencyId = \'KWD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'KYD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'KZT\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'LAK\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'LBP\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'LKR\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'LRD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'LSL\'').transacting(trx) - await knex.raw('update currency set scale = \'4\' where currencyId = \'LTL\'').transacting(trx) - await knex.raw('update currency set scale = \'4\' where currencyId = \'LVL\'').transacting(trx) - await knex.raw('update currency set scale = \'3\' where currencyId = \'LYD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'MAD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'MDL\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'MGA\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'MKD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'MMK\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'MNT\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'MOP\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'MRO\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'MUR\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'MVR\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'MWK\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'MXN\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'MYR\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'MZN\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'NAD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'NGN\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'NIO\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'NOK\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'NPR\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'NZD\'').transacting(trx) - await knex.raw('update currency set scale = \'3\' where currencyId = \'OMR\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'PAB\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'PEN\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'PGK\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'PHP\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'PKR\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'PLN\'').transacting(trx) - await knex.raw('update currency set scale = \'0\' where currencyId = \'PYG\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'QAR\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'RON\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'RSD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'RUB\'').transacting(trx) - await knex.raw('update currency set scale = \'0\' where currencyId = \'RWF\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'SAR\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'SBD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'SCR\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'SDG\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'SEK\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'SGD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'SHP\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'SLL\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'SOS\'').transacting(trx) - await knex.raw('update currency set scale = \'4\' where currencyId = \'SPL\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'SRD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'STD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'SVC\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'SYP\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'SZL\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'THB\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'TJS\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'TMT\'').transacting(trx) - await knex.raw('update currency set scale = \'3\' where currencyId = \'TND\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'TOP\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'TRY\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'TTD\'').transacting(trx) - await knex.raw('update currency set scale = \'4\' where currencyId = \'TVD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'TWD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'TZS\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'UAH\'').transacting(trx) - await knex.raw('update currency set scale = \'0\' where currencyId = \'UGX\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'USD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'UYU\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'UZS\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'VEF\'').transacting(trx) - await knex.raw('update currency set scale = \'0\' where currencyId = \'VND\'').transacting(trx) - await knex.raw('update currency set scale = \'0\' where currencyId = \'VUV\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'WST\'').transacting(trx) - await knex.raw('update currency set scale = \'0\' where currencyId = \'XAF\'').transacting(trx) - await knex.raw('update currency set scale = \'4\' where currencyId = \'XAG\'').transacting(trx) - await knex.raw('update currency set scale = \'4\' where currencyId = \'XAU\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'XCD\'').transacting(trx) - await knex.raw('update currency set scale = \'4\' where currencyId = \'XDR\'').transacting(trx) - await knex.raw('update currency set scale = \'4\' where currencyId = \'XFO\'').transacting(trx) - await knex.raw('update currency set scale = \'4\' where currencyId = \'XFU\'').transacting(trx) - await knex.raw('update currency set scale = \'0\' where currencyId = \'XOF\'').transacting(trx) - await knex.raw('update currency set scale = \'4\' where currencyId = \'XPD\'').transacting(trx) - await knex.raw('update currency set scale = \'0\' where currencyId = \'XPF\'').transacting(trx) - await knex.raw('update currency set scale = \'4\' where currencyId = \'XPT\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'YER\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'ZAR\'').transacting(trx) - await knex.raw('update currency set scale = \'4\' where currencyId = \'ZMK\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'ZMW\'').transacting(trx) - await knex.raw('update currency set scale = \'4\' where currencyId = \'ZWD\'').transacting(trx) - await knex.raw('update currency set scale = \'2\' where currencyId = \'ZWL\'').transacting(trx) - await knex.raw('update currency set scale = \'4\' where currencyId = \'ZWN\'').transacting(trx) - await knex.raw('update currency set scale = \'4\' where currencyId = \'ZWR\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'AED\'').transacting(trx) + await knex.raw('update currency set scale = \'4\' where currencyId = \'AFA\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'AFN\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'ALL\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'AMD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'ANG\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'AOA\'').transacting(trx) + await knex.raw('update currency set scale = \'4\' where currencyId = \'AOR\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'ARS\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'AUD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'AWG\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'AZN\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'BAM\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'BBD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'BDT\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'BGN\'').transacting(trx) + await knex.raw('update currency set scale = \'3\' where currencyId = \'BHD\'').transacting(trx) + await knex.raw('update currency set scale = \'0\' where currencyId = \'BIF\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'BMD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'BND\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'BOB\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'BRL\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'BSD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'BTN\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'BWP\'').transacting(trx) + await knex.raw('update currency set scale = \'4\' where currencyId = \'BYN\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'BZD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'CAD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'CDF\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'CHF\'').transacting(trx) + await knex.raw('update currency set scale = \'0\' where currencyId = \'CLP\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'CNY\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'COP\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'CRC\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'CUC\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'CUP\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'CVE\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'CZK\'').transacting(trx) + await knex.raw('update currency set scale = \'0\' where currencyId = \'DJF\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'DKK\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'DOP\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'DZD\'').transacting(trx) + await knex.raw('update currency set scale = \'4\' where currencyId = \'EEK\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'EGP\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'ERN\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'ETB\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'EUR\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'FJD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'FKP\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'GBP\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'GEL\'').transacting(trx) + await knex.raw('update currency set scale = \'4\' where currencyId = \'GGP\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'GHS\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'GIP\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'GMD\'').transacting(trx) + await knex.raw('update currency set scale = \'0\' where currencyId = \'GNF\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'GTQ\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'GYD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'HKD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'HNL\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'HRK\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'HTG\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'HUF\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'IDR\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'ILS\'').transacting(trx) + await knex.raw('update currency set scale = \'4\' where currencyId = \'IMP\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'INR\'').transacting(trx) + await knex.raw('update currency set scale = \'3\' where currencyId = \'IQD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'IRR\'').transacting(trx) + await knex.raw('update currency set scale = \'0\' where currencyId = \'ISK\'').transacting(trx) + await knex.raw('update currency set scale = \'4\' where currencyId = \'JEP\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'JMD\'').transacting(trx) + await knex.raw('update currency set scale = \'3\' where currencyId = \'JOD\'').transacting(trx) + await knex.raw('update currency set scale = \'0\' where currencyId = \'JPY\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'KES\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'KGS\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'KHR\'').transacting(trx) + await knex.raw('update currency set scale = \'0\' where currencyId = \'KMF\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'KPW\'').transacting(trx) + await knex.raw('update currency set scale = \'0\' where currencyId = \'KRW\'').transacting(trx) + await knex.raw('update currency set scale = \'3\' where currencyId = \'KWD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'KYD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'KZT\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'LAK\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'LBP\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'LKR\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'LRD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'LSL\'').transacting(trx) + await knex.raw('update currency set scale = \'4\' where currencyId = \'LTL\'').transacting(trx) + await knex.raw('update currency set scale = \'4\' where currencyId = \'LVL\'').transacting(trx) + await knex.raw('update currency set scale = \'3\' where currencyId = \'LYD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'MAD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'MDL\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'MGA\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'MKD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'MMK\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'MNT\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'MOP\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'MRO\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'MUR\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'MVR\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'MWK\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'MXN\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'MYR\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'MZN\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'NAD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'NGN\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'NIO\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'NOK\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'NPR\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'NZD\'').transacting(trx) + await knex.raw('update currency set scale = \'3\' where currencyId = \'OMR\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'PAB\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'PEN\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'PGK\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'PHP\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'PKR\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'PLN\'').transacting(trx) + await knex.raw('update currency set scale = \'0\' where currencyId = \'PYG\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'QAR\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'RON\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'RSD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'RUB\'').transacting(trx) + await knex.raw('update currency set scale = \'0\' where currencyId = \'RWF\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'SAR\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'SBD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'SCR\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'SDG\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'SEK\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'SGD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'SHP\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'SLL\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'SOS\'').transacting(trx) + await knex.raw('update currency set scale = \'4\' where currencyId = \'SPL\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'SRD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'STD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'SVC\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'SYP\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'SZL\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'THB\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'TJS\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'TMT\'').transacting(trx) + await knex.raw('update currency set scale = \'3\' where currencyId = \'TND\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'TOP\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'TRY\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'TTD\'').transacting(trx) + await knex.raw('update currency set scale = \'4\' where currencyId = \'TVD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'TWD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'TZS\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'UAH\'').transacting(trx) + await knex.raw('update currency set scale = \'0\' where currencyId = \'UGX\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'USD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'UYU\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'UZS\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'VEF\'').transacting(trx) + await knex.raw('update currency set scale = \'0\' where currencyId = \'VND\'').transacting(trx) + await knex.raw('update currency set scale = \'0\' where currencyId = \'VUV\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'WST\'').transacting(trx) + await knex.raw('update currency set scale = \'0\' where currencyId = \'XAF\'').transacting(trx) + await knex.raw('update currency set scale = \'4\' where currencyId = \'XAG\'').transacting(trx) + await knex.raw('update currency set scale = \'4\' where currencyId = \'XAU\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'XCD\'').transacting(trx) + await knex.raw('update currency set scale = \'4\' where currencyId = \'XDR\'').transacting(trx) + await knex.raw('update currency set scale = \'4\' where currencyId = \'XFO\'').transacting(trx) + await knex.raw('update currency set scale = \'4\' where currencyId = \'XFU\'').transacting(trx) + await knex.raw('update currency set scale = \'0\' where currencyId = \'XOF\'').transacting(trx) + await knex.raw('update currency set scale = \'4\' where currencyId = \'XPD\'').transacting(trx) + await knex.raw('update currency set scale = \'0\' where currencyId = \'XPF\'').transacting(trx) + await knex.raw('update currency set scale = \'4\' where currencyId = \'XPT\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'YER\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'ZAR\'').transacting(trx) + await knex.raw('update currency set scale = \'4\' where currencyId = \'ZMK\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'ZMW\'').transacting(trx) + await knex.raw('update currency set scale = \'4\' where currencyId = \'ZWD\'').transacting(trx) + await knex.raw('update currency set scale = \'2\' where currencyId = \'ZWL\'').transacting(trx) + await knex.raw('update currency set scale = \'4\' where currencyId = \'ZWN\'').transacting(trx) + await knex.raw('update currency set scale = \'4\' where currencyId = \'ZWR\'').transacting(trx) - try { - await knex.raw('insert into currency (currencyId, name, scale) values (\'BOV\', \'Bolivia Mvdol\', 2)').transacting(trx) - } catch (e) { await knex.raw('update currency set scale = \'2\' where currencyId = \'BOV\'').transacting(trx) } - try { - await knex.raw('insert into currency (currencyId, name, scale) values (\'BYR\', \'Belarussian Ruble\', 0)').transacting(trx) - } catch (e) { await knex.raw('update currency set scale = \'0\' where currencyId = \'BYR\'').transacting(trx) } - try { - await knex.raw('insert into currency (currencyId, name, scale) values (\'CHE\', \'Switzerland WIR Euro\', 2)').transacting(trx) - } catch (e) { await knex.raw('update currency set scale = \'2\' where currencyId = \'CHE\'').transacting(trx) } - try { - await knex.raw('insert into currency (currencyId, name, scale) values (\'CHW\', \'Switzerland WIR Franc\', 2)').transacting(trx) - } catch (e) { await knex.raw('update currency set scale = \'2\' where currencyId = \'CHW\'').transacting(trx) } - try { - await knex.raw('insert into currency (currencyId, name, scale) values (\'CLF\', \'Unidad de Fomento\', 4)').transacting(trx) - } catch (e) { await knex.raw('update currency set scale = \'4\' where currencyId = \'CLF\'').transacting(trx) } - try { - await knex.raw('insert into currency (currencyId, name, scale) values (\'COU\', \'Unidad de Valor Real\', 2)').transacting(trx) - } catch (e) { await knex.raw('update currency set scale = \'2\' where currencyId = \'COU\'').transacting(trx) } - try { - await knex.raw('insert into currency (currencyId, name, scale) values (\'MXV\', \'Mexican Unidad de Inversion (UDI)\', 2)').transacting(trx) - } catch (e) { await knex.raw('update currency set scale = \'2\' where currencyId = \'MXV\'').transacting(trx) } - try { - await knex.raw('insert into currency (currencyId, name, scale) values (\'SSP\', \'South Sudanese Pound\', 2)').transacting(trx) - } catch (e) { await knex.raw('update currency set scale = \'2\' where currencyId = \'SSP\'').transacting(trx) } - try { - await knex.raw('insert into currency (currencyId, name, scale) values (\'USN\', \'US Dollar (Next day)\', 2)').transacting(trx) - } catch (e) { await knex.raw('update currency set scale = \'2\' where currencyId = \'USN\'').transacting(trx) } - try { - await knex.raw('insert into currency (currencyId, name, scale) values (\'UYI\', \'Uruguay Peso en Unidades Indexadas (URUIURUI)\', 0)').transacting(trx) - } catch (e) { await knex.raw('update currency set scale = \'0\' where currencyId = \'UYI\'').transacting(trx) } - try { - await knex.raw('insert into currency (currencyId, name, scale) values (\'XSU\', \'Sucre\', 4)').transacting(trx) - } catch (e) { await knex.raw('update currency set scale = \'4\' where currencyId = \'XSU\'').transacting(trx) } - try { - await knex.raw('insert into currency (currencyId, name, scale) values (\'XTS\', \'Reserved for testing purposes\', 4)').transacting(trx) - } catch (e) { await knex.raw('update currency set scale = \'4\' where currencyId = \'XTS\'').transacting(trx) } - try { - await knex.raw('insert into currency (currencyId, name, scale) values (\'XUA\', \'African Development Bank (ADB) Unit of Account\', 4)').transacting(trx) - } catch (e) { await knex.raw('update currency set scale = \'4\' where currencyId = \'XUA\'').transacting(trx) } - try { - await knex.raw('insert into currency (currencyId, name, scale) values (\'XXX\', \'Assigned for transactions where no currency is involved\', 4)').transacting(trx) - } catch (e) { await knex.raw('update currency set scale = \'4\' where currencyId = \'XXX\'').transacting(trx) } - await trx.commit - } catch (err) { - await trx.rollback - throw err - } + try { + await knex.raw('insert into currency (currencyId, name, scale) values (\'BOV\', \'Bolivia Mvdol\', 2)').transacting(trx) + } catch (e) { await knex.raw('update currency set scale = \'2\' where currencyId = \'BOV\'').transacting(trx) } + try { + await knex.raw('insert into currency (currencyId, name, scale) values (\'BYR\', \'Belarussian Ruble\', 0)').transacting(trx) + } catch (e) { await knex.raw('update currency set scale = \'0\' where currencyId = \'BYR\'').transacting(trx) } + try { + await knex.raw('insert into currency (currencyId, name, scale) values (\'CHE\', \'Switzerland WIR Euro\', 2)').transacting(trx) + } catch (e) { await knex.raw('update currency set scale = \'2\' where currencyId = \'CHE\'').transacting(trx) } + try { + await knex.raw('insert into currency (currencyId, name, scale) values (\'CHW\', \'Switzerland WIR Franc\', 2)').transacting(trx) + } catch (e) { await knex.raw('update currency set scale = \'2\' where currencyId = \'CHW\'').transacting(trx) } + try { + await knex.raw('insert into currency (currencyId, name, scale) values (\'CLF\', \'Unidad de Fomento\', 4)').transacting(trx) + } catch (e) { await knex.raw('update currency set scale = \'4\' where currencyId = \'CLF\'').transacting(trx) } + try { + await knex.raw('insert into currency (currencyId, name, scale) values (\'COU\', \'Unidad de Valor Real\', 2)').transacting(trx) + } catch (e) { await knex.raw('update currency set scale = \'2\' where currencyId = \'COU\'').transacting(trx) } + try { + await knex.raw('insert into currency (currencyId, name, scale) values (\'MXV\', \'Mexican Unidad de Inversion (UDI)\', 2)').transacting(trx) + } catch (e) { await knex.raw('update currency set scale = \'2\' where currencyId = \'MXV\'').transacting(trx) } + try { + await knex.raw('insert into currency (currencyId, name, scale) values (\'SSP\', \'South Sudanese Pound\', 2)').transacting(trx) + } catch (e) { await knex.raw('update currency set scale = \'2\' where currencyId = \'SSP\'').transacting(trx) } + try { + await knex.raw('insert into currency (currencyId, name, scale) values (\'USN\', \'US Dollar (Next day)\', 2)').transacting(trx) + } catch (e) { await knex.raw('update currency set scale = \'2\' where currencyId = \'USN\'').transacting(trx) } + try { + await knex.raw('insert into currency (currencyId, name, scale) values (\'UYI\', \'Uruguay Peso en Unidades Indexadas (URUIURUI)\', 0)').transacting(trx) + } catch (e) { await knex.raw('update currency set scale = \'0\' where currencyId = \'UYI\'').transacting(trx) } + try { + await knex.raw('insert into currency (currencyId, name, scale) values (\'XSU\', \'Sucre\', 4)').transacting(trx) + } catch (e) { await knex.raw('update currency set scale = \'4\' where currencyId = \'XSU\'').transacting(trx) } + try { + await knex.raw('insert into currency (currencyId, name, scale) values (\'XTS\', \'Reserved for testing purposes\', 4)').transacting(trx) + } catch (e) { await knex.raw('update currency set scale = \'4\' where currencyId = \'XTS\'').transacting(trx) } + try { + await knex.raw('insert into currency (currencyId, name, scale) values (\'XUA\', \'African Development Bank (ADB) Unit of Account\', 4)').transacting(trx) + } catch (e) { await knex.raw('update currency set scale = \'4\' where currencyId = \'XUA\'').transacting(trx) } + try { + await knex.raw('insert into currency (currencyId, name, scale) values (\'XXX\', \'Assigned for transactions where no currency is involved\', 4)').transacting(trx) + } catch (e) { await knex.raw('update currency set scale = \'4\' where currencyId = \'XXX\'').transacting(trx) } }) } diff --git a/migrations/950103_dropTransferParticipantStateChange.js b/migrations/950103_dropTransferParticipantStateChange.js index 1956566ef..2cdfab6b7 100644 --- a/migrations/950103_dropTransferParticipantStateChange.js +++ b/migrations/950103_dropTransferParticipantStateChange.js @@ -19,7 +19,7 @@ - Name Surname * ModusBox - - Deon Botha + - Deon Botha -------------- ******/ diff --git a/migrations/950104_settlementModel-settlementAccountTypeId.js b/migrations/950104_settlementModel-settlementAccountTypeId.js index d3ec68abd..99a5393c7 100644 --- a/migrations/950104_settlementModel-settlementAccountTypeId.js +++ b/migrations/950104_settlementModel-settlementAccountTypeId.js @@ -41,27 +41,22 @@ exports.up = async (knex) => { t.integer('settlementAccountTypeId').unsigned().defaultTo(null) }) await knex.transaction(async (trx) => { - try { - await knex.select('s.settlementModelId', 's.name', 'lat.name AS latName') - .from('settlementModel AS s') - .transacting(trx) - .innerJoin('ledgerAccountType as lat', 's.ledgerAccountTypeId', 'lat.ledgerAccountTypeId') - .then(async (models) => { - for (const model of models) { - let settlementAccountName - if (model.latName === 'POSITION') { - settlementAccountName = 'SETTLEMENT' - } else { - settlementAccountName = model.latName + '_SETTLEMENT' - } - await knex('settlementModel').transacting(trx).update({ settlementAccountTypeId: knex('ledgerAccountType').select('ledgerAccountTypeId').where('name', settlementAccountName) }) - .where('settlementModelId', model.settlementModelId) + await knex.select('s.settlementModelId', 's.name', 'lat.name AS latName') + .from('settlementModel AS s') + .transacting(trx) + .innerJoin('ledgerAccountType as lat', 's.ledgerAccountTypeId', 'lat.ledgerAccountTypeId') + .then(async (models) => { + for (const model of models) { + let settlementAccountName + if (model.latName === 'POSITION') { + settlementAccountName = 'SETTLEMENT' + } else { + settlementAccountName = model.latName + '_SETTLEMENT' } - }) - await trx.commit - } catch (e) { - await trx.rollback - } + await knex('settlementModel').transacting(trx).update({ settlementAccountTypeId: knex('ledgerAccountType').select('ledgerAccountTypeId').where('name', settlementAccountName) }) + .where('settlementModelId', model.settlementModelId) + } + }) }) await knex.schema.alterTable('settlementModel', (t) => { t.integer('settlementAccountTypeId').alter().notNullable() diff --git a/migrations/950108_participantProxy.js b/migrations/950108_participantProxy.js new file mode 100644 index 000000000..7b6c2ef58 --- /dev/null +++ b/migrations/950108_participantProxy.js @@ -0,0 +1,52 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ +'use strict' + +exports.up = async (knex) => { + return await knex.schema.hasTable('participant').then(function(exists) { + if (exists) { + return knex.schema.alterTable('participant', (t) => { + t.boolean('isProxy').defaultTo(false).notNullable() + + }) + } + }) +} + +exports.down = function (knex) { + return knex.schema.alterTable('participant', (t) => { + t.dropColumn('isProxy') + }) +} diff --git a/migrations/950109_fxQuote.js b/migrations/950109_fxQuote.js new file mode 100644 index 000000000..99d8e9763 --- /dev/null +++ b/migrations/950109_fxQuote.js @@ -0,0 +1,53 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ +// Notes: these changes are required for the quoting-service and are not used by central-ledger +'use strict' + +exports.up = (knex) => { + return knex.schema.hasTable('fxQuote').then((exists) => { + if (!exists) { + return knex.schema.createTable('fxQuote', (t) => { + t.string('conversionRequestId', 36).primary().notNullable() + + // time keeping + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable().comment('System dateTime stamp pertaining to the inserted record') + }) + } + }) +} + +exports.down = (knex) => { + return knex.schema.dropTableIfExists('fxQuote') +} diff --git a/migrations/950110_fxQuoteResponse.js b/migrations/950110_fxQuoteResponse.js new file mode 100644 index 000000000..523132dd0 --- /dev/null +++ b/migrations/950110_fxQuoteResponse.js @@ -0,0 +1,59 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ +'use strict' + +exports.up = (knex) => { + return knex.schema.hasTable('fxQuoteResponse').then((exists) => { + if (!exists) { + return knex.schema.createTable('fxQuoteResponse', (t) => { + t.bigIncrements('fxQuoteResponseId').primary().notNullable() + + // reference to the original fxQuote + t.string('conversionRequestId', 36).notNullable() + t.foreign('conversionRequestId').references('conversionRequestId').inTable('fxQuote') + + // ilpCondition sent in FXP response + t.string('ilpCondition', 256).notNullable() + + // time keeping + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable().comment('System dateTime stamp pertaining to the inserted record') + }) + } + }) +} + +exports.down = (knex) => { + return knex.schema.dropTableIfExists('fxQuoteResponse') +} diff --git a/migrations/950111_fxQuoteError.js b/migrations/950111_fxQuoteError.js new file mode 100644 index 000000000..e74c25ad3 --- /dev/null +++ b/migrations/950111_fxQuoteError.js @@ -0,0 +1,57 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ +// Notes: these changes are required for the quoting-service and are not used by central-ledger +'use strict' + +exports.up = (knex) => { + return knex.schema.hasTable('fxQuoteError').then((exists) => { + if (!exists) { + return knex.schema.createTable('fxQuoteError', (t) => { + t.bigIncrements('fxQuoteErrorId').primary().notNullable() + t.string('conversionRequestId', 36).notNullable() + t.foreign('conversionRequestId').references('conversionRequestId').inTable('fxQuote') + t.bigInteger('fxQuoteResponseId').unsigned().defaultTo(null).nullable().comment('The response to the initial fxQuote') + t.foreign('fxQuoteResponseId').references('fxQuoteResponseId').inTable('fxQuoteResponse') + t.integer('errorCode').unsigned().notNullable() + t.string('errorDescription', 128).notNullable() + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable() + }) + } + }) +} + +exports.down = (knex) => { + return knex.schema.dropTableIfExists('quoteError') +} diff --git a/migrations/950113_fxQuoteDuplicateCheck.js b/migrations/950113_fxQuoteDuplicateCheck.js new file mode 100644 index 000000000..3c7afd9dc --- /dev/null +++ b/migrations/950113_fxQuoteDuplicateCheck.js @@ -0,0 +1,52 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ +// Notes: these changes are required for the quoting-service and are not used by central-ledger +'use strict' + +exports.up = (knex) => { + return knex.schema.hasTable('fxQuoteDuplicateCheck').then((exists) => { + if (!exists) { + return knex.schema.createTable('fxQuoteDuplicateCheck', (t) => { + t.string('conversionRequestId', 36).primary().notNullable() + t.string('hash', 1024).defaultTo(null).nullable().comment('hash value received for the quote request') + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable().comment('System dateTime stamp pertaining to the inserted record') + }) + } + }) +} + +exports.down = (knex) => { + return knex.schema.dropTableIfExists('fxQuoteDuplicateCheck') +} diff --git a/migrations/950114_fxQuoteResponseDuplicateCheck.js b/migrations/950114_fxQuoteResponseDuplicateCheck.js new file mode 100644 index 000000000..74a048083 --- /dev/null +++ b/migrations/950114_fxQuoteResponseDuplicateCheck.js @@ -0,0 +1,55 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ +// Notes: these changes are required for the quoting-service and are not used by central-ledger +'use strict' + +exports.up = (knex) => { + return knex.schema.hasTable('fxQuoteResponseDuplicateCheck').then((exists) => { + if (!exists) { + return knex.schema.createTable('fxQuoteResponseDuplicateCheck', (t) => { + t.bigIncrements('fxQuoteResponseId').primary().unsigned().comment('The response to the initial quote') + t.foreign('fxQuoteResponseId').references('fxQuoteResponseId').inTable('fxQuoteResponse') + t.string('conversionRequestId', 36).notNullable() + t.foreign('conversionRequestId').references('conversionRequestId').inTable('fxQuote') + t.string('hash', 255).defaultTo(null).nullable().comment('hash value received for the quote response') + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable().comment('System dateTime stamp pertaining to the inserted record') + }) + } + }) +} + +exports.down = (knex) => { + return knex.schema.dropTableIfExists('fxQuoteResponseDuplicateCheck') +} diff --git a/migrations/950115_fxQuoteConversionTerms.js b/migrations/950115_fxQuoteConversionTerms.js new file mode 100644 index 000000000..82d57901f --- /dev/null +++ b/migrations/950115_fxQuoteConversionTerms.js @@ -0,0 +1,70 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ +'use strict' + +exports.up = (knex) => { + return knex.schema.hasTable('fxQuoteConversionTerms').then((exists) => { + if (!exists) { + return knex.schema.createTable('fxQuoteConversionTerms', (t) => { + t.string('conversionId').primary().notNullable() + t.string('determiningTransferId', 36).defaultTo(null).nullable() + + // reference to the original fxQuote + t.string('conversionRequestId', 36).notNullable() + t.foreign('conversionRequestId').references('conversionRequestId').inTable('fxQuote') + + t.integer('amountTypeId').unsigned().notNullable().comment('This is part of the transaction type that contains valid elements for - Amount Type') + t.foreign('amountTypeId').references('amountTypeId').inTable('amountType') + t.string('initiatingFsp', 255) + t.string('counterPartyFsp', 255) + t.decimal('sourceAmount', 18, 4).notNullable() + t.string('sourceCurrency', 3).notNullable() + t.foreign('sourceCurrency').references('currencyId').inTable('currency') + // Should only be nullable in POST /fxQuote request + t.decimal('targetAmount', 18, 4).defaultTo(null).nullable() + t.string('targetCurrency', 3).notNullable() + t.foreign('targetCurrency').references('currencyId').inTable('currency') + + // time keeping + t.dateTime('expirationDate').notNullable() + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable().comment('System dateTime stamp pertaining to the inserted record') + }) + } + }) +} + +exports.down = (knex) => { + return knex.schema.dropTableIfExists('fxQuoteConversionTerms') +} diff --git a/migrations/950116_fxQuoteConversionTermsExtension.js b/migrations/950116_fxQuoteConversionTermsExtension.js new file mode 100644 index 000000000..7daf55cbf --- /dev/null +++ b/migrations/950116_fxQuoteConversionTermsExtension.js @@ -0,0 +1,55 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ +// Notes: these changes are required for the quoting-service and are not used by central-ledger +'use strict' + +exports.up = (knex) => { + return knex.schema.hasTable('fxQuoteConversionTermsExtension').then((exists) => { + if (!exists) { + return knex.schema.createTable('fxQuoteConversionTermsExtension', (t) => { + t.bigIncrements('fxQuoteConversionTermExtension').primary().notNullable() + t.string('conversionId', 36).notNullable() + t.foreign('conversionId').references('conversionId').inTable('fxQuoteConversionTerms') + t.string('key', 128).notNullable() + t.text('value').notNullable() + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable().comment('System dateTime stamp pertaining to the inserted record') + }) + } + }) +} + +exports.down = (knex) => { + return knex.schema.dropTableIfExists('fxQuoteConversionTermsExtension') +} diff --git a/migrations/950117_fxQuoteResponseConversionTerms.js b/migrations/950117_fxQuoteResponseConversionTerms.js new file mode 100644 index 000000000..b60b75686 --- /dev/null +++ b/migrations/950117_fxQuoteResponseConversionTerms.js @@ -0,0 +1,73 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ +'use strict' + +exports.up = (knex) => { + return knex.schema.hasTable('fxQuoteResponseConversionTerms').then((exists) => { + if (!exists) { + return knex.schema.createTable('fxQuoteResponseConversionTerms', (t) => { + t.string('conversionId').primary().notNullable() + t.string('determiningTransferId', 36).defaultTo(null).nullable() + + // reference to the original fxQuote + t.string('conversionRequestId', 36).notNullable() + t.foreign('conversionRequestId').references('conversionRequestId').inTable('fxQuote') + + // reference to the original fxQuoteResponse + t.bigIncrements('fxQuoteResponseId', 36).notNullable() + t.foreign('fxQuoteResponseId').references('fxQuoteResponseId').inTable('fxQuoteResponse') + + t.integer('amountTypeId').unsigned().notNullable().comment('This is part of the transaction type that contains valid elements for - Amount Type') + t.foreign('amountTypeId').references('amountTypeId').inTable('amountType') + t.string('initiatingFsp', 255) + t.string('counterPartyFsp', 255) + t.decimal('sourceAmount', 18, 4).notNullable() + t.string('sourceCurrency', 3).notNullable() + t.foreign('sourceCurrency').references('currencyId').inTable('currency') + t.decimal('targetAmount', 18, 4).notNullable() + t.string('targetCurrency', 3).notNullable() + t.foreign('targetCurrency').references('currencyId').inTable('currency') + + // time keeping + t.dateTime('expirationDate').notNullable() + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable().comment('System dateTime stamp pertaining to the inserted record') + }) + } + }) +} + +exports.down = (knex) => { + return knex.schema.dropTableIfExists('fxQuoteResponseConversionTerms') +} diff --git a/migrations/950118_fxQuoteResponseConversionTermsExtension.js b/migrations/950118_fxQuoteResponseConversionTermsExtension.js new file mode 100644 index 000000000..1cd7317fc --- /dev/null +++ b/migrations/950118_fxQuoteResponseConversionTermsExtension.js @@ -0,0 +1,55 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ +// Notes: these changes are required for the quoting-service and are not used by central-ledger +'use strict' + +exports.up = (knex) => { + return knex.schema.hasTable('fxQuoteResponseConversionTermsExtension').then((exists) => { + if (!exists) { + return knex.schema.createTable('fxQuoteResponseConversionTermsExtension', (t) => { + t.bigIncrements('fxQuoteResponseConversionTermsExtension').primary().notNullable() + t.string('conversionId', 36).notNullable() + t.foreign('conversionId').references('conversionId').inTable('fxQuoteResponseConversionTerms') + t.string('key', 128).notNullable() + t.text('value').notNullable() + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable().comment('System dateTime stamp pertaining to the inserted record') + }) + } + }) +} + +exports.down = (knex) => { + return knex.schema.dropTableIfExists('fxQuoteResponseConversionTermsExtension') +} diff --git a/migrations/950119_fxCharge.js b/migrations/950119_fxCharge.js new file mode 100644 index 000000000..81799e192 --- /dev/null +++ b/migrations/950119_fxCharge.js @@ -0,0 +1,61 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ +'use strict' + +exports.up = (knex) => { + return knex.schema.hasTable('fxCharge').then((exists) => { + if (!exists) { + return knex.schema.createTable('fxCharge', (t) => { + t.bigIncrements('fxChargeId').primary().notNullable() + t.string('chargeType', 32).notNullable().comment('A description of the charge which is being levied.') + + // fxCharge should only be sent back in the response to an fxQuote + // so reference the terms in fxQuoteResponse `conversionTerms` + t.string('conversionId', 36).notNullable() + t.foreign('conversionId').references('conversionId').inTable('fxQuoteResponseConversionTerms') + + t.decimal('sourceAmount', 18, 4).nullable().comment('The amount of the charge which is being levied, expressed in the source currency.') + t.string('sourceCurrency', 3).nullable().comment('The currency in which the source amount charge is being levied.') + + t.decimal('targetAmount', 18, 4).nullable().comment('The amount of the charge which is being levied, expressed in the target currency.') + t.string('targetCurrency', 3).nullable().comment('The currency in which the target amount charge is being levied.') + }) + } + }) +} + +exports.down = (knex) => { + return knex.schema.dropTableIfExists('fxCharge') +} diff --git a/migrations/960100_create_externalParticipant.js b/migrations/960100_create_externalParticipant.js new file mode 100644 index 000000000..a0f4ab5f7 --- /dev/null +++ b/migrations/960100_create_externalParticipant.js @@ -0,0 +1,47 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Eugen Klymniuk + -------------- + **********/ + +exports.up = async (knex) => { + return knex.schema.hasTable('externalParticipant').then(function(exists) { + if (!exists) { + return knex.schema.createTable('externalParticipant', (t) => { + t.bigIncrements('externalParticipantId').primary().notNullable() + t.string('name', 30).notNullable() + t.unique('name') + t.dateTime('createdDate').defaultTo(knex.fn.now()).notNullable() + t.integer('proxyId').unsigned().notNullable() + t.foreign('proxyId').references('participantId').inTable('participant') + }) + } + }) +} + +exports.down = function (knex) { + return knex.schema.hasTable('externalParticipant').then(function(exists) { + if (!exists) { + return knex.schema.dropTableIfExists('externalParticipant') + } + }) +} diff --git a/migrations/960110_alter_transferParticipant__addFiled_externalParticipantId.js b/migrations/960110_alter_transferParticipant__addFiled_externalParticipantId.js new file mode 100644 index 000000000..13b01119e --- /dev/null +++ b/migrations/960110_alter_transferParticipant__addFiled_externalParticipantId.js @@ -0,0 +1,50 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Eugen Klymniuk + -------------- + **********/ + +const EP_ID_FIELD = 'externalParticipantId' + +exports.up = async (knex) => { + return knex.schema.hasTable('transferParticipant').then(function(exists) { + if (exists) { + return knex.schema.alterTable('transferParticipant', (t) => { + t.bigint(EP_ID_FIELD).unsigned().nullable() + t.foreign(EP_ID_FIELD).references(EP_ID_FIELD).inTable('externalParticipant') + t.index(EP_ID_FIELD) + }) + } + }) +} + +exports.down = async (knex) => { + return knex.schema.hasTable('transferParticipant').then(function(exists) { + if (exists) { + return knex.schema.alterTable('transferParticipant', (t) => { + t.dropIndex(EP_ID_FIELD) + t.dropForeign(EP_ID_FIELD) + t.dropColumn(EP_ID_FIELD) + }) + } + }) +} diff --git a/migrations/960111_alter_fxTransferParticipant__addFiled_externalParticipantId.js b/migrations/960111_alter_fxTransferParticipant__addFiled_externalParticipantId.js new file mode 100644 index 000000000..ecf4adefd --- /dev/null +++ b/migrations/960111_alter_fxTransferParticipant__addFiled_externalParticipantId.js @@ -0,0 +1,50 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Eugen Klymniuk + -------------- + **********/ + +const EP_ID_FIELD = 'externalParticipantId' + +exports.up = async (knex) => { + return knex.schema.hasTable('fxTransferParticipant').then((exists) => { + if (exists) { + return knex.schema.alterTable('fxTransferParticipant', (t) => { + t.bigint(EP_ID_FIELD).unsigned().nullable() + t.foreign(EP_ID_FIELD).references(EP_ID_FIELD).inTable('externalParticipant') + t.index(EP_ID_FIELD) + }) + } + }) +} + +exports.down = async (knex) => { + return knex.schema.hasTable('fxTransferParticipant').then((exists) => { + if (exists) { + return knex.schema.alterTable('fxTransferParticipant', (t) => { + t.dropIndex(EP_ID_FIELD) + t.dropForeign(EP_ID_FIELD) + t.dropColumn(EP_ID_FIELD) + }) + } + }) +} diff --git a/package-lock.json b/package-lock.json index 1535b785d..9d3f562c4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,67 +1,72 @@ { "name": "@mojaloop/central-ledger", - "version": "17.7.8", + "version": "17.8.0-snapshot.34", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@mojaloop/central-ledger", - "version": "17.7.8", + "version": "17.8.0-snapshot.34", "license": "Apache-2.0", "dependencies": { "@hapi/basic": "7.0.2", "@hapi/catbox-memory": "6.0.2", "@hapi/good": "9.0.1", - "@hapi/hapi": "21.3.10", + "@hapi/hapi": "21.3.12", "@hapi/inert": "7.1.0", "@hapi/joi": "17.1.1", "@hapi/vision": "7.0.3", - "@mojaloop/central-services-error-handling": "13.0.1", + "@mojaloop/central-services-error-handling": "13.0.2", "@mojaloop/central-services-health": "15.0.0", - "@mojaloop/central-services-logger": "11.3.1", - "@mojaloop/central-services-metrics": "12.0.8", - "@mojaloop/central-services-shared": "18.3.8", - "@mojaloop/central-services-stream": "11.3.1", - "@mojaloop/database-lib": "11.0.5", + "@mojaloop/central-services-logger": "11.5.1", + "@mojaloop/central-services-metrics": "12.4.2", + "@mojaloop/central-services-shared": "18.14.1", + "@mojaloop/central-services-stream": "11.4.1", + "@mojaloop/database-lib": "11.0.6", "@mojaloop/event-sdk": "14.1.1", + "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.1", "@mojaloop/ml-number": "11.2.4", "@mojaloop/object-store-lib": "12.0.3", "@now-ims/hapi-now-auth": "2.1.0", - "ajv": "8.16.0", + "ajv": "8.17.1", "ajv-keywords": "5.1.0", "base64url": "3.0.1", "blipp": "4.0.2", "commander": "12.1.0", - "cron": "3.1.7", + "cron": "3.3.1", "decimal.js": "10.4.3", "docdash": "2.0.2", "event-stream": "4.0.1", "five-bells-condition": "5.0.1", - "glob": "10.4.1", + "glob": "10.4.3", + "hapi-auth-basic": "5.0.0", "hapi-auth-bearer-token": "8.0.0", - "hapi-swagger": "17.2.1", + "hapi-swagger": "17.3.2", "ilp-packet": "2.2.0", "knex": "3.1.0", "lodash": "4.17.21", "moment": "2.30.1", "mongo-uri-builder": "^4.0.0", + "parse-strings-in-object": "2.0.0", "rc": "1.2.8", "require-glob": "^4.1.0" }, "devDependencies": { + "@types/mock-knex": "0.4.8", "async-retry": "1.3.3", - "audit-ci": "^7.0.1", + "audit-ci": "^7.1.0", "get-port": "5.1.1", - "jsdoc": "4.0.3", + "jsdoc": "4.0.4", "jsonpath": "1.1.1", - "nodemon": "3.1.3", - "npm-check-updates": "16.14.20", - "nyc": "17.0.0", + "mock-knex": "0.4.13", + "nodemon": "3.1.9", + "npm-check-updates": "17.1.11", + "nyc": "17.1.0", "pre-commit": "1.2.2", "proxyquire": "2.1.3", "replace": "^1.2.2", "sinon": "17.0.0", - "standard": "17.1.0", + "standard": "17.1.2", "standard-version": "^9.5.0", "tap-spec": "^5.0.0", "tap-xunit": "2.4.1", @@ -95,9 +100,9 @@ } }, "node_modules/@apidevtools/json-schema-ref-parser": { - "version": "11.6.2", - "resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-11.6.2.tgz", - "integrity": "sha512-ENUdLLT04aDbbHCRwfKf8gR67AhV0CdFrOAtk+FcakBAgaq6ds3HLK9X0BCyiFUz8pK9uP+k6YZyJaGG7Mt7vQ==", + "version": "11.7.0", + "resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-11.7.0.tgz", + "integrity": "sha512-pRrmXMCwnmrkS3MLgAIW5dXRzeTv6GLjkjb4HmxNnvAKXN1Nfzp4KmGADBQvlVUcqi+a5D+hfGDLLnd5NnYxog==", "dependencies": { "@jsdevtools/ono": "^7.1.3", "@types/json-schema": "^7.0.15", @@ -554,11 +559,9 @@ } }, "node_modules/@colors/colors": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", - "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", - "dev": true, - "optional": true, + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", + "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", "engines": { "node": ">=0.1.90" } @@ -705,12 +708,6 @@ "resolved": "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.3.0.tgz", "integrity": "sha512-5Aap/GaRupgNx/feGBwLLTVv8OQFfv3pq2lPRzPg9R+IOBnDgghTGW7l7EuVXOvg5cc/xSAlRW8rBrjIC3Nvqw==" }, - "node_modules/@gar/promisify": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", - "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", - "dev": true - }, "node_modules/@grpc/grpc-js": { "version": "1.10.9", "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.10.9.tgz", @@ -798,9 +795,9 @@ } }, "node_modules/@hapi/bounce": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@hapi/bounce/-/bounce-3.0.1.tgz", - "integrity": "sha512-G+/Pp9c1Ha4FDP+3Sy/Xwg2O4Ahaw3lIZFSX+BL4uWi64CmiETuZPxhKDUD4xBMOUZbBlzvO8HjiK8ePnhBadA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@hapi/bounce/-/bounce-3.0.2.tgz", + "integrity": "sha512-d0XmlTi3H9HFDHhQLjg4F4auL1EY3Wqj7j7/hGDhFFe6xAbnm3qiGrXeT93zZnPH8gH+SKAFYiRzu26xkXcH3g==", "dependencies": { "@hapi/boom": "^10.0.1", "@hapi/hoek": "^11.0.2" @@ -897,19 +894,19 @@ "deprecated": "This version has been deprecated and is no longer supported or maintained" }, "node_modules/@hapi/hapi": { - "version": "21.3.10", - "resolved": "https://registry.npmjs.org/@hapi/hapi/-/hapi-21.3.10.tgz", - "integrity": "sha512-CmEcmTREW394MaGGKvWpoOK4rG8tKlpZLs30tbaBzhCrhiL2Ti/HARek9w+8Ya4nMBGcd+kDAzvU44OX8Ms0Jg==", + "version": "21.3.12", + "resolved": "https://registry.npmjs.org/@hapi/hapi/-/hapi-21.3.12.tgz", + "integrity": "sha512-GCUP12dkb3QMjpFl+wEFO73nqKRmsnD5um/QDOn6lj2GjGBrDXPcT194mNARO+PPNXZOR4KmvIpHt/lceUncfg==", "dependencies": { - "@hapi/accept": "^6.0.1", + "@hapi/accept": "^6.0.3", "@hapi/ammo": "^6.0.1", "@hapi/boom": "^10.0.1", - "@hapi/bounce": "^3.0.1", + "@hapi/bounce": "^3.0.2", "@hapi/call": "^9.0.1", "@hapi/catbox": "^12.1.1", "@hapi/catbox-memory": "^6.0.2", "@hapi/heavy": "^8.0.1", - "@hapi/hoek": "^11.0.2", + "@hapi/hoek": "^11.0.6", "@hapi/mimos": "^7.0.1", "@hapi/podium": "^5.0.1", "@hapi/shot": "^6.0.1", @@ -917,7 +914,7 @@ "@hapi/statehood": "^8.1.1", "@hapi/subtext": "^8.1.0", "@hapi/teamwork": "^6.0.0", - "@hapi/topo": "^6.0.1", + "@hapi/topo": "^6.0.2", "@hapi/validate": "^2.0.1" }, "engines": { @@ -953,9 +950,9 @@ } }, "node_modules/@hapi/hoek": { - "version": "11.0.4", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-11.0.4.tgz", - "integrity": "sha512-PnsP5d4q7289pS2T2EgGz147BFJ2Jpb4yrEdkpz2IhgEUzos1S7HTl7ezWh1yfYzYlj89KzLdCRkqsP6SIryeQ==" + "version": "11.0.7", + "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-11.0.7.tgz", + "integrity": "sha512-HV5undWkKzcB4RZUusqOpcgxOaq6VOAH7zhhIr2g3G8NF/MlFO75SjOr2NfuSx0Mh40+1FqCkagKLJRykUWoFQ==" }, "node_modules/@hapi/inert": { "version": "7.1.0", @@ -1294,6 +1291,11 @@ "node": ">=6.9.0" } }, + "node_modules/@ioredis/commands": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz", + "integrity": "sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==" + }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", @@ -1496,19 +1498,12 @@ } }, "node_modules/@mojaloop/central-services-error-handling": { - "version": "13.0.1", - "resolved": "https://registry.npmjs.org/@mojaloop/central-services-error-handling/-/central-services-error-handling-13.0.1.tgz", - "integrity": "sha512-Hl0KBHX30LbF127tgqNK/fdo0hwa6Bt23tb8DesLstYawKtCesJtk9lPuo6jE+dafNeG2QusUwVQyI+7kwAUHQ==", + "version": "13.0.2", + "resolved": "https://registry.npmjs.org/@mojaloop/central-services-error-handling/-/central-services-error-handling-13.0.2.tgz", + "integrity": "sha512-HSxI7OrtPdA94aHNWmAD50Ve8lR6FmgOX2LaZSL/TPfx22PVTTht0eXU+IQSN/srF20f2tvCa2CdFxWBQf6Ilg==", "dependencies": { + "fast-safe-stringify": "2.1.1", "lodash": "4.17.21" - }, - "peerDependencies": { - "@mojaloop/sdk-standard-components": ">=18.x.x" - }, - "peerDependenciesMeta": { - "@mojaloop/sdk-standard-components": { - "optional": false - } } }, "node_modules/@mojaloop/central-services-health": { @@ -1570,51 +1565,88 @@ } }, "node_modules/@mojaloop/central-services-logger": { - "version": "11.3.1", - "resolved": "https://registry.npmjs.org/@mojaloop/central-services-logger/-/central-services-logger-11.3.1.tgz", - "integrity": "sha512-XVU2K5grE1ZcIyxUXeMlvoVkeIcs9y1/0EKxa2Bk5sEbqXUtHuR8jqbAGlwaUIi9T9YWZRJyVC77nOQe/X1teA==", + "version": "11.5.1", + "resolved": "https://registry.npmjs.org/@mojaloop/central-services-logger/-/central-services-logger-11.5.1.tgz", + "integrity": "sha512-l+6+w35NqFJn1Xl82l55x71vCARWTkO6hYAgwbFuqVRqX0jqaRi4oiXG2WwPRVMLqVv8idAboCMX/I6vg/d4Kw==", "dependencies": { - "@types/node": "^20.12.7", "parse-strings-in-object": "2.0.0", "rc": "1.2.8", "safe-stable-stringify": "^2.4.3", - "winston": "3.13.0" + "winston": "3.14.2" + } + }, + "node_modules/@mojaloop/central-services-logger/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@mojaloop/central-services-logger/node_modules/winston": { + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.14.2.tgz", + "integrity": "sha512-CO8cdpBB2yqzEf8v895L+GNKYJiEq8eKlHU38af3snQBQ+sdAIUepjMSguOIJC7ICbzm0ZI+Af2If4vIJrtmOg==", + "dependencies": { + "@colors/colors": "^1.6.0", + "@dabh/diagnostics": "^2.0.2", + "async": "^3.2.3", + "is-stream": "^2.0.0", + "logform": "^2.6.0", + "one-time": "^1.0.0", + "readable-stream": "^3.4.0", + "safe-stable-stringify": "^2.3.1", + "stack-trace": "0.0.x", + "triple-beam": "^1.3.0", + "winston-transport": "^4.7.0" + }, + "engines": { + "node": ">= 12.0.0" } }, "node_modules/@mojaloop/central-services-metrics": { - "version": "12.0.8", - "resolved": "https://registry.npmjs.org/@mojaloop/central-services-metrics/-/central-services-metrics-12.0.8.tgz", - "integrity": "sha512-eYWX56zMlj0M0bE6qBLzhwDjo0C4LUQLcQW8du3xJ3mhxH0fSmw+Y5wsmuPmUVQZ90EU4S8l39VcXwh6ludLVg==", + "version": "12.4.2", + "resolved": "https://registry.npmjs.org/@mojaloop/central-services-metrics/-/central-services-metrics-12.4.2.tgz", + "integrity": "sha512-0XFW9nBJNY70tya/DEYlGl12adfb/3cAWuHv88vF8JI+JQAIE/6ePyET1Wb3tMp0BUcjFF5b1XbbYcOF69wKZQ==", "dependencies": { - "prom-client": "14.2.0" + "prom-client": "15.1.3" } }, "node_modules/@mojaloop/central-services-shared": { - "version": "18.3.8", - "resolved": "https://registry.npmjs.org/@mojaloop/central-services-shared/-/central-services-shared-18.3.8.tgz", - "integrity": "sha512-Wk+uG+mnOFrFNeDq0ffE+OXvcAtfemSPocPdCRFvnF0p123tV9CiH540R29XrXlRTLt78JS4N3GBYyR7E3ZfBA==", + "version": "18.14.1", + "resolved": "https://registry.npmjs.org/@mojaloop/central-services-shared/-/central-services-shared-18.14.1.tgz", + "integrity": "sha512-m04gmTfm7WBqdFgZBPljgUWRQ+htCTQJQ9jjblvj4b5Rbw0YI4gntsjyBxFKcVIIqluCeSmhzb9GPTIP/6Simg==", "dependencies": { "@hapi/catbox": "12.1.1", "@hapi/catbox-memory": "5.0.1", - "axios": "1.7.2", + "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.1", + "axios": "1.7.9", "clone": "2.1.2", - "dotenv": "16.4.5", + "dotenv": "16.4.7", "env-var": "7.5.0", "event-stream": "4.0.1", - "immutable": "4.3.6", + "fast-safe-stringify": "^2.1.1", + "immutable": "5.0.3", + "ioredis": "^5.4.1", "lodash": "4.17.21", "mustache": "4.2.0", - "openapi-backend": "5.10.6", - "raw-body": "2.5.2", + "openapi-backend": "5.11.1", + "raw-body": "3.0.0", "rc": "1.2.8", "shins": "2.6.0", + "ulidx": "2.4.1", "uuid4": "2.0.3", "widdershins": "^4.0.1", - "yaml": "2.4.5" + "yaml": "2.6.1" }, "peerDependencies": { "@mojaloop/central-services-error-handling": ">=13.x.x", - "@mojaloop/central-services-logger": ">=11.x.x", + "@mojaloop/central-services-logger": ">=11.5.x", "@mojaloop/central-services-metrics": ">=12.x.x", "@mojaloop/event-sdk": ">=14.1.1", "ajv": "8.x.x", @@ -1649,12 +1681,6 @@ "@hapi/hoek": "9.x.x" } }, - "node_modules/@mojaloop/central-services-shared/node_modules/@hapi/boom/node_modules/@hapi/hoek": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.0.3.tgz", - "integrity": "sha512-jKtjLLDiH95b002sJVc5c74PE6KKYftuyVdVmsuYId5stTaWcRFqE+5ukZI4gDUKjGn8wv2C3zPn3/nyjEI7gg==", - "deprecated": "This version has been deprecated and is no longer supported or maintained" - }, "node_modules/@mojaloop/central-services-shared/node_modules/@hapi/catbox-memory": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/@hapi/catbox-memory/-/catbox-memory-5.0.1.tgz", @@ -1664,18 +1690,17 @@ "@hapi/hoek": "9.x.x" } }, - "node_modules/@mojaloop/central-services-shared/node_modules/@hapi/catbox-memory/node_modules/@hapi/hoek": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.0.3.tgz", - "integrity": "sha512-jKtjLLDiH95b002sJVc5c74PE6KKYftuyVdVmsuYId5stTaWcRFqE+5ukZI4gDUKjGn8wv2C3zPn3/nyjEI7gg==", - "deprecated": "This version has been deprecated and is no longer supported or maintained" + "node_modules/@mojaloop/central-services-shared/node_modules/@hapi/hoek": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", + "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" }, "node_modules/@mojaloop/central-services-stream": { - "version": "11.3.1", - "resolved": "https://registry.npmjs.org/@mojaloop/central-services-stream/-/central-services-stream-11.3.1.tgz", - "integrity": "sha512-mSdWvEFJEjKkZdDs+e1yeZm/gFfXTqA+eVRIBmp8p67QJy36ZTaAvrvebGYKZ60MBN2syDrqL+DbQMJdoxHLEA==", + "version": "11.4.1", + "resolved": "https://registry.npmjs.org/@mojaloop/central-services-stream/-/central-services-stream-11.4.1.tgz", + "integrity": "sha512-LbnT/JAqliL8xWf/vCt5fJGIP8+o5Gcx265GPXbJPKSQrJ8UV5cUs1CIv0S/nYjrZuvfeEI3RQYuc93NF9qO3g==", "dependencies": { - "async": "3.2.5", + "async": "3.2.6", "async-exit-hook": "2.0.1", "events": "3.3.0", "node-rdkafka": "2.18.0" @@ -1694,9 +1719,9 @@ } }, "node_modules/@mojaloop/database-lib": { - "version": "11.0.5", - "resolved": "https://registry.npmjs.org/@mojaloop/database-lib/-/database-lib-11.0.5.tgz", - "integrity": "sha512-u7MOtJIwwlyxeFlUplf7kcdjnyOZpXS1rqEQw21WBIRTl4RXqQl6/ThTCIjCxxGc4dK/BfZz7Spo10RHcWvSgw==", + "version": "11.0.6", + "resolved": "https://registry.npmjs.org/@mojaloop/database-lib/-/database-lib-11.0.6.tgz", + "integrity": "sha512-5rg8aBkHEaz6MkgVZqXkYFFVKAc80iQejmyZaws3vuZnrG6YfAhTGQTSZCDfYX3WqtDpt4OE8yhYeBua82ftMA==", "dependencies": { "knex": "3.1.0", "lodash": "4.17.21", @@ -1741,6 +1766,21 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, + "node_modules/@mojaloop/inter-scheme-proxy-cache-lib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@mojaloop/inter-scheme-proxy-cache-lib/-/inter-scheme-proxy-cache-lib-2.3.1.tgz", + "integrity": "sha512-94HhBs/DJOwyE24CSVBpySrulMHN/xntc9c/0ZjpOzVHBsu/HJmfiA/CuwTo0GGNFrCxM9FgwjccafQeEs2B1A==", + "dependencies": { + "@mojaloop/central-services-logger": "11.5.1", + "ajv": "^8.17.1", + "convict": "^6.2.4", + "fast-safe-stringify": "^2.1.1", + "ioredis": "^5.4.1" + }, + "engines": { + "node": ">=18.x" + } + }, "node_modules/@mojaloop/ml-number": { "version": "11.2.4", "resolved": "https://registry.npmjs.org/@mojaloop/ml-number/-/ml-number-11.2.4.tgz", @@ -1765,60 +1805,10 @@ } } }, - "node_modules/@mojaloop/sdk-standard-components": { - "version": "18.1.0", - "resolved": "https://registry.npmjs.org/@mojaloop/sdk-standard-components/-/sdk-standard-components-18.1.0.tgz", - "integrity": "sha512-8g4JuVl3f9t80OEtvn9BeUtlZIW4kcL40f72FZobtqQjAZ+yz4J0BlWS/OEJDpuYV1qoyxGiuMRojKqP2Yio7g==", - "peer": true, - "dependencies": { - "base64url": "3.0.1", - "fast-safe-stringify": "^2.1.1", - "ilp-packet": "2.2.0", - "jsonwebtoken": "9.0.2", - "jws": "4.0.0" - } - }, - "node_modules/@mojaloop/sdk-standard-components/node_modules/jsonwebtoken": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz", - "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==", - "peer": true, - "dependencies": { - "jws": "^3.2.2", - "lodash": "^4.17.21", - "ms": "^2.1.1", - "semver": "^7.3.8" - }, - "engines": { - "node": ">=12", - "npm": ">=6" - } - }, - "node_modules/@mojaloop/sdk-standard-components/node_modules/jsonwebtoken/node_modules/jws": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", - "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", - "peer": true, - "dependencies": { - "jwa": "^1.4.1", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/@mojaloop/sdk-standard-components/node_modules/jwa": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", - "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", - "peer": true, - "dependencies": { - "buffer-equal-constant-time": "1.0.1", - "ecdsa-sig-formatter": "1.0.11", - "safe-buffer": "^5.0.1" - } - }, "node_modules/@mongodb-js/saslprep": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.1.tgz", - "integrity": "sha512-t7c5K033joZZMspnHg/gWPE4kandgc2OxE74aYOtGKfgB9VPuVJPix0H6fhmm2erj5PBJ21mqcx34lpIGtUCsQ==", + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.9.tgz", + "integrity": "sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw==", "optional": true, "dependencies": { "sparse-bitfield": "^3.0.3" @@ -1919,427 +1909,134 @@ "safe-buffer": "^5.0.1" } }, - "node_modules/@npmcli/fs": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz", - "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==", - "dev": true, - "dependencies": { - "semver": "^7.3.5" - }, + "node_modules/@opentelemetry/api": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz", + "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==", "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">=8.0.0" } }, - "node_modules/@npmcli/git": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.1.0.tgz", - "integrity": "sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==", - "dev": true, - "dependencies": { - "@npmcli/promise-spawn": "^6.0.0", - "lru-cache": "^7.4.4", - "npm-pick-manifest": "^8.0.0", - "proc-log": "^3.0.0", - "promise-inflight": "^1.0.1", - "promise-retry": "^2.0.1", - "semver": "^7.3.5", - "which": "^3.0.0" - }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "optional": true, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">=14" } }, - "node_modules/@npmcli/git/node_modules/which": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", - "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", - "dev": true, + "node_modules/@protobufjs/aspromise": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", + "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==" + }, + "node_modules/@protobufjs/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", + "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" + }, + "node_modules/@protobufjs/codegen": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", + "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" + }, + "node_modules/@protobufjs/eventemitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", + "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==" + }, + "node_modules/@protobufjs/fetch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", + "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==", "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/which.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" } }, - "node_modules/@npmcli/installed-package-contents": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.2.tgz", - "integrity": "sha512-xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ==", + "node_modules/@protobufjs/float": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", + "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==" + }, + "node_modules/@protobufjs/inquire": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", + "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==" + }, + "node_modules/@protobufjs/path": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", + "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==" + }, + "node_modules/@protobufjs/pool": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", + "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==" + }, + "node_modules/@protobufjs/utf8": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", + "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" + }, + "node_modules/@sideway/address": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz", + "integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==", + "dependencies": { + "@hapi/hoek": "^9.0.0" + } + }, + "node_modules/@sideway/address/node_modules/@hapi/hoek": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.0.3.tgz", + "integrity": "sha512-jKtjLLDiH95b002sJVc5c74PE6KKYftuyVdVmsuYId5stTaWcRFqE+5ukZI4gDUKjGn8wv2C3zPn3/nyjEI7gg==", + "deprecated": "This version has been deprecated and is no longer supported or maintained" + }, + "node_modules/@sideway/formula": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz", + "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==" + }, + "node_modules/@sideway/pinpoint": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz", + "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" + }, + "node_modules/@sinonjs/commons": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz", + "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==", "dev": true, "dependencies": { - "npm-bundled": "^3.0.0", - "npm-normalize-package-bin": "^3.0.0" - }, - "bin": { - "installed-package-contents": "lib/index.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "type-detect": "4.0.8" } }, - "node_modules/@npmcli/move-file": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", - "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", - "deprecated": "This functionality has been moved to @npmcli/fs", + "node_modules/@sinonjs/fake-timers": { + "version": "11.2.2", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.2.2.tgz", + "integrity": "sha512-G2piCSxQ7oWOxwGSAyFHfPIsyeJGXYtc6mFbnFA+kRXkiEnTl8c/8jul2S329iFBnDI9HGoeWWAZvuvOkZccgw==", "dev": true, "dependencies": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "@sinonjs/commons": "^3.0.0" } }, - "node_modules/@npmcli/move-file/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "node_modules/@sinonjs/samsam": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.0.tgz", + "integrity": "sha512-Bp8KUVlLp8ibJZrnvq2foVhP0IVX2CIprMJPK0vqGqgrDa0OHVKeZyBykqskkrdxV6yKBPmGasO8LVjAKR3Gew==", "dev": true, "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "@sinonjs/commons": "^2.0.0", + "lodash.get": "^4.4.2", + "type-detect": "^4.0.8" } }, - "node_modules/@npmcli/move-file/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@npmcli/move-file/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/@npmcli/move-file/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@npmcli/node-gyp": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz", - "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==", - "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/promise-spawn": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz", - "integrity": "sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==", - "dev": true, - "dependencies": { - "which": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/promise-spawn/node_modules/which": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", - "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/which.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/run-script": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.2.tgz", - "integrity": "sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==", - "dev": true, - "dependencies": { - "@npmcli/node-gyp": "^3.0.0", - "@npmcli/promise-spawn": "^6.0.0", - "node-gyp": "^9.0.0", - "read-package-json-fast": "^3.0.0", - "which": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@npmcli/run-script/node_modules/which": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", - "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/which.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "optional": true, - "engines": { - "node": ">=14" - } - }, - "node_modules/@pnpm/config.env-replace": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz", - "integrity": "sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==", - "dev": true, - "engines": { - "node": ">=12.22.0" - } - }, - "node_modules/@pnpm/network.ca-file": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@pnpm/network.ca-file/-/network.ca-file-1.0.2.tgz", - "integrity": "sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==", - "dev": true, - "dependencies": { - "graceful-fs": "4.2.10" - }, - "engines": { - "node": ">=12.22.0" - } - }, - "node_modules/@pnpm/network.ca-file/node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true - }, - "node_modules/@pnpm/npm-conf": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.2.2.tgz", - "integrity": "sha512-UA91GwWPhFExt3IizW6bOeY/pQ0BkuNwKjk9iQW9KqxluGCrg4VenZ0/L+2Y0+ZOtme72EVvg6v0zo3AMQRCeA==", - "dev": true, - "dependencies": { - "@pnpm/config.env-replace": "^1.1.0", - "@pnpm/network.ca-file": "^1.0.1", - "config-chain": "^1.1.11" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@protobufjs/aspromise": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", - "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==" - }, - "node_modules/@protobufjs/base64": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", - "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" - }, - "node_modules/@protobufjs/codegen": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", - "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" - }, - "node_modules/@protobufjs/eventemitter": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", - "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==" - }, - "node_modules/@protobufjs/fetch": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", - "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==", - "dependencies": { - "@protobufjs/aspromise": "^1.1.1", - "@protobufjs/inquire": "^1.1.0" - } - }, - "node_modules/@protobufjs/float": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", - "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==" - }, - "node_modules/@protobufjs/inquire": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", - "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==" - }, - "node_modules/@protobufjs/path": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", - "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==" - }, - "node_modules/@protobufjs/pool": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", - "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==" - }, - "node_modules/@protobufjs/utf8": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", - "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" - }, - "node_modules/@sideway/address": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz", - "integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==", - "dependencies": { - "@hapi/hoek": "^9.0.0" - } - }, - "node_modules/@sideway/address/node_modules/@hapi/hoek": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.0.3.tgz", - "integrity": "sha512-jKtjLLDiH95b002sJVc5c74PE6KKYftuyVdVmsuYId5stTaWcRFqE+5ukZI4gDUKjGn8wv2C3zPn3/nyjEI7gg==", - "deprecated": "This version has been deprecated and is no longer supported or maintained" - }, - "node_modules/@sideway/formula": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz", - "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==" - }, - "node_modules/@sideway/pinpoint": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz", - "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" - }, - "node_modules/@sigstore/bundle": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.1.0.tgz", - "integrity": "sha512-PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog==", - "dev": true, - "dependencies": { - "@sigstore/protobuf-specs": "^0.2.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@sigstore/protobuf-specs": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz", - "integrity": "sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==", - "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@sigstore/sign": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-1.0.0.tgz", - "integrity": "sha512-INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA==", - "dev": true, - "dependencies": { - "@sigstore/bundle": "^1.1.0", - "@sigstore/protobuf-specs": "^0.2.0", - "make-fetch-happen": "^11.0.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@sigstore/tuf": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz", - "integrity": "sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==", - "dev": true, - "dependencies": { - "@sigstore/protobuf-specs": "^0.2.0", - "tuf-js": "^1.1.7" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@sindresorhus/is": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz", - "integrity": "sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==", - "dev": true, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sindresorhus/is?sponsor=1" - } - }, - "node_modules/@sinonjs/commons": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz", - "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==", - "dev": true, - "dependencies": { - "type-detect": "4.0.8" - } - }, - "node_modules/@sinonjs/fake-timers": { - "version": "11.2.2", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.2.2.tgz", - "integrity": "sha512-G2piCSxQ7oWOxwGSAyFHfPIsyeJGXYtc6mFbnFA+kRXkiEnTl8c/8jul2S329iFBnDI9HGoeWWAZvuvOkZccgw==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^3.0.0" - } - }, - "node_modules/@sinonjs/samsam": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.0.tgz", - "integrity": "sha512-Bp8KUVlLp8ibJZrnvq2foVhP0IVX2CIprMJPK0vqGqgrDa0OHVKeZyBykqskkrdxV6yKBPmGasO8LVjAKR3Gew==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^2.0.0", - "lodash.get": "^4.4.2", - "type-detect": "^4.0.8" - } - }, - "node_modules/@sinonjs/samsam/node_modules/@sinonjs/commons": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz", - "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==", + "node_modules/@sinonjs/samsam/node_modules/@sinonjs/commons": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz", + "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==", "dev": true, "dependencies": { "type-detect": "4.0.8" @@ -2351,55 +2048,6 @@ "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==", "dev": true }, - "node_modules/@szmarczak/http-timer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz", - "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==", - "dev": true, - "dependencies": { - "defer-to-connect": "^2.0.1" - }, - "engines": { - "node": ">=14.16" - } - }, - "node_modules/@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", - "dev": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tufjs/canonical-json": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz", - "integrity": "sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==", - "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@tufjs/models": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.4.tgz", - "integrity": "sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==", - "dev": true, - "dependencies": { - "@tufjs/canonical-json": "1.0.0", - "minimatch": "^9.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@types/http-cache-semantics": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz", - "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==", - "dev": true - }, "node_modules/@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", @@ -2444,6 +2092,15 @@ "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==", "dev": true }, + "node_modules/@types/mock-knex": { + "version": "0.4.8", + "resolved": "https://registry.npmjs.org/@types/mock-knex/-/mock-knex-0.4.8.tgz", + "integrity": "sha512-xRoaH9GmsgP5JBdMadzJSg/63HCifgJZsWmCJ5Z1rA36Fg3Y7Yb03dMzMIk5sHnBWcPkWqY/zyDO4nStI+Frbg==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/node": { "version": "20.12.7", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz", @@ -2458,12 +2115,6 @@ "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", "dev": true }, - "node_modules/@types/semver-utils": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@types/semver-utils/-/semver-utils-1.1.3.tgz", - "integrity": "sha512-T+YwkslhsM+CeuhYUxyAjWm7mJ5am/K10UX40RuA6k6Lc7eGtq8iY2xOzy7Vq0GOqhl/xZl5l2FwURZMTPTUww==", - "dev": true - }, "node_modules/@types/triple-beam": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz", @@ -2524,40 +2175,16 @@ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true, - "peerDependencies": { - "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/add-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz", - "integrity": "sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==", - "dev": true - }, - "node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/agentkeepalive": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz", - "integrity": "sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==", - "dev": true, - "dependencies": { - "humanize-ms": "^1.2.1" - }, - "engines": { - "node": ">= 8.0.0" + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, + "node_modules/add-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz", + "integrity": "sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==", + "dev": true + }, "node_modules/aggregate-error": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", @@ -2572,12 +2199,12 @@ } }, "node_modules/ajv": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz", - "integrity": "sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "dependencies": { "fast-deep-equal": "^3.1.3", - "fast-uri": "^2.3.0", + "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" }, @@ -2637,47 +2264,6 @@ "node": ">=0.10.0" } }, - "node_modules/ansi-align": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", - "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==", - "dev": true, - "dependencies": { - "string-width": "^4.1.0" - } - }, - "node_modules/ansi-align/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/ansi-align/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-align/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -2724,58 +2310,28 @@ "node": ">=8" } }, - "node_modules/aproba": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", - "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", - "dev": true - }, "node_modules/archy": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==", "dev": true }, - "node_modules/are-we-there-yet": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", - "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", - "dev": true, - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/are-we-there-yet/node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" }, "node_modules/array-buffer-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", - "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", + "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "is-array-buffer": "^3.0.1" + "call-bind": "^1.0.5", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -2793,15 +2349,16 @@ "dev": true }, "node_modules/array-includes": { - "version": "3.1.7", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz", - "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", + "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1", + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", "is-string": "^1.0.7" }, "engines": { @@ -2819,6 +2376,26 @@ "node": ">=8" } }, + "node_modules/array.prototype.findlast": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz", + "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/array.prototype.findlastindex": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", @@ -2875,30 +2452,34 @@ } }, "node_modules/array.prototype.tosorted": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.2.tgz", - "integrity": "sha512-HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz", + "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.2.1" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.3", + "es-errors": "^1.3.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" } }, "node_modules/arraybuffer.prototype.slice": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz", - "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", + "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", "dev": true, "dependencies": { - "array-buffer-byte-length": "^1.0.0", - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1", - "is-array-buffer": "^3.0.2", + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.2.1", + "get-intrinsic": "^1.2.3", + "is-array-buffer": "^3.0.4", "is-shared-array-buffer": "^1.0.2" }, "engines": { @@ -2928,9 +2509,9 @@ } }, "node_modules/async": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz", - "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==" + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", + "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==" }, "node_modules/async-exit-hook": { "version": "2.0.1", @@ -2949,24 +2530,15 @@ "retry": "0.13.1" } }, - "node_modules/asynciterator.prototype": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz", - "integrity": "sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==", - "dev": true, - "dependencies": { - "has-symbols": "^1.0.3" - } - }, "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/audit-ci": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/audit-ci/-/audit-ci-7.0.1.tgz", - "integrity": "sha512-NAZuQYyZHmtrNGpS4qfUp8nFvB+6UdfSOg7NUcsyvuDVfulXH3lpnN2PcXOUj7Jr3epAoQ6BCpXmjMODC8SBgQ==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/audit-ci/-/audit-ci-7.1.0.tgz", + "integrity": "sha512-PjjEejlST57S/aDbeWLic0glJ8CNl/ekY3kfGFPMrPkmuaYaDKcMH0F9x9yS9Vp6URhuefSCubl/G0Y2r6oP0g==", "dev": true, "dependencies": { "cross-spawn": "^7.0.3", @@ -2987,10 +2559,13 @@ } }, "node_modules/available-typed-arrays": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", "dev": true, + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, "engines": { "node": ">= 0.4" }, @@ -2999,9 +2574,9 @@ } }, "node_modules/axios": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz", - "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==", + "version": "1.7.9", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz", + "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", @@ -3084,9 +2659,9 @@ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" }, "node_modules/body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -3096,7 +2671,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", + "qs": "6.13.0", "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -3130,18 +2705,18 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, - "node_modules/body-parser/node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "node_modules/body-parser/node_modules/raw-body": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", "dependencies": { - "side-channel": "^1.0.4" + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" }, "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "node": ">= 0.8" } }, "node_modules/boolbase": { @@ -3149,63 +2724,20 @@ "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==" }, - "node_modules/boxen": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-7.1.1.tgz", - "integrity": "sha512-2hCgjEmP8YLWQ130n2FerGv7rYpfBmnmp9Uy2Le1vge6X3gZIfSmEzP5QTDElFxcvVcXlEn8Aq6MU/PZygIOog==", - "dev": true, + "node_modules/boom": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/boom/-/boom-7.3.0.tgz", + "integrity": "sha512-Swpoyi2t5+GhOEGw8rEsKvTxFLIDiiKoUc2gsoV6Lyr43LHBIzch3k2MvYUs8RTROrIkVJ3Al0TkaOGjnb+B6A==", + "deprecated": "This module has moved and is now available at @hapi/boom. Please update your dependencies as this version is no longer maintained an may contain bugs and security issues.", "dependencies": { - "ansi-align": "^3.0.1", - "camelcase": "^7.0.1", - "chalk": "^5.2.0", - "cli-boxes": "^3.0.0", - "string-width": "^5.1.2", - "type-fest": "^2.13.0", - "widest-line": "^4.0.1", - "wrap-ansi": "^8.1.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/boxen/node_modules/camelcase": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-7.0.1.tgz", - "integrity": "sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw==", - "dev": true, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/boxen/node_modules/chalk": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", - "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", - "dev": true, - "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "hoek": "6.x.x" } }, - "node_modules/boxen/node_modules/type-fest": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", - "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", - "dev": true, - "engines": { - "node": ">=12.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } + "node_modules/boom/node_modules/hoek": { + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.3.tgz", + "integrity": "sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ==", + "deprecated": "This module has moved and is now available at @hapi/hoek. Please update your dependencies as this version is no longer maintained an may contain bugs and security issues." }, "node_modules/brace-expansion": { "version": "2.0.1", @@ -3305,56 +2837,6 @@ "node": ">= 0.8" } }, - "node_modules/cacache": { - "version": "17.1.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz", - "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==", - "dev": true, - "dependencies": { - "@npmcli/fs": "^3.1.0", - "fs-minipass": "^3.0.0", - "glob": "^10.2.2", - "lru-cache": "^7.7.1", - "minipass": "^7.0.3", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "p-map": "^4.0.0", - "ssri": "^10.0.0", - "tar": "^6.1.11", - "unique-filename": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/cacheable-lookup": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz", - "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==", - "dev": true, - "engines": { - "node": ">=14.16" - } - }, - "node_modules/cacheable-request": { - "version": "10.2.14", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.14.tgz", - "integrity": "sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==", - "dev": true, - "dependencies": { - "@types/http-cache-semantics": "^4.0.2", - "get-stream": "^6.0.1", - "http-cache-semantics": "^4.1.1", - "keyv": "^4.5.3", - "mimic-response": "^4.0.0", - "normalize-url": "^8.0.0", - "responselike": "^3.0.0" - }, - "engines": { - "node": ">=14.16" - } - }, "node_modules/caching-transform": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz", @@ -3486,20 +2968,24 @@ } }, "node_modules/cheerio": { - "version": "1.0.0-rc.12", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz", - "integrity": "sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0.tgz", + "integrity": "sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==", "dependencies": { "cheerio-select": "^2.1.0", "dom-serializer": "^2.0.0", "domhandler": "^5.0.3", - "domutils": "^3.0.1", - "htmlparser2": "^8.0.1", - "parse5": "^7.0.0", - "parse5-htmlparser2-tree-adapter": "^7.0.0" + "domutils": "^3.1.0", + "encoding-sniffer": "^0.2.0", + "htmlparser2": "^9.1.0", + "parse5": "^7.1.2", + "parse5-htmlparser2-tree-adapter": "^7.0.0", + "parse5-parser-stream": "^7.1.2", + "undici": "^6.19.5", + "whatwg-mimetype": "^4.0.0" }, "engines": { - "node": ">= 6" + "node": ">=18.17" }, "funding": { "url": "https://github.com/cheeriojs/cheerio?sponsor=1" @@ -3547,96 +3033,13 @@ "fsevents": "~2.3.2" } }, - "node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "engines": { - "node": ">=8" - } - }, "node_modules/clean-stack": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/cli-boxes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz", - "integrity": "sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cli-table3": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz", - "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==", - "dev": true, - "dependencies": { - "string-width": "^4.2.0" - }, - "engines": { - "node": "10.* || >= 12.*" - }, - "optionalDependencies": { - "@colors/colors": "1.5.0" - } - }, - "node_modules/cli-table3/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/cli-table3/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/cli-table3/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, "engines": { - "node": ">=8" + "node": ">=6" } }, "node_modules/cliui": { @@ -3705,6 +3108,14 @@ "node": ">=0.8" } }, + "node_modules/cluster-key-slot": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz", + "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", @@ -3747,15 +3158,6 @@ "simple-swizzle": "^0.2.2" } }, - "node_modules/color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", - "dev": true, - "bin": { - "color-support": "bin.js" - } - }, "node_modules/color/node_modules/color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", @@ -3892,74 +3294,6 @@ "typedarray": "^0.0.6" } }, - "node_modules/config-chain": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", - "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", - "dev": true, - "dependencies": { - "ini": "^1.3.4", - "proto-list": "~1.2.1" - } - }, - "node_modules/config-chain/node_modules/ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true - }, - "node_modules/configstore": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-6.0.0.tgz", - "integrity": "sha512-cD31W1v3GqUlQvbBCGcXmd2Nj9SvLDOP1oQ0YFuLETufzSPaKp11rYBsSOm7rCsW3OnIRAFM3OxRhceaXNYHkA==", - "dev": true, - "dependencies": { - "dot-prop": "^6.0.1", - "graceful-fs": "^4.2.6", - "unique-string": "^3.0.0", - "write-file-atomic": "^3.0.3", - "xdg-basedir": "^5.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/yeoman/configstore?sponsor=1" - } - }, - "node_modules/configstore/node_modules/dot-prop": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz", - "integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==", - "dev": true, - "dependencies": { - "is-obj": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/configstore/node_modules/xdg-basedir": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz", - "integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", - "dev": true - }, "node_modules/content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", @@ -4314,12 +3648,24 @@ "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", "dev": true }, + "node_modules/convict": { + "version": "6.2.4", + "resolved": "https://registry.npmjs.org/convict/-/convict-6.2.4.tgz", + "integrity": "sha512-qN60BAwdMVdofckX7AlohVJ2x9UvjTNoKVXCL2LxFk1l7757EJqf1nySdMkPQer0bt8kQ5lQiyZ9/2NvrFBuwQ==", + "dependencies": { + "lodash.clonedeep": "^4.5.0", + "yargs-parser": "^20.2.7" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz", + "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==", "engines": { - "node": ">= 0.6" + "node": ">=18" } }, "node_modules/cookie-signature": { @@ -4333,18 +3679,18 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" }, "node_modules/cron": { - "version": "3.1.7", - "resolved": "https://registry.npmjs.org/cron/-/cron-3.1.7.tgz", - "integrity": "sha512-tlBg7ARsAMQLzgwqVxy8AZl/qlTc5nibqYwtNGoCrd+cV+ugI+tvZC1oT/8dFH8W455YrywGykx/KMmAqOr7Jw==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/cron/-/cron-3.3.1.tgz", + "integrity": "sha512-KpvuzJEbeTMTfLsXhUuDfsFYr8s5roUlLKb4fa68GszWrA4783C7q6m9yj4vyc6neyD/V9e0YiADSX2c+yRDXg==", "dependencies": { "@types/luxon": "~3.4.0", - "luxon": "~3.4.0" + "luxon": "~3.5.0" } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -4354,33 +3700,6 @@ "node": ">= 8" } }, - "node_modules/crypto-random-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-4.0.0.tgz", - "integrity": "sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==", - "dev": true, - "dependencies": { - "type-fest": "^1.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/crypto-random-string/node_modules/type-fest": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", - "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/css-select": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz", @@ -4416,6 +3735,57 @@ "node": ">=8" } }, + "node_modules/data-view-buffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", + "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz", + "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz", + "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/dateformat": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", @@ -4484,33 +3854,6 @@ "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==" }, - "node_modules/decompress-response": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "dev": true, - "dependencies": { - "mimic-response": "^3.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/decompress-response/node_modules/mimic-response": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/deep-equal": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz", @@ -4589,15 +3932,6 @@ "node": ">=0.8" } }, - "node_modules/defer-to-connect": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", - "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", - "dev": true, - "engines": { - "node": ">=10" - } - }, "node_modules/define-data-property": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", @@ -4648,11 +3982,13 @@ "node": ">=0.4.0" } }, - "node_modules/delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", - "dev": true + "node_modules/denque": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", + "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==", + "engines": { + "node": ">=0.10" + } }, "node_modules/depd": { "version": "2.0.0", @@ -4747,17 +4083,6 @@ "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, - "node_modules/dom-serializer/node_modules/entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", - "engines": { - "node": ">=0.12" - }, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, "node_modules/domelementtype": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", @@ -4820,9 +4145,9 @@ } }, "node_modules/dotenv": { - "version": "16.4.5", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", - "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", + "version": "16.4.7", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", + "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==", "engines": { "node": ">=12" }, @@ -5049,20 +4374,23 @@ "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==" }, "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "engines": { "node": ">= 0.8" } }, - "node_modules/encoding": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", - "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", - "optional": true, + "node_modules/encoding-sniffer": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/encoding-sniffer/-/encoding-sniffer-0.2.0.tgz", + "integrity": "sha512-ju7Wq1kg04I3HtiYIOrUrdfdDvkyO9s5XM8QAj/bN61Yo/Vb4vgJxy5vi4Yxk01gWHbrofpPtpxM8bKger9jhg==", "dependencies": { - "iconv-lite": "^0.6.2" + "iconv-lite": "^0.6.3", + "whatwg-encoding": "^3.1.1" + }, + "funding": { + "url": "https://github.com/fb55/encoding-sniffer?sponsor=1" } }, "node_modules/end-of-stream": { @@ -5074,22 +4402,16 @@ } }, "node_modules/entities": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz", - "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "engines": { + "node": ">=0.12" + }, "funding": { "url": "https://github.com/fb55/entities?sponsor=1" } }, - "node_modules/env-paths": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", - "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/env-var": { "version": "7.5.0", "resolved": "https://registry.npmjs.org/env-var/-/env-var-7.5.0.tgz", @@ -5098,12 +4420,6 @@ "node": ">=10" } }, - "node_modules/err-code": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", - "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", - "dev": true - }, "node_modules/error-callsites": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/error-callsites/-/error-callsites-2.0.4.tgz", @@ -5122,50 +4438,57 @@ } }, "node_modules/es-abstract": { - "version": "1.22.3", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz", - "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==", + "version": "1.23.3", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz", + "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==", "dev": true, "dependencies": { - "array-buffer-byte-length": "^1.0.0", - "arraybuffer.prototype.slice": "^1.0.2", - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.5", - "es-set-tostringtag": "^2.0.1", + "array-buffer-byte-length": "^1.0.1", + "arraybuffer.prototype.slice": "^1.0.3", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", + "data-view-buffer": "^1.0.1", + "data-view-byte-length": "^1.0.1", + "data-view-byte-offset": "^1.0.0", + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-set-tostringtag": "^2.0.3", "es-to-primitive": "^1.2.1", "function.prototype.name": "^1.1.6", - "get-intrinsic": "^1.2.2", - "get-symbol-description": "^1.0.0", + "get-intrinsic": "^1.2.4", + "get-symbol-description": "^1.0.2", "globalthis": "^1.0.3", "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0", - "has-proto": "^1.0.1", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.0.3", "has-symbols": "^1.0.3", - "hasown": "^2.0.0", - "internal-slot": "^1.0.5", - "is-array-buffer": "^3.0.2", + "hasown": "^2.0.2", + "internal-slot": "^1.0.7", + "is-array-buffer": "^3.0.4", "is-callable": "^1.2.7", - "is-negative-zero": "^2.0.2", + "is-data-view": "^1.0.1", + "is-negative-zero": "^2.0.3", "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.2", + "is-shared-array-buffer": "^1.0.3", "is-string": "^1.0.7", - "is-typed-array": "^1.1.12", + "is-typed-array": "^1.1.13", "is-weakref": "^1.0.2", "object-inspect": "^1.13.1", "object-keys": "^1.1.1", - "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.5.1", - "safe-array-concat": "^1.0.1", - "safe-regex-test": "^1.0.0", - "string.prototype.trim": "^1.2.8", - "string.prototype.trimend": "^1.0.7", - "string.prototype.trimstart": "^1.0.7", - "typed-array-buffer": "^1.0.0", - "typed-array-byte-length": "^1.0.0", - "typed-array-byte-offset": "^1.0.0", - "typed-array-length": "^1.0.4", + "object.assign": "^4.1.5", + "regexp.prototype.flags": "^1.5.2", + "safe-array-concat": "^1.1.2", + "safe-regex-test": "^1.0.3", + "string.prototype.trim": "^1.2.9", + "string.prototype.trimend": "^1.0.8", + "string.prototype.trimstart": "^1.0.8", + "typed-array-buffer": "^1.0.2", + "typed-array-byte-length": "^1.0.1", + "typed-array-byte-offset": "^1.0.2", + "typed-array-length": "^1.0.6", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.13" + "which-typed-array": "^1.1.15" }, "engines": { "node": ">= 0.4" @@ -5194,36 +4517,51 @@ } }, "node_modules/es-iterator-helpers": { - "version": "1.0.15", - "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz", - "integrity": "sha512-GhoY8uYqd6iwUl2kgjTm4CZAf6oo5mHK7BPqx3rKgx893YSsy0LGHV6gfqqQvZt/8xM8xeOnfXBCfqclMKkJ5g==", + "version": "1.0.19", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz", + "integrity": "sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==", "dev": true, "dependencies": { - "asynciterator.prototype": "^1.0.0", - "call-bind": "^1.0.2", + "call-bind": "^1.0.7", "define-properties": "^1.2.1", - "es-abstract": "^1.22.1", - "es-set-tostringtag": "^2.0.1", - "function-bind": "^1.1.1", - "get-intrinsic": "^1.2.1", + "es-abstract": "^1.23.3", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.0.3", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", "globalthis": "^1.0.3", - "has-property-descriptors": "^1.0.0", - "has-proto": "^1.0.1", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.0.3", "has-symbols": "^1.0.3", - "internal-slot": "^1.0.5", + "internal-slot": "^1.0.7", "iterator.prototype": "^1.1.2", - "safe-array-concat": "^1.0.1" + "safe-array-concat": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", + "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" } }, "node_modules/es-set-tostringtag": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", - "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", + "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", "dev": true, "dependencies": { - "get-intrinsic": "^1.2.2", - "has-tostringtag": "^1.0.0", - "hasown": "^2.0.0" + "get-intrinsic": "^1.2.4", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.1" }, "engines": { "node": ">= 0.4" @@ -5274,18 +4612,6 @@ "node": ">=6" } }, - "node_modules/escape-goat": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-4.0.0.tgz", - "integrity": "sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -5737,33 +5063,36 @@ } }, "node_modules/eslint-plugin-react": { - "version": "7.33.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz", - "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==", + "version": "7.36.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.36.1.tgz", + "integrity": "sha512-/qwbqNXZoq+VP30s1d4Nc1C5GTxjJQjk4Jzs4Wq2qzxFM7dSmuG2UkIjg2USMLh3A/aVcUNrK7v0J5U1XEGGwA==", "dev": true, + "license": "MIT", "dependencies": { - "array-includes": "^3.1.6", - "array.prototype.flatmap": "^1.3.1", - "array.prototype.tosorted": "^1.1.1", + "array-includes": "^3.1.8", + "array.prototype.findlast": "^1.2.5", + "array.prototype.flatmap": "^1.3.2", + "array.prototype.tosorted": "^1.1.4", "doctrine": "^2.1.0", - "es-iterator-helpers": "^1.0.12", + "es-iterator-helpers": "^1.0.19", "estraverse": "^5.3.0", + "hasown": "^2.0.2", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.1.2", - "object.entries": "^1.1.6", - "object.fromentries": "^2.0.6", - "object.hasown": "^1.1.2", - "object.values": "^1.1.6", + "object.entries": "^1.1.8", + "object.fromentries": "^2.0.8", + "object.values": "^1.2.0", "prop-types": "^15.8.1", - "resolve": "^2.0.0-next.4", + "resolve": "^2.0.0-next.5", "semver": "^6.3.1", - "string.prototype.matchall": "^4.0.8" + "string.prototype.matchall": "^4.0.11", + "string.prototype.repeat": "^1.0.0" }, "engines": { "node": ">=4" }, "peerDependencies": { - "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" + "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7" } }, "node_modules/eslint-plugin-react/node_modules/brace-expansion": { @@ -6110,29 +5439,18 @@ } }, "node_modules/execa/node_modules/cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dependencies": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - }, - "engines": { - "node": ">=4.8" - } - }, - "node_modules/execa/node_modules/get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz", + "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==", "dependencies": { - "pump": "^3.0.0" + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" }, "engines": { - "node": ">=6" + "node": ">=4.8" } }, "node_modules/execa/node_modules/is-stream": { @@ -6194,43 +5512,37 @@ "which": "bin/which" } }, - "node_modules/exponential-backoff": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", - "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", - "dev": true - }, "node_modules/express": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", + "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.12", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -6239,12 +5551,16 @@ }, "engines": { "node": ">= 0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/express/node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "engines": { "node": ">= 0.6" } @@ -6262,20 +5578,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, - "node_modules/express/node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", - "dependencies": { - "side-channel": "^1.0.4" - }, - "engines": { - "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/extensible-error": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/extensible-error/-/extensible-error-1.0.2.tgz", @@ -6312,21 +5614,15 @@ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", "dev": true }, - "node_modules/fast-memoize": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz", - "integrity": "sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==", - "dev": true - }, "node_modules/fast-safe-stringify": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==" }, "node_modules/fast-uri": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-2.3.0.tgz", - "integrity": "sha512-eel5UKGn369gGEWOqBShmFJWfq/xSJvsgDzgLYC845GneayWvXBf0lJCBn5qTABfewy1ZDPoaR5OZCP+kssfuw==" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", + "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==" }, "node_modules/fastq": { "version": "1.15.0", @@ -6426,12 +5722,12 @@ } }, "node_modules/finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dependencies": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -6514,63 +5810,6 @@ "node": ">=12.0.0" } }, - "node_modules/flat-cache/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/flat-cache/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/flat-cache/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/flat-cache/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/flatted": { "version": "3.2.9", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", @@ -6583,9 +5822,9 @@ "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==" }, "node_modules/follow-redirects": { - "version": "1.15.6", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", - "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", "funding": [ { "type": "individual", @@ -6616,9 +5855,9 @@ "integrity": "sha512-k6GAGDyqLe9JaebCsFCoudPPWfihKu8pylYXRlqP1J7ms39iPoTtk2fviNglIeQEwdh0bQeKJ01ZPyuyQvKzwg==" }, "node_modules/foreground-child": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", - "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", + "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", "dependencies": { "cross-spawn": "^7.0.0", "signal-exit": "^4.0.1" @@ -6631,9 +5870,9 @@ } }, "node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz", + "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -6643,15 +5882,6 @@ "node": ">= 6" } }, - "node_modules/form-data-encoder": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz", - "integrity": "sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==", - "dev": true, - "engines": { - "node": ">= 14.17" - } - }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -6660,15 +5890,6 @@ "node": ">= 0.6" } }, - "node_modules/fp-and-or": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/fp-and-or/-/fp-and-or-0.1.4.tgz", - "integrity": "sha512-+yRYRhpnFPWXSly/6V4Lw9IfOV26uu30kynGJ03PW+MnjOEQe45RZ141QcS0aJehYBYA50GfCDnsRbFJdhssRw==", - "dev": true, - "engines": { - "node": ">=10" - } - }, "node_modules/fresh": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", @@ -6702,18 +5923,6 @@ } ] }, - "node_modules/fs-minipass": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", - "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", - "dev": true, - "dependencies": { - "minipass": "^7.0.3" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/fs-readfile-promise": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/fs-readfile-promise/-/fs-readfile-promise-2.0.1.tgz", @@ -6807,63 +6016,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/gauge": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", - "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", - "dev": true, - "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/gauge/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/gauge/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "node_modules/gauge/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/gauge/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", @@ -7067,25 +6219,25 @@ } }, "node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true, - "engines": { - "node": ">=10" + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "dependencies": { + "pump": "^3.0.0" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "engines": { + "node": ">=6" } }, "node_modules/get-symbol-description": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", - "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", + "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" + "call-bind": "^1.0.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4" }, "engines": { "node": ">= 0.4" @@ -7181,21 +6333,22 @@ "dev": true }, "node_modules/glob": { - "version": "10.4.1", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz", - "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==", + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz", + "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==", "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" }, "engines": { - "node": ">=16 || 14 >=14.18" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -7212,30 +6365,6 @@ "node": ">= 6" } }, - "node_modules/global-dirs": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz", - "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==", - "dev": true, - "dependencies": { - "ini": "2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/global-dirs/node_modules/ini": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz", - "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==", - "dev": true, - "engines": { - "node": ">=10" - } - }, "node_modules/globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", @@ -7290,31 +6419,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/got": { - "version": "12.6.1", - "resolved": "https://registry.npmjs.org/got/-/got-12.6.1.tgz", - "integrity": "sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==", - "dev": true, - "dependencies": { - "@sindresorhus/is": "^5.2.0", - "@szmarczak/http-timer": "^5.0.1", - "cacheable-lookup": "^7.0.0", - "cacheable-request": "^10.2.8", - "decompress-response": "^6.0.0", - "form-data-encoder": "^2.1.2", - "get-stream": "^6.0.1", - "http2-wrapper": "^2.1.10", - "lowercase-keys": "^3.0.0", - "p-cancelable": "^3.0.0", - "responselike": "^3.0.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sindresorhus/got?sponsor=1" - } - }, "node_modules/graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", @@ -7346,6 +6450,50 @@ "uglify-js": "^3.1.4" } }, + "node_modules/hapi": { + "version": "18.1.0", + "resolved": "https://registry.npmjs.org/hapi/-/hapi-18.1.0.tgz", + "integrity": "sha512-nSU1VLyTAgp7P5gy47QzJIP2JAb+wOFvJIV3gnL0lFj/mD+HuTXhyUsDYXjF/dhADMVXVEz31z6SUHBJhtsvGA==", + "deprecated": "This version contains severe security issues and defects and should not be used! Please upgrade to the latest version of @hapi/hapi or consider a commercial license (https://github.com/hapijs/hapi/issues/4114)", + "hasShrinkwrap": true, + "peer": true, + "dependencies": { + "accept": "3.x.x", + "ammo": "3.x.x", + "boom": "7.x.x", + "bounce": "1.x.x", + "call": "5.x.x", + "catbox": "10.x.x", + "catbox-memory": "4.x.x", + "heavy": "6.x.x", + "hoek": "6.x.x", + "joi": "14.x.x", + "mimos": "4.x.x", + "podium": "3.x.x", + "shot": "4.x.x", + "somever": "2.x.x", + "statehood": "6.x.x", + "subtext": "6.x.x", + "teamwork": "3.x.x", + "topo": "3.x.x" + } + }, + "node_modules/hapi-auth-basic": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/hapi-auth-basic/-/hapi-auth-basic-5.0.0.tgz", + "integrity": "sha512-4ceLge/CYBtEAvfnbwBPPck2wb9O7wksaeSOF0C1lp8GX2IuIm8BqtZtvDGLhqNH5j3ztP4im/TfCj3oYQ9bgA==", + "deprecated": "This module has moved and is now available at @hapi/basic. Please update your dependencies as this version is no longer maintained an may contain bugs and security issues.", + "dependencies": { + "boom": "7.x.x", + "hoek": "5.x.x" + }, + "engines": { + "node": ">=8.9.0" + }, + "peerDependencies": { + "hapi": ">=17.x.x" + } + }, "node_modules/hapi-auth-bearer-token": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/hapi-auth-bearer-token/-/hapi-auth-bearer-token-8.0.0.tgz", @@ -7368,26 +6516,194 @@ "integrity": "sha512-jKtjLLDiH95b002sJVc5c74PE6KKYftuyVdVmsuYId5stTaWcRFqE+5ukZI4gDUKjGn8wv2C3zPn3/nyjEI7gg==", "deprecated": "This version has been deprecated and is no longer supported or maintained" }, - "node_modules/hapi-swagger": { - "version": "17.2.1", - "resolved": "https://registry.npmjs.org/hapi-swagger/-/hapi-swagger-17.2.1.tgz", - "integrity": "sha512-IaF3OHfYjzDuyi5EQgS0j0xB7sbAAD4DaTwexdhPYqEBI/J7GWMXFbftGObCIOeMVDufjoSBZWeaarEkNn6/ww==", - "dependencies": { - "@apidevtools/json-schema-ref-parser": "^11.1.0", - "@hapi/boom": "^10.0.1", - "@hapi/hoek": "^11.0.2", - "handlebars": "^4.7.8", - "http-status": "^1.7.3", - "swagger-parser": "^10.0.3", - "swagger-ui-dist": "^5.9.1" - }, - "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "@hapi/hapi": ">=20.x.x", - "joi": "17.x" - } + "node_modules/hapi-swagger": { + "version": "17.3.2", + "resolved": "https://registry.npmjs.org/hapi-swagger/-/hapi-swagger-17.3.2.tgz", + "integrity": "sha512-mj1KPBl5UY4rLTLj9CrgNCps29iZ7vKNTEey3Ztm7fZ/DrMdJ7KHdxSucACyaFdPAiEpfJtHvm/5lxJVXVxa4g==", + "dependencies": { + "@apidevtools/json-schema-ref-parser": "^11.7.0", + "@hapi/boom": "^10.0.1", + "@hapi/hoek": "^11.0.4", + "handlebars": "^4.7.8", + "http-status": "^1.7.4", + "swagger-parser": "^10.0.3", + "swagger-ui-dist": "^5.17.14" + }, + "engines": { + "node": ">=16.0.0" + }, + "peerDependencies": { + "@hapi/hapi": ">=20.x.x", + "joi": "17.x" + } + }, + "node_modules/hapi/node_modules/accept": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/accept/-/accept-3.1.3.tgz", + "integrity": "sha512-OgOEAidVEOKPup+Gv2+2wdH2AgVKI9LxsJ4hicdJ6cY0faUuZdZoi56kkXWlHp9qicN1nWQLmW5ZRGk+SBS5xg==", + "peer": true + }, + "node_modules/hapi/node_modules/ammo": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/ammo/-/ammo-3.0.3.tgz", + "integrity": "sha512-vo76VJ44MkUBZL/BzpGXaKzMfroF4ZR6+haRuw9p+eSWfoNaH2AxVc8xmiEPC08jhzJSeM6w7/iMUGet8b4oBQ==", + "peer": true + }, + "node_modules/hapi/node_modules/b64": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/b64/-/b64-4.1.2.tgz", + "integrity": "sha512-+GUspBxlH3CJaxMUGUE1EBoWM6RKgWiYwUDal0qdf8m3ArnXNN1KzKVo5HOnE/FSq4HHyWf3TlHLsZI8PKQgrQ==", + "extraneous": true + }, + "node_modules/hapi/node_modules/boom": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/boom/-/boom-7.3.0.tgz", + "integrity": "sha512-Swpoyi2t5+GhOEGw8rEsKvTxFLIDiiKoUc2gsoV6Lyr43LHBIzch3k2MvYUs8RTROrIkVJ3Al0TkaOGjnb+B6A==", + "peer": true + }, + "node_modules/hapi/node_modules/bounce": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/bounce/-/bounce-1.2.3.tgz", + "integrity": "sha512-3G7B8CyBnip5EahCZJjnvQ1HLyArC6P5e+xcolo13BVI9ogFaDOsNMAE7FIWliHtIkYI8/nTRCvCY9tZa3Mu4g==", + "peer": true + }, + "node_modules/hapi/node_modules/bourne": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/bourne/-/bourne-1.1.1.tgz", + "integrity": "sha512-Ou0l3W8+n1FuTOoIfIrCk9oF9WVWc+9fKoAl67XQr9Ws0z7LgILRZ7qtc9xdT4BveSKtnYXfKPgn8pFAqeQRew==", + "extraneous": true + }, + "node_modules/hapi/node_modules/call": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/call/-/call-5.0.3.tgz", + "integrity": "sha512-eX16KHiAYXugbFu6VifstSdwH6aMuWWb4s0qvpq1nR1b+Sf+u68jjttg8ixDBEldPqBi30bDU35OJQWKeTLKxg==", + "peer": true + }, + "node_modules/hapi/node_modules/catbox": { + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/catbox/-/catbox-10.0.6.tgz", + "integrity": "sha512-gQWCnF/jbHcfwGbQ4FQxyRiAwLRipqWTTXjpq7rTqqdcsnZosFa0L3LsCZcPTF33QIeMMkS7QmFBHt6QdzGPvg==", + "peer": true + }, + "node_modules/hapi/node_modules/catbox-memory": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/catbox-memory/-/catbox-memory-4.0.1.tgz", + "integrity": "sha512-ZmqNiLsYCIu9qvBJ/MQbznDV2bFH5gFiH67TgIJgSSffJFtTXArT+MM3AvJQlby9NSkLHOX4eH/uuUqnch/Ldw==", + "peer": true + }, + "node_modules/hapi/node_modules/content": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/content/-/content-4.0.6.tgz", + "integrity": "sha512-lR9ND3dXiMdmsE84K6l02rMdgiBVmtYWu1Vr/gfSGHcIcznBj2QxmSdUgDuNFOA+G9yrb1IIWkZ7aKtB6hDGyA==", + "extraneous": true + }, + "node_modules/hapi/node_modules/cryptiles": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-4.1.3.tgz", + "integrity": "sha512-gT9nyTMSUC1JnziQpPbxKGBbUg8VL7Zn2NB4E1cJYvuXdElHrwxrV9bmltZGDzet45zSDGyYceueke1TjynGzw==", + "extraneous": true + }, + "node_modules/hapi/node_modules/heavy": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/heavy/-/heavy-6.1.2.tgz", + "integrity": "sha512-cJp884bqhiebNcEHydW0g6V1MUGYOXRPw9c7MFiHQnuGxtbWuSZpsbojwb2kxb3AA1/Rfs8CNiV9MMOF8pFRDg==", + "peer": true + }, + "node_modules/hapi/node_modules/hoek": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.2.tgz", + "integrity": "sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q==", + "peer": true + }, + "node_modules/hapi/node_modules/iron": { + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/iron/-/iron-5.0.6.tgz", + "integrity": "sha512-zYUMOSkEXGBdwlV/AXF9zJC0aLuTJUKHkGeYS5I2g225M5i6SrxQyGJGhPgOR8BK1omL6N5i6TcwfsXbP8/Exw==", + "extraneous": true + }, + "node_modules/hapi/node_modules/joi": { + "version": "14.3.1", + "resolved": "https://registry.npmjs.org/joi/-/joi-14.3.1.tgz", + "integrity": "sha512-LQDdM+pkOrpAn4Lp+neNIFV3axv1Vna3j38bisbQhETPMANYRbFJFUyOZcOClYvM/hppMhGWuKSFEK9vjrB+bQ==", + "peer": true + }, + "node_modules/hapi/node_modules/mime-db": { + "version": "1.37.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz", + "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==", + "extraneous": true + }, + "node_modules/hapi/node_modules/mimos": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/mimos/-/mimos-4.0.2.tgz", + "integrity": "sha512-5XBsDqBqzSN88XPPH/TFpOalWOjHJM5Z2d3AMx/30iq+qXvYKd/8MPhqBwZDOLtoaIWInR3nLzMQcxfGK9djXA==", + "peer": true + }, + "node_modules/hapi/node_modules/nigel": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/nigel/-/nigel-3.0.4.tgz", + "integrity": "sha512-3SZCCS/duVDGxFpTROHEieC+itDo4UqL9JNUyQJv3rljudQbK6aqus5B4470OxhESPJLN93Qqxg16rH7DUjbfQ==", + "extraneous": true + }, + "node_modules/hapi/node_modules/pez": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/pez/-/pez-4.0.5.tgz", + "integrity": "sha512-HvL8uiFIlkXbx/qw4B8jKDCWzo7Pnnd65Uvanf9OOCtb20MRcb9gtTVBf9NCnhETif1/nzbDHIjAWC/sUp7LIQ==", + "extraneous": true + }, + "node_modules/hapi/node_modules/podium": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/podium/-/podium-3.2.0.tgz", + "integrity": "sha512-rbwvxwVkI6gRRlxZQ1zUeafrpGxZ7QPHIheinehAvGATvGIPfWRkaTeWedc5P4YjXJXEV8ZbBxPtglNylF9hjw==", + "peer": true + }, + "node_modules/hapi/node_modules/shot": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/shot/-/shot-4.0.7.tgz", + "integrity": "sha512-RKaKAGKxJ11EjJl0cf2fYVSsd4KB5Cncb9J0v7w+0iIaXpxNqFWTYNDNhBX7f0XSyDrjOH9a4OWZ9Gp/ZML+ew==", + "peer": true + }, + "node_modules/hapi/node_modules/somever": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/somever/-/somever-2.0.0.tgz", + "integrity": "sha512-9JaIPP+HxwYGqCDqqK3tRaTqdtQHoK6Qy3IrXhIt2q5x8fs8RcfU7BMWlFTCOgFazK8p88zIv1tHQXvAwtXMyw==", + "peer": true + }, + "node_modules/hapi/node_modules/statehood": { + "version": "6.0.9", + "resolved": "https://registry.npmjs.org/statehood/-/statehood-6.0.9.tgz", + "integrity": "sha512-jbFg1+MYEqfC7ABAoWZoeF4cQUtp3LUvMDUGExL76cMmleBHG7I6xlZFsE8hRi7nEySIvutHmVlLmBe9+2R5LQ==", + "peer": true + }, + "node_modules/hapi/node_modules/subtext": { + "version": "6.0.12", + "resolved": "https://registry.npmjs.org/subtext/-/subtext-6.0.12.tgz", + "integrity": "sha512-yT1wCDWVgqvL9BIkWzWqgj5spUSYo/Enu09iUV8t2ZvHcr2tKGTGg2kc9tUpVEsdhp1ihsZeTAiDqh0TQciTPQ==", + "peer": true + }, + "node_modules/hapi/node_modules/teamwork": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/teamwork/-/teamwork-3.0.3.tgz", + "integrity": "sha512-OCB56z+G70iA1A1OFoT+51TPzfcgN0ks75uN3yhxA+EU66WTz2BevNDK4YzMqfaL5tuAvxy4iFUn35/u8pxMaQ==", + "peer": true + }, + "node_modules/hapi/node_modules/topo": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/topo/-/topo-3.0.3.tgz", + "integrity": "sha512-IgpPtvD4kjrJ7CRA3ov2FhWQADwv+Tdqbsf1ZnPUSAtCJ9e1Z44MmoSGDXGk4IppoZA7jd/QRkNddlLJWlUZsQ==", + "peer": true + }, + "node_modules/hapi/node_modules/vise": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/vise/-/vise-3.0.2.tgz", + "integrity": "sha512-X52VtdRQbSBXdjcazRiY3eRgV3vTQ0B+7Wh8uC9cVv7lKfML5m9+9NHlbcgCY0R9EAqD1v/v7o9mhGh2A3ANFg==", + "extraneous": true + }, + "node_modules/hapi/node_modules/wreck": { + "version": "14.1.3", + "resolved": "https://registry.npmjs.org/wreck/-/wreck-14.1.3.tgz", + "integrity": "sha512-hb/BUtjX3ObbwO3slCOLCenQ4EP8e+n8j6FmTne3VhEFp5XV1faSJojiyxVSvw34vgdeTG5baLTl4NmjwokLlw==", + "extraneous": true }, "node_modules/har-schema": { "version": "2.0.0", @@ -7496,9 +6812,9 @@ } }, "node_modules/has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", "engines": { "node": ">= 0.4" }, @@ -7518,12 +6834,12 @@ } }, "node_modules/has-tostringtag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", "dev": true, "dependencies": { - "has-symbols": "^1.0.2" + "has-symbols": "^1.0.3" }, "engines": { "node": ">= 0.4" @@ -7532,24 +6848,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", - "dev": true - }, - "node_modules/has-yarn": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-3.0.0.tgz", - "integrity": "sha512-IrsVwUHhEULx3R8f/aA8AHuEzAorplsab/v8HBzEiIukwq5i/EC+xmOW+HfP1OaDP+2JkgT1yILHN2O3UFIbcA==", - "dev": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/hasha": { "version": "5.2.2", "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz", @@ -7567,9 +6865,9 @@ } }, "node_modules/hasown": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", - "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", "dependencies": { "function-bind": "^1.1.2" }, @@ -7591,16 +6889,13 @@ "integrity": "sha512-FK1vmMj8BbEipEy8DLIvp71t5UsC7n2D6En/UfM/91PCwmOpj6f2iu0Y0coRC62KSRHHC+dquM2xMULV/X7NFg==", "deprecated": "Use the 'highlight.js' package instead https://npm.im/highlight.js" }, - "node_modules/hosted-git-info": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-5.2.1.tgz", - "integrity": "sha512-xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw==", - "dev": true, - "dependencies": { - "lru-cache": "^7.5.1" - }, + "node_modules/hoek": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-5.0.4.tgz", + "integrity": "sha512-Alr4ZQgoMlnere5FZJsIyfIjORBqZll5POhDsF4q64dPuJR6rNxXdDxtHSQq8OXRurhmx+PWYEE8bXRROY8h0w==", + "deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).", "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": ">=8.9.0" } }, "node_modules/html-escaper": { @@ -7610,9 +6905,9 @@ "dev": true }, "node_modules/htmlparser2": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz", - "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz", + "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==", "funding": [ "https://github.com/fb55/htmlparser2?sponsor=1", { @@ -7623,27 +6918,10 @@ "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.3", - "domutils": "^3.0.1", - "entities": "^4.4.0" - } - }, - "node_modules/htmlparser2/node_modules/entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", - "engines": { - "node": ">=0.12" - }, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" + "domutils": "^3.1.0", + "entities": "^4.5.0" } }, - "node_modules/http-cache-semantics": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", - "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", - "dev": true - }, "node_modules/http-errors": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", @@ -7659,24 +6937,10 @@ "node": ">= 0.8" } }, - "node_modules/http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "dev": true, - "dependencies": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/http-status": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/http-status/-/http-status-1.7.3.tgz", - "integrity": "sha512-GS8tL1qHT2nBCMJDYMHGkkkKQLNkIAHz37vgO68XKvzv+XyqB4oh/DfmMHdtRzfqSJPj1xKG2TaELZtlCz6BEQ==", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/http-status/-/http-status-1.7.4.tgz", + "integrity": "sha512-c2qSwNtTlHVYAhMj9JpGdyo0No/+DiKXCJ9pHtZ2Yf3QmPnBIytKSRT7BuyIiQ7icXLynavGmxUqkOjSrAuMuA==", "engines": { "node": ">= 0.4.0" } @@ -7686,44 +6950,6 @@ "resolved": "https://registry.npmjs.org/http2-client/-/http2-client-1.3.5.tgz", "integrity": "sha512-EC2utToWl4RKfs5zd36Mxq7nzHHBuomZboI0yYL6Y0RmBgT7Sgkq4rQ0ezFTYoIsSs7Tm9SJe+o2FcAg6GBhGA==" }, - "node_modules/http2-wrapper": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.0.tgz", - "integrity": "sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==", - "dev": true, - "dependencies": { - "quick-lru": "^5.1.1", - "resolve-alpn": "^1.2.0" - }, - "engines": { - "node": ">=10.19.0" - } - }, - "node_modules/http2-wrapper/node_modules/quick-lru": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", - "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/httpsnippet": { "version": "1.25.0", "resolved": "https://registry.npmjs.org/httpsnippet/-/httpsnippet-1.25.0.tgz", @@ -7874,20 +7100,10 @@ "node": ">=0.8.0" } }, - "node_modules/humanize-ms": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", - "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", - "dev": true, - "dependencies": { - "ms": "^2.0.0" - } - }, "node_modules/iconv-lite": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "optional": true, "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" }, @@ -7909,18 +7125,6 @@ "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", "dev": true }, - "node_modules/ignore-walk": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.3.tgz", - "integrity": "sha512-C7FfFoTA+bI10qfeydT8aZbvr91vAEU+2W5BZUlzPec47oNb07SsOfwYrtxuvOYdUApPP/Qlh4DtAO51Ekk2QA==", - "dev": true, - "dependencies": { - "minimatch": "^9.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/ilp-packet": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/ilp-packet/-/ilp-packet-2.2.0.tgz", @@ -7949,9 +7153,9 @@ } }, "node_modules/immutable": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz", - "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==" + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz", + "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==" }, "node_modules/import-fresh": { "version": "3.3.0", @@ -7990,15 +7194,6 @@ "node": ">=4" } }, - "node_modules/import-lazy": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz", - "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -8017,12 +7212,6 @@ "node": ">=8" } }, - "node_modules/infer-owner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", - "dev": true - }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -8038,22 +7227,13 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, - "node_modules/ini": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz", - "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==", - "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/internal-slot": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz", - "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", + "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", "dev": true, "dependencies": { - "get-intrinsic": "^1.2.2", + "es-errors": "^1.3.0", "hasown": "^2.0.0", "side-channel": "^1.0.4" }, @@ -8077,6 +7257,29 @@ "node": ">=4" } }, + "node_modules/ioredis": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.4.1.tgz", + "integrity": "sha512-2YZsvl7jopIa1gaePkeMtd9rAcSjOOjPtpcLlOeusyO+XH2SK5ZcT+UCrElPP+WVIInh2TzeI4XW9ENaSLVVHA==", + "dependencies": { + "@ioredis/commands": "^1.1.1", + "cluster-key-slot": "^1.1.0", + "debug": "^4.3.4", + "denque": "^2.1.0", + "lodash.defaults": "^4.2.0", + "lodash.isarguments": "^3.1.0", + "redis-errors": "^1.2.0", + "redis-parser": "^3.0.0", + "standard-as-callback": "^2.1.0" + }, + "engines": { + "node": ">=12.22.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/ioredis" + } + }, "node_modules/ip-address": { "version": "9.0.5", "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", @@ -8119,14 +7322,16 @@ } }, "node_modules/is-array-buffer": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", - "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", + "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", - "is-typed-array": "^1.1.10" + "get-intrinsic": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -8209,18 +7414,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-ci": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz", - "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==", - "dev": true, - "dependencies": { - "ci-info": "^3.2.0" - }, - "bin": { - "is-ci": "bin.js" - } - }, "node_modules/is-core-module": { "version": "2.13.1", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", @@ -8232,6 +7425,21 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-data-view": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz", + "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==", + "dev": true, + "dependencies": { + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-date-object": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", @@ -8313,41 +7521,22 @@ "node": ">=0.10.0" } }, - "node_modules/is-installed-globally": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz", - "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==", + "node_modules/is-map": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", + "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", "dev": true, - "dependencies": { - "global-dirs": "^3.0.0", - "is-path-inside": "^3.0.2" - }, "engines": { - "node": ">=10" + "node": ">= 0.4" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-lambda": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", - "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", - "dev": true - }, - "node_modules/is-map": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", - "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==", - "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-negative-zero": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", + "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", "dev": true, "engines": { "node": ">= 0.4" @@ -8356,18 +7545,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-npm": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-6.0.0.tgz", - "integrity": "sha512-JEjxbSmtPSt1c8XTkVrlujcXdKV1/tvuQ7GwKcAlyiVLeYFQ2VHat8xfrDJsIkhCdF/tZ7CiIR3sy141c6+gPQ==", - "dev": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -8460,21 +7637,27 @@ } }, "node_modules/is-set": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz", - "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", + "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", "dev": true, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-shared-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", - "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", + "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2" + "call-bind": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -8534,12 +7717,12 @@ } }, "node_modules/is-typed-array": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", - "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", + "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", "dev": true, "dependencies": { - "which-typed-array": "^1.1.11" + "which-typed-array": "^1.1.14" }, "engines": { "node": ">= 0.4" @@ -8555,10 +7738,13 @@ "dev": true }, "node_modules/is-weakmap": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", - "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", + "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", "dev": true, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -8576,13 +7762,16 @@ } }, "node_modules/is-weakset": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz", - "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", + "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" + "call-bind": "^1.0.7", + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -8605,15 +7794,6 @@ "node": ">=4" } }, - "node_modules/is-yarn-global": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.4.1.tgz", - "integrity": "sha512-/kppl+R+LO5VmhYSEWARUFjodS25D68gvj8W7z0I7OWhUla5xWu8KL6CtB2V0R6yqhnRgbcaREMr4EEM6htLPQ==", - "dev": true, - "engines": { - "node": ">=12" - } - }, "node_modules/isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", @@ -8670,54 +7850,12 @@ "archy": "^1.0.0", "cross-spawn": "^7.0.3", "istanbul-lib-coverage": "^3.2.0", - "p-map": "^3.0.0", - "rimraf": "^3.0.0", - "uuid": "^8.3.2" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-processinfo/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/istanbul-lib-processinfo/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/istanbul-lib-processinfo/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" + "p-map": "^3.0.0", + "rimraf": "^3.0.0", + "uuid": "^8.3.2" }, "engines": { - "node": "*" + "node": ">=8" } }, "node_modules/istanbul-lib-processinfo/node_modules/p-map": { @@ -8732,21 +7870,6 @@ "node": ">=8" } }, - "node_modules/istanbul-lib-processinfo/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/istanbul-lib-report": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", @@ -8817,14 +7940,14 @@ } }, "node_modules/jackspeak": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.1.2.tgz", - "integrity": "sha512-kWmLKn2tRtfYMF/BakihVVRzBKOxz4gJMiL2Rj91WnAB5TPZumSH99R/Yf1qE1u4uRimvCSJfm6hnxohXeEXjQ==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.2.tgz", + "integrity": "sha512-qH3nOSj8q/8+Eg8LUPOq3C+6HWkpUioIjDsq1+D4zY91oZvpPttw8GwtF1nReRYKXl+1AORyFqtm2f5Q1SB6/Q==", "dependencies": { "@isaacs/cliui": "^8.0.2" }, "engines": { - "node": ">=14" + "node": "14 >=14.21 || 16 >=16.20 || >=18" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -8834,9 +7957,9 @@ } }, "node_modules/jake": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.1.tgz", - "integrity": "sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==", + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz", + "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==", "dependencies": { "async": "^3.2.3", "chalk": "^4.0.2", @@ -8944,10 +8067,11 @@ "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==" }, "node_modules/jsdoc": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.3.tgz", - "integrity": "sha512-Nu7Sf35kXJ1MWDZIMAuATRQTg1iIPdzh7tqJ6jjvaU/GfDf+qi5UV8zJR3Mo+/pYFvm8mzay4+6O5EWigaQBQw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.4.tgz", + "integrity": "sha512-zeFezwyXeG4syyYHbvh1A967IAqq/67yXtXvuL5wnqCkFZe8I0vKfm+EO+YEvLguo6w9CDUbrAXVtJSHh2E8rw==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@babel/parser": "^7.20.15", "@jsdoc/salty": "^0.2.1", @@ -9005,24 +8129,6 @@ "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", "dev": true }, - "node_modules/json-parse-even-better-errors": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz", - "integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==", - "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/json-parse-helpfulerror": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz", - "integrity": "sha512-XgP0FGR77+QhUxjXkwOMkC94k3WtqEBfcnjWqhRd82qTat4SWKRE+9kUnynz/shm3I4ea2+qISvTIeGTNU7kJg==", - "dev": true, - "dependencies": { - "jju": "^1.1.0" - } - }, "node_modules/json-pointer": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/json-pointer/-/json-pointer-0.6.2.tgz", @@ -9060,12 +8166,6 @@ "node": ">=6" } }, - "node_modules/jsonlines": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsonlines/-/jsonlines-0.1.1.tgz", - "integrity": "sha512-ekDrAGso79Cvf+dtm+mL8OBI2bmAOt3gssYs833De/C9NmIpWDWyUO4zPgB5x2/OhY366dkhgfPMYfwZF7yOZA==", - "dev": true - }, "node_modules/jsonparse": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", @@ -9145,27 +8245,6 @@ "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==", "dev": true }, - "node_modules/jwa": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", - "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", - "peer": true, - "dependencies": { - "buffer-equal-constant-time": "1.0.1", - "ecdsa-sig-formatter": "1.0.11", - "safe-buffer": "^5.0.1" - } - }, - "node_modules/jws": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", - "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", - "peer": true, - "dependencies": { - "jwa": "^2.0.0", - "safe-buffer": "^5.0.1" - } - }, "node_modules/kareem": { "version": "2.5.1", "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.5.1.tgz", @@ -9201,15 +8280,6 @@ "graceful-fs": "^4.1.9" } }, - "node_modules/kleur": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz", - "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/knex": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/knex/-/knex-3.1.0.tgz", @@ -9278,20 +8348,10 @@ "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz", "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==" }, - "node_modules/latest-version": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-7.0.0.tgz", - "integrity": "sha512-KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg==", - "dev": true, - "dependencies": { - "package-json": "^8.1.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } + "node_modules/layerr": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/layerr/-/layerr-3.0.0.tgz", + "integrity": "sha512-tv754Ki2dXpPVApOrjTyRo4/QegVb9eVFq4mjqp4+NM5NaX7syQvN5BBNfV/ZpAHCEHV24XdUVrBAoka4jt3pA==" }, "node_modules/lazy-cache": { "version": "1.0.4", @@ -9335,6 +8395,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz", "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==", + "dev": true, "dependencies": { "uc.micro": "^2.0.0" } @@ -9342,7 +8403,8 @@ "node_modules/linkify-it/node_modules/uc.micro": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz", - "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==" + "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==", + "dev": true }, "node_modules/load-json-file": { "version": "5.3.0", @@ -9403,6 +8465,16 @@ "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==" }, + "node_modules/lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==" + }, + "node_modules/lodash.defaults": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==" + }, "node_modules/lodash.flattendeep": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", @@ -9414,6 +8486,11 @@ "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==" }, + "node_modules/lodash.isarguments": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", + "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==" + }, "node_modules/lodash.isequal": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", @@ -9446,14 +8523,6 @@ "node": ">= 12.0.0" } }, - "node_modules/logform/node_modules/@colors/colors": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", - "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", - "engines": { - "node": ">=0.1.90" - } - }, "node_modules/long": { "version": "5.2.3", "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz", @@ -9479,18 +8548,6 @@ "loose-envify": "cli.js" } }, - "node_modules/lowercase-keys": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz", - "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==", - "dev": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/lru-cache": { "version": "7.18.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", @@ -9500,9 +8557,9 @@ } }, "node_modules/luxon": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.3.tgz", - "integrity": "sha512-tFWBiv3h7z+T/tDaoxA8rqTxy1CHV6gHS//QdaH4pulbq/JuBSGgQspQQqcgnwdAx6pNI7cmvz5Sv/addzHmUg==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz", + "integrity": "sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==", "engines": { "node": ">=12" } @@ -9531,41 +8588,6 @@ "semver": "bin/semver.js" } }, - "node_modules/make-fetch-happen": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", - "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", - "dev": true, - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^5.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/make-fetch-happen/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/map-age-cleaner": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", @@ -9598,6 +8620,7 @@ "version": "14.1.0", "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==", + "dev": true, "dependencies": { "argparse": "^2.0.1", "entities": "^4.4.0", @@ -9620,17 +8643,6 @@ "markdown-it": "*" } }, - "node_modules/markdown-it-attrs": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/markdown-it-attrs/-/markdown-it-attrs-1.2.1.tgz", - "integrity": "sha512-EYYKLF9RvQJx1Etsb6EsBGWL7qNQLpg9BRej5f06+UdX75T5gvldEn7ts6bkLIQqugE15SGn4lw1CXDS1A+XUA==", - "engines": { - "node": ">=6" - }, - "peerDependencies": { - "markdown-it": ">=7.0.1" - } - }, "node_modules/markdown-it-emoji": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz", @@ -9641,26 +8653,17 @@ "resolved": "https://registry.npmjs.org/markdown-it-lazy-headers/-/markdown-it-lazy-headers-0.1.3.tgz", "integrity": "sha512-65BxqvmYLpVifv6MvTElthY8zvZ/TpZBCdshr/mTpsFkqwcwWtfD3YoSE7RYSn7ugnEAAaj2gywszq+hI/Pxgg==" }, - "node_modules/markdown-it/node_modules/entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", - "engines": { - "node": ">=0.12" - }, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, "node_modules/markdown-it/node_modules/mdurl": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", - "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==" + "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==", + "dev": true }, "node_modules/markdown-it/node_modules/uc.micro": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz", - "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==" + "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==", + "dev": true }, "node_modules/marked": { "version": "4.3.0", @@ -9936,9 +8939,12 @@ } }, "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/merge2": { "version": "1.4.1", @@ -9957,11 +8963,11 @@ } }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { @@ -10006,18 +9012,6 @@ "node": ">=6" } }, - "node_modules/mimic-response": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz", - "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==", - "dev": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/min-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", @@ -10033,207 +9027,47 @@ "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" }, "node_modules/minimatch": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", - "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/minimist-options": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", - "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", - "dev": true, - "dependencies": { - "arrify": "^1.0.1", - "is-plain-obj": "^1.1.0", - "kind-of": "^6.0.3" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minipass-collect/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-fetch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz", - "integrity": "sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==", - "dev": true, - "dependencies": { - "minipass": "^7.0.3", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/minipass-flush": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", - "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minipass-flush/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-json-stream": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz", - "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==", - "dev": true, - "dependencies": { - "jsonparse": "^1.3.1", - "minipass": "^3.0.0" - } - }, - "node_modules/minipass-json-stream/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-pipeline": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", - "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-pipeline/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-sized": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", - "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", - "dev": true, + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", + "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", "dependencies": { - "minipass": "^3.0.0" + "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=8" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/minipass-sized/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "node_modules/minimist-options": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", + "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", "dev": true, "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" + "arrify": "^1.0.1", + "is-plain-obj": "^1.1.0", + "kind-of": "^6.0.3" }, "engines": { - "node": ">= 8" + "node": ">= 6" } }, - "node_modules/minizlib/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, + "node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", "engines": { - "node": ">=8" + "node": ">=16 || 14 >=14.17" } }, "node_modules/mkdirp": { @@ -10267,6 +9101,29 @@ "lodash": "^4.17.21" } }, + "node_modules/mock-knex": { + "version": "0.4.13", + "resolved": "https://registry.npmjs.org/mock-knex/-/mock-knex-0.4.13.tgz", + "integrity": "sha512-UmZlxiJH7bBdzjSWcrLJ1tnLfPNL7GfJO1IWL4sHWfMzLqdA3VAVWhotq1YiyE5NwVcrQdoXj3TGGjhTkBeIcQ==", + "dev": true, + "dependencies": { + "bluebird": "^3.4.1", + "lodash": "^4.14.2", + "semver": "^5.3.0" + }, + "peerDependencies": { + "knex": "> 0.8" + } + }, + "node_modules/mock-knex/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, "node_modules/modify-values": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz", @@ -10299,9 +9156,9 @@ } }, "node_modules/mongodb": { - "version": "5.9.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-5.9.0.tgz", - "integrity": "sha512-g+GCMHN1CoRUA+wb1Agv0TI4YTSiWr42B5ulkiAfLLHitGK1R+PkSAf3Lr5rPZwi/3F04LiaZEW0Kxro9Fi2TA==", + "version": "5.9.2", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-5.9.2.tgz", + "integrity": "sha512-H60HecKO4Bc+7dhOv4sJlgvenK4fQNqqUIlXxZYQNbfEWSALGAwGoyJd/0Qwk4TttFXUOHJ2ZJQe/52ScaUwtQ==", "dependencies": { "bson": "^5.5.0", "mongodb-connection-string-url": "^2.6.0", @@ -10348,13 +9205,13 @@ } }, "node_modules/mongoose": { - "version": "7.6.4", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-7.6.4.tgz", - "integrity": "sha512-kadPkS/f5iZJrrMxxOvSoOAErXmdnb28lMvHmuYgmV1ZQTpRqpp132PIPHkJMbG4OC2H0eSXYw/fNzYTH+LUcw==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-7.8.3.tgz", + "integrity": "sha512-eFnbkKgyVrICoHB6tVJ4uLanS7d5AIo/xHkEbQeOv6g2sD7gh/1biRwvFifsmbtkIddQVNr3ROqHik6gkknN3g==", "dependencies": { "bson": "^5.5.0", "kareem": "2.5.1", - "mongodb": "5.9.0", + "mongodb": "5.9.2", "mpath": "0.9.0", "mquery": "5.0.0", "ms": "2.1.3", @@ -10433,9 +9290,9 @@ "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==" }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "funding": [ { "type": "github", @@ -10465,384 +9322,116 @@ }, "node_modules/neo-async": { "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" - }, - "node_modules/nice-try": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" - }, - "node_modules/nise": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.5.tgz", - "integrity": "sha512-VJuPIfUFaXNRzETTQEEItTOP8Y171ijr+JLq42wHes3DiryR8vT+1TXQW/Rx8JNUhyYYWyIvjXTU6dOhJcs9Nw==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^2.0.0", - "@sinonjs/fake-timers": "^10.0.2", - "@sinonjs/text-encoding": "^0.7.1", - "just-extend": "^4.0.2", - "path-to-regexp": "^1.7.0" - } - }, - "node_modules/nise/node_modules/@sinonjs/commons": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz", - "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==", - "dev": true, - "dependencies": { - "type-detect": "4.0.8" - } - }, - "node_modules/nise/node_modules/@sinonjs/fake-timers": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", - "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^3.0.0" - } - }, - "node_modules/nise/node_modules/@sinonjs/fake-timers/node_modules/@sinonjs/commons": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz", - "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==", - "dev": true, - "dependencies": { - "type-detect": "4.0.8" - } - }, - "node_modules/nise/node_modules/isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==", - "dev": true - }, - "node_modules/nise/node_modules/path-to-regexp": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", - "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", - "dev": true, - "dependencies": { - "isarray": "0.0.1" - } - }, - "node_modules/node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, - "node_modules/node-fetch-h2": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/node-fetch-h2/-/node-fetch-h2-2.3.0.tgz", - "integrity": "sha512-ofRW94Ab0T4AOh5Fk8t0h8OBWrmjb0SSB20xh1H8YnPV9EJ+f5AMoYSUQ2zgJ4Iq2HAK0I2l5/Nequ8YzFS3Hg==", - "dependencies": { - "http2-client": "^1.2.5" - }, - "engines": { - "node": "4.x || >=6.0.0" - } - }, - "node_modules/node-fetch/node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, - "node_modules/node-fetch/node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "node_modules/node-fetch/node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "node_modules/node-gyp": { - "version": "9.4.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz", - "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==", - "dev": true, - "dependencies": { - "env-paths": "^2.2.0", - "exponential-backoff": "^3.1.1", - "glob": "^7.1.4", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^10.0.3", - "nopt": "^6.0.0", - "npmlog": "^6.0.0", - "rimraf": "^3.0.2", - "semver": "^7.3.5", - "tar": "^6.1.2", - "which": "^2.0.2" - }, - "bin": { - "node-gyp": "bin/node-gyp.js" - }, - "engines": { - "node": "^12.13 || ^14.13 || >=16" - } - }, - "node_modules/node-gyp/node_modules/@npmcli/fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", - "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", - "dev": true, - "dependencies": { - "@gar/promisify": "^1.1.3", - "semver": "^7.3.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/node-gyp/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/node-gyp/node_modules/cacache": { - "version": "16.1.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", - "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", - "dev": true, - "dependencies": { - "@npmcli/fs": "^2.1.0", - "@npmcli/move-file": "^2.0.0", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "glob": "^8.0.1", - "infer-owner": "^1.0.4", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "mkdirp": "^1.0.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^9.0.0", - "tar": "^6.1.11", - "unique-filename": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/node-gyp/node_modules/cacache/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/node-gyp/node_modules/cacache/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/node-gyp/node_modules/cacache/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/node-gyp/node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/node-gyp/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" + }, + "node_modules/nice-try": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" }, - "node_modules/node-gyp/node_modules/make-fetch-happen": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", - "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", + "node_modules/nise": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.5.tgz", + "integrity": "sha512-VJuPIfUFaXNRzETTQEEItTOP8Y171ijr+JLq42wHes3DiryR8vT+1TXQW/Rx8JNUhyYYWyIvjXTU6dOhJcs9Nw==", "dev": true, "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^16.1.0", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^2.0.3", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^9.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "@sinonjs/commons": "^2.0.0", + "@sinonjs/fake-timers": "^10.0.2", + "@sinonjs/text-encoding": "^0.7.1", + "just-extend": "^4.0.2", + "path-to-regexp": "^1.7.0" } }, - "node_modules/node-gyp/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "node_modules/nise/node_modules/@sinonjs/commons": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz", + "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==", "dev": true, "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" + "type-detect": "4.0.8" } }, - "node_modules/node-gyp/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "node_modules/nise/node_modules/@sinonjs/fake-timers": { + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", + "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", "dev": true, "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" + "@sinonjs/commons": "^3.0.0" } }, - "node_modules/node-gyp/node_modules/minipass-fetch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", - "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", + "node_modules/nise/node_modules/@sinonjs/fake-timers/node_modules/@sinonjs/commons": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz", + "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==", "dev": true, "dependencies": { - "minipass": "^3.1.6", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" + "type-detect": "4.0.8" } }, - "node_modules/node-gyp/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "node_modules/nise/node_modules/isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==", + "dev": true + }, + "node_modules/nise/node_modules/path-to-regexp": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.9.0.tgz", + "integrity": "sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==", "dev": true, "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "isarray": "0.0.1" } }, - "node_modules/node-gyp/node_modules/ssri": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", - "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", - "dev": true, + "node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dependencies": { - "minipass": "^3.1.1" + "whatwg-url": "^5.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } } }, - "node_modules/node-gyp/node_modules/unique-filename": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", - "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", - "dev": true, + "node_modules/node-fetch-h2": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/node-fetch-h2/-/node-fetch-h2-2.3.0.tgz", + "integrity": "sha512-ofRW94Ab0T4AOh5Fk8t0h8OBWrmjb0SSB20xh1H8YnPV9EJ+f5AMoYSUQ2zgJ4Iq2HAK0I2l5/Nequ8YzFS3Hg==", "dependencies": { - "unique-slug": "^3.0.0" + "http2-client": "^1.2.5" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "4.x || >=6.0.0" } }, - "node_modules/node-gyp/node_modules/unique-slug": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", - "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", - "dev": true, + "node_modules/node-fetch/node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, + "node_modules/node-fetch/node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, + "node_modules/node-fetch/node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" } }, "node_modules/node-preload": { @@ -10885,9 +9474,9 @@ "dev": true }, "node_modules/nodemon": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.3.tgz", - "integrity": "sha512-m4Vqs+APdKzDFpuaL9F9EVOF85+h070FnkHVEoU4+rmT6Vw0bmNl7s61VEkY/cJkL7RCv1p4urnUDUMrS5rk2w==", + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.9.tgz", + "integrity": "sha512-hdr1oIb2p6ZSxu3PB2JWWYS7ZQ0qvaZsc3hK8DR8f02kRzc8rjYmxAIvdz+aYC+8F2IjNaB7HMcSDg8nQpJxyg==", "dev": true, "dependencies": { "chokidar": "^3.5.2", @@ -10955,48 +9544,6 @@ "node": ">=4" } }, - "node_modules/nopt": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", - "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", - "dev": true, - "dependencies": { - "abbrev": "^1.0.0" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/normalize-package-data": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz", - "integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==", - "dev": true, - "dependencies": { - "hosted-git-info": "^6.0.0", - "is-core-module": "^2.8.1", - "semver": "^7.3.5", - "validate-npm-package-license": "^3.0.4" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/normalize-package-data/node_modules/hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", - "dev": true, - "dependencies": { - "lru-cache": "^7.5.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -11005,211 +9552,18 @@ "node": ">=0.10.0" } }, - "node_modules/normalize-url": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.0.tgz", - "integrity": "sha512-uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw==", - "dev": true, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/npm-bundled": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.0.tgz", - "integrity": "sha512-Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ==", - "dev": true, - "dependencies": { - "npm-normalize-package-bin": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/npm-check-updates": { - "version": "16.14.20", - "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.14.20.tgz", - "integrity": "sha512-sYbIhun4DrjO7NFOTdvs11nCar0etEhZTsEjL47eM0TuiGMhmYughRCxG2SpGRmGAQ7AkwN7bw2lWzoE7q6yOQ==", - "dev": true, - "dependencies": { - "@types/semver-utils": "^1.1.1", - "chalk": "^5.3.0", - "cli-table3": "^0.6.3", - "commander": "^10.0.1", - "fast-memoize": "^2.5.2", - "find-up": "5.0.0", - "fp-and-or": "^0.1.4", - "get-stdin": "^8.0.0", - "globby": "^11.0.4", - "hosted-git-info": "^5.1.0", - "ini": "^4.1.1", - "js-yaml": "^4.1.0", - "json-parse-helpfulerror": "^1.0.3", - "jsonlines": "^0.1.1", - "lodash": "^4.17.21", - "make-fetch-happen": "^11.1.1", - "minimatch": "^9.0.3", - "p-map": "^4.0.0", - "pacote": "15.2.0", - "parse-github-url": "^1.0.2", - "progress": "^2.0.3", - "prompts-ncu": "^3.0.0", - "rc-config-loader": "^4.1.3", - "remote-git-tags": "^3.0.0", - "rimraf": "^5.0.5", - "semver": "^7.5.4", - "semver-utils": "^1.1.4", - "source-map-support": "^0.5.21", - "spawn-please": "^2.0.2", - "strip-ansi": "^7.1.0", - "strip-json-comments": "^5.0.1", - "untildify": "^4.0.0", - "update-notifier": "^6.0.2" - }, - "bin": { - "ncu": "build/src/bin/cli.js", - "npm-check-updates": "build/src/bin/cli.js" - }, - "engines": { - "node": ">=14.14" - } - }, - "node_modules/npm-check-updates/node_modules/chalk": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", - "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", - "dev": true, - "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/npm-check-updates/node_modules/commander": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", - "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", - "dev": true, - "engines": { - "node": ">=14" - } - }, - "node_modules/npm-check-updates/node_modules/strip-json-comments": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.1.tgz", - "integrity": "sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==", - "dev": true, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/npm-install-checks": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz", - "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==", - "dev": true, - "dependencies": { - "semver": "^7.1.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-normalize-package-bin": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", - "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", + "version": "17.1.11", + "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-17.1.11.tgz", + "integrity": "sha512-TR2RuGIH7P3Qrb0jfdC/nT7JWqXPKjDlxuNQt3kx4oNVf1Pn5SBRB7KLypgYZhruivJthgTtfkkyK4mz342VjA==", "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-package-arg": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", - "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", - "dev": true, - "dependencies": { - "hosted-git-info": "^6.0.0", - "proc-log": "^3.0.0", - "semver": "^7.3.5", - "validate-npm-package-name": "^5.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-package-arg/node_modules/hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", - "dev": true, - "dependencies": { - "lru-cache": "^7.5.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-packlist": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-7.0.4.tgz", - "integrity": "sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==", - "dev": true, - "dependencies": { - "ignore-walk": "^6.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-pick-manifest": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.2.tgz", - "integrity": "sha512-1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg==", - "dev": true, - "dependencies": { - "npm-install-checks": "^6.0.0", - "npm-normalize-package-bin": "^3.0.0", - "npm-package-arg": "^10.0.0", - "semver": "^7.3.5" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-registry-fetch": { - "version": "14.0.5", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz", - "integrity": "sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==", - "dev": true, - "dependencies": { - "make-fetch-happen": "^11.0.0", - "minipass": "^5.0.0", - "minipass-fetch": "^3.0.0", - "minipass-json-stream": "^1.0.1", - "minizlib": "^2.1.2", - "npm-package-arg": "^10.0.0", - "proc-log": "^3.0.0" + "bin": { + "ncu": "build/cli.js", + "npm-check-updates": "build/cli.js" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-registry-fetch/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "engines": { - "node": ">=8" + "node": "^18.18.0 || >=20.0.0", + "npm": ">=8.12.1" } }, "node_modules/npm-run-path": { @@ -11231,21 +9585,6 @@ "node": ">=4" } }, - "node_modules/npmlog": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", - "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", - "dev": true, - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, "node_modules/nth-check": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", @@ -11266,9 +9605,9 @@ } }, "node_modules/nyc": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-17.0.0.tgz", - "integrity": "sha512-ISp44nqNCaPugLLGGfknzQwSwt10SSS5IMoPR7GLoMAyS18Iw5js8U7ga2VF9lYuMZ42gOHr3UddZw4WZltxKg==", + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-17.1.0.tgz", + "integrity": "sha512-U42vQ4czpKa0QdI1hu950XuNhYqgoM+ZF1HT+VuUHL9hPfDPVvNQyltmMqdE9bUHMVa+8yNbc3QKTj8zQhlVxQ==", "dev": true, "dependencies": { "@istanbuljs/load-nyc-config": "^1.0.0", @@ -11278,7 +9617,7 @@ "decamelize": "^1.2.0", "find-cache-dir": "^3.2.0", "find-up": "^4.1.0", - "foreground-child": "^2.0.0", + "foreground-child": "^3.3.0", "get-package-type": "^0.1.0", "glob": "^7.1.6", "istanbul-lib-coverage": "^3.0.0", @@ -11334,29 +9673,16 @@ "dev": true }, "node_modules/nyc/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/nyc/node_modules/foreground-child": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", - "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "dependencies": { - "cross-spawn": "^7.0.0", - "signal-exit": "^3.0.2" + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" }, "engines": { - "node": ">=8.0.0" + "node": ">=8" } }, "node_modules/nyc/node_modules/glob": { @@ -11442,21 +9768,6 @@ "node": ">=8" } }, - "node_modules/nyc/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/nyc/node_modules/signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", @@ -11676,13 +9987,13 @@ } }, "node_modules/object.assign": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", - "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", + "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", "has-symbols": "^1.0.3", "object-keys": "^1.1.1" }, @@ -11694,28 +10005,29 @@ } }, "node_modules/object.entries": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.7.tgz", - "integrity": "sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz", + "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" }, "engines": { "node": ">= 0.4" } }, "node_modules/object.fromentries": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz", - "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==", + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", + "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -11736,28 +10048,15 @@ "get-intrinsic": "^1.2.1" } }, - "node_modules/object.hasown": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.3.tgz", - "integrity": "sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==", - "dev": true, - "dependencies": { - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/object.values": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz", - "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz", + "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -11807,14 +10106,14 @@ } }, "node_modules/openapi-backend": { - "version": "5.10.6", - "resolved": "https://registry.npmjs.org/openapi-backend/-/openapi-backend-5.10.6.tgz", - "integrity": "sha512-vTjBRys/O4JIHdlRHUKZ7pxS+gwIJreAAU9dvYRFrImtPzQ5qxm5a6B8BTVT9m6I8RGGsShJv35MAc3Tu2/y/A==", + "version": "5.11.1", + "resolved": "https://registry.npmjs.org/openapi-backend/-/openapi-backend-5.11.1.tgz", + "integrity": "sha512-TsIbku0692sU1X5Ewhzj49ivd8EIT0GDtwbB7XvT234lY3+oJfTe3cUWaBzeKGeX+a1mjcluuJ4V+wTancRbdA==", "dependencies": { "@apidevtools/json-schema-ref-parser": "^11.1.0", "ajv": "^8.6.2", "bath-es5": "^3.0.3", - "cookie": "^0.5.0", + "cookie": "^1.0.1", "dereference-json-schema": "^0.2.1", "lodash": "^4.17.15", "mock-json-schema": "^1.0.7", @@ -11830,9 +10129,9 @@ } }, "node_modules/openapi-sampler": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.3.1.tgz", - "integrity": "sha512-Ert9mvc2tLPmmInwSyGZS+v4Ogu9/YoZuq9oP3EdUklg2cad6+IGndP9yqJJwbgdXwZibiq5fpv6vYujchdJFg==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.5.1.tgz", + "integrity": "sha512-tIWIrZUKNAsbqf3bd9U1oH6JEXo8LNYuDlXw26By67EygpjT+ArFnsxxyTMjFWRfbqo5ozkvgSQDK69Gd8CddA==", "dependencies": { "@types/json-schema": "^7.0.7", "json-pointer": "0.6.2" @@ -11904,15 +10203,6 @@ "node": ">= 0.4.0" } }, - "node_modules/p-cancelable": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz", - "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==", - "dev": true, - "engines": { - "node": ">=12.20" - } - }, "node_modules/p-defer": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", @@ -11967,21 +10257,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "dependencies": { - "aggregate-error": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/p-try": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", @@ -12005,64 +10280,10 @@ "node": ">=8" } }, - "node_modules/package-json": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-8.1.1.tgz", - "integrity": "sha512-cbH9IAIJHNj9uXi196JVsRlt7cHKak6u/e6AkL/bkRelZ7rlL3X1YKxsZwa36xipOEKAsdtmaG6aAJoM1fx2zA==", - "dev": true, - "dependencies": { - "got": "^12.1.0", - "registry-auth-token": "^5.0.1", - "registry-url": "^6.0.0", - "semver": "^7.3.7" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pacote": { - "version": "15.2.0", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.2.0.tgz", - "integrity": "sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==", - "dev": true, - "dependencies": { - "@npmcli/git": "^4.0.0", - "@npmcli/installed-package-contents": "^2.0.1", - "@npmcli/promise-spawn": "^6.0.1", - "@npmcli/run-script": "^6.0.0", - "cacache": "^17.0.0", - "fs-minipass": "^3.0.0", - "minipass": "^5.0.0", - "npm-package-arg": "^10.0.0", - "npm-packlist": "^7.0.0", - "npm-pick-manifest": "^8.0.0", - "npm-registry-fetch": "^14.0.0", - "proc-log": "^3.0.0", - "promise-retry": "^2.0.1", - "read-package-json": "^6.0.0", - "read-package-json-fast": "^3.0.0", - "sigstore": "^1.3.0", - "ssri": "^10.0.0", - "tar": "^6.1.11" - }, - "bin": { - "pacote": "lib/bin.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/pacote/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "engines": { - "node": ">=8" - } + "node_modules/package-json-from-dist": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", + "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==" }, "node_modules/parent-module": { "version": "2.0.0", @@ -12075,18 +10296,6 @@ "node": ">=8" } }, - "node_modules/parse-github-url": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/parse-github-url/-/parse-github-url-1.0.2.tgz", - "integrity": "sha512-kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw==", - "dev": true, - "bin": { - "parse-github-url": "cli.js" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/parse-json": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", @@ -12142,15 +10351,15 @@ "url": "https://github.com/inikulin/parse5?sponsor=1" } }, - "node_modules/parse5/node_modules/entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", - "engines": { - "node": ">=0.12" + "node_modules/parse5-parser-stream": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5-parser-stream/-/parse5-parser-stream-7.1.2.tgz", + "integrity": "sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==", + "dependencies": { + "parse5": "^7.0.0" }, "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" + "url": "https://github.com/inikulin/parse5?sponsor=1" } }, "node_modules/parseurl": { @@ -12208,17 +10417,14 @@ } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.2.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", - "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", - "engines": { - "node": "14 || >=16.14" - } + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" }, "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==" }, "node_modules/path-type": { "version": "4.0.0", @@ -12427,10 +10633,19 @@ "node": ">=0.10.0" } }, + "node_modules/possible-typed-array-names": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", + "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/postcss": { - "version": "8.4.38", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", - "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", + "version": "8.4.45", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz", + "integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==", "funding": [ { "type": "opencollective", @@ -12447,7 +10662,7 @@ ], "dependencies": { "nanoid": "^3.3.7", - "picocolors": "^1.0.0", + "picocolors": "^1.0.1", "source-map-js": "^1.2.0" }, "engines": { @@ -12549,15 +10764,6 @@ "node": ">=0.10.0" } }, - "node_modules/proc-log": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz", - "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==", - "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -12575,65 +10781,16 @@ "node": ">=8" } }, - "node_modules/progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/prom-client": { - "version": "14.2.0", - "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-14.2.0.tgz", - "integrity": "sha512-sF308EhTenb/pDRPakm+WgiN+VdM/T1RaHj1x+MvAuT8UiQP8JmOEbxVqtkbfR4LrvOg5n7ic01kRBDGXjYikA==", + "version": "15.1.3", + "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-15.1.3.tgz", + "integrity": "sha512-6ZiOBfCywsD4k1BN9IX0uZhF+tJkV8q8llP64G5Hajs4JOeVLPCwpPVcpXy3BwYiUGgyJzsJJQeOIv7+hDSq8g==", "dependencies": { + "@opentelemetry/api": "^1.4.0", "tdigest": "^0.1.1" }, "engines": { - "node": ">=10" - } - }, - "node_modules/promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", - "dev": true - }, - "node_modules/promise-retry": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", - "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", - "dev": true, - "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/promise-retry/node_modules/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/prompts-ncu": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/prompts-ncu/-/prompts-ncu-3.0.0.tgz", - "integrity": "sha512-qyz9UxZ5MlPKWVhWrCmSZ1ahm2GVYdjLb8og2sg0IPth1KRuhcggHGuijz0e41dkx35p1t1q3GRISGH7QGALFA==", - "dev": true, - "dependencies": { - "kleur": "^4.0.1", - "sisteransi": "^1.0.5" - }, - "engines": { - "node": ">= 14" + "node": "^16 || ^18 || >=20" } }, "node_modules/prop-types": { @@ -12647,12 +10804,6 @@ "react-is": "^16.13.1" } }, - "node_modules/proto-list": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==", - "dev": true - }, "node_modules/protobufjs": { "version": "7.3.0", "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.0.tgz", @@ -12747,23 +10898,9 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz", "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==", - "engines": { - "node": ">=6" - } - }, - "node_modules/pupa": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/pupa/-/pupa-3.1.0.tgz", - "integrity": "sha512-FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug==", "dev": true, - "dependencies": { - "escape-goat": "^4.0.0" - }, "engines": { - "node": ">=12.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=6" } }, "node_modules/q": { @@ -12777,9 +10914,9 @@ } }, "node_modules/qs": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.0.tgz", - "integrity": "sha512-trVZiI6RMOkO476zLGaBIzszOdFPnCCXHPG9kn0yuS1uz6xdVxPfZdB3vUig9pxPFDM9BRAgz/YUIVQ1/vuiUg==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dependencies": { "side-channel": "^1.0.6" }, @@ -12832,30 +10969,19 @@ } }, "node_modules/raw-body": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", - "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.0.tgz", + "integrity": "sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", - "iconv-lite": "0.4.24", + "iconv-lite": "0.6.3", "unpipe": "1.0.0" }, "engines": { "node": ">= 0.8" } }, - "node_modules/raw-body/node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/rc": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", @@ -12870,18 +10996,6 @@ "rc": "cli.js" } }, - "node_modules/rc-config-loader": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-4.1.3.tgz", - "integrity": "sha512-kD7FqML7l800i6pS6pvLyIE2ncbk9Du8Q0gp/4hMPhJU6ZxApkoLcGD8ZeqgiAlfwZ6BlETq6qqe+12DUL207w==", - "dev": true, - "dependencies": { - "debug": "^4.3.4", - "js-yaml": "^4.1.0", - "json5": "^2.2.2", - "require-from-string": "^2.0.2" - } - }, "node_modules/rc/node_modules/ini": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", @@ -12907,34 +11021,6 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", "dev": true }, - "node_modules/read-package-json": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz", - "integrity": "sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==", - "dev": true, - "dependencies": { - "glob": "^10.2.2", - "json-parse-even-better-errors": "^3.0.0", - "normalize-package-data": "^5.0.0", - "npm-normalize-package-bin": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/read-package-json-fast": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz", - "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==", - "dev": true, - "dependencies": { - "json-parse-even-better-errors": "^3.0.0", - "npm-normalize-package-bin": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/read-pkg": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", @@ -13164,16 +11250,36 @@ "node": ">=8" } }, + "node_modules/redis-errors": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz", + "integrity": "sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==", + "engines": { + "node": ">=4" + } + }, + "node_modules/redis-parser": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz", + "integrity": "sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==", + "dependencies": { + "redis-errors": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/reflect.getprototypeof": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz", - "integrity": "sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz", + "integrity": "sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1", + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.1", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", "globalthis": "^1.0.3", "which-builtin-type": "^1.1.3" }, @@ -13193,14 +11299,15 @@ } }, "node_modules/regexp.prototype.flags": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", - "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", + "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "set-function-name": "^2.0.0" + "call-bind": "^1.0.6", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", + "set-function-name": "^2.0.1" }, "engines": { "node": ">= 0.4" @@ -13218,34 +11325,7 @@ "node": ">=8" }, "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, - "node_modules/registry-auth-token": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.0.2.tgz", - "integrity": "sha512-o/3ikDxtXaA59BmZuZrJZDJv8NMDGSj+6j6XaeBmHw8eY1i1qd9+6H+LjVvQXx3HN6aRCGa1cUdJ9RaJZUugnQ==", - "dev": true, - "dependencies": { - "@pnpm/npm-conf": "^2.1.0" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/registry-url": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-6.0.1.tgz", - "integrity": "sha512-+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q==", - "dev": true, - "dependencies": { - "rc": "1.2.8" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/mysticatea" } }, "node_modules/release-zalgo": { @@ -13260,15 +11340,6 @@ "node": ">=4" } }, - "node_modules/remote-git-tags": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/remote-git-tags/-/remote-git-tags-3.0.0.tgz", - "integrity": "sha512-C9hAO4eoEsX+OXA4rla66pXZQ+TLQ8T9dttgQj18yuKlPMTVkIkdYXvlMC55IuUsIkV6DpmQYi10JKFLaU+l7w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/repeat-string": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", @@ -13642,12 +11713,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/resolve-alpn": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", - "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==", - "dev": true - }, "node_modules/resolve-from": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", @@ -13656,21 +11721,6 @@ "node": ">=8" } }, - "node_modules/responselike": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz", - "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==", - "dev": true, - "dependencies": { - "lowercase-keys": "^3.0.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/resumer": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz", @@ -13710,23 +11760,64 @@ } }, "node_modules/rimraf": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz", - "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", "dev": true, "dependencies": { - "glob": "^10.3.7" + "glob": "^7.1.3" }, "bin": { - "rimraf": "dist/esm/bin.mjs" + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/rimraf/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" }, "engines": { - "node": ">=14" + "node": "*" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/rimraf/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -13750,13 +11841,13 @@ } }, "node_modules/safe-array-concat": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz", - "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", + "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1", + "call-bind": "^1.0.7", + "get-intrinsic": "^1.2.4", "has-symbols": "^1.0.3", "isarray": "^2.0.5" }, @@ -13793,15 +11884,18 @@ ] }, "node_modules/safe-regex-test": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", - "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", + "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", "is-regex": "^1.1.4" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -13832,6 +11926,24 @@ "postcss": "^8.3.11" } }, + "node_modules/sanitize-html/node_modules/htmlparser2": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz", + "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==", + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.0.1", + "entities": "^4.4.0" + } + }, "node_modules/semver": { "version": "7.5.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", @@ -13846,27 +11958,6 @@ "node": ">=10" } }, - "node_modules/semver-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-4.0.0.tgz", - "integrity": "sha512-0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA==", - "dev": true, - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/semver-utils": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.4.tgz", - "integrity": "sha512-EjnoLE5OGmDAVV/8YDoN5KiajNadjzIp9BAHOhYeQHt7j0UWxjmgsx4YD48wp4Ue1Qogq38F1GNUJNqF1kKKxA==", - "dev": true - }, "node_modules/semver/node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -13879,9 +11970,9 @@ } }, "node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -13914,6 +12005,14 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, + "node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/serialize-error": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-8.1.0.tgz", @@ -13940,14 +12039,14 @@ } }, "node_modules/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dependencies": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" }, "engines": { "node": ">= 0.8.0" @@ -13975,14 +12074,15 @@ } }, "node_modules/set-function-name": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", - "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", + "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", "dev": true, "dependencies": { - "define-data-property": "^1.0.1", + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", "functions-have-names": "^1.2.3", - "has-property-descriptors": "^1.0.0" + "has-property-descriptors": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -14056,6 +12156,14 @@ "wordwrap": "0.0.2" } }, + "node_modules/shins/node_modules/entities": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz", + "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==", + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, "node_modules/shins/node_modules/linkify-it": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz", @@ -14079,6 +12187,17 @@ "markdown-it": "bin/markdown-it.js" } }, + "node_modules/shins/node_modules/markdown-it-attrs": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/markdown-it-attrs/-/markdown-it-attrs-1.2.1.tgz", + "integrity": "sha512-EYYKLF9RvQJx1Etsb6EsBGWL7qNQLpg9BRej5f06+UdX75T5gvldEn7ts6bkLIQqugE15SGn4lw1CXDS1A+XUA==", + "engines": { + "node": ">=6" + }, + "peerDependencies": { + "markdown-it": ">=7.0.1" + } + }, "node_modules/shins/node_modules/source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", @@ -14213,25 +12332,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/sigstore": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.9.0.tgz", - "integrity": "sha512-0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A==", - "dev": true, - "dependencies": { - "@sigstore/bundle": "^1.1.0", - "@sigstore/protobuf-specs": "^0.2.0", - "@sigstore/sign": "^1.0.0", - "@sigstore/tuf": "^1.0.3", - "make-fetch-happen": "^11.0.1" - }, - "bin": { - "sigstore": "bin/sigstore.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/simple-swizzle": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", @@ -14275,12 +12375,6 @@ "url": "https://opencollective.com/sinon" } }, - "node_modules/sisteransi": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true - }, "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -14311,20 +12405,6 @@ "npm": ">= 3.0.0" } }, - "node_modules/socks-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", - "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", - "dev": true, - "dependencies": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" - }, - "engines": { - "node": ">= 10" - } - }, "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -14334,23 +12414,13 @@ } }, "node_modules/source-map-js": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", - "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", "engines": { "node": ">=0.10.0" } }, - "node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, "node_modules/sparse-bitfield": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", @@ -14360,18 +12430,6 @@ "memory-pager": "^1.0.2" } }, - "node_modules/spawn-please": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/spawn-please/-/spawn-please-2.0.2.tgz", - "integrity": "sha512-KM8coezO6ISQ89c1BzyWNtcn2V2kAVtwIXd3cN/V5a0xPYc1F/vydrRc01wsKFEQ/p+V1a4sw4z2yMITIXrgGw==", - "dev": true, - "dependencies": { - "cross-spawn": "^7.0.3" - }, - "engines": { - "node": ">=14" - } - }, "node_modules/spawn-sync": { "version": "1.0.15", "resolved": "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.15.tgz", @@ -14400,16 +12458,6 @@ "node": ">=8" } }, - "node_modules/spawn-wrap/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, "node_modules/spawn-wrap/node_modules/foreground-child": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", @@ -14423,53 +12471,6 @@ "node": ">=8.0.0" } }, - "node_modules/spawn-wrap/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/spawn-wrap/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/spawn-wrap/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/spawn-wrap/node_modules/signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", @@ -14556,18 +12557,6 @@ "node": ">= 0.6" } }, - "node_modules/ssri": { - "version": "10.0.5", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz", - "integrity": "sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==", - "dev": true, - "dependencies": { - "minipass": "^7.0.3" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/stack-trace": { "version": "0.0.10", "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", @@ -14577,9 +12566,9 @@ } }, "node_modules/standard": { - "version": "17.1.0", - "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.0.tgz", - "integrity": "sha512-jaDqlNSzLtWYW4lvQmU0EnxWMUGQiwHasZl5ZEIwx3S/ijZDjZOzs1y1QqKwKs5vqnFpGtizo4NOYX2s0Voq/g==", + "version": "17.1.2", + "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.2.tgz", + "integrity": "sha512-WLm12WoXveKkvnPnPnaFUUHuOB2cUdAsJ4AiGHL2G0UNMrcRAWY2WriQaV8IQ3oRmYr0AWUbLNr94ekYFAHOrA==", "dev": true, "funding": [ { @@ -14595,6 +12584,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "eslint": "^8.41.0", "eslint-config-standard": "17.1.0", @@ -14602,8 +12592,8 @@ "eslint-plugin-import": "^2.27.5", "eslint-plugin-n": "^15.7.0", "eslint-plugin-promise": "^6.1.1", - "eslint-plugin-react": "^7.32.2", - "standard-engine": "^15.0.0", + "eslint-plugin-react": "^7.36.1", + "standard-engine": "^15.1.0", "version-guard": "^1.1.1" }, "bin": { @@ -14613,6 +12603,11 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, + "node_modules/standard-as-callback": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz", + "integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==" + }, "node_modules/standard-engine": { "version": "15.1.0", "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz", @@ -14938,39 +12933,56 @@ "dependencies": { "ansi-regex": "^5.0.1" }, - "engines": { - "node": ">=8" + "engines": { + "node": ">=8" + } + }, + "node_modules/string.prototype.matchall": { + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz", + "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.7", + "regexp.prototype.flags": "^1.5.2", + "set-function-name": "^2.0.2", + "side-channel": "^1.0.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/string.prototype.matchall": { - "version": "4.0.10", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz", - "integrity": "sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==", + "node_modules/string.prototype.repeat": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz", + "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.5", - "regexp.prototype.flags": "^1.5.0", - "set-function-name": "^2.0.0", - "side-channel": "^1.0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" } }, "node_modules/string.prototype.trim": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz", - "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==", + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz", + "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.0", + "es-object-atoms": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -14980,28 +12992,31 @@ } }, "node_modules/string.prototype.trimend": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz", - "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz", + "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/string.prototype.trimstart": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz", - "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", + "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -15147,9 +13162,9 @@ } }, "node_modules/swagger-ui-dist": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-5.9.3.tgz", - "integrity": "sha512-/OgHfO96RWXF+p/EOjEnvKNEh94qAG/VHukgmVKh5e6foX9kas1WbjvQnDDj0sSTAMr9MHRBqAWytDcQi0VOrg==" + "version": "5.17.14", + "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-5.17.14.tgz", + "integrity": "sha512-CVbSfaLpstV65OnSjbXfVd6Sta3q3F7Cj/yYuvHMp1P90LztOLs6PfUnKEVAeiIVQt9u2SaPwv0LiH/OyMjHRw==" }, "node_modules/swagger2openapi": { "version": "7.0.8", @@ -15572,56 +13587,6 @@ "node": "*" } }, - "node_modules/tar": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", - "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", - "dev": true, - "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^5.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/tar/node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/tar/node_modules/fs-minipass/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/tar/node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/tarn": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/tarn/-/tarn-3.0.2.tgz", @@ -15891,20 +13856,6 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, - "node_modules/tuf-js": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.7.tgz", - "integrity": "sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==", - "dev": true, - "dependencies": { - "@tufjs/models": "1.0.4", - "debug": "^4.3.4", - "make-fetch-happen": "^11.1.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", @@ -15953,29 +13904,30 @@ } }, "node_modules/typed-array-buffer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", - "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz", + "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1", - "is-typed-array": "^1.1.10" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" } }, "node_modules/typed-array-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", - "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", + "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", + "call-bind": "^1.0.7", "for-each": "^0.3.3", - "has-proto": "^1.0.1", - "is-typed-array": "^1.1.10" + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" @@ -15985,16 +13937,17 @@ } }, "node_modules/typed-array-byte-offset": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", - "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", + "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", "for-each": "^0.3.3", - "has-proto": "^1.0.1", - "is-typed-array": "^1.1.10" + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" @@ -16004,14 +13957,20 @@ } }, "node_modules/typed-array-length": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", - "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz", + "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", + "call-bind": "^1.0.7", "for-each": "^0.3.3", - "is-typed-array": "^1.1.9" + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13", + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -16055,6 +14014,17 @@ "integrity": "sha512-vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q==", "optional": true }, + "node_modules/ulidx": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/ulidx/-/ulidx-2.4.1.tgz", + "integrity": "sha512-xY7c8LPyzvhvew0Fn+Ek3wBC9STZAuDI/Y5andCKi9AX6/jvfaX45PhsDX8oxgPL0YFp0Jhr8qWMbS/p9375Xg==", + "dependencies": { + "layerr": "^3.0.0" + }, + "engines": { + "node": ">=16" + } + }, "node_modules/unbox-primitive": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", @@ -16082,50 +14052,19 @@ "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==", "dev": true }, + "node_modules/undici": { + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.19.8.tgz", + "integrity": "sha512-U8uCCl2x9TK3WANvmBavymRzxbfFYG+tAu+fgx3zxQy3qdagQqBLwJVrdyO1TBfUXvfKveMKJZhpvUYoOjM+4g==", + "engines": { + "node": ">=18.17" + } + }, "node_modules/undici-types": { "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" }, - "node_modules/unique-filename": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", - "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", - "dev": true, - "dependencies": { - "unique-slug": "^4.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/unique-slug": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", - "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", - "dev": true, - "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/unique-string": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-3.0.0.tgz", - "integrity": "sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==", - "dev": true, - "dependencies": { - "crypto-random-string": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -16134,15 +14073,6 @@ "node": ">= 0.8" } }, - "node_modules/untildify": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", - "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/update-browserslist-db": { "version": "1.0.16", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz", @@ -16173,58 +14103,6 @@ "browserslist": ">= 4.21.0" } }, - "node_modules/update-notifier": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-6.0.2.tgz", - "integrity": "sha512-EDxhTEVPZZRLWYcJ4ZXjGFN0oP7qYvbXWzEgRm/Yql4dHX5wDbvh89YHP6PK1lzZJYrMtXUuZZz8XGK+U6U1og==", - "dev": true, - "dependencies": { - "boxen": "^7.0.0", - "chalk": "^5.0.1", - "configstore": "^6.0.0", - "has-yarn": "^3.0.0", - "import-lazy": "^4.0.0", - "is-ci": "^3.0.1", - "is-installed-globally": "^0.4.0", - "is-npm": "^6.0.0", - "is-yarn-global": "^0.4.0", - "latest-version": "^7.0.0", - "pupa": "^3.1.0", - "semver": "^7.3.7", - "semver-diff": "^4.0.0", - "xdg-basedir": "^5.1.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/yeoman/update-notifier?sponsor=1" - } - }, - "node_modules/update-notifier/node_modules/chalk": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", - "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", - "dev": true, - "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/update-notifier/node_modules/xdg-basedir": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz", - "integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -16275,18 +14153,6 @@ "spdx-expression-parse": "^3.0.0" } }, - "node_modules/validate-npm-package-name": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz", - "integrity": "sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==", - "dev": true, - "dependencies": { - "builtins": "^5.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/validator": { "version": "13.11.0", "resolved": "https://registry.npmjs.org/validator/-/validator-13.11.0.tgz", @@ -16329,6 +14195,25 @@ "node": ">=12" } }, + "node_modules/whatwg-encoding": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", + "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", + "dependencies": { + "iconv-lite": "0.6.3" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/whatwg-mimetype": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", + "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==", + "engines": { + "node": ">=18" + } + }, "node_modules/whatwg-url": { "version": "11.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", @@ -16372,13 +14257,13 @@ } }, "node_modules/which-builtin-type": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz", - "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.4.tgz", + "integrity": "sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==", "dev": true, "dependencies": { - "function.prototype.name": "^1.1.5", - "has-tostringtag": "^1.0.0", + "function.prototype.name": "^1.1.6", + "has-tostringtag": "^1.0.2", "is-async-function": "^2.0.0", "is-date-object": "^1.0.5", "is-finalizationregistry": "^1.0.2", @@ -16387,8 +14272,8 @@ "is-weakref": "^1.0.2", "isarray": "^2.0.5", "which-boxed-primitive": "^1.0.2", - "which-collection": "^1.0.1", - "which-typed-array": "^1.1.9" + "which-collection": "^1.0.2", + "which-typed-array": "^1.1.15" }, "engines": { "node": ">= 0.4" @@ -16404,15 +14289,18 @@ "dev": true }, "node_modules/which-collection": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", - "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", + "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", "dev": true, "dependencies": { - "is-map": "^2.0.1", - "is-set": "^2.0.1", - "is-weakmap": "^2.0.1", - "is-weakset": "^2.0.1" + "is-map": "^2.0.3", + "is-set": "^2.0.3", + "is-weakmap": "^2.0.2", + "is-weakset": "^2.0.3" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -16424,16 +14312,16 @@ "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==" }, "node_modules/which-typed-array": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz", - "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", + "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.4", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" + "has-tostringtag": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -16487,6 +14375,14 @@ "wrap-ansi": "^2.0.0" } }, + "node_modules/widdershins/node_modules/entities": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz", + "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==", + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, "node_modules/widdershins/node_modules/find-up": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", @@ -16703,62 +14599,6 @@ "decamelize": "^1.2.0" } }, - "node_modules/wide-align": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", - "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", - "dev": true, - "dependencies": { - "string-width": "^1.0.2 || 2 || 3 || 4" - } - }, - "node_modules/wide-align/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/wide-align/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/wide-align/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/widest-line": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-4.0.1.tgz", - "integrity": "sha512-o0cyEG0e8GPzT4iGHphIOh0cJOV8fivsXxddQasHPHfoZf1ZexrfeA21w2NaEN1RHE+fXlfISmOE8R9N3u3Qig==", - "dev": true, - "dependencies": { - "string-width": "^5.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/window-size": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", @@ -16814,14 +14654,6 @@ "node": ">= 6" } }, - "node_modules/winston/node_modules/@colors/colors": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", - "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", - "engines": { - "node": ">=0.1.90" - } - }, "node_modules/winston/node_modules/readable-stream": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", @@ -16995,9 +14827,9 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/yaml": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.5.tgz", - "integrity": "sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.1.tgz", + "integrity": "sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==", "bin": { "yaml": "bin.mjs" }, @@ -17026,7 +14858,6 @@ "version": "20.2.9", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", - "dev": true, "engines": { "node": ">=10" } diff --git a/package.json b/package.json index 0eeb773eb..673c9de19 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@mojaloop/central-ledger", - "version": "17.7.8", + "version": "17.8.0-snapshot.34", "description": "Central ledger hosted by a scheme to record and settle transfers", "license": "Apache-2.0", "author": "ModusBox", @@ -31,13 +31,15 @@ "pre-commit": [ "lint", "dep:check", + "audit:check", "test" ], "scripts": { "start": "npm run start:api", "start:api": "node src/api/index.js", - "watch:api": "npx nodemon src/api/index.js", "start:handlers": "node src/handlers/index.js", + "start:debug": "npm start --node-options --inspect=0.0.0.0", + "watch:api": "npx nodemon src/api/index.js", "dev": "npm run docker:stop && docker-compose -f docker-compose.yml -f docker-compose.dev.yml up --build -d", "lint": "npx standard", "lint:fix": "npx standard --fix", @@ -50,10 +52,10 @@ "test:int": "npx tape 'test/integration/**/*.test.js' ", "test:int-override": "npx tape 'test/integration-override/**/*.test.js'", "test:int:spec": "npm run test:int | npx tap-spec", - "test:xint": "npm run test:int | tap-xunit > ./test/results/xunit-integration.xml", - "test:xint-override": "npm run test:int-override | tap-xunit > ./test/results/xunit-integration-override.xml", - "test:integration": "sh ./test/scripts/test-integration.sh", - "test:functional": "sh ./test/scripts/test-functional.sh", + "test:xint": "npm run test:int | tee /dev/tty | tap-xunit > ./test/results/xunit-integration.xml", + "test:xint-override": "npm run test:int-override | tee /dev/tty | tap-xunit > ./test/results/xunit-integration-override.xml", + "test:integration": "./test/scripts/test-integration.sh", + "test:functional": "./test/scripts/test-functional.sh", "migrate": "npm run migrate:latest && npm run seed:run", "migrate:latest": "npx knex $npm_package_config_knex migrate:latest", "migrate:create": "npx knex migrate:make $npm_package_config_knex", @@ -61,7 +63,7 @@ "migrate:current": "npx knex migrate:currentVersion $npm_package_config_knex", "seed:run": "npx knex seed:run $npm_package_config_knex", "docker:build": "docker build --build-arg NODE_VERSION=\"$(cat .nvmrc)-alpine\" -t mojaloop/central-ledger:local .", - "docker:up": "docker-compose -f docker-compose.yml up", + "docker:up": ". ./docker/env.sh && docker-compose -f docker-compose.yml up -d", "docker:up:backend": "docker-compose up -d ml-api-adapter mysql mockserver kafka kowl temp_curl", "docker:up:int": "docker compose up -d kafka init-kafka objstore mysql", "docker:script:populateTestData": "sh ./test/util/scripts/populateTestData.sh", @@ -79,42 +81,45 @@ "wait-4-docker": "node ./scripts/_wait4_all.js" }, "dependencies": { - "@hapi/good": "9.0.1", - "@hapi/hapi": "21.3.10", "@hapi/basic": "7.0.2", + "@hapi/catbox-memory": "6.0.2", + "@hapi/good": "9.0.1", + "@hapi/hapi": "21.3.12", "@hapi/inert": "7.1.0", "@hapi/joi": "17.1.1", "@hapi/vision": "7.0.3", - "@hapi/catbox-memory": "6.0.2", - "@mojaloop/database-lib": "11.0.5", - "@mojaloop/central-services-error-handling": "13.0.1", + "@mojaloop/central-services-error-handling": "13.0.2", "@mojaloop/central-services-health": "15.0.0", - "@mojaloop/central-services-logger": "11.3.1", - "@mojaloop/central-services-metrics": "12.0.8", - "@mojaloop/central-services-shared": "18.3.8", - "@mojaloop/central-services-stream": "11.3.1", + "@mojaloop/central-services-logger": "11.5.1", + "@mojaloop/central-services-metrics": "12.4.2", + "@mojaloop/central-services-shared": "18.14.1", + "@mojaloop/central-services-stream": "11.4.1", + "@mojaloop/database-lib": "11.0.6", "@mojaloop/event-sdk": "14.1.1", + "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.1", "@mojaloop/ml-number": "11.2.4", "@mojaloop/object-store-lib": "12.0.3", "@now-ims/hapi-now-auth": "2.1.0", - "ajv": "8.16.0", + "ajv": "8.17.1", "ajv-keywords": "5.1.0", "base64url": "3.0.1", "blipp": "4.0.2", "commander": "12.1.0", - "cron": "3.1.7", + "cron": "3.3.1", "decimal.js": "10.4.3", "docdash": "2.0.2", "event-stream": "4.0.1", "five-bells-condition": "5.0.1", - "glob": "10.4.1", + "glob": "10.4.3", + "hapi-auth-basic": "5.0.0", "hapi-auth-bearer-token": "8.0.0", - "hapi-swagger": "17.2.1", + "hapi-swagger": "17.3.2", "ilp-packet": "2.2.0", "knex": "3.1.0", "lodash": "4.17.21", "moment": "2.30.1", "mongo-uri-builder": "^4.0.0", + "parse-strings-in-object": "2.0.0", "rc": "1.2.8", "require-glob": "^4.1.0" }, @@ -122,19 +127,21 @@ "mysql": "2.18.1" }, "devDependencies": { + "@types/mock-knex": "0.4.8", "async-retry": "1.3.3", - "audit-ci": "^7.0.1", + "audit-ci": "^7.1.0", "get-port": "5.1.1", - "jsdoc": "4.0.3", + "jsdoc": "4.0.4", "jsonpath": "1.1.1", - "nodemon": "3.1.3", - "npm-check-updates": "16.14.20", - "nyc": "17.0.0", + "mock-knex": "0.4.13", + "nodemon": "3.1.9", + "npm-check-updates": "17.1.11", + "nyc": "17.1.0", "pre-commit": "1.2.2", "proxyquire": "2.1.3", "replace": "^1.2.2", "sinon": "17.0.0", - "standard": "17.1.0", + "standard": "17.1.2", "standard-version": "^9.5.0", "tap-spec": "^5.0.0", "tap-xunit": "2.4.1", diff --git a/seeds/endpointType.js b/seeds/endpointType.js index 6ac12d99c..96ea38060 100644 --- a/seeds/endpointType.js +++ b/seeds/endpointType.js @@ -25,6 +25,8 @@ 'use strict' +const { FspEndpointTypes } = require('@mojaloop/central-services-shared').Enum.EndPoints + const endpointTypes = [ { name: 'ALARM_NOTIFICATION_URL', @@ -46,6 +48,22 @@ const endpointTypes = [ name: 'FSPIOP_CALLBACK_URL_TRANSFER_ERROR', description: 'Participant callback URL to which transfer error notifications can be sent' }, + { + name: FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_QUOTES, + description: 'Participant callback URL to which FX quote requests can be sent' + }, + { + name: FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_POST, + description: 'Participant callback URL to which FX transfer post can be sent' + }, + { + name: FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_PUT, + description: 'Participant callback URL to which FX transfer put can be sent' + }, + { + name: FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_ERROR, + description: 'Participant callback URL to which FX transfer error notifications can be sent' + }, { name: 'NET_DEBIT_CAP_THRESHOLD_BREACH_EMAIL', description: 'Participant/Hub operator email address to which the net debit cap breach e-mail notification can be sent' diff --git a/seeds/fxParticipantCurrencyType.js b/seeds/fxParticipantCurrencyType.js new file mode 100644 index 000000000..ae4c8557c --- /dev/null +++ b/seeds/fxParticipantCurrencyType.js @@ -0,0 +1,45 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Vijay Kumar Guthi + -------------- + ******/ + +'use strict' + +const fxParticipantCurrencyTypes = [ + { + name: 'SOURCE', + description: 'The participant currency is the source of the currency conversion' + }, + { + name: 'TARGET', + description: 'The participant currency is the target of the currency conversion' + } +] + +exports.seed = async function (knex) { + try { + return await knex('fxParticipantCurrencyType').insert(fxParticipantCurrencyTypes).onConflict('name').ignore() + } catch (err) { + console.log(`Uploading seeds for fxParticipantCurrencyType has failed with the following error: ${err}`) + return -1000 + } +} diff --git a/seeds/fxTransferType.js b/seeds/fxTransferType.js new file mode 100644 index 000000000..47d7625bb --- /dev/null +++ b/seeds/fxTransferType.js @@ -0,0 +1,45 @@ +/***** + License + -------------- + Copyright © 2017 Bill & Melinda Gates Foundation + The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Gates Foundation organization for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Vijay Kumar Guthi + -------------- + ******/ + +'use strict' + +const fxTransferTypes = [ + { + name: 'PAYER_CONVERSION', + description: 'Payer side currency conversion' + }, + { + name: 'PAYEE_CONVERSION', + description: 'Payee side currency conversion' + } +] + +exports.seed = async function (knex) { + try { + return await knex('fxTransferType').insert(fxTransferTypes).onConflict('name').ignore() + } catch (err) { + console.log(`Uploading seeds for fxTransferType has failed with the following error: ${err}`) + return -1000 + } +} diff --git a/seeds/participant.js b/seeds/participant.js index 2eff87278..19885f24d 100644 --- a/seeds/participant.js +++ b/seeds/participant.js @@ -28,6 +28,7 @@ const Config = require('../src/lib/config') const participant = [ { + participantId: Config.HUB_ID, name: Config.HUB_NAME, description: 'Hub Operator', createdBy: 'seeds' @@ -36,7 +37,7 @@ const participant = [ exports.seed = async function (knex) { try { - return await knex('participant').insert(participant).onConflict('name').ignore() + return await knex('participant').insert(participant).onConflict('id').merge() } catch (err) { console.log(`Uploading seeds for participant has failed with the following error: ${err}`) return -1000 diff --git a/seeds/transferParticipantRoleType.js b/seeds/transferParticipantRoleType.js index 296493bc5..c260f0240 100644 --- a/seeds/transferParticipantRoleType.js +++ b/seeds/transferParticipantRoleType.js @@ -20,6 +20,7 @@ * Georgi Georgiev * Shashikant Hirugade + * Vijay Kumar Guthi -------------- ******/ @@ -45,6 +46,14 @@ const transferParticipantRoleTypes = [ { name: 'DFSP_POSITION', description: 'Indicates the position account' + }, + { + name: 'INITIATING_FSP', + description: 'Identifier for the FSP who is requesting a currency conversion' + }, + { + name: 'COUNTER_PARTY_FSP', + description: 'Identifier for the FXP who is performing the currency conversion' } ] diff --git a/seeds/transferState.js b/seeds/transferState.js index 8736b6c6c..4135ae33b 100644 --- a/seeds/transferState.js +++ b/seeds/transferState.js @@ -41,6 +41,11 @@ const transferStates = [ enumeration: 'RESERVED', description: 'The switch has reserved the transfer, and has been assigned to a settlement window.' }, + { + transferStateId: 'RECEIVED_FULFIL_DEPENDENT', + enumeration: 'RESERVED', + description: 'The switch has reserved the fxTransfer fulfilment.' + }, { transferStateId: 'COMMITTED', enumeration: 'COMMITTED', @@ -95,6 +100,11 @@ const transferStates = [ transferStateId: 'SETTLED', enumeration: 'SETTLED', description: 'The switch has settled the transfer.' + }, + { + transferStateId: 'RESERVED_FORWARDED', + enumeration: 'RESERVED', + description: 'The switch has forwarded the transfer to a proxy participant' } ] diff --git a/src/api/interface/swagger.json b/src/api/interface/swagger.json index cb4616082..aadb3ee69 100644 --- a/src/api/interface/swagger.json +++ b/src/api/interface/swagger.json @@ -66,6 +66,25 @@ "tags": [ "participants" ], + "parameters": [ + { + "type": ["string", "boolean", "integer", "null"], + "enum": [ + false, + "0", + "false", + "", + true, + "1", + "true", + null + ], + "description": "Filter by if participant is a proxy", + "name": "isProxy", + "in": "query", + "required": false + } + ], "responses": { "default": { "schema": { @@ -375,9 +394,6 @@ "description": "Name of the participant", "minLength": 2, "maxLength": 30, - "x-format": { - "alphanum": true - }, "name": "name", "in": "path", "required": true @@ -404,9 +420,6 @@ "description": "Name of the participant", "minLength": 2, "maxLength": 30, - "x-format": { - "alphanum": true - }, "name": "name", "in": "path", "required": true @@ -442,9 +455,6 @@ "description": "Name of the participant", "minLength": 2, "maxLength": 30, - "x-format": { - "alphanum": true - }, "name": "name", "in": "path", "required": true @@ -663,9 +673,6 @@ "description": "Name of the participant", "minLength": 2, "maxLength": 30, - "x-format": { - "alphanum": true - }, "name": "name", "in": "path", "required": true @@ -701,9 +708,6 @@ "description": "Name of the participant", "minLength": 2, "maxLength": 30, - "x-format": { - "alphanum": true - }, "name": "name", "in": "path", "required": true @@ -917,9 +921,6 @@ "description": "Name of the participant", "minLength": 2, "maxLength": 30, - "x-format": { - "alphanum": true - }, "name": "name", "in": "path", "required": true @@ -979,9 +980,6 @@ "description": "Name of the participant", "minLength": 2, "maxLength": 30, - "x-format": { - "alphanum": true - }, "name": "name", "in": "path", "required": true @@ -1017,9 +1015,6 @@ "description": "Name of the participant", "minLength": 2, "maxLength": 30, - "x-format": { - "alphanum": true - }, "name": "name", "in": "path", "required": true @@ -1062,9 +1057,6 @@ "description": "Name of the participant", "minLength": 2, "maxLength": 30, - "x-format": { - "alphanum": true - }, "name": "name", "in": "path", "required": true @@ -1109,9 +1101,6 @@ "description": "Name of the participant", "minLength": 2, "maxLength": 30, - "x-format": { - "alphanum": true - }, "name": "name", "in": "path", "required": true @@ -1326,6 +1315,10 @@ "description": "Currency code", "$ref" : "#/definitions/Currency" + }, + "isProxy": { + "type": "boolean", + "description": "Is the participant a proxy" } }, "required": [ diff --git a/src/api/ledgerAccountTypes/handler.js b/src/api/ledgerAccountTypes/handler.js index ef0d6fca2..6b7277863 100644 --- a/src/api/ledgerAccountTypes/handler.js +++ b/src/api/ledgerAccountTypes/handler.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,9 +15,10 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . + * Gates Foundation - Name Surname diff --git a/src/api/ledgerAccountTypes/routes.js b/src/api/ledgerAccountTypes/routes.js index 2ac6074eb..9d9b95f74 100644 --- a/src/api/ledgerAccountTypes/routes.js +++ b/src/api/ledgerAccountTypes/routes.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,9 +15,10 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . + * Gates Foundation - Name Surname diff --git a/src/api/metrics/handler.js b/src/api/metrics/handler.js index cf11c3f4d..5e6c7105a 100644 --- a/src/api/metrics/handler.js +++ b/src/api/metrics/handler.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,9 +15,10 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . + * Gates Foundation - Name Surname diff --git a/src/api/metrics/plugin.js b/src/api/metrics/plugin.js index 08f264dbe..4e60b97e3 100644 --- a/src/api/metrics/plugin.js +++ b/src/api/metrics/plugin.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . diff --git a/src/api/metrics/routes.js b/src/api/metrics/routes.js index 861e09f29..11e6c0bd4 100644 --- a/src/api/metrics/routes.js +++ b/src/api/metrics/routes.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,9 +15,10 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . + * Gates Foundation - Name Surname diff --git a/src/api/participants/handler.js b/src/api/participants/handler.js index ad79e5ee2..72c8b79da 100644 --- a/src/api/participants/handler.js +++ b/src/api/participants/handler.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,9 +15,10 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . + * Gates Foundation - Name Surname @@ -38,7 +42,7 @@ const LocalEnum = { disabled: 'disabled' } -const entityItem = ({ name, createdDate, isActive, currencyList }, ledgerAccountIds) => { +const entityItem = ({ name, createdDate, isActive, currencyList, isProxy }, ledgerAccountIds) => { const link = UrlParser.toParticipantUri(name) const accounts = currencyList.map((currentValue) => { return { @@ -58,7 +62,8 @@ const entityItem = ({ name, createdDate, isActive, currencyList }, ledgerAccount links: { self: link }, - accounts + accounts, + isProxy } } @@ -160,6 +165,9 @@ const getAll = async function (request) { const results = await ParticipantService.getAll() const ledgerAccountTypes = await Enums.getEnums('ledgerAccountType') const ledgerAccountIds = Util.transpose(ledgerAccountTypes) + if (request.query.isProxy) { + return results.map(record => entityItem(record, ledgerAccountIds)).filter(record => record.isProxy) + } return results.map(record => entityItem(record, ledgerAccountIds)) } diff --git a/src/api/participants/routes.js b/src/api/participants/routes.js index 868b29769..9bce3187e 100644 --- a/src/api/participants/routes.js +++ b/src/api/participants/routes.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,9 +15,10 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . + * Gates Foundation - Name Surname @@ -29,7 +33,7 @@ const Joi = require('joi') const currencyList = require('../../../seeds/currency.js').currencyList const tags = ['api', 'participants'] -const nameValidator = Joi.string().alphanum().min(2).max(30).required().description('Name of the participant') +const nameValidator = Joi.string().min(2).max(30).required().description('Name of the participant') const currencyValidator = Joi.string().valid(...currencyList).description('Currency code') module.exports = [ @@ -49,7 +53,7 @@ module.exports = [ tags, validate: { params: Joi.object({ - name: Joi.string().required().description('Participant name') + name: nameValidator }) } } @@ -68,7 +72,8 @@ module.exports = [ payload: Joi.object({ name: nameValidator, // password: passwordValidator, - currency: currencyValidator // , + currency: currencyValidator, + isProxy: Joi.boolean().falsy(0, '0', '').truthy(1, '1').allow(true, false, 0, 1, '0', '1', null) // emailAddress: Joi.string().email().required() }) } @@ -89,7 +94,7 @@ module.exports = [ isActive: Joi.boolean().required().description('Participant isActive boolean') }), params: Joi.object({ - name: Joi.string().required().description('Participant name') + name: nameValidator }) } } @@ -239,7 +244,7 @@ module.exports = [ type: Joi.string().required().description('Account type') // Needs a validator here }), params: Joi.object({ - name: Joi.string().required().description('Participant name') // nameValidator + name: nameValidator // nameValidator }) } } @@ -306,7 +311,7 @@ module.exports = [ description: 'Record Funds In or Out of participant account', validate: { payload: Joi.object({ - transferId: Joi.string().guid().required(), + transferId: Joi.string().pattern(/^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-7][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]}$|^[0-9A-HJKMNP-TV-Z]{26}$6})$/).required(), externalReference: Joi.string().required(), action: Joi.string().required().valid('recordFundsIn', 'recordFundsOutPrepareReserve').label('action is missing or not supported'), reason: Joi.string().required(), @@ -344,7 +349,7 @@ module.exports = [ params: Joi.object({ name: nameValidator, id: Joi.number().integer().positive(), - transferId: Joi.string().guid().required() + transferId: Joi.string().pattern(/^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-7][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]}$|^[0-9A-HJKMNP-TV-Z]{26}$6})$/).required() }) } } diff --git a/src/api/root/handler.js b/src/api/root/handler.js index 17cdc6d67..c7de5483a 100644 --- a/src/api/root/handler.js +++ b/src/api/root/handler.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,9 +15,10 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . + * Gates Foundation - Name Surname @@ -30,13 +34,23 @@ const { defaultHealthHandler } = require('@mojaloop/central-services-health') const packageJson = require('../../../package.json') const { getSubServiceHealthDatastore, - getSubServiceHealthBroker + getSubServiceHealthBroker, + getSubServiceHealthProxyCache } = require('../../lib/healthCheck/subServiceHealth') +const Config = require('../../lib/config') -const healthCheck = new HealthCheck(packageJson, [ - getSubServiceHealthDatastore, - getSubServiceHealthBroker -]) +const subServiceChecks = Config.PROXY_CACHE_CONFIG?.enabled + ? [ + getSubServiceHealthDatastore, + getSubServiceHealthBroker, + getSubServiceHealthProxyCache + ] + : [ + getSubServiceHealthDatastore, + getSubServiceHealthBroker + ] + +const healthCheck = new HealthCheck(packageJson, subServiceChecks) /** * @function getHealth diff --git a/src/api/root/routes.js b/src/api/root/routes.js index 4278fbd39..34e39b72b 100644 --- a/src/api/root/routes.js +++ b/src/api/root/routes.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . diff --git a/src/api/settlementModels/handler.js b/src/api/settlementModels/handler.js index 22cc958c5..869aaa2a3 100644 --- a/src/api/settlementModels/handler.js +++ b/src/api/settlementModels/handler.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,9 +15,10 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . + * Gates Foundation - Name Surname diff --git a/src/api/settlementModels/routes.js b/src/api/settlementModels/routes.js index 89cf7f2f9..65e4b526f 100644 --- a/src/api/settlementModels/routes.js +++ b/src/api/settlementModels/routes.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/api/transactions/handler.js b/src/api/transactions/handler.js index b65e172ca..75d95de42 100644 --- a/src/api/transactions/handler.js +++ b/src/api/transactions/handler.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/api/transactions/routes.js b/src/api/transactions/routes.js index a26c01b67..0712f4595 100644 --- a/src/api/transactions/routes.js +++ b/src/api/transactions/routes.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/domain/bulkTransfer/index.js b/src/domain/bulkTransfer/index.js index b46c76f65..6456673ff 100644 --- a/src/domain/bulkTransfer/index.js +++ b/src/domain/bulkTransfer/index.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/domain/fx/cyril.js b/src/domain/fx/cyril.js new file mode 100644 index 000000000..e797c2100 --- /dev/null +++ b/src/domain/fx/cyril.js @@ -0,0 +1,462 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + * Vijay Kumar Guthi + -------------- + ******/ + +'use strict' + +const Metrics = require('@mojaloop/central-services-metrics') +const { Enum } = require('@mojaloop/central-services-shared') +const TransferModel = require('../../models/transfer/transfer') +const TransferFacade = require('../../models/transfer/facade') +const ParticipantPositionChangesModel = require('../../models/position/participantPositionChanges') +const { fxTransfer, watchList } = require('../../models/fxTransfer') +const Config = require('../../lib/config') +const ProxyCache = require('../../lib/proxyCache') + +const checkIfDeterminingTransferExistsForTransferMessage = async (payload, proxyObligation) => { + // Does this determining transfer ID appear on the watch list? + const watchListRecords = await watchList.getItemsInWatchListByDeterminingTransferId(payload.transferId) + const determiningTransferExistsInWatchList = (watchListRecords !== null && watchListRecords.length > 0) + // Create a list of participants and currencies to validate against + const participantCurrencyValidationList = [] + if (determiningTransferExistsInWatchList) { + // If there's a currency conversion before the transfer is requested, it must be the debtor who did it. + if (!proxyObligation.isCounterPartyFspProxy) { + participantCurrencyValidationList.push({ + participantName: payload.payeeFsp, + currencyId: payload.amount.currency + }) + } + } else { + // Normal transfer request or payee side currency conversion + if (!proxyObligation.isInitiatingFspProxy) { + participantCurrencyValidationList.push({ + participantName: payload.payerFsp, + currencyId: payload.amount.currency + }) + } + // If it is a normal transfer, we need to validate payeeFsp against the currency of the transfer. + // But its tricky to differentiate between normal transfer and payee side currency conversion. + if (Config.PAYEE_PARTICIPANT_CURRENCY_VALIDATION_ENABLED) { + if (!proxyObligation.isCounterPartyFspProxy) { + participantCurrencyValidationList.push({ + participantName: payload.payeeFsp, + currencyId: payload.amount.currency + }) + } + } + } + return { + determiningTransferExistsInWatchList, + watchListRecords, + participantCurrencyValidationList + } +} + +const checkIfDeterminingTransferExistsForFxTransferMessage = async (payload, proxyObligation) => { + // Does this determining transfer ID appear on the transfer list? + const transferRecord = await TransferModel.getById(payload.determiningTransferId) + const determiningTransferExistsInTransferList = (transferRecord !== null) + // We need to validate counterPartyFsp (FXP) against both source and target currencies anyway + const participantCurrencyValidationList = [ + { + participantName: payload.counterPartyFsp, + currencyId: payload.sourceAmount.currency + } + ] + // If a proxy is representing a FXP in a jurisdictional scenario, + // they would not hold a position account for the `targetAmount` currency + // for a /fxTransfer. So we skip adding this to accounts to be validated. + if (!proxyObligation.isCounterPartyFspProxy) { + participantCurrencyValidationList.push({ + participantName: payload.counterPartyFsp, + currencyId: payload.targetAmount.currency + }) + } + if (determiningTransferExistsInTransferList) { + // If there's a currency conversion which is not the first message, then it must be issued by the creditor party + participantCurrencyValidationList.push({ + participantName: payload.initiatingFsp, + currencyId: payload.targetAmount.currency + }) + } else { + // If there's a currency conversion before the transfer is requested, then it must be issued by the debtor party + participantCurrencyValidationList.push({ + participantName: payload.initiatingFsp, + currencyId: payload.sourceAmount.currency + }) + } + return { + determiningTransferExistsInTransferList, + transferRecord, + participantCurrencyValidationList + } +} + +const getParticipantAndCurrencyForTransferMessage = async (payload, determiningTransferCheckResult, proxyObligation) => { + const histTimer = Metrics.getHistogram( + 'fx_domain_cyril_getParticipantAndCurrencyForTransferMessage', + 'fx_domain_cyril_getParticipantAndCurrencyForTransferMessage - Metrics for fx cyril', + ['success', 'determiningTransferExists'] + ).startTimer() + + let participantName, currencyId, amount + + if (determiningTransferCheckResult.determiningTransferExistsInWatchList) { + // If there's a currency conversion before the transfer is requested, it must be the debtor who did it. + // Get the FX request corresponding to this transaction ID + let fxTransferRecord + if (proxyObligation.isCounterPartyFspProxy) { + // If a proxy is representing a FXP in a jurisdictional scenario, + // they would not hold a position account for the `targetAmount` currency + // for a /fxTransfer. So we skip adding this to accounts to be validated. + fxTransferRecord = await fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer(determiningTransferCheckResult.watchListRecords[0].commitRequestId) + } else { + fxTransferRecord = await fxTransfer.getAllDetailsByCommitRequestId(determiningTransferCheckResult.watchListRecords[0].commitRequestId) + } + + // Liquidity check and reserve funds against FXP in FX target currency + participantName = fxTransferRecord.counterPartyFspName + currencyId = fxTransferRecord.targetCurrency + amount = fxTransferRecord.targetAmount + } else { + // Normal transfer request or payee side currency conversion + // Liquidity check and reserve against payer + participantName = payload.payerFsp + currencyId = payload.amount.currency + amount = payload.amount.amount + } + + histTimer({ success: true, determiningTransferExists: determiningTransferCheckResult.determiningTransferExistsInWatchList }) + return { + participantName, + currencyId, + amount + } +} + +const getParticipantAndCurrencyForFxTransferMessage = async (payload, determiningTransferCheckResult) => { + const histTimer = Metrics.getHistogram( + 'fx_domain_cyril_getParticipantAndCurrencyForFxTransferMessage', + 'fx_domain_cyril_getParticipantAndCurrencyForFxTransferMessage - Metrics for fx cyril', + ['success', 'determiningTransferExists'] + ).startTimer() + + let participantName, currencyId, amount + + if (determiningTransferCheckResult.determiningTransferExistsInTransferList) { + // If there's a currency conversion which is not the first message, then it must be issued by the creditor party + // Liquidity check and reserve funds against FXP in FX target currency + participantName = payload.counterPartyFsp + currencyId = payload.targetAmount.currency + amount = payload.targetAmount.amount + await watchList.addToWatchList({ + commitRequestId: payload.commitRequestId, + determiningTransferId: payload.determiningTransferId, + fxTransferTypeId: Enum.Fx.FxTransferType.PAYEE_CONVERSION + }) + } else { + // If there's a currency conversion before the transfer is requested, then it must be issued by the debtor party + // Liquidity check and reserve funds against requester in FX source currency + participantName = payload.initiatingFsp + currencyId = payload.sourceAmount.currency + amount = payload.sourceAmount.amount + await watchList.addToWatchList({ + commitRequestId: payload.commitRequestId, + determiningTransferId: payload.determiningTransferId, + fxTransferTypeId: Enum.Fx.FxTransferType.PAYER_CONVERSION + }) + } + + histTimer({ success: true, determiningTransferExists: determiningTransferCheckResult.determiningTransferExistsInTransferList }) + return { + participantName, + currencyId, + amount + } +} + +const processFxFulfilMessage = async (commitRequestId) => { + const histTimer = Metrics.getHistogram( + 'fx_domain_cyril_processFxFulfilMessage', + 'fx_domain_cyril_processFxFulfilMessage - Metrics for fx cyril', + ['success'] + ).startTimer() + // Does this commitRequestId appear on the watch list? + const watchListRecord = await watchList.getItemInWatchListByCommitRequestId(commitRequestId) + if (!watchListRecord) { + throw new Error(`Commit request ID ${commitRequestId} not found in watch list`) + } + + histTimer({ success: true }) + return true +} + +/** + * @typedef {Object} PositionChangeItem + * + * @property {boolean} isFxTransferStateChange - Indicates whether the position change is related to an FX transfer. + * @property {string} [commitRequestId] - commitRequestId for the position change (only for FX transfers). + * @property {string} [transferId] - transferId for the position change (only for normal transfers). + * @property {string} notifyTo - The FSP to notify about the position change. + * @property {number} participantCurrencyId - The ID of the participant's currency involved in the position change. + * @property {number} amount - The amount of the position change, represented as a negative value. + */ +/** + * Retrieves position changes based on a list of commitRequestIds and transferIds. + * + * @param {Array} commitRequestIdList - List of commit request IDs to retrieve FX-related position changes. + * @param {Array} transferIdList - List of transfer IDs to retrieve regular transfer-related position changes. + * @returns {Promise} - A promise that resolves to an array of position change objects. + */ +const _getPositionChanges = async (commitRequestIdList, transferIdList) => { + const positionChanges = [] + for (const commitRequestId of commitRequestIdList) { + const fxRecord = await fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer(commitRequestId) + const fxPositionChanges = await ParticipantPositionChangesModel.getReservedPositionChangesByCommitRequestId(commitRequestId) + fxPositionChanges.forEach((fxPositionChange) => { + positionChanges.push({ + isFxTransferStateChange: true, + commitRequestId, + notifyTo: fxRecord.externalInitiatingFspName || fxRecord.initiatingFspName, + participantCurrencyId: fxPositionChange.participantCurrencyId, + amount: -fxPositionChange.change + }) + }) + } + + for (const transferId of transferIdList) { + const transferRecord = await TransferFacade.getById(transferId) + const transferPositionChanges = await ParticipantPositionChangesModel.getReservedPositionChangesByTransferId(transferId) + transferPositionChanges.forEach((transferPositionChange) => { + positionChanges.push({ + isFxTransferStateChange: false, + transferId, + notifyTo: transferRecord.externalPayerName || transferRecord.payerFsp, + participantCurrencyId: transferPositionChange.participantCurrencyId, + amount: -transferPositionChange.change + }) + }) + } + + return positionChanges +} + +/** + * @returns {Promise<{positionChanges: PositionChangeItem[]}>} + */ +const processFxAbortMessage = async (commitRequestId) => { + const histTimer = Metrics.getHistogram( + 'fx_domain_cyril_processFxAbortMessage', + 'fx_domain_cyril_processFxAbortMessage - Metrics for fx cyril', + ['success'] + ).startTimer() + + // Get the fxTransfer record + const fxTransferRecord = await fxTransfer.getByCommitRequestId(commitRequestId) + // const fxTransferRecord = await fxTransfer.getAllDetailsByCommitRequestId(commitRequestId) + // In case of reference currency, there might be multiple fxTransfers associated with a transfer. + const relatedFxTransferRecords = await fxTransfer.getByDeterminingTransferId(fxTransferRecord.determiningTransferId) + + // Get position changes + const positionChanges = await _getPositionChanges(relatedFxTransferRecords.map(item => item.commitRequestId), [fxTransferRecord.determiningTransferId]) + + histTimer({ success: true }) + return { + positionChanges + } +} + +const processAbortMessage = async (transferId) => { + const histTimer = Metrics.getHistogram( + 'fx_domain_cyril_processAbortMessage', + 'fx_domain_cyril_processAbortMessage - Metrics for fx cyril', + ['success'] + ).startTimer() + + // Get all related fxTransfers + const relatedFxTransferRecords = await fxTransfer.getByDeterminingTransferId(transferId) + + // Get position changes + const positionChanges = await _getPositionChanges(relatedFxTransferRecords.map(item => item.commitRequestId), [transferId]) + + histTimer({ success: true }) + return { + positionChanges + } +} + +const processFulfilMessage = async (transferId, payload, transfer) => { + const histTimer = Metrics.getHistogram( + 'fx_domain_cyril_processFulfilMessage', + 'fx_domain_cyril_processFulfilMessage - Metrics for fx cyril', + ['success'] + ).startTimer() + // Let's define a format for the function result + const result = { + isFx: false, + positionChanges: [], + patchNotifications: [] + } + + // Does this transferId appear on the watch list? + const watchListRecords = await watchList.getItemsInWatchListByDeterminingTransferId(transferId) + if (watchListRecords && watchListRecords.length > 0) { + result.isFx = true + + // Loop around watch list + let sendingFxpExists = false + let receivingFxpExists = false + let sendingFxpRecord = null + let receivingFxpRecord = null + for (const watchListRecord of watchListRecords) { + const fxTransferRecord = await fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer(watchListRecord.commitRequestId) + // Original Plan: If the reservation is against the FXP, then this is a conversion at the creditor. Mark FXP as receiving FXP + // The above condition is not required as we are setting the fxTransferType in the watchList beforehand + if (watchListRecord.fxTransferTypeId === Enum.Fx.FxTransferType.PAYEE_CONVERSION) { + receivingFxpExists = true + receivingFxpRecord = fxTransferRecord + // Create obligation between FXP and FX requesting party in currency of reservation + // Find out the participantCurrencyId of the initiatingFsp + // The following is hardcoded for Payer side conversion with SEND amountType. + const proxyParticipantAccountDetails = await ProxyCache.getProxyParticipantAccountDetails(fxTransferRecord.initiatingFspName, fxTransferRecord.targetCurrency) + if (proxyParticipantAccountDetails.participantCurrencyId) { + result.positionChanges.push({ + isFxTransferStateChange: false, + transferId, + participantCurrencyId: proxyParticipantAccountDetails.participantCurrencyId, + amount: -fxTransferRecord.targetAmount + }) + } + } + + // Original Plan: If the reservation is against the DFSP, then this is a conversion at the debtor. Mark FXP as sending FXP + // The above condition is not required as we are setting the fxTransferType in the watchList beforehand + if (watchListRecord.fxTransferTypeId === Enum.Fx.FxTransferType.PAYER_CONVERSION) { + sendingFxpExists = true + sendingFxpRecord = fxTransferRecord + // Create obligation between FX requesting party and FXP in currency of reservation + const proxyParticipantAccountDetails = await ProxyCache.getProxyParticipantAccountDetails(fxTransferRecord.counterPartyFspName, fxTransferRecord.sourceCurrency) + if (proxyParticipantAccountDetails.participantCurrencyId) { + result.positionChanges.push({ + isFxTransferStateChange: true, + commitRequestId: fxTransferRecord.commitRequestId, + participantCurrencyId: proxyParticipantAccountDetails.participantCurrencyId, + amount: -fxTransferRecord.sourceAmount + }) + } + result.patchNotifications.push({ + commitRequestId: watchListRecord.commitRequestId, + fxpName: fxTransferRecord.counterPartyFspName, + fulfilment: fxTransferRecord.fulfilment, + completedTimestamp: fxTransferRecord.completedTimestamp + }) + } + } + + if (!sendingFxpExists && !receivingFxpExists) { + // If there are no sending and receiving fxp, throw an error + throw new Error(`Required records not found in watch list for transfer ID ${transferId}`) + } + + if (sendingFxpExists && receivingFxpExists) { + // If we have both a sending and a receiving FXP, Create obligation between sending and receiving FXP in currency of transfer. + const proxyParticipantAccountDetails = await ProxyCache.getProxyParticipantAccountDetails(receivingFxpRecord.counterPartyFspName, receivingFxpRecord.sourceCurrency) + if (proxyParticipantAccountDetails.participantCurrencyId) { + result.positionChanges.push({ + isFxTransferStateChange: true, + commitRequestId: receivingFxpRecord.commitRequestId, + participantCurrencyId: proxyParticipantAccountDetails.participantCurrencyId, + amount: -receivingFxpRecord.sourceAmount + }) + } + } else if (sendingFxpExists) { + // If we have a sending FXP, Create obligation between FXP and creditor party to the transfer in currency of FX transfer + // Get participantCurrencyId for transfer.payeeParticipantId/transfer.payeeFsp and sendingFxpRecord.targetCurrency + const proxyParticipantAccountDetails = await ProxyCache.getProxyParticipantAccountDetails(transfer.payeeFsp, sendingFxpRecord.targetCurrency) + if (proxyParticipantAccountDetails.participantCurrencyId) { + let isPositionChange = false + if (proxyParticipantAccountDetails.inScheme) { + isPositionChange = true + } else { + // We are not expecting this. Payee participant is a proxy and have an account in the targetCurrency. + // In this case we need to check if FXP is also a proxy and have the same account as payee. + const proxyParticipantAccountDetails2 = await ProxyCache.getProxyParticipantAccountDetails(sendingFxpRecord.counterPartyFspName, sendingFxpRecord.targetCurrency) + if (!proxyParticipantAccountDetails2.inScheme && (proxyParticipantAccountDetails.participantCurrencyId !== proxyParticipantAccountDetails2.participantCurrencyId)) { + isPositionChange = true + } + } + if (isPositionChange) { + result.positionChanges.push({ + isFxTransferStateChange: false, + transferId, + participantCurrencyId: proxyParticipantAccountDetails.participantCurrencyId, + amount: -sendingFxpRecord.targetAmount + }) + } + } + } else if (receivingFxpExists) { + // If we have a receiving FXP, Create obligation between debtor party to the transfer and FXP in currency of transfer + const proxyParticipantAccountDetails = await ProxyCache.getProxyParticipantAccountDetails(receivingFxpRecord.counterPartyFspName, receivingFxpRecord.sourceCurrency) + if (proxyParticipantAccountDetails.participantCurrencyId) { + let isPositionChange = false + if (proxyParticipantAccountDetails.inScheme) { + isPositionChange = true + } else { + // We are not expecting this. FXP participant is a proxy and have an account in the sourceCurrency. + // In this case we need to check if Payer is also a proxy and have the same account as FXP. + const proxyParticipantAccountDetails2 = await ProxyCache.getProxyParticipantAccountDetails(transfer.payerFsp, receivingFxpRecord.sourceCurrency) + if (!proxyParticipantAccountDetails2.inScheme && (proxyParticipantAccountDetails.participantCurrencyId !== proxyParticipantAccountDetails2.participantCurrencyId)) { + isPositionChange = true + } + } + if (isPositionChange) { + result.positionChanges.push({ + isFxTransferStateChange: true, + commitRequestId: receivingFxpRecord.commitRequestId, + participantCurrencyId: proxyParticipantAccountDetails.participantCurrencyId, + amount: -receivingFxpRecord.sourceAmount + }) + } + } + } + } else { + // Normal transfer request, just return isFx = false + } + + histTimer({ success: true }) + return result +} + +module.exports = { + getParticipantAndCurrencyForTransferMessage, + getParticipantAndCurrencyForFxTransferMessage, + processFxFulfilMessage, + processFxAbortMessage, + processFulfilMessage, + processAbortMessage, + checkIfDeterminingTransferExistsForTransferMessage, + checkIfDeterminingTransferExistsForFxTransferMessage +} diff --git a/src/domain/fx/index.js b/src/domain/fx/index.js new file mode 100644 index 000000000..e94626711 --- /dev/null +++ b/src/domain/fx/index.js @@ -0,0 +1,81 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Vijay Kumar Guthi + -------------- + ******/ + +'use strict' + +/** + * @module src/domain/transfer/ + */ + +const ErrorHandler = require('@mojaloop/central-services-error-handling') +const Metrics = require('@mojaloop/central-services-metrics') +const FxTransferModel = require('../../models/fxTransfer') +// const TransferObjectTransform = require('./transform') +const Cyril = require('./cyril') + +const handleFulfilResponse = async (transferId, payload, action, fspiopError) => { + const histTimerTransferServiceHandlePayeeResponseEnd = Metrics.getHistogram( + 'fx_domain_transfer', + 'prepare - Metrics for fx transfer domain', + ['success', 'funcName'] + ).startTimer() + + try { + await FxTransferModel.fxTransfer.saveFxFulfilResponse(transferId, payload, action, fspiopError) + const result = {} + histTimerTransferServiceHandlePayeeResponseEnd({ success: true, funcName: 'handleFulfilResponse' }) + return result + } catch (err) { + histTimerTransferServiceHandlePayeeResponseEnd({ success: false, funcName: 'handleFulfilResponse' }) + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} + +const forwardedFxPrepare = async (commitRequestId) => { + const histTimerTransferServicePrepareEnd = Metrics.getHistogram( + 'fx_domain_transfer', + 'prepare - Metrics for fx transfer domain', + ['success', 'funcName'] + ).startTimer() + try { + const result = await FxTransferModel.fxTransfer.updateFxPrepareReservedForwarded(commitRequestId) + histTimerTransferServicePrepareEnd({ success: true, funcName: 'forwardedFxPrepare' }) + return result + } catch (err) { + histTimerTransferServicePrepareEnd({ success: false, funcName: 'forwardedFxPrepare' }) + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} + +const TransferService = { + handleFulfilResponse, + forwardedFxPrepare, + getByIdLight: FxTransferModel.fxTransfer.getByIdLight, + Cyril +} + +module.exports = TransferService diff --git a/src/domain/ledgerAccountTypes/index.js b/src/domain/ledgerAccountTypes/index.js index 2535fafc5..3ad90c1c6 100644 --- a/src/domain/ledgerAccountTypes/index.js +++ b/src/domain/ledgerAccountTypes/index.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/domain/participant/index.js b/src/domain/participant/index.js index bbeb0cd39..e975f3027 100644 --- a/src/domain/participant/index.js +++ b/src/domain/participant/index.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -42,6 +45,7 @@ const KafkaProducer = require('@mojaloop/central-services-stream').Util.Producer const { randomUUID } = require('crypto') const Enum = require('@mojaloop/central-services-shared').Enum const Enums = require('../../lib/enumCached') +const { logger } = require('../../shared/logger') // Alphabetically ordered list of error texts used below const AccountInactiveErrorText = 'Account is currently set inactive' @@ -58,9 +62,12 @@ const ErrorHandler = require('@mojaloop/central-services-error-handling') const { destroyParticipantEndpointByParticipantId } = require('../../models/participant/participant') const create = async (payload) => { + const log = logger.child({ payload }) try { - return ParticipantModel.create({ name: payload.name }) + log.info('creating participant with payload') + return ParticipantModel.create({ name: payload.name, isProxy: !!payload.isProxy }) } catch (err) { + log.error('error creating participant', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } @@ -71,13 +78,16 @@ const getAll = async () => { await Promise.all(all.map(async (participant) => { participant.currencyList = await ParticipantCurrencyModel.getByParticipantId(participant.participantId) })) + logger.debug('getAll participants', { participants: all }) return all } catch (err) { + logger.error('error getting all participants', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } const getById = async (id) => { + logger.debug('getting participant by id', { id }) const participant = await ParticipantModel.getById(id) if (participant) { participant.currencyList = await ParticipantCurrencyModel.getByParticipantId(participant.participantId) @@ -86,6 +96,7 @@ const getById = async (id) => { } const getByName = async (name) => { + logger.debug('getting participant by name', { name }) const participant = await ParticipantModel.getByName(name) if (participant) { participant.currencyList = await ParticipantCurrencyModel.getByParticipantId(participant.participantId) @@ -94,17 +105,23 @@ const getByName = async (name) => { } const participantExists = (participant, checkIsActive = false) => { + const log = logger.child({ participant, checkIsActive }) + log.debug('checking if participant exists') if (participant) { if (!checkIsActive || participant.isActive) { return participant } + log.warn('participant is inactive') throw ErrorHandler.Factory.createInternalServerFSPIOPError(ParticipantInactiveText) } + log.warn('participant not found') throw ErrorHandler.Factory.createInternalServerFSPIOPError(ParticipantNotFoundText) } const update = async (name, payload) => { + const log = logger.child({ name, payload }) try { + log.info('updating participant') const participant = await ParticipantModel.getByName(name) participantExists(participant) await ParticipantModel.update(participant, payload.isActive) @@ -112,38 +129,50 @@ const update = async (name, payload) => { participant.currencyList = await ParticipantCurrencyModel.getByParticipantId(participant.participantId) return participant } catch (err) { + log.error('error updating participant', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } const createParticipantCurrency = async (participantId, currencyId, ledgerAccountTypeId, isActive = true) => { + const log = logger.child({ participantId, currencyId, ledgerAccountTypeId, isActive }) try { + log.info('creating participant currency') const participantCurrency = await ParticipantCurrencyModel.create(participantId, currencyId, ledgerAccountTypeId, isActive) return participantCurrency } catch (err) { + log.error('error creating participant currency', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } const createHubAccount = async (participantId, currencyId, ledgerAccountTypeId) => { + const log = logger.child({ participantId, currencyId, ledgerAccountTypeId }) try { + log.info('creating hub account') const participantCurrency = await ParticipantFacade.addHubAccountAndInitPosition(participantId, currencyId, ledgerAccountTypeId) return participantCurrency } catch (err) { + log.error('error creating hub account', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } const getParticipantCurrencyById = async (participantCurrencyId) => { + const log = logger.child({ participantCurrencyId }) try { + log.debug('getting participant currency by id') return await ParticipantCurrencyModel.getById(participantCurrencyId) } catch (err) { + log.error('error getting participant currency by id', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } const destroyByName = async (name) => { + const log = logger.child({ name }) try { + log.debug('destroying participant by name') const participant = await ParticipantModel.getByName(name) await ParticipantLimitModel.destroyByParticipantId(participant.participantId) await ParticipantPositionModel.destroyByParticipantId(participant.participantId) @@ -151,6 +180,7 @@ const destroyByName = async (name) => { await destroyParticipantEndpointByParticipantId(participant.participantId) return await ParticipantModel.destroyByName(name) } catch (err) { + log.error('error destroying participant by name', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } @@ -174,11 +204,15 @@ const destroyByName = async (name) => { */ const addEndpoint = async (name, payload) => { + const log = logger.child({ name, payload }) try { + log.info('adding endpoint') const participant = await ParticipantModel.getByName(name) participantExists(participant) + log.info('adding endpoint for participant', { participant }) return ParticipantFacade.addEndpoint(participant.participantId, payload) } catch (err) { + log.error('error adding endpoint', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } @@ -199,11 +233,15 @@ const addEndpoint = async (name, payload) => { */ const getEndpoint = async (name, type) => { + const log = logger.child({ name, type }) try { + log.debug('getting endpoint') const participant = await ParticipantModel.getByName(name) participantExists(participant) + log.debug('getting endpoint for participant', { participant }) return ParticipantFacade.getEndpoint(participant.participantId, type) } catch (err) { + log.error('error getting endpoint', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } @@ -223,11 +261,15 @@ const getEndpoint = async (name, type) => { */ const getAllEndpoints = async (name) => { + const log = logger.child({ name }) try { + log.debug('getting all endpoints for participant name') const participant = await ParticipantModel.getByName(name) participantExists(participant) + log.debug('getting all endpoints for participant', { participant }) return ParticipantFacade.getAllEndpoints(participant.participantId) } catch (err) { + log.error('error getting all endpoints', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } @@ -245,11 +287,15 @@ const getAllEndpoints = async (name) => { */ const destroyParticipantEndpointByName = async (name) => { + const log = logger.child({ name }) try { + log.debug('destroying participant endpoint by name') const participant = await ParticipantModel.getByName(name) participantExists(participant) + log.debug('destroying participant endpoint for participant', { participant }) return ParticipantModel.destroyParticipantEndpointByParticipantId(participant.participantId) } catch (err) { + log.error('error destroying participant endpoint by name', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } @@ -278,14 +324,18 @@ const destroyParticipantEndpointByName = async (name) => { */ const addLimitAndInitialPosition = async (participantName, limitAndInitialPositionObj) => { + const log = logger.child({ participantName, limitAndInitialPositionObj }) try { + log.debug('adding limit and initial position', { participantName, limitAndInitialPositionObj }) const participant = await ParticipantFacade.getByNameAndCurrency(participantName, limitAndInitialPositionObj.currency, Enum.Accounts.LedgerAccountType.POSITION) participantExists(participant) + log.debug('adding limit and initial position for participant', { participant }) const settlementAccount = await ParticipantFacade.getByNameAndCurrency(participantName, limitAndInitialPositionObj.currency, Enum.Accounts.LedgerAccountType.SETTLEMENT) const existingLimit = await ParticipantLimitModel.getByParticipantCurrencyId(participant.participantCurrencyId) const existingPosition = await ParticipantPositionModel.getByParticipantCurrencyId(participant.participantCurrencyId) const existingSettlementPosition = await ParticipantPositionModel.getByParticipantCurrencyId(settlementAccount.participantCurrencyId) if (existingLimit || existingPosition || existingSettlementPosition) { + log.warn('participant limit or initial position already set') throw ErrorHandler.Factory.createInternalServerFSPIOPError(ParticipantInitialPositionExistsText) } const limitAndInitialPosition = Object.assign({}, limitAndInitialPositionObj, { name: participantName }) @@ -296,6 +346,7 @@ const addLimitAndInitialPosition = async (participantName, limitAndInitialPositi await Kafka.produceGeneralMessage(Config.KAFKA_CONFIG, KafkaProducer, Enum.Events.Event.Type.NOTIFICATION, Enum.Transfers.AdminNotificationActions.LIMIT_ADJUSTMENT, createLimitAdjustmentMessageProtocol(payload), Enum.Events.EventStatus.SUCCESS) return ParticipantFacade.addLimitAndInitialPosition(participant.participantCurrencyId, settlementAccount.participantCurrencyId, limitAndInitialPosition, true) } catch (err) { + log.error('error adding limit and initial position', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } @@ -313,9 +364,12 @@ const addLimitAndInitialPosition = async (participantName, limitAndInitialPositi */ const getPositionByParticipantCurrencyId = async (participantCurrencyId) => { + const log = logger.child({ participantCurrencyId }) try { + log.debug('getting position by participant currency id') return ParticipantPositionModel.getByParticipantCurrencyId(participantCurrencyId) } catch (err) { + log.error('error getting position by participant currency id', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } @@ -333,9 +387,12 @@ const getPositionByParticipantCurrencyId = async (participantCurrencyId) => { */ const getPositionChangeByParticipantPositionId = async (participantPositionId) => { + const log = logger.child({ participantPositionId }) try { + log.debug('getting position change by participant position id') return ParticipantPositionChangeModel.getByParticipantPositionId(participantPositionId) } catch (err) { + log.error('error getting position change by participant position id', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } @@ -353,11 +410,15 @@ const getPositionChangeByParticipantPositionId = async (participantPositionId) = */ const destroyParticipantPositionByNameAndCurrency = async (name, currencyId) => { + const log = logger.child({ name, currencyId }) try { + log.debug('destroying participant position by participant name and currency') const participant = await ParticipantFacade.getByNameAndCurrency(name, currencyId, Enum.Accounts.LedgerAccountType.POSITION) + log.debug('destroying participant position for participant', { participant }) participantExists(participant) return ParticipantPositionModel.destroyByParticipantCurrencyId(participant.participantCurrencyId) } catch (err) { + log.error('error destroying participant position by name and currency', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } @@ -376,11 +437,15 @@ const destroyParticipantPositionByNameAndCurrency = async (name, currencyId) => */ const destroyParticipantLimitByNameAndCurrency = async (name, currencyId) => { + const log = logger.child({ name, currencyId }) try { + log.debug('destroying participant limit by participant name and currency') const participant = await ParticipantFacade.getByNameAndCurrency(name, currencyId, Enum.Accounts.LedgerAccountType.POSITION) + log.debug('destroying participant limit for participant', { participant }) participantExists(participant) return ParticipantLimitModel.destroyByParticipantCurrencyId(participant.participantCurrencyId) } catch (err) { + log.error('error destroying participant limit by name and currency', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } @@ -403,18 +468,24 @@ const destroyParticipantLimitByNameAndCurrency = async (name, currencyId) => { */ const getLimits = async (name, { currency = null, type = null }) => { + const log = logger.child({ name, currency, type }) try { let participant if (currency != null) { + log.debug('getting limits by name and currency') participant = await ParticipantFacade.getByNameAndCurrency(name, currency, Enum.Accounts.LedgerAccountType.POSITION) + log.debug('getting limits for participant', { participant }) participantExists(participant) return ParticipantFacade.getParticipantLimitsByCurrencyId(participant.participantCurrencyId, type) } else { + log.debug('getting limits by name') participant = await ParticipantModel.getByName(name) + log.debug('getting limits for participant', { participant }) participantExists(participant) return ParticipantFacade.getParticipantLimitsByParticipantId(participant.participantId, type, Enum.Accounts.LedgerAccountType.POSITION) } } catch (err) { + log.error('error getting limits', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } @@ -434,9 +505,12 @@ const getLimits = async (name, { currency = null, type = null }) => { */ const getLimitsForAllParticipants = async ({ currency = null, type = null }) => { + const log = logger.child({ currency, type }) try { + log.debug('getting limits for all participants', { currency, type }) return ParticipantFacade.getLimitsForAllParticipants(currency, type, Enum.Accounts.LedgerAccountType.POSITION) } catch (err) { + log.error('error getting limits for all participants', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } @@ -465,15 +539,19 @@ const getLimitsForAllParticipants = async ({ currency = null, type = null }) => */ const adjustLimits = async (name, payload) => { + const log = logger.child({ name, payload }) try { + log.debug('adjusting limits') const { limit, currency } = payload const participant = await ParticipantFacade.getByNameAndCurrency(name, currency, Enum.Accounts.LedgerAccountType.POSITION) + log.debug('adjusting limits for participant', { participant }) participantExists(participant) const result = await ParticipantFacade.adjustLimits(participant.participantCurrencyId, limit) payload.name = name await Kafka.produceGeneralMessage(Config.KAFKA_CONFIG, KafkaProducer, Enum.Events.Event.Type.NOTIFICATION, Enum.Transfers.AdminNotificationActions.LIMIT_ADJUSTMENT, createLimitAdjustmentMessageProtocol(payload), Enum.Events.EventStatus.SUCCESS) return result } catch (err) { + log.error('error adjusting limits', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } @@ -546,9 +624,12 @@ const createLimitAdjustmentMessageProtocol = (payload, action = Enum.Transfers.A */ const getPositions = async (name, query) => { + const log = logger.child({ name, query }) try { + log.debug('getting positions') if (query.currency) { const participant = await ParticipantFacade.getByNameAndCurrency(name, query.currency, Enum.Accounts.LedgerAccountType.POSITION) + log.debug('getting positions for participant', { participant }) participantExists(participant) const result = await PositionFacade.getByNameAndCurrency(name, Enum.Accounts.LedgerAccountType.POSITION, query.currency) // TODO this function only takes a max of 3 params, this has 4 let position = {} @@ -559,9 +640,11 @@ const getPositions = async (name, query) => { changedDate: result[0].changedDate } } + log.debug('found positions for participant', { participant, position }) return position } else { const participant = await ParticipantModel.getByName(name) + log.debug('getting positions for participant', { participant }) participantExists(participant) const result = await await PositionFacade.getByNameAndCurrency(name, Enum.Accounts.LedgerAccountType.POSITION) const positions = [] @@ -574,16 +657,21 @@ const getPositions = async (name, query) => { }) }) } + log.debug('found positions for participant', { participant, positions }) return positions } } catch (err) { + log.error('error getting positions', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } const getAccounts = async (name, query) => { + const log = logger.child({ name, query }) try { + log.debug('getting accounts') const participant = await ParticipantModel.getByName(name) + log.debug('getting accounts for participant', { participant }) participantExists(participant) const result = await PositionFacade.getAllByNameAndCurrency(name, query.currency) const positions = [] @@ -600,18 +688,24 @@ const getAccounts = async (name, query) => { }) }) } + log.debug('found accounts for participant', { participant, positions }) return positions } catch (err) { + log.error('error getting accounts', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } const updateAccount = async (payload, params, enums) => { + const log = logger.child({ payload, params, enums }) try { + log.debug('updating account') const { name, id } = params const participant = await ParticipantModel.getByName(name) + log.debug('updating account for participant', { participant }) participantExists(participant) const account = await ParticipantCurrencyModel.getById(id) + log.debug('updating account for participant', { participant, account }) if (!account) { throw ErrorHandler.Factory.createInternalServerFSPIOPError(AccountNotFoundErrorText) } else if (account.participantId !== participant.participantId) { @@ -621,22 +715,29 @@ const updateAccount = async (payload, params, enums) => { } return await ParticipantCurrencyModel.update(id, payload.isActive) } catch (err) { + log.error('error updating account', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } const getLedgerAccountTypeName = async (name) => { + const log = logger.child({ name }) try { + log.debug('getting ledger account type by name') return await LedgerAccountTypeModel.getLedgerAccountByName(name) } catch (err) { + log.error('error getting ledger account type by name', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } const getParticipantAccount = async (accountParams) => { + const log = logger.child({ accountParams }) try { + log.debug('getting participant account by params') return await ParticipantCurrencyModel.findOneByParams(accountParams) } catch (err) { + log.error('error getting participant account by params', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } @@ -690,7 +791,9 @@ const setPayerPayeeFundsInOut = (fspName, payload, enums) => { } const recordFundsInOut = async (payload, params, enums) => { + const log = logger.child({ payload, params, enums }) try { + log.debug('recording funds in/out') const { name, id, transferId } = params const participant = await ParticipantModel.getByName(name) const currency = (payload.amount && payload.amount.currency) || null @@ -699,6 +802,7 @@ const recordFundsInOut = async (payload, params, enums) => { participantExists(participant, checkIsActive) const accounts = await ParticipantFacade.getAllAccountsByNameAndCurrency(name, currency, isAccountActive) const accountMatched = accounts[accounts.map(account => account.participantCurrencyId).findIndex(i => i === id)] + log.debug('recording funds in/out for participant account', { participant, accountMatched }) if (!accountMatched) { throw ErrorHandler.Factory.createInternalServerFSPIOPError(ParticipantAccountCurrencyMismatchText) } else if (!accountMatched.accountIsActive) { @@ -714,6 +818,7 @@ const recordFundsInOut = async (payload, params, enums) => { } return await Kafka.produceGeneralMessage(Config.KAFKA_CONFIG, KafkaProducer, Enum.Events.Event.Type.ADMIN, Enum.Events.Event.Action.TRANSFER, messageProtocol, Enum.Events.EventStatus.SUCCESS) } catch (err) { + log.error('error recording funds in/out', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } @@ -722,17 +827,21 @@ const validateHubAccounts = async (currency) => { const ledgerAccountTypes = await Enums.getEnums('ledgerAccountType') const hubReconciliationAccountExists = await ParticipantCurrencyModel.hubAccountExists(currency, ledgerAccountTypes.HUB_RECONCILIATION) if (!hubReconciliationAccountExists) { + logger.error('Hub reconciliation account for the specified currency does not exist') throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR, 'Hub reconciliation account for the specified currency does not exist') } const hubMlnsAccountExists = await ParticipantCurrencyModel.hubAccountExists(currency, ledgerAccountTypes.HUB_MULTILATERAL_SETTLEMENT) if (!hubMlnsAccountExists) { + logger.error('Hub multilateral net settlement account for the specified currency does not exist') throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR, 'Hub multilateral net settlement account for the specified currency does not exist') } return true } const createAssociatedParticipantAccounts = async (currency, ledgerAccountTypeId, trx) => { + const log = logger.child({ currency, ledgerAccountTypeId }) try { + log.info('creating associated participant accounts') const nonHubParticipantWithCurrencies = await ParticipantFacade.getAllNonHubParticipantsWithCurrencies(trx) const participantCurrencies = nonHubParticipantWithCurrencies.map(item => ({ @@ -760,6 +869,7 @@ const createAssociatedParticipantAccounts = async (currency, ledgerAccountTypeId } await ParticipantPositionModel.createParticipantPositionRecords(participantPositionRecords, trx) } catch (err) { + log.error('error creating associated participant accounts', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } diff --git a/src/domain/position/abort.js b/src/domain/position/abort.js new file mode 100644 index 000000000..9489a4f67 --- /dev/null +++ b/src/domain/position/abort.js @@ -0,0 +1,249 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ +const { Enum } = require('@mojaloop/central-services-shared') +const ErrorHandler = require('@mojaloop/central-services-error-handling') +const Config = require('../../lib/config') +const Utility = require('@mojaloop/central-services-shared').Util +const MLNumber = require('@mojaloop/ml-number') +const Logger = require('@mojaloop/central-services-logger') + +/** + * @function processPositionAbortBin + * + * @async + * @description This is the domain function to process a bin of abort / fx-abort messages of a single participant account. + * + * @param {array} abortBins - an array containing abort / fx-abort action bins + * @param {object} options + * @param {number} accumulatedPositionValue - value of position accumulated so far from previous bin processing + * @param {number} accumulatedPositionReservedValue - value of position reserved accumulated so far, not used but kept for consistency + * @param {object} accumulatedTransferStates - object with transfer id keys and transfer state id values. Used to check if transfer is in correct state for processing. Clone and update states for output. + * @param {object} transferInfoList - object with transfer id keys and transfer info values. Used to pass transfer info to domain function. + * @param {boolean} changePositions - whether to change positions or not + * @returns {object} - Returns an object containing accumulatedPositionValue, accumulatedPositionReservedValue, accumulatedTransferStateChanges, accumulatedTransferStates, resultMessages, limitAlarms or throws an error if failed + */ +const processPositionAbortBin = async ( + abortBins, + { + accumulatedPositionValue, + accumulatedPositionReservedValue, + accumulatedTransferStates, + accumulatedFxTransferStates, + isFx, + changePositions = true + } +) => { + const transferStateChanges = [] + const participantPositionChanges = [] + const resultMessages = [] + const followupMessages = [] + const fxTransferStateChanges = [] + const accumulatedTransferStatesCopy = Object.assign({}, accumulatedTransferStates) + const accumulatedFxTransferStatesCopy = Object.assign({}, accumulatedFxTransferStates) + let runningPosition = new MLNumber(accumulatedPositionValue) + + if (abortBins && abortBins.length > 0) { + for (const binItem of abortBins) { + Logger.isDebugEnabled && Logger.debug(`processPositionAbortBin::binItem: ${JSON.stringify(binItem.message.value)}`) + if (isFx) { + // If the transfer is not in `RECEIVED_ERROR`, a position fx-abort message was incorrectly published. + // i.e Something has gone extremely wrong. + if (accumulatedFxTransferStates[binItem.message.value.content.uriParams.id] !== Enum.Transfers.TransferInternalState.RECEIVED_ERROR) { + throw ErrorHandler.Factory.createInternalServerFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR.message) + } + } else { + // If the transfer is not in `RECEIVED_ERROR`, a position abort message was incorrectly published. + // i.e Something has gone extremely wrong. + if (accumulatedTransferStates[binItem.message.value.content.uriParams.id] !== Enum.Transfers.TransferInternalState.RECEIVED_ERROR) { + throw ErrorHandler.Factory.createInternalServerFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR.message) + } + } + + const cyrilResult = binItem.message.value.content.context?.cyrilResult + if (!cyrilResult || !cyrilResult.positionChanges || cyrilResult.positionChanges.length === 0) { + throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR) + } + + // Handle position movements + // Iterate through positionChanges and handle each position movement, mark as done and publish a position-commit kafka message again for the next item + // Find out the first item to be processed + const positionChangeIndex = cyrilResult.positionChanges.findIndex(positionChange => !positionChange.isDone) + const positionChangeToBeProcessed = cyrilResult.positionChanges[positionChangeIndex] + if (positionChangeToBeProcessed.isFxTransferStateChange) { + const { participantPositionChange, fxTransferStateChange, transferStateId, updatedRunningPosition } = + _handleParticipantPositionChangeFx(runningPosition, positionChangeToBeProcessed.amount, positionChangeToBeProcessed.commitRequestId, accumulatedPositionReservedValue) + runningPosition = updatedRunningPosition + participantPositionChanges.push(participantPositionChange) + fxTransferStateChanges.push(fxTransferStateChange) + accumulatedFxTransferStatesCopy[positionChangeToBeProcessed.commitRequestId] = transferStateId + } else { + const { participantPositionChange, transferStateChange, transferStateId, updatedRunningPosition } = + _handleParticipantPositionChange(runningPosition, positionChangeToBeProcessed.amount, positionChangeToBeProcessed.transferId, accumulatedPositionReservedValue) + runningPosition = updatedRunningPosition + participantPositionChanges.push(participantPositionChange) + transferStateChanges.push(transferStateChange) + accumulatedTransferStatesCopy[positionChangeToBeProcessed.transferId] = transferStateId + } + binItem.result = { success: true } + const from = binItem.message.value.from + cyrilResult.positionChanges[positionChangeIndex].isDone = true + const nextIndex = cyrilResult.positionChanges.findIndex(positionChange => !positionChange.isDone) + if (nextIndex === -1) { + // All position changes are done, we need to inform all the participants about the abort + // Construct a list of messages excluding the original message as it will notified anyway + for (const positionChange of cyrilResult.positionChanges) { + if (positionChange.isFxTransferStateChange) { + // Construct notification message for fx transfer state change + const resultMessage = _constructAbortResultMessage(binItem, positionChange.commitRequestId, from, positionChange.notifyTo) + resultMessages.push({ binItem, message: resultMessage }) + } else { + // Construct notification message for transfer state change + const resultMessage = _constructAbortResultMessage(binItem, positionChange.transferId, from, positionChange.notifyTo) + resultMessages.push({ binItem, message: resultMessage }) + } + } + } else { + // There are still position changes to be processed + // Send position-commit kafka message again for the next item + const participantCurrencyId = cyrilResult.positionChanges[nextIndex].participantCurrencyId + // const followupMessage = _constructTransferAbortFollowupMessage(binItem, transferId, payerFsp, payeeFsp, transfer) + // Pass down the context to the followup message with mutated cyrilResult + const followupMessage = { ...binItem.message.value } + // followupMessage.content.context = binItem.message.value.content.context + followupMessages.push({ binItem, messageKey: participantCurrencyId.toString(), message: followupMessage }) + } + } + } + + return { + accumulatedPositionValue: changePositions ? runningPosition.toNumber() : accumulatedPositionValue, + accumulatedTransferStates: accumulatedTransferStatesCopy, // finalized transfer state after fulfil processing + accumulatedPositionReservedValue, // not used but kept for consistency + accumulatedTransferStateChanges: transferStateChanges, // transfer state changes to be persisted in order + accumulatedFxTransferStates: accumulatedFxTransferStatesCopy, // finalized fx transfer state after fulfil processing + accumulatedFxTransferStateChanges: fxTransferStateChanges, // fx transfer state changes to be persisted in order + accumulatedPositionChanges: changePositions ? participantPositionChanges : [], // participant position changes to be persisted in order + notifyMessages: resultMessages, // array of objects containing bin item and result message. {binItem, message} + followupMessages // array of objects containing bin item, message key and followup message. {binItem, messageKey, message} + } +} + +const _constructAbortResultMessage = (binItem, id, from, notifyTo) => { + let apiErrorCode = ErrorHandler.Enums.FSPIOPErrorCodes.PAYEE_REJECTION + let fromCalculated = from + if (binItem.message?.value.metadata.event.action === Enum.Events.Event.Action.FX_ABORT_VALIDATION || binItem.message?.value.metadata.event.action === Enum.Events.Event.Action.ABORT_VALIDATION) { + fromCalculated = Config.HUB_NAME + apiErrorCode = ErrorHandler.Enums.FSPIOPErrorCodes.VALIDATION_ERROR + } + const fspiopError = ErrorHandler.Factory.createFSPIOPError( + apiErrorCode, + null, + null, + null, + null + ).toApiErrorObject(Config.ERROR_HANDLING) + + const state = Utility.StreamingProtocol.createEventState( + Enum.Events.EventStatus.FAILURE.status, + fspiopError.errorInformation.errorCode, + fspiopError.errorInformation.errorDescription + ) + + // Create metadata for the message + const metadata = Utility.StreamingProtocol.createMetadataWithCorrelatedEvent( + id, + Enum.Kafka.Topics.POSITION, + binItem.message?.value.metadata.event.action, // This will be replaced anyway in Kafka.produceGeneralMessage function + state + ) + const resultMessage = Utility.StreamingProtocol.createMessage( + id, + notifyTo, + fromCalculated, + metadata, + binItem.message.value.content.headers, // Headers don't really matter here. ml-api-adapter will ignore them and create their own. + fspiopError, + { id }, + 'application/json' + ) + + return resultMessage +} + +const _handleParticipantPositionChange = (runningPosition, transferAmount, transferId, accumulatedPositionReservedValue) => { + const transferStateId = Enum.Transfers.TransferInternalState.ABORTED_ERROR + const updatedRunningPosition = new MLNumber(runningPosition.add(transferAmount).toFixed(Config.AMOUNT.SCALE)) + + const participantPositionChange = { + transferId, // Need to delete this in bin processor while updating transferStateChangeId + transferStateChangeId: null, // Need to update this in bin processor while executing queries + value: updatedRunningPosition.toNumber(), + change: transferAmount, + reservedValue: accumulatedPositionReservedValue + } + + // Construct transfer state change object + const transferStateChange = { + transferId, + transferStateId, + reason: null + } + return { participantPositionChange, transferStateChange, transferStateId, updatedRunningPosition } +} + +const _handleParticipantPositionChangeFx = (runningPosition, transferAmount, commitRequestId, accumulatedPositionReservedValue) => { + const transferStateId = Enum.Transfers.TransferInternalState.ABORTED_ERROR + // Amounts in `transferParticipant` for the payee are stored as negative values + const updatedRunningPosition = new MLNumber(runningPosition.add(transferAmount).toFixed(Config.AMOUNT.SCALE)) + + const participantPositionChange = { + commitRequestId, // Need to delete this in bin processor while updating fxTransferStateChangeId + fxTransferStateChangeId: null, // Need to update this in bin processor while executing queries + value: updatedRunningPosition.toNumber(), + change: transferAmount, + reservedValue: accumulatedPositionReservedValue + } + + const fxTransferStateChange = { + commitRequestId, + transferStateId, + reason: null + } + return { participantPositionChange, fxTransferStateChange, transferStateId, updatedRunningPosition } +} + +module.exports = { + processPositionAbortBin +} diff --git a/src/domain/position/binProcessor.js b/src/domain/position/binProcessor.js index 39816764b..1b16d6ff6 100644 --- a/src/domain/position/binProcessor.js +++ b/src/domain/position/binProcessor.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -24,7 +24,6 @@ * INFITX - Vijay Kumar Guthi - - Steven Oderayi -------------- ******/ @@ -34,7 +33,12 @@ const Logger = require('@mojaloop/central-services-logger') const BatchPositionModel = require('../../models/position/batch') const BatchPositionModelCached = require('../../models/position/batchCached') const PositionPrepareDomain = require('./prepare') +const PositionFxPrepareDomain = require('./fx-prepare') const PositionFulfilDomain = require('./fulfil') +const PositionFxFulfilDomain = require('./fx-fulfil') +const PositionTimeoutReservedDomain = require('./timeout-reserved') +const PositionFxTimeoutReservedDomain = require('./fx-timeout-reserved') +const PositionAbortDomain = require('./abort') const SettlementModelCached = require('../../models/settlement/settlementModelCached') const Enum = require('@mojaloop/central-services-shared').Enum const ErrorHandler = require('@mojaloop/central-services-error-handling') @@ -52,75 +56,29 @@ const participantFacade = require('../../models/participant/facade') * @returns {results} - Returns a list of bins with results or throws an error if failed */ const processBins = async (bins, trx) => { - const transferIdList = [] - const reservedActionTransferIdList = [] - await iterateThroughBins(bins, (_accountID, action, item) => { - if (item.decodedPayload?.transferId) { - transferIdList.push(item.decodedPayload.transferId) - // get transferId from uriParams for fulfil messages - } else if (item.message?.value?.content?.uriParams?.id) { - transferIdList.push(item.message.value.content.uriParams.id) - if (action === Enum.Events.Event.Action.RESERVE) { - reservedActionTransferIdList.push(item.message.value.content.uriParams.id) - } - } - }) + let notifyMessages = [] + let followupMessages = [] + let limitAlarms = [] + + // Get transferIdList, reservedActionTransferIdList and commitRequestId for actions PREPARE, FX_PREPARE, FX_RESERVE, COMMIT and RESERVE + const { transferIdList, reservedActionTransferIdList, commitRequestIdList } = await _getTransferIdList(bins) + // Pre fetch latest transferStates for all the transferIds in the account-bin - const latestTransferStateChanges = await BatchPositionModel.getLatestTransferStateChangesByTransferIdList(trx, transferIdList) - const latestTransferStates = {} - for (const key in latestTransferStateChanges) { - latestTransferStates[key] = latestTransferStateChanges[key].transferStateId - } + const latestTransferStates = await _fetchLatestTransferStates(trx, transferIdList) - const accountIds = Object.keys(bins) + // Pre fetch latest fxTransferStates for all the commitRequestIds in the account-bin + const latestFxTransferStates = await _fetchLatestFxTransferStates(trx, commitRequestIdList) - // Pre fetch all settlement accounts corresponding to the position accounts - // Get all participantIdMap for the accountIds - const participantCurrencyIds = await BatchPositionModelCached.getParticipantCurrencyByIds(trx, accountIds) + const accountIds = [...Object.keys(bins).filter(accountId => accountId !== '0')] - // Validate that participantCurrencyIds exist for each of the accountIds - // i.e every unique accountId has a corresponding entry in participantCurrencyIds - const participantIdsHavingCurrencyIdsList = [...new Set(participantCurrencyIds.map(item => item.participantCurrencyId))] - const allAccountIdsHaveParticipantCurrencyIds = accountIds.every(accountId => { - return participantIdsHavingCurrencyIdsList.includes(Number(accountId)) - }) - if (!allAccountIdsHaveParticipantCurrencyIds) { - throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR, 'Not all accountIds have corresponding participantCurrencyIds') - } + // Get all participantIdMap for the accountIds + const participantCurrencyIds = await _getParticipantCurrencyIds(trx, accountIds) + // Pre fetch all settlement accounts corresponding to the position accounts const allSettlementModels = await SettlementModelCached.getAll() // Construct objects participantIdMap, accountIdMap and currencyIdMap - const participantIdMap = {} - const accountIdMap = {} - const currencyIdMap = {} - for (const item of participantCurrencyIds) { - const { participantId, currencyId, participantCurrencyId } = item - if (!participantIdMap[participantId]) { - participantIdMap[participantId] = {} - } - if (!currencyIdMap[currencyId]) { - currencyIdMap[currencyId] = { - settlementModel: _getSettlementModelForCurrency(currencyId, allSettlementModels) - } - } - participantIdMap[participantId][currencyId] = participantCurrencyId - accountIdMap[participantCurrencyId] = { participantId, currencyId } - } - - // Get all participantCurrencyIds for the participantIdMap - const allParticipantCurrencyIds = await BatchPositionModelCached.getParticipantCurrencyByParticipantIds(trx, Object.keys(participantIdMap)) - const settlementCurrencyIds = [] - for (const pc of allParticipantCurrencyIds) { - const correspondingParticipantCurrencyId = participantIdMap[pc.participantId][pc.currencyId] - if (correspondingParticipantCurrencyId) { - const settlementModel = currencyIdMap[pc.currencyId].settlementModel - if (pc.ledgerAccountTypeId === settlementModel.settlementAccountTypeId) { - settlementCurrencyIds.push(pc) - accountIdMap[correspondingParticipantCurrencyId].settlementCurrencyId = pc.participantCurrencyId - } - } - } + const { settlementCurrencyIds, accountIdMap } = await _constructRequiredMaps(participantCurrencyIds, allSettlementModels, trx) // Pre fetch all position account balances for the account-bin and acquire lock on position const positions = await BatchPositionModel.getPositionsByAccountIdsForUpdate(trx, [ @@ -135,15 +93,21 @@ const processBins = async (bins, trx) => { Enum.Accounts.LedgerEntryType.PRINCIPLE_VALUE ) + // Fetch all RESERVED participantPositionChanges associated with a commitRequestId + // These will contain the value that was reserved for the fxTransfer + // We will use these values to revert the position on timeouts + const fetchedReservedPositionChangesByCommitRequestIds = + await BatchPositionModel.getReservedPositionChangesByCommitRequestIds( + trx, + commitRequestIdList + ) + // Pre fetch transfers for all reserve action fulfils const reservedActionTransfers = await BatchPositionModel.getTransferByIdsForReserve( trx, reservedActionTransferIdList ) - let notifyMessages = [] - let limitAlarms = [] - // For each account-bin in the list for (const accountID in bins) { const accountBin = bins[accountID] @@ -152,57 +116,211 @@ const processBins = async (bins, trx) => { array2.every((element) => array1.includes(element)) // If non-prepare/non-commit action found, log error // We need to remove this once we implement all the actions - if (!isSubset(['prepare', 'commit', 'reserve'], actions)) { - Logger.isErrorEnabled && Logger.error('Only prepare/commit actions are allowed in a batch') - // throw new Error('Only prepare action is allowed in a batch') + const allowedActions = [ + Enum.Events.Event.Action.PREPARE, + Enum.Events.Event.Action.FX_PREPARE, + Enum.Events.Event.Action.COMMIT, + Enum.Events.Event.Action.RESERVE, + Enum.Events.Event.Action.FX_RESERVE, + Enum.Events.Event.Action.TIMEOUT_RESERVED, + Enum.Events.Event.Action.FX_TIMEOUT_RESERVED, + Enum.Events.Event.Action.ABORT, + Enum.Events.Event.Action.FX_ABORT, + Enum.Events.Event.Action.ABORT_VALIDATION, + Enum.Events.Event.Action.FX_ABORT_VALIDATION + ] + if (!isSubset(allowedActions, actions)) { + Logger.isErrorEnabled && Logger.error(`Only ${allowedActions.join()} are allowed in a batch`) } - const settlementParticipantPosition = positions[accountIdMap[accountID].settlementCurrencyId].value - const settlementModel = currencyIdMap[accountIdMap[accountID].currencyId].settlementModel + let settlementParticipantPosition = 0 + let participantLimit = null - // Story #3657: The following SQL query/lookup can be optimized for performance - const participantLimit = await participantFacade.getParticipantLimitByParticipantCurrencyLimit( - accountIdMap[accountID].participantId, - accountIdMap[accountID].currencyId, - Enum.Accounts.LedgerAccountType.POSITION, - Enum.Accounts.ParticipantLimitType.NET_DEBIT_CAP - ) // Initialize accumulated values // These values will be passed across various actions in the bin - let accumulatedPositionValue = positions[accountID].value - let accumulatedPositionReservedValue = positions[accountID].reservedValue + let accumulatedPositionValue = 0 + let accumulatedPositionReservedValue = 0 let accumulatedTransferStates = latestTransferStates + let accumulatedFxTransferStates = latestFxTransferStates let accumulatedTransferStateChanges = [] + let accumulatedFxTransferStateChanges = [] let accumulatedPositionChanges = [] + let changePositions = false + + if (accountID !== '0') { + settlementParticipantPosition = positions[accountIdMap[accountID].settlementCurrencyId].value + + // Story #3657: The following SQL query/lookup can be optimized for performance + participantLimit = await participantFacade.getParticipantLimitByParticipantCurrencyLimit( + accountIdMap[accountID].participantId, + accountIdMap[accountID].currencyId, + Enum.Accounts.LedgerAccountType.POSITION, + Enum.Accounts.ParticipantLimitType.NET_DEBIT_CAP + ) + accumulatedPositionValue = positions[accountID].value + accumulatedPositionReservedValue = positions[accountID].reservedValue + + changePositions = true + } + + // ========== FX_FULFIL ========== + // If fulfil action found then call processPositionPrepareBin function + // We don't need to change the position for FX transfers. All the position changes happen when actual transfer is done + const fxFulfilActionResult = await PositionFxFulfilDomain.processPositionFxFulfilBin( + accountBin[Enum.Events.Event.Action.FX_RESERVE], + { + accumulatedFxTransferStates + } + ) + + // ========== FX_TIMEOUT ========== + // If fx-timeout-reserved action found then call processPositionTimeoutReserveBin function + const fxTimeoutReservedActionResult = await PositionFxTimeoutReservedDomain.processPositionFxTimeoutReservedBin( + accountBin[Enum.Events.Event.Action.FX_TIMEOUT_RESERVED], + { + accumulatedPositionValue, + accumulatedPositionReservedValue, + accumulatedFxTransferStates, + fetchedReservedPositionChangesByCommitRequestIds, + changePositions + } + ) + + // Update accumulated values + accumulatedPositionValue = fxTimeoutReservedActionResult.accumulatedPositionValue + accumulatedPositionReservedValue = fxTimeoutReservedActionResult.accumulatedPositionReservedValue + accumulatedFxTransferStates = fxTimeoutReservedActionResult.accumulatedFxTransferStates + // Append accumulated arrays + accumulatedFxTransferStateChanges = accumulatedFxTransferStateChanges.concat(fxTimeoutReservedActionResult.accumulatedFxTransferStateChanges) + accumulatedPositionChanges = accumulatedPositionChanges.concat(fxTimeoutReservedActionResult.accumulatedPositionChanges) + notifyMessages = notifyMessages.concat(fxTimeoutReservedActionResult.notifyMessages) + + // Update accumulated values + accumulatedFxTransferStates = fxFulfilActionResult.accumulatedFxTransferStates + // Append accumulated arrays + accumulatedFxTransferStateChanges = accumulatedFxTransferStateChanges.concat(fxFulfilActionResult.accumulatedFxTransferStateChanges) + notifyMessages = notifyMessages.concat(fxFulfilActionResult.notifyMessages) + + // ========== FULFIL ========== // If fulfil action found then call processPositionPrepareBin function const fulfilActionResult = await PositionFulfilDomain.processPositionFulfilBin( [accountBin.commit, accountBin.reserve], - accumulatedPositionValue, - accumulatedPositionReservedValue, - accumulatedTransferStates, - latestTransferInfoByTransferId, - reservedActionTransfers + { + accumulatedPositionValue, + accumulatedPositionReservedValue, + accumulatedTransferStates, + accumulatedFxTransferStates, + transferInfoList: latestTransferInfoByTransferId, + reservedActionTransfers, + changePositions + } ) // Update accumulated values accumulatedPositionValue = fulfilActionResult.accumulatedPositionValue accumulatedPositionReservedValue = fulfilActionResult.accumulatedPositionReservedValue accumulatedTransferStates = fulfilActionResult.accumulatedTransferStates + accumulatedFxTransferStates = fulfilActionResult.accumulatedFxTransferStates // Append accumulated arrays accumulatedTransferStateChanges = accumulatedTransferStateChanges.concat(fulfilActionResult.accumulatedTransferStateChanges) + accumulatedFxTransferStateChanges = accumulatedFxTransferStateChanges.concat(fulfilActionResult.accumulatedFxTransferStateChanges) accumulatedPositionChanges = accumulatedPositionChanges.concat(fulfilActionResult.accumulatedPositionChanges) notifyMessages = notifyMessages.concat(fulfilActionResult.notifyMessages) + followupMessages = followupMessages.concat(fulfilActionResult.followupMessages) + + // ========== ABORT ========== + // If abort action found then call processPositionAbortBin function + const abortReservedActionResult = await PositionAbortDomain.processPositionAbortBin( + [ + ...(accountBin[Enum.Events.Event.Action.ABORT] || []), + ...(accountBin[Enum.Events.Event.Action.ABORT_VALIDATION] || []) + ], + { + accumulatedPositionValue, + accumulatedPositionReservedValue, + accumulatedTransferStates, + accumulatedFxTransferStates, + isFx: false, + changePositions + } + ) + + // Update accumulated values + accumulatedPositionValue = abortReservedActionResult.accumulatedPositionValue + accumulatedPositionReservedValue = abortReservedActionResult.accumulatedPositionReservedValue + accumulatedTransferStates = abortReservedActionResult.accumulatedTransferStates + accumulatedFxTransferStates = abortReservedActionResult.accumulatedFxTransferStates + // Append accumulated arrays + accumulatedTransferStateChanges = accumulatedTransferStateChanges.concat(abortReservedActionResult.accumulatedTransferStateChanges) + accumulatedFxTransferStateChanges = accumulatedFxTransferStateChanges.concat(abortReservedActionResult.accumulatedFxTransferStateChanges) + accumulatedPositionChanges = accumulatedPositionChanges.concat(abortReservedActionResult.accumulatedPositionChanges) + notifyMessages = notifyMessages.concat(abortReservedActionResult.notifyMessages) + followupMessages = followupMessages.concat(abortReservedActionResult.followupMessages) + + // ========== FX_ABORT ========== + // If abort action found then call processPositionAbortBin function + const fxAbortReservedActionResult = await PositionAbortDomain.processPositionAbortBin( + [ + ...(accountBin[Enum.Events.Event.Action.FX_ABORT] || []), + ...(accountBin[Enum.Events.Event.Action.FX_ABORT_VALIDATION] || []) + ], + { + accumulatedPositionValue, + accumulatedPositionReservedValue, + accumulatedTransferStates, + accumulatedFxTransferStates, + isFx: true, + changePositions + } + ) + + // Update accumulated values + accumulatedPositionValue = fxAbortReservedActionResult.accumulatedPositionValue + accumulatedPositionReservedValue = fxAbortReservedActionResult.accumulatedPositionReservedValue + accumulatedTransferStates = fxAbortReservedActionResult.accumulatedTransferStates + accumulatedFxTransferStates = fxAbortReservedActionResult.accumulatedFxTransferStates + // Append accumulated arrays + accumulatedTransferStateChanges = accumulatedTransferStateChanges.concat(fxAbortReservedActionResult.accumulatedTransferStateChanges) + accumulatedFxTransferStateChanges = accumulatedFxTransferStateChanges.concat(fxAbortReservedActionResult.accumulatedFxTransferStateChanges) + accumulatedPositionChanges = accumulatedPositionChanges.concat(fxAbortReservedActionResult.accumulatedPositionChanges) + notifyMessages = notifyMessages.concat(fxAbortReservedActionResult.notifyMessages) + followupMessages = followupMessages.concat(fxAbortReservedActionResult.followupMessages) + + // ========== TIMEOUT_RESERVED ========== + // If timeout-reserved action found then call processPositionTimeoutReserveBin function + const timeoutReservedActionResult = await PositionTimeoutReservedDomain.processPositionTimeoutReservedBin( + accountBin[Enum.Events.Event.Action.TIMEOUT_RESERVED], + { + accumulatedPositionValue, + accumulatedPositionReservedValue, + accumulatedTransferStates, + transferInfoList: latestTransferInfoByTransferId, + changePositions + } + ) + + // Update accumulated values + accumulatedPositionValue = timeoutReservedActionResult.accumulatedPositionValue + accumulatedPositionReservedValue = timeoutReservedActionResult.accumulatedPositionReservedValue + accumulatedTransferStates = timeoutReservedActionResult.accumulatedTransferStates + // Append accumulated arrays + accumulatedTransferStateChanges = accumulatedTransferStateChanges.concat(timeoutReservedActionResult.accumulatedTransferStateChanges) + accumulatedPositionChanges = accumulatedPositionChanges.concat(timeoutReservedActionResult.accumulatedPositionChanges) + notifyMessages = notifyMessages.concat(timeoutReservedActionResult.notifyMessages) + // ========== PREPARE ========== // If prepare action found then call processPositionPrepareBin function const prepareActionResult = await PositionPrepareDomain.processPositionPrepareBin( accountBin.prepare, - accumulatedPositionValue, - accumulatedPositionReservedValue, - accumulatedTransferStates, - settlementParticipantPosition, - settlementModel, - participantLimit + { + accumulatedPositionValue, + accumulatedPositionReservedValue, + accumulatedTransferStates, + settlementParticipantPosition, + participantLimit, + changePositions + } ) // Update accumulated values @@ -214,22 +332,63 @@ const processBins = async (bins, trx) => { accumulatedPositionChanges = accumulatedPositionChanges.concat(prepareActionResult.accumulatedPositionChanges) notifyMessages = notifyMessages.concat(prepareActionResult.notifyMessages) - // Update accumulated position values by calling a facade function - await BatchPositionModel.updateParticipantPosition(trx, positions[accountID].participantPositionId, accumulatedPositionValue, accumulatedPositionReservedValue) + // ========== FX_PREPARE ========== + // If fx-prepare action found then call processPositionFxPrepareBin function + const fxPrepareActionResult = await PositionFxPrepareDomain.processFxPositionPrepareBin( + accountBin[Enum.Events.Event.Action.FX_PREPARE], + { + accumulatedPositionValue, + accumulatedPositionReservedValue, + accumulatedFxTransferStates, + settlementParticipantPosition, + participantLimit, + changePositions + } + ) + + // Update accumulated values + accumulatedPositionValue = fxPrepareActionResult.accumulatedPositionValue + accumulatedPositionReservedValue = fxPrepareActionResult.accumulatedPositionReservedValue + accumulatedFxTransferStates = fxPrepareActionResult.accumulatedFxTransferStates + // Append accumulated arrays + accumulatedFxTransferStateChanges = accumulatedFxTransferStateChanges.concat(fxPrepareActionResult.accumulatedFxTransferStateChanges) + accumulatedPositionChanges = accumulatedPositionChanges.concat(fxPrepareActionResult.accumulatedPositionChanges) + notifyMessages = notifyMessages.concat(fxPrepareActionResult.notifyMessages) + + // ========== CONSOLIDATION ========== + + if (changePositions) { + // Update accumulated position values by calling a facade function + await BatchPositionModel.updateParticipantPosition(trx, positions[accountID].participantPositionId, accumulatedPositionValue, accumulatedPositionReservedValue) + } // Bulk insert accumulated transferStateChanges by calling a facade function await BatchPositionModel.bulkInsertTransferStateChanges(trx, accumulatedTransferStateChanges) + // Bulk insert accumulated fxTransferStateChanges by calling a facade function + await BatchPositionModel.bulkInsertFxTransferStateChanges(trx, accumulatedFxTransferStateChanges) // Bulk get the transferStateChangeIds for transferids using select whereIn const fetchedTransferStateChanges = await BatchPositionModel.getLatestTransferStateChangesByTransferIdList(trx, accumulatedTransferStateChanges.map(item => item.transferId)) - // Mutate accumulated positionChanges with transferStateChangeIds - for (const positionChange of accumulatedPositionChanges) { - positionChange.transferStateChangeId = fetchedTransferStateChanges[positionChange.transferId].transferStateChangeId - positionChange.participantPositionId = positions[accountID].participantPositionId - delete positionChange.transferId + // Bulk get the fxTransferStateChangeIds for commitRequestId using select whereIn + const fetchedFxTransferStateChanges = await BatchPositionModel.getLatestFxTransferStateChangesByCommitRequestIdList(trx, accumulatedFxTransferStateChanges.map(item => item.commitRequestId)) + + if (changePositions) { + // Mutate accumulated positionChanges with transferStateChangeIds and fxTransferStateChangeIds + for (const positionChange of accumulatedPositionChanges) { + if (positionChange.transferId) { + positionChange.transferStateChangeId = fetchedTransferStateChanges[positionChange.transferId].transferStateChangeId + delete positionChange.transferId + } else if (positionChange.commitRequestId) { + positionChange.fxTransferStateChangeId = fetchedFxTransferStateChanges[positionChange.commitRequestId].fxTransferStateChangeId + delete positionChange.commitRequestId + } + positionChange.participantPositionId = positions[accountID].participantPositionId + positionChange.participantCurrencyId = accountID + } + + // Bulk insert accumulated positionChanges by calling a facade function + await BatchPositionModel.bulkInsertParticipantPositionChanges(trx, accumulatedPositionChanges) } - // Bulk insert accumulated positionChanges by calling a facade function - await BatchPositionModel.bulkInsertParticipantPositionChanges(trx, accumulatedPositionChanges) limitAlarms = limitAlarms.concat(prepareActionResult.limitAlarms) } @@ -237,6 +396,7 @@ const processBins = async (bins, trx) => { // Return results return { notifyMessages, + followupMessages, limitAlarms } } @@ -285,6 +445,108 @@ const _getSettlementModelForCurrency = (currencyId, allSettlementModels) => { return settlementModels.find(sm => sm.ledgerAccountTypeId === Enum.Accounts.LedgerAccountType.POSITION) } +const _getTransferIdList = async (bins) => { + const transferIdList = [] + const reservedActionTransferIdList = [] + const commitRequestIdList = [] + await iterateThroughBins(bins, (_accountID, action, item) => { + if (action === Enum.Events.Event.Action.PREPARE) { + transferIdList.push(item.decodedPayload.transferId) + } else if (action === Enum.Events.Event.Action.FULFIL) { + transferIdList.push(item.message.value.content.uriParams.id) + } else if (action === Enum.Events.Event.Action.COMMIT) { + transferIdList.push(item.message.value.content.uriParams.id) + } else if (action === Enum.Events.Event.Action.RESERVE) { + transferIdList.push(item.message.value.content.uriParams.id) + reservedActionTransferIdList.push(item.message.value.content.uriParams.id) + } else if (action === Enum.Events.Event.Action.TIMEOUT_RESERVED) { + transferIdList.push(item.message.value.content.uriParams.id) + } else if (action === Enum.Events.Event.Action.FX_PREPARE) { + commitRequestIdList.push(item.decodedPayload.commitRequestId) + } else if (action === Enum.Events.Event.Action.FX_RESERVE) { + commitRequestIdList.push(item.message.value.content.uriParams.id) + } else if (action === Enum.Events.Event.Action.FX_TIMEOUT_RESERVED) { + commitRequestIdList.push(item.message.value.content.uriParams.id) + } else if (action === Enum.Events.Event.Action.ABORT) { + transferIdList.push(item.message.value.content.uriParams.id) + } else if (action === Enum.Events.Event.Action.FX_ABORT) { + commitRequestIdList.push(item.message.value.content.uriParams.id) + } else if (action === Enum.Events.Event.Action.ABORT_VALIDATION) { + transferIdList.push(item.message.value.content.uriParams.id) + } else if (action === Enum.Events.Event.Action.FX_ABORT_VALIDATION) { + commitRequestIdList.push(item.message.value.content.uriParams.id) + } + }) + return { transferIdList, reservedActionTransferIdList, commitRequestIdList } +} + +const _fetchLatestTransferStates = async (trx, transferIdList) => { + const latestTransferStateChanges = await BatchPositionModel.getLatestTransferStateChangesByTransferIdList(trx, transferIdList) + const latestTransferStates = {} + for (const key in latestTransferStateChanges) { + latestTransferStates[key] = latestTransferStateChanges[key].transferStateId + } + return latestTransferStates +} + +const _fetchLatestFxTransferStates = async (trx, commitRequestIdList) => { + const latestFxTransferStateChanges = await BatchPositionModel.getLatestFxTransferStateChangesByCommitRequestIdList(trx, commitRequestIdList) + const latestFxTransferStates = {} + for (const key in latestFxTransferStateChanges) { + latestFxTransferStates[key] = latestFxTransferStateChanges[key].transferStateId + } + return latestFxTransferStates +} + +const _getParticipantCurrencyIds = async (trx, accountIds) => { + const participantCurrencyIds = await BatchPositionModelCached.getParticipantCurrencyByIds(trx, accountIds) + + // Validate that participantCurrencyIds exist for each of the accountIds + // i.e every unique accountId has a corresponding entry in participantCurrencyIds + const participantIdsHavingCurrencyIdsList = [...new Set(participantCurrencyIds.map(item => item.participantCurrencyId))] + const allAccountIdsHaveParticipantCurrencyIds = accountIds.every(accountId => { + return participantIdsHavingCurrencyIdsList.includes(Number(accountId)) + }) + if (!allAccountIdsHaveParticipantCurrencyIds) { + throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR, 'Not all accountIds have corresponding participantCurrencyIds') + } + return participantCurrencyIds +} + +const _constructRequiredMaps = async (participantCurrencyIds, allSettlementModels, trx) => { + const participantIdMap = {} + const accountIdMap = {} + const currencyIdMap = {} + for (const item of participantCurrencyIds) { + const { participantId, currencyId, participantCurrencyId } = item + if (!participantIdMap[participantId]) { + participantIdMap[participantId] = {} + } + if (!currencyIdMap[currencyId]) { + currencyIdMap[currencyId] = { + settlementModel: _getSettlementModelForCurrency(currencyId, allSettlementModels) + } + } + participantIdMap[participantId][currencyId] = participantCurrencyId + accountIdMap[participantCurrencyId] = { participantId, currencyId } + } + + // Get all participantCurrencyIds for the participantIdMap + const allParticipantCurrencyIds = await BatchPositionModelCached.getParticipantCurrencyByParticipantIds(trx, Object.keys(participantIdMap)) + const settlementCurrencyIds = [] + for (const pc of allParticipantCurrencyIds) { + const correspondingParticipantCurrencyId = participantIdMap[pc.participantId][pc.currencyId] + if (correspondingParticipantCurrencyId) { + const settlementModel = currencyIdMap[pc.currencyId].settlementModel + if (pc.ledgerAccountTypeId === settlementModel.settlementAccountTypeId) { + settlementCurrencyIds.push(pc) + accountIdMap[correspondingParticipantCurrencyId].settlementCurrencyId = pc.participantCurrencyId + } + } + } + return { settlementCurrencyIds, accountIdMap, currencyIdMap } +} + module.exports = { processBins, iterateThroughBins diff --git a/src/domain/position/fulfil.js b/src/domain/position/fulfil.js index 6877eaf93..59a87b18a 100644 --- a/src/domain/position/fulfil.js +++ b/src/domain/position/fulfil.js @@ -1,3 +1,38 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ + const { Enum } = require('@mojaloop/central-services-shared') const ErrorHandler = require('@mojaloop/central-services-error-handling') const Config = require('../../lib/config') @@ -13,149 +48,290 @@ const TransferObjectTransform = require('../../domain/transfer/transform') * @description This is the domain function to process a bin of position-fulfil messages of a single participant account. * * @param {array} commitReserveFulfilBins - an array containing commit and reserve action bins - * @param {number} accumulatedPositionValue - value of position accumulated so far from previous bin processing - * @param {number} accumulatedPositionReservedValue - value of position reserved accumulated so far, not used but kept for consistency - * @param {object} accumulatedTransferStates - object with transfer id keys and transfer state id values. Used to check if transfer is in correct state for processing. Clone and update states for output. - * @param {object} transferInfoList - object with transfer id keys and transfer info values. Used to pass transfer info to domain function. + * @param {object} options + * @param {number} accumulatedPositionValue - value of position accumulated so far from previous bin processing + * @param {number} accumulatedPositionReservedValue - value of position reserved accumulated so far, not used but kept for consistency + * @param {object} accumulatedTransferStates - object with transfer id keys and transfer state id values. Used to check if transfer is in correct state for processing. Clone and update states for output. + * @param {object} transferInfoList - object with transfer id keys and transfer info values. Used to pass transfer info to domain function. + * @param {boolean} changePositions - whether to change positions or not * @returns {object} - Returns an object containing accumulatedPositionValue, accumulatedPositionReservedValue, accumulatedTransferStateChanges, accumulatedTransferStates, resultMessages, limitAlarms or throws an error if failed */ const processPositionFulfilBin = async ( commitReserveFulfilBins, - accumulatedPositionValue, - accumulatedPositionReservedValue, - accumulatedTransferStates, - transferInfoList, - reservedActionTransfers + { + accumulatedPositionValue, + accumulatedPositionReservedValue, + accumulatedTransferStates, + accumulatedFxTransferStates, + transferInfoList, + reservedActionTransfers, + changePositions = true + } ) => { const transferStateChanges = [] + const fxTransferStateChanges = [] const participantPositionChanges = [] const resultMessages = [] + const followupMessages = [] const accumulatedTransferStatesCopy = Object.assign({}, accumulatedTransferStates) + const accumulatedFxTransferStatesCopy = Object.assign({}, accumulatedFxTransferStates) let runningPosition = new MLNumber(accumulatedPositionValue) for (const binItems of commitReserveFulfilBins) { if (binItems && binItems.length > 0) { for (const binItem of binItems) { - let transferStateId - let reason - let resultMessage const transferId = binItem.message.value.content.uriParams.id const payeeFsp = binItem.message.value.from const payerFsp = binItem.message.value.to const transfer = binItem.decodedPayload - Logger.isDebugEnabled && Logger.debug(`processPositionFulfilBin::transfer:processingMessage: ${JSON.stringify(transfer)}`) - Logger.isDebugEnabled && Logger.debug(`accumulatedTransferStates: ${JSON.stringify(accumulatedTransferStates)}`) + // Inform payee dfsp if transfer is not in RECEIVED_FULFIL state, skip making any transfer state changes if (accumulatedTransferStates[transferId] !== Enum.Transfers.TransferInternalState.RECEIVED_FULFIL) { - // forward same headers from the prepare message, except the content-length header - // set destination to payeefsp and source to switch - const headers = { ...binItem.message.value.content.headers } - headers[Enum.Http.Headers.FSPIOP.DESTINATION] = payeeFsp - headers[Enum.Http.Headers.FSPIOP.SOURCE] = Enum.Http.Headers.FSPIOP.SWITCH.value - delete headers['content-length'] - - const fspiopError = ErrorHandler.Factory.createInternalServerFSPIOPError( - `Invalid State: ${accumulatedTransferStates[transferId]} - expected: ${Enum.Transfers.TransferInternalState.RECEIVED_FULFIL}` - ).toApiErrorObject(Config.ERROR_HANDLING) - const state = Utility.StreamingProtocol.createEventState( - Enum.Events.EventStatus.FAILURE.status, - fspiopError.errorInformation.errorCode, - fspiopError.errorInformation.errorDescription - ) - - const metadata = Utility.StreamingProtocol.createMetadataWithCorrelatedEvent( - transferId, - Enum.Kafka.Topics.NOTIFICATION, - Enum.Events.Event.Action.FULFIL, - state - ) - - resultMessage = Utility.StreamingProtocol.createMessage( - transferId, - payeeFsp, - Enum.Http.Headers.FSPIOP.SWITCH.value, - metadata, - headers, - fspiopError, - { id: transferId }, - 'application/json' - ) + const resultMessage = _handleIncorrectTransferState(binItem, payeeFsp, transferId, accumulatedTransferStates) + resultMessages.push({ binItem, message: resultMessage }) } else { - const transferInfo = transferInfoList[transferId] - - // forward same headers from the prepare message, except the content-length header - const headers = { ...binItem.message.value.content.headers } - delete headers['content-length'] - - const state = Utility.StreamingProtocol.createEventState( - Enum.Events.EventStatus.SUCCESS.status, - null, - null - ) - const metadata = Utility.StreamingProtocol.createMetadataWithCorrelatedEvent( - transferId, - Enum.Kafka.Topics.TRANSFER, - Enum.Events.Event.Action.COMMIT, - state - ) - - resultMessage = Utility.StreamingProtocol.createMessage( - transferId, - payerFsp, - payeeFsp, - metadata, - headers, - transfer, - { id: transferId }, - 'application/json' - ) - - if (binItem.message.value.metadata.event.action === Enum.Events.Event.Action.RESERVE) { - resultMessage.content.payload = TransferObjectTransform.toFulfil( - reservedActionTransfers[transferId] - ) - } - - transferStateId = Enum.Transfers.TransferState.COMMITTED - // Amounts in `transferParticipant` for the payee are stored as negative values - runningPosition = new MLNumber(runningPosition.add(transferInfo.amount).toFixed(Config.AMOUNT.SCALE)) - - const participantPositionChange = { - transferId, // Need to delete this in bin processor while updating transferStateChangeId - transferStateChangeId: null, // Need to update this in bin processor while executing queries - value: runningPosition.toNumber(), - reservedValue: accumulatedPositionReservedValue + Logger.isDebugEnabled && Logger.debug(`processPositionFulfilBin::transfer:processingMessage: ${JSON.stringify(transfer)}`) + Logger.isDebugEnabled && Logger.debug(`accumulatedTransferStates: ${JSON.stringify(accumulatedTransferStates)}`) + const cyrilResult = binItem.message.value.content.context?.cyrilResult + if (cyrilResult && cyrilResult.isFx) { + // This is FX transfer + // Handle position movements + // Iterate through positionChanges and handle each position movement, mark as done and publish a position-commit kafka message again for the next item + // Find out the first item to be processed + const positionChangeIndex = cyrilResult.positionChanges.findIndex(positionChange => !positionChange.isDone) + const positionChangeToBeProcessed = cyrilResult.positionChanges[positionChangeIndex] + let transferStateIdCopy + if (positionChangeToBeProcessed.isFxTransferStateChange) { + const { participantPositionChange, fxTransferStateChange, transferStateId, updatedRunningPosition } = + _handleParticipantPositionChangeFx(runningPosition, positionChangeToBeProcessed.amount, positionChangeToBeProcessed.commitRequestId, accumulatedPositionReservedValue) + transferStateIdCopy = transferStateId + runningPosition = updatedRunningPosition + participantPositionChanges.push(participantPositionChange) + fxTransferStateChanges.push(fxTransferStateChange) + accumulatedFxTransferStatesCopy[positionChangeToBeProcessed.commitRequestId] = transferStateId + const patchMessages = _constructPatchNotificationResultMessage( + binItem, + cyrilResult + ) + for (const patchMessage of patchMessages) { + resultMessages.push({ binItem, message: patchMessage }) + } + } else { + const { participantPositionChange, transferStateChange, transferStateId, updatedRunningPosition } = + _handleParticipantPositionChange(runningPosition, positionChangeToBeProcessed.amount, positionChangeToBeProcessed.transferId, accumulatedPositionReservedValue) + transferStateIdCopy = transferStateId + runningPosition = updatedRunningPosition + participantPositionChanges.push(participantPositionChange) + transferStateChanges.push(transferStateChange) + accumulatedTransferStatesCopy[positionChangeToBeProcessed.transferId] = transferStateId + } + binItem.result = { success: true } + cyrilResult.positionChanges[positionChangeIndex].isDone = true + const nextIndex = cyrilResult.positionChanges.findIndex(positionChange => !positionChange.isDone) + if (nextIndex === -1) { + // All position changes are done + const resultMessage = _constructTransferFulfilResultMessage(binItem, transferId, payerFsp, payeeFsp, transfer, reservedActionTransfers, transferStateIdCopy) + resultMessages.push({ binItem, message: resultMessage }) + } else { + // There are still position changes to be processed + // Send position-commit kafka message again for the next item + const participantCurrencyId = cyrilResult.positionChanges[nextIndex].participantCurrencyId + const followupMessage = _constructTransferFulfilResultMessage(binItem, transferId, payerFsp, payeeFsp, transfer, reservedActionTransfers, transferStateIdCopy) + // Pass down the context to the followup message with mutated cyrilResult + followupMessage.content.context = binItem.message.value.content.context + followupMessages.push({ binItem, messageKey: participantCurrencyId.toString(), message: followupMessage }) + } + } else { + const transferAmount = transferInfoList[transferId].amount + const { participantPositionChange, transferStateChange, transferStateId, updatedRunningPosition } = + _handleParticipantPositionChange(runningPosition, transferAmount, transferId, accumulatedPositionReservedValue) + runningPosition = updatedRunningPosition + binItem.result = { success: true } + participantPositionChanges.push(participantPositionChange) + transferStateChanges.push(transferStateChange) + accumulatedTransferStatesCopy[transferId] = transferStateId + const resultMessage = _constructTransferFulfilResultMessage(binItem, transferId, payerFsp, payeeFsp, transfer, reservedActionTransfers, transferStateId) + resultMessages.push({ binItem, message: resultMessage }) } - participantPositionChanges.push(participantPositionChange) - binItem.result = { success: true } - } - - resultMessages.push({ binItem, message: resultMessage }) - - if (transferStateId) { - const transferStateChange = { - transferId, - transferStateId, - reason - } - transferStateChanges.push(transferStateChange) - Logger.isDebugEnabled && Logger.debug(`processPositionFulfilBin::transferStateChange: ${JSON.stringify(transferStateChange)}`) - - accumulatedTransferStatesCopy[transferId] = transferStateId - Logger.isDebugEnabled && Logger.debug(`processPositionFulfilBin::accumulatedTransferStatesCopy:finalizedTransferState ${JSON.stringify(transferStateId)}`) } } } } return { - accumulatedPositionValue: runningPosition.toNumber(), + accumulatedPositionValue: changePositions ? runningPosition.toNumber() : accumulatedPositionValue, accumulatedTransferStates: accumulatedTransferStatesCopy, // finalized transfer state after fulfil processing + accumulatedFxTransferStates: accumulatedFxTransferStatesCopy, // finalized transfer state after fx fulfil processing accumulatedPositionReservedValue, // not used but kept for consistency accumulatedTransferStateChanges: transferStateChanges, // transfer state changes to be persisted in order - accumulatedPositionChanges: participantPositionChanges, // participant position changes to be persisted in order - notifyMessages: resultMessages // array of objects containing bin item and result message. {binItem, message} + accumulatedFxTransferStateChanges: fxTransferStateChanges, // fx-transfer state changes to be persisted in order + accumulatedPositionChanges: changePositions ? participantPositionChanges : [], // participant position changes to be persisted in order + notifyMessages: resultMessages, // array of objects containing bin item and result message. {binItem, message} + followupMessages // array of objects containing bin item, message key and followup message. {binItem, messageKey, message} + } +} + +const _handleIncorrectTransferState = (binItem, payeeFsp, transferId, accumulatedTransferStates) => { + // forward same headers from the prepare message, except the content-length header + // set destination to payeefsp and source to switch + const headers = { ...binItem.message.value.content.headers } + headers[Enum.Http.Headers.FSPIOP.DESTINATION] = payeeFsp + headers[Enum.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME + delete headers['content-length'] + + const fspiopError = ErrorHandler.Factory.createInternalServerFSPIOPError( + `Invalid State: ${accumulatedTransferStates[transferId]} - expected: ${Enum.Transfers.TransferInternalState.RECEIVED_FULFIL}` + ).toApiErrorObject(Config.ERROR_HANDLING) + const state = Utility.StreamingProtocol.createEventState( + Enum.Events.EventStatus.FAILURE.status, + fspiopError.errorInformation.errorCode, + fspiopError.errorInformation.errorDescription + ) + + const metadata = Utility.StreamingProtocol.createMetadataWithCorrelatedEvent( + transferId, + Enum.Kafka.Topics.NOTIFICATION, + Enum.Events.Event.Action.FULFIL, + state + ) + + return Utility.StreamingProtocol.createMessage( + transferId, + payeeFsp, + Config.HUB_NAME, + metadata, + headers, + fspiopError, + { id: transferId }, + 'application/json' + ) +} + +const _constructTransferFulfilResultMessage = (binItem, transferId, payerFsp, payeeFsp, transfer, reservedActionTransfers, transferStateId) => { + // forward same headers from the prepare message, except the content-length header + const headers = { ...binItem.message.value.content.headers } + delete headers['content-length'] + + const state = Utility.StreamingProtocol.createEventState( + Enum.Events.EventStatus.SUCCESS.status, + null, + null + ) + const metadata = Utility.StreamingProtocol.createMetadataWithCorrelatedEvent( + transferId, + Enum.Kafka.Topics.TRANSFER, + Enum.Events.Event.Action.COMMIT, + state + ) + + const resultMessage = Utility.StreamingProtocol.createMessage( + transferId, + payerFsp, + payeeFsp, + metadata, + headers, + transfer, + { id: transferId }, + 'application/json' + ) + + if (binItem.message.value.metadata.event.action === Enum.Events.Event.Action.RESERVE) { + resultMessage.content.payload = TransferObjectTransform.toFulfil( + reservedActionTransfers[transferId] + ) + resultMessage.content.payload.transferState = transferStateId + } + return resultMessage +} + +const _constructPatchNotificationResultMessage = (binItem, cyrilResult) => { + const messages = [] + const patchNotifications = cyrilResult.patchNotifications + for (const patchNotification of patchNotifications) { + const commitRequestId = patchNotification.commitRequestId + const fxpName = patchNotification.fxpName + const fulfilment = patchNotification.fulfilment + const completedTimestamp = patchNotification.completedTimestamp + const headers = { + ...binItem.message.value.content.headers, + 'fspiop-source': Config.HUB_NAME, + 'fspiop-destination': fxpName + } + + const fulfil = { + conversionState: Enum.Transfers.TransferState.COMMITTED, + fulfilment, + completedTimestamp + } + + const state = Utility.StreamingProtocol.createEventState( + Enum.Events.EventStatus.SUCCESS.status, + null, + null + ) + const metadata = Utility.StreamingProtocol.createMetadataWithCorrelatedEvent( + commitRequestId, + Enum.Kafka.Topics.TRANSFER, + Enum.Events.Event.Action.FX_NOTIFY, + state + ) + + const resultMessage = Utility.StreamingProtocol.createMessage( + commitRequestId, + fxpName, + Config.HUB_NAME, + metadata, + headers, + fulfil, + { id: commitRequestId }, + 'application/json' + ) + + messages.push(resultMessage) + } + return messages +} + +const _handleParticipantPositionChange = (runningPosition, transferAmount, transferId, accumulatedPositionReservedValue) => { + const transferStateId = Enum.Transfers.TransferState.COMMITTED + // Amounts in `transferParticipant` for the payee are stored as negative values + const updatedRunningPosition = new MLNumber(runningPosition.add(transferAmount).toFixed(Config.AMOUNT.SCALE)) + + const participantPositionChange = { + transferId, // Need to delete this in bin processor while updating transferStateChangeId + transferStateChangeId: null, // Need to update this in bin processor while executing queries + value: updatedRunningPosition.toNumber(), + change: transferAmount, + reservedValue: accumulatedPositionReservedValue + } + + const transferStateChange = { + transferId, + transferStateId, + reason: undefined + } + return { participantPositionChange, transferStateChange, transferStateId, updatedRunningPosition } +} + +const _handleParticipantPositionChangeFx = (runningPosition, transferAmount, commitRequestId, accumulatedPositionReservedValue) => { + const transferStateId = Enum.Transfers.TransferState.COMMITTED + // Amounts in `transferParticipant` for the payee are stored as negative values + const updatedRunningPosition = new MLNumber(runningPosition.add(transferAmount).toFixed(Config.AMOUNT.SCALE)) + + const participantPositionChange = { + commitRequestId, // Need to delete this in bin processor while updating fxTransferStateChangeId + fxTransferStateChangeId: null, // Need to update this in bin processor while executing queries + value: updatedRunningPosition.toNumber(), + change: transferAmount, + reservedValue: accumulatedPositionReservedValue + } + + const fxTransferStateChange = { + commitRequestId, + transferStateId, + reason: null } + return { participantPositionChange, fxTransferStateChange, transferStateId, updatedRunningPosition } } module.exports = { diff --git a/src/domain/position/fx-fulfil.js b/src/domain/position/fx-fulfil.js new file mode 100644 index 000000000..5c9226822 --- /dev/null +++ b/src/domain/position/fx-fulfil.js @@ -0,0 +1,173 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ + +const { Enum } = require('@mojaloop/central-services-shared') +const ErrorHandler = require('@mojaloop/central-services-error-handling') +const Config = require('../../lib/config') +const Utility = require('@mojaloop/central-services-shared').Util +const Logger = require('@mojaloop/central-services-logger') + +/** + * @function processPositionFxFulfilBin + * + * @async + * @description This is the domain function to process a bin of position-fx-fulfil messages of a single participant account. + * + * @param {array} binItems - an array of objects that contain a position fx reserve message and its span. {message, span} + * @param {object} options + * @param {object} accumulatedFxTransferStates - object with fx transfer id keys and transfer state id values. Used to check if transfer is in correct state for processing. Clone and update states for output. + * @returns {object} - Returns an object containing accumulatedFxTransferStateChanges, accumulatedFxTransferStates, resultMessages, limitAlarms or throws an error if failed + */ +const processPositionFxFulfilBin = async ( + binItems, + { + accumulatedFxTransferStates + } +) => { + const fxTransferStateChanges = [] + const resultMessages = [] + const accumulatedFxTransferStatesCopy = Object.assign({}, accumulatedFxTransferStates) + + if (binItems && binItems.length > 0) { + for (const binItem of binItems) { + let transferStateId + let reason + let resultMessage + const commitRequestId = binItem.message.value.content.uriParams.id + const counterPartyFsp = binItem.message.value.from + const initiatingFsp = binItem.message.value.to + const fxTransfer = binItem.decodedPayload + Logger.isDebugEnabled && Logger.debug(`processPositionFxFulfilBin::fxTransfer:processingMessage: ${JSON.stringify(fxTransfer)}`) + Logger.isDebugEnabled && Logger.debug(`accumulatedFxTransferStates: ${JSON.stringify(accumulatedFxTransferStates)}`) + Logger.isDebugEnabled && Logger.debug(`accumulatedFxTransferStates[commitRequestId]: ${accumulatedFxTransferStates[commitRequestId]}`) + // Inform sender if transfer is not in RECEIVED_FULFIL_DEPENDENT state, skip making any transfer state changes + if (accumulatedFxTransferStates[commitRequestId] !== Enum.Transfers.TransferInternalState.RECEIVED_FULFIL_DEPENDENT) { + // forward same headers from the request, except the content-length header + // set destination to counterPartyFsp and source to switch + const headers = { ...binItem.message.value.content.headers } + headers[Enum.Http.Headers.FSPIOP.DESTINATION] = counterPartyFsp + headers[Enum.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME + delete headers['content-length'] + + // There is no such logic in the fulfil handler. + transferStateId = Enum.Transfers.TransferInternalState.ABORTED_REJECTED + reason = 'FxFulfil in incorrect state' + + const fspiopError = ErrorHandler.Factory.createInternalServerFSPIOPError( + `Invalid State: ${accumulatedFxTransferStates[commitRequestId]} - expected: ${Enum.Transfers.TransferInternalState.RECEIVED_FULFIL_DEPENDENT}` + ).toApiErrorObject(Config.ERROR_HANDLING) + const state = Utility.StreamingProtocol.createEventState( + Enum.Events.EventStatus.FAILURE.status, + fspiopError.errorInformation.errorCode, + fspiopError.errorInformation.errorDescription + ) + + const metadata = Utility.StreamingProtocol.createMetadataWithCorrelatedEvent( + commitRequestId, + Enum.Kafka.Topics.NOTIFICATION, + Enum.Events.Event.Action.FX_FULFIL, + state + ) + + resultMessage = Utility.StreamingProtocol.createMessage( + commitRequestId, + counterPartyFsp, + Config.HUB_NAME, + metadata, + headers, + fspiopError, + { id: commitRequestId }, + 'application/json' + ) + } else { + // forward same headers from the prepare message, except the content-length header + const headers = { ...binItem.message.value.content.headers } + delete headers['content-length'] + + const state = Utility.StreamingProtocol.createEventState( + Enum.Events.EventStatus.SUCCESS.status, + null, + null + ) + const metadata = Utility.StreamingProtocol.createMetadataWithCorrelatedEvent( + commitRequestId, + Enum.Kafka.Topics.TRANSFER, + Enum.Events.Event.Action.COMMIT, + state + ) + + resultMessage = Utility.StreamingProtocol.createMessage( + commitRequestId, + initiatingFsp, + counterPartyFsp, + metadata, + headers, + fxTransfer, + { id: commitRequestId }, + 'application/json' + ) + + // No need to change the transfer state here for success case. + + binItem.result = { success: true } + } + + resultMessages.push({ binItem, message: resultMessage }) + + if (transferStateId) { + const fxTransferStateChange = { + commitRequestId, + transferStateId, + reason + } + fxTransferStateChanges.push(fxTransferStateChange) + Logger.isDebugEnabled && Logger.debug(`processPositionFxFulfilBin::fxTransferStateChange: ${JSON.stringify(fxTransferStateChange)}`) + + accumulatedFxTransferStatesCopy[commitRequestId] = transferStateId + Logger.isDebugEnabled && Logger.debug(`processPositionFxFulfilBin::accumulatedTransferStatesCopy:finalizedFxTransferState ${JSON.stringify(transferStateId)}`) + } + } + } + + return { + accumulatedFxTransferStates: accumulatedFxTransferStatesCopy, // finalized fx transfer state after fx-fulfil processing + accumulatedFxTransferStateChanges: fxTransferStateChanges, // fx transfer state changes to be persisted in order + notifyMessages: resultMessages // array of objects containing bin item and result message. {binItem, message} + } +} + +module.exports = { + processPositionFxFulfilBin +} diff --git a/src/domain/position/fx-prepare.js b/src/domain/position/fx-prepare.js new file mode 100644 index 000000000..f5741f5ba --- /dev/null +++ b/src/domain/position/fx-prepare.js @@ -0,0 +1,315 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ + +const { Enum } = require('@mojaloop/central-services-shared') +const ErrorHandler = require('@mojaloop/central-services-error-handling') +const Config = require('../../lib/config') +const Utility = require('@mojaloop/central-services-shared').Util +const MLNumber = require('@mojaloop/ml-number') +const Logger = require('@mojaloop/central-services-logger') + +/** + * @function processFxPositionPrepareBin + * + * @async + * @description This is the domain function to process a bin of position-prepare messages of a single participant account. + * + * @param {array} binItems - an array of objects that contain a position prepare message and its span. {message, decodedPayload, span} + * @param {object} options + * @param {number} accumulatedPositionValue - value of position accumulated so far from previous bin processing + * @param {number} accumulatedPositionReservedValue - value of position reserved accumulated so far, not used but kept for consistency + * @param {object} accumulatedFxTransferStates - object with fx commit request id keys and fx transfer state id values. Used to check if fx transfer is in correct state for processing. Clone and update states for output. + * @param {number} settlementParticipantPosition - position value of the participants settlement account + * @param {object} participantLimit - participant limit object for the currency + * @param {boolean} changePositions - whether to change positions or not + * @returns {object} - Returns an object containing accumulatedPositionValue, accumulatedPositionReservedValue, accumulatedFxTransferStateChanges, accumulatedTransferStates, resultMessages, limitAlarms or throws an error if failed + */ +const processFxPositionPrepareBin = async ( + binItems, + { + accumulatedPositionValue, + accumulatedPositionReservedValue, + accumulatedFxTransferStates, + settlementParticipantPosition, + participantLimit, + changePositions = true + } +) => { + const fxTransferStateChanges = [] + const participantPositionChanges = [] + const resultMessages = [] + const limitAlarms = [] + const accumulatedFxTransferStatesCopy = Object.assign({}, accumulatedFxTransferStates) + + let currentPosition = new MLNumber(accumulatedPositionValue) + let liquidityCover = 0 + let availablePositionBasedOnLiquidityCover = 0 + let availablePositionBasedOnPayerLimit = 0 + + if (changePositions) { + const reservedPosition = new MLNumber(accumulatedPositionReservedValue) + const effectivePosition = new MLNumber(currentPosition.add(reservedPosition).toFixed(Config.AMOUNT.SCALE)) + const payerLimit = new MLNumber(participantLimit.value) + liquidityCover = new MLNumber(settlementParticipantPosition).multiply(-1) + availablePositionBasedOnLiquidityCover = new MLNumber(liquidityCover.subtract(effectivePosition).toFixed(Config.AMOUNT.SCALE)) + Logger.isInfoEnabled && Logger.info(`processFxPositionPrepareBin::availablePositionBasedOnLiquidityCover: ${availablePositionBasedOnLiquidityCover}`) + availablePositionBasedOnPayerLimit = new MLNumber(payerLimit.subtract(effectivePosition).toFixed(Config.AMOUNT.SCALE)) + Logger.isDebugEnabled && Logger.debug(`processFxPositionPrepareBin::availablePositionBasedOnPayerLimit: ${availablePositionBasedOnPayerLimit}`) + } + + if (binItems && binItems.length > 0) { + for (const binItem of binItems) { + let transferStateId + let reason + let resultMessage + const fxTransfer = binItem.decodedPayload + const cyrilResult = binItem.message.value.content.context.cyrilResult + const transferAmount = fxTransfer.targetAmount.currency === cyrilResult.currencyId ? fxTransfer.targetAmount.amount : fxTransfer.sourceAmount.amount + + Logger.isDebugEnabled && Logger.debug(`processFxPositionPrepareBin::transfer:processingMessage: ${JSON.stringify(fxTransfer)}`) + + // Check if fxTransfer is in correct state for processing, produce an internal error message + if (accumulatedFxTransferStates[fxTransfer.commitRequestId] !== Enum.Transfers.TransferInternalState.RECEIVED_PREPARE) { + Logger.isDebugEnabled && Logger.debug(`processFxPositionPrepareBin::transferState: ${accumulatedFxTransferStates[fxTransfer.commitRequestId]} !== ${Enum.Transfers.TransferInternalState.RECEIVED_PREPARE}`) + + transferStateId = Enum.Transfers.TransferInternalState.ABORTED_REJECTED + reason = 'FxTransfer in incorrect state' + + // forward same headers from the prepare message, except the content-length header + // set destination to initiatingFsp and source to switch + const headers = { ...binItem.message.value.content.headers } + headers[Enum.Http.Headers.FSPIOP.DESTINATION] = fxTransfer.initiatingFsp + headers[Enum.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME + delete headers['content-length'] + + const fspiopError = ErrorHandler.Factory.createFSPIOPError( + ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR + ).toApiErrorObject(Config.ERROR_HANDLING) + + const state = Utility.StreamingProtocol.createEventState( + Enum.Events.EventStatus.FAILURE.status, + fspiopError.errorInformation.errorCode, + fspiopError.errorInformation.errorDescription + ) + + const metadata = Utility.StreamingProtocol.createMetadataWithCorrelatedEvent( + fxTransfer.commitRequestId, + Enum.Kafka.Topics.NOTIFICATION, + Enum.Events.Event.Action.FX_PREPARE, + state + ) + + resultMessage = Utility.StreamingProtocol.createMessage( + fxTransfer.commitRequestId, + fxTransfer.initiatingFsp, + Config.HUB_NAME, + metadata, + headers, + fspiopError, + { id: fxTransfer.commitRequestId }, + 'application/json' + ) + + binItem.result = { success: false } + + // Check if payer has insufficient liquidity, produce an error message and abort transfer + } else if (changePositions && availablePositionBasedOnLiquidityCover.toNumber() < transferAmount) { + transferStateId = Enum.Transfers.TransferInternalState.ABORTED_REJECTED + reason = ErrorHandler.Enums.FSPIOPErrorCodes.PAYER_FSP_INSUFFICIENT_LIQUIDITY.message + + // forward same headers from the prepare message, except the content-length header + // set destination to payerfsp and source to switch + const headers = { ...binItem.message.value.content.headers } + headers[Enum.Http.Headers.FSPIOP.DESTINATION] = fxTransfer.initiatingFsp + headers[Enum.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME + delete headers['content-length'] + + const fspiopError = ErrorHandler.Factory.createFSPIOPError( + ErrorHandler.Enums.FSPIOPErrorCodes.PAYER_FSP_INSUFFICIENT_LIQUIDITY + ).toApiErrorObject(Config.ERROR_HANDLING) + + const state = Utility.StreamingProtocol.createEventState( + Enum.Events.EventStatus.FAILURE.status, + fspiopError.errorInformation.errorCode, + fspiopError.errorInformation.errorDescription + ) + + const metadata = Utility.StreamingProtocol.createMetadataWithCorrelatedEvent( + fxTransfer.commitRequestId, + Enum.Kafka.Topics.NOTIFICATION, + Enum.Events.Event.Action.FX_PREPARE, + state + ) + + resultMessage = Utility.StreamingProtocol.createMessage( + fxTransfer.commitRequestId, + fxTransfer.initiatingFsp, + Config.HUB_NAME, + metadata, + headers, + fspiopError, + { id: fxTransfer.commitRequestId }, + 'application/json' + ) + + binItem.result = { success: false } + + // Check if payer has surpassed their limit, produce an error message and abort transfer + } else if (changePositions && availablePositionBasedOnPayerLimit.toNumber() < transferAmount) { + transferStateId = Enum.Transfers.TransferInternalState.ABORTED_REJECTED + reason = ErrorHandler.Enums.FSPIOPErrorCodes.PAYER_LIMIT_ERROR.message + + // forward same headers from the prepare message, except the content-length header + // set destination to payerfsp and source to switch + const headers = { ...binItem.message.value.content.headers } + headers[Enum.Http.Headers.FSPIOP.DESTINATION] = fxTransfer.initiatingFsp + headers[Enum.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME + delete headers['content-length'] + + const fspiopError = ErrorHandler.Factory.createFSPIOPError( + ErrorHandler.Enums.FSPIOPErrorCodes.PAYER_LIMIT_ERROR + ).toApiErrorObject(Config.ERROR_HANDLING) + + const state = Utility.StreamingProtocol.createEventState( + Enum.Events.EventStatus.FAILURE.status, + fspiopError.errorInformation.errorCode, + fspiopError.errorInformation.errorDescription + ) + + const metadata = Utility.StreamingProtocol.createMetadataWithCorrelatedEvent( + fxTransfer.commitRequestId, + Enum.Kafka.Topics.NOTIFICATION, + Enum.Events.Event.Action.FX_PREPARE, + state + ) + + resultMessage = Utility.StreamingProtocol.createMessage( + fxTransfer.commitRequestId, + fxTransfer.initiatingFsp, + Config.HUB_NAME, + metadata, + headers, + fspiopError, + { id: fxTransfer.commitRequestId }, + 'application/json' + ) + + binItem.result = { success: false } + + // Payer has sufficient liquidity and limit + } else { + transferStateId = Enum.Transfers.TransferInternalState.RESERVED + + if (changePositions) { + currentPosition = currentPosition.add(transferAmount) + availablePositionBasedOnLiquidityCover = availablePositionBasedOnLiquidityCover.add(transferAmount) + availablePositionBasedOnPayerLimit = availablePositionBasedOnPayerLimit.add(transferAmount) + const participantPositionChange = { + commitRequestId: fxTransfer.commitRequestId, // Need to delete this in bin processor while updating fxTransferStateChangeId + fxTransferStateChangeId: null, // Need to update this in bin processor while executing queries + value: currentPosition.toNumber(), + change: transferAmount, + reservedValue: accumulatedPositionReservedValue + } + participantPositionChanges.push(participantPositionChange) + Logger.isDebugEnabled && Logger.debug(`processFxPositionPrepareBin::participantPositionChange: ${JSON.stringify(participantPositionChange)}`) + } + + // forward same headers from the prepare message, except the content-length header + const headers = { ...binItem.message.value.content.headers } + delete headers['content-length'] + + const state = Utility.StreamingProtocol.createEventState( + Enum.Events.EventStatus.SUCCESS.status, + null, + null + ) + const metadata = Utility.StreamingProtocol.createMetadataWithCorrelatedEvent( + fxTransfer.commitRequestId, + Enum.Kafka.Topics.TRANSFER, + Enum.Events.Event.Action.FX_PREPARE, + state + ) + + resultMessage = Utility.StreamingProtocol.createMessage( + fxTransfer.commitRequestId, + fxTransfer.counterPartyFsp, + fxTransfer.initiatingFsp, + metadata, + headers, + fxTransfer, + {}, + 'application/json' + ) + + binItem.result = { success: true } + } + + resultMessages.push({ binItem, message: resultMessage }) + + if (changePositions) { + Logger.isDebugEnabled && Logger.debug(`processFxPositionPrepareBin::limitAlarm: ${currentPosition.toNumber()} > ${liquidityCover.multiply(participantLimit.thresholdAlarmPercentage)}`) + if (currentPosition.toNumber() > liquidityCover.multiply(participantLimit.thresholdAlarmPercentage).toNumber()) { + limitAlarms.push(participantLimit) + } + } + + const fxTransferStateChange = { + commitRequestId: fxTransfer.commitRequestId, + transferStateId, + reason + } + fxTransferStateChanges.push(fxTransferStateChange) + Logger.isDebugEnabled && Logger.debug(`processFxPositionPrepareBin::fxTransferStateChange: ${JSON.stringify(fxTransferStateChange)}`) + + accumulatedFxTransferStatesCopy[fxTransfer.commitRequestId] = transferStateId + Logger.isDebugEnabled && Logger.debug(`processFxPositionPrepareBin::accumulatedTransferStatesCopy:finalizedTransferState ${JSON.stringify(transferStateId)}`) + } + } + + return { + accumulatedPositionValue: changePositions ? currentPosition.toNumber() : accumulatedPositionValue, + accumulatedFxTransferStates: accumulatedFxTransferStatesCopy, // finalized transfer state after prepare processing + accumulatedPositionReservedValue, // not used but kept for consistency + accumulatedFxTransferStateChanges: fxTransferStateChanges, // fx-transfer state changes to be persisted in order + limitAlarms, // array of participant limits that have been breached + accumulatedPositionChanges: changePositions ? participantPositionChanges : [], // participant position changes to be persisted in order + notifyMessages: resultMessages // array of objects containing bin item and result message. {binItem, message} + } +} + +module.exports = { + processFxPositionPrepareBin +} diff --git a/src/domain/position/fx-timeout-reserved.js b/src/domain/position/fx-timeout-reserved.js new file mode 100644 index 000000000..e6b854158 --- /dev/null +++ b/src/domain/position/fx-timeout-reserved.js @@ -0,0 +1,194 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ + +const { Enum } = require('@mojaloop/central-services-shared') +const ErrorHandler = require('@mojaloop/central-services-error-handling') +const Config = require('../../lib/config') +const Utility = require('@mojaloop/central-services-shared').Util +const MLNumber = require('@mojaloop/ml-number') +const Logger = require('@mojaloop/central-services-logger') + +/** + * @function processPositionFxTimeoutReservedBin + * + * @async + * @description This is the domain function to process a bin of timeout-reserved messages of a single participant account. + * + * @param {array} fxTimeoutReservedBins - an array containing timeout-reserved action bins + * @param {object} options + * @param {number} accumulatedPositionValue - value of position accumulated so far from previous bin processing + * @param {number} accumulatedPositionReservedValue - value of position reserved accumulated so far, not used but kept for consistency + * @param {object} accumulatedFxTransferStates - object with commitRequest id keys and fxTransfer state id values. Used to check if fxTransfer is in correct state for processing. Clone and update states for output. + * @param {object} transferInfoList - object with transfer id keys and transfer info values. Used to pass transfer info to domain function. + * @param {boolean} changePositions - whether to change positions or not + * @returns {object} - Returns an object containing accumulatedPositionValue, accumulatedPositionReservedValue, accumulatedTransferStateChanges, accumulatedFxTransferStates, resultMessages, limitAlarms or throws an error if failed + */ +const processPositionFxTimeoutReservedBin = async ( + fxTimeoutReservedBins, + { + accumulatedPositionValue, + accumulatedPositionReservedValue, + accumulatedFxTransferStates, + fetchedReservedPositionChangesByCommitRequestIds, + changePositions = true + } +) => { + const fxTransferStateChanges = [] + const participantPositionChanges = [] + const resultMessages = [] + const accumulatedFxTransferStatesCopy = Object.assign({}, accumulatedFxTransferStates) + let runningPosition = new MLNumber(accumulatedPositionValue) + // Position action FX_RESERVED_TIMEOUT event messages are keyed with payer account id. + // We need to revert the payer's position for the source currency amount of the fxTransfer. + // We need to notify the payee of the timeout. + if (fxTimeoutReservedBins && fxTimeoutReservedBins.length > 0) { + for (const binItem of fxTimeoutReservedBins) { + Logger.isDebugEnabled && Logger.debug(`processPositionFxTimeoutReservedBin::binItem: ${JSON.stringify(binItem.message.value)}`) + const participantAccountId = binItem.message.key.toString() + const commitRequestId = binItem.message.value.content.uriParams.id + const counterPartyFsp = binItem.message.value.to + const initiatingFsp = binItem.message.value.from + + // If the transfer is not in `RESERVED_TIMEOUT`, a position fx-timeout-reserved message was incorrectly published. + // i.e Something has gone extremely wrong. + if (accumulatedFxTransferStates[commitRequestId] !== Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT) { + throw ErrorHandler.Factory.createInternalServerFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR.message) + } else { + Logger.isDebugEnabled && Logger.debug(`accumulatedFxTransferStates: ${JSON.stringify(accumulatedFxTransferStates)}`) + + const transferAmount = fetchedReservedPositionChangesByCommitRequestIds[commitRequestId][participantAccountId].change + + // Construct payee notification message + const resultMessage = _constructFxTimeoutReservedResultMessage( + binItem, + commitRequestId, + counterPartyFsp, + initiatingFsp + ) + Logger.isDebugEnabled && Logger.debug(`processPositionFxTimeoutReservedBin::resultMessage: ${JSON.stringify(resultMessage)}`) + + // Revert payer's position for the amount of the transfer + const { participantPositionChange, fxTransferStateChange, transferStateId, updatedRunningPosition } = + _handleParticipantPositionChange(runningPosition, transferAmount, commitRequestId, accumulatedPositionReservedValue) + Logger.isDebugEnabled && Logger.debug(`processPositionFxTimeoutReservedBin::participantPositionChange: ${JSON.stringify(participantPositionChange)}`) + runningPosition = updatedRunningPosition + binItem.result = { success: true } + participantPositionChanges.push(participantPositionChange) + fxTransferStateChanges.push(fxTransferStateChange) + accumulatedFxTransferStatesCopy[commitRequestId] = transferStateId + resultMessages.push({ binItem, message: resultMessage }) + } + } + } + + return { + accumulatedPositionValue: changePositions ? runningPosition.toNumber() : accumulatedPositionValue, + accumulatedFxTransferStates: accumulatedFxTransferStatesCopy, // finalized transfer state after fx fulfil processing + accumulatedPositionReservedValue, // not used but kept for consistency + accumulatedFxTransferStateChanges: fxTransferStateChanges, // fx-transfer state changes to be persisted in order + accumulatedPositionChanges: changePositions ? participantPositionChanges : [], // participant position changes to be persisted in order + notifyMessages: resultMessages // array of objects containing bin item and result message. {binItem, message} + } +} + +const _constructFxTimeoutReservedResultMessage = (binItem, commitRequestId, counterPartyFsp, initiatingFsp) => { + // IMPORTANT: This singular message is taken by the ml-api-adapter and used to + // notify the payer and payee of the timeout. + // As long as the `to` and `from` message values are the payer and payee, + // and the action is `timeout-reserved`, the ml-api-adapter will notify both. + // Create a FSPIOPError object for timeout payee notification + const fspiopError = ErrorHandler.Factory.createFSPIOPError( + ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED, + null, + null, + null, + null + ).toApiErrorObject(Config.ERROR_HANDLING) + + const state = Utility.StreamingProtocol.createEventState( + Enum.Events.EventStatus.FAILURE.status, + fspiopError.errorInformation.errorCode, + fspiopError.errorInformation.errorDescription + ) + + // Create metadata for the message, associating the payee notification + // with the position event fx-timeout-reserved action + const metadata = Utility.StreamingProtocol.createMetadataWithCorrelatedEvent( + commitRequestId, + Enum.Kafka.Topics.POSITION, + Enum.Events.Event.Action.FX_TIMEOUT_RESERVED, + state + ) + const resultMessage = Utility.StreamingProtocol.createMessage( + commitRequestId, + counterPartyFsp, + initiatingFsp, + metadata, + binItem.message.value.content.headers, // Headers don't really matter here. ml-api-adapter will ignore them and create their own. + fspiopError, + { id: commitRequestId }, + 'application/json' + ) + + return resultMessage +} + +const _handleParticipantPositionChange = (runningPosition, transferAmount, commitRequestId, accumulatedPositionReservedValue) => { + const transferStateId = Enum.Transfers.TransferInternalState.EXPIRED_RESERVED + // Revert payer's position for the amount of the transfer + const updatedRunningPosition = new MLNumber(runningPosition.subtract(transferAmount).toFixed(Config.AMOUNT.SCALE)) + Logger.isDebugEnabled && Logger.debug(`processPositionFxTimeoutReservedBin::_handleParticipantPositionChange::updatedRunningPosition: ${updatedRunningPosition.toString()}`) + Logger.isDebugEnabled && Logger.debug(`processPositionFxTimeoutReservedBin::_handleParticipantPositionChange::transferAmount: ${transferAmount}`) + // Construct participant position change object + const participantPositionChange = { + commitRequestId, // Need to delete this in bin processor while updating transferStateChangeId + transferStateChangeId: null, // Need to update this in bin processor while executing queries + value: updatedRunningPosition.toNumber(), + change: transferAmount, + reservedValue: accumulatedPositionReservedValue + } + + // Construct transfer state change object + const fxTransferStateChange = { + commitRequestId, + transferStateId, + reason: ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED.message + } + return { participantPositionChange, fxTransferStateChange, transferStateId, updatedRunningPosition } +} + +module.exports = { + processPositionFxTimeoutReservedBin +} diff --git a/src/domain/position/index.js b/src/domain/position/index.js index a1039dee8..5adb0235a 100644 --- a/src/domain/position/index.js +++ b/src/domain/position/index.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -23,6 +23,7 @@ - Name Surname * Shashikant Hirugade + * Vijay Kumar Guthi -------------- ******/ diff --git a/src/domain/position/prepare.js b/src/domain/position/prepare.js index 3f6df96c4..1aaab95bc 100644 --- a/src/domain/position/prepare.js +++ b/src/domain/position/prepare.js @@ -1,9 +1,44 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ + const { Enum } = require('@mojaloop/central-services-shared') const ErrorHandler = require('@mojaloop/central-services-error-handling') -const Config = require('../../lib/config') const Utility = require('@mojaloop/central-services-shared').Util const MLNumber = require('@mojaloop/ml-number') const Logger = require('@mojaloop/central-services-logger') +const Config = require('../../lib/config') /** * @function processPositionPrepareBin @@ -11,23 +46,27 @@ const Logger = require('@mojaloop/central-services-logger') * @async * @description This is the domain function to process a bin of position-prepare messages of a single participant account. * - * @param {array} binItems - an array of objects that contain a position prepare message and its span. {message, span} - * @param {number} accumulatedPositionValue - value of position accumulated so far from previous bin processing - * @param {number} accumulatedPositionReservedValue - value of position reserved accumulated so far, not used but kept for consistency - * @param {object} accumulatedTransferStates - object with transfer id keys and transfer state id values. Used to check if transfer is in correct state for processing. Clone and update states for output. - * @param {number} settlementParticipantPosition - position value of the participants settlement account - * @param {object} settlementModel - settlement model object for the currency - * @param {object} participantLimit - participant limit object for the currency + * @param {array} binItems - an array of objects that contain a position prepare message and its span. {message, decodedPayload, span} + * @param {object} options + * @param {number} accumulatedPositionValue - value of position accumulated so far from previous bin processing + * @param {number} accumulatedPositionReservedValue - value of position reserved accumulated so far, not used but kept for consistency + * @param {object} accumulatedTransferStates - object with transfer id keys and transfer state id values. Used to check if transfer is in correct state for processing. Clone and update states for output. + * @param {number} settlementParticipantPosition - position value of the participants settlement account + * @param {object} settlementModel - settlement model object for the currency + * @param {object} participantLimit - participant limit object for the currency + * @param {boolean} changePositions - whether to change positions or not * @returns {object} - Returns an object containing accumulatedPositionValue, accumulatedPositionReservedValue, accumulatedTransferStateChanges, accumulatedTransferStates, resultMessages, limitAlarms or throws an error if failed */ const processPositionPrepareBin = async ( binItems, - accumulatedPositionValue, - accumulatedPositionReservedValue, - accumulatedTransferStates, - settlementParticipantPosition, - settlementModel, - participantLimit + { + accumulatedPositionValue, + accumulatedPositionReservedValue, + accumulatedTransferStates, + settlementParticipantPosition, + participantLimit, + changePositions = true + } ) => { const transferStateChanges = [] const participantPositionChanges = [] @@ -36,14 +75,20 @@ const processPositionPrepareBin = async ( const accumulatedTransferStatesCopy = Object.assign({}, accumulatedTransferStates) let currentPosition = new MLNumber(accumulatedPositionValue) - const reservedPosition = new MLNumber(accumulatedPositionReservedValue) - const effectivePosition = new MLNumber(currentPosition.add(reservedPosition).toFixed(Config.AMOUNT.SCALE)) - const liquidityCover = new MLNumber(settlementParticipantPosition).multiply(-1) - const payerLimit = new MLNumber(participantLimit.value) - let availablePositionBasedOnLiquidityCover = new MLNumber(liquidityCover.subtract(effectivePosition).toFixed(Config.AMOUNT.SCALE)) - Logger.isInfoEnabled && Logger.info(`processPositionPrepareBin::availablePositionBasedOnLiquidityCover: ${availablePositionBasedOnLiquidityCover}`) - let availablePositionBasedOnPayerLimit = new MLNumber(payerLimit.subtract(effectivePosition).toFixed(Config.AMOUNT.SCALE)) - Logger.isDebugEnabled && Logger.debug(`processPositionPrepareBin::availablePositionBasedOnPayerLimit: ${availablePositionBasedOnPayerLimit}`) + let liquidityCover = 0 + let availablePositionBasedOnLiquidityCover = 0 + let availablePositionBasedOnPayerLimit = 0 + + if (changePositions) { + const reservedPosition = new MLNumber(accumulatedPositionReservedValue) + const effectivePosition = new MLNumber(currentPosition.add(reservedPosition).toFixed(Config.AMOUNT.SCALE)) + const payerLimit = new MLNumber(participantLimit.value) + liquidityCover = new MLNumber(settlementParticipantPosition).multiply(-1) + availablePositionBasedOnLiquidityCover = new MLNumber(liquidityCover.subtract(effectivePosition).toFixed(Config.AMOUNT.SCALE)) + Logger.isInfoEnabled && Logger.info(`processPositionPrepareBin::availablePositionBasedOnLiquidityCover: ${availablePositionBasedOnLiquidityCover}`) + availablePositionBasedOnPayerLimit = new MLNumber(payerLimit.subtract(effectivePosition).toFixed(Config.AMOUNT.SCALE)) + Logger.isDebugEnabled && Logger.debug(`processPositionPrepareBin::availablePositionBasedOnPayerLimit: ${availablePositionBasedOnPayerLimit}`) + } if (binItems && binItems.length > 0) { for (const binItem of binItems) { @@ -51,6 +96,9 @@ const processPositionPrepareBin = async ( let reason let resultMessage const transfer = binItem.decodedPayload + const cyrilResult = binItem.message.value.content.context?.cyrilResult + const transferAmount = cyrilResult ? cyrilResult.amount : transfer.amount.amount + Logger.isDebugEnabled && Logger.debug(`processPositionPrepareBin::transfer:processingMessage: ${JSON.stringify(transfer)}`) // Check if transfer is in correct state for processing, produce an internal error message @@ -64,7 +112,7 @@ const processPositionPrepareBin = async ( // set destination to payerfsp and source to switch const headers = { ...binItem.message.value.content.headers } headers[Enum.Http.Headers.FSPIOP.DESTINATION] = transfer.payerFsp - headers[Enum.Http.Headers.FSPIOP.SOURCE] = Enum.Http.Headers.FSPIOP.SWITCH.value + headers[Enum.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME delete headers['content-length'] const fspiopError = ErrorHandler.Factory.createFSPIOPError( @@ -87,7 +135,7 @@ const processPositionPrepareBin = async ( resultMessage = Utility.StreamingProtocol.createMessage( transfer.transferId, transfer.payerFsp, - Enum.Http.Headers.FSPIOP.SWITCH.value, + Config.HUB_NAME, metadata, headers, fspiopError, @@ -98,7 +146,7 @@ const processPositionPrepareBin = async ( binItem.result = { success: false } // Check if payer has insufficient liquidity, produce an error message and abort transfer - } else if (availablePositionBasedOnLiquidityCover.toNumber() < transfer.amount.amount) { + } else if (changePositions && availablePositionBasedOnLiquidityCover.toNumber() < transferAmount) { transferStateId = Enum.Transfers.TransferInternalState.ABORTED_REJECTED reason = ErrorHandler.Enums.FSPIOPErrorCodes.PAYER_FSP_INSUFFICIENT_LIQUIDITY.message @@ -106,7 +154,7 @@ const processPositionPrepareBin = async ( // set destination to payerfsp and source to switch const headers = { ...binItem.message.value.content.headers } headers[Enum.Http.Headers.FSPIOP.DESTINATION] = transfer.payerFsp - headers[Enum.Http.Headers.FSPIOP.SOURCE] = Enum.Http.Headers.FSPIOP.SWITCH.value + headers[Enum.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME delete headers['content-length'] const fspiopError = ErrorHandler.Factory.createFSPIOPError( @@ -129,7 +177,7 @@ const processPositionPrepareBin = async ( resultMessage = Utility.StreamingProtocol.createMessage( transfer.transferId, transfer.payerFsp, - Enum.Http.Headers.FSPIOP.SWITCH.value, + Config.HUB_NAME, metadata, headers, fspiopError, @@ -140,7 +188,7 @@ const processPositionPrepareBin = async ( binItem.result = { success: false } // Check if payer has surpassed their limit, produce an error message and abort transfer - } else if (availablePositionBasedOnPayerLimit.toNumber() < transfer.amount.amount) { + } else if (changePositions && availablePositionBasedOnPayerLimit.toNumber() < transferAmount) { transferStateId = Enum.Transfers.TransferInternalState.ABORTED_REJECTED reason = ErrorHandler.Enums.FSPIOPErrorCodes.PAYER_LIMIT_ERROR.message @@ -148,7 +196,7 @@ const processPositionPrepareBin = async ( // set destination to payerfsp and source to switch const headers = { ...binItem.message.value.content.headers } headers[Enum.Http.Headers.FSPIOP.DESTINATION] = transfer.payerFsp - headers[Enum.Http.Headers.FSPIOP.SOURCE] = Enum.Http.Headers.FSPIOP.SWITCH.value + headers[Enum.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME delete headers['content-length'] const fspiopError = ErrorHandler.Factory.createFSPIOPError( @@ -171,7 +219,7 @@ const processPositionPrepareBin = async ( resultMessage = Utility.StreamingProtocol.createMessage( transfer.transferId, transfer.payerFsp, - Enum.Http.Headers.FSPIOP.SWITCH.value, + Config.HUB_NAME, metadata, headers, fspiopError, @@ -181,12 +229,25 @@ const processPositionPrepareBin = async ( binItem.result = { success: false } - // Payer has sufficient liquidity and limit + // Payer has sufficient liquidity and limit or positions are not being changed } else { transferStateId = Enum.Transfers.TransferState.RESERVED - currentPosition = currentPosition.add(transfer.amount.amount) - availablePositionBasedOnLiquidityCover = availablePositionBasedOnLiquidityCover.add(transfer.amount.amount) - availablePositionBasedOnPayerLimit = availablePositionBasedOnPayerLimit.add(transfer.amount.amount) + if (changePositions) { + currentPosition = currentPosition.add(transferAmount) + + availablePositionBasedOnLiquidityCover = availablePositionBasedOnLiquidityCover.add(transferAmount) + availablePositionBasedOnPayerLimit = availablePositionBasedOnPayerLimit.add(transferAmount) + + const participantPositionChange = { + transferId: transfer.transferId, // Need to delete this in bin processor while updating transferStateChangeId + transferStateChangeId: null, // Need to update this in bin processor while executing queries + value: currentPosition.toNumber(), + change: transferAmount, + reservedValue: accumulatedPositionReservedValue + } + participantPositionChanges.push(participantPositionChange) + Logger.isDebugEnabled && Logger.debug(`processPositionPrepareBin::participantPositionChange: ${JSON.stringify(participantPositionChange)}`) + } // forward same headers from the prepare message, except the content-length header const headers = { ...binItem.message.value.content.headers } @@ -215,19 +276,18 @@ const processPositionPrepareBin = async ( 'application/json' ) - const participantPositionChange = { - transferId: transfer.transferId, // Need to delete this in bin processor while updating transferStateChangeId - transferStateChangeId: null, // Need to update this in bin processor while executing queries - value: currentPosition.toNumber(), - reservedValue: accumulatedPositionReservedValue - } - participantPositionChanges.push(participantPositionChange) - Logger.isDebugEnabled && Logger.debug(`processPositionPrepareBin::participantPositionChange: ${JSON.stringify(participantPositionChange)}`) binItem.result = { success: true } } resultMessages.push({ binItem, message: resultMessage }) + if (changePositions) { + Logger.isDebugEnabled && Logger.debug(`processPositionPrepareBin::limitAlarm: ${currentPosition.toNumber()} > ${liquidityCover.multiply(participantLimit.thresholdAlarmPercentage)}`) + if (currentPosition.toNumber() > liquidityCover.multiply(participantLimit.thresholdAlarmPercentage).toNumber()) { + limitAlarms.push(participantLimit) + } + } + const transferStateChange = { transferId: transfer.transferId, transferStateId, @@ -236,23 +296,18 @@ const processPositionPrepareBin = async ( transferStateChanges.push(transferStateChange) Logger.isDebugEnabled && Logger.debug(`processPositionPrepareBin::transferStateChange: ${JSON.stringify(transferStateChange)}`) - Logger.isDebugEnabled && Logger.debug(`processPositionPrepareBin::limitAlarm: ${currentPosition.toNumber()} > ${liquidityCover.multiply(participantLimit.thresholdAlarmPercentage)}`) - if (currentPosition.toNumber() > liquidityCover.multiply(participantLimit.thresholdAlarmPercentage).toNumber()) { - limitAlarms.push(participantLimit) - } - accumulatedTransferStatesCopy[transfer.transferId] = transferStateId Logger.isDebugEnabled && Logger.debug(`processPositionPrepareBin::accumulatedTransferStatesCopy:finalizedTransferState ${JSON.stringify(transferStateId)}`) } } return { - accumulatedPositionValue: currentPosition.toNumber(), + accumulatedPositionValue: changePositions ? currentPosition.toNumber() : accumulatedPositionValue, accumulatedTransferStates: accumulatedTransferStatesCopy, // finalized transfer state after prepare processing accumulatedPositionReservedValue, // not used but kept for consistency accumulatedTransferStateChanges: transferStateChanges, // transfer state changes to be persisted in order limitAlarms, // array of participant limits that have been breached - accumulatedPositionChanges: participantPositionChanges, // participant position changes to be persisted in order + accumulatedPositionChanges: changePositions ? participantPositionChanges : [], // participant position changes to be persisted in order notifyMessages: resultMessages // array of objects containing bin item and result message. {binItem, message} } } diff --git a/src/domain/position/timeout-reserved.js b/src/domain/position/timeout-reserved.js new file mode 100644 index 000000000..3b52ef9ab --- /dev/null +++ b/src/domain/position/timeout-reserved.js @@ -0,0 +1,197 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ + +const { Enum } = require('@mojaloop/central-services-shared') +const ErrorHandler = require('@mojaloop/central-services-error-handling') +const Config = require('../../lib/config') +const Utility = require('@mojaloop/central-services-shared').Util +const MLNumber = require('@mojaloop/ml-number') +const Logger = require('@mojaloop/central-services-logger') + +/** + * @function processPositionTimeoutReservedBin + * + * @async + * @description This is the domain function to process a bin of timeout-reserved messages of a single participant account. + * + * @param {array} timeoutReservedBins - an array containing timeout-reserved action bins + * @param {object} options + * @param {number} accumulatedPositionValue - value of position accumulated so far from previous bin processing + * @param {number} accumulatedPositionReservedValue - value of position reserved accumulated so far, not used but kept for consistency + * @param {object} accumulatedTransferStates - object with transfer id keys and transfer state id values. Used to check if transfer is in correct state for processing. Clone and update states for output. + * @param {object} transferInfoList - object with transfer id keys and transfer info values. Used to pass transfer info to domain function. + * @param {boolean} changePositions - whether to change positions or not + * @returns {object} - Returns an object containing accumulatedPositionValue, accumulatedPositionReservedValue, accumulatedTransferStateChanges, accumulatedTransferStates, resultMessages, limitAlarms or throws an error if failed + */ +const processPositionTimeoutReservedBin = async ( + timeoutReservedBins, + { + accumulatedPositionValue, + accumulatedPositionReservedValue, + accumulatedTransferStates, + transferInfoList, + changePositions = true + } +) => { + const transferStateChanges = [] + const participantPositionChanges = [] + const resultMessages = [] + const accumulatedTransferStatesCopy = Object.assign({}, accumulatedTransferStates) + let runningPosition = new MLNumber(accumulatedPositionValue) + // Position action RESERVED_TIMEOUT event messages are keyed either with the + // payer's account id or an fxp target currency account of an associated fxTransfer. + // We need to revert the payer's/fxp's position for the amount of the transfer. + // The payer and payee are notified from the singular NOTIFICATION event RESERVED_TIMEOUT action + if (timeoutReservedBins && timeoutReservedBins.length > 0) { + for (const binItem of timeoutReservedBins) { + Logger.isDebugEnabled && Logger.debug(`processPositionTimeoutReservedBin::binItem: ${JSON.stringify(binItem.message.value)}`) + const transferId = binItem.message.value.content.uriParams.id + const payeeFsp = binItem.message.value.to + const payerFsp = binItem.message.value.from + + // If the transfer is not in `RESERVED_TIMEOUT`, a position timeout-reserved message was incorrectly published. + // i.e Something has gone extremely wrong. + if (accumulatedTransferStates[transferId] !== Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT) { + throw ErrorHandler.Factory.createInternalServerFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR.message) + } else { + Logger.isDebugEnabled && Logger.debug(`accumulatedTransferStates: ${JSON.stringify(accumulatedTransferStates)}`) + + const transferAmount = transferInfoList[transferId].amount + + // Construct notification message + const resultMessage = _constructTimeoutReservedResultMessage( + binItem, + transferId, + payeeFsp, + payerFsp + ) + Logger.isDebugEnabled && Logger.debug(`processPositionTimeoutReservedBin::resultMessage: ${JSON.stringify(resultMessage)}`) + + // Revert payer's or fxp's position for the amount of the transfer + const { participantPositionChange, transferStateChange, transferStateId, updatedRunningPosition } = + _handleParticipantPositionChange(runningPosition, transferAmount, transferId, accumulatedPositionReservedValue) + Logger.isDebugEnabled && Logger.debug(`processPositionTimeoutReservedBin::participantPositionChange: ${JSON.stringify(participantPositionChange)}`) + runningPosition = updatedRunningPosition + binItem.result = { success: true } + participantPositionChanges.push(participantPositionChange) + transferStateChanges.push(transferStateChange) + accumulatedTransferStatesCopy[transferId] = transferStateId + resultMessages.push({ binItem, message: resultMessage }) + } + } + } + + return { + accumulatedPositionValue: changePositions ? runningPosition.toNumber() : accumulatedPositionValue, + accumulatedTransferStates: accumulatedTransferStatesCopy, // finalized transfer state after fulfil processing + accumulatedPositionReservedValue, // not used but kept for consistency + accumulatedTransferStateChanges: transferStateChanges, // transfer state changes to be persisted in order + accumulatedPositionChanges: changePositions ? participantPositionChanges : [], // participant position changes to be persisted in order + notifyMessages: resultMessages // array of objects containing bin item and result message. {binItem, message} + } +} + +const _constructTimeoutReservedResultMessage = (binItem, transferId, payeeFsp, payerFsp) => { + // IMPORTANT: This singular message is taken by the ml-api-adapter and used to + // notify the payer and payee of the timeout. + // As long as the `to` and `from` message values are the payer and payee, + // and the action is `timeout-reserved`, the ml-api-adapter will notify both. + // Create a FSPIOPError object for timeout payee notification + const fspiopError = ErrorHandler.Factory.createFSPIOPError( + ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED, + null, + null, + null, + null + ).toApiErrorObject(Config.ERROR_HANDLING) + + const state = Utility.StreamingProtocol.createEventState( + Enum.Events.EventStatus.FAILURE.status, + fspiopError.errorInformation.errorCode, + fspiopError.errorInformation.errorDescription + ) + + // Create metadata for the message, associating the payee notification + // with the position event timeout-reserved action + const metadata = Utility.StreamingProtocol.createMetadataWithCorrelatedEvent( + transferId, + Enum.Kafka.Topics.POSITION, + Enum.Events.Event.Action.TIMEOUT_RESERVED, + state + ) + const resultMessage = Utility.StreamingProtocol.createMessage( + transferId, + payeeFsp, + payerFsp, + metadata, + binItem.message.value.content.headers, // Headers don't really matter here. ml-api-adapter will ignore them and create their own. + fspiopError, + { id: transferId }, + 'application/json' + ) + + return resultMessage +} + +const _handleParticipantPositionChange = (runningPosition, transferAmount, transferId, accumulatedPositionReservedValue) => { + // NOTE: The transfer info amount is pulled from the payee records in a batch `SELECT` query. + // And will have a negative value. We add that value to the payer's(in regular transfer) or fxp's(in fx transfer) position + // to revert the position for the amount of the transfer. + const transferStateId = Enum.Transfers.TransferInternalState.EXPIRED_RESERVED + // Revert payer's or fxp's position for the amount of the transfer + const updatedRunningPosition = new MLNumber(runningPosition.add(transferAmount).toFixed(Config.AMOUNT.SCALE)) + Logger.isDebugEnabled && Logger.debug(`processPositionTimeoutReservedBin::_handleParticipantPositionChange::updatedRunningPosition: ${updatedRunningPosition.toString()}`) + Logger.isDebugEnabled && Logger.debug(`processPositionTimeoutReservedBin::_handleParticipantPositionChange::transferAmount: ${transferAmount}`) + // Construct participant position change object + const participantPositionChange = { + transferId, // Need to delete this in bin processor while updating transferStateChangeId + transferStateChangeId: null, // Need to update this in bin processor while executing queries + value: updatedRunningPosition.toNumber(), + change: transferAmount, + reservedValue: accumulatedPositionReservedValue + } + + // Construct transfer state change object + const transferStateChange = { + transferId, + transferStateId, + reason: ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED.message + } + return { participantPositionChange, transferStateChange, transferStateId, updatedRunningPosition } +} + +module.exports = { + processPositionTimeoutReservedBin +} diff --git a/src/domain/settlement/index.js b/src/domain/settlement/index.js index 9cd9896cd..795de5918 100644 --- a/src/domain/settlement/index.js +++ b/src/domain/settlement/index.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/domain/timeout/index.js b/src/domain/timeout/index.js index ec1251d69..744bb8817 100644 --- a/src/domain/timeout/index.js +++ b/src/domain/timeout/index.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -30,7 +33,9 @@ const SegmentModel = require('../../models/misc/segment') const TransferTimeoutModel = require('../../models/transfer/transferTimeout') +const FxTransferTimeoutModel = require('../../models/fxTransfer/fxTransferTimeout') const TransferStateChangeModel = require('../../models/transfer/transferStateChange') +const FxTransferStateChangeModel = require('../../models/fxTransfer/stateChange') const TransferFacade = require('../../models/transfer/facade') const getTimeoutSegment = async () => { @@ -43,24 +48,46 @@ const getTimeoutSegment = async () => { return result } +const getFxTimeoutSegment = async () => { + const params = { + segmentType: 'timeout', + enumeration: 0, + tableName: 'fxTransferStateChange' + } + const result = await SegmentModel.getByParams(params) + return result +} + const cleanupTransferTimeout = async () => { const result = await TransferTimeoutModel.cleanup() return result } +const cleanupFxTransferTimeout = async () => { + const result = await FxTransferTimeoutModel.cleanup() + return result +} + const getLatestTransferStateChange = async () => { const result = await TransferStateChangeModel.getLatest() return result } -const timeoutExpireReserved = async (segmentId, intervalMin, intervalMax) => { - const result = await TransferFacade.timeoutExpireReserved(segmentId, intervalMin, intervalMax) +const getLatestFxTransferStateChange = async () => { + const result = await FxTransferStateChangeModel.getLatest() return result } +const timeoutExpireReserved = async (segmentId, intervalMin, intervalMax, fxSegmentId, fxIntervalMin, fxIntervalMax) => { + return TransferFacade.timeoutExpireReserved(segmentId, intervalMin, intervalMax, fxSegmentId, fxIntervalMin, fxIntervalMax) +} + module.exports = { getTimeoutSegment, + getFxTimeoutSegment, cleanupTransferTimeout, + cleanupFxTransferTimeout, getLatestTransferStateChange, + getLatestFxTransferStateChange, timeoutExpireReserved } diff --git a/src/domain/transactions/index.js b/src/domain/transactions/index.js index 2dc1e0e71..8cd67140e 100644 --- a/src/domain/transactions/index.js +++ b/src/domain/transactions/index.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/domain/transfer/index.js b/src/domain/transfer/index.js index b8cfe7d53..8cf47b99f 100644 --- a/src/domain/transfer/index.js +++ b/src/domain/transfer/index.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -29,6 +32,8 @@ * @module src/domain/transfer/ */ +const ErrorHandler = require('@mojaloop/central-services-error-handling') +const Metrics = require('@mojaloop/central-services-metrics') const TransferFacade = require('../../models/transfer/facade') const TransferModel = require('../../models/transfer/transfer') const TransferStateChangeModel = require('../../models/transfer/transferStateChange') @@ -36,19 +41,17 @@ const TransferErrorModel = require('../../models/transfer/transferError') const TransferDuplicateCheckModel = require('../../models/transfer/transferDuplicateCheck') const TransferFulfilmentDuplicateCheckModel = require('../../models/transfer/transferFulfilmentDuplicateCheck') const TransferErrorDuplicateCheckModel = require('../../models/transfer/transferErrorDuplicateCheck') -const TransferObjectTransform = require('./transform') const TransferError = require('../../models/transfer/transferError') -const ErrorHandler = require('@mojaloop/central-services-error-handling') -const Metrics = require('@mojaloop/central-services-metrics') +const TransferObjectTransform = require('./transform') -const prepare = async (payload, stateReason = null, hasPassedValidation = true) => { +const prepare = async (payload, stateReason = null, hasPassedValidation = true, determiningTransferCheckResult, proxyObligation) => { const histTimerTransferServicePrepareEnd = Metrics.getHistogram( 'domain_transfer', 'prepare - Metrics for transfer domain', ['success', 'funcName'] ).startTimer() try { - const result = await TransferFacade.saveTransferPrepared(payload, stateReason, hasPassedValidation) + const result = await TransferFacade.saveTransferPrepared(payload, stateReason, hasPassedValidation, determiningTransferCheckResult, proxyObligation) histTimerTransferServicePrepareEnd({ success: true, funcName: 'prepare' }) return result } catch (err) { @@ -57,6 +60,22 @@ const prepare = async (payload, stateReason = null, hasPassedValidation = true) } } +const forwardedPrepare = async (transferId) => { + const histTimerTransferServicePrepareEnd = Metrics.getHistogram( + 'domain_transfer', + 'prepare - Metrics for transfer domain', + ['success', 'funcName'] + ).startTimer() + try { + const result = await TransferFacade.updatePrepareReservedForwarded(transferId) + histTimerTransferServicePrepareEnd({ success: true, funcName: 'forwardedPrepare' }) + return result + } catch (err) { + histTimerTransferServicePrepareEnd({ success: false, funcName: 'forwardedPrepare' }) + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} + const handlePayeeResponse = async (transferId, payload, action, fspiopError) => { const histTimerTransferServiceHandlePayeeResponseEnd = Metrics.getHistogram( 'domain_transfer', @@ -104,6 +123,7 @@ const TransferService = { prepare, handlePayeeResponse, logTransferError, + forwardedPrepare, getTransferErrorByTransferId: TransferErrorModel.getByTransferId, getTransferById: TransferModel.getById, getById: TransferFacade.getById, diff --git a/src/domain/transfer/transform.js b/src/domain/transfer/transform.js index 6e6fbd8a0..320f54d51 100644 --- a/src/domain/transfer/transform.js +++ b/src/domain/transfer/transform.js @@ -110,17 +110,30 @@ const transformExtensionList = (extensionList) => { }) } -const transformTransferToFulfil = (transfer) => { +const transformTransferToFulfil = (transfer, isFx) => { try { + if (!transfer || Object.keys(transfer).length === 0) { + throw new Error('transformTransferToFulfil: transfer is required') + } + const result = { - completedTimestamp: transfer.completedTimestamp, - transferState: transfer.transferStateEnumeration + completedTimestamp: transfer.completedTimestamp + } + if (isFx) { + result.conversionState = transfer.fxTransferStateEnumeration + } else { + result.transferState = transfer.transferStateEnumeration } + if (transfer.fulfilment !== '0') result.fulfilment = transfer.fulfilment - const extension = transformExtensionList(transfer.extensionList) - if (extension.length > 0) { - result.extensionList = { extension } + + if (transfer.extensionList) { + const extension = transformExtensionList(transfer.extensionList) + if (extension.length > 0 && !isFx) { + result.extensionList = { extension } + } } + return Util.omitNil(result) } catch (err) { throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR, `Unable to transform to fulfil response: ${err}`) diff --git a/src/handlers/admin/handler.js b/src/handlers/admin/handler.js index a18f7c39b..656ec28b7 100644 --- a/src/handlers/admin/handler.js +++ b/src/handlers/admin/handler.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -63,10 +63,8 @@ const createRecordFundsInOut = async (payload, transactionTimestamp, enums) => { try { await TransferService.reconciliationTransferPrepare(payload, transactionTimestamp, enums, trx) await TransferService.reconciliationTransferReserve(payload, transactionTimestamp, enums, trx) - await trx.commit } catch (err) { Logger.isErrorEnabled && Logger.error(err) - await trx.rollback throw ErrorHandler.Factory.reformatFSPIOPError(err) } }) diff --git a/src/handlers/api/plugin.js b/src/handlers/api/plugin.js index b6cef9a56..df97f6a88 100644 --- a/src/handlers/api/plugin.js +++ b/src/handlers/api/plugin.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . diff --git a/src/handlers/api/routes.js b/src/handlers/api/routes.js index 25e28a04c..91168ee9d 100644 --- a/src/handlers/api/routes.js +++ b/src/handlers/api/routes.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . diff --git a/src/handlers/bulk/fulfil/handler.js b/src/handlers/bulk/fulfil/handler.js index 1a94f3b45..6fa4b25b8 100644 --- a/src/handlers/bulk/fulfil/handler.js +++ b/src/handlers/bulk/fulfil/handler.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -110,7 +110,7 @@ const bulkFulfil = async (error, messages) => { Logger.isErrorEnabled && Logger.error(Util.breadcrumb(location, `callbackErrorModified--${actionLetter}2`)) const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.MODIFIED_REQUEST) const eventDetail = { functionality: Enum.Events.Event.Type.NOTIFICATION, action } - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) throw fspiopError } @@ -134,7 +134,7 @@ const bulkFulfil = async (error, messages) => { const eventDetail = { functionality: Enum.Events.Event.Type.NOTIFICATION, action } params.message.value.content.uriParams = { id: bulkTransferId } - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) throw fspiopError } try { @@ -240,7 +240,7 @@ const bulkFulfil = async (error, messages) => { const eventDetail = { functionality: Enum.Events.Event.Type.NOTIFICATION, action } params.message.value.content.uriParams = { id: bulkTransferId } - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) throw fspiopError } Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorGeneric--${actionLetter}8`)) @@ -248,7 +248,7 @@ const bulkFulfil = async (error, messages) => { const eventDetail = { functionality: Enum.Events.Event.Type.NOTIFICATION, action } params.message.value.content.uriParams = { id: bulkTransferId } - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: validationFspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: validationFspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) throw validationFspiopError } } catch (err) { @@ -293,7 +293,7 @@ const sendIndividualTransfer = async (message, messageId, kafkaTopic, headers, p value: Util.StreamingProtocol.createMessage(messageId, headers[Enum.Http.Headers.FSPIOP.DESTINATION], headers[Enum.Http.Headers.FSPIOP.SOURCE], metadata, headers, dataUri, { id: transferId }) } params = { message: msg, kafkaTopic, consumer: Consumer, producer: Producer } - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, histTimerEnd, eventDetail }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, histTimerEnd, eventDetail, hubName: Config.HUB_NAME }) histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) } diff --git a/src/handlers/bulk/get/handler.js b/src/handlers/bulk/get/handler.js index 571d55c36..a9f2a1666 100644 --- a/src/handlers/bulk/get/handler.js +++ b/src/handlers/bulk/get/handler.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -88,7 +88,7 @@ const getBulkTransfer = async (error, messages) => { if (!(await Validator.validateParticipantByName(message.value.from)).isValid) { Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `breakParticipantDoesntExist--${actionLetter}1`)) - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, histTimerEnd }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, histTimerEnd, hubName: Config.HUB_NAME }) histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) return true } @@ -97,7 +97,7 @@ const getBulkTransfer = async (error, messages) => { if (!bulkTransferLight) { Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorBulkTransferNotFound--${actionLetter}3`)) const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.BULK_TRANSFER_ID_NOT_FOUND, 'Provided Bulk Transfer ID was not found on the server.') - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) throw fspiopError } // The SD says this should be 404 response which I think will not be constent with single transfers @@ -106,7 +106,7 @@ const getBulkTransfer = async (error, messages) => { if (![participants.payeeFsp, participants.payerFsp].includes(message.value.from)) { Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorNotBulkTransferParticipant--${actionLetter}2`)) const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.CLIENT_ERROR) - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) throw fspiopError } const isPayeeRequest = participants.payeeFsp === message.value.from @@ -129,9 +129,9 @@ const getBulkTransfer = async (error, messages) => { } message.value.content.payload = payload if (fspiopError) { - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(ERROR_HANDLING), eventDetail, fromSwitch }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) } else { - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, fromSwitch }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, fromSwitch, hubName: Config.HUB_NAME }) } histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) return true diff --git a/src/handlers/bulk/index.js b/src/handlers/bulk/index.js index 6f129ceb0..1ad6340de 100644 --- a/src/handlers/bulk/index.js +++ b/src/handlers/bulk/index.js @@ -2,8 +2,8 @@ * @file This registers all handlers for the central-ledger API License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -16,7 +16,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . diff --git a/src/handlers/bulk/prepare/handler.js b/src/handlers/bulk/prepare/handler.js index 6dedb551e..967ea76eb 100644 --- a/src/handlers/bulk/prepare/handler.js +++ b/src/handlers/bulk/prepare/handler.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -145,15 +145,15 @@ const bulkPrepare = async (error, messages) => { params.message.value.content.payload = payload params.message.value.content.uriParams = { id: bulkTransferId } if (fspiopError) { - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) } else { - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, fromSwitch }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, fromSwitch, hubName: Config.HUB_NAME }) } return true } else { Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, 'inProgress')) Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `ignore--${actionLetter}3`)) - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, hubName: Config.HUB_NAME }) return true } } @@ -165,7 +165,7 @@ const bulkPrepare = async (error, messages) => { const eventDetail = { functionality: Enum.Events.Event.Type.NOTIFICATION, action } params.message.value.content.uriParams = { id: bulkTransferId } - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) throw fspiopError } @@ -183,7 +183,7 @@ const bulkPrepare = async (error, messages) => { const eventDetail = { functionality: Enum.Events.Event.Type.NOTIFICATION, action } params.message.value.content.uriParams = { id: bulkTransferId } - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) throw fspiopError } try { @@ -212,7 +212,7 @@ const bulkPrepare = async (error, messages) => { } params = { message: msg, kafkaTopic, consumer: Consumer, producer: Producer } const eventDetail = { functionality: Enum.Events.Event.Type.PREPARE, action: Enum.Events.Event.Action.BULK_PREPARE } - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, hubName: Config.HUB_NAME }) histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) } } catch (err) { // handle individual transfers streaming error @@ -221,7 +221,7 @@ const bulkPrepare = async (error, messages) => { const eventDetail = { functionality: Enum.Events.Event.Type.NOTIFICATION, action } params.message.value.content.uriParams = { id: bulkTransferId } - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) throw fspiopError } } else { // handle validation failure @@ -257,7 +257,7 @@ const bulkPrepare = async (error, messages) => { const eventDetail = { functionality: Enum.Events.Event.Type.NOTIFICATION, action } params.message.value.content.uriParams = { id: bulkTransferId } - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) throw fspiopError } // produce validation error callback notification to payer @@ -266,7 +266,7 @@ const bulkPrepare = async (error, messages) => { const eventDetail = { functionality: Enum.Events.Event.Type.NOTIFICATION, action } params.message.value.content.uriParams = { id: bulkTransferId } - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: validationFspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: validationFspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) throw validationFspiopError } } catch (err) { diff --git a/src/handlers/bulk/processing/handler.js b/src/handlers/bulk/processing/handler.js index 1c2bf42dd..7369e45de 100644 --- a/src/handlers/bulk/processing/handler.js +++ b/src/handlers/bulk/processing/handler.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -32,7 +32,6 @@ const Logger = require('@mojaloop/central-services-logger') const BulkTransferService = require('../../../domain/bulkTransfer') const Util = require('@mojaloop/central-services-shared').Util -const Kafka = require('@mojaloop/central-services-shared').Util.Kafka const Producer = require('@mojaloop/central-services-stream').Util.Producer const Consumer = require('@mojaloop/central-services-stream').Util.Consumer const Enum = require('@mojaloop/central-services-shared').Enum @@ -41,6 +40,8 @@ const Config = require('../../../lib/config') const decodePayload = require('@mojaloop/central-services-shared').Util.StreamingProtocol.decodePayload const BulkTransferModels = require('@mojaloop/object-store-lib').Models.BulkTransfer const ErrorHandler = require('@mojaloop/central-services-error-handling') +const Kafka = Util.Kafka +const HeaderValidation = Util.HeaderValidation const location = { module: 'BulkProcessingHandler', method: '', path: '' } // var object used as pointer @@ -295,7 +296,7 @@ const bulkProcessing = async (error, messages) => { }) const metadata = Util.StreamingProtocol.createMetadataWithCorrelatedEvent(params.message.value.metadata.event.id, params.message.value.metadata.type, params.message.value.metadata.action, Enum.Events.EventStatus.SUCCESS) params.message.value = Util.StreamingProtocol.createMessage(params.message.value.id, payeeBulkResponse.destination, payeeBulkResponse.headers[Enum.Http.Headers.FSPIOP.SOURCE], metadata, payeeBulkResponse.headers, payload) - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, hubName: Config.HUB_NAME }) histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) return true } else { @@ -310,7 +311,7 @@ const bulkProcessing = async (error, messages) => { Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `bulkFulfil--${actionLetter}3`)) const participants = await BulkTransferService.getParticipantsById(bulkTransferInfo.bulkTransferId) const normalizedKeys = Object.keys(headers).reduce((keys, k) => { keys[k.toLowerCase()] = k; return keys }, {}) - const payeeBulkResponseHeaders = Util.Headers.transformHeaders(headers, { httpMethod: headers[normalizedKeys[Enum.Http.Headers.FSPIOP.HTTP_METHOD]], sourceFsp: Enum.Http.Headers.FSPIOP.SWITCH.value, destinationFsp: participants.payeeFsp }) + const payeeBulkResponseHeaders = Util.Headers.transformHeaders(headers, { httpMethod: headers[normalizedKeys[Enum.Http.Headers.FSPIOP.HTTP_METHOD]], sourceFsp: Config.HUB_NAME, destinationFsp: participants.payeeFsp, hubNameRegex: HeaderValidation.getHubNameRegex(Config.HUB_NAME) }) delete payeeBulkResponseHeaders[normalizedKeys[Enum.Http.Headers.FSPIOP.SIGNATURE]] const payerBulkResponse = Object.assign({}, { messageId: message.value.id, headers: Util.clone(headers) }, getBulkTransferByIdResult.payerBulkTransfer) const payeeBulkResponse = Object.assign({}, { messageId: message.value.id, headers: payeeBulkResponseHeaders }, getBulkTransferByIdResult.payeeBulkTransfer) @@ -344,13 +345,13 @@ const bulkProcessing = async (error, messages) => { payerParams.message.value = Util.StreamingProtocol.createMessage(params.message.value.id, participants.payerFsp, payerBulkResponse.headers[normalizedKeys[Enum.Http.Headers.FSPIOP.SOURCE]], payerMetadata, payerBulkResponse.headers, payerPayload) const payeeMetadata = Util.StreamingProtocol.createMetadataWithCorrelatedEvent(params.message.value.metadata.event.id, payeeParams.message.value.metadata.type, payeeParams.message.value.metadata.action, Enum.Events.EventStatus.SUCCESS) - payeeParams.message.value = Util.StreamingProtocol.createMessage(params.message.value.id, participants.payeeFsp, Enum.Http.Headers.FSPIOP.SWITCH.value, payeeMetadata, payeeBulkResponse.headers, payeePayload) + payeeParams.message.value = Util.StreamingProtocol.createMessage(params.message.value.id, participants.payeeFsp, Config.HUB_NAME, payeeMetadata, payeeBulkResponse.headers, payeePayload) if ([Enum.Events.Event.Action.BULK_TIMEOUT_RECEIVED, Enum.Events.Event.Action.BULK_TIMEOUT_RESERVED].includes(action)) { eventDetail.action = Enum.Events.Event.Action.BULK_COMMIT } else if ([Enum.Events.Event.Action.BULK_ABORT].includes(action)) { eventDetail.action = Enum.Events.Event.Action.BULK_ABORT } - await Kafka.proceed(Config.KAFKA_CONFIG, payerParams, { consumerCommit, eventDetail }) + await Kafka.proceed(Config.KAFKA_CONFIG, payerParams, { consumerCommit, eventDetail, hubName: Config.HUB_NAME }) histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) await Kafka.proceed(Config.KAFKA_CONFIG, payeeParams, { consumerCommit, eventDetail }) histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) @@ -359,7 +360,7 @@ const bulkProcessing = async (error, messages) => { const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED, null, null, null, payload.extensionList) eventDetail.action = Enum.Events.Event.Action.BULK_ABORT params.message.value.content.uriParams.id = bulkTransferInfo.bulkTransferId - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, hubName: Config.HUB_NAME }) throw fspiopError } else { // TODO: For the following (Internal Server Error) scenario a notification is produced for each individual transfer. @@ -367,7 +368,7 @@ const bulkProcessing = async (error, messages) => { Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `invalidEventTypeOrAction--${actionLetter}4`)) const fspiopError = ErrorHandler.Factory.createInternalServerFSPIOPError(`Invalid event action:(${action}) and/or type:(${eventType})`).toApiErrorObject(Config.ERROR_HANDLING) const eventDetail = { functionality: Enum.Events.Event.Type.NOTIFICATION, action: Enum.Events.Event.Action.BULK_PROCESSING } - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError, eventDetail, fromSwitch }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError, eventDetail, fromSwitch, hubName: Config.HUB_NAME }) histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) return true } diff --git a/src/handlers/bulk/shared/validator.js b/src/handlers/bulk/shared/validator.js index a54b039ff..cc888cfc2 100644 --- a/src/handlers/bulk/shared/validator.js +++ b/src/handlers/bulk/shared/validator.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -95,7 +95,7 @@ const validateFspiopSourceAndDestination = async (payload, headers) => { // Due to the Bulk [Design Considerations](https://docs.mojaloop.io/technical/central-bulk-transfers/#_2-design-considerations), // it is possible that the Switch may send a POST Request to the Payee FSP with the Source Header containing "Switch", // and the Payee FSP thus responding with a PUT Callback and destination header containing the same value (Switch). - (headers[Enum.Http.Headers.FSPIOP.DESTINATION] === Enum.Http.Headers.FSPIOP.SWITCH.value) + (headers[Enum.Http.Headers.FSPIOP.DESTINATION] === Config.HUB_NAME) ) ) diff --git a/src/handlers/index.js b/src/handlers/index.js index ee1a6a706..9acaa19f7 100644 --- a/src/handlers/index.js +++ b/src/handlers/index.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . diff --git a/src/handlers/positions/handler.js b/src/handlers/positions/handler.js index 17feba7ea..d3c12a9ea 100644 --- a/src/handlers/positions/handler.js +++ b/src/handlers/positions/handler.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -43,6 +43,7 @@ const EventSdk = require('@mojaloop/event-sdk') const TransferService = require('../../domain/transfer') const TransferObjectTransform = require('../../domain/transfer/transform') const PositionService = require('../../domain/position') +const participantFacade = require('../../models/participant/facade') const SettlementModelCached = require('../../models/settlement/settlementModelCached') const Utility = require('@mojaloop/central-services-shared').Util const Kafka = require('@mojaloop/central-services-shared').Util.Kafka @@ -113,6 +114,7 @@ const positions = async (error, messages) => { Logger.isErrorEnabled && Logger.error(fspiopError) throw fspiopError } + const kafkaTopic = message.topic Logger.isInfoEnabled && Logger.info(Utility.breadcrumb(location, { method: 'positions' })) @@ -158,7 +160,7 @@ const positions = async (error, messages) => { const { transferState, fspiopError } = prepareMessage if (transferState.transferStateId === Enum.Transfers.TransferState.RESERVED) { Logger.isInfoEnabled && Logger.info(Utility.breadcrumb(location, `payer--${actionLetter}1`)) - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, hubName: Config.HUB_NAME }) histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId, action }) return true } else { @@ -166,17 +168,18 @@ const positions = async (error, messages) => { const responseFspiopError = fspiopError || ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR) const fspiopApiError = responseFspiopError.toApiErrorObject(Config.ERROR_HANDLING) await TransferService.logTransferError(transferId, fspiopApiError.errorInformation.errorCode, fspiopApiError.errorInformation.errorDescription) - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopApiError, eventDetail, fromSwitch }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopApiError, eventDetail, fromSwitch, hubName: Config.HUB_NAME }) throw responseFspiopError } } } else if (eventType === Enum.Events.Event.Type.POSITION && [Enum.Events.Event.Action.COMMIT, Enum.Events.Event.Action.RESERVE, Enum.Events.Event.Action.BULK_COMMIT].includes(action)) { Logger.isInfoEnabled && Logger.info(Utility.breadcrumb(location, { path: 'commit' })) const transferInfo = await TransferService.getTransferInfoToChangePosition(transferId, Enum.Accounts.TransferParticipantRoleType.PAYEE_DFSP, Enum.Accounts.LedgerEntryType.PRINCIPLE_VALUE) + const participantCurrency = await participantFacade.getByIDAndCurrency(transferInfo.participantId, transferInfo.currencyId, Enum.Accounts.LedgerAccountType.POSITION) if (transferInfo.transferStateId !== Enum.Transfers.TransferInternalState.RECEIVED_FULFIL) { Logger.isInfoEnabled && Logger.info(Utility.breadcrumb(location, `validationFailed::notReceivedFulfilState1--${actionLetter}3`)) const fspiopError = ErrorHandler.Factory.createInternalServerFSPIOPError(`Invalid State: ${transferInfo.transferStateId} - expected: ${Enum.Transfers.TransferInternalState.RECEIVED_FULFIL}`) - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) throw fspiopError } else { Logger.isInfoEnabled && Logger.info(Utility.breadcrumb(location, `payee--${actionLetter}4`)) @@ -185,18 +188,19 @@ const positions = async (error, messages) => { transferId: transferInfo.transferId, transferStateId: Enum.Transfers.TransferState.COMMITTED } - await PositionService.changeParticipantPosition(transferInfo.participantCurrencyId, isReversal, transferInfo.amount, transferStateChange) + await PositionService.changeParticipantPosition(participantCurrency.participantCurrencyId, isReversal, transferInfo.amount, transferStateChange) if (action === Enum.Events.Event.Action.RESERVE) { const transfer = await TransferService.getById(transferInfo.transferId) message.value.content.payload = TransferObjectTransform.toFulfil(transfer) } - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, hubName: Config.HUB_NAME }) histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId, action }) return true } } else if (eventType === Enum.Events.Event.Type.POSITION && [Enum.Events.Event.Action.REJECT, Enum.Events.Event.Action.ABORT, Enum.Events.Event.Action.ABORT_VALIDATION, Enum.Events.Event.Action.BULK_ABORT].includes(action)) { Logger.isInfoEnabled && Logger.info(Utility.breadcrumb(location, { path: action })) const transferInfo = await TransferService.getTransferInfoToChangePosition(transferId, Enum.Accounts.TransferParticipantRoleType.PAYER_DFSP, Enum.Accounts.LedgerEntryType.PRINCIPLE_VALUE) + const participantCurrency = await participantFacade.getByIDAndCurrency(transferInfo.participantId, transferInfo.currencyId, Enum.Accounts.LedgerAccountType.POSITION) let transferStateId if (action === Enum.Events.Event.Action.REJECT) { @@ -212,14 +216,15 @@ const positions = async (error, messages) => { transferStateId, reason: transferInfo.reason } - await PositionService.changeParticipantPosition(transferInfo.participantCurrencyId, isReversal, transferInfo.amount, transferStateChange) - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail }) + await PositionService.changeParticipantPosition(participantCurrency.participantCurrencyId, isReversal, transferInfo.amount, transferStateChange) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, hubName: Config.HUB_NAME }) histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId, action }) return true } else if (eventType === Enum.Events.Event.Type.POSITION && [Enum.Events.Event.Action.TIMEOUT_RESERVED, Enum.Events.Event.Action.BULK_TIMEOUT_RESERVED].includes(action)) { Logger.isInfoEnabled && Logger.info(Utility.breadcrumb(location, { path: 'timeout' })) span.setTags({ transactionId: transferId }) const transferInfo = await TransferService.getTransferInfoToChangePosition(transferId, Enum.Accounts.TransferParticipantRoleType.PAYER_DFSP, Enum.Accounts.LedgerEntryType.PRINCIPLE_VALUE) + const participantCurrency = await participantFacade.getByIDAndCurrency(transferInfo.participantId, transferInfo.currencyId, Enum.Accounts.LedgerAccountType.POSITION) if (transferInfo.transferStateId !== Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT) { Logger.isInfoEnabled && Logger.info(Utility.breadcrumb(location, `validationFailed::notReceivedFulfilState2--${actionLetter}6`)) throw ErrorHandler.Factory.createInternalServerFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR.message) @@ -231,16 +236,24 @@ const positions = async (error, messages) => { transferStateId: Enum.Transfers.TransferInternalState.EXPIRED_RESERVED, reason: ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED.message } - await PositionService.changeParticipantPosition(transferInfo.participantCurrencyId, isReversal, transferInfo.amount, transferStateChange) + await PositionService.changeParticipantPosition(participantCurrency.participantCurrencyId, isReversal, transferInfo.amount, transferStateChange) const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED, null, null, null, payload.extensionList) - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail }) + await Kafka.proceed( + Config.KAFKA_CONFIG, + params, + { + consumerCommit, + fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), + eventDetail, + hubName: Config.HUB_NAME + }) throw fspiopError } } else { Logger.isInfoEnabled && Logger.info(Utility.breadcrumb(location, `invalidEventTypeOrAction--${actionLetter}8`)) const fspiopError = ErrorHandler.Factory.createInternalServerFSPIOPError(`Invalid event action:(${action}) and/or type:(${eventType})`) const eventDetail = { functionality: Enum.Events.Event.Type.NOTIFICATION, action: Enum.Events.Event.Action.POSITION } - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) throw fspiopError } } catch (err) { diff --git a/src/handlers/positions/handlerBatch.js b/src/handlers/positions/handlerBatch.js index cc706b3ca..627e0bae9 100644 --- a/src/handlers/positions/handlerBatch.js +++ b/src/handlers/positions/handlerBatch.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -48,7 +48,6 @@ const { randomUUID } = require('crypto') const ErrorHandler = require('@mojaloop/central-services-error-handling') const BatchPositionModel = require('../../models/position/batch') const decodePayload = require('@mojaloop/central-services-shared').Util.StreamingProtocol.decodePayload - const consumerCommit = true /** @@ -89,7 +88,7 @@ const positions = async (error, messages) => { // Iterate through consumedMessages const bins = {} const lastPerPartition = {} - for (const message of consumedMessages) { + await Promise.all(consumedMessages.map(message => { const histTimerMsgEnd = Metrics.getHistogram( 'transfer_position', 'Process a prepare transfer message', @@ -104,9 +103,10 @@ const positions = async (error, messages) => { binId }) + const accountID = message.key.toString() + // Assign message to account-bin by accountID and child action-bin by action // (References to the messages to be stored in bins, no duplication of messages) - const accountID = message.key.toString() const action = message.value.metadata.event.action const accountBin = bins[accountID] || (bins[accountID] = {}) const actionBin = accountBin[action] || (accountBin[action] = []) @@ -126,39 +126,67 @@ const positions = async (error, messages) => { lastPerPartition[message.partition] = message } - await span.audit(message, EventSdk.AuditEventAction.start) - } + return span.audit(message, EventSdk.AuditEventAction.start) + })) - // Start DB Transaction - const trx = await BatchPositionModel.startDbTransaction() + // Start DB Transaction if there are any bins to process + const trx = !!Object.keys(bins).length && await BatchPositionModel.startDbTransaction() try { - // Call Bin Processor with the list of account-bins and trx - const result = await BinProcessor.processBins(bins, trx) - - // If Bin Processor processed bins successfully, commit Kafka offset - // Commit the offset of last message in the array - for (const message of Object.values(lastPerPartition)) { - const params = { message, kafkaTopic: message.topic, consumer: Consumer } - // We are using Kafka.proceed() to just commit the offset of the last message in the array - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit }) - } + if (trx) { + // Call Bin Processor with the list of account-bins and trx + const result = await BinProcessor.processBins(bins, trx) + + // If Bin Processor processed bins successfully, commit Kafka offset + // Commit the offset of last message in the array + for (const message of Object.values(lastPerPartition)) { + const params = { message, kafkaTopic: message.topic, consumer: Consumer } + // We are using Kafka.proceed() to just commit the offset of the last message in the array + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, hubName: Config.HUB_NAME }) + } - // Commit DB transaction - await trx.commit() + // Commit DB transaction + await trx.commit() - // Loop through results and produce notification messages and audit messages - for (const item of result.notifyMessages) { - // Produce notification message and audit message - const action = item.binItem.message?.value.metadata.event.action - const eventStatus = item?.message.metadata.event.state.status === Enum.Events.EventStatus.SUCCESS.status ? Enum.Events.EventStatus.SUCCESS : Enum.Events.EventStatus.FAILURE - await Kafka.produceGeneralMessage(Config.KAFKA_CONFIG, Producer, Enum.Events.Event.Type.NOTIFICATION, action, item.message, eventStatus, null, item.binItem.span) + // Loop through results and produce notification messages and audit messages + await Promise.all(result.notifyMessages.map(item => { + // Produce notification message and audit message + // NOTE: Not sure why we're checking the binItem for the action vs the message + // that is being created. + // Handled FX_NOTIFY differently so as not to break existing functionality. + let action + if (item?.message.metadata.event.action !== Enum.Events.Event.Action.FX_NOTIFY) { + action = item.binItem.message?.value.metadata.event.action + } else { + action = item.message.metadata.event.action + } + const eventStatus = item?.message.metadata.event.state.status === Enum.Events.EventStatus.SUCCESS.status ? Enum.Events.EventStatus.SUCCESS : Enum.Events.EventStatus.FAILURE + return Kafka.produceGeneralMessage(Config.KAFKA_CONFIG, Producer, Enum.Events.Event.Type.NOTIFICATION, action, item.message, eventStatus, null, item.binItem.span) + }).concat( + // Loop through followup messages and produce position messages for further processing of the transfer + result.followupMessages.map(item => { + // Produce position message and audit message + const action = item.binItem.message?.value.metadata.event.action + const eventStatus = item?.message.metadata.event.state.status === Enum.Events.EventStatus.SUCCESS.status ? Enum.Events.EventStatus.SUCCESS : Enum.Events.EventStatus.FAILURE + return Kafka.produceGeneralMessage( + Config.KAFKA_CONFIG, + Producer, + Enum.Events.Event.Type.POSITION, + action, + item.message, + eventStatus, + item.messageKey, + item.binItem.span, + Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP?.POSITION?.COMMIT + ) + }) + )) } histTimerEnd({ success: true }) } catch (err) { // If Bin Processor returns failure // - Rollback DB transaction - await trx.rollback() + await trx?.rollback() // - Audit Error for each message const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err) diff --git a/src/handlers/register.js b/src/handlers/register.js index ae89f1394..092685932 100644 --- a/src/handlers/register.js +++ b/src/handlers/register.js @@ -2,8 +2,8 @@ * @file This registers all handlers for the central-ledger API License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -16,7 +16,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -97,7 +97,8 @@ module.exports = { }, timeouts: { registerAllHandlers: TimeoutHandlers.registerAllHandlers, - registerTimeoutHandler: TimeoutHandlers.registerTimeoutHandler + registerTimeoutHandler: TimeoutHandlers.registerTimeoutHandler, + registerFxTimeoutHandler: TimeoutHandlers.registerFxTimeoutHandler }, admin: { registerAdminHandlers: AdminHandlers.registerAllHandlers diff --git a/src/handlers/timeouts/handler.js b/src/handlers/timeouts/handler.js index 0bd1b2e86..edc7c79ca 100644 --- a/src/handlers/timeouts/handler.js +++ b/src/handlers/timeouts/handler.js @@ -1,23 +1,23 @@ /***** -License --------------- -Copyright © 2017 Bill & Melinda Gates Foundation -The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - -Contributors --------------- -This is the official list of the Mojaloop project contributors for this file. -Names of the original copyright holders (individuals or organizations) -should be listed with a '*' in the first column. People who have -contributed from an organization can be listed under the organization -that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have - their names indented and be marked with a '-'. Email address can be added - optionally within square brackets . + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . * Gates Foundation - Name Surname @@ -35,20 +35,206 @@ that actually holds the copyright for their contributions (see the */ const CronJob = require('cron').CronJob -const Config = require('../../lib/config') -const TimeoutService = require('../../domain/timeout') const Enum = require('@mojaloop/central-services-shared').Enum -const Kafka = require('@mojaloop/central-services-shared').Util.Kafka -const Producer = require('@mojaloop/central-services-stream').Util.Producer const Utility = require('@mojaloop/central-services-shared').Util +const Producer = require('@mojaloop/central-services-stream').Util.Producer const ErrorHandler = require('@mojaloop/central-services-error-handling') const EventSdk = require('@mojaloop/event-sdk') -const resourceVersions = require('@mojaloop/central-services-shared').Util.resourceVersions -const Logger = require('@mojaloop/central-services-logger') + +const Config = require('../../lib/config') +const TimeoutService = require('../../domain/timeout') +const { logger } = require('../../shared/logger') + +const { Kafka, resourceVersions } = Utility +const { Action, Type } = Enum.Events.Event + let timeoutJob let isRegistered let running = false +/** + * Processes timedOut transfers + * + * @param {TimedOutTransfer[]} transferTimeoutList + * @returns {Promise} + */ +const _processTimedOutTransfers = async (transferTimeoutList) => { + const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED).toApiErrorObject(Config.ERROR_HANDLING) + if (!Array.isArray(transferTimeoutList)) { + transferTimeoutList = [ + { ...transferTimeoutList } + ] + } + + for (const TT of transferTimeoutList) { + const span = EventSdk.Tracer.createSpan('cl_transfer_timeout') + try { + const state = Utility.StreamingProtocol.createEventState(Enum.Events.EventStatus.FAILURE.status, fspiopError.errorInformation.errorCode, fspiopError.errorInformation.errorDescription) + const metadata = Utility.StreamingProtocol.createMetadataWithCorrelatedEvent(TT.transferId, Enum.Kafka.Topics.NOTIFICATION, Action.TIMEOUT_RECEIVED, state) + const destination = TT.externalPayerName || TT.payerFsp + const source = TT.externalPayeeName || TT.payeeFsp + const headers = Utility.Http.SwitchDefaultHeaders(destination, Enum.Http.HeaderResources.TRANSFERS, Config.HUB_NAME, resourceVersions[Enum.Http.HeaderResources.TRANSFERS].contentVersion) + const message = Utility.StreamingProtocol.createMessage(TT.transferId, destination, source, metadata, headers, fspiopError, { id: TT.transferId }, `application/vnd.interoperability.${Enum.Http.HeaderResources.TRANSFERS}+json;version=${resourceVersions[Enum.Http.HeaderResources.TRANSFERS].contentVersion}`) + + span.setTags(Utility.EventFramework.getTransferSpanTags({ payload: message.content.payload, headers }, Type.TRANSFER, Action.TIMEOUT_RECEIVED)) + await span.audit({ + state, + metadata, + headers, + message + }, EventSdk.AuditEventAction.start) + + if (TT.bulkTransferId === null) { // regular transfer + if (TT.transferStateId === Enum.Transfers.TransferInternalState.EXPIRED_PREPARED) { + message.from = Config.HUB_NAME + // event & type set above when `const metadata` is initialized to NOTIFICATION / TIMEOUT_RECEIVED + await Kafka.produceGeneralMessage( + Config.KAFKA_CONFIG, + Producer, + Enum.Kafka.Topics.NOTIFICATION, + Action.TIMEOUT_RECEIVED, + message, + state, + null, + span + ) + } else if (TT.transferStateId === Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT) { + message.metadata.event.type = Type.POSITION + message.metadata.event.action = Action.TIMEOUT_RESERVED + // Key position timeouts with payer account id + await Kafka.produceGeneralMessage( + Config.KAFKA_CONFIG, + Producer, + Enum.Kafka.Topics.POSITION, + Action.TIMEOUT_RESERVED, + message, + state, + TT.effectedParticipantCurrencyId?.toString(), + span, + Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP?.POSITION?.TIMEOUT_RESERVED + ) + } + } else { // individual transfer from a bulk + if (TT.transferStateId === Enum.Transfers.TransferInternalState.EXPIRED_PREPARED) { + message.from = Config.HUB_NAME + message.metadata.event.type = Type.BULK_PROCESSING + message.metadata.event.action = Action.BULK_TIMEOUT_RECEIVED + await Kafka.produceGeneralMessage( + Config.KAFKA_CONFIG, + Producer, + Enum.Kafka.Topics.BULK_PROCESSING, + Action.BULK_TIMEOUT_RECEIVED, + message, + state, + null, + span + ) + } else if (TT.transferStateId === Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT) { + message.metadata.event.type = Type.POSITION + message.metadata.event.action = Action.BULK_TIMEOUT_RESERVED + // Key position timeouts with payer account id + await Kafka.produceGeneralMessage( + Config.KAFKA_CONFIG, + Producer, + Enum.Kafka.Topics.POSITION, + Action.BULK_TIMEOUT_RESERVED, + message, + state, + TT.payerParticipantCurrencyId?.toString(), + span + ) + } + } + } catch (err) { + logger.error('error in _processTimedOutTransfers:', err) + const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err) + const state = new EventSdk.EventStateMetadata(EventSdk.EventStatusType.failed, fspiopError.apiErrorCode.code, fspiopError.apiErrorCode.message) + await span.error(fspiopError, state) + await span.finish(fspiopError.message, state) + throw fspiopError + } finally { + if (!span.isFinished) { + await span.finish() + } + } + } +} + +/** + * Processes timedOut fxTransfers + * + * @param {TimedOutFxTransfer[]} fxTransferTimeoutList + * @returns {Promise} + */ +const _processFxTimedOutTransfers = async (fxTransferTimeoutList) => { + const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED).toApiErrorObject(Config.ERROR_HANDLING) + if (!Array.isArray(fxTransferTimeoutList)) { + fxTransferTimeoutList = [ + { ...fxTransferTimeoutList } + ] + } + for (const fTT of fxTransferTimeoutList) { + const span = EventSdk.Tracer.createSpan('cl_fx_transfer_timeout') + try { + const state = Utility.StreamingProtocol.createEventState(Enum.Events.EventStatus.FAILURE.status, fspiopError.errorInformation.errorCode, fspiopError.errorInformation.errorDescription) + const metadata = Utility.StreamingProtocol.createMetadataWithCorrelatedEvent(fTT.commitRequestId, Enum.Kafka.Topics.NOTIFICATION, Action.TIMEOUT_RECEIVED, state) + const destination = fTT.externalInitiatingFspName || fTT.initiatingFsp + const source = fTT.externalCounterPartyFspName || fTT.counterPartyFsp + const headers = Utility.Http.SwitchDefaultHeaders(destination, Enum.Http.HeaderResources.FX_TRANSFERS, Config.HUB_NAME, resourceVersions[Enum.Http.HeaderResources.FX_TRANSFERS].contentVersion) + const message = Utility.StreamingProtocol.createMessage(fTT.commitRequestId, destination, source, metadata, headers, fspiopError, { id: fTT.commitRequestId }, `application/vnd.interoperability.${Enum.Http.HeaderResources.FX_TRANSFERS}+json;version=${resourceVersions[Enum.Http.HeaderResources.FX_TRANSFERS].contentVersion}`) + + span.setTags(Utility.EventFramework.getTransferSpanTags({ payload: message.content.payload, headers }, Type.FX_TRANSFER, Action.TIMEOUT_RECEIVED)) + await span.audit({ + state, + metadata, + headers, + message + }, EventSdk.AuditEventAction.start) + + if (fTT.transferStateId === Enum.Transfers.TransferInternalState.EXPIRED_PREPARED) { + message.from = Config.HUB_NAME + // event & type set above when `const metadata` is initialized to NOTIFICATION / TIMEOUT_RECEIVED + await Kafka.produceGeneralMessage( + Config.KAFKA_CONFIG, + Producer, + Enum.Kafka.Topics.NOTIFICATION, + Action.FX_TIMEOUT_RESERVED, + message, + state, + null, + span + ) + } else if (fTT.transferStateId === Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT) { + message.metadata.event.type = Type.POSITION + message.metadata.event.action = Action.FX_TIMEOUT_RESERVED + // Key position timeouts with payer account id + await Kafka.produceGeneralMessage( + Config.KAFKA_CONFIG, + Producer, + Enum.Kafka.Topics.POSITION, + Action.FX_TIMEOUT_RESERVED, + message, + state, + fTT.effectedParticipantCurrencyId?.toString(), + span, + Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP?.POSITION?.FX_TIMEOUT_RESERVED + ) + } + } catch (err) { + logger.error('error in _processFxTimedOutTransfers:', err) + const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err) + const state = new EventSdk.EventStateMetadata(EventSdk.EventStatusType.failed, fspiopError.apiErrorCode.code, fspiopError.apiErrorCode.message) + await span.error(fspiopError, state) + await span.finish(fspiopError.message, state) + throw fspiopError + } finally { + if (!span.isFinished) { + await span.finish() + } + } + } +} + /** * @function TransferTimeoutHandler * @@ -70,73 +256,31 @@ const timeout = async () => { const segmentId = timeoutSegment ? timeoutSegment.segmentId : 0 const cleanup = await TimeoutService.cleanupTransferTimeout() const latestTransferStateChange = await TimeoutService.getLatestTransferStateChange() + + const fxTimeoutSegment = await TimeoutService.getFxTimeoutSegment() const intervalMax = (latestTransferStateChange && parseInt(latestTransferStateChange.transferStateChangeId)) || 0 - const result = await TimeoutService.timeoutExpireReserved(segmentId, intervalMin, intervalMax) - const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED).toApiErrorObject(Config.ERROR_HANDLING) - if (!Array.isArray(result)) { - result[0] = result - } - for (let i = 0; i < result.length; i++) { - const span = EventSdk.Tracer.createSpan('cl_transfer_timeout') - try { - const state = Utility.StreamingProtocol.createEventState(Enum.Events.EventStatus.FAILURE.status, fspiopError.errorInformation.errorCode, fspiopError.errorInformation.errorDescription) - const metadata = Utility.StreamingProtocol.createMetadataWithCorrelatedEvent(result[i].transferId, Enum.Kafka.Topics.NOTIFICATION, Enum.Events.Event.Action.TIMEOUT_RECEIVED, state) - const headers = Utility.Http.SwitchDefaultHeaders(result[i].payerFsp, Enum.Http.HeaderResources.TRANSFERS, Enum.Http.Headers.FSPIOP.SWITCH.value, resourceVersions[Enum.Http.HeaderResources.TRANSFERS].contentVersion) - const message = Utility.StreamingProtocol.createMessage(result[i].transferId, result[i].payeeFsp, result[i].payerFsp, metadata, headers, fspiopError, { id: result[i].transferId }, `application/vnd.interoperability.${Enum.Http.HeaderResources.TRANSFERS}+json;version=${resourceVersions[Enum.Http.HeaderResources.TRANSFERS].contentVersion}`) - span.setTags(Utility.EventFramework.getTransferSpanTags({ payload: message.content.payload, headers }, Enum.Events.Event.Type.TRANSFER, Enum.Events.Event.Action.TIMEOUT_RECEIVED)) - await span.audit({ - state, - metadata, - headers, - message - }, EventSdk.AuditEventAction.start) - if (result[i].bulkTransferId === null) { // regular transfer - if (result[i].transferStateId === Enum.Transfers.TransferInternalState.EXPIRED_PREPARED) { - message.to = message.from - message.from = Enum.Http.Headers.FSPIOP.SWITCH.value - // event & type set above when `const metadata` is initialized to NOTIFICATION / TIMEOUT_RECEIVED - await Kafka.produceGeneralMessage(Config.KAFKA_CONFIG, Producer, Enum.Kafka.Topics.NOTIFICATION, Enum.Events.Event.Action.TIMEOUT_RECEIVED, message, state, null, span) - } else if (result[i].transferStateId === Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT) { - message.metadata.event.type = Enum.Events.Event.Type.POSITION - message.metadata.event.action = Enum.Events.Event.Action.TIMEOUT_RESERVED - // Key position timeouts with payer account id - await Kafka.produceGeneralMessage(Config.KAFKA_CONFIG, Producer, Enum.Kafka.Topics.POSITION, Enum.Events.Event.Action.TIMEOUT_RESERVED, message, state, result[i].payerParticipantCurrencyId?.toString(), span) - } - } else { // individual transfer from a bulk - if (result[i].transferStateId === Enum.Transfers.TransferInternalState.EXPIRED_PREPARED) { - message.to = message.from - message.from = Enum.Http.Headers.FSPIOP.SWITCH.value - message.metadata.event.type = Enum.Events.Event.Type.BULK_PROCESSING - message.metadata.event.action = Enum.Events.Event.Action.BULK_TIMEOUT_RECEIVED - await Kafka.produceGeneralMessage(Config.KAFKA_CONFIG, Producer, Enum.Kafka.Topics.BULK_PROCESSING, Enum.Events.Event.Action.BULK_TIMEOUT_RECEIVED, message, state, null, span) - } else if (result[i].transferStateId === Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT) { - message.metadata.event.type = Enum.Events.Event.Type.POSITION - message.metadata.event.action = Enum.Events.Event.Action.BULK_TIMEOUT_RESERVED - // Key position timeouts with payer account id - await Kafka.produceGeneralMessage(Config.KAFKA_CONFIG, Producer, Enum.Kafka.Topics.POSITION, Enum.Events.Event.Action.BULK_TIMEOUT_RESERVED, message, state, result[i].payerParticipantCurrencyId?.toString(), span) - } - } - } catch (err) { - Logger.isErrorEnabled && Logger.error(err) - const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err) - const state = new EventSdk.EventStateMetadata(EventSdk.EventStatusType.failed, fspiopError.apiErrorCode.code, fspiopError.apiErrorCode.message) - await span.error(fspiopError, state) - await span.finish(fspiopError.message, state) - throw fspiopError - } finally { - if (!span.isFinished) { - await span.finish() - } - } - } + const fxIntervalMin = fxTimeoutSegment ? fxTimeoutSegment.value : 0 + const fxSegmentId = fxTimeoutSegment ? fxTimeoutSegment.segmentId : 0 + const fxCleanup = await TimeoutService.cleanupFxTransferTimeout() + const latestFxTransferStateChange = await TimeoutService.getLatestFxTransferStateChange() + const fxIntervalMax = (latestFxTransferStateChange && parseInt(latestFxTransferStateChange.fxTransferStateChangeId)) || 0 + + const { transferTimeoutList, fxTransferTimeoutList } = await TimeoutService.timeoutExpireReserved(segmentId, intervalMin, intervalMax, fxSegmentId, fxIntervalMin, fxIntervalMax) + transferTimeoutList && await _processTimedOutTransfers(transferTimeoutList) + fxTransferTimeoutList && await _processFxTimedOutTransfers(fxTransferTimeoutList) + return { intervalMin, cleanup, intervalMax, - result + fxIntervalMin, + fxCleanup, + fxIntervalMax, + transferTimeoutList, + fxTransferTimeoutList } } catch (err) { - Logger.isErrorEnabled && Logger.error(err) + logger.error('error in timeout:', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } finally { running = false @@ -192,7 +336,7 @@ const registerTimeoutHandler = async () => { await timeoutJob.start() return true } catch (err) { - Logger.isErrorEnabled && Logger.error(err) + logger.error('error in registerTimeoutHandler:', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } @@ -212,7 +356,7 @@ const registerAllHandlers = async () => { } return true } catch (err) { - Logger.isErrorEnabled && Logger.error(err) + logger.error('error in registerAllHandlers:', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } diff --git a/src/handlers/transfers/FxFulfilService.js b/src/handlers/transfers/FxFulfilService.js new file mode 100644 index 000000000..9e7839733 --- /dev/null +++ b/src/handlers/transfers/FxFulfilService.js @@ -0,0 +1,390 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Eugen Klymniuk + -------------- + **********/ + +/* eslint-disable space-before-function-paren */ +const { Enum, Util } = require('@mojaloop/central-services-shared') +const cyril = require('../../domain/fx/cyril') +const TransferObjectTransform = require('../../domain/transfer/transform') +const fspiopErrorFactory = require('../../shared/fspiopErrorFactory') +const ErrorHandler = require('@mojaloop/central-services-error-handling') + +const { Type, Action } = Enum.Events.Event +const { SOURCE, DESTINATION } = Enum.Http.Headers.FSPIOP +const { TransferState, TransferInternalState } = Enum.Transfers + +const consumerCommit = true +const fromSwitch = true + +class FxFulfilService { + // #state = null + + constructor(deps) { + this.log = deps.log + this.Config = deps.Config + this.Comparators = deps.Comparators + this.Validator = deps.Validator + this.FxTransferModel = deps.FxTransferModel + this.Kafka = deps.Kafka + this.params = deps.params + this.cyril = deps.cyril || cyril + this.transform = deps.transform || TransferObjectTransform + } + + async getFxTransferDetails(commitRequestId, functionality) { + const fxTransfer = await this.FxTransferModel.fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer(commitRequestId) + + if (!fxTransfer) { + const fspiopError = fspiopErrorFactory.fxTransferNotFound() + const apiFSPIOPError = fspiopError.toApiErrorObject(this.Config.ERROR_HANDLING) + const eventDetail = { + functionality, + action: Action.FX_RESERVE + } + this.log.warn('fxTransfer not found', { commitRequestId, eventDetail, apiFSPIOPError }) + + await this.kafkaProceed({ + consumerCommit, + fspiopError: apiFSPIOPError, + eventDetail, + fromSwitch + }) + throw fspiopError + } + + this.log.debug('fxTransfer is found', { fxTransfer }) + return fxTransfer + } + + async validateHeaders({ transfer, headers, payload }) { + let fspiopError = null + + if (!transfer.counterPartyFspIsProxy && (headers[SOURCE]?.toLowerCase() !== transfer.counterPartyFspName.toLowerCase())) { + fspiopError = fspiopErrorFactory.fxHeaderSourceValidationError() + } + if (!transfer.initiatingFspIsProxy && (headers[DESTINATION]?.toLowerCase() !== transfer.initiatingFspName.toLowerCase())) { + fspiopError = fspiopErrorFactory.fxHeaderDestinationValidationError() + } + + if (fspiopError) { + const apiFSPIOPError = fspiopError.toApiErrorObject(this.Config.ERROR_HANDLING) + const eventDetail = { + functionality: Type.POSITION, + action: Action.FX_ABORT_VALIDATION + } + this.log.warn('headers validation error', { eventDetail, apiFSPIOPError }) + + // Lets handle the abort validation and change the fxTransfer state to reflect this + await this.FxTransferModel.fxTransfer.saveFxFulfilResponse(transfer.commitRequestId, payload, eventDetail.action, apiFSPIOPError) + + await this._handleAbortValidation(transfer, apiFSPIOPError, eventDetail) + throw fspiopError + } + } + + async _handleAbortValidation(fxTransfer, apiFSPIOPError, eventDetail) { + const cyrilResult = await this.cyril.processFxAbortMessage(fxTransfer.commitRequestId) + + this.params.message.value.content.context = { + ...this.params.message.value.content.context, + cyrilResult + } + if (cyrilResult.positionChanges.length > 0) { + const participantCurrencyId = cyrilResult.positionChanges[0].participantCurrencyId + await this.kafkaProceed({ + consumerCommit, + fspiopError: apiFSPIOPError, + eventDetail, + fromSwitch, + toDestination: fxTransfer.externalInitiatingFspName || fxTransfer.initiatingFspName, + messageKey: participantCurrencyId.toString(), + topicNameOverride: this.Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP?.POSITION?.FX_ABORT + }) + } else { + const fspiopError = ErrorHandler.Factory.createInternalServerFSPIOPError('Invalid cyril result') + throw fspiopError + } + } + + async getDuplicateCheckResult({ commitRequestId, payload, action }) { + const { duplicateCheck } = this.FxTransferModel + const isFxTransferError = action === Action.FX_ABORT + + const getDuplicateFn = isFxTransferError + ? duplicateCheck.getFxTransferErrorDuplicateCheck + : duplicateCheck.getFxTransferFulfilmentDuplicateCheck + const saveHashFn = isFxTransferError + ? duplicateCheck.saveFxTransferErrorDuplicateCheck + : duplicateCheck.saveFxTransferFulfilmentDuplicateCheck + + return this.Comparators.duplicateCheckComparator( + commitRequestId, + payload, + getDuplicateFn, + saveHashFn + ) + } + + async checkDuplication({ dupCheckResult, transfer, functionality, action, type }) { + const transferStateEnum = transfer?.transferStateEnumeration + this.log.info('fxTransfer checkDuplication...', { dupCheckResult, action, transferStateEnum }) + + if (!dupCheckResult.hasDuplicateId) { + this.log.debug('No duplication found') + return false + } + + if (!dupCheckResult.hasDuplicateHash) { + // ERROR: We've seen fxTransfer of this ID before, but it's message hash doesn't match the previous message hash. + const fspiopError = fspiopErrorFactory.noFxDuplicateHash() + const apiFSPIOPError = fspiopError.toApiErrorObject(this.Config.ERROR_HANDLING) + const eventDetail = { + functionality, + action: action === Action.FX_ABORT ? Action.FX_ABORT_DUPLICATE : Action.FX_FULFIL_DUPLICATE + } + this.log.warn('callbackErrorModified - no hasDuplicateHash', { eventDetail, apiFSPIOPError }) + + await this.kafkaProceed({ + consumerCommit, + fspiopError: apiFSPIOPError, + eventDetail, + fromSwitch + }) + throw fspiopError + } + + // This is a duplicate message for a fxTransfer that is already in a finalized state + // respond as if we received a GET /fxTransfers/{ID} from the client + if ([TransferState.COMMITTED, TransferState.ABORTED].includes(transferStateEnum)) { + this.params.message.value.content.payload = this.transform.toFulfil(transfer) + const eventDetail = { + functionality, + action: action === Action.FX_ABORT ? Action.FX_ABORT_DUPLICATE : Action.FX_FULFIL_DUPLICATE + } + this.log.info('eventDetail:', { eventDetail }) + await this.kafkaProceed({ consumerCommit, eventDetail, fromSwitch }) + return true + } + + if ([TransferState.RECEIVED, TransferState.RESERVED].includes(transferStateEnum)) { + this.log.info('state: RECEIVED or RESERVED') + await this.kafkaProceed({ consumerCommit }) + // this code doesn't publish any message to kafka, coz we don't provide eventDetail: + // https://github.com/mojaloop/central-services-shared/blob/main/src/util/kafka/index.js#L315 + return true + } + + // Error scenario - fxTransfer.transferStateEnumeration is in some invalid state + const fspiopError = fspiopErrorFactory.invalidFxTransferState({ transferStateEnum, action, type }) + const apiFSPIOPError = fspiopError.toApiErrorObject(this.Config.ERROR_HANDLING) + const eventDetail = { + functionality, + action: Action.FX_RESERVE + } + this.log.warn('callbackErrorInvalidTransferStateEnum', { eventDetail, apiFSPIOPError }) + await this.kafkaProceed({ + consumerCommit, + fspiopError: apiFSPIOPError, + eventDetail, + fromSwitch + }) + + return true + } + + async validateEventType(type, functionality) { + if (type !== Type.FULFIL) { + const fspiopError = fspiopErrorFactory.invalidEventType(type) + const apiFSPIOPError = fspiopError.toApiErrorObject(this.Config.ERROR_HANDLING) + const eventDetail = { + functionality, + action: Action.FX_RESERVE + } + this.log.warn('callbackErrorInvalidEventType', { type, eventDetail, apiFSPIOPError }) + + await this.kafkaProceed({ + consumerCommit, + fspiopError: apiFSPIOPError, + eventDetail, + fromSwitch + }) + throw fspiopError + } + this.log.debug('validateEventType is passed', { type, functionality }) + } + + async validateFulfilment(fxTransfer, payload) { + const isValid = this.validateFulfilCondition(payload.fulfilment, fxTransfer.ilpCondition) + + if (!isValid) { + const fspiopError = fspiopErrorFactory.fxInvalidFulfilment() + const apiFSPIOPError = fspiopError.toApiErrorObject(this.Config.ERROR_HANDLING) + const eventDetail = { + functionality: Type.POSITION, + action: Action.FX_ABORT_VALIDATION + } + this.log.warn('callbackErrorInvalidFulfilment', { eventDetail, apiFSPIOPError, fxTransfer, payload }) + await this.FxTransferModel.fxTransfer.saveFxFulfilResponse(fxTransfer.commitRequestId, payload, eventDetail.action, apiFSPIOPError) + + await this._handleAbortValidation(fxTransfer, apiFSPIOPError, eventDetail) + throw fspiopError + } + + this.log.info('fulfilmentCheck passed successfully', { isValid }) + return isValid + } + + async validateTransferState(transfer, functionality) { + if (transfer.transferState !== TransferInternalState.RESERVED && + transfer.transferState !== TransferInternalState.RESERVED_FORWARDED) { + const fspiopError = fspiopErrorFactory.fxTransferNonReservedState() + const apiFSPIOPError = fspiopError.toApiErrorObject(this.Config.ERROR_HANDLING) + const eventDetail = { + functionality, + action: Action.FX_RESERVE + } + this.log.warn('callbackErrorNonReservedState', { eventDetail, apiFSPIOPError, transfer }) + + await this.kafkaProceed({ + consumerCommit, + fspiopError: apiFSPIOPError, + eventDetail, + fromSwitch + }) + throw fspiopError + } + this.log.debug('validateTransferState is passed') + return true + } + + async validateExpirationDate(transfer, functionality) { + if (transfer.expirationDate <= new Date(Util.Time.getUTCString(new Date()))) { + const fspiopError = fspiopErrorFactory.fxTransferExpired() + const apiFSPIOPError = fspiopError.toApiErrorObject(this.Config.ERROR_HANDLING) + const eventDetail = { + functionality, + action: Action.FX_RESERVE + } + this.log.warn('callbackErrorTransferExpired', { eventDetail, apiFSPIOPError }) + + await this.kafkaProceed({ + consumerCommit, + fspiopError: apiFSPIOPError, + eventDetail, + fromSwitch + }) + throw fspiopError + } + } + + async processFxAbort({ transfer, payload, action }) { + const fspiopError = fspiopErrorFactory.fromErrorInformation(payload.errorInformation) + const apiFSPIOPError = fspiopError.toApiErrorObject(this.Config.ERROR_HANDLING) + const eventDetail = { + functionality: Type.POSITION, + action // FX_ABORT + } + this.log.warn('FX_ABORT case', { eventDetail, apiFSPIOPError }) + + await this.FxTransferModel.fxTransfer.saveFxFulfilResponse(transfer.commitRequestId, payload, action, apiFSPIOPError) + const cyrilResult = await this.cyril.processFxAbortMessage(transfer.commitRequestId) + + this.params.message.value.content.context = { + ...this.params.message.value.content.context, + cyrilResult + } + if (cyrilResult.positionChanges.length > 0) { + const participantCurrencyId = cyrilResult.positionChanges[0].participantCurrencyId + await this.kafkaProceed({ + consumerCommit, + eventDetail, + messageKey: participantCurrencyId.toString(), + topicNameOverride: this.Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP?.POSITION?.FX_ABORT + }) + } else { + const fspiopError = ErrorHandler.Factory.createInternalServerFSPIOPError('Invalid cyril result') + throw fspiopError + } + return true + } + + async processFxFulfil({ transfer, payload, action }) { + await this.FxTransferModel.fxTransfer.saveFxFulfilResponse(transfer.commitRequestId, payload, action) + await this.cyril.processFxFulfilMessage(transfer.commitRequestId) + const eventDetail = { + functionality: Type.POSITION, + action + } + this.log.info('handle fxFulfilResponse', { eventDetail }) + + await this.kafkaProceed({ + consumerCommit, + eventDetail, + messageKey: transfer.counterPartyFspSourceParticipantCurrencyId.toString(), + topicNameOverride: this.Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP?.POSITION?.COMMIT + }) + return true + } + + async kafkaProceed(kafkaOpts) { + return this.Kafka.proceed(this.Config.KAFKA_CONFIG, this.params, { + ...kafkaOpts, + hubName: this.Config.HUB_NAME + }) + } + + validateFulfilCondition(fulfilment, condition) { + try { + const isValid = fulfilment && this.Validator.validateFulfilCondition(fulfilment, condition) + this.log.debug('validateFulfilCondition result:', { isValid, fulfilment, condition }) + return isValid + } catch (err) { + this.log.warn(`validateFulfilCondition error: ${err?.message}`, { fulfilment, condition }) + return false + } + } + + static decodeKafkaMessage(message) { + if (!message?.value) { + throw TypeError('Invalid message format!') + } + const payload = Util.StreamingProtocol.decodePayload(message.value.content.payload) + const { headers } = message.value.content + const { type, action } = message.value.metadata.event + const commitRequestId = message.value.content.uriParams.id + + return Object.freeze({ + payload, + headers, + type, + action, + commitRequestId, + kafkaTopic: message.topic + }) + } +} + +module.exports = FxFulfilService diff --git a/src/handlers/transfers/createRemittanceEntity.js b/src/handlers/transfers/createRemittanceEntity.js new file mode 100644 index 000000000..609c7f6a8 --- /dev/null +++ b/src/handlers/transfers/createRemittanceEntity.js @@ -0,0 +1,141 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ + +const fxTransferModel = require('../../models/fxTransfer') +const TransferService = require('../../domain/transfer') +const cyril = require('../../domain/fx/cyril') +const { logger } = require('../../shared/logger') + +/** @import { ProxyObligation } from './prepare.js' */ + +// abstraction on transfer and fxTransfer +const createRemittanceEntity = (isFx) => { + return { + isFx, + + async getDuplicate (id) { + return isFx + ? fxTransferModel.duplicateCheck.getFxTransferDuplicateCheck(id) + : TransferService.getTransferDuplicateCheck(id) + }, + async saveDuplicateHash (id, hash) { + return isFx + ? fxTransferModel.duplicateCheck.saveFxTransferDuplicateCheck(id, hash) + : TransferService.saveTransferDuplicateCheck(id, hash) + }, + + /** + * Saves prepare transfer/fxTransfer details to DB. + * + * @param {Object} payload - Message payload. + * @param {string | null} reason - Validation failure reasons. + * @param {Boolean} isValid - isValid. + * @param {DeterminingTransferCheckResult} determiningTransferCheckResult - The determining transfer check result. + * @param {ProxyObligation} proxyObligation - The proxy obligation + * @returns {Promise} + */ + async savePreparedRequest ( + payload, + reason, + isValid, + determiningTransferCheckResult, + proxyObligation + ) { + return isFx + ? fxTransferModel.fxTransfer.savePreparedRequest( + payload, + reason, + isValid, + determiningTransferCheckResult, + proxyObligation + ) + : TransferService.prepare( + payload, + reason, + isValid, + determiningTransferCheckResult, + proxyObligation + ) + }, + + async getByIdLight (id) { + return isFx + ? fxTransferModel.fxTransfer.getByIdLight(id) + : TransferService.getByIdLight(id) + }, + + /** + * @typedef {Object} DeterminingTransferCheckResult + * + * @property {boolean} determiningTransferExists - Indicates if the determining transfer exists. + * @property {Array<{participantName, currencyId}>} participantCurrencyValidationList - List of validations for participant currencies. + * @property {Object} [transferRecord] - Determining transfer for the FX transfer (optional). + * @property {Array} [watchListRecords] - Records from fxWatchList-table for the transfer (optional). + */ + /** + * Checks if a determining transfer exists based on the payload and proxy obligation. + * The function determines which method to use based on whether it is an FX transfer. + * + * @param {Object} payload - The payload data required for the transfer check. + * @param {ProxyObligation} proxyObligation - The proxy obligation details. + * @returns {DeterminingTransferCheckResult} determiningTransferCheckResult + */ + async checkIfDeterminingTransferExists (payload, proxyObligation) { + const result = isFx + ? await cyril.checkIfDeterminingTransferExistsForFxTransferMessage(payload, proxyObligation) + : await cyril.checkIfDeterminingTransferExistsForTransferMessage(payload, proxyObligation) + + logger.debug('cyril determiningTransferCheckResult:', { result }) + return result + }, + + async getPositionParticipant (payload, determiningTransferCheckResult, proxyObligation) { + const result = isFx + ? await cyril.getParticipantAndCurrencyForFxTransferMessage(payload, determiningTransferCheckResult) + : await cyril.getParticipantAndCurrencyForTransferMessage(payload, determiningTransferCheckResult, proxyObligation) + + logger.debug('cyril getPositionParticipant result:', { result }) + return result + }, + + async logTransferError (id, errorCode, errorDescription) { + return isFx + ? fxTransferModel.stateChange.logTransferError(id, errorCode, errorDescription) + : TransferService.logTransferError(id, errorCode, errorDescription) + } + } +} + +module.exports = createRemittanceEntity diff --git a/src/handlers/transfers/dto.js b/src/handlers/transfers/dto.js new file mode 100644 index 000000000..1f1edcd41 --- /dev/null +++ b/src/handlers/transfers/dto.js @@ -0,0 +1,53 @@ +const { Util, Enum } = require('@mojaloop/central-services-shared') +const { PROM_METRICS } = require('../../shared/constants') + +const { decodePayload } = Util.StreamingProtocol +const { Action, Type } = Enum.Events.Event + +const prepareInputDto = (error, messages) => { + if (error || !messages) { + return { + error, + metric: PROM_METRICS.transferPrepare() + } + } + + const message = Array.isArray(messages) ? messages[0] : messages + if (!message) throw new Error('No input kafka message') + + const payload = decodePayload(message.value.content.payload) + const isFx = !payload.transferId + + const { action } = message.value.metadata.event + const isForwarded = [Action.FORWARDED, Action.FX_FORWARDED].includes(action) + const isPrepare = [Action.PREPARE, Action.FX_PREPARE, Action.FORWARDED, Action.FX_FORWARDED].includes(action) + + const actionLetter = isPrepare + ? Enum.Events.ActionLetter.prepare + : (action === Action.BULK_PREPARE + ? Enum.Events.ActionLetter.bulkPrepare + : Enum.Events.ActionLetter.unknown) + + const functionality = isPrepare + ? Type.NOTIFICATION + : (action === Action.BULK_PREPARE + ? Type.BULK_PROCESSING + : Enum.Events.ActionLetter.unknown) + + return { + message, + payload, + action, + functionality, + isFx, + isForwarded, + ID: payload.transferId || payload.commitRequestId || message.value.id, + headers: message.value.content.headers, + metric: PROM_METRICS.transferPrepare(isFx, isForwarded), + actionLetter // just for logging + } +} + +module.exports = { + prepareInputDto +} diff --git a/src/handlers/transfers/handler.js b/src/handlers/transfers/handler.js index c0e85c388..1eff070ea 100644 --- a/src/handlers/transfers/handler.js +++ b/src/handlers/transfers/handler.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -40,214 +40,85 @@ const Logger = require('@mojaloop/central-services-logger') const EventSdk = require('@mojaloop/event-sdk') +const ErrorHandler = require('@mojaloop/central-services-error-handling') +const Metrics = require('@mojaloop/central-services-metrics') +const { Enum, Util } = require('@mojaloop/central-services-shared') +const { Consumer, Producer } = require('@mojaloop/central-services-stream').Util + +const { logger } = require('../../shared/logger') +const { ERROR_MESSAGES } = require('../../shared/constants') +const Config = require('../../lib/config') const TransferService = require('../../domain/transfer') -const Util = require('@mojaloop/central-services-shared').Util -const Kafka = require('@mojaloop/central-services-shared').Util.Kafka -const Producer = require('@mojaloop/central-services-stream').Util.Producer -const Consumer = require('@mojaloop/central-services-stream').Util.Consumer +const FxService = require('../../domain/fx') +const FxTransferModel = require('../../models/fxTransfer') +const TransferObjectTransform = require('../../domain/transfer/transform') +const Participant = require('../../domain/participant') const Validator = require('./validator') -const Enum = require('@mojaloop/central-services-shared').Enum +const FxFulfilService = require('./FxFulfilService') + +// particular handlers +const { prepare } = require('./prepare') + +const { Kafka, Comparators } = Util const TransferState = Enum.Transfers.TransferState const TransferEventType = Enum.Events.Event.Type const TransferEventAction = Enum.Events.Event.Action -const TransferObjectTransform = require('../../domain/transfer/transform') -const Metrics = require('@mojaloop/central-services-metrics') -const Config = require('../../lib/config') const decodePayload = Util.StreamingProtocol.decodePayload -const Comparators = require('@mojaloop/central-services-shared').Util.Comparators -const ErrorHandler = require('@mojaloop/central-services-error-handling') -const Participant = require('../../domain/participant') const consumerCommit = true const fromSwitch = true -/** - * @function TransferPrepareHandler - * - * @async - * @description This is the consumer callback function that gets registered to a topic. This then gets a list of messages, - * we will only ever use the first message in non batch processing. We then break down the message into its payload and - * begin validating the payload. Once the payload is validated successfully it will be written to the database to - * the relevant tables. If the validation fails it is still written to the database for auditing purposes but with an - * INVALID status. For any duplicate requests we will send appropriate callback based on the transfer state and the hash validation - * - * Validator.validatePrepare called to validate the payload of the message - * TransferService.getById called to get the details of the existing transfer - * TransferObjectTransform.toTransfer called to transform the transfer object - * TransferService.prepare called and creates new entries in transfer tables for successful prepare transfer - * TransferService.logTransferError called to log the invalid request - * - * @param {error} error - error thrown if something fails within Kafka - * @param {array} messages - a list of messages to consume for the relevant topic - * - * @returns {object} - Returns a boolean: true if successful, or throws and error if failed - */ -const prepare = async (error, messages) => { - const location = { module: 'PrepareHandler', method: '', path: '' } - const histTimerEnd = Metrics.getHistogram( - 'transfer_prepare', - 'Consume a prepare transfer message from the kafka topic and process it accordingly', - ['success', 'fspId'] - ).startTimer() +const fulfil = async (error, messages) => { if (error) { - histTimerEnd({ success: false, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) throw ErrorHandler.Factory.reformatFSPIOPError(error) } - let message = {} + let message if (Array.isArray(messages)) { message = messages[0] } else { message = messages } - const parentSpanService = 'cl_transfer_prepare' const contextFromMessage = EventSdk.Tracer.extractContextFromMessage(message.value) - const span = EventSdk.Tracer.createChildSpanFromContext(parentSpanService, contextFromMessage) + const span = EventSdk.Tracer.createChildSpanFromContext('cl_transfer_fulfil', contextFromMessage) try { - const payload = decodePayload(message.value.content.payload) - const headers = message.value.content.headers - const action = message.value.metadata.event.action - const transferId = payload.transferId - span.setTags({ transactionId: transferId }) await span.audit(message, EventSdk.AuditEventAction.start) - const kafkaTopic = message.topic - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, { method: 'prepare' })) - - const actionLetter = action === TransferEventAction.PREPARE - ? Enum.Events.ActionLetter.prepare - : (action === TransferEventAction.BULK_PREPARE - ? Enum.Events.ActionLetter.bulkPrepare - : Enum.Events.ActionLetter.unknown) - - let functionality = action === TransferEventAction.PREPARE - ? TransferEventType.NOTIFICATION - : (action === TransferEventAction.BULK_PREPARE - ? TransferEventType.BULK_PROCESSING - : Enum.Events.ActionLetter.unknown) - const params = { message, kafkaTopic, decodedPayload: payload, span, consumer: Consumer, producer: Producer } - - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, { path: 'dupCheck' })) - const histTimerDuplicateCheckEnd = Metrics.getHistogram( - 'handler_transfers', - 'prepare_duplicateCheckComparator - Metrics for transfer handler', - ['success', 'funcName'] - ).startTimer() - - const { hasDuplicateId, hasDuplicateHash } = await Comparators.duplicateCheckComparator(transferId, payload, TransferService.getTransferDuplicateCheck, TransferService.saveTransferDuplicateCheck) - histTimerDuplicateCheckEnd({ success: true, funcName: 'prepare_duplicateCheckComparator' }) - if (hasDuplicateId && hasDuplicateHash) { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, 'handleResend')) - const transfer = await TransferService.getByIdLight(transferId) - const transferStateEnum = transfer && transfer.transferStateEnumeration - const eventDetail = { functionality, action: TransferEventAction.PREPARE_DUPLICATE } - if ([TransferState.COMMITTED, TransferState.ABORTED].includes(transferStateEnum)) { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, 'finalized')) - if (action === TransferEventAction.PREPARE) { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callback--${actionLetter}1`)) - message.value.content.payload = TransferObjectTransform.toFulfil(transfer) - message.value.content.uriParams = { id: transferId } - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, fromSwitch }) - histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) - return true - } else if (action === TransferEventAction.BULK_PREPARE) { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `validationError1--${actionLetter}2`)) - const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.MODIFIED_REQUEST, 'Individual transfer prepare duplicate') - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) - throw fspiopError - } - } else { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, 'inProgress')) - if (action === TransferEventAction.BULK_PREPARE) { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `validationError2--${actionLetter}4`)) - const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.MODIFIED_REQUEST, 'Individual transfer prepare duplicate') - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) - throw fspiopError - } else { // action === TransferEventAction.PREPARE - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `ignore--${actionLetter}3`)) - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit }) - histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) - return true - } - } - } else if (hasDuplicateId && !hasDuplicateHash) { - Logger.isErrorEnabled && Logger.error(Util.breadcrumb(location, `callbackErrorModified1--${actionLetter}5`)) - const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.MODIFIED_REQUEST) - const eventDetail = { functionality, action } - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) - throw fspiopError - } else { // !hasDuplicateId - const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers) - if (validationPassed) { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, { path: 'validationPassed' })) - try { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, 'saveTransfer')) - await TransferService.prepare(payload) - } catch (err) { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorInternal1--${actionLetter}6`)) - Logger.isErrorEnabled && Logger.error(`${Util.breadcrumb(location)}::${err.message}`) - const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err, ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR) - const eventDetail = { functionality, action: TransferEventAction.PREPARE } - /** - * TODO: BULK-Handle at BulkProcessingHandler (not in scope of #967) - * HOWTO: Stop execution at the `TransferService.prepare`, stop mysql, - * continue execution to catch block, start mysql - */ - Logger.isErrorEnabled && Logger.error(`${Util.breadcrumb(location)}::${err.message}`) - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) - throw fspiopError - } - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `positionTopic1--${actionLetter}7`)) - functionality = TransferEventType.POSITION - const eventDetail = { functionality, action } - // Key position prepare message with payer account id - const payerAccount = await Participant.getAccountByNameAndCurrency(payload.payerFsp, payload.amount.currency, Enum.Accounts.LedgerAccountType.POSITION) - // We route bulk-prepare and prepare messages differently based on the topic configured for it. - // Note: The batch handler does not currently support bulk-prepare messages, only prepare messages are supported. - // Therefore, it is necessary to check the action to determine the topic to route to. - const topicNameOverride = - action === TransferEventAction.BULK_PREPARE - ? Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP?.POSITION?.BULK_PREPARE - : Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP?.POSITION?.PREPARE - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, messageKey: payerAccount.participantCurrencyId.toString(), topicNameOverride }) - histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) - return true - } else { - Logger.isErrorEnabled && Logger.error(Util.breadcrumb(location, { path: 'validationFailed' })) - try { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, 'saveInvalidRequest')) - await TransferService.prepare(payload, reasons.toString(), false) - } catch (err) { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorInternal2--${actionLetter}8`)) - Logger.isErrorEnabled && Logger.error(`${Util.breadcrumb(location)}::${err.message}`) - const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err, ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR) - const eventDetail = { functionality, action: TransferEventAction.PREPARE } - /** - * TODO: BULK-Handle at BulkProcessingHandler (not in scope of #967) - * HOWTO: For regular transfers this branch may be triggered by sending - * a transfer in a currency not supported by either dfsp and also stopping - * mysql at `TransferService.prepare` and starting it after entring catch. - * Not sure if it will work for bulk, because of the BulkPrepareHandler. - */ - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) - throw fspiopError - } - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorGeneric--${actionLetter}9`)) - const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.VALIDATION_ERROR, reasons.toString()) - await TransferService.logTransferError(transferId, ErrorHandler.Enums.FSPIOPErrorCodes.VALIDATION_ERROR.code, reasons.toString()) - const eventDetail = { functionality, action } - /** - * TODO: BULK-Handle at BulkProcessingHandler (not in scope of #967) - * HOWTO: For regular transfers this branch may be triggered by sending - * a tansfer in a currency not supported by either dfsp. Not sure if it - * will be triggered for bulk, because of the BulkPrepareHandler. - */ - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) - throw fspiopError + const action = message.value.metadata.event.action + + const functionality = (() => { + switch (action) { + case TransferEventAction.COMMIT: + case TransferEventAction.FX_COMMIT: + case TransferEventAction.RESERVE: + case TransferEventAction.FX_RESERVE: + case TransferEventAction.REJECT: + case TransferEventAction.FX_REJECT: + case TransferEventAction.ABORT: + case TransferEventAction.FX_ABORT: + return TransferEventType.NOTIFICATION + case TransferEventAction.BULK_COMMIT: + case TransferEventAction.BULK_ABORT: + return TransferEventType.BULK_PROCESSING + default: return Enum.Events.ActionLetter.unknown } + })() + logger.info('FulfilHandler start:', { action, functionality }) + + const fxActions = [ + TransferEventAction.FX_COMMIT, + TransferEventAction.FX_RESERVE, + TransferEventAction.FX_REJECT, + TransferEventAction.FX_ABORT, + TransferEventAction.FX_FORWARDED + ] + + if (fxActions.includes(action)) { + return await processFxFulfilMessage(message, functionality, span) + } else { + return await processFulfilMessage(message, functionality, span) } } catch (err) { - histTimerEnd({ success: false, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) + logger.error(`error in FulfilHandler: ${err?.message}`, { err }) const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err) - Logger.isErrorEnabled && Logger.error(`${Util.breadcrumb(location)}::${err.message}--P0`) const state = new EventSdk.EventStateMetadata(EventSdk.EventStatusType.failed, fspiopError.apiErrorCode.code, fspiopError.apiErrorCode.message) await span.error(fspiopError, state) await span.finish(fspiopError.message, state) @@ -259,107 +130,82 @@ const prepare = async (error, messages) => { } } -const fulfil = async (error, messages) => { +const processFulfilMessage = async (message, functionality, span) => { const location = { module: 'FulfilHandler', method: '', path: '' } const histTimerEnd = Metrics.getHistogram( 'transfer_fulfil', 'Consume a fulfil transfer message from the kafka topic and process it accordingly', ['success', 'fspId'] ).startTimer() - if (error) { - throw ErrorHandler.Factory.reformatFSPIOPError(error) - } - let message = {} - if (Array.isArray(messages)) { - message = messages[0] - } else { - message = messages - } - const contextFromMessage = EventSdk.Tracer.extractContextFromMessage(message.value) - const span = EventSdk.Tracer.createChildSpanFromContext('cl_transfer_fulfil', contextFromMessage) - try { - await span.audit(message, EventSdk.AuditEventAction.start) - const payload = decodePayload(message.value.content.payload) - const headers = message.value.content.headers - const type = message.value.metadata.event.type - const action = message.value.metadata.event.action - const transferId = message.value.content.uriParams.id - const kafkaTopic = message.topic - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, { method: `fulfil:${action}` })) - - const actionLetter = (() => { - switch (action) { - case TransferEventAction.COMMIT: return Enum.Events.ActionLetter.commit - case TransferEventAction.RESERVE: return Enum.Events.ActionLetter.reserve - case TransferEventAction.REJECT: return Enum.Events.ActionLetter.reject - case TransferEventAction.ABORT: return Enum.Events.ActionLetter.abort - case TransferEventAction.BULK_COMMIT: return Enum.Events.ActionLetter.bulkCommit - case TransferEventAction.BULK_ABORT: return Enum.Events.ActionLetter.bulkAbort - default: return Enum.Events.ActionLetter.unknown - } - })() - - const functionality = (() => { - switch (action) { - case TransferEventAction.COMMIT: - case TransferEventAction.RESERVE: - case TransferEventAction.REJECT: - case TransferEventAction.ABORT: - return TransferEventType.NOTIFICATION - case TransferEventAction.BULK_COMMIT: - case TransferEventAction.BULK_ABORT: - return TransferEventType.BULK_PROCESSING - default: return Enum.Events.ActionLetter.unknown - } - })() - // fulfil-specific declarations - const isTransferError = action === TransferEventAction.ABORT - const params = { message, kafkaTopic, decodedPayload: payload, span, consumer: Consumer, producer: Producer } + const payload = decodePayload(message.value.content.payload) + const headers = message.value.content.headers + const type = message.value.metadata.event.type + const action = message.value.metadata.event.action + const transferId = message.value.content.uriParams.id + const kafkaTopic = message.topic + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, { method: `fulfil:${action}` })) - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, { path: 'getById' })) - - // We fail early and silently to allow timeout handler abort transfer - // if 'RESERVED' transfer state is sent in with v1.0 content-type - if (headers['content-type'].split('=')[1] === '1.0' && payload.transferState === TransferState.RESERVED) { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `failSilentlyforReservedStateWith1.0ContentType--${actionLetter}0`)) - const errorMessage = 'action "RESERVE" is not allowed in fulfil handler for v1.0 clients.' - Logger.isErrorEnabled && Logger.error(errorMessage) - !!span && span.error(errorMessage) - histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) - return true + const actionLetter = (() => { + switch (action) { + case TransferEventAction.COMMIT: return Enum.Events.ActionLetter.commit + case TransferEventAction.RESERVE: return Enum.Events.ActionLetter.reserve + case TransferEventAction.REJECT: return Enum.Events.ActionLetter.reject + case TransferEventAction.ABORT: return Enum.Events.ActionLetter.abort + case TransferEventAction.BULK_COMMIT: return Enum.Events.ActionLetter.bulkCommit + case TransferEventAction.BULK_ABORT: return Enum.Events.ActionLetter.bulkAbort + default: return Enum.Events.ActionLetter.unknown } + })() + + // We fail early and silently to allow timeout handler abort transfer + // if 'RESERVED' transfer state is sent in with v1.0 content-type + if (headers['content-type'].split('=')[1] === '1.0' && payload.transferState === TransferState.RESERVED) { + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `failSilentlyforReservedStateWith1.0ContentType--${actionLetter}0`)) + const errorMessage = 'action "RESERVE" is not allowed in fulfil handler for v1.0 clients.' + Logger.isErrorEnabled && Logger.error(errorMessage) + !!span && span.error(errorMessage) + return true + } - const transfer = await TransferService.getById(transferId) - const transferStateEnum = transfer && transfer.transferStateEnumeration - - // List of valid actions that Source & Destination headers should be checked - const validActionsForRouteValidations = [ - TransferEventAction.COMMIT, - TransferEventAction.RESERVE, - TransferEventAction.REJECT, - TransferEventAction.ABORT - ] - - if (!transfer) { - Logger.isErrorEnabled && Logger.error(Util.breadcrumb(location, `callbackInternalServerErrorNotFound--${actionLetter}1`)) - const fspiopError = ErrorHandler.Factory.createInternalServerFSPIOPError('transfer not found') - const eventDetail = { functionality, action: TransferEventAction.COMMIT } - /** - * TODO: BULK-Handle at BulkProcessingHandler (not in scope of #967) - * HOWTO: The list of individual transfers being committed should contain - * non-existing transferId - */ - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) - throw fspiopError - - // Lets validate FSPIOP Source & Destination Headers - } else if ( - validActionsForRouteValidations.includes(action) && // Lets only check headers for specific actions that need checking (i.e. bulk should not since its already done elsewhere) - ( - (headers[Enum.Http.Headers.FSPIOP.SOURCE] && (headers[Enum.Http.Headers.FSPIOP.SOURCE].toLowerCase() !== transfer.payeeFsp.toLowerCase())) || - (headers[Enum.Http.Headers.FSPIOP.DESTINATION] && (headers[Enum.Http.Headers.FSPIOP.DESTINATION].toLowerCase() !== transfer.payerFsp.toLowerCase())) - ) + // fulfil-specific declarations + const isTransferError = action === TransferEventAction.ABORT + const params = { message, kafkaTopic, decodedPayload: payload, span, consumer: Consumer, producer: Producer } + + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, { path: 'getById' })) + + const transfer = await TransferService.getById(transferId) + const transferStateEnum = transfer && transfer.transferStateEnumeration + + // List of valid actions that Source & Destination headers should be checked + const validActionsForRouteValidations = [ + TransferEventAction.COMMIT, + TransferEventAction.RESERVE, + TransferEventAction.REJECT, + TransferEventAction.ABORT + ] + + if (!transfer) { + Logger.isErrorEnabled && Logger.error(Util.breadcrumb(location, `callbackInternalServerErrorNotFound--${actionLetter}1`)) + const fspiopError = ErrorHandler.Factory.createInternalServerFSPIOPError('transfer not found') + const eventDetail = { functionality, action: TransferEventAction.COMMIT } + /** + * TODO: BULK-Handle at BulkProcessingHandler (not in scope of #967) + * HOWTO: The list of individual transfers being committed should contain + * non-existing transferId + */ + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) + throw fspiopError + + // Lets validate FSPIOP Source & Destination Headers + // In interscheme scenario, we store proxy fsp id in transferParticipant table and hence we can't compare that data with fspiop headers in fulfil + } else if ( + validActionsForRouteValidations.includes(action) // Lets only check headers for specific actions that need checking (i.e. bulk should not since its already done elsewhere) + ) { + // Check if the payerFsp and payeeFsp are proxies and if they are, skip validating headers + if ( + (headers[Enum.Http.Headers.FSPIOP.SOURCE] && !transfer.payeeIsProxy && (headers[Enum.Http.Headers.FSPIOP.SOURCE].toLowerCase() !== transfer.payeeFsp.toLowerCase())) || + (headers[Enum.Http.Headers.FSPIOP.DESTINATION] && !transfer.payerIsProxy && (headers[Enum.Http.Headers.FSPIOP.DESTINATION].toLowerCase() !== transfer.payerFsp.toLowerCase())) ) { /** * If fulfilment request is coming from a source not matching transfer payee fsp or destination not matching transfer payer fsp, @@ -370,19 +216,22 @@ const fulfil = async (error, messages) => { let fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.VALIDATION_ERROR, 'FSP does not match one of the fsp-id\'s associated with a transfer on the Fulfil callback response') // Lets make the error specific if the PayeeFSP IDs do not match - if (headers[Enum.Http.Headers.FSPIOP.SOURCE].toLowerCase() !== transfer.payeeFsp.toLowerCase()) { + if (!transfer.payeeIsProxy && (headers[Enum.Http.Headers.FSPIOP.SOURCE].toLowerCase() !== transfer.payeeFsp.toLowerCase())) { fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.VALIDATION_ERROR, `${Enum.Http.Headers.FSPIOP.SOURCE} does not match payee fsp on the Fulfil callback response`) } // Lets make the error specific if the PayerFSP IDs do not match - if (headers[Enum.Http.Headers.FSPIOP.DESTINATION].toLowerCase() !== transfer.payerFsp.toLowerCase()) { + if (!transfer.payerIsProxy && (headers[Enum.Http.Headers.FSPIOP.DESTINATION].toLowerCase() !== transfer.payerFsp.toLowerCase())) { fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.VALIDATION_ERROR, `${Enum.Http.Headers.FSPIOP.DESTINATION} does not match payer fsp on the Fulfil callback response`) } const apiFSPIOPError = fspiopError.toApiErrorObject(Config.ERROR_HANDLING) // Set the event details to map to an ABORT_VALIDATION event targeted to the Position Handler - const eventDetail = { functionality: TransferEventType.POSITION, action: TransferEventAction.ABORT_VALIDATION } + const eventDetail = { + functionality: TransferEventType.POSITION, + action: TransferEventAction.ABORT_VALIDATION + } // Lets handle the abort validation and change the transfer state to reflect this const transferAbortResult = await TransferService.handlePayeeResponse(transferId, payload, TransferEventAction.ABORT_VALIDATION, apiFSPIOPError) @@ -397,7 +246,7 @@ const fulfil = async (error, messages) => { // Publish message to Position Handler // Key position abort with payer account id const payerAccount = await Participant.getAccountByNameAndCurrency(transfer.payerFsp, transfer.currency, Enum.Accounts.LedgerAccountType.POSITION) - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: apiFSPIOPError, eventDetail, fromSwitch, toDestination: transfer.payerFsp, messageKey: payerAccount.participantCurrencyId.toString() }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: apiFSPIOPError, eventDetail, fromSwitch, toDestination: transfer.payerFsp, messageKey: payerAccount.participantCurrencyId.toString(), hubName: Config.HUB_NAME }) /** * Send patch notification callback to original payee fsp if they asked for a a patch response. @@ -427,319 +276,468 @@ const fulfil = async (error, messages) => { } } message.value.content.payload = reservedAbortedPayload - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail: reserveAbortedEventDetail, fromSwitch: true, toDestination: transfer.payeeFsp }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail: reserveAbortedEventDetail, fromSwitch: true, toDestination: transfer.payeeFsp, hubName: Config.HUB_NAME }) } throw apiFSPIOPError } - // If execution continues after this point we are sure transfer exists and source matches payee fsp - - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, { path: 'dupCheck' })) - const histTimerDuplicateCheckEnd = Metrics.getHistogram( - 'handler_transfers', - 'fulfil_duplicateCheckComparator - Metrics for transfer handler', - ['success', 'funcName'] - ).startTimer() - - let dupCheckResult - if (!isTransferError) { - dupCheckResult = await Comparators.duplicateCheckComparator(transferId, payload, TransferService.getTransferFulfilmentDuplicateCheck, TransferService.saveTransferFulfilmentDuplicateCheck) - } else { - dupCheckResult = await Comparators.duplicateCheckComparator(transferId, payload, TransferService.getTransferErrorDuplicateCheck, TransferService.saveTransferErrorDuplicateCheck) - } - const { hasDuplicateId, hasDuplicateHash } = dupCheckResult - histTimerDuplicateCheckEnd({ success: true, funcName: 'fulfil_duplicateCheckComparator' }) - if (hasDuplicateId && hasDuplicateHash) { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, 'handleResend')) - - // This is a duplicate message for a transfer that is already in a finalized state - // respond as if we received a GET /transfers/{ID} from the client - if (transferStateEnum === TransferState.COMMITTED || transferStateEnum === TransferState.ABORTED) { - message.value.content.payload = TransferObjectTransform.toFulfil(transfer) - const eventDetail = { functionality, action } - if (action !== TransferEventAction.RESERVE) { - if (!isTransferError) { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackFinalized2--${actionLetter}3`)) - eventDetail.action = TransferEventAction.FULFIL_DUPLICATE - /** - * HOWTO: During bulk fulfil use an individualTransfer from a previous bulk fulfil - */ - } else { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackFinalized3--${actionLetter}4`)) - eventDetail.action = TransferEventAction.ABORT_DUPLICATE - } - } - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, fromSwitch }) - histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) - return true - } + } + // If execution continues after this point we are sure transfer exists and source matches payee fsp - if (transferStateEnum === TransferState.RECEIVED || transferStateEnum === TransferState.RESERVED) { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `inProgress2--${actionLetter}5`)) - /** - * HOWTO: Nearly impossible to trigger for bulk - an individual transfer from a bulk needs to be triggered - * for processing in order to have the fulfil duplicate hash recorded. While it is still in RESERVED state - * the individual transfer needs to be requested by another bulk fulfil request! - * - * TODO: find a way to trigger this code branch and handle it at BulkProcessingHandler (not in scope of #967) - */ - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, histTimerEnd }) - histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) - return true - } + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, { path: 'dupCheck' })) + const histTimerDuplicateCheckEnd = Metrics.getHistogram( + 'handler_transfers', + 'fulfil_duplicateCheckComparator - Metrics for transfer handler', + ['success', 'funcName'] + ).startTimer() - // Error scenario - transfer.transferStateEnumeration is in some invalid state - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorInvalidTransferStateEnum--${actionLetter}6`)) - const fspiopError = ErrorHandler.Factory.createInternalServerFSPIOPError( - `Invalid transferStateEnumeration:(${transferStateEnum}) for event action:(${action}) and type:(${type})`).toApiErrorObject(Config.ERROR_HANDLING) - const eventDetail = { functionality, action: TransferEventAction.COMMIT } - /** - * HOWTO: Impossible to trigger for individual transfer in a bulk? (not in scope of #967) - */ - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError, eventDetail, fromSwitch }) + let dupCheckResult + if (!isTransferError) { + dupCheckResult = await Comparators.duplicateCheckComparator(transferId, payload, TransferService.getTransferFulfilmentDuplicateCheck, TransferService.saveTransferFulfilmentDuplicateCheck) + } else { + dupCheckResult = await Comparators.duplicateCheckComparator(transferId, payload, TransferService.getTransferErrorDuplicateCheck, TransferService.saveTransferErrorDuplicateCheck) + } + const { hasDuplicateId, hasDuplicateHash } = dupCheckResult + histTimerDuplicateCheckEnd({ success: true, funcName: 'fulfil_duplicateCheckComparator' }) + if (hasDuplicateId && hasDuplicateHash) { + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, 'handleResend')) + + // This is a duplicate message for a transfer that is already in a finalized state + // respond as if we received a GET /transfers/{ID} from the client + if (transferStateEnum === TransferState.COMMITTED || transferStateEnum === TransferState.ABORTED) { + message.value.content.payload = TransferObjectTransform.toFulfil(transfer) + const eventDetail = { functionality, action } + if (action !== TransferEventAction.RESERVE) { + if (!isTransferError) { + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackFinalized2--${actionLetter}3`)) + eventDetail.action = TransferEventAction.FULFIL_DUPLICATE + /** + * HOWTO: During bulk fulfil use an individualTransfer from a previous bulk fulfil + */ + } else { + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackFinalized3--${actionLetter}4`)) + eventDetail.action = TransferEventAction.ABORT_DUPLICATE + } + } + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, fromSwitch, hubName: Config.HUB_NAME }) histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) return true } - // ERROR: We have seen a transfer of this ID before, but it's message hash doesn't match - // the previous message hash. - if (hasDuplicateId && !hasDuplicateHash) { - const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.MODIFIED_REQUEST) - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorModified2--${actionLetter}7`)) - let action = TransferEventAction.FULFIL_DUPLICATE - if (isTransferError) { - action = TransferEventAction.ABORT_DUPLICATE - } - + if (transferStateEnum === TransferState.RECEIVED || transferStateEnum === TransferState.RESERVED) { + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `inProgress2--${actionLetter}5`)) /** - * HOWTO: During bulk fulfil use an individualTransfer from a previous bulk fulfil, - * but use different fulfilment value. + * HOWTO: Nearly impossible to trigger for bulk - an individual transfer from a bulk needs to be triggered + * for processing in order to have the fulfil duplicate hash recorded. While it is still in RESERVED state + * the individual transfer needs to be requested by another bulk fulfil request! + * + * TODO: find a way to trigger this code branch and handle it at BulkProcessingHandler (not in scope of #967) */ - const eventDetail = { functionality, action } - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) - throw fspiopError + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, histTimerEnd, hubName: Config.HUB_NAME }) + histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) + return true } - // Transfer is not a duplicate, or message hasn't been changed. + // Error scenario - transfer.transferStateEnumeration is in some invalid state + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorInvalidTransferStateEnum--${actionLetter}6`)) + const fspiopError = ErrorHandler.Factory.createInternalServerFSPIOPError( + `Invalid transferStateEnumeration:(${transferStateEnum}) for event action:(${action}) and type:(${type})`).toApiErrorObject(Config.ERROR_HANDLING) + const eventDetail = { functionality, action: TransferEventAction.COMMIT } + /** + * HOWTO: Impossible to trigger for individual transfer in a bulk? (not in scope of #967) + */ + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError, eventDetail, fromSwitch, hubName: Config.HUB_NAME }) + histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) + return true + } - if (type !== TransferEventType.FULFIL) { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorInvalidEventType--${actionLetter}15`)) - const fspiopError = ErrorHandler.Factory.createInternalServerFSPIOPError(`Invalid event type:(${type})`) - const eventDetail = { functionality, action: TransferEventAction.COMMIT } - /** - * TODO: BulkProcessingHandler (not in scope of #967) - */ - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) - throw fspiopError + // ERROR: We have seen a transfer of this ID before, but it's message hash doesn't match + // the previous message hash. + if (hasDuplicateId && !hasDuplicateHash) { + const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.MODIFIED_REQUEST) + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorModified2--${actionLetter}7`)) + let action = TransferEventAction.FULFIL_DUPLICATE + if (isTransferError) { + action = TransferEventAction.ABORT_DUPLICATE } - const validActions = [ - TransferEventAction.COMMIT, - TransferEventAction.RESERVE, - TransferEventAction.REJECT, - TransferEventAction.ABORT, - TransferEventAction.BULK_COMMIT, - TransferEventAction.BULK_ABORT - ] - if (!validActions.includes(action)) { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorInvalidEventAction--${actionLetter}15`)) - const fspiopError = ErrorHandler.Factory.createInternalServerFSPIOPError(`Invalid event action:(${action}) and/or type:(${type})`) - const eventDetail = { functionality, action: TransferEventAction.COMMIT } - /** - * TODO: BulkProcessingHandler (not in scope of #967) - */ - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) - throw fspiopError - } + /** + * HOWTO: During bulk fulfil use an individualTransfer from a previous bulk fulfil, + * but use different fulfilment value. + */ + const eventDetail = { functionality, action } + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) + throw fspiopError + } - Util.breadcrumb(location, { path: 'validationCheck' }) - if (payload.fulfilment && !Validator.validateFulfilCondition(payload.fulfilment, transfer.condition)) { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorInvalidFulfilment--${actionLetter}9`)) - const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.VALIDATION_ERROR, 'invalid fulfilment') - const apiFSPIOPError = fspiopError.toApiErrorObject(Config.ERROR_HANDLING) - await TransferService.handlePayeeResponse(transferId, payload, action, apiFSPIOPError) - const eventDetail = { functionality: TransferEventType.POSITION, action: TransferEventAction.ABORT_VALIDATION } - /** - * TODO: BulkProcessingHandler (not in scope of #967) The individual transfer is ABORTED by notification is never sent. - */ - // Key position validation abort with payer account id - const payerAccount = await Participant.getAccountByNameAndCurrency(transfer.payerFsp, transfer.currency, Enum.Accounts.LedgerAccountType.POSITION) - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: apiFSPIOPError, eventDetail, messageKey: payerAccount.participantCurrencyId.toString() }) + // Transfer is not a duplicate, or message hasn't been changed. + + if (type !== TransferEventType.FULFIL) { + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorInvalidEventType--${actionLetter}15`)) + const fspiopError = ErrorHandler.Factory.createInternalServerFSPIOPError(`Invalid event type:(${type})`) + const eventDetail = { functionality, action: TransferEventAction.COMMIT } + /** + * TODO: BulkProcessingHandler (not in scope of #967) + */ + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) + throw fspiopError + } - // emit an extra message - RESERVED_ABORTED if action === TransferEventAction.RESERVE - if (action === TransferEventAction.RESERVE) { - // Get the updated transfer now that completedTimestamp will be different - // TODO: should we just modify TransferService.handlePayeeResponse to - // return the completed timestamp? Or is it safer to go back to the DB here? - const transferAbortResult = await TransferService.getById(transferId) - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackReservedAborted--${actionLetter}1`)) - const eventDetail = { functionality: TransferEventType.NOTIFICATION, action: TransferEventAction.RESERVED_ABORTED } + const validActions = [ + TransferEventAction.COMMIT, + TransferEventAction.RESERVE, + TransferEventAction.REJECT, + TransferEventAction.ABORT, + TransferEventAction.BULK_COMMIT, + TransferEventAction.BULK_ABORT + ] + if (!validActions.includes(action)) { + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorInvalidEventAction--${actionLetter}15`)) + const fspiopError = ErrorHandler.Factory.createInternalServerFSPIOPError(`Invalid event action:(${action}) and/or type:(${type})`) + const eventDetail = { functionality, action: TransferEventAction.COMMIT } + /** + * TODO: BulkProcessingHandler (not in scope of #967) + */ + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) + throw fspiopError + } - // Extract error information - const errorCode = apiFSPIOPError && apiFSPIOPError.errorInformation && apiFSPIOPError.errorInformation.errorCode - const errorDescription = apiFSPIOPError && apiFSPIOPError.errorInformation && apiFSPIOPError.errorInformation.errorDescription + Util.breadcrumb(location, { path: 'validationCheck' }) + if (payload.fulfilment && !Validator.validateFulfilCondition(payload.fulfilment, transfer.condition)) { + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorInvalidFulfilment--${actionLetter}9`)) + const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.VALIDATION_ERROR, 'invalid fulfilment') + const apiFSPIOPError = fspiopError.toApiErrorObject(Config.ERROR_HANDLING) + await TransferService.handlePayeeResponse(transferId, payload, TransferEventAction.ABORT_VALIDATION, apiFSPIOPError) + const eventDetail = { functionality: TransferEventType.POSITION, action: TransferEventAction.ABORT_VALIDATION } + /** + * TODO: BulkProcessingHandler (not in scope of #967) The individual transfer is ABORTED by notification is never sent. + */ + // Key position validation abort with payer account id + + const cyrilResult = await FxService.Cyril.processAbortMessage(transferId) + + params.message.value.content.context = { + ...params.message.value.content.context, + cyrilResult + } + if (cyrilResult.positionChanges.length > 0) { + const participantCurrencyId = cyrilResult.positionChanges[0].participantCurrencyId + await Kafka.proceed( + Config.KAFKA_CONFIG, + params, + { + consumerCommit, + fspiopError: apiFSPIOPError, + eventDetail, + messageKey: participantCurrencyId.toString(), + topicNameOverride: Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP?.POSITION?.ABORT, + hubName: Config.HUB_NAME + } + ) + } else { + const fspiopError = ErrorHandler.Factory.createInternalServerFSPIOPError('Invalid cyril result') + throw fspiopError + } - // TODO: This should be handled by a PATCH /transfers/{id}/error callback in the future FSPIOP v1.2 specification, and instead we should just send the FSPIOP-Error instead! Ref: https://github.com/mojaloop/mojaloop-specification/issues/106. - const reservedAbortedPayload = { - transferId: transferAbortResult && transferAbortResult.id, - completedTimestamp: transferAbortResult && transferAbortResult.completedTimestamp && (new Date(Date.parse(transferAbortResult.completedTimestamp))).toISOString(), - transferState: TransferState.ABORTED, - extensionList: { // lets add the extension list to handle the limitation of the FSPIOP v1.1 specification by adding the error cause... - extension: [ - { - key: 'cause', - value: `${errorCode}: ${errorDescription}` - } - ] - } + // const payerAccount = await Participant.getAccountByNameAndCurrency(transfer.payerFsp, transfer.currency, Enum.Accounts.LedgerAccountType.POSITION) + // await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: apiFSPIOPError, eventDetail, messageKey: payerAccount.participantCurrencyId.toString(), hubName: Config.HUB_NAME }) + + // emit an extra message - RESERVED_ABORTED if action === TransferEventAction.RESERVE + if (action === TransferEventAction.RESERVE) { + // Get the updated transfer now that completedTimestamp will be different + const transferAbortResult = await TransferService.getById(transferId) + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackReservedAborted--${actionLetter}1`)) + const eventDetail = { functionality: TransferEventType.NOTIFICATION, action: TransferEventAction.RESERVED_ABORTED } + + // Extract error information + const errorCode = apiFSPIOPError && apiFSPIOPError.errorInformation && apiFSPIOPError.errorInformation.errorCode + const errorDescription = apiFSPIOPError && apiFSPIOPError.errorInformation && apiFSPIOPError.errorInformation.errorDescription + + // TODO: This should be handled by a PATCH /transfers/{id}/error callback in the future FSPIOP v1.2 specification, and instead we should just send the FSPIOP-Error instead! Ref: https://github.com/mojaloop/mojaloop-specification/issues/106. + const reservedAbortedPayload = { + transferId: transferAbortResult && transferAbortResult.id, + completedTimestamp: transferAbortResult && transferAbortResult.completedTimestamp && (new Date(Date.parse(transferAbortResult.completedTimestamp))).toISOString(), + transferState: TransferState.ABORTED, + extensionList: { // lets add the extension list to handle the limitation of the FSPIOP v1.1 specification by adding the error cause... + extension: [ + { + key: 'cause', + value: `${errorCode}: ${errorDescription}` + } + ] } - message.value.content.payload = reservedAbortedPayload - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, fromSwitch: true, toDestination: transfer.payeeFsp }) } - throw fspiopError + message.value.content.payload = reservedAbortedPayload + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, fromSwitch: true, toDestination: transfer.payeeFsp, hubName: Config.HUB_NAME }) } + throw fspiopError + } - if (transfer.transferState !== TransferState.RESERVED) { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorNonReservedState--${actionLetter}10`)) - const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.VALIDATION_ERROR, 'non-RESERVED transfer state') - const eventDetail = { functionality, action: TransferEventAction.COMMIT } - /** - * TODO: BulkProcessingHandler (not in scope of #967) - */ - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) + if (transfer.transferState !== Enum.Transfers.TransferInternalState.RESERVED && + transfer.transferState !== Enum.Transfers.TransferInternalState.RESERVED_FORWARDED + ) { + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorNonReservedState--${actionLetter}10`)) + const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.VALIDATION_ERROR, 'non-RESERVED transfer state') + const eventDetail = { functionality, action: TransferEventAction.COMMIT } + /** + * TODO: BulkProcessingHandler (not in scope of #967) + */ + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) + + // emit an extra message - RESERVED_ABORTED if action === TransferEventAction.RESERVE + if (action === TransferEventAction.RESERVE) { + // Get the updated transfer now that completedTimestamp will be different + const transferAborted = await TransferService.getById(transferId) + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackReservedAborted--${actionLetter}2`)) + const eventDetail = { functionality: TransferEventType.NOTIFICATION, action: TransferEventAction.RESERVED_ABORTED } + const reservedAbortedPayload = { + transferId: transferAborted.id, + completedTimestamp: Util.Time.getUTCString(new Date(transferAborted.completedTimestamp)), + transferState: TransferState.ABORTED + } + message.value.content.payload = reservedAbortedPayload + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, fromSwitch: true, toDestination: transfer.payeeFsp, hubName: Config.HUB_NAME }) + } + throw fspiopError + } - // emit an extra message - RESERVED_ABORTED if action === TransferEventAction.RESERVE - if (action === TransferEventAction.RESERVE) { - // Get the updated transfer now that completedTimestamp will be different - // TODO: should we just modify TransferService.handlePayeeResponse to - // return the completed timestamp? Or is it safer to go back to the DB here? - const transferAborted = await TransferService.getById(transferId) // TODO: remove this once it can be tested - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackReservedAborted--${actionLetter}2`)) - const eventDetail = { functionality: TransferEventType.NOTIFICATION, action: TransferEventAction.RESERVED_ABORTED } - const reservedAbortedPayload = { - transferId: transferAborted.id, - completedTimestamp: Util.Time.getUTCString(new Date(transferAborted.completedTimestamp)), // TODO: remove this once it can be tested - transferState: TransferState.ABORTED - } - message.value.content.payload = reservedAbortedPayload - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, fromSwitch: true, toDestination: transfer.payeeFsp }) + if (transfer.expirationDate <= new Date(Util.Time.getUTCString(new Date()))) { + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorTransferExpired--${actionLetter}11`)) + const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED) + const eventDetail = { functionality, action: TransferEventAction.COMMIT } + /** + * TODO: BulkProcessingHandler (not in scope of #967) + */ + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) + + // emit an extra message - RESERVED_ABORTED if action === TransferEventAction.RESERVE + if (action === TransferEventAction.RESERVE) { + // Get the updated transfer now that completedTimestamp will be different + const transferAborted = await TransferService.getById(transferId) + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackReservedAborted--${actionLetter}3`)) + const eventDetail = { functionality: TransferEventType.NOTIFICATION, action: TransferEventAction.RESERVED_ABORTED } + const reservedAbortedPayload = { + transferId: transferAborted.id, + completedTimestamp: Util.Time.getUTCString(new Date(transferAborted.completedTimestamp)), + transferState: TransferState.ABORTED } - throw fspiopError + message.value.content.payload = reservedAbortedPayload + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, fromSwitch: true, hubName: Config.HUB_NAME }) } + throw fspiopError + } - if (transfer.expirationDate <= new Date(Util.Time.getUTCString(new Date()))) { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorTransferExpired--${actionLetter}11`)) - const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED) - const eventDetail = { functionality, action: TransferEventAction.COMMIT } - /** - * TODO: BulkProcessingHandler (not in scope of #967) - */ - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) + // Validations Succeeded - process the fulfil + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, { path: 'validationPassed' })) + switch (action) { + case TransferEventAction.COMMIT: + case TransferEventAction.RESERVE: + case TransferEventAction.BULK_COMMIT: { + let topicNameOverride + if (action === TransferEventAction.COMMIT) { + topicNameOverride = Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP?.POSITION?.COMMIT + } else if (action === TransferEventAction.RESERVE) { + topicNameOverride = Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP?.POSITION?.RESERVE + } else if (action === TransferEventAction.BULK_COMMIT) { + topicNameOverride = Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP?.POSITION?.BULK_COMMIT + } - // emit an extra message - RESERVED_ABORTED if action === TransferEventAction.RESERVE - if (action === TransferEventAction.RESERVE) { - // Get the updated transfer now that completedTimestamp will be different - // TODO: should we just modify TransferService.handlePayeeResponse to - // return the completed timestamp? Or is it safer to go back to the DB here? - const transferAborted = await TransferService.getById(transferId) - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackReservedAborted--${actionLetter}3`)) - const eventDetail = { functionality: TransferEventType.NOTIFICATION, action: TransferEventAction.RESERVED_ABORTED } - const reservedAbortedPayload = { - transferId: transferAborted.id, - completedTimestamp: Util.Time.getUTCString(new Date(transferAborted.completedTimestamp)), - transferState: TransferState.ABORTED + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `positionTopic2--${actionLetter}12`)) + await TransferService.handlePayeeResponse(transferId, payload, action) + const eventDetail = { functionality: TransferEventType.POSITION, action } + // Key position fulfil message with payee account id + const cyrilResult = await FxService.Cyril.processFulfilMessage(transferId, payload, transfer) + if (cyrilResult.isFx) { + // const payeeAccount = await Participant.getAccountByNameAndCurrency(transfer.payeeFsp, transfer.currency, Enum.Accounts.LedgerAccountType.POSITION) + params.message.value.content.context = { + ...params.message.value.content.context, + cyrilResult } - message.value.content.payload = reservedAbortedPayload - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, fromSwitch: true }) + if (cyrilResult.positionChanges.length > 0) { + const participantCurrencyId = cyrilResult.positionChanges[0].participantCurrencyId + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, messageKey: participantCurrencyId.toString(), topicNameOverride, hubName: Config.HUB_NAME }) + histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) + } else { + histTimerEnd({ success: false, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) + const fspiopError = ErrorHandler.Factory.createInternalServerFSPIOPError('Invalid cyril result') + throw fspiopError + } + } else { + const payeeAccount = await Participant.getAccountByNameAndCurrency(transfer.payeeFsp, transfer.currency, Enum.Accounts.LedgerAccountType.POSITION) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, messageKey: payeeAccount.participantCurrencyId.toString(), topicNameOverride, hubName: Config.HUB_NAME }) + histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) + } + return true + } + case TransferEventAction.REJECT: { + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `positionTopic3--${actionLetter}13`)) + const errorMessage = 'action REJECT is not allowed into fulfil handler' + Logger.isErrorEnabled && Logger.error(errorMessage) + !!span && span.error(errorMessage) + histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) + return true + } + case TransferEventAction.BULK_ABORT: { + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `positionTopic4--${actionLetter}14`)) + let fspiopError + const eInfo = payload.errorInformation + try { // handle only valid errorCodes provided by the payee + fspiopError = ErrorHandler.Factory.createFSPIOPErrorFromErrorInformation(eInfo) + } catch (err) { + Logger.isErrorEnabled && Logger.error(`${Util.breadcrumb(location)}::${err.message}`) + fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.VALIDATION_ERROR, 'API specification undefined errorCode') + await TransferService.handlePayeeResponse(transferId, payload, action, fspiopError.toApiErrorObject(Config.ERROR_HANDLING)) + const eventDetail = { functionality: TransferEventType.POSITION, action } + // Key position abort with payer account id + const payerAccount = await Participant.getAccountByNameAndCurrency(transfer.payerFsp, transfer.currency, Enum.Accounts.LedgerAccountType.POSITION) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, messageKey: payerAccount.participantCurrencyId.toString(), hubName: Config.HUB_NAME }) + throw fspiopError } + await TransferService.handlePayeeResponse(transferId, payload, action, fspiopError.toApiErrorObject(Config.ERROR_HANDLING)) + const eventDetail = { functionality: TransferEventType.POSITION, action } + // Key position abort with payer account id + const payerAccount = await Participant.getAccountByNameAndCurrency(transfer.payerFsp, transfer.currency, Enum.Accounts.LedgerAccountType.POSITION) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, messageKey: payerAccount.participantCurrencyId.toString(), hubName: Config.HUB_NAME }) throw fspiopError } - - // Validations Succeeded - process the fulfil - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, { path: 'validationPassed' })) - switch (action) { - case TransferEventAction.COMMIT: - case TransferEventAction.RESERVE: - case TransferEventAction.BULK_COMMIT: { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `positionTopic2--${actionLetter}12`)) - await TransferService.handlePayeeResponse(transferId, payload, action) + case TransferEventAction.ABORT: { + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `positionTopic4--${actionLetter}14`)) + let fspiopError + const eInfo = payload.errorInformation + try { // handle only valid errorCodes provided by the payee + fspiopError = ErrorHandler.Factory.createFSPIOPErrorFromErrorInformation(eInfo) + } catch (err) { + Logger.isErrorEnabled && Logger.error(`${Util.breadcrumb(location)}::${err.message}`) + fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.VALIDATION_ERROR, 'API specification undefined errorCode') + await TransferService.handlePayeeResponse(transferId, payload, action, fspiopError.toApiErrorObject(Config.ERROR_HANDLING)) const eventDetail = { functionality: TransferEventType.POSITION, action } - // Key position fulfil message with payee account id - let topicNameOverride - if (action === TransferEventAction.COMMIT) { - topicNameOverride = Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP?.POSITION?.COMMIT - } else if (action === TransferEventAction.RESERVE) { - topicNameOverride = Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP?.POSITION?.RESERVE - } else if (action === TransferEventAction.BULK_COMMIT) { - topicNameOverride = Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP?.POSITION?.BULK_COMMIT - } - const payeeAccount = await Participant.getAccountByNameAndCurrency(transfer.payeeFsp, transfer.currency, Enum.Accounts.LedgerAccountType.POSITION) + // Key position abort with payer account id + const payerAccount = await Participant.getAccountByNameAndCurrency(transfer.payerFsp, transfer.currency, Enum.Accounts.LedgerAccountType.POSITION) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, messageKey: payerAccount.participantCurrencyId.toString(), hubName: Config.HUB_NAME }) + throw fspiopError + } + await TransferService.handlePayeeResponse(transferId, payload, action, fspiopError.toApiErrorObject(Config.ERROR_HANDLING)) + const eventDetail = { functionality: TransferEventType.POSITION, action } + const cyrilResult = await FxService.Cyril.processAbortMessage(transferId) + + params.message.value.content.context = { + ...params.message.value.content.context, + cyrilResult + } + if (cyrilResult.positionChanges.length > 0) { + const participantCurrencyId = cyrilResult.positionChanges[0].participantCurrencyId await Kafka.proceed( Config.KAFKA_CONFIG, params, { consumerCommit, + fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, - messageKey: payeeAccount.participantCurrencyId.toString(), - topicNameOverride + messageKey: participantCurrencyId.toString(), + topicNameOverride: Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP?.POSITION?.ABORT, + hubName: Config.HUB_NAME } ) - histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) - return true - } - // TODO: why do we let this logic get this far? Why not remove it from validActions array above? - case TransferEventAction.REJECT: { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `positionTopic3--${actionLetter}13`)) - const errorMessage = 'action REJECT is not allowed into fulfil handler' - Logger.isErrorEnabled && Logger.error(errorMessage) - !!span && span.error(errorMessage) - histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) - return true - } - // TODO: why do we let this logic get this far? Why not remove it from validActions array above? - case TransferEventAction.ABORT: - case TransferEventAction.BULK_ABORT: - default: { // action === TransferEventAction.ABORT || action === TransferEventAction.BULK_ABORT // error-callback request to be processed - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `positionTopic4--${actionLetter}14`)) - let fspiopError - const eInfo = payload.errorInformation - try { // handle only valid errorCodes provided by the payee - fspiopError = ErrorHandler.Factory.createFSPIOPErrorFromErrorInformation(eInfo) - } catch (err) { - /** - * TODO: Handling of out-of-range errorCodes is to be introduced to the ml-api-adapter, - * so that such requests are rejected right away, instead of aborting the transfer here. - */ - Logger.isErrorEnabled && Logger.error(`${Util.breadcrumb(location)}::${err.message}`) - fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.VALIDATION_ERROR, 'API specification undefined errorCode') - await TransferService.handlePayeeResponse(transferId, payload, action, fspiopError.toApiErrorObject(Config.ERROR_HANDLING)) - const eventDetail = { functionality: TransferEventType.POSITION, action } - // Key position abort with payer account id - const payerAccount = await Participant.getAccountByNameAndCurrency(transfer.payerFsp, transfer.currency, Enum.Accounts.LedgerAccountType.POSITION) - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, messageKey: payerAccount.participantCurrencyId.toString() }) - throw fspiopError - } - await TransferService.handlePayeeResponse(transferId, payload, action, fspiopError.toApiErrorObject(Config.ERROR_HANDLING)) - const eventDetail = { functionality: TransferEventType.POSITION, action } - // Key position abort with payer account id - const payerAccount = await Participant.getAccountByNameAndCurrency(transfer.payerFsp, transfer.currency, Enum.Accounts.LedgerAccountType.POSITION) - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, messageKey: payerAccount.participantCurrencyId.toString() }) - // TODO(2556): I don't think we should emit an extra notification here - // this is the case where the Payee sent an ABORT, so we don't need to tell them to abort + } else { + const fspiopError = ErrorHandler.Factory.createInternalServerFSPIOPError('Invalid cyril result') throw fspiopError } } - } catch (err) { - histTimerEnd({ success: false, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) - const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err) - Logger.isErrorEnabled && Logger.error(`${Util.breadcrumb(location)}::${err.message}--F0`) - const state = new EventSdk.EventStateMetadata(EventSdk.EventStatusType.failed, fspiopError.apiErrorCode.code, fspiopError.apiErrorCode.message) - await span.error(fspiopError, state) - await span.finish(fspiopError.message, state) + } +} + +const processFxFulfilMessage = async (message, functionality, span) => { + const histTimerEnd = Metrics.getHistogram( + 'fx_transfer_fulfil', + 'Consume a fx fulfil transfer message from the kafka topic and process it accordingly', + ['success', 'fspId'] + ).startTimer() + + const { + payload, + headers, + type, + action, + commitRequestId, + kafkaTopic + } = FxFulfilService.decodeKafkaMessage(message) + + const log = logger.child({ commitRequestId, type, action }) + log.info('processFxFulfilMessage start...', { payload }) + + const params = { + message, + kafkaTopic, + span, + decodedPayload: payload, + consumer: Consumer, + producer: Producer + } + + const fxFulfilService = new FxFulfilService({ + log, Config, Comparators, Validator, FxTransferModel, Kafka, params + }) + + // Validate event type + await fxFulfilService.validateEventType(type, functionality) + + // Validate action + const validActions = [ + TransferEventAction.FX_RESERVE, + TransferEventAction.FX_COMMIT, + // TransferEventAction.FX_REJECT, + TransferEventAction.FX_ABORT, + TransferEventAction.FX_FORWARDED + ] + if (!validActions.includes(action)) { + const errorMessage = ERROR_MESSAGES.fxActionIsNotAllowed(action) + log.error(errorMessage) + span?.error(errorMessage) + histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) return true - } finally { - if (!span.isFinished) { - await span.finish() + } + + const transfer = await fxFulfilService.getFxTransferDetails(commitRequestId, functionality) + await fxFulfilService.validateHeaders({ transfer, headers, payload }) + + // If execution continues after this point we are sure fxTransfer exists and source matches payee fsp + const histTimerDuplicateCheckEnd = Metrics.getHistogram( + 'fx_handler_transfers', + 'fxFulfil_duplicateCheckComparator - Metrics for fxTransfer handler', + ['success', 'funcName'] + ).startTimer() + + const dupCheckResult = await fxFulfilService.getDuplicateCheckResult({ commitRequestId, payload }) + histTimerDuplicateCheckEnd({ success: true, funcName: 'fxFulfil_duplicateCheckComparator' }) + + const isDuplicate = await fxFulfilService.checkDuplication({ dupCheckResult, transfer, functionality, action, type }) + if (isDuplicate) { + log.info('fxTransfer duplication detected, skip further processing') + histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) + return true + } + + // Transfer is not a duplicate, or message hasn't been changed. + + payload.fulfilment && await fxFulfilService.validateFulfilment(transfer, payload) + await fxFulfilService.validateTransferState(transfer, functionality) + await fxFulfilService.validateExpirationDate(transfer, functionality) + + log.info('Validations Succeeded - process the fxFulfil...') + + switch (action) { + case TransferEventAction.FX_RESERVE: + case TransferEventAction.FX_COMMIT: { + const success = await fxFulfilService.processFxFulfil({ transfer, payload, action }) + log.info('fxFulfil handling is done', { success }) + histTimerEnd({ success, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) + return success + } + case TransferEventAction.FX_ABORT: { + const success = await fxFulfilService.processFxAbort({ transfer, payload, action }) + log.info('fxAbort handling is done', { success }) + histTimerEnd({ success, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) + return true } } } @@ -769,46 +767,66 @@ const getTransfer = async (error, messages) => { } else { message = messages } + const action = message.value.metadata.event.action + const isFx = action === TransferEventAction.FX_GET const contextFromMessage = EventSdk.Tracer.extractContextFromMessage(message.value) const span = EventSdk.Tracer.createChildSpanFromContext('cl_transfer_get', contextFromMessage) try { await span.audit(message, EventSdk.AuditEventAction.start) const metadata = message.value.metadata const action = metadata.event.action - const transferId = message.value.content.uriParams.id + const transferIdOrCommitRequestId = message.value.content.uriParams.id const kafkaTopic = message.topic Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, { method: `getTransfer:${action}` })) const actionLetter = Enum.Events.ActionLetter.get const params = { message, kafkaTopic, span, consumer: Consumer, producer: Producer } - const eventDetail = { functionality: TransferEventType.NOTIFICATION, action: TransferEventAction.GET } + const eventDetail = { functionality: TransferEventType.NOTIFICATION, action } Util.breadcrumb(location, { path: 'validationFailed' }) if (!await Validator.validateParticipantByName(message.value.from)) { Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `breakParticipantDoesntExist--${actionLetter}1`)) - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, histTimerEnd }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, histTimerEnd, hubName: Config.HUB_NAME }) histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) return true } - const transfer = await TransferService.getByIdLight(transferId) - if (!transfer) { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorTransferNotFound--${actionLetter}3`)) - const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_ID_NOT_FOUND, 'Provided Transfer ID was not found on the server.') - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) - throw fspiopError - } - if (!await Validator.validateParticipantTransferId(message.value.from, transferId)) { - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorNotTransferParticipant--${actionLetter}2`)) - const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.CLIENT_ERROR) - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) - throw fspiopError + if (isFx) { + const fxTransfer = await FxTransferModel.fxTransfer.getByIdLight(transferIdOrCommitRequestId) + if (!fxTransfer) { + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorTransferNotFound--${actionLetter}3`)) + const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_ID_NOT_FOUND, 'Provided commitRequest ID was not found on the server.') + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) + throw fspiopError + } + if (!await Validator.validateParticipantForCommitRequestId(message.value.from, transferIdOrCommitRequestId)) { + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorNotFxTransferParticipant--${actionLetter}2`)) + const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.CLIENT_ERROR) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) + throw fspiopError + } + Util.breadcrumb(location, { path: 'validationPassed' }) + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackMessage--${actionLetter}4`)) + message.value.content.payload = TransferObjectTransform.toFulfil(fxTransfer, true) + } else { + const transfer = await TransferService.getByIdLight(transferIdOrCommitRequestId) + if (!transfer) { + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorTransferNotFound--${actionLetter}3`)) + const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_ID_NOT_FOUND, 'Provided Transfer ID was not found on the server.') + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) + throw fspiopError + } + if (!await Validator.validateParticipantTransferId(message.value.from, transferIdOrCommitRequestId)) { + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorNotTransferParticipant--${actionLetter}2`)) + const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.CLIENT_ERROR) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME }) + throw fspiopError + } + Util.breadcrumb(location, { path: 'validationPassed' }) + Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackMessage--${actionLetter}4`)) + message.value.content.payload = TransferObjectTransform.toFulfil(transfer) } - // ============================================================================================ - Util.breadcrumb(location, { path: 'validationPassed' }) - Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackMessage--${actionLetter}4`)) - message.value.content.payload = TransferObjectTransform.toFulfil(transfer) - await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, fromSwitch }) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, fromSwitch, hubName: Config.HUB_NAME }) histTimerEnd({ success: true, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId }) return true } catch (err) { @@ -836,13 +854,14 @@ const getTransfer = async (error, messages) => { */ const registerPrepareHandler = async () => { try { - const prepareHandler = { - command: prepare, - topicName: Kafka.transformGeneralTopicName(Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, TransferEventType.TRANSFER, TransferEventAction.PREPARE), - config: Kafka.getKafkaConfig(Config.KAFKA_CONFIG, Enum.Kafka.Config.CONSUMER, TransferEventType.TRANSFER.toUpperCase(), TransferEventAction.PREPARE.toUpperCase()) - } - prepareHandler.config.rdkafkaConf['client.id'] = prepareHandler.topicName - await Consumer.createHandler(prepareHandler.topicName, prepareHandler.config, prepareHandler.command) + const { TRANSFER } = TransferEventType + const { PREPARE } = TransferEventAction + + const topicName = Kafka.transformGeneralTopicName(Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, TRANSFER, PREPARE) + const consumeConfig = Kafka.getKafkaConfig(Config.KAFKA_CONFIG, Enum.Kafka.Config.CONSUMER, TRANSFER.toUpperCase(), PREPARE.toUpperCase()) + consumeConfig.rdkafkaConf['client.id'] = topicName + + await Consumer.createHandler(topicName, consumeConfig, prepare) return true } catch (err) { Logger.isErrorEnabled && Logger.error(err) diff --git a/src/handlers/transfers/prepare.js b/src/handlers/transfers/prepare.js new file mode 100644 index 000000000..15d3fdb7c --- /dev/null +++ b/src/handlers/transfers/prepare.js @@ -0,0 +1,582 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Eugen Klymniuk + -------------- + **********/ + +const EventSdk = require('@mojaloop/event-sdk') +const ErrorHandler = require('@mojaloop/central-services-error-handling') +const Metrics = require('@mojaloop/central-services-metrics') +const { Enum, Util } = require('@mojaloop/central-services-shared') +const { Consumer, Producer } = require('@mojaloop/central-services-stream').Util + +const { logger } = require('../../shared/logger') +const Config = require('../../lib/config') +const TransferObjectTransform = require('../../domain/transfer/transform') +const Participant = require('../../domain/participant') + +const createRemittanceEntity = require('./createRemittanceEntity') +const Validator = require('./validator') +const dto = require('./dto') +const TransferService = require('../../domain/transfer/index') +const ProxyCache = require('../../lib/proxyCache') +const FxTransferService = require('../../domain/fx/index') + +const { Kafka, Comparators } = Util +const { TransferState, TransferInternalState } = Enum.Transfers +const { Action, Type } = Enum.Events.Event +const { FSPIOPErrorCodes } = ErrorHandler.Enums +const { createFSPIOPError, reformatFSPIOPError } = ErrorHandler.Factory +const { fspId } = Config.INSTRUMENTATION_METRICS_LABELS + +const consumerCommit = true +const fromSwitch = true +const proxyEnabled = Config.PROXY_CACHE_CONFIG.enabled + +const proceedForwardErrorMessage = async ({ fspiopError, isFx, params }) => { + const eventDetail = { + functionality: Type.NOTIFICATION, + action: isFx ? Action.FX_FORWARDED : Action.FORWARDED + } + await Kafka.proceed(Config.KAFKA_CONFIG, params, { + fspiopError, + eventDetail, + consumerCommit + }) + logger.warn('proceedForwardErrorMessage is done', { fspiopError, eventDetail }) +} + +// think better name +const forwardPrepare = async ({ isFx, params, ID }) => { + if (isFx) { + const fxTransfer = await FxTransferService.getByIdLight(ID) + if (!fxTransfer) { + const fspiopError = ErrorHandler.Factory.createFSPIOPError( + FSPIOPErrorCodes.ID_NOT_FOUND, + 'Forwarded fxTransfer could not be found.' + ).toApiErrorObject(Config.ERROR_HANDLING) + // IMPORTANT: This singular message is taken by the ml-api-adapter and used to + // notify the payerFsp and proxy of the error. + // As long as the `to` and `from` message values are the fsp and fxp, + // and the action is `fx-forwarded`, the ml-api-adapter will notify both. + await proceedForwardErrorMessage({ fspiopError, isFx, params }) + return true + } + + if (fxTransfer.fxTransferState === TransferInternalState.RESERVED) { + await FxTransferService.forwardedFxPrepare(ID) + } else { + const fspiopError = ErrorHandler.Factory.createInternalServerFSPIOPError( + `Invalid State: ${fxTransfer.fxTransferState} - expected: ${TransferInternalState.RESERVED}` + ).toApiErrorObject(Config.ERROR_HANDLING) + // IMPORTANT: This singular message is taken by the ml-api-adapter and used to + // notify the payerFsp and proxy of the error. + // As long as the `to` and `from` message values are the fsp and fxp, + // and the action is `fx-forwarded`, the ml-api-adapter will notify both. + await proceedForwardErrorMessage({ fspiopError, isFx, params }) + } + } else { + const transfer = await TransferService.getById(ID) + if (!transfer) { + const fspiopError = ErrorHandler.Factory.createFSPIOPError( + FSPIOPErrorCodes.ID_NOT_FOUND, + 'Forwarded transfer could not be found.' + ).toApiErrorObject(Config.ERROR_HANDLING) + // IMPORTANT: This singular message is taken by the ml-api-adapter and used to + // notify the payerFsp and proxy of the error. + // As long as the `to` and `from` message values are the payer and payee, + // and the action is `forwarded`, the ml-api-adapter will notify both. + await proceedForwardErrorMessage({ fspiopError, isFx, params }) + return true + } + + if (transfer.transferState === TransferInternalState.RESERVED) { + await TransferService.forwardedPrepare(ID) + } else { + const fspiopError = ErrorHandler.Factory.createInternalServerFSPIOPError( + `Invalid State: ${transfer.transferState} - expected: ${TransferInternalState.RESERVED}` + ).toApiErrorObject(Config.ERROR_HANDLING) + // IMPORTANT: This singular message is taken by the ml-api-adapter and used to + // notify the payerFsp and proxy of the error. + // As long as the `to` and `from` message values are the payer and payee, + // and the action is `forwarded`, the ml-api-adapter will notify both. + await proceedForwardErrorMessage({ fspiopError, isFx, params }) + } + } + + return true +} + +/** @import { ProxyOrParticipant } from '#src/lib/proxyCache.js' */ +/** + * @typedef {Object} ProxyObligation + * @property {boolean} isFx - Is FX transfer. + * @property {Object} payloadClone - A clone of the original payload. + * @property {ProxyOrParticipant} initiatingFspProxyOrParticipantId - initiating FSP: proxy or participant. + * @property {ProxyOrParticipant} counterPartyFspProxyOrParticipantId - counterparty FSP: proxy or participant. + * @property {boolean} isInitiatingFspProxy - initiatingFsp.(!inScheme && proxyId !== null). + * @property {boolean} isCounterPartyFspProxy - counterPartyFsp.(!inScheme && proxyId !== null). + */ + +/** + * Calculates proxyObligation. + * @returns {ProxyObligation} proxyObligation + */ +const calculateProxyObligation = async ({ payload, isFx, params, functionality, action }) => { + const proxyObligation = { + isFx, + payloadClone: { ...payload }, + isInitiatingFspProxy: false, + isCounterPartyFspProxy: false, + initiatingFspProxyOrParticipantId: null, + counterPartyFspProxyOrParticipantId: null + } + + if (proxyEnabled) { + const [initiatingFsp, counterPartyFsp] = isFx ? [payload.initiatingFsp, payload.counterPartyFsp] : [payload.payerFsp, payload.payeeFsp] + + // We need to double check the following validation logic incase of payee side currency conversion + const payeeFspLookupOptions = isFx + ? null + : { + validateCurrencyAccounts: true, + accounts: [ + { currency: payload.amount.currency, accountType: Enum.Accounts.LedgerAccountType.POSITION } + ] + } + + ;[proxyObligation.initiatingFspProxyOrParticipantId, proxyObligation.counterPartyFspProxyOrParticipantId] = await Promise.all([ + ProxyCache.getFSPProxy(initiatingFsp), + ProxyCache.getFSPProxy(counterPartyFsp, payeeFspLookupOptions) + ]) + logger.debug('Prepare proxy cache lookup results', { + initiatingFsp, + counterPartyFsp, + initiatingFspProxyOrParticipantId: proxyObligation.initiatingFspProxyOrParticipantId, + counterPartyFspProxyOrParticipantId: proxyObligation.counterPartyFspProxyOrParticipantId + }) + + proxyObligation.isInitiatingFspProxy = !proxyObligation.initiatingFspProxyOrParticipantId.inScheme && + proxyObligation.initiatingFspProxyOrParticipantId.proxyId !== null + proxyObligation.isCounterPartyFspProxy = !proxyObligation.counterPartyFspProxyOrParticipantId.inScheme && + proxyObligation.counterPartyFspProxyOrParticipantId.proxyId !== null + + if (isFx) { + proxyObligation.payloadClone.initiatingFsp = !proxyObligation.initiatingFspProxyOrParticipantId?.inScheme && + proxyObligation.initiatingFspProxyOrParticipantId?.proxyId + ? proxyObligation.initiatingFspProxyOrParticipantId.proxyId + : payload.initiatingFsp + proxyObligation.payloadClone.counterPartyFsp = !proxyObligation.counterPartyFspProxyOrParticipantId?.inScheme && + proxyObligation.counterPartyFspProxyOrParticipantId?.proxyId + ? proxyObligation.counterPartyFspProxyOrParticipantId.proxyId + : payload.counterPartyFsp + } else { + proxyObligation.payloadClone.payerFsp = !proxyObligation.initiatingFspProxyOrParticipantId?.inScheme && + proxyObligation.initiatingFspProxyOrParticipantId?.proxyId + ? proxyObligation.initiatingFspProxyOrParticipantId.proxyId + : payload.payerFsp + proxyObligation.payloadClone.payeeFsp = !proxyObligation.counterPartyFspProxyOrParticipantId?.inScheme && + proxyObligation.counterPartyFspProxyOrParticipantId?.proxyId + ? proxyObligation.counterPartyFspProxyOrParticipantId.proxyId + : payload.payeeFsp + } + + // If either debtor participant or creditor participant aren't in the scheme and have no proxy representative, then throw an error. + if ((proxyObligation.initiatingFspProxyOrParticipantId.inScheme === false && proxyObligation.initiatingFspProxyOrParticipantId.proxyId === null) || + (proxyObligation.counterPartyFspProxyOrParticipantId.inScheme === false && proxyObligation.counterPartyFspProxyOrParticipantId.proxyId === null)) { + const fspiopError = ErrorHandler.Factory.createFSPIOPError( + ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, + `Payer proxy or payee proxy not found: initiatingFsp: ${initiatingFsp} counterPartyFsp: ${counterPartyFsp}` + ).toApiErrorObject(Config.ERROR_HANDLING) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { + consumerCommit, + fspiopError, + eventDetail: { functionality, action }, + fromSwitch, + hubName: Config.HUB_NAME + }) + throw fspiopError + } + } + + return proxyObligation +} + +const checkDuplication = async ({ payload, isFx, ID, location }) => { + const funcName = 'prepare_duplicateCheckComparator' + const histTimerDuplicateCheckEnd = Metrics.getHistogram( + 'handler_transfers', + `${funcName} - Metrics for transfer handler`, + ['success', 'funcName'] + ).startTimer() + + const remittance = createRemittanceEntity(isFx) + const { hasDuplicateId, hasDuplicateHash } = await Comparators.duplicateCheckComparator( + ID, + payload, + remittance.getDuplicate, + remittance.saveDuplicateHash + ) + + logger.info(Util.breadcrumb(location, { path: funcName }), { hasDuplicateId, hasDuplicateHash, isFx, ID }) + histTimerDuplicateCheckEnd({ success: true, funcName }) + + return { hasDuplicateId, hasDuplicateHash } +} + +const processDuplication = async ({ + duplication, isFx, ID, functionality, action, actionLetter, params, location +}) => { + if (!duplication.hasDuplicateId) return + + let error + if (!duplication.hasDuplicateHash) { + logger.warn(Util.breadcrumb(location, `callbackErrorModified1--${actionLetter}5`)) + error = createFSPIOPError(FSPIOPErrorCodes.MODIFIED_REQUEST) + } else if (action === Action.BULK_PREPARE) { + logger.info(Util.breadcrumb(location, `validationError1--${actionLetter}2`)) + error = createFSPIOPError('Individual transfer prepare duplicate') + } + + if (error) { + await Kafka.proceed(Config.KAFKA_CONFIG, params, { + consumerCommit, + fspiopError: error.toApiErrorObject(Config.ERROR_HANDLING), + eventDetail: { functionality, action }, + fromSwitch, + hubName: Config.HUB_NAME + }) + throw error + } + logger.info(Util.breadcrumb(location, 'handleResend')) + + const transfer = await createRemittanceEntity(isFx) + .getByIdLight(ID) + + const finalizedState = [TransferState.COMMITTED, TransferState.ABORTED, TransferState.RESERVED] + const isFinalized = + finalizedState.includes(transfer?.transferStateEnumeration) || + finalizedState.includes(transfer?.fxTransferStateEnumeration) + const isPrepare = [Action.PREPARE, Action.FX_PREPARE, Action.FORWARDED, Action.FX_FORWARDED].includes(action) + + let eventDetail = { functionality, action: Action.PREPARE_DUPLICATE } + if (isFinalized) { + if (isPrepare) { + logger.info(Util.breadcrumb(location, `finalized callback--${actionLetter}1`)) + params.message.value.content.payload = TransferObjectTransform.toFulfil(transfer, isFx) + params.message.value.content.uriParams = { id: ID } + const action = isFx ? Action.FX_PREPARE_DUPLICATE : Action.PREPARE_DUPLICATE + eventDetail = { functionality, action } + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, eventDetail, fromSwitch, hubName: Config.HUB_NAME }) + } else if (action === Action.BULK_PREPARE) { + logger.info(Util.breadcrumb(location, `validationError1--${actionLetter}2`)) + const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.MODIFIED_REQUEST, 'Individual transfer prepare duplicate') + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) + throw fspiopError + } + } else { + logger.info(Util.breadcrumb(location, 'inProgress')) + if (action === Action.BULK_PREPARE) { + logger.info(Util.breadcrumb(location, `validationError2--${actionLetter}4`)) + const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.MODIFIED_REQUEST, 'Individual transfer prepare duplicate') + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch }) + throw fspiopError + } else { // action === TransferEventAction.PREPARE + logger.info(Util.breadcrumb(location, `ignore--${actionLetter}3`)) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit }) + return true + } + } + + return true +} + +const savePreparedRequest = async ({ + validationPassed, + reasons, + payload, + isFx, + functionality, + params, + location, + determiningTransferCheckResult, + proxyObligation +}) => { + const logMessage = Util.breadcrumb(location, 'savePreparedRequest') + try { + logger.info(logMessage, { validationPassed, reasons }) + const reason = validationPassed ? null : reasons.toString() + await createRemittanceEntity(isFx) + .savePreparedRequest( + payload, + reason, + validationPassed, + determiningTransferCheckResult, + proxyObligation + ) + } catch (err) { + logger.error(`${logMessage} error:`, err) + const fspiopError = reformatFSPIOPError(err, FSPIOPErrorCodes.INTERNAL_SERVER_ERROR) + await Kafka.proceed(Config.KAFKA_CONFIG, params, { + consumerCommit, + fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), + eventDetail: { functionality, action: Action.PREPARE }, + fromSwitch, + hubName: Config.HUB_NAME + }) + throw fspiopError + } +} + +const definePositionParticipant = async ({ isFx, payload, determiningTransferCheckResult, proxyObligation }) => { + const cyrilResult = await createRemittanceEntity(isFx) + .getPositionParticipant(payload, determiningTransferCheckResult, proxyObligation) + + let messageKey + // On a proxied transfer prepare if there is a corresponding fx transfer `getPositionParticipant` + // should return the fxp's proxy as the participantName since the fxp proxy would be saved as the counterPartyFsp + // in the prior fx transfer prepare. + // Following interscheme rules, if the debtor(fxTransfer FXP) and the creditor(transfer payee) are + // represented by the same proxy, no position adjustment is needed. + let isSameProxy = false + // Only check transfers that have a related fxTransfer + if (determiningTransferCheckResult?.watchListRecords?.length > 0) { + const counterPartyParticipantFXPProxy = cyrilResult.participantName + isSameProxy = counterPartyParticipantFXPProxy && proxyObligation?.counterPartyFspProxyOrParticipantId?.proxyId + ? counterPartyParticipantFXPProxy === proxyObligation.counterPartyFspProxyOrParticipantId.proxyId + : false + } + if (isSameProxy) { + messageKey = '0' + } else { + const account = await Participant.getAccountByNameAndCurrency( + cyrilResult.participantName, + cyrilResult.currencyId, + Enum.Accounts.LedgerAccountType.POSITION + ) + messageKey = account.participantCurrencyId.toString() + } + logger.info('prepare positionParticipant details:', { messageKey, isSameProxy, cyrilResult }) + + return { + messageKey, + cyrilResult + } +} + +const sendPositionPrepareMessage = async ({ + isFx, + action, + params, + determiningTransferCheckResult, + proxyObligation +}) => { + const eventDetail = { + functionality: Type.POSITION, + action + } + + const { messageKey, cyrilResult } = await definePositionParticipant({ + payload: proxyObligation.payloadClone, + isFx, + determiningTransferCheckResult, + proxyObligation + }) + + params.message.value.content.context = { + ...params.message.value.content.context, + cyrilResult + } + // We route fx-prepare, bulk-prepare and prepare messages differently based on the topic configured for it. + // Note: The batch handler does not currently support bulk-prepare messages, only prepare messages are supported. + // And non batch processing is not supported for fx-prepare messages. + // Therefore, it is necessary to check the action to determine the topic to route to. + let topicNameOverride = Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP?.POSITION?.PREPARE + if (action === Action.BULK_PREPARE) { + topicNameOverride = Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP?.POSITION?.BULK_PREPARE + } else if (action === Action.FX_PREPARE) { + topicNameOverride = Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP?.POSITION?.FX_PREPARE + } + await Kafka.proceed(Config.KAFKA_CONFIG, params, { + consumerCommit, + eventDetail, + messageKey, + topicNameOverride, + hubName: Config.HUB_NAME + }) + + return true +} + +/** + * @function TransferPrepareHandler + * + * @async + * @description This is the consumer callback function that gets registered to a topic. This then gets a list of messages, + * we will only ever use the first message in non batch processing. We then break down the message into its payload and + * begin validating the payload. Once the payload is validated successfully it will be written to the database to + * the relevant tables. If the validation fails it is still written to the database for auditing purposes but with an + * INVALID status. For any duplicate requests we will send appropriate callback based on the transfer state and the hash validation + * + * Validator.validatePrepare called to validate the payload of the message + * TransferService.getById called to get the details of the existing transfer + * TransferObjectTransform.toTransfer called to transform the transfer object + * TransferService.prepare called and creates new entries in transfer tables for successful prepare transfer + * TransferService.logTransferError called to log the invalid request + * + * @param {error} error - error thrown if something fails within Kafka + * @param {array} messages - a list of messages to consume for the relevant topic + * + * @returns {object} - Returns a boolean: true if successful, or throws and error if failed + */ +const prepare = async (error, messages) => { + const location = { module: 'PrepareHandler', method: '', path: '' } + const input = dto.prepareInputDto(error, messages) + + const histTimerEnd = Metrics.getHistogram( + input.metric, + `Consume a ${input.metric} message from the kafka topic and process it accordingly`, + ['success', 'fspId'] + ).startTimer() + if (error) { + histTimerEnd({ success: false, fspId }) + throw reformatFSPIOPError(error) + } + + const { + message, payload, isFx, ID, headers, action, actionLetter, functionality, isForwarded + } = input + + const contextFromMessage = EventSdk.Tracer.extractContextFromMessage(message.value) + const span = EventSdk.Tracer.createChildSpanFromContext(`cl_${input.metric}`, contextFromMessage) + + try { + span.setTags({ transactionId: ID }) + await span.audit(message, EventSdk.AuditEventAction.start) + logger.info(Util.breadcrumb(location, { method: 'prepare' })) + + const params = { + message, + kafkaTopic: message.topic, + decodedPayload: payload, + span, + consumer: Consumer, + producer: Producer + } + + if (proxyEnabled && isForwarded) { + const isOk = await forwardPrepare({ isFx, params, ID }) + logger.info('forwardPrepare message is processed', { isOk, isFx, ID }) + return isOk + } + + const proxyObligation = await calculateProxyObligation({ + payload, isFx, params, functionality, action + }) + + const duplication = await checkDuplication({ payload, isFx, ID, location }) + if (duplication.hasDuplicateId) { + const success = await processDuplication({ + duplication, isFx, ID, functionality, action, actionLetter, params, location + }) + histTimerEnd({ success, fspId }) + return success + } + + const determiningTransferCheckResult = await createRemittanceEntity(isFx) + .checkIfDeterminingTransferExists(proxyObligation.payloadClone, proxyObligation) + + const { validationPassed, reasons } = await Validator.validatePrepare( + payload, + headers, + isFx, + determiningTransferCheckResult, + proxyObligation + ) + + await savePreparedRequest({ + validationPassed, + reasons, + payload, + isFx, + functionality, + params, + location, + determiningTransferCheckResult, + proxyObligation + }) + + if (!validationPassed) { + logger.warn(Util.breadcrumb(location, { path: 'validationFailed' })) + const fspiopError = createFSPIOPError(FSPIOPErrorCodes.VALIDATION_ERROR, reasons.toString()) + await createRemittanceEntity(isFx) + .logTransferError(ID, FSPIOPErrorCodes.VALIDATION_ERROR.code, reasons.toString()) + /** + * TODO: BULK-Handle at BulkProcessingHandler (not in scope of #967) + * HOWTO: For regular transfers this branch may be triggered by sending + * a transfer in a currency not supported by either dfsp. Not sure if it + * will be triggered for bulk, because of the BulkPrepareHandler. + */ + await Kafka.proceed(Config.KAFKA_CONFIG, params, { + consumerCommit, + fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), + eventDetail: { functionality, action }, + fromSwitch, + hubName: Config.HUB_NAME + }) + throw fspiopError + } + + logger.info(Util.breadcrumb(location, `positionTopic1--${actionLetter}7`)) + const success = await sendPositionPrepareMessage({ + isFx, action, params, determiningTransferCheckResult, proxyObligation + }) + + histTimerEnd({ success, fspId }) + return success + } catch (err) { + histTimerEnd({ success: false, fspId }) + const fspiopError = reformatFSPIOPError(err) + logger.error(`${Util.breadcrumb(location)}::${err.message}`, err) + const state = new EventSdk.EventStateMetadata(EventSdk.EventStatusType.failed, fspiopError.apiErrorCode.code, fspiopError.apiErrorCode.message) + await span.error(fspiopError, state) + await span.finish(fspiopError.message, state) + return true + } finally { + if (!span.isFinished) { + await span.finish() + } + } +} + +module.exports = { + prepare, + forwardPrepare, + calculateProxyObligation, + checkDuplication, + processDuplication, + savePreparedRequest, + definePositionParticipant, + sendPositionPrepareMessage +} diff --git a/src/handlers/transfers/validator.js b/src/handlers/transfers/validator.js index e4d928115..b2d958c01 100644 --- a/src/handlers/transfers/validator.js +++ b/src/handlers/transfers/validator.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -42,6 +42,9 @@ const Decimal = require('decimal.js') const Config = require('../../lib/config') const Participant = require('../../domain/participant') const Transfer = require('../../domain/transfer') +const FxTransferModel = require('../../models/fxTransfer') +// const TransferStateChangeModel = require('../../models/transfer/transferStateChange') +const FxTransferStateChangeModel = require('../../models/fxTransfer/stateChange') const CryptoConditions = require('../../cryptoConditions') const Crypto = require('crypto') const base64url = require('base64url') @@ -87,9 +90,9 @@ const validatePositionAccountByNameAndCurrency = async function (participantName return validationPassed } -const validateDifferentDfsp = (payload) => { +const validateDifferentDfsp = (payerFsp, payeeFsp) => { if (!Config.ENABLE_ON_US_TRANSFERS) { - const isPayerAndPayeeDifferent = (payload.payerFsp.toLowerCase() !== payload.payeeFsp.toLowerCase()) + const isPayerAndPayeeDifferent = (payerFsp.toLowerCase() !== payeeFsp.toLowerCase()) if (!isPayerAndPayeeDifferent) { reasons.push('Payer FSP and Payee FSP should be different, unless on-us tranfers are allowed by the Scheme') return false @@ -98,8 +101,8 @@ const validateDifferentDfsp = (payload) => { return true } -const validateFspiopSourceMatchesPayer = (payload, headers) => { - const matched = (headers && headers['fspiop-source'] && headers['fspiop-source'] === payload.payerFsp) +const validateFspiopSourceMatchesPayer = (payer, headers) => { + const matched = (headers && headers['fspiop-source'] && headers['fspiop-source'] === payer) if (!matched) { reasons.push('FSPIOP-Source header should match Payer') return false @@ -185,7 +188,11 @@ const validateConditionAndExpiration = async (payload) => { return true } -const validatePrepare = async (payload, headers) => { +const isAmountValid = (payload, isFx) => isFx + ? validateAmount(payload.sourceAmount) && validateAmount(payload.targetAmount) + : validateAmount(payload.amount) + +const validatePrepare = async (payload, headers, isFx = false, determiningTransferCheckResult, proxyObligation) => { const histTimerValidatePrepareEnd = Metrics.getHistogram( 'handlers_transfer_validator', 'validatePrepare - Metrics for transfer handler', @@ -199,15 +206,53 @@ const validatePrepare = async (payload, headers) => { validationPassed = false return { validationPassed, reasons } } - validationPassed = (validateFspiopSourceMatchesPayer(payload, headers) && - await validateParticipantByName(payload.payerFsp) && - await validatePositionAccountByNameAndCurrency(payload.payerFsp, payload.amount.currency) && - await validateParticipantByName(payload.payeeFsp) && - await validatePositionAccountByNameAndCurrency(payload.payeeFsp, payload.amount.currency) && - validateAmount(payload.amount) && - await validateConditionAndExpiration(payload) && - validateDifferentDfsp(payload)) + + const initiatingFsp = isFx ? payload.initiatingFsp : payload.payerFsp + const counterPartyFsp = isFx ? payload.counterPartyFsp : payload.payeeFsp + + // Check if determining transfers are failed + if (determiningTransferCheckResult.watchListRecords && determiningTransferCheckResult.watchListRecords.length > 0) { + // Iterate through determiningTransferCheckResult.watchListRecords + for (const watchListRecord of determiningTransferCheckResult.watchListRecords) { + if (isFx) { + throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.NOT_IMPLEMENTED) + } else { + // Check the transfer state of commitRequestId + const latestFxTransferStateChange = await FxTransferStateChangeModel.getByCommitRequestId(watchListRecord.commitRequestId) + if (latestFxTransferStateChange.transferStateId !== Enum.Transfers.TransferInternalState.RECEIVED_FULFIL_DEPENDENT) { + reasons.push('Related FX Transfer is not fulfilled') + validationPassed = false + return { validationPassed, reasons } + } + } + } + } + + // Skip usual validation if preparing a proxy transfer or fxTransfer + if (!(proxyObligation?.isInitiatingFspProxy || proxyObligation?.isCounterPartyFspProxy)) { + validationPassed = ( + validateFspiopSourceMatchesPayer(initiatingFsp, headers) && + isAmountValid(payload, isFx) && + await validateParticipantByName(initiatingFsp) && + await validateParticipantByName(counterPartyFsp) && + await validateConditionAndExpiration(payload) && + validateDifferentDfsp(initiatingFsp, counterPartyFsp) + ) + } else { + validationPassed = true + } + + // validate participant accounts from determiningTransferCheckResult + if (validationPassed && determiningTransferCheckResult) { + for (const participantCurrency of determiningTransferCheckResult.participantCurrencyValidationList) { + if (!await validatePositionAccountByNameAndCurrency(participantCurrency.participantName, participantCurrency.currencyId)) { + validationPassed = false + break // Exit the loop if validation fails + } + } + } histTimerValidatePrepareEnd({ success: true, funcName: 'validatePrepare' }) + return { validationPassed, reasons @@ -241,11 +286,21 @@ const validateParticipantTransferId = async function (participantName, transferI return validationPassed } +const validateParticipantForCommitRequestId = async function (participantName, commitRequestId) { + const fxTransferParticipants = await FxTransferModel.fxTransfer.getFxTransferParticipant(participantName, commitRequestId) + let validationPassed = false + if (Array.isArray(fxTransferParticipants) && fxTransferParticipants.length > 0) { + validationPassed = true + } + return validationPassed +} + module.exports = { validatePrepare, validateById, validateFulfilCondition, validateParticipantByName, reasons, - validateParticipantTransferId + validateParticipantTransferId, + validateParticipantForCommitRequestId } diff --git a/src/lib/cache.js b/src/lib/cache.js index 839ca0a77..d559fc23f 100644 --- a/src/lib/cache.js +++ b/src/lib/cache.js @@ -74,7 +74,7 @@ const initCache = async function () { } const destroyCache = async function () { - catboxMemoryClient.stop() + catboxMemoryClient?.stop() catboxMemoryClient = null } diff --git a/src/lib/config.js b/src/lib/config.js index 5442a4a67..5c9e95526 100644 --- a/src/lib/config.js +++ b/src/lib/config.js @@ -1,4 +1,4 @@ -const RC = require('rc')('CLEDG', require('../../config/default.json')) +const RC = require('parse-strings-in-object')(require('rc')('CLEDG', require('../../config/default.json'))) module.exports = { HOSTNAME: RC.HOSTNAME.replace(/\/$/, ''), @@ -9,8 +9,8 @@ module.exports = { MONGODB_USER: RC.MONGODB.USER, MONGODB_PASSWORD: RC.MONGODB.PASSWORD, MONGODB_DATABASE: RC.MONGODB.DATABASE, - MONGODB_DEBUG: (RC.MONGODB.DEBUG === true || RC.MONGODB.DEBUG === 'true'), - MONGODB_DISABLED: (RC.MONGODB.DISABLED === true || RC.MONGODB.DISABLED === 'true'), + MONGODB_DEBUG: RC.MONGODB.DEBUG === true, + MONGODB_DISABLED: RC.MONGODB.DISABLED === true, AMOUNT: RC.AMOUNT, EXPIRES_TIMEOUT: RC.EXPIRES_TIMEOUT, ERROR_HANDLING: RC.ERROR_HANDLING, @@ -23,6 +23,7 @@ module.exports = { HANDLERS_TIMEOUT_TIMEXP: RC.HANDLERS.TIMEOUT.TIMEXP, HANDLERS_TIMEOUT_TIMEZONE: RC.HANDLERS.TIMEOUT.TIMEZONE, CACHE_CONFIG: RC.CACHE, + PROXY_CACHE_CONFIG: RC.PROXY_CACHE, KAFKA_CONFIG: RC.KAFKA, PARTICIPANT_INITIAL_POSITION: RC.PARTICIPANT_INITIAL_POSITION, RUN_MIGRATIONS: !RC.MIGRATIONS.DISABLED, @@ -69,5 +70,7 @@ module.exports = { debug: RC.DATABASE.DEBUG }, API_DOC_ENDPOINTS_ENABLED: RC.API_DOC_ENDPOINTS_ENABLED || false, + // If this is set to true, payee side currency conversion will not be allowed due to a limitation in the current implementation + PAYEE_PARTICIPANT_CURRENCY_VALIDATION_ENABLED: (RC.PAYEE_PARTICIPANT_CURRENCY_VALIDATION_ENABLED === true || RC.PAYEE_PARTICIPANT_CURRENCY_VALIDATION_ENABLED === 'true'), SETTLEMENT_MODELS: RC.SETTLEMENT_MODELS } diff --git a/src/lib/db.js b/src/lib/db.js index c49361960..fcde740c8 100644 --- a/src/lib/db.js +++ b/src/lib/db.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/lib/enum.js b/src/lib/enum.js index da51ceb02..bbdd27180 100644 --- a/src/lib/enum.js +++ b/src/lib/enum.js @@ -2,8 +2,8 @@ * @file This registers all handlers for the central-ledger API License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -16,7 +16,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . diff --git a/src/lib/enumCached.js b/src/lib/enumCached.js index 6d8667fb7..7a54d6df9 100644 --- a/src/lib/enumCached.js +++ b/src/lib/enumCached.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/lib/healthCheck/subServiceHealth.js b/src/lib/healthCheck/subServiceHealth.js index 2ddc59591..ceeed0a5c 100644 --- a/src/lib/healthCheck/subServiceHealth.js +++ b/src/lib/healthCheck/subServiceHealth.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -26,7 +29,7 @@ const { statusEnum, serviceName } = require('@mojaloop/central-services-shared').HealthCheck.HealthCheckEnums const Logger = require('@mojaloop/central-services-logger') const Consumer = require('@mojaloop/central-services-stream').Util.Consumer - +const ProxyCache = require('../proxyCache') const MigrationLockModel = require('../../models/misc/migrationLock') /** @@ -82,7 +85,17 @@ const getSubServiceHealthDatastore = async () => { } } +const getSubServiceHealthProxyCache = async () => { + const proxyCache = ProxyCache.getCache() + const healthCheck = await proxyCache.healthCheck() + return { + name: 'proxyCache', + status: healthCheck ? statusEnum.OK : statusEnum.DOWN + } +} + module.exports = { getSubServiceHealthBroker, - getSubServiceHealthDatastore + getSubServiceHealthDatastore, + getSubServiceHealthProxyCache } diff --git a/src/lib/proxyCache.js b/src/lib/proxyCache.js new file mode 100644 index 000000000..7000a6702 --- /dev/null +++ b/src/lib/proxyCache.js @@ -0,0 +1,166 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ + +'use strict' +const { createProxyCache } = require('@mojaloop/inter-scheme-proxy-cache-lib') +const { Enum } = require('@mojaloop/central-services-shared') +const ParticipantService = require('../../src/domain/participant') +const Config = require('./config.js') +const { logger } = require('../../src/shared/logger') + +let proxyCache + +const init = () => { + const { type, proxyConfig } = Config.PROXY_CACHE_CONFIG + proxyCache = createProxyCache(type, proxyConfig) +} + +const connect = async () => { + return !proxyCache?.isConnected && getCache().connect() +} + +const disconnect = async () => { + proxyCache?.isConnected && await proxyCache.disconnect() + proxyCache = null +} + +const reset = async () => { + await disconnect() + proxyCache = null +} + +const getCache = () => { + if (!proxyCache) { + init() + } + return proxyCache +} + +/** + * @typedef {Object} ProxyOrParticipant - An object containing the inScheme status, proxyId and FSP name + * + * @property {boolean} inScheme - Is FSP in the scheme. + * @property {string|null} proxyId - Proxy, associated with the FSP, if FSP is not in the scheme. + * @property {string} name - FSP name. + */ + +/** + * Checks if dfspId is in scheme or proxy. + * + * @param {string} dfspId - The DFSP ID to check. + * @param {Object} [options] - { validateCurrencyAccounts: boolean, accounts: [ { currency: string, accountType: Enum.Accounts.LedgerAccountType } ] } + * @returns {ProxyOrParticipant} proxyOrParticipant details + */ +const getFSPProxy = async (dfspId, options = null) => { + logger.debug('Checking if dfspId is in scheme or proxy', { dfspId }) + const participant = await ParticipantService.getByName(dfspId) + let inScheme = !!participant + + if (inScheme && options?.validateCurrencyAccounts) { + logger.debug('Checking if participant currency accounts are active', { dfspId, options, participant }) + let accountsAreActive = false + for (const account of options.accounts) { + accountsAreActive = participant.currencyList.some((currAccount) => { + return ( + currAccount.currencyId === account.currency && + currAccount.ledgerAccountTypeId === account.accountType && + currAccount.isActive === 1 + ) + }) + if (!accountsAreActive) break + } + inScheme = accountsAreActive + } + + return { + inScheme, + proxyId: !participant ? await getCache().lookupProxyByDfspId(dfspId) : null, + name: dfspId + } +} + +const checkSameCreditorDebtorProxy = async (debtorDfspId, creditorDfspId) => { + logger.debug('Checking if debtorDfspId and creditorDfspId are using the same proxy', { debtorDfspId, creditorDfspId }) + const [debtorProxyId, creditorProxyId] = await Promise.all([ + getCache().lookupProxyByDfspId(debtorDfspId), + getCache().lookupProxyByDfspId(creditorDfspId) + ]) + return debtorProxyId && creditorProxyId ? debtorProxyId === creditorProxyId : false +} + +const getProxyParticipantAccountDetails = async (fspName, currency) => { + logger.debug('Getting account details for fspName and currency', { fspName, currency }) + const proxyLookupResult = await getFSPProxy(fspName) + if (proxyLookupResult.inScheme) { + const participantCurrency = await ParticipantService.getAccountByNameAndCurrency( + fspName, + currency, + Enum.Accounts.LedgerAccountType.POSITION + ) + logger.debug("Account details for fspName's currency", { fspName, currency, participantCurrency }) + return { + inScheme: true, + participantCurrencyId: participantCurrency?.participantCurrencyId || null + } + } else { + if (proxyLookupResult.proxyId) { + const participantCurrency = await ParticipantService.getAccountByNameAndCurrency( + proxyLookupResult.proxyId, + currency, + Enum.Accounts.LedgerAccountType.POSITION + ) + logger.debug('Account details for proxy\'s currency', { proxyId: proxyLookupResult.proxyId, currency, participantCurrency }) + return { + inScheme: false, + participantCurrencyId: participantCurrency?.participantCurrencyId || null + } + } + logger.debug('No proxy found for fspName', { fspName }) + return { + inScheme: false, + participantCurrencyId: null + } + } +} + +module.exports = { + reset, // for testing + connect, + disconnect, + getCache, + getFSPProxy, + getProxyParticipantAccountDetails, + checkSameCreditorDebtorProxy +} diff --git a/src/lib/urlParser.js b/src/lib/urlParser.js index a8393795e..f962ffba4 100644 --- a/src/lib/urlParser.js +++ b/src/lib/urlParser.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/bulkTransfer/bulkTransfer.js b/src/models/bulkTransfer/bulkTransfer.js index 7254d4077..9e48bca43 100644 --- a/src/models/bulkTransfer/bulkTransfer.js +++ b/src/models/bulkTransfer/bulkTransfer.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/bulkTransfer/bulkTransferAssociation.js b/src/models/bulkTransfer/bulkTransferAssociation.js index aeea76292..b563303c6 100644 --- a/src/models/bulkTransfer/bulkTransferAssociation.js +++ b/src/models/bulkTransfer/bulkTransferAssociation.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/bulkTransfer/bulkTransferDuplicateCheck.js b/src/models/bulkTransfer/bulkTransferDuplicateCheck.js index 7cb850038..cf9d81afc 100644 --- a/src/models/bulkTransfer/bulkTransferDuplicateCheck.js +++ b/src/models/bulkTransfer/bulkTransferDuplicateCheck.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/bulkTransfer/bulkTransferExtension.js b/src/models/bulkTransfer/bulkTransferExtension.js index 7919ba1e6..f9a6110dc 100644 --- a/src/models/bulkTransfer/bulkTransferExtension.js +++ b/src/models/bulkTransfer/bulkTransferExtension.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/bulkTransfer/bulkTransferFulfilmentDuplicateCheck.js b/src/models/bulkTransfer/bulkTransferFulfilmentDuplicateCheck.js index d022df307..67fdab2fd 100644 --- a/src/models/bulkTransfer/bulkTransferFulfilmentDuplicateCheck.js +++ b/src/models/bulkTransfer/bulkTransferFulfilmentDuplicateCheck.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/bulkTransfer/bulkTransferStateChange.js b/src/models/bulkTransfer/bulkTransferStateChange.js index ccadfb7d3..de1bca1d7 100644 --- a/src/models/bulkTransfer/bulkTransferStateChange.js +++ b/src/models/bulkTransfer/bulkTransferStateChange.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/bulkTransfer/facade.js b/src/models/bulkTransfer/facade.js index 1dc71c90f..558d456eb 100644 --- a/src/models/bulkTransfer/facade.js +++ b/src/models/bulkTransfer/facade.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -51,25 +54,19 @@ const saveBulkTransferReceived = async (payload, participants, stateReason = nul const knex = await Db.getKnex() return await knex.transaction(async (trx) => { - try { - await knex('bulkTransfer').transacting(trx).insert(bulkTransferRecord) - if (payload.extensionList && payload.extensionList.extension) { - const bulkTransferExtensionsRecordList = payload.extensionList.extension.map(ext => { - return { - bulkTransferId: payload.bulkTransferId, - key: ext.key, - value: ext.value - } - }) - await knex.batchInsert('bulkTransferExtension', bulkTransferExtensionsRecordList).transacting(trx) - } - await knex('bulkTransferStateChange').transacting(trx).insert(bulkTransferStateChangeRecord) - await trx.commit - return state - } catch (err) { - await trx.rollback - throw err + await knex('bulkTransfer').transacting(trx).insert(bulkTransferRecord) + if (payload.extensionList && payload.extensionList.extension) { + const bulkTransferExtensionsRecordList = payload.extensionList.extension.map(ext => { + return { + bulkTransferId: payload.bulkTransferId, + key: ext.key, + value: ext.value + } + }) + await knex.batchInsert('bulkTransferExtension', bulkTransferExtensionsRecordList).transacting(trx) } + await knex('bulkTransferStateChange').transacting(trx).insert(bulkTransferStateChangeRecord) + return state }) } catch (err) { Logger.isErrorEnabled && Logger.error(err) @@ -95,26 +92,20 @@ const saveBulkTransferProcessing = async (payload, stateReason = null, isValid = const knex = await Db.getKnex() return await knex.transaction(async (trx) => { - try { - await knex('bulkTransferFulfilment').transacting(trx).insert(bulkTransferFulfilmentRecord) - if (payload.extensionList && payload.extensionList.extension) { - const bulkTransferExtensionsRecordList = payload.extensionList.extension.map(ext => { - return { - bulkTransferId: payload.bulkTransferId, - isFulfilment: true, - key: ext.key, - value: ext.value - } - }) - await knex.batchInsert('bulkTransferExtension', bulkTransferExtensionsRecordList).transacting(trx) - } - await knex('bulkTransferStateChange').transacting(trx).insert(bulkTransferStateChangeRecord) - await trx.commit - return state - } catch (err) { - await trx.rollback - throw err + await knex('bulkTransferFulfilment').transacting(trx).insert(bulkTransferFulfilmentRecord) + if (payload.extensionList && payload.extensionList.extension) { + const bulkTransferExtensionsRecordList = payload.extensionList.extension.map(ext => { + return { + bulkTransferId: payload.bulkTransferId, + isFulfilment: true, + key: ext.key, + value: ext.value + } + }) + await knex.batchInsert('bulkTransferExtension', bulkTransferExtensionsRecordList).transacting(trx) } + await knex('bulkTransferStateChange').transacting(trx).insert(bulkTransferStateChangeRecord) + return state }) } catch (err) { Logger.isErrorEnabled && Logger.error(err) @@ -138,33 +129,27 @@ const saveBulkTransferErrorProcessing = async (payload, stateReason = null, isVa const knex = await Db.getKnex() return await knex.transaction(async (trx) => { - try { - await knex('bulkTransferFulfilment').transacting(trx).insert(bulkTransferFulfilmentRecord) - if (payload.errorInformation.extensionList && payload.errorInformation.extensionList.extension) { - const bulkTransferExtensionsRecordList = payload.errorInformation.extensionList.extension.map(ext => { - return { - bulkTransferId: payload.bulkTransferId, - isFulfilment: true, - key: ext.key, - value: ext.value - } - }) - await knex.batchInsert('bulkTransferExtension', bulkTransferExtensionsRecordList).transacting(trx) - } - const returnedInsertIds = await knex('bulkTransferStateChange').transacting(trx).insert(bulkTransferStateChangeRecord).returning('bulkTransferStateChangeId') - const bulkTransferStateChangeId = returnedInsertIds[0] - const bulkTransferErrorRecord = { - bulkTransferStateChangeId, - errorCode: payload.errorInformation.errorCode, - errorDescription: payload.errorInformation.errorDescription - } - await knex('bulkTransferError').transacting(trx).insert(bulkTransferErrorRecord) - await trx.commit - return state - } catch (err) { - await trx.rollback - throw err + await knex('bulkTransferFulfilment').transacting(trx).insert(bulkTransferFulfilmentRecord) + if (payload.errorInformation.extensionList && payload.errorInformation.extensionList.extension) { + const bulkTransferExtensionsRecordList = payload.errorInformation.extensionList.extension.map(ext => { + return { + bulkTransferId: payload.bulkTransferId, + isFulfilment: true, + key: ext.key, + value: ext.value + } + }) + await knex.batchInsert('bulkTransferExtension', bulkTransferExtensionsRecordList).transacting(trx) + } + const returnedInsertIds = await knex('bulkTransferStateChange').transacting(trx).insert(bulkTransferStateChangeRecord).returning('bulkTransferStateChangeId') + const bulkTransferStateChangeId = returnedInsertIds[0] + const bulkTransferErrorRecord = { + bulkTransferStateChangeId, + errorCode: payload.errorInformation.errorCode, + errorDescription: payload.errorInformation.errorDescription } + await knex('bulkTransferError').transacting(trx).insert(bulkTransferErrorRecord) + return state }) } catch (err) { Logger.isErrorEnabled && Logger.error(err) @@ -188,26 +173,20 @@ const saveBulkTransferAborting = async (payload, stateReason = null) => { const knex = await Db.getKnex() return await knex.transaction(async (trx) => { - try { - await knex('bulkTransferFulfilment').transacting(trx).insert(bulkTransferFulfilmentRecord) - if (payload.extensionList && payload.extensionList.extension) { - const bulkTransferExtensionsRecordList = payload.extensionList.extension.map(ext => { - return { - bulkTransferId: payload.bulkTransferId, - isFulfilment: true, - key: ext.key, - value: ext.value - } - }) - await knex.batchInsert('bulkTransferExtension', bulkTransferExtensionsRecordList).transacting(trx) - } - await knex('bulkTransferStateChange').transacting(trx).insert(bulkTransferStateChangeRecord) - await trx.commit - return state - } catch (err) { - await trx.rollback - throw err + await knex('bulkTransferFulfilment').transacting(trx).insert(bulkTransferFulfilmentRecord) + if (payload.extensionList && payload.extensionList.extension) { + const bulkTransferExtensionsRecordList = payload.extensionList.extension.map(ext => { + return { + bulkTransferId: payload.bulkTransferId, + isFulfilment: true, + key: ext.key, + value: ext.value + } + }) + await knex.batchInsert('bulkTransferExtension', bulkTransferExtensionsRecordList).transacting(trx) } + await knex('bulkTransferStateChange').transacting(trx).insert(bulkTransferStateChangeRecord) + return state }) } catch (err) { Logger.isErrorEnabled && Logger.error(err) diff --git a/src/models/bulkTransfer/individualTransfer.js b/src/models/bulkTransfer/individualTransfer.js index 87a2d3a54..d211eb6af 100644 --- a/src/models/bulkTransfer/individualTransfer.js +++ b/src/models/bulkTransfer/individualTransfer.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/fxTransfer/duplicateCheck.js b/src/models/fxTransfer/duplicateCheck.js new file mode 100644 index 000000000..deda85c93 --- /dev/null +++ b/src/models/fxTransfer/duplicateCheck.js @@ -0,0 +1,188 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ + +const ErrorHandler = require('@mojaloop/central-services-error-handling') +const Metrics = require('@mojaloop/central-services-metrics') +const Db = require('../../lib/db') +const { logger } = require('../../shared/logger') +const { TABLE_NAMES } = require('../../shared/constants') + +const histName = 'model_fx_transfer' + +const getOneByCommitRequestId = async ({ commitRequestId, table, queryName }) => { + const histTimerEnd = Metrics.getHistogram( + histName, + `${queryName} - Metrics for fxTransfer duplicate check model`, + ['success', 'queryName'] + ).startTimer() + logger.debug('get duplicate record', { commitRequestId, table, queryName }) + + try { + const result = await Db.from(table).findOne({ commitRequestId }) + histTimerEnd({ success: true, queryName }) + return result + } catch (err) { + histTimerEnd({ success: false, queryName }) + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} + +const saveCommitRequestIdAndHash = async ({ commitRequestId, hash, table, queryName }) => { + const histTimerEnd = Metrics.getHistogram( + histName, + `${queryName} - Metrics for fxTransfer duplicate check model`, + ['success', 'queryName'] + ).startTimer() + logger.debug('save duplicate record', { commitRequestId, hash, table }) + + try { + const result = await Db.from(table).insert({ commitRequestId, hash }) + histTimerEnd({ success: true, queryName }) + return result + } catch (err) { + histTimerEnd({ success: false, queryName }) + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} + +/** + * @function GetTransferDuplicateCheck + * + * @async + * @description This retrieves the fxTransferDuplicateCheck table record if present + * + * @param {string} commitRequestId - the fxTransfer commitRequestId + * + * @returns {object} - Returns the record from fxTransferDuplicateCheck table, or throws an error if failed + */ +const getFxTransferDuplicateCheck = async (commitRequestId) => { + const table = TABLE_NAMES.fxTransferDuplicateCheck + const queryName = `${table}_getFxTransferDuplicateCheck` + return getOneByCommitRequestId({ commitRequestId, table, queryName }) +} + +/** + * @function SaveTransferDuplicateCheck + * + * @async + * @description This inserts a record into fxTransferDuplicateCheck table + * + * @param {string} commitRequestId - the fxTransfer commitRequestId + * @param {string} hash - the hash of the fxTransfer request payload + * + * @returns {integer} - Returns the database id of the inserted row, or throws an error if failed + */ +const saveFxTransferDuplicateCheck = async (commitRequestId, hash) => { + const table = TABLE_NAMES.fxTransferDuplicateCheck + const queryName = `${table}_saveFxTransferDuplicateCheck` + return saveCommitRequestIdAndHash({ commitRequestId, hash, table, queryName }) +} + +/** + * @function getFxTransferErrorDuplicateCheck + * + * @async + * @description This retrieves the fxTransferErrorDuplicateCheck table record if present + * + * @param {string} commitRequestId - the fxTransfer commitRequestId + * + * @returns {object} - Returns the record from fxTransferDuplicateCheck table, or throws an error if failed + */ +const getFxTransferErrorDuplicateCheck = async (commitRequestId) => { + const table = TABLE_NAMES.fxTransferErrorDuplicateCheck + const queryName = `${table}_getFxTransferErrorDuplicateCheck` + return getOneByCommitRequestId({ commitRequestId, table, queryName }) +} + +/** + * @function saveFxTransferErrorDuplicateCheck + * + * @async + * @description This inserts a record into fxTransferErrorDuplicateCheck table + * + * @param {string} commitRequestId - the fxTransfer commitRequestId + * @param {string} hash - the hash of the fxTransfer request payload + * + * @returns {integer} - Returns the database id of the inserted row, or throws an error if failed + */ +const saveFxTransferErrorDuplicateCheck = async (commitRequestId, hash) => { + const table = TABLE_NAMES.fxTransferErrorDuplicateCheck + const queryName = `${table}_saveFxTransferErrorDuplicateCheck` + return saveCommitRequestIdAndHash({ commitRequestId, hash, table, queryName }) +} + +/** + * @function getFxTransferFulfilmentDuplicateCheck + * + * @async + * @description This retrieves the fxTransferFulfilmentDuplicateCheck table record if present + * + * @param {string} commitRequestId - the fxTransfer commitRequestId + * + * @returns {object} - Returns the record from fxTransferFulfilmentDuplicateCheck table, or throws an error if failed + */ +const getFxTransferFulfilmentDuplicateCheck = async (commitRequestId) => { + const table = TABLE_NAMES.fxTransferFulfilmentDuplicateCheck + const queryName = `${table}_getFxTransferFulfilmentDuplicateCheck` + return getOneByCommitRequestId({ commitRequestId, table, queryName }) +} + +/** + * @function saveFxTransferFulfilmentDuplicateCheck + * + * @async + * @description This inserts a record into fxTransferFulfilmentDuplicateCheck table + * + * @param {string} commitRequestId - the fxTransfer commitRequestId + * @param {string} hash - the hash of the fxTransfer request payload + * + * @returns {integer} - Returns the database id of the inserted row, or throws an error if failed + */ +const saveFxTransferFulfilmentDuplicateCheck = async (commitRequestId, hash) => { + const table = TABLE_NAMES.fxTransferFulfilmentDuplicateCheck + const queryName = `${table}_saveFxTransferFulfilmentDuplicateCheck` + return saveCommitRequestIdAndHash({ commitRequestId, hash, table, queryName }) +} + +module.exports = { + getFxTransferDuplicateCheck, + saveFxTransferDuplicateCheck, + + getFxTransferErrorDuplicateCheck, + saveFxTransferErrorDuplicateCheck, + + getFxTransferFulfilmentDuplicateCheck, + saveFxTransferFulfilmentDuplicateCheck +} diff --git a/src/models/fxTransfer/fxTransfer.js b/src/models/fxTransfer/fxTransfer.js new file mode 100644 index 000000000..324ce7408 --- /dev/null +++ b/src/models/fxTransfer/fxTransfer.js @@ -0,0 +1,594 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ + +const Metrics = require('@mojaloop/central-services-metrics') +const ErrorHandler = require('@mojaloop/central-services-error-handling') +const { Enum, Util } = require('@mojaloop/central-services-shared') +const Time = require('@mojaloop/central-services-shared').Util.Time +const TransferEventAction = Enum.Events.Event.Action + +const { logger } = require('../../shared/logger') +const { TABLE_NAMES } = require('../../shared/constants') +const Db = require('../../lib/db') +const participant = require('../participant/facade') +const ParticipantCachedModel = require('../participant/participantCached') +const TransferExtensionModel = require('./fxTransferExtension') + +const { TransferInternalState } = Enum.Transfers + +const UnsupportedActionText = 'Unsupported action' + +const getByCommitRequestId = async (commitRequestId) => { + logger.debug('get fxTransfer by commitRequestId:', { commitRequestId }) + return Db.from(TABLE_NAMES.fxTransfer).findOne({ commitRequestId }) +} + +const getByDeterminingTransferId = async (determiningTransferId) => { + logger.debug('get fxTransfers by determiningTransferId:', { determiningTransferId }) + return Db.from(TABLE_NAMES.fxTransfer).find({ determiningTransferId }) +} + +const saveFxTransfer = async (record) => { + logger.debug('save fxTransfer record:', { record }) + return Db.from(TABLE_NAMES.fxTransfer).insert(record) +} + +const getByIdLight = async (id) => { + try { + /** @namespace Db.fxTransfer **/ + return await Db.from(TABLE_NAMES.fxTransfer).query(async (builder) => { + return builder + .where({ 'fxTransfer.commitRequestId': id }) + .leftJoin('fxTransferStateChange AS tsc', 'tsc.commitRequestId', 'fxTransfer.commitRequestId') + .leftJoin('transferState AS ts', 'ts.transferStateId', 'tsc.transferStateId') + .leftJoin('fxTransferFulfilment AS tf', 'tf.commitRequestId', 'fxTransfer.commitRequestId') + .select( + 'fxTransfer.*', + 'tsc.fxTransferStateChangeId', + 'tsc.transferStateId AS fxTransferState', + 'ts.enumeration AS fxTransferStateEnumeration', + 'ts.description as fxTransferStateDescription', + 'tsc.reason AS reason', + 'tsc.createdDate AS completedTimestamp', + 'fxTransfer.ilpCondition AS condition', + 'tf.ilpFulfilment AS fulfilment' + ) + .orderBy('tsc.fxTransferStateChangeId', 'desc') + .first() + }) + } catch (err) { + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} + +const getAllDetailsByCommitRequestId = async (commitRequestId) => { + try { + /** @namespace Db.fxTransfer **/ + return await Db.from('fxTransfer').query(async (builder) => { + const transferResult = await builder + .where({ + 'fxTransfer.commitRequestId': commitRequestId, + 'tprt1.name': 'INITIATING_FSP', + 'tprt2.name': 'COUNTER_PARTY_FSP', + 'tprt3.name': 'COUNTER_PARTY_FSP', + 'fpct1.name': 'SOURCE', + 'fpct2.name': 'TARGET' + }) + // INITIATING_FSP + .innerJoin('fxTransferParticipant AS tp1', 'tp1.commitRequestId', 'fxTransfer.commitRequestId') + .innerJoin('transferParticipantRoleType AS tprt1', 'tprt1.transferParticipantRoleTypeId', 'tp1.transferParticipantRoleTypeId') + .innerJoin('participant AS da', 'da.participantId', 'tp1.participantId') + // COUNTER_PARTY_FSP SOURCE currency + .innerJoin('fxTransferParticipant AS tp21', 'tp21.commitRequestId', 'fxTransfer.commitRequestId') + .innerJoin('transferParticipantRoleType AS tprt2', 'tprt2.transferParticipantRoleTypeId', 'tp21.transferParticipantRoleTypeId') + .innerJoin('fxParticipantCurrencyType AS fpct1', 'fpct1.fxParticipantCurrencyTypeId', 'tp21.fxParticipantCurrencyTypeId') + .innerJoin('participant AS ca', 'ca.participantId', 'tp21.participantId') + .leftJoin('participantCurrency AS pc21', 'pc21.participantCurrencyId', 'tp21.participantCurrencyId') + // COUNTER_PARTY_FSP TARGET currency + .innerJoin('fxTransferParticipant AS tp22', 'tp22.commitRequestId', 'fxTransfer.commitRequestId') + .innerJoin('transferParticipantRoleType AS tprt3', 'tprt3.transferParticipantRoleTypeId', 'tp22.transferParticipantRoleTypeId') + .innerJoin('fxParticipantCurrencyType AS fpct2', 'fpct2.fxParticipantCurrencyTypeId', 'tp22.fxParticipantCurrencyTypeId') + // .innerJoin('participantCurrency AS pc22', 'pc22.participantCurrencyId', 'tp22.participantCurrencyId') + // OTHER JOINS + .leftJoin('fxTransferStateChange AS tsc', 'tsc.commitRequestId', 'fxTransfer.commitRequestId') + .leftJoin('transferState AS ts', 'ts.transferStateId', 'tsc.transferStateId') + .leftJoin('fxTransferFulfilment AS tf', 'tf.commitRequestId', 'fxTransfer.commitRequestId') + // .leftJoin('transferError as te', 'te.commitRequestId', 'transfer.commitRequestId') // currently transferError.transferId is PK ensuring one error per transferId + .select( + 'fxTransfer.*', + 'da.participantId AS initiatingFspParticipantId', + 'da.name AS initiatingFspName', + 'da.isProxy AS initiatingFspIsProxy', + // 'pc21.participantCurrencyId AS counterPartyFspSourceParticipantCurrencyId', + // 'pc22.participantCurrencyId AS counterPartyFspTargetParticipantCurrencyId', + 'tp21.participantCurrencyId AS counterPartyFspSourceParticipantCurrencyId', + 'tp22.participantCurrencyId AS counterPartyFspTargetParticipantCurrencyId', + 'ca.participantId AS counterPartyFspParticipantId', + 'ca.name AS counterPartyFspName', + 'ca.isProxy AS counterPartyFspIsProxy', + 'tsc.fxTransferStateChangeId', + 'tsc.transferStateId AS transferState', + 'tsc.reason AS reason', + 'tsc.createdDate AS completedTimestamp', + 'ts.enumeration as transferStateEnumeration', + 'ts.description as transferStateDescription', + 'tf.ilpFulfilment AS fulfilment' + ) + .orderBy('tsc.fxTransferStateChangeId', 'desc') + .first() + if (transferResult) { + transferResult.extensionList = await TransferExtensionModel.getByCommitRequestId(commitRequestId) + if (transferResult.errorCode && transferResult.transferStateEnumeration === Enum.Transfers.TransferState.ABORTED) { + if (!transferResult.extensionList) transferResult.extensionList = [] + transferResult.extensionList.push({ + key: 'cause', + value: `${transferResult.errorCode}: ${transferResult.errorDescription}`.substr(0, 128) + }) + } + transferResult.isTransferReadModel = true + } + return transferResult + }) + } catch (err) { + logger.warn('error in getAllDetailsByCommitRequestId', err) + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} + +// For proxied fxTransfers and transfers in a regional and jurisdictional scenario, proxy participants +// are not expected to have a target currency account, so we need a slightly altered version of the above function. +const getAllDetailsByCommitRequestIdForProxiedFxTransfer = async (commitRequestId) => { + try { + /** @namespace Db.fxTransfer **/ + return await Db.from('fxTransfer').query(async (builder) => { + const transferResult = await builder + .where({ + 'fxTransfer.commitRequestId': commitRequestId, + 'tprt1.name': 'INITIATING_FSP', + 'tprt2.name': 'COUNTER_PARTY_FSP', + 'fpct1.name': 'SOURCE' + }) + // INITIATING_FSP + .innerJoin('fxTransferParticipant AS tp1', 'tp1.commitRequestId', 'fxTransfer.commitRequestId') + .leftJoin('externalParticipant AS ep1', 'ep1.externalParticipantId', 'tp1.externalParticipantId') + .innerJoin('transferParticipantRoleType AS tprt1', 'tprt1.transferParticipantRoleTypeId', 'tp1.transferParticipantRoleTypeId') + .innerJoin('participant AS da', 'da.participantId', 'tp1.participantId') + // COUNTER_PARTY_FSP SOURCE currency + .innerJoin('fxTransferParticipant AS tp21', 'tp21.commitRequestId', 'fxTransfer.commitRequestId') + .leftJoin('externalParticipant AS ep2', 'ep2.externalParticipantId', 'tp21.externalParticipantId') + .innerJoin('transferParticipantRoleType AS tprt2', 'tprt2.transferParticipantRoleTypeId', 'tp21.transferParticipantRoleTypeId') + .innerJoin('fxParticipantCurrencyType AS fpct1', 'fpct1.fxParticipantCurrencyTypeId', 'tp21.fxParticipantCurrencyTypeId') + .innerJoin('participant AS ca', 'ca.participantId', 'tp21.participantId') + .leftJoin('participantCurrency AS pc21', 'pc21.participantCurrencyId', 'tp21.participantCurrencyId') + // .innerJoin('participantCurrency AS pc22', 'pc22.participantCurrencyId', 'tp22.participantCurrencyId') + // OTHER JOINS + .leftJoin('fxTransferStateChange AS tsc', 'tsc.commitRequestId', 'fxTransfer.commitRequestId') + .leftJoin('transferState AS ts', 'ts.transferStateId', 'tsc.transferStateId') + .leftJoin('fxTransferFulfilment AS tf', 'tf.commitRequestId', 'fxTransfer.commitRequestId') + // .leftJoin('transferError as te', 'te.commitRequestId', 'transfer.commitRequestId') // currently transferError.transferId is PK ensuring one error per transferId + .select( + 'fxTransfer.*', + 'da.participantId AS initiatingFspParticipantId', + 'da.name AS initiatingFspName', + 'da.isProxy AS initiatingFspIsProxy', + // 'pc21.participantCurrencyId AS counterPartyFspSourceParticipantCurrencyId', + // 'pc22.participantCurrencyId AS counterPartyFspTargetParticipantCurrencyId', + 'tp21.participantCurrencyId AS counterPartyFspSourceParticipantCurrencyId', + 'ca.participantId AS counterPartyFspParticipantId', + 'ca.name AS counterPartyFspName', + 'ca.isProxy AS counterPartyFspIsProxy', + 'tsc.fxTransferStateChangeId', + 'tsc.transferStateId AS transferState', + 'tsc.reason AS reason', + 'tsc.createdDate AS completedTimestamp', + 'ts.enumeration as transferStateEnumeration', + 'ts.description as transferStateDescription', + 'tf.ilpFulfilment AS fulfilment', + 'ep1.name AS externalInitiatingFspName', + 'ep2.name AS externalCounterPartyFspName' + ) + .orderBy('tsc.fxTransferStateChangeId', 'desc') + .first() + + if (transferResult) { + transferResult.extensionList = await TransferExtensionModel.getByCommitRequestId(commitRequestId) + if (transferResult.errorCode && transferResult.transferStateEnumeration === Enum.Transfers.TransferState.ABORTED) { + if (!transferResult.extensionList) transferResult.extensionList = [] + transferResult.extensionList.push({ + key: 'cause', + value: `${transferResult.errorCode}: ${transferResult.errorDescription}`.substr(0, 128) + }) + } + transferResult.isTransferReadModel = true + } + return transferResult + }) + } catch (err) { + logger.warn('error in getAllDetailsByCommitRequestIdForProxiedFxTransfer', err) + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} + +const getParticipant = async (name, currency) => + participant.getByNameAndCurrency(name, currency, Enum.Accounts.LedgerAccountType.POSITION) + +/** + * Saves prepare fxTransfer details to DB. + * + * @param {Object} payload - Message payload. + * @param {string | null} stateReason - Validation failure reasons. + * @param {Boolean} hasPassedValidation - Is fxTransfer prepare validation passed. + * @param {DeterminingTransferCheckResult} determiningTransferCheckResult - Determining transfer check result. + * @param {ProxyObligation} proxyObligation - The proxy obligation + * @returns {Promise} + */ +const savePreparedRequest = async ( + payload, + stateReason, + hasPassedValidation, + determiningTransferCheckResult, + proxyObligation +) => { + const histTimerSaveFxTransferEnd = Metrics.getHistogram( + 'model_fx_transfer', + 'facade_saveFxTransferPrepared - Metrics for transfer model', + ['success', 'queryName'] + ).startTimer() + + // Substitute out of scheme participants with their proxy representatives + const initiatingFsp = proxyObligation.isInitiatingFspProxy + ? proxyObligation.initiatingFspProxyOrParticipantId.proxyId + : payload.initiatingFsp + const counterPartyFsp = proxyObligation.isCounterPartyFspProxy + ? proxyObligation.counterPartyFspProxyOrParticipantId.proxyId + : payload.counterPartyFsp + + // If creditor(counterPartyFsp) is a proxy in a jurisdictional scenario, + // they would not hold a position account for the target currency, + // so we skip adding records of the target currency for the creditor. + try { + const [initiatingParticipant, counterParticipant1, counterParticipant2] = await Promise.all([ + ParticipantCachedModel.getByName(initiatingFsp), + getParticipant(counterPartyFsp, payload.sourceAmount.currency), + !proxyObligation.isCounterPartyFspProxy ? getParticipant(counterPartyFsp, payload.targetAmount.currency) : null + ]) + + const fxTransferRecord = { + commitRequestId: payload.commitRequestId, + determiningTransferId: payload.determiningTransferId, + sourceAmount: payload.sourceAmount.amount, + sourceCurrency: payload.sourceAmount.currency, + targetAmount: payload.targetAmount.amount, + targetCurrency: payload.targetAmount.currency, + ilpCondition: payload.condition, + expirationDate: Util.Time.getUTCString(new Date(payload.expiration)) + } + + const fxTransferStateChangeRecord = { + commitRequestId: payload.commitRequestId, + transferStateId: hasPassedValidation ? TransferInternalState.RECEIVED_PREPARE : TransferInternalState.INVALID, + reason: stateReason, + createdDate: Util.Time.getUTCString(new Date()) + } + + const initiatingParticipantRecord = { + commitRequestId: payload.commitRequestId, + participantId: initiatingParticipant.participantId, + participantCurrencyId: null, + amount: payload.sourceAmount.amount, + transferParticipantRoleTypeId: Enum.Accounts.TransferParticipantRoleType.INITIATING_FSP, + ledgerEntryTypeId: Enum.Accounts.LedgerEntryType.PRINCIPLE_VALUE + } + if (proxyObligation.isInitiatingFspProxy) { + initiatingParticipantRecord.externalParticipantId = await participant + .getExternalParticipantIdByNameOrCreate(proxyObligation.initiatingFspProxyOrParticipantId) + } + + const counterPartyParticipantRecord1 = { + commitRequestId: payload.commitRequestId, + participantId: counterParticipant1.participantId, + participantCurrencyId: counterParticipant1.participantCurrencyId, + amount: -payload.sourceAmount.amount, + transferParticipantRoleTypeId: Enum.Accounts.TransferParticipantRoleType.COUNTER_PARTY_FSP, + fxParticipantCurrencyTypeId: Enum.Fx.FxParticipantCurrencyType.SOURCE, + ledgerEntryTypeId: Enum.Accounts.LedgerEntryType.PRINCIPLE_VALUE + } + if (proxyObligation.isCounterPartyFspProxy) { + counterPartyParticipantRecord1.externalParticipantId = await participant + .getExternalParticipantIdByNameOrCreate(proxyObligation.counterPartyFspProxyOrParticipantId) + } + + let counterPartyParticipantRecord2 = null + if (!proxyObligation.isCounterPartyFspProxy) { + counterPartyParticipantRecord2 = { + commitRequestId: payload.commitRequestId, + participantId: counterParticipant2.participantId, + participantCurrencyId: counterParticipant2.participantCurrencyId, + amount: -payload.targetAmount.amount, + transferParticipantRoleTypeId: Enum.Accounts.TransferParticipantRoleType.COUNTER_PARTY_FSP, + fxParticipantCurrencyTypeId: Enum.Fx.FxParticipantCurrencyType.TARGET, + ledgerEntryTypeId: Enum.Accounts.LedgerEntryType.PRINCIPLE_VALUE + } + } + + const knex = await Db.getKnex() + if (hasPassedValidation) { + const histTimerSaveTranferTransactionValidationPassedEnd = Metrics.getHistogram( + 'model_fx_transfer', + 'facade_saveFxTransferPrepared_transaction - Metrics for transfer model', + ['success', 'queryName'] + ).startTimer() + return await knex.transaction(async (trx) => { + try { + await knex(TABLE_NAMES.fxTransfer).transacting(trx).insert(fxTransferRecord) + await knex(TABLE_NAMES.fxTransferParticipant).transacting(trx).insert(initiatingParticipantRecord) + await knex(TABLE_NAMES.fxTransferParticipant).transacting(trx).insert(counterPartyParticipantRecord1) + if (!proxyObligation.isCounterPartyFspProxy) { + await knex(TABLE_NAMES.fxTransferParticipant).transacting(trx).insert(counterPartyParticipantRecord2) + } + initiatingParticipantRecord.name = payload.initiatingFsp + counterPartyParticipantRecord1.name = payload.counterPartyFsp + if (!proxyObligation.isCounterPartyFspProxy) { + counterPartyParticipantRecord2.name = payload.counterPartyFsp + } + + await knex(TABLE_NAMES.fxTransferStateChange).transacting(trx).insert(fxTransferStateChangeRecord) + histTimerSaveTranferTransactionValidationPassedEnd({ success: true, queryName: 'facade_saveFxTransferPrepared_transaction' }) + } catch (err) { + histTimerSaveTranferTransactionValidationPassedEnd({ success: false, queryName: 'facade_saveFxTransferPrepared_transaction' }) + throw err + } + }) + } else { + const queryName = 'facade_saveFxTransferPrepared_no_validation' + const histTimerNoValidationEnd = Metrics.getHistogram( + 'model_fx_transfer', + `${queryName} - Metrics for fxTransfer model`, + ['success', 'queryName'] + ).startTimer() + await knex(TABLE_NAMES.fxTransfer).insert(fxTransferRecord) + + try { + await knex(TABLE_NAMES.fxTransferParticipant).insert(initiatingParticipantRecord) + } catch (err) { + logger.warn(`Payer fxTransferParticipant insert error: ${err.message}`) + histTimerNoValidationEnd({ success: false, queryName }) + } + + try { + await knex(TABLE_NAMES.fxTransferParticipant).insert(counterPartyParticipantRecord1) + if (!proxyObligation.isCounterPartyFspProxy) { + await knex(TABLE_NAMES.fxTransferParticipant).insert(counterPartyParticipantRecord2) + } + } catch (err) { + histTimerNoValidationEnd({ success: false, queryName }) + logger.warn(`Payee fxTransferParticipant insert error: ${err.message}`) + } + initiatingParticipantRecord.name = payload.initiatingFsp + counterPartyParticipantRecord1.name = payload.counterPartyFsp + if (!proxyObligation.isCounterPartyFspProxy) { + counterPartyParticipantRecord2.name = payload.counterPartyFsp + } + + try { + await knex(TABLE_NAMES.fxTransferStateChange).insert(fxTransferStateChangeRecord) + histTimerNoValidationEnd({ success: true, queryName }) + } catch (err) { + logger.warn(`fxTransferStateChange insert error: ${err.message}`) + histTimerNoValidationEnd({ success: false, queryName }) + } + } + histTimerSaveFxTransferEnd({ success: true, queryName: 'transfer_model_facade_saveTransferPrepared' }) + } catch (err) { + logger.warn('error in savePreparedRequest', err) + histTimerSaveFxTransferEnd({ success: false, queryName: 'transfer_model_facade_saveTransferPrepared' }) + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} + +const saveFxFulfilResponse = async (commitRequestId, payload, action, fspiopError) => { + const histTimerSaveFulfilResponseEnd = Metrics.getHistogram( + 'fx_model_transfer', + 'facade_saveFxFulfilResponse - Metrics for fxTransfer model', + ['success', 'queryName'] + ).startTimer() + + let state + let isFulfilment = false + let isError = false + // const errorCode = fspiopError && fspiopError.errorInformation && fspiopError.errorInformation.errorCode + const errorDescription = fspiopError && fspiopError.errorInformation && fspiopError.errorInformation.errorDescription + let extensionList + switch (action) { + case TransferEventAction.FX_COMMIT: + case TransferEventAction.FX_RESERVE: + case TransferEventAction.FX_FORWARDED: + state = TransferInternalState.RECEIVED_FULFIL_DEPENDENT + extensionList = payload && payload.extensionList + isFulfilment = true + break + case TransferEventAction.FX_REJECT: + state = TransferInternalState.RECEIVED_REJECT + extensionList = payload && payload.extensionList + isFulfilment = true + break + + case TransferEventAction.FX_ABORT_VALIDATION: + case TransferEventAction.FX_ABORT: + state = TransferInternalState.RECEIVED_ERROR + extensionList = payload && payload.errorInformation && payload.errorInformation.extensionList + isError = true + break + default: + throw ErrorHandler.Factory.createInternalServerFSPIOPError(UnsupportedActionText) + } + const completedTimestamp = Time.getUTCString((payload.completedTimestamp && new Date(payload.completedTimestamp)) || new Date()) + const transactionTimestamp = Time.getUTCString(new Date()) + const result = { + savePayeeTransferResponseExecuted: false + } + + const fxTransferFulfilmentRecord = { + commitRequestId, + ilpFulfilment: payload.fulfilment || null, + completedDate: completedTimestamp, + isValid: !fspiopError, + settlementWindowId: null, + createdDate: transactionTimestamp + } + let fxTransferExtensionRecordsList = [] + if (extensionList && extensionList.extension) { + fxTransferExtensionRecordsList = extensionList.extension.map(ext => { + return { + commitRequestId, + key: ext.key, + value: ext.value, + isFulfilment, + isError + } + }) + } + const fxTransferStateChangeRecord = { + commitRequestId, + transferStateId: state, + reason: errorDescription, + createdDate: transactionTimestamp + } + + try { + /** @namespace Db.getKnex **/ + const knex = await Db.getKnex() + const histTFxFulfilResponseValidationPassedEnd = Metrics.getHistogram( + 'model_transfer', + 'facade_saveTransferPrepared_transaction - Metrics for transfer model', + ['success', 'queryName'] + ).startTimer() + + await knex.transaction(async (trx) => { + try { + if (!fspiopError && [TransferEventAction.FX_COMMIT, TransferEventAction.FX_RESERVE].includes(action)) { + const res = await Db.from('settlementWindow').query(builder => { + return builder + .leftJoin('settlementWindowStateChange AS swsc', 'swsc.settlementWindowStateChangeId', 'settlementWindow.currentStateChangeId') + .select( + 'settlementWindow.settlementWindowId', + 'swsc.settlementWindowStateId as state', + 'swsc.reason as reason', + 'settlementWindow.createdDate as createdDate', + 'swsc.createdDate as changedDate' + ) + .where('swsc.settlementWindowStateId', 'OPEN') + .orderBy('changedDate', 'desc') + }) + fxTransferFulfilmentRecord.settlementWindowId = res[0].settlementWindowId + logger.debug('saveFxFulfilResponse::settlementWindowId') + } + if (isFulfilment) { + await knex('fxTransferFulfilment').transacting(trx).insert(fxTransferFulfilmentRecord) + result.fxTransferFulfilmentRecord = fxTransferFulfilmentRecord + logger.debug('saveFxFulfilResponse::fxTransferFulfilment') + } + if (fxTransferExtensionRecordsList.length > 0) { + await knex('fxTransferExtension').transacting(trx).insert(fxTransferExtensionRecordsList) + result.fxTransferExtensionRecordsList = fxTransferExtensionRecordsList + logger.debug('saveFxFulfilResponse::transferExtensionRecordsList') + } + await knex('fxTransferStateChange').transacting(trx).insert(fxTransferStateChangeRecord) + result.fxTransferStateChangeRecord = fxTransferStateChangeRecord + logger.debug('saveFxFulfilResponse::fxTransferStateChange') + histTFxFulfilResponseValidationPassedEnd({ success: true, queryName: 'facade_saveFxFulfilResponse_transaction' }) + result.savePayeeTransferResponseExecuted = true + logger.debug('saveFxFulfilResponse::success') + } catch (err) { + histTFxFulfilResponseValidationPassedEnd({ success: false, queryName: 'facade_saveFxFulfilResponse_transaction' }) + logger.error('saveFxFulfilResponse::failure') + throw err + } + }) + histTimerSaveFulfilResponseEnd({ success: true, queryName: 'facade_saveFulfilResponse' }) + return result + } catch (err) { + logger.warn('error in saveFxFulfilResponse', err) + histTimerSaveFulfilResponseEnd({ success: false, queryName: 'facade_saveFulfilResponse' }) + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} + +const updateFxPrepareReservedForwarded = async function (commitRequestId) { + try { + const knex = await Db.getKnex() + return await knex('fxTransferStateChange') + .insert({ + commitRequestId, + transferStateId: TransferInternalState.RESERVED_FORWARDED, + reason: null, + createdDate: Time.getUTCString(new Date()) + }) + } catch (err) { + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} + +const getFxTransferParticipant = async (participantName, commitRequestId) => { + try { + return Db.from('participant').query(async (builder) => { + return builder + .where({ + 'ftp.commitRequestId': commitRequestId, + 'participant.name': participantName, + 'participant.isActive': 1 + }) + .innerJoin('fxTransferParticipant AS ftp', 'ftp.participantId', 'participant.participantId') + .select( + 'ftp.*' + ) + }) + } catch (err) { + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} + +module.exports = { + getByCommitRequestId, + getByDeterminingTransferId, + getByIdLight, + getAllDetailsByCommitRequestId, + getAllDetailsByCommitRequestIdForProxiedFxTransfer, + getFxTransferParticipant, + savePreparedRequest, + saveFxFulfilResponse, + saveFxTransfer, + updateFxPrepareReservedForwarded +} diff --git a/src/models/fxTransfer/fxTransferError.js b/src/models/fxTransfer/fxTransferError.js new file mode 100644 index 000000000..8568a8c73 --- /dev/null +++ b/src/models/fxTransfer/fxTransferError.js @@ -0,0 +1,56 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Vijaya Kumar Guthi + -------------- + ******/ + +'use strict' + +/** + * @module src/models/transfer/transferError/ + */ + +const Db = require('../../lib/db') +const Logger = require('@mojaloop/central-services-logger') + +const getByCommitRequestId = async (id) => { + try { + const fxTransferError = await Db.from('fxTransferError').query(async (builder) => { + const result = builder + .where({ commitRequestId: id }) + .select('*') + .first() + return result + }) + fxTransferError.errorCode = fxTransferError.errorCode.toString() + return fxTransferError + } catch (err) { + Logger.isErrorEnabled && Logger.error(err) + throw err + } +} + +module.exports = { + getByCommitRequestId +} diff --git a/src/models/fxTransfer/fxTransferExtension.js b/src/models/fxTransfer/fxTransferExtension.js new file mode 100644 index 000000000..58081b1dc --- /dev/null +++ b/src/models/fxTransfer/fxTransferExtension.js @@ -0,0 +1,44 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Infitx + - Kalin Krustev + -------------- + ******/ + +'use strict' + +const Db = require('../../lib/db') +const ErrorHandler = require('@mojaloop/central-services-error-handling') + +const getByCommitRequestId = async (commitRequestId, isFulfilment = false, isError = false) => { + try { + return await Db.from('fxTransferExtension').find({ commitRequestId, isFulfilment, isError }) + } catch (err) { + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} + +module.exports = { + getByCommitRequestId +} diff --git a/src/models/fxTransfer/fxTransferTimeout.js b/src/models/fxTransfer/fxTransferTimeout.js new file mode 100644 index 000000000..0c71ab135 --- /dev/null +++ b/src/models/fxTransfer/fxTransferTimeout.js @@ -0,0 +1,71 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Vijaya Kumar Guthi + -------------- + ******/ + +'use strict' + +const Db = require('../../lib/db') +const Logger = require('@mojaloop/central-services-logger') +const Enum = require('@mojaloop/central-services-shared').Enum +const TS = Enum.Transfers.TransferInternalState + +const cleanup = async () => { + Logger.isDebugEnabled && Logger.debug('cleanup fxTransferTimeout') + try { + const knex = await Db.getKnex() + + const ttIdList = await Db.from('fxTransferTimeout').query(async (builder) => { + const b = await builder + .whereIn('tsc.transferStateId', [`${TS.RECEIVED_FULFIL}`, `${TS.COMMITTED}`, `${TS.FAILED}`, `${TS.RESERVED_TIMEOUT}`, + `${TS.RECEIVED_REJECT}`, `${TS.EXPIRED_PREPARED}`, `${TS.EXPIRED_RESERVED}`, `${TS.ABORTED_REJECTED}`, `${TS.ABORTED_ERROR}`]) + .innerJoin( + knex('fxTransferTimeout AS tt1') + .select('tsc1.commitRequestId') + .max('tsc1.fxTransferStateChangeId AS maxFxTransferStateChangeId') + .innerJoin('fxTransferStateChange AS tsc1', 'tsc1.commitRequestId', 'tt1.commitRequestId') + .groupBy('tsc1.commitRequestId').as('ts'), 'ts.commitRequestId', 'fxTransferTimeout.commitRequestId' + ) + .innerJoin('fxTransferStateChange AS tsc', 'tsc.fxTransferStateChangeId', 'ts.maxFxTransferStateChangeId') + .select('fxTransferTimeout.fxTransferTimeoutId') + return b + }) + + await Db.from('fxTransferTimeout').query(async (builder) => { + const b = await builder + .whereIn('fxTransferTimeoutId', ttIdList.map(elem => elem.fxTransferTimeoutId)) + .del() + return b + }) + return ttIdList + } catch (err) { + Logger.isErrorEnabled && Logger.error(err) + throw err + } +} + +module.exports = { + cleanup +} diff --git a/src/models/fxTransfer/index.js b/src/models/fxTransfer/index.js new file mode 100644 index 000000000..526024f58 --- /dev/null +++ b/src/models/fxTransfer/index.js @@ -0,0 +1,50 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ + +const duplicateCheck = require('./duplicateCheck') +const fxTransfer = require('./fxTransfer') +const stateChange = require('./stateChange') +const watchList = require('./watchList') +const fxTransferTimeout = require('./fxTransferTimeout') +const fxTransferError = require('./fxTransferError') + +module.exports = { + duplicateCheck, + fxTransfer, + stateChange, + watchList, + fxTransferTimeout, + fxTransferError +} diff --git a/src/models/fxTransfer/stateChange.js b/src/models/fxTransfer/stateChange.js new file mode 100644 index 000000000..8c1283788 --- /dev/null +++ b/src/models/fxTransfer/stateChange.js @@ -0,0 +1,81 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ + +const ErrorHandler = require('@mojaloop/central-services-error-handling') +const TransferError = require('../../models/transfer/transferError') +const Db = require('../../lib/db') +const { TABLE_NAMES } = require('../../shared/constants') +const { logger } = require('../../shared/logger') + +const table = TABLE_NAMES.fxTransferStateChange + +const getByCommitRequestId = async (id) => { + return await Db.from(table).query(async (builder) => { + return builder + .where({ 'fxTransferStateChange.commitRequestId': id }) + .select('fxTransferStateChange.*') + .orderBy('fxTransferStateChangeId', 'desc') + .first() + }) +} + +const logTransferError = async (id, errorCode, errorDescription) => { + try { + const stateChange = await getByCommitRequestId(id) + return TransferError.insert(id, stateChange?.fxTransferStateChangeId, errorCode, errorDescription) + } catch (err) { + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} + +const getLatest = async () => { + try { + return await Db.from('fxTransferStateChange').query(async (builder) => { + return builder + .select('fxTransferStateChangeId') + .orderBy('fxTransferStateChangeId', 'desc') + .first() + }) + } catch (err) { + logger.error('getLatest::fxTransferStateChange', err) + throw err + } +} + +module.exports = { + getByCommitRequestId, + logTransferError, + getLatest +} diff --git a/src/models/fxTransfer/watchList.js b/src/models/fxTransfer/watchList.js new file mode 100644 index 000000000..1e057d6a1 --- /dev/null +++ b/src/models/fxTransfer/watchList.js @@ -0,0 +1,52 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + * Vijay Kumar Guthi + -------------- + ******/ + +'use strict' + +const Db = require('../../lib/db') +const { TABLE_NAMES } = require('../../shared/constants') +const { logger } = require('../../shared/logger') + +const getItemInWatchListByCommitRequestId = async (commitRequestId) => { + logger.debug(`get item in watch list (commitRequestId=${commitRequestId})`) + return Db.from(TABLE_NAMES.fxWatchList).findOne({ commitRequestId }) +} + +const getItemsInWatchListByDeterminingTransferId = async (determiningTransferId) => { + logger.debug(`get item in watch list (determiningTransferId=${determiningTransferId})`) + return Db.from(TABLE_NAMES.fxWatchList).find({ determiningTransferId }) +} + +const addToWatchList = async (record) => { + logger.debug('add to fx watch list', record) + return Db.from(TABLE_NAMES.fxWatchList).insert(record) +} + +module.exports = { + getItemInWatchListByCommitRequestId, + getItemsInWatchListByDeterminingTransferId, + addToWatchList +} diff --git a/src/models/ilpPackets/ilpPacket.js b/src/models/ilpPackets/ilpPacket.js index 358763bb7..ac03b9b13 100644 --- a/src/models/ilpPackets/ilpPacket.js +++ b/src/models/ilpPackets/ilpPacket.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/ledgerAccountType/ledgerAccountType.js b/src/models/ledgerAccountType/ledgerAccountType.js index 4b2795473..4b151093c 100644 --- a/src/models/ledgerAccountType/ledgerAccountType.js +++ b/src/models/ledgerAccountType/ledgerAccountType.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -35,25 +38,19 @@ const ErrorHandler = require('@mojaloop/central-services-error-handling') exports.getLedgerAccountByName = async (name, trx = null) => { try { const knex = Db.getKnex() - const trxFunction = async (trx, doCommit = true) => { + const trxFunction = async (trx) => { try { const ledgerAccountType = await knex('ledgerAccountType') .select() .where('name', name) .transacting(trx) - if (doCommit) { - await trx.commit - } return ledgerAccountType.length > 0 ? ledgerAccountType[0] : null } catch (err) { - if (doCommit) { - await trx.rollback - } throw ErrorHandler.Factory.reformatFSPIOPError(err) } } if (trx) { - return trxFunction(trx, false) + return trxFunction(trx) } else { return knex.transaction(trxFunction) } @@ -66,25 +63,19 @@ exports.getLedgerAccountByName = async (name, trx = null) => { exports.getLedgerAccountsByName = async (names, trx = null) => { try { const knex = Db.getKnex() - const trxFunction = async (trx, doCommit = true) => { + const trxFunction = async (trx) => { try { const ledgerAccountTypes = await knex('ledgerAccountType') .select('name') .whereIn('name', names) .transacting(trx) - if (doCommit) { - await trx.commit - } return ledgerAccountTypes } catch (err) { - if (doCommit) { - await trx.rollback - } throw ErrorHandler.Factory.reformatFSPIOPError(err) } } if (trx) { - return trxFunction(trx, false) + return trxFunction(trx) } else { return knex.transaction(trxFunction) } @@ -97,7 +88,7 @@ exports.getLedgerAccountsByName = async (names, trx = null) => { exports.bulkInsert = async (records, trx = null) => { try { const knex = Db.getKnex() - const trxFunction = async (trx, doCommit = true) => { + const trxFunction = async (trx) => { try { await knex('ledgerAccountType') .insert(records) @@ -107,19 +98,13 @@ exports.bulkInsert = async (records, trx = null) => { .from('ledgerAccountType') .whereIn('name', recordsNames) .transacting(trx) - if (doCommit) { - await trx.commit - } return createdIds.map(record => record.ledgerAccountTypeId) } catch (err) { - if (doCommit) { - await trx.rollback - } throw ErrorHandler.Factory.reformatFSPIOPError(err) } } if (trx) { - return trxFunction(trx, false) + return trxFunction(trx) } else { return knex.transaction(trxFunction) } @@ -131,7 +116,7 @@ exports.bulkInsert = async (records, trx = null) => { exports.create = async (name, description, isActive, isSettleable, trx = null) => { try { const knex = Db.getKnex() - const trxFunction = async (trx, doCommit = true) => { + const trxFunction = async (trx) => { try { await knex('ledgerAccountType') .insert({ @@ -145,19 +130,13 @@ exports.create = async (name, description, isActive, isSettleable, trx = null) = .from('ledgerAccountType') .where('name', name) .transacting(trx) - if (doCommit) { - await trx.commit - } return createdId[0].ledgerAccountTypeId } catch (err) { - if (doCommit) { - await trx.rollback() - } throw ErrorHandler.Factory.reformatFSPIOPError(err) } } if (trx) { - return trxFunction(trx, false) + return trxFunction(trx) } else { return knex.transaction(trxFunction) } diff --git a/src/models/misc/migrationLock.js b/src/models/misc/migrationLock.js index e482c1443..7f00dc14b 100644 --- a/src/models/misc/migrationLock.js +++ b/src/models/misc/migrationLock.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/misc/segment.js b/src/models/misc/segment.js index 60250ae5a..0bf946c40 100644 --- a/src/models/misc/segment.js +++ b/src/models/misc/segment.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -26,7 +29,6 @@ const Db = require('../../lib/db') const ErrorHandler = require('@mojaloop/central-services-error-handling') -// const Logger = require('@mojaloop/central-services-logger') const getByParams = async (params) => { try { diff --git a/src/models/participant/externalParticipant.js b/src/models/participant/externalParticipant.js new file mode 100644 index 000000000..6fc6b7038 --- /dev/null +++ b/src/models/participant/externalParticipant.js @@ -0,0 +1,98 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Gates Foundation + - Name Surname + + * Eugen Klymniuk + -------------- + **********/ + +const ErrorHandler = require('@mojaloop/central-services-error-handling') +const Db = require('../../lib/db') +const { logger } = require('../../shared/logger') +const { TABLE_NAMES, DB_ERROR_CODES } = require('../../shared/constants') + +const TABLE = TABLE_NAMES.externalParticipant +const ID_FIELD = 'externalParticipantId' + +const log = logger.child(`DB#${TABLE}`) + +const create = async ({ name, proxyId }) => { + try { + const result = await Db.from(TABLE).insert({ name, proxyId }) + log.debug('create result:', { result }) + return result + } catch (err) { + if (err.code === DB_ERROR_CODES.duplicateEntry) { + log.warn('duplicate entry for externalParticipant. Skip inserting', { name, proxyId }) + return null + } + log.error('error in create', err) + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} + +const getAll = async (options = {}) => { + try { + const result = await Db.from(TABLE).find({}, options) + log.debug('getAll result:', { result }) + return result + } catch (err) /* istanbul ignore next */ { + log.error('error in getAll:', err) + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} + +const getOneBy = async (criteria, options) => { + try { + const result = await Db.from(TABLE).findOne(criteria, options) + log.debug('getOneBy result:', { criteria, result }) + return result + } catch (err) /* istanbul ignore next */ { + log.error('error in getOneBy:', err) + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} +const getById = async (id, options = {}) => getOneBy({ [ID_FIELD]: id }, options) +const getByName = async (name, options = {}) => getOneBy({ name }, options) + +const destroyBy = async (criteria) => { + try { + const result = await Db.from(TABLE).destroy(criteria) + log.debug('destroyBy result:', { criteria, result }) + return result + } catch (err) /* istanbul ignore next */ { + log.error('error in destroyBy', err) + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} +const destroyById = async (id) => destroyBy({ [ID_FIELD]: id }) +const destroyByName = async (name) => destroyBy({ name }) + +module.exports = { + create, + getAll, + getById, + getByName, + destroyById, + destroyByName +} diff --git a/src/models/participant/externalParticipantCached.js b/src/models/participant/externalParticipantCached.js new file mode 100644 index 000000000..d83d94805 --- /dev/null +++ b/src/models/participant/externalParticipantCached.js @@ -0,0 +1,151 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Gates Foundation + - Name Surname + + * Eugen Klymniuk + -------------- + **********/ + +const ErrorHandler = require('@mojaloop/central-services-error-handling') +const Metrics = require('@mojaloop/central-services-metrics') +const cache = require('../../lib/cache') +const externalParticipantModel = require('./externalParticipant') + +let cacheClient +let epAllCacheKey + +const buildUnifiedCachedData = (allExternalParticipants) => { + // build indexes - optimization for byId and byName access + const indexById = {} + const indexByName = {} + + allExternalParticipants.forEach(({ createdDate, ...ep }) => { + indexById[ep.externalParticipantId] = ep + indexByName[ep.name] = ep + }) + + // build unified structure - indexes + data + return { + indexById, + indexByName, + allExternalParticipants + } +} + +const getExternalParticipantsCached = async () => { + const queryName = 'model_getExternalParticipantsCached' + const histTimer = Metrics.getHistogram( + 'model_externalParticipant', + `${queryName} - Metrics for externalParticipant model`, + ['success', 'queryName', 'hit'] + ).startTimer() + + let cachedParticipants = cacheClient.get(epAllCacheKey) + const hit = !!cachedParticipants + + if (!cachedParticipants) { + const allParticipants = await externalParticipantModel.getAll() + cachedParticipants = buildUnifiedCachedData(allParticipants) + cacheClient.set(epAllCacheKey, cachedParticipants) + } else { + // unwrap participants list from catbox structure + cachedParticipants = cachedParticipants.item + } + histTimer({ success: true, queryName, hit }) + + return cachedParticipants +} + +/* + Public API +*/ +const initialize = () => { + /* Register as cache client */ + const cacheClientMeta = { + id: 'externalParticipants', + preloadCache: getExternalParticipantsCached + } + + cacheClient = cache.registerCacheClient(cacheClientMeta) + epAllCacheKey = cacheClient.createKey('all') +} + +const invalidateCache = async () => { + cacheClient.drop(epAllCacheKey) +} + +const getById = async (id) => { + try { + const cachedParticipants = await getExternalParticipantsCached() + return cachedParticipants.indexById[id] + } catch (err) /* istanbul ignore next */ { + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} + +const getByName = async (name) => { + try { + const cachedParticipants = await getExternalParticipantsCached() + return cachedParticipants.indexByName[name] + } catch (err) /* istanbul ignore next */ { + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} + +const getAll = async () => { + try { + const cachedParticipants = await getExternalParticipantsCached() + return cachedParticipants.allExternalParticipants + } catch (err) /* istanbul ignore next */ { + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} + +const withInvalidate = (theFunctionName) => { + return async (...args) => { + try { + const result = await externalParticipantModel[theFunctionName](...args) + await invalidateCache() + return result + } catch (err) /* istanbul ignore next */ { + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } + } +} + +const create = withInvalidate('create') +const destroyById = withInvalidate('destroyById') +const destroyByName = withInvalidate('destroyByName') + +module.exports = { + initialize, + invalidateCache, + + getAll, + getById, + getByName, + + create, + destroyById, + destroyByName +} diff --git a/src/models/participant/facade.js b/src/models/participant/facade.js index cf68cc666..9059c29a5 100644 --- a/src/models/participant/facade.js +++ b/src/models/participant/facade.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -28,17 +31,20 @@ * @module src/models/participant/facade/ */ -const Db = require('../../lib/db') const Time = require('@mojaloop/central-services-shared').Util.Time +const { Enum } = require('@mojaloop/central-services-shared') const ErrorHandler = require('@mojaloop/central-services-error-handling') const Metrics = require('@mojaloop/central-services-metrics') + +const Db = require('../../lib/db') const Cache = require('../../lib/cache') const ParticipantModelCached = require('../../models/participant/participantCached') const ParticipantCurrencyModelCached = require('../../models/participant/participantCurrencyCached') const ParticipantLimitCached = require('../../models/participant/participantLimitCached') +const externalParticipantModelCached = require('../../models/participant/externalParticipantCached') const Config = require('../../lib/config') const SettlementModelModel = require('../settlement/settlementModel') -const { Enum } = require('@mojaloop/central-services-shared') +const { logger } = require('../../shared/logger') const getByNameAndCurrency = async (name, currencyId, ledgerAccountTypeId, isCurrencyActive) => { const histTimerParticipantGetByNameAndCurrencyEnd = Metrics.getHistogram( @@ -106,6 +112,72 @@ const getByNameAndCurrency = async (name, currencyId, ledgerAccountTypeId, isCur } } +const getByIDAndCurrency = async (participantId, currencyId, ledgerAccountTypeId, isCurrencyActive) => { + const histTimerParticipantGetByIDAndCurrencyEnd = Metrics.getHistogram( + 'model_participant', + 'facade_getByIDAndCurrency - Metrics for participant model', + ['success', 'queryName'] + ).startTimer() + + try { + let participant + if (Cache.isCacheEnabled()) { + /* Cached version - fetch data from Models (which we trust are cached) */ + /* find paricipant by ID */ + participant = await ParticipantModelCached.getById(participantId) + if (participant) { + /* use the paricipant id and incoming params to prepare the filter */ + const searchFilter = { + participantId, + currencyId, + ledgerAccountTypeId + } + if (isCurrencyActive !== undefined) { + searchFilter.isActive = isCurrencyActive + } + + /* find the participantCurrency by prepared filter */ + const participantCurrency = await ParticipantCurrencyModelCached.findOneByParams(searchFilter) + + if (participantCurrency) { + /* mix requested data from participantCurrency */ + participant.participantCurrencyId = participantCurrency.participantCurrencyId + participant.currencyId = participantCurrency.currencyId + participant.currencyIsActive = participantCurrency.isActive + } + } + } else { + /* Non-cached version - direct call to DB */ + participant = await Db.from('participant').query(async (builder) => { + let b = builder + .where({ 'participant.participantId': participantId }) + .andWhere({ 'pc.currencyId': currencyId }) + .andWhere({ 'pc.ledgerAccountTypeId': ledgerAccountTypeId }) + .innerJoin('participantCurrency AS pc', 'pc.participantId', 'participant.participantId') + .select( + 'participant.*', + 'pc.participantCurrencyId', + 'pc.currencyId', + 'pc.isActive AS currencyIsActive' + ) + .first() + + if (isCurrencyActive !== undefined) { + b = b.andWhere({ 'pc.isActive': isCurrencyActive }) + } + return b + }) + } + + histTimerParticipantGetByIDAndCurrencyEnd({ success: true, queryName: 'facade_getByIDAndCurrency' }) + + return participant + } catch (err) { + histTimerParticipantGetByIDAndCurrencyEnd({ success: false, queryName: 'facade_getByIDAndCurrency' }) + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} + const getParticipantLimitByParticipantIdAndCurrencyId = async (participantId, currencyId, ledgerAccountTypeId) => { try { return await Db.from('participant').query(async (builder) => { @@ -259,34 +331,30 @@ const addEndpoint = async (participantId, endpoint) => { try { const knex = Db.getKnex() return knex.transaction(async trx => { - try { - const endpointType = await knex('endpointType').where({ name: endpoint.type, isActive: 1 }).select('endpointTypeId').first() - // let endpointType = await trx.first('endpointTypeId').from('endpointType').where({ 'name': endpoint.type, 'isActive': 1 }) + const endpointType = await knex('endpointType').where({ + name: endpoint.type, + isActive: 1 + }).select('endpointTypeId').first() - const existingEndpoint = await knex('participantEndpoint').transacting(trx).forUpdate().select('*') - .where({ - participantId, - endpointTypeId: endpointType.endpointTypeId, - isActive: 1 - }) - if (Array.isArray(existingEndpoint) && existingEndpoint.length > 0) { - await knex('participantEndpoint').transacting(trx).update({ isActive: 0 }).where('participantEndpointId', existingEndpoint[0].participantEndpointId) - } - const newEndpoint = { + const existingEndpoint = await knex('participantEndpoint').transacting(trx).forUpdate().select('*') + .where({ participantId, endpointTypeId: endpointType.endpointTypeId, - value: endpoint.value, - isActive: 1, - createdBy: 'unknown' - } - const result = await knex('participantEndpoint').transacting(trx).insert(newEndpoint) - newEndpoint.participantEndpointId = result[0] - await trx.commit - return newEndpoint - } catch (err) { - await trx.rollback - throw err + isActive: 1 + }) + if (Array.isArray(existingEndpoint) && existingEndpoint.length > 0) { + await knex('participantEndpoint').transacting(trx).update({ isActive: 0 }).where('participantEndpointId', existingEndpoint[0].participantEndpointId) + } + const newEndpoint = { + participantId, + endpointTypeId: endpointType.endpointTypeId, + value: endpoint.value, + isActive: 1, + createdBy: 'unknown' } + const result = await knex('participantEndpoint').transacting(trx).insert(newEndpoint) + newEndpoint.participantEndpointId = result[0] + return newEndpoint }) } catch (err) { throw ErrorHandler.Factory.reformatFSPIOPError(err) @@ -413,73 +481,67 @@ const addLimitAndInitialPosition = async (participantCurrencyId, settlementAccou try { const knex = Db.getKnex() return knex.transaction(async trx => { - try { - const limitType = await knex('participantLimitType').where({ name: limitPositionObj.limit.type, isActive: 1 }).select('participantLimitTypeId').first() - const participantLimit = { - participantCurrencyId, - participantLimitTypeId: limitType.participantLimitTypeId, - value: limitPositionObj.limit.value, - isActive: 1, - createdBy: 'unknown' - } - const result = await knex('participantLimit').transacting(trx).insert(participantLimit) - participantLimit.participantLimitId = result[0] - - const allSettlementModels = await SettlementModelModel.getAll() - const settlementModels = allSettlementModels.filter(model => model.currencyId === limitPositionObj.currency) - if (Array.isArray(settlementModels) && settlementModels.length > 0) { - for (const settlementModel of settlementModels) { - const positionAccount = await getByNameAndCurrency(limitPositionObj.name, limitPositionObj.currency, settlementModel.ledgerAccountTypeId) - const settlementAccount = await getByNameAndCurrency(limitPositionObj.name, limitPositionObj.currency, settlementModel.settlementAccountTypeId) - - const participantPosition = { - participantCurrencyId: positionAccount.participantCurrencyId, - value: (settlementModel.ledgerAccountTypeId === Enum.Accounts.LedgerAccountType.POSITION ? limitPositionObj.initialPosition : 0), - reservedValue: 0 - } - await knex('participantPosition').transacting(trx).insert(participantPosition) + const limitType = await knex('participantLimitType').where({ name: limitPositionObj.limit.type, isActive: 1 }).select('participantLimitTypeId').first() + const participantLimit = { + participantCurrencyId, + participantLimitTypeId: limitType.participantLimitTypeId, + value: limitPositionObj.limit.value, + isActive: 1, + createdBy: 'unknown' + } + const result = await knex('participantLimit').transacting(trx).insert(participantLimit) + participantLimit.participantLimitId = result[0] + + const allSettlementModels = await SettlementModelModel.getAll() + const settlementModels = allSettlementModels.filter(model => model.currencyId === limitPositionObj.currency) + if (Array.isArray(settlementModels) && settlementModels.length > 0) { + for (const settlementModel of settlementModels) { + const positionAccount = await getByNameAndCurrency(limitPositionObj.name, limitPositionObj.currency, settlementModel.ledgerAccountTypeId) + const settlementAccount = await getByNameAndCurrency(limitPositionObj.name, limitPositionObj.currency, settlementModel.settlementAccountTypeId) - const settlementPosition = { - participantCurrencyId: settlementAccount.participantCurrencyId, - value: 0, - reservedValue: 0 - } - await knex('participantPosition').transacting(trx).insert(settlementPosition) - if (setCurrencyActive) { // if the flag is true then set the isActive flag for corresponding participantCurrency record to true - await knex('participantCurrency').transacting(trx).update({ isActive: 1 }).where('participantCurrencyId', positionAccount.participantCurrencyId) - await knex('participantCurrency').transacting(trx).update({ isActive: 1 }).where('participantCurrencyId', settlementAccount.participantCurrencyId) - await ParticipantCurrencyModelCached.invalidateParticipantCurrencyCache() - await ParticipantLimitCached.invalidateParticipantLimitCache() - } - } - } else { const participantPosition = { - participantCurrencyId, - value: limitPositionObj.initialPosition, + participantCurrencyId: positionAccount.participantCurrencyId, + value: (settlementModel.ledgerAccountTypeId === Enum.Accounts.LedgerAccountType.POSITION ? limitPositionObj.initialPosition : 0), reservedValue: 0 } - const participantPositionResult = await knex('participantPosition').transacting(trx).insert(participantPosition) - participantPosition.participantPositionId = participantPositionResult[0] + await knex('participantPosition').transacting(trx).insert(participantPosition) + const settlementPosition = { - participantCurrencyId: settlementAccountId, + participantCurrencyId: settlementAccount.participantCurrencyId, value: 0, reservedValue: 0 } await knex('participantPosition').transacting(trx).insert(settlementPosition) if (setCurrencyActive) { // if the flag is true then set the isActive flag for corresponding participantCurrency record to true - await knex('participantCurrency').transacting(trx).update({ isActive: 1 }).where('participantCurrencyId', participantCurrencyId) - await knex('participantCurrency').transacting(trx).update({ isActive: 1 }).where('participantCurrencyId', settlementAccountId) + await knex('participantCurrency').transacting(trx).update({ isActive: 1 }).where('participantCurrencyId', positionAccount.participantCurrencyId) + await knex('participantCurrency').transacting(trx).update({ isActive: 1 }).where('participantCurrencyId', settlementAccount.participantCurrencyId) await ParticipantCurrencyModelCached.invalidateParticipantCurrencyCache() await ParticipantLimitCached.invalidateParticipantLimitCache() } } - - await trx.commit - return true - } catch (err) { - await trx.rollback - throw err + } else { + const participantPosition = { + participantCurrencyId, + value: limitPositionObj.initialPosition, + reservedValue: 0 + } + const participantPositionResult = await knex('participantPosition').transacting(trx).insert(participantPosition) + participantPosition.participantPositionId = participantPositionResult[0] + const settlementPosition = { + participantCurrencyId: settlementAccountId, + value: 0, + reservedValue: 0 + } + await knex('participantPosition').transacting(trx).insert(settlementPosition) + if (setCurrencyActive) { // if the flag is true then set the isActive flag for corresponding participantCurrency record to true + await knex('participantCurrency').transacting(trx).update({ isActive: 1 }).where('participantCurrencyId', participantCurrencyId) + await knex('participantCurrency').transacting(trx).update({ isActive: 1 }).where('participantCurrencyId', settlementAccountId) + await ParticipantCurrencyModelCached.invalidateParticipantCurrencyCache() + await ParticipantLimitCached.invalidateParticipantLimitCache() + } } + + return true }) } catch (err) { throw ErrorHandler.Factory.reformatFSPIOPError(err) @@ -510,7 +572,7 @@ const addLimitAndInitialPosition = async (participantCurrencyId, settlementAccou const adjustLimits = async (participantCurrencyId, limit, trx) => { try { - const trxFunction = async (trx, doCommit = true) => { + const trxFunction = async (trx) => { try { const limitType = await knex('participantLimitType').where({ name: limit.type, isActive: 1 }).select('participantLimitTypeId').first() // const limitType = await trx.first('participantLimitTypeId').from('participantLimitType').where({ 'name': limit.type, 'isActive': 1 }) @@ -535,23 +597,17 @@ const adjustLimits = async (participantCurrencyId, limit, trx) => { } const result = await knex('participantLimit').transacting(trx).insert(newLimit) newLimit.participantLimitId = result[0] - if (doCommit) { - await trx.commit - } return { participantLimit: newLimit } } catch (err) { - if (doCommit) { - await trx.rollback - } throw ErrorHandler.Factory.reformatFSPIOPError(err) } } const knex = Db.getKnex() if (trx) { - return trxFunction(trx, false) + return trxFunction(trx) } else { return knex.transaction(trxFunction) } @@ -640,34 +696,28 @@ const addHubAccountAndInitPosition = async (participantId, currencyId, ledgerAcc try { const knex = Db.getKnex() return knex.transaction(async trx => { - try { - let result - const participantCurrency = { - participantId, - currencyId, - ledgerAccountTypeId, - createdBy: 'unknown', - isActive: 1, - createdDate: Time.getUTCString(new Date()) - } - result = await knex('participantCurrency').transacting(trx).insert(participantCurrency) - await ParticipantCurrencyModelCached.invalidateParticipantCurrencyCache() - participantCurrency.participantCurrencyId = result[0] - const participantPosition = { - participantCurrencyId: participantCurrency.participantCurrencyId, - value: 0, - reservedValue: 0 - } - result = await knex('participantPosition').transacting(trx).insert(participantPosition) - participantPosition.participantPositionId = result[0] - await trx.commit - return { - participantCurrency, - participantPosition - } - } catch (err) { - await trx.rollback - throw err + let result + const participantCurrency = { + participantId, + currencyId, + ledgerAccountTypeId, + createdBy: 'unknown', + isActive: 1, + createdDate: Time.getUTCString(new Date()) + } + result = await knex('participantCurrency').transacting(trx).insert(participantCurrency) + await ParticipantCurrencyModelCached.invalidateParticipantCurrencyCache() + participantCurrency.participantCurrencyId = result[0] + const participantPosition = { + participantCurrencyId: participantCurrency.participantCurrencyId, + value: 0, + reservedValue: 0 + } + result = await knex('participantPosition').transacting(trx).insert(participantPosition) + participantPosition.participantPositionId = result[0] + return { + participantCurrency, + participantPosition } }) } catch (err) { @@ -706,7 +756,7 @@ const getAllNonHubParticipantsWithCurrencies = async (trx) => { try { const HUB_ACCOUNT_NAME = Config.HUB_NAME const knex = Db.getKnex() - const trxFunction = async (trx, doCommit = true) => { + const trxFunction = async (trx) => { try { const res = await knex.distinct('participant.participantId', 'pc.participantId', 'pc.currencyId') .from('participant') @@ -714,19 +764,13 @@ const getAllNonHubParticipantsWithCurrencies = async (trx) => { .whereNot('participant.name', HUB_ACCOUNT_NAME) .transacting(trx) - if (doCommit) { - await trx.commit - } return res } catch (err) { - if (doCommit) { - await trx.rollback - } throw ErrorHandler.Factory.reformatFSPIOPError(err) } } if (trx) { - return trxFunction(trx, false) + return trxFunction(trx) } else { return knex.transaction(trxFunction) } @@ -735,9 +779,35 @@ const getAllNonHubParticipantsWithCurrencies = async (trx) => { } } +const getExternalParticipantIdByNameOrCreate = async ({ name, proxyId }) => { + try { + let externalFsp = await externalParticipantModelCached.getByName(name) + if (!externalFsp) { + const proxy = await ParticipantModelCached.getByName(proxyId) + if (!proxy) { + throw new Error(`Proxy participant not found: ${proxyId}`) + } + const externalParticipantId = await externalParticipantModelCached.create({ + name, + proxyId: proxy.participantId + }) + externalFsp = externalParticipantId + ? { externalParticipantId } + : await externalParticipantModelCached.getByName(name) + } + const id = externalFsp?.externalParticipantId + logger.verbose('getExternalParticipantIdByNameOrCreate result:', { id, name }) + return id + } catch (err) { + logger.child({ name, proxyId }).warn('error in getExternalParticipantIdByNameOrCreate:', err) + return null + } +} + module.exports = { addHubAccountAndInitPosition, getByNameAndCurrency, + getByIDAndCurrency, getParticipantLimitByParticipantIdAndCurrencyId, getEndpoint, getAllEndpoints, @@ -750,5 +820,6 @@ module.exports = { getParticipantLimitsByParticipantId, getAllAccountsByNameAndCurrency, getLimitsForAllParticipants, - getAllNonHubParticipantsWithCurrencies + getAllNonHubParticipantsWithCurrencies, + getExternalParticipantIdByNameOrCreate } diff --git a/src/models/participant/participant.js b/src/models/participant/participant.js index 8c379e06b..c02de3cdf 100644 --- a/src/models/participant/participant.js +++ b/src/models/participant/participant.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -43,7 +46,8 @@ exports.create = async (participant) => { try { const result = await Db.from('participant').insert({ name: participant.name, - createdBy: 'unknown' + createdBy: 'unknown', + isProxy: !!participant.isProxy }) return result } catch (err) { diff --git a/src/models/participant/participantCached.js b/src/models/participant/participantCached.js index 0660e552d..831df8860 100644 --- a/src/models/participant/participantCached.js +++ b/src/models/participant/participantCached.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/participant/participantCurrency.js b/src/models/participant/participantCurrency.js index 36f07e3e9..dee5bc46c 100644 --- a/src/models/participant/participantCurrency.js +++ b/src/models/participant/participantCurrency.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -43,7 +46,7 @@ exports.create = async (participantId, currencyId, ledgerAccountTypeId, isActive exports.getAll = async () => { try { - return Db.from('participantCurrency').find({}, { order: 'participantCurrencyId asc' }) + return await Db.from('participantCurrency').find({}, { order: 'participantCurrencyId asc' }) } catch (err) { throw ErrorHandler.Factory.reformatFSPIOPError(err) } diff --git a/src/models/participant/participantCurrencyCached.js b/src/models/participant/participantCurrencyCached.js index 9ae8a4933..be76e7122 100644 --- a/src/models/participant/participantCurrencyCached.js +++ b/src/models/participant/participantCurrencyCached.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/participant/participantLimit.js b/src/models/participant/participantLimit.js index e228918ea..b142ce969 100644 --- a/src/models/participant/participantLimit.js +++ b/src/models/participant/participantLimit.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/participant/participantLimitCached.js b/src/models/participant/participantLimitCached.js index dd6c64d1d..aa59cedbd 100644 --- a/src/models/participant/participantLimitCached.js +++ b/src/models/participant/participantLimitCached.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/participant/participantPosition.js b/src/models/participant/participantPosition.js index 1a3fa0770..1d779c1cf 100644 --- a/src/models/participant/participantPosition.js +++ b/src/models/participant/participantPosition.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -107,23 +110,17 @@ const destroyByParticipantId = async (participantId) => { const createParticipantPositionRecords = async (participantPositions, trx) => { try { const knex = Db.getKnex() - const trxFunction = async (trx, doCommit = true) => { + const trxFunction = async (trx) => { try { await knex .batchInsert('participantPosition', participantPositions) .transacting(trx) - if (doCommit) { - await trx.commit - } } catch (err) { - if (doCommit) { - await trx.rollback - } throw ErrorHandler.Factory.reformatFSPIOPError(err) } } if (trx) { - return trxFunction(trx, false) + return trxFunction(trx) } else { return knex.transaction(trxFunction) } diff --git a/src/models/participant/participantPositionChange.js b/src/models/participant/participantPositionChange.js index a6902c1ba..c0d7153c2 100644 --- a/src/models/participant/participantPositionChange.js +++ b/src/models/participant/participantPositionChange.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/position/batch.js b/src/models/position/batch.js index 934f42696..986a9fe04 100644 --- a/src/models/position/batch.js +++ b/src/models/position/batch.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -63,6 +63,28 @@ const getLatestTransferStateChangesByTransferIdList = async (trx, transfersIdLis } } +const getLatestFxTransferStateChangesByCommitRequestIdList = async (trx, commitRequestIdList) => { + const knex = await Db.getKnex() + try { + const latestFxTransferStateChanges = {} + const results = await knex('fxTransferStateChange') + .transacting(trx) + .whereIn('fxTransferStateChange.commitRequestId', commitRequestIdList) + .orderBy('fxTransferStateChangeId', 'desc') + .select('*') + + for (const result of results) { + if (!latestFxTransferStateChanges[result.commitRequestId]) { + latestFxTransferStateChanges[result.commitRequestId] = result + } + } + return latestFxTransferStateChanges + } catch (err) { + Logger.isErrorEnabled && Logger.error(err) + throw err + } +} + const getAllParticipantCurrency = async (trx) => { const knex = await Db.getKnex() if (trx) { @@ -138,6 +160,11 @@ const bulkInsertTransferStateChanges = async (trx, transferStateChangeList) => { return await knex.batchInsert('transferStateChange', transferStateChangeList).transacting(trx) } +const bulkInsertFxTransferStateChanges = async (trx, fxTransferStateChangeList) => { + const knex = await Db.getKnex() + return await knex.batchInsert('fxTransferStateChange', fxTransferStateChangeList).transacting(trx) +} + const bulkInsertParticipantPositionChanges = async (trx, participantPositionChangeList) => { const knex = await Db.getKnex() return await knex.batchInsert('participantPositionChange', participantPositionChangeList).transacting(trx) @@ -184,14 +211,76 @@ const getTransferByIdsForReserve = async (trx, transferIds) => { return {} } +const getFxTransferInfoList = async (trx, commitRequestId, transferParticipantRoleTypeId, ledgerEntryTypeId) => { + try { + const knex = await Db.getKnex() + const transferInfos = await knex('fxTransferParticipant') + .transacting(trx) + .where({ + 'fxTransferParticipant.transferParticipantRoleTypeId': transferParticipantRoleTypeId, + 'fxTransferParticipant.ledgerEntryTypeId': ledgerEntryTypeId + }) + .whereIn('fxTransferParticipant.commitRequestId', commitRequestId) + .select( + 'fxTransferParticipant.*' + ) + const info = {} + // This should key the transfer info with the latest transferStateChangeId + for (const transferInfo of transferInfos) { + if (!(transferInfo.commitRequestId in info)) { + info[transferInfo.commitRequestId] = transferInfo + } + } + return info + } catch (err) { + Logger.isErrorEnabled && Logger.error(err) + throw err + } +} + +// This model assumes that there is only one RESERVED participantPositionChange per commitRequestId and participantPositionId. +// If an fxTransfer use case changes in the future where more than one reservation happens to a participant's account +// for the same commitRequestId, this model will need to be updated. +const getReservedPositionChangesByCommitRequestIds = async (trx, commitRequestIdList) => { + try { + const knex = await Db.getKnex() + const participantPositionChanges = await knex('fxTransferStateChange') + .transacting(trx) + .whereIn('fxTransferStateChange.commitRequestId', commitRequestIdList) + .where('fxTransferStateChange.transferStateId', Enum.Transfers.TransferInternalState.RESERVED) + .leftJoin('participantPositionChange AS ppc', 'ppc.fxTransferStateChangeId', 'fxTransferStateChange.fxTransferStateChangeId') + .select( + 'ppc.*', + 'fxTransferStateChange.commitRequestId AS commitRequestId' + ) + const info = {} + for (const participantPositionChange of participantPositionChanges) { + if (!(participantPositionChange.commitRequestId in info)) { + info[participantPositionChange.commitRequestId] = {} + } + if (participantPositionChange.participantCurrencyId) { + info[participantPositionChange.commitRequestId][participantPositionChange.participantCurrencyId] = participantPositionChange + } + } + return info + } catch (err) { + Logger.isErrorEnabled && Logger.error(err) + throw err + } +} + module.exports = { startDbTransaction, getLatestTransferStateChangesByTransferIdList, + getLatestFxTransferStateChangesByCommitRequestIdList, getPositionsByAccountIdsForUpdate, updateParticipantPosition, bulkInsertTransferStateChanges, + bulkInsertFxTransferStateChanges, bulkInsertParticipantPositionChanges, getAllParticipantCurrency, getTransferInfoList, - getTransferByIdsForReserve + getTransferByIdsForReserve, + getFxTransferInfoList, + getReservedPositionChangesByCommitRequestIds } diff --git a/src/models/position/batchCached.js b/src/models/position/batchCached.js index 4adcd5a54..6e5634989 100644 --- a/src/models/position/batchCached.js +++ b/src/models/position/batchCached.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . diff --git a/src/models/position/facade.js b/src/models/position/facade.js index a2fa69d28..b808a91f5 100644 --- a/src/models/position/facade.js +++ b/src/models/position/facade.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -229,11 +232,13 @@ const prepareChangeParticipantPositionTransaction = async (transferList) => { const processedTransfersKeysList = Object.keys(processedTransfers) const batchParticipantPositionChange = [] for (const keyIndex in processedTransfersKeysList) { - const { runningPosition, runningReservedValue } = processedTransfers[processedTransfersKeysList[keyIndex]] + const { transferAmount, runningPosition, runningReservedValue } = processedTransfers[processedTransfersKeysList[keyIndex]] const participantPositionChange = { participantPositionId: initialParticipantPosition.participantPositionId, + participantCurrencyId: participantCurrency.participantCurrencyId, transferStateChangeId: processedTransferStateChangeIdList[keyIndex], value: runningPosition, + change: transferAmount.toNumber(), // processBatch: - a single value uuid for this entire batch to make sure the set of transfers in this batch can be clearly grouped reservedValue: runningReservedValue } @@ -241,11 +246,9 @@ const prepareChangeParticipantPositionTransaction = async (transferList) => { } batchParticipantPositionChange.length && await knex.batchInsert('participantPositionChange', batchParticipantPositionChange).transacting(trx) histTimerPersistTransferStateChangeEnd({ success: true, queryName: 'facade_prepareChangeParticipantPositionTransaction_transaction_PersistTransferState' }) - await trx.commit() histTimerChangeParticipantPositionTransEnd({ success: true, queryName: 'facade_prepareChangeParticipantPositionTransaction_transaction' }) } catch (err) { Logger.isErrorEnabled && Logger.error(err) - await trx.rollback() histTimerChangeParticipantPositionTransEnd({ success: false, queryName: 'facade_prepareChangeParticipantPositionTransaction_transaction' }) throw ErrorHandler.Factory.reformatFSPIOPError(err) } @@ -292,16 +295,16 @@ const changeParticipantPositionTransaction = async (participantCurrencyId, isRev const insertedTransferStateChange = await knex('transferStateChange').transacting(trx).where({ transferId: transferStateChange.transferId }).forUpdate().first().orderBy('transferStateChangeId', 'desc') const participantPositionChange = { participantPositionId: participantPosition.participantPositionId, + participantCurrencyId, transferStateChangeId: insertedTransferStateChange.transferStateChangeId, value: latestPosition, + change: isReversal ? -amount : amount, reservedValue: participantPosition.reservedValue, createdDate: transactionTimestamp } await knex('participantPositionChange').transacting(trx).insert(participantPositionChange) - await trx.commit() histTimerChangeParticipantPositionTransactionEnd({ success: true, queryName: 'facade_changeParticipantPositionTransaction' }) } catch (err) { - await trx.rollback() throw ErrorHandler.Factory.reformatFSPIOPError(err) } }).catch((err) => { diff --git a/src/models/position/participantPosition.js b/src/models/position/participantPosition.js index d01d262d2..cbd0be695 100644 --- a/src/models/position/participantPosition.js +++ b/src/models/position/participantPosition.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/position/participantPositionChanges.js b/src/models/position/participantPositionChanges.js new file mode 100644 index 000000000..99e6cf37a --- /dev/null +++ b/src/models/position/participantPositionChanges.js @@ -0,0 +1,71 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Vijaya Kumar Guthi + -------------- + ******/ + +'use strict' + +const Db = require('../../lib/db') +const Logger = require('@mojaloop/central-services-logger') +const Enum = require('@mojaloop/central-services-shared').Enum + +const getReservedPositionChangesByCommitRequestId = async (commitRequestId) => { + try { + const knex = await Db.getKnex() + const participantPositionChanges = await knex('fxTransferStateChange') + .where('fxTransferStateChange.commitRequestId', commitRequestId) + .where('fxTransferStateChange.transferStateId', Enum.Transfers.TransferInternalState.RESERVED) + .innerJoin('participantPositionChange AS ppc', 'ppc.fxTransferStateChangeId', 'fxTransferStateChange.fxTransferStateChangeId') + .select( + 'ppc.*' + ) + return participantPositionChanges + } catch (err) { + Logger.isErrorEnabled && Logger.error(err) + throw err + } +} + +const getReservedPositionChangesByTransferId = async (transferId) => { + try { + const knex = await Db.getKnex() + const participantPositionChanges = await knex('transferStateChange') + .where('transferStateChange.transferId', transferId) + .where('transferStateChange.transferStateId', Enum.Transfers.TransferInternalState.RESERVED) + .innerJoin('participantPositionChange AS ppc', 'ppc.transferStateChangeId', 'transferStateChange.transferStateChangeId') + .select( + 'ppc.*' + ) + return participantPositionChanges + } catch (err) { + Logger.isErrorEnabled && Logger.error(err) + throw err + } +} + +module.exports = { + getReservedPositionChangesByCommitRequestId, + getReservedPositionChangesByTransferId +} diff --git a/src/models/settlement/settlementModel.js b/src/models/settlement/settlementModel.js index b0c36cd32..6170a7136 100644 --- a/src/models/settlement/settlementModel.js +++ b/src/models/settlement/settlementModel.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -32,7 +35,7 @@ const ErrorHandler = require('@mojaloop/central-services-error-handling') exports.create = async (name, isActive, settlementGranularityId, settlementInterchangeId, settlementDelayId, currencyId, requireLiquidityCheck, ledgerAccountTypeId, settlementAccountTypeId, autoPositionReset, trx = null) => { try { const knex = Db.getKnex() - const trxFunction = async (trx, doCommit = true) => { + const trxFunction = async (trx) => { try { await knex('settlementModel') .insert({ @@ -48,18 +51,12 @@ exports.create = async (name, isActive, settlementGranularityId, settlementInter autoPositionReset }) .transacting(trx) - if (doCommit) { - await trx.commit - } } catch (err) { - if (doCommit) { - await trx.rollback - } throw ErrorHandler.Factory.reformatFSPIOPError(err) } } if (trx) { - return trxFunction(trx, false) + return trxFunction(trx) } else { return knex.transaction(trxFunction) } @@ -77,19 +74,13 @@ exports.getByName = async (name, trx = null) => { .select() .where('name', name) .transacting(trx) - if (doCommit) { - await trx.commit - } return result.length > 0 ? result[0] : null } catch (err) { - if (doCommit) { - await trx.rollback - } throw ErrorHandler.Factory.reformatFSPIOPError(err) } } if (trx) { - return trxFunction(trx, false) + return trxFunction(trx) } else { return knex.transaction(trxFunction) } @@ -116,25 +107,19 @@ exports.update = async (settlementModel, isActive) => { exports.getSettlementModelsByName = async (names, trx = null) => { try { const knex = Db.getKnex() - const trxFunction = async (trx, doCommit = true) => { + const trxFunction = async (trx) => { try { const settlementModelNames = knex('settlementModel') .select('name') .whereIn('name', names) .transacting(trx) - if (doCommit) { - await trx.commit - } return settlementModelNames } catch (err) { - if (doCommit) { - await trx.rollback - } throw ErrorHandler.Factory.reformatFSPIOPError(err) } } if (trx) { - return trxFunction(trx, false) + return trxFunction(trx) } else { return knex.transaction(trxFunction) } diff --git a/src/models/settlement/settlementModelCached.js b/src/models/settlement/settlementModelCached.js index 7a1f36769..11d4ee1b6 100644 --- a/src/models/settlement/settlementModelCached.js +++ b/src/models/settlement/settlementModelCached.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/transfer/facade.js b/src/models/transfer/facade.js index ada363bd7..4073df1c2 100644 --- a/src/models/transfer/facade.js +++ b/src/models/transfer/facade.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -23,6 +26,7 @@ * Rajiv Mothilal * Miguel de Barros * Shashikant Hirugade + * Vijay Kumar Guthi -------------- ******/ @@ -32,19 +36,21 @@ * @module src/models/transfer/facade/ */ -const Db = require('../../lib/db') +const ErrorHandler = require('@mojaloop/central-services-error-handling') +const Metrics = require('@mojaloop/central-services-metrics') +const MLNumber = require('@mojaloop/ml-number') const Enum = require('@mojaloop/central-services-shared').Enum -const TransferEventAction = Enum.Events.Event.Action -const TransferInternalState = Enum.Transfers.TransferInternalState -const TransferExtensionModel = require('./transferExtension') -const ParticipantFacade = require('../participant/facade') const Time = require('@mojaloop/central-services-shared').Util.Time -const MLNumber = require('@mojaloop/ml-number') + +const { logger } = require('../../shared/logger') +const Db = require('../../lib/db') const Config = require('../../lib/config') -const _ = require('lodash') -const ErrorHandler = require('@mojaloop/central-services-error-handling') -const Logger = require('@mojaloop/central-services-logger') -const Metrics = require('@mojaloop/central-services-metrics') +const ParticipantFacade = require('../participant/facade') +const ParticipantCachedModel = require('../participant/participantCached') +const TransferExtensionModel = require('./transferExtension') + +const TransferEventAction = Enum.Events.Event.Action +const TransferInternalState = Enum.Transfers.TransferInternalState // Alphabetically ordered list of error texts used below const UnsupportedActionText = 'Unsupported action' @@ -53,24 +59,25 @@ const getById = async (id) => { try { /** @namespace Db.transfer **/ return await Db.from('transfer').query(async (builder) => { + /* istanbul ignore next */ const transferResult = await builder .where({ 'transfer.transferId': id, 'tprt1.name': 'PAYER_DFSP', // TODO: refactor to use transferParticipantRoleTypeId 'tprt2.name': 'PAYEE_DFSP' }) - .whereRaw('pc1.currencyId = transfer.currencyId') - .whereRaw('pc2.currencyId = transfer.currencyId') // PAYER .innerJoin('transferParticipant AS tp1', 'tp1.transferId', 'transfer.transferId') + .leftJoin('externalParticipant AS ep1', 'ep1.externalParticipantId', 'tp1.externalParticipantId') .innerJoin('transferParticipantRoleType AS tprt1', 'tprt1.transferParticipantRoleTypeId', 'tp1.transferParticipantRoleTypeId') - .innerJoin('participantCurrency AS pc1', 'pc1.participantCurrencyId', 'tp1.participantCurrencyId') - .innerJoin('participant AS da', 'da.participantId', 'pc1.participantId') + .innerJoin('participant AS da', 'da.participantId', 'tp1.participantId') + .leftJoin('participantCurrency AS pc1', 'pc1.participantCurrencyId', 'tp1.participantCurrencyId') // PAYEE .innerJoin('transferParticipant AS tp2', 'tp2.transferId', 'transfer.transferId') + .leftJoin('externalParticipant AS ep2', 'ep2.externalParticipantId', 'tp2.externalParticipantId') .innerJoin('transferParticipantRoleType AS tprt2', 'tprt2.transferParticipantRoleTypeId', 'tp2.transferParticipantRoleTypeId') - .innerJoin('participantCurrency AS pc2', 'pc2.participantCurrencyId', 'tp2.participantCurrencyId') - .innerJoin('participant AS ca', 'ca.participantId', 'pc2.participantId') + .innerJoin('participant AS ca', 'ca.participantId', 'tp2.participantId') + .leftJoin('participantCurrency AS pc2', 'pc2.participantCurrencyId', 'tp2.participantCurrencyId') // OTHER JOINS .innerJoin('ilpPacket AS ilpp', 'ilpp.transferId', 'transfer.transferId') .leftJoin('transferStateChange AS tsc', 'tsc.transferId', 'transfer.transferId') @@ -84,10 +91,12 @@ const getById = async (id) => { 'tp1.amount AS payerAmount', 'da.participantId AS payerParticipantId', 'da.name AS payerFsp', + 'da.isProxy AS payerIsProxy', 'pc2.participantCurrencyId AS payeeParticipantCurrencyId', 'tp2.amount AS payeeAmount', 'ca.participantId AS payeeParticipantId', 'ca.name AS payeeFsp', + 'ca.isProxy AS payeeIsProxy', 'tsc.transferStateChangeId', 'tsc.transferStateId AS transferState', 'tsc.reason AS reason', @@ -98,10 +107,13 @@ const getById = async (id) => { 'transfer.ilpCondition AS condition', 'tf.ilpFulfilment AS fulfilment', 'te.errorCode', - 'te.errorDescription' + 'te.errorDescription', + 'ep1.name AS externalPayerName', + 'ep2.name AS externalPayeeName' ) .orderBy('tsc.transferStateChangeId', 'desc') .first() + if (transferResult) { transferResult.extensionList = await TransferExtensionModel.getByTransferId(id) // TODO: check if this is needed if (transferResult.errorCode && transferResult.transferStateEnumeration === Enum.Transfers.TransferState.ABORTED) { @@ -116,6 +128,7 @@ const getById = async (id) => { return transferResult }) } catch (err) { + logger.warn('error in transfer.getById', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } @@ -168,6 +181,7 @@ const getByIdLight = async (id) => { return transferResult }) } catch (err) { + logger.warn('error in transfer.getByIdLight', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } @@ -222,6 +236,7 @@ const getAll = async () => { return transferResultList }) } catch (err) { + logger.warn('error in transfer.getAll', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } @@ -237,8 +252,10 @@ const getTransferInfoToChangePosition = async (id, transferParticipantRoleTypeId 'transferParticipant.ledgerEntryTypeId': ledgerEntryTypeId }) .innerJoin('transferStateChange AS tsc', 'tsc.transferId', 'transferParticipant.transferId') + .innerJoin('transfer AS t', 't.transferId', 'transferParticipant.transferId') .select( 'transferParticipant.*', + 't.currencyId', 'tsc.transferStateId', 'tsc.reason' ) @@ -246,6 +263,7 @@ const getTransferInfoToChangePosition = async (id, transferParticipantRoleTypeId .first() }) } catch (err) { + logger.warn('error in getTransferInfoToChangePosition', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } @@ -353,12 +371,12 @@ const savePayeeTransferResponse = async (transferId, payload, action, fspiopErro .orderBy('changedDate', 'desc') }) transferFulfilmentRecord.settlementWindowId = res[0].settlementWindowId - Logger.isDebugEnabled && Logger.debug('savePayeeTransferResponse::settlementWindowId') + logger.debug('savePayeeTransferResponse::settlementWindowId') } if (isFulfilment) { await knex('transferFulfilment').transacting(trx).insert(transferFulfilmentRecord) result.transferFulfilmentRecord = transferFulfilmentRecord - Logger.isDebugEnabled && Logger.debug('savePayeeTransferResponse::transferFulfilment') + logger.debug('savePayeeTransferResponse::transferFulfilment') } if (transferExtensionRecordsList.length > 0) { // ###! CAN BE DONE THROUGH A BATCH @@ -367,11 +385,11 @@ const savePayeeTransferResponse = async (transferId, payload, action, fspiopErro } // ###! result.transferExtensionRecordsList = transferExtensionRecordsList - Logger.isDebugEnabled && Logger.debug('savePayeeTransferResponse::transferExtensionRecordsList') + logger.debug('savePayeeTransferResponse::transferExtensionRecordsList') } await knex('transferStateChange').transacting(trx).insert(transferStateChangeRecord) result.transferStateChangeRecord = transferStateChangeRecord - Logger.isDebugEnabled && Logger.debug('savePayeeTransferResponse::transferStateChange') + logger.debug('savePayeeTransferResponse::transferStateChange') if (fspiopError) { const insertedTransferStateChange = await knex('transferStateChange').transacting(trx) .where({ transferId }) @@ -380,45 +398,81 @@ const savePayeeTransferResponse = async (transferId, payload, action, fspiopErro transferErrorRecord.transferStateChangeId = insertedTransferStateChange.transferStateChangeId await knex('transferError').transacting(trx).insert(transferErrorRecord) result.transferErrorRecord = transferErrorRecord - Logger.isDebugEnabled && Logger.debug('savePayeeTransferResponse::transferError') + logger.debug('savePayeeTransferResponse::transferError') } histTPayeeResponseValidationPassedEnd({ success: true, queryName: 'facade_saveTransferPrepared_transaction' }) result.savePayeeTransferResponseExecuted = true - Logger.isDebugEnabled && Logger.debug('savePayeeTransferResponse::success') + logger.debug('savePayeeTransferResponse::success') } catch (err) { - await trx.rollback() + logger.error('savePayeeTransferResponse::failure', err) histTPayeeResponseValidationPassedEnd({ success: false, queryName: 'facade_saveTransferPrepared_transaction' }) - Logger.isErrorEnabled && Logger.error('savePayeeTransferResponse::failure') throw err } }) histTimerSavePayeeTranferResponsedEnd({ success: true, queryName: 'facade_savePayeeTransferResponse' }) return result } catch (err) { + logger.warn('error in savePayeeTransferResponse', err) histTimerSavePayeeTranferResponsedEnd({ success: false, queryName: 'facade_savePayeeTransferResponse' }) throw ErrorHandler.Factory.reformatFSPIOPError(err) } } -const saveTransferPrepared = async (payload, stateReason = null, hasPassedValidation = true) => { +/** + * Saves prepare transfer details to DB. + * + * @param {Object} payload - Message payload. + * @param {string | null} stateReason - Validation failure reasons. + * @param {Boolean} hasPassedValidation - Is transfer prepare validation passed. + * @param {DeterminingTransferCheckResult} determiningTransferCheckResult - Determining transfer check result. + * @param {ProxyObligation} proxyObligation - The proxy obligation + * @returns {Promise} + */ +const saveTransferPrepared = async (payload, stateReason = null, hasPassedValidation = true, determiningTransferCheckResult, proxyObligation) => { const histTimerSaveTransferPreparedEnd = Metrics.getHistogram( 'model_transfer', 'facade_saveTransferPrepared - Metrics for transfer model', ['success', 'queryName'] ).startTimer() try { - const participants = [] - const names = [payload.payeeFsp, payload.payerFsp] + const participants = { + [payload.payeeFsp]: {}, + [payload.payerFsp]: {} + } - for (const name of names) { - const participant = await ParticipantFacade.getByNameAndCurrency(name, payload.amount.currency, Enum.Accounts.LedgerAccountType.POSITION) + // Iterate over the participants and get the details + for (const name of Object.keys(participants)) { + const participant = await ParticipantCachedModel.getByName(name) if (participant) { - participants.push(participant) + participants[name].id = participant.participantId + } + // If determiningTransferCheckResult.participantCurrencyValidationList contains the participant name, then get the participantCurrencyId + const participantCurrency = determiningTransferCheckResult && determiningTransferCheckResult.participantCurrencyValidationList.find(participantCurrencyItem => participantCurrencyItem.participantName === name) + if (participantCurrency) { + const participantCurrencyRecord = await ParticipantFacade.getByNameAndCurrency(participantCurrency.participantName, participantCurrency.currencyId, Enum.Accounts.LedgerAccountType.POSITION) + participants[name].participantCurrencyId = participantCurrencyRecord?.participantCurrencyId } } - const participantCurrencyIds = await _.reduce(participants, (m, acct) => - _.set(m, acct.name, acct.participantCurrencyId), {}) + if (proxyObligation?.isInitiatingFspProxy) { + const proxyId = proxyObligation.initiatingFspProxyOrParticipantId.proxyId + const proxyParticipant = await ParticipantCachedModel.getByName(proxyId) + participants[proxyId] = {} + participants[proxyId].id = proxyParticipant.participantId + const participantCurrencyRecord = await ParticipantFacade.getByNameAndCurrency( + proxyId, payload.amount.currency, Enum.Accounts.LedgerAccountType.POSITION + ) + // In a regional scheme, the stand-in initiating FSP proxy may not have a participantCurrencyId + // of the target currency of the transfer, so set to null if not found + participants[proxyId].participantCurrencyId = participantCurrencyRecord?.participantCurrencyId + } + + if (proxyObligation?.isCounterPartyFspProxy) { + const proxyId = proxyObligation.counterPartyFspProxyOrParticipantId.proxyId + const proxyParticipant = await ParticipantCachedModel.getByName(proxyId) + participants[proxyId] = {} + participants[proxyId].id = proxyParticipant.participantId + } const transferRecord = { transferId: payload.transferId, @@ -433,29 +487,58 @@ const saveTransferPrepared = async (payload, stateReason = null, hasPassedValida value: payload.ilpPacket } - const state = ((hasPassedValidation) ? Enum.Transfers.TransferInternalState.RECEIVED_PREPARE : Enum.Transfers.TransferInternalState.INVALID) - const transferStateChangeRecord = { transferId: payload.transferId, - transferStateId: state, + transferStateId: hasPassedValidation ? TransferInternalState.RECEIVED_PREPARE : TransferInternalState.INVALID, reason: stateReason, createdDate: Time.getUTCString(new Date()) } - const payerTransferParticipantRecord = { - transferId: payload.transferId, - participantCurrencyId: participantCurrencyIds[payload.payerFsp], - transferParticipantRoleTypeId: Enum.Accounts.TransferParticipantRoleType.PAYER_DFSP, - ledgerEntryTypeId: Enum.Accounts.LedgerEntryType.PRINCIPLE_VALUE, - amount: payload.amount.amount + let payerTransferParticipantRecord + if (proxyObligation?.isInitiatingFspProxy) { + const externalParticipantId = await ParticipantFacade.getExternalParticipantIdByNameOrCreate(proxyObligation.initiatingFspProxyOrParticipantId) + payerTransferParticipantRecord = { + transferId: payload.transferId, + participantId: participants[proxyObligation.initiatingFspProxyOrParticipantId.proxyId].id, + participantCurrencyId: participants[proxyObligation.initiatingFspProxyOrParticipantId.proxyId].participantCurrencyId, + transferParticipantRoleTypeId: Enum.Accounts.TransferParticipantRoleType.PAYER_DFSP, + ledgerEntryTypeId: Enum.Accounts.LedgerEntryType.PRINCIPLE_VALUE, + amount: -payload.amount.amount, + externalParticipantId + } + } else { + payerTransferParticipantRecord = { + transferId: payload.transferId, + participantId: participants[payload.payerFsp].id, + participantCurrencyId: participants[payload.payerFsp].participantCurrencyId, + transferParticipantRoleTypeId: Enum.Accounts.TransferParticipantRoleType.PAYER_DFSP, + ledgerEntryTypeId: Enum.Accounts.LedgerEntryType.PRINCIPLE_VALUE, + amount: payload.amount.amount + } } - const payeeTransferParticipantRecord = { - transferId: payload.transferId, - participantCurrencyId: participantCurrencyIds[payload.payeeFsp], - transferParticipantRoleTypeId: Enum.Accounts.TransferParticipantRoleType.PAYEE_DFSP, - ledgerEntryTypeId: Enum.Accounts.LedgerEntryType.PRINCIPLE_VALUE, - amount: -payload.amount.amount + logger.debug('saveTransferPrepared participants:', { participants }) + let payeeTransferParticipantRecord + if (proxyObligation?.isCounterPartyFspProxy) { + const externalParticipantId = await ParticipantFacade.getExternalParticipantIdByNameOrCreate(proxyObligation.counterPartyFspProxyOrParticipantId) + payeeTransferParticipantRecord = { + transferId: payload.transferId, + participantId: participants[proxyObligation.counterPartyFspProxyOrParticipantId.proxyId].id, + participantCurrencyId: null, + transferParticipantRoleTypeId: Enum.Accounts.TransferParticipantRoleType.PAYEE_DFSP, + ledgerEntryTypeId: Enum.Accounts.LedgerEntryType.PRINCIPLE_VALUE, + amount: -payload.amount.amount, + externalParticipantId + } + } else { + payeeTransferParticipantRecord = { + transferId: payload.transferId, + participantId: participants[payload.payeeFsp].id, + participantCurrencyId: participants[payload.payeeFsp].participantCurrencyId, + transferParticipantRoleTypeId: Enum.Accounts.TransferParticipantRoleType.PAYEE_DFSP, + ledgerEntryTypeId: Enum.Accounts.LedgerEntryType.PRINCIPLE_VALUE, + amount: -payload.amount.amount + } } const knex = await Db.getKnex() @@ -485,10 +568,8 @@ const saveTransferPrepared = async (payload, stateReason = null, hasPassedValida } await knex('ilpPacket').transacting(trx).insert(ilpPacketRecord) await knex('transferStateChange').transacting(trx).insert(transferStateChangeRecord) - await trx.commit() histTimerSaveTranferTransactionValidationPassedEnd({ success: true, queryName: 'facade_saveTransferPrepared_transaction' }) } catch (err) { - await trx.rollback() histTimerSaveTranferTransactionValidationPassedEnd({ success: false, queryName: 'facade_saveTransferPrepared_transaction' }) throw err } @@ -503,14 +584,14 @@ const saveTransferPrepared = async (payload, stateReason = null, hasPassedValida try { await knex('transferParticipant').insert(payerTransferParticipantRecord) } catch (err) { - Logger.isWarnEnabled && Logger.warn(`Payer transferParticipant insert error: ${err.message}`) + logger.warn('Payer transferParticipant insert error', err) histTimerSaveTranferNoValidationEnd({ success: false, queryName: 'facade_saveTransferPrepared_no_validation' }) } try { await knex('transferParticipant').insert(payeeTransferParticipantRecord) } catch (err) { + logger.warn('Payee transferParticipant insert error:', err) histTimerSaveTranferNoValidationEnd({ success: false, queryName: 'facade_saveTransferPrepared_no_validation' }) - Logger.isWarnEnabled && Logger.warn(`Payee transferParticipant insert error: ${err.message}`) } payerTransferParticipantRecord.name = payload.payerFsp payeeTransferParticipantRecord.name = payload.payeeFsp @@ -526,26 +607,27 @@ const saveTransferPrepared = async (payload, stateReason = null, hasPassedValida try { await knex.batchInsert('transferExtension', transferExtensionsRecordList) } catch (err) { - Logger.isWarnEnabled && Logger.warn(`batchInsert transferExtension error: ${err.message}`) + logger.warn('batchInsert transferExtension error:', err) histTimerSaveTranferNoValidationEnd({ success: false, queryName: 'facade_saveTransferPrepared_no_validation' }) } } try { await knex('ilpPacket').insert(ilpPacketRecord) } catch (err) { - Logger.isWarnEnabled && Logger.warn(`ilpPacket insert error: ${err.message}`) + logger.warn('ilpPacket insert error:', err) histTimerSaveTranferNoValidationEnd({ success: false, queryName: 'facade_saveTransferPrepared_no_validation' }) } try { await knex('transferStateChange').insert(transferStateChangeRecord) histTimerSaveTranferNoValidationEnd({ success: true, queryName: 'facade_saveTransferPrepared_no_validation' }) } catch (err) { - Logger.isWarnEnabled && Logger.warn(`transferStateChange insert error: ${err.message}`) + logger.warn('transferStateChange insert error:', err) histTimerSaveTranferNoValidationEnd({ success: false, queryName: 'facade_saveTransferPrepared_no_validation' }) } } histTimerSaveTransferPreparedEnd({ success: true, queryName: 'transfer_model_facade_saveTransferPrepared' }) } catch (err) { + logger.warn('error in saveTransferPrepared', err) histTimerSaveTransferPreparedEnd({ success: false, queryName: 'transfer_model_facade_saveTransferPrepared' }) throw ErrorHandler.Factory.reformatFSPIOPError(err) } @@ -592,7 +674,265 @@ const getTransferStateByTransferId = async (id) => { } } -const timeoutExpireReserved = async (segmentId, intervalMin, intervalMax) => { +const _processTimeoutEntries = async (knex, trx, transactionTimestamp) => { + // Insert `transferStateChange` records for RECEIVED_PREPARE + await knex.from(knex.raw('transferStateChange (transferId, transferStateId, reason)')).transacting(trx) + .insert(function () { + this.from('transferTimeout AS tt') + .innerJoin(knex('transferStateChange AS tsc1') + .select('tsc1.transferId') + .max('tsc1.transferStateChangeId AS maxTransferStateChangeId') + .innerJoin('transferTimeout AS tt1', 'tt1.transferId', 'tsc1.transferId') + .groupBy('tsc1.transferId').as('ts'), 'ts.transferId', 'tt.transferId' + ) + .innerJoin('transferStateChange AS tsc', 'tsc.transferStateChangeId', 'ts.maxTransferStateChangeId') + .where('tt.expirationDate', '<', transactionTimestamp) + .andWhere('tsc.transferStateId', `${Enum.Transfers.TransferInternalState.RECEIVED_PREPARE}`) + .select('tt.transferId', knex.raw('?', Enum.Transfers.TransferInternalState.EXPIRED_PREPARED), knex.raw('?', 'Aborted by Timeout Handler')) + }) + + // Insert `transferStateChange` records for RESERVED + await knex.from(knex.raw('transferStateChange (transferId, transferStateId, reason)')).transacting(trx) + .insert(function () { + this.from('transferTimeout AS tt') + .innerJoin(knex('transferStateChange AS tsc1') + .select('tsc1.transferId') + .max('tsc1.transferStateChangeId AS maxTransferStateChangeId') + .innerJoin('transferTimeout AS tt1', 'tt1.transferId', 'tsc1.transferId') + .groupBy('tsc1.transferId').as('ts'), 'ts.transferId', 'tt.transferId' + ) + .innerJoin('transferStateChange AS tsc', 'tsc.transferStateChangeId', 'ts.maxTransferStateChangeId') + .where('tt.expirationDate', '<', transactionTimestamp) + .andWhere('tsc.transferStateId', `${Enum.Transfers.TransferState.RESERVED}`) + .select('tt.transferId', knex.raw('?', Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT), knex.raw('?', 'Marked for expiration by Timeout Handler')) + }) +} + +const _insertTransferErrorEntries = async (knex, trx, transactionTimestamp) => { + // Insert `transferError` records + await knex.from(knex.raw('transferError (transferId, transferStateChangeId, errorCode, errorDescription)')).transacting(trx) + .insert(function () { + this.from('transferTimeout AS tt') + .innerJoin(knex('transferStateChange AS tsc1') + .select('tsc1.transferId') + .max('tsc1.transferStateChangeId AS maxTransferStateChangeId') + .innerJoin('transferTimeout AS tt1', 'tt1.transferId', 'tsc1.transferId') + .groupBy('tsc1.transferId').as('ts'), 'ts.transferId', 'tt.transferId' + ) + .innerJoin('transferStateChange AS tsc', 'tsc.transferStateChangeId', 'ts.maxTransferStateChangeId') + .where('tt.expirationDate', '<', transactionTimestamp) + .andWhere('tsc.transferStateId', `${Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT}`) + .select('tt.transferId', 'tsc.transferStateChangeId', knex.raw('?', ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED.code), knex.raw('?', ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED.message)) + }) +} + +const _processFxTimeoutEntries = async (knex, trx, transactionTimestamp) => { + // Insert `fxTransferStateChange` records for RECEIVED_PREPARE + /* istanbul ignore next */ + await knex.from(knex.raw('fxTransferStateChange (commitRequestId, transferStateId, reason)')).transacting(trx) + .insert(function () { + this.from('fxTransferTimeout AS ftt') + .innerJoin(knex('fxTransferStateChange AS ftsc1') + .select('ftsc1.commitRequestId') + .max('ftsc1.fxTransferStateChangeId AS maxFxTransferStateChangeId') + .innerJoin('fxTransferTimeout AS ftt1', 'ftt1.commitRequestId', 'ftsc1.commitRequestId') + .groupBy('ftsc1.commitRequestId').as('fts'), 'fts.commitRequestId', 'ftt.commitRequestId' + ) + .innerJoin('fxTransferStateChange AS ftsc', 'ftsc.fxTransferStateChangeId', 'fts.maxFxTransferStateChangeId') + .where('ftt.expirationDate', '<', transactionTimestamp) + .andWhere('ftsc.transferStateId', `${Enum.Transfers.TransferInternalState.RECEIVED_PREPARE}`) + .select('ftt.commitRequestId', knex.raw('?', Enum.Transfers.TransferInternalState.EXPIRED_PREPARED), knex.raw('?', 'Aborted by Timeout Handler')) + }) + + // Insert `fxTransferStateChange` records for RESERVED + await knex.from(knex.raw('fxTransferStateChange (commitRequestId, transferStateId, reason)')).transacting(trx) + .insert(function () { + this.from('fxTransferTimeout AS ftt') + .innerJoin(knex('fxTransferStateChange AS ftsc1') + .select('ftsc1.commitRequestId') + .max('ftsc1.fxTransferStateChangeId AS maxFxTransferStateChangeId') + .innerJoin('fxTransferTimeout AS ftt1', 'ftt1.commitRequestId', 'ftsc1.commitRequestId') + .groupBy('ftsc1.commitRequestId').as('fts'), 'fts.commitRequestId', 'ftt.commitRequestId' + ) + .innerJoin('fxTransferStateChange AS ftsc', 'ftsc.fxTransferStateChangeId', 'fts.maxFxTransferStateChangeId') + .where('ftt.expirationDate', '<', transactionTimestamp) + .andWhere('ftsc.transferStateId', `${Enum.Transfers.TransferState.RESERVED}`) + .select('ftt.commitRequestId', knex.raw('?', Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT), knex.raw('?', 'Marked for expiration by Timeout Handler')) + }) + + // Insert `fxTransferStateChange` records for RECEIVED_FULFIL_DEPENDENT + await knex.from(knex.raw('fxTransferStateChange (commitRequestId, transferStateId, reason)')).transacting(trx) + .insert(function () { + this.from('fxTransferTimeout AS ftt') + .innerJoin(knex('fxTransferStateChange AS ftsc1') + .select('ftsc1.commitRequestId') + .max('ftsc1.fxTransferStateChangeId AS maxFxTransferStateChangeId') + .innerJoin('fxTransferTimeout AS ftt1', 'ftt1.commitRequestId', 'ftsc1.commitRequestId') + .groupBy('ftsc1.commitRequestId').as('fts'), 'fts.commitRequestId', 'ftt.commitRequestId' + ) + .innerJoin('fxTransferStateChange AS ftsc', 'ftsc.fxTransferStateChangeId', 'fts.maxFxTransferStateChangeId') + .where('ftt.expirationDate', '<', transactionTimestamp) + .andWhere('ftsc.transferStateId', `${Enum.Transfers.TransferInternalState.RECEIVED_FULFIL_DEPENDENT}`) + .select('ftt.commitRequestId', knex.raw('?', Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT), knex.raw('?', 'Marked for expiration by Timeout Handler')) + }) +} + +const _insertFxTransferErrorEntries = async (knex, trx, transactionTimestamp) => { + // Insert `fxTransferError` records + await knex.from(knex.raw('fxTransferError (commitRequestId, fxTransferStateChangeId, errorCode, errorDescription)')).transacting(trx) + .insert(function () { + this.from('fxTransferTimeout AS ftt') + .innerJoin(knex('fxTransferStateChange AS ftsc1') + .select('ftsc1.commitRequestId') + .max('ftsc1.fxTransferStateChangeId AS maxFxTransferStateChangeId') + .innerJoin('fxTransferTimeout AS ftt1', 'ftt1.commitRequestId', 'ftsc1.commitRequestId') + .groupBy('ftsc1.commitRequestId').as('fts'), 'fts.commitRequestId', 'ftt.commitRequestId' + ) + .innerJoin('fxTransferStateChange AS ftsc', 'ftsc.fxTransferStateChangeId', 'fts.maxFxTransferStateChangeId') + .where('ftt.expirationDate', '<', transactionTimestamp) + .andWhere('ftsc.transferStateId', `${Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT}`) + .select('ftt.commitRequestId', 'ftsc.fxTransferStateChangeId', knex.raw('?', ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED.code), knex.raw('?', ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED.message)) + }) +} + +const _getTransferTimeoutList = async (knex, transactionTimestamp) => { + /* istanbul ignore next */ + return knex('transferTimeout AS tt') + .innerJoin(knex('transferStateChange AS tsc1') + .select('tsc1.transferId') + .max('tsc1.transferStateChangeId AS maxTransferStateChangeId') + .innerJoin('transferTimeout AS tt1', 'tt1.transferId', 'tsc1.transferId') + .groupBy('tsc1.transferId') + .as('ts'), 'ts.transferId', 'tt.transferId' + ) + .innerJoin('transferStateChange AS tsc', 'tsc.transferStateChangeId', 'ts.maxTransferStateChangeId') + .innerJoin('transferParticipant AS tp1', function () { + this.on('tp1.transferId', 'tt.transferId') + .andOn('tp1.transferParticipantRoleTypeId', Enum.Accounts.TransferParticipantRoleType.PAYER_DFSP) + .andOn('tp1.ledgerEntryTypeId', Enum.Accounts.LedgerEntryType.PRINCIPLE_VALUE) + }) + .leftJoin('externalParticipant AS ep1', 'ep1.externalParticipantId', 'tp1.externalParticipantId') + .innerJoin('transferParticipant AS tp2', function () { + this.on('tp2.transferId', 'tt.transferId') + .andOn('tp2.transferParticipantRoleTypeId', Enum.Accounts.TransferParticipantRoleType.PAYEE_DFSP) + .andOn('tp2.ledgerEntryTypeId', Enum.Accounts.LedgerEntryType.PRINCIPLE_VALUE) + }) + .leftJoin('externalParticipant AS ep2', 'ep2.externalParticipantId', 'tp2.externalParticipantId') + .innerJoin('participant AS p1', 'p1.participantId', 'tp1.participantId') + .innerJoin('participant AS p2', 'p2.participantId', 'tp2.participantId') + .innerJoin(knex('transferStateChange AS tsc2') + .select('tsc2.transferId', 'tsc2.transferStateChangeId', 'ppc1.participantCurrencyId') + .innerJoin('transferTimeout AS tt2', 'tt2.transferId', 'tsc2.transferId') + .innerJoin('participantPositionChange AS ppc1', 'ppc1.transferStateChangeId', 'tsc2.transferStateChangeId') + .as('tpc'), 'tpc.transferId', 'tt.transferId' + ) + .leftJoin('bulkTransferAssociation AS bta', 'bta.transferId', 'tt.transferId') + + .where('tt.expirationDate', '<', transactionTimestamp) + .select( + 'tt.*', + 'tsc.transferStateId', + 'tp1.participantCurrencyId AS payerParticipantCurrencyId', + 'p1.name AS payerFsp', + 'p2.name AS payeeFsp', + 'tp2.participantCurrencyId AS payeeParticipantCurrencyId', + 'bta.bulkTransferId', + 'tpc.participantCurrencyId AS effectedParticipantCurrencyId', + 'ep1.name AS externalPayerName', + 'ep2.name AS externalPayeeName' + ) +} + +const _getFxTransferTimeoutList = async (knex, transactionTimestamp) => { + /* istanbul ignore next */ + return knex('fxTransferTimeout AS ftt') + .innerJoin(knex('fxTransferStateChange AS ftsc1') + .select('ftsc1.commitRequestId') + .max('ftsc1.fxTransferStateChangeId AS maxFxTransferStateChangeId') + .innerJoin('fxTransferTimeout AS ftt1', 'ftt1.commitRequestId', 'ftsc1.commitRequestId') + .groupBy('ftsc1.commitRequestId') + .as('fts'), 'fts.commitRequestId', 'ftt.commitRequestId' + ) + .innerJoin('fxTransferStateChange AS ftsc', 'ftsc.fxTransferStateChangeId', 'fts.maxFxTransferStateChangeId') + .innerJoin('fxTransferParticipant AS ftp1', function () { + this.on('ftp1.commitRequestId', 'ftt.commitRequestId') + .andOn('ftp1.transferParticipantRoleTypeId', Enum.Accounts.TransferParticipantRoleType.INITIATING_FSP) + .andOn('ftp1.ledgerEntryTypeId', Enum.Accounts.LedgerEntryType.PRINCIPLE_VALUE) + }) + .leftJoin('externalParticipant AS ep1', 'ep1.externalParticipantId', 'ftp1.externalParticipantId') + .innerJoin('fxTransferParticipant AS ftp2', function () { + this.on('ftp2.commitRequestId', 'ftt.commitRequestId') + .andOn('ftp2.transferParticipantRoleTypeId', Enum.Accounts.TransferParticipantRoleType.COUNTER_PARTY_FSP) + .andOn('ftp2.fxParticipantCurrencyTypeId', Enum.Fx.FxParticipantCurrencyType.TARGET) + .andOn('ftp2.ledgerEntryTypeId', Enum.Accounts.LedgerEntryType.PRINCIPLE_VALUE) + }) + .leftJoin('externalParticipant AS ep2', 'ep2.externalParticipantId', 'ftp2.externalParticipantId') + .innerJoin('participant AS p1', 'p1.participantId', 'ftp1.participantId') + .innerJoin('participant AS p2', 'p2.participantId', 'ftp2.participantId') + .innerJoin(knex('fxTransferStateChange AS ftsc2') + .select('ftsc2.commitRequestId', 'ftsc2.fxTransferStateChangeId', 'ppc1.participantCurrencyId') + .innerJoin('fxTransferTimeout AS ftt2', 'ftt2.commitRequestId', 'ftsc2.commitRequestId') + .innerJoin('participantPositionChange AS ppc1', 'ppc1.fxTransferStateChangeId', 'ftsc2.fxTransferStateChangeId') + .as('ftpc'), 'ftpc.commitRequestId', 'ftt.commitRequestId' + ) + .where('ftt.expirationDate', '<', transactionTimestamp) + .select( + 'ftt.*', + 'ftsc.transferStateId', + 'ftp1.participantCurrencyId AS initiatingParticipantCurrencyId', + 'p1.name AS initiatingFsp', + 'p2.name AS counterPartyFsp', + 'ftp2.participantCurrencyId AS counterPartyParticipantCurrencyId', + 'ftpc.participantCurrencyId AS effectedParticipantCurrencyId', + 'ep1.name AS externalInitiatingFspName', + 'ep2.name AS externalCounterPartyFspName' + ) +} + +/** + * @typedef {Object} TimedOutTransfer + * + * @property {Integer} transferTimeoutId + * @property {String} transferId + * @property {Date} expirationDate + * @property {Date} createdDate + * @property {String} transferStateId + * @property {String} payerFsp + * @property {String} payeeFsp + * @property {Integer} payerParticipantCurrencyId + * @property {Integer} payeeParticipantCurrencyId + * @property {Integer} bulkTransferId + * @property {Integer} effectedParticipantCurrencyId + * @property {String} externalPayerName + * @property {String} externalPayeeName + */ + +/** + * @typedef {Object} TimedOutFxTransfer + * + * @property {Integer} fxTransferTimeoutId + * @property {String} commitRequestId + * @property {Date} expirationDate + * @property {Date} createdDate + * @property {String} transferStateId + * @property {String} initiatingFsp + * @property {String} counterPartyFsp + * @property {Integer} initiatingParticipantCurrencyId + * @property {Integer} counterPartyParticipantCurrencyId + * @property {Integer} effectedParticipantCurrencyId + * @property {String} externalInitiatingFspName + * @property {String} externalCounterPartyFspName + */ + +/** + * Returns the list of transfers/fxTransfers that have timed out + * + * @returns {Promise<{ + * transferTimeoutList: TimedOutTransfer, + * fxTransferTimeoutList: TimedOutFxTransfer + * }>} + */ +const timeoutExpireReserved = async (segmentId, intervalMin, intervalMax, fxSegmentId, fxIntervalMin, fxIntervalMax) => { try { const transactionTimestamp = Time.getUTCString(new Date()) const knex = await Db.getKnex() @@ -607,66 +947,129 @@ const timeoutExpireReserved = async (segmentId, intervalMin, intervalMax) => { .max('transferStateChangeId AS maxTransferStateChangeId') .where('transferStateChangeId', '>', intervalMin) .andWhere('transferStateChangeId', '<=', intervalMax) - .groupBy('transferId').as('ts'), 'ts.transferId', 't.transferId' + .groupBy('transferId') + .as('ts'), 'ts.transferId', 't.transferId' ) .innerJoin('transferStateChange AS tsc', 'tsc.transferStateChangeId', 'ts.maxTransferStateChangeId') .leftJoin('transferTimeout AS tt', 'tt.transferId', 't.transferId') .whereNull('tt.transferId') .whereIn('tsc.transferStateId', [`${Enum.Transfers.TransferInternalState.RECEIVED_PREPARE}`, `${Enum.Transfers.TransferState.RESERVED}`]) .select('t.transferId', 't.expirationDate') - }) // .toSQL().sql - // console.log('SQL: ' + q1) + }) - // Insert `transferStateChange` records for RECEIVED_PREPARE - await knex.from(knex.raw('transferStateChange (transferId, transferStateId, reason)')).transacting(trx) + // Insert `fxTransferTimeout` records for fxTransfers found between the interval intervalMin <= intervalMax and related fxTransfers + await knex.from(knex.raw('fxTransferTimeout (commitRequestId, expirationDate)')).transacting(trx) .insert(function () { - this.from('transferTimeout AS tt') - .innerJoin(knex('transferStateChange AS tsc1') - .select('tsc1.transferId') - .max('tsc1.transferStateChangeId AS maxTransferStateChangeId') - .innerJoin('transferTimeout AS tt1', 'tt1.transferId', 'tsc1.transferId') - .groupBy('tsc1.transferId').as('ts'), 'ts.transferId', 'tt.transferId' + this.from('fxTransfer AS ft') + .innerJoin(knex('fxTransferStateChange') + .select('commitRequestId') + .max('fxTransferStateChangeId AS maxFxTransferStateChangeId') + .where('fxTransferStateChangeId', '>', fxIntervalMin) + .andWhere('fxTransferStateChangeId', '<=', fxIntervalMax) + .groupBy('commitRequestId').as('fts'), 'fts.commitRequestId', 'ft.commitRequestId' ) - .innerJoin('transferStateChange AS tsc', 'tsc.transferStateChangeId', 'ts.maxTransferStateChangeId') - .where('tt.expirationDate', '<', transactionTimestamp) - .andWhere('tsc.transferStateId', `${Enum.Transfers.TransferInternalState.RECEIVED_PREPARE}`) - .select('tt.transferId', knex.raw('?', Enum.Transfers.TransferInternalState.EXPIRED_PREPARED), knex.raw('?', 'Aborted by Timeout Handler')) - }) // .toSQL().sql - // console.log('SQL: ' + q2) - - // Insert `transferStateChange` records for RESERVED - await knex.from(knex.raw('transferStateChange (transferId, transferStateId, reason)')).transacting(trx) + .innerJoin('fxTransferStateChange AS ftsc', 'ftsc.fxTransferStateChangeId', 'fts.maxFxTransferStateChangeId') + .leftJoin('fxTransferTimeout AS ftt', 'ftt.commitRequestId', 'ft.commitRequestId') + .leftJoin('fxTransfer AS ft1', 'ft1.determiningTransferId', 'ft.determiningTransferId') + .whereNull('ftt.commitRequestId') + .whereIn('ftsc.transferStateId', [ + `${Enum.Transfers.TransferInternalState.RECEIVED_PREPARE}`, + `${Enum.Transfers.TransferState.RESERVED}`, + `${Enum.Transfers.TransferInternalState.RECEIVED_FULFIL_DEPENDENT}` + ]) + .select('ft1.commitRequestId', 'ft.expirationDate') // Passing expiration date of the timed out fxTransfer for all related fxTransfers + }) + + await _processTimeoutEntries(knex, trx, transactionTimestamp) + await _processFxTimeoutEntries(knex, trx, transactionTimestamp) + + // Insert `fxTransferTimeout` records for the related fxTransfers, or update if exists. The expiration date will be of the transfer and not from fxTransfer + await knex.from(knex.raw('fxTransferTimeout (commitRequestId, expirationDate)')).transacting(trx) .insert(function () { - this.from('transferTimeout AS tt') - .innerJoin(knex('transferStateChange AS tsc1') - .select('tsc1.transferId') - .max('tsc1.transferStateChangeId AS maxTransferStateChangeId') - .innerJoin('transferTimeout AS tt1', 'tt1.transferId', 'tsc1.transferId') - .groupBy('tsc1.transferId').as('ts'), 'ts.transferId', 'tt.transferId' + this.from('fxTransfer AS ft') + .innerJoin( + knex('transferTimeout AS tt') + .select('tt.transferId', 'tt.expirationDate') + .innerJoin( + knex('transferStateChange as tsc1') + .select('tsc1.transferId') + .max('tsc1.transferStateChangeId AS maxTransferStateChangeId') + .innerJoin('transferTimeout AS tt1', 'tt1.transferId', 'tsc1.transferId') + .groupBy('tsc1.transferId') + .as('ts'), + 'ts.transferId', 'tt.transferId' + ) + .innerJoin('transferStateChange AS tsc', 'tsc.transferStateChangeId', 'ts.maxTransferStateChangeId') + .where('tt.expirationDate', '<', transactionTimestamp) + .whereIn('tsc.transferStateId', [ + `${Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT}`, + `${Enum.Transfers.TransferInternalState.EXPIRED_PREPARED}` + ]) + .as('tt1'), + 'ft.determiningTransferId', 'tt1.transferId' ) - .innerJoin('transferStateChange AS tsc', 'tsc.transferStateChangeId', 'ts.maxTransferStateChangeId') - .where('tt.expirationDate', '<', transactionTimestamp) - .andWhere('tsc.transferStateId', `${Enum.Transfers.TransferState.RESERVED}`) - .select('tt.transferId', knex.raw('?', Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT), knex.raw('?', 'Marked for expiration by Timeout Handler')) - }) // .toSQL().sql - // console.log('SQL: ' + q3) - - // Insert `transferError` records - await knex.from(knex.raw('transferError (transferId, transferStateChangeId, errorCode, errorDescription)')).transacting(trx) + .select('ft.commitRequestId', 'tt1.expirationDate') + }) + .onConflict('commitRequestId') + .merge({ + expirationDate: knex.raw('VALUES(expirationDate)') + }) + + // Insert `transferTimeout` records for the related transfers, or update if exists. The expiration date will be of the fxTransfer and not from transfer + await knex.from(knex.raw('transferTimeout (transferId, expirationDate)')).transacting(trx) .insert(function () { - this.from('transferTimeout AS tt') - .innerJoin(knex('transferStateChange AS tsc1') - .select('tsc1.transferId') - .max('tsc1.transferStateChangeId AS maxTransferStateChangeId') - .innerJoin('transferTimeout AS tt1', 'tt1.transferId', 'tsc1.transferId') - .groupBy('tsc1.transferId').as('ts'), 'ts.transferId', 'tt.transferId' + this.from('fxTransfer AS ft') + .innerJoin( + knex('fxTransferTimeout AS ftt') + .select('ftt.commitRequestId', 'ftt.expirationDate') + .innerJoin( + knex('fxTransferStateChange AS ftsc1') + .select('ftsc1.commitRequestId') + .max('ftsc1.fxTransferStateChangeId AS maxFxTransferStateChangeId') + .innerJoin('fxTransferTimeout AS ftt1', 'ftt1.commitRequestId', 'ftsc1.commitRequestId') + .groupBy('ftsc1.commitRequestId') + .as('fts'), + 'fts.commitRequestId', 'ftt.commitRequestId' + ) + .innerJoin('fxTransferStateChange AS ftsc', 'ftsc.fxTransferStateChangeId', 'fts.maxFxTransferStateChangeId') + .where('ftt.expirationDate', '<', transactionTimestamp) + .whereIn('ftsc.transferStateId', [ + `${Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT}`, + `${Enum.Transfers.TransferInternalState.EXPIRED_PREPARED}` + ]) + .as('ftt1'), + 'ft.commitRequestId', 'ftt1.commitRequestId' ) - .innerJoin('transferStateChange AS tsc', 'tsc.transferStateChangeId', 'ts.maxTransferStateChangeId') - .where('tt.expirationDate', '<', transactionTimestamp) - .andWhere('tsc.transferStateId', `${Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT}`) - .select('tt.transferId', 'tsc.transferStateChangeId', knex.raw('?', ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED.code), knex.raw('?', ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED.message)) - }) // .toSQL().sql - // console.log('SQL: ' + q4) + .innerJoin( + knex('transferStateChange AS tsc') + .select('tsc.transferId') + .innerJoin( + knex('transferStateChange AS tsc1') + .select('tsc1.transferId') + .max('tsc1.transferStateChangeId AS maxTransferStateChangeId') + .groupBy('tsc1.transferId') + .as('ts'), + 'ts.transferId', 'tsc.transferId' + ) + .whereRaw('tsc.transferStateChangeId = ts.maxTransferStateChangeId') + .whereIn('tsc.transferStateId', [ + `${Enum.Transfers.TransferInternalState.RECEIVED_PREPARE}`, + `${Enum.Transfers.TransferState.RESERVED}` + ]) + .as('tt1'), + 'ft.determiningTransferId', 'tt1.transferId' + ) + .select('tt1.transferId', 'ftt1.expirationDate') + }) + .onConflict('transferId') + .merge({ + expirationDate: knex.raw('VALUES(expirationDate)') + }) + + await _processTimeoutEntries(knex, trx, transactionTimestamp) + await _processFxTimeoutEntries(knex, trx, transactionTimestamp) + await _insertTransferErrorEntries(knex, trx, transactionTimestamp) + await _insertFxTransferErrorEntries(knex, trx, transactionTimestamp) if (segmentId === 0) { const segment = { @@ -679,45 +1082,31 @@ const timeoutExpireReserved = async (segmentId, intervalMin, intervalMax) => { } else { await knex('segment').transacting(trx).where({ segmentId }).update({ value: intervalMax }) } - await trx.commit + if (fxSegmentId === 0) { + const fxSegment = { + segmentType: 'timeout', + enumeration: 0, + tableName: 'fxTransferStateChange', + value: fxIntervalMax + } + await knex('segment').transacting(trx).insert(fxSegment) + } else { + await knex('segment').transacting(trx).where({ segmentId: fxSegmentId }).update({ value: fxIntervalMax }) + } } catch (err) { - await trx.rollback throw ErrorHandler.Factory.reformatFSPIOPError(err) } }).catch((err) => { throw ErrorHandler.Factory.reformatFSPIOPError(err) }) - return knex('transferTimeout AS tt') - .innerJoin(knex('transferStateChange AS tsc1') - .select('tsc1.transferId') - .max('tsc1.transferStateChangeId AS maxTransferStateChangeId') - .innerJoin('transferTimeout AS tt1', 'tt1.transferId', 'tsc1.transferId') - .groupBy('tsc1.transferId').as('ts'), 'ts.transferId', 'tt.transferId' - ) - .innerJoin('transferStateChange AS tsc', 'tsc.transferStateChangeId', 'ts.maxTransferStateChangeId') - .innerJoin('transferParticipant AS tp1', function () { - this.on('tp1.transferId', 'tt.transferId') - .andOn('tp1.transferParticipantRoleTypeId', Enum.Accounts.TransferParticipantRoleType.PAYER_DFSP) - .andOn('tp1.ledgerEntryTypeId', Enum.Accounts.LedgerEntryType.PRINCIPLE_VALUE) - }) - .innerJoin('transferParticipant AS tp2', function () { - this.on('tp2.transferId', 'tt.transferId') - .andOn('tp2.transferParticipantRoleTypeId', Enum.Accounts.TransferParticipantRoleType.PAYEE_DFSP) - .andOn('tp2.ledgerEntryTypeId', Enum.Accounts.LedgerEntryType.PRINCIPLE_VALUE) - }) - .innerJoin('participantCurrency AS pc1', 'pc1.participantCurrencyId', 'tp1.participantCurrencyId') - .innerJoin('participant AS p1', 'p1.participantId', 'pc1.participantId') - - .innerJoin('participantCurrency AS pc2', 'pc2.participantCurrencyId', 'tp2.participantCurrencyId') - .innerJoin('participant AS p2', 'p2.participantId', 'pc2.participantId') - - .leftJoin('bulkTransferAssociation AS bta', 'bta.transferId', 'tt.transferId') + const transferTimeoutList = await _getTransferTimeoutList(knex, transactionTimestamp) + const fxTransferTimeoutList = await _getFxTransferTimeoutList(knex, transactionTimestamp) - .where('tt.expirationDate', '<', transactionTimestamp) - .select('tt.*', 'tsc.transferStateId', 'tp1.participantCurrencyId AS payerParticipantCurrencyId', - 'p1.name AS payerFsp', 'p2.name AS payeeFsp', 'tp2.participantCurrencyId AS payeeParticipantCurrencyId', - 'bta.bulkTransferId') + return { + transferTimeoutList, + fxTransferTimeoutList + } } catch (err) { throw ErrorHandler.Factory.reformatFSPIOPError(err) } @@ -727,119 +1116,113 @@ const transferStateAndPositionUpdate = async function (param1, enums, trx = null try { const knex = await Db.getKnex() - const trxFunction = async (trx, doCommit = true) => { + const trxFunction = async (trx) => { const transactionTimestamp = Time.getUTCString(new Date()) - let info, transferStateChangeId - try { - info = await knex('transfer AS t') - .join('transferParticipant AS dr', function () { - this.on('dr.transferId', 't.transferId') - .andOn('dr.amount', '>', 0) - }) - .join('participantCurrency AS drpc', 'drpc.participantCurrencyId', 'dr.participantCurrencyId') - .join('participantPosition AS drp', 'drp.participantCurrencyId', 'dr.participantCurrencyId') - .join('transferParticipant AS cr', function () { - this.on('cr.transferId', 't.transferId') - .andOn('cr.amount', '<', 0) + const info = await knex('transfer AS t') + .join('transferParticipant AS dr', function () { + this.on('dr.transferId', 't.transferId') + .andOn('dr.amount', '>', 0) + }) + .join('participantCurrency AS drpc', 'drpc.participantCurrencyId', 'dr.participantCurrencyId') + .join('participantPosition AS drp', 'drp.participantCurrencyId', 'dr.participantCurrencyId') + .join('transferParticipant AS cr', function () { + this.on('cr.transferId', 't.transferId') + .andOn('cr.amount', '<', 0) + }) + .join('participantCurrency AS crpc', 'crpc.participantCurrencyId', 'dr.participantCurrencyId') + .join('participantPosition AS crp', 'crp.participantCurrencyId', 'cr.participantCurrencyId') + .join('transferStateChange AS tsc', 'tsc.transferId', 't.transferId') + .where('t.transferId', param1.transferId) + .whereIn('drpc.ledgerAccountTypeId', [enums.ledgerAccountType.POSITION, enums.ledgerAccountType.SETTLEMENT, + enums.ledgerAccountType.HUB_RECONCILIATION, enums.ledgerAccountType.HUB_MULTILATERAL_SETTLEMENT]) + .whereIn('crpc.ledgerAccountTypeId', [enums.ledgerAccountType.POSITION, enums.ledgerAccountType.SETTLEMENT, + enums.ledgerAccountType.HUB_RECONCILIATION, enums.ledgerAccountType.HUB_MULTILATERAL_SETTLEMENT]) + .select('dr.participantCurrencyId AS drAccountId', 'dr.amount AS drAmount', 'drp.participantPositionId AS drPositionId', + 'drp.value AS drPositionValue', 'drp.reservedValue AS drReservedValue', 'cr.participantCurrencyId AS crAccountId', + 'cr.amount AS crAmount', 'crp.participantPositionId AS crPositionId', 'crp.value AS crPositionValue', + 'crp.reservedValue AS crReservedValue', 'tsc.transferStateId', 'drpc.ledgerAccountTypeId', 'crpc.ledgerAccountTypeId') + .orderBy('tsc.transferStateChangeId', 'desc') + .first() + .transacting(trx) + + if (param1.transferStateId === enums.transferState.COMMITTED || + param1.transferStateId === TransferInternalState.RESERVED_FORWARDED + ) { + await knex('transferStateChange') + .insert({ + transferId: param1.transferId, + transferStateId: enums.transferState.RECEIVED_FULFIL, + reason: param1.reason, + createdDate: param1.createdDate }) - .join('participantCurrency AS crpc', 'crpc.participantCurrencyId', 'dr.participantCurrencyId') - .join('participantPosition AS crp', 'crp.participantCurrencyId', 'cr.participantCurrencyId') - .join('transferStateChange AS tsc', 'tsc.transferId', 't.transferId') - .where('t.transferId', param1.transferId) - .whereIn('drpc.ledgerAccountTypeId', [enums.ledgerAccountType.POSITION, enums.ledgerAccountType.SETTLEMENT, - enums.ledgerAccountType.HUB_RECONCILIATION, enums.ledgerAccountType.HUB_MULTILATERAL_SETTLEMENT]) - .whereIn('crpc.ledgerAccountTypeId', [enums.ledgerAccountType.POSITION, enums.ledgerAccountType.SETTLEMENT, - enums.ledgerAccountType.HUB_RECONCILIATION, enums.ledgerAccountType.HUB_MULTILATERAL_SETTLEMENT]) - .select('dr.participantCurrencyId AS drAccountId', 'dr.amount AS drAmount', 'drp.participantPositionId AS drPositionId', - 'drp.value AS drPositionValue', 'drp.reservedValue AS drReservedValue', 'cr.participantCurrencyId AS crAccountId', - 'cr.amount AS crAmount', 'crp.participantPositionId AS crPositionId', 'crp.value AS crPositionValue', - 'crp.reservedValue AS crReservedValue', 'tsc.transferStateId', 'drpc.ledgerAccountTypeId', 'crpc.ledgerAccountTypeId') - .orderBy('tsc.transferStateChangeId', 'desc') - .first() .transacting(trx) - - if (param1.transferStateId === enums.transferState.COMMITTED) { - await knex('transferStateChange') - .insert({ - transferId: param1.transferId, - transferStateId: enums.transferState.RECEIVED_FULFIL, - reason: param1.reason, - createdDate: param1.createdDate - }) - .transacting(trx) - } else if (param1.transferStateId === enums.transferState.ABORTED_REJECTED) { - await knex('transferStateChange') - .insert({ - transferId: param1.transferId, - transferStateId: enums.transferState.RECEIVED_REJECT, - reason: param1.reason, - createdDate: param1.createdDate - }) - .transacting(trx) - } - transferStateChangeId = await knex('transferStateChange') + } else if (param1.transferStateId === enums.transferState.ABORTED_REJECTED) { + await knex('transferStateChange') .insert({ transferId: param1.transferId, - transferStateId: param1.transferStateId, + transferStateId: enums.transferState.RECEIVED_REJECT, reason: param1.reason, createdDate: param1.createdDate }) .transacting(trx) + } + const transferStateChangeId = await knex('transferStateChange') + .insert({ + transferId: param1.transferId, + transferStateId: param1.transferStateId, + reason: param1.reason, + createdDate: param1.createdDate + }) + .transacting(trx) - if (param1.drUpdated === true) { - if (param1.transferStateId === 'ABORTED_REJECTED') { - info.drAmount = -info.drAmount - } - await knex('participantPosition') - .update({ - value: new MLNumber(info.drPositionValue).add(info.drAmount).toFixed(Config.AMOUNT.SCALE), - changedDate: transactionTimestamp - }) - .where('participantPositionId', info.drPositionId) - .transacting(trx) - - await knex('participantPositionChange') - .insert({ - participantPositionId: info.drPositionId, - transferStateChangeId, - value: new MLNumber(info.drPositionValue).add(info.drAmount).toFixed(Config.AMOUNT.SCALE), - reservedValue: info.drReservedValue, - createdDate: param1.createdDate - }) - .transacting(trx) + if (param1.drUpdated === true) { + if (param1.transferStateId === 'ABORTED_REJECTED') { + info.drAmount = -info.drAmount } + await knex('participantPosition') + .update({ + value: new MLNumber(info.drPositionValue).add(info.drAmount).toFixed(Config.AMOUNT.SCALE), + changedDate: transactionTimestamp + }) + .where('participantPositionId', info.drPositionId) + .transacting(trx) - if (param1.crUpdated === true) { - if (param1.transferStateId === 'ABORTED_REJECTED') { - info.crAmount = -info.crAmount - } - await knex('participantPosition') - .update({ - value: new MLNumber(info.crPositionValue).add(info.crAmount).toFixed(Config.AMOUNT.SCALE), - changedDate: transactionTimestamp - }) - .where('participantPositionId', info.crPositionId) - .transacting(trx) - - await knex('participantPositionChange') - .insert({ - participantPositionId: info.crPositionId, - transferStateChangeId, - value: new MLNumber(info.crPositionValue).add(info.crAmount).toFixed(Config.AMOUNT.SCALE), - reservedValue: info.crReservedValue, - createdDate: param1.createdDate - }) - .transacting(trx) - } + await knex('participantPositionChange') + .insert({ + participantPositionId: info.drPositionId, + participantCurrencyId: info.drAccountId, + transferStateChangeId, + value: new MLNumber(info.drPositionValue).add(info.drAmount).toFixed(Config.AMOUNT.SCALE), + change: info.drAmount, + reservedValue: info.drReservedValue, + createdDate: param1.createdDate + }) + .transacting(trx) + } - if (doCommit) { - await trx.commit - } - } catch (err) { - if (doCommit) { - await trx.rollback + if (param1.crUpdated === true) { + if (param1.transferStateId === 'ABORTED_REJECTED') { + info.crAmount = -info.crAmount } - throw err + await knex('participantPosition') + .update({ + value: new MLNumber(info.crPositionValue).add(info.crAmount).toFixed(Config.AMOUNT.SCALE), + changedDate: transactionTimestamp + }) + .where('participantPositionId', info.crPositionId) + .transacting(trx) + + await knex('participantPositionChange') + .insert({ + participantPositionId: info.crPositionId, + participantCurrencyId: info.crAccountId, + transferStateChangeId, + value: new MLNumber(info.crPositionValue).add(info.crAmount).toFixed(Config.AMOUNT.SCALE), + change: info.crAmount, + reservedValue: info.crReservedValue, + createdDate: param1.createdDate + }) + .transacting(trx) } return { transferStateChangeId, @@ -849,7 +1232,7 @@ const transferStateAndPositionUpdate = async function (param1, enums, trx = null } if (trx) { - return await trxFunction(trx, false) + return await trxFunction(trx) } else { return await knex.transaction(trxFunction) } @@ -858,115 +1241,128 @@ const transferStateAndPositionUpdate = async function (param1, enums, trx = null } } -const reconciliationTransferPrepare = async function (payload, transactionTimestamp, enums, trx = null) { +const updatePrepareReservedForwarded = async function (transferId) { try { const knex = await Db.getKnex() + return await knex('transferStateChange') + .insert({ + transferId, + transferStateId: TransferInternalState.RESERVED_FORWARDED, + reason: null, + createdDate: Time.getUTCString(new Date()) + }) + } catch (err) { + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} - const trxFunction = async (trx, doCommit = true) => { - try { - // transferDuplicateCheck check and insert is done prior to calling the prepare - // see admin/handler.js :: transfer -> Comparators.duplicateCheckComparator - - // Insert transfer - await knex('transfer') - .insert({ - transferId: payload.transferId, - amount: payload.amount.amount, - currencyId: payload.amount.currency, - ilpCondition: 0, - expirationDate: Time.getUTCString(new Date(+new Date() + - 1000 * Number(Config.INTERNAL_TRANSFER_VALIDITY_SECONDS))), - createdDate: transactionTimestamp - }) - .transacting(trx) +const reconciliationTransferPrepare = async function (payload, transactionTimestamp, enums, trx = null) { + try { + const knex = await Db.getKnex() - // Retrieve hub reconciliation account for the specified currency - const { reconciliationAccountId } = await knex('participantCurrency') - .select('participantCurrencyId AS reconciliationAccountId') - .where('participantId', Config.HUB_ID) - .andWhere('currencyId', payload.amount.currency) - .first() - .transacting(trx) + const trxFunction = async (trx) => { + // transferDuplicateCheck check and insert is done prior to calling the prepare + // see admin/handler.js :: transfer -> Comparators.duplicateCheckComparator - let ledgerEntryTypeId, amount - if (payload.action === Enum.Transfers.AdminTransferAction.RECORD_FUNDS_IN) { - ledgerEntryTypeId = enums.ledgerEntryType.RECORD_FUNDS_IN - amount = payload.amount.amount - } else if (payload.action === Enum.Transfers.AdminTransferAction.RECORD_FUNDS_OUT_PREPARE_RESERVE) { - ledgerEntryTypeId = enums.ledgerEntryType.RECORD_FUNDS_OUT - amount = -payload.amount.amount - } else { - throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR, 'Action not allowed for reconciliationTransferPrepare') - } + // Insert transfer + await knex('transfer') + .insert({ + transferId: payload.transferId, + amount: payload.amount.amount, + currencyId: payload.amount.currency, + ilpCondition: 0, + expirationDate: Time.getUTCString(new Date(+new Date() + + 1000 * Number(Config.INTERNAL_TRANSFER_VALIDITY_SECONDS))), + createdDate: transactionTimestamp + }) + .transacting(trx) - // Insert transferParticipant records - await knex('transferParticipant') - .insert({ - transferId: payload.transferId, - participantCurrencyId: reconciliationAccountId, - transferParticipantRoleTypeId: enums.transferParticipantRoleType.HUB, - ledgerEntryTypeId, - amount, - createdDate: transactionTimestamp - }) - .transacting(trx) - await knex('transferParticipant') - .insert({ - transferId: payload.transferId, - participantCurrencyId: payload.participantCurrencyId, - transferParticipantRoleTypeId: enums.transferParticipantRoleType.DFSP_SETTLEMENT, - ledgerEntryTypeId, - amount: -amount, - createdDate: transactionTimestamp - }) - .transacting(trx) + // Retrieve hub reconciliation account for the specified currency + const { reconciliationAccountId } = await knex('participantCurrency') + .select('participantCurrencyId AS reconciliationAccountId') + .where('participantId', Config.HUB_ID) + .andWhere('currencyId', payload.amount.currency) + .first() + .transacting(trx) - await knex('transferStateChange') - .insert({ - transferId: payload.transferId, - transferStateId: enums.transferState.RECEIVED_PREPARE, - reason: payload.reason, - createdDate: transactionTimestamp - }) - .transacting(trx) + // Get participantId based on participantCurrencyId + const { participantId } = await knex('participantCurrency') + .select('participantId') + .where('participantCurrencyId', payload.participantCurrencyId) + .first() + .transacting(trx) + + let ledgerEntryTypeId, amount + if (payload.action === Enum.Transfers.AdminTransferAction.RECORD_FUNDS_IN) { + ledgerEntryTypeId = enums.ledgerEntryType.RECORD_FUNDS_IN + amount = payload.amount.amount + } else if (payload.action === Enum.Transfers.AdminTransferAction.RECORD_FUNDS_OUT_PREPARE_RESERVE) { + ledgerEntryTypeId = enums.ledgerEntryType.RECORD_FUNDS_OUT + amount = -payload.amount.amount + } else { + throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR, 'Action not allowed for reconciliationTransferPrepare') + } - // Save transaction reference and transfer extensions - let transferExtensions = [] - transferExtensions.push({ + // Insert transferParticipant records + await knex('transferParticipant') + .insert({ transferId: payload.transferId, - key: 'externalReference', - value: payload.externalReference, + participantId: Config.HUB_ID, + participantCurrencyId: reconciliationAccountId, + transferParticipantRoleTypeId: enums.transferParticipantRoleType.HUB, + ledgerEntryTypeId, + amount, createdDate: transactionTimestamp }) - if (payload.extensionList && payload.extensionList.extension) { - transferExtensions = transferExtensions.concat( - payload.extensionList.extension.map(ext => { - return { - transferId: payload.transferId, - key: ext.key, - value: ext.value, - createdDate: transactionTimestamp - } - }) - ) - } - for (const transferExtension of transferExtensions) { - await knex('transferExtension').insert(transferExtension).transacting(trx) - } + .transacting(trx) + await knex('transferParticipant') + .insert({ + transferId: payload.transferId, + participantId, + participantCurrencyId: payload.participantCurrencyId, + transferParticipantRoleTypeId: enums.transferParticipantRoleType.DFSP_SETTLEMENT, + ledgerEntryTypeId, + amount: -amount, + createdDate: transactionTimestamp + }) + .transacting(trx) - if (doCommit) { - await trx.commit - } - } catch (err) { - if (doCommit) { - await trx.rollback - } - throw err + await knex('transferStateChange') + .insert({ + transferId: payload.transferId, + transferStateId: enums.transferState.RECEIVED_PREPARE, + reason: payload.reason, + createdDate: transactionTimestamp + }) + .transacting(trx) + + // Save transaction reference and transfer extensions + let transferExtensions = [] + transferExtensions.push({ + transferId: payload.transferId, + key: 'externalReference', + value: payload.externalReference, + createdDate: transactionTimestamp + }) + if (payload.extensionList && payload.extensionList.extension) { + transferExtensions = transferExtensions.concat( + payload.extensionList.extension.map(ext => { + return { + transferId: payload.transferId, + key: ext.key, + value: ext.value, + createdDate: transactionTimestamp + } + }) + ) + } + for (const transferExtension of transferExtensions) { + await knex('transferExtension').insert(transferExtension).transacting(trx) } } if (trx) { - await trxFunction(trx, false) + await trxFunction(trx) } else { await knex.transaction(trxFunction) } @@ -980,38 +1376,27 @@ const reconciliationTransferReserve = async function (payload, transactionTimest try { const knex = await Db.getKnex() - const trxFunction = async (trx, doCommit = true) => { - try { - const param1 = { - transferId: payload.transferId, - transferStateId: enums.transferState.RESERVED, - reason: payload.reason, - createdDate: transactionTimestamp, - drUpdated: true, - crUpdated: false - } - const positionResult = await TransferFacade.transferStateAndPositionUpdate(param1, enums, trx) - - if (payload.action === Enum.Transfers.AdminTransferAction.RECORD_FUNDS_OUT_PREPARE_RESERVE && - positionResult.drPositionValue > 0) { - payload.reason = 'Aborted due to insufficient funds' - payload.action = Enum.Transfers.AdminTransferAction.RECORD_FUNDS_OUT_ABORT - await TransferFacade.reconciliationTransferAbort(payload, transactionTimestamp, enums, trx) - } + const trxFunction = async (trx) => { + const param1 = { + transferId: payload.transferId, + transferStateId: enums.transferState.RESERVED, + reason: payload.reason, + createdDate: transactionTimestamp, + drUpdated: true, + crUpdated: false + } + const positionResult = await TransferFacade.transferStateAndPositionUpdate(param1, enums, trx) - if (doCommit) { - await trx.commit - } - } catch (err) { - if (doCommit) { - await trx.rollback - } - throw err + if (payload.action === Enum.Transfers.AdminTransferAction.RECORD_FUNDS_OUT_PREPARE_RESERVE && + positionResult.drPositionValue > 0) { + payload.reason = 'Aborted due to insufficient funds' + payload.action = Enum.Transfers.AdminTransferAction.RECORD_FUNDS_OUT_ABORT + await TransferFacade.reconciliationTransferAbort(payload, transactionTimestamp, enums, trx) } } if (trx) { - await trxFunction(trx, false) + await trxFunction(trx) } else { await knex.transaction(trxFunction) } @@ -1025,55 +1410,44 @@ const reconciliationTransferCommit = async function (payload, transactionTimesta try { const knex = await Db.getKnex() - const trxFunction = async (trx, doCommit = true) => { - try { - // Persist transfer state and participant position change - const transferId = payload.transferId - await knex('transferFulfilmentDuplicateCheck') - .insert({ - transferId - }) - .transacting(trx) - - await knex('transferFulfilment') - .insert({ - transferId, - ilpFulfilment: 0, - completedDate: transactionTimestamp, - isValid: 1, - settlementWindowId: null, - createdDate: transactionTimestamp - }) - .transacting(trx) - - if (payload.action === Enum.Transfers.AdminTransferAction.RECORD_FUNDS_IN || - payload.action === Enum.Transfers.AdminTransferAction.RECORD_FUNDS_OUT_COMMIT) { - const param1 = { - transferId: payload.transferId, - transferStateId: enums.transferState.COMMITTED, - reason: payload.reason, - createdDate: transactionTimestamp, - drUpdated: false, - crUpdated: true - } - await TransferFacade.transferStateAndPositionUpdate(param1, enums, trx) - } else { - throw new Error('Action not allowed for reconciliationTransferCommit') - } + const trxFunction = async (trx) => { + // Persist transfer state and participant position change + const transferId = payload.transferId + await knex('transferFulfilmentDuplicateCheck') + .insert({ + transferId + }) + .transacting(trx) + + await knex('transferFulfilment') + .insert({ + transferId, + ilpFulfilment: 0, + completedDate: transactionTimestamp, + isValid: 1, + settlementWindowId: null, + createdDate: transactionTimestamp + }) + .transacting(trx) - if (doCommit) { - await trx.commit - } - } catch (err) { - if (doCommit) { - await trx.rollback + if (payload.action === Enum.Transfers.AdminTransferAction.RECORD_FUNDS_IN || + payload.action === Enum.Transfers.AdminTransferAction.RECORD_FUNDS_OUT_COMMIT) { + const param1 = { + transferId: payload.transferId, + transferStateId: enums.transferState.COMMITTED, + reason: payload.reason, + createdDate: transactionTimestamp, + drUpdated: false, + crUpdated: true } - throw err + await TransferFacade.transferStateAndPositionUpdate(param1, enums, trx) + } else { + throw new Error('Action not allowed for reconciliationTransferCommit') } } if (trx) { - await trxFunction(trx, false) + await trxFunction(trx) } else { await knex.transaction(trxFunction) } @@ -1087,54 +1461,43 @@ const reconciliationTransferAbort = async function (payload, transactionTimestam try { const knex = await Db.getKnex() - const trxFunction = async (trx, doCommit = true) => { - try { - // Persist transfer state and participant position change - const transferId = payload.transferId - await knex('transferFulfilmentDuplicateCheck') - .insert({ - transferId - }) - .transacting(trx) - - await knex('transferFulfilment') - .insert({ - transferId, - ilpFulfilment: 0, - completedDate: transactionTimestamp, - isValid: 1, - settlementWindowId: null, - createdDate: transactionTimestamp - }) - .transacting(trx) - - if (payload.action === Enum.Transfers.AdminTransferAction.RECORD_FUNDS_OUT_ABORT) { - const param1 = { - transferId: payload.transferId, - transferStateId: enums.transferState.ABORTED_REJECTED, - reason: payload.reason, - createdDate: transactionTimestamp, - drUpdated: true, - crUpdated: false - } - await TransferFacade.transferStateAndPositionUpdate(param1, enums, trx) - } else { - throw new Error('Action not allowed for reconciliationTransferAbort') - } + const trxFunction = async (trx) => { + // Persist transfer state and participant position change + const transferId = payload.transferId + await knex('transferFulfilmentDuplicateCheck') + .insert({ + transferId + }) + .transacting(trx) + + await knex('transferFulfilment') + .insert({ + transferId, + ilpFulfilment: 0, + completedDate: transactionTimestamp, + isValid: 1, + settlementWindowId: null, + createdDate: transactionTimestamp + }) + .transacting(trx) - if (doCommit) { - await trx.commit - } - } catch (err) { - if (doCommit) { - await trx.rollback + if (payload.action === Enum.Transfers.AdminTransferAction.RECORD_FUNDS_OUT_ABORT) { + const param1 = { + transferId: payload.transferId, + transferStateId: enums.transferState.ABORTED_REJECTED, + reason: payload.reason, + createdDate: transactionTimestamp, + drUpdated: true, + crUpdated: false } - throw err + await TransferFacade.transferStateAndPositionUpdate(param1, enums, trx) + } else { + throw new Error('Action not allowed for reconciliationTransferAbort') } } if (trx) { - await trxFunction(trx, false) + await trxFunction(trx) } else { await knex.transaction(trxFunction) } @@ -1151,11 +1514,9 @@ const getTransferParticipant = async (participantName, transferId) => { .where({ 'participant.name': participantName, 'tp.transferId': transferId, - 'participant.isActive': 1, - 'pc.isActive': 1 + 'participant.isActive': 1 }) - .innerJoin('participantCurrency AS pc', 'pc.participantId', 'participant.participantId') - .innerJoin('transferParticipant AS tp', 'tp.participantCurrencyId', 'pc.participantCurrencyId') + .innerJoin('transferParticipant AS tp', 'tp.participantId', 'participant.participantId') .select( 'tp.*' ) @@ -1173,10 +1534,8 @@ const recordFundsIn = async (payload, transactionTimestamp, enums) => { await TransferFacade.reconciliationTransferPrepare(payload, transactionTimestamp, enums, trx) await TransferFacade.reconciliationTransferReserve(payload, transactionTimestamp, enums, trx) await TransferFacade.reconciliationTransferCommit(payload, transactionTimestamp, enums, trx) - await trx.commit } catch (err) { - Logger.isErrorEnabled && Logger.error(err) - await trx.rollback + logger.error('error in recordFundsIn:', err) throw ErrorHandler.Factory.reformatFSPIOPError(err) } }) @@ -1197,7 +1556,8 @@ const TransferFacade = { reconciliationTransferCommit, reconciliationTransferAbort, getTransferParticipant, - recordFundsIn + recordFundsIn, + updatePrepareReservedForwarded } module.exports = TransferFacade diff --git a/src/models/transfer/ilpPacket.js b/src/models/transfer/ilpPacket.js index 88f7c7a8a..fe40c7214 100644 --- a/src/models/transfer/ilpPacket.js +++ b/src/models/transfer/ilpPacket.js @@ -1,29 +1,30 @@ /* -- License -- -------------- -- Copyright © 2017 Bill & Melinda Gates Foundation -- The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at -- http://www.apache.org/licenses/LICENSE-2.0 -- Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -- Contributors -- -------------- -- This is the official list of the Mojaloop project contributors for this file. -- Names of the original copyright holders (individuals or organizations) -- should be listed with a '*' in the first column. People who have -- contributed from an organization can be listed under the organization -- that actually holds the copyright for their contributions (see the -- Gates Foundation organization for an example). Those individuals should have -- their names indented and be marked with a '-'. Email address can be added -- optionally within square brackets . -- * Gates Foundation -- - Name Surname + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at -- * Georgi Georgiev -- * Valentin Genev -- * Rajiv Mothilal -- * Miguel de Barros -- -------------- -- ******/ + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Georgi Georgiev + * Valentin Genev + * Rajiv Mothilal + * Miguel de Barros + -------------- +******/ 'use strict' diff --git a/src/models/transfer/transfer.js b/src/models/transfer/transfer.js index ff4d24571..f943b05d9 100644 --- a/src/models/transfer/transfer.js +++ b/src/models/transfer/transfer.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/transfer/transferDuplicateCheck.js b/src/models/transfer/transferDuplicateCheck.js index 35e121241..53912d43e 100644 --- a/src/models/transfer/transferDuplicateCheck.js +++ b/src/models/transfer/transferDuplicateCheck.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/transfer/transferError.js b/src/models/transfer/transferError.js index 43741e52b..b699eea70 100644 --- a/src/models/transfer/transferError.js +++ b/src/models/transfer/transferError.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/transfer/transferErrorDuplicateCheck.js b/src/models/transfer/transferErrorDuplicateCheck.js index 06ab156b9..5bba69841 100644 --- a/src/models/transfer/transferErrorDuplicateCheck.js +++ b/src/models/transfer/transferErrorDuplicateCheck.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/transfer/transferExtension.js b/src/models/transfer/transferExtension.js index edc48f440..58f907b0a 100644 --- a/src/models/transfer/transferExtension.js +++ b/src/models/transfer/transferExtension.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/transfer/transferFulfilment.js b/src/models/transfer/transferFulfilment.js index 522db90b0..f22762271 100644 --- a/src/models/transfer/transferFulfilment.js +++ b/src/models/transfer/transferFulfilment.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/transfer/transferFulfilmentDuplicateCheck.js b/src/models/transfer/transferFulfilmentDuplicateCheck.js index 7ece58146..41dc9bc17 100644 --- a/src/models/transfer/transferFulfilmentDuplicateCheck.js +++ b/src/models/transfer/transferFulfilmentDuplicateCheck.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/transfer/transferParticipant.js b/src/models/transfer/transferParticipant.js index bafbfa96b..488ed1337 100644 --- a/src/models/transfer/transferParticipant.js +++ b/src/models/transfer/transferParticipant.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/transfer/transferStateChange.js b/src/models/transfer/transferStateChange.js index ed7234bd2..aec23d74c 100644 --- a/src/models/transfer/transferStateChange.js +++ b/src/models/transfer/transferStateChange.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/models/transfer/transferTimeout.js b/src/models/transfer/transferTimeout.js index ac33b20cc..c59b085c6 100644 --- a/src/models/transfer/transferTimeout.js +++ b/src/models/transfer/transferTimeout.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/src/schema/bulkTransfer.js b/src/schema/bulkTransfer.js index 34a8b586e..5afaa09d5 100644 --- a/src/schema/bulkTransfer.js +++ b/src/schema/bulkTransfer.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . diff --git a/src/shared/constants.js b/src/shared/constants.js new file mode 100644 index 000000000..92f4d65ae --- /dev/null +++ b/src/shared/constants.js @@ -0,0 +1,52 @@ +const { Enum } = require('@mojaloop/central-services-shared') + +const TABLE_NAMES = Object.freeze({ + externalParticipant: 'externalParticipant', + fxTransfer: 'fxTransfer', + fxTransferDuplicateCheck: 'fxTransferDuplicateCheck', + fxTransferErrorDuplicateCheck: 'fxTransferErrorDuplicateCheck', + fxTransferFulfilmentDuplicateCheck: 'fxTransferFulfilmentDuplicateCheck', + fxTransferParticipant: 'fxTransferParticipant', + fxTransferStateChange: 'fxTransferStateChange', + fxTransferExtension: 'fxTransferExtension', + fxWatchList: 'fxWatchList', + transferDuplicateCheck: 'transferDuplicateCheck', + participantPositionChange: 'participantPositionChange' +}) + +const FX_METRIC_PREFIX = 'fx_' +const FORWARDED_METRIC_PREFIX = 'fwd_' + +const PROM_METRICS = Object.freeze({ + transferGet: (isFx) => `${isFx ? FX_METRIC_PREFIX : ''}transfer_get`, + transferPrepare: (isFx, isForwarded) => `${isFx ? FX_METRIC_PREFIX : ''}${isForwarded ? FORWARDED_METRIC_PREFIX : ''}transfer_prepare`, + transferFulfil: (isFx) => `${isFx ? FX_METRIC_PREFIX : ''}transfer_fulfil`, + transferFulfilError: (isFx) => `${isFx ? FX_METRIC_PREFIX : ''}transfer_fulfil_error` +}) + +const ERROR_MESSAGES = Object.freeze({ + fxTransferNotFound: 'fxTransfer not found', + fxTransferHeaderSourceValidationError: `${Enum.Http.Headers.FSPIOP.SOURCE} header does not match counterPartyFsp on the fxFulfil callback response`, + fxTransferHeaderDestinationValidationError: `${Enum.Http.Headers.FSPIOP.DESTINATION} header does not match initiatingFsp on the fxFulfil callback response`, + fxInvalidFulfilment: 'Invalid FX fulfilment', + fxTransferNonReservedState: 'Non-RESERVED fxTransfer state', + fxTransferExpired: 'fxTransfer expired', + invalidApiErrorCode: 'API specification undefined errorCode', + invalidEventType: type => `Invalid event type:(${type})`, + invalidAction: action => `Invalid action:(${action})`, + invalidFxTransferState: ({ transferStateEnum, action, type }) => `Invalid fxTransferStateEnumeration:(${transferStateEnum}) for event action:(${action}) and type:(${type})`, + fxActionIsNotAllowed: action => `action ${action} is not allowed into fxFulfil handler`, + noFxDuplicateHash: 'No fxDuplicateHash found', + transferNotFound: 'transfer not found' +}) + +const DB_ERROR_CODES = Object.freeze({ + duplicateEntry: 'ER_DUP_ENTRY' +}) + +module.exports = { + DB_ERROR_CODES, + ERROR_MESSAGES, + TABLE_NAMES, + PROM_METRICS +} diff --git a/src/shared/fspiopErrorFactory.js b/src/shared/fspiopErrorFactory.js new file mode 100644 index 000000000..2eef9c223 --- /dev/null +++ b/src/shared/fspiopErrorFactory.js @@ -0,0 +1,130 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Gates Foundation + - Name Surname + + * Eugen Klymniuk + -------------- + **********/ + +/* eslint-disable no-return-assign */ +const { Factory, Enums } = require('@mojaloop/central-services-error-handling') +const { logger } = require('../shared/logger') +const { ERROR_MESSAGES } = require('./constants') + +const fspiopErrorFactory = { + fxTransferNotFound: (cause = null, replyTo = '') => { + return Factory.createFSPIOPError( + Enums.FSPIOPErrorCodes.TRANSFER_ID_NOT_FOUND, + ERROR_MESSAGES.fxTransferNotFound, + cause, replyTo + ) + }, + + fxHeaderSourceValidationError: (cause = null, replyTo = '') => { + return Factory.createFSPIOPError( + Enums.FSPIOPErrorCodes.VALIDATION_ERROR, + ERROR_MESSAGES.fxTransferHeaderSourceValidationError, + cause, replyTo + ) + }, + + fxHeaderDestinationValidationError: (cause = null, replyTo = '') => { + return Factory.createFSPIOPError( + Enums.FSPIOPErrorCodes.VALIDATION_ERROR, + ERROR_MESSAGES.fxTransferHeaderDestinationValidationError, + cause, replyTo + ) + }, + + fxInvalidFulfilment: (cause = null, replyTo = '') => { + return Factory.createFSPIOPError( + Enums.FSPIOPErrorCodes.VALIDATION_ERROR, + ERROR_MESSAGES.fxInvalidFulfilment, + cause, replyTo + ) + }, + + fxTransferNonReservedState: (cause = null, replyTo = '') => { + return Factory.createFSPIOPError( + Enums.FSPIOPErrorCodes.VALIDATION_ERROR, + ERROR_MESSAGES.fxTransferNonReservedState, + cause, replyTo + ) + }, + + fxTransferExpired: (cause = null, replyTo = '') => { + return Factory.createFSPIOPError( + Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED, + ERROR_MESSAGES.fxTransferExpired, + cause, replyTo + ) + }, + + invalidEventType: (type, cause = null, replyTo = '') => { + return Factory.createInternalServerFSPIOPError( + ERROR_MESSAGES.invalidEventType(type), + cause, replyTo + ) + }, + + fxActionIsNotAllowed: (action, cause = null, replyTo = '') => { + return Factory.createInternalServerFSPIOPError( + ERROR_MESSAGES.fxActionIsNotAllowed(action), + cause, replyTo + ) + }, + + invalidFxTransferState: ({ transferStateEnum, action, type }, cause = null, replyTo = '') => { + return Factory.createInternalServerFSPIOPError( + ERROR_MESSAGES.invalidFxTransferState({ transferStateEnum, action, type }), + cause, replyTo + ) + }, + + noFxDuplicateHash: (cause = null, replyTo = '') => { + return Factory.createFSPIOPError( + Enums.FSPIOPErrorCodes.MODIFIED_REQUEST, + ERROR_MESSAGES.noFxDuplicateHash, + cause, replyTo + ) + }, + + fromErrorInformation: (errInfo, cause = null, replyTo = '') => { + let fspiopError + + try { // handle only valid errorCodes provided by the payee + fspiopError = Factory.createFSPIOPErrorFromErrorInformation(errInfo) + } catch (err) { + logger.error(`apiErrorCode error: ${err?.message}`) + fspiopError = Factory.createFSPIOPError( + Enums.FSPIOPErrorCodes.VALIDATION_ERROR, + ERROR_MESSAGES.invalidApiErrorCode, + cause, replyTo + ) + } + return fspiopError + } + +} + +module.exports = fspiopErrorFactory diff --git a/src/shared/logger/index.js b/src/shared/logger/index.js new file mode 100644 index 000000000..96b77abeb --- /dev/null +++ b/src/shared/logger/index.js @@ -0,0 +1,8 @@ +const { loggerFactory } = require('@mojaloop/central-services-logger/src/contextLogger') + +const logger = loggerFactory('CL') // global logger + +module.exports = { + logger, + loggerFactory +} diff --git a/src/shared/loggingPlugin.js b/src/shared/loggingPlugin.js new file mode 100644 index 000000000..e0f01a991 --- /dev/null +++ b/src/shared/loggingPlugin.js @@ -0,0 +1,43 @@ +const { asyncStorage } = require('@mojaloop/central-services-logger/src/contextLogger') +const { logger } = require('./logger') // pass though options + +const loggingPlugin = { + name: 'loggingPlugin', + version: '1.0.0', + once: true, + register: async (server, options) => { + // const { logger } = options; + server.ext({ + type: 'onPreHandler', + method: (request, h) => { + const { path, method, headers, payload, query } = request + const { remoteAddress } = request.info + const requestId = request.info.id = `${request.info.id}__${headers.traceid}` + asyncStorage.enterWith({ requestId }) + + logger.isInfoEnabled && logger.info(`[==> req] ${method.toUpperCase()} ${path}`, { headers, payload, query, remoteAddress }) + return h.continue + } + }) + + server.ext({ + type: 'onPreResponse', + method: (request, h) => { + if (logger.isInfoEnabled) { + const { path, method, headers, payload, query, response } = request + const { received } = request.info + + const statusCode = response instanceof Error + ? response.output?.statusCode + : response.statusCode + const respTimeSec = ((Date.now() - received) / 1000).toFixed(3) + + logger.info(`[<== ${statusCode}][${respTimeSec} s] ${method.toUpperCase()} ${path}`, { headers, payload, query }) + } + return h.continue + } + }) + } +} + +module.exports = loggingPlugin diff --git a/src/shared/plugins.js b/src/shared/plugins.js index 9717dec5e..f1afa820a 100644 --- a/src/shared/plugins.js +++ b/src/shared/plugins.js @@ -7,6 +7,7 @@ const Blipp = require('blipp') const ErrorHandling = require('@mojaloop/central-services-error-handling') const APIDocumentation = require('@mojaloop/central-services-shared').Util.Hapi.APIDocumentation const Config = require('../lib/config') +const LoggingPlugin = require('./loggingPlugin') const registerPlugins = async (server) => { if (Config.API_DOC_ENDPOINTS_ENABLED) { @@ -39,6 +40,11 @@ const registerPlugins = async (server) => { plugin: require('hapi-auth-bearer-token') }) + await server.register({ + plugin: LoggingPlugin, + options: {} + }) + await server.register([Inert, Vision, Blipp, ErrorHandling]) } diff --git a/src/shared/setup.js b/src/shared/setup.js index 19fd3b2e7..44d157f37 100644 --- a/src/shared/setup.js +++ b/src/shared/setup.js @@ -2,8 +2,8 @@ * @file This registers all handlers for the central-ledger API License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -16,7 +16,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -36,6 +36,7 @@ const Hapi = require('@hapi/hapi') const Migrator = require('../lib/migrator') const Db = require('../lib/db') +const ProxyCache = require('../lib/proxyCache') const ObjStoreDb = require('@mojaloop/object-store-lib').Db const Plugins = require('./plugins') const Config = require('../lib/config') @@ -51,6 +52,7 @@ const EnumCached = require('../lib/enumCached') const ParticipantCached = require('../models/participant/participantCached') const ParticipantCurrencyCached = require('../models/participant/participantCurrencyCached') const ParticipantLimitCached = require('../models/participant/participantLimitCached') +const externalParticipantCached = require('../models/participant/externalParticipantCached') const BatchPositionModelCached = require('../models/position/batchCached') const MongoUriBuilder = require('mongo-uri-builder') @@ -236,6 +238,8 @@ const initializeCache = async () => { await ParticipantCurrencyCached.initialize() await ParticipantLimitCached.initialize() await BatchPositionModelCached.initialize() + // all cached models initialize-methods are SYNC!! + externalParticipantCached.initialize() await Cache.initCache() } @@ -265,6 +269,9 @@ const initialize = async function ({ service, port, modules = [], runMigrations await connectDatabase() await connectMongoose() await initializeCache() + if (Config.PROXY_CACHE_CONFIG?.enabled) { + await ProxyCache.connect() + } let server switch (service) { @@ -303,6 +310,9 @@ const initialize = async function ({ service, port, modules = [], runMigrations Logger.isErrorEnabled && Logger.error(`Error while initializing ${err}`) await Db.disconnect() + if (Config.PROXY_CACHE_CONFIG?.enabled) { + await ProxyCache.disconnect() + } process.exit(1) } } diff --git a/test-integration.Dockerfile b/test-integration.Dockerfile index cca862220..4772cae9e 100644 --- a/test-integration.Dockerfile +++ b/test-integration.Dockerfile @@ -2,7 +2,7 @@ ARG NODE_VERSION=lts-alpine # Build Image -FROM node:${NODE_VERSION} as builder +FROM node:${NODE_VERSION} AS builder USER root diff --git a/test.Dockerfile b/test.Dockerfile index 6d8b708cb..e2174a439 100644 --- a/test.Dockerfile +++ b/test.Dockerfile @@ -2,7 +2,7 @@ ARG NODE_VERSION=lts-alpine # Build Image -FROM node:${NODE_VERSION} as builder +FROM node:${NODE_VERSION} AS builder USER root diff --git a/test/fixtures.js b/test/fixtures.js new file mode 100644 index 000000000..5b4b8b564 --- /dev/null +++ b/test/fixtures.js @@ -0,0 +1,366 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Eugen Klymniuk + -------------- + **********/ + +const { randomUUID } = require('node:crypto') +const { Enum } = require('@mojaloop/central-services-shared') +const Config = require('../src/lib/config') + +const ILP_PACKET = 'AYIBgQAAAAAAAASwNGxldmVsb25lLmRmc3AxLm1lci45T2RTOF81MDdqUUZERmZlakgyOVc4bXFmNEpLMHlGTFGCAUBQU0svMS4wCk5vbmNlOiB1SXlweUYzY3pYSXBFdzVVc05TYWh3CkVuY3J5cHRpb246IG5vbmUKUGF5bWVudC1JZDogMTMyMzZhM2ItOGZhOC00MTYzLTg0NDctNGMzZWQzZGE5OGE3CgpDb250ZW50LUxlbmd0aDogMTM1CkNvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbgpTZW5kZXItSWRlbnRpZmllcjogOTI4MDYzOTEKCiJ7XCJmZWVcIjowLFwidHJhbnNmZXJDb2RlXCI6XCJpbnZvaWNlXCIsXCJkZWJpdE5hbWVcIjpcImFsaWNlIGNvb3BlclwiLFwiY3JlZGl0TmFtZVwiOlwibWVyIGNoYW50XCIsXCJkZWJpdElkZW50aWZpZXJcIjpcIjkyODA2MzkxXCJ9IgA' +const CONDITION = '8x04dj-RKEtfjStajaKXKJ5eL1mWm9iG2ltEKvEDOHc' +const FULFILMENT = 'uz0FAeutW6o8Mz7OmJh8ALX6mmsZCcIDOqtE01eo4uI' + +const DFSP1_ID = 'dfsp1' +const DFSP2_ID = 'dfsp2' +const FXP_ID = 'fxp' +const SWITCH_ID = Config.HUB_NAME + +const TOPICS = Object.freeze({ + notificationEvent: 'topic-notification-event', + transferPosition: 'topic-transfer-position', + transferFulfil: 'topic-transfer-fulfil', + transferPositionBatch: 'topic-transfer-position-batch' +}) +// think, how to define TOPICS dynamically (based on TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE) + +const extensionListDto = ({ + key = 'key1', + value = 'value1' +} = {}) => ({ + extension: [ + { key, value } + ] +}) + +const fulfilPayloadDto = ({ + fulfilment = FULFILMENT, + transferState = 'RECEIVED', + completedTimestamp = new Date().toISOString(), + extensionList = extensionListDto() +} = {}) => ({ + fulfilment, + transferState, + completedTimestamp, + extensionList +}) + +const fxFulfilPayloadDto = ({ + fulfilment = FULFILMENT, + conversionState = 'RECEIVED', + completedTimestamp = new Date().toISOString(), + extensionList = extensionListDto() +} = {}) => ({ + fulfilment, + conversionState, + completedTimestamp, + extensionList +}) + +const fulfilContentDto = ({ + payload = fulfilPayloadDto(), + transferId = randomUUID(), + from = DFSP1_ID, + to = DFSP2_ID +} = {}) => ({ + payload, + uriParams: { + id: transferId + }, + headers: { + 'fspiop-source': from, + 'fspiop-destination': to, + 'content-type': 'application/vnd.interoperability.transfers+json;version=1.1' + } +}) + +const fxFulfilContentDto = ({ + payload = fxFulfilPayloadDto(), + commitRequestId = randomUUID(), + from = FXP_ID, + to = DFSP1_ID +} = {}) => ({ + payload, + uriParams: { + id: commitRequestId + }, + headers: { + 'fspiop-source': from, + 'fspiop-destination': to, + 'content-type': 'application/vnd.interoperability.fxTransfers+json;version=2.0' + } +}) + +const fulfilMetadataDto = ({ + id = randomUUID(), // think, how it relates to other ids + type = 'fulfil', + action = 'commit' +} = {}) => ({ + event: { + id, + type, + action, + createdAt: new Date() + } +}) + +const metadataEventStateDto = ({ + status = 'success', + code = 0, + description = 'action successful' +} = {}) => ({ + status, + code, + description +}) + +const createKafkaMessage = ({ + id = randomUUID(), + from = DFSP1_ID, + to = DFSP2_ID, + content = fulfilContentDto({ from, to }), + metadata = fulfilMetadataDto(), + topic = 'topic-transfer-fulfil' +}) => ({ + topic, + value: { + id, + from, + to, + content, + metadata, + type: 'application/json', + pp: '' + } +}) + +const fulfilKafkaMessageDto = ({ + id = randomUUID(), + from = DFSP1_ID, + to = DFSP2_ID, + content = fulfilContentDto({ from, to }), + metadata = fulfilMetadataDto(), + topic +} = {}) => createKafkaMessage({ + id, + from, + to, + content, + metadata, + topic +}) + +const fxFulfilKafkaMessageDto = ({ + id = randomUUID(), + from = FXP_ID, + to = DFSP1_ID, + content = fxFulfilContentDto({ from, to }), + metadata = fulfilMetadataDto(), + topic +} = {}) => createKafkaMessage({ + id, + from, + to, + content, + metadata, + topic +}) + +const amountDto = ({ + currency = 'BWP', + amount = '300.33' +} = {}) => ({ currency, amount }) + +const errorInfoDto = ({ + errorCode = 5104, + errorDescription = 'Transfer rejection error' +} = {}) => ({ + errorInformation: { + errorCode, + errorDescription + } +}) + +const transferDto = ({ + transferId = randomUUID(), + payerFsp = DFSP1_ID, + payeeFsp = DFSP2_ID, + amount = amountDto(), + ilpPacket = ILP_PACKET, + condition = CONDITION, + expiration = new Date().toISOString(), + extensionList = extensionListDto() +} = {}) => ({ + transferId, + payerFsp, + payeeFsp, + amount, + ilpPacket, + condition, + expiration, + extensionList +}) + +const fxTransferDto = ({ + commitRequestId = randomUUID(), + determiningTransferId = randomUUID(), + initiatingFsp = DFSP1_ID, + counterPartyFsp = FXP_ID, + amountType = 'SEND', + sourceAmount = amountDto({ currency: 'BWP', amount: '300.33' }), + targetAmount = amountDto({ currency: 'TZS', amount: '48000' }), + condition = CONDITION, + expiration = new Date(Date.now() + (24 * 60 * 60 * 1000)) +} = {}) => ({ + commitRequestId, + determiningTransferId, + initiatingFsp, + counterPartyFsp, + amountType, + sourceAmount, + targetAmount, + condition, + expiration +}) + +const fxtGetAllDetailsByCommitRequestIdDto = ({ + commitRequestId, + determiningTransferId, + sourceAmount, + targetAmount, + condition, + initiatingFsp, + counterPartyFsp +} = fxTransferDto()) => ({ + commitRequestId, + determiningTransferId, + sourceAmount: sourceAmount.amount, + sourceCurrency: sourceAmount.currency, + targetAmount: targetAmount.amount, + targetCurrency: targetAmount.currency, + ilpCondition: condition, + initiatingFspName: initiatingFsp, + initiatingFspParticipantId: 1, + counterPartyFspName: counterPartyFsp, + counterPartyFspParticipantId: 2, + counterPartyFspTargetParticipantCurrencyId: 22, + counterPartyFspSourceParticipantCurrencyId: 33, + transferState: Enum.Transfers.TransferState.RESERVED, + transferStateEnumeration: 'RECEIVED', // or RECEIVED_FULFIL? + fulfilment: FULFILMENT, + expirationDate: new Date(), + createdDate: new Date() +}) + +const fxFulfilResponseDto = ({ + savePayeeTransferResponseExecuted = true, + fxTransferFulfilmentRecord = {}, + fxTransferStateChangeRecord = {} +} = {}) => ({ + savePayeeTransferResponseExecuted, + fxTransferFulfilmentRecord, + fxTransferStateChangeRecord +}) + +const watchListItemDto = ({ + fxWatchList = 100, + commitRequestId = 'commitRequestId', + determiningTransferId = 'determiningTransferId', + fxTransferTypeId = 'fxTransferTypeId', + createdDate = new Date() +} = {}) => ({ + fxWatchList, + commitRequestId, + determiningTransferId, + fxTransferTypeId, + createdDate +}) + +const mockExternalParticipantDto = ({ + name = `extFsp-${Date.now()}`, + proxyId = new Date().getMilliseconds(), + id = Date.now(), + createdDate = new Date() +} = {}) => ({ + name, + proxyId, + ...(id && { externalParticipantId: id }), + ...(createdDate && { createdDate }) +}) + +/** + * @returns {ProxyObligation} proxyObligation + */ +const mockProxyObligationDto = ({ + isFx = false, + payloadClone = transferDto(), // or fxTransferDto() + proxy1 = null, + proxy2 = null +} = {}) => ({ + isFx, + payloadClone, + isInitiatingFspProxy: !!proxy1, + isCounterPartyFspProxy: !!proxy2, + initiatingFspProxyOrParticipantId: { + inScheme: !proxy1, + proxyId: proxy1, + name: payloadClone.payerFsp || payloadClone.initiatingFsp + }, + counterPartyFspProxyOrParticipantId: { + inScheme: !proxy2, + proxyId: proxy2, + name: payloadClone.payeeFsp || payloadClone.counterPartyFsp + } +}) + +module.exports = { + ILP_PACKET, + CONDITION, + FULFILMENT, + DFSP1_ID, + DFSP2_ID, + FXP_ID, + SWITCH_ID, + TOPICS, + + fulfilKafkaMessageDto, + fulfilMetadataDto, + fulfilContentDto, + fulfilPayloadDto, + metadataEventStateDto, + errorInfoDto, + extensionListDto, + amountDto, + transferDto, + fxFulfilKafkaMessageDto, + fxFulfilPayloadDto, + fxFulfilContentDto, + fxTransferDto, + fxFulfilResponseDto, + fxtGetAllDetailsByCommitRequestIdDto, + watchListItemDto, + mockExternalParticipantDto, + mockProxyObligationDto +} diff --git a/test/integration-override/handlers/positions/handlerBatch.test.js b/test/integration-override/handlers/positions/handlerBatch.test.js index beed5c9d9..942ce5061 100644 --- a/test/integration-override/handlers/positions/handlerBatch.test.js +++ b/test/integration-override/handlers/positions/handlerBatch.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -28,9 +31,10 @@ const Test = require('tape') const { randomUUID } = require('crypto') const Logger = require('@mojaloop/central-services-logger') const Config = require('#src/lib/config') +const ProxyCache = require('#src/lib/proxyCache') const Db = require('@mojaloop/database-lib').Db const Cache = require('#src/lib/cache') -const Producer = require('@mojaloop/central-services-stream').Util.Producer +const { Producer, Consumer } = require('@mojaloop/central-services-stream').Util const Utility = require('@mojaloop/central-services-shared').Util.Kafka const Enum = require('@mojaloop/central-services-shared').Enum const ParticipantHelper = require('#test/integration/helpers/participant') @@ -40,6 +44,7 @@ const ParticipantEndpointHelper = require('#test/integration/helpers/participant const SettlementHelper = require('#test/integration/helpers/settlementModels') const HubAccountsHelper = require('#test/integration/helpers/hubAccounts') const TransferService = require('#src/domain/transfer/index') +const FxTransferModels = require('#src/models/fxTransfer/index') const ParticipantService = require('#src/domain/participant/index') const Util = require('@mojaloop/central-services-shared').Util const ErrorHandler = require('@mojaloop/central-services-error-handling') @@ -56,6 +61,7 @@ const SettlementModelCached = require('#src/models/settlement/settlementModelCac const Handlers = { index: require('#src/handlers/register'), positions: require('#src/handlers/positions/handler'), + positionsBatch: require('#src/handlers/positions/handlerBatch'), transfers: require('#src/handlers/transfers/handler'), timeouts: require('#src/handlers/timeouts/handler') } @@ -65,10 +71,10 @@ const TransferInternalState = Enum.Transfers.TransferInternalState const TransferEventType = Enum.Events.Event.Type const TransferEventAction = Enum.Events.Event.Action -const debug = process?.env?.TEST_INT_DEBUG || false -// const rebalanceDelay = process?.env?.TEST_INT_REBALANCE_DELAY || 10000 -const retryDelay = process?.env?.TEST_INT_RETRY_DELAY || 2 -const retryCount = process?.env?.TEST_INT_RETRY_COUNT || 40 +const debug = process?.env?.skip_INT_DEBUG || false +// const rebalanceDelay = process?.env?.skip_INT_REBALANCE_DELAY || 10000 +const retryDelay = process?.env?.skip_INT_RETRY_DELAY || 2 +const retryCount = process?.env?.skip_INT_RETRY_COUNT || 40 const retryOpts = { retries: retryCount, minTimeout: retryDelay, @@ -158,6 +164,154 @@ const testData = { expiration: new Date((new Date()).getTime() + (24 * 60 * 60 * 1000)) // tomorrow } +const testFxData = { + currencies: ['USD', 'XXX'], + transfers: [ + { + amount: { + currency: 'USD', + amount: 5 + }, + fx: { + targetAmount: { + currency: 'XXX', + amount: 50 + } + } + }, + { + amount: { + currency: 'USD', + amount: 5 + }, + fx: { + targetAmount: { + currency: 'XXX', + amount: 50 + } + } + }, + { + amount: { + currency: 'USD', + amount: 5 + }, + fx: { + targetAmount: { + currency: 'XXX', + amount: 50 + } + } + }, + { + amount: { + currency: 'USD', + amount: 5 + }, + fx: { + targetAmount: { + currency: 'XXX', + amount: 50 + } + } + }, + { + amount: { + currency: 'USD', + amount: 5 + }, + fx: { + targetAmount: { + currency: 'XXX', + amount: 50 + } + } + }, + { + amount: { + currency: 'USD', + amount: 5 + }, + fx: { + targetAmount: { + currency: 'XXX', + amount: 50 + } + } + }, + { + amount: { + currency: 'USD', + amount: 5 + }, + fx: { + targetAmount: { + currency: 'XXX', + amount: 50 + } + } + }, + { + amount: { + currency: 'USD', + amount: 5 + }, + fx: { + targetAmount: { + currency: 'XXX', + amount: 50 + } + } + }, + { + amount: { + currency: 'USD', + amount: 5 + }, + fx: { + targetAmount: { + currency: 'XXX', + amount: 50 + } + } + }, + { + amount: { + currency: 'USD', + amount: 5 + }, + fx: { + targetAmount: { + currency: 'XXX', + amount: 50 + } + } + } + ], + payer: { + name: 'payerFsp', + limit: 1000, + number: 1, + fundsIn: 10000 + }, + payee: { + name: 'payeeFsp', + number: 1, + limit: 1000 + }, + fxp: { + name: 'testFxp', + number: 1, + limit: 1000 + }, + endpoint: { + base: 'http://localhost:1080', + email: 'test@example.com' + }, + now: new Date(), + expiration: new Date((new Date()).getTime() + (24 * 60 * 60 * 1000)) // tomorrow +} + const testDataLimitExceeded = { currencies: ['USD', 'XXX'], transfers: [ @@ -450,12 +604,17 @@ const _endpointSetup = async (participantName, baseURL) => { await ParticipantEndpointHelper.prepareData(participantName, 'FSPIOP_CALLBACK_URL_BULK_TRANSFER_PUT', `${baseURL}/bulkTransfers/{{id}}`) await ParticipantEndpointHelper.prepareData(participantName, 'FSPIOP_CALLBACK_URL_BULK_TRANSFER_ERROR', `${baseURL}/bulkTransfers/{{id}}/error`) await ParticipantEndpointHelper.prepareData(participantName, 'FSPIOP_CALLBACK_URL_QUOTES', `${baseURL}`) + await ParticipantEndpointHelper.prepareData(participantName, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_QUOTES, `${baseURL}`) + await ParticipantEndpointHelper.prepareData(participantName, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_POST, `${baseURL}/fxTransfers`) + await ParticipantEndpointHelper.prepareData(participantName, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_PUT, `${baseURL}/fxTransfers/{{commitRequestId}}`) + await ParticipantEndpointHelper.prepareData(participantName, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_ERROR, `${baseURL}/fxTransfers/{{commitRequestId}}/error`) } const prepareTestData = async (dataObj) => { try { const payerList = [] const payeeList = [] + const fxpList = [] // Create Payers for (let i = 0; i < dataObj.payer.number; i++) { @@ -502,14 +661,42 @@ const prepareTestData = async (dataObj) => { payeeList.push(payee) } - const kafkacat = 'GROUP=abc; T=topic; TR=transfer; kafkacat -b localhost -G $GROUP $T-$TR-prepare $T-$TR-position $T-$TR-position-batch $T-$TR-fulfil $T-$TR-get $T-admin-$TR $T-notification-event $T-bulk-prepare' - if (debug) console.error(kafkacat) + // Create FXPs + + if (dataObj.fxp) { + for (let i = 0; i < dataObj.fxp.number; i++) { + // Create payer + const fxp = await ParticipantHelper.prepareData(dataObj.fxp.name, dataObj.currencies[0], dataObj.currencies[1]) + // limit,initial position and funds in + fxp.payerLimitAndInitialPosition = await ParticipantLimitHelper.prepareLimitAndInitialPosition(fxp.participant.name, { + currency: dataObj.currencies[0], + limit: { value: dataObj.fxp.limit } + }) + fxp.payerLimitAndInitialPositionSecondaryCurrency = await ParticipantLimitHelper.prepareLimitAndInitialPosition(fxp.participant.name, { + currency: dataObj.currencies[1], + limit: { value: dataObj.fxp.limit } + }) + await ParticipantFundsInOutHelper.recordFundsIn(fxp.participant.name, fxp.participantCurrencyId2, { + currency: dataObj.currencies[0], + amount: dataObj.fxp.fundsIn + }) + await ParticipantFundsInOutHelper.recordFundsIn(fxp.participant.name, fxp.participantCurrencyIdSecondary2, { + currency: dataObj.currencies[1], + amount: dataObj.fxp.fundsIn + }) + // endpoint setup + await _endpointSetup(fxp.participant.name, dataObj.endpoint.base) + + fxpList.push(fxp) + } + } // Create payloads for number of transfers const transfersArray = [] for (let i = 0; i < dataObj.transfers.length; i++) { const payer = payerList[i % payerList.length] const payee = payeeList[i % payeeList.length] + const fxp = fxpList.length > 0 ? fxpList[i % fxpList.length] : payee const transferPayload = { transferId: randomUUID(), @@ -536,11 +723,47 @@ const prepareTestData = async (dataObj) => { } } + const fxTransferPayload = { + commitRequestId: randomUUID(), + determiningTransferId: randomUUID(), + initiatingFsp: payer.participant.name, + counterPartyFsp: fxp.participant.name, + sourceAmount: { + currency: dataObj.transfers[i].amount.currency, + amount: dataObj.transfers[i].amount.amount.toString() + }, + targetAmount: { + currency: dataObj.transfers[i].fx?.targetAmount.currency || dataObj.transfers[i].amount.currency, + amount: dataObj.transfers[i].fx?.targetAmount.amount.toString() || dataObj.transfers[i].amount.amount.toString() + }, + condition: 'GRzLaTP7DJ9t4P-a_BA0WA9wzzlsugf00-Tn6kESAfM', + expiration: dataObj.expiration + } + + const fxFulfilPayload = { + fulfilment: 'UNlJ98hZTY_dsw0cAqw4i_UN3v4utt7CZFB4yfLbVFA', + completedTimestamp: dataObj.now, + conversionState: 'RESERVED', + extensionList: { + extension: [] + } + } + const prepareHeaders = { 'fspiop-source': payer.participant.name, - 'fspiop-destination': payee.participant.name, + 'fspiop-destination': fxp.participant.name, 'content-type': 'application/vnd.interoperability.transfers+json;version=1.1' } + const fxPrepareHeaders = { + 'fspiop-source': payer.participant.name, + 'fspiop-destination': fxp.participant.name, + 'content-type': 'application/vnd.interoperability.fxtransfers+json;version=2.0' + } + const fxFulfilHeaders = { + 'fspiop-source': fxp.participant.name, + 'fspiop-destination': payer.participant.name, + 'content-type': 'application/vnd.interoperability.fxtransfers+json;version=2.0' + } const fulfilAbortRejectHeaders = { 'fspiop-source': payee.participant.name, 'fspiop-destination': payer.participant.name, @@ -593,6 +816,28 @@ const prepareTestData = async (dataObj) => { } } + const messageProtocolFxPrepare = Util.clone(messageProtocolPrepare) + messageProtocolFxPrepare.id = randomUUID() + messageProtocolFxPrepare.from = fxTransferPayload.initiatingFsp + messageProtocolFxPrepare.to = fxTransferPayload.counterPartyFsp + messageProtocolFxPrepare.content.headers = fxPrepareHeaders + messageProtocolFxPrepare.content.uriParams = { id: fxTransferPayload.commitRequestId } + messageProtocolFxPrepare.content.payload = fxTransferPayload + messageProtocolFxPrepare.metadata.event.id = randomUUID() + messageProtocolFxPrepare.metadata.event.type = TransferEventType.PREPARE + messageProtocolFxPrepare.metadata.event.action = TransferEventAction.FX_PREPARE + + const messageProtocolFxFulfil = Util.clone(messageProtocolPrepare) + messageProtocolFxFulfil.id = randomUUID() + messageProtocolFxFulfil.from = fxTransferPayload.counterPartyFsp + messageProtocolFxFulfil.to = fxTransferPayload.initiatingFsp + messageProtocolFxFulfil.content.headers = fxFulfilHeaders + messageProtocolFxFulfil.content.uriParams = { id: fxTransferPayload.commitRequestId } + messageProtocolFxFulfil.content.payload = fxFulfilPayload + messageProtocolFxFulfil.metadata.event.id = randomUUID() + messageProtocolFxFulfil.metadata.event.type = TransferEventType.FULFIL + messageProtocolFxFulfil.metadata.event.action = TransferEventAction.FX_RESERVE + const messageProtocolFulfil = Util.clone(messageProtocolPrepare) messageProtocolFulfil.id = randomUUID() messageProtocolFulfil.from = transferPayload.payeeFsp @@ -628,6 +873,7 @@ const prepareTestData = async (dataObj) => { messageProtocolError.metadata.event.action = TransferEventAction.ABORT transfersArray.push({ transferPayload, + fxTransferPayload, fulfilPayload, rejectPayload, errorPayload, @@ -636,8 +882,11 @@ const prepareTestData = async (dataObj) => { messageProtocolReject, messageProtocolError, messageProtocolFulfilReserved, + messageProtocolFxPrepare, + messageProtocolFxFulfil, payer, - payee + payee, + fxp }) } const topicConfTransferPrepare = Utility.createGeneralTopicConf(Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, TransferEventType.TRANSFER, TransferEventType.PREPARE) @@ -645,6 +894,7 @@ const prepareTestData = async (dataObj) => { return { payerList, payeeList, + fxpList, topicConfTransferPrepare, topicConfTransferFulfil, transfersArray @@ -718,6 +968,8 @@ Test('Handlers test', async handlersTest => { await setupTests.test('start testConsumer', async (test) => { // Set up the testConsumer here await testConsumer.startListening() + await new Promise(resolve => setTimeout(resolve, 5_000)) + testConsumer.clearEvents() test.pass('done') test.end() @@ -736,10 +988,16 @@ Test('Handlers test', async handlersTest => { Enum.Kafka.Config.PRODUCER, TransferEventType.TRANSFER.toUpperCase(), TransferEventType.FULFIL.toUpperCase()) + const positionConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.POSITION.toUpperCase()) prepareConfig.logger = Logger fulfilConfig.logger = Logger + positionConfig.logger = Logger - await transferPositionPrepare.test('process batch of messages with mixed keys (accountIds) and update transfer state to RESERVED', async (test) => { + await transferPositionPrepare.skip('process batch of messages with mixed keys (accountIds) and update transfer state to RESERVED', async (test) => { // Construct test data for 10 transfers. Default object contains 10 transfers. const td = await prepareTestData(testData) @@ -800,7 +1058,7 @@ Test('Handlers test', async handlersTest => { test.end() }) - await transferPositionPrepare.test('process batch of messages with payer limit reached and update transfer state to ABORTED_REJECTED', async (test) => { + await transferPositionPrepare.skip('process batch of messages with payer limit reached and update transfer state to ABORTED_REJECTED', async (test) => { // Construct test data for 10 transfers. Default object contains 10 transfers. const td = await prepareTestData(testDataLimitExceeded) @@ -841,7 +1099,7 @@ Test('Handlers test', async handlersTest => { test.end() }) - await transferPositionPrepare.test('process batch of messages with not enough liquidity and update transfer state to ABORTED_REJECTED', async (test) => { + await transferPositionPrepare.skip('process batch of messages with not enough liquidity and update transfer state to ABORTED_REJECTED', async (test) => { // Construct test data for 10 transfers. Default object contains 10 transfers. const td = await prepareTestData(testDataLimitNoLiquidity) @@ -883,7 +1141,7 @@ Test('Handlers test', async handlersTest => { test.end() }) - await transferPositionPrepare.test('process batch of messages with some transfers having amount that exceeds NDC. Those transfers should be ABORTED', async (test) => { + await transferPositionPrepare.skip('process batch of messages with some transfers having amount that exceeds NDC. Those transfers should be ABORTED', async (test) => { // Construct test data for 10 transfers. Default object contains 10 transfers. const td = await prepareTestData(testDataMixedWithLimitExceeded) @@ -939,7 +1197,7 @@ Test('Handlers test', async handlersTest => { test.end() }) - await transferPositionPrepare.test('process batch of transfers with mixed currencies', async (test) => { + await transferPositionPrepare.skip('process batch of transfers with mixed currencies', async (test) => { // Construct test data for 10 transfers. Default object contains 10 transfers. const td = await prepareTestData(testDataWithMixedCurrencies) @@ -982,7 +1240,136 @@ Test('Handlers test', async handlersTest => { test.end() }) - await transferPositionPrepare.test('process batch of prepare/commit messages with mixed keys (accountIds) and update transfer state to COMMITTED', async (test) => { + await transferPositionPrepare.skip('process batch of fxtransfers', async (test) => { + // Construct test data for 10 fxTransfers. + const td = await prepareTestData(testFxData) + + // Produce fx prepare messages for transfersArray + for (const transfer of td.transfersArray) { + await Producer.produceMessage(transfer.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) + } + await new Promise(resolve => setTimeout(resolve, 5000)) + // Consume messages from notification topic + const positionFxPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: 'fx-prepare' + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + + // filter positionFxPrepare messages where destination is not Hub + const positionFxPrepareFiltered = positionFxPrepare.filter((notification) => notification.to !== 'Hub') + test.equal(positionFxPrepareFiltered.length, 10, 'Notification Messages received for all 10 fxTransfers') + + // Check that initiating FSP position is only updated by sum of transfers relevant to the source currency + const initiatingFspCurrentPositionForSourceCurrency = await ParticipantService.getPositionByParticipantCurrencyId(td.transfersArray[0].payer.participantCurrencyId) || {} + const initiatingFspExpectedPositionForSourceCurrency = td.transfersArray.reduce((acc, tdTest) => acc + Number(tdTest.fxTransferPayload.sourceAmount.amount), 0) + test.equal(initiatingFspCurrentPositionForSourceCurrency.value, initiatingFspExpectedPositionForSourceCurrency, 'Initiating FSP position increases for Source Currency') + + // Check that initiating FSP position is not updated for target currency + const initiatingFspCurrentPositionForTargetCurrency = await ParticipantService.getPositionByParticipantCurrencyId(td.transfersArray[0].payer.participantCurrencyIdSecondary) || {} + const initiatingFspExpectedPositionForTargetCurrency = 0 + test.equal(initiatingFspCurrentPositionForTargetCurrency.value, initiatingFspExpectedPositionForTargetCurrency, 'Initiating FSP position not changed for Target Currency') + + // Check that CounterParty FSP position is only updated by sum of transfers relevant to the source currency + const counterPartyFspCurrentPositionForSourceCurrency = await ParticipantService.getPositionByParticipantCurrencyId(td.transfersArray[0].fxp.participantCurrencyId) || {} + const counterPartyFspExpectedPositionForSourceCurrency = 0 + test.equal(counterPartyFspCurrentPositionForSourceCurrency.value, counterPartyFspExpectedPositionForSourceCurrency, 'CounterParty FSP position not changed for Source Currency') + + // Check that CounterParty FSP position is not updated for target currency + const counterPartyFspCurrentPositionForTargetCurrency = await ParticipantService.getPositionByParticipantCurrencyId(td.transfersArray[0].fxp.participantCurrencyIdSecondary) || {} + const counterPartyFspExpectedPositionForTargetCurrency = 0 + test.equal(counterPartyFspCurrentPositionForTargetCurrency.value, counterPartyFspExpectedPositionForTargetCurrency, 'CounterParty FSP position not changed for Target Currency') + + // Check that the fx transfer state for fxTransfers is RESERVED + try { + for (const tdTest of td.transfersArray) { + const fxTransfer = await FxTransferModels.fxTransfer.getByIdLight(tdTest.fxTransferPayload.commitRequestId) || {} + test.equal(fxTransfer?.fxTransferState, TransferInternalState.RESERVED, 'FX Transfer state updated to RESERVED') + } + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + testConsumer.clearEvents() + test.end() + }) + + await transferPositionPrepare.skip('process batch of transfers and fxtransfers', async (test) => { + // Construct test data for 10 transfers / fxTransfers. + const td = await prepareTestData(testFxData) + + // Produce prepare and fx prepare messages + for (const transfer of td.transfersArray) { + await Producer.produceMessage(transfer.messageProtocolPrepare, td.topicConfTransferPrepare, prepareConfig) + await Producer.produceMessage(transfer.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) + } + + await new Promise(resolve => setTimeout(resolve, 5000)) + // Consume messages from notification topic + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: 'prepare' + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + const positionFxPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: 'fx-prepare' + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + + // filter positionPrepare messages where destination is not Hub + const positionPrepareFiltered = positionPrepare.filter((notification) => notification.to !== 'Hub') + test.equal(positionPrepareFiltered.length, 10, 'Notification Messages received for all 10 transfers') + + // filter positionFxPrepare messages where destination is not Hub + const positionFxPrepareFiltered = positionFxPrepare.filter((notification) => notification.to !== 'Hub') + test.equal(positionFxPrepareFiltered.length, 10, 'Notification Messages received for all 10 fxTransfers') + + // Check that payer / initiating FSP position is only updated by sum of transfers relevant to the source currency + const payerCurrentPositionForSourceCurrency = await ParticipantService.getPositionByParticipantCurrencyId(td.transfersArray[0].payer.participantCurrencyId) || {} + const payerExpectedPositionForSourceCurrency = td.transfersArray.reduce((acc, tdTest) => acc + Number(tdTest.transferPayload.amount.amount), 0) + td.transfersArray.reduce((acc, tdTest) => acc + Number(tdTest.fxTransferPayload.sourceAmount.amount), 0) + test.equal(payerCurrentPositionForSourceCurrency.value, payerExpectedPositionForSourceCurrency, 'Payer / Initiating FSP position increases for Source Currency') + + // Check that payer / initiating FSP position is not updated for target currency + const payerCurrentPositionForTargetCurrency = await ParticipantService.getPositionByParticipantCurrencyId(td.transfersArray[0].payer.participantCurrencyIdSecondary) || {} + const payerExpectedPositionForTargetCurrency = 0 + test.equal(payerCurrentPositionForTargetCurrency.value, payerExpectedPositionForTargetCurrency, 'Payer / Initiating FSP position not changed for Target Currency') + + // Check that FXP position is only updated by sum of transfers relevant to the source currency + const fxpCurrentPositionForSourceCurrency = await ParticipantService.getPositionByParticipantCurrencyId(td.transfersArray[0].fxp.participantCurrencyId) || {} + const fxpExpectedPositionForSourceCurrency = 0 + test.equal(fxpCurrentPositionForSourceCurrency.value, fxpExpectedPositionForSourceCurrency, 'FXP position not changed for Source Currency') + + // Check that payee / CounterParty FSP position is not updated for target currency + const fxpCurrentPositionForTargetCurrency = await ParticipantService.getPositionByParticipantCurrencyId(td.transfersArray[0].fxp.participantCurrencyIdSecondary) || {} + const fxpExpectedPositionForTargetCurrency = 0 + test.equal(fxpCurrentPositionForTargetCurrency.value, fxpExpectedPositionForTargetCurrency, 'FXP position not changed for Target Currency') + + // Check that the transfer state for transfers is RESERVED + try { + for (const tdTest of td.transfersArray) { + const transfer = await TransferService.getById(tdTest.messageProtocolPrepare.content.payload.transferId) || {} + test.equal(transfer?.transferState, TransferInternalState.RESERVED, 'Transfer state updated to RESERVED') + } + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + // Check that the fx transfer state for fxTransfers is RESERVED + try { + for (const tdTest of td.transfersArray) { + const fxTransfer = await FxTransferModels.fxTransfer.getByIdLight(tdTest.fxTransferPayload.commitRequestId) || {} + test.equal(fxTransfer?.fxTransferState, TransferInternalState.RESERVED, 'FX Transfer state updated to RESERVED') + } + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + testConsumer.clearEvents() + test.end() + }) + + await transferPositionPrepare.skip('process batch of prepare/commit messages with mixed keys (accountIds) and update transfer state to COMMITTED', async (test) => { // Construct test data for 10 transfers. Default object contains 10 transfers. const td = await prepareTestData(testData) @@ -1099,7 +1486,7 @@ Test('Handlers test', async handlersTest => { test.end() }) - await transferPositionPrepare.test('process batch of prepare/reserve messages with mixed keys (accountIds) and update transfer state to COMMITTED', async (test) => { + await transferPositionPrepare.skip('process batch of prepare/reserve messages with mixed keys (accountIds) and update transfer state to COMMITTED', async (test) => { // Construct test data for 10 transfers. Default object contains 10 transfers. const td = await prepareTestData(testData) @@ -1215,6 +1602,241 @@ Test('Handlers test', async handlersTest => { testConsumer.clearEvents() test.end() }) + + await transferPositionPrepare.skip('process batch of fx prepare/ fx reserve messages with mixed keys (accountIds) and update transfer state to COMMITTED', async (test) => { + // Construct test data for 10 transfers. Default object contains 10 transfers. + const td = await prepareTestData(testFxData) + + // Produce prepare messages for transfersArray + for (const transfer of td.transfersArray) { + await Producer.produceMessage(transfer.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) + } + await new Promise(resolve => setTimeout(resolve, 5000)) + try { + const positionFxPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: 'fx-prepare' + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + + // filter positionPrepare messages where destination is not Hub + const positionFxPrepareFiltered = positionFxPrepare.filter((notification) => notification.to !== 'Hub') + test.equal(positionFxPrepareFiltered.length, 10, 'Notification Messages received for all 10 fx transfers') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + // Check that payer / initiating FSP position is only updated by sum of transfers relevant to the source currency + const payerCurrentPositionForSourceCurrency = await ParticipantService.getPositionByParticipantCurrencyId(td.transfersArray[0].payer.participantCurrencyId) || {} + const payerExpectedPositionForSourceCurrency = td.transfersArray.reduce((acc, tdTest) => acc + Number(tdTest.fxTransferPayload.sourceAmount.amount), 0) + test.equal(payerCurrentPositionForSourceCurrency.value, payerExpectedPositionForSourceCurrency, 'Payer / Initiating FSP position increases for Source Currency') + + // Check that payer / initiating FSP position is not updated for target currency + const payerCurrentPositionForTargetCurrency = await ParticipantService.getPositionByParticipantCurrencyId(td.transfersArray[0].payer.participantCurrencyIdSecondary) || {} + const payerExpectedPositionForTargetCurrency = 0 + test.equal(payerCurrentPositionForTargetCurrency.value, payerExpectedPositionForTargetCurrency, 'Payer / Initiating FSP position not changed for Target Currency') + + // Check that FXP position is only updated by sum of transfers relevant to the source currency + const fxpCurrentPositionForSourceCurrency = await ParticipantService.getPositionByParticipantCurrencyId(td.transfersArray[0].fxp.participantCurrencyId) || {} + const fxpExpectedPositionForSourceCurrency = 0 + test.equal(fxpCurrentPositionForSourceCurrency.value, fxpExpectedPositionForSourceCurrency, 'FXP position not changed for Source Currency') + + // Check that FXP position is not updated for target currency + const fxpCurrentPositionForTargetCurrency = await ParticipantService.getPositionByParticipantCurrencyId(td.transfersArray[0].fxp.participantCurrencyIdSecondary) || {} + const fxpExpectedPositionForTargetCurrency = 0 + test.equal(fxpCurrentPositionForTargetCurrency.value, fxpExpectedPositionForTargetCurrency, 'FXP position not changed for Target Currency') + + // Check that the fx transfer state for fxTransfers is RESERVED + try { + for (const tdTest of td.transfersArray) { + const fxTransfer = await FxTransferModels.fxTransfer.getByIdLight(tdTest.fxTransferPayload.commitRequestId) || {} + test.equal(fxTransfer?.fxTransferState, TransferInternalState.RESERVED, 'FX Transfer state updated to RESERVED') + } + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + testConsumer.clearEvents() + + // Produce fx fulfil messages for transfersArray + for (const transfer of td.transfersArray) { + await Producer.produceMessage(transfer.messageProtocolFxFulfil, td.topicConfTransferFulfil, fulfilConfig) + } + await new Promise(resolve => setTimeout(resolve, 5000)) + try { + const positionFxFulfil = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: 'fx-reserve' + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + + // filter positionFxFulfil messages where destination is not Hub + const positionFxFulfilFiltered = positionFxFulfil.filter((notification) => notification.to !== 'Hub') + test.equal(positionFxFulfilFiltered.length, 10, 'Notification Messages received for all 10 transfers') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + // Check that payer / initiating FSP position is not updated for source currency + const payerCurrentPositionForSourceCurrencyAfterFxFulfil = await ParticipantService.getPositionByParticipantCurrencyId(td.transfersArray[0].payer.participantCurrencyId) || {} + test.equal(payerCurrentPositionForSourceCurrencyAfterFxFulfil.value, payerExpectedPositionForSourceCurrency, 'Payer / Initiating FSP position not changed for Source Currency') + + // Check that payer / initiating FSP position is not updated for target currency + const payerCurrentPositionForTargetCurrencyAfterFxFulfil = await ParticipantService.getPositionByParticipantCurrencyId(td.transfersArray[0].payer.participantCurrencyIdSecondary) || {} + test.equal(payerCurrentPositionForTargetCurrencyAfterFxFulfil.value, payerExpectedPositionForTargetCurrency, 'Payer / Initiating FSP position not changed for Target Currency') + + // Check that FXP position is only updated by sum of transfers relevant to the source currency + const fxpCurrentPositionForSourceCurrencyAfterFxFulfil = await ParticipantService.getPositionByParticipantCurrencyId(td.transfersArray[0].fxp.participantCurrencyId) || {} + test.equal(fxpCurrentPositionForSourceCurrencyAfterFxFulfil.value, fxpExpectedPositionForSourceCurrency, 'FXP position not changed for Source Currency') + + // Check that FXP position is not updated for target currency + const fxpCurrentPositionForTargetCurrencyAfterFxFulfil = await ParticipantService.getPositionByParticipantCurrencyId(td.transfersArray[0].fxp.participantCurrencyIdSecondary) || {} + test.equal(fxpCurrentPositionForTargetCurrencyAfterFxFulfil.value, fxpExpectedPositionForTargetCurrency, 'FXP position not changed for Target Currency') + + testConsumer.clearEvents() + test.end() + }) + + await transferPositionPrepare.skip('timeout should', async timeoutTest => { + const td = await prepareTestData(testData) + + await timeoutTest.skip('update transfer state to RESERVED by PREPARE request', async (test) => { + // Produce prepare messages for transfersArray + for (const transfer of td.transfersArray) { + transfer.messageProtocolPrepare.content.payload.expiration = new Date((new Date()).getTime() + (5 * 1000)) // 4 seconds + await Producer.produceMessage(transfer.messageProtocolPrepare, td.topicConfTransferPrepare, prepareConfig) + } + await new Promise(resolve => setTimeout(resolve, 2500)) + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: 'prepare' + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + + // filter positionPrepare messages where destination is not Hub + const positionPrepareFiltered = positionPrepare.filter((notification) => notification.to !== 'Hub') + test.equal(positionPrepareFiltered.length, 10, 'Notification Messages received for all 10 transfers') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + const tests = async (totalTransferAmounts) => { + for (const value of Object.values(totalTransferAmounts)) { + const payerCurrentPosition = await ParticipantService.getPositionByParticipantCurrencyId(value.payer.participantCurrencyId) || {} + const payerInitialPosition = value.payer.payerLimitAndInitialPosition.participantPosition.value + const payerExpectedPosition = payerInitialPosition + value.totalTransferAmount + const payerPositionChange = await ParticipantService.getPositionChangeByParticipantPositionId(payerCurrentPosition.participantPositionId) || {} + test.equal(payerCurrentPosition.value, payerExpectedPosition, 'Payer position incremented by transfer amount and updated in participantPosition') + test.equal(payerPositionChange.value, payerCurrentPosition.value, 'Payer position change value inserted and matches the updated participantPosition value') + } + } + + try { + const totalTransferAmounts = {} + for (const tdTest of td.transfersArray) { + const transfer = await TransferService.getById(tdTest.messageProtocolPrepare.content.payload.transferId) || {} + if (transfer?.transferState !== TransferState.RESERVED) { + if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) + throw ErrorHandler.Factory.createFSPIOPError( + ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR, + `#1 Max retry count ${retryCount} reached after ${retryCount * retryDelay / 1000}s. Tests fail. TRANSFER STATE: ${transfer?.transferState}` + ) + } + totalTransferAmounts[tdTest.payer.participantCurrencyId] = { + payer: tdTest.payer, + totalTransferAmount: ( + (totalTransferAmounts[tdTest.payer.participantCurrencyId] && + totalTransferAmounts[tdTest.payer.participantCurrencyId].totalTransferAmount) || 0 + ) + tdTest.transferPayload.amount.amount + } + } + await tests(totalTransferAmounts) + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + testConsumer.clearEvents() + test.end() + }) + + await timeoutTest.skip('update transfer after timeout with timeout status & error', async (test) => { + for (const tf of td.transfersArray) { + // Re-try function with conditions + const inspectTransferState = async () => { + try { + // Fetch Transfer record + const transfer = await TransferService.getById(tf.messageProtocolPrepare.content.payload.transferId) || {} + + // Check Transfer for correct state + if (transfer?.transferState === Enum.Transfers.TransferInternalState.EXPIRED_RESERVED) { + // We have a Transfer with the correct state, lets check if we can get the TransferError record + try { + // Fetch the TransferError record + const transferError = await TransferService.getTransferErrorByTransferId(tf.messageProtocolPrepare.content.payload.transferId) + // TransferError record found, so lets return it + return { + transfer, + transferError + } + } catch (err) { + // NO TransferError record found, so lets return the transfer and the error + return { + transfer, + err + } + } + } else { + // NO Transfer with the correct state was found, so we return false + return false + } + } catch (err) { + // NO Transfer with the correct state was found, so we return false + Logger.error(err) + return false + } + } + const result = await wrapWithRetries( + inspectTransferState, + wrapWithRetriesConf.remainingRetries, + wrapWithRetriesConf.timeout + ) + + // Assert + if (result === false) { + test.fail(`Transfer['${tf.messageProtocolPrepare.content.payload.transferId}'].TransferState failed to transition to ${Enum.Transfers.TransferInternalState.EXPIRED_RESERVED}`) + } else { + test.equal(result.transfer && result.transfer?.transferState, Enum.Transfers.TransferInternalState.EXPIRED_RESERVED, `Transfer['${tf.messageProtocolPrepare.content.payload.transferId}'].TransferState = ${Enum.Transfers.TransferInternalState.EXPIRED_RESERVED}`) + test.equal(result.transferError && result.transferError.errorCode, ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED.code, `Transfer['${tf.messageProtocolPrepare.content.payload.transferId}'].transferError.errorCode = ${ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED.code}`) + test.equal(result.transferError && result.transferError.errorDescription, ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED.message, `Transfer['${tf.messageProtocolPrepare.content.payload.transferId}'].transferError.errorDescription = ${ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED.message}`) + test.pass() + } + } + test.end() + }) + + await timeoutTest.skip('position resets after a timeout', async (test) => { + // Arrange + for (const payer of td.payerList) { + const payerInitialPosition = payer.payerLimitAndInitialPosition.participantPosition.value + // Act + const payerPositionDidReset = async () => { + const payerCurrentPosition = await ParticipantService.getPositionByParticipantCurrencyId(payer.participantCurrencyId) + console.log(payerCurrentPosition) + return payerCurrentPosition.value === payerInitialPosition + } + // wait until we know the position reset, or throw after 5 tries + await wrapWithRetries(payerPositionDidReset, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + const payerCurrentPosition = await ParticipantService.getPositionByParticipantCurrencyId(payer.participantCurrencyId) || {} + + // Assert + test.equal(payerCurrentPosition.value, payerInitialPosition, 'Position resets after a timeout') + } + + test.end() + }) + + timeoutTest.end() + }) transferPositionPrepare.end() }) @@ -1225,12 +1847,17 @@ Test('Handlers test', async handlersTest => { await Db.disconnect() assert.pass('database connection closed') await testConsumer.destroy() // this disconnects the consumers - + await ProxyCache.disconnect() await Producer.disconnect() + // Disconnect all consumers + await Promise.all(Consumer.getListOfTopics().map(async (topic) => { + Logger.info(`Disconnecting consumer for topic: ${topic}`) + return Consumer.getConsumer(topic).disconnect() + })) if (debug) { const elapsedTime = Math.round(((new Date()) - startTime) / 100) / 10 - console.log(`handlers.test.js finished in (${elapsedTime}s)`) + console.log(`handlers.skip.js finished in (${elapsedTime}s)`) } assert.end() diff --git a/test/integration-override/handlers/transfers/fxAbort.test.js b/test/integration-override/handlers/transfers/fxAbort.test.js new file mode 100644 index 000000000..96a879c33 --- /dev/null +++ b/test/integration-override/handlers/transfers/fxAbort.test.js @@ -0,0 +1,854 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Vijaya Kumar Guthi + -------------- + **********/ + +'use strict' + +const Test = require('tape') +const { randomUUID } = require('crypto') +const Logger = require('@mojaloop/central-services-logger') +const Config = require('#src/lib/config') +const Db = require('@mojaloop/database-lib').Db +const Cache = require('#src/lib/cache') +const ProxyCache = require('#src/lib/proxyCache') +const Producer = require('@mojaloop/central-services-stream').Util.Producer +const Utility = require('@mojaloop/central-services-shared').Util.Kafka +const Util = require('@mojaloop/central-services-shared').Util +const Enum = require('@mojaloop/central-services-shared').Enum +const ParticipantHelper = require('#test/integration/helpers/participant') +const ParticipantLimitHelper = require('#test/integration/helpers/participantLimit') +const ParticipantFundsInOutHelper = require('#test/integration/helpers/participantFundsInOut') +const ParticipantEndpointHelper = require('#test/integration/helpers/participantEndpoint') +const SettlementHelper = require('#test/integration/helpers/settlementModels') +const HubAccountsHelper = require('#test/integration/helpers/hubAccounts') +const TransferService = require('#src/domain/transfer/index') +const FxTransferModels = require('#src/models/fxTransfer/index') +const ParticipantService = require('#src/domain/participant/index') +const ErrorHandler = require('@mojaloop/central-services-error-handling') +const { + wrapWithRetries +} = require('#test/util/helpers') +const TestConsumer = require('#test/integration/helpers/testConsumer') + +const ParticipantCached = require('#src/models/participant/participantCached') +const ParticipantCurrencyCached = require('#src/models/participant/participantCurrencyCached') +const ParticipantLimitCached = require('#src/models/participant/participantLimitCached') +const SettlementModelCached = require('#src/models/settlement/settlementModelCached') + +const Handlers = { + index: require('#src/handlers/register'), + positions: require('#src/handlers/positions/handler'), + transfers: require('#src/handlers/transfers/handler'), + timeouts: require('#src/handlers/timeouts/handler') +} + +const TransferState = Enum.Transfers.TransferState +const TransferInternalState = Enum.Transfers.TransferInternalState +const TransferEventType = Enum.Events.Event.Type +const TransferEventAction = Enum.Events.Event.Action + +const debug = process?.env?.TEST_INT_DEBUG || false +const rebalanceDelay = process?.env?.TEST_INT_REBALANCE_DELAY || 20000 +const retryDelay = process?.env?.TEST_INT_RETRY_DELAY || 2 +const retryCount = process?.env?.TEST_INT_RETRY_COUNT || 40 +const retryOpts = { + retries: retryCount, + minTimeout: retryDelay, + maxTimeout: retryDelay +} +const TOPIC_POSITION = 'topic-transfer-position' +const TOPIC_POSITION_BATCH = 'topic-transfer-position-batch' + +const testFxData = { + sourceAmount: { + currency: 'USD', + amount: 433.88 + }, + targetAmount: { + currency: 'XXX', + amount: 200.00 + }, + payer: { + name: 'payerFsp', + limit: 5000 + }, + payee: { + name: 'payeeFsp', + limit: 5000 + }, + fxp: { + name: 'fxp', + limit: 3000 + }, + endpoint: { + base: 'http://localhost:1080', + email: 'test@example.com' + }, + now: new Date(), + expiration: new Date((new Date()).getTime() + (24 * 60 * 60 * 1000)) // tomorrow +} + +const prepareFxTestData = async (dataObj) => { + try { + const payer = await ParticipantHelper.prepareData(dataObj.payer.name, dataObj.sourceAmount.currency) + const fxp = await ParticipantHelper.prepareData(dataObj.fxp.name, dataObj.sourceAmount.currency, dataObj.targetAmount.currency) + const payee = await ParticipantHelper.prepareData(dataObj.payee.name, dataObj.targetAmount.currency) + + const payerLimitAndInitialPosition = await ParticipantLimitHelper.prepareLimitAndInitialPosition(payer.participant.name, { + currency: dataObj.sourceAmount.currency, + limit: { value: dataObj.payer.limit } + }) + const fxpLimitAndInitialPositionSourceCurrency = await ParticipantLimitHelper.prepareLimitAndInitialPosition(fxp.participant.name, { + currency: dataObj.sourceAmount.currency, + limit: { value: dataObj.fxp.limit } + }) + const fxpLimitAndInitialPositionTargetCurrency = await ParticipantLimitHelper.prepareLimitAndInitialPosition(fxp.participant.name, { + currency: dataObj.targetAmount.currency, + limit: { value: dataObj.fxp.limit } + }) + const payeeLimitAndInitialPosition = await ParticipantLimitHelper.prepareLimitAndInitialPosition(payee.participant.name, { + currency: dataObj.targetAmount.currency, + limit: { value: dataObj.payee.limit } + }) + await ParticipantFundsInOutHelper.recordFundsIn(payer.participant.name, payer.participantCurrencyId2, { + currency: dataObj.sourceAmount.currency, + amount: 10000 + }) + await ParticipantFundsInOutHelper.recordFundsIn(fxp.participant.name, fxp.participantCurrencyId2, { + currency: dataObj.sourceAmount.currency, + amount: 10000 + }) + await ParticipantFundsInOutHelper.recordFundsIn(fxp.participant.name, fxp.participantCurrencyIdSecondary2, { + currency: dataObj.targetAmount.currency, + amount: 10000 + }) + + for (const name of [payer.participant.name, fxp.participant.name]) { + await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_TRANSFER_POST', `${dataObj.endpoint.base}/transfers`) + await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_TRANSFER_PUT', `${dataObj.endpoint.base}/transfers/{{transferId}}`) + await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_TRANSFER_ERROR', `${dataObj.endpoint.base}/transfers/{{transferId}}/error`) + await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_BULK_TRANSFER_POST', `${dataObj.endpoint.base}/bulkTransfers`) + await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_BULK_TRANSFER_PUT', `${dataObj.endpoint.base}/bulkTransfers/{{id}}`) + await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_BULK_TRANSFER_ERROR', `${dataObj.endpoint.base}/bulkTransfers/{{id}}/error`) + await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_QUOTES', `${dataObj.endpoint.base}`) + await ParticipantEndpointHelper.prepareData(name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_QUOTES, `${dataObj.endpoint.base}`) + await ParticipantEndpointHelper.prepareData(name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_POST, `${dataObj.endpoint.base}/fxTransfers`) + await ParticipantEndpointHelper.prepareData(name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_PUT, `${dataObj.endpoint.base}/fxTransfers/{{commitRequestId}}`) + await ParticipantEndpointHelper.prepareData(name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_ERROR, `${dataObj.endpoint.base}/fxTransfers/{{commitRequestId}}/error`) + } + + const transferId = randomUUID() + + const fxTransferPayload = { + commitRequestId: randomUUID(), + determiningTransferId: transferId, + condition: 'GRzLaTP7DJ9t4P-a_BA0WA9wzzlsugf00-Tn6kESAfM', + expiration: dataObj.expiration, + initiatingFsp: payer.participant.name, + counterPartyFsp: fxp.participant.name, + sourceAmount: { + currency: dataObj.sourceAmount.currency, + amount: dataObj.sourceAmount.amount + }, + targetAmount: { + currency: dataObj.targetAmount.currency, + amount: dataObj.targetAmount.amount + } + } + + const fxPrepareHeaders = { + 'fspiop-source': payer.participant.name, + 'fspiop-destination': fxp.participant.name, + 'content-type': 'application/vnd.interoperability.fxTransfers+json;version=2.0' + } + + const transferPayload = { + transferId, + payerFsp: payer.participant.name, + payeeFsp: payee.participant.name, + amount: { + currency: dataObj.targetAmount.currency, + amount: dataObj.targetAmount.amount + }, + ilpPacket: 'AYIBgQAAAAAAAASwNGxldmVsb25lLmRmc3AxLm1lci45T2RTOF81MDdqUUZERmZlakgyOVc4bXFmNEpLMHlGTFGCAUBQU0svMS4wCk5vbmNlOiB1SXlweUYzY3pYSXBFdzVVc05TYWh3CkVuY3J5cHRpb246IG5vbmUKUGF5bWVudC1JZDogMTMyMzZhM2ItOGZhOC00MTYzLTg0NDctNGMzZWQzZGE5OGE3CgpDb250ZW50LUxlbmd0aDogMTM1CkNvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbgpTZW5kZXItSWRlbnRpZmllcjogOTI4MDYzOTEKCiJ7XCJmZWVcIjowLFwidHJhbnNmZXJDb2RlXCI6XCJpbnZvaWNlXCIsXCJkZWJpdE5hbWVcIjpcImFsaWNlIGNvb3BlclwiLFwiY3JlZGl0TmFtZVwiOlwibWVyIGNoYW50XCIsXCJkZWJpdElkZW50aWZpZXJcIjpcIjkyODA2MzkxXCJ9IgA', + condition: 'GRzLaTP7DJ9t4P-a_BA0WA9wzzlsugf00-Tn6kESAfM', + expiration: dataObj.expiration, + extensionList: { + extension: [ + { + key: 'key1', + value: 'value1' + }, + { + key: 'key2', + value: 'value2' + } + ] + } + } + + const sourceTransferPayload = { + transferId, + payerFsp: payer.participant.name, + payeeFsp: fxp.participant.name, + amount: { + currency: dataObj.sourceAmount.currency, + amount: dataObj.sourceAmount.amount + }, + ilpPacket: 'AYIBgQAAAAAAAASwNGxldmVsb25lLmRmc3AxLm1lci45T2RTOF81MDdqUUZERmZlakgyOVc4bXFmNEpLMHlGTFGCAUBQU0svMS4wCk5vbmNlOiB1SXlweUYzY3pYSXBFdzVVc05TYWh3CkVuY3J5cHRpb246IG5vbmUKUGF5bWVudC1JZDogMTMyMzZhM2ItOGZhOC00MTYzLTg0NDctNGMzZWQzZGE5OGE3CgpDb250ZW50LUxlbmd0aDogMTM1CkNvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbgpTZW5kZXItSWRlbnRpZmllcjogOTI4MDYzOTEKCiJ7XCJmZWVcIjowLFwidHJhbnNmZXJDb2RlXCI6XCJpbnZvaWNlXCIsXCJkZWJpdE5hbWVcIjpcImFsaWNlIGNvb3BlclwiLFwiY3JlZGl0TmFtZVwiOlwibWVyIGNoYW50XCIsXCJkZWJpdElkZW50aWZpZXJcIjpcIjkyODA2MzkxXCJ9IgA', + condition: 'GRzLaTP7DJ9t4P-a_BA0WA9wzzlsugf00-Tn6kESAfM', + expiration: dataObj.expiration + } + + const fulfilPayload = { + fulfilment: 'UNlJ98hZTY_dsw0cAqw4i_UN3v4utt7CZFB4yfLbVFA', + completedTimestamp: dataObj.now, + transferState: 'COMMITTED' + } + + const rejectPayload = Object.assign({}, fulfilPayload, { transferState: TransferInternalState.ABORTED_REJECTED }) + + const prepareHeaders = { + 'fspiop-source': payer.participant.name, + 'fspiop-destination': payee.participant.name, + 'content-type': 'application/vnd.interoperability.transfers+json;version=1.1' + } + + const fulfilHeaders = { + 'fspiop-source': payee.participant.name, + 'fspiop-destination': payer.participant.name, + 'content-type': 'application/vnd.interoperability.transfers+json;version=1.1' + } + + const fxFulfilHeaders = { + 'fspiop-source': fxp.participant.name, + 'fspiop-destination': payer.participant.name, + 'content-type': 'application/vnd.interoperability.fxTransfers+json;version=2.0' + } + + const errorPayload = ErrorHandler.Factory.createFSPIOPError( + ErrorHandler.Enums.FSPIOPErrorCodes.PAYEE_FSP_REJECTED_TXN + ).toApiErrorObject() + errorPayload.errorInformation.extensionList = { + extension: [{ + key: 'errorDetail', + value: 'This is an abort extension' + }] + } + + const messageProtocolPayerInitiatedConversionFxPrepare = { + id: randomUUID(), + from: fxTransferPayload.initiatingFsp, + to: fxTransferPayload.counterPartyFsp, + type: 'application/json', + content: { + headers: fxPrepareHeaders, + payload: fxTransferPayload + }, + metadata: { + event: { + id: randomUUID(), + type: TransferEventType.TRANSFER, + action: TransferEventAction.FX_PREPARE, + createdAt: dataObj.now, + state: { + status: 'success', + code: 0 + } + } + } + } + + const messageProtocolPrepare = { + id: randomUUID(), + from: transferPayload.payerFsp, + to: transferPayload.payeeFsp, + type: 'application/json', + content: { + headers: prepareHeaders, + payload: transferPayload + }, + metadata: { + event: { + id: randomUUID(), + type: TransferEventAction.PREPARE, + action: TransferEventType.PREPARE, + createdAt: dataObj.now, + state: { + status: 'success', + code: 0 + } + } + } + } + + const messageProtocolSourcePrepare = Util.clone(messageProtocolPrepare) + messageProtocolSourcePrepare.to = sourceTransferPayload.payeeFsp + messageProtocolSourcePrepare.content.payload = sourceTransferPayload + messageProtocolSourcePrepare.content.headers = { + ...prepareHeaders, + 'fspiop-destination': fxp.participant.name + } + + const messageProtocolFulfil = Util.clone(messageProtocolPrepare) + messageProtocolFulfil.id = randomUUID() + messageProtocolFulfil.from = transferPayload.payeeFsp + messageProtocolFulfil.to = transferPayload.payerFsp + messageProtocolFulfil.content.headers = fulfilHeaders + messageProtocolFulfil.content.uriParams = { id: transferPayload.transferId } + messageProtocolFulfil.content.payload = fulfilPayload + messageProtocolFulfil.metadata.event.id = randomUUID() + messageProtocolFulfil.metadata.event.type = TransferEventType.FULFIL + messageProtocolFulfil.metadata.event.action = TransferEventAction.COMMIT + + const messageProtocolPayerInitiatedConversionFxFulfil = Util.clone(messageProtocolPayerInitiatedConversionFxPrepare) + messageProtocolPayerInitiatedConversionFxFulfil.id = randomUUID() + messageProtocolPayerInitiatedConversionFxFulfil.from = fxTransferPayload.counterPartyFsp + messageProtocolPayerInitiatedConversionFxFulfil.to = fxTransferPayload.initiatingFsp + messageProtocolPayerInitiatedConversionFxFulfil.content.headers = fxFulfilHeaders + messageProtocolPayerInitiatedConversionFxFulfil.content.uriParams = { id: fxTransferPayload.commitRequestId } + messageProtocolPayerInitiatedConversionFxFulfil.content.payload = fulfilPayload + messageProtocolPayerInitiatedConversionFxFulfil.metadata.event.id = randomUUID() + messageProtocolPayerInitiatedConversionFxFulfil.metadata.event.type = TransferEventType.FULFIL + messageProtocolPayerInitiatedConversionFxFulfil.metadata.event.action = TransferEventAction.FX_RESERVE + + const messageProtocolReject = Util.clone(messageProtocolFulfil) + messageProtocolReject.id = randomUUID() + messageProtocolReject.content.uriParams = { id: transferPayload.transferId } + messageProtocolReject.content.payload = rejectPayload + messageProtocolReject.metadata.event.action = TransferEventAction.REJECT + + const messageProtocolError = Util.clone(messageProtocolFulfil) + messageProtocolError.id = randomUUID() + messageProtocolError.content.uriParams = { id: transferPayload.transferId } + messageProtocolError.content.payload = errorPayload + messageProtocolError.metadata.event.action = TransferEventAction.ABORT + + const messageProtocolFxAbort = Util.clone(messageProtocolPayerInitiatedConversionFxFulfil) + messageProtocolFxAbort.id = randomUUID() + messageProtocolFxAbort.content.uriParams = { id: fxTransferPayload.commitRequestId } + messageProtocolFxAbort.content.payload = errorPayload + messageProtocolFxAbort.metadata.event.action = TransferEventAction.FX_ABORT + + const topicConfFxTransferPrepare = Utility.createGeneralTopicConf( + Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, + TransferEventType.TRANSFER, + TransferEventAction.PREPARE + ) + + const topicConfTransferPrepare = Utility.createGeneralTopicConf( + Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, + TransferEventType.TRANSFER, + TransferEventType.PREPARE + ) + + const topicConfFxTransferFulfil = Utility.createGeneralTopicConf( + Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, + TransferEventType.TRANSFER, + TransferEventType.FULFIL + ) + + const topicConfTransferFulfil = Utility.createGeneralTopicConf( + Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, + TransferEventType.TRANSFER, + TransferEventType.FULFIL + ) + + return { + fxTransferPayload, + transferPayload, + fulfilPayload, + rejectPayload, + errorPayload, + messageProtocolPayerInitiatedConversionFxPrepare, + messageProtocolPayerInitiatedConversionFxFulfil, + messageProtocolFxAbort, + messageProtocolPrepare, + messageProtocolFulfil, + messageProtocolReject, + messageProtocolError, + messageProtocolSourcePrepare, + topicConfTransferPrepare, + topicConfTransferFulfil, + topicConfFxTransferPrepare, + topicConfFxTransferFulfil, + payer, + payerLimitAndInitialPosition, + fxp, + fxpLimitAndInitialPositionSourceCurrency, + fxpLimitAndInitialPositionTargetCurrency, + payee, + payeeLimitAndInitialPosition + } + } catch (err) { + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} + +Test('Handlers test', async handlersTest => { + const startTime = new Date() + await Db.connect(Config.DATABASE) + await ParticipantCached.initialize() + await ParticipantCurrencyCached.initialize() + await ParticipantLimitCached.initialize() + await SettlementModelCached.initialize() + await Cache.initCache() + await SettlementHelper.prepareData() + await HubAccountsHelper.prepareData() + + const wrapWithRetriesConf = { + remainingRetries: retryOpts?.retries || 10, // default 10 + timeout: retryOpts?.maxTimeout || 2 // default 2 + } + + // Start a testConsumer to monitor events that our handlers emit + const testConsumer = new TestConsumer([ + { + topicName: Utility.transformGeneralTopicName( + Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, + Enum.Events.Event.Type.TRANSFER, + Enum.Events.Event.Action.FULFIL + ), + config: Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.CONSUMER, + Enum.Events.Event.Type.TRANSFER.toUpperCase(), + Enum.Events.Event.Action.FULFIL.toUpperCase() + ) + }, + { + topicName: Utility.transformGeneralTopicName( + Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, + Enum.Events.Event.Type.NOTIFICATION, + Enum.Events.Event.Action.EVENT + ), + config: Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.CONSUMER, + Enum.Events.Event.Type.NOTIFICATION.toUpperCase(), + Enum.Events.Event.Action.EVENT.toUpperCase() + ) + }, + { + topicName: TOPIC_POSITION, + config: Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.CONSUMER, + Enum.Events.Event.Type.TRANSFER.toUpperCase(), + Enum.Events.Event.Action.POSITION.toUpperCase() + ) + }, + { + topicName: TOPIC_POSITION_BATCH, + config: Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.CONSUMER, + Enum.Events.Event.Type.TRANSFER.toUpperCase(), + Enum.Events.Event.Action.POSITION.toUpperCase() + ) + } + ]) + + await handlersTest.test('Setup kafka consumer should', async registerAllHandlers => { + await registerAllHandlers.test('start consumer', async (test) => { + // Set up the testConsumer here + await testConsumer.startListening() + + // Disabling these handlers to test running the CL as a separate service independently. + await new Promise(resolve => setTimeout(resolve, rebalanceDelay)) + testConsumer.clearEvents() + + test.pass('done') + test.end() + registerAllHandlers.end() + }) + }) + + await handlersTest.test('When only transfer is sent and followed by transfer abort', async abortTest => { + const td = await prepareFxTestData(testFxData) + + await abortTest.test('update transfer state to RESERVED by PREPARE request', async (test) => { + const config = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + config.logger = Logger + + const producerResponse = await Producer.produceMessage(td.messageProtocolSourcePrepare, td.topicConfTransferPrepare, config) + Logger.info(producerResponse) + + try { + await wrapWithRetries(async () => { + const transfer = await TransferService.getById(td.messageProtocolSourcePrepare.content.payload.transferId) || {} + if (transfer?.transferState !== TransferState.RESERVED) { + if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) + return null + } + return transfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + test.end() + }) + + await abortTest.test('update transfer state to ABORTED by FULFIL-ABORT callback', async (test) => { + const config = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.FULFIL.toUpperCase()) + config.logger = Logger + + await Producer.produceMessage(td.messageProtocolError, td.topicConfTransferFulfil, config) + + // Check for the transfer state to be ABORTED + try { + await wrapWithRetries(async () => { + const transfer = await TransferService.getById(td.messageProtocolSourcePrepare.content.payload.transferId) || {} + if (transfer?.transferState !== TransferInternalState.ABORTED_ERROR) { + if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) + return null + } + return transfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + test.end() + }) + + abortTest.end() + }) + + await handlersTest.test('When fxTransfer followed by a transfer and transferFulfilAbort are sent', async abortTest => { + const td = await prepareFxTestData(testFxData) + + await abortTest.test('update fxTransfer state to RESERVED by PREPARE request', async (test) => { + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventAction.PREPARE.toUpperCase() + ) + prepareConfig.logger = Logger + + await Producer.produceMessage( + td.messageProtocolPayerInitiatedConversionFxPrepare, + td.topicConfFxTransferPrepare, + prepareConfig + ) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: TOPIC_POSITION_BATCH, + action: Enum.Events.Event.Action.FX_PREPARE, + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position fx-prepare message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + try { + await wrapWithRetries(async () => { + const fxTransfer = await FxTransferModels.fxTransfer.getAllDetailsByCommitRequestId(td.messageProtocolPayerInitiatedConversionFxPrepare.content.payload.commitRequestId) || {} + if (fxTransfer?.transferState !== TransferInternalState.RESERVED) { + if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) + return null + } + return fxTransfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + // Check the position of the payer is updated + const payerPositionAfterReserve = await ParticipantService.getPositionByParticipantCurrencyId(td.payer.participantCurrencyId) + test.equal(payerPositionAfterReserve.value, testFxData.sourceAmount.amount) + + testConsumer.clearEvents() + test.end() + }) + + await abortTest.test('update fxTransfer state to RECEIVED_FULFIL_DEPENDENT by FULFIL request', async (test) => { + const fulfilConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventAction.FULFIL.toUpperCase() + ) + fulfilConfig.logger = Logger + + await Producer.produceMessage( + td.messageProtocolPayerInitiatedConversionFxFulfil, + td.topicConfFxTransferFulfil, + fulfilConfig + ) + + try { + const positionFulfil = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: TOPIC_POSITION_BATCH, + action: Enum.Events.Event.Action.FX_RESERVE + // NOTE: The key is the fxp participantCurrencyId of the source currency (USD) + // Is that correct...? + // keyFilter: td.fxp.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionFulfil[0], 'Position fx-fulfil message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + try { + await wrapWithRetries(async () => { + const fxTransfer = await FxTransferModels.fxTransfer.getAllDetailsByCommitRequestId( + td.messageProtocolPayerInitiatedConversionFxPrepare.content.payload.commitRequestId) || {} + + if (fxTransfer?.transferState !== TransferInternalState.RECEIVED_FULFIL_DEPENDENT) { + if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) + return null + } + return fxTransfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + testConsumer.clearEvents() + test.end() + }) + + await abortTest.test('update transfer state to RESERVED by PREPARE request', async (test) => { + const config = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + config.logger = Logger + + const producerResponse = await Producer.produceMessage(td.messageProtocolPrepare, td.topicConfTransferPrepare, config) + Logger.info(producerResponse) + + try { + await wrapWithRetries(async () => { + const transfer = await TransferService.getById(td.messageProtocolPrepare.content.payload.transferId) || {} + if (transfer?.transferState !== TransferState.RESERVED) { + if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) + return null + } + return transfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + // Check the position of the fxp is updated + const fxpTargetPositionAfterReserve = await ParticipantService.getPositionByParticipantCurrencyId(td.fxp.participantCurrencyIdSecondary) + test.equal(fxpTargetPositionAfterReserve.value, testFxData.targetAmount.amount) + + testConsumer.clearEvents() + test.end() + }) + + await abortTest.test('update transfer state to ABORTED by FULFIL-ABORT callback', async (test) => { + const config = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.FULFIL.toUpperCase()) + config.logger = Logger + + await Producer.produceMessage(td.messageProtocolError, td.topicConfTransferFulfil, config) + + // Check for the transfer state to be ABORTED + try { + await wrapWithRetries(async () => { + const transfer = await TransferService.getById(td.messageProtocolPrepare.content.payload.transferId) || {} + if (transfer?.transferState !== TransferInternalState.ABORTED_ERROR) { + if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) + return null + } + return transfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + // Check for the fxTransfer state to be ABORTED + try { + await wrapWithRetries(async () => { + const fxTransfer = await FxTransferModels.fxTransfer.getAllDetailsByCommitRequestId( + td.messageProtocolPayerInitiatedConversionFxPrepare.content.payload.commitRequestId) || {} + if (fxTransfer?.transferState !== TransferInternalState.ABORTED_ERROR) { + if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) + return null + } + return fxTransfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + // Check the position of the payer is reverted + const payerPositionAfterAbort = await ParticipantService.getPositionByParticipantCurrencyId(td.payer.participantCurrencyId) + test.equal(payerPositionAfterAbort.value, 0) + + // Check the position of the fxp is reverted + const fxpTargetPositionAfterAbort = await ParticipantService.getPositionByParticipantCurrencyId(td.fxp.participantCurrencyIdSecondary) + test.equal(fxpTargetPositionAfterAbort.value, 0) + + // Check the position of the payee is not changed + const payeePositionAfterAbort = await ParticipantService.getPositionByParticipantCurrencyId(td.payee.participantCurrencyId) + test.equal(payeePositionAfterAbort.value, 0) + + // Check the position of the fxp source currency is not changed + const fxpSourcePositionAfterAbort = await ParticipantService.getPositionByParticipantCurrencyId(td.fxp.participantCurrencyId) + test.equal(fxpSourcePositionAfterAbort.value, 0) + + testConsumer.clearEvents() + test.end() + }) + + abortTest.end() + }) + + await handlersTest.test('When there is an abort from FXP for fxTransfer', async abortTest => { + const td = await prepareFxTestData(testFxData) + + await abortTest.test('update fxTransfer state to RESERVED by PREPARE request', async (test) => { + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventAction.PREPARE.toUpperCase() + ) + prepareConfig.logger = Logger + await Producer.produceMessage( + td.messageProtocolPayerInitiatedConversionFxPrepare, + td.topicConfFxTransferPrepare, + prepareConfig + ) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: TOPIC_POSITION_BATCH, + action: Enum.Events.Event.Action.FX_PREPARE, + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position fx-prepare message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + try { + await wrapWithRetries(async () => { + const fxTransfer = await FxTransferModels.fxTransfer.getAllDetailsByCommitRequestId(td.messageProtocolPayerInitiatedConversionFxPrepare.content.payload.commitRequestId) || {} + if (fxTransfer?.transferState !== TransferInternalState.RESERVED) { + if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) + return null + } + return fxTransfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + testConsumer.clearEvents() + test.end() + }) + + await abortTest.test('update fxTransfer state to ABORTED by FULFIL-ABORT callback', async (test) => { + const config = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.FULFIL.toUpperCase()) + config.logger = Logger + + await Producer.produceMessage(td.messageProtocolFxAbort, td.topicConfTransferFulfil, config) + + // Check for the fxTransfer state to be ABORTED + try { + await wrapWithRetries(async () => { + const fxTransfer = await FxTransferModels.fxTransfer.getAllDetailsByCommitRequestId( + td.messageProtocolPayerInitiatedConversionFxPrepare.content.payload.commitRequestId) || {} + if (fxTransfer?.transferState !== TransferInternalState.ABORTED_ERROR) { + if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) + return null + } + return fxTransfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + testConsumer.clearEvents() + test.end() + }) + + abortTest.end() + }) + + await handlersTest.test('teardown', async (assert) => { + try { + await Handlers.timeouts.stop() + await Cache.destroyCache() + await Db.disconnect() + assert.pass('database connection closed') + await testConsumer.destroy() // this disconnects the consumers + + await Producer.disconnect() + await ProxyCache.disconnect() + + if (debug) { + const elapsedTime = Math.round(((new Date()) - startTime) / 100) / 10 + console.log(`handlers.test.js finished in (${elapsedTime}s)`) + } + + assert.end() + } catch (err) { + Logger.error(`teardown failed with error - ${err}`) + assert.fail() + assert.end() + } finally { + handlersTest.end() + } + }) +}) diff --git a/test/integration-override/handlers/transfers/fxFulfil.test.js b/test/integration-override/handlers/transfers/fxFulfil.test.js new file mode 100644 index 000000000..f1d62a525 --- /dev/null +++ b/test/integration-override/handlers/transfers/fxFulfil.test.js @@ -0,0 +1,312 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Eugen Klymniuk + -------------- + **********/ + +const Test = require('tape') +const { Db } = require('@mojaloop/database-lib') +const { Enum, Util } = require('@mojaloop/central-services-shared') +const { Producer } = require('@mojaloop/central-services-stream').Kafka + +const Config = require('#src/lib/config') +const Cache = require('#src/lib/cache') +const ProxyCache = require('#src/lib/proxyCache') +const fspiopErrorFactory = require('#src/shared/fspiopErrorFactory') +const ParticipantCached = require('#src/models/participant/participantCached') +const ParticipantCurrencyCached = require('#src/models/participant/participantCurrencyCached') +const ParticipantLimitCached = require('#src/models/participant/participantLimitCached') +const fxTransferModel = require('#src/models/fxTransfer/index') +const prepare = require('#src/handlers/transfers/prepare') +const cyril = require('#src/domain/fx/cyril') +const { logger } = require('#src/shared/logger/index') +const { TABLE_NAMES } = require('#src/shared/constants') + +const { checkErrorPayload, wrapWithRetries } = require('#test/util/helpers') +const createTestConsumer = require('#test/integration/helpers/createTestConsumer') +const ParticipantHelper = require('#test/integration/helpers/participant') +const HubAccountsHelper = require('#test/integration/helpers/hubAccounts') +const fixtures = require('#test/fixtures') + +const kafkaUtil = Util.Kafka +const { Action, Type } = Enum.Events.Event +const { TOPICS } = fixtures + +const storeFxTransferPreparePayload = async (fxTransfer, transferStateId = '', addToWatchList = true) => { + const { commitRequestId } = fxTransfer + const isFx = true + const proxyObligation = { + isInitiatingFspProxy: false, + isCounterPartyFspProxy: false, + initiatingFspProxyOrParticipantId: null, + counterPartyFspProxyOrParticipantId: null + } + const dupResult = await prepare.checkDuplication({ + payload: fxTransfer, + isFx, + ID: commitRequestId, + location: {} + }) + if (dupResult.hasDuplicateId) throw new Error('fxTransfer prepare Duplication Error') + + await prepare.savePreparedRequest({ + payload: fxTransfer, + isFx, + functionality: Type.NOTIFICATION, + params: {}, + validationPassed: true, + reasons: [], + location: {}, + proxyObligation + }) + + if (transferStateId) { + const knex = Db.getKnex() + await knex(TABLE_NAMES.fxTransferStateChange) + .update({ + transferStateId, + reason: 'fxFulfil int-test' + }) + .where({ commitRequestId }) + // https://github.com/mojaloop/central-ledger/blob/ad4dd53d6914628813aa30a1dcd3af2a55f12b0d/src/domain/position/fx-prepare.js#L187 + logger.info('fxTransfer state is updated', { transferStateId }) + if (transferStateId === Enum.Transfers.TransferState.RESERVED) { + const fxTransferStateChangeId = await knex(TABLE_NAMES.fxTransferStateChange).where({ commitRequestId }).select('fxTransferStateChangeId') + await knex(TABLE_NAMES.participantPositionChange).insert({ + participantPositionId: 1, + fxTransferStateChangeId: fxTransferStateChangeId[0].fxTransferStateChangeId, + participantCurrencyId: 1, + value: 0, + change: 0, + reservedValue: 0 + }) + } + } + + if (addToWatchList) { + const determiningTransferCheckResult = await cyril.checkIfDeterminingTransferExistsForFxTransferMessage( + fxTransfer, + proxyObligation + ) + await cyril.getParticipantAndCurrencyForFxTransferMessage(fxTransfer, determiningTransferCheckResult) + logger.info('fxTransfer is added to watchList', { fxTransfer }) + } +} + +Test('FxFulfil flow Integration Tests -->', async fxFulfilTest => { + await Db.connect(Config.DATABASE) + await Promise.all([ + Cache.initCache(), + ParticipantCached.initialize(), + ParticipantCurrencyCached.initialize(), + ParticipantLimitCached.initialize(), + HubAccountsHelper.prepareData() + ]) + + const dfspNamePrefix = 'dfsp_' + const fxpNamePrefix = 'fxp_' + const sourceAmount = fixtures.amountDto({ currency: 'USD', amount: 433.88 }) + const targetAmount = fixtures.amountDto({ currency: 'XXX', amount: 200.22 }) + + const [payer, fxp] = await Promise.all([ + ParticipantHelper.prepareData(dfspNamePrefix, sourceAmount.currency), + ParticipantHelper.prepareData(fxpNamePrefix, sourceAmount.currency, targetAmount.currency) + ]) + const DFSP_1 = payer.participant.name + const FXP = fxp.participant.name + + const createFxFulfilKafkaMessage = ({ commitRequestId, fulfilment, action = Action.FX_RESERVE } = {}) => { + const content = fixtures.fxFulfilContentDto({ + commitRequestId, + payload: fixtures.fxFulfilPayloadDto({ fulfilment }), + from: FXP, + to: DFSP_1 + }) + const fxFulfilMessage = fixtures.fxFulfilKafkaMessageDto({ + content, + from: FXP, + to: DFSP_1, + metadata: fixtures.fulfilMetadataDto({ action }) + }) + return fxFulfilMessage.value + } + + const topicFxFulfilConfig = kafkaUtil.createGeneralTopicConf( + Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, + Type.TRANSFER, + Action.FULFIL + ) + const fxFulfilProducerConfig = kafkaUtil.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + Type.TRANSFER.toUpperCase(), + Action.FULFIL.toUpperCase() + ) + const producer = new Producer(fxFulfilProducerConfig) + await producer.connect() + const produceMessageToFxFulfilTopic = async (message) => producer.sendMessage(message, topicFxFulfilConfig) + + const testConsumer = createTestConsumer([ + { type: Type.NOTIFICATION, action: Action.EVENT }, + { type: Type.TRANSFER, action: Action.POSITION }, + { type: Type.TRANSFER, action: Action.FULFIL } + ]) + const batchTopicConfig = { + topicName: TOPICS.transferPositionBatch, + config: Util.Kafka.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.CONSUMER, + Enum.Events.Event.Type.TRANSFER.toUpperCase(), + Enum.Events.Event.Action.POSITION.toUpperCase() + ) + } + testConsumer.handlers.push(batchTopicConfig) + await testConsumer.startListening() + await new Promise(resolve => setTimeout(resolve, 5_000)) + testConsumer.clearEvents() + fxFulfilTest.pass('setup is done') + + fxFulfilTest.test('should publish a message to send error callback if fxTransfer does not exist', async (t) => { + const noFxTransferMessage = createFxFulfilKafkaMessage() + const isTriggered = await produceMessageToFxFulfilTopic(noFxTransferMessage) + t.ok(isTriggered, 'test is triggered') + + const messages = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: TOPICS.notificationEvent, + action: Action.FX_RESERVE, + valueToFilter: FXP + })) + t.ok(messages[0], 'Notification event message is sent') + t.equal(messages[0].value.id, noFxTransferMessage.id) + checkErrorPayload(t)(messages[0].value.content.payload, fspiopErrorFactory.fxTransferNotFound()) + t.end() + }) + + fxFulfilTest.test('should process fxFulfil message (happy path)', async (t) => { + const fxTransfer = fixtures.fxTransferDto({ + initiatingFsp: DFSP_1, + counterPartyFsp: FXP, + sourceAmount, + targetAmount + }) + const { commitRequestId } = fxTransfer + + await storeFxTransferPreparePayload(fxTransfer, Enum.Transfers.TransferState.RESERVED) + t.pass(`fxTransfer prepare is saved in DB: ${commitRequestId}`) + + const fxFulfilMessage = createFxFulfilKafkaMessage({ commitRequestId }) + const isTriggered = await produceMessageToFxFulfilTopic(fxFulfilMessage) + t.ok(isTriggered, 'test is triggered') + + const messages = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: TOPICS.transferPositionBatch, + action: Action.FX_RESERVE + })) + t.ok(messages[0], `Message is sent to ${TOPICS.transferPositionBatch}`) + const knex = Db.getKnex() + const extension = await knex(TABLE_NAMES.fxTransferExtension).where({ commitRequestId }).select('key', 'value') + const { from, to, content } = messages[0].value + t.equal(extension.length, fxFulfilMessage.content.payload.extensionList.extension.length, 'Saved extension') + t.equal(extension[0].key, fxFulfilMessage.content.payload.extensionList.extension[0].key, 'Saved extension key') + t.equal(extension[0].value, fxFulfilMessage.content.payload.extensionList.extension[0].value, 'Saved extension value') + t.equal(from, FXP) + t.equal(to, DFSP_1) + t.equal(content.payload.fulfilment, fxFulfilMessage.content.payload.fulfilment, 'fulfilment is correct') + t.end() + }) + + fxFulfilTest.test('should check duplicates, and detect modified request (hash is not the same)', async (t) => { + const fxTransfer = fixtures.fxTransferDto({ + initiatingFsp: DFSP_1, + counterPartyFsp: FXP, + sourceAmount, + targetAmount + }) + const { commitRequestId } = fxTransfer + + await storeFxTransferPreparePayload(fxTransfer, '', false) + await fxTransferModel.duplicateCheck.saveFxTransferFulfilmentDuplicateCheck(commitRequestId, 'wrongHash') + t.pass(`fxTransfer prepare and duplicateCheck are saved in DB: ${commitRequestId}`) + + const fxFulfilMessage = createFxFulfilKafkaMessage({ commitRequestId }) + const isTriggered = await produceMessageToFxFulfilTopic(fxFulfilMessage) + t.ok(isTriggered, 'test is triggered') + + const messages = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: TOPICS.notificationEvent, + action: Action.FX_FULFIL_DUPLICATE + })) + t.ok(messages[0], `Message is sent to ${TOPICS.notificationEvent}`) + const { from, to, content, metadata } = messages[0].value + t.equal(from, fixtures.SWITCH_ID) + t.equal(to, FXP) + t.equal(metadata.event.type, Type.NOTIFICATION) + checkErrorPayload(t)(content.payload, fspiopErrorFactory.noFxDuplicateHash()) + t.end() + }) + + fxFulfilTest.test('should detect invalid fulfilment', async (t) => { + const fxTransfer = fixtures.fxTransferDto({ + initiatingFsp: DFSP_1, + counterPartyFsp: FXP, + sourceAmount, + targetAmount + }) + const { commitRequestId } = fxTransfer + + await storeFxTransferPreparePayload(fxTransfer, Enum.Transfers.TransferState.RESERVED) + t.pass(`fxTransfer prepare is saved in DB: ${commitRequestId}`) + + const fulfilment = 'wrongFulfilment' + const fxFulfilMessage = createFxFulfilKafkaMessage({ commitRequestId, fulfilment }) + const isTriggered = await produceMessageToFxFulfilTopic(fxFulfilMessage) + t.ok(isTriggered, 'test is triggered') + + const messages = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: TOPICS.transferPositionBatch, + action: Action.FX_ABORT_VALIDATION + })) + t.ok(messages[0], `Message is sent to ${TOPICS.transferPosition}`) + const { from, to, content } = messages[0].value + t.equal(from, fixtures.SWITCH_ID) + t.equal(to, DFSP_1) + checkErrorPayload(t)(content.payload, fspiopErrorFactory.fxInvalidFulfilment()) + t.end() + }) + + fxFulfilTest.test('teardown', async (t) => { + await Promise.all([ + Db.disconnect(), + Cache.destroyCache(), + producer.disconnect(), + testConsumer.destroy() + ]) + await ProxyCache.disconnect() + await new Promise(resolve => setTimeout(resolve, 5_000)) + t.pass('teardown is finished') + t.end() + }) + + fxFulfilTest.end() +}) diff --git a/test/integration-override/handlers/transfers/fxTimeout.test.js b/test/integration-override/handlers/transfers/fxTimeout.test.js new file mode 100644 index 000000000..17c2fd721 --- /dev/null +++ b/test/integration-override/handlers/transfers/fxTimeout.test.js @@ -0,0 +1,875 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Vijaya Kumar Guthi + -------------- + **********/ + +'use strict' + +const Test = require('tape') +const { randomUUID } = require('crypto') +const Logger = require('@mojaloop/central-services-logger') +const Config = require('#src/lib/config') +const Db = require('@mojaloop/database-lib').Db +const Cache = require('#src/lib/cache') +const ProxyCache = require('#src/lib/proxyCache') +const Producer = require('@mojaloop/central-services-stream').Util.Producer +const Utility = require('@mojaloop/central-services-shared').Util.Kafka +const Util = require('@mojaloop/central-services-shared').Util +const Enum = require('@mojaloop/central-services-shared').Enum +const ParticipantHelper = require('#test/integration/helpers/participant') +const ParticipantLimitHelper = require('#test/integration/helpers/participantLimit') +const ParticipantFundsInOutHelper = require('#test/integration/helpers/participantFundsInOut') +const ParticipantEndpointHelper = require('#test/integration/helpers/participantEndpoint') +const SettlementHelper = require('#test/integration/helpers/settlementModels') +const HubAccountsHelper = require('#test/integration/helpers/hubAccounts') +const TransferService = require('#src/domain/transfer/index') +const FxTransferModels = require('#src/models/fxTransfer/index') +const ParticipantService = require('#src/domain/participant/index') +const ErrorHandler = require('@mojaloop/central-services-error-handling') +const { + wrapWithRetries +} = require('#test/util/helpers') +const TestConsumer = require('#test/integration/helpers/testConsumer') + +const ParticipantCached = require('#src/models/participant/participantCached') +const ParticipantCurrencyCached = require('#src/models/participant/participantCurrencyCached') +const ParticipantLimitCached = require('#src/models/participant/participantLimitCached') +const SettlementModelCached = require('#src/models/settlement/settlementModelCached') + +const Handlers = { + index: require('#src/handlers/register'), + positions: require('#src/handlers/positions/handler'), + transfers: require('#src/handlers/transfers/handler'), + timeouts: require('#src/handlers/timeouts/handler') +} + +const TransferState = Enum.Transfers.TransferState +const TransferInternalState = Enum.Transfers.TransferInternalState +const TransferEventType = Enum.Events.Event.Type +const TransferEventAction = Enum.Events.Event.Action + +const debug = process?.env?.TEST_INT_DEBUG || false +const rebalanceDelay = process?.env?.TEST_INT_REBALANCE_DELAY || 20000 +const retryDelay = process?.env?.TEST_INT_RETRY_DELAY || 2 +const retryCount = process?.env?.TEST_INT_RETRY_COUNT || 40 +const retryOpts = { + retries: retryCount, + minTimeout: retryDelay, + maxTimeout: retryDelay +} +const TOPIC_POSITION = 'topic-transfer-position' +const TOPIC_POSITION_BATCH = 'topic-transfer-position-batch' + +const testFxData = { + sourceAmount: { + currency: 'USD', + amount: 433.88 + }, + targetAmount: { + currency: 'XXX', + amount: 200.00 + }, + payer: { + name: 'payerFsp', + limit: 5000 + }, + payee: { + name: 'payeeFsp', + limit: 5000 + }, + fxp: { + name: 'fxp', + limit: 3000 + }, + endpoint: { + base: 'http://localhost:1080', + email: 'test@example.com' + }, + now: new Date(), + expiration: new Date((new Date()).getTime() + (24 * 60 * 60 * 1000)) // tomorrow +} + +const prepareFxTestData = async (dataObj) => { + try { + const payer = await ParticipantHelper.prepareData(dataObj.payer.name, dataObj.sourceAmount.currency) + const fxp = await ParticipantHelper.prepareData(dataObj.fxp.name, dataObj.sourceAmount.currency, dataObj.targetAmount.currency) + const payee = await ParticipantHelper.prepareData(dataObj.payee.name, dataObj.targetAmount.currency) + + const payerLimitAndInitialPosition = await ParticipantLimitHelper.prepareLimitAndInitialPosition(payer.participant.name, { + currency: dataObj.sourceAmount.currency, + limit: { value: dataObj.payer.limit } + }) + const fxpLimitAndInitialPositionSourceCurrency = await ParticipantLimitHelper.prepareLimitAndInitialPosition(fxp.participant.name, { + currency: dataObj.sourceAmount.currency, + limit: { value: dataObj.fxp.limit } + }) + const fxpLimitAndInitialPositionTargetCurrency = await ParticipantLimitHelper.prepareLimitAndInitialPosition(fxp.participant.name, { + currency: dataObj.targetAmount.currency, + limit: { value: dataObj.fxp.limit } + }) + const payeeLimitAndInitialPosition = await ParticipantLimitHelper.prepareLimitAndInitialPosition(payee.participant.name, { + currency: dataObj.targetAmount.currency, + limit: { value: dataObj.payee.limit } + }) + await ParticipantFundsInOutHelper.recordFundsIn(payer.participant.name, payer.participantCurrencyId2, { + currency: dataObj.sourceAmount.currency, + amount: 10000 + }) + await ParticipantFundsInOutHelper.recordFundsIn(fxp.participant.name, fxp.participantCurrencyId2, { + currency: dataObj.sourceAmount.currency, + amount: 10000 + }) + await ParticipantFundsInOutHelper.recordFundsIn(fxp.participant.name, fxp.participantCurrencyIdSecondary2, { + currency: dataObj.targetAmount.currency, + amount: 10000 + }) + + for (const name of [payer.participant.name, fxp.participant.name]) { + await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_TRANSFER_POST', `${dataObj.endpoint.base}/transfers`) + await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_TRANSFER_PUT', `${dataObj.endpoint.base}/transfers/{{transferId}}`) + await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_TRANSFER_ERROR', `${dataObj.endpoint.base}/transfers/{{transferId}}/error`) + await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_BULK_TRANSFER_POST', `${dataObj.endpoint.base}/bulkTransfers`) + await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_BULK_TRANSFER_PUT', `${dataObj.endpoint.base}/bulkTransfers/{{id}}`) + await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_BULK_TRANSFER_ERROR', `${dataObj.endpoint.base}/bulkTransfers/{{id}}/error`) + await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_QUOTES', `${dataObj.endpoint.base}`) + await ParticipantEndpointHelper.prepareData(name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_QUOTES, `${dataObj.endpoint.base}`) + await ParticipantEndpointHelper.prepareData(name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_POST, `${dataObj.endpoint.base}/fxTransfers`) + await ParticipantEndpointHelper.prepareData(name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_PUT, `${dataObj.endpoint.base}/fxTransfers/{{commitRequestId}}`) + await ParticipantEndpointHelper.prepareData(name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_ERROR, `${dataObj.endpoint.base}/fxTransfers/{{commitRequestId}}/error`) + } + + const transferId = randomUUID() + + const fxTransferPayload = { + commitRequestId: randomUUID(), + determiningTransferId: transferId, + condition: 'GRzLaTP7DJ9t4P-a_BA0WA9wzzlsugf00-Tn6kESAfM', + expiration: dataObj.expiration, + initiatingFsp: payer.participant.name, + counterPartyFsp: fxp.participant.name, + sourceAmount: { + currency: dataObj.sourceAmount.currency, + amount: dataObj.sourceAmount.amount + }, + targetAmount: { + currency: dataObj.targetAmount.currency, + amount: dataObj.targetAmount.amount + } + } + + const fxPrepareHeaders = { + 'fspiop-source': payer.participant.name, + 'fspiop-destination': fxp.participant.name, + 'content-type': 'application/vnd.interoperability.fxTransfers+json;version=1.1' + } + + const transfer1Payload = { + transferId, + payerFsp: payer.participant.name, + payeeFsp: payee.participant.name, + amount: { + currency: dataObj.targetAmount.currency, + amount: dataObj.targetAmount.amount + }, + ilpPacket: 'AYIBgQAAAAAAAASwNGxldmVsb25lLmRmc3AxLm1lci45T2RTOF81MDdqUUZERmZlakgyOVc4bXFmNEpLMHlGTFGCAUBQU0svMS4wCk5vbmNlOiB1SXlweUYzY3pYSXBFdzVVc05TYWh3CkVuY3J5cHRpb246IG5vbmUKUGF5bWVudC1JZDogMTMyMzZhM2ItOGZhOC00MTYzLTg0NDctNGMzZWQzZGE5OGE3CgpDb250ZW50LUxlbmd0aDogMTM1CkNvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbgpTZW5kZXItSWRlbnRpZmllcjogOTI4MDYzOTEKCiJ7XCJmZWVcIjowLFwidHJhbnNmZXJDb2RlXCI6XCJpbnZvaWNlXCIsXCJkZWJpdE5hbWVcIjpcImFsaWNlIGNvb3BlclwiLFwiY3JlZGl0TmFtZVwiOlwibWVyIGNoYW50XCIsXCJkZWJpdElkZW50aWZpZXJcIjpcIjkyODA2MzkxXCJ9IgA', + condition: 'GRzLaTP7DJ9t4P-a_BA0WA9wzzlsugf00-Tn6kESAfM', + expiration: dataObj.expiration, + extensionList: { + extension: [ + { + key: 'key1', + value: 'value1' + }, + { + key: 'key2', + value: 'value2' + } + ] + } + } + + const prepare1Headers = { + 'fspiop-source': payer.participant.name, + 'fspiop-destination': payee.participant.name, + 'content-type': 'application/vnd.interoperability.transfers+json;version=1.1' + } + + const errorPayload = ErrorHandler.Factory.createFSPIOPError( + ErrorHandler.Enums.FSPIOPErrorCodes.PAYEE_FSP_REJECTED_TXN + ).toApiErrorObject() + errorPayload.errorInformation.extensionList = { + extension: [{ + key: 'errorDetail', + value: 'This is an abort extension' + }] + } + + const messageProtocolPayerInitiatedConversionFxPrepare = { + id: randomUUID(), + from: fxTransferPayload.initiatingFsp, + to: fxTransferPayload.counterPartyFsp, + type: 'application/json', + content: { + headers: fxPrepareHeaders, + payload: fxTransferPayload + }, + metadata: { + event: { + id: randomUUID(), + type: TransferEventType.TRANSFER, + action: TransferEventAction.FX_PREPARE, + createdAt: dataObj.now, + state: { + status: 'success', + code: 0 + } + } + } + } + + const messageProtocolPrepare1 = { + id: randomUUID(), + from: transfer1Payload.payerFsp, + to: transfer1Payload.payeeFsp, + type: 'application/json', + content: { + headers: prepare1Headers, + payload: transfer1Payload + }, + metadata: { + event: { + id: randomUUID(), + type: TransferEventAction.PREPARE, + action: TransferEventType.PREPARE, + createdAt: dataObj.now, + state: { + status: 'success', + code: 0 + } + } + } + } + + const topicConfFxTransferPrepare = Utility.createGeneralTopicConf( + Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, + TransferEventType.TRANSFER, + TransferEventAction.PREPARE + ) + + const topicConfTransferPrepare = Utility.createGeneralTopicConf( + Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, + TransferEventType.TRANSFER, + TransferEventType.PREPARE + ) + + const topicConfFxTransferFulfil = Utility.createGeneralTopicConf( + Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, + TransferEventType.TRANSFER, + TransferEventType.FULFIL + ) + + const fxFulfilHeaders = { + 'fspiop-source': fxp.participant.name, + 'fspiop-destination': payer.participant.name, + 'content-type': 'application/vnd.interoperability.fxTransfers+json;version=2.0' + } + + const fulfilPayload = { + fulfilment: 'UNlJ98hZTY_dsw0cAqw4i_UN3v4utt7CZFB4yfLbVFA', + completedTimestamp: dataObj.now, + transferState: 'COMMITTED' + } + + const messageProtocolPayerInitiatedConversionFxFulfil = Util.clone(messageProtocolPayerInitiatedConversionFxPrepare) + messageProtocolPayerInitiatedConversionFxFulfil.id = randomUUID() + messageProtocolPayerInitiatedConversionFxFulfil.from = fxTransferPayload.counterPartyFsp + messageProtocolPayerInitiatedConversionFxFulfil.to = fxTransferPayload.initiatingFsp + messageProtocolPayerInitiatedConversionFxFulfil.content.headers = fxFulfilHeaders + messageProtocolPayerInitiatedConversionFxFulfil.content.uriParams = { id: fxTransferPayload.commitRequestId } + messageProtocolPayerInitiatedConversionFxFulfil.content.payload = fulfilPayload + messageProtocolPayerInitiatedConversionFxFulfil.metadata.event.id = randomUUID() + messageProtocolPayerInitiatedConversionFxFulfil.metadata.event.type = TransferEventType.FULFIL + messageProtocolPayerInitiatedConversionFxFulfil.metadata.event.action = TransferEventAction.FX_RESERVE + + return { + fxTransferPayload, + transfer1Payload, + errorPayload, + messageProtocolPayerInitiatedConversionFxPrepare, + messageProtocolPayerInitiatedConversionFxFulfil, + messageProtocolPrepare1, + topicConfTransferPrepare, + topicConfFxTransferPrepare, + topicConfFxTransferFulfil, + payer, + payerLimitAndInitialPosition, + fxp, + fxpLimitAndInitialPositionSourceCurrency, + fxpLimitAndInitialPositionTargetCurrency, + payee, + payeeLimitAndInitialPosition + } + } catch (err) { + throw ErrorHandler.Factory.reformatFSPIOPError(err) + } +} + +Test('fxTimeout Handler Tests -->', async fxTimeoutTest => { + const startTime = new Date() + await Db.connect(Config.DATABASE) + await ParticipantCached.initialize() + await ParticipantCurrencyCached.initialize() + await ParticipantLimitCached.initialize() + await SettlementModelCached.initialize() + await Cache.initCache() + await SettlementHelper.prepareData() + await HubAccountsHelper.prepareData() + + const wrapWithRetriesConf = { + remainingRetries: retryOpts?.retries || 10, // default 10 + timeout: retryOpts?.maxTimeout || 2 // default 2 + } + + // Start a testConsumer to monitor events that our handlers emit + const testConsumer = new TestConsumer([ + { + topicName: Utility.transformGeneralTopicName( + Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, + Enum.Events.Event.Type.TRANSFER, + Enum.Events.Event.Action.FULFIL + ), + config: Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.CONSUMER, + Enum.Events.Event.Type.TRANSFER.toUpperCase(), + Enum.Events.Event.Action.FULFIL.toUpperCase() + ) + }, + { + topicName: Utility.transformGeneralTopicName( + Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, + Enum.Events.Event.Type.NOTIFICATION, + Enum.Events.Event.Action.EVENT + ), + config: Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.CONSUMER, + Enum.Events.Event.Type.NOTIFICATION.toUpperCase(), + Enum.Events.Event.Action.EVENT.toUpperCase() + ) + }, + { + topicName: TOPIC_POSITION, + config: Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.CONSUMER, + Enum.Events.Event.Type.TRANSFER.toUpperCase(), + Enum.Events.Event.Action.POSITION.toUpperCase() + ) + }, + { + topicName: TOPIC_POSITION_BATCH, + config: Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.CONSUMER, + Enum.Events.Event.Type.TRANSFER.toUpperCase(), + Enum.Events.Event.Action.POSITION.toUpperCase() + ) + } + ]) + + await fxTimeoutTest.test('Setup kafka consumer should', async registerAllHandlers => { + await registerAllHandlers.test('start consumer', async (test) => { + // Set up the testConsumer here + await testConsumer.startListening() + + await new Promise(resolve => setTimeout(resolve, rebalanceDelay)) + testConsumer.clearEvents() + + test.pass('done') + test.end() + registerAllHandlers.end() + }) + }) + + await fxTimeoutTest.test('fxTransferPrepare should', async fxTransferPrepare => { + await fxTransferPrepare.test('should handle payer initiated conversion fxTransfer', async (test) => { + const td = await prepareFxTestData(testFxData) + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventAction.PREPARE.toUpperCase() + ) + prepareConfig.logger = Logger + await Producer.produceMessage( + td.messageProtocolPayerInitiatedConversionFxPrepare, + td.topicConfFxTransferPrepare, + prepareConfig + ) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: TOPIC_POSITION_BATCH, + action: Enum.Events.Event.Action.FX_PREPARE, + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position fx-prepare message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + test.end() + }) + + fxTransferPrepare.end() + }) + + await fxTimeoutTest.test('When only fxTransfer is sent, fxTimeout should', async timeoutTest => { + const expiration = new Date((new Date()).getTime() + (10 * 1000)) // 10 seconds + const newTestFxData = { + ...testFxData, + expiration: expiration.toISOString() + } + const td = await prepareFxTestData(newTestFxData) + + await timeoutTest.test('update fxTransfer state to RESERVED by PREPARE request', async (test) => { + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventAction.PREPARE.toUpperCase() + ) + prepareConfig.logger = Logger + await Producer.produceMessage( + td.messageProtocolPayerInitiatedConversionFxPrepare, + td.topicConfFxTransferPrepare, + prepareConfig + ) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: TOPIC_POSITION_BATCH, + action: Enum.Events.Event.Action.FX_PREPARE, + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position fx-prepare message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + try { + await wrapWithRetries(async () => { + const fxTransfer = await FxTransferModels.fxTransfer.getAllDetailsByCommitRequestId(td.messageProtocolPayerInitiatedConversionFxPrepare.content.payload.commitRequestId) || {} + if (fxTransfer?.transferState !== TransferInternalState.RESERVED) { + if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) + return null + } + return fxTransfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + test.end() + }) + + await timeoutTest.test('update fxTransfer after timeout with timeout status & error', async (test) => { + // Arrange + // Nothing to do here... + + // Act + + // Re-try function with conditions + const inspectTransferState = async () => { + try { + // Fetch FxTransfer record + const fxTransfer = await FxTransferModels.fxTransfer.getAllDetailsByCommitRequestId(td.messageProtocolPayerInitiatedConversionFxPrepare.content.payload.commitRequestId) || {} + + // Check Transfer for correct state + if (fxTransfer?.transferState === Enum.Transfers.TransferInternalState.EXPIRED_RESERVED) { + // We have a Transfer with the correct state, lets check if we can get the TransferError record + try { + // Fetch the TransferError record + const fxTransferError = await FxTransferModels.fxTransferError.getByCommitRequestId(td.messageProtocolPayerInitiatedConversionFxPrepare.content.payload.commitRequestId) + // FxTransferError record found, so lets return it + return { + fxTransfer, + fxTransferError + } + } catch (err) { + // NO FxTransferError record found, so lets return the fxTransfer and the error + return { + fxTransfer, + err + } + } + } else { + // NO FxTransfer with the correct state was found, so we return false + return false + } + } catch (err) { + // NO FxTransfer with the correct state was found, so we return false + Logger.error(err) + return false + } + } + + // wait until we inspect a fxTransfer with the correct status, or return false if all re-try attempts have failed + const result = await wrapWithRetries(inspectTransferState, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + + // Assert + if (result === false) { + test.fail(`FxTransfer['${td.messageProtocolPayerInitiatedConversionFxPrepare.content.payload.commitRequestId}'].TransferState failed to transition to ${Enum.Transfers.TransferInternalState.EXPIRED_RESERVED}`) + test.end() + } else { + test.equal(result.fxTransfer && result.fxTransfer?.transferState, Enum.Transfers.TransferInternalState.EXPIRED_RESERVED, `FxTransfer['${td.messageProtocolPayerInitiatedConversionFxPrepare.content.payload.commitRequestId}'].TransferState = ${Enum.Transfers.TransferInternalState.EXPIRED_RESERVED}`) + test.equal(result.fxTransferError && result.fxTransferError.errorCode, ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED.code, `FxTransfer['${td.messageProtocolPayerInitiatedConversionFxPrepare.content.payload.commitRequestId}'].transferError.errorCode = ${ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED.code}`) + test.equal(result.fxTransferError && result.fxTransferError.errorDescription, ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED.message, `FxTransfer['${td.messageProtocolPayerInitiatedConversionFxPrepare.content.payload.commitRequestId}'].transferError.errorDescription = ${ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED.message}`) + test.pass() + test.end() + } + }) + + await timeoutTest.test('fxTransfer position timeout should be keyed with proper account id', async (test) => { + try { + const positionTimeout = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: TOPIC_POSITION_BATCH, + action: Enum.Events.Event.Action.FX_TIMEOUT_RESERVED, + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionTimeout[0], 'Position timeout message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + test.end() + }) + + await timeoutTest.test('position resets after a timeout', async (test) => { + // Arrange + const payerInitialPosition = td.fxpLimitAndInitialPositionTargetCurrency.participantPosition.value + + // Act + const payerPositionDidReset = async () => { + const payerCurrentPosition = await ParticipantService.getPositionByParticipantCurrencyId(td.fxp.participantCurrencyId) + console.log(td.payerLimitAndInitialPosition) + console.log(payerInitialPosition) + console.log(payerCurrentPosition) + return payerCurrentPosition.value === payerInitialPosition + } + // wait until we know the position reset, or throw after 5 tries + await wrapWithRetries(payerPositionDidReset, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + const payerCurrentPosition = await ParticipantService.getPositionByParticipantCurrencyId(td.payer.participantCurrencyId) || {} + + // Assert + test.equal(payerCurrentPosition.value, payerInitialPosition, 'Position resets after a timeout') + test.end() + }) + + timeoutTest.end() + }) + + await fxTimeoutTest.test('When fxTransfer followed by a transfer are sent, fxTimeout should', async timeoutTest => { + const td = await prepareFxTestData(testFxData) + // Modify expiration of only fxTransfer + const expiration = new Date((new Date()).getTime() + (10 * 1000)) // 10 seconds + td.messageProtocolPayerInitiatedConversionFxPrepare.content.payload.expiration = expiration.toISOString() + + await timeoutTest.test('update fxTransfer state to RESERVED by PREPARE request', async (test) => { + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventAction.PREPARE.toUpperCase() + ) + prepareConfig.logger = Logger + await Producer.produceMessage( + td.messageProtocolPayerInitiatedConversionFxPrepare, + td.topicConfFxTransferPrepare, + prepareConfig + ) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: TOPIC_POSITION_BATCH, + action: Enum.Events.Event.Action.FX_PREPARE, + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position fx-prepare message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + try { + await wrapWithRetries(async () => { + const fxTransfer = await FxTransferModels.fxTransfer.getAllDetailsByCommitRequestId(td.messageProtocolPayerInitiatedConversionFxPrepare.content.payload.commitRequestId) || {} + if (fxTransfer?.transferState !== TransferInternalState.RESERVED) { + if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) + return null + } + return fxTransfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + test.end() + }) + + await timeoutTest.test('update fxTransfer state to RECEIVED_FULFIL_DEPENDENT by FULFIL request', async (test) => { + const fulfilConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventAction.FULFIL.toUpperCase() + ) + fulfilConfig.logger = Logger + + await Producer.produceMessage( + td.messageProtocolPayerInitiatedConversionFxFulfil, + td.topicConfFxTransferFulfil, + fulfilConfig + ) + + try { + const positionFulfil = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: TOPIC_POSITION_BATCH, + action: Enum.Events.Event.Action.FX_RESERVE + // NOTE: The key is the fxp participantCurrencyId of the source currency (USD) + // Is that correct...? + // keyFilter: td.fxp.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionFulfil[0], 'Position fx-fulfil message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + try { + await wrapWithRetries(async () => { + const fxTransfer = await FxTransferModels.fxTransfer.getAllDetailsByCommitRequestId( + td.messageProtocolPayerInitiatedConversionFxPrepare.content.payload.commitRequestId) || {} + + if (fxTransfer?.transferState !== TransferInternalState.RECEIVED_FULFIL_DEPENDENT) { + if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) + return null + } + return fxTransfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + testConsumer.clearEvents() + test.end() + }) + + await timeoutTest.test('update transfer state to RESERVED by PREPARE request', async (test) => { + const config = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + config.logger = Logger + + const producerResponse = await Producer.produceMessage(td.messageProtocolPrepare1, td.topicConfTransferPrepare, config) + Logger.info(producerResponse) + + try { + await wrapWithRetries(async () => { + const transfer = await TransferService.getById(td.messageProtocolPrepare1.content.payload.transferId) || {} + if (transfer?.transferState !== TransferState.RESERVED) { + if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) + return null + } + return transfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + test.end() + }) + + await timeoutTest.test('update fxTransfer after timeout with timeout status & error', async (test) => { + // Arrange + // Nothing to do here... + + // Act + + // Re-try function with conditions + const inspectTransferState = async () => { + try { + // Fetch FxTransfer record + const fxTransfer = await FxTransferModels.fxTransfer.getAllDetailsByCommitRequestId(td.messageProtocolPayerInitiatedConversionFxPrepare.content.payload.commitRequestId) || {} + // Check Transfer for correct state + if (fxTransfer?.transferState === Enum.Transfers.TransferInternalState.EXPIRED_RESERVED) { + // We have a Transfer with the correct state, lets check if we can get the TransferError record + try { + // Fetch the TransferError record + const fxTransferError = await FxTransferModels.fxTransferError.getByCommitRequestId(td.messageProtocolPayerInitiatedConversionFxPrepare.content.payload.commitRequestId) + // FxTransferError record found, so lets return it + return { + fxTransfer, + fxTransferError + } + } catch (err) { + // NO FxTransferError record found, so lets return the fxTransfer and the error + return { + fxTransfer, + err + } + } + } else { + // NO FxTransfer with the correct state was found, so we return false + return false + } + } catch (err) { + // NO FxTransfer with the correct state was found, so we return false + Logger.error(err) + return false + } + } + + // wait until we inspect a fxTransfer with the correct status, or return false if all re-try attempts have failed + const result = await wrapWithRetries(inspectTransferState, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + + // Assert + if (result === false) { + test.fail(`FxTransfer['${td.messageProtocolPayerInitiatedConversionFxPrepare.content.payload.commitRequestId}'].TransferState failed to transition to ${Enum.Transfers.TransferInternalState.EXPIRED_RESERVED}`) + test.end() + } else { + test.equal(result.fxTransfer && result.fxTransfer?.transferState, Enum.Transfers.TransferInternalState.EXPIRED_RESERVED, `FxTransfer['${td.messageProtocolPayerInitiatedConversionFxPrepare.content.payload.commitRequestId}'].TransferState = ${Enum.Transfers.TransferInternalState.EXPIRED_RESERVED}`) + test.equal(result.fxTransferError && result.fxTransferError.errorCode, ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED.code, `FxTransfer['${td.messageProtocolPayerInitiatedConversionFxPrepare.content.payload.commitRequestId}'].transferError.errorCode = ${ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED.code}`) + test.equal(result.fxTransferError && result.fxTransferError.errorDescription, ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED.message, `FxTransfer['${td.messageProtocolPayerInitiatedConversionFxPrepare.content.payload.commitRequestId}'].transferError.errorDescription = ${ErrorHandler.Enums.FSPIOPErrorCodes.TRANSFER_EXPIRED.message}`) + test.pass() + test.end() + } + }) + + await timeoutTest.test('fxTransfer position timeout should be keyed with proper account id', async (test) => { + try { + const positionTimeout = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: TOPIC_POSITION_BATCH, + action: Enum.Events.Event.Action.FX_TIMEOUT_RESERVED, + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionTimeout[0], 'Position timeout message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + test.end() + }) + + await timeoutTest.test('transfer position timeout should be keyed with proper account id', async (test) => { + try { + const positionTimeout = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: TOPIC_POSITION_BATCH, + action: Enum.Events.Event.Action.TIMEOUT_RESERVED, + keyFilter: td.fxp.participantCurrencyIdSecondary.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionTimeout[0], 'Position timeout message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + test.end() + }) + + await timeoutTest.test('payer position resets after a timeout', async (test) => { + // Arrange + const payerInitialPosition = td.payerLimitAndInitialPosition.participantPosition.value + + // Act + const payerPositionDidReset = async () => { + const payerCurrentPosition = await ParticipantService.getPositionByParticipantCurrencyId(td.payer.participantCurrencyId) + return payerCurrentPosition.value === payerInitialPosition + } + // wait until we know the position reset, or throw after 5 tries + await wrapWithRetries(payerPositionDidReset, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + const payerCurrentPosition = await ParticipantService.getPositionByParticipantCurrencyId(td.payer.participantCurrencyId) || {} + + // Assert + test.equal(payerCurrentPosition.value, payerInitialPosition, 'Position resets after a timeout') + test.end() + }) + + await timeoutTest.test('fxp target currency position resets after a timeout', async (test) => { + // td.fxp.participantCurrencyIdSecondary is the fxp's target currency + // Arrange + const fxpInitialPosition = td.fxpLimitAndInitialPositionTargetCurrency.participantPosition.value + + // Act + const fxpPositionDidReset = async () => { + const fxpCurrentPosition = await ParticipantService.getPositionByParticipantCurrencyId(td.fxp.participantCurrencyIdSecondary) + return fxpCurrentPosition.value === fxpInitialPosition + } + // wait until we know the position reset, or throw after 5 tries + await wrapWithRetries(fxpPositionDidReset, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + const fxpCurrentPosition = await ParticipantService.getPositionByParticipantCurrencyId(td.fxp.participantCurrencyIdSecondary) || {} + + // Assert + test.equal(fxpCurrentPosition.value, fxpInitialPosition, 'Position resets after a timeout') + test.end() + }) + + timeoutTest.end() + }) + + await fxTimeoutTest.test('teardown', async (assert) => { + try { + await Handlers.timeouts.stop() + await Cache.destroyCache() + await Db.disconnect() + assert.pass('database connection closed') + await testConsumer.destroy() // this disconnects the consumers + + await Producer.disconnect() + await ProxyCache.disconnect() + + if (debug) { + const elapsedTime = Math.round(((new Date()) - startTime) / 100) / 10 + console.log(`handlers.test.js finished in (${elapsedTime}s)`) + } + + assert.end() + } catch (err) { + Logger.error(`teardown failed with error - ${err}`) + assert.fail() + assert.end() + } finally { + fxTimeoutTest.end() + } + }) +}) diff --git a/test/integration-override/handlers/transfers/handlers.test.js b/test/integration-override/handlers/transfers/handlers.test.js index cfc801ab3..e9e178bd0 100644 --- a/test/integration-override/handlers/transfers/handlers.test.js +++ b/test/integration-override/handlers/transfers/handlers.test.js @@ -1,20 +1,24 @@ /***** License --------------- -Copyright © 2017 Bill & Melinda Gates Foundation -The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 -Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -Contributors --------------- -This is the official list of the Mojaloop project contributors for this file. -Names of the original copyright holders (individuals or organizations) -should be listed with a '*' in the first column. People who have -contributed from an organization can be listed under the organization -that actually holds the copyright for their contributions (see the -Gates Foundation organization for an example). Those individuals should have -their names indented and be marked with a '-'. Email address can be added -optionally within square brackets . + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation - Name Surname @@ -30,6 +34,7 @@ const Logger = require('@mojaloop/central-services-logger') const Config = require('#src/lib/config') const Db = require('@mojaloop/database-lib').Db const Cache = require('#src/lib/cache') +const ProxyCache = require('#src/lib/proxyCache') const Producer = require('@mojaloop/central-services-stream').Util.Producer const Utility = require('@mojaloop/central-services-shared').Util.Kafka const Enum = require('@mojaloop/central-services-shared').Enum @@ -45,12 +50,14 @@ const { wrapWithRetries } = require('#test/util/helpers') const TestConsumer = require('#test/integration/helpers/testConsumer') -const KafkaHelper = require('#test/integration/helpers/kafkaHelper') const ParticipantCached = require('#src/models/participant/participantCached') const ParticipantCurrencyCached = require('#src/models/participant/participantCurrencyCached') const ParticipantLimitCached = require('#src/models/participant/participantLimitCached') const SettlementModelCached = require('#src/models/settlement/settlementModelCached') +const TransferService = require('#src/domain/transfer/index') +const FxTransferService = require('#src/domain/fx/index') +const ParticipantService = require('#src/domain/participant/index') const Handlers = { index: require('#src/handlers/register'), @@ -58,15 +65,15 @@ const Handlers = { transfers: require('#src/handlers/transfers/handler'), timeouts: require('#src/handlers/timeouts/handler') } - +const TransferStateEnum = Enum.Transfers.TransferState const TransferInternalState = Enum.Transfers.TransferInternalState const TransferEventType = Enum.Events.Event.Type const TransferEventAction = Enum.Events.Event.Action -const debug = process?.env?.TEST_INT_DEBUG || false -const rebalanceDelay = process?.env?.TEST_INT_REBALANCE_DELAY || 10000 -const retryDelay = process?.env?.TEST_INT_RETRY_DELAY || 2 -const retryCount = process?.env?.TEST_INT_RETRY_COUNT || 40 +const debug = process?.env?.test_INT_DEBUG || false +const rebalanceDelay = process?.env?.test_INT_REBALANCE_DELAY || 10000 +const retryDelay = process?.env?.test_INT_RETRY_DELAY || 2 +const retryCount = process?.env?.test_INT_RETRY_COUNT || 40 const retryOpts = { retries: retryCount, minTimeout: retryDelay, @@ -74,6 +81,7 @@ const retryOpts = { } const testData = { + currencies: ['USD', 'XXX'], amount: { currency: 'USD', amount: 110 @@ -86,6 +94,31 @@ const testData = { name: 'payeeFsp', limit: 300 }, + proxyAR: { + name: 'proxyAR', + limit: 99999 + }, + proxyRB: { + name: 'proxyRB', + limit: 99999 + }, + fxp: { + name: 'testFxp', + number: 1, + limit: 1000 + }, + fxTransfer: { + amount: { + currency: 'USD', + amount: 5 + }, + fx: { + targetAmount: { + currency: 'XXX', + amount: 50 + } + } + }, endpoint: { base: 'http://localhost:1080', email: 'test@example.com' @@ -129,25 +162,75 @@ const prepareTestData = async (dataObj) => { // } const payer = await ParticipantHelper.prepareData(dataObj.payer.name, dataObj.amount.currency) - const payee = await ParticipantHelper.prepareData(dataObj.payee.name, dataObj.amount.currency) - - const kafkacat = 'GROUP=abc; T=topic; TR=transfer; kafkacat -b localhost -G $GROUP $T-$TR-prepare $T-$TR-position $T-$TR-fulfil $T-$TR-get $T-admin-$TR $T-notification-event $T-bulk-prepare' - if (debug) console.error(kafkacat) + const fxp = await ParticipantHelper.prepareData(dataObj.fxp.name, dataObj.currencies[0], dataObj.currencies[1]) + const proxyAR = await ParticipantHelper.prepareData(dataObj.proxyAR.name, dataObj.amount.currency, undefined, undefined, true) + const proxyRB = await ParticipantHelper.prepareData(dataObj.proxyRB.name, dataObj.currencies[1], undefined, undefined, true) const payerLimitAndInitialPosition = await ParticipantLimitHelper.prepareLimitAndInitialPosition(payer.participant.name, { currency: dataObj.amount.currency, limit: { value: dataObj.payer.limit } }) - const payeeLimitAndInitialPosition = await ParticipantLimitHelper.prepareLimitAndInitialPosition(payee.participant.name, { + const fxpPayerLimitAndInitialPosition = await ParticipantLimitHelper.prepareLimitAndInitialPosition(fxp.participant.name, { + currency: dataObj.currencies[0], + limit: { value: dataObj.fxp.limit } + }) + const fxpPayerLimitAndInitialPositionSecondaryCurrency = await ParticipantLimitHelper.prepareLimitAndInitialPosition(fxp.participant.name, { + currency: dataObj.currencies[1], + limit: { value: dataObj.fxp.limit } + }) + const proxyARLimitAndInitialPosition = await ParticipantLimitHelper.prepareLimitAndInitialPosition(proxyAR.participant.name, { currency: dataObj.amount.currency, - limit: { value: dataObj.payee.limit } + limit: { value: dataObj.proxyAR.limit } }) + const proxyRBLimitAndInitialPosition = await ParticipantLimitHelper.prepareLimitAndInitialPosition(proxyRB.participant.name, { + currency: dataObj.currencies[1], + limit: { value: dataObj.proxyRB.limit } + }) + await ParticipantFundsInOutHelper.recordFundsIn(payer.participant.name, payer.participantCurrencyId2, { currency: dataObj.amount.currency, amount: 10000 }) + await ParticipantFundsInOutHelper.recordFundsIn(fxp.participant.name, fxp.participantCurrencyId2, { + currency: dataObj.currencies[0], + amount: 10000 + }) + await ParticipantFundsInOutHelper.recordFundsIn(fxp.participant.name, fxp.participantCurrencyIdSecondary2, { + currency: dataObj.currencies[1], + amount: 10000 + }) + await ParticipantFundsInOutHelper.recordFundsIn(proxyAR.participant.name, proxyAR.participantCurrencyId2, { + currency: dataObj.amount.currency, + amount: 10000 + }) + await ParticipantFundsInOutHelper.recordFundsIn(proxyRB.participant.name, proxyRB.participantCurrencyId2, { + currency: dataObj.currencies[1], + amount: 10000 + }) + + let payee + let payeeLimitAndInitialPosition + let payeeLimitAndInitialPositionSecondaryCurrency + if (dataObj.crossSchemeSetup) { + payee = await ParticipantHelper.prepareData(dataObj.payee.name, dataObj.currencies[1], undefined) + payeeLimitAndInitialPosition = await ParticipantLimitHelper.prepareLimitAndInitialPosition(payee.participant.name, { + currency: dataObj.currencies[1], + limit: { value: dataObj.payee.limit } + }) + payeeLimitAndInitialPositionSecondaryCurrency = null + } else { + payee = await ParticipantHelper.prepareData(dataObj.payee.name, dataObj.amount.currency, dataObj.currencies[1]) + payeeLimitAndInitialPosition = await ParticipantLimitHelper.prepareLimitAndInitialPosition(payee.participant.name, { + currency: dataObj.amount.currency, + limit: { value: dataObj.payee.limit } + }) + payeeLimitAndInitialPositionSecondaryCurrency = await ParticipantLimitHelper.prepareLimitAndInitialPosition(payee.participant.name, { + currency: dataObj.currencies[1], + limit: { value: dataObj.payee.limit } + }) + } - for (const name of [payer.participant.name, payee.participant.name]) { + for (const name of [payer.participant.name, payee.participant.name, proxyAR.participant.name, proxyRB.participant.name, fxp.participant.name]) { await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_TRANSFER_POST', `${dataObj.endpoint.base}/transfers`) await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_TRANSFER_PUT', `${dataObj.endpoint.base}/transfers/{{transferId}}`) await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_TRANSFER_ERROR', `${dataObj.endpoint.base}/transfers/{{transferId}}/error`) @@ -155,10 +238,14 @@ const prepareTestData = async (dataObj) => { await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_BULK_TRANSFER_PUT', `${dataObj.endpoint.base}/bulkTransfers/{{id}}`) await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_BULK_TRANSFER_ERROR', `${dataObj.endpoint.base}/bulkTransfers/{{id}}/error`) await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_QUOTES', `${dataObj.endpoint.base}`) + await ParticipantEndpointHelper.prepareData(name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_QUOTES, `${dataObj.endpoint.base}`) + await ParticipantEndpointHelper.prepareData(name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_POST, `${dataObj.endpoint.base}/fxTransfers`) + await ParticipantEndpointHelper.prepareData(name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_PUT, `${dataObj.endpoint.base}/fxTransfers/{{commitRequestId}}`) + await ParticipantEndpointHelper.prepareData(name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_ERROR, `${dataObj.endpoint.base}/fxTransfers/{{commitRequestId}}/error`) } - + const transferId = randomUUID() const transferPayload = { - transferId: randomUUID(), + transferId, payerFsp: payer.participant.name, payeeFsp: payee.participant.name, amount: { @@ -187,6 +274,16 @@ const prepareTestData = async (dataObj) => { 'fspiop-destination': payee.participant.name, 'content-type': 'application/vnd.interoperability.transfers+json;version=1.1' } + const fxPrepareHeaders = { + 'fspiop-source': payer.participant.name, + 'fspiop-destination': fxp.participant.name, + 'content-type': 'application/vnd.interoperability.fxTransfers+json;version=2.0' + } + const fxFulfilAbortRejectHeaders = { + 'fspiop-source': fxp.participant.name, + 'fspiop-destination': payer.participant.name, + 'content-type': 'application/vnd.interoperability.fxTransfers+json;version=2.0' + } const fulfilAbortRejectHeaders = { 'fspiop-source': payee.participant.name, 'fspiop-destination': payer.participant.name, @@ -211,6 +308,29 @@ const prepareTestData = async (dataObj) => { } } + const fxTransferPayload = { + commitRequestId: randomUUID(), + determiningTransferId: transferId, + initiatingFsp: payer.participant.name, + counterPartyFsp: fxp.participant.name, + sourceAmount: { + currency: dataObj.fxTransfer.amount.currency, + amount: dataObj.fxTransfer.amount.amount.toString() + }, + targetAmount: { + currency: dataObj.fxTransfer.fx?.targetAmount.currency || dataObj.fxTransfer.amount.currency, + amount: dataObj.fxTransfer.fx?.targetAmount.amount.toString() || dataObj.fxTransfer.amount.amount.toString() + }, + condition: 'GRzLaTP7DJ9t4P-a_BA0WA9wzzlsugf00-Tn6kESAfM', + expiration: dataObj.expiration + } + + const fxFulfilPayload = { + fulfilment: 'UNlJ98hZTY_dsw0cAqw4i_UN3v4utt7CZFB4yfLbVFA', + completedTimestamp: dataObj.now, + conversionState: 'RESERVED' + } + const rejectPayload = Object.assign({}, fulfilPayload, { transferState: TransferInternalState.ABORTED_REJECTED }) const errorPayload = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.PAYEE_FSP_REJECTED_TXN).toApiErrorObject() @@ -239,6 +359,67 @@ const prepareTestData = async (dataObj) => { } } + const messageProtocolPrepareForwarded = { + id: transferPayload.transferId, + from: 'payerFsp', + to: 'proxyFsp', + type: 'application/json', + content: { + payload: { + proxyId: 'test', + transferId: transferPayload.transferId + } + }, + metadata: { + event: { + id: transferPayload.transferId, + type: TransferEventType.PREPARE, + action: TransferEventAction.FORWARDED, + createdAt: dataObj.now, + state: { + status: 'success', + code: 0 + } + } + } + } + + const messageProtocolPrepareFxForwarded = { + id: fxTransferPayload.commitRequestId, + from: 'payerFsp', + to: 'proxyFsp', + type: 'application/json', + content: { + payload: { + proxyId: 'test', + commitRequestId: fxTransferPayload.commitRequestId + } + }, + metadata: { + event: { + id: transferPayload.transferId, + type: TransferEventType.PREPARE, + action: TransferEventAction.FX_FORWARDED, + createdAt: dataObj.now, + state: { + status: 'success', + code: 0 + } + } + } + } + + const messageProtocolFxPrepare = Util.clone(messageProtocolPrepare) + messageProtocolFxPrepare.id = randomUUID() + messageProtocolFxPrepare.from = fxTransferPayload.initiatingFsp + messageProtocolFxPrepare.to = fxTransferPayload.counterPartyFsp + messageProtocolFxPrepare.content.headers = fxPrepareHeaders + messageProtocolFxPrepare.content.uriParams = { id: fxTransferPayload.commitRequestId } + messageProtocolFxPrepare.content.payload = fxTransferPayload + messageProtocolFxPrepare.metadata.event.id = randomUUID() + messageProtocolFxPrepare.metadata.event.type = TransferEventType.PREPARE + messageProtocolFxPrepare.metadata.event.action = TransferEventAction.FX_PREPARE + const messageProtocolFulfil = Util.clone(messageProtocolPrepare) messageProtocolFulfil.id = randomUUID() messageProtocolFulfil.from = transferPayload.payeeFsp @@ -250,6 +431,17 @@ const prepareTestData = async (dataObj) => { messageProtocolFulfil.metadata.event.type = TransferEventType.FULFIL messageProtocolFulfil.metadata.event.action = TransferEventAction.COMMIT + const messageProtocolFxFulfil = Util.clone(messageProtocolFxPrepare) + messageProtocolFxFulfil.id = randomUUID() + messageProtocolFxFulfil.from = fxTransferPayload.counterPartyFsp + messageProtocolFxFulfil.to = fxTransferPayload.initiatingFsp + messageProtocolFxFulfil.content.headers = fxFulfilAbortRejectHeaders + messageProtocolFxFulfil.content.uriParams = { id: fxTransferPayload.commitRequestId } + messageProtocolFxFulfil.content.payload = fxFulfilPayload + messageProtocolFxFulfil.metadata.event.id = randomUUID() + messageProtocolFxFulfil.metadata.event.type = TransferEventType.FULFIL + messageProtocolFxFulfil.metadata.event.action = TransferEventAction.FX_RESERVE + const messageProtocolReject = Util.clone(messageProtocolFulfil) messageProtocolReject.id = randomUUID() messageProtocolFulfil.content.uriParams = { id: transferPayload.transferId } @@ -258,20 +450,33 @@ const prepareTestData = async (dataObj) => { const messageProtocolError = Util.clone(messageProtocolFulfil) messageProtocolError.id = randomUUID() - messageProtocolFulfil.content.uriParams = { id: transferPayload.transferId } + messageProtocolError.content.uriParams = { id: transferPayload.transferId } messageProtocolError.content.payload = errorPayload messageProtocolError.metadata.event.action = TransferEventAction.ABORT + const messageProtocolFxError = Util.clone(messageProtocolFxFulfil) + messageProtocolFxError.id = randomUUID() + messageProtocolFxError.content.uriParams = { id: fxTransferPayload.commitRequestId } + messageProtocolFxError.content.payload = errorPayload + messageProtocolFxError.metadata.event.action = TransferEventAction.FX_ABORT + const topicConfTransferPrepare = Utility.createGeneralTopicConf(Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, TransferEventType.TRANSFER, TransferEventType.PREPARE) const topicConfTransferFulfil = Utility.createGeneralTopicConf(Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, TransferEventType.TRANSFER, TransferEventType.FULFIL) return { transferPayload, + fxTransferPayload, fulfilPayload, + fxFulfilPayload, rejectPayload, errorPayload, messageProtocolPrepare, + messageProtocolPrepareForwarded, + messageProtocolPrepareFxForwarded, + messageProtocolFxPrepare, + messageProtocolFxError, messageProtocolFulfil, + messageProtocolFxFulfil, messageProtocolReject, messageProtocolError, topicConfTransferPrepare, @@ -279,7 +484,15 @@ const prepareTestData = async (dataObj) => { payer, payerLimitAndInitialPosition, payee, - payeeLimitAndInitialPosition + payeeLimitAndInitialPosition, + payeeLimitAndInitialPositionSecondaryCurrency, + proxyAR, + proxyARLimitAndInitialPosition, + proxyRB, + proxyRBLimitAndInitialPosition, + fxp, + fxpPayerLimitAndInitialPosition, + fxpPayerLimitAndInitialPositionSecondaryCurrency } } catch (err) { throw ErrorHandler.Factory.reformatFSPIOPError(err) @@ -312,6 +525,19 @@ Test('Handlers test', async handlersTest => { Enum.Events.Event.Type.TRANSFER.toUpperCase(), Enum.Events.Event.Action.POSITION.toUpperCase() ) + }, + { + topicName: Utility.transformGeneralTopicName( + Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, + Enum.Events.Event.Type.NOTIFICATION, + Enum.Events.Event.Action.EVENT + ), + config: Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.CONSUMER, + Enum.Events.Event.Type.NOTIFICATION.toUpperCase(), + Enum.Events.Event.Action.EVENT.toUpperCase() + ) } ]) @@ -327,10 +553,10 @@ Test('Handlers test', async handlersTest => { // Set up the testConsumer here await testConsumer.startListening() - await KafkaHelper.producers.connect() // TODO: MIG - Disabling these handlers to test running the CL as a separate service independently. await new Promise(resolve => setTimeout(resolve, rebalanceDelay)) - + await ProxyCache.connect() + testConsumer.clearEvents() test.pass('done') test.end() registerAllHandlers.end() @@ -366,8 +592,49 @@ Test('Handlers test', async handlersTest => { transferPrepare.end() }) - await handlersTest.test('transferFulfil should', async transferFulfil => { - await transferFulfil.test('should create position fulfil message to override topic name in config', async (test) => { + await handlersTest.test('fxTransferPrepare should', async transferPrepare => { + await transferPrepare.test('ignore non COMMITTED/ABORTED fxTransfer on duplicate request', async (test) => { + const td = await prepareTestData(testData) + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + await Producer.produceMessage(td.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: TransferEventAction.FX_PREPARE, + // To be keyed with the Payer DFSP participantCurrencyId + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + testConsumer.clearEvents() + + await new Promise(resolve => setTimeout(resolve, 5000)) + await Producer.produceMessage(td.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) + try { + await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: TransferEventAction.FX_PREPARE, + // To be keyed with the Payer DFSP participantCurrencyId + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.notOk('Secondary position prepare message with key should not be found') + } catch (err) { + test.ok('Duplicate prepare message ignored') + console.error(err) + } + test.end() + }) + + await transferPrepare.test('send fxTransfer information callback when fxTransfer is (RECEIVED_FULFIL_DEPENDENT) RESERVED on duplicate request', async (test) => { const td = await prepareTestData(testData) const prepareConfig = Utility.getKafkaConfig( Config.KAFKA_CONFIG, @@ -381,13 +648,90 @@ Test('Handlers test', async handlersTest => { TransferEventType.TRANSFER.toUpperCase(), TransferEventType.FULFIL.toUpperCase()) fulfilConfig.logger = Logger + await Producer.produceMessage(td.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) - await Producer.produceMessage(td.messageProtocolPrepare, td.topicConfTransferPrepare, prepareConfig) + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: TransferEventAction.FX_PREPARE, + // To be keyed with the Payer DFSP participantCurrencyId + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + testConsumer.clearEvents() + + await new Promise(resolve => setTimeout(resolve, 2000)) + await Producer.produceMessage(td.messageProtocolFxFulfil, td.topicConfTransferFulfil, fulfilConfig) + + try { + const positionFxFulfil = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: TransferEventAction.FX_RESERVE, + valueToFilter: td.payer.name + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionFxFulfil[0], 'Position fulfil message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + testConsumer.clearEvents() + + try { + const fxTransfer = await FxTransferService.getByIdLight(td.messageProtocolFxPrepare.content.payload.commitRequestId) || {} + test.equal(fxTransfer?.fxTransferState, TransferInternalState.RECEIVED_FULFIL_DEPENDENT, 'FxTransfer state updated to RECEIVED_FULFIL_DEPENDENT') + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + // Resend fx-prepare after state is RECEIVED_FULFIL_DEPENDENT + await new Promise(resolve => setTimeout(resolve, 2000)) + await Producer.produceMessage(td.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) + + // Should send fxTransfer state in callback + // Internal state RECEIVED_FULFIL_DEPENDENT maps to TransferStateEnum.RESERVED enumeration. + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: TransferEventAction.FX_PREPARE_DUPLICATE + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare duplicate message with key found') + // Check if the error message is correct + test.equal(positionPrepare[0].value.content.payload.conversionState, TransferStateEnum.RESERVED) + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + test.end() + }) + + await transferPrepare.test('send fxTransfer information callback when fxTransfer is COMMITTED on duplicate request', async (test) => { + const td = await prepareTestData(testData) + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + const fulfilConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.FULFIL.toUpperCase()) + fulfilConfig.logger = Logger + // Set up the fxTransfer + await Producer.produceMessage(td.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) try { const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ topicFilter: 'topic-transfer-position-batch', - action: 'prepare', + action: TransferEventAction.FX_PREPARE, + // To be keyed with the Payer DFSP participantCurrencyId keyFilter: td.payer.participantCurrencyId.toString() }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) test.ok(positionPrepare[0], 'Position prepare message with key found') @@ -396,24 +740,1665 @@ Test('Handlers test', async handlersTest => { console.error(err) } testConsumer.clearEvents() + + await new Promise(resolve => setTimeout(resolve, 2000)) + await Producer.produceMessage(td.messageProtocolFxFulfil, td.topicConfTransferFulfil, fulfilConfig) + try { + const positionFxFulfil = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: TransferEventAction.FX_RESERVE, + valueToFilter: td.payer.name + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionFxFulfil[0], 'Position fulfil notification message found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + testConsumer.clearEvents() + + try { + const fxTransfer = await FxTransferService.getByIdLight(td.messageProtocolFxPrepare.content.payload.commitRequestId) || {} + test.equal(fxTransfer?.fxTransferState, TransferInternalState.RECEIVED_FULFIL_DEPENDENT, 'FxTransfer state updated to RECEIVED_FULFIL_DEPENDENT') + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + // Complete dependent transfer + await Producer.produceMessage(td.messageProtocolPrepare, td.topicConfTransferPrepare, fulfilConfig) + try { + const positionFxFulfil = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: TransferEventAction.PREPARE + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionFxFulfil[0], 'Prepare notification message found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + testConsumer.clearEvents() + await Producer.produceMessage(td.messageProtocolFulfil, td.topicConfTransferFulfil, fulfilConfig) + try { + const positionFxFulfil = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: TransferEventAction.COMMIT + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionFxFulfil[0], 'Fulfil notification message found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + // Assert FXP notification message is produced try { - const positionFulfil = await wrapWithRetries(() => testConsumer.getEventsForFilter({ - topicFilter: 'topic-transfer-position-batch', - action: 'commit', - keyFilter: td.payee.participantCurrencyId.toString() + const notifyFxp = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: TransferEventAction.FX_NOTIFY }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) - test.ok(positionFulfil[0], 'Position fulfil message with key found') + test.ok(notifyFxp[0], 'FXP notify notification message found') + test.equal(notifyFxp[0].value.content.payload.conversionState, TransferStateEnum.COMMITTED) + test.equal(notifyFxp[0].value.content.uriParams.id, td.messageProtocolFxPrepare.content.payload.commitRequestId) + test.ok(notifyFxp[0].value.content.payload.completedTimestamp) + test.equal(notifyFxp[0].value.to, td.fxp.participant.name) } catch (err) { test.notOk('Error should not be thrown') console.error(err) } testConsumer.clearEvents() + + // Resend fx-prepare after fxTransfer state is COMMITTED + await new Promise(resolve => setTimeout(resolve, 2000)) + await Producer.produceMessage(td.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) + + // Should send fxTransfer state in callback + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: TransferEventAction.FX_PREPARE_DUPLICATE + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare duplicate notification found') + // Check if the error message is correct + test.equal(positionPrepare[0].value.content.payload.conversionState, TransferStateEnum.COMMITTED) + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + test.end() }) - transferFulfil.end() + await transferPrepare.test('send fxTransfer information callback when fxTransfer is ABORTED on duplicate request', async (test) => { + const td = await prepareTestData(testData) + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + const fulfilConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.FULFIL.toUpperCase()) + fulfilConfig.logger = Logger + await Producer.produceMessage(td.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: TransferEventAction.FX_PREPARE, + // To be keyed with the Payer DFSP participantCurrencyId + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + testConsumer.clearEvents() + + await new Promise(resolve => setTimeout(resolve, 2000)) + await Producer.produceMessage(td.messageProtocolFxError, td.topicConfTransferFulfil, fulfilConfig) + + try { + const positionFxFulfil = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: TransferEventAction.FX_ABORT, + valueToFilter: td.payer.name + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionFxFulfil[0], 'Position fulfil message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + testConsumer.clearEvents() + + try { + const fxTransfer = await FxTransferService.getByIdLight(td.messageProtocolFxPrepare.content.payload.commitRequestId) || {} + test.equal(fxTransfer?.fxTransferState, TransferInternalState.ABORTED_ERROR, 'FxTransfer state updated to ABORTED_ERROR') + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + // Resend fx-prepare after state is ABORTED_ERROR + await new Promise(resolve => setTimeout(resolve, 2000)) + await Producer.produceMessage(td.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) + + // Should send fxTransfer state in callback + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: TransferEventAction.FX_PREPARE_DUPLICATE + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare duplicate message with key found') + // Check if the error message is correct + test.equal(positionPrepare[0].value.content.payload.conversionState, TransferStateEnum.ABORTED) + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + test.end() + }) + transferPrepare.end() + }) + + await handlersTest.test('transferForwarded should', async transferForwarded => { + await transferForwarded.test('should update transfer internal state on prepare event forwarded action', async (test) => { + const td = await prepareTestData(testData) + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + await Producer.produceMessage(td.messageProtocolPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'prepare', + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + await Producer.produceMessage(td.messageProtocolPrepareForwarded, td.topicConfTransferPrepare, prepareConfig) + + await new Promise(resolve => setTimeout(resolve, 5000)) + + try { + const transfer = await TransferService.getById(td.messageProtocolPrepare.content.payload.transferId) || {} + test.equal(transfer?.transferState, TransferInternalState.RESERVED_FORWARDED, 'Transfer state updated to RESERVED_FORWARDED') + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + testConsumer.clearEvents() + test.end() + }) + + await transferForwarded.test('not timeout transfer in RESERVED_FORWARDED internal transfer state', async (test) => { + const expiringTestData = Util.clone(testData) + expiringTestData.expiration = new Date((new Date()).getTime() + 5000) + + const td = await prepareTestData(expiringTestData) + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + await Producer.produceMessage(td.messageProtocolPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'prepare', + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + await Producer.produceMessage(td.messageProtocolPrepareForwarded, td.topicConfTransferPrepare, prepareConfig) + + await new Promise(resolve => setTimeout(resolve, 5000)) + + try { + const transfer = await TransferService.getById(td.messageProtocolPrepare.content.payload.transferId) || {} + test.equal(transfer?.transferState, TransferInternalState.RESERVED_FORWARDED, 'Transfer state updated to RESERVED_FORWARDED') + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + await new Promise(resolve => setTimeout(resolve, 5000)) + try { + const transfer = await TransferService.getById(td.messageProtocolPrepare.content.payload.transferId) || {} + test.equal(transfer?.transferState, TransferInternalState.RESERVED_FORWARDED, 'Transfer state is still RESERVED_FORWARDED') + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + testConsumer.clearEvents() + test.end() + }) + + await transferForwarded.test('should be able to transition from RESERVED_FORWARDED to RECEIVED_FULFIL and COMMITED on fulfil', async (test) => { + const td = await prepareTestData(testData) + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + const fulfilConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.FULFIL.toUpperCase()) + fulfilConfig.logger = Logger + await Producer.produceMessage(td.messageProtocolPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'prepare', + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + await Producer.produceMessage(td.messageProtocolPrepareForwarded, td.topicConfTransferPrepare, prepareConfig) + + await new Promise(resolve => setTimeout(resolve, 5000)) + + try { + const transfer = await TransferService.getById(td.messageProtocolPrepare.content.payload.transferId) || {} + test.equal(transfer?.transferState, TransferInternalState.RESERVED_FORWARDED, 'Transfer state updated to RESERVED_FORWARDED') + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + await Producer.produceMessage(td.messageProtocolFulfil, td.topicConfTransferFulfil, fulfilConfig) + + try { + const positionFulfil = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'commit', + keyFilter: td.payee.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionFulfil[0], 'Position fulfil message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + try { + const transfer = await TransferService.getById(td.messageProtocolPrepare.content.payload.transferId) || {} + test.equal(transfer?.transferState, TransferInternalState.COMMITTED, 'Transfer state updated to COMMITTED') + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + testConsumer.clearEvents() + test.end() + }) + + await transferForwarded.test('should be able to transition from RESERVED_FORWARDED to RECEIVED_ERROR and ABORTED_ERROR on fulfil error', async (test) => { + const td = await prepareTestData(testData) + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + const fulfilConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.FULFIL.toUpperCase()) + fulfilConfig.logger = Logger + await Producer.produceMessage(td.messageProtocolPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'prepare', + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + await Producer.produceMessage(td.messageProtocolPrepareForwarded, td.topicConfTransferPrepare, prepareConfig) + + await new Promise(resolve => setTimeout(resolve, 5000)) + + try { + const transfer = await TransferService.getById(td.messageProtocolPrepare.content.payload.transferId) || {} + test.equal(transfer?.transferState, TransferInternalState.RESERVED_FORWARDED, 'Transfer state updated to RESERVED_FORWARDED') + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + await Producer.produceMessage(td.messageProtocolError, td.topicConfTransferFulfil, fulfilConfig) + + await new Promise(resolve => setTimeout(resolve, 5000)) + + try { + const transfer = await TransferService.getById(td.messageProtocolPrepare.content.payload.transferId) || {} + test.equal(transfer?.transferState, TransferInternalState.ABORTED_ERROR, 'Transfer state updated to ABORTED_ERROR') + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + testConsumer.clearEvents() + test.end() + }) + + await transferForwarded.test('should create notification message if transfer is not found', async (test) => { + const td = await prepareTestData(testData) + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + + await Producer.produceMessage(td.messageProtocolPrepareForwarded, td.topicConfTransferPrepare, prepareConfig) + + try { + const notificationMessages = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: 'forwarded' + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(notificationMessages[0], 'notification message found') + test.equal(notificationMessages[0].value.to, 'proxyFsp') + test.equal(notificationMessages[0].value.from, 'payerFsp') + test.equal( + notificationMessages[0].value.content.payload.errorInformation.errorDescription, + 'Generic ID not found - Forwarded transfer could not be found.' + ) + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + testConsumer.clearEvents() + test.end() + }) + + await transferForwarded.test('should create notification message if transfer is found in incorrect state', async (test) => { + const expiredTestData = Util.clone(testData) + expiredTestData.expiration = new Date((new Date()).getTime() + 3000) + + const td = await prepareTestData(expiredTestData) + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + await Producer.produceMessage(td.messageProtocolPrepare, td.topicConfTransferPrepare, prepareConfig) + await new Promise(resolve => setTimeout(resolve, 3000)) + + try { + await wrapWithRetries(async () => { + const transfer = await TransferService.getById(td.messageProtocolPrepare.content.payload.transferId) || {} + if (transfer?.transferState !== TransferInternalState.EXPIRED_RESERVED) { + if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) + return null + } + return transfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + // Send the prepare forwarded message after the prepare message has timed out + await Producer.produceMessage(td.messageProtocolPrepareForwarded, td.topicConfTransferPrepare, prepareConfig) + + try { + const notificationMessages = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: 'forwarded' + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(notificationMessages[0], 'notification message found') + test.equal(notificationMessages[0].value.to, 'proxyFsp') + test.equal(notificationMessages[0].value.from, 'payerFsp') + test.equal( + notificationMessages[0].value.content.payload.errorInformation.errorDescription, + 'Internal server error - Invalid State: EXPIRED_RESERVED - expected: RESERVED' + ) + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + testConsumer.clearEvents() + test.end() + }) + transferForwarded.end() + }) + + await handlersTest.test('transferFxForwarded should', async transferFxForwarded => { + await transferFxForwarded.test('should update fxTransfer internal state on prepare event fx-forwarded action', async (test) => { + const td = await prepareTestData(testData) + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + await Producer.produceMessage(td.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'fx-prepare', + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position fx-prepare message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + await Producer.produceMessage(td.messageProtocolPrepareFxForwarded, td.topicConfTransferPrepare, prepareConfig) + + await new Promise(resolve => setTimeout(resolve, 5000)) + + try { + const fxTransfer = await FxTransferService.getByIdLight(td.messageProtocolFxPrepare.content.payload.commitRequestId) || {} + test.equal(fxTransfer?.fxTransferState, TransferInternalState.RESERVED_FORWARDED, 'FxTransfer state updated to RESERVED_FORWARDED') + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + testConsumer.clearEvents() + test.end() + }) + + await transferFxForwarded.test('not timeout fxTransfer in RESERVED_FORWARDED internal transfer state', async (test) => { + const expiringTestData = Util.clone(testData) + expiringTestData.expiration = new Date((new Date()).getTime() + 5000) + + const td = await prepareTestData(expiringTestData) + + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + await Producer.produceMessage(td.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'fx-prepare', + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position fx-prepare message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + await Producer.produceMessage(td.messageProtocolPrepareFxForwarded, td.topicConfTransferPrepare, prepareConfig) + await new Promise(resolve => setTimeout(resolve, 5000)) + try { + const fxTransfer = await FxTransferService.getByIdLight(td.messageProtocolFxPrepare.content.payload.commitRequestId) || {} + test.equal(fxTransfer?.fxTransferState, TransferInternalState.RESERVED_FORWARDED, 'FxTransfer state updated to RESERVED_FORWARDED') + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + await new Promise(resolve => setTimeout(resolve, 5000)) + try { + const fxTransfer = await FxTransferService.getByIdLight(td.messageProtocolFxPrepare.content.payload.commitRequestId) || {} + test.equal(fxTransfer?.fxTransferState, TransferInternalState.RESERVED_FORWARDED, 'FxTransfer still in RESERVED_FORWARDED') + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + testConsumer.clearEvents() + test.end() + }) + + await transferFxForwarded.test('should be able to transition from RESERVED_FORWARDED to RECEIVED_FULFIL_DEPENDENT on fx-fulfil', async (test) => { + const td = await prepareTestData(testData) + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + await Producer.produceMessage(td.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'fx-prepare', + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position fx-prepare message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + await Producer.produceMessage(td.messageProtocolPrepareFxForwarded, td.topicConfTransferPrepare, prepareConfig) + await new Promise(resolve => setTimeout(resolve, 5000)) + try { + const fxTransfer = await FxTransferService.getByIdLight(td.messageProtocolFxPrepare.content.payload.commitRequestId) || {} + test.equal(fxTransfer?.fxTransferState, TransferInternalState.RESERVED_FORWARDED, 'FxTransfer state updated to RESERVED_FORWARDED') + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + // Fulfil the fxTransfer + const fulfilConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.FULFIL.toUpperCase()) + fulfilConfig.logger = Logger + + await Producer.produceMessage(td.messageProtocolFxFulfil, td.topicConfTransferFulfil, fulfilConfig) + + try { + const positionFxFulfil = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: 'fx-reserve', + valueToFilter: td.payer.name + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionFxFulfil[0], 'Position fulfil message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + try { + const fxTransfer = await FxTransferService.getByIdLight(td.messageProtocolFxPrepare.content.payload.commitRequestId) || {} + test.equal(fxTransfer?.fxTransferState, TransferInternalState.RECEIVED_FULFIL_DEPENDENT, 'FxTransfer state updated to RECEIVED_FULFIL_DEPENDENT') + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + testConsumer.clearEvents() + test.end() + }) + + await transferFxForwarded.test('should be able to transition from RESERVED_FORWARDED to RECEIVED_ERROR and ABORTED_ERROR on fx-fulfil error', async (test) => { + const td = await prepareTestData(testData) + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + await Producer.produceMessage(td.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'fx-prepare', + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position fx-prepare message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + await Producer.produceMessage(td.messageProtocolPrepareFxForwarded, td.topicConfTransferPrepare, prepareConfig) + await new Promise(resolve => setTimeout(resolve, 5000)) + try { + const fxTransfer = await FxTransferService.getByIdLight(td.messageProtocolFxPrepare.content.payload.commitRequestId) || {} + test.equal(fxTransfer?.fxTransferState, TransferInternalState.RESERVED_FORWARDED, 'FxTransfer state updated to RESERVED_FORWARDED') + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + // Fulfil the fxTransfer + const fulfilConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.FULFIL.toUpperCase()) + fulfilConfig.logger = Logger + + console.log('messageProtocolFxError', td.messageProtocolFxError) + await Producer.produceMessage(td.messageProtocolFxError, td.topicConfTransferFulfil, fulfilConfig) + await new Promise(resolve => setTimeout(resolve, 5000)) + try { + const fxTransfer = await FxTransferService.getByIdLight(td.messageProtocolFxPrepare.content.payload.commitRequestId) || {} + test.equal(fxTransfer?.fxTransferState, TransferInternalState.ABORTED_ERROR, 'FxTransfer state updated to ABORTED_ERROR') + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + testConsumer.clearEvents() + test.end() + }) + + await transferFxForwarded.test('should create notification message if fxTransfer is not found', async (test) => { + const td = await prepareTestData(testData) + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + + await Producer.produceMessage(td.messageProtocolPrepareFxForwarded, td.topicConfTransferPrepare, prepareConfig) + + try { + const notificationMessages = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: 'fx-forwarded' + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(notificationMessages[0], 'notification message found') + test.equal(notificationMessages[0].value.to, 'proxyFsp') + test.equal(notificationMessages[0].value.from, 'payerFsp') + test.equal( + notificationMessages[0].value.content.payload.errorInformation.errorDescription, + 'Generic ID not found - Forwarded fxTransfer could not be found.' + ) + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + testConsumer.clearEvents() + test.end() + }) + + await transferFxForwarded.test('should create notification message if transfer is found in incorrect state', async (test) => { + const expiredTestData = Util.clone(testData) + expiredTestData.expiration = new Date((new Date()).getTime() + 3000) + + const td = await prepareTestData(expiredTestData) + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + await Producer.produceMessage(td.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) + await new Promise(resolve => setTimeout(resolve, 3000)) + + try { + await wrapWithRetries(async () => { + const fxTransfer = await FxTransferService.getByIdLight(td.messageProtocolFxPrepare.content.payload.commitRequestId) || {} + if (fxTransfer?.fxTransferState !== TransferInternalState.EXPIRED_RESERVED) { + if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) + return null + } + return fxTransfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + // Send the prepare forwarded message after the prepare message has timed out + await Producer.produceMessage(td.messageProtocolPrepareFxForwarded, td.topicConfTransferPrepare, prepareConfig) + + try { + const notificationMessages = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: 'fx-forwarded' + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(notificationMessages[0], 'notification message found') + test.equal(notificationMessages[0].value.to, 'proxyFsp') + test.equal(notificationMessages[0].value.from, 'payerFsp') + test.equal( + notificationMessages[0].value.content.payload.errorInformation.errorDescription, + 'Internal server error - Invalid State: EXPIRED_RESERVED - expected: RESERVED' + ) + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + testConsumer.clearEvents() + test.end() + }) + transferFxForwarded.end() + }) + + await handlersTest.test('transferFulfil should', async transferFulfil => { + await transferFulfil.test('should create position fulfil message to override topic name in config', async (test) => { + const td = await prepareTestData(testData) + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + const fulfilConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.FULFIL.toUpperCase()) + fulfilConfig.logger = Logger + + await Producer.produceMessage(td.messageProtocolPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'prepare', + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + testConsumer.clearEvents() + await Producer.produceMessage(td.messageProtocolFulfil, td.topicConfTransferFulfil, fulfilConfig) + + try { + const positionFulfil = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'commit', + keyFilter: td.payee.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionFulfil[0], 'Position fulfil message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + testConsumer.clearEvents() + test.end() + }) + + transferFulfil.end() + }) + + await handlersTest.test('transferProxyPrepare should', async transferProxyPrepare => { + await transferProxyPrepare.test(` + Scheme A: POST /fxTransfer call I.e. Debtor: Payer DFSP → Creditor: Proxy AR + Payer DFSP position account must be updated (reserved)`, async (test) => { + const creditor = 'regionalSchemeFXP' + + const td = await prepareTestData({ ...testData, crossSchemeSetup: true }) + await ProxyCache.getCache().addDfspIdToProxyMapping(creditor, td.proxyAR.participant.name) + + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + + td.messageProtocolFxPrepare.to = creditor + td.messageProtocolFxPrepare.content.headers['fspiop-destination'] = creditor + td.messageProtocolFxPrepare.content.payload.counterPartyFsp = creditor + await Producer.produceMessage(td.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'fx-prepare', + // To be keyed with the Payer DFSP participantCurrencyId + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with debtor key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + testConsumer.clearEvents() + test.end() + }) + + await transferProxyPrepare.test(` + Scheme A: POST /Transfer call I.e. Debtor: Proxy AR → Creditor: Proxy AR + Do nothing (produce message with key 0)`, async (test) => { + // Create dependent fxTransfer + let creditor = 'regionalSchemeFXP' + + const td = await prepareTestData({ ...testData, crossSchemeSetup: true }) + await ProxyCache.getCache().addDfspIdToProxyMapping(creditor, td.proxyAR.participant.name) + + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + const fulfilConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.FULFIL.toUpperCase()) + fulfilConfig.logger = Logger + + td.messageProtocolFxPrepare.to = creditor + td.messageProtocolFxPrepare.content.headers['fspiop-destination'] = creditor + td.messageProtocolFxPrepare.content.payload.counterPartyFsp = creditor + await Producer.produceMessage(td.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'fx-prepare', + // To be keyed with the Payer DFSP participantCurrencyId + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with debtor key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + // Payer DFSP position account must be updated (reserved) + let payerPositionAfterFxPrepare + const tests = async () => { + const payerCurrentPosition = await ParticipantService.getPositionByParticipantCurrencyId(td.payer.participantCurrencyId) || {} + const payerInitialPosition = td.payerLimitAndInitialPosition.participantPosition.value + const payerExpectedPosition = Number(payerInitialPosition) + Number(td.fxTransferPayload.sourceAmount.amount) + const payerPositionChange = await ParticipantService.getPositionChangeByParticipantPositionId(payerCurrentPosition.participantPositionId) || {} + test.equal(payerCurrentPosition.value, payerExpectedPosition, 'Payer position incremented by transfer amount and updated in participantPosition') + test.equal(payerPositionChange.value, payerCurrentPosition.value, 'Payer position change value inserted and matches the updated participantPosition value') + payerPositionAfterFxPrepare = payerExpectedPosition + } + try { + await wrapWithRetries(async () => { + const fxTransfer = await FxTransferService.getByIdLight(td.messageProtocolFxPrepare.content.payload.commitRequestId) || {} + Logger.warn(`fxTransfer: ${JSON.stringify(fxTransfer)}`) + if (fxTransfer?.fxTransferState !== TransferInternalState.RESERVED) { + if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) + return null + } + return fxTransfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + await tests() + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + td.messageProtocolFxFulfil.to = td.payer.participant.name + td.messageProtocolFxFulfil.from = 'regionalSchemeFXP' + td.messageProtocolFxFulfil.content.headers['fspiop-destination'] = td.payer.participant.name + td.messageProtocolFxFulfil.content.headers['fspiop-source'] = 'regionalSchemeFXP' + await Producer.produceMessage(td.messageProtocolFxFulfil, td.topicConfTransferFulfil, fulfilConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: 'fx-reserve', + valueToFilter: td.payer.name + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Fulfil notification found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + // Create subsequent transfer + creditor = 'regionalSchemePayeeFsp' + await ProxyCache.getCache().addDfspIdToProxyMapping(creditor, td.proxyAR.participant.name) + + td.messageProtocolPrepare.to = creditor + td.messageProtocolPrepare.content.headers['fspiop-destination'] = creditor + td.messageProtocolPrepare.content.payload.payeeFsp = creditor + + await Producer.produceMessage(td.messageProtocolPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'prepare', + // To be keyed with 0 + keyFilter: '0' + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with key 0 found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + // Hard to test that the position messageKey=0 equates to doing nothing + // so we'll just check that the positions are unchanged for the participants + const payerCurrentPosition = await ParticipantService.getPositionByParticipantCurrencyId(td.payer.participantCurrencyId) || {} + test.equal(payerCurrentPosition.value, payerPositionAfterFxPrepare, 'Payer position unchanged') + const proxyARCurrentPosition = await ParticipantService.getPositionByParticipantCurrencyId(td.proxyAR.participantCurrencyId) || {} + test.equal(proxyARCurrentPosition.value, td.proxyARLimitAndInitialPosition.participantPosition.value, 'FXP position unchanged') + + testConsumer.clearEvents() + test.end() + }) + + await transferProxyPrepare.test(` + Scheme R: POST /fxTransfer call I.e. Debtor: Proxy AR → Creditor: FXP + Proxy AR position account in source currency must be updated (reserved)`, async (test) => { + const debtor = 'jurisdictionalFspPayerFsp' + + const td = await prepareTestData({ ...testData, crossSchemeSetup: true }) + await ProxyCache.getCache().addDfspIdToProxyMapping(debtor, td.proxyAR.participant.name) + + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + + td.messageProtocolFxPrepare.from = debtor + td.messageProtocolFxPrepare.content.headers['fspiop-source'] = debtor + td.messageProtocolFxPrepare.content.payload.initiatingFsp = debtor + await Producer.produceMessage(td.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'fx-prepare', + // To be keyed with the Proxy AR participantCurrencyId + keyFilter: td.proxyAR.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with debtor key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + testConsumer.clearEvents() + test.end() + }) + + await transferProxyPrepare.test(` + Scheme R: POST /transfer call I.e. Debtor: FXP → Creditor: Proxy RB + FXP position account in targeted currency must be updated (reserved)`, async (test) => { + const debtor = 'jurisdictionalFspPayerFsp' + + const td = await prepareTestData({ ...testData, crossSchemeSetup: true }) + await ProxyCache.getCache().addDfspIdToProxyMapping(debtor, td.proxyAR.participant.name) + + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + + td.messageProtocolFxPrepare.from = debtor + td.messageProtocolFxPrepare.content.headers['fspiop-source'] = debtor + td.messageProtocolFxPrepare.content.payload.initiatingFsp = debtor + await Producer.produceMessage(td.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'fx-prepare', + // To be keyed with the Proxy AR participantCurrencyId + keyFilter: td.proxyAR.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with debtor key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + // Fulfil the fxTransfer + const fulfilConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.FULFIL.toUpperCase()) + fulfilConfig.logger = Logger + + td.messageProtocolFxFulfil.to = debtor + td.messageProtocolFxFulfil.content.headers['fspiop-destination'] = debtor + + testConsumer.clearEvents() + await Producer.produceMessage(td.messageProtocolFxFulfil, td.topicConfTransferFulfil, fulfilConfig) + + try { + const positionFxFulfil = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: 'fx-reserve', + valueToFilter: td.payer.name + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionFxFulfil[0], 'Position fulfil message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + // Create subsequent transfer + const creditor = 'regionalSchemePayeeFsp' + await ProxyCache.getCache().addDfspIdToProxyMapping(creditor, td.proxyRB.participant.name) + + td.messageProtocolPrepare.to = creditor + td.messageProtocolPrepare.content.headers['fspiop-destination'] = creditor + td.messageProtocolPrepare.content.payload.payeeFsp = creditor + + await Producer.produceMessage(td.messageProtocolPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'prepare', + // A position prepare message reserving the FXP's targeted currency account should be created + // Specifically for this test the targetCurrency is XXX + keyFilter: td.fxp.participantCurrencyIdSecondary.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with key of fxp target currency account found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + testConsumer.clearEvents() + test.end() + }) + + await transferProxyPrepare.test(` + Scheme B: POST /transfer call I.e. Debtor: Proxy RB → Creditor: Payee DFSP + Proxy RB position account must be updated (reserved)`, async (test) => { + const debtor = 'jurisdictionalFspPayerFsp' + + // Proxy RB and Payee are only set up to deal in XXX currency + const td = await prepareTestData({ + ...testData, + amount: { + currency: 'XXX', + amount: '100' + }, + crossSchemeSetup: true + }) + await ProxyCache.getCache().addDfspIdToProxyMapping(debtor, td.proxyRB.participant.name) + + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + + td.messageProtocolPrepare.from = debtor + td.messageProtocolPrepare.content.headers['fspiop-source'] = debtor + td.messageProtocolPrepare.content.payload.payerFsp = debtor + td.messageProtocolPrepare.content.payload.amount.currency = 'XXX' + + await Producer.produceMessage(td.messageProtocolPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'prepare', + // A position prepare message reserving the proxy of ProxyRB on it's XXX participant currency account + keyFilter: td.proxyRB.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with key of proxyRB target currency account found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + testConsumer.clearEvents() + test.end() + }) + + transferProxyPrepare.end() + }) + + await handlersTest.test('transferProxyFulfil should', async transferProxyPrepare => { + await transferProxyPrepare.test(` + Scheme B: PUT /transfers call I.e. From: Payee DFSP → To: Proxy RB + Payee DFSP position account must be updated`, async (test) => { + const transferPrepareFrom = 'schemeAPayerFsp' + + // Proxy RB and Payee are only set up to deal in XXX currency + const td = await prepareTestData({ + ...testData, + crossSchemeSetup: true, + amount: { + currency: 'XXX', + amount: '100' + } + }) + await ProxyCache.getCache().addDfspIdToProxyMapping(transferPrepareFrom, td.proxyRB.participant.name) + + // Prepare the transfer + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + + td.messageProtocolPrepare.from = transferPrepareFrom + td.messageProtocolPrepare.content.headers['fspiop-source'] = transferPrepareFrom + td.messageProtocolPrepare.content.payload.payerFsp = transferPrepareFrom + + await Producer.produceMessage(td.messageProtocolPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'prepare', + // A position prepare message reserving the proxy of ProxyRB on it's XXX participant currency account + keyFilter: td.proxyRB.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with key of fxp target currency account found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + // Fulfil the transfer + const fulfilConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.FULFIL.toUpperCase()) + fulfilConfig.logger = Logger + + td.messageProtocolFulfil.to = transferPrepareFrom + td.messageProtocolFulfil.content.headers['fspiop-destination'] = transferPrepareFrom + + testConsumer.clearEvents() + await Producer.produceMessage(td.messageProtocolFulfil, td.topicConfTransferFulfil, fulfilConfig) + + try { + const positionFulfil = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'commit', + keyFilter: td.payee.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionFulfil[0], 'Position fulfil message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + testConsumer.clearEvents() + test.end() + }) + + await transferProxyPrepare.test(` + Scheme R: PUT /transfers call I.e. From: Proxy RB → To: Proxy AR + If it is a normal transfer without currency conversion + ProxyRB account must be updated`, async (test) => { + const transferPrepareFrom = 'schemeAPayerFsp' + const transferPrepareTo = 'schemeBPayeeFsp' + + // In this particular test, without currency conversion proxyRB and proxyAR + // should have accounts in the same currency. proxyRB default currency is already XXX. + // So configure proxy AR to operate in XXX currency. + const td = await prepareTestData({ + ...testData, + amount: { + currency: 'XXX', + amount: '100' + }, + crossSchemeSetup: true + }) + + await ProxyCache.getCache().addDfspIdToProxyMapping(transferPrepareFrom, td.proxyAR.participant.name) + await ProxyCache.getCache().addDfspIdToProxyMapping(transferPrepareTo, td.proxyRB.participant.name) + + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + + td.messageProtocolPrepare.from = transferPrepareFrom + td.messageProtocolPrepare.to = transferPrepareTo + td.messageProtocolPrepare.content.headers['fspiop-source'] = transferPrepareFrom + td.messageProtocolPrepare.content.headers['fspiop-destination'] = transferPrepareTo + td.messageProtocolPrepare.content.payload.payerFsp = transferPrepareFrom + td.messageProtocolPrepare.content.payload.payeeFsp = transferPrepareTo + + await Producer.produceMessage(td.messageProtocolPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'prepare', + keyFilter: td.proxyAR.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with key of proxyAR account found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + // Fulfil the transfer + const fulfilConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.FULFIL.toUpperCase()) + fulfilConfig.logger = Logger + + td.messageProtocolFulfil.from = transferPrepareTo + td.messageProtocolFulfil.to = transferPrepareFrom + td.messageProtocolFulfil.content.headers['fspiop-source'] = transferPrepareTo + td.messageProtocolFulfil.content.headers['fspiop-destination'] = transferPrepareFrom + + testConsumer.clearEvents() + await Producer.produceMessage(td.messageProtocolFulfil, td.topicConfTransferFulfil, fulfilConfig) + + try { + const positionFulfil = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'commit', + keyFilter: td.proxyRB.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionFulfil[0], 'Position fulfil message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + testConsumer.clearEvents() + test.end() + }) + + await transferProxyPrepare.test(` + Scheme R: PUT /fxTransfer call I.e. From: FXP → To: Proxy AR + No position changes should happen`, async (test) => { + const debtor = 'jurisdictionalFspPayerFsp' + + const td = await prepareTestData({ ...testData, crossSchemeSetup: true }) + await ProxyCache.getCache().addDfspIdToProxyMapping(debtor, td.proxyAR.participant.name) + + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + + td.messageProtocolFxPrepare.from = debtor + td.messageProtocolFxPrepare.content.headers['fspiop-source'] = debtor + td.messageProtocolFxPrepare.content.payload.initiatingFsp = debtor + await Producer.produceMessage(td.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'fx-prepare', + // To be keyed with the Proxy AR participantCurrencyId + keyFilter: td.proxyAR.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with debtor key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + // Fulfil the fxTransfer + const fulfilConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.FULFIL.toUpperCase()) + fulfilConfig.logger = Logger + + td.messageProtocolFxFulfil.to = debtor + td.messageProtocolFxFulfil.content.headers['fspiop-destination'] = debtor + + testConsumer.clearEvents() + await Producer.produceMessage(td.messageProtocolFxFulfil, td.topicConfTransferFulfil, fulfilConfig) + + try { + const positionFxFulfil = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: 'fx-reserve', + valueToFilter: td.payer.name + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionFxFulfil[0], 'Position fulfil message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + testConsumer.clearEvents() + test.end() + }) + + await transferProxyPrepare.test(` + Scheme R: PUT /fxTransfer call I.e. From: FXP → To: Proxy AR + with wrong headers - ABORT VALIDATION`, async (test) => { + const debtor = 'jurisdictionalFspPayerFsp' + + const td = await prepareTestData({ ...testData, crossSchemeSetup: true }) + await ProxyCache.getCache().addDfspIdToProxyMapping(debtor, td.proxyAR.participant.name) + + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + + td.messageProtocolFxPrepare.from = debtor + td.messageProtocolFxPrepare.content.headers['fspiop-source'] = debtor + td.messageProtocolFxPrepare.content.payload.initiatingFsp = debtor + await Producer.produceMessage(td.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'fx-prepare', + // To be keyed with the Proxy AR participantCurrencyId + keyFilter: td.proxyAR.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with debtor key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + // Fulfil the fxTransfer + const fulfilConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.FULFIL.toUpperCase()) + fulfilConfig.logger = Logger + + td.messageProtocolFxFulfil.to = debtor + td.messageProtocolFxFulfil.content.headers['fspiop-destination'] = debtor + + // If initiatingFsp is proxy, fx fulfil handler doesn't validate fspiop-destination header. + // But it should validate fspiop-source header, because counterPartyFsp is not a proxy. + td.messageProtocolFxFulfil.content.headers['fspiop-source'] = 'wrongfsp' + + testConsumer.clearEvents() + await Producer.produceMessage(td.messageProtocolFxFulfil, td.topicConfTransferFulfil, fulfilConfig) + + try { + const positionFxFulfil = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'fx-abort-validation', + keyFilter: td.proxyAR.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionFxFulfil[0], 'Position fulfil message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + testConsumer.clearEvents() + test.end() + }) + + await transferProxyPrepare.test(` + Scheme R: PUT /transfers call I.e. From: Proxy RB → To: Proxy AR + If it is a FX transfer with currency conversion + FXP and ProxyRB account must be updated`, async (test) => { + const transferPrepareFrom = 'schemeAPayerFsp' + const transferPrepareTo = 'schemeBPayeeFsp' + + // In this particular test, with currency conversion, we're assuming that proxyAR and proxyRB + // operate in different currencies. ProxyRB's default currency is XXX, and ProxyAR's default currency is USD. + const td = await prepareTestData({ + ...testData, + crossSchemeSetup: true + }) + await ProxyCache.getCache().addDfspIdToProxyMapping(transferPrepareFrom, td.proxyAR.participant.name) + await ProxyCache.getCache().addDfspIdToProxyMapping(transferPrepareTo, td.proxyRB.participant.name) + + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + const fulfilConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.FULFIL.toUpperCase()) + fulfilConfig.logger = Logger + + // FX Transfer from proxyAR to FXP + td.messageProtocolFxPrepare.from = transferPrepareFrom + td.messageProtocolFxPrepare.content.headers['fspiop-source'] = transferPrepareFrom + td.messageProtocolFxPrepare.content.payload.initiatingFsp = transferPrepareFrom + await Producer.produceMessage(td.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'fx-prepare', + // To be keyed with the Proxy AR participantCurrencyId + keyFilter: td.proxyAR.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with proxyAR key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + // Fulfil the fxTransfer + td.messageProtocolFxFulfil.to = transferPrepareFrom + td.messageProtocolFxFulfil.content.headers['fspiop-destination'] = transferPrepareFrom + td.messageProtocolFxFulfil.from = td.fxp.participant.name + td.messageProtocolFxFulfil.content.headers['fspiop-source'] = td.fxp.participant.name + + testConsumer.clearEvents() + Logger.warn(`td.messageProtocolFxFulfil: ${JSON.stringify(td.messageProtocolFxFulfil)}`) + await Producer.produceMessage(td.messageProtocolFxFulfil, td.topicConfTransferFulfil, fulfilConfig) + + try { + const positionFxFulfil = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: 'fx-reserve', + valueToFilter: transferPrepareFrom + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionFxFulfil[0], 'Position fxFulfil message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + // Create subsequent transfer + td.messageProtocolPrepare.from = transferPrepareFrom + td.messageProtocolPrepare.to = transferPrepareTo + td.messageProtocolPrepare.content.headers['fspiop-source'] = transferPrepareFrom + td.messageProtocolPrepare.content.headers['fspiop-destination'] = transferPrepareTo + td.messageProtocolPrepare.content.payload.payerFsp = transferPrepareFrom + td.messageProtocolPrepare.content.payload.payeeFsp = transferPrepareTo + + await Producer.produceMessage(td.messageProtocolPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'prepare', + // A position prepare message reserving the FXP's targeted currency account should be created + keyFilter: td.fxp.participantCurrencyIdSecondary.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with key of fxp target currency account found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + // Fulfil the transfer + td.messageProtocolFulfil.from = transferPrepareTo + td.messageProtocolFulfil.to = transferPrepareFrom + td.messageProtocolFulfil.content.headers['fspiop-source'] = transferPrepareTo + td.messageProtocolFulfil.content.headers['fspiop-destination'] = transferPrepareFrom + + testConsumer.clearEvents() + await Producer.produceMessage(td.messageProtocolFulfil, td.topicConfTransferFulfil, fulfilConfig) + + try { + const positionFulfil1 = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'commit', + keyFilter: td.fxp.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + const positionFulfil2 = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'commit', + keyFilter: td.proxyRB.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionFulfil1[0], 'Position fulfil message with key found') + test.ok(positionFulfil2[0], 'Position fulfil message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + testConsumer.clearEvents() + test.end() + }) + + await transferProxyPrepare.test(` + Scheme A: PUT /transfers call I.e. From: Proxy AR → To: Payer FSP + If it is a FX transfer with currency conversion + PayerFSP and ProxyAR account must be updated`, async (test) => { + const transferPrepareTo = 'schemeBPayeeFsp' + const fxTransferPrepareTo = 'schemeRFxp' + + const td = await prepareTestData({ ...testData, crossSchemeSetup: true }) + await ProxyCache.getCache().addDfspIdToProxyMapping(fxTransferPrepareTo, td.proxyAR.participant.name) + await ProxyCache.getCache().addDfspIdToProxyMapping(transferPrepareTo, td.proxyAR.participant.name) + + const prepareConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.PREPARE.toUpperCase()) + prepareConfig.logger = Logger + const fulfilConfig = Utility.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.PRODUCER, + TransferEventType.TRANSFER.toUpperCase(), + TransferEventType.FULFIL.toUpperCase()) + fulfilConfig.logger = Logger + + // FX Transfer from payer to proxyAR + td.messageProtocolFxPrepare.to = fxTransferPrepareTo + td.messageProtocolFxPrepare.content.headers['fspiop-destination'] = fxTransferPrepareTo + td.messageProtocolFxPrepare.content.payload.counterPartyFsp = fxTransferPrepareTo + await Producer.produceMessage(td.messageProtocolFxPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'fx-prepare', + // To be keyed with the PayerFSP participantCurrencyId + keyFilter: td.payer.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with proxyAR key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + // Fulfil the fxTransfer + td.messageProtocolFulfil.from = fxTransferPrepareTo + td.messageProtocolFulfil.content.headers['fspiop-source'] = fxTransferPrepareTo + + testConsumer.clearEvents() + await Producer.produceMessage(td.messageProtocolFxFulfil, td.topicConfTransferFulfil, fulfilConfig) + + try { + const positionFxFulfil = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-notification-event', + action: 'fx-reserve', + valueToFilter: td.payer.name + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionFxFulfil[0], 'Position fxFulfil message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + // Create subsequent transfer + td.messageProtocolPrepare.to = transferPrepareTo + td.messageProtocolPrepare.content.headers['fspiop-destination'] = transferPrepareTo + td.messageProtocolPrepare.content.payload.payeeFsp = transferPrepareTo + + await Producer.produceMessage(td.messageProtocolPrepare, td.topicConfTransferPrepare, prepareConfig) + + try { + const positionPrepare = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'prepare', + // A position prepare message without need for any position changes should be created (key 0) + keyFilter: '0' + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionPrepare[0], 'Position prepare message with key of fxp target currency account found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + try { + await wrapWithRetries(async () => { + const transfer = await TransferService.getById(td.messageProtocolPrepare.content.payload.transferId) || {} + if (transfer?.transferState !== TransferInternalState.RESERVED) { + if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) + return null + } + return transfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + } catch (err) { + Logger.error(err) + test.fail(err.message) + } + + // Fulfil the transfer + td.messageProtocolFulfil.from = transferPrepareTo + td.messageProtocolFulfil.content.headers['fspiop-source'] = transferPrepareTo + testConsumer.clearEvents() + await Producer.produceMessage(td.messageProtocolFulfil, td.topicConfTransferFulfil, fulfilConfig) + try { + const positionFulfil1 = await wrapWithRetries(() => testConsumer.getEventsForFilter({ + topicFilter: 'topic-transfer-position-batch', + action: 'commit', + keyFilter: td.proxyAR.participantCurrencyId.toString() + }), wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + test.ok(positionFulfil1[0], 'Position fulfil message with key found') + } catch (err) { + test.notOk('Error should not be thrown') + console.error(err) + } + + testConsumer.clearEvents() + test.end() + }) + + transferProxyPrepare.end() }) await handlersTest.test('teardown', async (assert) => { @@ -425,6 +2410,7 @@ Test('Handlers test', async handlersTest => { await testConsumer.destroy() // this disconnects the consumers await Producer.disconnect() + await ProxyCache.disconnect() if (debug) { const elapsedTime = Math.round(((new Date()) - startTime) / 100) / 10 diff --git a/test/integration-override/handlers/transfers/prepare/prepare-internals.test.js b/test/integration-override/handlers/transfers/prepare/prepare-internals.test.js new file mode 100644 index 000000000..d745faf29 --- /dev/null +++ b/test/integration-override/handlers/transfers/prepare/prepare-internals.test.js @@ -0,0 +1,179 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Eugen Klymniuk + -------------- + **********/ + +const { randomUUID } = require('node:crypto') +const Test = require('tape') + +const prepareHandler = require('#src/handlers/transfers/prepare') +const config = require('#src/lib/config') +const Db = require('#src/lib/db') +const proxyCache = require('#src/lib/proxyCache') +const Cache = require('#src/lib/cache') +const externalParticipantCached = require('#src/models/participant/externalParticipantCached') +const ParticipantCached = require('#src/models/participant/participantCached') +const ParticipantCurrencyCached = require('#src/models/participant/participantCurrencyCached') +const ParticipantLimitCached = require('#src/models/participant/participantLimitCached') +const transferFacade = require('#src/models/transfer/facade') + +const participantHelper = require('#test/integration/helpers/participant') +const fixtures = require('#test/fixtures') +const { tryCatchEndTest } = require('#test/util/helpers') + +Test('Prepare Handler internals Tests -->', (prepareHandlerTest) => { + const initiatingFsp = `externalPayer-${Date.now()}` + const counterPartyFsp = `externalPayee-${Date.now()}` + const proxyId1 = `proxy1-${Date.now()}` + const proxyId2 = `proxy2-${Date.now()}` + + const curr1 = 'BWP' + // const curr2 = 'TZS'; + + const transferId = randomUUID() + + prepareHandlerTest.test('setup', tryCatchEndTest(async (t) => { + await Db.connect(config.DATABASE) + await proxyCache.connect() + await ParticipantCached.initialize() + await ParticipantCurrencyCached.initialize() + await ParticipantLimitCached.initialize() + externalParticipantCached.initialize() + await Cache.initCache() + + const [proxy1, proxy2] = await Promise.all([ + participantHelper.prepareData(proxyId1, curr1, null, false, true), + participantHelper.prepareData(proxyId2, curr1, null, false, true) + ]) + t.ok(proxy1, 'proxy1 is created') + t.ok(proxy2, 'proxy2 is created') + + await Promise.all([ + ParticipantCurrencyCached.update(proxy1.participantCurrencyId, true), + ParticipantCurrencyCached.update(proxy1.participantCurrencyId2, true) + ]) + t.pass('proxy1 currencies are activated') + + const [isPayerAdded, isPayeeAdded] = await Promise.all([ + proxyCache.getCache().addDfspIdToProxyMapping(initiatingFsp, proxyId1), + proxyCache.getCache().addDfspIdToProxyMapping(counterPartyFsp, proxyId2) + ]) + t.ok(isPayerAdded, 'payer is added to proxyCache') + t.ok(isPayeeAdded, 'payee is added to proxyCache') + + t.pass('setup is done') + })) + + prepareHandlerTest.test('should create proxyObligation for inter-scheme fxTransfer', tryCatchEndTest(async (t) => { + const payload = fixtures.fxTransferDto({ initiatingFsp, counterPartyFsp }) + const isFx = true + + const obligation = await prepareHandler.calculateProxyObligation({ + payload, + isFx, + params: {}, + functionality: 'functionality', + action: 'action' + }) + t.equals(obligation.isFx, isFx) + t.equals(obligation.initiatingFspProxyOrParticipantId.inScheme, false) + t.equals(obligation.initiatingFspProxyOrParticipantId.proxyId, proxyId1) + t.equals(obligation.initiatingFspProxyOrParticipantId.name, initiatingFsp) + t.equals(obligation.counterPartyFspProxyOrParticipantId.inScheme, false) + t.equals(obligation.counterPartyFspProxyOrParticipantId.proxyId, proxyId2) + t.equals(obligation.counterPartyFspProxyOrParticipantId.name, counterPartyFsp) + })) + + prepareHandlerTest.test('should save preparedRequest for inter-scheme transfer, and create external participants', tryCatchEndTest(async (t) => { + let [extPayer, extPayee] = await Promise.all([ + externalParticipantCached.getByName(initiatingFsp), + externalParticipantCached.getByName(counterPartyFsp) + ]) + t.equals(extPayer, undefined) + t.equals(extPayee, undefined) + + const isFx = false + const payload = fixtures.transferDto({ + transferId, + payerFsp: initiatingFsp, + payeeFsp: counterPartyFsp + }) + const proxyObligation = fixtures.mockProxyObligationDto({ + isFx, + payloadClone: payload, + proxy1: proxyId1, + proxy2: proxyId2 + }) + const determiningTransferCheckResult = { + determiningTransferExistsInTransferList: null, + watchListRecords: [], + participantCurrencyValidationList: [] + } + + await prepareHandler.checkDuplication({ + isFx, + payload, + ID: transferId, + location: {} + }) + await prepareHandler.savePreparedRequest({ + isFx, + payload, + validationPassed: true, + reasons: [], + functionality: 'functionality', + params: {}, + location: {}, + determiningTransferCheckResult, + proxyObligation + }) + + const dbTransfer = await transferFacade.getByIdLight(payload.transferId) + t.ok(dbTransfer, 'transfer is saved') + t.equals(dbTransfer.transferId, transferId, 'dbTransfer.transferId') + + ;[extPayer, extPayee] = await Promise.all([ + externalParticipantCached.getByName(initiatingFsp), + externalParticipantCached.getByName(counterPartyFsp) + ]) + t.ok(extPayer) + t.ok(extPayee) + + const [participant1] = await transferFacade.getTransferParticipant(proxyId1, transferId) + t.equals(participant1.externalParticipantId, extPayer.externalParticipantId) + t.equals(participant1.participantId, extPayer.proxyId) + })) + + prepareHandlerTest.test('teardown', tryCatchEndTest(async (t) => { + await Promise.all([ + Db.disconnect(), + proxyCache.disconnect(), + Cache.destroyCache() + ]) + t.pass('connections are closed') + })) + + prepareHandlerTest.end() +}) diff --git a/test/integration-override/lib/proxyCache.js b/test/integration-override/lib/proxyCache.js new file mode 100644 index 000000000..a0b14d684 --- /dev/null +++ b/test/integration-override/lib/proxyCache.js @@ -0,0 +1,220 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ + +'use strict' + +const Test = require('tape') +const Sinon = require('sinon') +const Db = require('#src/lib/db') +const Cache = require('#src/lib/cache') +const Logger = require('@mojaloop/central-services-logger') +const Config = require('#src/lib/config') +const ProxyCache = require('#src/lib/proxyCache') +const ParticipantService = require('#src/domain/participant') +const ParticipantCached = require('#src/models/participant/participantCached') +const ParticipantCurrencyCached = require('#src/models/participant/participantCurrencyCached') +const ParticipantLimitCached = require('#src/models/participant/participantLimitCached') +const ParticipantHelper = require('../../integration/helpers/participant') + +const debug = false + +Test('Participant service', async (participantTest) => { + let sandbox + const participantFixtures = [] + const participantMap = new Map() + + const testData = { + currency: 'USD', + fsp1Name: 'dfsp1', + fsp2Name: 'dfsp2', + endpointBase: 'http://localhost:1080', + fsp3Name: 'payerfsp', + fsp4Name: 'payeefsp', + simulatorBase: 'http://localhost:8444', + notificationEmail: 'test@example.com', + proxyParticipant: 'xnProxy' + } + + await participantTest.test('setup', async (test) => { + try { + sandbox = Sinon.createSandbox() + await Db.connect(Config.DATABASE) + await ParticipantCached.initialize() + await ParticipantCurrencyCached.initialize() + await ParticipantLimitCached.initialize() + await Cache.initCache() + await ProxyCache.connect() + test.pass() + test.end() + } catch (err) { + Logger.error(`Setup for test failed with error - ${err}`) + test.fail() + test.end() + } + }) + + await participantTest.test('create participants', async (assert) => { + try { + let getByNameResult, result + getByNameResult = await ParticipantService.getByName(testData.fsp1Name) + result = await ParticipantHelper.prepareData(testData.fsp1Name, testData.currency, undefined, !!getByNameResult) + participantFixtures.push(result.participant) + getByNameResult = await ParticipantService.getByName(testData.fsp2Name) + result = await ParticipantHelper.prepareData(testData.fsp2Name, testData.currency, undefined, !!getByNameResult) + participantFixtures.push(result.participant) + getByNameResult = await ParticipantService.getByName(testData.fsp3Name) + result = await ParticipantHelper.prepareData(testData.fsp3Name, testData.currency, undefined, !!getByNameResult) + participantFixtures.push(result.participant) + getByNameResult = await ParticipantService.getByName(testData.fsp4Name) + result = await ParticipantHelper.prepareData(testData.fsp4Name, testData.currency, undefined, !!getByNameResult) + participantFixtures.push(result.participant) + for (const participant of participantFixtures) { + const read = await ParticipantService.getById(participant.participantId) + participantMap.set(participant.participantId, read) + if (debug) assert.comment(`Testing with participant \n ${JSON.stringify(participant, null, 2)}`) + assert.equal(read.name, participant.name, 'names are equal') + assert.deepEqual(read.currencyList, participant.currencyList, 'currency match') + assert.equal(read.isActive, participant.isActive, 'isActive flag matches') + assert.equal(read.createdDate.toString(), participant.createdDate.toString(), 'created date matches') + } + assert.end() + } catch (err) { + Logger.error(`create participant failed with error - ${err}`) + assert.fail() + assert.end() + } + }) + + await participantTest.test('getFSPProxy should return proxyId if fsp not in scheme', async (assert) => { + try { + const proxyCache = ProxyCache.getCache() + proxyCache.addDfspIdToProxyMapping('notInSchemeFsp', 'proxyId') + const result = await ProxyCache.getFSPProxy('notInSchemeFsp') + assert.equal(result.inScheme, false, 'not in scheme') + assert.equal(result.proxyId, 'proxyId', 'proxy id matches') + proxyCache.removeDfspIdFromProxyMapping('notInSchemeFsp') + assert.end() + } catch (err) { + Logger.error(`create participant failed with error - ${err}`) + assert.fail() + assert.end() + } + }) + + await participantTest.test('getFSPProxy should not return proxyId if fsp is in scheme', async (assert) => { + try { + const proxyCache = ProxyCache.getCache() + proxyCache.addDfspIdToProxyMapping('dfsp1', 'proxyId') + const result = await ProxyCache.getFSPProxy('dfsp1') + assert.equal(result.inScheme, true, 'is in scheme') + assert.equal(result.proxyId, null, 'proxy id is null') + proxyCache.removeDfspIdFromProxyMapping('dfsp1') + assert.end() + } catch (err) { + Logger.error(`create participant failed with error - ${err}`) + assert.fail() + assert.end() + } + }) + + await participantTest.test('checkSameCreditorDebtorProxy should return true if debtor and creditor proxy are the same', async (assert) => { + try { + const proxyCache = ProxyCache.getCache() + proxyCache.addDfspIdToProxyMapping('dfsp1', 'proxyId') + proxyCache.addDfspIdToProxyMapping('dfsp2', 'proxyId') + const result = await ProxyCache.checkSameCreditorDebtorProxy('dfsp1', 'dfsp2') + assert.equal(result, true, 'returned true') + proxyCache.removeDfspIdFromProxyMapping('dfsp1') + proxyCache.removeDfspIdFromProxyMapping('dfsp2') + assert.end() + } catch (err) { + Logger.error(`create participant failed with error - ${err}`) + assert.fail() + assert.end() + } + }) + + await participantTest.test('checkSameCreditorDebtorProxy should return false if debtor and creditor proxy are not the same', async (assert) => { + try { + const proxyCache = ProxyCache.getCache() + proxyCache.addDfspIdToProxyMapping('dfsp1', 'proxyId') + proxyCache.addDfspIdToProxyMapping('dfsp2', 'proxyId2') + const result = await ProxyCache.checkSameCreditorDebtorProxy('dfsp1', 'dfsp2') + assert.equal(result, false, 'returned false') + proxyCache.removeDfspIdFromProxyMapping('dfsp1') + proxyCache.removeDfspIdFromProxyMapping('dfsp2') + assert.end() + } catch (err) { + Logger.error(`create participant failed with error - ${err}`) + assert.fail() + assert.end() + } + }) + + await participantTest.test('teardown', async (assert) => { + try { + for (const participant of participantFixtures) { + if (participant.name === testData.fsp1Name || + participant.name === testData.fsp2Name || + participant.name === testData.fsp3Name || + participant.name === testData.fsp4Name) { + assert.pass(`participant ${participant.name} preserved`) + } else { + const result = await ParticipantHelper.deletePreparedData(participant.name) + assert.ok(result, `destroy ${participant.name} success`) + } + } + await Cache.destroyCache() + await Db.disconnect() + await ProxyCache.disconnect() + + assert.pass('database connection closed') + // @ggrg: Having the following 3 lines commented prevents the current test from exiting properly when run individually, + // BUT it is required in order to have successful run of all integration test scripts as a sequence, where + // the last script will actually disconnect topic-notification-event producer. + // const Producer = require('../../../../src/handlers/lib/kafka/producer') + // await Producer.getProducer('topic-notification-event').disconnect() + // assert.pass('producer to topic-notification-event disconnected') + sandbox.restore() + assert.end() + } catch (err) { + Logger.error(`teardown failed with error - ${err}`) + assert.fail() + assert.end() + } + }) + + await participantTest.end() +}) diff --git a/test/integration/domain/participant/index.test.js b/test/integration/domain/participant/index.test.js index 4dbdf976c..0c9a1160c 100644 --- a/test/integration/domain/participant/index.test.js +++ b/test/integration/domain/participant/index.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -32,6 +35,7 @@ const Test = require('tape') const Sinon = require('sinon') const Db = require('../../../../src/lib/db') const Cache = require('../../../../src/lib/cache') +const ProxyCache = require('../../../../src/lib/proxyCache') const Logger = require('@mojaloop/central-services-logger') const Config = require('../../../../src/lib/config') const ParticipantService = require('../../../../src/domain/participant') @@ -49,6 +53,7 @@ Test('Participant service', async (participantTest) => { let sandbox const participantFixtures = [] const endpointsFixtures = [] + const participantProxyFixtures = [] const participantMap = new Map() const testData = { @@ -59,13 +64,15 @@ Test('Participant service', async (participantTest) => { fsp3Name: 'payerfsp', fsp4Name: 'payeefsp', simulatorBase: 'http://localhost:8444', - notificationEmail: 'test@example.com' + notificationEmail: 'test@example.com', + proxyParticipant: 'xnProxy' } await participantTest.test('setup', async (test) => { try { sandbox = Sinon.createSandbox() await Db.connect(Config.DATABASE) + await ProxyCache.connect() await ParticipantCached.initialize() await ParticipantCurrencyCached.initialize() await ParticipantLimitCached.initialize() @@ -172,6 +179,7 @@ Test('Participant service', async (participantTest) => { for (const participantId of participantMap.keys()) { const participant = await ParticipantService.getById(participantId) assert.equal(JSON.stringify(participant), JSON.stringify(participantMap.get(participantId))) + assert.equal(participant.isProxy, 0, 'isProxy flag set to false') } assert.end() } catch (err) { @@ -220,6 +228,10 @@ Test('Participant service', async (participantTest) => { await ParticipantEndpointHelper.prepareData(participant.name, 'SETTLEMENT_TRANSFER_POSITION_CHANGE_EMAIL', testData.notificationEmail) await ParticipantEndpointHelper.prepareData(participant.name, 'FSPIOP_CALLBACK_URL_AUTHORIZATIONS', testData.endpointBase) await ParticipantEndpointHelper.prepareData(participant.name, 'FSPIOP_CALLBACK_URL_TRX_REQ_SERVICE', testData.endpointBase) + await ParticipantEndpointHelper.prepareData(participant.name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_QUOTES, `${testData.endpointBase}`) + await ParticipantEndpointHelper.prepareData(participant.name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_POST, `${testData.endpointBase}/fxTransfers`) + await ParticipantEndpointHelper.prepareData(participant.name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_PUT, `${testData.endpointBase}/fxTransfers/{{commitRequestId}}`) + await ParticipantEndpointHelper.prepareData(participant.name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_ERROR, `${testData.endpointBase}/fxTransfers/{{commitRequestId}}/error`) participant = participantFixtures[2] await ParticipantEndpointHelper.prepareData(participant.name, 'FSPIOP_CALLBACK_URL_TRANSFER_POST', `${testData.simulatorBase}/${participant.name}/transfers`) await ParticipantEndpointHelper.prepareData(participant.name, 'FSPIOP_CALLBACK_URL_TRANSFER_PUT', `${testData.simulatorBase}/${participant.name}/transfers/{{transferId}}`) @@ -233,6 +245,10 @@ Test('Participant service', async (participantTest) => { await ParticipantEndpointHelper.prepareData(participant.name, 'SETTLEMENT_TRANSFER_POSITION_CHANGE_EMAIL', testData.notificationEmail) await ParticipantEndpointHelper.prepareData(participant.name, 'FSPIOP_CALLBACK_URL_AUTHORIZATIONS', testData.endpointBase) await ParticipantEndpointHelper.prepareData(participant.name, 'FSPIOP_CALLBACK_URL_TRX_REQ_SERVICE', testData.endpointBase) + await ParticipantEndpointHelper.prepareData(participant.name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_QUOTES, `${testData.endpointBase}`) + await ParticipantEndpointHelper.prepareData(participant.name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_POST, `${testData.endpointBase}/fxTransfers`) + await ParticipantEndpointHelper.prepareData(participant.name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_PUT, `${testData.endpointBase}/fxTransfers/{{commitRequestId}}`) + await ParticipantEndpointHelper.prepareData(participant.name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_ERROR, `${testData.endpointBase}/fxTransfers/{{commitRequestId}}/error`) participant = participantFixtures[3] await ParticipantEndpointHelper.prepareData(participant.name, 'FSPIOP_CALLBACK_URL_TRANSFER_POST', `${testData.simulatorBase}/${participant.name}/transfers`) await ParticipantEndpointHelper.prepareData(participant.name, 'FSPIOP_CALLBACK_URL_TRANSFER_PUT', `${testData.simulatorBase}/${participant.name}/transfers/{{transferId}}`) @@ -246,6 +262,10 @@ Test('Participant service', async (participantTest) => { await ParticipantEndpointHelper.prepareData(participant.name, 'SETTLEMENT_TRANSFER_POSITION_CHANGE_EMAIL', testData.notificationEmail) await ParticipantEndpointHelper.prepareData(participant.name, 'FSPIOP_CALLBACK_URL_AUTHORIZATIONS', testData.endpointBase) await ParticipantEndpointHelper.prepareData(participant.name, 'FSPIOP_CALLBACK_URL_TRX_REQ_SERVICE', testData.endpointBase) + await ParticipantEndpointHelper.prepareData(participant.name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_QUOTES, `${testData.endpointBase}`) + await ParticipantEndpointHelper.prepareData(participant.name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_POST, `${testData.endpointBase}/fxTransfers`) + await ParticipantEndpointHelper.prepareData(participant.name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_PUT, `${testData.endpointBase}/fxTransfers/{{commitRequestId}}`) + await ParticipantEndpointHelper.prepareData(participant.name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_ERROR, `${testData.endpointBase}/fxTransfers/{{commitRequestId}}/error`) assert.end() } catch (err) { console.log(err) @@ -411,6 +431,30 @@ Test('Participant service', async (participantTest) => { } }) + await participantTest.test('create participant with proxy', async (assert) => { + try { + const getByNameResult = await ParticipantService.getByName(testData.proxyParticipant) + const result = await ParticipantHelper.prepareData(testData.proxyParticipant, testData.currency, undefined, !!getByNameResult, true) + participantProxyFixtures.push(result.participant) + + for (const participant of participantProxyFixtures) { + const read = await ParticipantService.getById(participant.participantId) + participantMap.set(participant.participantId, read) + if (debug) assert.comment(`Testing with participant \n ${JSON.stringify(participant, null, 2)}`) + assert.equal(read.name, participant.name, 'names are equal') + assert.deepEqual(read.currencyList, participant.currencyList, 'currency match') + assert.equal(read.isActive, participant.isActive, 'isActive flag matches') + assert.equal(read.createdDate.toString(), participant.createdDate.toString(), 'created date matches') + assert.equal(read.isProxy, 1, 'isProxy flag set to true') + } + assert.end() + } catch (err) { + Logger.error(`create participant failed with error - ${err}`) + assert.fail() + assert.end() + } + }) + await participantTest.test('teardown', async (assert) => { try { for (const participant of participantFixtures) { @@ -426,6 +470,8 @@ Test('Participant service', async (participantTest) => { } await Cache.destroyCache() await Db.disconnect() + await ProxyCache.disconnect() + assert.pass('database connection closed') // @ggrg: Having the following 3 lines commented prevents the current test from exiting properly when run individually, // BUT it is required in order to have successful run of all integration test scripts as a sequence, where diff --git a/test/integration/handlers/root.test.js b/test/integration/handlers/root.test.js index 175459c4b..f5ab0f88a 100644 --- a/test/integration/handlers/root.test.js +++ b/test/integration/handlers/root.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -30,6 +33,7 @@ const Logger = require('@mojaloop/central-services-logger') const Db = require('@mojaloop/database-lib').Db const Config = require('../../../src/lib/config') +const ProxyCache = require('../../../src/lib/proxyCache') const Consumer = require('@mojaloop/central-services-stream').Util.Consumer // const Producer = require('@mojaloop/central-services-stream').Util.Producer const rootApiHandler = require('../../../src/api/root/handler') @@ -52,6 +56,7 @@ Test('Root handler test', async handlersTest => { await handlersTest.test('registerAllHandlers should', async registerAllHandlers => { await registerAllHandlers.test('setup handlers', async (test) => { await Db.connect(Config.DATABASE) + await ProxyCache.connect() await Handlers.transfers.registerPrepareHandler() await Handlers.positions.registerPositionHandler() await Handlers.transfers.registerFulfilHandler() @@ -88,7 +93,8 @@ Test('Root handler test', async handlersTest => { const expectedStatus = 200 const expectedServices = [ { name: 'datastore', status: 'OK' }, - { name: 'broker', status: 'OK' } + { name: 'broker', status: 'OK' }, + { name: 'proxyCache', status: 'OK' } ] // Act @@ -112,7 +118,7 @@ Test('Root handler test', async handlersTest => { try { await Db.disconnect() assert.pass('database connection closed') - + await ProxyCache.disconnect() // TODO: Replace this with KafkaHelper.topics const topics = [ 'topic-transfer-prepare', diff --git a/test/integration/handlers/transfers/handlers.test.js b/test/integration/handlers/transfers/handlers.test.js index 0700d4f72..b5c2054fc 100644 --- a/test/integration/handlers/transfers/handlers.test.js +++ b/test/integration/handlers/transfers/handlers.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -27,9 +30,9 @@ const Test = require('tape') const { randomUUID } = require('crypto') -const retry = require('async-retry') const Logger = require('@mojaloop/central-services-logger') const Config = require('#src/lib/config') +const ProxyCache = require('#src/lib/proxyCache') const Time = require('@mojaloop/central-services-shared').Util.Time const Db = require('@mojaloop/database-lib').Db const Cache = require('#src/lib/cache') @@ -160,9 +163,6 @@ const prepareTestData = async (dataObj) => { const payer = await ParticipantHelper.prepareData(dataObj.payer.name, dataObj.amount.currency) const payee = await ParticipantHelper.prepareData(dataObj.payee.name, dataObj.amount.currency) - const kafkacat = 'GROUP=abc; T=topic; TR=transfer; kafkacat -b localhost -G $GROUP $T-$TR-prepare $T-$TR-position $T-$TR-fulfil $T-$TR-get $T-admin-$TR $T-notification-event $T-bulk-prepare' - if (debug) console.error(kafkacat) - const payerLimitAndInitialPosition = await ParticipantLimitHelper.prepareLimitAndInitialPosition(payer.participant.name, { currency: dataObj.amount.currency, limit: { value: dataObj.payer.limit } @@ -184,6 +184,10 @@ const prepareTestData = async (dataObj) => { await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_BULK_TRANSFER_PUT', `${dataObj.endpoint.base}/bulkTransfers/{{id}}`) await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_BULK_TRANSFER_ERROR', `${dataObj.endpoint.base}/bulkTransfers/{{id}}/error`) await ParticipantEndpointHelper.prepareData(name, 'FSPIOP_CALLBACK_URL_QUOTES', `${dataObj.endpoint.base}`) + await ParticipantEndpointHelper.prepareData(name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_QUOTES, `${dataObj.endpoint.base}`) + await ParticipantEndpointHelper.prepareData(name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_POST, `${dataObj.endpoint.base}/fxTransfers`) + await ParticipantEndpointHelper.prepareData(name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_PUT, `${dataObj.endpoint.base}/fxTransfers/{{commitRequestId}}`) + await ParticipantEndpointHelper.prepareData(name, Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_FX_TRANSFER_ERROR, `${dataObj.endpoint.base}/fxTransfers/{{commitRequestId}}/error`) } const transferPayload = { @@ -318,6 +322,7 @@ const prepareTestData = async (dataObj) => { Test('Handlers test', async handlersTest => { const startTime = new Date() await Db.connect(Config.DATABASE) + await ProxyCache.connect() await ParticipantCached.initialize() await ParticipantCurrencyCached.initialize() await ParticipantLimitCached.initialize() @@ -389,6 +394,7 @@ Test('Handlers test', async handlersTest => { // TODO: MIG - Disabling these handlers to test running the CL as a separate service independently. await new Promise(resolve => setTimeout(resolve, rebalanceDelay)) + testConsumer.clearEvents() test.pass('done') test.end() @@ -860,14 +866,15 @@ Test('Handlers test', async handlersTest => { } try { - await retry(async () => { // use bail(new Error('to break before max retries')) + await wrapWithRetries(async () => { const transfer = await TransferService.getById(td.messageProtocolPrepare.content.payload.transferId) || {} if (transfer?.transferState !== TransferState.RESERVED) { if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) - throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR, `#1 Max retry count ${retryCount} reached after ${retryCount * retryDelay / 1000}s. Tests fail`) + return null } - return tests() - }, retryOpts) + return transfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + await tests() } catch (err) { Logger.error(err) test.fail(err.message) @@ -900,14 +907,15 @@ Test('Handlers test', async handlersTest => { } try { - await retry(async () => { // use bail(new Error('to break before max retries')) + await wrapWithRetries(async () => { const transfer = await TransferService.getById(td.messageProtocolPrepare.content.payload.transferId) || {} if (transfer?.transferState !== TransferState.COMMITTED) { if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) - throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR, `#2 Max retry count ${retryCount} reached after ${retryCount * retryDelay / 1000}s. Tests fail`) + return null } - return tests() - }, retryOpts) + return transfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + await tests() } catch (err) { Logger.error(err) test.fail(err.message) @@ -959,14 +967,15 @@ Test('Handlers test', async handlersTest => { } try { - await retry(async () => { // use bail(new Error('to break before max retries')) + await wrapWithRetries(async () => { const transfer = await TransferService.getById(td.messageProtocolPrepare.content.payload.transferId) || {} if (transfer?.transferState !== TransferState.RESERVED) { if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) - throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR, `#1 Max retry count ${retryCount} reached after ${retryCount * retryDelay / 1000}s. Tests fail`) + return null } - return tests() - }, retryOpts) + return transfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + await tests() } catch (err) { Logger.error(err) test.fail(err.message) @@ -997,14 +1006,15 @@ Test('Handlers test', async handlersTest => { } try { - await retry(async () => { // use bail(new Error('to break before max retries')) + await wrapWithRetries(async () => { const transfer = await TransferService.getById(td.messageProtocolPrepare.content.payload.transferId) || {} if (transfer?.transferState !== TransferState.COMMITTED) { if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) - throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR, `#2 Max retry count ${retryCount} reached after ${retryCount * retryDelay / 1000}s. Tests fail`) + return null } - return tests() - }, retryOpts) + return transfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + await tests() } catch (err) { Logger.error(err) test.fail(err.message) @@ -1035,14 +1045,15 @@ Test('Handlers test', async handlersTest => { } try { - await retry(async () => { // use bail(new Error('to break before max retries')) + await wrapWithRetries(async () => { const transfer = await TransferService.getById(td.messageProtocolPrepare.content.payload.transferId) || {} if (transfer?.transferState !== TransferState.RESERVED) { if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) - throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR, `#3 Max retry count ${retryCount} reached after ${retryCount * retryDelay / 1000}s. Tests fail`) + return null } - return tests() - }, retryOpts) + return transfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + await tests() } catch (err) { Logger.error(err) test.fail(err.message) @@ -1074,14 +1085,15 @@ Test('Handlers test', async handlersTest => { } try { - await retry(async () => { // use bail(new Error('to break before max retries')) + await wrapWithRetries(async () => { const transfer = await TransferService.getById(td.messageProtocolPrepare.content.payload.transferId) || {} if (transfer?.transferState !== TransferInternalState.ABORTED_REJECTED) { if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) - throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR, `#4 Max retry count ${retryCount} reached after ${retryCount * retryDelay / 1000}s. Tests fail`) + return null } - return tests() - }, retryOpts) + return transfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + await tests() } catch (err) { Logger.error(err) test.fail(err.message) @@ -1113,14 +1125,15 @@ Test('Handlers test', async handlersTest => { } try { - await retry(async () => { // use bail(new Error('to break before max retries')) + await wrapWithRetries(async () => { const transfer = await TransferService.getById(td.messageProtocolPrepare.content.payload.transferId) || {} if (transfer?.transferState !== TransferState.RESERVED) { if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) - throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR, `#5 Max retry count ${retryCount} reached after ${retryCount * retryDelay / 1000}s. Tests fail`) + return null } - return tests() - }, retryOpts) + return transfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + await tests() } catch (err) { Logger.error(err) test.fail(err.message) @@ -1160,14 +1173,15 @@ Test('Handlers test', async handlersTest => { } try { - await retry(async () => { // use bail(new Error('to break before max retries')) + await wrapWithRetries(async () => { const transfer = await TransferService.getById(td.messageProtocolPrepare.content.payload.transferId) || {} if (transfer?.transferState !== TransferInternalState.ABORTED_ERROR) { if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) - throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR, `#6 Max retry count ${retryCount} reached after ${retryCount * retryDelay / 1000}s. Tests fail`) + return null } - return tests() - }, retryOpts) + return transfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + await tests() } catch (err) { Logger.error(err) test.fail(err.message) @@ -1194,7 +1208,7 @@ Test('Handlers test', async handlersTest => { }) await handlersTest.test('timeout should', async timeoutTest => { - testData.expiration = new Date((new Date()).getTime() + (2 * 1000)) // 2 seconds + testData.expiration = new Date((new Date()).getTime() + (10 * 1000)) // 10 seconds const td = await prepareTestData(testData) await timeoutTest.test('update transfer state to RESERVED by PREPARE request', async (test) => { @@ -1222,20 +1236,15 @@ Test('Handlers test', async handlersTest => { } try { - const retryTimeoutOpts = { - retries: Number(retryOpts.retries) * 2, - minTimeout: retryOpts.minTimeout, - maxTimeout: retryOpts.maxTimeout - } - - await retry(async () => { // use bail(new Error('to break before max retries')) + await wrapWithRetries(async () => { const transfer = await TransferService.getById(td.messageProtocolPrepare.content.payload.transferId) || {} if (transfer?.transferState !== TransferState.RESERVED) { if (debug) console.log(`retrying in ${retryDelay / 1000}s..`) - throw new Error(`#7 Max retry count ${retryCount} reached after ${retryCount * retryDelay / 1000}s. Tests fail`) + return null } - return tests() - }, retryTimeoutOpts) + return transfer + }, wrapWithRetriesConf.remainingRetries, wrapWithRetriesConf.timeout) + await tests() } catch (err) { Logger.error(err) test.fail(err.message) @@ -1342,6 +1351,7 @@ Test('Handlers test', async handlersTest => { await Handlers.timeouts.stop() await Cache.destroyCache() await Db.disconnect() + await ProxyCache.disconnect() assert.pass('database connection closed') await testConsumer.destroy() // this disconnects the consumers diff --git a/test/integration/helpers/createTestConsumer.js b/test/integration/helpers/createTestConsumer.js new file mode 100644 index 000000000..01c187c84 --- /dev/null +++ b/test/integration/helpers/createTestConsumer.js @@ -0,0 +1,59 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Eugen Klymniuk + -------------- + **********/ + +const { Enum, Util } = require('@mojaloop/central-services-shared') +const Config = require('#src/lib/config') +const TestConsumer = require('./testConsumer') + +/** + * Creates a TestConsumer with handlers based on the specified types/actions configurations. + * + * @param {Array} typeActionList - An array of objects with 'type' and 'action' properties + * - `type` {string} - Represents the type parameter for the topic and configuration. + * - `action` {string} - Represents the action parameter for the topic and configuration. + * + * @returns {TestConsumer} An instance of TestConsumer configured with handlers derived from + */ +const createTestConsumer = (typeActionList) => { + const handlers = typeActionList.map(({ type, action }) => ({ + topicName: Util.Kafka.transformGeneralTopicName( + Config.KAFKA_CONFIG.TOPIC_TEMPLATES.GENERAL_TOPIC_TEMPLATE.TEMPLATE, + type, + action + ), + config: Util.Kafka.getKafkaConfig( + Config.KAFKA_CONFIG, + Enum.Kafka.Config.CONSUMER, + type.toUpperCase(), + action.toUpperCase() + ) + })) + + return new TestConsumer(handlers) +} + +module.exports = createTestConsumer diff --git a/test/integration/helpers/hubAccounts.js b/test/integration/helpers/hubAccounts.js index 9d14ea325..06e97083a 100644 --- a/test/integration/helpers/hubAccounts.js +++ b/test/integration/helpers/hubAccounts.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/integration/helpers/ilpPacket.js b/test/integration/helpers/ilpPacket.js index 43bb07269..e37671927 100644 --- a/test/integration/helpers/ilpPacket.js +++ b/test/integration/helpers/ilpPacket.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/integration/helpers/index.js b/test/integration/helpers/index.js index a9ff5ee5b..90b504c98 100644 --- a/test/integration/helpers/index.js +++ b/test/integration/helpers/index.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/integration/helpers/kafkaHelper.js b/test/integration/helpers/kafkaHelper.js deleted file mode 100644 index efdc78d15..000000000 --- a/test/integration/helpers/kafkaHelper.js +++ /dev/null @@ -1,127 +0,0 @@ -/***** - License - -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - Contributors - -------------- - This is the official list of the Mojaloop project contributors for this file. - Names of the original copyright holders (individuals or organizations) - should be listed with a '*' in the first column. People who have - contributed from an organization can be listed under the organization - that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have - their names indented and be marked with a '-'. Email address can be added - optionally within square brackets . - * Gates Foundation - - Name Surname - - * Miguel de Barros - -------------- - **********/ - -const Producer = require('@mojaloop/central-services-stream').Util.Producer -const Consumer = require('@mojaloop/central-services-stream').Util.Consumer - -const topics = [ - 'topic-transfer-prepare', - 'topic-transfer-position', - 'topic-transfer-fulfil', - 'topic-notification-event' -] - -exports.topics = topics - -exports.producers = { - connect: async (assert) => { - // lets make sure all our Producers are already connected if they have already been defined. - for (const topic of topics) { - try { - // lets make sure check if any of our Producers are already connected if they have already been defined. - console.log(`Producer[${topic}] checking connectivity!`) - const isConnected = await Producer.isConnected(topic) - if (!isConnected) { - try { - console.log(`Producer[${topic}] is connecting`) - await Producer.getProducer(topic).connect() - console.log(`Producer[${topic}] is connected`) - if (assert) assert.pass(`Producer[${topic}] is connected`) - } catch (err) { - console.log(`Producer[${topic}] connection failed!`) - if (assert) assert.fail(err) - console.error(err) - } - } else { - console.log(`Producer[${topic}] is ALREADY connected`) - } - } catch (err) { - console.log(`Producer[${topic}] has not been initialized`) - if (assert) assert.fail(err) - console.error(err) - } - } - }, - - disconnect: async (assert) => { - for (const topic of topics) { - try { - console.log(`Producer[${topic}] disconnecting`) - await Producer.getProducer(topic).disconnect() - if (assert) assert.pass(`Producer[${topic}] is disconnected`) - console.log(`Producer[${topic}] disconnected`) - } catch (err) { - if (assert) assert.fail(err.message) - console.log(`Producer[${topic}] disconnection failed`) - console.error(err) - } - } - } -} - -exports.consumers = { - connect: async (assert) => { - // lets make sure all our Consumers are already connected if they have already been defined. - for (const topic of topics) { - try { - // lets make sure check if any of our Consumers are already connected if they have already been defined. - console.log(`Consumer[${topic}] checking connectivity!`) - const isConnected = await Consumer.isConnected(topic) - if (!isConnected) { - try { - console.log(`Consumer[${topic}] is connecting`) - await Consumer.getConsumer(topic).connect() - console.log(`Consumer[${topic}] is connected`) - if (assert) assert.pass(`Consumer[${topic}] is connected`) - } catch (err) { - console.log(`Consumer[${topic}] connection failed!`) - if (assert) assert.fail(`Consumer[${topic}] connection failed!`) - console.error(err) - } - } else { - console.log(`Consumer[${topic}] is ALREADY connected`) - } - } catch (err) { - console.log(`Consumer[${topic}] has not been initialized`) - if (assert) assert.fail(`Consumer[${topic}] has not been initialized`) - console.error(err) - } - } - }, - - disconnect: async (assert) => { - for (const topic of topics) { - try { - console.log(`Consumer[${topic}] disconnecting`) - await Consumer.getConsumer(topic).disconnect() - if (assert) assert.pass(`Consumer[${topic}] is disconnected`) - console.log(`Consumer[${topic}] disconnected`) - } catch (err) { - if (assert) assert.fail(err.message) - console.log(`Consumer[${topic}] disconnection failed`) - console.error(err) - } - } - } -} diff --git a/test/integration/helpers/participant.js b/test/integration/helpers/participant.js index 004985684..51444f1e3 100644 --- a/test/integration/helpers/participant.js +++ b/test/integration/helpers/participant.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -42,19 +45,24 @@ const testParticipant = { createdDate: new Date() } -exports.prepareData = async (name, currencyId = 'USD', secondaryCurrencyId = 'XXX', isUnique = true) => { +exports.prepareData = async (name, currencyId = 'USD', secondaryCurrencyId = null, isUnique = true, isProxy = false) => { try { const participantId = await Model.create(Object.assign( {}, testParticipant, { - name: (name || testParticipant.name) + (isUnique ? time.msToday().toString() : '') + name: (name || testParticipant.name) + (isUnique ? time.msToday().toString() : ''), + isProxy } )) const participantCurrencyId = await ParticipantCurrencyModel.create(participantId, currencyId, Enum.Accounts.LedgerAccountType.POSITION, false) const participantCurrencyId2 = await ParticipantCurrencyModel.create(participantId, currencyId, Enum.Accounts.LedgerAccountType.SETTLEMENT, false) - const participantCurrencyIdSecondary = await ParticipantCurrencyModel.create(participantId, secondaryCurrencyId, Enum.Accounts.LedgerAccountType.POSITION, false) - const participantCurrencyIdSecondary2 = await ParticipantCurrencyModel.create(participantId, secondaryCurrencyId, Enum.Accounts.LedgerAccountType.SETTLEMENT, false) + let participantCurrencyIdSecondary + let participantCurrencyIdSecondary2 + if (secondaryCurrencyId) { + participantCurrencyIdSecondary = await ParticipantCurrencyModel.create(participantId, secondaryCurrencyId, Enum.Accounts.LedgerAccountType.POSITION, false) + participantCurrencyIdSecondary2 = await ParticipantCurrencyModel.create(participantId, secondaryCurrencyId, Enum.Accounts.LedgerAccountType.SETTLEMENT, false) + } const participant = await Model.getById(participantId) return { participant, diff --git a/test/integration/helpers/participantEndpoint.js b/test/integration/helpers/participantEndpoint.js index 6dc49a080..ececdee9b 100644 --- a/test/integration/helpers/participantEndpoint.js +++ b/test/integration/helpers/participantEndpoint.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/integration/helpers/participantFundsInOut.js b/test/integration/helpers/participantFundsInOut.js index 0a2b1d5c4..32a00532e 100644 --- a/test/integration/helpers/participantFundsInOut.js +++ b/test/integration/helpers/participantFundsInOut.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/integration/helpers/participantLimit.js b/test/integration/helpers/participantLimit.js index 91f41d5b2..40e93387d 100644 --- a/test/integration/helpers/participantLimit.js +++ b/test/integration/helpers/participantLimit.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/integration/helpers/settlementModels.js b/test/integration/helpers/settlementModels.js index 975070586..5688eac80 100644 --- a/test/integration/helpers/settlementModels.js +++ b/test/integration/helpers/settlementModels.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -34,6 +37,7 @@ const Enums = require('../../../src/lib/enumCached') const ErrorHandler = require('@mojaloop/central-services-error-handling') const Db = require('@mojaloop/database-lib').Db const Cache = require('../../../src/lib/cache') +const ProxyCache = require('../../../src/lib/proxyCache') const ParticipantCached = require('../../../src/models/participant/participantCached') const ParticipantCurrencyCached = require('../../../src/models/participant/participantCurrencyCached') const ParticipantLimitCached = require('../../../src/models/participant/participantLimitCached') @@ -66,6 +70,7 @@ const settlementModels = [ exports.prepareData = async () => { await Db.connect(Config.DATABASE) + await ProxyCache.connect() await Enums.initialize() await ParticipantCached.initialize() await ParticipantCurrencyCached.initialize() diff --git a/test/integration/helpers/testConsumer.js b/test/integration/helpers/testConsumer.js index d154159d4..8a40fab9d 100644 --- a/test/integration/helpers/testConsumer.js +++ b/test/integration/helpers/testConsumer.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -27,8 +27,8 @@ ******/ 'use strict' -const Logger = require('@mojaloop/central-services-logger') const { uniqueId } = require('lodash') +const Logger = require('@mojaloop/central-services-logger') const Consumer = require('@mojaloop/central-services-stream').Kafka.Consumer /** @@ -55,12 +55,13 @@ class TestConsumer { config: handlerConfig.config } // Override the client and group ids: - handler.config.rdkafkaConf['client.id'] = 'testConsumer' + const id = uniqueId() + handler.config.rdkafkaConf['client.id'] = 'testConsumer' + id // Fix issue of consumers with different partition.assignment.strategy being assigned to the same group - handler.config.rdkafkaConf['group.id'] = 'testConsumerGroup' + uniqueId() + handler.config.rdkafkaConf['group.id'] = 'testConsumerGroup' + id delete handler.config.rdkafkaConf['partition.assignment.strategy'] - Logger.warn(`TestConsumer.startListening(): registering consumer with topicName: ${handler.topicName}`) + Logger.warn(`TestConsumer.startListening(): registering consumer with uniqueId ${id} - topicName: ${handler.topicName}`) const topics = [handler.topicName] const consumer = new Consumer(topics, handler.config) await consumer.connect() diff --git a/test/integration/helpers/testProducer.js b/test/integration/helpers/testProducer.js index f2b270726..537025f97 100644 --- a/test/integration/helpers/testProducer.js +++ b/test/integration/helpers/testProducer.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/integration/helpers/transfer.js b/test/integration/helpers/transfer.js index 387f33f93..068a62ff9 100644 --- a/test/integration/helpers/transfer.js +++ b/test/integration/helpers/transfer.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/integration/helpers/transferDuplicateCheck.js b/test/integration/helpers/transferDuplicateCheck.js index 220cc6b32..0dd28d5a7 100644 --- a/test/integration/helpers/transferDuplicateCheck.js +++ b/test/integration/helpers/transferDuplicateCheck.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/integration/helpers/transferError.js b/test/integration/helpers/transferError.js index e6ac446c3..e407685ce 100644 --- a/test/integration/helpers/transferError.js +++ b/test/integration/helpers/transferError.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/integration/helpers/transferExtension.js b/test/integration/helpers/transferExtension.js index 6265c8322..37a99c79d 100644 --- a/test/integration/helpers/transferExtension.js +++ b/test/integration/helpers/transferExtension.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/integration/helpers/transferState.js b/test/integration/helpers/transferState.js index 7273c5708..8cbccb780 100644 --- a/test/integration/helpers/transferState.js +++ b/test/integration/helpers/transferState.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/integration/helpers/transferStateChange.js b/test/integration/helpers/transferStateChange.js index 077bcbb08..e155c5cb1 100644 --- a/test/integration/helpers/transferStateChange.js +++ b/test/integration/helpers/transferStateChange.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/integration/helpers/transferTestHelper.js b/test/integration/helpers/transferTestHelper.js index 054dc6386..ad4abe189 100644 --- a/test/integration/helpers/transferTestHelper.js +++ b/test/integration/helpers/transferTestHelper.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -87,6 +90,7 @@ exports.prepareData = async () => { await TransferParticipantModel.saveTransferParticipant({ transferId: transferResult.transfer.transferId, + participantId: transferDuplicateCheckResult.participantPayerResult.participant.participantId, participantCurrencyId: transferDuplicateCheckResult.participantPayerResult.participantCurrencyId, transferParticipantRoleTypeId: Enum.Accounts.TransferParticipantRoleType.PAYER_DFSP, ledgerEntryTypeId: Enum.Accounts.LedgerAccountType.POSITION, @@ -95,6 +99,7 @@ exports.prepareData = async () => { await TransferParticipantModel.saveTransferParticipant({ transferId: transferResult.transfer.transferId, + participantId: transferDuplicateCheckResult.participantPayerResult.participant.participantId, participantCurrencyId: transferDuplicateCheckResult.participantPayeeResult.participantCurrencyId, transferParticipantRoleTypeId: Enum.Accounts.TransferParticipantRoleType.PAYEE_DFSP, ledgerEntryTypeId: Enum.Accounts.LedgerAccountType.POSITION, diff --git a/test/integration/models/participant/externalParticipant.test.js b/test/integration/models/participant/externalParticipant.test.js new file mode 100644 index 000000000..a39568bb9 --- /dev/null +++ b/test/integration/models/participant/externalParticipant.test.js @@ -0,0 +1,71 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Eugen Klymniuk + -------------- + **********/ + +const Test = require('tape') +const externalParticipant = require('#src/models/participant/externalParticipant') +const config = require('#src/lib/config') +const db = require('#src/lib/db') + +const fixtures = require('#test/fixtures') +const { tryCatchEndTest } = require('#test/util/helpers') + +Test('externalParticipant Model Tests -->', (epModelTest) => { + epModelTest.test('setup', tryCatchEndTest(async (t) => { + await db.connect(config.DATABASE) + t.ok(db.getKnex()) + t.pass('setup is done') + })) + + epModelTest.test('should throw error on inserting a record without related proxyId in participant table', tryCatchEndTest(async (t) => { + const err = await externalParticipant.create({ proxyId: 0, name: 'name' }) + .catch(e => e) + t.ok(err.cause.includes('ER_NO_REFERENCED_ROW_2')) + })) + + epModelTest.test('should not throw error on inserting a record, if the name already exists', tryCatchEndTest(async (t) => { + const { participantId } = await db.from('participant').findOne({}) + const name = `epName-${Date.now()}` + const data = fixtures.mockExternalParticipantDto({ + name, + proxyId: participantId, + id: null, + createdDate: null + }) + const created = await externalParticipant.create(data) + t.ok(created) + + const result = await externalParticipant.create(data) + t.equals(result, null) + })) + + epModelTest.test('teardown', tryCatchEndTest(async (t) => { + await db.disconnect() + t.pass('connections are closed') + })) + + epModelTest.end() +}) diff --git a/test/integration/models/transfer/facade.test.js b/test/integration/models/transfer/facade.test.js index 29b625f46..4a6432dd8 100644 --- a/test/integration/models/transfer/facade.test.js +++ b/test/integration/models/transfer/facade.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -32,6 +35,7 @@ const Test = require('tape') const Db = require('../../../../src/lib/db') const Cache = require('../../../../src/lib/cache') +const ProxyCache = require('../../../../src/lib/proxyCache') const Logger = require('@mojaloop/central-services-logger') const Config = require('../../../../src/lib/config') const TransferFacade = require('../../../../src/models/transfer/facade') @@ -44,6 +48,7 @@ Test('Transfer read model test', async (transferReadModelTest) => { try { await Db.connect(Config.DATABASE).then(async () => { await Cache.initCache() + await ProxyCache.connect() transferPrepareResult = await HelperModule.prepareNeededData('transferModel') assert.pass('setup OK') assert.end() @@ -88,6 +93,7 @@ Test('Transfer read model test', async (transferReadModelTest) => { try { await Cache.destroyCache() await Db.disconnect() + await ProxyCache.disconnect() assert.pass('database connection closed') assert.end() } catch (err) { diff --git a/test/integration/models/transfer/ilpPacket.test.js b/test/integration/models/transfer/ilpPacket.test.js index 41eaa0461..03cb98192 100644 --- a/test/integration/models/transfer/ilpPacket.test.js +++ b/test/integration/models/transfer/ilpPacket.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -30,6 +33,7 @@ const Test = require('tape') const Db = require('../../../../src/lib/db') +const ProxyCache = require('../../../../src/lib/proxyCache') const Cache = require('../../../../src/lib/cache') const Logger = require('@mojaloop/central-services-logger') const Config = require('../../../../src/lib/config') @@ -48,6 +52,7 @@ Test('Ilp service tests', async (ilpTest) => { await ilpTest.test('setup', async (assert) => { try { + await ProxyCache.connect() await Db.connect(Config.DATABASE).then(() => { assert.pass('setup OK') assert.end() @@ -178,6 +183,7 @@ Test('Ilp service tests', async (ilpTest) => { try { await Cache.destroyCache() await Db.disconnect() + await ProxyCache.disconnect() assert.pass('database connection closed') assert.end() } catch (err) { diff --git a/test/integration/models/transfer/transferError.test.js b/test/integration/models/transfer/transferError.test.js index 2c851ed55..c100b500d 100644 --- a/test/integration/models/transfer/transferError.test.js +++ b/test/integration/models/transfer/transferError.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -27,6 +30,7 @@ const Test = require('tape') const Db = require('../../../../src/lib/db') const Cache = require('../../../../src/lib/cache') +const ProxyCache = require('../../../../src/lib/proxyCache') const Logger = require('@mojaloop/central-services-logger') const Config = require('../../../../src/lib/config') const Model = require('../../../../src/models/transfer/transferError') @@ -38,6 +42,7 @@ Test('Transfer Error model test', async (transferErrorTest) => { try { await Db.connect(Config.DATABASE).then(async () => { await Cache.initCache() + await ProxyCache.connect() assert.pass('setup OK') assert.end() }).catch(err => { @@ -90,6 +95,7 @@ Test('Transfer Error model test', async (transferErrorTest) => { try { await Cache.destroyCache() await Db.disconnect() + await ProxyCache.disconnect() assert.pass('database connection closed') assert.end() } catch (err) { diff --git a/test/integration/models/transfer/transferExtension.test.js b/test/integration/models/transfer/transferExtension.test.js index cf943240b..0e5bbe6a0 100644 --- a/test/integration/models/transfer/transferExtension.test.js +++ b/test/integration/models/transfer/transferExtension.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -31,6 +34,7 @@ const Test = require('tape') const Db = require('../../../../src/lib/db') const Cache = require('../../../../src/lib/cache') +const ProxyCache = require('../../../../src/lib/proxyCache') const Logger = require('@mojaloop/central-services-logger') const Config = require('../../../../src/lib/config') const Model = require('../../../../src/models/transfer/transferExtension') @@ -52,6 +56,7 @@ Test('Extension model test', async (extensionTest) => { await extensionTest.test('setup', async (assert) => { try { + await ProxyCache.connect() await Db.connect(Config.DATABASE).then(() => { assert.pass('setup OK') assert.end() @@ -196,6 +201,7 @@ Test('Extension model test', async (extensionTest) => { try { await Cache.destroyCache() await Db.disconnect() + await ProxyCache.disconnect() assert.pass('database connection closed') assert.end() } catch (err) { diff --git a/test/integration/models/transfer/transferStateChange.test.js b/test/integration/models/transfer/transferStateChange.test.js index a1b33048c..84304fa0e 100644 --- a/test/integration/models/transfer/transferStateChange.test.js +++ b/test/integration/models/transfer/transferStateChange.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -31,6 +34,7 @@ const Test = require('tape') const Db = require('../../../../src/lib/db') const Cache = require('../../../../src/lib/cache') +const ProxyCache = require('../../../../src/lib/proxyCache') const Logger = require('@mojaloop/central-services-logger') const Config = require('../../../../src/lib/config') const Model = require('../../../../src/models/transfer/transferStateChange') @@ -45,6 +49,7 @@ Test('Transfer State Change model test', async (stateChangeTest) => { await stateChangeTest.test('setup', async (assert) => { try { await Db.connect(Config.DATABASE).then(async () => { + await ProxyCache.connect() await ParticipantCached.initialize() await ParticipantCurrencyCached.initialize() await ParticipantLimitCached.initialize() @@ -127,6 +132,7 @@ Test('Transfer State Change model test', async (stateChangeTest) => { try { await Cache.destroyCache() await Db.disconnect() + await ProxyCache.disconnect() assert.pass('database connection closed') assert.end() } catch (err) { diff --git a/test/scripts/test-functional.sh b/test/scripts/test-functional.sh old mode 100644 new mode 100755 index 5dea98e0f..255c24447 --- a/test/scripts/test-functional.sh +++ b/test/scripts/test-functional.sh @@ -4,10 +4,10 @@ echo "--=== Running Functional Test Runner ===--" echo CENTRAL_LEDGER_VERSION=${CENTRAL_LEDGER_VERSION:-"local"} -ML_CORE_TEST_HARNESS_VERSION=${ML_CORE_TEST_HARNESS_VERSION:-"v1.1.1"} +ML_CORE_TEST_HARNESS_VERSION=${ML_CORE_TEST_HARNESS_VERSION:-"v1.2.4-fx-snapshot.12"} ML_CORE_TEST_HARNESS_GIT=${ML_CORE_TEST_HARNESS_GIT:-"https://github.com/mojaloop/ml-core-test-harness.git"} -ML_CORE_TEST_HARNESS_TEST_PROV_CONT_NAME=${ML_CORE_TEST_HARNESS_TEST_PROV_CONT_NAME:-"ttk-func-ttk-provisioning-1"} -ML_CORE_TEST_HARNESS_TEST_FUNC_CONT_NAME=${ML_CORE_TEST_HARNESS_TEST_FUNC_CONT_NAME:-"ttk-func-ttk-tests-1"} +ML_CORE_TEST_HARNESS_TEST_PROV_CONT_NAME=${ML_CORE_TEST_HARNESS_TEST_PROV_CONT_NAME:-"ttk-func-ttk-provisioning-fx-1"} +ML_CORE_TEST_HARNESS_TEST_FUNC_CONT_NAME=${ML_CORE_TEST_HARNESS_TEST_FUNC_CONT_NAME:-"ttk-func-ttk-fx-tests-1"} ML_CORE_TEST_HARNESS_DIR=${ML_CORE_TEST_HARNESS_DIR:-"/tmp/ml-api-adapter-core-test-harness"} ML_CORE_TEST_SKIP_SHUTDOWN=${ML_CORE_TEST_SKIP_SHUTDOWN:-false} @@ -24,7 +24,7 @@ echo "==> Cloning $ML_CORE_TEST_HARNESS_GIT:$ML_CORE_TEST_HARNESS_VERSION into d git clone --depth 1 --branch $ML_CORE_TEST_HARNESS_VERSION $ML_CORE_TEST_HARNESS_GIT $ML_CORE_TEST_HARNESS_DIR echo "==> Copying configs from ./docker/config-modifier/*.* to $ML_CORE_TEST_HARNESS_DIR/docker/config-modifier/configs/" -cp -f ./docker/config-modifier/*.* $ML_CORE_TEST_HARNESS_DIR/docker/config-modifier/configs/ +cp -rf ./docker/config-modifier/configs/* $ML_CORE_TEST_HARNESS_DIR/docker/config-modifier/configs/ ## Set initial exit code value to 1 (i.e. assume error!) TTK_FUNC_TEST_EXIT_CODE=1 @@ -37,7 +37,7 @@ pushd $ML_CORE_TEST_HARNESS_DIR ## Start the test harness echo "==> Starting Docker compose" - docker compose --project-name ttk-func --ansi never --profile all-services --profile ttk-provisioning --profile ttk-tests up -d + docker compose --project-name ttk-func --ansi never --profile testing-toolkit --profile fx --profile ttk-provisioning-fx --profile ttk-fx-tests up -d echo "==> Running wait-for-container.sh $ML_CORE_TEST_HARNESS_TEST_FUNC_CONT_NAME" ## Wait for the test harness to complete, and capture the exit code @@ -59,7 +59,7 @@ pushd $ML_CORE_TEST_HARNESS_DIR echo "==> Skipping test harness shutdown" else echo "==> Shutting down test harness" - docker compose --project-name ttk-func --ansi never --profile all-services --profile ttk-provisioning --profile ttk-tests down -v + docker compose --project-name ttk-func --ansi never --profile testing-toolkit --profile fx --profile ttk-provisioning-fx --profile ttk-fx-tests down -v fi ## Dump log to console diff --git a/test/scripts/test-integration.sh b/test/scripts/test-integration.sh old mode 100644 new mode 100755 index faffe3988..ef93080aa --- a/test/scripts/test-integration.sh +++ b/test/scripts/test-integration.sh @@ -18,10 +18,13 @@ TTK_FUNC_TEST_EXIT_CODE=1 ## Make reports directory mkdir ./test/results +## Set environment variables +source ./docker/env.sh + ## Start backend services echo "==> Starting Docker backend services" -docker compose pull mysql kafka init-kafka -docker compose up -d mysql kafka init-kafka +docker compose pull mysql kafka init-kafka redis-node-0 +docker compose up -d mysql kafka init-kafka redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5 docker compose ps npm run wait-4-docker @@ -49,8 +52,8 @@ echo "==> integration tests exited with code: $INTEGRATION_TEST_EXIT_CODE" ## Kill service echo "Stopping Service with Process ID=$PID" -kill $(cat /tmp/int-test-service.pid) -kill $(lsof -t -i:3001) +kill -9 $(cat /tmp/int-test-service.pid) +kill -9 $(lsof -t -i:3001) ## Give some time before restarting service for override tests sleep $WAIT_FOR_REBALANCE @@ -60,6 +63,11 @@ echo "Starting Service in the background" export CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__PREPARE='topic-transfer-position-batch' export CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__COMMIT='topic-transfer-position-batch' export CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__RESERVE='topic-transfer-position-batch' +export CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__TIMEOUT_RESERVED='topic-transfer-position-batch' +export CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__FX_TIMEOUT_RESERVED='topic-transfer-position-batch' +export CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__ABORT='topic-transfer-position-batch' +export CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__FX_ABORT='topic-transfer-position-batch' + npm start > ./test/results/cl-service-override.log & ## Store PID for cleanup echo $! > /tmp/int-test-service.pid @@ -69,6 +77,10 @@ echo $! > /tmp/int-test-handler.pid unset CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__PREPARE unset CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__COMMIT unset CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__RESERVE +unset CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__TIMEOUT_RESERVED +unset CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__FX_TIMEOUT_RESERVED +unset CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__ABORT +unset CLEDG_KAFKA__EVENT_TYPE_ACTION_TOPIC_MAP__POSITION__FX_ABORT PID1=$(cat /tmp/int-test-service.pid) echo "Service started with Process ID=$PID1" @@ -91,10 +103,10 @@ echo "==> override integration tests exited with code: $OVERRIDE_INTEGRATION_TES ## Kill service echo "Stopping Service with Process ID=$PID1" -kill $(cat /tmp/int-test-service.pid) -kill $(lsof -t -i:3001) +kill -9 $(cat /tmp/int-test-service.pid) +kill -9 $(lsof -t -i:3001) echo "Stopping Service with Process ID=$PID2" -kill $(cat /tmp/int-test-handler.pid) +kill -9 $(cat /tmp/int-test-handler.pid) ## Shutdown the backend services if [ $INT_TEST_SKIP_SHUTDOWN == true ]; then diff --git a/test/unit/api/index.test.js b/test/unit/api/index.test.js index fbfa37bd9..5f277aba1 100644 --- a/test/unit/api/index.test.js +++ b/test/unit/api/index.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -29,6 +32,7 @@ const Sinon = require('sinon') const Logger = require('@mojaloop/central-services-logger') const Config = require('../../../src/lib/config') +const ProxyCache = require('#src/lib/proxyCache') const Routes = require('../../../src/api/routes') const Setup = require('../../../src/shared/setup') @@ -39,6 +43,10 @@ Test('Api index', indexTest => { sandbox = Sinon.createSandbox() sandbox.stub(Setup) sandbox.stub(Logger) + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub() + }) test.end() }) @@ -66,6 +74,7 @@ Test('Api index', indexTest => { runMigrations: true, runHandlers: !Config.HANDLERS_DISABLED })) + test.end() }) exportTest.end() diff --git a/test/unit/api/ledgerAccountTypes/handler.test.js b/test/unit/api/ledgerAccountTypes/handler.test.js index 7a8e82530..fbc3359a3 100644 --- a/test/unit/api/ledgerAccountTypes/handler.test.js +++ b/test/unit/api/ledgerAccountTypes/handler.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -29,6 +32,7 @@ const Sinon = require('sinon') const Logger = require('@mojaloop/central-services-logger') const Handler = require('../../../../src/api/ledgerAccountTypes/handler') const LedgerAccountTypeService = require('../../../../src/domain/ledgerAccountTypes') +const ProxyCache = require('#src/lib/proxyCache') Test('LedgerAccountTypes', ledgerAccountTypesHandlerTest => { let sandbox @@ -37,6 +41,11 @@ Test('LedgerAccountTypes', ledgerAccountTypesHandlerTest => { sandbox = Sinon.createSandbox() sandbox.stub(Logger) sandbox.stub(LedgerAccountTypeService) + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub(), + healthCheck: sandbox.stub().resolves() + }) test.end() }) diff --git a/test/unit/api/ledgerAccountTypes/routes.test.js b/test/unit/api/ledgerAccountTypes/routes.test.js index 693c7d3e1..c8e6c4996 100644 --- a/test/unit/api/ledgerAccountTypes/routes.test.js +++ b/test/unit/api/ledgerAccountTypes/routes.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/api/metrics/handler.test.js b/test/unit/api/metrics/handler.test.js index 1163c94e4..9f68e6680 100644 --- a/test/unit/api/metrics/handler.test.js +++ b/test/unit/api/metrics/handler.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -28,6 +31,7 @@ const Test = require('tapes')(require('tape')) const Sinon = require('sinon') const Handler = require('../../../../src/api/metrics/handler') const Metrics = require('@mojaloop/central-services-metrics') +const ProxyCache = require('#src/lib/proxyCache') function createRequest (routes) { const value = routes || [] @@ -45,6 +49,11 @@ Test('metrics handler', (handlerTest) => { handlerTest.beforeEach(t => { sandbox = Sinon.createSandbox() sandbox.stub(Metrics) + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub(), + healthCheck: sandbox.stub().resolves() + }) t.end() }) diff --git a/test/unit/api/metrics/plugin.test.js b/test/unit/api/metrics/plugin.test.js index ac5b78670..3857741a9 100644 --- a/test/unit/api/metrics/plugin.test.js +++ b/test/unit/api/metrics/plugin.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/api/participants/handler.test.js b/test/unit/api/participants/handler.test.js index 0fa165d07..97a3694c2 100644 --- a/test/unit/api/participants/handler.test.js +++ b/test/unit/api/participants/handler.test.js @@ -9,6 +9,8 @@ const Participant = require('../../../../src/domain/participant') const EnumCached = require('../../../../src/lib/enumCached') const FSPIOPError = require('@mojaloop/central-services-error-handling').Factory.FSPIOPError const SettlementModel = require('../../../../src/domain/settlement') +const ProxyCache = require('#src/lib/proxyCache') +const Config = require('#src/lib/config') const createRequest = ({ payload, params, query }) => { const sandbox = Sinon.createSandbox() @@ -43,7 +45,8 @@ Test('Participant', participantHandlerTest => { currencyList: [ { participantCurrencyId: 1, currencyId: 'USD', ledgerAccountTypeId: 1, isActive: 1, createdBy: 'unknown', createdDate: '2018-07-17T16:04:24.185Z' }, { participantCurrencyId: 2, currencyId: 'USD', ledgerAccountTypeId: 2, isActive: 1, createdBy: 'unknown', createdDate: '2018-07-17T16:04:24.185Z' } - ] + ], + isProxy: 0 }, { participantId: 2, @@ -54,7 +57,8 @@ Test('Participant', participantHandlerTest => { currencyList: [ { participantCurrencyId: 3, currencyId: 'EUR', ledgerAccountTypeId: 1, isActive: 1, createdBy: 'unknown', createdDate: '2018-07-17T16:04:24.185Z' }, { participantCurrencyId: 4, currencyId: 'EUR', ledgerAccountTypeId: 2, isActive: 1, createdBy: 'unknown', createdDate: '2018-07-17T16:04:24.185Z' } - ] + ], + isProxy: 0 }, { participantId: 3, @@ -64,48 +68,78 @@ Test('Participant', participantHandlerTest => { createdDate: '2018-07-17T16:04:24.185Z', currencyList: [ { participantCurrencyId: 5, currencyId: 'USD', ledgerAccountTypeId: 5, isActive: 1, createdBy: 'unknown', createdDate: '2018-07-17T16:04:24.185Z' } - ] + ], + isProxy: 0 + }, + { + participantId: 4, + name: 'xnProxy', + currency: 'EUR', + isActive: 1, + createdDate: '2018-07-17T16:04:24.185Z', + currencyList: [ + { participantCurrencyId: 6, currencyId: 'EUR', ledgerAccountTypeId: 1, isActive: 1, createdBy: 'unknown', createdDate: '2018-07-17T16:04:24.185Z' }, + { participantCurrencyId: 7, currencyId: 'EUR', ledgerAccountTypeId: 2, isActive: 1, createdBy: 'unknown', createdDate: '2018-07-17T16:04:24.185Z' } + ], + isProxy: 1 } ] const participantResults = [ { name: 'fsp1', - id: 'http://central-ledger/participants/fsp1', + id: 'https://central-ledger/participants/fsp1', created: '2018-07-17T16:04:24.185Z', isActive: 1, links: { - self: 'http://central-ledger/participants/fsp1' + self: 'https://central-ledger/participants/fsp1' }, accounts: [ { id: 1, currency: 'USD', ledgerAccountType: 'POSITION', isActive: 1, createdBy: 'unknown', createdDate: new Date('2018-07-17T16:04:24.185Z') }, { id: 2, currency: 'USD', ledgerAccountType: 'SETTLEMENT', isActive: 1, createdBy: 'unknown', createdDate: new Date('2018-07-17T16:04:24.185Z') } - ] + ], + isProxy: 0 }, { name: 'fsp2', - id: 'http://central-ledger/participants/fsp2', + id: 'https://central-ledger/participants/fsp2', created: '2018-07-17T16:04:24.185Z', isActive: 1, links: { - self: 'http://central-ledger/participants/fsp2' + self: 'https://central-ledger/participants/fsp2' }, accounts: [ { id: 3, currency: 'EUR', ledgerAccountType: 'POSITION', isActive: 1, createdBy: 'unknown', createdDate: new Date('2018-07-17T16:04:24.185Z') }, { id: 4, currency: 'EUR', ledgerAccountType: 'SETTLEMENT', isActive: 1, createdBy: 'unknown', createdDate: new Date('2018-07-17T16:04:24.185Z') } - ] + ], + isProxy: 0 }, { name: 'Hub', - id: 'http://central-ledger/participants/Hub', + id: 'https://central-ledger/participants/Hub', created: '2018-07-17T16:04:24.185Z', isActive: 1, links: { - self: 'http://central-ledger/participants/Hub' + self: 'https://central-ledger/participants/Hub' }, accounts: [ { id: 5, currency: 'USD', ledgerAccountType: 'HUB_FEE', isActive: 1, createdBy: 'unknown', createdDate: new Date('2018-07-17T16:04:24.185Z') } - ] + ], + isProxy: 0 + }, + { + name: 'xnProxy', + id: 'https://central-ledger/participants/xnProxy', + created: '2018-07-17T16:04:24.185Z', + isActive: 1, + links: { + self: 'https://central-ledger/participants/xnProxy' + }, + accounts: [ + { id: 6, currency: 'EUR', ledgerAccountType: 'POSITION', isActive: 1, createdBy: 'unknown', createdDate: new Date('2018-07-17T16:04:24.185Z') }, + { id: 7, currency: 'EUR', ledgerAccountType: 'SETTLEMENT', isActive: 1, createdBy: 'unknown', createdDate: new Date('2018-07-17T16:04:24.185Z') } + ], + isProxy: 1 } ] const settlementModelFixtures = [ @@ -131,6 +165,12 @@ Test('Participant', participantHandlerTest => { sandbox.stub(Participant) sandbox.stub(EnumCached) sandbox.stub(SettlementModel, 'getAll') + sandbox.stub(Config, 'HOSTNAME').value('https://central-ledger') + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub(), + healthCheck: sandbox.stub().resolves() + }) EnumCached.getEnums.returns(Promise.resolve({ POSITION: 1, SETTLEMENT: 2, HUB_RECONCILIATION: 3, HUB_MULTILATERAL_SETTLEMENT: 4, HUB_FEE: 5 })) Logger.isDebugEnabled = true test.end() @@ -149,6 +189,13 @@ Test('Participant', participantHandlerTest => { test.end() }) + handlerTest.test('getAll should return all proxies when isProxy query is true', async function (test) { + Participant.getAll.returns(Promise.resolve(participantFixtures)) + const result = await Handler.getAll(createRequest({ query: { isProxy: true } })) + test.deepEqual(result, participantResults.filter(record => record.isProxy), 'The results match') + test.end() + }) + handlerTest.test('getByName should return the participant', async function (test) { Participant.getByName.withArgs(participantFixtures[0].name).returns(Promise.resolve(participantFixtures[0])) const result = await Handler.getByName(createRequest({ params: { name: participantFixtures[0].name } })) @@ -236,7 +283,8 @@ Test('Participant', participantHandlerTest => { name: 'fsp1', currency: 'USD', isActive: 1, - createdDate: '2018-07-17T16:04:24.185Z' + createdDate: '2018-07-17T16:04:24.185Z', + isProxy: 0 } const participantCurrencyId1 = 1 @@ -327,7 +375,8 @@ Test('Participant', participantHandlerTest => { currency: 'USD', isActive: 1, createdDate: '2018-07-17T16:04:24.185Z', - currencyList: [] + currencyList: [], + isProxy: 0 } const participantCurrencyId1 = 1 @@ -1231,7 +1280,8 @@ Test('Participant', participantHandlerTest => { isActive: 1, createdDate: '2018-07-17T16:04:24.185Z', createdBy: 'unknown', - currencyList: [] + currencyList: [], + isProxy: 0 } const ledgerAccountType = { ledgerAccountTypeId: 5, diff --git a/test/unit/api/participants/routes.test.js b/test/unit/api/participants/routes.test.js index b39f42cc8..45839553c 100644 --- a/test/unit/api/participants/routes.test.js +++ b/test/unit/api/participants/routes.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/api/root/handler.test.js b/test/unit/api/root/handler.test.js index e84d7e8f4..1680e3c5b 100644 --- a/test/unit/api/root/handler.test.js +++ b/test/unit/api/root/handler.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -28,19 +31,29 @@ const Test = require('tapes')(require('tape')) const Joi = require('joi') const Sinon = require('sinon') -const Handler = require('../../../../src/api/root/handler') const Consumer = require('@mojaloop/central-services-stream').Util.Consumer const MigrationLockModel = require('../../../../src/models/misc/migrationLock') +const ProxyCache = require('#src/lib/proxyCache') +const Config = require('#src/lib/config') const { createRequest, unwrapResponse } = require('../../../util/helpers') +const requireUncached = module => { + delete require.cache[require.resolve(module)] + return require(module) +} + Test('Root', rootHandlerTest => { let sandbox - rootHandlerTest.beforeEach(test => { sandbox = Sinon.createSandbox() + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub(), + healthCheck: sandbox.stub().returns(Promise.resolve(true)) + }) test.end() }) @@ -54,6 +67,43 @@ Test('Root', rootHandlerTest => { rootHandlerTest.test('Handler Test', async handlerTest => { handlerTest.test('getHealth returns the detailed health check', async function (test) { // Arrange + const Handler = requireUncached('../../../../src/api/root/handler') + sandbox.stub(MigrationLockModel, 'getIsMigrationLocked').returns(false) + sandbox.stub(Consumer, 'getListOfTopics').returns(['admin']) + sandbox.stub(Consumer, 'isConnected').returns(Promise.resolve()) + const schema = Joi.compile({ + status: Joi.string().valid('OK').required(), + uptime: Joi.number().required(), + startTime: Joi.date().iso().required(), + versionNumber: Joi.string().required(), + services: Joi.array().required() + }) + const expectedStatus = 200 + const expectedServices = [ + { name: 'datastore', status: 'OK' }, + { name: 'broker', status: 'OK' }, + { name: 'proxyCache', status: 'OK' } + ] + + // Act + const { + responseBody, + responseCode + } = await unwrapResponse((reply) => Handler.getHealth(createRequest({}), reply)) + + // Assert + const validationResult = Joi.attempt(responseBody, schema) // We use Joi to validate the results as they rely on timestamps that are variable + test.equal(validationResult.error, undefined, 'The response matches the validation schema') + test.deepEqual(responseCode, expectedStatus, 'The response code matches') + test.deepEqual(responseBody.services, expectedServices, 'The sub-services are correct') + test.end() + }) + + handlerTest.test('getHealth returns the detailed health check without proxyCache if disabled', async function (test) { + // Arrange + Config.PROXY_CACHE_CONFIG.enabled = false + const Handler = requireUncached('../../../../src/api/root/handler') + sandbox.stub(MigrationLockModel, 'getIsMigrationLocked').returns(false) sandbox.stub(Consumer, 'getListOfTopics').returns(['admin']) sandbox.stub(Consumer, 'isConnected').returns(Promise.resolve()) diff --git a/test/unit/api/root/routes.test.js b/test/unit/api/root/routes.test.js index ad6378067..877ac412a 100644 --- a/test/unit/api/root/routes.test.js +++ b/test/unit/api/root/routes.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -29,18 +32,31 @@ const Base = require('../../base') const AdminRoutes = require('../../../../src/api/routes') const Sinon = require('sinon') const Enums = require('../../../../src/lib/enumCached') +const ProxyCache = require('#src/lib/proxyCache') Test('test root routes - health', async function (assert) { + const sandbox = Sinon.createSandbox() + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub(), + healthCheck: sandbox.stub().resolves() + }) const req = Base.buildRequest({ url: '/health', method: 'GET' }) const server = await Base.setup(AdminRoutes) const res = await server.inject(req) assert.ok(res) await server.stop() + sandbox.restore() assert.end() }) Test('test root routes - enums', async function (assert) { const sandbox = Sinon.createSandbox() + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub(), + healthCheck: sandbox.stub().resolves() + }) sandbox.stub(Enums, 'getEnums').returns(Promise.resolve({})) const req = Base.buildRequest({ url: '/enums', method: 'GET' }) const server = await Base.setup(AdminRoutes) @@ -52,10 +68,17 @@ Test('test root routes - enums', async function (assert) { }) Test('test root routes - /', async function (assert) { + const sandbox = Sinon.createSandbox() + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub(), + healthCheck: sandbox.stub().resolves() + }) const req = Base.buildRequest({ url: '/', method: 'GET' }) const server = await Base.setup(AdminRoutes) const res = await server.inject(req) assert.ok(res) await server.stop() + sandbox.restore() assert.end() }) diff --git a/test/unit/api/routes.test.js b/test/unit/api/routes.test.js index 8a12ba533..6a5e1187d 100644 --- a/test/unit/api/routes.test.js +++ b/test/unit/api/routes.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -27,12 +30,21 @@ const Test = require('tape') const Base = require('../base') const ApiRoutes = require('../../../src/api/routes') +const ProxyCache = require('#src/lib/proxyCache') +const Sinon = require('sinon') Test('test health', async function (assert) { + const sandbox = Sinon.createSandbox() + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub(), + healthCheck: sandbox.stub().resolves() + }) const req = Base.buildRequest({ url: '/health', method: 'GET' }) const server = await Base.setup(ApiRoutes) const res = await server.inject(req) assert.ok(res) await server.stop() + sandbox.restore() assert.end() }) diff --git a/test/unit/api/settlementModels/handler.test.js b/test/unit/api/settlementModels/handler.test.js index 98b826f31..b2682e541 100644 --- a/test/unit/api/settlementModels/handler.test.js +++ b/test/unit/api/settlementModels/handler.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -32,6 +35,7 @@ const Handler = require('../../../../src/api/settlementModels/handler') const SettlementService = require('../../../../src/domain/settlement') const EnumCached = require('../../../../src/lib/enumCached') const FSPIOPError = require('@mojaloop/central-services-error-handling').Factory.FSPIOPError +const ProxyCache = require('#src/lib/proxyCache') const createRequest = ({ payload, params, query }) => { const sandbox = Sinon.createSandbox() @@ -97,6 +101,11 @@ Test('SettlementModel', settlementModelHandlerTest => { sandbox.stub(Logger) sandbox.stub(SettlementService) sandbox.stub(EnumCached) + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub(), + healthCheck: sandbox.stub().resolves() + }) EnumCached.getEnums.returns(Promise.resolve({ POSITION: 1, SETTLEMENT: 2, HUB_RECONCILIATION: 3, HUB_MULTILATERAL_SETTLEMENT: 4, HUB_FEE: 5 })) test.end() }) diff --git a/test/unit/api/settlementModels/routes.test.js b/test/unit/api/settlementModels/routes.test.js index 900d0facc..ead96f5e4 100644 --- a/test/unit/api/settlementModels/routes.test.js +++ b/test/unit/api/settlementModels/routes.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/api/transactions/handler.test.js b/test/unit/api/transactions/handler.test.js index 73502dba7..bf6fab3e4 100644 --- a/test/unit/api/transactions/handler.test.js +++ b/test/unit/api/transactions/handler.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -28,6 +31,7 @@ const Test = require('tapes')(require('tape')) const Sinon = require('sinon') const Handler = require('../../../../src/api/transactions/handler') const TransactionsService = require('../../../../src/domain/transactions') +const ProxyCache = require('#src/lib/proxyCache') Test('IlpPackets', IlpPacketsHandlerTest => { let sandbox @@ -74,6 +78,11 @@ Test('IlpPackets', IlpPacketsHandlerTest => { IlpPacketsHandlerTest.beforeEach(test => { sandbox = Sinon.createSandbox() sandbox.stub(TransactionsService) + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub(), + healthCheck: sandbox.stub().resolves() + }) test.end() }) diff --git a/test/unit/api/transactions/routes.test.js b/test/unit/api/transactions/routes.test.js index ae9ca8305..f6981ab3e 100644 --- a/test/unit/api/transactions/routes.test.js +++ b/test/unit/api/transactions/routes.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/base.js b/test/unit/base.js index f9adcd291..de53f15a1 100644 --- a/test/unit/base.js +++ b/test/unit/base.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/domain/fx/cyril.test.js b/test/unit/domain/fx/cyril.test.js new file mode 100644 index 000000000..041538142 --- /dev/null +++ b/test/unit/domain/fx/cyril.test.js @@ -0,0 +1,1228 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ + +'use strict' + +const Test = require('tapes')(require('tape')) +const Sinon = require('sinon') +const Cyril = require('../../../../src/domain/fx/cyril') +const Logger = require('@mojaloop/central-services-logger') +const { Enum } = require('@mojaloop/central-services-shared') +const TransferModel = require('../../../../src/models/transfer/transfer') +const TransferFacade = require('../../../../src/models/transfer/facade') +const ParticipantFacade = require('../../../../src/models/participant/facade') +const ParticipantPositionChangesModel = require('../../../../src/models/position/participantPositionChanges') +const { fxTransfer, watchList } = require('../../../../src/models/fxTransfer') +const ProxyCache = require('../../../../src/lib/proxyCache') +const config = require('#src/lib/config') + +const defaultGetProxyParticipantAccountDetailsResponse = { inScheme: true, participantCurrencyId: 1 } + +Test('Cyril', cyrilTest => { + let sandbox + let fxPayload + let payload + cyrilTest.beforeEach(t => { + sandbox = Sinon.createSandbox() + sandbox.stub(Logger, 'isDebugEnabled').value(true) + sandbox.stub(watchList) + sandbox.stub(fxTransfer) + sandbox.stub(TransferModel) + sandbox.stub(ParticipantFacade) + sandbox.stub(ProxyCache) + sandbox.stub(ParticipantPositionChangesModel) + sandbox.stub(TransferFacade) + payload = { + transferId: 'b51ec534-ee48-4575-b6a9-ead2955b8999', + payerFsp: 'dfsp1', + payeeFsp: 'dfsp2', + amount: { + currency: 'USD', + amount: '433.88' + }, + ilpPacket: 'AYIBgQAAAAAAAASwNGxldmVsb25lLmRmc3AxLm1lci45T2RTOF81MDdqUUZERmZlakgyOVc4bXFmNEpLMHlGTFGCAUBQU0svMS4wCk5vbmNlOiB1SXlweUYzY3pYSXBFdzVVc05TYWh3CkVuY3J5cHRpb246IG5vbmUKUGF5bWVudC1JZDogMTMyMzZhM2ItOGZhOC00MTYzLTg0NDctNGMzZWQzZGE5OGE3CgpDb250ZW50LUxlbmd0aDogMTM1CkNvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbgpTZW5kZXItSWRlbnRpZmllcjogOTI4MDYzOTEKCiJ7XCJmZWVcIjowLFwidHJhbnNmZXJDb2RlXCI6XCJpbnZvaWNlXCIsXCJkZWJpdE5hbWVcIjpcImFsaWNlIGNvb3BlclwiLFwiY3JlZGl0TmFtZVwiOlwibWVyIGNoYW50XCIsXCJkZWJpdElkZW50aWZpZXJcIjpcIjkyODA2MzkxXCJ9IgA', + condition: 'YlK5TZyhflbXaDRPtR5zhCu8FrbgvrQwwmzuH0iQ0AI', + expiration: new Date((new Date()).getTime() + (24 * 60 * 60 * 1000)), // tomorrow + extensionList: { + extension: [ + { + key: 'key1', + value: 'value1' + }, + { + key: 'key2', + value: 'value2' + } + ] + } + } + + fxPayload = { + commitRequestId: '88622a75-5bde-4da4-a6cc-f4cd23b268c4', + determiningTransferId: 'c05c3f31-33b5-4e33-8bfd-7c3a2685fb6c', + condition: 'YlK5TZyhflbXaDRPtR5zhCu8FrbgvrQwwmzuH0iQ0AI', + expiration: new Date((new Date()).getTime() + (24 * 60 * 60 * 1000)), // tomorrow + initiatingFsp: 'fx_dfsp1', + counterPartyFsp: 'fx_dfsp2', + sourceAmount: { + currency: 'USD', + amount: '433.88' + }, + targetAmount: { + currency: 'EUR', + amount: '200.00' + } + } + + t.end() + }) + + cyrilTest.afterEach(t => { + sandbox.restore() + t.end() + }) + + cyrilTest.test('getParticipantAndCurrencyForTransferMessage should', getParticipantAndCurrencyForTransferMessageTest => { + getParticipantAndCurrencyForTransferMessageTest.test('return details about regular transfer', async (test) => { + try { + watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve([])) + const determiningTransferCheckResult = await Cyril.checkIfDeterminingTransferExistsForTransferMessage(payload, + { + isCounterPartyFspProxy: false, + isInitiatingFspProxy: false + } + ) + const result = await Cyril.getParticipantAndCurrencyForTransferMessage(payload, determiningTransferCheckResult) + + test.deepEqual(result, { + participantName: 'dfsp1', + currencyId: 'USD', + amount: '433.88' + }) + test.ok(watchList.getItemsInWatchListByDeterminingTransferId.calledWith(payload.transferId)) + test.pass('Error not thrown') + test.end() + } catch (e) { + test.fail('Error Thrown') + test.end() + } + }) + + getParticipantAndCurrencyForTransferMessageTest.test('return details about fxtransfer', async (test) => { + try { + watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve([ + { + commitRequestId: fxPayload.commitRequestId, + determiningTransferId: fxPayload.determiningTransferId, + fxTransferTypeId: Enum.Fx.FxTransferType.PAYER_CONVERSION, + createdDate: new Date() + } + ])) + fxTransfer.getAllDetailsByCommitRequestId.withArgs( + fxPayload.commitRequestId + ).returns(Promise.resolve( + { + targetAmount: fxPayload.targetAmount.amount, + targetCurrency: fxPayload.targetAmount.currency, + counterPartyFspName: 'fx_dfsp2' + } + )) + const determiningTransferCheckResult = await Cyril.checkIfDeterminingTransferExistsForTransferMessage(payload, + { + isCounterPartyFspProxy: false, + isInitiatingFspProxy: false + } + ) + const result = await Cyril.getParticipantAndCurrencyForTransferMessage( + payload, + determiningTransferCheckResult, + { isCounterPartyFspProxy: false } + ) + + test.deepEqual(result, { + participantName: 'fx_dfsp2', + currencyId: 'EUR', + amount: '200.00' + }) + test.ok(watchList.getItemsInWatchListByDeterminingTransferId.calledWith(payload.transferId)) + test.ok(fxTransfer.getAllDetailsByCommitRequestId.calledWith(fxPayload.commitRequestId)) + test.pass('Error not thrown') + test.end() + } catch (e) { + console.log(e) + test.fail('Error Thrown') + test.end() + } + }) + + getParticipantAndCurrencyForTransferMessageTest.test('return details about proxied fxtransfer', async (test) => { + try { + watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve([ + { + commitRequestId: fxPayload.commitRequestId, + determiningTransferId: fxPayload.determiningTransferId, + fxTransferTypeId: Enum.Fx.FxTransferType.PAYER_CONVERSION, + createdDate: new Date() + } + ])) + fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.withArgs( + fxPayload.commitRequestId + ).returns(Promise.resolve( + { + targetAmount: fxPayload.targetAmount.amount, + targetCurrency: fxPayload.targetAmount.currency, + counterPartyFspName: 'fx_dfsp2' + } + )) + const determiningTransferCheckResult = await Cyril.checkIfDeterminingTransferExistsForTransferMessage(payload, + { + isCounterPartyFspProxy: true, + isInitiatingFspProxy: false + } + ) + const result = await Cyril.getParticipantAndCurrencyForTransferMessage( + payload, + determiningTransferCheckResult, + { isCounterPartyFspProxy: true } + ) + + test.deepEqual(result, { + participantName: 'fx_dfsp2', + currencyId: 'EUR', + amount: '200.00' + }) + test.ok(watchList.getItemsInWatchListByDeterminingTransferId.calledWith(payload.transferId)) + test.ok(fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.calledWith(fxPayload.commitRequestId)) + test.pass('Error not thrown') + test.end() + } catch (e) { + console.log(e) + test.fail('Error Thrown') + test.end() + } + }) + + getParticipantAndCurrencyForTransferMessageTest.test('skips adding payee participantCurrency for validation when payee has proxy representation', async (test) => { + try { + watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve([ + { + commitRequestId: fxPayload.commitRequestId, + determiningTransferId: fxPayload.determiningTransferId, + fxTransferTypeId: Enum.Fx.FxTransferType.PAYER_CONVERSION, + createdDate: new Date() + } + ])) + fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.withArgs( + fxPayload.commitRequestId + ).returns(Promise.resolve( + { + targetAmount: fxPayload.targetAmount.amount, + targetCurrency: fxPayload.targetAmount.currency, + counterPartyFspName: 'fx_dfsp2' + } + )) + + const determiningTransferCheckResult = await Cyril.checkIfDeterminingTransferExistsForTransferMessage(payload, + { + isCounterPartyFspProxy: true, + isInitiatingFspProxy: false + } + ) + test.deepEqual(determiningTransferCheckResult.participantCurrencyValidationList, []) + test.pass('Error not thrown') + test.end() + } catch (e) { + console.log(e) + test.fail('Error Thrown') + test.end() + } + }) + + getParticipantAndCurrencyForTransferMessageTest.test('skips adding payer participantCurrency for validation when payer has proxy representation', async (test) => { + try { + watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve([])) + fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.withArgs( + fxPayload.commitRequestId + ).returns(Promise.resolve( + { + targetAmount: fxPayload.targetAmount.amount, + targetCurrency: fxPayload.targetAmount.currency, + counterPartyFspName: 'fx_dfsp2' + } + )) + + const determiningTransferCheckResult = await Cyril.checkIfDeterminingTransferExistsForTransferMessage(payload, + { + isCounterPartyFspProxy: false, + isInitiatingFspProxy: true + } + ) + test.deepEqual(determiningTransferCheckResult.participantCurrencyValidationList, []) + test.pass('Error not thrown') + test.end() + } catch (e) { + console.log(e) + test.fail('Error Thrown') + test.end() + } + }) + + getParticipantAndCurrencyForTransferMessageTest.test('skips adding payee participantCurrency for validation when payee has proxy representation, PAYEE_PARTICIPANT_CURRENCY_VALIDATION_ENABLED=true', async (test) => { + try { + config.PAYEE_PARTICIPANT_CURRENCY_VALIDATION_ENABLED = true + watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve([])) + fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.withArgs( + fxPayload.commitRequestId + ).returns(Promise.resolve( + { + targetAmount: fxPayload.targetAmount.amount, + targetCurrency: fxPayload.targetAmount.currency, + counterPartyFspName: 'fx_dfsp2' + } + )) + + const determiningTransferCheckResult = await Cyril.checkIfDeterminingTransferExistsForTransferMessage(payload, + { + isCounterPartyFspProxy: true, + isInitiatingFspProxy: true + } + ) + test.deepEqual(determiningTransferCheckResult.participantCurrencyValidationList, []) + test.pass('Error not thrown') + config.PAYEE_PARTICIPANT_CURRENCY_VALIDATION_ENABLED = false + test.end() + } catch (e) { + console.log(e) + test.fail('Error Thrown') + test.end() + } + }) + + getParticipantAndCurrencyForTransferMessageTest.test('adds payee participantCurrency for validation for payee, PAYEE_PARTICIPANT_CURRENCY_VALIDATION_ENABLED=true', async (test) => { + try { + config.PAYEE_PARTICIPANT_CURRENCY_VALIDATION_ENABLED = true + watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve([])) + fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.withArgs( + fxPayload.commitRequestId + ).returns(Promise.resolve( + { + targetAmount: fxPayload.targetAmount.amount, + targetCurrency: fxPayload.targetAmount.currency, + counterPartyFspName: 'fx_dfsp2' + } + )) + + const determiningTransferCheckResult = await Cyril.checkIfDeterminingTransferExistsForTransferMessage(payload, + { + isCounterPartyFspProxy: false, + isInitiatingFspProxy: true + } + ) + test.deepEqual(determiningTransferCheckResult.participantCurrencyValidationList, [{ participantName: 'dfsp2', currencyId: 'USD' }]) + test.pass('Error not thrown') + config.PAYEE_PARTICIPANT_CURRENCY_VALIDATION_ENABLED = false + test.end() + } catch (e) { + console.log(e) + test.fail('Error Thrown') + test.end() + } + }) + + getParticipantAndCurrencyForTransferMessageTest.end() + }) + + cyrilTest.test('getParticipantAndCurrencyForFxTransferMessage should', getParticipantAndCurrencyForFxTransferMessageTest => { + getParticipantAndCurrencyForFxTransferMessageTest.test('return details about fxtransfer debtor party initited msg', async (test) => { + try { + TransferModel.getById.returns(Promise.resolve(null)) + const determiningTransferCheckResult = await Cyril.checkIfDeterminingTransferExistsForFxTransferMessage(fxPayload, { + isCounterPartyFspProxy: false + }) + const result = await Cyril.getParticipantAndCurrencyForFxTransferMessage(fxPayload, determiningTransferCheckResult) + + test.ok(watchList.addToWatchList.calledWith({ + commitRequestId: fxPayload.commitRequestId, + determiningTransferId: fxPayload.determiningTransferId, + fxTransferTypeId: Enum.Fx.FxTransferType.PAYER_CONVERSION + })) + test.deepEqual(result, { + participantName: fxPayload.initiatingFsp, + currencyId: fxPayload.sourceAmount.currency, + amount: fxPayload.sourceAmount.amount + }) + test.pass('Error not thrown') + test.end() + } catch (e) { + console.log(e.stack) + test.fail('Error Thrown') + test.end() + } + }) + + getParticipantAndCurrencyForFxTransferMessageTest.test('return details about fxtransfer creditor party initited msg', async (test) => { + try { + TransferModel.getById.returns(Promise.resolve({})) + const determiningTransferCheckResult = await Cyril.checkIfDeterminingTransferExistsForFxTransferMessage(fxPayload, { + isCounterPartyFspProxy: false + }) + const result = await Cyril.getParticipantAndCurrencyForFxTransferMessage(fxPayload, determiningTransferCheckResult) + + test.ok(watchList.addToWatchList.calledWith({ + commitRequestId: fxPayload.commitRequestId, + determiningTransferId: fxPayload.determiningTransferId, + fxTransferTypeId: Enum.Fx.FxTransferType.PAYEE_CONVERSION + })) + test.deepEqual(result, { + participantName: fxPayload.counterPartyFsp, + currencyId: fxPayload.targetAmount.currency, + amount: fxPayload.targetAmount.amount + }) + test.pass('Error not thrown') + test.end() + } catch (e) { + test.fail('Error Thrown') + test.end() + } + }) + getParticipantAndCurrencyForFxTransferMessageTest.end() + }) + + cyrilTest.test('processFxFulfilMessage should', processFxFulfilMessageTest => { + processFxFulfilMessageTest.test('throws error when commitRequestId not in watchlist', async (test) => { + try { + watchList.getItemInWatchListByCommitRequestId.returns(Promise.resolve(null)) + await Cyril.processFxFulfilMessage(fxPayload.commitRequestId) + test.ok(watchList.getItemInWatchListByCommitRequestId.calledWith(fxPayload.commitRequestId)) + test.fail('Error not thrown') + test.end() + } catch (e) { + test.pass('Error Thrown') + test.end() + } + }) + + processFxFulfilMessageTest.test('should return true when commitRequestId is in watchlist', async (test) => { + try { + watchList.getItemInWatchListByCommitRequestId.returns(Promise.resolve({ + commitRequestId: fxPayload.commitRequestId, + determiningTransferId: fxPayload.determiningTransferId, + fxTransferTypeId: Enum.Fx.FxTransferType.PAYER_CONVERSION, + createdDate: new Date() + })) + const result = await Cyril.processFxFulfilMessage(fxPayload.commitRequestId) + test.ok(watchList.getItemInWatchListByCommitRequestId.calledWith(fxPayload.commitRequestId)) + test.ok(result) + test.pass('Error not thrown') + test.end() + } catch (e) { + test.fail('Error Thrown') + test.end() + } + }) + + processFxFulfilMessageTest.end() + }) + + cyrilTest.test('processFulfilMessage should', processFulfilMessageTest => { + processFulfilMessageTest.test('return false if transferId is not in watchlist', async (test) => { + try { + watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve(null)) + const result = await Cyril.processFulfilMessage(payload.transferId, payload, payload) + + test.ok(watchList.getItemsInWatchListByDeterminingTransferId.calledWith(payload.transferId)) + test.deepEqual(result, { + isFx: false, + positionChanges: [], + patchNotifications: [] + }) + test.pass('Error not thrown') + test.end() + } catch (e) { + test.fail('Error Thrown') + test.end() + } + }) + + processFulfilMessageTest.test('process watchlist with only payer conversion found', async (test) => { + try { + const completedTimestamp = new Date().toISOString() + watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve( + [{ + commitRequestId: fxPayload.commitRequestId, + determiningTransferId: fxPayload.determiningTransferId, + fxTransferTypeId: Enum.Fx.FxTransferType.PAYER_CONVERSION, + createdDate: new Date() + }] + )) + fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.returns(Promise.resolve( + { + initiatingFspParticipantId: 2, + targetAmount: fxPayload.targetAmount.amount, + commitRequestId: fxPayload.commitRequestId, + counterPartyFspSourceParticipantCurrencyId: 1, + counterPartyFspTargetParticipantCurrencyId: 2, + sourceAmount: fxPayload.sourceAmount.amount, + targetCurrency: fxPayload.targetAmount.currency, + counterPartyFspName: fxPayload.counterPartyFsp, + fulfilment: 'fulfilment', + completedTimestamp + } + )) + ParticipantFacade.getByNameAndCurrency.returns(Promise.resolve({ + participantId: 1, + participantCurrencyId: 1, + participantName: 'fx_dfsp1', + isActive: 1 + })) + ProxyCache.getProxyParticipantAccountDetails.returns(Promise.resolve(defaultGetProxyParticipantAccountDetailsResponse)) + const result = await Cyril.processFulfilMessage(payload.transferId, payload, payload) + test.ok(watchList.getItemsInWatchListByDeterminingTransferId.calledWith(payload.transferId)) + test.ok(fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.calledWith(fxPayload.commitRequestId)) + test.ok(ProxyCache.getProxyParticipantAccountDetails.calledWith( + 'dfsp2', + fxPayload.targetAmount.currency + )) + + test.deepEqual(result, { + isFx: true, + positionChanges: [{ + isFxTransferStateChange: true, + commitRequestId: '88622a75-5bde-4da4-a6cc-f4cd23b268c4', + participantCurrencyId: 1, + amount: -433.88 + }, + { + isFxTransferStateChange: false, + transferId: 'b51ec534-ee48-4575-b6a9-ead2955b8999', + participantCurrencyId: 1, + amount: -200 + } + ], + patchNotifications: [{ + commitRequestId: fxPayload.commitRequestId, + fxpName: fxPayload.counterPartyFsp, + fulfilment: 'fulfilment', + completedTimestamp + }] + }) + test.pass('Error not thrown') + test.end() + } catch (e) { + console.log(e) + test.fail('Error Thrown') + test.end() + } + }) + + processFulfilMessageTest.test('process watchlist with only payee conversion found', async (test) => { + try { + const completedTimestamp = new Date().toISOString() + watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve( + [{ + commitRequestId: fxPayload.commitRequestId, + determiningTransferId: fxPayload.determiningTransferId, + fxTransferTypeId: Enum.Fx.FxTransferType.PAYEE_CONVERSION, + createdDate: new Date() + }] + )) + fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.returns(Promise.resolve( + { + initiatingFspParticipantId: 1, + targetAmount: fxPayload.targetAmount.amount, + commitRequestId: fxPayload.commitRequestId, + counterPartyFspSourceParticipantCurrencyId: 1, + counterPartyFspTargetParticipantCurrencyId: 2, + sourceAmount: fxPayload.sourceAmount.amount, + targetCurrency: fxPayload.targetAmount.currency, + fulfilment: 'fulfilment', + completedTimestamp + } + )) + ParticipantFacade.getByNameAndCurrency.returns(Promise.resolve({ + participantId: 1, + participantCurrencyId: 1, + participantName: 'payeeFsp', + isActive: 1 + })) + ProxyCache.getProxyParticipantAccountDetails.returns(Promise.resolve(defaultGetProxyParticipantAccountDetailsResponse)) + const result = await Cyril.processFulfilMessage(payload.transferId, payload, payload) + test.ok(watchList.getItemsInWatchListByDeterminingTransferId.calledWith(payload.transferId)) + test.ok(fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.calledWith(fxPayload.commitRequestId)) + test.deepEqual(result, { + isFx: true, + positionChanges: [{ + isFxTransferStateChange: false, + transferId: 'b51ec534-ee48-4575-b6a9-ead2955b8999', + participantCurrencyId: 1, + amount: -200 + }, + { + isFxTransferStateChange: true, + commitRequestId: '88622a75-5bde-4da4-a6cc-f4cd23b268c4', + participantCurrencyId: 1, + amount: -433.88 + } + ], + patchNotifications: [] + } + ) + test.pass('Error not thrown') + test.end() + } catch (e) { + console.log(e) + test.fail('Error Thrown') + test.end() + } + }) + + processFulfilMessageTest.test('process watchlist with both payer and payee conversion found', async (test) => { + try { + const completedTimestamp = new Date().toISOString() + watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve( + [ + { + commitRequestId: fxPayload.commitRequestId, + determiningTransferId: fxPayload.determiningTransferId, + fxTransferTypeId: Enum.Fx.FxTransferType.PAYEE_CONVERSION, + createdDate: new Date() + }, + { + commitRequestId: fxPayload.commitRequestId, + determiningTransferId: fxPayload.determiningTransferId, + fxTransferTypeId: Enum.Fx.FxTransferType.PAYER_CONVERSION, + createdDate: new Date() + } + ] + )) + fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.returns(Promise.resolve( + { + initiatingFspParticipantId: 1, + targetAmount: fxPayload.targetAmount.amount, + commitRequestId: fxPayload.commitRequestId, + counterPartyFspSourceParticipantCurrencyId: 1, + counterPartyFspTargetParticipantCurrencyId: 2, + sourceAmount: fxPayload.sourceAmount.amount, + targetCurrency: fxPayload.targetAmount.currency, + counterPartyFspName: fxPayload.counterPartyFsp, + fulfilment: 'fulfilment', + completedTimestamp + } + )) + ParticipantFacade.getByNameAndCurrency.returns(Promise.resolve({ + participantId: 1, + participantCurrencyId: 1, + participantName: 'payeeFsp', + isActive: 1 + })) + ProxyCache.getProxyParticipantAccountDetails.returns(Promise.resolve(defaultGetProxyParticipantAccountDetailsResponse)) + const result = await Cyril.processFulfilMessage(payload.transferId, payload, payload) + test.ok(watchList.getItemsInWatchListByDeterminingTransferId.calledWith(payload.transferId)) + test.ok(fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.calledWith(fxPayload.commitRequestId)) + test.deepEqual(result, { + isFx: true, + positionChanges: [ + { + isFxTransferStateChange: false, + transferId: 'b51ec534-ee48-4575-b6a9-ead2955b8999', + participantCurrencyId: 1, + amount: -200 + }, + { + isFxTransferStateChange: true, + commitRequestId: '88622a75-5bde-4da4-a6cc-f4cd23b268c4', + participantCurrencyId: 1, + amount: -433.88 + }, + { + isFxTransferStateChange: true, + commitRequestId: '88622a75-5bde-4da4-a6cc-f4cd23b268c4', + participantCurrencyId: 1, + amount: -433.88 + } + ], + patchNotifications: [{ + commitRequestId: fxPayload.commitRequestId, + fxpName: fxPayload.counterPartyFsp, + fulfilment: 'fulfilment', + completedTimestamp + }] + } + ) + test.pass('Error not thrown') + test.end() + } catch (e) { + console.log(e) + test.fail('Error Thrown') + test.end() + } + }) + + processFulfilMessageTest.test('process watchlist with only payer conversion found, but payee is a proxy and have no account in the currency', async (test) => { + try { + const completedTimestamp = new Date().toISOString() + watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve( + [{ + commitRequestId: fxPayload.commitRequestId, + determiningTransferId: fxPayload.determiningTransferId, + fxTransferTypeId: Enum.Fx.FxTransferType.PAYER_CONVERSION, + createdDate: new Date() + }] + )) + fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.returns(Promise.resolve( + { + initiatingFspParticipantId: 2, + targetAmount: fxPayload.targetAmount.amount, + commitRequestId: fxPayload.commitRequestId, + counterPartyFspSourceParticipantCurrencyId: 1, + counterPartyFspTargetParticipantCurrencyId: 2, + sourceAmount: fxPayload.sourceAmount.amount, + targetCurrency: fxPayload.targetAmount.currency, + counterPartyFspName: fxPayload.counterPartyFsp, + fulfilment: 'fulfilment', + completedTimestamp + } + )) + ParticipantFacade.getByNameAndCurrency.returns(Promise.resolve({ + participantId: 1, + participantCurrencyId: 1, + participantName: 'fx_dfsp1', + isActive: 1 + })) + ProxyCache.getProxyParticipantAccountDetails.returns(Promise.resolve({ inScheme: false, participantCurrencyId: null })) + const result = await Cyril.processFulfilMessage(payload.transferId, payload, payload) + test.ok(watchList.getItemsInWatchListByDeterminingTransferId.calledWith(payload.transferId)) + test.ok(fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.calledWith(fxPayload.commitRequestId)) + test.ok(ProxyCache.getProxyParticipantAccountDetails.calledWith( + 'dfsp2', + fxPayload.targetAmount.currency + )) + + test.deepEqual(result, { + isFx: true, + positionChanges: [], + patchNotifications: [{ + commitRequestId: fxPayload.commitRequestId, + fxpName: fxPayload.counterPartyFsp, + fulfilment: 'fulfilment', + completedTimestamp + }] + }) + test.pass('Error not thrown') + test.end() + } catch (e) { + console.log(e) + test.fail('Error Thrown') + test.end() + } + }) + + processFulfilMessageTest.test('process watchlist with only payer conversion found, but payee is a proxy and have account in the currency somehow', async (test) => { + try { + const completedTimestamp = new Date().toISOString() + watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve( + [{ + commitRequestId: fxPayload.commitRequestId, + determiningTransferId: fxPayload.determiningTransferId, + fxTransferTypeId: Enum.Fx.FxTransferType.PAYER_CONVERSION, + createdDate: new Date() + }] + )) + fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.returns(Promise.resolve( + { + initiatingFspParticipantId: 2, + targetAmount: fxPayload.targetAmount.amount, + commitRequestId: fxPayload.commitRequestId, + counterPartyFspSourceParticipantCurrencyId: 1, + counterPartyFspTargetParticipantCurrencyId: 2, + sourceAmount: fxPayload.sourceAmount.amount, + targetCurrency: fxPayload.targetAmount.currency, + counterPartyFspName: fxPayload.counterPartyFsp, + fulfilment: 'fulfilment', + completedTimestamp + } + )) + ParticipantFacade.getByNameAndCurrency.returns(Promise.resolve({ + participantId: 1, + participantCurrencyId: 1, + participantName: 'fx_dfsp1', + isActive: 1 + })) + ProxyCache.getProxyParticipantAccountDetails.onCall(0).returns(Promise.resolve({ inScheme: false, participantCurrencyId: 234 })) // FXP Source Currency + ProxyCache.getProxyParticipantAccountDetails.onCall(1).returns(Promise.resolve({ inScheme: false, participantCurrencyId: 456 })) // Payee Target Currency + ProxyCache.getProxyParticipantAccountDetails.onCall(2).returns(Promise.resolve({ inScheme: false, participantCurrencyId: 345 })) // FXP Target Currency + const result = await Cyril.processFulfilMessage(payload.transferId, payload, payload) + test.ok(watchList.getItemsInWatchListByDeterminingTransferId.calledWith(payload.transferId)) + test.ok(fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.calledWith(fxPayload.commitRequestId)) + test.ok(ProxyCache.getProxyParticipantAccountDetails.calledWith( + 'dfsp2', + fxPayload.targetAmount.currency + )) + + test.deepEqual(result, { + isFx: true, + positionChanges: [ + { + isFxTransferStateChange: true, + commitRequestId: '88622a75-5bde-4da4-a6cc-f4cd23b268c4', + participantCurrencyId: 234, + amount: -433.88 + }, + { + isFxTransferStateChange: false, + transferId: 'b51ec534-ee48-4575-b6a9-ead2955b8999', + participantCurrencyId: 456, + amount: -200 + } + ], + patchNotifications: [{ + commitRequestId: fxPayload.commitRequestId, + fxpName: fxPayload.counterPartyFsp, + fulfilment: 'fulfilment', + completedTimestamp + }] + }) + test.pass('Error not thrown') + test.end() + } catch (e) { + console.log(e) + test.fail('Error Thrown') + test.end() + } + }) + + processFulfilMessageTest.test('process watchlist with only payer conversion found, but payee is a proxy and have account in the currency somehow and it is same as fxp target account', async (test) => { + try { + const completedTimestamp = new Date().toISOString() + watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve( + [{ + commitRequestId: fxPayload.commitRequestId, + determiningTransferId: fxPayload.determiningTransferId, + fxTransferTypeId: Enum.Fx.FxTransferType.PAYER_CONVERSION, + createdDate: new Date() + }] + )) + fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.returns(Promise.resolve( + { + initiatingFspParticipantId: 2, + targetAmount: fxPayload.targetAmount.amount, + commitRequestId: fxPayload.commitRequestId, + counterPartyFspSourceParticipantCurrencyId: 1, + counterPartyFspTargetParticipantCurrencyId: 2, + sourceAmount: fxPayload.sourceAmount.amount, + targetCurrency: fxPayload.targetAmount.currency, + counterPartyFspName: fxPayload.counterPartyFsp, + fulfilment: 'fulfilment', + completedTimestamp + } + )) + ParticipantFacade.getByNameAndCurrency.returns(Promise.resolve({ + participantId: 1, + participantCurrencyId: 1, + participantName: 'fx_dfsp1', + isActive: 1 + })) + ProxyCache.getProxyParticipantAccountDetails.onCall(0).returns(Promise.resolve({ inScheme: false, participantCurrencyId: 234 })) // FXP Source Currency + ProxyCache.getProxyParticipantAccountDetails.onCall(1).returns(Promise.resolve({ inScheme: false, participantCurrencyId: 456 })) // Payee Target Currency + ProxyCache.getProxyParticipantAccountDetails.onCall(2).returns(Promise.resolve({ inScheme: false, participantCurrencyId: 456 })) // FXP Target Currency + const result = await Cyril.processFulfilMessage(payload.transferId, payload, payload) + test.ok(watchList.getItemsInWatchListByDeterminingTransferId.calledWith(payload.transferId)) + test.ok(fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.calledWith(fxPayload.commitRequestId)) + test.ok(ProxyCache.getProxyParticipantAccountDetails.calledWith( + 'dfsp2', + fxPayload.targetAmount.currency + )) + + test.deepEqual(result, { + isFx: true, + positionChanges: [ + { + isFxTransferStateChange: true, + commitRequestId: '88622a75-5bde-4da4-a6cc-f4cd23b268c4', + participantCurrencyId: 234, + amount: -433.88 + } + ], + patchNotifications: [{ + commitRequestId: fxPayload.commitRequestId, + fxpName: fxPayload.counterPartyFsp, + fulfilment: 'fulfilment', + completedTimestamp + }] + }) + test.pass('Error not thrown') + test.end() + } catch (e) { + console.log(e) + test.fail('Error Thrown') + test.end() + } + }) + + processFulfilMessageTest.test('process watchlist with only payee conversion found but fxp is proxy and have no account', async (test) => { + try { + const completedTimestamp = new Date().toISOString() + watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve( + [{ + commitRequestId: fxPayload.commitRequestId, + determiningTransferId: fxPayload.determiningTransferId, + fxTransferTypeId: Enum.Fx.FxTransferType.PAYEE_CONVERSION, + createdDate: new Date() + }] + )) + fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.returns(Promise.resolve( + { + initiatingFspParticipantId: 1, + targetAmount: fxPayload.targetAmount.amount, + commitRequestId: fxPayload.commitRequestId, + counterPartyFspSourceParticipantCurrencyId: 1, + counterPartyFspTargetParticipantCurrencyId: 2, + sourceAmount: fxPayload.sourceAmount.amount, + targetCurrency: fxPayload.targetAmount.currency, + fulfilment: 'fulfilment', + completedTimestamp + } + )) + ParticipantFacade.getByNameAndCurrency.returns(Promise.resolve({ + participantId: 1, + participantCurrencyId: 1, + participantName: 'payeeFsp', + isActive: 1 + })) + ProxyCache.getProxyParticipantAccountDetails.returns(Promise.resolve({ inScheme: false, participantCurrencyId: null })) + const result = await Cyril.processFulfilMessage(payload.transferId, payload, payload) + test.ok(watchList.getItemsInWatchListByDeterminingTransferId.calledWith(payload.transferId)) + test.ok(fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.calledWith(fxPayload.commitRequestId)) + test.deepEqual(result, { + isFx: true, + positionChanges: [], + patchNotifications: [] + } + ) + test.pass('Error not thrown') + test.end() + } catch (e) { + console.log(e) + test.fail('Error Thrown') + test.end() + } + }) + + processFulfilMessageTest.test('process watchlist with only payee conversion found but fxp is proxy and have account in source currency somehow', async (test) => { + try { + const completedTimestamp = new Date().toISOString() + watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve( + [{ + commitRequestId: fxPayload.commitRequestId, + determiningTransferId: fxPayload.determiningTransferId, + fxTransferTypeId: Enum.Fx.FxTransferType.PAYEE_CONVERSION, + createdDate: new Date() + }] + )) + fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.returns(Promise.resolve( + { + initiatingFspParticipantId: 1, + targetAmount: fxPayload.targetAmount.amount, + commitRequestId: fxPayload.commitRequestId, + counterPartyFspSourceParticipantCurrencyId: 1, + counterPartyFspTargetParticipantCurrencyId: 2, + sourceAmount: fxPayload.sourceAmount.amount, + targetCurrency: fxPayload.targetAmount.currency, + fulfilment: 'fulfilment', + completedTimestamp + } + )) + ParticipantFacade.getByNameAndCurrency.returns(Promise.resolve({ + participantId: 1, + participantCurrencyId: 1, + participantName: 'payeeFsp', + isActive: 1 + })) + ProxyCache.getProxyParticipantAccountDetails.onCall(0).returns(Promise.resolve({ inScheme: false, participantCurrencyId: 456 })) // Payee Target Currency + ProxyCache.getProxyParticipantAccountDetails.onCall(1).returns(Promise.resolve({ inScheme: false, participantCurrencyId: 234 })) // FXP Source Currency + ProxyCache.getProxyParticipantAccountDetails.onCall(2).returns(Promise.resolve({ inScheme: false, participantCurrencyId: 123 })) // Payer Source Currency + const result = await Cyril.processFulfilMessage(payload.transferId, payload, payload) + test.ok(watchList.getItemsInWatchListByDeterminingTransferId.calledWith(payload.transferId)) + test.ok(fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.calledWith(fxPayload.commitRequestId)) + test.deepEqual(result, { + isFx: true, + positionChanges: [ + { + isFxTransferStateChange: false, + transferId: 'b51ec534-ee48-4575-b6a9-ead2955b8999', + participantCurrencyId: 456, + amount: -200 + }, + { + isFxTransferStateChange: true, + commitRequestId: '88622a75-5bde-4da4-a6cc-f4cd23b268c4', + participantCurrencyId: 234, + amount: -433.88 + } + ], + patchNotifications: [] + } + ) + test.pass('Error not thrown') + test.end() + } catch (e) { + console.log(e) + test.fail('Error Thrown') + test.end() + } + }) + + processFulfilMessageTest.test('process watchlist with only payee conversion found but fxp is proxy and have account in source currency somehow and it is same as payer account', async (test) => { + try { + const completedTimestamp = new Date().toISOString() + watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve( + [{ + commitRequestId: fxPayload.commitRequestId, + determiningTransferId: fxPayload.determiningTransferId, + fxTransferTypeId: Enum.Fx.FxTransferType.PAYEE_CONVERSION, + createdDate: new Date() + }] + )) + fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.returns(Promise.resolve( + { + initiatingFspParticipantId: 1, + targetAmount: fxPayload.targetAmount.amount, + commitRequestId: fxPayload.commitRequestId, + counterPartyFspSourceParticipantCurrencyId: 1, + counterPartyFspTargetParticipantCurrencyId: 2, + sourceAmount: fxPayload.sourceAmount.amount, + targetCurrency: fxPayload.targetAmount.currency, + fulfilment: 'fulfilment', + completedTimestamp + } + )) + ParticipantFacade.getByNameAndCurrency.returns(Promise.resolve({ + participantId: 1, + participantCurrencyId: 1, + participantName: 'payeeFsp', + isActive: 1 + })) + ProxyCache.getProxyParticipantAccountDetails.onCall(0).returns(Promise.resolve({ inScheme: false, participantCurrencyId: 456 })) // Payee Target Currency + ProxyCache.getProxyParticipantAccountDetails.onCall(1).returns(Promise.resolve({ inScheme: false, participantCurrencyId: 234 })) // FXP Source Currency + ProxyCache.getProxyParticipantAccountDetails.onCall(2).returns(Promise.resolve({ inScheme: false, participantCurrencyId: 234 })) // Payer Source Currency + const result = await Cyril.processFulfilMessage(payload.transferId, payload, payload) + test.ok(watchList.getItemsInWatchListByDeterminingTransferId.calledWith(payload.transferId)) + test.ok(fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.calledWith(fxPayload.commitRequestId)) + test.deepEqual(result, { + isFx: true, + positionChanges: [ + { + isFxTransferStateChange: false, + transferId: 'b51ec534-ee48-4575-b6a9-ead2955b8999', + participantCurrencyId: 456, + amount: -200 + } + ], + patchNotifications: [] + } + ) + test.pass('Error not thrown') + test.end() + } catch (e) { + console.log(e) + test.fail('Error Thrown') + test.end() + } + }) + + processFulfilMessageTest.test('process watchlist with both payer and payee conversion found, but derived currencyId is null', async (test) => { + try { + const completedTimestamp = new Date().toISOString() + watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve( + [ + { + commitRequestId: fxPayload.commitRequestId, + determiningTransferId: fxPayload.determiningTransferId, + fxTransferTypeId: Enum.Fx.FxTransferType.PAYEE_CONVERSION, + createdDate: new Date() + }, + { + commitRequestId: fxPayload.commitRequestId, + determiningTransferId: fxPayload.determiningTransferId, + fxTransferTypeId: Enum.Fx.FxTransferType.PAYER_CONVERSION, + createdDate: new Date() + } + ] + )) + fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.returns(Promise.resolve( + { + initiatingFspParticipantId: 1, + targetAmount: fxPayload.targetAmount.amount, + commitRequestId: fxPayload.commitRequestId, + counterPartyFspSourceParticipantCurrencyId: 1, + counterPartyFspTargetParticipantCurrencyId: 2, + sourceAmount: fxPayload.sourceAmount.amount, + targetCurrency: fxPayload.targetAmount.currency, + counterPartyFspName: fxPayload.counterPartyFsp, + fulfilment: 'fulfilment', + completedTimestamp + } + )) + ParticipantFacade.getByNameAndCurrency.returns(Promise.resolve({ + participantId: 1, + participantCurrencyId: 1, + participantName: 'payeeFsp', + isActive: 1 + })) + ProxyCache.getProxyParticipantAccountDetails.returns(Promise.resolve({ inScheme: true, participantCurrencyId: null })) + const result = await Cyril.processFulfilMessage(payload.transferId, payload, payload) + test.ok(watchList.getItemsInWatchListByDeterminingTransferId.calledWith(payload.transferId)) + test.ok(fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.calledWith(fxPayload.commitRequestId)) + test.deepEqual(result, { + isFx: true, + positionChanges: [], + patchNotifications: [{ + commitRequestId: fxPayload.commitRequestId, + fxpName: fxPayload.counterPartyFsp, + fulfilment: 'fulfilment', + completedTimestamp + }] + } + ) + test.pass('Error not thrown') + test.end() + } catch (e) { + console.log(e) + test.fail('Error Thrown') + test.end() + } + }) + processFulfilMessageTest.end() + }) + + cyrilTest.test('processAbortMessage should', processAbortMessageTest => { + processAbortMessageTest.test('return false if transferId is not in watchlist', async (test) => { + try { + fxTransfer.getByDeterminingTransferId.returns(Promise.resolve([ + { commitRequestId: fxPayload.commitRequestId } + ])) + // Mocks for _getPositionChnages + fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.returns(Promise.resolve({ + initiatingFspName: fxPayload.initiatingFsp + })) + ParticipantPositionChangesModel.getReservedPositionChangesByCommitRequestId.returns(Promise.resolve([ + { + participantCurrencyId: 1, + change: payload.amount.amount + } + ])) + TransferFacade.getById.returns(Promise.resolve({ + payerFsp: payload.payerFsp + })) + ParticipantPositionChangesModel.getReservedPositionChangesByTransferId.returns(Promise.resolve([ + { + participantCurrencyId: 1, + change: payload.amount.amount + } + ])) + + const result = await Cyril.processAbortMessage(payload.transferId) + + test.deepEqual(result, { positionChanges: [{ isFxTransferStateChange: true, commitRequestId: '88622a75-5bde-4da4-a6cc-f4cd23b268c4', notifyTo: 'fx_dfsp1', participantCurrencyId: 1, amount: -433.88 }, { isFxTransferStateChange: false, transferId: 'b51ec534-ee48-4575-b6a9-ead2955b8999', notifyTo: 'dfsp1', participantCurrencyId: 1, amount: -433.88 }] }) + test.pass('Error not thrown') + test.end() + } catch (e) { + test.fail('Error Thrown') + test.end() + } + }) + + processAbortMessageTest.end() + }) + + cyrilTest.test('processFxAbortMessage should', processFxAbortMessageTest => { + processFxAbortMessageTest.test('return false if transferId is not in watchlist', async (test) => { + try { + fxTransfer.getByCommitRequestId.returns(Promise.resolve({ + determiningTransferId: fxPayload.determiningTransferId + })) + fxTransfer.getByDeterminingTransferId.returns(Promise.resolve([ + { commitRequestId: fxPayload.commitRequestId } + ])) + // Mocks for _getPositionChnages + fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.returns(Promise.resolve({ + initiatingFspName: fxPayload.initiatingFsp + })) + ParticipantPositionChangesModel.getReservedPositionChangesByCommitRequestId.returns(Promise.resolve([ + { + participantCurrencyId: 1, + change: payload.amount.amount + } + ])) + TransferFacade.getById.returns(Promise.resolve({ + payerFsp: payload.payerFsp + })) + ParticipantPositionChangesModel.getReservedPositionChangesByTransferId.returns(Promise.resolve([ + { + participantCurrencyId: 1, + change: payload.amount.amount + } + ])) + + const result = await Cyril.processFxAbortMessage(payload.transferId) + + test.deepEqual(result, { + positionChanges: [{ + isFxTransferStateChange: true, + commitRequestId: '88622a75-5bde-4da4-a6cc-f4cd23b268c4', + notifyTo: 'fx_dfsp1', + participantCurrencyId: 1, + amount: -433.88 + }, { + isFxTransferStateChange: false, + transferId: 'c05c3f31-33b5-4e33-8bfd-7c3a2685fb6c', + notifyTo: 'dfsp1', + participantCurrencyId: 1, + amount: -433.88 + }] + }) + test.pass('Error not thrown') + test.end() + } catch (e) { + test.fail('Error Thrown') + test.end() + } + }) + + processFxAbortMessageTest.end() + }) + + cyrilTest.end() +}) diff --git a/test/unit/domain/fx/index.test.js b/test/unit/domain/fx/index.test.js new file mode 100644 index 000000000..7c31abf1a --- /dev/null +++ b/test/unit/domain/fx/index.test.js @@ -0,0 +1,167 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ + +'use strict' + +const Test = require('tapes')(require('tape')) +const Sinon = require('sinon') +const Fx = require('../../../../src/domain/fx') +const Logger = require('@mojaloop/central-services-logger') +const { fxTransfer } = require('../../../../src/models/fxTransfer') +const { Enum } = require('@mojaloop/central-services-shared') + +const TransferEventAction = Enum.Events.Event.Action + +Test('Fx', fxIndexTest => { + let sandbox + let payload + let fxPayload + fxIndexTest.beforeEach(t => { + sandbox = Sinon.createSandbox() + sandbox.stub(Logger, 'isDebugEnabled').value(true) + sandbox.stub(fxTransfer) + payload = { + transferId: 'b51ec534-ee48-4575-b6a9-ead2955b8999', + payerFsp: 'dfsp1', + payeeFsp: 'dfsp2', + amount: { + currency: 'USD', + amount: '433.88' + }, + ilpPacket: 'AYIBgQAAAAAAAASwNGxldmVsb25lLmRmc3AxLm1lci45T2RTOF81MDdqUUZERmZlakgyOVc4bXFmNEpLMHlGTFGCAUBQU0svMS4wCk5vbmNlOiB1SXlweUYzY3pYSXBFdzVVc05TYWh3CkVuY3J5cHRpb246IG5vbmUKUGF5bWVudC1JZDogMTMyMzZhM2ItOGZhOC00MTYzLTg0NDctNGMzZWQzZGE5OGE3CgpDb250ZW50LUxlbmd0aDogMTM1CkNvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbgpTZW5kZXItSWRlbnRpZmllcjogOTI4MDYzOTEKCiJ7XCJmZWVcIjowLFwidHJhbnNmZXJDb2RlXCI6XCJpbnZvaWNlXCIsXCJkZWJpdE5hbWVcIjpcImFsaWNlIGNvb3BlclwiLFwiY3JlZGl0TmFtZVwiOlwibWVyIGNoYW50XCIsXCJkZWJpdElkZW50aWZpZXJcIjpcIjkyODA2MzkxXCJ9IgA', + condition: 'YlK5TZyhflbXaDRPtR5zhCu8FrbgvrQwwmzuH0iQ0AI', + expiration: new Date((new Date()).getTime() + (24 * 60 * 60 * 1000)), // tomorrow + extensionList: { + extension: [ + { + key: 'key1', + value: 'value1' + }, + { + key: 'key2', + value: 'value2' + } + ] + } + } + fxPayload = { + commitRequestId: '88622a75-5bde-4da4-a6cc-f4cd23b268c4', + determiningTransferId: 'c05c3f31-33b5-4e33-8bfd-7c3a2685fb6c', + condition: 'YlK5TZyhflbXaDRPtR5zhCu8FrbgvrQwwmzuH0iQ0AI', + expiration: new Date((new Date()).getTime() + (24 * 60 * 60 * 1000)), // tomorrow + initiatingFsp: 'dfsp1', + counterPartyFsp: 'fx_dfsp', + sourceAmount: { + currency: 'USD', + amount: '433.88' + }, + targetAmount: { + currency: 'EUR', + amount: '200.00' + } + } + t.end() + }) + + fxIndexTest.afterEach(t => { + sandbox.restore() + t.end() + }) + + fxIndexTest.test('handleFulfilResponse should', handleFulfilResponseTest => { + handleFulfilResponseTest.test('return details about regular transfer', async (test) => { + try { + fxTransfer.saveFxFulfilResponse.returns(Promise.resolve()) + const result = await Fx.handleFulfilResponse(payload.transferId, payload, TransferEventAction.FX_RESERVE, null) + test.deepEqual(result, {}) + test.ok(fxTransfer.saveFxFulfilResponse.calledWith(payload.transferId, payload, TransferEventAction.FX_RESERVE, null)) + test.pass('Error not thrown') + test.end() + } catch (e) { + test.fail('Error Thrown') + test.end() + } + }) + + handleFulfilResponseTest.test('throw errors', async (test) => { + try { + fxTransfer.saveFxFulfilResponse.throws(new Error('Error')) + const result = await Fx.handleFulfilResponse(payload.transferId, payload, TransferEventAction.FX_RESERVE, null) + test.deepEqual(result, {}) + test.ok(fxTransfer.saveFxFulfilResponse.calledWith(payload.transferId, payload, TransferEventAction.FX_RESERVE, null)) + test.fail('Error not thrown') + test.end() + } catch (e) { + test.pass('Error Thrown') + test.end() + } + }) + + handleFulfilResponseTest.end() + }) + + fxIndexTest.test('forwardedPrepare should', forwardedPrepareTest => { + forwardedPrepareTest.test('commit transfer', async (test) => { + try { + fxTransfer.updateFxPrepareReservedForwarded.returns(Promise.resolve()) + await Fx.forwardedFxPrepare(fxPayload.commitRequestId) + test.ok(fxTransfer.updateFxPrepareReservedForwarded.calledWith(fxPayload.commitRequestId)) + test.pass() + test.end() + } catch (err) { + Logger.error(`handlePayeeResponse failed with error - ${err}`) + test.fail() + test.end() + } + }) + + forwardedPrepareTest.test('throw error', async (test) => { + try { + fxTransfer.updateFxPrepareReservedForwarded.throws(new Error()) + await Fx.forwardedFxPrepare(fxPayload.commitRequestId) + test.fail('Error not thrown') + test.end() + } catch (err) { + Logger.error(`handlePayeeResponse failed with error - ${err}`) + test.pass('Error thrown') + test.end() + } + }) + + forwardedPrepareTest.end() + }) + + fxIndexTest.end() +}) diff --git a/test/unit/domain/ledgerAccountTypes/index.test.js b/test/unit/domain/ledgerAccountTypes/index.test.js index 1c9b684c6..da3538a79 100644 --- a/test/unit/domain/ledgerAccountTypes/index.test.js +++ b/test/unit/domain/ledgerAccountTypes/index.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/domain/participant/index.test.js b/test/unit/domain/participant/index.test.js index 5f8ceca27..41b1c231b 100644 --- a/test/unit/domain/participant/index.test.js +++ b/test/unit/domain/participant/index.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -52,14 +55,16 @@ Test('Participant service', async (participantTest) => { name: 'fsp1', currency: 'USD', isActive: 1, - createdDate: new Date() + createdDate: new Date(), + isProxy: 0 }, { participantId: 1, name: 'fsp2', currency: 'EUR', isActive: 1, - createdDate: new Date() + createdDate: new Date(), + isProxy: 0 } ] @@ -70,7 +75,8 @@ Test('Participant service', async (participantTest) => { currency: 'USD', isActive: 1, createdDate: new Date(), - currencyList: ['USD'] + currencyList: ['USD'], + isProxy: 0 }, { participantId: 1, @@ -78,7 +84,8 @@ Test('Participant service', async (participantTest) => { currency: 'EUR', isActive: 1, createdDate: new Date(), - currencyList: ['EUR'] + currencyList: ['EUR'], + isProxy: 0 } ] const participantCurrencyResult = [ @@ -195,7 +202,7 @@ Test('Participant service', async (participantTest) => { participantFixtures.forEach((participant, index) => { participantMap.set(index + 1, participantResult[index]) Db.participant.insert.withArgs({ participant }).returns(index) - ParticipantModelCached.create.withArgs({ name: participant.name }).returns((index + 1)) + ParticipantModelCached.create.withArgs({ name: participant.name, isProxy: !!participant.isProxy }).returns((index + 1)) ParticipantModelCached.getByName.withArgs(participant.name).returns(participantResult[index]) ParticipantModelCached.getById.withArgs(index).returns(participantResult[index]) ParticipantModelCached.update.withArgs(participant, 1).returns((index + 1)) @@ -250,7 +257,7 @@ Test('Participant service', async (participantTest) => { }) await participantTest.test('create false participant', async (assert) => { - const falseParticipant = { name: 'fsp3' } + const falseParticipant = { name: 'fsp3', isProxy: false } ParticipantModelCached.create.withArgs(falseParticipant).throws(new Error()) try { await Service.create(falseParticipant) diff --git a/test/unit/domain/position/abort.test.js b/test/unit/domain/position/abort.test.js new file mode 100644 index 000000000..aa332d694 --- /dev/null +++ b/test/unit/domain/position/abort.test.js @@ -0,0 +1,693 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + + -------------- + + ******/ + +'use strict' + +const Test = require('tapes')(require('tape')) +const { Enum } = require('@mojaloop/central-services-shared') +const Sinon = require('sinon') +const { processPositionAbortBin } = require('../../../../src/domain/position/abort') + +const abortMessage1 = { + value: { + from: 'payeefsp1', + to: 'payerfsp1', + id: 'a0000001-0000-0000-0000-000000000000', + content: { + uriParams: { + id: 'a0000001-0000-0000-0000-000000000000' + }, + headers: { + accept: 'application/vnd.interoperability.transfers+json;version=1.0', + 'fspiop-destination': 'payerfsp1', + 'Content-Type': 'application/vnd.interoperability.transfers+json;version=1.0', + date: 'Tue, 14 May 2024 00:13:15 GMT', + 'fspiop-source': 'payeefsp1' + }, + payload: { + errorInformation: { + errorCode: '5104', + errorDescription: 'Payee Rejected' + } + }, + context: { + cyrilResult: { + positionChanges: [ + { + isFxTransferStateChange: false, + transferId: 'a0000001-0000-0000-0000-000000000000', + notifyTo: 'payerfsp1', + participantCurrencyId: 1, + amount: -10 + }, + { + isFxTransferStateChange: true, + commitRequestId: 'b0000001-0000-0000-0000-000000000000', + notifyTo: 'fxp1', + participantCurrencyId: 2, + amount: -10 + } + ] + } + } + }, + type: 'application/vnd.interoperability.transfers+json;version=1.0', + metadata: { + correlationId: 'a0000001-0000-0000-0000-000000000000', + event: { + type: 'position', + action: 'abort', + createdAt: '2024-05-14T00:13:15.092Z', + state: { + status: 'error', + code: '5104', + description: 'Payee Rejected' + }, + id: '1ef2f45c-f7a4-4b67-a0fc-7164ed43f0f1' + }, + trace: { + service: 'cl_transfer', + traceId: 'de8e410463b73e45203fc916d68cf98c', + spanId: 'bb0abd2ea5fdfbbd', + startTimestamp: '2024-05-14T00:13:15.092Z', + tags: { + tracestate: 'acmevendor=eyJzcGFuSWQiOiJiYjBhYmQyZWE1ZmRmYmJkIn0=', + transactionType: 'transfer', + transactionAction: 'abort', + source: 'payeefsp1', + destination: 'payerfsp1' + }, + tracestates: { + acmevendor: { + spanId: 'bb0abd2ea5fdfbbd' + } + } + }, + 'protocol.createdAt': 1715645595093 + } + }, + size: 3489, + key: 51, + topic: 'topic-transfer-position', + offset: 4073, + partition: 0, + timestamp: 1694175690401 +} + +const abortMessage2 = { + value: { + from: 'payeefsp1', + to: 'payerfsp1', + id: 'a0000002-0000-0000-0000-000000000000', + content: { + uriParams: { + id: 'a0000002-0000-0000-0000-000000000000' + }, + headers: { + accept: 'application/vnd.interoperability.transfers+json;version=1.0', + 'fspiop-destination': 'payerfsp1', + 'Content-Type': 'application/vnd.interoperability.transfers+json;version=1.0', + date: 'Tue, 14 May 2024 00:13:15 GMT', + 'fspiop-source': 'payeefsp1' + }, + payload: { + errorInformation: { + errorCode: '5104', + errorDescription: 'Payee Rejected' + } + }, + context: { + cyrilResult: { + positionChanges: [ + { + isFxTransferStateChange: false, + transferId: 'a0000002-0000-0000-0000-000000000000', + notifyTo: 'payerfsp1', + participantCurrencyId: 1, + amount: -10 + } + ] + } + } + }, + type: 'application/vnd.interoperability.transfers+json;version=1.0', + metadata: { + correlationId: 'a0000002-0000-0000-0000-000000000000', + event: { + type: 'position', + action: 'abort', + createdAt: '2024-05-14T00:13:15.092Z', + state: { + status: 'error', + code: '5104', + description: 'Payee Rejected' + }, + id: '1ef2f45c-f7a4-4b67-a0fc-7164ed43f0f1' + }, + trace: { + service: 'cl_transfer', + traceId: 'de8e410463b73e45203fc916d68cf98c', + spanId: 'bb0abd2ea5fdfbbd', + startTimestamp: '2024-05-14T00:13:15.092Z', + tags: { + tracestate: 'acmevendor=eyJzcGFuSWQiOiJiYjBhYmQyZWE1ZmRmYmJkIn0=', + transactionType: 'transfer', + transactionAction: 'abort', + source: 'payeefsp1', + destination: 'payerfsp1' + }, + tracestates: { + acmevendor: { + spanId: 'bb0abd2ea5fdfbbd' + } + } + }, + 'protocol.createdAt': 1715645595093 + } + }, + size: 3489, + key: 51, + topic: 'topic-transfer-position', + offset: 4073, + partition: 0, + timestamp: 1694175690401 +} + +const fxAbortMessage1 = { + value: { + from: 'fxp1', + to: 'payerfsp1', + id: 'c0000001-0000-0000-0000-000000000000', + content: { + uriParams: { + id: 'c0000001-0000-0000-0000-000000000000' + }, + headers: { + accept: 'application/vnd.interoperability.transfers+json;version=1.0', + 'fspiop-destination': 'payerfsp1', + 'Content-Type': 'application/vnd.interoperability.transfers+json;version=1.0', + date: 'Tue, 14 May 2024 00:13:15 GMT', + 'fspiop-source': 'fxp1' + }, + payload: { + errorInformation: { + errorCode: '5104', + errorDescription: 'FXP Rejected' + } + }, + context: { + cyrilResult: { + positionChanges: [ + { + isFxTransferStateChange: true, + commitRequestId: 'c0000001-0000-0000-0000-000000000000', + notifyTo: 'fxp1', + participantCurrencyId: 1, + amount: -10 + }, + { + isFxTransferStateChange: false, + transferId: 'd0000001-0000-0000-0000-000000000000', + notifyTo: 'payerfsp1', + participantCurrencyId: 1, + amount: -10 + } + ] + } + } + }, + type: 'application/vnd.interoperability.transfers+json;version=1.0', + metadata: { + correlationId: 'c0000001-0000-0000-0000-000000000000', + event: { + type: 'position', + action: 'fx-abort', + createdAt: '2024-05-14T00:13:15.092Z', + state: { + status: 'error', + code: '5104', + description: 'Payee Rejected' + }, + id: '1ef2f45c-f7a4-4b67-a0fc-7164ed43f0f1' + }, + trace: { + service: 'cl_transfer', + traceId: 'de8e410463b73e45203fc916d68cf98c', + spanId: 'bb0abd2ea5fdfbbd', + startTimestamp: '2024-05-14T00:13:15.092Z', + tags: { + tracestate: 'acmevendor=eyJzcGFuSWQiOiJiYjBhYmQyZWE1ZmRmYmJkIn0=', + transactionType: 'transfer', + transactionAction: 'fx-abort', + source: 'fxp1', + destination: 'payerfsp1' + }, + tracestates: { + acmevendor: { + spanId: 'bb0abd2ea5fdfbbd' + } + } + }, + 'protocol.createdAt': 1715645595093 + } + }, + size: 3489, + key: 51, + topic: 'topic-transfer-position', + offset: 4073, + partition: 0, + timestamp: 1694175690401 +} + +const fxAbortMessage2 = { + value: { + from: 'fxp1', + to: 'payerfsp1', + id: 'c0000002-0000-0000-0000-000000000000', + content: { + uriParams: { + id: 'c0000002-0000-0000-0000-000000000000' + }, + headers: { + accept: 'application/vnd.interoperability.transfers+json;version=1.0', + 'fspiop-destination': 'payerfsp1', + 'Content-Type': 'application/vnd.interoperability.transfers+json;version=1.0', + date: 'Tue, 14 May 2024 00:13:15 GMT', + 'fspiop-source': 'fxp1' + }, + payload: { + errorInformation: { + errorCode: '5104', + errorDescription: 'FXP Rejected' + } + }, + context: { + cyrilResult: { + positionChanges: [ + { + isFxTransferStateChange: true, + commitRequestId: 'c0000002-0000-0000-0000-000000000000', + notifyTo: 'fxp1', + participantCurrencyId: 1, + amount: -10 + } + ] + } + } + }, + type: 'application/vnd.interoperability.transfers+json;version=1.0', + metadata: { + correlationId: 'c0000002-0000-0000-0000-000000000000', + event: { + type: 'position', + action: 'fx-abort', + createdAt: '2024-05-14T00:13:15.092Z', + state: { + status: 'error', + code: '5104', + description: 'Payee Rejected' + }, + id: '1ef2f45c-f7a4-4b67-a0fc-7164ed43f0f1' + }, + trace: { + service: 'cl_transfer', + traceId: 'de8e410463b73e45203fc916d68cf98c', + spanId: 'bb0abd2ea5fdfbbd', + startTimestamp: '2024-05-14T00:13:15.092Z', + tags: { + tracestate: 'acmevendor=eyJzcGFuSWQiOiJiYjBhYmQyZWE1ZmRmYmJkIn0=', + transactionType: 'transfer', + transactionAction: 'fx-abort', + source: 'fxp1', + destination: 'payerfsp1' + }, + tracestates: { + acmevendor: { + spanId: 'bb0abd2ea5fdfbbd' + } + } + }, + 'protocol.createdAt': 1715645595093 + } + }, + size: 3489, + key: 51, + topic: 'topic-transfer-position', + offset: 4073, + partition: 0, + timestamp: 1694175690401 +} + +const span = {} + +const getAbortBinItems = () => { + const binItems = [ + { + message: JSON.parse(JSON.stringify(abortMessage1)), + span, + decodedPayload: {} + }, + { + message: JSON.parse(JSON.stringify(abortMessage2)), + span, + decodedPayload: {} + } + ] + return binItems +} + +const getFxAbortBinItems = () => { + const binItems = [ + { + message: JSON.parse(JSON.stringify(fxAbortMessage1)), + span, + decodedPayload: {} + }, + { + message: JSON.parse(JSON.stringify(fxAbortMessage2)), + span, + decodedPayload: {} + } + ] + return binItems +} + +Test('abort domain', positionIndexTest => { + let sandbox + + positionIndexTest.beforeEach(t => { + sandbox = Sinon.createSandbox() + t.end() + }) + + positionIndexTest.afterEach(t => { + sandbox.restore() + t.end() + }) + + positionIndexTest.test('processPositionAbortBin should', processPositionAbortBinTest => { + processPositionAbortBinTest.test('produce abort message for transfers not in the right transfer state', async (test) => { + const binItems = getAbortBinItems() + try { + await processPositionAbortBin( + binItems, + { + accumulatedPositionValue: 0, + accumulatedPositionReservedValue: 0, + accumulatedTransferStates: { + 'a0000001-0000-0000-0000-000000000000': 'INVALID_STATE', + 'a0000002-0000-0000-0000-000000000000': 'INVALID_STATE' + }, + accumulatedFxTransferStates: { + 'b0000001-0000-0000-0000-000000000000': 'INVALID_STATE' + }, + isFx: false + } + ) + test.fail('Error not thrown') + } catch (e) { + test.pass('Error thrown') + } + test.end() + }) + + processPositionAbortBinTest.test('produce abort messages with correct states but invalid cyrilResult', async (test) => { + const binItems = getAbortBinItems() + binItems[0].message.value.content.context = { + cyrilResult: 'INVALID' + } + try { + await processPositionAbortBin( + binItems, + { + accumulatedPositionValue: 0, + accumulatedPositionReservedValue: 0, + accumulatedTransferStates: { + 'a0000001-0000-0000-0000-000000000000': Enum.Transfers.TransferInternalState.RECEIVED_ERROR, + 'a0000002-0000-0000-0000-000000000000': Enum.Transfers.TransferInternalState.RECEIVED_ERROR + }, + accumulatedFxTransferStates: { + 'b0000001-0000-0000-0000-000000000000': Enum.Transfers.TransferInternalState.RECEIVED_ERROR + }, + isFx: false + } + ) + test.fail('Error not thrown') + } catch (e) { + test.pass('Error thrown') + } + test.end() + }) + + processPositionAbortBinTest.test('produce abort messages with correct states and proper cyrilResult.', async (test) => { + const binItems = getAbortBinItems() + try { + const processedResult = await processPositionAbortBin( + binItems, + { + accumulatedPositionValue: 0, + accumulatedPositionReservedValue: 0, + accumulatedTransferStates: { + 'a0000001-0000-0000-0000-000000000000': Enum.Transfers.TransferInternalState.RECEIVED_ERROR, + 'a0000002-0000-0000-0000-000000000000': Enum.Transfers.TransferInternalState.RECEIVED_ERROR + }, + accumulatedFxTransferStates: { + 'b0000001-0000-0000-0000-000000000000': Enum.Transfers.TransferInternalState.RECEIVED_ERROR + }, + isFx: false + } + ) + test.pass('Error not thrown') + test.equal(processedResult.notifyMessages.length, 1) + test.equal(processedResult.followupMessages.length, 1) + test.equal(processedResult.accumulatedPositionChanges.length, 2) + test.equal(processedResult.accumulatedPositionChanges[0].value, -10) + test.equal(processedResult.accumulatedTransferStates[abortMessage1.value.id], Enum.Transfers.TransferInternalState.ABORTED_ERROR) + test.equal(processedResult.accumulatedTransferStates[abortMessage2.value.id], Enum.Transfers.TransferInternalState.ABORTED_ERROR) + test.equal(processedResult.accumulatedTransferStateChanges[0].transferId, abortMessage1.value.id) + test.equal(processedResult.accumulatedTransferStateChanges[1].transferId, abortMessage2.value.id) + test.equal(processedResult.accumulatedTransferStateChanges[0].transferStateId, Enum.Transfers.TransferInternalState.ABORTED_ERROR) + test.equal(processedResult.accumulatedTransferStateChanges[1].transferStateId, Enum.Transfers.TransferInternalState.ABORTED_ERROR) + test.equal(processedResult.accumulatedPositionValue, -20) + } catch (e) { + test.fail('Error thrown') + } + test.end() + }) + + processPositionAbortBinTest.test('produce abort messages with correct states and proper cyrilResult with a single message. expecting one position to be adjusted and one followup message', async (test) => { + const binItems = getAbortBinItems() + binItems.splice(1, 1) + try { + const processedResult = await processPositionAbortBin( + binItems, + { + accumulatedPositionValue: 0, + accumulatedPositionReservedValue: 0, + accumulatedTransferStates: { + 'a0000001-0000-0000-0000-000000000000': Enum.Transfers.TransferInternalState.RECEIVED_ERROR, + 'a0000002-0000-0000-0000-000000000000': Enum.Transfers.TransferInternalState.RECEIVED_ERROR + }, + accumulatedFxTransferStates: { + 'b0000001-0000-0000-0000-000000000000': Enum.Transfers.TransferInternalState.RECEIVED_ERROR + }, + isFx: false + } + ) + test.pass('Error not thrown') + test.equal(processedResult.notifyMessages.length, 0) + test.equal(processedResult.followupMessages.length, 1) + test.equal(processedResult.accumulatedPositionChanges.length, 1) + test.equal(processedResult.accumulatedPositionChanges[0].value, -10) + test.equal(processedResult.accumulatedTransferStates[abortMessage1.value.id], Enum.Transfers.TransferInternalState.ABORTED_ERROR) + test.equal(processedResult.accumulatedTransferStateChanges[0].transferId, abortMessage1.value.id) + test.equal(processedResult.accumulatedTransferStateChanges[0].transferStateId, Enum.Transfers.TransferInternalState.ABORTED_ERROR) + test.equal(processedResult.accumulatedPositionValue, -10) + } catch (e) { + test.fail('Error thrown') + } + test.end() + }) + + processPositionAbortBinTest.test('skip position changes if changePositions is false', async (test) => { + const binItems = getAbortBinItems() + try { + const processedResult = await processPositionAbortBin( + binItems, + { + accumulatedPositionValue: 0, + accumulatedPositionReservedValue: 0, + accumulatedTransferStates: { + 'a0000001-0000-0000-0000-000000000000': Enum.Transfers.TransferInternalState.RECEIVED_ERROR, + 'a0000002-0000-0000-0000-000000000000': Enum.Transfers.TransferInternalState.RECEIVED_ERROR + }, + isFx: false, + changePositions: false + } + ) + test.equal(processedResult.accumulatedPositionChanges.length, 0) + test.equal(processedResult.accumulatedPositionValue, 0) + test.equal(processedResult.accumulatedTransferStateChanges.length, 2) + processedResult.accumulatedTransferStateChanges.forEach(transferStateChange => test.equal(transferStateChange.transferStateId, Enum.Transfers.TransferInternalState.ABORTED_ERROR)) + processedResult.accumulatedTransferStates[abortMessage1.value.id] = Enum.Transfers.TransferInternalState.ABORTED_ERROR + processedResult.accumulatedTransferStates[abortMessage2.value.id] = Enum.Transfers.TransferInternalState.ABORTED_ERROR + } catch (e) { + test.fail('Error thrown') + } + test.end() + }) + + processPositionAbortBinTest.end() + }) + + positionIndexTest.test('processPositionAbortBin with FX should', processPositionAbortBinTest => { + processPositionAbortBinTest.test('produce fx-abort message for fxTransfers not in the right transfer state', async (test) => { + const binItems = getFxAbortBinItems() + try { + await processPositionAbortBin( + binItems, + { + accumulatedPositionValue: 0, + accumulatedPositionReservedValue: 0, + accumulatedTransferStates: { + 'd0000001-0000-0000-0000-000000000000': 'INVALID_STATE' + }, + accumulatedFxTransferStates: { + 'c0000001-0000-0000-0000-000000000000': 'INVALID_STATE', + 'c0000002-0000-0000-0000-000000000000': 'INVALID_STATE' + }, + isFx: true + } + ) + test.fail('Error not thrown') + } catch (e) { + test.pass('Error thrown') + } + test.end() + }) + + processPositionAbortBinTest.test('produce fx-abort messages with correct states but invalid cyrilResult', async (test) => { + const binItems = getFxAbortBinItems() + binItems[0].message.value.content.context = { + cyrilResult: 'INVALID' + } + try { + await processPositionAbortBin( + binItems, + { + accumulatedPositionValue: 0, + accumulatedPositionReservedValue: 0, + accumulatedTransferStates: { + 'd0000001-0000-0000-0000-000000000000': Enum.Transfers.TransferInternalState.RECEIVED_ERROR + }, + accumulatedFxTransferStates: { + 'c0000001-0000-0000-0000-000000000000': Enum.Transfers.TransferInternalState.RECEIVED_ERROR, + 'c0000002-0000-0000-0000-000000000000': Enum.Transfers.TransferInternalState.RECEIVED_ERROR + }, + isFx: true + } + ) + test.fail('Error not thrown') + } catch (e) { + test.pass('Error thrown') + } + test.end() + }) + + processPositionAbortBinTest.test('produce abort messages with correct states and proper cyrilResult.', async (test) => { + const binItems = getFxAbortBinItems() + try { + const processedResult = await processPositionAbortBin( + binItems, + { + accumulatedPositionValue: 0, + accumulatedPositionReservedValue: 0, + accumulatedTransferStates: { + 'd0000001-0000-0000-0000-000000000000': Enum.Transfers.TransferInternalState.RECEIVED_ERROR + }, + accumulatedFxTransferStates: { + 'c0000001-0000-0000-0000-000000000000': Enum.Transfers.TransferInternalState.RECEIVED_ERROR, + 'c0000002-0000-0000-0000-000000000000': Enum.Transfers.TransferInternalState.RECEIVED_ERROR + }, + isFx: true + } + ) + test.pass('Error not thrown') + test.equal(processedResult.notifyMessages.length, 1) + test.equal(processedResult.followupMessages.length, 1) + test.equal(processedResult.accumulatedPositionChanges.length, 2) + test.equal(processedResult.accumulatedPositionChanges[0].value, -10) + test.equal(processedResult.accumulatedFxTransferStates[fxAbortMessage1.value.id], Enum.Transfers.TransferInternalState.ABORTED_ERROR) + test.equal(processedResult.accumulatedFxTransferStates[fxAbortMessage2.value.id], Enum.Transfers.TransferInternalState.ABORTED_ERROR) + test.equal(processedResult.accumulatedPositionValue, -20) + } catch (e) { + test.fail('Error thrown') + } + test.end() + }) + + processPositionAbortBinTest.test('produce abort messages with correct states and proper cyrilResult with a single message. expecting one position to be adjusted and one followup message', async (test) => { + const binItems = getFxAbortBinItems() + binItems.splice(1, 1) + try { + const processedResult = await processPositionAbortBin( + binItems, + { + accumulatedPositionValue: 0, + accumulatedPositionReservedValue: 0, + accumulatedTransferStates: { + 'd0000001-0000-0000-0000-000000000000': Enum.Transfers.TransferInternalState.RECEIVED_ERROR + }, + accumulatedFxTransferStates: { + 'c0000001-0000-0000-0000-000000000000': Enum.Transfers.TransferInternalState.RECEIVED_ERROR, + 'c0000002-0000-0000-0000-000000000000': Enum.Transfers.TransferInternalState.RECEIVED_ERROR + }, + isFx: true + } + ) + test.pass('Error not thrown') + test.equal(processedResult.notifyMessages.length, 0) + test.equal(processedResult.followupMessages.length, 1) + test.equal(processedResult.accumulatedPositionChanges.length, 1) + test.equal(processedResult.accumulatedPositionChanges[0].value, -10) + test.equal(processedResult.accumulatedFxTransferStates[fxAbortMessage1.value.id], Enum.Transfers.TransferInternalState.ABORTED_ERROR) + test.equal(processedResult.accumulatedPositionValue, -10) + } catch (e) { + test.fail('Error thrown') + } + test.end() + }) + + processPositionAbortBinTest.end() + }) + + positionIndexTest.end() +}) diff --git a/test/unit/domain/position/binProcessor.test.js b/test/unit/domain/position/binProcessor.test.js index 16159cacd..e216096b5 100644 --- a/test/unit/domain/position/binProcessor.test.js +++ b/test/unit/domain/position/binProcessor.test.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -60,7 +60,7 @@ const prepareTransfers = [ ...prepareTransfersBin2 ] -const fulfillTransfers = [ +const fulfilTransfers = [ '4830fa00-0c2a-4de1-9640-5ad4e68f5f62', '33d42717-1dc9-4224-8c9b-45aab4fe6457', 'f33add51-38b1-4715-9876-83d8a08c485d', @@ -69,8 +69,17 @@ const fulfillTransfers = [ 'fe332218-07d6-4f00-8399-76671594697a' ] +const timeoutReservedTransfers = [ + '7e3fa3f7-9a1b-4a81-83c9-5b41112dd7f5' +] + +const fxTimeoutReservedTransfers = [ + 'ed6848e0-e2a8-45b0-9f98-59a2ffba8c10' +] + Test('BinProcessor', async (binProcessorTest) => { let sandbox + binProcessorTest.beforeEach(async test => { sandbox = Sinon.createSandbox() sandbox.stub(BatchPositionModel) @@ -79,10 +88,18 @@ Test('BinProcessor', async (binProcessorTest) => { sandbox.stub(participantFacade) const prepareTransfersStates = Object.fromEntries(prepareTransfers.map((transferId) => [transferId, { transferStateChangeId: 1, transferStateId: Enum.Transfers.TransferInternalState.RECEIVED_PREPARE }])) - const fulfillTransfersStates = Object.fromEntries(fulfillTransfers.map((transferId) => [transferId, { transferStateChangeId: 1, transferStateId: Enum.Transfers.TransferInternalState.RECEIVED_FULFIL }])) + const fulfilTransfersStates = Object.fromEntries(fulfilTransfers.map((transferId) => [transferId, { transferStateChangeId: 1, transferStateId: Enum.Transfers.TransferInternalState.RECEIVED_FULFIL }])) + const timeoutReservedTransfersStates = Object.fromEntries(timeoutReservedTransfers.map((transferId) => [transferId, { transferStateChangeId: 1, transferStateId: Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT }])) + const fxTimeoutReservedTransfersStates = Object.fromEntries(fxTimeoutReservedTransfers.map((commitRequestId) => [commitRequestId, { transferStateChangeId: 1, transferStateId: Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT }])) + BatchPositionModel.getLatestTransferStateChangesByTransferIdList.returns({ ...prepareTransfersStates, - ...fulfillTransfersStates + ...fulfilTransfersStates, + ...timeoutReservedTransfersStates + }) + + BatchPositionModel.getLatestFxTransferStateChangesByCommitRequestIdList.returns({ + ...fxTimeoutReservedTransfersStates }) BatchPositionModelCached.getParticipantCurrencyByIds.returns([ @@ -363,6 +380,18 @@ Test('BinProcessor', async (binProcessorTest) => { }, 'fe332218-07d6-4f00-8399-76671594697a': { amount: -2 + }, + '7e3fa3f7-9a1b-4a81-83c9-5b41112dd7f5': { + amount: -50 + } + }) + + BatchPositionModel.getReservedPositionChangesByCommitRequestIds.returns({ + 'ed6848e0-e2a8-45b0-9f98-59a2ffba8c10': { + 15: { + value: 100, + change: 100 + } } }) @@ -412,8 +441,8 @@ Test('BinProcessor', async (binProcessorTest) => { test.end() }) - binProcessorTest.test('binProcessor should', prepareActionTest => { - prepareActionTest.test('processBins should process a bin of positions and return the expected results', async (test) => { + binProcessorTest.test('binProcessor should', processBinsTest => { + processBinsTest.test('processBins should process a bin of positions and return the expected results', async (test) => { const sampleParticipantLimitReturnValues = [ { participantId: 2, @@ -434,7 +463,7 @@ Test('BinProcessor', async (binProcessorTest) => { const result = await BinProcessor.processBins(sampleBins, trx) // Assert on result.notifyMessages - test.equal(result.notifyMessages.length, 13, 'processBins should return the expected number of notify messages') + test.equal(result.notifyMessages.length, 15, 'processBins should return the expected number of notify messages') // Assert on result.limitAlarms // test.equal(result.limitAlarms.length, 1, 'processBin should return the expected number of limit alarms') @@ -447,8 +476,8 @@ Test('BinProcessor', async (binProcessorTest) => { // Assert on DB update for position values of all accounts in each function call test.deepEqual(BatchPositionModel.updateParticipantPosition.getCalls().map(call => call.args), [ - [{}, 7, 0, 0], - [{}, 15, 2, 0] + [{}, 7, -50, 0], + [{}, 15, -98, 0] ], 'updateParticipantPosition should be called with the expected arguments') // TODO: Assert on DB bulk insert of transferStateChanges in each function call @@ -457,7 +486,7 @@ Test('BinProcessor', async (binProcessorTest) => { test.end() }) - prepareActionTest.test('processBins should handle prepare messages', async (test) => { + processBinsTest.test('processBins should handle prepare messages', async (test) => { const sampleParticipantLimitReturnValues = [ { participantId: 2, @@ -479,6 +508,10 @@ Test('BinProcessor', async (binProcessorTest) => { sampleBinsDeepCopy[15].commit = [] sampleBinsDeepCopy[7].reserve = [] sampleBinsDeepCopy[15].reserve = [] + sampleBinsDeepCopy[7]['timeout-reserved'] = [] + sampleBinsDeepCopy[15]['timeout-reserved'] = [] + sampleBinsDeepCopy[7]['fx-timeout-reserved'] = [] + sampleBinsDeepCopy[15]['fx-timeout-reserved'] = [] const result = await BinProcessor.processBins(sampleBinsDeepCopy, trx) // Assert on result.notifyMessages @@ -505,7 +538,7 @@ Test('BinProcessor', async (binProcessorTest) => { test.end() }) - prepareActionTest.test('processBins should handle commit messages', async (test) => { + processBinsTest.test('processBins should handle commit messages', async (test) => { const sampleParticipantLimitReturnValues = [ { participantId: 2, @@ -526,6 +559,10 @@ Test('BinProcessor', async (binProcessorTest) => { sampleBinsDeepCopy[15].prepare = [] sampleBinsDeepCopy[7].reserve = [] sampleBinsDeepCopy[15].reserve = [] + sampleBinsDeepCopy[7]['timeout-reserved'] = [] + sampleBinsDeepCopy[15]['timeout-reserved'] = [] + sampleBinsDeepCopy[7]['fx-timeout-reserved'] = [] + sampleBinsDeepCopy[15]['fx-timeout-reserved'] = [] const result = await BinProcessor.processBins(sampleBinsDeepCopy, trx) // Assert on result.notifyMessages @@ -550,7 +587,7 @@ Test('BinProcessor', async (binProcessorTest) => { test.end() }) - prepareActionTest.test('processBins should handle reserve messages', async (test) => { + processBinsTest.test('processBins should handle reserve messages', async (test) => { const sampleParticipantLimitReturnValues = [ { participantId: 2, @@ -571,6 +608,10 @@ Test('BinProcessor', async (binProcessorTest) => { sampleBinsDeepCopy[15].prepare = [] sampleBinsDeepCopy[7].commit = [] sampleBinsDeepCopy[15].commit = [] + sampleBinsDeepCopy[7]['timeout-reserved'] = [] + sampleBinsDeepCopy[15]['timeout-reserved'] = [] + sampleBinsDeepCopy[7]['fx-timeout-reserved'] = [] + sampleBinsDeepCopy[15]['fx-timeout-reserved'] = [] const result = await BinProcessor.processBins(sampleBinsDeepCopy, trx) // Assert on result.notifyMessages @@ -595,7 +636,105 @@ Test('BinProcessor', async (binProcessorTest) => { test.end() }) - prepareActionTest.test('processBins should throw error if any accountId cannot be matched to atleast one participantCurrencyId', async (test) => { + processBinsTest.test('processBins should handle timeout-reserved messages', async (test) => { + const sampleParticipantLimitReturnValues = [ + { + participantId: 2, + currencyId: 'USD', + participantLimitTypeId: 1, + value: 1000000 + }, + { + participantId: 3, + currencyId: 'USD', + participantLimitTypeId: 1, + value: 1000000 + } + ] + participantFacade.getParticipantLimitByParticipantCurrencyLimit.returns(sampleParticipantLimitReturnValues.shift()) + const sampleBinsDeepCopy = JSON.parse(JSON.stringify(sampleBins)) + sampleBinsDeepCopy[7].prepare = [] + sampleBinsDeepCopy[15].prepare = [] + sampleBinsDeepCopy[7].commit = [] + sampleBinsDeepCopy[15].commit = [] + sampleBinsDeepCopy[7].reserve = [] + sampleBinsDeepCopy[15].reserve = [] + sampleBinsDeepCopy[7]['fx-timeout-reserved'] = [] + sampleBinsDeepCopy[15]['fx-timeout-reserved'] = [] + const result = await BinProcessor.processBins(sampleBinsDeepCopy, trx) + + // Assert on result.notifyMessages + test.equal(result.notifyMessages.length, 1, 'processBins should return 1 messages') + + // TODO: What if there are no position changes in a batch? + // Assert on number of function calls for DB update on position value + // test.ok(BatchPositionModel.updateParticipantPosition.notCalled, 'updateParticipantPosition should not be called') + + // TODO: Assert on number of function calls for DB bulk insert of transferStateChanges + // TODO: Assert on number of function calls for DB bulk insert of positionChanges + + // Assert on DB update for position values of all accounts in each function call + test.deepEqual(BatchPositionModel.updateParticipantPosition.getCalls().map(call => call.args), [ + [{}, 7, -50, 0], + [{}, 15, 0, 0] + ], 'updateParticipantPosition should be called with the expected arguments') + + // TODO: Assert on DB bulk insert of transferStateChanges in each function call + // TODO: Assert on DB bulk insert of positionChanges in each function call + + test.end() + }) + + processBinsTest.test('processBins should handle fx-timeout-reserved messages', async (test) => { + const sampleParticipantLimitReturnValues = [ + { + participantId: 2, + currencyId: 'USD', + participantLimitTypeId: 1, + value: 1000000 + }, + { + participantId: 3, + currencyId: 'USD', + participantLimitTypeId: 1, + value: 1000000 + } + ] + participantFacade.getParticipantLimitByParticipantCurrencyLimit.returns(sampleParticipantLimitReturnValues.shift()) + const sampleBinsDeepCopy = JSON.parse(JSON.stringify(sampleBins)) + sampleBinsDeepCopy[7].prepare = [] + sampleBinsDeepCopy[15].prepare = [] + sampleBinsDeepCopy[7].commit = [] + sampleBinsDeepCopy[15].commit = [] + sampleBinsDeepCopy[7].reserve = [] + sampleBinsDeepCopy[15].reserve = [] + sampleBinsDeepCopy[7]['timeout-reserved'] = [] + sampleBinsDeepCopy[15]['timeout-reserved'] = [] + const result = await BinProcessor.processBins(sampleBinsDeepCopy, trx) + + // Assert on result.notifyMessages + test.equal(result.notifyMessages.length, 1, 'processBins should return 1 messages') + + // TODO: What if there are no position changes in a batch? + // Assert on number of function calls for DB update on position value + // test.ok(BatchPositionModel.updateParticipantPosition.notCalled, 'updateParticipantPosition should not be called') + + // TODO: Assert on number of function calls for DB bulk insert of transferStateChanges + // TODO: Assert on number of function calls for DB bulk insert of positionChanges + + // Assert on DB update for position values of all accounts in each function call + test.deepEqual(BatchPositionModel.updateParticipantPosition.getCalls().map(call => call.args), [ + [{}, 7, 0, 0], + [{}, 15, -100, 0] + ], 'updateParticipantPosition should be called with the expected arguments') + + // TODO: Assert on DB bulk insert of transferStateChanges in each function call + // TODO: Assert on DB bulk insert of positionChanges in each function call + + test.end() + }) + + processBinsTest.test('processBins should throw error if any accountId cannot be matched to atleast one participantCurrencyId', async (test) => { const sampleParticipantLimitReturnValues = [ { participantId: 2, @@ -624,7 +763,7 @@ Test('BinProcessor', async (binProcessorTest) => { test.end() }) - prepareActionTest.test('processBins should throw error if no settlement model is found', async (test) => { + processBinsTest.test('processBins should throw error if no settlement model is found', async (test) => { SettlementModelCached.getAll.returns([]) const sampleParticipantLimitReturnValues = [ { @@ -650,7 +789,7 @@ Test('BinProcessor', async (binProcessorTest) => { test.end() }) - prepareActionTest.test('processBins should throw error if no default settlement model if currency model is missing', async (test) => { + processBinsTest.test('processBins should throw error if no default settlement model if currency model is missing', async (test) => { SettlementModelCached.getAll.returns([ { settlementModelId: 3, @@ -691,7 +830,7 @@ Test('BinProcessor', async (binProcessorTest) => { test.end() }) - prepareActionTest.test('processBins should use default settlement model if currency model is missing', async (test) => { + processBinsTest.test('processBins should use default settlement model if currency model is missing', async (test) => { SettlementModelCached.getAll.returns([ { settlementModelId: 2, @@ -727,7 +866,7 @@ Test('BinProcessor', async (binProcessorTest) => { const result = await BinProcessor.processBins(sampleBins, trx) // Assert on result.notifyMessages - test.equal(result.notifyMessages.length, 13, 'processBins should return 13 messages') + test.equal(result.notifyMessages.length, 15, 'processBins should return 15 messages') // TODO: What if there are no position changes in a batch? // Assert on number of function calls for DB update on position value @@ -738,8 +877,8 @@ Test('BinProcessor', async (binProcessorTest) => { // Assert on DB update for position values of all accounts in each function call test.deepEqual(BatchPositionModel.updateParticipantPosition.getCalls().map(call => call.args), [ - [{}, 7, 0, 0], - [{}, 15, 2, 0] + [{}, 7, -50, 0], + [{}, 15, -98, 0] ], 'updateParticipantPosition should be called with the expected arguments') // TODO: Assert on DB bulk insert of transferStateChanges in each function call @@ -748,7 +887,7 @@ Test('BinProcessor', async (binProcessorTest) => { test.end() }) - prepareActionTest.test('processBins should handle no binItems', async (test) => { + processBinsTest.test('processBins should handle no binItems', async (test) => { const sampleParticipantLimitReturnValues = [ { participantId: 2, @@ -771,6 +910,10 @@ Test('BinProcessor', async (binProcessorTest) => { delete sampleBinsDeepCopy[15].commit delete sampleBinsDeepCopy[7].reserve delete sampleBinsDeepCopy[15].reserve + delete sampleBinsDeepCopy[7]['timeout-reserved'] + delete sampleBinsDeepCopy[15]['timeout-reserved'] + sampleBinsDeepCopy[7]['fx-timeout-reserved'] = [] + sampleBinsDeepCopy[15]['fx-timeout-reserved'] = [] const result = await BinProcessor.processBins(sampleBinsDeepCopy, trx) // Assert on result.notifyMessages @@ -795,7 +938,7 @@ Test('BinProcessor', async (binProcessorTest) => { test.end() }) - prepareActionTest.test('processBins should handle non supported bins', async (test) => { + processBinsTest.test('processBins should handle non supported bins', async (test) => { const sampleParticipantLimitReturnValues = [ { participantId: 2, @@ -823,14 +966,51 @@ Test('BinProcessor', async (binProcessorTest) => { test.end() }) - prepareActionTest.end() + + processBinsTest.test('processBins should process bins with accountId 0 differently', async (test) => { + const sampleParticipantLimitReturnValues = [ + { + participantId: 2, + currencyId: 'USD', + participantLimitTypeId: 1, + value: 1000000 + }, + { + participantId: 3, + currencyId: 'USD', + participantLimitTypeId: 1, + value: 1000000 + } + ] + participantFacade.getParticipantLimitByParticipantCurrencyLimit.returns(sampleParticipantLimitReturnValues.shift()) + const binsWithZeroId = JSON.parse(JSON.stringify(sampleBins)) + binsWithZeroId[0] = binsWithZeroId[15] + delete binsWithZeroId[15] + delete binsWithZeroId[7] + + const result = await BinProcessor.processBins(binsWithZeroId, trx) + + // Assert on result.notifyMessages + test.equal(result.notifyMessages.length, 6, 'processBins should return 6 messages') + + // Assert on number of function calls for DB update on position value + test.equal(BatchPositionModel.updateParticipantPosition.callCount, 0, 'updateParticipantPosition should not be called') + test.ok(BatchPositionModel.bulkInsertTransferStateChanges.calledOnce, 'bulkInsertTrasferStateChanges should be called once') + test.ok(BatchPositionModel.bulkInsertFxTransferStateChanges.calledOnce, 'bulkInsertFxTrasferStateChanges should be called once') + test.equal(BatchPositionModel.bulkInsertParticipantPositionChanges.callCount, 0, 'bulkInsertParticipantPositionChanges should not be called') + + test.end() + }) + + processBinsTest.end() }) + binProcessorTest.test('iterateThroughBins should', async (iterateThroughBinsTest) => { iterateThroughBinsTest.test('iterateThroughBins should call callback function for each message in bins', async (test) => { const spyCb = sandbox.spy() await BinProcessor.iterateThroughBins(sampleBins, spyCb) - test.equal(spyCb.callCount, 13, 'callback should be called 13 times') + test.equal(spyCb.callCount, 15, 'callback should be called 15 times') test.end() }) iterateThroughBinsTest.test('iterateThroughBins should call error callback function if callback function throws error', async (test) => { @@ -840,7 +1020,7 @@ Test('BinProcessor', async (binProcessorTest) => { spyCb.onThirdCall().throws() await BinProcessor.iterateThroughBins(sampleBins, spyCb, errorCb) - test.equal(spyCb.callCount, 13, 'callback should be called 13 times') + test.equal(spyCb.callCount, 15, 'callback should be called 15 times') test.equal(errorCb.callCount, 2, 'error callback should be called 2 times') test.end() }) @@ -849,10 +1029,11 @@ Test('BinProcessor', async (binProcessorTest) => { spyCb.onFirstCall().throws() await BinProcessor.iterateThroughBins(sampleBins, spyCb) - test.equal(spyCb.callCount, 13, 'callback should be called 13 times') + test.equal(spyCb.callCount, 15, 'callback should be called 15 times') test.end() }) iterateThroughBinsTest.end() }) + binProcessorTest.end() }) diff --git a/test/unit/domain/position/fulfil.test.js b/test/unit/domain/position/fulfil.test.js index 27cc40d62..4e55f2960 100644 --- a/test/unit/domain/position/fulfil.test.js +++ b/test/unit/domain/position/fulfil.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -28,343 +31,203 @@ const Test = require('tapes')(require('tape')) const { Enum } = require('@mojaloop/central-services-shared') const Sinon = require('sinon') const { processPositionFulfilBin } = require('../../../../src/domain/position/fulfil') +const { randomUUID } = require('crypto') +const Config = require('../../../../src/lib/config') -const transferMessage1 = { - value: { - from: 'perffsp1', - to: 'perffsp2', - id: '68c8aa25-fe5b-4b1f-a0ab-ab890fe3ae7f', - content: { - uriParams: { - id: '68c8aa25-fe5b-4b1f-a0ab-ab890fe3ae7f' - }, - headers: { - accept: 'application/vnd.interoperability.transfers+json;version=1.1', - 'content-type': 'application/vnd.interoperability.transfers+json;version=1.1', - date: '2023-08-21T10:22:11.000Z', - 'fspiop-source': 'perffsp1', - 'fspiop-destination': 'perffsp2', - traceparent: '00-278414be0ce56adab6c6461b1196f7ec-c2639bb302a327f2-01', - tracestate: 'acmevendor=eyJzcGFuSWQiOiJjMjYzOWJiMzAyYTMyN2YyIiwidGltZUFwaVByZXBhcmUiOiIxNjkyMjg1OTA4MTc4In0=,tx_end2end_start_ts=1692285908177,tx_callback_start_ts=1692613331481', - 'user-agent': 'axios/1.4.0', - 'content-length': '136', - 'accept-encoding': 'gzip, compress, deflate, br', - host: 'ml-api-adapter:3000', - connection: 'keep-alive' - }, - payload: 'data:application/vnd.interoperability.transfers+json;version=1.1;base64,eyJ0cmFuc2ZlclN0YXRlIjoiQ09NTUlUVEVEIiwiZnVsZmlsbWVudCI6ImxuWWU0cll3THRoV2J6aFZ5WDVjQXVEZkwxVWx3NFdkYVRneUdEUkV5c3ciLCJjb21wbGV0ZWRUaW1lc3RhbXAiOiIyMDIzLTA4LTIxVDEwOjIyOjExLjQ4MVoifQ==' - }, - type: 'application/json', - metadata: { - correlationId: '68c8aa25-fe5b-4b1f-a0ab-ab890fe3ae7f', - event: { - type: 'position', - action: 'commit', - createdAt: '2023-08-21T10:22:11.481Z', - state: { - status: 'success', - code: 0, - description: 'action successful' - }, - id: 'ffa2969c-8b90-4fa7-97b3-6013b5937553' - }, - trace: { - service: 'cl_transfer_fulfil', - traceId: '278414be0ce56adab6c6461b1196f7ec', - spanId: '29dcf2b250cd22d1', - sampled: 1, - flags: '01', - parentSpanId: 'e038bfd263a0b4c0', - startTimestamp: '2023-08-21T10:23:31.357Z', - tags: { - tracestate: 'acmevendor=eyJzcGFuSWQiOiIyOWRjZjJiMjUwY2QyMmQxIiwidGltZUFwaVByZXBhcmUiOiIxNjkyMjg1OTA4MTc4IiwidGltZUFwaUZ1bGZpbCI6IjE2OTI2MTMzMzE0ODEifQ==,tx_end2end_start_ts=1692285908177,tx_callback_start_ts=1692613331481', - transactionType: 'transfer', - transactionAction: 'fulfil', - transactionId: '68c8aa25-fe5b-4b1f-a0ab-ab890fe3ae7f', - source: 'perffsp1', - destination: 'perffsp2' - }, - tracestates: { - acmevendor: { - spanId: '29dcf2b250cd22d1', - timeApiPrepare: '1692285908178', - timeApiFulfil: '1692613331481' +const constructTransferCallbackTestData = (payerFsp, payeeFsp, transferState, eventAction, amount, currency) => { + const transferId = randomUUID() + const payload = { + transferState, + fulfilment: 'lnYe4rYwLthWbzhVyX5cAuDfL1Ulw4WdaTgyGDREysw', + completedTimestamp: '2023-08-21T10:22:11.481Z' + } + const transferInfo = { + transferId, + amount + } + const reservedActionTransferInfo = { + transferId, + amount, + currencyId: currency, + ilpCondition: 'lnYe4rYwLthWbzhVyX5cAuDfL1Ulw4WdaTgyGDREysw', + expirationDate: '2023-08-21T10:22:11.481Z', + createdDate: '2023-08-21T10:22:11.481Z', + completedTimestamp: '2023-08-21T10:22:11.481Z', + transferStateEnumeration: 'PREPARE', + fulfilment: 'lnYe4rYwLthWbzhVyX5cAuDfL1Ulw4WdaTgyGDREysw', + extensionList: [] + } + const base64Payload = Buffer.from(JSON.stringify(payload)).toString('base64') + return { + transferInfo, + reservedActionTransferInfo, + decodedPayload: payload, + message: { + value: { + from: payerFsp, + to: payeeFsp, + id: transferId, + content: { + uriParams: { + id: transferId }, - tx_end2end_start_ts: '1692285908177', - tx_callback_start_ts: '1692613331481' - } - }, - 'protocol.createdAt': 1692613411360 - } - }, - size: 3489, - key: 51, - topic: 'topic-transfer-position', - offset: 4070, - partition: 0, - timestamp: 1694175690401 -} -const transferMessage2 = { - value: { - from: 'perffsp2', - to: 'perffsp1', - id: '4830fa00-0c2a-4de1-9640-5ad4e68f5f62', - content: { - uriParams: { - id: '4830fa00-0c2a-4de1-9640-5ad4e68f5f62' - }, - headers: { - accept: 'application/vnd.interoperability.transfers+json;version=1.1', - 'content-type': 'application/vnd.interoperability.transfers+json;version=1.1', - date: '2023-08-21T10:22:27.000Z', - 'fspiop-source': 'perffsp2', - 'fspiop-destination': 'perffsp1', - traceparent: '00-1fcd3843697316bd4dea096eb8b0f20d-242262bdec0c9c76-01', - tracestate: 'acmevendor=eyJzcGFuSWQiOiIyNDIyNjJiZGVjMGM5Yzc2IiwidGltZUFwaVByZXBhcmUiOiIxNjkyMjg1OTEyMDI3In0=,tx_end2end_start_ts=1692285912027,tx_callback_start_ts=1692613347073', - 'user-agent': 'axios/1.4.0', - 'content-length': '136', - 'accept-encoding': 'gzip, compress, deflate, br', - host: 'ml-api-adapter:3000', - connection: 'keep-alive' - }, - payload: 'data:application/vnd.interoperability.transfers+json;version=1.1;base64,eyJ0cmFuc2ZlclN0YXRlIjoiQ09NTUlUVEVEIiwiZnVsZmlsbWVudCI6ImxuWWU0cll3THRoV2J6aFZ5WDVjQXVEZkwxVWx3NFdkYVRneUdEUkV5c3ciLCJjb21wbGV0ZWRUaW1lc3RhbXAiOiIyMDIzLTA4LTIxVDEwOjIyOjI3LjA3M1oifQ==' - }, - type: 'application/json', - metadata: { - correlationId: '4830fa00-0c2a-4de1-9640-5ad4e68f5f62', - event: { - type: 'position', - action: 'commit', - createdAt: '2023-08-21T10:22:27.074Z', - state: { - status: 'success', - code: 0, - description: 'action successful' - }, - id: 'c16155a3-1807-470d-9386-ce46603ed875' - }, - trace: { - service: 'cl_transfer_fulfil', - traceId: '1fcd3843697316bd4dea096eb8b0f20d', - spanId: '5690c3dbd5bb1ee5', - sampled: 1, - flags: '01', - parentSpanId: '66055f3f76497fc9', - startTimestamp: '2023-08-21T10:23:45.332Z', - tags: { - tracestate: 'acmevendor=eyJzcGFuSWQiOiI1NjkwYzNkYmQ1YmIxZWU1IiwidGltZUFwaVByZXBhcmUiOiIxNjkyMjg1OTEyMDI3IiwidGltZUFwaUZ1bGZpbCI6IjE2OTI2MTMzNDcwNzQifQ==,tx_end2end_start_ts=1692285912027,tx_callback_start_ts=1692613347073', - transactionType: 'transfer', - transactionAction: 'fulfil', - transactionId: '4830fa00-0c2a-4de1-9640-5ad4e68f5f62', - source: 'perffsp2', - destination: 'perffsp1' - }, - tracestates: { - acmevendor: { - spanId: '5690c3dbd5bb1ee5', - timeApiPrepare: '1692285912027', - timeApiFulfil: '1692613347074' + headers: { + accept: 'application/vnd.interoperability.transfers+json;version=1.1', + 'content-type': 'application/vnd.interoperability.transfers+json;version=1.1', + date: '2023-08-21T10:22:11.000Z', + 'fspiop-source': payerFsp, + 'fspiop-destination': payeeFsp, + traceparent: '00-278414be0ce56adab6c6461b1196f7ec-c2639bb302a327f2-01', + tracestate: 'acmevendor=eyJzcGFuSWQiOiJjMjYzOWJiMzAyYTMyN2YyIiwidGltZUFwaVByZXBhcmUiOiIxNjkyMjg1OTA4MTc4In0=,tx_end2end_start_ts=1692285908177,tx_callback_start_ts=1692613331481', + 'user-agent': 'axios/1.4.0', + 'content-length': '136', + 'accept-encoding': 'gzip, compress, deflate, br', + host: 'ml-api-adapter:3000', + connection: 'keep-alive' }, - tx_end2end_start_ts: '1692285912027', - tx_callback_start_ts: '1692613347073' - } - }, - 'protocol.createdAt': 1692613425335 - } - }, - size: 3489, - key: 51, - topic: 'topic-transfer-position', - offset: 4073, - partition: 0, - timestamp: 1694175690401 -} -const transferMessage3 = { - value: { - from: 'perffsp1', - to: 'perffsp2', - id: '780a1e7c-f01e-47a4-8538-1a27fb690627', - content: { - uriParams: { - id: '780a1e7c-f01e-47a4-8538-1a27fb690627' - }, - headers: { - accept: 'application/vnd.interoperability.transfers+json;version=1.1', - 'content-type': 'application/vnd.interoperability.transfers+json;version=1.1', - date: '2023-08-21T10:22:11.000Z', - 'fspiop-source': 'perffsp1', - 'fspiop-destination': 'perffsp2', - traceparent: '00-278414be0ce56adab6c6461b1196f7ec-c2639bb302a327f2-01', - tracestate: 'acmevendor=eyJzcGFuSWQiOiJjMjYzOWJiMzAyYTMyN2YyIiwidGltZUFwaVByZXBhcmUiOiIxNjkyMjg1OTA4MTc4In0=,tx_end2end_start_ts=1692285908177,tx_callback_start_ts=1692613331481', - 'user-agent': 'axios/1.4.0', - 'content-length': '136', - 'accept-encoding': 'gzip, compress, deflate, br', - host: 'ml-api-adapter:3000', - connection: 'keep-alive' - }, - payload: 'data:application/vnd.interoperability.transfers+json;version=1.1;base64,eyJ0cmFuc2ZlclN0YXRlIjoiQ09NTUlUVEVEIiwiZnVsZmlsbWVudCI6ImxuWWU0cll3THRoV2J6aFZ5WDVjQXVEZkwxVWx3NFdkYVRneUdEUkV5c3ciLCJjb21wbGV0ZWRUaW1lc3RhbXAiOiIyMDIzLTA4LTIxVDEwOjIyOjExLjQ4MVoifQ==' - }, - type: 'application/json', - metadata: { - correlationId: '780a1e7c-f01e-47a4-8538-1a27fb690627', - event: { - type: 'position', - action: 'reserve', - createdAt: '2023-08-21T10:22:11.481Z', - state: { - status: 'success', - code: 0, - description: 'action successful' - }, - id: 'ffa2969c-8b90-4fa7-97b3-6013b5937553' - }, - trace: { - service: 'cl_transfer_fulfil', - traceId: '278414be0ce56adab6c6461b1196f7ec', - spanId: '29dcf2b250cd22d1', - sampled: 1, - flags: '01', - parentSpanId: 'e038bfd263a0b4c0', - startTimestamp: '2023-08-21T10:23:31.357Z', - tags: { - tracestate: 'acmevendor=eyJzcGFuSWQiOiIyOWRjZjJiMjUwY2QyMmQxIiwidGltZUFwaVByZXBhcmUiOiIxNjkyMjg1OTA4MTc4IiwidGltZUFwaUZ1bGZpbCI6IjE2OTI2MTMzMzE0ODEifQ==,tx_end2end_start_ts=1692285908177,tx_callback_start_ts=1692613331481', - transactionType: 'transfer', - transactionAction: 'fulfil', - transactionId: '780a1e7c-f01e-47a4-8538-1a27fb690627', - source: 'perffsp1', - destination: 'perffsp2' + payload: 'data:application/vnd.interoperability.transfers+json;version=1.1;base64,' + base64Payload }, - tracestates: { - acmevendor: { + type: 'application/json', + metadata: { + correlationId: transferId, + event: { + type: 'position', + action: eventAction, + createdAt: '2023-08-21T10:22:11.481Z', + state: { + status: 'success', + code: 0, + description: 'action successful' + }, + id: 'ffa2969c-8b90-4fa7-97b3-6013b5937553' + }, + trace: { + service: 'cl_transfer_fulfil', + traceId: '278414be0ce56adab6c6461b1196f7ec', spanId: '29dcf2b250cd22d1', - timeApiPrepare: '1692285908178', - timeApiFulfil: '1692613331481' + sampled: 1, + flags: '01', + parentSpanId: 'e038bfd263a0b4c0', + startTimestamp: '2023-08-21T10:23:31.357Z', + tags: { + tracestate: 'acmevendor=eyJzcGFuSWQiOiIyOWRjZjJiMjUwY2QyMmQxIiwidGltZUFwaVByZXBhcmUiOiIxNjkyMjg1OTA4MTc4IiwidGltZUFwaUZ1bGZpbCI6IjE2OTI2MTMzMzE0ODEifQ==,tx_end2end_start_ts=1692285908177,tx_callback_start_ts=1692613331481', + transactionType: 'transfer', + transactionAction: 'fulfil', + transactionId: transferId, + source: payerFsp, + destination: payeeFsp + }, + tracestates: { + acmevendor: { + spanId: '29dcf2b250cd22d1', + timeApiPrepare: '1692285908178', + timeApiFulfil: '1692613331481' + }, + tx_end2end_start_ts: '1692285908177', + tx_callback_start_ts: '1692613331481' + } }, - tx_end2end_start_ts: '1692285908177', - tx_callback_start_ts: '1692613331481' + 'protocol.createdAt': 1692613411360 } }, - 'protocol.createdAt': 1692613411360 + size: 3489, + key: 51, + topic: 'topic-transfer-position', + offset: 4070, + partition: 0, + timestamp: 1694175690401 } - }, - size: 3489, - key: 51, - topic: 'topic-transfer-position', - offset: 4070, - partition: 0, - timestamp: 1694175690401 + } } -const transferMessage4 = { - value: { - from: 'perffsp2', - to: 'perffsp1', - id: '0a4834e7-7e4c-47e8-8dcb-f3f68031d377', - content: { - uriParams: { - id: '0a4834e7-7e4c-47e8-8dcb-f3f68031d377' - }, - headers: { - accept: 'application/vnd.interoperability.transfers+json;version=1.1', - 'content-type': 'application/vnd.interoperability.transfers+json;version=1.1', - date: '2023-08-21T10:22:27.000Z', - 'fspiop-source': 'perffsp2', - 'fspiop-destination': 'perffsp1', - traceparent: '00-1fcd3843697316bd4dea096eb8b0f20d-242262bdec0c9c76-01', - tracestate: 'acmevendor=eyJzcGFuSWQiOiIyNDIyNjJiZGVjMGM5Yzc2IiwidGltZUFwaVByZXBhcmUiOiIxNjkyMjg1OTEyMDI3In0=,tx_end2end_start_ts=1692285912027,tx_callback_start_ts=1692613347073', - 'user-agent': 'axios/1.4.0', - 'content-length': '136', - 'accept-encoding': 'gzip, compress, deflate, br', - host: 'ml-api-adapter:3000', - connection: 'keep-alive' - }, - payload: 'data:application/vnd.interoperability.transfers+json;version=1.1;base64,eyJ0cmFuc2ZlclN0YXRlIjoiQ09NTUlUVEVEIiwiZnVsZmlsbWVudCI6ImxuWWU0cll3THRoV2J6aFZ5WDVjQXVEZkwxVWx3NFdkYVRneUdEUkV5c3ciLCJjb21wbGV0ZWRUaW1lc3RhbXAiOiIyMDIzLTA4LTIxVDEwOjIyOjI3LjA3M1oifQ==' - }, - type: 'application/json', - metadata: { - correlationId: '0a4834e7-7e4c-47e8-8dcb-f3f68031d377', - event: { - type: 'position', - action: 'reserve', - createdAt: '2023-08-21T10:22:27.074Z', - state: { - status: 'success', - code: 0, - description: 'action successful' - }, - id: 'c16155a3-1807-470d-9386-ce46603ed875' - }, - trace: { - service: 'cl_transfer_fulfil', - traceId: '1fcd3843697316bd4dea096eb8b0f20d', - spanId: '5690c3dbd5bb1ee5', - sampled: 1, - flags: '01', - parentSpanId: '66055f3f76497fc9', - startTimestamp: '2023-08-21T10:23:45.332Z', - tags: { - tracestate: 'acmevendor=eyJzcGFuSWQiOiI1NjkwYzNkYmQ1YmIxZWU1IiwidGltZUFwaVByZXBhcmUiOiIxNjkyMjg1OTEyMDI3IiwidGltZUFwaUZ1bGZpbCI6IjE2OTI2MTMzNDcwNzQifQ==,tx_end2end_start_ts=1692285912027,tx_callback_start_ts=1692613347073', - transactionType: 'transfer', - transactionAction: 'fulfil', - transactionId: '0a4834e7-7e4c-47e8-8dcb-f3f68031d377', - source: 'perffsp2', - destination: 'perffsp1' + +const _constructContextForFx = (transferTestData, partialProcessed = false, patchNotifications = []) => { + return { + cyrilResult: { + isFx: true, + positionChanges: [ + { + isFxTransferStateChange: true, + commitRequestId: randomUUID(), + participantCurrencyId: '100', + amount: '10', + isDone: partialProcessed ? true : undefined }, - tracestates: { - acmevendor: { - spanId: '5690c3dbd5bb1ee5', - timeApiPrepare: '1692285912027', - timeApiFulfil: '1692613347074' - }, - tx_end2end_start_ts: '1692285912027', - tx_callback_start_ts: '1692613347073' + { + isFxTransferStateChange: false, + transferId: transferTestData.message.value.id, + participantCurrencyId: '101', + amount: transferTestData.transferInfo.amount } - }, - 'protocol.createdAt': 1692613425335 + ], + patchNotifications } - }, - size: 3489, - key: 51, - topic: 'topic-transfer-position', - offset: 4073, - partition: 0, - timestamp: 1694175690401 + } } + +const transferTestData1 = constructTransferCallbackTestData('perffsp1', 'perffsp2', 'COMMITTED', 'commit', '2.00', 'USD') +const transferTestData2 = constructTransferCallbackTestData('perffsp2', 'perffsp1', 'COMMITTED', 'commit', '2.00', 'USD') +const transferTestData3 = constructTransferCallbackTestData('perffsp1', 'perffsp2', 'RESERVED', 'reserve', '2.00', 'USD') +const transferTestData4 = constructTransferCallbackTestData('perffsp2', 'perffsp1', 'RESERVED', 'reserve', '2.00', 'USD') +// Fulfil messages those are linked to FX transfers +const transferTestData5 = constructTransferCallbackTestData('perffsp1', 'perffsp2', 'COMMITTED', 'commit', '2.00', 'USD') +transferTestData5.message.value.content.context = _constructContextForFx(transferTestData5, undefined, [{ + commitRequestId: randomUUID(), + fxpName: 'FXP1', + fulfilment: 'fulfilment', + completedTimestamp: new Date().toISOString() +}]) +const transferTestData6 = constructTransferCallbackTestData('perffsp2', 'perffsp1', 'COMMITTED', 'commit', '2.00', 'USD') +transferTestData6.message.value.content.context = _constructContextForFx(transferTestData6, undefined, [{ + commitRequestId: randomUUID(), + fxpName: 'FXP1', + fulfilment: 'fulfilment', + completedTimestamp: new Date().toISOString() +}]) +const transferTestData7 = constructTransferCallbackTestData('perffsp1', 'perffsp2', 'COMMITTED', 'commit', '2.00', 'USD') +transferTestData7.message.value.content.context = _constructContextForFx(transferTestData7, true) +const transferTestData8 = constructTransferCallbackTestData('perffsp2', 'perffsp1', 'COMMITTED', 'commit', '2.00', 'USD') +transferTestData8.message.value.content.context = _constructContextForFx(transferTestData8, true) + const span = {} const commitBinItems = [{ - message: transferMessage1, + message: transferTestData1.message, span, - decodedPayload: { - transferState: 'COMMITTED', - fulfilment: 'lnYe4rYwLthWbzhVyX5cAuDfL1Ulw4WdaTgyGDREysw', - completedTimestamp: '2023-08-21T10:22:11.481Z' - } + decodedPayload: transferTestData1.decodedPayload }, { - message: transferMessage2, + message: transferTestData2.message, span, - decodedPayload: { - transferState: 'COMMITTED', - fulfilment: 'lnYe4rYwLthWbzhVyX5cAuDfL1Ulw4WdaTgyGDREysw', - completedTimestamp: '2023-08-21T10:22:27.073Z' - } + decodedPayload: transferTestData2.decodedPayload }] const reserveBinItems = [{ - message: transferMessage3, + message: transferTestData3.message, span, - decodedPayload: { - transferState: 'RESERVED', - fulfilment: 'lnYe4rYwLthWbzhVyX5cAuDfL1Ulw4WdaTgyGDREysw', - completedTimestamp: '2023-08-21T10:22:11.481Z' - } + decodedPayload: transferTestData3.decodedPayload }, { - message: transferMessage4, + message: transferTestData4.message, span, - decodedPayload: { - transferState: 'RESERVED', - fulfilment: 'lnYe4rYwLthWbzhVyX5cAuDfL1Ulw4WdaTgyGDREysw', - completedTimestamp: '2023-08-21T10:22:27.073Z' - } + decodedPayload: transferTestData4.decodedPayload +}] +const commitWithFxBinItems = [{ + message: transferTestData5.message, + span, + decodedPayload: transferTestData5.decodedPayload +}, +{ + message: transferTestData6.message, + span, + decodedPayload: transferTestData6.decodedPayload +}] +const commitWithPartiallyProcessedFxBinItems = [{ + message: transferTestData7.message, + span, + decodedPayload: transferTestData7.decodedPayload +}, +{ + message: transferTestData8.message, + span, + decodedPayload: transferTestData8.decodedPayload }] Test('Fulfil domain', processPositionFulfilBinTest => { let sandbox @@ -380,22 +243,25 @@ Test('Fulfil domain', processPositionFulfilBinTest => { }) processPositionFulfilBinTest.test('should process a bin of position-commit messages', async (test) => { + const accumulatedTransferStates = { + [transferTestData1.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_FULFIL, + [transferTestData2.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_FULFIL + } + const accumulatedFxTransferStates = {} + const transferInfoList = { + [transferTestData1.message.value.id]: transferTestData1.transferInfo, + [transferTestData2.message.value.id]: transferTestData2.transferInfo + } // Call the function const result = await processPositionFulfilBin( [commitBinItems, []], - 0, - 0, - { - '68c8aa25-fe5b-4b1f-a0ab-ab890fe3ae7f': Enum.Transfers.TransferInternalState.RECEIVED_FULFIL, - '4830fa00-0c2a-4de1-9640-5ad4e68f5f62': Enum.Transfers.TransferInternalState.RECEIVED_FULFIL - }, { - '68c8aa25-fe5b-4b1f-a0ab-ab890fe3ae7f': { - amount: 2.00 - }, - '4830fa00-0c2a-4de1-9640-5ad4e68f5f62': { - amount: 2.00 - } + accumulatedPositionValue: 0, + accumulatedPositionReservedValue: 0, + accumulatedTransferStates, + accumulatedFxTransferStates, + transferInfoList, + reservedActionTransfers: [] } ) @@ -403,83 +269,53 @@ Test('Fulfil domain', processPositionFulfilBinTest => { test.equal(result.notifyMessages.length, 2) test.equal(result.accumulatedPositionValue, 4) test.equal(result.accumulatedPositionReservedValue, 0) - test.deepEqual(result.accumulatedTransferStateChanges, [ - { - transferId: '68c8aa25-fe5b-4b1f-a0ab-ab890fe3ae7f', - transferStateId: 'COMMITTED', - reason: undefined - }, - { - transferId: '4830fa00-0c2a-4de1-9640-5ad4e68f5f62', - transferStateId: 'COMMITTED', - reason: undefined - } - ]) - test.deepEqual(result.accumulatedTransferStates, { - '68c8aa25-fe5b-4b1f-a0ab-ab890fe3ae7f': 'COMMITTED', - '4830fa00-0c2a-4de1-9640-5ad4e68f5f62': 'COMMITTED' - }) - - test.equal(result.notifyMessages[0].message.content.headers.accept, transferMessage1.value.content.headers.accept) - test.equal(result.notifyMessages[0].message.content.headers['fspiop-destination'], transferMessage1.value.content.headers['fspiop-destination']) - test.equal(result.notifyMessages[0].message.content.headers['fspiop-source'], transferMessage1.value.content.headers['fspiop-source']) - test.equal(result.notifyMessages[0].message.content.headers['content-type'], transferMessage1.value.content.headers['content-type']) + + test.equal(result.accumulatedTransferStateChanges[0].transferId, transferTestData1.message.value.id) + test.equal(result.accumulatedTransferStateChanges[1].transferId, transferTestData2.message.value.id) + test.equal(result.accumulatedTransferStateChanges[0].transferStateId, Enum.Transfers.TransferState.COMMITTED) + test.equal(result.accumulatedTransferStateChanges[1].transferStateId, Enum.Transfers.TransferState.COMMITTED) + + test.equal(result.notifyMessages[0].message.content.headers.accept, transferTestData1.message.value.content.headers.accept) + test.equal(result.notifyMessages[0].message.content.headers['fspiop-destination'], transferTestData1.message.value.content.headers['fspiop-destination']) + test.equal(result.notifyMessages[0].message.content.headers['fspiop-source'], transferTestData1.message.value.content.headers['fspiop-source']) + test.equal(result.notifyMessages[0].message.content.headers['content-type'], transferTestData1.message.value.content.headers['content-type']) test.equal(result.accumulatedPositionChanges[0].value, 2) - test.equal(result.accumulatedTransferStates[transferMessage1.value.id], Enum.Transfers.TransferState.COMMITTED) + test.equal(result.accumulatedTransferStates[transferTestData1.message.value.id], Enum.Transfers.TransferState.COMMITTED) - test.equal(result.notifyMessages[1].message.content.headers.accept, transferMessage2.value.content.headers.accept) - test.equal(result.notifyMessages[1].message.content.headers['fspiop-destination'], transferMessage2.value.content.headers['fspiop-destination']) - test.equal(result.notifyMessages[1].message.content.headers['fspiop-source'], transferMessage2.value.content.headers['fspiop-source']) - test.equal(result.notifyMessages[1].message.content.headers['content-type'], transferMessage2.value.content.headers['content-type']) + test.equal(result.notifyMessages[1].message.content.headers.accept, transferTestData2.message.value.content.headers.accept) + test.equal(result.notifyMessages[1].message.content.headers['fspiop-destination'], transferTestData2.message.value.content.headers['fspiop-destination']) + test.equal(result.notifyMessages[1].message.content.headers['fspiop-source'], transferTestData2.message.value.content.headers['fspiop-source']) + test.equal(result.notifyMessages[1].message.content.headers['content-type'], transferTestData2.message.value.content.headers['content-type']) test.equal(result.accumulatedPositionChanges[1].value, 4) - test.equal(result.accumulatedTransferStates[transferMessage2.value.id], Enum.Transfers.TransferState.COMMITTED) + test.equal(result.accumulatedTransferStates[transferTestData2.message.value.id], Enum.Transfers.TransferState.COMMITTED) test.end() }) processPositionFulfilBinTest.test('should process a bin of position-reserve messages', async (test) => { + const accumulatedTransferStates = { + [transferTestData3.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_FULFIL, + [transferTestData4.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_FULFIL + } + const accumulatedFxTransferStates = {} + const transferInfoList = { + [transferTestData3.message.value.id]: transferTestData3.transferInfo, + [transferTestData4.message.value.id]: transferTestData4.transferInfo + } + const reservedActionTransfers = { + [transferTestData3.message.value.id]: transferTestData3.reservedActionTransferInfo, + [transferTestData4.message.value.id]: transferTestData4.reservedActionTransferInfo + } // Call the function const result = await processPositionFulfilBin( [[], reserveBinItems], - 0, - 0, - { - '780a1e7c-f01e-47a4-8538-1a27fb690627': Enum.Transfers.TransferInternalState.RECEIVED_FULFIL, - '0a4834e7-7e4c-47e8-8dcb-f3f68031d377': Enum.Transfers.TransferInternalState.RECEIVED_FULFIL - }, - { - '780a1e7c-f01e-47a4-8538-1a27fb690627': { - amount: 2.00 - }, - '0a4834e7-7e4c-47e8-8dcb-f3f68031d377': { - amount: 2.00 - } - }, { - '780a1e7c-f01e-47a4-8538-1a27fb690627': { - transferId: '780a1e7c-f01e-47a4-8538-1a27fb690627', - amount: 2.00, - currencyId: 'USD', - ilpCondition: 'lnYe4rYwLthWbzhVyX5cAuDfL1Ulw4WdaTgyGDREysw', - expirationDate: '2023-08-21T10:22:11.481Z', - createdDate: '2023-08-21T10:22:11.481Z', - completedTimestamp: '2023-08-21T10:22:11.481Z', - transferStateEnumeration: 'COMMITED', - fulfilment: 'lnYe4rYwLthWbzhVyX5cAuDfL1Ulw4WdaTgyGDREysw', - extensionList: [] - }, - '0a4834e7-7e4c-47e8-8dcb-f3f68031d377': { - transferId: '0a4834e7-7e4c-47e8-8dcb-f3f68031d377', - amount: 2.00, - currencyId: 'USD', - ilpCondition: 'lnYe4rYwLthWbzhVyX5cAuDfL1Ulw4WdaTgyGDREysw', - expirationDate: '2023-08-21T10:22:11.481Z', - createdDate: '2023-08-21T10:22:11.481Z', - completedTimestamp: '2023-08-21T10:22:11.481Z', - transferStateEnumeration: 'COMMITED', - fulfilment: 'lnYe4rYwLthWbzhVyX5cAuDfL1Ulw4WdaTgyGDREysw', - extensionList: [] - } + accumulatedPositionValue: 0, + accumulatedPositionReservedValue: 0, + accumulatedTransferStates, + accumulatedFxTransferStates, + transferInfoList, + reservedActionTransfers } ) @@ -487,91 +323,57 @@ Test('Fulfil domain', processPositionFulfilBinTest => { test.equal(result.notifyMessages.length, 2) test.equal(result.accumulatedPositionValue, 4) test.equal(result.accumulatedPositionReservedValue, 0) - test.deepEqual(result.accumulatedTransferStateChanges, [ - { - transferId: '780a1e7c-f01e-47a4-8538-1a27fb690627', - transferStateId: 'COMMITTED', - reason: undefined - }, - { - transferId: '0a4834e7-7e4c-47e8-8dcb-f3f68031d377', - transferStateId: 'COMMITTED', - reason: undefined - } - ]) - test.deepEqual(result.accumulatedTransferStates, { - '780a1e7c-f01e-47a4-8538-1a27fb690627': 'COMMITTED', - '0a4834e7-7e4c-47e8-8dcb-f3f68031d377': 'COMMITTED' - }) - console.log(result.accumulatedTransferStates) - test.equal(result.notifyMessages[0].message.content.headers.accept, transferMessage1.value.content.headers.accept) - test.equal(result.notifyMessages[0].message.content.headers['fspiop-destination'], transferMessage1.value.content.headers['fspiop-destination']) - test.equal(result.notifyMessages[0].message.content.headers['fspiop-source'], transferMessage1.value.content.headers['fspiop-source']) - test.equal(result.notifyMessages[0].message.content.headers['content-type'], transferMessage1.value.content.headers['content-type']) + + test.equal(result.accumulatedTransferStateChanges[0].transferId, transferTestData3.message.value.id) + test.equal(result.accumulatedTransferStateChanges[1].transferId, transferTestData4.message.value.id) + test.equal(result.accumulatedTransferStateChanges[0].transferStateId, Enum.Transfers.TransferState.COMMITTED) + test.equal(result.accumulatedTransferStateChanges[1].transferStateId, Enum.Transfers.TransferState.COMMITTED) + + test.equal(result.notifyMessages[0].message.content.headers.accept, transferTestData3.message.value.content.headers.accept) + test.equal(result.notifyMessages[0].message.content.headers['fspiop-destination'], transferTestData3.message.value.content.headers['fspiop-destination']) + test.equal(result.notifyMessages[0].message.content.headers['fspiop-source'], transferTestData3.message.value.content.headers['fspiop-source']) + test.equal(result.notifyMessages[0].message.content.headers['content-type'], transferTestData3.message.value.content.headers['content-type']) test.equal(result.accumulatedPositionChanges[0].value, 2) - test.equal(result.accumulatedTransferStates[transferMessage3.value.id], Enum.Transfers.TransferState.COMMITTED) + test.equal(result.accumulatedTransferStates[transferTestData3.message.value.id], Enum.Transfers.TransferState.COMMITTED) - test.equal(result.notifyMessages[1].message.content.headers.accept, transferMessage2.value.content.headers.accept) - test.equal(result.notifyMessages[1].message.content.headers['fspiop-destination'], transferMessage2.value.content.headers['fspiop-destination']) - test.equal(result.notifyMessages[1].message.content.headers['fspiop-source'], transferMessage2.value.content.headers['fspiop-source']) - test.equal(result.notifyMessages[1].message.content.headers['content-type'], transferMessage2.value.content.headers['content-type']) + test.equal(result.notifyMessages[1].message.content.headers.accept, transferTestData4.message.value.content.headers.accept) + test.equal(result.notifyMessages[1].message.content.headers['fspiop-destination'], transferTestData4.message.value.content.headers['fspiop-destination']) + test.equal(result.notifyMessages[1].message.content.headers['fspiop-source'], transferTestData4.message.value.content.headers['fspiop-source']) + test.equal(result.notifyMessages[1].message.content.headers['content-type'], transferTestData4.message.value.content.headers['content-type']) test.equal(result.accumulatedPositionChanges[1].value, 4) - test.equal(result.accumulatedTransferStates[transferMessage4.value.id], Enum.Transfers.TransferState.COMMITTED) + test.equal(result.accumulatedTransferStates[transferTestData4.message.value.id], Enum.Transfers.TransferState.COMMITTED) test.end() }) processPositionFulfilBinTest.test('should process a bin of position-reserve and position-commit messages', async (test) => { + const accumulatedTransferStates = { + [transferTestData1.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_FULFIL, + [transferTestData2.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_FULFIL, + [transferTestData3.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_FULFIL, + [transferTestData4.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_FULFIL + } + const accumulatedFxTransferStates = {} + const transferInfoList = { + [transferTestData1.message.value.id]: transferTestData1.transferInfo, + [transferTestData2.message.value.id]: transferTestData2.transferInfo, + [transferTestData3.message.value.id]: transferTestData3.transferInfo, + [transferTestData4.message.value.id]: transferTestData4.transferInfo + } + const reservedActionTransfers = { + [transferTestData3.message.value.id]: transferTestData3.reservedActionTransferInfo, + [transferTestData4.message.value.id]: transferTestData4.reservedActionTransferInfo + } // Call the function const result = await processPositionFulfilBin( [commitBinItems, reserveBinItems], - 0, - 0, - { - '68c8aa25-fe5b-4b1f-a0ab-ab890fe3ae7f': Enum.Transfers.TransferInternalState.RECEIVED_FULFIL, - '4830fa00-0c2a-4de1-9640-5ad4e68f5f62': Enum.Transfers.TransferInternalState.RECEIVED_FULFIL, - '780a1e7c-f01e-47a4-8538-1a27fb690627': Enum.Transfers.TransferInternalState.RECEIVED_FULFIL, - '0a4834e7-7e4c-47e8-8dcb-f3f68031d377': Enum.Transfers.TransferInternalState.RECEIVED_FULFIL - }, { - '68c8aa25-fe5b-4b1f-a0ab-ab890fe3ae7f': { - amount: 2.00 - }, - '4830fa00-0c2a-4de1-9640-5ad4e68f5f62': { - amount: 2.00 - }, - '780a1e7c-f01e-47a4-8538-1a27fb690627': { - amount: 2.00 - }, - '0a4834e7-7e4c-47e8-8dcb-f3f68031d377': { - amount: 2.00 - } - }, - { - '780a1e7c-f01e-47a4-8538-1a27fb690627': { - transferId: '780a1e7c-f01e-47a4-8538-1a27fb690627', - amount: 2.00, - currencyId: 'USD', - ilpCondition: 'lnYe4rYwLthWbzhVyX5cAuDfL1Ulw4WdaTgyGDREysw', - expirationDate: '2023-08-21T10:22:11.481Z', - createdDate: '2023-08-21T10:22:11.481Z', - completedTimestamp: '2023-08-21T10:22:11.481Z', - transferStateEnumeration: 'COMMITED', - fulfilment: 'lnYe4rYwLthWbzhVyX5cAuDfL1Ulw4WdaTgyGDREysw', - extensionList: [] - }, - '0a4834e7-7e4c-47e8-8dcb-f3f68031d377': { - transferId: '0a4834e7-7e4c-47e8-8dcb-f3f68031d377', - amount: 2.00, - currencyId: 'USD', - ilpCondition: 'lnYe4rYwLthWbzhVyX5cAuDfL1Ulw4WdaTgyGDREysw', - expirationDate: '2023-08-21T10:22:11.481Z', - createdDate: '2023-08-21T10:22:11.481Z', - completedTimestamp: '2023-08-21T10:22:11.481Z', - transferStateEnumeration: 'COMMITED', - fulfilment: 'lnYe4rYwLthWbzhVyX5cAuDfL1Ulw4WdaTgyGDREysw', - extensionList: [] - } + accumulatedPositionValue: 0, + accumulatedPositionReservedValue: 0, + accumulatedTransferStates, + accumulatedFxTransferStates, + transferInfoList, + reservedActionTransfers } ) @@ -579,110 +381,285 @@ Test('Fulfil domain', processPositionFulfilBinTest => { test.equal(result.notifyMessages.length, 4) test.equal(result.accumulatedPositionValue, 8) test.equal(result.accumulatedPositionReservedValue, 0) - test.deepEqual(result.accumulatedTransferStateChanges, [ - { - transferId: '68c8aa25-fe5b-4b1f-a0ab-ab890fe3ae7f', - transferStateId: 'COMMITTED', - reason: undefined - }, - { - transferId: '4830fa00-0c2a-4de1-9640-5ad4e68f5f62', - transferStateId: 'COMMITTED', - reason: undefined - }, - { - transferId: '780a1e7c-f01e-47a4-8538-1a27fb690627', - transferStateId: 'COMMITTED', - reason: undefined - }, - { - transferId: '0a4834e7-7e4c-47e8-8dcb-f3f68031d377', - transferStateId: 'COMMITTED', - reason: undefined - } - ]) - test.deepEqual(result.accumulatedTransferStates, { - '780a1e7c-f01e-47a4-8538-1a27fb690627': 'COMMITTED', - '0a4834e7-7e4c-47e8-8dcb-f3f68031d377': 'COMMITTED', - '68c8aa25-fe5b-4b1f-a0ab-ab890fe3ae7f': 'COMMITTED', - '4830fa00-0c2a-4de1-9640-5ad4e68f5f62': 'COMMITTED' - }) - console.log(result.accumulatedPositionChanges) - test.equal(result.notifyMessages[0].message.content.headers.accept, transferMessage1.value.content.headers.accept) - test.equal(result.notifyMessages[0].message.content.headers['fspiop-destination'], transferMessage1.value.content.headers['fspiop-destination']) - test.equal(result.notifyMessages[0].message.content.headers['fspiop-source'], transferMessage1.value.content.headers['fspiop-source']) - test.equal(result.notifyMessages[0].message.content.headers['content-type'], transferMessage1.value.content.headers['content-type']) + + test.equal(result.accumulatedTransferStateChanges[0].transferId, transferTestData1.message.value.id) + test.equal(result.accumulatedTransferStateChanges[1].transferId, transferTestData2.message.value.id) + test.equal(result.accumulatedTransferStateChanges[2].transferId, transferTestData3.message.value.id) + test.equal(result.accumulatedTransferStateChanges[3].transferId, transferTestData4.message.value.id) + test.equal(result.accumulatedTransferStateChanges[0].transferStateId, Enum.Transfers.TransferState.COMMITTED) + test.equal(result.accumulatedTransferStateChanges[1].transferStateId, Enum.Transfers.TransferState.COMMITTED) + test.equal(result.accumulatedTransferStateChanges[2].transferStateId, Enum.Transfers.TransferState.COMMITTED) + test.equal(result.accumulatedTransferStateChanges[3].transferStateId, Enum.Transfers.TransferState.COMMITTED) + + test.equal(result.notifyMessages[0].message.content.headers.accept, transferTestData1.message.value.content.headers.accept) + test.equal(result.notifyMessages[0].message.content.headers['fspiop-destination'], transferTestData1.message.value.content.headers['fspiop-destination']) + test.equal(result.notifyMessages[0].message.content.headers['fspiop-source'], transferTestData1.message.value.content.headers['fspiop-source']) + test.equal(result.notifyMessages[0].message.content.headers['content-type'], transferTestData1.message.value.content.headers['content-type']) test.equal(result.accumulatedPositionChanges[0].value, 2) - test.equal(result.accumulatedTransferStates[transferMessage1.value.id], Enum.Transfers.TransferState.COMMITTED) + test.equal(result.accumulatedTransferStates[transferTestData1.message.value.id], Enum.Transfers.TransferState.COMMITTED) - test.equal(result.notifyMessages[1].message.content.headers.accept, transferMessage2.value.content.headers.accept) - test.equal(result.notifyMessages[1].message.content.headers['fspiop-destination'], transferMessage2.value.content.headers['fspiop-destination']) - test.equal(result.notifyMessages[1].message.content.headers['fspiop-source'], transferMessage2.value.content.headers['fspiop-source']) - test.equal(result.notifyMessages[1].message.content.headers['content-type'], transferMessage2.value.content.headers['content-type']) + test.equal(result.notifyMessages[1].message.content.headers.accept, transferTestData2.message.value.content.headers.accept) + test.equal(result.notifyMessages[1].message.content.headers['fspiop-destination'], transferTestData2.message.value.content.headers['fspiop-destination']) + test.equal(result.notifyMessages[1].message.content.headers['fspiop-source'], transferTestData2.message.value.content.headers['fspiop-source']) + test.equal(result.notifyMessages[1].message.content.headers['content-type'], transferTestData2.message.value.content.headers['content-type']) test.equal(result.accumulatedPositionChanges[1].value, 4) - test.equal(result.accumulatedTransferStates[transferMessage2.value.id], Enum.Transfers.TransferState.COMMITTED) + test.equal(result.accumulatedTransferStates[transferTestData2.message.value.id], Enum.Transfers.TransferState.COMMITTED) - test.equal(result.notifyMessages[2].message.content.headers.accept, transferMessage1.value.content.headers.accept) - test.equal(result.notifyMessages[2].message.content.headers['fspiop-destination'], transferMessage1.value.content.headers['fspiop-destination']) - test.equal(result.notifyMessages[2].message.content.headers['fspiop-source'], transferMessage1.value.content.headers['fspiop-source']) - test.equal(result.notifyMessages[2].message.content.headers['content-type'], transferMessage1.value.content.headers['content-type']) + test.equal(result.notifyMessages[2].message.content.headers.accept, transferTestData3.message.value.content.headers.accept) + test.equal(result.notifyMessages[2].message.content.headers['fspiop-destination'], transferTestData3.message.value.content.headers['fspiop-destination']) + test.equal(result.notifyMessages[2].message.content.headers['fspiop-source'], transferTestData3.message.value.content.headers['fspiop-source']) + test.equal(result.notifyMessages[2].message.content.headers['content-type'], transferTestData3.message.value.content.headers['content-type']) test.equal(result.accumulatedPositionChanges[2].value, 6) - test.equal(result.accumulatedTransferStates[transferMessage3.value.id], Enum.Transfers.TransferState.COMMITTED) + test.equal(result.accumulatedTransferStates[transferTestData3.message.value.id], Enum.Transfers.TransferState.COMMITTED) - test.equal(result.notifyMessages[3].message.content.headers.accept, transferMessage2.value.content.headers.accept) - test.equal(result.notifyMessages[3].message.content.headers['fspiop-destination'], transferMessage2.value.content.headers['fspiop-destination']) - test.equal(result.notifyMessages[3].message.content.headers['fspiop-source'], transferMessage2.value.content.headers['fspiop-source']) - test.equal(result.notifyMessages[3].message.content.headers['content-type'], transferMessage2.value.content.headers['content-type']) + test.equal(result.notifyMessages[3].message.content.headers.accept, transferTestData4.message.value.content.headers.accept) + test.equal(result.notifyMessages[3].message.content.headers['fspiop-destination'], transferTestData4.message.value.content.headers['fspiop-destination']) + test.equal(result.notifyMessages[3].message.content.headers['fspiop-source'], transferTestData4.message.value.content.headers['fspiop-source']) + test.equal(result.notifyMessages[3].message.content.headers['content-type'], transferTestData4.message.value.content.headers['content-type']) test.equal(result.accumulatedPositionChanges[3].value, 8) - test.equal(result.accumulatedTransferStates[transferMessage4.value.id], Enum.Transfers.TransferState.COMMITTED) + test.equal(result.accumulatedTransferStates[transferTestData4.message.value.id], Enum.Transfers.TransferState.COMMITTED) test.end() }) processPositionFulfilBinTest.test('should abort if fulfil is incorrect state', async (test) => { + const accumulatedTransferStates = { + [transferTestData1.message.value.id]: Enum.Transfers.TransferInternalState.INVALID, + [transferTestData2.message.value.id]: Enum.Transfers.TransferInternalState.INVALID + } + const accumulatedFxTransferStates = {} + const transferInfoList = { + [transferTestData1.message.value.id]: transferTestData1.transferInfo, + [transferTestData2.message.value.id]: transferTestData2.transferInfo + } // Call the function const result = await processPositionFulfilBin( [commitBinItems, []], - 0, - 0, { - '68c8aa25-fe5b-4b1f-a0ab-ab890fe3ae7f': Enum.Transfers.TransferInternalState.INVALID, - '4830fa00-0c2a-4de1-9640-5ad4e68f5f62': Enum.Transfers.TransferInternalState.INVALID - }, + accumulatedPositionValue: 0, + accumulatedPositionReservedValue: 0, + accumulatedTransferStates, + accumulatedFxTransferStates, + transferInfoList, + reservedActionTransfers: [] + } + ) + + // Assert the expected results + test.equal(result.notifyMessages.length, 2) + test.equal(result.accumulatedPositionValue, 0) + test.equal(result.accumulatedPositionReservedValue, 0) + test.equal(result.accumulatedTransferStateChanges.length, 0) + + test.equal(result.notifyMessages[0].message.content.headers.accept, transferTestData1.message.value.content.headers.accept) + test.equal(result.notifyMessages[0].message.content.headers['fspiop-destination'], transferTestData1.message.value.content.headers['fspiop-source']) + test.equal(result.notifyMessages[0].message.content.headers['fspiop-source'], Config.HUB_NAME) + test.equal(result.notifyMessages[0].message.content.headers['content-type'], transferTestData1.message.value.content.headers['content-type']) + test.equal(result.accumulatedTransferStates[transferTestData1.message.value.id], Enum.Transfers.TransferInternalState.INVALID) + + test.equal(result.notifyMessages[1].message.content.headers.accept, transferTestData2.message.value.content.headers.accept) + test.equal(result.notifyMessages[1].message.content.headers['fspiop-destination'], transferTestData2.message.value.content.headers['fspiop-source']) + test.equal(result.notifyMessages[1].message.content.headers['fspiop-source'], Config.HUB_NAME) + test.equal(result.notifyMessages[1].message.content.headers['content-type'], transferTestData2.message.value.content.headers['content-type']) + test.equal(result.accumulatedTransferStates[transferTestData2.message.value.id], Enum.Transfers.TransferInternalState.INVALID) + + test.end() + }) + + processPositionFulfilBinTest.test('should abort if some fulfil messages are in incorrect state', async (test) => { + const accumulatedTransferStates = { + [transferTestData1.message.value.id]: Enum.Transfers.TransferInternalState.INVALID, + [transferTestData2.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_FULFIL + } + const accumulatedFxTransferStates = {} + const transferInfoList = { + [transferTestData1.message.value.id]: transferTestData1.transferInfo, + [transferTestData2.message.value.id]: transferTestData2.transferInfo + } + // Call the function + const result = await processPositionFulfilBin( + [commitBinItems, []], { - '68c8aa25-fe5b-4b1f-a0ab-ab890fe3ae7f': { - amount: 2.00 - }, - '4830fa00-0c2a-4de1-9640-5ad4e68f5f62': { - amount: 2.00 - } + accumulatedPositionValue: 0, + accumulatedPositionReservedValue: 0, + accumulatedTransferStates, + accumulatedFxTransferStates, + transferInfoList, + reservedActionTransfers: [] + } + ) + + // Assert the expected results + test.equal(result.notifyMessages.length, 2) + test.equal(result.accumulatedPositionValue, 2) + test.equal(result.accumulatedPositionReservedValue, 0) + test.equal(result.accumulatedTransferStateChanges.length, 1) + test.equal(result.accumulatedPositionChanges.length, 1) + + test.equal(result.accumulatedTransferStateChanges[0].transferId, transferTestData2.message.value.id) + test.equal(result.accumulatedTransferStateChanges[0].transferStateId, Enum.Transfers.TransferState.COMMITTED) + + test.equal(result.notifyMessages[0].message.content.headers.accept, transferTestData1.message.value.content.headers.accept) + test.equal(result.notifyMessages[0].message.content.headers['fspiop-destination'], transferTestData1.message.value.content.headers['fspiop-source']) + test.equal(result.notifyMessages[0].message.content.headers['fspiop-source'], Config.HUB_NAME) + test.equal(result.notifyMessages[0].message.content.headers['content-type'], transferTestData1.message.value.content.headers['content-type']) + test.equal(result.accumulatedTransferStates[transferTestData1.message.value.id], Enum.Transfers.TransferInternalState.INVALID) + + test.equal(result.notifyMessages[1].message.content.headers.accept, transferTestData2.message.value.content.headers.accept) + test.equal(result.notifyMessages[1].message.content.headers['fspiop-destination'], transferTestData2.message.value.content.headers['fspiop-destination']) + test.equal(result.notifyMessages[1].message.content.headers['fspiop-source'], transferTestData2.message.value.content.headers['fspiop-source']) + test.equal(result.notifyMessages[1].message.content.headers['content-type'], transferTestData2.message.value.content.headers['content-type']) + test.equal(result.accumulatedTransferStates[transferTestData2.message.value.id], Enum.Transfers.TransferState.COMMITTED) + + test.equal(result.accumulatedPositionChanges[0].value, 2) + + test.end() + }) + + processPositionFulfilBinTest.test('should skip position changes if changePosition is false', async (test) => { + const accumulatedTransferStates = { + [transferTestData1.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_FULFIL, + [transferTestData2.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_FULFIL + } + const accumulatedFxTransferStates = {} + const transferInfoList = { + [transferTestData1.message.value.id]: transferTestData1.transferInfo, + [transferTestData2.message.value.id]: transferTestData2.transferInfo + } + // Call the function + const result = await processPositionFulfilBin( + [commitBinItems, []], + { + accumulatedPositionValue: 0, + accumulatedPositionReservedValue: 0, + accumulatedTransferStates, + accumulatedFxTransferStates, + transferInfoList, + reservedActionTransfers: [], + changePositions: false } ) // Assert the expected results test.equal(result.notifyMessages.length, 2) test.equal(result.accumulatedPositionValue, 0) + test.equal(result.accumulatedTransferStateChanges.length, 2) + test.equal(result.accumulatedPositionChanges.length, 0) + + test.equal(result.accumulatedTransferStateChanges[0].transferId, transferTestData1.message.value.id) + test.equal(result.accumulatedTransferStateChanges[1].transferId, transferTestData2.message.value.id) + test.equal(result.accumulatedTransferStateChanges[0].transferStateId, Enum.Transfers.TransferState.COMMITTED) + test.equal(result.accumulatedTransferStateChanges[1].transferStateId, Enum.Transfers.TransferState.COMMITTED) + test.equal(result.accumulatedTransferStates[transferTestData1.message.value.id], Enum.Transfers.TransferState.COMMITTED) + test.equal(result.accumulatedTransferStates[transferTestData2.message.value.id], Enum.Transfers.TransferState.COMMITTED) + + test.end() + }) + + // FX tests + + processPositionFulfilBinTest.test('should process a bin of position-commit messages involved in fx transfers', async (test) => { + const accumulatedTransferStates = { + [transferTestData5.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_FULFIL, + [transferTestData6.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_FULFIL + } + const accumulatedFxTransferStates = {} + const transferInfoList = { + [transferTestData5.message.value.id]: transferTestData5.transferInfo, + [transferTestData6.message.value.id]: transferTestData6.transferInfo + } + // Call the function + const result = await processPositionFulfilBin( + [commitWithFxBinItems, []], + { + accumulatedPositionValue: 0, + accumulatedPositionReservedValue: 0, + accumulatedTransferStates, + accumulatedFxTransferStates, + transferInfoList, + reservedActionTransfers: [] + } + ) + + // Assert the expected results + test.equal(result.notifyMessages.length, 2) + test.equal(result.followupMessages.length, 2) + test.equal(result.accumulatedPositionValue, 20) test.equal(result.accumulatedPositionReservedValue, 0) - test.deepEqual(result.accumulatedTransferStateChanges, []) - test.deepEqual(result.accumulatedTransferStates, + test.equal(result.accumulatedTransferStateChanges.length, 0) + test.equal(result.accumulatedFxTransferStateChanges.length, 2) + + test.equal(result.accumulatedFxTransferStateChanges[0].commitRequestId, transferTestData5.message.value.content.context.cyrilResult.positionChanges[0].commitRequestId) + test.equal(result.accumulatedFxTransferStateChanges[1].commitRequestId, transferTestData6.message.value.content.context.cyrilResult.positionChanges[0].commitRequestId) + test.equal(result.accumulatedFxTransferStateChanges[0].transferStateId, Enum.Transfers.TransferState.COMMITTED) + test.equal(result.accumulatedFxTransferStateChanges[1].transferStateId, Enum.Transfers.TransferState.COMMITTED) + + test.equal(result.followupMessages[0].message.content.context.cyrilResult.isFx, true) + test.ok(result.followupMessages[0].message.content.context.cyrilResult.positionChanges[0].isDone) + test.notOk(result.followupMessages[0].message.content.context.cyrilResult.positionChanges[1].isDone) + test.equal(result.followupMessages[0].messageKey, '101') + test.equal(result.accumulatedPositionChanges[0].value, 10) + test.equal(result.accumulatedTransferStates[transferTestData5.message.value.id], Enum.Transfers.TransferInternalState.RECEIVED_FULFIL) + + test.equal(result.followupMessages[1].message.content.context.cyrilResult.isFx, true) + test.ok(result.followupMessages[1].message.content.context.cyrilResult.positionChanges[0].isDone) + test.notOk(result.followupMessages[1].message.content.context.cyrilResult.positionChanges[1].isDone) + test.equal(result.followupMessages[1].messageKey, '101') + test.equal(result.accumulatedPositionChanges[1].value, 20) + test.equal(result.accumulatedTransferStates[transferTestData5.message.value.id], Enum.Transfers.TransferInternalState.RECEIVED_FULFIL) + + test.end() + }) + + processPositionFulfilBinTest.test('should process a bin of position-commit partial processed messages involved in fx transfers', async (test) => { + const accumulatedTransferStates = { + [transferTestData7.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_FULFIL, + [transferTestData8.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_FULFIL + } + const accumulatedFxTransferStates = {} + const transferInfoList = { + [transferTestData7.message.value.id]: transferTestData7.transferInfo, + [transferTestData8.message.value.id]: transferTestData8.transferInfo + } + // Call the function + const result = await processPositionFulfilBin( + [commitWithPartiallyProcessedFxBinItems, []], { - '68c8aa25-fe5b-4b1f-a0ab-ab890fe3ae7f': Enum.Transfers.TransferInternalState.INVALID, - '4830fa00-0c2a-4de1-9640-5ad4e68f5f62': Enum.Transfers.TransferInternalState.INVALID + accumulatedPositionValue: 0, + accumulatedPositionReservedValue: 0, + accumulatedTransferStates, + accumulatedFxTransferStates, + transferInfoList, + reservedActionTransfers: [] } ) - test.equal(result.notifyMessages[0].message.content.headers.accept, transferMessage1.value.content.headers.accept) - test.equal(result.notifyMessages[0].message.content.headers['fspiop-destination'], transferMessage1.value.content.headers['fspiop-source']) - test.equal(result.notifyMessages[0].message.content.headers['fspiop-source'], Enum.Http.Headers.FSPIOP.SWITCH.value) - test.equal(result.notifyMessages[0].message.content.headers['content-type'], transferMessage1.value.content.headers['content-type']) - test.equal(result.accumulatedTransferStates[transferMessage1.value.id], Enum.Transfers.TransferInternalState.INVALID) - - console.log(transferMessage2.value.content.headers['fspiop-source']) - test.equal(result.notifyMessages[1].message.content.headers.accept, transferMessage2.value.content.headers.accept) - test.equal(result.notifyMessages[1].message.content.headers['fspiop-destination'], transferMessage2.value.content.headers['fspiop-source']) - test.equal(result.notifyMessages[1].message.content.headers['fspiop-source'], Enum.Http.Headers.FSPIOP.SWITCH.value) - test.equal(result.notifyMessages[1].message.content.headers['content-type'], transferMessage2.value.content.headers['content-type']) - test.equal(result.accumulatedTransferStates[transferMessage2.value.id], Enum.Transfers.TransferInternalState.INVALID) + // Assert the expected results + test.equal(result.notifyMessages.length, 2) + test.equal(result.followupMessages.length, 0) + test.equal(result.accumulatedPositionValue, 4) + test.equal(result.accumulatedPositionReservedValue, 0) + test.equal(result.accumulatedTransferStateChanges.length, 2) + test.equal(result.accumulatedFxTransferStateChanges.length, 0) + + test.equal(result.accumulatedTransferStateChanges[0].transferId, transferTestData7.message.value.content.context.cyrilResult.positionChanges[1].transferId) + test.equal(result.accumulatedTransferStateChanges[1].transferId, transferTestData8.message.value.content.context.cyrilResult.positionChanges[1].transferId) + test.equal(result.accumulatedTransferStateChanges[0].transferStateId, Enum.Transfers.TransferState.COMMITTED) + test.equal(result.accumulatedTransferStateChanges[1].transferStateId, Enum.Transfers.TransferState.COMMITTED) + + test.equal(result.notifyMessages[0].message.content.headers.accept, transferTestData7.message.value.content.headers.accept) + test.equal(result.notifyMessages[0].message.content.headers['fspiop-destination'], transferTestData7.message.value.content.headers['fspiop-destination']) + test.equal(result.notifyMessages[0].message.content.headers['fspiop-source'], transferTestData7.message.value.content.headers['fspiop-source']) + test.equal(result.notifyMessages[0].message.content.headers['content-type'], transferTestData7.message.value.content.headers['content-type']) + test.equal(result.accumulatedPositionChanges[0].value, 2) + test.equal(result.accumulatedTransferStates[transferTestData7.message.value.id], Enum.Transfers.TransferState.COMMITTED) + + test.equal(result.notifyMessages[1].message.content.headers.accept, transferTestData8.message.value.content.headers.accept) + test.equal(result.notifyMessages[1].message.content.headers['fspiop-destination'], transferTestData8.message.value.content.headers['fspiop-destination']) + test.equal(result.notifyMessages[1].message.content.headers['fspiop-source'], transferTestData8.message.value.content.headers['fspiop-source']) + test.equal(result.notifyMessages[1].message.content.headers['content-type'], transferTestData8.message.value.content.headers['content-type']) + test.equal(result.accumulatedPositionChanges[1].value, 4) + test.equal(result.accumulatedTransferStates[transferTestData8.message.value.id], Enum.Transfers.TransferState.COMMITTED) test.end() }) diff --git a/test/unit/domain/position/fx-fulfil.test.js b/test/unit/domain/position/fx-fulfil.test.js new file mode 100644 index 000000000..81f2ac3b1 --- /dev/null +++ b/test/unit/domain/position/fx-fulfil.test.js @@ -0,0 +1,200 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Vijaya Kumar Guthi + -------------- + ******/ + +'use strict' + +const Test = require('tapes')(require('tape')) +const { Enum } = require('@mojaloop/central-services-shared') +const Sinon = require('sinon') +const { processPositionFxFulfilBin } = require('../../../../src/domain/position/fx-fulfil') +const { randomUUID } = require('crypto') +const Config = require('../../../../src/lib/config') + +const constructFxTransferCallbackTestData = (initiatingFsp, counterPartyFsp) => { + const commitRequestId = randomUUID() + const payload = { + fulfilment: 'WLctttbu2HvTsa1XWvUoGRcQozHsqeu9Ahl2JW9Bsu8', + completedTimestamp: '2024-04-19T14:06:08.936Z', + conversionState: 'RESERVED' + } + const base64Payload = Buffer.from(JSON.stringify(payload)).toString('base64') + return { + decodedPayload: payload, + message: { + value: { + from: counterPartyFsp, + to: initiatingFsp, + id: commitRequestId, + content: { + uriParams: { + id: commitRequestId + }, + headers: { + host: 'ml-api-adapter:3000', + 'content-length': 1314, + accept: 'application/vnd.interoperability.fxTransfers+json;version=2.0', + 'content-type': 'application/vnd.interoperability.fxTransfers+json;version=2.0', + date: '2023-08-17T15:25:08.000Z', + 'fspiop-destination': initiatingFsp, + 'fspiop-source': counterPartyFsp, + traceparent: '00-e11ece8cc6ca3dc170a8ab693910d934-25d85755f1bc6898-01', + tracestate: 'tx_end2end_start_ts=1692285908510' + }, + payload: 'data:application/vnd.interoperability.fxTransfers+json;version=2.0;base64,' + base64Payload, + context: { + cyrilResult: {} + } + }, + type: 'application/json', + metadata: { + correlationId: '1cf6981b-25d8-4bd7-b9d9-b1c0fc8cdeaf', + event: { + type: 'position', + action: 'fx-reserve', + createdAt: '2023-08-17T15:25:08.511Z', + state: { + status: 'success', + code: 0, + description: 'action successful' + }, + id: commitRequestId + }, + trace: { + service: 'cl_fx_transfer_fulfil', + traceId: 'e11ece8cc6ca3dc170a8ab693910d934', + spanId: '1a2c4baf99bdb2c6', + sampled: 1, + flags: '01', + parentSpanId: '3c5863bb3c2b4ecc', + startTimestamp: '2023-08-17T15:25:08.860Z', + tags: { + tracestate: 'acmevendor=eyJzcGFuSWQiOiIxYTJjNGJhZjk5YmRiMmM2IiwidGltZUFwaVByZXBhcmUiOiIxNjkyMjg1OTA4NTEwIn0=,tx_end2end_start_ts=1692285908510', + transactionType: 'transfer', + transactionAction: 'fx-reserve', + transactionId: '1cf6981b-25d8-4bd7-b9d9-b1c0fc8cdeaf', + source: counterPartyFsp, + destination: initiatingFsp, + initiatingFsp, + counterPartyFsp + }, + tracestates: { + acmevendor: { + spanId: '1a2c4baf99bdb2c6', + timeApiPrepare: '1692285908510' + }, + tx_end2end_start_ts: '1692285908510' + } + }, + 'protocol.createdAt': 1692285908866 + } + }, + size: 3489, + key: 51, + topic: 'topic-transfer-position-batch', + offset: 4070, + partition: 0, + timestamp: 1694175690401 + } + } +} + +const fxTransferCallbackTestData1 = constructFxTransferCallbackTestData('perffsp1', 'perffsp2') +const fxTransferCallbackTestData2 = constructFxTransferCallbackTestData('perffsp2', 'perffsp1') +const fxTransferCallbackTestData3 = constructFxTransferCallbackTestData('perffsp1', 'perffsp2') + +const span = {} +const reserveBinItems = [{ + message: fxTransferCallbackTestData1.message, + span, + decodedPayload: fxTransferCallbackTestData1.decodedPayload +}, +{ + message: fxTransferCallbackTestData2.message, + span, + decodedPayload: fxTransferCallbackTestData2.decodedPayload +}, +{ + message: fxTransferCallbackTestData3.message, + span, + decodedPayload: fxTransferCallbackTestData3.decodedPayload +}] +Test('Fx Fulfil domain', processPositionFxFulfilBinTest => { + let sandbox + + processPositionFxFulfilBinTest.beforeEach(t => { + sandbox = Sinon.createSandbox() + t.end() + }) + + processPositionFxFulfilBinTest.afterEach(t => { + sandbox.restore() + t.end() + }) + + processPositionFxFulfilBinTest.test('should process a bin of position-commit messages', async (test) => { + const accumulatedFxTransferStates = { + [fxTransferCallbackTestData1.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_FULFIL_DEPENDENT, + [fxTransferCallbackTestData2.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_FULFIL_DEPENDENT, + [fxTransferCallbackTestData3.message.value.id]: 'INVALID_STATE' + } + // Call the function + const processedMessages = await processPositionFxFulfilBin( + reserveBinItems, + { accumulatedFxTransferStates } + ) + + // Assert the expected results + test.equal(processedMessages.notifyMessages.length, 3) + test.equal(processedMessages.notifyMessages[0].message.content.headers.accept, fxTransferCallbackTestData1.message.value.content.headers.accept) + test.equal(processedMessages.notifyMessages[0].message.content.headers['fspiop-destination'], fxTransferCallbackTestData1.message.value.content.headers['fspiop-destination']) + test.equal(processedMessages.notifyMessages[0].message.content.headers['fspiop-source'], fxTransferCallbackTestData1.message.value.content.headers['fspiop-source']) + test.equal(processedMessages.notifyMessages[0].message.content.headers['content-type'], fxTransferCallbackTestData1.message.value.content.headers['content-type']) + test.equal(processedMessages.accumulatedFxTransferStates[fxTransferCallbackTestData1.message.value.id], Enum.Transfers.TransferInternalState.RECEIVED_FULFIL_DEPENDENT) + + test.equal(processedMessages.notifyMessages[1].message.content.headers.accept, fxTransferCallbackTestData2.message.value.content.headers.accept) + test.equal(processedMessages.notifyMessages[1].message.content.headers['fspiop-destination'], fxTransferCallbackTestData2.message.value.content.headers['fspiop-destination']) + test.equal(processedMessages.notifyMessages[1].message.content.headers['fspiop-source'], fxTransferCallbackTestData2.message.value.content.headers['fspiop-source']) + test.equal(processedMessages.notifyMessages[1].message.content.headers['content-type'], fxTransferCallbackTestData2.message.value.content.headers['content-type']) + test.equal(processedMessages.accumulatedFxTransferStates[fxTransferCallbackTestData2.message.value.id], Enum.Transfers.TransferInternalState.RECEIVED_FULFIL_DEPENDENT) + + test.equal(processedMessages.notifyMessages[2].message.content.uriParams.id, fxTransferCallbackTestData3.message.value.id) + test.equal(processedMessages.notifyMessages[2].message.content.headers.accept, fxTransferCallbackTestData3.message.value.content.headers.accept) + test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-destination'], fxTransferCallbackTestData3.message.value.content.headers['fspiop-source']) + test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-source'], Config.HUB_NAME) + test.equal(processedMessages.notifyMessages[2].message.content.headers['content-type'], fxTransferCallbackTestData3.message.value.content.headers['content-type']) + test.equal(processedMessages.notifyMessages[2].message.content.payload.errorInformation.errorCode, '2001') + test.equal(processedMessages.accumulatedFxTransferStates[fxTransferCallbackTestData3.message.value.id], Enum.Transfers.TransferInternalState.ABORTED_REJECTED) + + test.equal(processedMessages.accumulatedFxTransferStateChanges.length, 1) + test.equal(processedMessages.accumulatedFxTransferStateChanges[0].commitRequestId, fxTransferCallbackTestData3.message.value.id) + test.equal(processedMessages.accumulatedFxTransferStateChanges[0].transferStateId, Enum.Transfers.TransferInternalState.ABORTED_REJECTED) + + test.end() + }) + + processPositionFxFulfilBinTest.end() +}) diff --git a/test/unit/domain/position/fx-prepare.test.js b/test/unit/domain/position/fx-prepare.test.js new file mode 100644 index 000000000..cc449b9b7 --- /dev/null +++ b/test/unit/domain/position/fx-prepare.test.js @@ -0,0 +1,552 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Vijaya Kumar Guthi + -------------- + ******/ + +'use strict' + +const Test = require('tapes')(require('tape')) +const { Enum } = require('@mojaloop/central-services-shared') +const Sinon = require('sinon') +const { processFxPositionPrepareBin } = require('../../../../src/domain/position/fx-prepare') +const Logger = require('@mojaloop/central-services-logger') +const { randomUUID } = require('crypto') +const Config = require('../../../../src/lib/config') + +const constructFxTransferTestData = (initiatingFsp, counterPartyFsp, sourceAmount, sourceCurrency, targetAmount, targetCurrency) => { + const commitRequestId = randomUUID() + const determiningTransferId = randomUUID() + const payload = { + commitRequestId, + determiningTransferId, + initiatingFsp, + counterPartyFsp, + sourceAmount: { + currency: sourceCurrency, + amount: sourceAmount + }, + targetAmount: { + currency: targetCurrency, + amount: targetAmount + }, + condition: 'GRzLaTP7DJ9t4P-a_BA0WA9wzzlsugf00-Tn6kESAfM', + expiration: '2024-04-19T14:06:08.936Z' + } + const base64Payload = Buffer.from(JSON.stringify(payload)).toString('base64') + return { + decodedPayload: payload, + message: { + value: { + from: initiatingFsp, + to: counterPartyFsp, + id: commitRequestId, + content: { + uriParams: { + id: commitRequestId + }, + headers: { + host: 'ml-api-adapter:3000', + 'content-length': 1314, + accept: 'application/vnd.interoperability.fxTransfers+json;version=2.0', + 'content-type': 'application/vnd.interoperability.fxTransfers+json;version=2.0', + date: '2023-08-17T15:25:08.000Z', + 'fspiop-destination': counterPartyFsp, + 'fspiop-source': initiatingFsp, + traceparent: '00-e11ece8cc6ca3dc170a8ab693910d934-25d85755f1bc6898-01', + tracestate: 'tx_end2end_start_ts=1692285908510' + }, + payload: 'data:application/vnd.interoperability.fxTransfers+json;version=2.0;base64,' + base64Payload, + context: { + cyrilResult: { + participantName: initiatingFsp, + currencyId: sourceCurrency, + amount: sourceAmount + } + } + }, + type: 'application/json', + metadata: { + correlationId: '1cf6981b-25d8-4bd7-b9d9-b1c0fc8cdeaf', + event: { + type: 'position', + action: 'fx-prepare', + createdAt: '2023-08-17T15:25:08.511Z', + state: { + status: 'success', + code: 0, + description: 'action successful' + }, + id: commitRequestId + }, + trace: { + service: 'cl_fx_transfer_prepare', + traceId: 'e11ece8cc6ca3dc170a8ab693910d934', + spanId: '1a2c4baf99bdb2c6', + sampled: 1, + flags: '01', + parentSpanId: '3c5863bb3c2b4ecc', + startTimestamp: '2023-08-17T15:25:08.860Z', + tags: { + tracestate: 'acmevendor=eyJzcGFuSWQiOiIxYTJjNGJhZjk5YmRiMmM2IiwidGltZUFwaVByZXBhcmUiOiIxNjkyMjg1OTA4NTEwIn0=,tx_end2end_start_ts=1692285908510', + transactionType: 'transfer', + transactionAction: 'fx-prepare', + transactionId: '1cf6981b-25d8-4bd7-b9d9-b1c0fc8cdeaf', + source: initiatingFsp, + destination: counterPartyFsp, + initiatingFsp, + counterPartyFsp + }, + tracestates: { + acmevendor: { + spanId: '1a2c4baf99bdb2c6', + timeApiPrepare: '1692285908510' + }, + tx_end2end_start_ts: '1692285908510' + } + }, + 'protocol.createdAt': 1692285908866 + } + }, + size: 3489, + key: 51, + topic: 'topic-transfer-position-batch', + offset: 4070, + partition: 0, + timestamp: 1694175690401 + } + } +} + +const sourceAmount = 5 +const fxTransferTestData1 = constructFxTransferTestData('perffsp1', 'perffsp2', sourceAmount.toString(), 'USD', '50', 'XXX') +const fxTransferTestData2 = constructFxTransferTestData('perffsp1', 'perffsp2', sourceAmount.toString(), 'USD', '50', 'XXX') +const fxTransferTestData3 = constructFxTransferTestData('perffsp1', 'perffsp2', sourceAmount.toString(), 'USD', '50', 'XXX') + +const span = {} +const binItems = [{ + message: fxTransferTestData1.message, + span, + decodedPayload: fxTransferTestData1.decodedPayload +}, +{ + message: fxTransferTestData2.message, + span, + decodedPayload: fxTransferTestData2.decodedPayload +}, +{ + message: fxTransferTestData3.message, + span, + decodedPayload: fxTransferTestData3.decodedPayload +}] + +Test('FX Prepare domain', positionIndexTest => { + let sandbox + + positionIndexTest.beforeEach(t => { + sandbox = Sinon.createSandbox() + t.end() + }) + + positionIndexTest.afterEach(t => { + sandbox.restore() + t.end() + }) + + positionIndexTest.test('processFxPositionPrepareBin should', changeParticipantPositionTest => { + changeParticipantPositionTest.test('produce abort message for transfers not in the right transfer state', async (test) => { + const participantLimit = { + participantCurrencyId: 1, + participantLimitTypeId: 1, + value: 900, // Participant limit value + isActive: 1, + createdBy: 'unknown', + participantLimitId: 1, + thresholdAlarmPercentage: 0.5 + } + const accumulatedFxTransferStates = { + [fxTransferTestData1.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + [fxTransferTestData2.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + [fxTransferTestData3.message.value.id]: 'INVALID_STATE' + } + const processedMessages = await processFxPositionPrepareBin( + binItems, + { + accumulatedPositionValue: 0, // Accumulated position value + accumulatedPositionReservedValue: 0, + accumulatedFxTransferStates, + settlementParticipantPosition: -1000, // Settlement participant position value + participantLimit + } + ) + Logger.isInfoEnabled && Logger.info(processedMessages) + test.equal(processedMessages.notifyMessages.length, 3) + test.equal(processedMessages.notifyMessages[0].message.content.headers.accept, fxTransferTestData1.message.value.content.headers.accept) + test.equal(processedMessages.notifyMessages[0].message.content.headers['fspiop-destination'], fxTransferTestData1.message.value.content.headers['fspiop-destination']) + test.equal(processedMessages.notifyMessages[0].message.content.headers['fspiop-source'], fxTransferTestData1.message.value.content.headers['fspiop-source']) + test.equal(processedMessages.notifyMessages[0].message.content.headers['content-type'], fxTransferTestData1.message.value.content.headers['content-type']) + test.equal(processedMessages.accumulatedFxTransferStates[fxTransferTestData1.message.value.id], Enum.Transfers.TransferState.RESERVED) + + test.equal(processedMessages.notifyMessages[1].message.content.headers.accept, fxTransferTestData2.message.value.content.headers.accept) + test.equal(processedMessages.notifyMessages[1].message.content.headers['fspiop-destination'], fxTransferTestData2.message.value.content.headers['fspiop-destination']) + test.equal(processedMessages.notifyMessages[1].message.content.headers['fspiop-source'], fxTransferTestData2.message.value.content.headers['fspiop-source']) + test.equal(processedMessages.notifyMessages[1].message.content.headers['content-type'], fxTransferTestData2.message.value.content.headers['content-type']) + test.equal(processedMessages.accumulatedFxTransferStates[fxTransferTestData2.message.value.id], Enum.Transfers.TransferState.RESERVED) + + test.equal(processedMessages.notifyMessages[2].message.content.uriParams.id, fxTransferTestData3.message.value.id) + test.equal(processedMessages.notifyMessages[2].message.content.headers.accept, fxTransferTestData3.message.value.content.headers.accept) + test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-destination'], fxTransferTestData3.message.value.content.headers['fspiop-source']) + test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-source'], Config.HUB_NAME) + test.equal(processedMessages.notifyMessages[2].message.content.headers['content-type'], fxTransferTestData3.message.value.content.headers['content-type']) + test.equal(processedMessages.notifyMessages[2].message.content.payload.errorInformation.errorCode, '2001') + test.equal(processedMessages.notifyMessages[2].message.content.payload.errorInformation.errorDescription, 'Internal server error') + test.equal(processedMessages.accumulatedFxTransferStates[fxTransferTestData3.message.value.id], Enum.Transfers.TransferInternalState.ABORTED_REJECTED) + + test.equal(processedMessages.accumulatedFxTransferStateChanges[0].commitRequestId, fxTransferTestData1.message.value.id) + test.equal(processedMessages.accumulatedFxTransferStateChanges[1].commitRequestId, fxTransferTestData2.message.value.id) + test.equal(processedMessages.accumulatedFxTransferStateChanges[2].commitRequestId, fxTransferTestData3.message.value.id) + + test.equal(processedMessages.accumulatedFxTransferStateChanges[0].transferStateId, Enum.Transfers.TransferState.RESERVED) + test.equal(processedMessages.accumulatedFxTransferStateChanges[1].transferStateId, Enum.Transfers.TransferState.RESERVED) + test.equal(processedMessages.accumulatedFxTransferStateChanges[2].transferStateId, Enum.Transfers.TransferInternalState.ABORTED_REJECTED) + + test.equal(processedMessages.accumulatedPositionValue, sourceAmount * 2) + test.end() + }) + + changeParticipantPositionTest.test('produce abort message for when payer does not have enough liquidity', async (test) => { + const participantLimit = { + participantCurrencyId: 1, + participantLimitTypeId: 1, + value: 0, // Set low + isActive: 1, + createdBy: 'unknown', + participantLimitId: 1, + thresholdAlarmPercentage: 0.5 + } + const accumulatedFxTransferStates = { + [fxTransferTestData1.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + [fxTransferTestData2.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + [fxTransferTestData3.message.value.id]: 'INVALID_STATE' + } + const processedMessages = await processFxPositionPrepareBin( + binItems, + { + accumulatedPositionValue: 0, // No accumulated position value + accumulatedPositionReservedValue: 0, + accumulatedFxTransferStates, + settlementParticipantPosition: 0, // Settlement participant position value + participantLimit + } + ) + Logger.isInfoEnabled && Logger.info(processedMessages) + test.equal(processedMessages.notifyMessages.length, 3) + test.equal(processedMessages.accumulatedPositionChanges.length, 0) + + test.equal(processedMessages.notifyMessages[0].message.content.uriParams.id, fxTransferTestData1.message.value.id) + test.equal(processedMessages.notifyMessages[0].message.content.headers.accept, fxTransferTestData1.message.value.content.headers.accept) + test.equal(processedMessages.notifyMessages[0].message.content.headers['fspiop-destination'], fxTransferTestData1.message.value.content.headers['fspiop-source']) + test.equal(processedMessages.notifyMessages[0].message.content.headers['fspiop-source'], Config.HUB_NAME) + test.equal(processedMessages.notifyMessages[0].message.content.headers['content-type'], fxTransferTestData1.message.value.content.headers['content-type']) + + test.equal(processedMessages.notifyMessages[0].message.content.payload.errorInformation.errorCode, '4001') + test.equal(processedMessages.notifyMessages[0].message.content.payload.errorInformation.errorDescription, 'Payer FSP insufficient liquidity') + test.equal(processedMessages.accumulatedFxTransferStates[fxTransferTestData1.message.value.id], Enum.Transfers.TransferInternalState.ABORTED_REJECTED) + + test.equal(processedMessages.notifyMessages[1].message.content.uriParams.id, fxTransferTestData2.message.value.id) + test.equal(processedMessages.notifyMessages[1].message.content.headers.accept, fxTransferTestData2.message.value.content.headers.accept) + test.equal(processedMessages.notifyMessages[1].message.content.headers['fspiop-destination'], fxTransferTestData2.message.value.content.headers['fspiop-source']) + test.equal(processedMessages.notifyMessages[1].message.content.headers['fspiop-source'], Config.HUB_NAME) + test.equal(processedMessages.notifyMessages[1].message.content.headers['content-type'], fxTransferTestData2.message.value.content.headers['content-type']) + test.equal(processedMessages.notifyMessages[1].message.content.payload.errorInformation.errorCode, '4001') + test.equal(processedMessages.notifyMessages[1].message.content.payload.errorInformation.errorDescription, 'Payer FSP insufficient liquidity') + test.equal(processedMessages.accumulatedFxTransferStates[fxTransferTestData2.message.value.id], Enum.Transfers.TransferInternalState.ABORTED_REJECTED) + + test.equal(processedMessages.notifyMessages[2].message.content.uriParams.id, fxTransferTestData3.message.value.id) + test.equal(processedMessages.notifyMessages[2].message.content.headers.accept, fxTransferTestData3.message.value.content.headers.accept) + test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-destination'], fxTransferTestData3.message.value.content.headers['fspiop-source']) + test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-source'], Config.HUB_NAME) + test.equal(processedMessages.notifyMessages[2].message.content.headers['content-type'], fxTransferTestData3.message.value.content.headers['content-type']) + test.equal(processedMessages.notifyMessages[2].message.content.payload.errorInformation.errorCode, '2001') + test.equal(processedMessages.notifyMessages[2].message.content.payload.errorInformation.errorDescription, 'Internal server error') + test.equal(processedMessages.accumulatedFxTransferStates[fxTransferTestData3.message.value.id], Enum.Transfers.TransferInternalState.ABORTED_REJECTED) + + test.equal(processedMessages.accumulatedFxTransferStateChanges[0].commitRequestId, fxTransferTestData1.message.value.id) + test.equal(processedMessages.accumulatedFxTransferStateChanges[1].commitRequestId, fxTransferTestData2.message.value.id) + test.equal(processedMessages.accumulatedFxTransferStateChanges[2].commitRequestId, fxTransferTestData3.message.value.id) + + test.equal(processedMessages.accumulatedFxTransferStateChanges[0].transferStateId, Enum.Transfers.TransferInternalState.ABORTED_REJECTED) + test.equal(processedMessages.accumulatedFxTransferStateChanges[1].transferStateId, Enum.Transfers.TransferInternalState.ABORTED_REJECTED) + test.equal(processedMessages.accumulatedFxTransferStateChanges[2].transferStateId, Enum.Transfers.TransferInternalState.ABORTED_REJECTED) + + test.equal(processedMessages.accumulatedPositionValue, 0) + test.end() + }) + + changeParticipantPositionTest.test('produce abort message for when payer has reached their set payer limit', async (test) => { + const participantLimit = { + participantCurrencyId: 1, + participantLimitTypeId: 1, + value: 1000, + isActive: 1, + createdBy: 'unknown', + participantLimitId: 1, + thresholdAlarmPercentage: 0.5 + } + const accumulatedFxTransferStates = { + [fxTransferTestData1.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + [fxTransferTestData2.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + [fxTransferTestData3.message.value.id]: 'INVALID_STATE' + } + const processedMessages = await processFxPositionPrepareBin( + binItems, + { + accumulatedPositionValue: 1000, // Position value has reached limit of 1000 + accumulatedPositionReservedValue: 0, + accumulatedFxTransferStates, + settlementParticipantPosition: -2000, // Payer has liquidity + participantLimit + } + ) + Logger.isInfoEnabled && Logger.info(processedMessages) + test.equal(processedMessages.notifyMessages.length, 3) + test.equal(processedMessages.accumulatedPositionChanges.length, 0) + + test.equal(processedMessages.notifyMessages[0].message.content.uriParams.id, fxTransferTestData1.message.value.id) + test.equal(processedMessages.notifyMessages[0].message.content.headers.accept, fxTransferTestData1.message.value.content.headers.accept) + test.equal(processedMessages.notifyMessages[0].message.content.headers['fspiop-destination'], fxTransferTestData1.message.value.content.headers['fspiop-source']) + test.equal(processedMessages.notifyMessages[0].message.content.headers['fspiop-source'], Config.HUB_NAME) + test.equal(processedMessages.notifyMessages[0].message.content.headers['content-type'], fxTransferTestData1.message.value.content.headers['content-type']) + test.equal(processedMessages.notifyMessages[0].message.content.payload.errorInformation.errorCode, '4200') + test.equal(processedMessages.notifyMessages[0].message.content.payload.errorInformation.errorDescription, 'Payer limit error') + test.equal(processedMessages.accumulatedFxTransferStates[fxTransferTestData1.message.value.id], Enum.Transfers.TransferInternalState.ABORTED_REJECTED) + + test.equal(processedMessages.notifyMessages[1].message.content.uriParams.id, fxTransferTestData2.message.value.id) + test.equal(processedMessages.notifyMessages[1].message.content.headers.accept, fxTransferTestData2.message.value.content.headers.accept) + test.equal(processedMessages.notifyMessages[1].message.content.headers['fspiop-destination'], fxTransferTestData2.message.value.content.headers['fspiop-source']) + test.equal(processedMessages.notifyMessages[1].message.content.headers['fspiop-source'], Config.HUB_NAME) + test.equal(processedMessages.notifyMessages[1].message.content.headers['content-type'], fxTransferTestData2.message.value.content.headers['content-type']) + test.equal(processedMessages.notifyMessages[1].message.content.payload.errorInformation.errorCode, '4200') + test.equal(processedMessages.notifyMessages[1].message.content.payload.errorInformation.errorDescription, 'Payer limit error') + test.equal(processedMessages.accumulatedFxTransferStates[fxTransferTestData2.message.value.id], Enum.Transfers.TransferInternalState.ABORTED_REJECTED) + + test.equal(processedMessages.notifyMessages[2].message.content.uriParams.id, fxTransferTestData3.message.value.id) + test.equal(processedMessages.notifyMessages[2].message.content.headers.accept, fxTransferTestData3.message.value.content.headers.accept) + test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-destination'], fxTransferTestData3.message.value.content.headers['fspiop-source']) + test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-source'], Config.HUB_NAME) + test.equal(processedMessages.notifyMessages[2].message.content.headers['content-type'], fxTransferTestData3.message.value.content.headers['content-type']) + test.equal(processedMessages.notifyMessages[2].message.content.payload.errorInformation.errorCode, '2001') + test.equal(processedMessages.notifyMessages[2].message.content.payload.errorInformation.errorDescription, 'Internal server error') + test.equal(processedMessages.accumulatedFxTransferStates[fxTransferTestData3.message.value.id], Enum.Transfers.TransferInternalState.ABORTED_REJECTED) + + test.equal(processedMessages.accumulatedFxTransferStateChanges[0].commitRequestId, fxTransferTestData1.message.value.id) + test.equal(processedMessages.accumulatedFxTransferStateChanges[1].commitRequestId, fxTransferTestData2.message.value.id) + test.equal(processedMessages.accumulatedFxTransferStateChanges[2].commitRequestId, fxTransferTestData3.message.value.id) + + test.equal(processedMessages.accumulatedFxTransferStateChanges[0].transferStateId, Enum.Transfers.TransferInternalState.ABORTED_REJECTED) + test.equal(processedMessages.accumulatedFxTransferStateChanges[1].transferStateId, Enum.Transfers.TransferInternalState.ABORTED_REJECTED) + test.equal(processedMessages.accumulatedFxTransferStateChanges[2].transferStateId, Enum.Transfers.TransferInternalState.ABORTED_REJECTED) + + // Accumulated position value should not change from the input + test.equal(processedMessages.accumulatedPositionValue, 1000) + test.end() + }) + + changeParticipantPositionTest.test('produce reserved messages for valid transfer messages', async (test) => { + const participantLimit = { + participantCurrencyId: 1, + participantLimitTypeId: 1, + value: 10000, + isActive: 1, + createdBy: 'unknown', + participantLimitId: 1, + thresholdAlarmPercentage: 0.5 + } + const accumulatedFxTransferStates = { + [fxTransferTestData1.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + [fxTransferTestData2.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + [fxTransferTestData3.message.value.id]: 'INVALID_STATE' + } + const processedMessages = await processFxPositionPrepareBin( + binItems, + { + accumulatedPositionValue: 0, // Accumulated position value + accumulatedPositionReservedValue: 0, + accumulatedFxTransferStates, + settlementParticipantPosition: -2000, // Payer has liquidity + participantLimit + } + ) + Logger.isInfoEnabled && Logger.info(processedMessages) + test.equal(processedMessages.notifyMessages.length, 3) + + test.equal(processedMessages.accumulatedPositionChanges.length, 2) + + test.equal(processedMessages.notifyMessages[0].message.content.headers.accept, fxTransferTestData1.message.value.content.headers.accept) + test.equal(processedMessages.notifyMessages[0].message.content.headers['fspiop-destination'], fxTransferTestData1.message.value.content.headers['fspiop-destination']) + test.equal(processedMessages.notifyMessages[0].message.content.headers['fspiop-source'], fxTransferTestData1.message.value.content.headers['fspiop-source']) + test.equal(processedMessages.notifyMessages[0].message.content.headers['content-type'], fxTransferTestData1.message.value.content.headers['content-type']) + test.equal(processedMessages.accumulatedPositionChanges[0].value, sourceAmount) + test.equal(processedMessages.accumulatedFxTransferStates[fxTransferTestData1.message.value.id], Enum.Transfers.TransferState.RESERVED) + + test.equal(processedMessages.notifyMessages[1].message.content.headers.accept, fxTransferTestData2.message.value.content.headers.accept) + test.equal(processedMessages.notifyMessages[1].message.content.headers['fspiop-destination'], fxTransferTestData2.message.value.content.headers['fspiop-destination']) + test.equal(processedMessages.notifyMessages[1].message.content.headers['fspiop-source'], fxTransferTestData2.message.value.content.headers['fspiop-source']) + test.equal(processedMessages.notifyMessages[1].message.content.headers['content-type'], fxTransferTestData2.message.value.content.headers['content-type']) + test.equal(processedMessages.accumulatedPositionChanges[1].value, sourceAmount * 2) + test.equal(processedMessages.accumulatedFxTransferStates[fxTransferTestData2.message.value.id], Enum.Transfers.TransferState.RESERVED) + + test.equal(processedMessages.notifyMessages[2].message.content.uriParams.id, fxTransferTestData3.message.value.id) + test.equal(processedMessages.notifyMessages[2].message.content.headers.accept, fxTransferTestData3.message.value.content.headers.accept) + test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-destination'], fxTransferTestData3.message.value.content.headers['fspiop-source']) + test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-source'], Config.HUB_NAME) + test.equal(processedMessages.notifyMessages[2].message.content.headers['content-type'], fxTransferTestData3.message.value.content.headers['content-type']) + test.equal(processedMessages.notifyMessages[2].message.content.payload.errorInformation.errorCode, '2001') + test.equal(processedMessages.notifyMessages[2].message.content.payload.errorInformation.errorDescription, 'Internal server error') + test.equal(processedMessages.accumulatedFxTransferStates[fxTransferTestData3.message.value.id], Enum.Transfers.TransferInternalState.ABORTED_REJECTED) + + test.equal(processedMessages.accumulatedFxTransferStateChanges[0].commitRequestId, fxTransferTestData1.message.value.id) + test.equal(processedMessages.accumulatedFxTransferStateChanges[1].commitRequestId, fxTransferTestData2.message.value.id) + test.equal(processedMessages.accumulatedFxTransferStateChanges[2].commitRequestId, fxTransferTestData3.message.value.id) + + test.equal(processedMessages.accumulatedFxTransferStateChanges[0].transferStateId, Enum.Transfers.TransferState.RESERVED) + test.equal(processedMessages.accumulatedFxTransferStateChanges[1].transferStateId, Enum.Transfers.TransferState.RESERVED) + test.equal(processedMessages.accumulatedFxTransferStateChanges[2].transferStateId, Enum.Transfers.TransferInternalState.ABORTED_REJECTED) + + test.equal(processedMessages.accumulatedPositionValue, sourceAmount * 2) + test.end() + }) + + changeParticipantPositionTest.test('produce proper limit alarms', async (test) => { + const participantLimit = { + participantCurrencyId: 1, + participantLimitTypeId: 1, + value: sourceAmount * 2, + isActive: 1, + createdBy: 'unknown', + participantLimitId: 1, + thresholdAlarmPercentage: 0.5 + } + const accumulatedFxTransferStates = { + [fxTransferTestData1.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + [fxTransferTestData2.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + [fxTransferTestData3.message.value.id]: 'INVALID_STATE' + } + const processedMessages = await processFxPositionPrepareBin( + binItems, + { + accumulatedPositionValue: 0, + accumulatedPositionReservedValue: 0, + accumulatedFxTransferStates, + settlementParticipantPosition: -sourceAmount * 2, + participantLimit + } + ) + Logger.isInfoEnabled && Logger.info(processedMessages) + test.equal(processedMessages.notifyMessages.length, 3) + test.equal(processedMessages.limitAlarms.length, 2) + test.equal(processedMessages.accumulatedPositionValue, sourceAmount * 2) + test.end() + }) + + changeParticipantPositionTest.test('skip position changes if changePositions is false', async (test) => { + const participantLimit = { + participantCurrencyId: 1, + participantLimitTypeId: 1, + value: 10000, + isActive: 1, + createdBy: 'unknown', + participantLimitId: 1, + thresholdAlarmPercentage: 0.5 + } + const accumulatedFxTransferStates = { + [fxTransferTestData1.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + [fxTransferTestData2.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + [fxTransferTestData3.message.value.id]: 'INVALID_STATE' + } + const processedMessages = await processFxPositionPrepareBin( + binItems, + { + accumulatedPositionValue: -4, + accumulatedPositionReservedValue: 0, + accumulatedFxTransferStates, + settlementParticipantPosition: -2000, + participantLimit, + changePositions: false + } + ) + Logger.isInfoEnabled && Logger.info(processedMessages) + test.equal(processedMessages.notifyMessages.length, 3) + test.equal(processedMessages.accumulatedPositionChanges.length, 0) + test.equal(processedMessages.accumulatedPositionValue, -4) + test.end() + }) + + changeParticipantPositionTest.test('use targetAmount as transferAmount if cyrilResult currency equals targetAmount currency', async (test) => { + const participantLimit = { + participantCurrencyId: 1, + participantLimitTypeId: 1, + value: 10000, + isActive: 1, + createdBy: 'unknown', + participantLimitId: 1, + thresholdAlarmPercentage: 0.5 + } + const accumulatedFxTransferStates = { + [fxTransferTestData1.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + [fxTransferTestData2.message.value.id]: Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + [fxTransferTestData3.message.value.id]: 'INVALID_STATE' + } + const cyrilResult = { + participantName: 'perffsp1', + currencyId: 'XXX', + amount: 50 + } + const binItemsWithModifiedCyrilResult = binItems.map(item => { + item.message.value.content.context.cyrilResult = cyrilResult + return item + }) + const processedMessages = await processFxPositionPrepareBin( + binItemsWithModifiedCyrilResult, + { + accumulatedPositionValue: 0, + accumulatedPositionReservedValue: 0, + accumulatedFxTransferStates, + settlementParticipantPosition: -2000, + participantLimit + } + ) + Logger.isInfoEnabled && Logger.info(processedMessages) + test.equal(processedMessages.notifyMessages.length, 3) + test.equal(processedMessages.accumulatedPositionChanges.length, 2) + test.equal(processedMessages.accumulatedPositionChanges[0].value, 50) + test.equal(processedMessages.accumulatedPositionChanges[1].value, 100) + test.end() + }) + + changeParticipantPositionTest.end() + }) + + positionIndexTest.end() +}) diff --git a/test/unit/domain/position/fx-timeout-reserved.test.js b/test/unit/domain/position/fx-timeout-reserved.test.js new file mode 100644 index 000000000..cf8a173d7 --- /dev/null +++ b/test/unit/domain/position/fx-timeout-reserved.test.js @@ -0,0 +1,324 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Kevin Leyow + -------------- + ******/ + +'use strict' + +const Test = require('tapes')(require('tape')) +const { Enum } = require('@mojaloop/central-services-shared') +const Sinon = require('sinon') +const { processPositionFxTimeoutReservedBin } = require('../../../../src/domain/position/fx-timeout-reserved') + +// Fx timeout messages are still being written, use appropriate messages +const fxTimeoutMessage1 = { + value: { + from: 'perffsp1', + to: 'fxp', + id: 'd6a036a5-65a3-48af-a0c7-ee089c412ada', + content: { + uriParams: { + id: 'd6a036a5-65a3-48af-a0c7-ee089c412ada' + }, + headers: { + accept: 'application/vnd.interoperability.transfers+json;version=1.0', + 'fspiop-destination': 'fxp', + 'Content-Type': 'application/vnd.interoperability.transfers+json;version=1.0', + date: 'Tue, 14 May 2024 00:13:15 GMT', + 'fspiop-source': 'perffsp1' + }, + payload: { + errorInformation: { + errorCode: '3303', + errorDescription: 'Transfer expired', + extensionList: { + extension: [ + { + key: 'cause', + value: 'FSPIOPError at Object.createFSPIOPError (/home/kleyow/mojaloop/central-ledger/node_modules/@mojaloop/central-services-error-handling/src/factory.js:198:12) at CronJob.timeout (/home/kleyow/moj...' + } + ] + } + } + } + }, + type: 'application/vnd.interoperability.transfers+json;version=1.0', + metadata: { + correlationId: 'd6a036a5-65a3-48af-a0c7-ee089c412ada', + event: { + type: 'position', + action: 'fx-timeout-reserved', + createdAt: '2024-05-14T00:13:15.092Z', + state: { + status: 'error', + code: '3303', + description: 'Transfer expired' + }, + id: '1ef2f45c-f7a4-4b67-a0fc-7164ed43f0f1' + }, + trace: { + service: 'cl_transfer_timeout', + traceId: 'de8e410463b73e45203fc916d68cf98c', + spanId: 'bb0abd2ea5fdfbbd', + startTimestamp: '2024-05-14T00:13:15.092Z', + tags: { + tracestate: 'acmevendor=eyJzcGFuSWQiOiJiYjBhYmQyZWE1ZmRmYmJkIn0=', + transactionType: 'transfer', + transactionAction: 'timeout-received', + source: 'switch', + destination: 'perffsp1' + }, + tracestates: { + acmevendor: { + spanId: 'bb0abd2ea5fdfbbd' + } + } + }, + 'protocol.createdAt': 1715645595093 + } + }, + size: 3489, + key: 51, + topic: 'topic-transfer-position', + offset: 4073, + partition: 0, + timestamp: 1694175690401 +} +const fxTimeoutMessage2 = { + value: { + from: 'perffsp1', + to: 'fxp', + id: '7e3fa3f7-9a1b-4a81-83c9-5b41112dd7f5', + content: { + uriParams: { + id: '7e3fa3f7-9a1b-4a81-83c9-5b41112dd7f5' + }, + headers: { + accept: 'application/vnd.interoperability.transfers+json;version=1.0', + 'fspiop-destination': 'fxp', + 'Content-Type': 'application/vnd.interoperability.transfers+json;version=1.0', + date: 'Tue, 14 May 2024 00:13:15 GMT', + 'fspiop-source': 'perffsp1' + }, + payload: { + errorInformation: { + errorCode: '3303', + errorDescription: 'Transfer expired', + extensionList: { + extension: [ + { + key: 'cause', + value: 'FSPIOPError at Object.createFSPIOPError (/home/kleyow/mojaloop/central-ledger/node_modules/@mojaloop/central-services-error-handling/src/factory.js:198:12) at CronJob.timeout (/home/kleyow/moj...' + } + ] + } + } + } + }, + type: 'application/vnd.interoperability.transfers+json;version=1.0', + metadata: { + correlationId: '7e3fa3f7-9a1b-4a81-83c9-5b41112dd7f5', + event: { + type: 'position', + action: 'fx-timeout-reserved', + createdAt: '2024-05-14T00:13:15.092Z', + state: { + status: 'error', + code: '3303', + description: 'Transfer expired' + }, + id: '1ef2f45c-f7a4-4b67-a0fc-7164ed43f0f1' + }, + trace: { + service: 'cl_transfer_timeout', + traceId: 'de8e410463b73e45203fc916d68cf98c', + spanId: 'bb0abd2ea5fdfbbd', + startTimestamp: '2024-05-14T00:13:15.092Z', + tags: { + tracestate: 'acmevendor=eyJzcGFuSWQiOiJiYjBhYmQyZWE1ZmRmYmJkIn0=', + transactionType: 'transfer', + transactionAction: 'timeout-received', + source: 'switch', + destination: 'perffsp1' + }, + tracestates: { + acmevendor: { + spanId: 'bb0abd2ea5fdfbbd' + } + } + }, + 'protocol.createdAt': 1715645595093 + } + }, + size: 3489, + key: 51, + topic: 'topic-transfer-position', + offset: 4073, + partition: 0, + timestamp: 1694175690401 +} + +const span = {} +const binItems = [{ + message: fxTimeoutMessage1, + span, + decodedPayload: {} +}, +{ + message: fxTimeoutMessage2, + span, + decodedPayload: {} +}] + +Test('timeout reserved domain', positionIndexTest => { + let sandbox + + positionIndexTest.beforeEach(t => { + sandbox = Sinon.createSandbox() + t.end() + }) + + positionIndexTest.afterEach(t => { + sandbox.restore() + t.end() + }) + + positionIndexTest.test('processPositionFxTimeoutReservedBin should', changeParticipantPositionTest => { + changeParticipantPositionTest.test('produce abort message for transfers not in the right transfer state', async (test) => { + try { + await processPositionFxTimeoutReservedBin( + binItems, + { + accumulatedPositionValue: 0, // Accumulated position value + accumulatedPositionReservedValue: 0, + accumulatedFxTransferStates: { + 'd6a036a5-65a3-48af-a0c7-ee089c412ada': 'INVALID_STATE', + '7e3fa3f7-9a1b-4a81-83c9-5b41112dd7f5': 'INVALID_STATE' + }, + fetchedReservedPositionChangesByCommitRequestIds: {} + } + ) + test.fail('Error not thrown') + } catch (e) { + test.pass('Error thrown') + } + test.end() + }) + + changeParticipantPositionTest.test('produce reserved messages/position changes for valid timeout messages', async (test) => { + const processedMessages = await processPositionFxTimeoutReservedBin( + binItems, + { + accumulatedPositionValue: 0, // Accumulated position value + accumulatedPositionReservedValue: 0, + accumulatedFxTransferStates: { + 'd6a036a5-65a3-48af-a0c7-ee089c412ada': Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT, + '7e3fa3f7-9a1b-4a81-83c9-5b41112dd7f5': Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT + }, + fetchedReservedPositionChangesByCommitRequestIds: { + 'd6a036a5-65a3-48af-a0c7-ee089c412ada': { + 51: { + value: 10, + change: 10 + } + }, + '7e3fa3f7-9a1b-4a81-83c9-5b41112dd7f5': { + 51: { + value: 5, + change: 5 + } + } + } + } + ) + test.equal(processedMessages.notifyMessages.length, 2) + + test.equal(processedMessages.accumulatedPositionChanges.length, 2) + + test.equal(processedMessages.notifyMessages[0].message.content.headers['fspiop-destination'], fxTimeoutMessage1.value.to) + test.equal(processedMessages.notifyMessages[0].message.content.headers['fspiop-source'], fxTimeoutMessage1.value.from) + test.equal(processedMessages.notifyMessages[0].message.content.headers['content-type'], fxTimeoutMessage1.value.content.headers['content-type']) + test.equal(processedMessages.accumulatedPositionChanges[0].value, -10) + test.equal(processedMessages.accumulatedFxTransferStates[fxTimeoutMessage1.value.id], Enum.Transfers.TransferInternalState.EXPIRED_RESERVED) + + test.equal(processedMessages.notifyMessages[1].message.content.headers['fspiop-destination'], fxTimeoutMessage2.value.to) + test.equal(processedMessages.notifyMessages[1].message.content.headers['fspiop-source'], fxTimeoutMessage1.value.from) + test.equal(processedMessages.notifyMessages[1].message.content.headers['content-type'], fxTimeoutMessage2.value.content.headers['content-type']) + test.equal(processedMessages.accumulatedPositionChanges[1].value, -15) + test.equal(processedMessages.accumulatedFxTransferStates[fxTimeoutMessage2.value.id], Enum.Transfers.TransferInternalState.EXPIRED_RESERVED) + + test.equal(processedMessages.accumulatedFxTransferStateChanges[0].commitRequestId, fxTimeoutMessage1.value.id) + test.equal(processedMessages.accumulatedFxTransferStateChanges[1].commitRequestId, fxTimeoutMessage2.value.id) + + test.equal(processedMessages.accumulatedFxTransferStateChanges[0].transferStateId, Enum.Transfers.TransferInternalState.EXPIRED_RESERVED) + test.equal(processedMessages.accumulatedFxTransferStateChanges[1].transferStateId, Enum.Transfers.TransferInternalState.EXPIRED_RESERVED) + + test.equal(processedMessages.accumulatedPositionValue, -15) + test.end() + }) + + changeParticipantPositionTest.test('skip position changes if changePositions is false', async (test) => { + const processedMessages = await processPositionFxTimeoutReservedBin( + binItems, + { + accumulatedPositionValue: 0, // Accumulated position value + accumulatedPositionReservedValue: 0, + accumulatedFxTransferStates: { + 'd6a036a5-65a3-48af-a0c7-ee089c412ada': Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT, + '7e3fa3f7-9a1b-4a81-83c9-5b41112dd7f5': Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT + }, + fetchedReservedPositionChangesByCommitRequestIds: { + 'd6a036a5-65a3-48af-a0c7-ee089c412ada': { + 51: { + value: 10 + } + }, + '7e3fa3f7-9a1b-4a81-83c9-5b41112dd7f5': { + 51: { + value: 5 + } + } + }, + changePositions: false + } + ) + test.equal(processedMessages.notifyMessages.length, 2) + test.equal(processedMessages.accumulatedPositionValue, 0) + test.equal(processedMessages.accumulatedPositionChanges.length, 0) + test.equal(processedMessages.accumulatedFxTransferStateChanges[0].commitRequestId, fxTimeoutMessage1.value.id) + test.equal(processedMessages.accumulatedFxTransferStateChanges[1].commitRequestId, fxTimeoutMessage2.value.id) + test.equal(processedMessages.accumulatedFxTransferStateChanges[0].transferStateId, Enum.Transfers.TransferInternalState.EXPIRED_RESERVED) + test.equal(processedMessages.accumulatedFxTransferStateChanges[1].transferStateId, Enum.Transfers.TransferInternalState.EXPIRED_RESERVED) + test.equal(processedMessages.accumulatedFxTransferStates[fxTimeoutMessage1.value.id], Enum.Transfers.TransferInternalState.EXPIRED_RESERVED) + test.equal(processedMessages.accumulatedFxTransferStates[fxTimeoutMessage2.value.id], Enum.Transfers.TransferInternalState.EXPIRED_RESERVED) + + test.end() + }) + + changeParticipantPositionTest.end() + }) + + positionIndexTest.end() +}) diff --git a/test/unit/domain/position/index.test.js b/test/unit/domain/position/index.test.js index ff8a5a6b6..c11661982 100644 --- a/test/unit/domain/position/index.test.js +++ b/test/unit/domain/position/index.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -51,6 +54,7 @@ Test('Position Service', positionIndexTest => { test.pass('Error not thrown') test.end() } catch (e) { + console.log(e) test.fail('Error Thrown') test.end() } @@ -67,6 +71,7 @@ Test('Position Service', positionIndexTest => { test.pass('Error not thrown') test.end() } catch (e) { + console.log(e) test.fail('Error Thrown') test.end() } diff --git a/test/unit/domain/position/prepare.test.js b/test/unit/domain/position/prepare.test.js index dbba431d0..a985f6b28 100644 --- a/test/unit/domain/position/prepare.test.js +++ b/test/unit/domain/position/prepare.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -29,6 +32,7 @@ const { Enum } = require('@mojaloop/central-services-shared') const Sinon = require('sinon') const { processPositionPrepareBin } = require('../../../../src/domain/position/prepare') const Logger = require('@mojaloop/central-services-logger') +const Config = require('../../../../src/lib/config') // Each transfer is for $2.00 USD const transferMessage1 = { @@ -323,32 +327,19 @@ Test('Prepare domain', positionIndexTest => { participantLimitId: 1, thresholdAlarmPercentage: 0.5 } - const settlementModel = { - settlementModelId: 1, - name: 'DEFERREDNET', - isActive: 1, - settlementGranularityId: 2, - settlementInterchangeId: 2, - settlementDelayId: 2, // 1 Immediate, 2 Deferred - currencyId: 'USD', - requireLiquidityCheck: 1, - ledgerAccountTypeId: 1, // 1 Position, 2 Settlement - autoPositionReset: 1, - adjustPosition: 0, - settlementAccountTypeId: 2 - } const processedMessages = await processPositionPrepareBin( binItems, - 0, // Accumulated position value - 0, { - '1cf6981b-25d8-4bd7-b9d9-b1c0fc8cdeaf': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, - '6c2c09c3-19b6-48ba-becc-cbdffcaadd7e': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, - '5dff336f-62c0-4619-92c6-9ccd7c8f0369': 'INVALID_STATE' - }, - -1000, // Settlement participant position value - settlementModel, - participantLimit + accumulatedPositionValue: 0, // Accumulated position value + accumulatedPositionReservedValue: 0, + accumulatedTransferStates: { + '1cf6981b-25d8-4bd7-b9d9-b1c0fc8cdeaf': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + '6c2c09c3-19b6-48ba-becc-cbdffcaadd7e': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + '5dff336f-62c0-4619-92c6-9ccd7c8f0369': 'INVALID_STATE' + }, + settlementParticipantPosition: -1000, // Settlement participant position value + participantLimit + } ) Logger.isInfoEnabled && Logger.info(processedMessages) test.equal(processedMessages.notifyMessages.length, 3) @@ -367,7 +358,7 @@ Test('Prepare domain', positionIndexTest => { test.equal(processedMessages.notifyMessages[2].message.content.uriParams.id, transferMessage3.value.id) test.equal(processedMessages.notifyMessages[2].message.content.headers.accept, transferMessage3.value.content.headers.accept) test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-destination'], transferMessage3.value.content.headers['fspiop-source']) - test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-source'], Enum.Http.Headers.FSPIOP.SWITCH.value) + test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-source'], Config.HUB_NAME) test.equal(processedMessages.notifyMessages[2].message.content.headers['content-type'], transferMessage3.value.content.headers['content-type']) test.equal(processedMessages.notifyMessages[2].message.content.payload.errorInformation.errorCode, '2001') test.equal(processedMessages.notifyMessages[2].message.content.payload.errorInformation.errorDescription, 'Internal server error') @@ -395,32 +386,19 @@ Test('Prepare domain', positionIndexTest => { participantLimitId: 1, thresholdAlarmPercentage: 0.5 } - const settlementModel = { - settlementModelId: 1, - name: 'DEFERREDNET', - isActive: 1, - settlementGranularityId: 2, - settlementInterchangeId: 2, - settlementDelayId: 2, // 1 Immediate, 2 Deferred - currencyId: 'USD', - requireLiquidityCheck: 1, - ledgerAccountTypeId: 1, // 1 Position, 2 Settlement - autoPositionReset: 1, - adjustPosition: 0, - settlementAccountTypeId: 2 - } const processedMessages = await processPositionPrepareBin( binItems, - 0, // No accumulated position value - 0, { - '1cf6981b-25d8-4bd7-b9d9-b1c0fc8cdeaf': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, - '6c2c09c3-19b6-48ba-becc-cbdffcaadd7e': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, - '5dff336f-62c0-4619-92c6-9ccd7c8f0369': 'INVALID_STATE' - }, - 0, // Settlement participant position value - settlementModel, - participantLimit + accumulatedPositionValue: 0, // No accumulated position value + accumulatedPositionReservedValue: 0, + accumulatedTransferStates: { + '1cf6981b-25d8-4bd7-b9d9-b1c0fc8cdeaf': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + '6c2c09c3-19b6-48ba-becc-cbdffcaadd7e': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + '5dff336f-62c0-4619-92c6-9ccd7c8f0369': 'INVALID_STATE' + }, + settlementParticipantPosition: 0, // Settlement participant position value + participantLimit + } ) Logger.isInfoEnabled && Logger.info(processedMessages) test.equal(processedMessages.notifyMessages.length, 3) @@ -429,7 +407,7 @@ Test('Prepare domain', positionIndexTest => { test.equal(processedMessages.notifyMessages[0].message.content.uriParams.id, transferMessage1.value.id) test.equal(processedMessages.notifyMessages[0].message.content.headers.accept, transferMessage1.value.content.headers.accept) test.equal(processedMessages.notifyMessages[0].message.content.headers['fspiop-destination'], transferMessage1.value.content.headers['fspiop-source']) - test.equal(processedMessages.notifyMessages[0].message.content.headers['fspiop-source'], Enum.Http.Headers.FSPIOP.SWITCH.value) + test.equal(processedMessages.notifyMessages[0].message.content.headers['fspiop-source'], Config.HUB_NAME) test.equal(processedMessages.notifyMessages[0].message.content.headers['content-type'], transferMessage1.value.content.headers['content-type']) test.equal(processedMessages.notifyMessages[0].message.content.payload.errorInformation.errorCode, '4001') @@ -439,7 +417,7 @@ Test('Prepare domain', positionIndexTest => { test.equal(processedMessages.notifyMessages[1].message.content.uriParams.id, transferMessage2.value.id) test.equal(processedMessages.notifyMessages[1].message.content.headers.accept, transferMessage2.value.content.headers.accept) test.equal(processedMessages.notifyMessages[1].message.content.headers['fspiop-destination'], transferMessage2.value.content.headers['fspiop-source']) - test.equal(processedMessages.notifyMessages[1].message.content.headers['fspiop-source'], Enum.Http.Headers.FSPIOP.SWITCH.value) + test.equal(processedMessages.notifyMessages[1].message.content.headers['fspiop-source'], Config.HUB_NAME) test.equal(processedMessages.notifyMessages[1].message.content.headers['content-type'], transferMessage2.value.content.headers['content-type']) test.equal(processedMessages.notifyMessages[1].message.content.payload.errorInformation.errorCode, '4001') test.equal(processedMessages.notifyMessages[1].message.content.payload.errorInformation.errorDescription, 'Payer FSP insufficient liquidity') @@ -448,7 +426,7 @@ Test('Prepare domain', positionIndexTest => { test.equal(processedMessages.notifyMessages[2].message.content.uriParams.id, transferMessage3.value.id) test.equal(processedMessages.notifyMessages[2].message.content.headers.accept, transferMessage3.value.content.headers.accept) test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-destination'], transferMessage3.value.content.headers['fspiop-source']) - test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-source'], Enum.Http.Headers.FSPIOP.SWITCH.value) + test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-source'], Config.HUB_NAME) test.equal(processedMessages.notifyMessages[2].message.content.headers['content-type'], transferMessage3.value.content.headers['content-type']) test.equal(processedMessages.notifyMessages[2].message.content.payload.errorInformation.errorCode, '2001') test.equal(processedMessages.notifyMessages[2].message.content.payload.errorInformation.errorDescription, 'Internal server error') @@ -476,32 +454,19 @@ Test('Prepare domain', positionIndexTest => { participantLimitId: 1, thresholdAlarmPercentage: 0.5 } - const settlementModel = { - settlementModelId: 1, - name: 'DEFERREDNET', - isActive: 1, - settlementGranularityId: 2, - settlementInterchangeId: 2, - settlementDelayId: 2, // 1 Immediate, 2 Deferred - currencyId: 'USD', - requireLiquidityCheck: 1, - ledgerAccountTypeId: 1, // 1 Position, 2 Settlement - autoPositionReset: 1, - adjustPosition: 0, - settlementAccountTypeId: 2 - } const processedMessages = await processPositionPrepareBin( binItems, - 1000, // Position value has reached limit of 1000 - 0, { - '1cf6981b-25d8-4bd7-b9d9-b1c0fc8cdeaf': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, - '6c2c09c3-19b6-48ba-becc-cbdffcaadd7e': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, - '5dff336f-62c0-4619-92c6-9ccd7c8f0369': 'INVALID_STATE' - }, - -2000, // Payer has liquidity - settlementModel, - participantLimit + accumulatedPositionValue: 1000, // Position value has reached limit of 1000 + accumulatedPositionReservedValue: 0, + accumulatedTransferStates: { + '1cf6981b-25d8-4bd7-b9d9-b1c0fc8cdeaf': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + '6c2c09c3-19b6-48ba-becc-cbdffcaadd7e': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + '5dff336f-62c0-4619-92c6-9ccd7c8f0369': 'INVALID_STATE' + }, + settlementParticipantPosition: -2000, // Payer has liquidity + participantLimit + } ) Logger.isInfoEnabled && Logger.info(processedMessages) test.equal(processedMessages.notifyMessages.length, 3) @@ -510,7 +475,7 @@ Test('Prepare domain', positionIndexTest => { test.equal(processedMessages.notifyMessages[0].message.content.uriParams.id, transferMessage1.value.id) test.equal(processedMessages.notifyMessages[0].message.content.headers.accept, transferMessage1.value.content.headers.accept) test.equal(processedMessages.notifyMessages[0].message.content.headers['fspiop-destination'], transferMessage1.value.content.headers['fspiop-source']) - test.equal(processedMessages.notifyMessages[0].message.content.headers['fspiop-source'], Enum.Http.Headers.FSPIOP.SWITCH.value) + test.equal(processedMessages.notifyMessages[0].message.content.headers['fspiop-source'], Config.HUB_NAME) test.equal(processedMessages.notifyMessages[0].message.content.headers['content-type'], transferMessage1.value.content.headers['content-type']) test.equal(processedMessages.notifyMessages[0].message.content.payload.errorInformation.errorCode, '4200') test.equal(processedMessages.notifyMessages[0].message.content.payload.errorInformation.errorDescription, 'Payer limit error') @@ -519,7 +484,7 @@ Test('Prepare domain', positionIndexTest => { test.equal(processedMessages.notifyMessages[1].message.content.uriParams.id, transferMessage2.value.id) test.equal(processedMessages.notifyMessages[1].message.content.headers.accept, transferMessage2.value.content.headers.accept) test.equal(processedMessages.notifyMessages[1].message.content.headers['fspiop-destination'], transferMessage2.value.content.headers['fspiop-source']) - test.equal(processedMessages.notifyMessages[1].message.content.headers['fspiop-source'], Enum.Http.Headers.FSPIOP.SWITCH.value) + test.equal(processedMessages.notifyMessages[1].message.content.headers['fspiop-source'], Config.HUB_NAME) test.equal(processedMessages.notifyMessages[1].message.content.headers['content-type'], transferMessage2.value.content.headers['content-type']) test.equal(processedMessages.notifyMessages[1].message.content.payload.errorInformation.errorCode, '4200') test.equal(processedMessages.notifyMessages[1].message.content.payload.errorInformation.errorDescription, 'Payer limit error') @@ -528,7 +493,7 @@ Test('Prepare domain', positionIndexTest => { test.equal(processedMessages.notifyMessages[2].message.content.uriParams.id, transferMessage3.value.id) test.equal(processedMessages.notifyMessages[2].message.content.headers.accept, transferMessage3.value.content.headers.accept) test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-destination'], transferMessage3.value.content.headers['fspiop-source']) - test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-source'], Enum.Http.Headers.FSPIOP.SWITCH.value) + test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-source'], Config.HUB_NAME) test.equal(processedMessages.notifyMessages[2].message.content.headers['content-type'], transferMessage3.value.content.headers['content-type']) test.equal(processedMessages.notifyMessages[2].message.content.payload.errorInformation.errorCode, '2001') test.equal(processedMessages.notifyMessages[2].message.content.payload.errorInformation.errorDescription, 'Internal server error') @@ -557,32 +522,19 @@ Test('Prepare domain', positionIndexTest => { participantLimitId: 1, thresholdAlarmPercentage: 0.5 } - const settlementModel = { - settlementModelId: 1, - name: 'DEFERREDNET', - isActive: 1, - settlementGranularityId: 2, - settlementInterchangeId: 2, - settlementDelayId: 2, // 1 Immediate, 2 Deferred - currencyId: 'USD', - requireLiquidityCheck: 1, - ledgerAccountTypeId: 1, // 1 Position, 2 Settlement - autoPositionReset: 1, - adjustPosition: 0, - settlementAccountTypeId: 2 - } const processedMessages = await processPositionPrepareBin( binItems, - -4, // Accumulated position value - 0, { - '1cf6981b-25d8-4bd7-b9d9-b1c0fc8cdeaf': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, - '6c2c09c3-19b6-48ba-becc-cbdffcaadd7e': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, - '5dff336f-62c0-4619-92c6-9ccd7c8f0369': 'INVALID_STATE' - }, - 0, // Settlement participant position value - settlementModel, - participantLimit + accumulatedPositionValue: -4, // Accumulated position value + accumulatedPositionReservedValue: 0, + accumulatedTransferStates: { + '1cf6981b-25d8-4bd7-b9d9-b1c0fc8cdeaf': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + '6c2c09c3-19b6-48ba-becc-cbdffcaadd7e': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + '5dff336f-62c0-4619-92c6-9ccd7c8f0369': 'INVALID_STATE' + }, + settlementParticipantPosition: 0, // Settlement participant position value + participantLimit + } ) Logger.isInfoEnabled && Logger.info(processedMessages) test.equal(processedMessages.notifyMessages.length, 3) @@ -606,7 +558,7 @@ Test('Prepare domain', positionIndexTest => { test.equal(processedMessages.notifyMessages[2].message.content.uriParams.id, transferMessage3.value.id) test.equal(processedMessages.notifyMessages[2].message.content.headers.accept, transferMessage3.value.content.headers.accept) test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-destination'], transferMessage3.value.content.headers['fspiop-source']) - test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-source'], Enum.Http.Headers.FSPIOP.SWITCH.value) + test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-source'], Config.HUB_NAME) test.equal(processedMessages.notifyMessages[2].message.content.headers['content-type'], transferMessage3.value.content.headers['content-type']) test.equal(processedMessages.notifyMessages[2].message.content.payload.errorInformation.errorCode, '2001') test.equal(processedMessages.notifyMessages[2].message.content.payload.errorInformation.errorDescription, 'Internal server error') @@ -624,7 +576,7 @@ Test('Prepare domain', positionIndexTest => { test.end() }) - changeParticipantPositionTest.test('produce reserved messages for valid transfer messages with default settlement model', async (test) => { + changeParticipantPositionTest.test('produce reserved messages for valid transfer messages related to fx transfers', async (test) => { const participantLimit = { participantCurrencyId: 1, participantLimitTypeId: 1, @@ -634,32 +586,91 @@ Test('Prepare domain', positionIndexTest => { participantLimitId: 1, thresholdAlarmPercentage: 0.5 } - const settlementModel = { - settlementModelId: 1, - name: 'DEFERREDNET', + + // Modifying first transfer message to contain a context object with cyrilResult so that it is considered an FX transfer + const binItemsCopy = JSON.parse(JSON.stringify(binItems)) + binItemsCopy[0].message.value.content.context = { + cyrilResult: { + amount: 10 + } + } + const processedMessages = await processPositionPrepareBin( + binItemsCopy, + { + accumulatedPositionValue: -20, // Accumulated position value + accumulatedPositionReservedValue: 0, + accumulatedTransferStates: { + '1cf6981b-25d8-4bd7-b9d9-b1c0fc8cdeaf': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + '6c2c09c3-19b6-48ba-becc-cbdffcaadd7e': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + '5dff336f-62c0-4619-92c6-9ccd7c8f0369': 'INVALID_STATE' + }, + settlementParticipantPosition: 0, // Settlement participant position value + participantLimit + } + ) + Logger.isInfoEnabled && Logger.info(processedMessages) + test.equal(processedMessages.notifyMessages.length, 3) + + test.equal(processedMessages.accumulatedPositionChanges.length, 2) + + test.equal(processedMessages.notifyMessages[0].message.content.headers.accept, transferMessage1.value.content.headers.accept) + test.equal(processedMessages.notifyMessages[0].message.content.headers['fspiop-destination'], transferMessage1.value.content.headers['fspiop-destination']) + test.equal(processedMessages.notifyMessages[0].message.content.headers['fspiop-source'], transferMessage1.value.content.headers['fspiop-source']) + test.equal(processedMessages.notifyMessages[0].message.content.headers['content-type'], transferMessage1.value.content.headers['content-type']) + test.equal(processedMessages.accumulatedPositionChanges[0].value, -10) + test.equal(processedMessages.accumulatedTransferStates[transferMessage1.value.id], Enum.Transfers.TransferState.RESERVED) + + test.equal(processedMessages.notifyMessages[1].message.content.headers.accept, transferMessage2.value.content.headers.accept) + test.equal(processedMessages.notifyMessages[1].message.content.headers['fspiop-destination'], transferMessage2.value.content.headers['fspiop-destination']) + test.equal(processedMessages.notifyMessages[1].message.content.headers['fspiop-source'], transferMessage2.value.content.headers['fspiop-source']) + test.equal(processedMessages.notifyMessages[1].message.content.headers['content-type'], transferMessage2.value.content.headers['content-type']) + test.equal(processedMessages.accumulatedPositionChanges[1].value, -8) + test.equal(processedMessages.accumulatedTransferStates[transferMessage2.value.id], Enum.Transfers.TransferState.RESERVED) + + test.equal(processedMessages.notifyMessages[2].message.content.uriParams.id, transferMessage3.value.id) + test.equal(processedMessages.notifyMessages[2].message.content.headers.accept, transferMessage3.value.content.headers.accept) + test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-destination'], transferMessage3.value.content.headers['fspiop-source']) + test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-source'], Config.HUB_NAME) + test.equal(processedMessages.notifyMessages[2].message.content.headers['content-type'], transferMessage3.value.content.headers['content-type']) + test.equal(processedMessages.notifyMessages[2].message.content.payload.errorInformation.errorCode, '2001') + test.equal(processedMessages.notifyMessages[2].message.content.payload.errorInformation.errorDescription, 'Internal server error') + test.equal(processedMessages.accumulatedTransferStates[transferMessage3.value.id], Enum.Transfers.TransferInternalState.ABORTED_REJECTED) + + test.equal(processedMessages.accumulatedTransferStateChanges[0].transferId, transferMessage1.value.id) + test.equal(processedMessages.accumulatedTransferStateChanges[1].transferId, transferMessage2.value.id) + test.equal(processedMessages.accumulatedTransferStateChanges[2].transferId, transferMessage3.value.id) + + test.equal(processedMessages.accumulatedTransferStateChanges[0].transferStateId, Enum.Transfers.TransferState.RESERVED) + test.equal(processedMessages.accumulatedTransferStateChanges[1].transferStateId, Enum.Transfers.TransferState.RESERVED) + test.equal(processedMessages.accumulatedTransferStateChanges[2].transferStateId, Enum.Transfers.TransferInternalState.ABORTED_REJECTED) + + test.equal(processedMessages.accumulatedPositionValue, -8) + test.end() + }) + + changeParticipantPositionTest.test('produce reserved messages for valid transfer messages with default settlement model', async (test) => { + const participantLimit = { + participantCurrencyId: 1, + participantLimitTypeId: 1, + value: 10000, isActive: 1, - settlementGranularityId: 2, - settlementInterchangeId: 2, - settlementDelayId: 2, // 1 Immediate, 2 Deferred - currencyId: null, // Default settlement model is null currencyId - requireLiquidityCheck: 1, - ledgerAccountTypeId: 1, // 1 Position, 2 Settlement - autoPositionReset: 1, - adjustPosition: 0, - settlementAccountTypeId: 2 + createdBy: 'unknown', + participantLimitId: 1, + thresholdAlarmPercentage: 0.5 } const processedMessages = await processPositionPrepareBin( binItems, - -4, - 0, { - '1cf6981b-25d8-4bd7-b9d9-b1c0fc8cdeaf': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, - '6c2c09c3-19b6-48ba-becc-cbdffcaadd7e': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, - '5dff336f-62c0-4619-92c6-9ccd7c8f0369': 'INVALID_STATE' - }, - 0, - settlementModel, - participantLimit + accumulatedPositionValue: -4, + accumulatedPositionReservedValue: 0, + accumulatedTransferStates: { + '1cf6981b-25d8-4bd7-b9d9-b1c0fc8cdeaf': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + '6c2c09c3-19b6-48ba-becc-cbdffcaadd7e': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + '5dff336f-62c0-4619-92c6-9ccd7c8f0369': 'INVALID_STATE' + }, + settlementParticipantPosition: 0, + participantLimit + } ) Logger.isInfoEnabled && Logger.info(processedMessages) test.equal(processedMessages.notifyMessages.length, 3) @@ -682,7 +693,7 @@ Test('Prepare domain', positionIndexTest => { test.equal(processedMessages.notifyMessages[2].message.content.uriParams.id, transferMessage3.value.id) test.equal(processedMessages.notifyMessages[2].message.content.headers.accept, transferMessage3.value.content.headers.accept) test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-destination'], transferMessage3.value.content.headers['fspiop-source']) - test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-source'], Enum.Http.Headers.FSPIOP.SWITCH.value) + test.equal(processedMessages.notifyMessages[2].message.content.headers['fspiop-source'], Config.HUB_NAME) test.equal(processedMessages.notifyMessages[2].message.content.headers['content-type'], transferMessage3.value.content.headers['content-type']) test.equal(processedMessages.notifyMessages[2].message.content.payload.errorInformation.errorCode, '2001') test.equal(processedMessages.notifyMessages[2].message.content.payload.errorInformation.errorDescription, 'Internal server error') @@ -710,32 +721,19 @@ Test('Prepare domain', positionIndexTest => { participantLimitId: 1, thresholdAlarmPercentage: 0.5 } - const settlementModel = { - settlementModelId: 1, - name: 'DEFERREDNET', - isActive: 1, - settlementGranularityId: 2, - settlementInterchangeId: 2, - settlementDelayId: 2, // 1 Immediate, 2 Deferred - currencyId: null, // Default settlement model is null currencyId - requireLiquidityCheck: 1, - ledgerAccountTypeId: 1, // 1 Position, 2 Settlement - autoPositionReset: 1, - adjustPosition: 0, - settlementAccountTypeId: 2 - } const processedMessages = await processPositionPrepareBin( binItems, - 0, - 0, { - '1cf6981b-25d8-4bd7-b9d9-b1c0fc8cdeaf': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, - '6c2c09c3-19b6-48ba-becc-cbdffcaadd7e': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, - '5dff336f-62c0-4619-92c6-9ccd7c8f0369': 'INVALID_STATE' - }, - -4, - settlementModel, - participantLimit + accumulatedPositionValue: 0, + accumulatedPositionReservedValue: 0, + accumulatedTransferStates: { + '1cf6981b-25d8-4bd7-b9d9-b1c0fc8cdeaf': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + '6c2c09c3-19b6-48ba-becc-cbdffcaadd7e': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + '5dff336f-62c0-4619-92c6-9ccd7c8f0369': 'INVALID_STATE' + }, + settlementParticipantPosition: -4, + participantLimit + } ) Logger.isInfoEnabled && Logger.info(processedMessages) test.equal(processedMessages.notifyMessages.length, 3) @@ -744,6 +742,38 @@ Test('Prepare domain', positionIndexTest => { test.end() }) + changeParticipantPositionTest.test('skip position changes if changePosition is false', async (test) => { + const participantLimit = { + participantCurrencyId: 1, + participantLimitTypeId: 1, + value: 10000, + isActive: 1, + createdBy: 'unknown', + participantLimitId: 1, + thresholdAlarmPercentage: 0.5 + } + const processedMessages = await processPositionPrepareBin( + binItems, + { + accumulatedPositionValue: -4, + accumulatedPositionReservedValue: 0, + accumulatedTransferStates: { + '1cf6981b-25d8-4bd7-b9d9-b1c0fc8cdeaf': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + '6c2c09c3-19b6-48ba-becc-cbdffcaadd7e': Enum.Transfers.TransferInternalState.RECEIVED_PREPARE, + '5dff336f-62c0-4619-92c6-9ccd7c8f0369': 'INVALID_STATE' + }, + settlementParticipantPosition: 0, + participantLimit, + changePositions: false + } + ) + Logger.isInfoEnabled && Logger.info(processedMessages) + test.equal(processedMessages.notifyMessages.length, 3) + test.equal(processedMessages.accumulatedPositionChanges.length, 0) + test.equal(processedMessages.accumulatedPositionValue, -4) + test.end() + }) + changeParticipantPositionTest.end() }) diff --git a/test/unit/domain/position/sampleBins.js b/test/unit/domain/position/sampleBins.js index 30cc2811d..1e914e22d 100644 --- a/test/unit/domain/position/sampleBins.js +++ b/test/unit/domain/position/sampleBins.js @@ -668,6 +668,84 @@ module.exports = { }, span: {} } + ], + 'timeout-reserved': [ + { + message: { + value: { + from: 'payerFsp69185571', + to: 'payeeFsp69186326', + id: '7e3fa3f7-9a1b-4a81-83c9-5b41112dd7f5', + content: { + uriParams: { + id: '7e3fa3f7-9a1b-4a81-83c9-5b41112dd7f5' + }, + headers: { + accept: 'application/vnd.interoperability.transfers+json;version=1.0', + 'FSPIOP-Destination': 'payerFsp69185571', + 'Content-Type': 'application/vnd.interoperability.transfers+json;version=1.0', + date: 'Tue, 14 May 2024 00:13:15 GMT', + 'FSPIOP-Source': 'switch' + }, + payload: { + errorInformation: { + errorCode: '3303', + errorDescription: 'Transfer expired', + extensionList: { + extension: [ + { + key: 'cause', + value: 'FSPIOPError at Object.createFSPIOPError (/home/kleyow/mojaloop/central-ledger/node_modules/@mojaloop/central-services-error-handling/src/factory.js:198:12) at CronJob.timeout (/home/kleyow/moj...' + } + ] + } + } + } + }, + type: 'application/vnd.interoperability.transfers+json;version=1.0', + metadata: { + correlationId: '7e3fa3f7-9a1b-4a81-83c9-5b41112dd7f5', + event: { + type: 'position', + action: 'timeout-reserved', + createdAt: '2024-05-14T00:13:15.092Z', + state: { + status: 'error', + code: '3303', + description: 'Transfer expired' + }, + id: '1ef2f45c-f7a4-4b67-a0fc-7164ed43f0f1' + }, + trace: { + service: 'cl_transfer_timeout', + traceId: 'de8e410463b73e45203fc916d68cf98c', + spanId: 'bb0abd2ea5fdfbbd', + startTimestamp: '2024-05-14T00:13:15.092Z', + tags: { + tracestate: 'acmevendor=eyJzcGFuSWQiOiJiYjBhYmQyZWE1ZmRmYmJkIn0=', + transactionType: 'transfer', + transactionAction: 'timeout-received', + source: 'switch', + destination: 'payerFsp69185571' + }, + tracestates: { + acmevendor: { + spanId: 'bb0abd2ea5fdfbbd' + } + } + }, + 'protocol.createdAt': 1715645595093 + } + }, + size: 3489, + key: 7, + topic: 'topic-transfer-position', + offset: 4073, + partition: 0, + timestamp: 1694175690401 + }, + span: {} + } ] }, 15: { @@ -1096,6 +1174,84 @@ module.exports = { }, span: {} } + ], + 'fx-timeout-reserved': [ + { + message: { + value: { + from: 'perffsp2', + to: 'fxp', + id: 'ed6848e0-e2a8-45b0-9f98-59a2ffba8c10', + content: { + uriParams: { + id: 'ed6848e0-e2a8-45b0-9f98-59a2ffba8c10' + }, + headers: { + accept: 'application/vnd.interoperability.transfers+json;version=1.0', + 'fspiop-destination': 'fxp', + 'Content-Type': 'application/vnd.interoperability.transfers+json;version=1.0', + date: 'Tue, 14 May 2024 00:13:15 GMT', + 'fspiop-source': 'perffsp2' + }, + payload: { + errorInformation: { + errorCode: '3303', + errorDescription: 'Transfer expired', + extensionList: { + extension: [ + { + key: 'cause', + value: 'FSPIOPError at Object.createFSPIOPError (/home/kleyow/mojaloop/central-ledger/node_modules/@mojaloop/central-services-error-handling/src/factory.js:198:12) at CronJob.timeout (/home/kleyow/moj...' + } + ] + } + } + } + }, + type: 'application/vnd.interoperability.transfers+json;version=1.0', + metadata: { + correlationId: 'd6a036a5-65a3-48af-a0c7-ee089c412ada', + event: { + type: 'position', + action: 'fx-timeout-reserved', + createdAt: '2024-05-14T00:13:15.092Z', + state: { + status: 'error', + code: '3303', + description: 'Transfer expired' + }, + id: '1ef2f45c-f7a4-4b67-a0fc-7164ed43f0f1' + }, + trace: { + service: 'cl_transfer_timeout', + traceId: 'de8e410463b73e45203fc916d68cf98c', + spanId: 'bb0abd2ea5fdfbbd', + startTimestamp: '2024-05-14T00:13:15.092Z', + tags: { + tracestate: 'acmevendor=eyJzcGFuSWQiOiJiYjBhYmQyZWE1ZmRmYmJkIn0=', + transactionType: 'transfer', + transactionAction: 'timeout-received', + source: 'switch', + destination: 'perffsp2' + }, + tracestates: { + acmevendor: { + spanId: 'bb0abd2ea5fdfbbd' + } + } + }, + 'protocol.createdAt': 1715645595093 + } + }, + size: 3489, + key: 15, + topic: 'topic-transfer-position', + offset: 4073, + partition: 0, + timestamp: 1694175690401 + }, + span: {} + } ] } } diff --git a/test/unit/domain/position/timeout-reserved.test.js b/test/unit/domain/position/timeout-reserved.test.js new file mode 100644 index 000000000..182b18c29 --- /dev/null +++ b/test/unit/domain/position/timeout-reserved.test.js @@ -0,0 +1,312 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Kevin Leyow + -------------- + ******/ + +'use strict' + +const Test = require('tapes')(require('tape')) +const { Enum } = require('@mojaloop/central-services-shared') +const Sinon = require('sinon') +const { processPositionTimeoutReservedBin } = require('../../../../src/domain/position/timeout-reserved') + +const timeoutMessage1 = { + value: { + from: 'perffsp1', + to: 'perffsp2', + id: 'd6a036a5-65a3-48af-a0c7-ee089c412ada', + content: { + uriParams: { + id: 'd6a036a5-65a3-48af-a0c7-ee089c412ada' + }, + headers: { + accept: 'application/vnd.interoperability.transfers+json;version=1.0', + 'fspiop-destination': 'perffsp2', + 'Content-Type': 'application/vnd.interoperability.transfers+json;version=1.0', + date: 'Tue, 14 May 2024 00:13:15 GMT', + 'fspiop-source': 'perffsp1' + }, + payload: { + errorInformation: { + errorCode: '3303', + errorDescription: 'Transfer expired', + extensionList: { + extension: [ + { + key: 'cause', + value: 'FSPIOPError at Object.createFSPIOPError...' + } + ] + } + } + } + }, + type: 'application/vnd.interoperability.transfers+json;version=1.0', + metadata: { + correlationId: 'd6a036a5-65a3-48af-a0c7-ee089c412ada', + event: { + type: 'position', + action: 'timeout-reserved', + createdAt: '2024-05-14T00:13:15.092Z', + state: { + status: 'error', + code: '3303', + description: 'Transfer expired' + }, + id: '1ef2f45c-f7a4-4b67-a0fc-7164ed43f0f1' + }, + trace: { + service: 'cl_transfer_timeout', + traceId: 'de8e410463b73e45203fc916d68cf98c', + spanId: 'bb0abd2ea5fdfbbd', + startTimestamp: '2024-05-14T00:13:15.092Z', + tags: { + tracestate: 'acmevendor=eyJzcGFuSWQiOiJiYjBhYmQyZWE1ZmRmYmJkIn0=', + transactionType: 'transfer', + transactionAction: 'timeout-received', + source: 'switch', + destination: 'perffsp1' + }, + tracestates: { + acmevendor: { + spanId: 'bb0abd2ea5fdfbbd' + } + } + }, + 'protocol.createdAt': 1715645595093 + } + }, + size: 3489, + key: 51, + topic: 'topic-transfer-position', + offset: 4073, + partition: 0, + timestamp: 1694175690401 +} +const timeoutMessage2 = { + value: { + from: 'perffsp1', + to: 'perffsp2', + id: '7e3fa3f7-9a1b-4a81-83c9-5b41112dd7f5', + content: { + uriParams: { + id: '7e3fa3f7-9a1b-4a81-83c9-5b41112dd7f5' + }, + headers: { + accept: 'application/vnd.interoperability.transfers+json;version=1.0', + 'fspiop-destination': 'perffsp2', + 'Content-Type': 'application/vnd.interoperability.transfers+json;version=1.0', + date: 'Tue, 14 May 2024 00:13:15 GMT', + 'fspiop-source': 'perffsp1' + }, + payload: { + errorInformation: { + errorCode: '3303', + errorDescription: 'Transfer expired', + extensionList: { + extension: [ + { + key: 'cause', + value: 'FSPIOPError at Object.createFSPIOPError...' + } + ] + } + } + } + }, + type: 'application/vnd.interoperability.transfers+json;version=1.0', + metadata: { + correlationId: '7e3fa3f7-9a1b-4a81-83c9-5b41112dd7f5', + event: { + type: 'position', + action: 'timeout-reserved', + createdAt: '2024-05-14T00:13:15.092Z', + state: { + status: 'error', + code: '3303', + description: 'Transfer expired' + }, + id: '1ef2f45c-f7a4-4b67-a0fc-7164ed43f0f1' + }, + trace: { + service: 'cl_transfer_timeout', + traceId: 'de8e410463b73e45203fc916d68cf98c', + spanId: 'bb0abd2ea5fdfbbd', + startTimestamp: '2024-05-14T00:13:15.092Z', + tags: { + tracestate: 'acmevendor=eyJzcGFuSWQiOiJiYjBhYmQyZWE1ZmRmYmJkIn0=', + transactionType: 'transfer', + transactionAction: 'timeout-received', + source: 'switch', + destination: 'perffsp1' + }, + tracestates: { + acmevendor: { + spanId: 'bb0abd2ea5fdfbbd' + } + } + }, + 'protocol.createdAt': 1715645595093 + } + }, + size: 3489, + key: 51, + topic: 'topic-transfer-position', + offset: 4073, + partition: 0, + timestamp: 1694175690401 +} + +const span = {} +const binItems = [{ + message: timeoutMessage1, + span, + decodedPayload: {} +}, +{ + message: timeoutMessage2, + span, + decodedPayload: {} +}] + +Test('timeout reserved domain', positionIndexTest => { + let sandbox + + positionIndexTest.beforeEach(t => { + sandbox = Sinon.createSandbox() + t.end() + }) + + positionIndexTest.afterEach(t => { + sandbox.restore() + t.end() + }) + + positionIndexTest.test('processPositionTimeoutReservedBin should', changeParticipantPositionTest => { + changeParticipantPositionTest.test('produce abort message for transfers not in the right transfer state', async (test) => { + try { + await processPositionTimeoutReservedBin( + binItems, + { + accumulatedPositionValue: 0, // Accumulated position value + accumulatedPositionReservedValue: 0, + accumulatedTransferStates: { + 'd6a036a5-65a3-48af-a0c7-ee089c412ada': 'INVALID_STATE', + '7e3fa3f7-9a1b-4a81-83c9-5b41112dd7f5': 'INVALID_STATE' + }, + transferInfoList: {} + } + ) + test.fail('Error not thrown') + } catch (e) { + test.pass('Error thrown') + } + test.end() + }) + + changeParticipantPositionTest.test('produce reserved messages/position changes for valid timeout messages', async (test) => { + const processedMessages = await processPositionTimeoutReservedBin( + binItems, + { + accumulatedPositionValue: 0, // Accumulated position value + accumulatedPositionReservedValue: 0, + accumulatedTransferStates: { + 'd6a036a5-65a3-48af-a0c7-ee089c412ada': Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT, + '7e3fa3f7-9a1b-4a81-83c9-5b41112dd7f5': Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT + }, + transferInfoList: { + 'd6a036a5-65a3-48af-a0c7-ee089c412ada': { + amount: -10 + }, + '7e3fa3f7-9a1b-4a81-83c9-5b41112dd7f5': { + amount: -5 + } + } + } + ) + test.equal(processedMessages.notifyMessages.length, 2) + + test.equal(processedMessages.accumulatedPositionChanges.length, 2) + + test.equal(processedMessages.notifyMessages[0].message.content.headers['fspiop-destination'], timeoutMessage1.value.to) + test.equal(processedMessages.notifyMessages[0].message.content.headers['fspiop-source'], timeoutMessage1.value.from) + test.equal(processedMessages.notifyMessages[0].message.content.headers['content-type'], timeoutMessage1.value.content.headers['content-type']) + test.equal(processedMessages.accumulatedPositionChanges[0].value, -10) + test.equal(processedMessages.accumulatedTransferStates[timeoutMessage1.value.id], Enum.Transfers.TransferInternalState.EXPIRED_RESERVED) + + test.equal(processedMessages.notifyMessages[1].message.content.headers['fspiop-destination'], timeoutMessage2.value.to) + test.equal(processedMessages.notifyMessages[1].message.content.headers['fspiop-source'], timeoutMessage1.value.from) + test.equal(processedMessages.notifyMessages[1].message.content.headers['content-type'], timeoutMessage2.value.content.headers['content-type']) + test.equal(processedMessages.accumulatedPositionChanges[1].value, -15) + test.equal(processedMessages.accumulatedTransferStates[timeoutMessage2.value.id], Enum.Transfers.TransferInternalState.EXPIRED_RESERVED) + + test.equal(processedMessages.accumulatedTransferStateChanges[0].transferId, timeoutMessage1.value.id) + test.equal(processedMessages.accumulatedTransferStateChanges[1].transferId, timeoutMessage2.value.id) + + test.equal(processedMessages.accumulatedTransferStateChanges[0].transferStateId, Enum.Transfers.TransferInternalState.EXPIRED_RESERVED) + test.equal(processedMessages.accumulatedTransferStateChanges[1].transferStateId, Enum.Transfers.TransferInternalState.EXPIRED_RESERVED) + + test.equal(processedMessages.accumulatedPositionValue, -15) + test.end() + }) + + changeParticipantPositionTest.test('skip position changes if changePositions is false', async (test) => { + const processedMessages = await processPositionTimeoutReservedBin( + binItems, + { + accumulatedPositionValue: 0, // Accumulated position value + accumulatedPositionReservedValue: 0, + accumulatedTransferStates: { + 'd6a036a5-65a3-48af-a0c7-ee089c412ada': Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT, + '7e3fa3f7-9a1b-4a81-83c9-5b41112dd7f5': Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT + }, + transferInfoList: { + 'd6a036a5-65a3-48af-a0c7-ee089c412ada': { + amount: -10 + }, + '7e3fa3f7-9a1b-4a81-83c9-5b41112dd7f5': { + amount: -5 + } + }, + changePositions: false + } + ) + test.equal(processedMessages.notifyMessages.length, 2) + test.equal(processedMessages.accumulatedPositionChanges.length, 0) + test.equal(processedMessages.accumulatedPositionValue, 0) + test.equal(processedMessages.accumulatedTransferStateChanges[0].transferId, timeoutMessage1.value.id) + test.equal(processedMessages.accumulatedTransferStateChanges[1].transferId, timeoutMessage2.value.id) + test.equal(processedMessages.accumulatedTransferStateChanges[0].transferStateId, Enum.Transfers.TransferInternalState.EXPIRED_RESERVED) + test.equal(processedMessages.accumulatedTransferStateChanges[1].transferStateId, Enum.Transfers.TransferInternalState.EXPIRED_RESERVED) + test.equal(processedMessages.accumulatedTransferStates[timeoutMessage1.value.id], Enum.Transfers.TransferInternalState.EXPIRED_RESERVED) + test.equal(processedMessages.accumulatedTransferStates[timeoutMessage2.value.id], Enum.Transfers.TransferInternalState.EXPIRED_RESERVED) + test.end() + }) + + changeParticipantPositionTest.end() + }) + + positionIndexTest.end() +}) diff --git a/test/unit/domain/settlement/index.test.js b/test/unit/domain/settlement/index.test.js index 0b182d9d6..f70fcd1dc 100644 --- a/test/unit/domain/settlement/index.test.js +++ b/test/unit/domain/settlement/index.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/domain/timeout/index.test.js b/test/unit/domain/timeout/index.test.js index 8573ae25d..7b4cd10f4 100644 --- a/test/unit/domain/timeout/index.test.js +++ b/test/unit/domain/timeout/index.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -28,9 +31,11 @@ const Test = require('tapes')(require('tape')) const Sinon = require('sinon') const TimeoutService = require('../../../../src/domain/timeout') const TransferTimeoutModel = require('../../../../src/models/transfer/transferTimeout') +const FxTransferTimeoutModel = require('../../../../src/models/fxTransfer/fxTransferTimeout') const TransferFacade = require('../../../../src/models/transfer/facade') const SegmentModel = require('../../../../src/models/misc/segment') const TransferStateChangeModel = require('../../../../src/models/transfer/transferStateChange') +const FxTransferStateChangeModel = require('../../../../src/models/fxTransfer/stateChange') const Logger = require('@mojaloop/central-services-logger') Test('Timeout Service', timeoutTest => { @@ -39,8 +44,10 @@ Test('Timeout Service', timeoutTest => { timeoutTest.beforeEach(t => { sandbox = Sinon.createSandbox() sandbox.stub(TransferTimeoutModel) + sandbox.stub(FxTransferTimeoutModel) sandbox.stub(TransferFacade) sandbox.stub(TransferStateChangeModel) + sandbox.stub(FxTransferStateChangeModel) sandbox.stub(SegmentModel) t.end() }) @@ -82,6 +89,38 @@ Test('Timeout Service', timeoutTest => { getTimeoutSegmentTest.end() }) + timeoutTest.test('getFxTimeoutSegment should', getFxTimeoutSegmentTest => { + getFxTimeoutSegmentTest.test('return the segment', async (test) => { + try { + const params = { + segmentType: 'timeout', + enumeration: 0, + tableName: 'fxTransferStateChange' + } + + const segment = { + segmentId: 1, + segmentType: 'timeout', + enumeration: 0, + tableName: 'fxTransferStateChange', + value: 4, + changedDate: '2018-10-10 21:57:00' + } + + SegmentModel.getByParams.withArgs(params).returns(Promise.resolve(segment)) + const result = await TimeoutService.getFxTimeoutSegment() + test.deepEqual(result, segment, 'Results Match') + test.end() + } catch (e) { + Logger.error(e) + test.fail('Error Thrown') + test.end() + } + }) + + getFxTimeoutSegmentTest.end() + }) + timeoutTest.test('cleanupTransferTimeout should', cleanupTransferTimeoutTest => { cleanupTransferTimeoutTest.test('cleanup the timed out transfers and return the id', async (test) => { try { @@ -99,6 +138,23 @@ Test('Timeout Service', timeoutTest => { cleanupTransferTimeoutTest.end() }) + timeoutTest.test('cleanupFxTransferTimeout should', cleanupFxTransferTimeoutTest => { + cleanupFxTransferTimeoutTest.test('cleanup the timed out fx-transfers and return the id', async (test) => { + try { + FxTransferTimeoutModel.cleanup.returns(Promise.resolve(1)) + const result = await TimeoutService.cleanupFxTransferTimeout() + test.equal(result, 1, 'Results Match') + test.end() + } catch (e) { + Logger.error(e) + test.fail('Error Thrown') + test.end() + } + }) + + cleanupFxTransferTimeoutTest.end() + }) + timeoutTest.test('getLatestTransferStateChange should', getLatestTransferStateChangeTest => { getLatestTransferStateChangeTest.test('get the latest transfer state change id', async (test) => { try { @@ -117,6 +173,24 @@ Test('Timeout Service', timeoutTest => { getLatestTransferStateChangeTest.end() }) + timeoutTest.test('getLatestFxTransferStateChange should', getLatestFxTransferStateChangeTest => { + getLatestFxTransferStateChangeTest.test('get the latest fx-transfer state change id', async (test) => { + try { + const record = { fxTransferStateChangeId: 1 } + FxTransferStateChangeModel.getLatest.returns(Promise.resolve(record)) + const result = await TimeoutService.getLatestFxTransferStateChange() + test.equal(result, record, 'Results Match') + test.end() + } catch (e) { + Logger.error(e) + test.fail('Error Thrown') + test.end() + } + }) + + getLatestFxTransferStateChangeTest.end() + }) + timeoutTest.test('timeoutExpireReserved should', timeoutExpireReservedTest => { timeoutExpireReservedTest.test('timeout the reserved transactions which are expired', async (test) => { try { diff --git a/test/unit/domain/transactions/index.test.js b/test/unit/domain/transactions/index.test.js index 450062794..567226d51 100644 --- a/test/unit/domain/transactions/index.test.js +++ b/test/unit/domain/transactions/index.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/domain/transfer/index.test.js b/test/unit/domain/transfer/index.test.js index 730c527a0..d286bd193 100644 --- a/test/unit/domain/transfer/index.test.js +++ b/test/unit/domain/transfer/index.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -209,5 +212,35 @@ Test('Transfer Service', transferIndexTest => { logTransferErrorTest.end() }) + transferIndexTest.test('forwardedPrepare should', handlePayeeResponseTest => { + handlePayeeResponseTest.test('commit transfer', async (test) => { + try { + TransferFacade.updatePrepareReservedForwarded.returns(Promise.resolve()) + await TransferService.forwardedPrepare(payload.transferId) + test.pass() + test.end() + } catch (err) { + Logger.error(`handlePayeeResponse failed with error - ${err}`) + test.fail() + test.end() + } + }) + + handlePayeeResponseTest.test('throw error', async (test) => { + try { + TransferFacade.updatePrepareReservedForwarded.throws(new Error()) + await TransferService.forwardedPrepare(payload.transferId) + test.fail('Error not thrown') + test.end() + } catch (err) { + Logger.error(`handlePayeeResponse failed with error - ${err}`) + test.pass('Error thrown') + test.end() + } + }) + + handlePayeeResponseTest.end() + }) + transferIndexTest.end() }) diff --git a/test/unit/domain/transfer/transform.test.js b/test/unit/domain/transfer/transform.test.js index 1c9dc1dd5..346400ea5 100644 --- a/test/unit/domain/transfer/transform.test.js +++ b/test/unit/domain/transfer/transform.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -340,7 +343,8 @@ Test('Transform Service', transformTest => { toFulfilTest.test('throw error', async (test) => { try { const invalidTransfer = {} - TransformService.toFulfil(invalidTransfer) + const x = TransformService.toFulfil(invalidTransfer) + console.log(x) test.fail('should throw') test.end() } catch (e) { diff --git a/test/unit/handlers/admin/handler.test.js b/test/unit/handlers/admin/handler.test.js index 92539f4cb..fdb8522a6 100644 --- a/test/unit/handlers/admin/handler.test.js +++ b/test/unit/handlers/admin/handler.test.js @@ -11,6 +11,7 @@ const Logger = require('@mojaloop/central-services-logger') const Comparators = require('@mojaloop/central-services-shared').Util.Comparators const TransferService = require('../../../../src/domain/transfer') const Db = require('../../../../src/lib/db') +const ProxyCache = require('#src/lib/proxyCache') const Enum = require('@mojaloop/central-services-shared').Enum const TransferState = Enum.Transfers.TransferState const TransferInternalState = Enum.Transfers.TransferInternalState @@ -299,6 +300,10 @@ Test('Admin handler', adminHandlerTest => { adminHandlerTest.beforeEach(test => { sandbox = Sinon.createSandbox() + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub() + }) sandbox.stub(KafkaConsumer.prototype, 'constructor').resolves() sandbox.stub(KafkaConsumer.prototype, 'connect').resolves() sandbox.stub(KafkaConsumer.prototype, 'consume').resolves() @@ -406,7 +411,8 @@ Test('Admin handler', adminHandlerTest => { sandbox.stub(Db, 'getKnex') const knexStub = sandbox.stub() const trxStub = sandbox.stub() - trxStub.rollback = sandbox.stub() + trxStub.rollback = () => Promise.reject(new Error('DB Error')) + Consumer.isConsumerAutoCommitEnabled.withArgs(topicName).throws(new Error()) knexStub.transaction = sandbox.stub().callsArgWith(0, trxStub) Db.getKnex.returns(knexStub) @@ -434,7 +440,7 @@ Test('Admin handler', adminHandlerTest => { sandbox.stub(Db, 'getKnex') const knexStub = sandbox.stub() const trxStub = sandbox.stub() - trxStub.rollback = sandbox.stub() + trxStub.rollback = () => Promise.reject(new Error('DB Error')) Consumer.isConsumerAutoCommitEnabled.withArgs(topicName).throws(new Error()) knexStub.transaction = sandbox.stub().callsArgWith(0, trxStub) Db.getKnex.returns(knexStub) diff --git a/test/unit/handlers/api/handler.test.js b/test/unit/handlers/api/handler.test.js index 33087ecc0..8bd52e8e0 100644 --- a/test/unit/handlers/api/handler.test.js +++ b/test/unit/handlers/api/handler.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -29,6 +32,7 @@ const Sinon = require('sinon') const Handler = require('../../../../src/handlers/api/routes') const Consumer = require('@mojaloop/central-services-stream').Util.Consumer const MigrationLockModel = require('../../../../src/models/misc/migrationLock') +const ProxyCache = require('#src/lib/proxyCache') function createRequest (routes) { const value = routes || [] @@ -61,6 +65,11 @@ Test('route handler', (handlerTest) => { // Arrange sandbox.stub(MigrationLockModel, 'getIsMigrationLocked').returns(false) sandbox.stub(Consumer, 'isConnected').returns(Promise.resolve()) + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub(), + healthCheck: sandbox.stub().returns(Promise.resolve(true)) + }) const jp = require('jsonpath') const healthHandler = jp.query(Handler, '$[?(@.path=="/health")]') diff --git a/test/unit/handlers/bulk/get/handler.test.js b/test/unit/handlers/bulk/get/handler.test.js index df076356e..6ece83626 100644 --- a/test/unit/handlers/bulk/get/handler.test.js +++ b/test/unit/handlers/bulk/get/handler.test.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -30,6 +30,7 @@ const { randomUUID } = require('crypto') const Sinon = require('sinon') const Proxyquire = require('proxyquire') +const ProxyCache = require('#src/lib/proxyCache') const Test = require('tapes')(require('tape')) const EventSdk = require('@mojaloop/event-sdk') const Kafka = require('@mojaloop/central-services-shared').Util.Kafka @@ -152,6 +153,10 @@ Test('Bulk Transfer GET handler', getHandlerTest => { getHandlerTest.beforeEach(test => { sandbox = Sinon.createSandbox() + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub() + }) SpanStub = { audit: sandbox.stub().callsFake(), error: sandbox.stub().callsFake(), diff --git a/test/unit/handlers/bulk/prepare/handler.test.js b/test/unit/handlers/bulk/prepare/handler.test.js index 554a70721..32217b6a1 100644 --- a/test/unit/handlers/bulk/prepare/handler.test.js +++ b/test/unit/handlers/bulk/prepare/handler.test.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -43,6 +43,7 @@ const BulkTransferService = require('#src/domain/bulkTransfer/index') const BulkTransferModel = require('#src/models/bulkTransfer/bulkTransfer') const BulkTransferModels = require('@mojaloop/object-store-lib').Models.BulkTransfer const ilp = require('#src/models/transfer/ilpPacket') +const ProxyCache = require('#src/lib/proxyCache') // Sample Bulk Transfer Message received by the Bulk API Adapter const fspiopBulkTransferMsg = { @@ -159,6 +160,10 @@ Test('Bulk Transfer PREPARE handler', handlerTest => { handlerTest.beforeEach(test => { sandbox = Sinon.createSandbox() + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub() + }) SpanStub = { audit: sandbox.stub().callsFake(), error: sandbox.stub().callsFake(), diff --git a/test/unit/handlers/index.test.js b/test/unit/handlers/index.test.js index 684803972..e89036b8d 100644 --- a/test/unit/handlers/index.test.js +++ b/test/unit/handlers/index.test.js @@ -7,6 +7,7 @@ const Proxyquire = require('proxyquire') const Plugin = require('../../../src/handlers/api/plugin') const MetricsPlugin = require('../../../src/api/metrics/plugin') const Logger = require('@mojaloop/central-services-logger') +const ProxyCache = require('#src/lib/proxyCache') Test('cli', async (cliTest) => { let sandbox @@ -35,9 +36,12 @@ Test('cli', async (cliTest) => { commanderTest.beforeEach(test => { sandbox = Sinon.createSandbox() - + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub() + }) SetupStub = { - initialize: sandbox.stub().returns(Promise.resolve()) + initialize: sandbox.stub().resolves() } process.argv = [] diff --git a/test/unit/handlers/positions/handler.test.js b/test/unit/handlers/positions/handler.test.js index 4b7aa8d53..2384f341b 100644 --- a/test/unit/handlers/positions/handler.test.js +++ b/test/unit/handlers/positions/handler.test.js @@ -7,6 +7,8 @@ const Validator = require('../../../../src/handlers/transfers/validator') const TransferService = require('../../../../src/domain/transfer') const PositionService = require('../../../../src/domain/position') const SettlementModelCached = require('../../../../src/models/settlement/settlementModelCached') +const ParticipantFacade = require('../../../../src/models/participant/facade') +const ParticipantCachedModel = require('../../../../src/models/participant/participantCached') const MainUtil = require('@mojaloop/central-services-shared').Util const Consumer = require('@mojaloop/central-services-stream').Util.Consumer const KafkaConsumer = Consumer.Consumer @@ -20,6 +22,7 @@ const Clone = require('lodash').clone const TransferState = Enum.Transfers.TransferState const TransferInternalState = Enum.Transfers.TransferInternalState const Proxyquire = require('proxyquire') +const ProxyCache = require('#src/lib/proxyCache') const transfer = { transferId: 'b51ec534-ee48-4575-b6a9-ead2955b8999', @@ -141,6 +144,10 @@ Test('Position handler', transferHandlerTest => { transferHandlerTest.beforeEach(test => { sandbox = Sinon.createSandbox() + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub() + }) SpanStub = { audit: sandbox.stub().callsFake(), error: sandbox.stub().callsFake(), @@ -178,6 +185,8 @@ Test('Position handler', transferHandlerTest => { sandbox.stub(PositionService) sandbox.stub(TransferStateChange) sandbox.stub(SettlementModelCached) + sandbox.stub(ParticipantFacade) + sandbox.stub(ParticipantCachedModel) Kafka.transformAccountToTopicName.returns(topicName) Kafka.produceGeneralMessage.resolves() test.end() @@ -733,6 +742,8 @@ Test('Position handler', transferHandlerTest => { Kafka.transformGeneralTopicName.returns(topicName) Kafka.getKafkaConfig.returns(config) TransferStateChange.saveTransferStateChange.resolves(true) + ParticipantFacade.getByNameAndCurrency.resolves({ participantCurrencyId: 1 }) + ParticipantCachedModel.getByName.resolves({ participantId: 1 }) TransferService.getTransferInfoToChangePosition.resolves({ transferStateId: 'INVALID_STATE' }) const m = Object.assign({}, MainUtil.clone(messages[0])) m.value.metadata.event.action = transferEventAction.TIMEOUT_RESERVED diff --git a/test/unit/handlers/positions/handlerBatch.test.js b/test/unit/handlers/positions/handlerBatch.test.js index 84e480b07..12173a68e 100644 --- a/test/unit/handlers/positions/handlerBatch.test.js +++ b/test/unit/handlers/positions/handlerBatch.test.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -40,6 +40,7 @@ const SettlementModelCached = require('../../../../src/models/settlement/settlem const Enum = require('@mojaloop/central-services-shared').Enum const Proxyquire = require('proxyquire') const Logger = require('@mojaloop/central-services-logger') +const ProxyCache = require('#src/lib/proxyCache') const topicName = 'topic-transfer-position-batch' @@ -53,6 +54,7 @@ const prepareMessageValue = { payload: {} } } + const commitMessageValue = { metadata: { event: { @@ -128,6 +130,10 @@ Test('Position handler', positionBatchHandlerTest => { positionBatchHandlerTest.beforeEach(test => { sandbox = Sinon.createSandbox() + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub() + }) SpanStub = { audit: sandbox.stub().callsFake(), error: sandbox.stub().callsFake(), @@ -223,7 +229,8 @@ Test('Position handler', positionBatchHandlerTest => { BatchPositionModel.startDbTransaction.returns(trxStub) sandbox.stub(BinProcessor) BinProcessor.processBins.resolves({ - notifyMessages: messages.map((i) => ({ binItem: { message: i, span: SpanStub }, message: { metadata: { event: { state: { status: 'success' } } } } })) + notifyMessages: messages.map((i) => ({ binItem: { message: i, span: SpanStub }, message: { metadata: { event: { state: { status: 'success' } } } } })), + followupMessages: [] }) BinProcessor.iterateThroughBins.restore() @@ -413,7 +420,8 @@ Test('Position handler', positionBatchHandlerTest => { Kafka.proceed.returns(true) BinProcessor.processBins.resolves({ - notifyMessages: [{ binItem: { message: messages[0], span: SpanStub }, message: { metadata: { event: { state: 'success' } } } }] + notifyMessages: [{ binItem: { message: messages[0], span: SpanStub }, message: { metadata: { event: { state: 'success' } } } }], + followupMessages: [] }) // Act @@ -447,7 +455,89 @@ Test('Position handler', positionBatchHandlerTest => { Kafka.proceed.returns(true) BinProcessor.processBins.resolves({ - notifyMessages: [{ binItem: { message: messages[0], span: SpanStub }, message: { metadata: { event: { state: { status: 'error' } } } } }] + notifyMessages: [{ binItem: { message: messages[0], span: SpanStub }, message: { metadata: { event: { state: { status: 'error' } } } } }], + followupMessages: [] + }) + + // Act + try { + await allTransferHandlers.positions(null, messages[0]) + test.ok(BatchPositionModel.startDbTransaction.calledOnce, 'startDbTransaction should be called once') + // Need an easier way to do partial matching... + delete BinProcessor.processBins.getCall(0).args[0][1001].prepare[0].histTimerMsgEnd + test.deepEqual(BinProcessor.processBins.getCall(0).args[0][1001].prepare[0], expectedBins[1001].prepare[0]) + test.equal(BinProcessor.processBins.getCall(0).args[1], trxStub) + const expectedLastMessageToCommit = messages[messages.length - 1] + test.equal(Kafka.proceed.getCall(0).args[1].message.offset, expectedLastMessageToCommit.offset, 'kafkaProceed should be called with the correct offset') + test.equal(SpanStub.audit.callCount, 1, 'span.audit should be called one time') + test.equal(SpanStub.finish.callCount, 1, 'span.finish should be called one time') + test.ok(trxStub.commit.calledOnce, 'trx.commit should be called once') + test.ok(trxStub.rollback.notCalled, 'trx.rollback should not be called') + test.equal(Kafka.produceGeneralMessage.callCount, 1, 'produceGeneralMessage should be one time to produce kafka notification events') + test.equal(Kafka.produceGeneralMessage.getCall(0).args[5], Enum.Events.EventStatus.FAILURE, 'produceGeneralMessage should be called with eventStatus as Enum.Events.EventStatus.FAILURE') + test.end() + } catch (err) { + Logger.info(err) + test.fail('Error should not be thrown') + test.end() + } + }) + + positionsTest.test('calls Kafka.produceGeneralMessage for followup messages', async test => { + // Arrange + await Consumer.createHandler(topicName, config, command) + Kafka.transformGeneralTopicName.returns(topicName) + Kafka.getKafkaConfig.returns(config) + Kafka.proceed.returns(true) + + BinProcessor.processBins.resolves({ + notifyMessages: [], + followupMessages: messages.map((i) => ({ binItem: { message: i, messageKey: '100', span: SpanStub }, message: { metadata: { event: { state: { status: 'success' } } } } })) + }) + + // Act + try { + await allTransferHandlers.positions(null, messages) + test.ok(BatchPositionModel.startDbTransaction.calledOnce, 'startDbTransaction should be called once') + // Need an easier way to do partial matching... + delete BinProcessor.processBins.getCall(0).args[0][1001].commit[0].histTimerMsgEnd + delete BinProcessor.processBins.getCall(0).args[0][1001].prepare[0].histTimerMsgEnd + delete BinProcessor.processBins.getCall(0).args[0][1001].prepare[1].histTimerMsgEnd + delete BinProcessor.processBins.getCall(0).args[0][1002].commit[0].histTimerMsgEnd + delete BinProcessor.processBins.getCall(0).args[0][1002].prepare[0].histTimerMsgEnd + test.deepEqual(BinProcessor.processBins.getCall(0).args[0][1001].commit, expectedBins[1001].commit) + test.deepEqual(BinProcessor.processBins.getCall(0).args[0][1001].prepare, expectedBins[1001].prepare) + test.deepEqual(BinProcessor.processBins.getCall(0).args[0][1002].commit, expectedBins[1002].commit) + test.deepEqual(BinProcessor.processBins.getCall(0).args[0][1002].prepare, expectedBins[1002].prepare) + test.equal(BinProcessor.processBins.getCall(0).args[1], trxStub) + const expectedLastMessageToCommit = messages[messages.length - 1] + test.equal(Kafka.proceed.getCall(0).args[1].message.offset, expectedLastMessageToCommit.offset, 'kafkaProceed should be called with the correct offset') + test.equal(SpanStub.audit.callCount, 5, 'span.audit should be called five times') + test.equal(SpanStub.finish.callCount, 5, 'span.finish should be called five times') + test.ok(trxStub.commit.calledOnce, 'trx.commit should be called once') + test.ok(trxStub.rollback.notCalled, 'trx.rollback should not be called') + test.equal(Kafka.produceGeneralMessage.callCount, 5, 'produceGeneralMessage should be five times to produce kafka notification events') + test.equal(Kafka.produceGeneralMessage.getCall(0).args[2], Enum.Events.Event.Type.POSITION, 'produceGeneralMessage should be called with eventType POSITION') + test.equal(Kafka.produceGeneralMessage.getCall(0).args[3], Enum.Events.Event.Action.PREPARE, 'produceGeneralMessage should be called with eventAction PREPARE') + test.equal(Kafka.produceGeneralMessage.getCall(0).args[5], Enum.Events.EventStatus.SUCCESS, 'produceGeneralMessage should be called with eventStatus as Enum.Events.EventStatus.SUCCESS') + test.end() + } catch (err) { + Logger.info(err) + test.fail('Error should not be thrown') + test.end() + } + }) + + positionsTest.test('calls Kafka.produceGeneralMessage for followup messages with correct eventStatus if event is a failure event', async test => { + // Arrange + await Consumer.createHandler(topicName, config, command) + Kafka.transformGeneralTopicName.returns(topicName) + Kafka.getKafkaConfig.returns(config) + Kafka.proceed.returns(true) + + BinProcessor.processBins.resolves({ + notifyMessages: [], + followupMessages: [{ binItem: { message: messages[0], messageKey: '100', span: SpanStub }, message: { metadata: { event: { state: { status: 'error' } } } } }] }) // Act @@ -465,6 +555,8 @@ Test('Position handler', positionBatchHandlerTest => { test.ok(trxStub.commit.calledOnce, 'trx.commit should be called once') test.ok(trxStub.rollback.notCalled, 'trx.rollback should not be called') test.equal(Kafka.produceGeneralMessage.callCount, 1, 'produceGeneralMessage should be one time to produce kafka notification events') + test.equal(Kafka.produceGeneralMessage.getCall(0).args[2], Enum.Events.Event.Type.POSITION, 'produceGeneralMessage should be called with eventType POSITION') + test.equal(Kafka.produceGeneralMessage.getCall(0).args[3], Enum.Events.Event.Action.PREPARE, 'produceGeneralMessage should be called with eventAction PREPARE') test.equal(Kafka.produceGeneralMessage.getCall(0).args[5], Enum.Events.EventStatus.FAILURE, 'produceGeneralMessage should be called with eventStatus as Enum.Events.EventStatus.FAILURE') test.end() } catch (err) { diff --git a/test/unit/handlers/register.test.js b/test/unit/handlers/register.test.js index 7da1df0e5..1a0f81f7c 100644 --- a/test/unit/handlers/register.test.js +++ b/test/unit/handlers/register.test.js @@ -12,6 +12,7 @@ const BulkProcessingHandlers = require('../../../src/handlers/bulk/processing/ha const BulkFulfilHandlers = require('../../../src/handlers/bulk/fulfil/handler') const BulkGetHandlers = require('../../../src/handlers/bulk/get/handler') const Proxyquire = require('proxyquire') +const ProxyCache = require('#src/lib/proxyCache') Test('handlers', handlersTest => { let sandbox @@ -26,6 +27,10 @@ Test('handlers', handlersTest => { sandbox.stub(BulkProcessingHandlers, 'registerAllHandlers').returns(Promise.resolve(true)) sandbox.stub(BulkFulfilHandlers, 'registerAllHandlers').returns(Promise.resolve(true)) sandbox.stub(BulkGetHandlers, 'registerAllHandlers').returns(Promise.resolve(true)) + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub() + }) test.end() }) diff --git a/test/unit/handlers/timeouts/handler.test.js b/test/unit/handlers/timeouts/handler.test.js index 23bae6f14..b941c36d6 100644 --- a/test/unit/handlers/timeouts/handler.test.js +++ b/test/unit/handlers/timeouts/handler.test.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -36,6 +36,7 @@ const CronJob = require('cron').CronJob const TimeoutService = require('../../../../src/domain/timeout') const Config = require('../../../../src/lib/config') const { randomUUID } = require('crypto') +const ProxyCache = require('#src/lib/proxyCache') const Enum = require('@mojaloop/central-services-shared').Enum const Utility = require('@mojaloop/central-services-shared').Util.Kafka @@ -49,6 +50,10 @@ Test('Timeout handler', TimeoutHandlerTest => { sandbox.stub(CronJob.prototype, 'constructor').returns(Promise.resolve()) sandbox.stub(CronJob.prototype, 'start').returns(Promise.resolve(true)) sandbox.stub(CronJob.prototype, 'stop').returns(Promise.resolve(true)) + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub() + }) Config.HANDLERS_TIMEOUT_DISABLED = false test.end() }) @@ -66,14 +71,18 @@ Test('Timeout handler', TimeoutHandlerTest => { const latestTransferStateChangeMock = { transferStateChangeId: 20 } - const resultMock = [ + const latestFxTransferStateChangeMock = { + fxTransferStateChangeId: 20 + } + const transferTimeoutListMock = [ { transferId: randomUUID(), bulkTransferId: null, payerFsp: 'dfsp1', payeeFsp: 'dfsp2', transferStateId: Enum.Transfers.TransferInternalState.EXPIRED_PREPARED, - payerParticipantCurrencyId: 0 + payerParticipantCurrencyId: 0, + effectedParticipantCurrencyId: 0 }, { transferId: randomUUID(), @@ -81,7 +90,8 @@ Test('Timeout handler', TimeoutHandlerTest => { payerFsp: 'dfsp1', payeeFsp: 'dfsp2', transferStateId: Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT, - payerParticipantCurrencyId: 0 + payerParticipantCurrencyId: 0, + effectedParticipantCurrencyId: 0 }, { transferId: randomUUID(), @@ -89,7 +99,8 @@ Test('Timeout handler', TimeoutHandlerTest => { payerFsp: 'dfsp2', payeeFsp: 'dfsp1', transferStateId: Enum.Transfers.TransferState.COMMITTED, - payerParticipantCurrencyId: 0 + payerParticipantCurrencyId: 0, + effectedParticipantCurrencyId: 0 }, { transferId: randomUUID(), @@ -97,7 +108,8 @@ Test('Timeout handler', TimeoutHandlerTest => { payerFsp: 'dfsp1', payeeFsp: 'dfsp2', transferStateId: Enum.Transfers.TransferInternalState.EXPIRED_PREPARED, - payerParticipantCurrencyId: 0 + payerParticipantCurrencyId: 0, + effectedParticipantCurrencyId: 0 }, { transferId: randomUUID(), @@ -105,7 +117,8 @@ Test('Timeout handler', TimeoutHandlerTest => { payerFsp: 'dfsp1', payeeFsp: 'dfsp2', transferStateId: Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT, - payerParticipantCurrencyId: 0 + payerParticipantCurrencyId: 0, + effectedParticipantCurrencyId: 0 }, { transferId: randomUUID(), @@ -113,20 +126,49 @@ Test('Timeout handler', TimeoutHandlerTest => { payerFsp: 'dfsp2', payeeFsp: 'dfsp1', transferStateId: Enum.Transfers.TransferState.COMMITTED, - payerParticipantCurrencyId: 0 + payerParticipantCurrencyId: 0, + effectedParticipantCurrencyId: 0 } ] + const fxTransferTimeoutListMock = [ + { + commitRequestId: randomUUID(), + initiatingFsp: 'dfsp1', + counterPartyFsp: 'dfsp2', + transferStateId: Enum.Transfers.TransferInternalState.EXPIRED_PREPARED, + payerParticipantCurrencyId: 0, + effectedParticipantCurrencyId: 0 + }, + { + commitRequestId: randomUUID(), + initiatingFsp: 'dfsp1', + counterPartyFsp: 'dfsp2', + transferStateId: Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT, + payerParticipantCurrencyId: 0, + effectedParticipantCurrencyId: 0 + } + ] + const resultMock = { + transferTimeoutList: transferTimeoutListMock, + fxTransferTimeoutList: fxTransferTimeoutListMock + } let expected = { cleanup: 1, + fxCleanup: 1, intervalMin: 10, intervalMax: 20, - result: resultMock + fxIntervalMin: 10, + fxIntervalMax: 20, + ...resultMock } timeoutTest.test('perform timeout', async (test) => { TimeoutService.getTimeoutSegment = sandbox.stub().returns(timeoutSegmentMock) + TimeoutService.getFxTimeoutSegment = sandbox.stub().returns(timeoutSegmentMock) TimeoutService.cleanupTransferTimeout = sandbox.stub().returns(1) + TimeoutService.cleanupFxTransferTimeout = sandbox.stub().returns(1) TimeoutService.getLatestTransferStateChange = sandbox.stub().returns(latestTransferStateChangeMock) + TimeoutService.getLatestFxTransferStateChange = sandbox.stub().returns(latestFxTransferStateChangeMock) TimeoutService.timeoutExpireReserved = sandbox.stub().returns(resultMock) Utility.produceGeneralMessage = sandbox.stub() @@ -140,21 +182,65 @@ Test('Timeout handler', TimeoutHandlerTest => { } } test.deepEqual(result, expected, 'Expected result is returned') - test.equal(Utility.produceGeneralMessage.callCount, 4, 'Four different messages were produced') + test.equal(Utility.produceGeneralMessage.callCount, 6, '6 messages were produced') + test.end() + }) + + timeoutTest.test('perform timeout with single messages', async (test) => { + const resultMock1 = { + transferTimeoutList: transferTimeoutListMock[0], + fxTransferTimeoutList: fxTransferTimeoutListMock[0] + } + + TimeoutService.getTimeoutSegment = sandbox.stub().returns(timeoutSegmentMock) + TimeoutService.getFxTimeoutSegment = sandbox.stub().returns(timeoutSegmentMock) + TimeoutService.cleanupTransferTimeout = sandbox.stub().returns(1) + TimeoutService.cleanupFxTransferTimeout = sandbox.stub().returns(1) + TimeoutService.getLatestTransferStateChange = sandbox.stub().returns(latestTransferStateChangeMock) + TimeoutService.getLatestFxTransferStateChange = sandbox.stub().returns(latestFxTransferStateChangeMock) + TimeoutService.timeoutExpireReserved = sandbox.stub().returns(resultMock1) + Utility.produceGeneralMessage = sandbox.stub() + + const result = await TimeoutHandler.timeout() + const produceGeneralMessageCalls = Utility.produceGeneralMessage.getCalls() + + for (const message of produceGeneralMessageCalls) { + if (message.args[2] === 'position') { + // Check message key matches payer account id + test.equal(message.args[6], '0') + } + } + + const expected1 = { + ...expected, + ...resultMock1 + } + test.deepEqual(result, expected1, 'Expected result is returned') + test.equal(Utility.produceGeneralMessage.callCount, 2, '2 messages were produced') test.end() }) timeoutTest.test('perform timeout when no data is present in segment table', async (test) => { TimeoutService.getTimeoutSegment = sandbox.stub().returns(null) + TimeoutService.getFxTimeoutSegment = sandbox.stub().returns(null) TimeoutService.cleanupTransferTimeout = sandbox.stub().returns(1) + TimeoutService.cleanupFxTransferTimeout = sandbox.stub().returns(1) TimeoutService.getLatestTransferStateChange = sandbox.stub().returns(null) - TimeoutService.timeoutExpireReserved = sandbox.stub().returns(resultMock[0]) + TimeoutService.getLatestFxTransferStateChange = sandbox.stub().returns(null) + const resultMock1 = { + transferTimeoutList: null, + fxTransferTimeoutList: null + } + TimeoutService.timeoutExpireReserved = sandbox.stub().returns(resultMock1) Utility.produceGeneralMessage = sandbox.stub() expected = { cleanup: 1, + fxCleanup: 1, intervalMin: 0, intervalMax: 0, - result: resultMock[0] + fxIntervalMin: 0, + fxIntervalMax: 0, + ...resultMock1 } const result = await TimeoutHandler.timeout() @@ -191,6 +277,31 @@ Test('Timeout handler', TimeoutHandlerTest => { } }) + timeoutTest.test('handle fx message errors', async (test) => { + const resultMock1 = { + transferTimeoutList: [], + fxTransferTimeoutList: fxTransferTimeoutListMock[0] + } + TimeoutService.timeoutExpireReserved = sandbox.stub().returns(resultMock1) + + TimeoutService.getTimeoutSegment = sandbox.stub().returns(null) + TimeoutService.getFxTimeoutSegment = sandbox.stub().returns(timeoutSegmentMock) + TimeoutService.cleanupTransferTimeout = sandbox.stub().returns(1) + TimeoutService.cleanupFxTransferTimeout = sandbox.stub().returns(1) + TimeoutService.getLatestTransferStateChange = sandbox.stub().returns(null) + TimeoutService.getLatestFxTransferStateChange = sandbox.stub().returns(latestFxTransferStateChangeMock) + Utility.produceGeneralMessage = sandbox.stub().throws() + + try { + await TimeoutHandler.timeout() + test.error('Exception expected') + test.end() + } catch (err) { + test.pass('Error thrown') + test.end() + } + }) + timeoutTest.end() }) diff --git a/test/unit/handlers/transfers/FxFulfilService.test.js b/test/unit/handlers/transfers/FxFulfilService.test.js new file mode 100644 index 000000000..b3d69e3d8 --- /dev/null +++ b/test/unit/handlers/transfers/FxFulfilService.test.js @@ -0,0 +1,207 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Eugen Klymniuk + -------------- + **********/ + +/* eslint-disable object-property-newline */ +const Sinon = require('sinon') +const Test = require('tapes')(require('tape')) +const { Db } = require('@mojaloop/database-lib') +const { Enum, Util } = require('@mojaloop/central-services-shared') +const { Consumer, Producer } = require('@mojaloop/central-services-stream').Util + +const Cyril = require('../../../../src/domain/fx/cyril') +const FxFulfilService = require('../../../../src/handlers/transfers/FxFulfilService') +const fspiopErrorFactory = require('../../../../src/shared/fspiopErrorFactory') +const Validator = require('../../../../src/handlers/transfers/validator') +const FxTransferModel = require('../../../../src/models/fxTransfer') +const Config = require('../../../../src/lib/config') +const { ERROR_MESSAGES } = require('../../../../src/shared/constants') +const { logger } = require('../../../../src/shared/logger') +const ProxyCache = require('#src/lib/proxyCache') + +const fixtures = require('../../../fixtures') +const mocks = require('./mocks') +const { checkErrorPayload } = require('#test/util/helpers') + +const { Kafka, Comparators, Hash } = Util +const { Action } = Enum.Events.Event +const { TOPICS } = fixtures + +const log = logger +// const functionality = Type.NOTIFICATION + +Test('FxFulfilService Tests -->', fxFulfilTest => { + let sandbox + let span + let producer + + const createFxFulfilServiceWithTestData = (message) => { + const { + commitRequestId, + payload, + type, + action, + kafkaTopic + } = FxFulfilService.decodeKafkaMessage(message) + + const params = { + message, + kafkaTopic, + span, + decodedPayload: payload, + consumer: Consumer, + producer: Producer + } + const service = new FxFulfilService({ + log, Config, Comparators, Validator, FxTransferModel, Kafka, params + }) + + return { + service, + commitRequestId, payload, type, action + } + } + + fxFulfilTest.beforeEach(test => { + sandbox = Sinon.createSandbox() + producer = sandbox.stub(Producer) + sandbox.stub(Consumer, 'isConsumerAutoCommitEnabled').returns(true) + sandbox.stub(Db) + sandbox.stub(FxTransferModel.fxTransfer) + sandbox.stub(FxTransferModel.duplicateCheck) + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub() + }) + sandbox.stub(Cyril) + Cyril.processFxAbortMessage.returns({ + positionChanges: [{ + participantCurrencyId: 1 + }] + }) + span = mocks.createTracerStub(sandbox).SpanStub + test.end() + }) + + fxFulfilTest.afterEach(test => { + sandbox.restore() + test.end() + }) + + fxFulfilTest.test('getDuplicateCheckResult Method Tests -->', methodTest => { + methodTest.test('should detect duplicate fulfil request [action: fx-commit]', async t => { + const action = Action.FX_COMMIT + const metadata = fixtures.fulfilMetadataDto({ action }) + const message = fixtures.fxFulfilKafkaMessageDto({ metadata }) + const { + service, + commitRequestId, payload + } = createFxFulfilServiceWithTestData(message) + + FxTransferModel.duplicateCheck.getFxTransferFulfilmentDuplicateCheck.resolves({ hash: Hash.generateSha256(payload) }) + FxTransferModel.duplicateCheck.saveFxTransferFulfilmentDuplicateCheck.resolves() + FxTransferModel.duplicateCheck.getFxTransferErrorDuplicateCheck.rejects(new Error('Should not be called')) + FxTransferModel.duplicateCheck.saveFxTransferErrorDuplicateCheck.rejects(new Error('Should not be called')) + + const dupCheckResult = await service.getDuplicateCheckResult({ commitRequestId, payload, action }) + t.ok(dupCheckResult.hasDuplicateId) + t.ok(dupCheckResult.hasDuplicateHash) + t.end() + }) + + methodTest.test('should detect error duplicate fulfil request [action: fx-abort]', async t => { + const action = Action.FX_ABORT + const metadata = fixtures.fulfilMetadataDto({ action }) + const message = fixtures.fxFulfilKafkaMessageDto({ metadata }) + const { + service, + commitRequestId, payload + } = createFxFulfilServiceWithTestData(message) + + FxTransferModel.duplicateCheck.getFxTransferFulfilmentDuplicateCheck.rejects(new Error('Should not be called')) + FxTransferModel.duplicateCheck.saveFxTransferFulfilmentDuplicateCheck.rejects(new Error('Should not be called')) + FxTransferModel.duplicateCheck.getFxTransferErrorDuplicateCheck.resolves({ hash: Hash.generateSha256(payload) }) + FxTransferModel.duplicateCheck.saveFxTransferErrorDuplicateCheck.resolves() + + const dupCheckResult = await service.getDuplicateCheckResult({ commitRequestId, payload, action }) + t.ok(dupCheckResult.hasDuplicateId) + t.ok(dupCheckResult.hasDuplicateHash) + t.end() + }) + + methodTest.end() + }) + + fxFulfilTest.test('validateFulfilment Method Tests -->', methodTest => { + methodTest.test('should pass fulfilment validation', async t => { + const { service } = createFxFulfilServiceWithTestData(fixtures.fxFulfilKafkaMessageDto()) + const transfer = { + ilpCondition: fixtures.CONDITION, + counterPartyFspTargetParticipantCurrencyId: 123 + } + const payload = { fulfilment: fixtures.FULFILMENT } + + const isOk = await service.validateFulfilment(transfer, payload) + t.true(isOk) + t.end() + }) + + methodTest.test('should process wrong fulfilment', async t => { + Db.getKnex.resolves({ + transaction: sandbox.stub + }) + FxTransferModel.fxTransfer.saveFxFulfilResponse.restore() // to call real saveFxFulfilResponse impl. + + const { service } = createFxFulfilServiceWithTestData(fixtures.fxFulfilKafkaMessageDto()) + const transfer = { + ilpCondition: fixtures.CONDITION, + initiatingFspName: fixtures.DFSP1_ID, + counterPartyFspTargetParticipantCurrencyId: 123 + } + const payload = { fulfilment: 'wrongFulfilment' } + + try { + await service.validateFulfilment(transfer, payload) + t.fail('Should throw fxInvalidFulfilment error') + } catch (err) { + t.equal(err.message, ERROR_MESSAGES.fxInvalidFulfilment) + t.ok(producer.produceMessage.calledOnce) + const [messageProtocol, topicConfig] = producer.produceMessage.lastCall.args + t.ok(topicConfig.topicName === TOPICS.transferPosition || topicConfig.topicName === TOPICS.transferPositionBatch) + t.equal(topicConfig.key, String(1)) + t.equal(messageProtocol.from, fixtures.SWITCH_ID) + t.equal(messageProtocol.to, fixtures.DFSP1_ID) + t.equal(messageProtocol.metadata.event.action, Action.FX_ABORT_VALIDATION) + checkErrorPayload(t)(messageProtocol.content.payload, fspiopErrorFactory.fxInvalidFulfilment()) + } + t.end() + }) + + methodTest.end() + }) + + fxFulfilTest.end() +}) diff --git a/test/unit/handlers/transfers/fxFulfilHandler.test.js b/test/unit/handlers/transfers/fxFulfilHandler.test.js new file mode 100644 index 000000000..de7faf44c --- /dev/null +++ b/test/unit/handlers/transfers/fxFulfilHandler.test.js @@ -0,0 +1,532 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Gates Foundation + - Name Surname + + * Georgi Georgiev + * Rajiv Mothilal + * Miguel de Barros + * Deon Botha + * Shashikant Hirugade + + -------------- + ******/ +'use strict' + +const Sinon = require('sinon') +const Test = require('tapes')(require('tape')) +const Proxyquire = require('proxyquire') + +const { Util, Enum } = require('@mojaloop/central-services-shared') +const { Consumer, Producer } = require('@mojaloop/central-services-stream').Util + +const FxFulfilService = require('../../../../src/handlers/transfers/FxFulfilService') +const ParticipantPositionChangesModel = require('../../../../src/models/position/participantPositionChanges') +const fxTransferModel = require('../../../../src/models/fxTransfer') +const TransferFacade = require('../../../../src/models/transfer/facade') +const Validator = require('../../../../src/handlers/transfers/validator') +const TransferObjectTransform = require('../../../../src/domain/transfer/transform') +const fspiopErrorFactory = require('../../../../src/shared/fspiopErrorFactory') +const { logger } = require('../../../../src/shared/logger') + +const { checkErrorPayload } = require('../../../util/helpers') +const fixtures = require('../../../fixtures') +const mocks = require('./mocks') +const ProxyCache = require('#src/lib/proxyCache') + +const { Kafka, Comparators } = Util +const { Action, Type } = Enum.Events.Event +const { TransferState } = Enum.Transfers +const { TOPICS } = fixtures + +let transferHandlers + +Test('FX Transfer Fulfil handler -->', fxFulfilTest => { + let sandbox + let producer + + fxFulfilTest.beforeEach(test => { + sandbox = Sinon.createSandbox() + producer = sandbox.stub(Producer) + + const { TracerStub } = mocks.createTracerStub(sandbox) + const EventSdkStub = { + Tracer: TracerStub + } + transferHandlers = Proxyquire('../../../../src/handlers/transfers/handler', { + '@mojaloop/event-sdk': EventSdkStub + }) + + sandbox.stub(Comparators) + sandbox.stub(Validator) + sandbox.stub(fxTransferModel.fxTransfer) + sandbox.stub(fxTransferModel.watchList) + sandbox.stub(ParticipantPositionChangesModel) + sandbox.stub(TransferFacade) + sandbox.stub(TransferObjectTransform, 'toFulfil') + sandbox.stub(Consumer, 'getConsumer').returns({ + commitMessageSync: async () => true + }) + sandbox.stub(Consumer, 'isConsumerAutoCommitEnabled').returns(false) + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub() + }) + test.end() + }) + + fxFulfilTest.afterEach(test => { + sandbox.restore() + test.end() + }) + + fxFulfilTest.test('should return true in case of wrong message format', async (test) => { + const logError = sandbox.stub(logger, 'error') + const result = await transferHandlers.fulfil(null, {}) + test.ok(result) + test.ok(logError.calledOnce) + test.ok(logError.lastCall.firstArg.includes("Cannot read properties of undefined (reading 'metadata')")) + test.end() + }) + + fxFulfilTest.test('commitRequestId not found -->', async (test) => { + const from = fixtures.DFSP1_ID + const to = fixtures.DFSP2_ID + const notFoundError = fspiopErrorFactory.fxTransferNotFound() + let message + + test.beforeEach((t) => { + message = fixtures.fxFulfilKafkaMessageDto({ + from, + to, + metadata: fixtures.fulfilMetadataDto({ action: Action.FX_RESERVE }) + }) + fxTransferModel.fxTransfer.getByIdLight.resolves(null) + t.end() + }) + + test.test('should call Kafka.proceed with proper fspiopError', async (t) => { + sandbox.stub(Kafka, 'proceed') + const result = await transferHandlers.fulfil(null, message) + + t.ok(result) + t.ok(Kafka.proceed.calledOnce) + const [, params, opts] = Kafka.proceed.lastCall.args + t.equal(params.message, message) + t.equal(params.kafkaTopic, message.topic) + t.deepEqual(opts.eventDetail, { + functionality: 'notification', + action: Action.FX_RESERVE + }) + t.true(opts.fromSwitch) + checkErrorPayload(t)(opts.fspiopError, notFoundError) + t.end() + }) + + test.test('should produce proper kafka error message', async (t) => { + const result = await transferHandlers.fulfil(null, message) + t.ok(result) + t.ok(producer.produceMessage.calledOnce) + const [messageProtocol, topicConfig] = producer.produceMessage.lastCall.args + t.equal(topicConfig.topicName, TOPICS.notificationEvent) // check if we have appropriate task/test for FX notification handler + t.equal(messageProtocol.from, fixtures.SWITCH_ID) + t.equal(messageProtocol.to, from) + t.equal(messageProtocol.metadata, message.value.metadata) + t.equal(messageProtocol.id, message.value.id) + t.equal(messageProtocol.content.uriParams, message.value.content.uriParams) + checkErrorPayload(t)(messageProtocol.content.payload, notFoundError) + t.end() + }) + + test.end() + }) + + fxFulfilTest.test('should throw fxValidation error if source-header does not match counterPartyFsp-field from DB', async (t) => { + const initiatingFsp = fixtures.DFSP1_ID + const counterPartyFsp = fixtures.FXP_ID + const fxTransferPayload = fixtures.fxTransferDto({ initiatingFsp, counterPartyFsp }) + const fxTransferDetailsFromDb = fixtures.fxtGetAllDetailsByCommitRequestIdDto(fxTransferPayload) + + fxTransferModel.fxTransfer.getAllDetailsByCommitRequestId.resolves(fxTransferDetailsFromDb) + fxTransferModel.fxTransfer.saveFxFulfilResponse.resolves({}) + fxTransferModel.fxTransfer.getByCommitRequestId.resolves(fxTransferDetailsFromDb) + fxTransferModel.fxTransfer.getByDeterminingTransferId.resolves([]) + fxTransferModel.fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.resolves(fxTransferDetailsFromDb) + const mockPositionChanges = [ + { participantCurrencyId: 1, value: 100 } + ] + ParticipantPositionChangesModel.getReservedPositionChangesByCommitRequestId.resolves([]) + ParticipantPositionChangesModel.getReservedPositionChangesByTransferId.resolves(mockPositionChanges) + TransferFacade.getById.resolves({ payerfsp: 'testpayer' }) + + const metadata = fixtures.fulfilMetadataDto({ action: Action.FX_RESERVE }) + const content = fixtures.fulfilContentDto({ + from: 'wrongCounterPartyId', + to: initiatingFsp + }) + const kafkaMessage = fixtures.fxFulfilKafkaMessageDto({ content, metadata }) + const result = await transferHandlers.fulfil(null, kafkaMessage) + + t.ok(result) + t.ok(producer.produceMessage.calledOnce) + const [messageProtocol, topicConfig] = producer.produceMessage.lastCall.args + t.equal(messageProtocol.from, fixtures.SWITCH_ID) + t.equal(messageProtocol.metadata.event.action, Action.FX_ABORT_VALIDATION) + checkErrorPayload(t)(messageProtocol.content.payload, fspiopErrorFactory.fxHeaderSourceValidationError()) + t.ok(topicConfig.topicName === TOPICS.transferPosition || topicConfig.topicName === TOPICS.transferPositionBatch) + t.end() + }) + + fxFulfilTest.test('should detect invalid event type', async (t) => { + const type = 'wrongType' + const action = Action.FX_RESERVE + const metadata = fixtures.fulfilMetadataDto({ type, action }) + const content = fixtures.fulfilContentDto({ + to: fixtures.DFSP1_ID, + from: fixtures.FXP_ID + }) + const kafkaMessage = fixtures.fxFulfilKafkaMessageDto({ metadata, content }) + const fxTransferDetails = fixtures.fxtGetAllDetailsByCommitRequestIdDto() + fxTransferModel.fxTransfer.getAllDetailsByCommitRequestId.resolves(fxTransferDetails) + Comparators.duplicateCheckComparator.resolves({ + hasDuplicateId: false, + hasDuplicateHash: false + }) + + const result = await transferHandlers.fulfil(null, kafkaMessage) + + t.ok(result) + t.ok(producer.produceMessage.calledOnce) + const [messageProtocol, topicConfig] = producer.produceMessage.lastCall.args + t.equal(messageProtocol.metadata.event.action, action) + checkErrorPayload(t)(messageProtocol.content.payload, fspiopErrorFactory.invalidEventType(type)) + t.equal(topicConfig.topicName, TOPICS.notificationEvent) + t.end() + }) + + fxFulfilTest.test('should process case with invalid fulfilment', async (t) => { + const fxTransferDetails = fixtures.fxtGetAllDetailsByCommitRequestIdDto() + sandbox.stub(FxFulfilService.prototype, 'getFxTransferDetails').resolves(fxTransferDetails) + sandbox.stub(FxFulfilService.prototype, 'validateHeaders').resolves() + sandbox.stub(FxFulfilService.prototype, 'validateEventType').resolves() + const initiatingFsp = fixtures.DFSP1_ID + const counterPartyFsp = fixtures.FXP_ID + const fxTransferPayload = fixtures.fxTransferDto({ initiatingFsp, counterPartyFsp }) + const fxTransferDetailsFromDb = fixtures.fxtGetAllDetailsByCommitRequestIdDto(fxTransferPayload) + fxTransferModel.fxTransfer.getByCommitRequestId.resolves(fxTransferDetailsFromDb) + fxTransferModel.fxTransfer.getByDeterminingTransferId.resolves([]) + fxTransferModel.fxTransfer.getAllDetailsByCommitRequestIdForProxiedFxTransfer.resolves(fxTransferDetailsFromDb) + const mockPositionChanges = [ + { participantCurrencyId: 1, value: 100 } + ] + ParticipantPositionChangesModel.getReservedPositionChangesByCommitRequestId.resolves([]) + ParticipantPositionChangesModel.getReservedPositionChangesByTransferId.resolves(mockPositionChanges) + TransferFacade.getById.resolves({ payerfsp: 'testpayer' }) + + Comparators.duplicateCheckComparator.resolves({ + hasDuplicateId: false, + hasDuplicateHash: false + }) + const metadata = fixtures.fulfilMetadataDto({ action: Action.FX_RESERVE }) + const kafkaMessage = fixtures.fxFulfilKafkaMessageDto({ metadata }) + Validator.validateFulfilCondition.returns(false) + + const result = await transferHandlers.fulfil(null, kafkaMessage) + + t.ok(result) + t.ok(producer.produceMessage.calledOnce) + const [messageProtocol, topicConfig] = producer.produceMessage.lastCall.args + t.equal(messageProtocol.metadata.event.action, Action.FX_ABORT_VALIDATION) + checkErrorPayload(t)(messageProtocol.content.payload, fspiopErrorFactory.fxInvalidFulfilment()) + t.ok(topicConfig.topicName === TOPICS.transferPosition || topicConfig.topicName === TOPICS.transferPositionBatch) + t.equal(topicConfig.key, String(1)) + t.end() + }) + + fxFulfilTest.test('should detect invalid fxTransfer state', async (t) => { + const transferState = 'wrongState' + sandbox.stub(FxFulfilService.prototype, 'getFxTransferDetails').resolves({ transferState }) + sandbox.stub(FxFulfilService.prototype, 'validateHeaders').resolves() + sandbox.stub(FxFulfilService.prototype, 'validateEventType').resolves() + sandbox.stub(FxFulfilService.prototype, 'validateFulfilment').resolves() + Comparators.duplicateCheckComparator.resolves({ + hasDuplicateId: false, + hasDuplicateHash: false + }) + Validator.validateFulfilCondition.returns(true) + const metadata = fixtures.fulfilMetadataDto({ action: Action.FX_RESERVE }) + const kafkaMessage = fixtures.fxFulfilKafkaMessageDto({ metadata }) + + const result = await transferHandlers.fulfil(null, kafkaMessage) + + t.ok(result) + t.ok(producer.produceMessage.calledOnce) + const [messageProtocol, topicConfig] = producer.produceMessage.lastCall.args + t.equal(messageProtocol.from, fixtures.SWITCH_ID) + t.equal(messageProtocol.metadata.event.action, Action.FX_RESERVE) + checkErrorPayload(t)(messageProtocol.content.payload, fspiopErrorFactory.fxTransferNonReservedState()) + t.equal(topicConfig.topicName, TOPICS.notificationEvent) + t.end() + }) + + fxFulfilTest.test('should detect expired fxTransfer', async (t) => { + const expirationDate = new Date(Date.now() - 1000 ** 3) + sandbox.stub(FxFulfilService.prototype, 'getFxTransferDetails').resolves({ expirationDate }) + sandbox.stub(FxFulfilService.prototype, 'validateHeaders').resolves() + sandbox.stub(FxFulfilService.prototype, 'validateEventType').resolves() + sandbox.stub(FxFulfilService.prototype, 'validateFulfilment').resolves() + sandbox.stub(FxFulfilService.prototype, 'validateTransferState').resolves() + Comparators.duplicateCheckComparator.resolves({ + hasDuplicateId: false, + hasDuplicateHash: false + }) + Validator.validateFulfilCondition.returns(true) + const metadata = fixtures.fulfilMetadataDto({ action: Action.FX_RESERVE }) + const kafkaMessage = fixtures.fxFulfilKafkaMessageDto({ metadata }) + + const result = await transferHandlers.fulfil(null, kafkaMessage) + + t.ok(result) + t.ok(producer.produceMessage.calledOnce) + const [messageProtocol, topicConfig] = producer.produceMessage.lastCall.args + t.equal(messageProtocol.from, fixtures.SWITCH_ID) + t.equal(messageProtocol.metadata.event.action, Action.FX_RESERVE) + checkErrorPayload(t)(messageProtocol.content.payload, fspiopErrorFactory.fxTransferExpired()) + t.equal(topicConfig.topicName, TOPICS.notificationEvent) + t.end() + }) + + fxFulfilTest.test('should skip message with fxReject action', async (t) => { + const fxTransferDetails = fixtures.fxtGetAllDetailsByCommitRequestIdDto() + sandbox.stub(FxFulfilService.prototype, 'getFxTransferDetails').resolves(fxTransferDetails) + sandbox.stub(FxFulfilService.prototype, 'validateHeaders').resolves() + sandbox.stub(FxFulfilService.prototype, 'validateEventType').resolves() + sandbox.stub(FxFulfilService.prototype, 'validateFulfilment').resolves() + sandbox.stub(FxFulfilService.prototype, 'validateTransferState').resolves() + sandbox.stub(FxFulfilService.prototype, 'validateExpirationDate').resolves() + Comparators.duplicateCheckComparator.resolves({ + hasDuplicateId: false, + hasDuplicateHash: false + }) + Validator.validateFulfilCondition.returns(true) + const metadata = fixtures.fulfilMetadataDto({ action: Action.FX_REJECT }) + const kafkaMessage = fixtures.fxFulfilKafkaMessageDto({ metadata }) + + const result = await transferHandlers.fulfil(null, kafkaMessage) + + t.ok(result) + t.ok(producer.produceMessage.notCalled) + t.end() + }) + + fxFulfilTest.test('should process error callback with fxAbort action', async (t) => { + const fxTransferDetails = fixtures.fxtGetAllDetailsByCommitRequestIdDto() + sandbox.stub(FxFulfilService.prototype, 'getFxTransferDetails').resolves(fxTransferDetails) + sandbox.stub(FxFulfilService.prototype, 'validateHeaders').resolves() + sandbox.stub(FxFulfilService.prototype, 'validateEventType').resolves() + sandbox.stub(FxFulfilService.prototype, 'validateFulfilment').resolves() + sandbox.stub(FxFulfilService.prototype, 'validateTransferState').resolves() + sandbox.stub(FxFulfilService.prototype, 'validateExpirationDate').resolves() + sandbox.stub(FxFulfilService.prototype, 'processFxAbort').resolves() + + Comparators.duplicateCheckComparator.resolves({ + hasDuplicateId: false, + hasDuplicateHash: false + }) + Validator.validateFulfilCondition.returns(true) + const errorInfo = fixtures.errorInfoDto() + const content = fixtures.fulfilContentDto({ payload: errorInfo }) + const metadata = fixtures.fulfilMetadataDto({ action: Action.FX_ABORT }) + const kafkaMessage = fixtures.fxFulfilKafkaMessageDto({ content, metadata }) + + const result = await transferHandlers.fulfil(null, kafkaMessage) + + t.ok(result) + t.ok(FxFulfilService.prototype.processFxAbort.calledOnce) + t.end() + }) + + fxFulfilTest.test('should process fxFulfil callback - just skip message if no commitRequestId in watchList', async (t) => { + // todo: clarify this behaviuor + const fxTransferDetails = fixtures.fxtGetAllDetailsByCommitRequestIdDto() + sandbox.stub(FxFulfilService.prototype, 'getFxTransferDetails').resolves(fxTransferDetails) + sandbox.stub(FxFulfilService.prototype, 'validateHeaders').resolves() + sandbox.stub(FxFulfilService.prototype, 'validateEventType').resolves() + sandbox.stub(FxFulfilService.prototype, 'validateFulfilment').resolves() + sandbox.stub(FxFulfilService.prototype, 'validateTransferState').resolves() + sandbox.stub(FxFulfilService.prototype, 'validateExpirationDate').resolves() + Comparators.duplicateCheckComparator.resolves({ + hasDuplicateId: false, + hasDuplicateHash: false + }) + Validator.validateFulfilCondition.returns(true) + fxTransferModel.watchList.getItemInWatchListByCommitRequestId.resolves(null) + const metadata = fixtures.fulfilMetadataDto({ action: Action.FX_COMMIT }) + const kafkaMessage = fixtures.fxFulfilKafkaMessageDto({ metadata }) + + const result = await transferHandlers.fulfil(null, kafkaMessage) + + t.ok(result) + t.ok(producer.produceMessage.notCalled) + t.end() + }) + + fxFulfilTest.test('should process fxFulfil callback (commitRequestId is in watchList)', async (t) => { + const fxTransferDetails = fixtures.fxtGetAllDetailsByCommitRequestIdDto() + sandbox.stub(FxFulfilService.prototype, 'getFxTransferDetails').resolves(fxTransferDetails) + sandbox.stub(FxFulfilService.prototype, 'validateHeaders').resolves() + sandbox.stub(FxFulfilService.prototype, 'validateEventType').resolves() + sandbox.stub(FxFulfilService.prototype, 'validateFulfilment').resolves() + sandbox.stub(FxFulfilService.prototype, 'validateTransferState').resolves() + sandbox.stub(FxFulfilService.prototype, 'validateExpirationDate').resolves() + sandbox.stub(FxFulfilService.prototype, 'getDuplicateCheckResult').resolves({ + hasDuplicateId: false, + hasDuplicateHash: false + }) + Comparators.duplicateCheckComparator.resolves({ + hasDuplicateId: false, + hasDuplicateHash: false + }) + Validator.validateFulfilCondition.returns(true) + fxTransferModel.fxTransfer.getAllDetailsByCommitRequestId.resolves(fxTransferDetails) + fxTransferModel.watchList.getItemInWatchListByCommitRequestId.resolves(fixtures.watchListItemDto()) + + const action = Action.FX_RESERVE + const metadata = fixtures.fulfilMetadataDto({ action }) + const kafkaMessage = fixtures.fxFulfilKafkaMessageDto({ metadata }) + + const result = await transferHandlers.fulfil(null, kafkaMessage) + + t.ok(result) + t.ok(producer.produceMessage.calledOnce) + const [messageProtocol, topicConfig] = producer.produceMessage.lastCall.args + t.equal(messageProtocol.metadata.event.action, action) + t.deepEqual(messageProtocol.metadata.event.state, fixtures.metadataEventStateDto()) + t.deepEqual(messageProtocol.content, kafkaMessage.value.content) + // t.equal(topicConfig.topicName, TOPICS.transferPositionBatch) + // TODO: Need to check if the following assertion is correct + t.equal(topicConfig.topicName, TOPICS.transferPosition) + t.equal(topicConfig.key, String(fxTransferDetails.counterPartyFspSourceParticipantCurrencyId)) + t.end() + }) + + fxFulfilTest.test('should detect that duplicate hash was modified', async (t) => { + Comparators.duplicateCheckComparator.resolves({ + hasDuplicateId: true, + hasDuplicateHash: false + }) + sandbox.stub(FxFulfilService.prototype, 'getFxTransferDetails').resolves({}) + sandbox.stub(FxFulfilService.prototype, 'validateHeaders').resolves() + + const action = Action.FX_COMMIT + const metadata = fixtures.fulfilMetadataDto({ action }) + const kafkaMessage = fixtures.fxFulfilKafkaMessageDto({ metadata }) + + const result = await transferHandlers.fulfil(null, kafkaMessage) + + t.ok(result) + t.ok(producer.produceMessage.calledOnce) + const [messageProtocol, topicConfig] = producer.produceMessage.lastCall.args + t.equal(messageProtocol.from, fixtures.SWITCH_ID) + t.equal(messageProtocol.metadata.event.action, Action.FX_FULFIL_DUPLICATE) + checkErrorPayload(t)(messageProtocol.content.payload, fspiopErrorFactory.noFxDuplicateHash()) + t.equal(topicConfig.topicName, TOPICS.notificationEvent) + t.end() + }) + + fxFulfilTest.test('should process duplication if fxTransfer state is COMMITTED', async (t) => { + Comparators.duplicateCheckComparator.resolves({ + hasDuplicateId: true, + hasDuplicateHash: true + }) + sandbox.stub(FxFulfilService.prototype, 'getFxTransferDetails').resolves({ transferStateEnumeration: TransferState.COMMITTED }) + sandbox.stub(FxFulfilService.prototype, 'validateHeaders').resolves() + + const action = Action.FX_COMMIT + const metadata = fixtures.fulfilMetadataDto({ action }) + const kafkaMessage = fixtures.fxFulfilKafkaMessageDto({ metadata }) + + const result = await transferHandlers.fulfil(null, kafkaMessage) + + t.ok(result) + t.ok(producer.produceMessage.calledOnce) + const [messageProtocol, topicConfig] = producer.produceMessage.lastCall.args + t.equal(messageProtocol.from, fixtures.SWITCH_ID) + t.equal(messageProtocol.content.payload, undefined) + t.equal(messageProtocol.metadata.event.action, Action.FX_FULFIL_DUPLICATE) + t.equal(topicConfig.topicName, TOPICS.notificationEvent) + t.end() + }) + + fxFulfilTest.test('should just skip processing duplication if fxTransfer state is RESERVED/RECEIVED', async (t) => { + Comparators.duplicateCheckComparator.resolves({ + hasDuplicateId: true, + hasDuplicateHash: true + }) + sandbox.stub(FxFulfilService.prototype, 'getFxTransferDetails').resolves({ transferStateEnumeration: TransferState.RESERVED }) + sandbox.stub(FxFulfilService.prototype, 'validateHeaders').resolves() + + const action = Action.FX_RESERVE + const metadata = fixtures.fulfilMetadataDto({ action }) + const kafkaMessage = fixtures.fxFulfilKafkaMessageDto({ metadata }) + + const result = await transferHandlers.fulfil(null, kafkaMessage) + + t.ok(result) + t.ok(producer.produceMessage.notCalled) + // todo: clarify, if it's expected behaviour + t.end() + }) + + fxFulfilTest.test('should process duplication if fxTransfer has invalid state', async (t) => { + Comparators.duplicateCheckComparator.resolves({ + hasDuplicateId: true, + hasDuplicateHash: true + }) + const transferStateEnumeration = TransferState.SETTLED + sandbox.stub(FxFulfilService.prototype, 'getFxTransferDetails').resolves({ transferStateEnumeration }) + sandbox.stub(FxFulfilService.prototype, 'validateHeaders').resolves() + + const action = Action.FX_COMMIT + const type = Type.FULFIL + const metadata = fixtures.fulfilMetadataDto({ action, type }) + const kafkaMessage = fixtures.fxFulfilKafkaMessageDto({ metadata }) + + const result = await transferHandlers.fulfil(null, kafkaMessage) + + t.ok(result) + t.ok(producer.produceMessage.calledOnce) + const [messageProtocol, topicConfig] = producer.produceMessage.lastCall.args + t.equal(messageProtocol.from, fixtures.SWITCH_ID) + t.equal(messageProtocol.metadata.event.action, Action.FX_RESERVE) + const fspiopError = fspiopErrorFactory.invalidFxTransferState({ + transferStateEnum: transferStateEnumeration, + type, + action + }) + checkErrorPayload(t)(messageProtocol.content.payload, fspiopError) + t.equal(topicConfig.topicName, TOPICS.notificationEvent) + t.end() + }) + + fxFulfilTest.end() +}) diff --git a/test/unit/handlers/transfers/handler.test.js b/test/unit/handlers/transfers/handler.test.js index cd8677adb..5c86e2bee 100644 --- a/test/unit/handlers/transfers/handler.test.js +++ b/test/unit/handlers/transfers/handler.test.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -32,27 +32,33 @@ ******/ 'use strict' +const { randomUUID } = require('crypto') const Sinon = require('sinon') const Test = require('tapes')(require('tape')) +const Proxyquire = require('proxyquire') + const Kafka = require('@mojaloop/central-services-shared').Util.Kafka -const Validator = require('../../../../src/handlers/transfers/validator') -const TransferService = require('../../../../src/domain/transfer') -const TransferObjectTransform = require('../../../../src/domain/transfer/transform') const MainUtil = require('@mojaloop/central-services-shared').Util const Time = require('@mojaloop/central-services-shared').Util.Time -const ilp = require('../../../../src/models/transfer/ilpPacket') -const { randomUUID } = require('crypto') -const KafkaConsumer = require('@mojaloop/central-services-stream').Kafka.Consumer -const Consumer = require('@mojaloop/central-services-stream').Util.Consumer const Enum = require('@mojaloop/central-services-shared').Enum +const Comparators = require('@mojaloop/central-services-shared').Util.Comparators +const KafkaConsumer = require('@mojaloop/central-services-stream').Kafka.Consumer +const { Consumer } = require('@mojaloop/central-services-stream').Util const EventSdk = require('@mojaloop/event-sdk') + +const Validator = require('../../../../src/handlers/transfers/validator') +const TransferService = require('../../../../src/domain/transfer') +const Participant = require('../../../../src/domain/participant') +const Cyril = require('../../../../src/domain/fx/cyril') +const TransferObjectTransform = require('../../../../src/domain/transfer/transform') +const ilp = require('../../../../src/models/transfer/ilpPacket') +const ProxyCache = require('#src/lib/proxyCache') + +const { getMessagePayloadOrThrow } = require('../../../util/helpers') +const mocks = require('./mocks') + const TransferState = Enum.Transfers.TransferState const TransferInternalState = Enum.Transfers.TransferInternalState -const Comparators = require('@mojaloop/central-services-shared').Util.Comparators -const Proxyquire = require('proxyquire') -const { getMessagePayloadOrThrow } = require('../../../util/helpers') -const Participant = require('../../../../src/domain/participant') -const Config = require('../../../../src/lib/config') const transfer = { transferId: 'b51ec534-ee48-4575-b6a9-ead2955b8999', @@ -235,601 +241,96 @@ const config = { } } -const configAutocommit = { - options: { - mode: 2, - batchSize: 1, - pollFrequency: 10, - recursiveTimeout: 100, - messageCharset: 'utf8', - messageAsJSON: true, - sync: true, - consumeTimeout: 1000 - }, - rdkafkaConf: { - 'client.id': 'kafka-test', - debug: 'all', - 'group.id': 'central-ledger-kafka', - 'metadata.broker.list': 'localhost:9092', - 'enable.auto.commit': true - } -} - const command = () => { } -const error = () => { - throw new Error() -} - let SpanStub let allTransferHandlers +let prepare +let createRemittanceEntity -const participants = ['testName1', 'testName2'] - -Test('Transfer handler', transferHandlerTest => { - let sandbox - - transferHandlerTest.beforeEach(test => { - sandbox = Sinon.createSandbox() - SpanStub = { - audit: sandbox.stub().callsFake(), - error: sandbox.stub().callsFake(), - finish: sandbox.stub().callsFake(), - debug: sandbox.stub().callsFake(), - info: sandbox.stub().callsFake(), - getChild: sandbox.stub().returns(SpanStub), - setTags: sandbox.stub().callsFake() - } - - const TracerStub = { - extractContextFromMessage: sandbox.stub().callsFake(() => { - return {} - }), - createChildSpanFromContext: sandbox.stub().callsFake(() => { - return SpanStub - }) - } - - const EventSdkStub = { - Tracer: TracerStub - } - - allTransferHandlers = Proxyquire('../../../../src/handlers/transfers/handler', { - '@mojaloop/event-sdk': EventSdkStub - }) - - sandbox.stub(KafkaConsumer.prototype, 'constructor').returns(Promise.resolve()) - sandbox.stub(KafkaConsumer.prototype, 'connect').returns(Promise.resolve()) - sandbox.stub(KafkaConsumer.prototype, 'consume').returns(Promise.resolve()) - sandbox.stub(KafkaConsumer.prototype, 'commitMessageSync').returns(Promise.resolve()) - sandbox.stub(Comparators) - sandbox.stub(Validator) - sandbox.stub(TransferService) - sandbox.stub(Consumer, 'getConsumer').returns({ - commitMessageSync: async function () { - return true - } - }) - sandbox.stub(Consumer, 'isConsumerAutoCommitEnabled').returns(false) - sandbox.stub(ilp) - sandbox.stub(Kafka) - sandbox.stub(MainUtil.StreamingProtocol) - sandbox.stub(TransferObjectTransform, 'toTransfer') - sandbox.stub(TransferObjectTransform, 'toFulfil') - sandbox.stub(Participant, 'getAccountByNameAndCurrency').callsFake((...args) => { - if (args[0] === transfer.payerFsp) { - return { - participantCurrencyId: 0 - } - } - if (args[0] === transfer.payeeFsp) { - return { - participantCurrencyId: 1 - } - } - }) - Kafka.produceGeneralMessage.returns(Promise.resolve()) - test.end() - }) - - transferHandlerTest.afterEach(test => { - sandbox.restore() - test.end() - }) - - transferHandlerTest.test('prepare should', prepareTest => { - prepareTest.test('persist transfer to database when messages is an array', async (test) => { - const localMessages = MainUtil.clone(messages) - // here copy - await Consumer.createHandler(topicName, config, command) - Kafka.transformAccountToTopicName.returns(topicName) - Kafka.proceed.returns(true) - Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: false, - hasDuplicateHash: false - })) - const result = await allTransferHandlers.prepare(null, localMessages) - const kafkaCallOne = Kafka.proceed.getCall(0) - test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.POSITION) - test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.PREPARE) - test.equal(kafkaCallOne.args[2].messageKey, '0') - test.equal(kafkaCallOne.args[2].topicNameOverride, null) - test.equal(result, true) - test.end() - }) - - prepareTest.test('use topic name override if specified in config', async (test) => { - Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP.POSITION.PREPARE = 'topic-test-override' - const localMessages = MainUtil.clone(messages) - // here copy - await Consumer.createHandler(topicName, config, command) - Kafka.transformAccountToTopicName.returns(topicName) - Kafka.proceed.returns(true) - Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: false, - hasDuplicateHash: false - })) - const result = await allTransferHandlers.prepare(null, localMessages) - const kafkaCallOne = Kafka.proceed.getCall(0) - test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.POSITION) - test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.PREPARE) - test.equal(kafkaCallOne.args[2].messageKey, '0') - test.equal(kafkaCallOne.args[2].topicNameOverride, 'topic-test-override') - test.equal(result, true) - delete Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP.POSITION.PREPARE - test.end() - }) - - prepareTest.test('persist transfer to database when messages is an array - consumer throws error', async (test) => { - const localMessages = MainUtil.clone(messages) - await Consumer.createHandler(topicName, config, command) - Consumer.getConsumer.throws(new Error()) - Kafka.transformAccountToTopicName.returns(topicName) - Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) - TransferService.prepare.returns(Promise.resolve(true)) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: false, - hasDuplicateHash: false - })) - const result = await allTransferHandlers.prepare(null, localMessages) - const kafkaCallOne = Kafka.proceed.getCall(0) - test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.POSITION) - test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.PREPARE) - test.equal(kafkaCallOne.args[2].messageKey, '0') - test.equal(result, true) - test.end() - }) - - prepareTest.test('send callback when duplicate found but without transferState', async (test) => { - const localMessages = MainUtil.clone(messages) - await Consumer.createHandler(topicName, config, command) - Kafka.transformAccountToTopicName.returns(topicName) - Kafka.proceed.returns(true) - Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) - TransferService.getByIdLight.returns(Promise.resolve(null)) - TransferService.prepare.returns(Promise.resolve(true)) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: true, - hasDuplicateHash: true - })) - TransferService.getTransferStateChange.withArgs(transfer.transferId).returns(Promise.resolve(null)) - const result = await allTransferHandlers.prepare(null, localMessages) - test.equal(result, true) - test.end() - }) - - prepareTest.test('send callback when duplicate found but without transferState - autocommit is enabled', async (test) => { - const localMessages = MainUtil.clone(messages) - await Consumer.createHandler(topicName, config, command) - Consumer.isConsumerAutoCommitEnabled.returns(true) - Kafka.transformAccountToTopicName.returns(topicName) - Kafka.proceed.returns(true) - Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) - TransferService.getByIdLight.returns(Promise.resolve(null)) - TransferService.prepare.returns(Promise.resolve(true)) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: true, - hasDuplicateHash: true - })) - TransferService.getTransferStateChange.withArgs(transfer.transferId).returns(Promise.resolve(null)) - const result = await allTransferHandlers.prepare(null, localMessages) - test.equal(result, true) - test.end() - }) - - prepareTest.test('send callback when duplicate found but without transferState - kafka autocommit enabled', async (test) => { - const localMessages = MainUtil.clone(messages) - await Consumer.createHandler(topicName, configAutocommit, command) - Kafka.transformAccountToTopicName.returns(topicName) - Kafka.proceed.returns(true) - Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) - TransferService.getByIdLight.returns(Promise.resolve(null)) - TransferService.prepare.returns(Promise.resolve(true)) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: true, - hasDuplicateHash: true - })) - TransferService.getTransferStateChange.withArgs(transfer.transferId).returns(Promise.resolve(null)) - const result = await allTransferHandlers.prepare(null, localMessages) - test.equal(result, true) - test.end() - }) - - prepareTest.test('send callback when duplicate found and transferState is COMMITTED', async (test) => { - const localMessages = MainUtil.clone(messages) - await Consumer.createHandler(topicName, config, command) - Kafka.transformAccountToTopicName.returns(topicName) - Kafka.proceed.returns(true) - Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) - TransferService.prepare.returns(Promise.resolve(true)) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: true, - hasDuplicateHash: true - })) - TransferService.getByIdLight.withArgs(transfer.transferId).returns(Promise.resolve(transferReturn)) - TransferObjectTransform.toTransfer.withArgs(transferReturn).returns(transfer) - - const result = await allTransferHandlers.prepare(null, localMessages) - test.equal(result, true) - test.end() - }) - - prepareTest.test('send callback when duplicate found and transferState is ABORTED_REJECTED', async (test) => { - const localMessages = MainUtil.clone(messages) - await Consumer.createHandler(topicName, config, command) - Kafka.transformAccountToTopicName.returns(topicName) - Kafka.proceed.returns(true) - Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) - TransferService.prepare.returns(Promise.resolve(true)) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: true, - hasDuplicateHash: true - })) - TransferService.getTransferStateChange.withArgs(transfer.transferId).returns(Promise.resolve({ enumeration: 'ABORTED' })) - TransferService.getById.withArgs(transfer.transferId).returns(Promise.resolve(transferReturn)) - - TransferObjectTransform.toFulfil.withArgs(transferReturn).returns(fulfil) - - const result = await allTransferHandlers.prepare(null, localMessages) - test.equal(result, true) - test.end() - }) - - prepareTest.test('do nothing when duplicate found and transferState is RECEIVED', async (test) => { - const localMessages = MainUtil.clone(messages) - await Consumer.createHandler(topicName, config, command) - Kafka.transformAccountToTopicName.returns(topicName) - Kafka.proceed.returns(true) - Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) - TransferService.prepare.returns(Promise.resolve(true)) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: true, - hasDuplicateHash: true - })) - TransferService.getTransferStateChange.withArgs(transfer.transferId).returns(Promise.resolve({ enumeration: 'RECEIVED' })) - - const result = await allTransferHandlers.prepare(null, localMessages) - test.equal(result, true) - test.end() - }) - - prepareTest.test('do nothing when duplicate found and transferState is RECEIVED', async (test) => { - const localMessages = MainUtil.clone(messages) - await Consumer.createHandler(topicName, config, command) - Kafka.transformAccountToTopicName.returns(topicName) - Kafka.proceed.returns(true) - Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) - TransferService.prepare.returns(Promise.resolve(true)) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: true, - hasDuplicateHash: true - })) - TransferService.getTransferStateChange.withArgs(transfer.transferId).returns(Promise.resolve({ enumeration: 'unknown' })) - localMessages[0].value.metadata.event.action = 'unknown' - - const result = await allTransferHandlers.prepare(null, localMessages) - test.equal(result, true) - test.end() - }) - - prepareTest.test('do nothing when duplicate found and transferState is RESERVED', async (test) => { - const localMessages = MainUtil.clone(messages) - await Consumer.createHandler(topicName, config, command) - Kafka.transformAccountToTopicName.returns(topicName) - Kafka.proceed.returns(true) - Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) - TransferService.prepare.returns(Promise.resolve(true)) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: true, - hasDuplicateHash: true - })) - TransferService.getTransferStateChange.withArgs(transfer.transferId).returns(Promise.resolve({ enumeration: 'RESERVED' })) - - const result = await allTransferHandlers.prepare(null, localMessages) - test.equal(result, true) - test.end() - }) - - prepareTest.test('send callback when duplicate transfer id found but hash doesnt match', async (test) => { - const localMessages = MainUtil.clone(messages) - await Consumer.createHandler(topicName, config, command) - Kafka.transformAccountToTopicName.returns(topicName) - Kafka.proceed.returns(true) - Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) - TransferService.prepare.returns(Promise.resolve(true)) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: true, - hasDuplicateHash: true - })) - - const result = await allTransferHandlers.prepare(null, localMessages) - test.equal(result, true) - test.end() - }) - - prepareTest.test('send callback when duplicate transfer id found but hash doesnt match - kafka autocommit enabled', async (test) => { - const localMessages = MainUtil.clone(messages) - await Consumer.createHandler(topicName, configAutocommit, command) - Consumer.isConsumerAutoCommitEnabled.returns(true) - Kafka.transformAccountToTopicName.returns(topicName) - Kafka.proceed.returns(true) - Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) - TransferService.prepare.returns(Promise.resolve(true)) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: true, - hasDuplicateHash: false - })) - - const result = await allTransferHandlers.prepare(null, localMessages) - test.equal(result, true) - test.end() - }) - - prepareTest.test('persist transfer to database when single message sent', async (test) => { - const localMessages = MainUtil.clone(messages) - await Consumer.createHandler(topicName, config, command) - Kafka.transformAccountToTopicName.returns(topicName) - Kafka.proceed.returns(true) - Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) - TransferService.prepare.returns(Promise.resolve(true)) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: false, - hasDuplicateHash: false - })) - const result = await allTransferHandlers.prepare(null, localMessages[0]) - test.equal(result, true) - test.end() - }) - - prepareTest.test('persist transfer to database when BULK_PREPARE single message sent', async (test) => { - const localMessages = MainUtil.clone(messages) - await Consumer.createHandler(topicName, config, command) - Kafka.transformAccountToTopicName.returns(topicName) - Kafka.proceed.returns(true) - Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) - TransferService.prepare.returns(Promise.resolve(true)) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: false, - hasDuplicateHash: false - })) - const result = await allTransferHandlers.prepare(null, localMessages[1]) - test.equal(result, true) - test.end() - }) - - prepareTest.test('persist transfer to database when single message sent - autocommit is enabled', async (test) => { - const localMessages = MainUtil.clone(messages) - await Consumer.createHandler(topicName, config, command) - Consumer.isConsumerAutoCommitEnabled.returns(true) - Kafka.transformAccountToTopicName.returns(topicName) - Kafka.proceed.returns(true) - Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) - TransferService.prepare.returns(Promise.resolve(true)) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: false, - hasDuplicateHash: false - })) - const result = await allTransferHandlers.prepare(null, localMessages[0]) - test.equal(result, true) - test.end() - }) - - prepareTest.test('persist transfer to database when single message sent - kafka autocommit enabled', async (test) => { - const localMessages = MainUtil.clone(messages) - await Consumer.createHandler(topicName, configAutocommit, command) - Kafka.transformAccountToTopicName.returns(topicName) - Kafka.proceed.returns(true) - Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) - TransferService.prepare.returns(Promise.resolve(true)) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: false, - hasDuplicateHash: false - })) - const result = await allTransferHandlers.prepare(null, localMessages[0]) - test.equal(result, true) - test.end() - }) - - prepareTest.test('send notification when validation successful but duplicate error thrown by prepare', async (test) => { - const localMessages = MainUtil.clone(messages) - await Consumer.createHandler(topicName, config, command) - Kafka.transformAccountToTopicName.returns(topicName) - Kafka.proceed.returns(true) - Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) - TransferService.prepare.throws(new Error()) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: false, - hasDuplicateHash: false - })) - const result = await allTransferHandlers.prepare(null, localMessages) - test.equal(result, true) - test.end() - }) - - prepareTest.test('send notification when validation successful but duplicate error thrown by prepare - kafka autocommit enabled', async (test) => { - const localMessages = MainUtil.clone(messages) - await Consumer.createHandler(topicName, configAutocommit, command) - Consumer.isConsumerAutoCommitEnabled.returns(true) - Kafka.transformAccountToTopicName.returns(topicName) - Kafka.proceed.returns(true) - Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) - TransferService.prepare.throws(new Error()) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: false, - hasDuplicateHash: false - })) - const result = await allTransferHandlers.prepare(null, localMessages) - test.equal(result, true) - test.end() - }) - - prepareTest.test('fail validation and persist INVALID transfer to database and insert transferError', async (test) => { - const localMessages = MainUtil.clone(messages) - await Consumer.createHandler(topicName, config, command) - Kafka.transformAccountToTopicName.returns(topicName) - Kafka.proceed.returns(true) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: false, - hasDuplicateHash: false - })) - MainUtil.StreamingProtocol.createEventState.returns(messageProtocol.metadata.event.state) - Validator.validatePrepare.returns({ validationPassed: false, reasons: [] }) - TransferService.getById.returns(Promise.resolve(null)) - TransferService.prepare.returns(Promise.resolve(true)) - const result = await allTransferHandlers.prepare(null, localMessages) - test.equal(result, true) - test.end() - }) - - prepareTest.test('fail validation and persist INVALID transfer to database and insert transferError -kafka autocommit enabled', async (test) => { - await Consumer.createHandler(topicName, configAutocommit, command) - Consumer.isConsumerAutoCommitEnabled.returns(true) - Kafka.transformAccountToTopicName.returns(topicName) - Kafka.proceed.returns(true) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: false, - hasDuplicateHash: false - })) - MainUtil.StreamingProtocol.createEventState.returns(messageProtocol.metadata.event.state) - Validator.validatePrepare.returns({ validationPassed: false, reasons: [] }) - TransferService.prepare.returns(Promise.resolve(true)) - - const result = await allTransferHandlers.prepare(null, messages) - test.equal(result, true) - test.end() - }) - - prepareTest.test('send notification when validation failed and duplicate error thrown by prepare', async (test) => { - const localMessages = MainUtil.clone(messages) - await Consumer.createHandler(topicName, config, command) - Kafka.transformAccountToTopicName.returns(topicName) - Kafka.proceed.returns(true) - Validator.validatePrepare.returns({ validationPassed: false, reasons: [] }) - TransferService.prepare.throws(new Error()) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: false, - hasDuplicateHash: false - })) - const result = await allTransferHandlers.prepare(null, localMessages) - test.equal(result, true) - test.end() - }) - - prepareTest.test('send notification when validation failed and duplicate error thrown by prepare - kafka autocommit enabled', async (test) => { - const localMessages = MainUtil.clone(messages) - await Consumer.createHandler(topicName, configAutocommit, command) - Consumer.isConsumerAutoCommitEnabled.returns(true) - Kafka.transformAccountToTopicName.returns(topicName) - Kafka.proceed.returns(true) - Validator.validatePrepare.returns({ validationPassed: false, reasons: [] }) - TransferService.prepare.throws(new Error()) - TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) - TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) - Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ - hasDuplicateId: false, - hasDuplicateHash: false - })) - const result = await allTransferHandlers.prepare(null, localMessages) - test.equal(result, true) - test.end() +const participants = ['testName1', 'testName2'] + +const cyrilStub = async (payload) => ({ + participantName: payload.payerFsp, + currencyId: payload.amount.currency, + amount: payload.amount.amount +}) + +Test('Transfer handler', transferHandlerTest => { + let sandbox + + transferHandlerTest.beforeEach(test => { + sandbox = Sinon.createSandbox() + sandbox.stub(ProxyCache, 'getCache').returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub() }) + sandbox.stub(ProxyCache, 'getProxyParticipantAccountDetails').resolves({ inScheme: true, participantCurrencyId: 1 }) + sandbox.stub(ProxyCache, 'checkSameCreditorDebtorProxy').resolves(false) + const stubs = mocks.createTracerStub(sandbox) + SpanStub = stubs.SpanStub - prepareTest.test('log an error when consumer not found', async (test) => { - try { - const localMessages = MainUtil.clone(messages) - await Consumer.createHandler(topicName, config, command) - Kafka.transformAccountToTopicName.returns('invalid-topic') - await allTransferHandlers.prepare(null, localMessages) - const expectedState = new EventSdk.EventStateMetadata(EventSdk.EventStatusType.failed, '2001', 'Internal server error') - const args = SpanStub.finish.getCall(0).args - test.ok(args[0].length > 0) - test.deepEqual(args[1], expectedState) - test.end() - } catch (e) { - test.fail('Error Thrown') - test.end() + const EventSdkStub = { + Tracer: stubs.TracerStub + } + + createRemittanceEntity = Proxyquire('../../../../src/handlers/transfers/createRemittanceEntity', { + '../../domain/fx/cyril': { + getParticipantAndCurrencyForTransferMessage: cyrilStub, + getParticipantAndCurrencyForFxTransferMessage: cyrilStub } }) + prepare = Proxyquire('../../../../src/handlers/transfers/prepare', { + '@mojaloop/event-sdk': EventSdkStub, + './createRemittanceEntity': createRemittanceEntity + }) + allTransferHandlers = Proxyquire('../../../../src/handlers/transfers/handler', { + '@mojaloop/event-sdk': EventSdkStub, + './prepare': prepare + }) - prepareTest.test('throw an error when an error is thrown from Kafka', async (test) => { - try { - await allTransferHandlers.prepare(error, null) - test.fail('No Error Thrown') - test.end() - } catch (e) { - test.pass('Error Thrown') - test.end() + sandbox.stub(KafkaConsumer.prototype, 'constructor').returns(Promise.resolve()) + sandbox.stub(KafkaConsumer.prototype, 'connect').returns(Promise.resolve()) + sandbox.stub(KafkaConsumer.prototype, 'consume').returns(Promise.resolve()) + sandbox.stub(KafkaConsumer.prototype, 'commitMessageSync').returns(Promise.resolve()) + sandbox.stub(Comparators) + sandbox.stub(Validator) + sandbox.stub(TransferService) + sandbox.stub(Cyril) + Cyril.processFulfilMessage.returns({ + isFx: false + }) + sandbox.stub(Consumer, 'getConsumer').returns({ + commitMessageSync: async function () { + return true + } + }) + sandbox.stub(Consumer, 'isConsumerAutoCommitEnabled').returns(false) + sandbox.stub(ilp) + sandbox.stub(Kafka) + sandbox.stub(MainUtil.StreamingProtocol) + sandbox.stub(TransferObjectTransform, 'toTransfer') + sandbox.stub(TransferObjectTransform, 'toFulfil') + sandbox.stub(Participant, 'getAccountByNameAndCurrency').callsFake((...args) => { + if (args[0] === transfer.payerFsp) { + return { + participantCurrencyId: 0 + } + } + if (args[0] === transfer.payeeFsp) { + return { + participantCurrencyId: 1 + } } }) + Kafka.produceGeneralMessage.returns(Promise.resolve()) + test.end() + }) - prepareTest.end() + transferHandlerTest.afterEach(test => { + sandbox.restore() + test.end() }) transferHandlerTest.test('register getTransferHandler should', registerTransferhandler => { @@ -1128,6 +629,12 @@ Test('Transfer handler', transferHandlerTest => { })) Validator.validateFulfilCondition.returns(false) Kafka.proceed.returns(true) + Cyril.processAbortMessage.returns({ + isFx: false, + positionChanges: [{ + participantCurrencyId: 1 + }] + }) // Act const result = await allTransferHandlers.fulfil(null, localfulfilMessages) @@ -1472,6 +979,115 @@ Test('Transfer handler', transferHandlerTest => { const localfulfilMessages = MainUtil.clone(fulfilMessages) await Consumer.createHandler(topicName, config, command) Kafka.transformGeneralTopicName.returns(topicName) + + TransferService.getById.returns(Promise.resolve({ + condition: 'condition', + payeeFsp: 'dfsp2', + payerFsp: 'dfsp1', + transferState: TransferState.RESERVED + })) + ilp.update.returns(Promise.resolve()) + Validator.validateFulfilCondition.returns(true) + localfulfilMessages[0].value.content.headers['fspiop-source'] = 'dfsp2' + localfulfilMessages[0].value.content.headers['fspiop-destination'] = 'dfsp1' + localfulfilMessages[0].value.content.payload.fulfilment = 'condition' + Kafka.proceed.returns(true) + + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, localfulfilMessages[0].value.content.payload).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + + const result = await allTransferHandlers.fulfil(null, localfulfilMessages) + const kafkaCallOne = Kafka.proceed.getCall(0) + + test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.POSITION) + test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.COMMIT) + test.equal(kafkaCallOne.args[2].messageKey, '1') + test.equal(result, true) + test.end() + }) + + fulfilTest.test('produce message to position topic when validations pass with RESERVED_FORWARDED state', async (test) => { + const localfulfilMessages = MainUtil.clone(fulfilMessages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformGeneralTopicName.returns(topicName) + + TransferService.getById.returns(Promise.resolve({ + condition: 'condition', + payeeFsp: 'dfsp2', + payerFsp: 'proxyFsp', + transferState: TransferInternalState.RESERVED_FORWARDED + })) + ilp.update.returns(Promise.resolve()) + Validator.validateFulfilCondition.returns(true) + localfulfilMessages[0].value.content.headers['fspiop-source'] = 'dfsp2' + localfulfilMessages[0].value.content.headers['fspiop-destination'] = 'proxyFsp' + localfulfilMessages[0].value.content.payload.fulfilment = 'condition' + Kafka.proceed.returns(true) + + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, localfulfilMessages[0].value.content.payload).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + + const result = await allTransferHandlers.fulfil(null, localfulfilMessages) + const kafkaCallOne = Kafka.proceed.getCall(0) + + test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.POSITION) + test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.COMMIT) + test.equal(kafkaCallOne.args[2].messageKey, '1') + test.equal(result, true) + test.end() + }) + + fulfilTest.test('fail if event type is not fulfil', async (test) => { + const localfulfilMessages = MainUtil.clone(fulfilMessages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformGeneralTopicName.returns(topicName) + + TransferService.getById.returns(Promise.resolve({ + condition: 'condition', + payeeFsp: 'dfsp2', + payerFsp: 'dfsp1', + transferState: TransferState.RESERVED + })) + ilp.update.returns(Promise.resolve()) + Validator.validateFulfilCondition.returns(true) + localfulfilMessages[0].value.content.headers['fspiop-source'] = 'dfsp2' + localfulfilMessages[0].value.content.headers['fspiop-destination'] = 'dfsp1' + localfulfilMessages[0].value.content.payload.fulfilment = 'condition' + localfulfilMessages[0].value.metadata.event.type = 'invalid_event_type' + Kafka.proceed.returns(true) + + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, localfulfilMessages[0].value.content.payload).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + + const result = await allTransferHandlers.fulfil(null, localfulfilMessages) + + test.equal(result, true) + test.end() + }) + + fulfilTest.test('produce message to position topic when validations pass if Cyril result is fx enabled', async (test) => { + const localfulfilMessages = MainUtil.clone(fulfilMessages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformGeneralTopicName.returns(topicName) + Cyril.processFulfilMessage.returns({ + isFx: true, + positionChanges: [{ + participantCurrencyId: 1 + }] + }) + TransferService.getById.returns(Promise.resolve({ condition: 'condition', payeeFsp: 'dfsp2', @@ -1502,6 +1118,80 @@ Test('Transfer handler', transferHandlerTest => { test.end() }) + fulfilTest.test('produce message to position topic when validations pass if Cyril result is fx enabled on RESERVED_FORWARDED transfer state', async (test) => { + const localfulfilMessages = MainUtil.clone(fulfilMessages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformGeneralTopicName.returns(topicName) + Cyril.processFulfilMessage.returns({ + isFx: true, + positionChanges: [{ + participantCurrencyId: 1 + }] + }) + + TransferService.getById.returns(Promise.resolve({ + condition: 'condition', + payeeFsp: 'dfsp2', + payerFsp: 'dfsp1', + transferState: TransferInternalState.RESERVED_FORWARDED + })) + ilp.update.returns(Promise.resolve()) + Validator.validateFulfilCondition.returns(true) + localfulfilMessages[0].value.content.headers['fspiop-source'] = 'dfsp2' + localfulfilMessages[0].value.content.headers['fspiop-destination'] = 'dfsp1' + localfulfilMessages[0].value.content.payload.fulfilment = 'condition' + Kafka.proceed.returns(true) + + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, localfulfilMessages[0].value.content.payload).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + + const result = await allTransferHandlers.fulfil(null, localfulfilMessages) + const kafkaCallOne = Kafka.proceed.getCall(0) + + test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.POSITION) + test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.COMMIT) + test.equal(kafkaCallOne.args[2].messageKey, '1') + test.equal(result, true) + test.end() + }) + + fulfilTest.test('fail when Cyril result contains no positionChanges', async (test) => { + const localfulfilMessages = MainUtil.clone(fulfilMessages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformGeneralTopicName.returns(topicName) + Cyril.processFulfilMessage.returns({ + isFx: true, + positionChanges: [] + }) + + TransferService.getById.returns(Promise.resolve({ + condition: 'condition', + payeeFsp: 'dfsp2', + payerFsp: 'dfsp1', + transferState: TransferState.RESERVED + })) + ilp.update.returns(Promise.resolve()) + Validator.validateFulfilCondition.returns(true) + localfulfilMessages[0].value.content.headers['fspiop-source'] = 'dfsp2' + localfulfilMessages[0].value.content.headers['fspiop-destination'] = 'dfsp1' + localfulfilMessages[0].value.content.payload.fulfilment = 'condition' + Kafka.proceed.returns(true) + + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, localfulfilMessages[0].value.content.payload).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + const result = await allTransferHandlers.fulfil(null, localfulfilMessages) + test.equal(result, true) + test.end() + }) + fulfilTest.test('produce message to position topic when validations pass and action is RESERVE', async (test) => { const localfulfilMessages = MainUtil.clone(fulfilMessages) localfulfilMessages[0].value.metadata.event.action = 'reserve' @@ -2213,6 +1903,36 @@ Test('Transfer handler', transferHandlerTest => { test.end() }) + fulfilTest.test('set transfer ABORTED when valid errorInformation is provided from RESERVED_FORWARDED state', async (test) => { + const invalidEventMessage = MainUtil.clone(fulfilMessages)[0] + await Consumer.createHandler(topicName, config, command) + Kafka.transformGeneralTopicName.returns(topicName) + Validator.validateFulfilCondition.returns(true) + TransferService.getById.returns(Promise.resolve({ + condition: 'condition', + payeeFsp: 'dfsp2', + payerFsp: 'dfsp1', + transferState: TransferInternalState.RESERVED_FORWARDED + })) + TransferService.handlePayeeResponse.returns(Promise.resolve({ transferErrorRecord: { errorCode: '5000', errorDescription: 'error text' } })) + invalidEventMessage.value.metadata.event.action = 'abort' + invalidEventMessage.value.content.payload = errInfo + invalidEventMessage.value.content.headers['fspiop-source'] = 'dfsp2' + invalidEventMessage.value.content.headers['fspiop-destination'] = 'dfsp1' + Kafka.proceed.returns(true) + + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, invalidEventMessage.value.content.payload).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + + const result = await allTransferHandlers.fulfil(null, invalidEventMessage) + test.equal(result, true) + test.end() + }) + fulfilTest.test('log error', async (test) => { // TODO: extend and enable unit test const invalidEventMessage = MainUtil.clone(fulfilMessages)[0] await Consumer.createHandler(topicName, config, command) @@ -2289,6 +2009,7 @@ Test('Transfer handler', transferHandlerTest => { transferHandlerTest.test('reject should', rejectTest => { rejectTest.test('throw', async (test) => { try { + // todo: clarify, what the test is about? await allTransferHandlers.reject() test.fail('No Error Thrown') test.end() diff --git a/test/unit/handlers/transfers/mocks.js b/test/unit/handlers/transfers/mocks.js new file mode 100644 index 000000000..9b87cc865 --- /dev/null +++ b/test/unit/handlers/transfers/mocks.js @@ -0,0 +1,60 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + + * Mojaloop Foundation + - Name Surname + + * Infitx + - Vijay Kumar Guthi + - Kevin Leyow + - Kalin Krustev + - Steven Oderayi + - Eugen Klymniuk + + -------------- + + ******/ + +const createTracerStub = (sandbox, context = {}) => { + /* eslint-disable prefer-const */ + let SpanStub + SpanStub = { + audit: sandbox.stub().callsFake(), + error: sandbox.stub().callsFake(), + finish: sandbox.stub().callsFake(), + debug: sandbox.stub().callsFake(), + info: sandbox.stub().callsFake(), + getChild: sandbox.stub().returns(SpanStub), + setTags: sandbox.stub().callsFake(), + injectContextToMessage: sandbox.stub().callsFake(msg => msg) + } + + const TracerStub = { + extractContextFromMessage: sandbox.stub().callsFake(() => context), + createChildSpanFromContext: sandbox.stub().callsFake(() => SpanStub) + } + + return { TracerStub, SpanStub } +} + +module.exports = { + createTracerStub +} diff --git a/test/unit/handlers/transfers/prepare.test.js b/test/unit/handlers/transfers/prepare.test.js new file mode 100644 index 000000000..5117d87b5 --- /dev/null +++ b/test/unit/handlers/transfers/prepare.test.js @@ -0,0 +1,1696 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + +* Gates Foundation +- Name Surname + +* Georgi Georgiev +* Rajiv Mothilal +* Miguel de Barros +* Deon Botha +* Shashikant Hirugade + +-------------- +******/ +'use strict' + +const Sinon = require('sinon') +const Test = require('tapes')(require('tape')) +const Kafka = require('@mojaloop/central-services-shared').Util.Kafka +const ErrorHandler = require('@mojaloop/central-services-error-handling') +const Validator = require('../../../../src/handlers/transfers/validator') +const TransferService = require('../../../../src/domain/transfer') +const FxTransferService = require('../../../../src/domain/fx') +const Cyril = require('../../../../src/domain/fx/cyril') +const TransferObjectTransform = require('../../../../src/domain/transfer/transform') +const MainUtil = require('@mojaloop/central-services-shared').Util +const ilp = require('../../../../src/models/transfer/ilpPacket') +const { randomUUID } = require('crypto') +const KafkaConsumer = require('@mojaloop/central-services-stream').Kafka.Consumer +const Consumer = require('@mojaloop/central-services-stream').Util.Consumer +const Enum = require('@mojaloop/central-services-shared').Enum +const EventSdk = require('@mojaloop/event-sdk') +const Comparators = require('@mojaloop/central-services-shared').Util.Comparators +const Proxyquire = require('proxyquire') +const Participant = require('../../../../src/domain/participant') +const Config = require('../../../../src/lib/config') +const fxTransferModel = require('../../../../src/models/fxTransfer') +const fxDuplicateCheck = require('../../../../src/models/fxTransfer/duplicateCheck') +const fxTransferStateChange = require('../../../../src/models/fxTransfer/stateChange') +const ProxyCache = require('../../../../src/lib/proxyCache') +const TransferModel = require('../../../../src/models/transfer/transfer') + +const { Action } = Enum.Events.Event + +const transfer = { + transferId: 'b51ec534-ee48-4575-b6a9-ead2955b8999', + payerFsp: 'dfsp1', + payeeFsp: 'dfsp2', + amount: { + currency: 'USD', + amount: '433.88' + }, + ilpPacket: 'AYIBgQAAAAAAAASwNGxldmVsb25lLmRmc3AxLm1lci45T2RTOF81MDdqUUZERmZlakgyOVc4bXFmNEpLMHlGTFGCAUBQU0svMS4wCk5vbmNlOiB1SXlweUYzY3pYSXBFdzVVc05TYWh3CkVuY3J5cHRpb246IG5vbmUKUGF5bWVudC1JZDogMTMyMzZhM2ItOGZhOC00MTYzLTg0NDctNGMzZWQzZGE5OGE3CgpDb250ZW50LUxlbmd0aDogMTM1CkNvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbgpTZW5kZXItSWRlbnRpZmllcjogOTI4MDYzOTEKCiJ7XCJmZWVcIjowLFwidHJhbnNmZXJDb2RlXCI6XCJpbnZvaWNlXCIsXCJkZWJpdE5hbWVcIjpcImFsaWNlIGNvb3BlclwiLFwiY3JlZGl0TmFtZVwiOlwibWVyIGNoYW50XCIsXCJkZWJpdElkZW50aWZpZXJcIjpcIjkyODA2MzkxXCJ9IgA', + condition: 'YlK5TZyhflbXaDRPtR5zhCu8FrbgvrQwwmzuH0iQ0AI', + expiration: '2016-05-24T08:38:08.699-04:00', + extensionList: { + extension: [ + { + key: 'key1', + value: 'value1' + }, + { + key: 'key2', + value: 'value2' + } + ] + } +} + +const fxTransfer = { + commitRequestId: '88622a75-5bde-4da4-a6cc-f4cd23b268c4', + determiningTransferId: 'c05c3f31-33b5-4e33-8bfd-7c3a2685fb6c', + condition: 'YlK5TZyhflbXaDRPtR5zhCu8FrbgvrQwwmzuH0iQ0AI', + expiration: new Date((new Date()).getTime() + (24 * 60 * 60 * 1000)), // tomorrow + initiatingFsp: 'fx_dfsp1', + counterPartyFsp: 'fx_dfsp2', + sourceAmount: { + currency: 'USD', + amount: '433.88' + }, + targetAmount: { + currency: 'EUR', + amount: '200.00' + } +} +const transferReturn = { + transferId: 'b51ec534-ee48-4575-b6a9-ead2955b8999', + amount: { + currency: 'USD', + amount: '433.88' + }, + transferState: 'COMMITTED', + transferStateEnumeration: 'COMMITTED', + completedTimestamp: '2016-05-15T18:44:38.000Z', + ilpPacket: 'AYIBgQAAAAAAAASwNGxldmVsb25lLmRmc3AxLm1lci45T2RTOF81MDdqUUZERmZlakgyOVc4bXFmNEpLMHlGTFGCAUBQU0svMS4wCk5vbmNlOiB1SXlweUYzY3pYSXBFdzVVc05TYWh3CkVuY3J5cHRpb246IG5vbmUKUGF5bWVudC1JZDogMTMyMzZhM2ItOGZhOC00MTYzLTg0NDctNGMzZWQzZGE5OGE3CgpDb250ZW50LUxlbmd0aDogMTM1CkNvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbgpTZW5kZXItSWRlbnRpZmllcjogOTI4MDYzOTEKCiJ7XCJmZWVcIjowLFwidHJhbnNmZXJDb2RlXCI6XCJpbnZvaWNlXCIsXCJkZWJpdE5hbWVcIjpcImFsaWNlIGNvb3BlclwiLFwiY3JlZGl0TmFtZVwiOlwibWVyIGNoYW50XCIsXCJkZWJpdElkZW50aWZpZXJcIjpcIjkyODA2MzkxXCJ9IgA', + condition: 'YlK5TZyhflbXaDRPtR5zhCu8FrbgvrQwwmzuH0iQ0AI', + expiration: '2016-05-24T08:38:08.699-04:00', + fulfilment: 'uz0FAeutW6o8Mz7OmJh8ALX6mmsZCcIDOqtE01eo4uI', + extensionList: [{ + key: 'key1', + value: 'value1' + }] +} + +const fulfil = { + fulfilment: 'oAKAAA', + completedTimestamp: '2018-10-24T08:38:08.699-04:00', + transferState: 'COMMITTED', + extensionList: { + extension: [ + { + key: 'key1', + value: 'value1' + }, + { + key: 'key2', + value: 'value2' + } + ] + } +} + +const messageProtocol = { + id: randomUUID(), + from: transfer.payerFsp, + to: transfer.payeeFsp, + type: 'application/json', + content: { + headers: { 'fspiop-destination': transfer.payerFsp, 'content-type': 'application/vnd.interoperability.transfers+json;version=1.1' }, + uriParams: { id: transfer.transferId }, + payload: transfer + }, + metadata: { + event: { + id: randomUUID(), + type: 'prepare', + action: 'prepare', + createdAt: new Date(), + state: { + status: 'success', + code: 0 + } + } + }, + pp: '' +} + +const fxMessageProtocol = { + id: randomUUID(), + from: fxTransfer.initiatingFsp, + to: fxTransfer.counterPartyFsp, + type: 'application/json', + content: { + headers: { + 'fspiop-destination': fxTransfer.initiatingFsp, + 'content-type': 'application/vnd.interoperability.transfers+json;version=1.1' + }, + uriParams: { id: fxTransfer.commitRequestId }, + payload: fxTransfer + }, + metadata: { + event: { + id: randomUUID(), + type: 'fx-prepare', + action: Action.FX_PREPARE, + createdAt: new Date(), + state: { + status: 'success', + code: 0 + } + } + }, + pp: '' +} + +const messageForwardedProtocol = { + id: randomUUID(), + from: '', + to: '', + type: 'application/json', + content: { + uriParams: { id: transfer.transferId }, + payload: { + proxyId: '', + transferId: transfer.transferId + } + }, + metadata: { + event: { + id: randomUUID(), + type: 'prepare', + action: 'forwarded', + createdAt: new Date(), + state: { + status: 'success', + code: 0 + } + } + }, + pp: '' +} + +const messageFxForwardedProtocol = { + id: randomUUID(), + from: '', + to: '', + type: 'application/json', + content: { + uriParams: { id: fxTransfer.commitRequestId }, + payload: { + proxyId: '', + commitRequestId: fxTransfer.commitRequestId + } + }, + metadata: { + event: { + id: randomUUID(), + type: 'prepare', + action: 'fx-forwarded', + createdAt: new Date(), + state: { + status: 'success', + code: 0 + } + } + }, + pp: '' +} + +const messageProtocolBulkPrepare = MainUtil.clone(messageProtocol) +messageProtocolBulkPrepare.metadata.event.action = 'bulk-prepare' +const messageProtocolBulkCommit = MainUtil.clone(messageProtocol) +messageProtocolBulkCommit.metadata.event.action = 'bulk-commit' + +const topicName = 'topic-test' + +const messages = [ + { + topic: topicName, + value: messageProtocol + }, + { + topic: topicName, + value: messageProtocolBulkPrepare + } +] + +const fxMessages = [ + { + topic: topicName, + value: fxMessageProtocol + } +] + +const forwardedMessages = [ + { + topic: topicName, + value: messageForwardedProtocol + } +] + +const fxForwardedMessages = [ + { + topic: topicName, + value: messageFxForwardedProtocol + } +] + +const config = { + options: { + mode: 2, + batchSize: 1, + pollFrequency: 10, + recursiveTimeout: 100, + messageCharset: 'utf8', + messageAsJSON: true, + sync: true, + consumeTimeout: 1000 + }, + rdkafkaConf: { + 'client.id': 'kafka-test', + debug: 'all', + 'group.id': 'central-ledger-kafka', + 'metadata.broker.list': 'localhost:9092', + 'enable.auto.commit': false + } +} + +const configAutocommit = { + options: { + mode: 2, + batchSize: 1, + pollFrequency: 10, + recursiveTimeout: 100, + messageCharset: 'utf8', + messageAsJSON: true, + sync: true, + consumeTimeout: 1000 + }, + rdkafkaConf: { + 'client.id': 'kafka-test', + debug: 'all', + 'group.id': 'central-ledger-kafka', + 'metadata.broker.list': 'localhost:9092', + 'enable.auto.commit': true + } +} + +const command = () => { +} + +const error = () => { + throw new Error() +} + +let SpanStub +let allTransferHandlers +let prepare +let createRemittanceEntity + +const cyrilStub = async (payload) => { + if (payload.determiningTransferId) { + return { + participantName: payload.initiatingFsp, + currencyId: payload.targetAmount.currency, + amount: payload.targetAmount.amount + } + } + if (payload.transferId === fxTransfer.determiningTransferId) { + return { + participantName: 'proxyAR', + currencyId: fxTransfer.targetAmount.currency, + amount: fxTransfer.targetAmount.amount + } + } + return { + participantName: payload.payerFsp, + currencyId: payload.amount.currency, + amount: payload.amount.amount + } +} + +Test('Transfer handler', transferHandlerTest => { + let sandbox + let getProxyCacheStub + let getFSPProxyStub + let checkSameCreditorDebtorProxyStub + + transferHandlerTest.beforeEach(test => { + sandbox = Sinon.createSandbox() + getProxyCacheStub = sandbox.stub(ProxyCache, 'getCache') + getProxyCacheStub.returns({ + connect: sandbox.stub(), + disconnect: sandbox.stub() + }) + SpanStub = { + audit: sandbox.stub().callsFake(), + error: sandbox.stub().callsFake(), + finish: sandbox.stub().callsFake(), + debug: sandbox.stub().callsFake(), + info: sandbox.stub().callsFake(), + getChild: sandbox.stub().returns(SpanStub), + setTags: sandbox.stub().callsFake() + } + + const TracerStub = { + extractContextFromMessage: sandbox.stub().callsFake(() => { + return {} + }), + createChildSpanFromContext: sandbox.stub().callsFake(() => { + return SpanStub + }) + } + + const EventSdkStub = { + Tracer: TracerStub + } + + createRemittanceEntity = Proxyquire('../../../../src/handlers/transfers/createRemittanceEntity', { + '../../domain/fx/cyril': { + getParticipantAndCurrencyForTransferMessage: cyrilStub, + getParticipantAndCurrencyForFxTransferMessage: cyrilStub, + getPositionParticipant: cyrilStub + } + }) + prepare = Proxyquire('../../../../src/handlers/transfers/prepare', { + '@mojaloop/event-sdk': EventSdkStub, + './createRemittanceEntity': createRemittanceEntity + }) + allTransferHandlers = Proxyquire('../../../../src/handlers/transfers/handler', { + '@mojaloop/event-sdk': EventSdkStub, + './prepare': prepare + }) + + sandbox.stub(KafkaConsumer.prototype, 'constructor').returns(Promise.resolve()) + sandbox.stub(KafkaConsumer.prototype, 'connect').returns(Promise.resolve()) + sandbox.stub(KafkaConsumer.prototype, 'consume').returns(Promise.resolve()) + sandbox.stub(KafkaConsumer.prototype, 'commitMessageSync').returns(Promise.resolve()) + sandbox.stub(Comparators) + sandbox.stub(Validator) + sandbox.stub(TransferService) + sandbox.stub(FxTransferService) + sandbox.stub(fxTransferModel.fxTransfer) + sandbox.stub(fxTransferModel.watchList) + sandbox.stub(fxDuplicateCheck) + sandbox.stub(fxTransferStateChange) + sandbox.stub(Cyril) + sandbox.stub(TransferModel) + Cyril.processFulfilMessage.returns({ + isFx: false + }) + sandbox.stub(Consumer, 'getConsumer').returns({ + commitMessageSync: async function () { + return true + } + }) + sandbox.stub(Consumer, 'isConsumerAutoCommitEnabled').returns(false) + sandbox.stub(ilp) + sandbox.stub(Kafka) + sandbox.stub(MainUtil.StreamingProtocol) + sandbox.stub(TransferObjectTransform, 'toTransfer') + sandbox.stub(TransferObjectTransform, 'toFulfil') + sandbox.stub(Participant, 'getAccountByNameAndCurrency').callsFake((...args) => { + // Avoid using a participantCurrencyId of 0 as this is used to represent a + // special proxy case where no action is to take place in the position handler + if (args[0] === transfer.payerFsp) { + return { + participantCurrencyId: 1 + } + } + if (args[0] === fxTransfer.initiatingFsp) { + return { + participantCurrencyId: 2 + } + } + if (args[0] === transfer.payeeFsp || args[0] === fxTransfer.counterPartyFsp) { + return { + participantCurrencyId: 3 + } + } + if (args[0] === fxTransfer.counterPartyFsp) { + return { + participantCurrencyId: 4 + } + } + if (args[0] === 'ProxyAR') { + return { + participantCurrencyId: 5 + } + } + if (args[0] === 'ProxyRB') { + return { + participantCurrencyId: 6 + } + } + }) + Kafka.produceGeneralMessage.returns(Promise.resolve()) + Config.PROXY_CACHE_CONFIG.enabled = true + getFSPProxyStub = sandbox.stub(ProxyCache, 'getFSPProxy') + checkSameCreditorDebtorProxyStub = sandbox.stub(ProxyCache, 'checkSameCreditorDebtorProxy') + getFSPProxyStub.withArgs(transfer.payerFsp).returns({ + inScheme: true, + proxyId: null + }) + getFSPProxyStub.withArgs(transfer.payeeFsp).returns({ + inScheme: true, + proxyId: null + }) + getFSPProxyStub.withArgs(fxTransfer.initiatingFsp).returns({ + inScheme: true, + proxyId: null + }) + getFSPProxyStub.withArgs(fxTransfer.counterPartyFsp).returns({ + inScheme: true, + proxyId: null + }) + checkSameCreditorDebtorProxyStub.resolves(false) + test.end() + }) + + transferHandlerTest.afterEach(test => { + sandbox.restore() + test.end() + }) + + transferHandlerTest.test('prepare should', prepareTest => { + prepareTest.test('persist transfer to database when messages is an array', async (test) => { + const localMessages = MainUtil.clone(messages) + // here copy + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + fxTransferModel.watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + const result = await allTransferHandlers.prepare(null, localMessages) + const kafkaCallOne = Kafka.proceed.getCall(0) + test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.POSITION) + test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.PREPARE) + test.equal(kafkaCallOne.args[2].messageKey, '1') + test.equal(result, true) + test.end() + }) + + prepareTest.test('fail when messages array is empty', async (test) => { + const localMessages = [] + // here copy + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + fxTransferModel.watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + try { + await allTransferHandlers.prepare(null, localMessages) + test.fail('Error not thrown') + test.end() + } catch (err) { + test.ok(err instanceof Error) + test.end() + } + }) + + prepareTest.test('use topic name override if specified in config', async (test) => { + Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP.POSITION.PREPARE = 'topic-test-override' + const localMessages = MainUtil.clone(messages) + // here copy + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + fxTransferModel.watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + const result = await allTransferHandlers.prepare(null, localMessages) + const kafkaCallOne = Kafka.proceed.getCall(0) + test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.POSITION) + test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.PREPARE) + test.equal(kafkaCallOne.args[2].messageKey, '1') + test.equal(kafkaCallOne.args[2].topicNameOverride, 'topic-test-override') + test.equal(result, true) + delete Config.KAFKA_CONFIG.EVENT_TYPE_ACTION_TOPIC_MAP.POSITION.PREPARE + test.end() + }) + + prepareTest.test('persist transfer to database when messages is an array - consumer throws error', async (test) => { + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, config, command) + Consumer.getConsumer.throws(new Error()) + Kafka.transformAccountToTopicName.returns(topicName) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.prepare.returns(Promise.resolve(true)) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + fxTransferModel.watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + const result = await allTransferHandlers.prepare(null, localMessages) + const kafkaCallOne = Kafka.proceed.getCall(0) + test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.POSITION) + test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.PREPARE) + test.equal(kafkaCallOne.args[2].messageKey, '1') + test.equal(result, true) + test.end() + }) + + // Not sure why all these tests have conditions on transferState. + // `prepare` does not currently have any code that checks transferState. + prepareTest.test('send callback when duplicate found but without transferState', async (test) => { + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.getByIdLight.returns(Promise.resolve(null)) + TransferService.prepare.returns(Promise.resolve(true)) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: true, + hasDuplicateHash: true + })) + TransferService.getTransferStateChange.withArgs(transfer.transferId).returns(Promise.resolve(null)) + const result = await allTransferHandlers.prepare(null, localMessages) + test.equal(result, true) + test.end() + }) + + prepareTest.test('send callback when duplicate found but without transferState - autocommit is enabled', async (test) => { + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, config, command) + Consumer.isConsumerAutoCommitEnabled.returns(true) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.getByIdLight.returns(Promise.resolve(null)) + TransferService.prepare.returns(Promise.resolve(true)) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: true, + hasDuplicateHash: true + })) + TransferService.getTransferStateChange.withArgs(transfer.transferId).returns(Promise.resolve(null)) + const result = await allTransferHandlers.prepare(null, localMessages) + test.equal(result, true) + test.end() + }) + + prepareTest.test('send callback when duplicate found but without transferState - kafka autocommit enabled', async (test) => { + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, configAutocommit, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.getByIdLight.returns(Promise.resolve(null)) + TransferService.prepare.returns(Promise.resolve(true)) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: true, + hasDuplicateHash: true + })) + TransferService.getTransferStateChange.withArgs(transfer.transferId).returns(Promise.resolve(null)) + const result = await allTransferHandlers.prepare(null, localMessages) + test.equal(result, true) + test.end() + }) + + prepareTest.test('send callback when duplicate found and transferState is COMMITTED', async (test) => { + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.prepare.returns(Promise.resolve(true)) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: true, + hasDuplicateHash: true + })) + TransferService.getByIdLight.withArgs(transfer.transferId).returns(Promise.resolve(transferReturn)) + TransferObjectTransform.toTransfer.withArgs(transferReturn).returns(transfer) + + const result = await allTransferHandlers.prepare(null, localMessages) + test.equal(result, true) + test.end() + }) + + prepareTest.test('send callback when duplicate found and transferState is ABORTED_REJECTED', async (test) => { + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.prepare.returns(Promise.resolve(true)) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: true, + hasDuplicateHash: true + })) + TransferService.getTransferStateChange.withArgs(transfer.transferId).returns(Promise.resolve({ enumeration: 'ABORTED' })) + TransferService.getById.withArgs(transfer.transferId).returns(Promise.resolve(transferReturn)) + + TransferObjectTransform.toFulfil.withArgs(transferReturn).returns(fulfil) + + const result = await allTransferHandlers.prepare(null, localMessages) + test.equal(result, true) + test.end() + }) + + prepareTest.test('do nothing when duplicate found and transferState is RECEIVED', async (test) => { + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.prepare.returns(Promise.resolve(true)) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: true, + hasDuplicateHash: true + })) + TransferService.getTransferStateChange.withArgs(transfer.transferId).returns(Promise.resolve({ enumeration: 'RECEIVED' })) + + const result = await allTransferHandlers.prepare(null, localMessages) + test.equal(result, true) + test.end() + }) + + prepareTest.test('do nothing when duplicate found and transferState is RECEIVED', async (test) => { + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.prepare.returns(Promise.resolve(true)) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: true, + hasDuplicateHash: true + })) + TransferService.getTransferStateChange.withArgs(transfer.transferId).returns(Promise.resolve({ enumeration: 'unknown' })) + localMessages[0].value.metadata.event.action = 'unknown' + + const result = await allTransferHandlers.prepare(null, localMessages) + test.equal(result, true) + test.end() + }) + + prepareTest.test('do nothing when duplicate found and transferState is RESERVED', async (test) => { + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.prepare.returns(Promise.resolve(true)) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: true, + hasDuplicateHash: true + })) + TransferService.getTransferStateChange.withArgs(transfer.transferId).returns(Promise.resolve({ enumeration: 'RESERVED' })) + + const result = await allTransferHandlers.prepare(null, localMessages) + test.equal(result, true) + test.end() + }) + + prepareTest.test('send callback when duplicate transfer id found but hash doesnt match', async (test) => { + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.prepare.returns(Promise.resolve(true)) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: true, + hasDuplicateHash: true + })) + + const result = await allTransferHandlers.prepare(null, localMessages) + test.equal(result, true) + test.end() + }) + + prepareTest.test('send callback when duplicate transfer id found but hash doesnt match - kafka autocommit enabled', async (test) => { + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, configAutocommit, command) + Consumer.isConsumerAutoCommitEnabled.returns(true) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.prepare.returns(Promise.resolve(true)) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: true, + hasDuplicateHash: false + })) + + const result = await allTransferHandlers.prepare(null, localMessages) + test.equal(result, true) + test.end() + }) + + prepareTest.test('persist transfer to database when single message sent', async (test) => { + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.prepare.returns(Promise.resolve(true)) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + const result = await allTransferHandlers.prepare(null, localMessages[0]) + test.equal(result, true) + test.end() + }) + + prepareTest.test('persist transfer to database when BULK_PREPARE single message sent', async (test) => { + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.prepare.returns(Promise.resolve(true)) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + const result = await allTransferHandlers.prepare(null, localMessages[1]) + test.equal(result, true) + test.end() + }) + + prepareTest.test('persist transfer to database when single message sent - autocommit is enabled', async (test) => { + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, config, command) + Consumer.isConsumerAutoCommitEnabled.returns(true) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.prepare.returns(Promise.resolve(true)) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + const result = await allTransferHandlers.prepare(null, localMessages[0]) + test.equal(result, true) + test.end() + }) + + prepareTest.test('persist transfer to database when single message sent - kafka autocommit enabled', async (test) => { + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, configAutocommit, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.prepare.returns(Promise.resolve(true)) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + const result = await allTransferHandlers.prepare(null, localMessages[0]) + test.equal(result, true) + test.end() + }) + + prepareTest.test('send notification when validation successful but duplicate error thrown by prepare', async (test) => { + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.prepare.throws(new Error()) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + const result = await allTransferHandlers.prepare(null, localMessages) + test.equal(result, true) + test.end() + }) + + prepareTest.test('send notification when validation successful but duplicate error thrown by prepare - kafka autocommit enabled', async (test) => { + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, configAutocommit, command) + Consumer.isConsumerAutoCommitEnabled.returns(true) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.prepare.throws(new Error()) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + const result = await allTransferHandlers.prepare(null, localMessages) + test.equal(result, true) + test.end() + }) + + prepareTest.test('fail validation and persist INVALID transfer to database and insert transferError', async (test) => { + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + MainUtil.StreamingProtocol.createEventState.returns(messageProtocol.metadata.event.state) + Validator.validatePrepare.returns({ validationPassed: false, reasons: [] }) + TransferService.getById.returns(Promise.resolve(null)) + TransferService.prepare.returns(Promise.resolve(true)) + const result = await allTransferHandlers.prepare(null, localMessages) + test.equal(result, true) + test.end() + }) + + prepareTest.test('fail validation and persist INVALID transfer to database and insert transferError -kafka autocommit enabled', async (test) => { + await Consumer.createHandler(topicName, configAutocommit, command) + Consumer.isConsumerAutoCommitEnabled.returns(true) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + MainUtil.StreamingProtocol.createEventState.returns(messageProtocol.metadata.event.state) + Validator.validatePrepare.returns({ validationPassed: false, reasons: [] }) + TransferService.prepare.returns(Promise.resolve(true)) + + const result = await allTransferHandlers.prepare(null, messages) + test.equal(result, true) + test.end() + }) + + prepareTest.test('send notification when validation failed and duplicate error thrown by prepare', async (test) => { + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: false, reasons: [] }) + TransferService.prepare.throws(new Error()) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + const result = await allTransferHandlers.prepare(null, localMessages) + test.equal(result, true) + test.end() + }) + + prepareTest.test('send notification when validation failed and duplicate error thrown by prepare - kafka autocommit enabled', async (test) => { + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, configAutocommit, command) + Consumer.isConsumerAutoCommitEnabled.returns(true) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: false, reasons: [] }) + TransferService.prepare.throws(new Error()) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + const result = await allTransferHandlers.prepare(null, localMessages) + test.equal(result, true) + test.end() + }) + + prepareTest.test('log an error when consumer not found', async (test) => { + try { + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns('invalid-topic') + await allTransferHandlers.prepare(null, localMessages) + const expectedState = new EventSdk.EventStateMetadata(EventSdk.EventStatusType.failed, '2001', 'Internal server error') + const args = SpanStub.finish.getCall(0).args + test.ok(args[0].length > 0) + test.deepEqual(args[1], expectedState) + test.end() + } catch (e) { + test.fail('Error Thrown') + test.end() + } + }) + + prepareTest.test('throw an error when an error is thrown from Kafka', async (test) => { + try { + await allTransferHandlers.prepare(error, null) + test.fail('No Error Thrown') + test.end() + } catch (e) { + test.pass('Error Thrown') + test.end() + } + }) + + prepareTest.test('produce error for unexpected state when receiving fowarded event message', async (test) => { + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + TransferService.getById.returns(Promise.resolve({ transferState: Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT })) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + const result = await allTransferHandlers.prepare(null, forwardedMessages[0]) + test.equal(Kafka.proceed.getCall(0).args[2].fspiopError.errorInformation.errorCode, ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR.code) + test.equal(result, true) + test.end() + }) + + prepareTest.test('produce error on transfer not found when receiving forwarded event message', async (test) => { + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + TransferService.getById.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + const result = await allTransferHandlers.prepare(null, forwardedMessages[0]) + test.equal(result, true) + test.equal(Kafka.proceed.getCall(0).args[2].fspiopError.errorInformation.errorCode, ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND.code) + test.end() + }) + + prepareTest.test('produce error for unexpected state when receiving fx-fowarded event message', async (test) => { + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + FxTransferService.getByIdLight.returns(Promise.resolve({ fxTransferState: Enum.Transfers.TransferInternalState.RESERVED_TIMEOUT })) + + const result = await allTransferHandlers.prepare(null, fxForwardedMessages[0]) + test.equal(Kafka.proceed.getCall(0).args[2].fspiopError.errorInformation.errorCode, ErrorHandler.Enums.FSPIOPErrorCodes.INTERNAL_SERVER_ERROR.code) + test.equal(result, true) + test.end() + }) + + prepareTest.test('produce error on transfer not found when receiving fx-forwarded event message', async (test) => { + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + FxTransferService.getByIdLight.returns(Promise.resolve(null)) + + const result = await allTransferHandlers.prepare(null, fxForwardedMessages[0]) + test.equal(result, true) + test.equal(Kafka.proceed.getCall(0).args[2].fspiopError.errorInformation.errorCode, ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND.code) + test.end() + }) + + prepareTest.end() + }) + + transferHandlerTest.test('prepare proxy scenarios should', prepareProxyTest => { + prepareProxyTest.test(` + handle scenario scheme A: POST /fxTransfer call I.e. Debtor: Payer DFSP → Creditor: Proxy AR + Payer DFSP postion account must be updated (reserved) + substitute creditor(counterpartyFsp) if not in scheme and found in proxy cache for /fxTransfers msg`, async (test) => { + // In this the counter party is not in scheme and is found in the proxy cache + getFSPProxyStub.withArgs(fxTransfer.counterPartyFsp).returns({ + inScheme: false, + proxyId: 'ProxyAR' + }) + + // Stub underlying methods for determiningTransferCheckResult + // so that proper currency validation lists are returned + TransferModel.getById.resolves(null) + + const localMessages = MainUtil.clone(fxMessages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + fxTransferModel.fxTransfer.savePreparedRequest.returns(Promise.resolve(true)) + Comparators.duplicateCheckComparator.returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + + // Payer DFSP postion account must be updated (reserved) + // The generated position message should be keyed with the initiatingFsp participant currency id + // which is `payerFsp` in this case + const result = await allTransferHandlers.prepare(null, localMessages) + const kafkaCallOne = Kafka.proceed.getCall(0) + test.equal(kafkaCallOne.args[2].messageKey, '2') + test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.POSITION) + test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.FX_PREPARE) + test.equal(result, true) + + // `to` `from` and `initiatingFsp` and `counterPartyFsp` is message should be the original values + test.equal(kafkaCallOne.args[1].message.value.from, 'fx_dfsp1') + test.equal(kafkaCallOne.args[1].message.value.to, 'fx_dfsp2') + test.equal(kafkaCallOne.args[1].decodedPayload.initiatingFsp, 'fx_dfsp1') + test.equal(kafkaCallOne.args[1].decodedPayload.counterPartyFsp, 'fx_dfsp2') + test.end() + }) + + prepareProxyTest.test(` + should handle Scheme A: POST /transfer call I.e. Debtor: Proxy AR → Creditor: Proxy AR + Do nothing + produce message with key=0 if both proxies for debtor and creditor are the same in /transfers msg`, async (test) => { + // Stub payee with same proxy + getFSPProxyStub.withArgs(transfer.payeeFsp).returns({ + inScheme: false, + proxyId: 'proxyAR' + }) + getFSPProxyStub.withArgs(fxTransfer.counterPartyFsp).returns({ + inScheme: false, + proxyId: 'proxyAR' + }) + checkSameCreditorDebtorProxyStub.resolves(true) + // Stub watchlist to mimic that transfer is part of fxTransfer + fxTransferModel.watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve([{ + fxTransferId: 1 + }])) + + const localMessages = MainUtil.clone(messages) + localMessages[0].value.content.payload.transferId = 'c05c3f31-33b5-4e33-8bfd-7c3a2685fb6c' + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.prepare.returns(Promise.resolve(true)) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + + const result = await allTransferHandlers.prepare(null, localMessages[0]) + const kafkaCallOne = Kafka.proceed.getCall(0) + + // Do nothing is represented by the position message with key=0 + test.equal(kafkaCallOne.args[2].messageKey, '0') + test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.POSITION) + test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.PREPARE) + test.equal(result, true) + + // `to` `from` and `payerFsp` and `payeeFsp` is message should be the original values + test.equal(kafkaCallOne.args[1].message.value.from, 'dfsp1') + test.equal(kafkaCallOne.args[1].message.value.to, 'dfsp2') + test.equal(kafkaCallOne.args[1].decodedPayload.payerFsp, 'dfsp1') + test.equal(kafkaCallOne.args[1].decodedPayload.payeeFsp, 'dfsp2') + test.end() + }) + + prepareProxyTest.test(` + should handle Scheme R: POST /fxTransfer call I.e. Debtor: Proxy AR → Creditor: FXP + Proxy AR position account in source currency must be updated (reserved) + substitute debtor(initiatingFsp) if not in scheme and found in proxy cache for /fxTransfers msg`, async (test) => { + // In this the initiatingFsp is not in scheme and is found in the proxy cache + getFSPProxyStub.withArgs(fxTransfer.initiatingFsp).returns({ + inScheme: false, + proxyId: 'ProxyAR' + }) + + // Stub underlying methods for determiningTransferCheckResult + // so that proper currency validation lists are returned + TransferModel.getById.resolves(null) + + const localMessages = MainUtil.clone(fxMessages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + fxTransferModel.fxTransfer.savePreparedRequest.returns(Promise.resolve(true)) + Comparators.duplicateCheckComparator.returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + + // The generated position message should be keyed with the proxy participant currency id + // which is `initiatingFspProxy` in this case + const result = await allTransferHandlers.prepare(null, localMessages) + const kafkaCallOne = Kafka.proceed.getCall(0) + test.equal(kafkaCallOne.args[2].messageKey, '5') + test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.POSITION) + test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.FX_PREPARE) + test.equal(result, true) + + // `to` `from` and `initiatingFsp` and `counterPartyFsp` is message should be the original values + test.equal(kafkaCallOne.args[1].message.value.from, 'fx_dfsp1') + test.equal(kafkaCallOne.args[1].message.value.to, 'fx_dfsp2') + test.equal(kafkaCallOne.args[1].decodedPayload.initiatingFsp, 'fx_dfsp1') + test.equal(kafkaCallOne.args[1].decodedPayload.counterPartyFsp, 'fx_dfsp2') + + test.end() + }) + + prepareProxyTest.test(` + should handle Scheme R: POST /Transfer call I.e. Debtor: FXP → Creditor: Proxy RB + FXP position account in targed currency must be updated (reserved) + substitute creditor(payeeFsp) if not in scheme and found in proxy cache for /fxTransfers msg`, async (test) => { + // Stub payee with same proxy + getFSPProxyStub.withArgs(transfer.payeeFsp).returns({ + inScheme: false, + proxyId: 'ProxyRB' + }) + + // Stub watchlist to mimic that transfer is part of fxTransfer + fxTransferModel.watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve({ fxTransferId: 1 })) + + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.prepare.returns(Promise.resolve(true)) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + + const result = await allTransferHandlers.prepare(null, localMessages[0]) + const kafkaCallOne = Kafka.proceed.getCall(0) + + // The generated position message should be keyed with the fxp participant currency id + // which is payerFsp in this case (naming here is confusing due reusing payload) + test.equal(kafkaCallOne.args[2].messageKey, '1') + test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.POSITION) + test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.PREPARE) + test.equal(result, true) + + // `to` `from` and `payerFsp` and `payeeFsp` is message should be the original values + test.equal(kafkaCallOne.args[1].message.value.from, 'dfsp1') + test.equal(kafkaCallOne.args[1].message.value.to, 'dfsp2') + test.equal(kafkaCallOne.args[1].decodedPayload.payerFsp, 'dfsp1') + test.equal(kafkaCallOne.args[1].decodedPayload.payeeFsp, 'dfsp2') + + test.end() + }) + + prepareProxyTest.test(` + should handle Scheme B: POST /transfer call I.e. Debtor: Proxy RB → Creditor: Payee DFSP + Proxy RB postion account must be updated (reserved) + substitute debtor(payerFsp) if not in scheme and found in proxy cache for /transfers msg`, async (test) => { + // Stub payee with same proxy + getFSPProxyStub.withArgs(transfer.payerFsp).returns({ + inScheme: false, + proxyId: 'ProxyRB' + }) + + // Scheme B has no visibility that this is part of an fxTransfer + fxTransferModel.watchList.getItemsInWatchListByDeterminingTransferId.returns(null) + + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.prepare.returns(Promise.resolve(true)) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + + const result = await allTransferHandlers.prepare(null, localMessages[0]) + const kafkaCallOne = Kafka.proceed.getCall(0) + + // The generated position message should be keyed with the payerFsp's proxy + test.equal(kafkaCallOne.args[2].messageKey, '6') + test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.POSITION) + test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.PREPARE) + test.equal(result, true) + + // `to` `from` and `payerFsp` and `payeeFsp` is message should be the original values + test.equal(kafkaCallOne.args[1].message.value.from, 'dfsp1') + test.equal(kafkaCallOne.args[1].message.value.to, 'dfsp2') + test.equal(kafkaCallOne.args[1].decodedPayload.payerFsp, 'dfsp1') + test.equal(kafkaCallOne.args[1].decodedPayload.payeeFsp, 'dfsp2') + test.end() + }) + + prepareProxyTest.test('throw error if debtor(payer) if not in scheme and not found in proxy cache in /transfers msg', async (test) => { + getFSPProxyStub.withArgs(transfer.payerFsp).returns({ + inScheme: false, + proxyId: null + }) + getFSPProxyStub.withArgs(transfer.payeeFsp).returns({ + inScheme: false, + proxyId: 'payeeProxy' + }) + + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.prepare.returns(Promise.resolve(true)) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + fxTransferModel.watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + const result = await allTransferHandlers.prepare(null, localMessages) + const kafkaCallOne = Kafka.proceed.getCall(0) + + try { + test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.NOTIFICATION) + test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.PREPARE) + test.equal(result, true) + test.end() + } catch (e) { + test.fail() + test.end() + } + }) + + prepareProxyTest.test('throw error if creditor(payee) if not in scheme and not found in proxy cache in /transfers msg', async (test) => { + getFSPProxyStub.withArgs(transfer.payerFsp).returns({ + inScheme: false, + proxyId: 'payerProxy' + }) + getFSPProxyStub.withArgs(transfer.payeeFsp).returns({ + inScheme: false, + proxyId: null + }) + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + TransferService.prepare.returns(Promise.resolve(true)) + TransferService.getTransferDuplicateCheck.returns(Promise.resolve(null)) + TransferService.saveTransferDuplicateCheck.returns(Promise.resolve(null)) + fxTransferModel.watchList.getItemsInWatchListByDeterminingTransferId.returns(Promise.resolve(null)) + Comparators.duplicateCheckComparator.returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + const result = await allTransferHandlers.prepare(null, localMessages) + const kafkaCallOne = Kafka.proceed.getCall(0) + + try { + test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.NOTIFICATION) + test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.PREPARE) + test.equal(result, true) + test.end() + } catch (e) { + test.fail() + test.end() + } + }) + + prepareProxyTest.test('throw error if debtor(initiatingFsp) if not in scheme and not found in proxy cache in /fxTransfers msg', async (test) => { + getFSPProxyStub.withArgs(fxTransfer.initiatingFsp).returns({ + inScheme: false, + proxyId: null + }) + getFSPProxyStub.withArgs(fxTransfer.counterPartyFsp).returns({ + inScheme: false, + proxyId: 'counterPartyFspProxy' + }) + const localMessages = MainUtil.clone(fxMessages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + fxTransferModel.fxTransfer.savePreparedRequest.returns(Promise.resolve(true)) + Comparators.duplicateCheckComparator.returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + const result = await allTransferHandlers.prepare(null, localMessages) + const kafkaCallOne = Kafka.proceed.getCall(0) + + try { + test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.NOTIFICATION) + test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.FX_PREPARE) + test.equal(result, true) + test.end() + } catch (e) { + test.fail() + test.end() + } + }) + + prepareProxyTest.test('throw error if debtor(counterpartyFsp) if not in scheme and not found in proxy cache in /fxTransfers msg', async (test) => { + getFSPProxyStub.withArgs(fxTransfer.initiatingFsp).returns({ + inScheme: false, + proxyId: 'initiatingFspProxy' + }) + getFSPProxyStub.withArgs(fxTransfer.counterPartyFsp).returns({ + inScheme: false, + proxyId: null + }) + const localMessages = MainUtil.clone(fxMessages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + fxTransferModel.fxTransfer.savePreparedRequest.returns(Promise.resolve(true)) + Comparators.duplicateCheckComparator.returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + const result = await allTransferHandlers.prepare(null, localMessages) + const kafkaCallOne = Kafka.proceed.getCall(0) + + try { + test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.NOTIFICATION) + test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.FX_PREPARE) + test.equal(result, true) + test.end() + } catch (e) { + test.fail() + test.end() + } + }) + + prepareProxyTest.test('update reserved transfer on forwarded prepare message', async (test) => { + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + TransferService.getById.returns(Promise.resolve({ transferState: Enum.Transfers.TransferInternalState.RESERVED })) + Comparators.duplicateCheckComparator.withArgs(transfer.transferId, transfer).returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + const result = await allTransferHandlers.prepare(null, forwardedMessages[0]) + test.ok(TransferService.forwardedPrepare.called) + test.equal(result, true) + test.end() + }) + + prepareProxyTest.test('update reserved fxTransfer on fx-forwarded prepare message', async (test) => { + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + FxTransferService.getByIdLight.returns(Promise.resolve({ fxTransferState: Enum.Transfers.TransferInternalState.RESERVED })) + const result = await allTransferHandlers.prepare(null, fxForwardedMessages[0]) + test.ok(FxTransferService.forwardedFxPrepare.called) + test.equal(result, true) + test.end() + }) + + prepareProxyTest.end() + }) + + transferHandlerTest.test('processDuplication', processDuplicationTest => { + processDuplicationTest.test('return undefined hasDuplicateId is falsey', async (test) => { + const result = await prepare.processDuplication({ + duplication: { + hasDuplicateId: false + } + }) + test.equal(result, undefined) + test.end() + }) + + processDuplicationTest.test('throw error if action is BULK_PREPARE', async (test) => { + try { + await prepare.processDuplication({ + duplication: { + hasDuplicateId: true, + hasDuplicateHash: true + }, + location: { module: 'PrepareHandler', method: '', path: '' }, + action: Action.BULK_PREPARE + }) + test.fail('Error not thrown') + } catch (e) { + test.pass('Error thrown') + } + test.end() + }) + processDuplicationTest.end() + }) + + transferHandlerTest.test('payer initiated conversion fxPrepare should', fxPrepareTest => { + fxPrepareTest.test('persist fxtransfer to database when messages is an array', async (test) => { + const localMessages = MainUtil.clone(fxMessages) + await Consumer.createHandler(topicName, config, command) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + fxTransferModel.fxTransfer.savePreparedRequest.returns(Promise.resolve(true)) + Comparators.duplicateCheckComparator.returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + + const result = await allTransferHandlers.prepare(null, localMessages) + const kafkaCallOne = Kafka.proceed.getCall(0) + + test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.POSITION) + test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.FX_PREPARE) + test.equal(result, true) + test.ok(Validator.validatePrepare.called) + test.ok(fxTransferModel.fxTransfer.savePreparedRequest.called) + test.ok(Comparators.duplicateCheckComparator.called) + test.end() + }) + + fxPrepareTest.test('persist transfer to database when messages is an array - consumer throws error', async (test) => { + const localMessages = MainUtil.clone(fxMessages) + await Consumer.createHandler(topicName, config, command) + Consumer.getConsumer.throws(new Error()) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + fxTransferModel.fxTransfer.savePreparedRequest.returns(Promise.resolve(true)) + Comparators.duplicateCheckComparator.returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + + const result = await allTransferHandlers.prepare(null, localMessages) + const kafkaCallOne = Kafka.proceed.getCall(0) + + test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.POSITION) + test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.FX_PREPARE) + test.equal(result, true) + test.ok(Validator.validatePrepare.called) + test.ok(fxTransferModel.fxTransfer.savePreparedRequest.called) + test.ok(Comparators.duplicateCheckComparator.called) + test.end() + }) + + fxPrepareTest.test('send callback when duplicate found', async (test) => { + const localMessages = MainUtil.clone(messages) + await Consumer.createHandler(topicName, config, command) + + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + fxTransferModel.fxTransfer.savePreparedRequest.returns(Promise.resolve(true)) + Comparators.duplicateCheckComparator.returns(Promise.resolve({ + hasDuplicateId: true, + hasDuplicateHash: true + })) + + const result = await allTransferHandlers.prepare(null, localMessages) + + test.equal(result, true) + test.end() + }) + + fxPrepareTest.test('persist transfer to database when single message sent', async (test) => { + const localMessages = MainUtil.clone(fxMessages) + await Consumer.createHandler(topicName, config, command) + + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: true, reasons: [] }) + fxTransferModel.fxTransfer.savePreparedRequest.returns(Promise.resolve(true)) + Comparators.duplicateCheckComparator.returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + + const result = await allTransferHandlers.prepare(null, localMessages[0]) + const kafkaCallOne = Kafka.proceed.getCall(0) + + test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.POSITION) + test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.FX_PREPARE) + test.equal(result, true) + test.ok(Validator.validatePrepare.called) + test.ok(fxTransferModel.fxTransfer.savePreparedRequest.called) + test.ok(Comparators.duplicateCheckComparator.called) + test.end() + }) + + fxPrepareTest.test('send notification when validation failed and duplicate error thrown by prepare', async (test) => { + const localMessages = MainUtil.clone(fxMessages) + await Consumer.createHandler(topicName, config, command) + + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: false, reasons: [] }) + fxTransferModel.fxTransfer.savePreparedRequest.throws(new Error()) + Comparators.duplicateCheckComparator.returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + + const result = await allTransferHandlers.prepare(null, localMessages) + const kafkaCallOne = Kafka.proceed.getCall(0) + + test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.NOTIFICATION) + // Is this not supposed to be FX_PREPARE? + test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.PREPARE) + test.equal(result, true) + test.end() + }) + + fxPrepareTest.test('send notification when validation failed and duplicate error thrown by prepare - kafka autocommit enabled', async (test) => { + const localMessages = MainUtil.clone(fxMessages) + await Consumer.createHandler(topicName, configAutocommit, command) + Consumer.isConsumerAutoCommitEnabled.returns(true) + + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: false, reasons: [] }) + fxTransferModel.fxTransfer.savePreparedRequest.throws(new Error()) + Comparators.duplicateCheckComparator.returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + + const result = await allTransferHandlers.prepare(null, localMessages) + const kafkaCallOne = Kafka.proceed.getCall(0) + + test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.NOTIFICATION) + // Is this not supposed to be FX_PREPARE? + test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.PREPARE) + test.equal(result, true) + test.end() + }) + + fxPrepareTest.test('fail validation and persist INVALID transfer to database and insert transferError', async (test) => { + const localMessages = MainUtil.clone(fxMessages) + await Consumer.createHandler(topicName, config, command) + + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: false, reasons: [] }) + fxTransferModel.fxTransfer.savePreparedRequest.returns(Promise.resolve(true)) + Comparators.duplicateCheckComparator.returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + + const result = await allTransferHandlers.prepare(null, localMessages) + const kafkaCallOne = Kafka.proceed.getCall(0) + + test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.NOTIFICATION) + test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.FX_PREPARE) + test.equal(result, true) + test.ok(Validator.validatePrepare.called) + test.ok(fxTransferModel.fxTransfer.savePreparedRequest.called) + test.ok(Comparators.duplicateCheckComparator.called) + test.end() + }) + + fxPrepareTest.test('fail validation and persist INVALID transfer to database and insert transferError - kafka autocommit enabled', async (test) => { + const localMessages = MainUtil.clone(fxMessages) + await Consumer.createHandler(topicName, configAutocommit, command) + Consumer.isConsumerAutoCommitEnabled.returns(true) + Kafka.transformAccountToTopicName.returns(topicName) + Kafka.proceed.returns(true) + Validator.validatePrepare.returns({ validationPassed: false, reasons: [] }) + fxTransferModel.fxTransfer.savePreparedRequest.returns(Promise.resolve(true)) + Comparators.duplicateCheckComparator.returns(Promise.resolve({ + hasDuplicateId: false, + hasDuplicateHash: false + })) + + const result = await allTransferHandlers.prepare(null, localMessages) + const kafkaCallOne = Kafka.proceed.getCall(0) + + test.equal(kafkaCallOne.args[2].eventDetail.functionality, Enum.Events.Event.Type.NOTIFICATION) + test.equal(kafkaCallOne.args[2].eventDetail.action, Enum.Events.Event.Action.FX_PREPARE) + test.equal(result, true) + test.ok(Validator.validatePrepare.called) + test.ok(fxTransferModel.fxTransfer.savePreparedRequest.called) + test.ok(Comparators.duplicateCheckComparator.called) + test.end() + }) + fxPrepareTest.end() + }) + transferHandlerTest.end() +}) diff --git a/test/unit/handlers/transfers/validator.test.js b/test/unit/handlers/transfers/validator.test.js index 64e3c9d1a..e24cbd635 100644 --- a/test/unit/handlers/transfers/validator.test.js +++ b/test/unit/handlers/transfers/validator.test.js @@ -4,12 +4,16 @@ const Test = require('tapes')(require('tape')) const Sinon = require('sinon') const Participant = require('../../../../src/domain/participant') const Transfer = require('../../../../src/domain/transfer') +const FxTransferModel = require('../../../../src/models/fxTransfer') const Validator = require('../../../../src/handlers/transfers/validator') const CryptoConditions = require('../../../../src/cryptoConditions') const Enum = require('@mojaloop/central-services-shared').Enum let payload let headers +let fxPayload +let fxHeaders +let determiningTransferCheckResult Test('transfer validator', validatorTest => { let sandbox @@ -39,14 +43,47 @@ Test('transfer validator', validatorTest => { ] } } + fxPayload = { + commitRequestId: '88622a75-5bde-4da4-a6cc-f4cd23b268c4', + determiningTransferId: 'c05c3f31-33b5-4e33-8bfd-7c3a2685fb6c', + condition: 'YlK5TZyhflbXaDRPtR5zhCu8FrbgvrQwwmzuH0iQ0AI', + expiration: new Date((new Date()).getTime() + (24 * 60 * 60 * 1000)), // tomorrow + initiatingFsp: 'fx_dfsp1', + counterPartyFsp: 'fx_dfsp2', + sourceAmount: { + currency: 'USD', + amount: '433.88' + }, + targetAmount: { + currency: 'EUR', + amount: '200.00' + } + } headers = { 'fspiop-source': 'dfsp1', 'fspiop-destination': 'dfsp2' } + fxHeaders = { + 'fspiop-source': 'fx_dfsp1', + 'fspiop-destination': 'fx_dfsp2' + } + determiningTransferCheckResult = { + participantCurrencyValidationList: [ + { + participantName: 'dfsp1', + currencyId: 'USD' + }, + { + participantName: 'dfsp2', + currencyId: 'USD' + } + ] + } sandbox = Sinon.createSandbox() sandbox.stub(Participant) sandbox.stub(CryptoConditions, 'validateCondition') sandbox.stub(Transfer, 'getTransferParticipant') + sandbox.stub(FxTransferModel.fxTransfer, 'getFxTransferParticipant') test.end() }) @@ -61,7 +98,7 @@ Test('transfer validator', validatorTest => { Participant.getAccountByNameAndCurrency.returns(Promise.resolve({ currencyIsActive: true })) CryptoConditions.validateCondition.returns(true) - const { validationPassed } = await Validator.validatePrepare(payload, headers) + const { validationPassed } = await Validator.validatePrepare(payload, headers, false, determiningTransferCheckResult) test.equal(validationPassed, true) test.end() }) @@ -75,7 +112,7 @@ Test('transfer validator', validatorTest => { validatePrepareTest.test('fail validation when FSPIOP-Source doesnt match Payer', async (test) => { const headersModified = { 'fspiop-source': 'dfsp2' } - const { validationPassed, reasons } = await Validator.validatePrepare(payload, headersModified) + const { validationPassed, reasons } = await Validator.validatePrepare(payload, headersModified, false, determiningTransferCheckResult) test.equal(validationPassed, false) test.deepEqual(reasons, ['FSPIOP-Source header should match Payer']) test.end() @@ -86,7 +123,7 @@ Test('transfer validator', validatorTest => { Participant.getAccountByNameAndCurrency.returns(Promise.resolve({ currencyIsActive: true })) CryptoConditions.validateCondition.throws(new Error()) - const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers) + const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers, false, determiningTransferCheckResult) test.equal(validationPassed, false) test.deepEqual(reasons, ['Condition validation failed']) test.end() @@ -97,7 +134,7 @@ Test('transfer validator', validatorTest => { Participant.getAccountByNameAndCurrency.returns(Promise.resolve({ currencyIsActive: true })) payload.condition = null - const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers) + const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers, false, determiningTransferCheckResult) test.equal(validationPassed, false) test.deepEqual(reasons, ['Condition is required for a conditional transfer']) test.end() @@ -109,7 +146,7 @@ Test('transfer validator', validatorTest => { CryptoConditions.validateCondition.returns(true) payload.expiration = '1971-11-24T08:38:08.699-04:00' - const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers) + const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers, false, determiningTransferCheckResult) test.equal(validationPassed, false) test.deepEqual(reasons, ['Expiration date 1971-11-24T12:38:08.699Z is already in the past']) test.end() @@ -121,7 +158,7 @@ Test('transfer validator', validatorTest => { CryptoConditions.validateCondition.returns(true) payload.expiration = null - const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers) + const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers, false, determiningTransferCheckResult) test.equal(validationPassed, false) test.deepEqual(reasons, ['Expiration is required for conditional transfer']) test.end() @@ -133,7 +170,7 @@ Test('transfer validator', validatorTest => { Participant.getAccountByNameAndCurrency.returns(Promise.resolve({ currencyIsActive: true })) CryptoConditions.validateCondition.returns(true) - const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers) + const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers, false, determiningTransferCheckResult) test.equal(validationPassed, false) test.deepEqual(reasons, ['Participant dfsp2 not found']) test.end() @@ -145,7 +182,7 @@ Test('transfer validator', validatorTest => { Participant.getAccountByNameAndCurrency.returns(Promise.resolve({ currencyIsActive: true })) CryptoConditions.validateCondition.returns(true) - const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers) + const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers, false, determiningTransferCheckResult) test.equal(validationPassed, false) test.deepEqual(reasons, ['Participant dfsp2 is inactive']) test.end() @@ -158,7 +195,7 @@ Test('transfer validator', validatorTest => { Participant.getAccountByNameAndCurrency.withArgs('dfsp2', 'USD', Enum.Accounts.LedgerAccountType.POSITION).returns(Promise.resolve(null)) CryptoConditions.validateCondition.returns(true) - const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers) + const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers, false, determiningTransferCheckResult) test.equal(validationPassed, false) test.deepEqual(reasons, ['Participant dfsp2 USD account not found']) test.end() @@ -171,7 +208,7 @@ Test('transfer validator', validatorTest => { Participant.getAccountByNameAndCurrency.withArgs('dfsp2', 'USD', Enum.Accounts.LedgerAccountType.POSITION).returns(Promise.resolve({ currencyIsActive: false })) CryptoConditions.validateCondition.returns(true) - const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers) + const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers, false, determiningTransferCheckResult) test.equal(validationPassed, false) test.deepEqual(reasons, ['Participant dfsp2 USD account is inactive']) test.end() @@ -183,7 +220,7 @@ Test('transfer validator', validatorTest => { CryptoConditions.validateCondition.returns(true) payload.amount.amount = '123.12345' - const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers) + const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers, false, determiningTransferCheckResult) test.equal(validationPassed, false) test.deepEqual(reasons, ['Amount 123.12345 exceeds allowed scale of 4']) test.end() @@ -195,7 +232,7 @@ Test('transfer validator', validatorTest => { CryptoConditions.validateCondition.returns(true) payload.payeeFsp = payload.payerFsp - const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers) + const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers, false, determiningTransferCheckResult) test.equal(validationPassed, false) test.deepEqual(reasons, ['Payer FSP and Payee FSP should be different, unless on-us tranfers are allowed by the Scheme']) test.end() @@ -207,12 +244,24 @@ Test('transfer validator', validatorTest => { CryptoConditions.validateCondition.returns(true) payload.amount.amount = '123456789012345.6789' - const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers) + const { validationPassed, reasons } = await Validator.validatePrepare(payload, headers, false, determiningTransferCheckResult) test.equal(validationPassed, false) test.deepEqual(reasons, ['Amount 123456789012345.6789 exceeds allowed precision of 18']) test.end() }) + validatePrepareTest.test('select variables based on prepare is fx', async (test) => { + Participant.getByName.returns(Promise.resolve({ isActive: true })) + Participant.getAccountByNameAndCurrency.returns(Promise.resolve({ currencyIsActive: true })) + CryptoConditions.validateCondition.returns(true) + + const { validationPassed } = await Validator.validatePrepare(fxPayload, fxHeaders, true, determiningTransferCheckResult) + test.equal(validationPassed, true) + test.ok(Participant.getByName.calledWith('fx_dfsp1')) + test.ok(Participant.getByName.calledWith('fx_dfsp2')) + test.end() + }) + validatePrepareTest.end() }) @@ -294,5 +343,29 @@ Test('transfer validator', validatorTest => { validateParticipantTransferIdTest.end() }) + validatorTest.test('validateParticipantForCommitRequestId should', validateParticipantForCommitRequestIdTest => { + validateParticipantForCommitRequestIdTest.test('validate the CommitRequestId belongs to the requesting fsp', async (test) => { + const participantName = 'fsp1' + const commitRequestId = '88416f4c-68a3-4819-b8e0-c23b27267cd5' + FxTransferModel.fxTransfer.getFxTransferParticipant.withArgs(participantName, commitRequestId).returns(Promise.resolve([1])) + + const result = await Validator.validateParticipantForCommitRequestId(participantName, commitRequestId) + test.equal(result, true, 'results match') + test.end() + }) + + validateParticipantForCommitRequestIdTest.test('validate the CommitRequestId belongs to the requesting fsp return false for no match', async (test) => { + const participantName = 'fsp1' + const commitRequestId = '88416f4c-68a3-4819-b8e0-c23b27267cd5' + FxTransferModel.fxTransfer.getFxTransferParticipant.withArgs(participantName, commitRequestId).returns(Promise.resolve([])) + + const result = await Validator.validateParticipantForCommitRequestId(participantName, commitRequestId) + test.equal(result, false, 'results match') + test.end() + }) + + validateParticipantForCommitRequestIdTest.end() + }) + validatorTest.end() }) diff --git a/test/unit/lib/cachingOfEnums.test.js b/test/unit/lib/cachingOfEnums.test.js index cb5036a10..26ceefbcd 100644 --- a/test/unit/lib/cachingOfEnums.test.js +++ b/test/unit/lib/cachingOfEnums.test.js @@ -3,10 +3,13 @@ License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -14,7 +17,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/lib/config.test.js b/test/unit/lib/config.test.js index 2e03c4199..5fd3c685f 100644 --- a/test/unit/lib/config.test.js +++ b/test/unit/lib/config.test.js @@ -42,17 +42,5 @@ Test('Config should', configTest => { test.end() }) - configTest.test('evaluate MONGODB_DISABLED to a boolean if a string', async function (test) { - console.log(Defaults) - const DefaultsStub = { ...Defaults } - DefaultsStub.MONGODB.DISABLED = 'true' - const Config = Proxyquire('../../../src/lib/config', { - '../../config/default.json': DefaultsStub - }) - - test.ok(Config.MONGODB_DISABLED === true) - test.end() - }) - configTest.end() }) diff --git a/test/unit/lib/enum.test.js b/test/unit/lib/enum.test.js index 17c26e973..dc7fa7e65 100644 --- a/test/unit/lib/enum.test.js +++ b/test/unit/lib/enum.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/lib/enumCached.test.js b/test/unit/lib/enumCached.test.js index 81a4bf3f3..123561337 100644 --- a/test/unit/lib/enumCached.test.js +++ b/test/unit/lib/enumCached.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/lib/healthCheck/subServiceHealth.test.js b/test/unit/lib/healthCheck/subServiceHealth.test.js index a02515f99..9ebadd2d7 100644 --- a/test/unit/lib/healthCheck/subServiceHealth.test.js +++ b/test/unit/lib/healthCheck/subServiceHealth.test.js @@ -1,8 +1,8 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 @@ -15,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . @@ -37,21 +37,23 @@ const { statusEnum, serviceName } = require('@mojaloop/central-services-shared') const MigrationLockModel = require('../../../../src/models/misc/migrationLock') const Consumer = require('@mojaloop/central-services-stream').Util.Consumer const Logger = require('@mojaloop/central-services-logger') +const ProxyCache = require('#src/lib/proxyCache') const { getSubServiceHealthBroker, - getSubServiceHealthDatastore + getSubServiceHealthDatastore, + getSubServiceHealthProxyCache } = require('../../../../src/lib/healthCheck/subServiceHealth.js') Test('SubServiceHealth test', subServiceHealthTest => { let sandbox - + let proxyCacheStub subServiceHealthTest.beforeEach(t => { sandbox = Sinon.createSandbox() sandbox.stub(Consumer, 'getListOfTopics') sandbox.stub(Consumer, 'isConnected') sandbox.stub(Logger, 'isDebugEnabled').value(true) - + proxyCacheStub = sandbox.stub(ProxyCache, 'getCache') t.end() }) @@ -151,5 +153,38 @@ Test('SubServiceHealth test', subServiceHealthTest => { datastoreTest.end() }) + subServiceHealthTest.test('getSubServiceHealthProxyCache', proxyCacheTest => { + proxyCacheTest.test('Reports up when not health', async test => { + // Arrange + proxyCacheStub.returns({ + healthCheck: sandbox.stub().returns(Promise.resolve(true)) + }) + const expected = { name: 'proxyCache', status: statusEnum.OK } + + // Act + const result = await getSubServiceHealthProxyCache() + + // Assert + test.deepEqual(result, expected, 'getSubServiceHealthBroker should match expected result') + test.end() + }) + + proxyCacheTest.test('Reports down when not health', async test => { + // Arrange + proxyCacheStub.returns({ + healthCheck: sandbox.stub().returns(Promise.resolve(false)) + }) + const expected = { name: 'proxyCache', status: statusEnum.DOWN } + + // Act + const result = await getSubServiceHealthProxyCache() + + // Assert + test.deepEqual(result, expected, 'getSubServiceHealthBroker should match expected result') + test.end() + }) + proxyCacheTest.end() + }) + subServiceHealthTest.end() }) diff --git a/test/unit/lib/proxyCache.test.js b/test/unit/lib/proxyCache.test.js new file mode 100644 index 000000000..ab8407760 --- /dev/null +++ b/test/unit/lib/proxyCache.test.js @@ -0,0 +1,182 @@ +'use strict' + +const Test = require('tapes')(require('tape')) +const Sinon = require('sinon') +const Proxyquire = require('proxyquire') +const ParticipantService = require('../../../src/domain/participant') +const Config = require('../../../src/lib/config') + +const connectStub = Sinon.stub() +const disconnectStub = Sinon.stub() +const lookupProxyByDfspIdStub = Sinon.stub() +lookupProxyByDfspIdStub.withArgs('existingDfspId1').resolves('proxyId') +lookupProxyByDfspIdStub.withArgs('existingDfspId2').resolves('proxyId') +lookupProxyByDfspIdStub.withArgs('existingDfspId3').resolves('proxyId1') +lookupProxyByDfspIdStub.withArgs('nonExistingDfspId1').resolves(null) +lookupProxyByDfspIdStub.withArgs('nonExistingDfspId2').resolves(null) + +const createProxyCacheStub = Sinon.stub().returns({ + connect: connectStub, + disconnect: disconnectStub, + lookupProxyByDfspId: lookupProxyByDfspIdStub +}) +const ProxyCache = Proxyquire('../../../src/lib/proxyCache', { + '@mojaloop/inter-scheme-proxy-cache-lib': { + createProxyCache: createProxyCacheStub + } +}) + +Test('Proxy Cache test', async (proxyCacheTest) => { + let sandbox + + proxyCacheTest.beforeEach(t => { + sandbox = Sinon.createSandbox() + sandbox.stub(Config.PROXY_CACHE_CONFIG, 'type') + sandbox.stub(Config.PROXY_CACHE_CONFIG, 'proxyConfig') + sandbox.stub(ParticipantService) + t.end() + }) + + proxyCacheTest.afterEach(t => { + sandbox.restore() + t.end() + }) + + await proxyCacheTest.test('connect', async (connectTest) => { + await connectTest.test('connect to cache with lazyConnect', async (test) => { + await ProxyCache.connect() + test.ok(connectStub.calledOnce) + test.end() + }) + + await connectTest.test('connect to cache with default config if not redis storage type', async (test) => { + await ProxyCache.reset() + connectStub.resetHistory() + createProxyCacheStub.resetHistory() + Config.PROXY_CACHE_CONFIG.type = 'mysql' + await ProxyCache.connect() + test.ok(connectStub.calledOnce) + const secondArg = createProxyCacheStub.getCall(0).args[1] + test.ok(secondArg.lazyConnect === undefined) + test.end() + }) + + connectTest.end() + }) + + await proxyCacheTest.test('disconnect', async (disconnectTest) => { + await disconnectTest.test('disconnect from cache', async (test) => { + await ProxyCache.disconnect() + test.pass() + test.end() + }) + + disconnectTest.end() + }) + + await proxyCacheTest.test('getCache', async (getCacheTest) => { + await getCacheTest.test('resolve proxy id if participant not in scheme and proxyId is in cache', async (test) => { + await ProxyCache.getCache() + test.pass() + test.end() + }) + getCacheTest.end() + }) + + await proxyCacheTest.test('getFSPProxy', async (getFSPProxyTest) => { + await getFSPProxyTest.test('resolve proxy id if participant not in scheme and proxyId is in cache', async (test) => { + ParticipantService.getByName.returns(Promise.resolve(null)) + const dfspId = 'existingDfspId1' + const result = await ProxyCache.getFSPProxy(dfspId) + + test.deepEqual(result, { inScheme: false, proxyId: 'proxyId', name: dfspId }) + test.end() + }) + + await getFSPProxyTest.test('resolve proxy id if participant not in scheme and proxyId is not cache', async (test) => { + ParticipantService.getByName.returns(Promise.resolve(null)) + const dsfpId = 'nonExistingDfspId1' + const result = await ProxyCache.getFSPProxy(dsfpId) + + test.deepEqual(result, { inScheme: false, proxyId: null, name: dsfpId }) + test.end() + }) + + await getFSPProxyTest.test('not resolve proxyId if participant is in scheme', async (test) => { + ParticipantService.getByName.returns(Promise.resolve({ participantId: 1 })) + const result = await ProxyCache.getFSPProxy('existingDfspId1') + + test.deepEqual(result, { inScheme: true, proxyId: null, name: 'existingDfspId1' }) + test.end() + }) + + getFSPProxyTest.end() + }) + + await proxyCacheTest.test('checkSameCreditorDebtorProxy', async (checkSameCreditorDebtorProxyTest) => { + await checkSameCreditorDebtorProxyTest.test('resolve true if proxy of debtor and creditor are truth and the same', async (test) => { + const result = await ProxyCache.checkSameCreditorDebtorProxy('existingDfspId1', 'existingDfspId2') + test.deepEqual(result, true) + test.end() + }) + + await checkSameCreditorDebtorProxyTest.test('resolve false if proxy of debtor and creditor are truth and different', async (test) => { + const result = await ProxyCache.checkSameCreditorDebtorProxy('existingDfspId1', 'existingDfspId3') + test.deepEqual(result, false) + test.end() + }) + + await checkSameCreditorDebtorProxyTest.test('resolve false if proxy of debtor and creditor are same but falsy', async (test) => { + const result = await ProxyCache.checkSameCreditorDebtorProxy('nonExistingDfspId1', 'nonExistingDfspId1') + test.deepEqual(result, false) + test.end() + }) + + checkSameCreditorDebtorProxyTest.end() + }) + + await proxyCacheTest.test('getProxyParticipantAccountDetails', async (getProxyParticipantAccountDetailsTest) => { + await getProxyParticipantAccountDetailsTest.test('resolve participantCurrencyId if participant is in scheme', async (test) => { + ParticipantService.getByName.returns(Promise.resolve({ participantId: 1 })) + ParticipantService.getAccountByNameAndCurrency.returns(Promise.resolve({ participantCurrencyId: 123 })) + const result = await ProxyCache.getProxyParticipantAccountDetails('nonExistingDfspId1', 'XXX') + test.deepEqual(result, { inScheme: true, participantCurrencyId: 123 }) + test.end() + }) + + await getProxyParticipantAccountDetailsTest.test('resolve participantCurrencyId of the proxy if participant is not in scheme', async (test) => { + ParticipantService.getByName.returns(Promise.resolve(null)) + ParticipantService.getAccountByNameAndCurrency.returns(Promise.resolve({ participantCurrencyId: 456 })) + const result = await ProxyCache.getProxyParticipantAccountDetails('existingDfspId1', 'XXX') + test.deepEqual(result, { inScheme: false, participantCurrencyId: 456 }) + test.end() + }) + + await getProxyParticipantAccountDetailsTest.test('resolve null if participant is in scheme and there is no account', async (test) => { + ParticipantService.getByName.returns(Promise.resolve({ participantId: 1 })) + ParticipantService.getAccountByNameAndCurrency.returns(Promise.resolve(null)) + const result = await ProxyCache.getProxyParticipantAccountDetails('nonExistingDfspId1', 'XXX') + test.deepEqual(result, { inScheme: true, participantCurrencyId: null }) + test.end() + }) + + await getProxyParticipantAccountDetailsTest.test('resolve null if participant is not in scheme and also there is no proxy in cache', async (test) => { + ParticipantService.getByName.returns(Promise.resolve(null)) + const result = await ProxyCache.getProxyParticipantAccountDetails('nonExistingDfspId1', 'XXX') + test.deepEqual(result, { inScheme: false, participantCurrencyId: null }) + test.end() + }) + + await getProxyParticipantAccountDetailsTest.test('resolve null if participant is not in scheme and proxy exists but no account', async (test) => { + ParticipantService.getByName.returns(Promise.resolve(null)) + ParticipantService.getAccountByNameAndCurrency.returns(Promise.resolve(null)) + const result = await ProxyCache.getProxyParticipantAccountDetails('existingDfspId1', 'XXX') + test.deepEqual(result, { inScheme: false, participantCurrencyId: null }) + test.end() + }) + + getProxyParticipantAccountDetailsTest.end() + }) + + proxyCacheTest.end() +}) diff --git a/test/unit/lib/requestLogger.test.js b/test/unit/lib/requestLogger.test.js index b455c5382..d6a4e4ad4 100644 --- a/test/unit/lib/requestLogger.test.js +++ b/test/unit/lib/requestLogger.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/lib/urlparser.test.js b/test/unit/lib/urlparser.test.js index 15adc169b..b97f25803 100644 --- a/test/unit/lib/urlparser.test.js +++ b/test/unit/lib/urlparser.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/fxTransfer/duplicateCheck.test.js b/test/unit/models/fxTransfer/duplicateCheck.test.js new file mode 100644 index 000000000..529c7cd38 --- /dev/null +++ b/test/unit/models/fxTransfer/duplicateCheck.test.js @@ -0,0 +1,257 @@ +'use strict' + +const Db = require('../../../../src/lib/db') +const Test = require('tapes')(require('tape')) +const sinon = require('sinon') +const duplicateCheck = require('../../../../src/models/fxTransfer/duplicateCheck') +const { TABLE_NAMES } = require('../../../../src/shared/constants') + +Test('DuplicateCheck', async (duplicateCheckTest) => { + let sandbox + + duplicateCheckTest.beforeEach(t => { + sandbox = sinon.createSandbox() + Db.fxTransferDuplicateCheck = { + insert: sandbox.stub(), + findOne: sandbox.stub(), + find: sandbox.stub() + } + Db.fxTransferErrorDuplicateCheck = { + insert: sandbox.stub(), + findOne: sandbox.stub(), + find: sandbox.stub() + } + Db.fxTransferFulfilmentDuplicateCheck = { + insert: sandbox.stub(), + findOne: sandbox.stub(), + find: sandbox.stub() + } + Db.from = (table) => { + return { + ...Db[table] + } + } + t.end() + }) + + duplicateCheckTest.afterEach(t => { + sandbox.restore() + t.end() + }) + + duplicateCheckTest.test('getFxTransferDuplicateCheck should retrieve the record from fxTransferDuplicateCheck table if present', async (test) => { + const commitRequestId = '123456789' + const expectedRecord = { id: 1, commitRequestId, hash: 'abc123' } + + // Mock the Db.from().findOne() method to return the expected record + Db.from(TABLE_NAMES.fxTransferDuplicateCheck).findOne.resolves(expectedRecord) + + try { + const result = await duplicateCheck.getFxTransferDuplicateCheck(commitRequestId) + + test.deepEqual(result, expectedRecord, 'Should return the expected record') + test.ok(Db.from(TABLE_NAMES.fxTransferDuplicateCheck).findOne.calledOnceWith({ commitRequestId }), 'Should call Db.from().findOne() with the correct parameters') + + test.end() + } catch (error) { + test.fail(`Error thrown: ${error}`) + test.end() + } + }) + + duplicateCheckTest.test('getFxTransferDuplicateCheck should throw an error if Db.from().findOne() fails', async (test) => { + const commitRequestId = '123456789' + const expectedError = new Error('Database error') + + // Mock the Db.from().findOne() method to throw an error + Db.from(TABLE_NAMES.fxTransferDuplicateCheck).findOne.throws(expectedError) + + try { + await duplicateCheck.getFxTransferDuplicateCheck(commitRequestId) + + test.fail('Should throw an error') + test.end() + } catch (error) { + test.equal(error.message, expectedError.message, 'Should throw the expected error') + test.ok(Db.from(TABLE_NAMES.fxTransferDuplicateCheck).findOne.calledOnceWith({ commitRequestId }), 'Should call Db.from().findOne() with the correct parameters') + + test.end() + } + }) + + duplicateCheckTest.test('saveFxTransferDuplicateCheck should insert a record into fxTransferDuplicateCheck table', async (test) => { + const commitRequestId = '123456789' + const hash = 'abc123' + const expectedId = 1 + + // Mock the Db.from().insert() method to return the expected id + Db.from(TABLE_NAMES.fxTransferDuplicateCheck).insert.resolves(expectedId) + + try { + const result = await duplicateCheck.saveFxTransferDuplicateCheck(commitRequestId, hash) + + test.equal(result, expectedId, 'Should return the expected id') + test.ok(Db.from(TABLE_NAMES.fxTransferDuplicateCheck).insert.calledOnceWith({ commitRequestId, hash }), 'Should call Db.from().insert() with the correct parameters') + + test.end() + } catch (error) { + test.fail(`Error thrown: ${error}`) + test.end() + } + }) + + duplicateCheckTest.test('saveFxTransferDuplicateCheck should throw an error if Db.from().insert() fails', async (test) => { + const commitRequestId = '123456789' + const hash = 'abc123' + const expectedError = new Error('Database error') + + // Mock the Db.from().insert() method to throw an error + Db.from(TABLE_NAMES.fxTransferDuplicateCheck).insert.throws(expectedError) + + try { + await duplicateCheck.saveFxTransferDuplicateCheck(commitRequestId, hash) + + test.fail('Should throw an error') + test.end() + } catch (error) { + test.equal(error.message, expectedError.message, 'Should throw the expected error') + test.ok(Db.from(TABLE_NAMES.fxTransferDuplicateCheck).insert.calledOnceWith({ commitRequestId, hash }), 'Should call Db.from().insert() with the correct parameters') + + test.end() + } + }) + + duplicateCheckTest.test('getFxTransferErrorDuplicateCheck should retrieve the record from fxTransferErrorDuplicateCheck table if present', async (test) => { + const commitRequestId = '123456789' + const expectedRecord = { id: 1, commitRequestId, hash: 'abc123' } + // Mock the Db.from().findOne() method to return the expected record + Db.from(TABLE_NAMES.fxTransferErrorDuplicateCheck).findOne.resolves(expectedRecord) + try { + const result = await duplicateCheck.getFxTransferErrorDuplicateCheck(commitRequestId) + test.deepEqual(result, expectedRecord, 'Should return the expected record') + test.ok(Db.from(TABLE_NAMES.fxTransferErrorDuplicateCheck).findOne.calledOnceWith({ commitRequestId }), 'Should call Db.from().findOne() with the correct parameters') + test.end() + } catch (error) { + test.fail(`Error thrown: ${error}`) + test.end() + } + }) + + duplicateCheckTest.test('getFxTransferErrorDuplicateCheck should throw an error if Db.from().findOne() fails', async (test) => { + const commitRequestId = '123456789' + const expectedError = new Error('Database error') + // Mock the Db.from().findOne() method to throw an error + Db.from(TABLE_NAMES.fxTransferErrorDuplicateCheck).findOne.throws(expectedError) + try { + await duplicateCheck.getFxTransferErrorDuplicateCheck(commitRequestId) + test.fail('Should throw an error') + test.end() + } catch (error) { + test.equal(error.message, expectedError.message, 'Should throw the expected error') + test.ok(Db.from(TABLE_NAMES.fxTransferErrorDuplicateCheck).findOne.calledOnceWith({ commitRequestId }), 'Should call Db.from().findOne() with the correct parameters') + test.end() + } + }) + + duplicateCheckTest.test('saveFxTransferErrorDuplicateCheck should insert a record into fxTransferErrorDuplicateCheck table', async (test) => { + const commitRequestId = '123456789' + const hash = 'abc123' + const expectedId = 1 + // Mock the Db.from().insert() method to return the expected id + Db.from(TABLE_NAMES.fxTransferErrorDuplicateCheck).insert.resolves(expectedId) + try { + const result = await duplicateCheck.saveFxTransferErrorDuplicateCheck(commitRequestId, hash) + test.equal(result, expectedId, 'Should return the expected id') + test.ok(Db.from(TABLE_NAMES.fxTransferErrorDuplicateCheck).insert.calledOnceWith({ commitRequestId, hash }), 'Should call Db.from().insert() with the correct parameters') + test.end() + } catch (error) { + test.fail(`Error thrown: ${error}`) + test.end() + } + }) + + duplicateCheckTest.test('saveFxTransferErrorDuplicateCheck should throw an error if Db.from().insert() fails', async (test) => { + const commitRequestId = '123456789' + const hash = 'abc123' + const expectedError = new Error('Database error') + // Mock the Db.from().insert() method to throw an error + Db.from(TABLE_NAMES.fxTransferErrorDuplicateCheck).insert.throws(expectedError) + try { + await duplicateCheck.saveFxTransferErrorDuplicateCheck(commitRequestId, hash) + test.fail('Should throw an error') + test.end() + } catch (error) { + test.equal(error.message, expectedError.message, 'Should throw the expected error') + test.ok(Db.from(TABLE_NAMES.fxTransferErrorDuplicateCheck).insert.calledOnceWith({ commitRequestId, hash }), 'Should call Db.from().insert() with the correct parameters') + test.end() + } + }) + + duplicateCheckTest.test('getFxTransferFulfilmentDuplicateCheck should retrieve the record from fxTransferFulfilmentDuplicateCheck table if present', async (test) => { + const commitRequestId = '123456789' + const expectedRecord = { id: 1, commitRequestId, hash: 'abc123' } + // Mock the Db.from().findOne() method to return the expected record + Db.from(TABLE_NAMES.fxTransferFulfilmentDuplicateCheck).findOne.resolves(expectedRecord) + try { + const result = await duplicateCheck.getFxTransferFulfilmentDuplicateCheck(commitRequestId) + test.deepEqual(result, expectedRecord, 'Should return the expected record') + test.ok(Db.from(TABLE_NAMES.fxTransferFulfilmentDuplicateCheck).findOne.calledOnceWith({ commitRequestId }), 'Should call Db.from().findOne() with the correct parameters') + test.end() + } catch (error) { + test.fail(`Error thrown: ${error}`) + test.end() + } + }) + + duplicateCheckTest.test('getFxTransferFulfilmentDuplicateCheck should throw an error if Db.from().findOne() fails', async (test) => { + const commitRequestId = '123456789' + const expectedError = new Error('Database error') + // Mock the Db.from().findOne() method to throw an error + Db.from(TABLE_NAMES.fxTransferFulfilmentDuplicateCheck).findOne.throws(expectedError) + try { + await duplicateCheck.getFxTransferFulfilmentDuplicateCheck(commitRequestId) + test.fail('Should throw an error') + test.end() + } catch (error) { + test.equal(error.message, expectedError.message, 'Should throw the expected error') + test.ok(Db.from(TABLE_NAMES.fxTransferFulfilmentDuplicateCheck).findOne.calledOnceWith({ commitRequestId }), 'Should call Db.from().findOne() with the correct parameters') + test.end() + } + }) + + duplicateCheckTest.test('saveFxTransferFulfilmentDuplicateCheck should insert a record into fxTransferFulfilmentDuplicateCheck table', async (test) => { + const commitRequestId = '123456789' + const hash = 'abc123' + const expectedId = 1 + // Mock the Db.from().insert() method to return the expected id + Db.from(TABLE_NAMES.fxTransferFulfilmentDuplicateCheck).insert.resolves(expectedId) + try { + const result = await duplicateCheck.saveFxTransferFulfilmentDuplicateCheck(commitRequestId, hash) + test.equal(result, expectedId, 'Should return the expected id') + test.ok(Db.from(TABLE_NAMES.fxTransferFulfilmentDuplicateCheck).insert.calledOnceWith({ commitRequestId, hash }), 'Should call Db.from().insert() with the correct parameters') + test.end() + } catch (error) { + test.fail(`Error thrown: ${error}`) + test.end() + } + }) + + duplicateCheckTest.test('saveFxTransferFulfilmentDuplicateCheck should throw an error if Db.from().insert() fails', async (test) => { + const commitRequestId = '123456789' + const hash = 'abc123' + const expectedError = new Error('Database error') + // Mock the Db.from().insert() method to throw an error + Db.from(TABLE_NAMES.fxTransferFulfilmentDuplicateCheck).insert.throws(expectedError) + try { + await duplicateCheck.saveFxTransferFulfilmentDuplicateCheck(commitRequestId, hash) + test.fail('Should throw an error') + test.end() + } catch (error) { + test.equal(error.message, expectedError.message, 'Should throw the expected error') + test.ok(Db.from(TABLE_NAMES.fxTransferFulfilmentDuplicateCheck).insert.calledOnceWith({ commitRequestId, hash }), 'Should call Db.from().insert() with the correct parameters') + test.end() + } + }) + + duplicateCheckTest.end() +}) diff --git a/test/unit/models/fxTransfer/watchList.test.js b/test/unit/models/fxTransfer/watchList.test.js new file mode 100644 index 000000000..630002317 --- /dev/null +++ b/test/unit/models/fxTransfer/watchList.test.js @@ -0,0 +1,77 @@ +'use strict' + +const Db = require('../../../../src/lib/db') +const Test = require('tapes')(require('tape')) +const sinon = require('sinon') +const watchList = require('../../../../src/models/fxTransfer/watchList') +const { TABLE_NAMES } = require('../../../../src/shared/constants') + +Test('Transfer facade', async (watchListTest) => { + let sandbox + + watchListTest.beforeEach(t => { + sandbox = sinon.createSandbox() + Db.fxWatchList = { + insert: sandbox.stub(), + findOne: sandbox.stub(), + find: sandbox.stub() + } + Db.from = (table) => { + return { + ...Db[table] + } + } + t.end() + }) + + watchListTest.afterEach(t => { + sandbox.restore() + t.end() + }) + + await watchListTest.test('getItemInWatchListByCommitRequestId should return the item in watch list', async (t) => { + const commitRequestId = '123456' + const expectedItem = { commitRequestId: '123456', amount: 100 } + + // Mock the database findOne method + Db.from(TABLE_NAMES.fxWatchList).findOne.returns(expectedItem) + + const result = await watchList.getItemInWatchListByCommitRequestId(commitRequestId) + + t.deepEqual(result, expectedItem, 'Should return the expected item') + t.ok(Db.from(TABLE_NAMES.fxWatchList).findOne.calledOnceWithExactly({ commitRequestId }), 'Should call findOne method with the correct arguments') + + t.end() + }) + + await watchListTest.test('getItemsInWatchListByDeterminingTransferId should return the items in watch list', async (t) => { + const determiningTransferId = '789012' + const expectedItems = [ + { determiningTransferId: '789012', amount: 200 }, + { determiningTransferId: '789012', amount: 300 } + ] + + // Mock the database find method + Db.from(TABLE_NAMES.fxWatchList).find.returns(expectedItems) + + const result = await watchList.getItemsInWatchListByDeterminingTransferId(determiningTransferId) + + t.deepEqual(result, expectedItems, 'Should return the expected items') + t.ok(Db.from(TABLE_NAMES.fxWatchList).find.calledOnceWithExactly({ determiningTransferId }), 'Should call find method with the correct arguments') + t.end() + }) + + await watchListTest.test('addToWatchList should add the record to the watch list', async (t) => { + const record = { commitRequestId: '123456', amount: 100 } + + // Mock the database insert method + Db.from(TABLE_NAMES.fxWatchList).insert.returns() + + await watchList.addToWatchList(record) + + t.ok(Db.from(TABLE_NAMES.fxWatchList).insert.calledOnceWithExactly(record), 'Should call insert method with the correct arguments') + t.end() + }) + + watchListTest.end() +}) diff --git a/test/unit/models/ilpPackets/ilpPacket.test.js b/test/unit/models/ilpPackets/ilpPacket.test.js index bd3bb811f..b40a5d86c 100644 --- a/test/unit/models/ilpPackets/ilpPacket.test.js +++ b/test/unit/models/ilpPackets/ilpPacket.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/ledgerAccountType/ledgerAccountType.test.js b/test/unit/models/ledgerAccountType/ledgerAccountType.test.js index 02afdcde4..a536e406d 100644 --- a/test/unit/models/ledgerAccountType/ledgerAccountType.test.js +++ b/test/unit/models/ledgerAccountType/ledgerAccountType.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -187,14 +190,14 @@ Test('ledgerAccountType model', async (ledgerAccountTypeTest) => { sandbox.stub(Db, 'getKnex') const knexStub = sandbox.stub() const trxStub = { - get commit () { + commit () { }, - get rollback () { - + rollback () { + return Promise.reject(new Error('DB error')) } } - const trxSpyCommit = sandbox.spy(trxStub, 'commit', ['get']) + sandbox.spy(trxStub, 'commit') knexStub.transaction = sandbox.stub().callsArgWith(0, trxStub) Db.getKnex.returns(knexStub) @@ -219,62 +222,16 @@ Test('ledgerAccountType model', async (ledgerAccountTypeTest) => { knexStub.select = selectStub await Model.create(ledgerAccountType.name, ledgerAccountType.description, ledgerAccountType.isActive, ledgerAccountType.isSettleable) - test.equal(trxSpyCommit.get.calledOnce, true, 'commit the transaction if no transaction is passed') + test.equal(knexStub.transaction.calledOnce, true, 'call knex.transaction() no transaction is passed') test.end() } catch (err) { test.fail(`should not have thrown an error ${err}`) test.end() } }) - await ledgerAccountTypeTest.test('create should', async (test) => { - let trxStub - let trxSpyRollBack - const ledgerAccountType = { - name: 'POSITION', - description: 'A single account for each currency with which the hub operates. The account is "held" by the Participant representing the hub in the switch', - isActive: 1, - isSettleable: true - } - try { - sandbox.stub(Db, 'getKnex') - const knexStub = sandbox.stub() - trxStub = { - get commit () { - - }, - get rollback () { - - } - } - trxSpyRollBack = sandbox.spy(trxStub, 'rollback', ['get']) - - knexStub.transaction = sandbox.stub().callsArgWith(0, trxStub) - Db.getKnex.returns(knexStub) - const transactingStub = sandbox.stub() - const insertStub = sandbox.stub() - transactingStub.resolves() - knexStub.insert = insertStub.returns({ transacting: transactingStub }) - const selectStub = sandbox.stub() - const fromStub = sandbox.stub() - const whereStub = sandbox.stub() - transactingStub.rejects(new Error()) - whereStub.returns({ transacting: transactingStub }) - fromStub.returns({ whereStub }) - knexStub.select = selectStub.returns({ from: fromStub }) - - await Model.create(ledgerAccountType.name, ledgerAccountType.description, ledgerAccountType.isActive, ledgerAccountType.isSettleable) - test.fail('have thrown an error') - test.end() - } catch (err) { - test.pass('throw an error') - test.equal(trxSpyRollBack.get.calledOnce, true, 'rollback the transaction if no transaction is passed') - test.end() - } - }) await ledgerAccountTypeTest.test('create should', async (test) => { let trxStub - let trxSpyRollBack const ledgerAccountType = { name: 'POSITION', @@ -286,14 +243,13 @@ Test('ledgerAccountType model', async (ledgerAccountTypeTest) => { sandbox.stub(Db, 'getKnex') const knexStub = sandbox.stub() trxStub = { - get commit () { + commit () { }, - get rollback () { - + rollback () { + return Promise.reject(new Error('DB error')) } } - trxSpyRollBack = sandbox.spy(trxStub, 'rollback', ['get']) knexStub.transaction = sandbox.stub().callsArgWith(0, trxStub) Db.getKnex.returns(knexStub) @@ -314,7 +270,6 @@ Test('ledgerAccountType model', async (ledgerAccountTypeTest) => { test.end() } catch (err) { test.pass('throw an error') - test.equal(trxSpyRollBack.get.calledOnce, false, 'not rollback the transaction if transaction is passed') test.end() } }) diff --git a/test/unit/models/misc/migrationLock.test.js b/test/unit/models/misc/migrationLock.test.js index c749e6883..4dcbbf8e3 100644 --- a/test/unit/models/misc/migrationLock.test.js +++ b/test/unit/models/misc/migrationLock.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/misc/segment.test.js b/test/unit/models/misc/segment.test.js index 271a96076..92afea9bf 100644 --- a/test/unit/models/misc/segment.test.js +++ b/test/unit/models/misc/segment.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/participant/externalParticipant.test.js b/test/unit/models/participant/externalParticipant.test.js new file mode 100644 index 000000000..51037811b --- /dev/null +++ b/test/unit/models/participant/externalParticipant.test.js @@ -0,0 +1,125 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Eugen Klymniuk + -------------- + **********/ +process.env.LOG_LEVEL = 'debug' + +const Test = require('tapes')(require('tape')) +const Sinon = require('sinon') + +const model = require('#src/models/participant/externalParticipant') +const Db = require('#src/lib/db') +const { TABLE_NAMES, DB_ERROR_CODES } = require('#src/shared/constants') + +const { tryCatchEndTest } = require('#test/util/helpers') +const { mockExternalParticipantDto } = require('#test/fixtures') + +const EP_TABLE = TABLE_NAMES.externalParticipant + +const isFSPIOPError = (err, message) => err.name === 'FSPIOPError' && + err.message === message && + err.cause.includes(message) + +Test('externalParticipant Model Tests -->', (epmTest) => { + let sandbox + + epmTest.beforeEach(t => { + sandbox = Sinon.createSandbox() + + const dbStub = sandbox.stub(Db) + Db.from = table => dbStub[table] + Db[EP_TABLE] = { + insert: sandbox.stub(), + findOne: sandbox.stub(), + find: sandbox.stub(), + destroy: sandbox.stub() + } + t.end() + }) + + epmTest.afterEach(t => { + sandbox.restore() + t.end() + }) + + epmTest.test('should create externalParticipant in DB', tryCatchEndTest(async (t) => { + const data = mockExternalParticipantDto({ id: null, createdDate: null }) + Db[EP_TABLE].insert.withArgs(data).resolves(true) + const result = await model.create(data) + t.ok(result) + })) + + epmTest.test('should return null in case duplicateEntry error', tryCatchEndTest(async (t) => { + Db[EP_TABLE].insert.rejects({ code: DB_ERROR_CODES.duplicateEntry }) + const result = await model.create({}) + t.equals(result, null) + })) + + epmTest.test('should reformat DB error into SPIOPError on create', tryCatchEndTest(async (t) => { + const dbError = new Error('DB error') + Db[EP_TABLE].insert.rejects(dbError) + const err = await model.create({}) + .catch(e => e) + t.true(isFSPIOPError(err, dbError.message)) + })) + + epmTest.test('should get externalParticipant by name from DB', tryCatchEndTest(async (t) => { + const data = mockExternalParticipantDto() + Db[EP_TABLE].findOne.withArgs({ name: data.name }).resolves(data) + const result = await model.getByName(data.name) + t.deepEqual(result, data) + })) + + epmTest.test('should get externalParticipant by id', tryCatchEndTest(async (t) => { + const id = 'id123' + const data = { name: 'extFsp', proxyId: '123' } + Db[EP_TABLE].findOne.withArgs({ externalParticipantId: id }).resolves(data) + const result = await model.getById(id) + t.deepEqual(result, data) + })) + + epmTest.test('should get all externalParticipants by id', tryCatchEndTest(async (t) => { + const ep = mockExternalParticipantDto() + Db[EP_TABLE].find.withArgs({}).resolves([ep]) + const result = await model.getAll() + t.deepEqual(result, [ep]) + })) + + epmTest.test('should delete externalParticipant record by name', tryCatchEndTest(async (t) => { + const name = 'extFsp' + Db[EP_TABLE].destroy.withArgs({ name }).resolves(true) + const result = await model.destroyByName(name) + t.ok(result) + })) + + epmTest.test('should delete externalParticipant record by id', tryCatchEndTest(async (t) => { + const id = 123 + Db[EP_TABLE].destroy.withArgs({ externalParticipantId: id }).resolves(true) + const result = await model.destroyById(id) + t.ok(result) + })) + + epmTest.end() +}) diff --git a/test/unit/models/participant/externalParticipantCached.test.js b/test/unit/models/participant/externalParticipantCached.test.js new file mode 100644 index 000000000..459abee26 --- /dev/null +++ b/test/unit/models/participant/externalParticipantCached.test.js @@ -0,0 +1,141 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Eugen Klymniuk + -------------- + **********/ +process.env.CLEDG_CACHE__CACHE_ENABLED = 'true' +process.env.CLEDG_CACHE__EXPIRES_IN_MS = `${120 * 1000}` +process.env.LOG_LEVEL = 'debug' + +const Test = require('tapes')(require('tape')) +const Sinon = require('sinon') + +const model = require('#src/models/participant/externalParticipantCached') +const cache = require('#src/lib/cache') +const db = require('#src/lib/db') +const { TABLE_NAMES } = require('#src/shared/constants') + +const { tryCatchEndTest } = require('#test/util/helpers') +const { mockExternalParticipantDto } = require('#test/fixtures') + +const EP_TABLE = TABLE_NAMES.externalParticipant + +Test('externalParticipantCached Model Tests -->', (epCachedTest) => { + let sandbox + + const name = `extFsp-${Date.now()}` + const mockEpList = [ + mockExternalParticipantDto({ name, createdDate: null }) + ] + + epCachedTest.beforeEach(async t => { + sandbox = Sinon.createSandbox() + + const dbStub = sandbox.stub(db) + db.from = table => dbStub[table] + db[EP_TABLE] = { + find: sandbox.stub().resolves(mockEpList), + findOne: sandbox.stub(), + insert: sandbox.stub(), + destroy: sandbox.stub() + } + + model.initialize() + await cache.initCache() + t.end() + }) + + epCachedTest.afterEach(async t => { + sandbox.restore() + await cache.destroyCache() + cache.dropClients() + t.end() + }) + + epCachedTest.test('should return undefined if no data by query in cache', tryCatchEndTest(async (t) => { + const fakeName = `${Date.now()}` + const data = await model.getById(fakeName) + t.equal(data, undefined) + })) + + epCachedTest.test('should get externalParticipant by name from cache', tryCatchEndTest(async (t) => { + // db[EP_TABLE].find = sandbox.stub() + const data = await model.getByName(name) + t.deepEqual(data, mockEpList[0]) + })) + + epCachedTest.test('should get externalParticipant by ID from cache', tryCatchEndTest(async (t) => { + const id = mockEpList[0].externalParticipantId + const data = await model.getById(id) + t.deepEqual(data, mockEpList[0]) + })) + + epCachedTest.test('should get all externalParticipants from cache', tryCatchEndTest(async (t) => { + const data = await model.getAll() + t.deepEqual(data, mockEpList) + })) + + epCachedTest.test('should invalidate cache', tryCatchEndTest(async (t) => { + let data = await model.getByName(name) + t.deepEqual(data, mockEpList[0]) + + await model.invalidateCache() + + db[EP_TABLE].find = sandbox.stub().resolves([]) + data = await model.getByName(name) + t.equal(data, undefined) + })) + + epCachedTest.test('should invalidate cache during create', tryCatchEndTest(async (t) => { + await model.create({}) + + db[EP_TABLE].find = sandbox.stub().resolves([]) + const data = await model.getByName(name) + t.equal(data, undefined) + })) + + epCachedTest.test('should invalidate cache during destroyById', tryCatchEndTest(async (t) => { + let data = await model.getByName(name) + t.deepEqual(data, mockEpList[0]) + + await model.destroyById('id') + + db[EP_TABLE].find = sandbox.stub().resolves([]) + data = await model.getByName(name) + t.equal(data, undefined) + })) + + epCachedTest.test('should invalidate cache during destroyByName', tryCatchEndTest(async (t) => { + let data = await model.getByName(name) + t.deepEqual(data, mockEpList[0]) + + await model.destroyByName('name') + + db[EP_TABLE].find = sandbox.stub().resolves([]) + data = await model.getByName(name) + t.equal(data, undefined) + })) + + epCachedTest.end() +}) diff --git a/test/unit/models/participant/facade.test.js b/test/unit/models/participant/facade.test.js index 8f77c3969..c46e21165 100644 --- a/test/unit/models/participant/facade.test.js +++ b/test/unit/models/participant/facade.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -42,8 +45,12 @@ const Enum = require('@mojaloop/central-services-shared').Enum const ParticipantModel = require('../../../../src/models/participant/participantCached') const ParticipantCurrencyModel = require('../../../../src/models/participant/participantCurrencyCached') const ParticipantLimitModel = require('../../../../src/models/participant/participantLimitCached') +const externalParticipantCachedModel = require('../../../../src/models/participant/externalParticipantCached') const SettlementModel = require('../../../../src/models/settlement/settlementModel') +const fixtures = require('#test/fixtures') +const { tryCatchEndTest } = require('#test/util/helpers') + Test('Participant facade', async (facadeTest) => { let sandbox @@ -55,8 +62,10 @@ Test('Participant facade', async (facadeTest) => { sandbox.stub(ParticipantCurrencyModel, 'invalidateParticipantCurrencyCache') sandbox.stub(ParticipantLimitModel, 'getByParticipantCurrencyId') sandbox.stub(ParticipantLimitModel, 'invalidateParticipantLimitCache') + sandbox.stub(externalParticipantCachedModel, 'getByName') + sandbox.stub(externalParticipantCachedModel, 'create') sandbox.stub(SettlementModel, 'getAll') - sandbox.stub(Cache) + sandbox.stub(Cache, 'isCacheEnabled') Db.participant = { query: sandbox.stub() } @@ -274,6 +283,98 @@ Test('Participant facade', async (facadeTest) => { } }) + await facadeTest.test('getByIDAndCurrency (cache off)', async (assert) => { + try { + const builderStub = sandbox.stub() + Db.participant.query.callsArgWith(0, builderStub) + builderStub.where = sandbox.stub() + + builderStub.where.returns({ + andWhere: sandbox.stub().returns({ + andWhere: sandbox.stub().returns({ + innerJoin: sandbox.stub().returns({ + select: sandbox.stub().returns({ + first: sandbox.stub().returns(participant) + }) + }) + }) + }) + }) + + const result = await Model.getByIDAndCurrency(1, 'USD', Enum.Accounts.LedgerAccountType.POSITION) + assert.deepEqual(result, participant) + assert.end() + } catch (err) { + Logger.error(`getByIDAndCurrency failed with error - ${err}`) + assert.fail() + assert.end() + } + }) + + await facadeTest.test('getByIDAndCurrency (cache off)', async (assert) => { + try { + const builderStub = sandbox.stub() + Db.participant.query.callsArgWith(0, builderStub) + builderStub.where = sandbox.stub() + + builderStub.where.returns({ + andWhere: sandbox.stub().returns({ + andWhere: sandbox.stub().returns({ + innerJoin: sandbox.stub().returns({ + select: sandbox.stub().returns({ + first: sandbox.stub().returns({ + andWhere: sandbox.stub().returns(participant) + }) + }) + }) + }) + }) + }) + + const result = await Model.getByIDAndCurrency(1, 'USD', Enum.Accounts.LedgerAccountType.POSITION, true) + assert.deepEqual(result, participant) + assert.end() + } catch (err) { + Logger.error(`getByIDAndCurrency failed with error - ${err}`) + assert.fail() + assert.end() + } + }) + + await facadeTest.test('getByIDAndCurrency should throw error when participant not found (cache off)', async (assert) => { + try { + Db.participant.query.throws(new Error('message')) + await Model.getByIDAndCurrency(1, 'USD', Enum.Accounts.LedgerAccountType.POSITION, true) + assert.fail('should throw') + assert.end() + } catch (err) { + Logger.error(`getByIDAndCurrency failed with error - ${err}`) + assert.pass('Error thrown') + assert.end() + } + }) + + await facadeTest.test('getByIDAndCurrency (cache on)', async (assert) => { + try { + Cache.isCacheEnabled.returns(true) + + ParticipantModel.getById.withArgs(participant.participantId).returns(participant) + ParticipantCurrencyModel.findOneByParams.withArgs({ + participantId: participant.participantId, + currencyId: participant.currency, + ledgerAccountTypeId: Enum.Accounts.LedgerAccountType.POSITION + }).returns(participant) + + const result = await Model.getByIDAndCurrency(participant.participantId, participant.currency, Enum.Accounts.LedgerAccountType.POSITION) + assert.deepEqual(result, participant) + assert.end() + } catch (err) { + Logger.error(`getByIDAndCurrency failed with error - ${err}`) + assert.fail() + assert.end() + } + }) + await facadeTest.test('getEndpoint', async (assert) => { try { const builderStub = sandbox.stub() @@ -1765,14 +1866,14 @@ Test('Participant facade', async (facadeTest) => { sandbox.stub(Db, 'getKnex') const knexStub = sandbox.stub() const trxStub = { - get commit () { + commit () { }, - get rollback () { - + rollback () { + return Promise.reject(new Error('DB error')) } } - const trxSpyCommit = sandbox.spy(trxStub, 'commit', ['get']) + const trxSpyCommit = sandbox.spy(trxStub, 'commit') knexStub.transaction = sandbox.stub().callsArgWith(0, trxStub) Db.getKnex.returns(knexStub) @@ -1795,7 +1896,7 @@ Test('Participant facade', async (facadeTest) => { test.equal(whereNotStub.lastCall.args[0], 'participant.name', 'filter on participants name') test.equal(whereNotStub.lastCall.args[1], 'Hub', 'filter out the Hub') test.equal(transactingStub.lastCall.args[0], trxStub, 'run as transaction') - test.equal(trxSpyCommit.get.calledOnce, false, 'not commit the transaction if transaction is passed') + test.equal(trxSpyCommit.called, false, 'not commit the transaction if transaction is passed') test.deepEqual(response, participantsWithCurrencies, 'return participants with currencies') test.end() } catch (err) { @@ -1810,14 +1911,13 @@ Test('Participant facade', async (facadeTest) => { sandbox.stub(Db, 'getKnex') const knexStub = sandbox.stub() const trxStub = { - get commit () { + commit () { }, - get rollback () { - + rollback () { + return Promise.reject(new Error('DB error')) } } - const trxSpyCommit = sandbox.spy(trxStub, 'commit', ['get']) knexStub.transaction = sandbox.stub().callsArgWith(0, trxStub) Db.getKnex.returns(knexStub) @@ -1840,7 +1940,6 @@ Test('Participant facade', async (facadeTest) => { test.equal(whereNotStub.lastCall.args[0], 'participant.name', 'filter on participants name') test.equal(whereNotStub.lastCall.args[1], 'Hub', 'filter out the Hub') test.equal(transactingStub.lastCall.args[0], trxStub, 'run as transaction') - test.equal(trxSpyCommit.get.calledOnce, true, 'commit the transaction if no transaction is passed') test.deepEqual(response, participantsWithCurrencies, 'return participants with currencies') test.end() @@ -1858,7 +1957,7 @@ Test('Participant facade', async (facadeTest) => { const knexStub = sandbox.stub() trxStub = sandbox.stub() trxStub.commit = sandbox.stub() - trxStub.rollback = sandbox.stub() + trxStub.rollback = () => Promise.reject(new Error('DB Error')) knexStub.transaction = sandbox.stub().callsArgWith(0, trxStub) Db.getKnex.returns(knexStub) const transactingStub = sandbox.stub() @@ -1877,7 +1976,6 @@ Test('Participant facade', async (facadeTest) => { test.end() } catch (err) { test.pass('throw an error') - test.equal(trxStub.rollback.callCount, 0, 'not rollback the transaction if transaction is passed') test.end() } }) @@ -1895,5 +1993,39 @@ Test('Participant facade', async (facadeTest) => { } }) + facadeTest.test('getExternalParticipantIdByNameOrCreate method Tests -->', (getEpMethodTest) => { + getEpMethodTest.test('should return null in case of any error inside the method', tryCatchEndTest(async (t) => { + externalParticipantCachedModel.getByName = sandbox.stub().throws(new Error('Error occurred')) + const data = fixtures.mockExternalParticipantDto() + const result = await Model.getExternalParticipantIdByNameOrCreate(data) + t.equal(result, null) + })) + + getEpMethodTest.test('should return null if proxyParticipant not found', tryCatchEndTest(async (t) => { + ParticipantModel.getByName = sandbox.stub().resolves(null) + const result = await Model.getExternalParticipantIdByNameOrCreate({}) + t.equal(result, null) + })) + + getEpMethodTest.test('should return cached externalParticipant id', tryCatchEndTest(async (t) => { + const cachedEp = fixtures.mockExternalParticipantDto() + externalParticipantCachedModel.getByName = sandbox.stub().resolves(cachedEp) + const id = await Model.getExternalParticipantIdByNameOrCreate(cachedEp.name) + t.equal(id, cachedEp.externalParticipantId) + })) + + getEpMethodTest.test('should create and return new externalParticipant id', tryCatchEndTest(async (t) => { + const newEp = fixtures.mockExternalParticipantDto() + externalParticipantCachedModel.getByName = sandbox.stub().resolves(null) + externalParticipantCachedModel.create = sandbox.stub().resolves(newEp.externalParticipantId) + ParticipantModel.getByName = sandbox.stub().resolves({}) // to get proxy participantId + + const id = await Model.getExternalParticipantIdByNameOrCreate(newEp) + t.equal(id, newEp.externalParticipantId) + })) + + getEpMethodTest.end() + }) + await facadeTest.end() }) diff --git a/test/unit/models/participant/participant.test.js b/test/unit/models/participant/participant.test.js index 0105f176e..e0c254d06 100644 --- a/test/unit/models/participant/participant.test.js +++ b/test/unit/models/participant/participant.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -42,6 +45,7 @@ Test('Participant model', async (participantTest) => { name: 'fsp1z', currency: 'USD', isActive: 1, + isProxy: false, createdDate: new Date() }, { @@ -49,6 +53,7 @@ Test('Participant model', async (participantTest) => { name: 'fsp2', currency: 'EUR', isActive: 1, + isProxy: true, createdDate: new Date() } ] @@ -97,7 +102,8 @@ Test('Participant model', async (participantTest) => { try { Db.participant.insert.withArgs({ name: participantFixtures[0].name, - createdBy: 'unknown' + createdBy: 'unknown', + isProxy: false }).returns(1) const result = await Model.create(participantFixtures[0]) assert.equal(result, 1, ` returns ${result}`) @@ -113,7 +119,8 @@ Test('Participant model', async (participantTest) => { try { Db.participant.insert.withArgs({ name: participantFixtures[0].name, - createdBy: 'unknown' + createdBy: 'unknown', + isProxy: false }).throws(new Error()) const result = await Model.create(participantFixtures[0]) test.equal(result, 1, ` returns ${result}`) diff --git a/test/unit/models/participant/participantCached.test.js b/test/unit/models/participant/participantCached.test.js index 0e5b3aaab..2ba483989 100644 --- a/test/unit/models/participant/participantCached.test.js +++ b/test/unit/models/participant/participantCached.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/participant/participantCurrency.test.js b/test/unit/models/participant/participantCurrency.test.js index 55c3bc218..414bd7594 100644 --- a/test/unit/models/participant/participantCurrency.test.js +++ b/test/unit/models/participant/participantCurrency.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/participant/participantCurrencyCached.test.js b/test/unit/models/participant/participantCurrencyCached.test.js index 3d70f78b1..3b4fa7cfc 100644 --- a/test/unit/models/participant/participantCurrencyCached.test.js +++ b/test/unit/models/participant/participantCurrencyCached.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/participant/participantLimit.test.js b/test/unit/models/participant/participantLimit.test.js index 7d3845746..61c61815f 100644 --- a/test/unit/models/participant/participantLimit.test.js +++ b/test/unit/models/participant/participantLimit.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/participant/participantLimitCached.test.js b/test/unit/models/participant/participantLimitCached.test.js index 8486c147e..2a137f602 100644 --- a/test/unit/models/participant/participantLimitCached.test.js +++ b/test/unit/models/participant/participantLimitCached.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/participant/participantPosition.test.js b/test/unit/models/participant/participantPosition.test.js index 0c6f24dfe..f9c261ca9 100644 --- a/test/unit/models/participant/participantPosition.test.js +++ b/test/unit/models/participant/participantPosition.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -203,14 +206,13 @@ Test('Participant Position model', async (participantPositionTest) => { sandbox.stub(Db, 'getKnex') const knexStub = sandbox.stub() const trxStub = { - get commit () { + commit () { }, - get rollback () { - + rollback () { + return Promise.reject(new Error('DB error')) } } - const trxSpyCommit = sandbox.spy(trxStub, 'commit', ['get']) knexStub.transaction = sandbox.stub().callsArgWith(0, trxStub) Db.getKnex.returns(knexStub) @@ -238,7 +240,6 @@ Test('Participant Position model', async (participantPositionTest) => { test.deepEqual(batchInsertStub.lastCall.args[1], participantPositions, 'all records should be inserted') test.equal(transactingStub.callCount, 1, 'make the database calls as transaction') test.equal(transactingStub.lastCall.args[0], trxStub, 'run as transaction') - test.equal(trxSpyCommit.get.calledOnce, true, 'commit the transaction if no transaction is passed') test.end() } catch (err) { @@ -250,20 +251,18 @@ Test('Participant Position model', async (participantPositionTest) => { await participantPositionTest.test('createParticipantPositionRecords should', async (test) => { let trxStub - let trxSpyRollBack try { sandbox.stub(Db, 'getKnex') const knexStub = sandbox.stub() trxStub = { - get commit () { + commit () { }, - get rollback () { - + rollback () { + return Promise.reject(new Error('DB error')) } } - trxSpyRollBack = sandbox.spy(trxStub, 'rollback', ['get']) knexStub.transaction = sandbox.stub().callsArgWith(0, trxStub) Db.getKnex.returns(knexStub) @@ -291,27 +290,24 @@ Test('Participant Position model', async (participantPositionTest) => { test.end() } catch (err) { test.pass('throw an error') - test.equal(trxSpyRollBack.get.calledOnce, true, 'rollback the transaction if no transaction is passed') test.end() } }) await participantPositionTest.test('createParticipantCurrencyRecords should', async (test) => { let trxStub - let trxSpyRollBack try { sandbox.stub(Db, 'getKnex') const knexStub = sandbox.stub() trxStub = { - get commit () { + commit () { }, - get rollback () { - + rollback () { + return Promise.reject(new Error('DB error')) } } - trxSpyRollBack = sandbox.spy(trxStub, 'rollback', ['get']) knexStub.transaction = sandbox.stub().callsArgWith(0, [trxStub, true]) Db.getKnex.returns(knexStub) @@ -339,7 +335,6 @@ Test('Participant Position model', async (participantPositionTest) => { test.end() } catch (err) { test.pass('throw an error') - test.equal(trxSpyRollBack.get.calledOnce, false, 'not rollback the transaction if transaction is passed') test.end() } }) diff --git a/test/unit/models/participant/participantPositionChange.test.js b/test/unit/models/participant/participantPositionChange.test.js index ddc2ef7ce..8b8fe2ba2 100644 --- a/test/unit/models/participant/participantPositionChange.test.js +++ b/test/unit/models/participant/participantPositionChange.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/position/batch.test.js b/test/unit/models/position/batch.test.js index cd2ce3656..83b251b92 100644 --- a/test/unit/models/position/batch.test.js +++ b/test/unit/models/position/batch.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -555,5 +558,44 @@ Test('Batch model', async (positionBatchTest) => { } }) + await positionBatchTest.test('getReservedPositionChangesByCommitRequestIds', async (test) => { + try { + sandbox.stub(Db, 'getKnex') + + const knexStub = sandbox.stub() + const trxStub = sandbox.stub() + trxStub.commit = sandbox.stub() + knexStub.transaction = sandbox.stub().callsArgWith(0, trxStub) + Db.getKnex.returns(knexStub) + + knexStub.returns({ + transacting: sandbox.stub().returns({ + whereIn: sandbox.stub().returns({ + where: sandbox.stub().returns({ + leftJoin: sandbox.stub().returns({ + select: sandbox.stub().returns([{ + 1: { + 2: { + value: 1 + } + } + }]) + }) + }) + }) + }) + }) + + await Model.getReservedPositionChangesByCommitRequestIds(trxStub, [1, 2], 3, 4) + test.pass('completed successfully') + test.ok(knexStub.withArgs('fxTransferStateChange').calledOnce, 'knex called with fxTransferStateChange once') + test.end() + } catch (err) { + Logger.error(`getReservedPositionChangesByCommitRequestIds failed with error - ${err}`) + test.fail() + test.end() + } + }) + positionBatchTest.end() }) diff --git a/test/unit/models/position/batchCached.test.js b/test/unit/models/position/batchCached.test.js index 14e820faf..16e397d38 100644 --- a/test/unit/models/position/batchCached.test.js +++ b/test/unit/models/position/batchCached.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/position/facade.test.js b/test/unit/models/position/facade.test.js index 6feb81af9..dfc9124c7 100644 --- a/test/unit/models/position/facade.test.js +++ b/test/unit/models/position/facade.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -217,7 +220,14 @@ Test('Position facade', async (positionFacadeTest) => { type: 'application/json', content: { header: '', - payload: transfer + payload: transfer, + context: { + cyrilResult: { + participantName: 'dfsp1', + currencyId: 'USD', + amount: '100' + } + } }, metadata: { event: { @@ -312,11 +322,11 @@ Test('Position facade', async (positionFacadeTest) => { transacting: sandbox.stub().returns({ forUpdate: sandbox.stub().returns({ whereIn: sandbox.stub().returns({ - select: sandbox.stub().returns(Promise.resolve()) + select: sandbox.stub().resolves() }) }), where: sandbox.stub().returns({ - update: sandbox.stub().returns(Promise.resolve()), + update: sandbox.stub().resolves(), orderBy: sandbox.stub().returns({ first: sandbox.stub().resolves(Object.assign({}, transferStateChange)) }) @@ -398,11 +408,11 @@ Test('Position facade', async (positionFacadeTest) => { transacting: sandbox.stub().returns({ forUpdate: sandbox.stub().returns({ whereIn: sandbox.stub().returns({ - select: sandbox.stub().returns(Promise.resolve()) + select: sandbox.stub().resolves() }) }), where: sandbox.stub().returns({ - update: sandbox.stub().returns(Promise.resolve()), + update: sandbox.stub().resolves(), orderBy: sandbox.stub().returns({ first: sandbox.stub().resolves(Object.assign({}, transferStateChange)) }) @@ -481,11 +491,11 @@ Test('Position facade', async (positionFacadeTest) => { transacting: sandbox.stub().returns({ forUpdate: sandbox.stub().returns({ whereIn: sandbox.stub().returns({ - select: sandbox.stub().returns(Promise.resolve()) + select: sandbox.stub().resolves() }) }), where: sandbox.stub().returns({ - update: sandbox.stub().returns(Promise.resolve()), + update: sandbox.stub().resolves(), orderBy: sandbox.stub().returns({ first: sandbox.stub().resolves(incorrectTransferStateChange) }) @@ -591,11 +601,11 @@ Test('Position facade', async (positionFacadeTest) => { transacting: sandbox.stub().returns({ forUpdate: sandbox.stub().returns({ whereIn: sandbox.stub().returns({ - select: sandbox.stub().returns(Promise.resolve()) + select: sandbox.stub().resolves() }) }), where: sandbox.stub().returns({ - update: sandbox.stub().returns(Promise.resolve()), + update: sandbox.stub().resolves(), orderBy: sandbox.stub().returns({ first: sandbox.stub().resolves(MainUtil.clone(transferStateChange)) }) @@ -680,11 +690,11 @@ Test('Position facade', async (positionFacadeTest) => { transacting: sandbox.stub().returns({ forUpdate: sandbox.stub().returns({ whereIn: sandbox.stub().returns({ - select: sandbox.stub().returns(Promise.resolve()) + select: sandbox.stub().resolves() }) }), where: sandbox.stub().returns({ - update: sandbox.stub().returns(Promise.resolve()), + update: sandbox.stub().resolves(), orderBy: sandbox.stub().returns({ first: sandbox.stub().resolves(MainUtil.clone(transferStateChange)) }) diff --git a/test/unit/models/position/participantPosition.test.js b/test/unit/models/position/participantPosition.test.js index 71d2b5076..437c53b1c 100644 --- a/test/unit/models/position/participantPosition.test.js +++ b/test/unit/models/position/participantPosition.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/position/participantPositionChanges.test.js b/test/unit/models/position/participantPositionChanges.test.js new file mode 100644 index 000000000..3e6b063e7 --- /dev/null +++ b/test/unit/models/position/participantPositionChanges.test.js @@ -0,0 +1,116 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Vijaya Kumar Guthi + -------------- + ******/ + +'use strict' + +const Test = require('tapes')(require('tape')) +const Sinon = require('sinon') +const Db = require('../../../../src/lib/db') +const Logger = require('@mojaloop/central-services-logger') +const Model = require('../../../../src/models/position/participantPositionChanges') + +Test('participantPositionChanges model', async (participantPositionChangesTest) => { + let sandbox + + participantPositionChangesTest.beforeEach(t => { + sandbox = Sinon.createSandbox() + sandbox.stub(Db, 'getKnex') + const knexStub = sandbox.stub() + knexStub.returns({ + where: sandbox.stub().returns({ + where: sandbox.stub().returns({ + innerJoin: sandbox.stub().returns({ + select: sandbox.stub().resolves({}) + }) + }) + }) + }) + Db.getKnex.returns(knexStub) + + t.end() + }) + + participantPositionChangesTest.afterEach(t => { + sandbox.restore() + + t.end() + }) + + await participantPositionChangesTest.test('getReservedPositionChangesByCommitRequestId', async (assert) => { + try { + const commitRequestId = 'b0000001-0000-0000-0000-000000000000' + const result = await Model.getReservedPositionChangesByCommitRequestId(commitRequestId) + assert.deepEqual(result, {}, `returns ${result}`) + assert.end() + } catch (err) { + Logger.error(`getReservedPositionChangesByCommitRequestId failed with error - ${err}`) + assert.fail() + assert.end() + } + }) + + await participantPositionChangesTest.test('getReservedPositionChangesByTransferId', async (assert) => { + try { + const transferId = 'a0000001-0000-0000-0000-000000000000' + const result = await Model.getReservedPositionChangesByTransferId(transferId) + assert.deepEqual(result, {}, `returns ${result}`) + assert.end() + } catch (err) { + Logger.error(`getReservedPositionChangesByTransferId failed with error - ${err}`) + assert.fail() + assert.end() + } + }) + + await participantPositionChangesTest.test('getReservedPositionChangesByCommitRequestId throws an error', async (assert) => { + try { + Db.getKnex.returns(Promise.reject(new Error('Test Error'))) + const commitRequestId = 'b0000001-0000-0000-0000-000000000000' + await Model.getReservedPositionChangesByCommitRequestId(commitRequestId) + assert.fail() + assert.end() + } catch (err) { + assert.pass('Error thrown') + assert.end() + } + }) + + await participantPositionChangesTest.test('getReservedPositionChangesByTransferId throws an error', async (assert) => { + try { + Db.getKnex.returns(Promise.reject(new Error('Test Error'))) + const transferId = 'a0000001-0000-0000-0000-000000000000' + await Model.getReservedPositionChangesByTransferId(transferId) + assert.fail() + assert.end() + } catch (err) { + assert.pass('Error thrown') + assert.end() + } + }) + + participantPositionChangesTest.end() +}) diff --git a/test/unit/models/settlement/settlementModel.test.js b/test/unit/models/settlement/settlementModel.test.js index 12bc36d7c..ef9ffb8df 100644 --- a/test/unit/models/settlement/settlementModel.test.js +++ b/test/unit/models/settlement/settlementModel.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/settlement/settlementModelCached.test.js b/test/unit/models/settlement/settlementModelCached.test.js index 24c8e7dbb..ba7586d7b 100644 --- a/test/unit/models/settlement/settlementModelCached.test.js +++ b/test/unit/models/settlement/settlementModelCached.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/transfer/facade-withMockKnex.test.js b/test/unit/models/transfer/facade-withMockKnex.test.js new file mode 100644 index 000000000..da403d623 --- /dev/null +++ b/test/unit/models/transfer/facade-withMockKnex.test.js @@ -0,0 +1,103 @@ +/***** + License + -------------- + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + Contributors + -------------- + This is the official list of the Mojaloop project contributors for this file. + Names of the original copyright holders (individuals or organizations) + should be listed with a '*' in the first column. People who have + contributed from an organization can be listed under the organization + that actually holds the copyright for their contributions (see the + Mojaloop Foundation for an example). Those individuals should have + their names indented and be marked with a '-'. Email address can be added + optionally within square brackets . + * Gates Foundation + - Name Surname + + * Eugen Klymniuk + -------------- + **********/ + +const Database = require('@mojaloop/database-lib/src/database') + +const Test = require('tapes')(require('tape')) +const knex = require('knex') +const mockKnex = require('mock-knex') +const Proxyquire = require('proxyquire') + +const config = require('#src/lib/config') +const { tryCatchEndTest } = require('#test/util/helpers') + +let transferFacade + +Test('Transfer facade Tests (with mockKnex) -->', async (transferFacadeTest) => { + const db = new Database() + db._knex = knex(config.DATABASE) + mockKnex.mock(db._knex) + + await db.connect(config.DATABASE) + + // we need to override the singleton Db (from ../lib/db), coz it was already modified by other unit-tests! + transferFacade = Proxyquire('#src/models/transfer/facade', { + '../../lib/db': db, + './transferExtension': Proxyquire('#src/models/transfer/transferExtension', { '../../lib/db': db }) + }) + + let tracker // allow to catch and respond to DB queries: https://www.npmjs.com/package/mock-knex#tracker + + await transferFacadeTest.beforeEach(async t => { + tracker = mockKnex.getTracker() + tracker.install() + t.end() + }) + + await transferFacadeTest.afterEach(t => { + tracker.uninstall() + t.end() + }) + + await transferFacadeTest.test('getById Method Tests -->', (getByIdTest) => { + getByIdTest.test('should find zero records', tryCatchEndTest(async (t) => { + const id = Date.now() + + tracker.on('query', (query) => { + if (query.bindings[0] === id && query.method === 'first') { + return query.response(null) + } + query.reject(new Error('Mock DB error')) + }) + const result = await transferFacade.getById(id) + t.equal(result, null, 'no transfers were found') + })) + + getByIdTest.test('should find transfer by id', tryCatchEndTest(async (t) => { + const id = Date.now() + const mockExtensionList = [id] + + tracker.on('query', (q) => { + if (q.step === 1 && q.method === 'first' && q.bindings[0] === id) { + return q.response({}) + } + if (q.step === 2 && q.method === 'select') { // TransferExtensionModel.getByTransferId() call + return q.response(mockExtensionList) + } + q.reject(new Error('Mock DB error')) + }) + + const result = await transferFacade.getById(id) + t.ok(result, 'transfers is found') + t.deepEqual(result.extensionList, mockExtensionList) + })) + + getByIdTest.end() + }) + + await transferFacadeTest.end() +}) diff --git a/test/unit/models/transfer/facade.test.js b/test/unit/models/transfer/facade.test.js index 8740f3a62..4e56a7fe6 100644 --- a/test/unit/models/transfer/facade.test.js +++ b/test/unit/models/transfer/facade.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -39,6 +42,7 @@ const Enum = require('@mojaloop/central-services-shared').Enum const TransferEventAction = Enum.Events.Event.Action // const Proxyquire = require('proxyquire') const ParticipantFacade = require('../../../../src/models/participant/facade') +const ParticipantModelCached = require('../../../../src/models/participant/participantCached') const Time = require('@mojaloop/central-services-shared').Util.Time const { randomUUID } = require('crypto') const cloneDeep = require('lodash').cloneDeep @@ -94,6 +98,11 @@ Test('Transfer facade', async (transferFacadeTest) => { transferFacadeTest.beforeEach(t => { sandbox = Sinon.createSandbox() + const findStub = sandbox.stub().returns([{ + createdDate: now, + participantId: 1, + name: 'test' + }]) Db.transfer = { insert: sandbox.stub(), find: sandbox.stub(), @@ -115,10 +124,22 @@ Test('Transfer facade', async (transferFacadeTest) => { query: sandbox.stub() } Db.from = (table) => { - return Db[table] + return { + ...Db[table], + find: findStub + } } clock = Sinon.useFakeTimers(now.getTime()) sandbox.stub(ParticipantFacade, 'getByNameAndCurrency') + sandbox.stub(ParticipantModelCached, 'getByName') + ParticipantModelCached.getByName.returns(Promise.resolve({ + participantId: 0, + name: 'fsp1', + currency: 'USD', + isActive: 1, + createdDate: new Date(), + currencyList: ['USD'] + })) t.end() }) @@ -128,236 +149,6 @@ Test('Transfer facade', async (transferFacadeTest) => { t.end() }) - await transferFacadeTest.test('getById should return transfer by id', async (test) => { - try { - const transferId1 = 't1' - const transferId2 = 't2' - const extensions = cloneDeep(transferExtensions) - const transfers = [ - { transferId: transferId1, extensionList: extensions }, - { transferId: transferId2, errorCode: 5105, transferStateEnumeration: Enum.Transfers.TransferState.ABORTED, extensionList: [{ key: 'key1', value: 'value1' }, { key: 'key2', value: 'value2' }, { key: 'cause', value: '5105: undefined' }], isTransferReadModel: true } - ] - - const builderStub = sandbox.stub() - const whereRawPc1 = sandbox.stub() - const whereRawPc2 = sandbox.stub() - const payerTransferStub = sandbox.stub() - const payerRoleTypeStub = sandbox.stub() - const payerCurrencyStub = sandbox.stub() - const payerParticipantStub = sandbox.stub() - const payeeTransferStub = sandbox.stub() - const payeeRoleTypeStub = sandbox.stub() - const payeeCurrencyStub = sandbox.stub() - const payeeParticipantStub = sandbox.stub() - const ilpPacketStub = sandbox.stub() - const stateChangeStub = sandbox.stub() - const stateStub = sandbox.stub() - const transferFulfilmentStub = sandbox.stub() - const transferErrorStub = sandbox.stub() - - const selectStub = sandbox.stub() - const orderByStub = sandbox.stub() - const firstStub = sandbox.stub() - - builderStub.where = sandbox.stub() - - Db.transfer.query.callsArgWith(0, builderStub) - Db.transfer.query.returns(transfers[0]) - - builderStub.where.returns({ - whereRaw: whereRawPc1.returns({ - whereRaw: whereRawPc2.returns({ - innerJoin: payerTransferStub.returns({ - innerJoin: payerRoleTypeStub.returns({ - innerJoin: payerCurrencyStub.returns({ - innerJoin: payerParticipantStub.returns({ - innerJoin: payeeTransferStub.returns({ - innerJoin: payeeRoleTypeStub.returns({ - innerJoin: payeeCurrencyStub.returns({ - innerJoin: payeeParticipantStub.returns({ - innerJoin: ilpPacketStub.returns({ - leftJoin: stateChangeStub.returns({ - leftJoin: stateStub.returns({ - leftJoin: transferFulfilmentStub.returns({ - leftJoin: transferErrorStub.returns({ - select: selectStub.returns({ - orderBy: orderByStub.returns({ - first: firstStub.returns(transfers[0]) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - - sandbox.stub(transferExtensionModel, 'getByTransferId') - transferExtensionModel.getByTransferId.returns(extensions) - - const found = await TransferFacade.getById(transferId1) - test.equal(found, transfers[0]) - test.ok(builderStub.where.withArgs({ - 'transfer.transferId': transferId1, - 'tprt1.name': 'PAYER_DFSP', - 'tprt2.name': 'PAYEE_DFSP' - }).calledOnce) - test.ok(whereRawPc1.withArgs('pc1.currencyId = transfer.currencyId').calledOnce) - test.ok(whereRawPc2.withArgs('pc2.currencyId = transfer.currencyId').calledOnce) - test.ok(payerTransferStub.withArgs('transferParticipant AS tp1', 'tp1.transferId', 'transfer.transferId').calledOnce) - test.ok(payerRoleTypeStub.withArgs('transferParticipantRoleType AS tprt1', 'tprt1.transferParticipantRoleTypeId', 'tp1.transferParticipantRoleTypeId').calledOnce) - test.ok(payerCurrencyStub.withArgs('participantCurrency AS pc1', 'pc1.participantCurrencyId', 'tp1.participantCurrencyId').calledOnce) - test.ok(payerParticipantStub.withArgs('participant AS da', 'da.participantId', 'pc1.participantId').calledOnce) - test.ok(payeeTransferStub.withArgs('transferParticipant AS tp2', 'tp2.transferId', 'transfer.transferId').calledOnce) - test.ok(payeeRoleTypeStub.withArgs('transferParticipantRoleType AS tprt2', 'tprt2.transferParticipantRoleTypeId', 'tp2.transferParticipantRoleTypeId').calledOnce) - test.ok(payeeCurrencyStub.withArgs('participantCurrency AS pc2', 'pc2.participantCurrencyId', 'tp2.participantCurrencyId').calledOnce) - test.ok(payeeParticipantStub.withArgs('participant AS ca', 'ca.participantId', 'pc2.participantId').calledOnce) - test.ok(ilpPacketStub.withArgs('ilpPacket AS ilpp', 'ilpp.transferId', 'transfer.transferId').calledOnce) - test.ok(stateChangeStub.withArgs('transferStateChange AS tsc', 'tsc.transferId', 'transfer.transferId').calledOnce) - test.ok(stateStub.withArgs('transferState AS ts', 'ts.transferStateId', 'tsc.transferStateId').calledOnce) - test.ok(transferFulfilmentStub.withArgs('transferFulfilment AS tf', 'tf.transferId', 'transfer.transferId').calledOnce) - test.ok(transferErrorStub.withArgs('transferError as te', 'te.transferId', 'transfer.transferId').calledOnce) - test.ok(selectStub.withArgs( - 'transfer.*', - 'transfer.currencyId AS currency', - 'pc1.participantCurrencyId AS payerParticipantCurrencyId', - 'tp1.amount AS payerAmount', - 'da.participantId AS payerParticipantId', - 'da.name AS payerFsp', - 'pc2.participantCurrencyId AS payeeParticipantCurrencyId', - 'tp2.amount AS payeeAmount', - 'ca.participantId AS payeeParticipantId', - 'ca.name AS payeeFsp', - 'tsc.transferStateChangeId', - 'tsc.transferStateId AS transferState', - 'tsc.reason AS reason', - 'tsc.createdDate AS completedTimestamp', - 'ts.enumeration as transferStateEnumeration', - 'ts.description as transferStateDescription', - 'ilpp.value AS ilpPacket', - 'transfer.ilpCondition AS condition', - 'tf.ilpFulfilment AS fulfilment' - ).calledOnce) - test.ok(orderByStub.withArgs('tsc.transferStateChangeId', 'desc').calledOnce) - test.ok(firstStub.withArgs().calledOnce) - - Db.transfer.query.returns(transfers[1]) - builderStub.where.returns({ - whereRaw: whereRawPc1.returns({ - whereRaw: whereRawPc2.returns({ - innerJoin: payerTransferStub.returns({ - innerJoin: payerRoleTypeStub.returns({ - innerJoin: payerCurrencyStub.returns({ - innerJoin: payerParticipantStub.returns({ - innerJoin: payeeTransferStub.returns({ - innerJoin: payeeRoleTypeStub.returns({ - innerJoin: payeeCurrencyStub.returns({ - innerJoin: payeeParticipantStub.returns({ - innerJoin: ilpPacketStub.returns({ - leftJoin: stateChangeStub.returns({ - leftJoin: stateStub.returns({ - leftJoin: transferFulfilmentStub.returns({ - leftJoin: transferErrorStub.returns({ - select: selectStub.returns({ - orderBy: orderByStub.returns({ - first: firstStub.returns(transfers[1]) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - const found2 = await TransferFacade.getById(transferId2) - // TODO: extend testing for the current code branch - test.deepEqual(found2, transfers[1]) - - transferExtensionModel.getByTransferId.returns(null) - const found3 = await TransferFacade.getById(transferId2) - // TODO: extend testing for the current code branch - test.equal(found3, transfers[1]) - test.end() - } catch (err) { - Logger.error(`getById failed with error - ${err}`) - test.fail() - test.end() - } - }) - - await transferFacadeTest.test('getById should find zero records', async (test) => { - try { - const transferId1 = 't1' - const builderStub = sandbox.stub() - Db.transfer.query.callsArgWith(0, builderStub) - builderStub.where = sandbox.stub() - builderStub.where.returns({ - whereRaw: sandbox.stub().returns({ - whereRaw: sandbox.stub().returns({ - innerJoin: sandbox.stub().returns({ - innerJoin: sandbox.stub().returns({ - innerJoin: sandbox.stub().returns({ - innerJoin: sandbox.stub().returns({ - innerJoin: sandbox.stub().returns({ - innerJoin: sandbox.stub().returns({ - innerJoin: sandbox.stub().returns({ - innerJoin: sandbox.stub().returns({ - innerJoin: sandbox.stub().returns({ - leftJoin: sandbox.stub().returns({ - leftJoin: sandbox.stub().returns({ - leftJoin: sandbox.stub().returns({ - leftJoin: sandbox.stub().returns({ - select: sandbox.stub().returns({ - orderBy: sandbox.stub().returns({ - first: sandbox.stub().returns(null) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - const found = await TransferFacade.getById(transferId1) - test.equal(found, null, 'no transfers were found') - test.end() - } catch (err) { - Logger.error(`getById failed with error - ${err}`) - test.fail('Error thrown') - test.end() - } - }) - await transferFacadeTest.test('getById should throw an error', async (test) => { try { const transferId1 = 't1' @@ -732,6 +523,7 @@ Test('Transfer facade', async (transferFacadeTest) => { const builderStub = sandbox.stub() const transferStateChange = sandbox.stub() + const transferStub = sandbox.stub() const selectStub = sandbox.stub() const orderByStub = sandbox.stub() const firstStub = sandbox.stub() @@ -742,9 +534,11 @@ Test('Transfer facade', async (transferFacadeTest) => { builderStub.where.returns({ innerJoin: transferStateChange.returns({ - select: selectStub.returns({ - orderBy: orderByStub.returns({ - first: firstStub.returns(transfer) + innerJoin: transferStub.returns({ + select: selectStub.returns({ + orderBy: orderByStub.returns({ + first: firstStub.returns(transfer) + }) }) }) }) @@ -760,6 +554,7 @@ Test('Transfer facade', async (transferFacadeTest) => { test.ok(transferStateChange.withArgs('transferStateChange AS tsc', 'tsc.transferId', 'transferParticipant.transferId').calledOnce) test.ok(selectStub.withArgs( 'transferParticipant.*', + 't.currencyId', 'tsc.transferStateId', 'tsc.reason' ).calledOnce) @@ -1435,6 +1230,9 @@ Test('Transfer facade', async (transferFacadeTest) => { const segmentId = 1 const intervalMin = 1 const intervalMax = 10 + const fxSegmentId = 1 + const fxIntervalMin = 1 + const fxIntervalMax = 10 const knexStub = sandbox.stub() sandbox.stub(Db, 'getKnex').returns(knexStub) @@ -1442,7 +1240,7 @@ Test('Transfer facade', async (transferFacadeTest) => { knexStub.transaction = sandbox.stub().callsArgWith(0, trxStub) knexStub.from = sandbox.stub().throws(new Error('Custom error')) - await TransferFacade.timeoutExpireReserved(segmentId, intervalMin, intervalMax) + await TransferFacade.timeoutExpireReserved(segmentId, intervalMin, intervalMax, fxSegmentId, fxIntervalMin, fxIntervalMax) test.fail('Error not thrown!') test.end() } catch (err) { @@ -1452,120 +1250,6 @@ Test('Transfer facade', async (transferFacadeTest) => { } }) - await timeoutExpireReservedTest.test('perform timeout successfully', async test => { - try { - let segmentId - const intervalMin = 1 - const intervalMax = 10 - const expectedResult = 1 - - const knexStub = sandbox.stub() - sandbox.stub(Db, 'getKnex').returns(knexStub) - const trxStub = sandbox.stub() - knexStub.transaction = sandbox.stub().callsArgWith(0, trxStub) - const context = sandbox.stub() - context.from = sandbox.stub().returns({ - innerJoin: sandbox.stub().returns({ - innerJoin: sandbox.stub().returns({ - leftJoin: sandbox.stub().returns({ - whereNull: sandbox.stub().returns({ - whereIn: sandbox.stub().returns({ - select: sandbox.stub() - }) - }) - }), - where: sandbox.stub().returns({ - andWhere: sandbox.stub().returns({ - select: sandbox.stub() - }) - }) - }) - }) - }) - context.on = sandbox.stub().returns({ - andOn: sandbox.stub().returns({ - andOn: sandbox.stub() - }) - }) - knexStub.returns({ - select: sandbox.stub().returns({ - max: sandbox.stub().returns({ - where: sandbox.stub().returns({ - andWhere: sandbox.stub().returns({ - groupBy: sandbox.stub().returns({ - as: sandbox.stub() - }) - }) - }), - innerJoin: sandbox.stub().returns({ - groupBy: sandbox.stub().returns({ - as: sandbox.stub() - }) - }) - }) - }), - transacting: sandbox.stub().returns({ - insert: sandbox.stub(), - where: sandbox.stub().returns({ - update: sandbox.stub() - }) - }), - innerJoin: sandbox.stub().returns({ - innerJoin: sandbox.stub().returns({ - innerJoin: sandbox.stub().callsArgOn(1, context).returns({ - innerJoin: sandbox.stub().callsArgOn(1, context).returns({ - innerJoin: sandbox.stub().returns({ - innerJoin: sandbox.stub().returns({ - innerJoin: sandbox.stub().returns({ - innerJoin: sandbox.stub().returns({ - leftJoin: sandbox.stub().returns({ - where: sandbox.stub().returns({ - select: sandbox.stub().returns( - Promise.resolve(expectedResult) - ) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - }) - knexStub.raw = sandbox.stub() - knexStub.from = sandbox.stub().returns({ - transacting: sandbox.stub().returns({ - insert: sandbox.stub().callsArgOn(0, context) - }) - }) - - let result - try { - segmentId = 0 - result = await TransferFacade.timeoutExpireReserved(segmentId, intervalMin, intervalMax) - test.equal(result, expectedResult, 'Expected result returned') - } catch (err) { - Logger.error(`timeoutExpireReserved failed with error - ${err}`) - test.fail() - } - try { - segmentId = 1 - await TransferFacade.timeoutExpireReserved(segmentId, intervalMin, intervalMax) - test.equal(result, expectedResult, 'Expected result returned.') - } catch (err) { - Logger.error(`timeoutExpireReserved failed with error - ${err}`) - test.fail() - } - test.end() - } catch (err) { - Logger.error(`timeoutExpireReserved failed with error - ${err}`) - test.fail() - test.end() - } - }) - await timeoutExpireReservedTest.end() } catch (err) { Logger.error(`transferFacadeTest failed with error - ${err}`) @@ -1723,7 +1407,14 @@ Test('Transfer facade', async (transferFacadeTest) => { transferStateId: Enum.Transfers.TransferInternalState.ABORTED_REJECTED, ledgerAccountTypeId: 2 } - const trxStub = sandbox.stub() + const trxStub = { + commit () { + + }, + rollback () { + return Promise.reject(new Error('DB error')) + } + } const knexStub = sandbox.stub() knexStub.transaction = sandbox.stub().callsArgWith(0, trxStub) @@ -1821,7 +1512,14 @@ Test('Transfer facade', async (transferFacadeTest) => { transferStateId: 'RECEIVED_PREPARE', ledgerAccountTypeId: 2 } - const trxStub = sandbox.stub() + const trxStub = { + commit () { + + }, + rollback () { + return Promise.reject(new Error('DB error')) + } + } const knexStub = sandbox.stub() knexStub.transaction = sandbox.stub().callsArgWith(0, trxStub) @@ -1950,6 +1648,13 @@ Test('Transfer facade', async (transferFacadeTest) => { knexStub.withArgs('participantCurrency').returns({ select: sandbox.stub().returns({ where: sandbox.stub().returns({ + first: sandbox.stub().returns({ + transacting: sandbox.stub().returns( + Promise.resolve({ + participantId: 1 + }) + ) + }), andWhere: sandbox.stub().returns({ first: sandbox.stub().returns({ transacting: sandbox.stub().returns( @@ -1967,7 +1672,7 @@ Test('Transfer facade', async (transferFacadeTest) => { const result = await TransferFacade.reconciliationTransferPrepare(payload, transactionTimestamp, enums, trxStub) test.equal(result, 0, 'Result for successful operation returned') test.equal(knexStub.withArgs('transfer').callCount, 1) - test.equal(knexStub.withArgs('participantCurrency').callCount, 1) + test.equal(knexStub.withArgs('participantCurrency').callCount, 2) test.equal(knexStub.withArgs('transferParticipant').callCount, 2) test.equal(knexStub.withArgs('transferStateChange').callCount, 1) test.equal(knexStub.withArgs('transferExtension').callCount, 3) @@ -2020,6 +1725,11 @@ Test('Transfer facade', async (transferFacadeTest) => { knexStub.returns({ select: sandbox.stub().returns({ where: sandbox.stub().returns({ + first: sandbox.stub().returns({ + transacting: sandbox.stub().returns({ + participantId: 1 + }) + }), andWhere: sandbox.stub().returns({ first: sandbox.stub().returns({ transacting: sandbox.stub().returns({ @@ -2067,6 +1777,13 @@ Test('Transfer facade', async (transferFacadeTest) => { knexStub.withArgs('participantCurrency').returns({ select: sandbox.stub().returns({ where: sandbox.stub().returns({ + first: sandbox.stub().returns({ + transacting: sandbox.stub().returns( + Promise.resolve({ + participantId: 1 + }) + ) + }), andWhere: sandbox.stub().returns({ first: sandbox.stub().returns({ transacting: sandbox.stub().returns( @@ -2199,7 +1916,14 @@ Test('Transfer facade', async (transferFacadeTest) => { } const transactionTimestamp = Time.getUTCString(now) - const trxStub = sandbox.stub() + const trxStub = { + commit () { + + }, + rollback () { + return Promise.reject(new Error('DB error')) + } + } const knexStub = sandbox.stub() knexStub.transaction = sandbox.stub().callsArgWith(0, trxStub) sandbox.stub(Db, 'getKnex').returns(knexStub) @@ -2223,7 +1947,14 @@ Test('Transfer facade', async (transferFacadeTest) => { } const transactionTimestamp = Time.getUTCString(now) - const trxStub = sandbox.stub() + const trxStub = { + commit () { + + }, + rollback () { + return Promise.reject(new Error('DB error')) + } + } const knexStub = sandbox.stub() knexStub.transaction = sandbox.stub().callsArgWith(0, trxStub) sandbox.stub(Db, 'getKnex').returns(knexStub) @@ -2524,7 +2255,7 @@ Test('Transfer facade', async (transferFacadeTest) => { const trxStub = sandbox.stub() trxStub.commit = sandbox.stub() - trxStub.rollback = sandbox.stub() + trxStub.rollback = () => Promise.reject(new Error('DB Error')) const knexStub = sandbox.stub() knexStub.transaction = sandbox.stub().callsArgWith(0, trxStub) sandbox.stub(Db, 'getKnex').returns(knexStub) @@ -2557,7 +2288,6 @@ Test('Transfer facade', async (transferFacadeTest) => { const participantName = 'fsp1' const transferId = '88416f4c-68a3-4819-b8e0-c23b27267cd5' const builderStub = sandbox.stub() - const participantCurrencyStub = sandbox.stub() const transferParticipantStub = sandbox.stub() const selectStub = sandbox.stub() @@ -2565,10 +2295,8 @@ Test('Transfer facade', async (transferFacadeTest) => { Db.participant.query.callsArgWith(0, builderStub) builderStub.where.returns({ - innerJoin: participantCurrencyStub.returns({ - innerJoin: transferParticipantStub.returns({ - select: selectStub.returns([1]) - }) + innerJoin: transferParticipantStub.returns({ + select: selectStub.returns([1]) }) }) @@ -2577,11 +2305,9 @@ Test('Transfer facade', async (transferFacadeTest) => { test.ok(builderStub.where.withArgs({ 'participant.name': participantName, 'tp.transferId': transferId, - 'participant.isActive': 1, - 'pc.isActive': 1 + 'participant.isActive': 1 }).calledOnce, 'query builder called once') - test.ok(participantCurrencyStub.withArgs('participantCurrency AS pc', 'pc.participantId', 'participant.participantId').calledOnce, 'participantCurrency inner joined') - test.ok(transferParticipantStub.withArgs('transferParticipant AS tp', 'tp.participantCurrencyId', 'pc.participantCurrencyId').calledOnce, 'transferParticipant inner joined') + test.ok(transferParticipantStub.withArgs('transferParticipant AS tp', 'tp.participantId', 'participant.participantId').calledOnce, 'transferParticipant inner joined') test.ok(selectStub.withArgs( 'tp.*' ).calledOnce, 'select all columns from transferParticipant') diff --git a/test/unit/models/transfer/ilpPacket.test.js b/test/unit/models/transfer/ilpPacket.test.js index 6db16850c..f26c1640a 100644 --- a/test/unit/models/transfer/ilpPacket.test.js +++ b/test/unit/models/transfer/ilpPacket.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/transfer/transfer.test.js b/test/unit/models/transfer/transfer.test.js index 895cbccd4..a6e700b10 100644 --- a/test/unit/models/transfer/transfer.test.js +++ b/test/unit/models/transfer/transfer.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/transfer/transferDuplicateCheck.test.js b/test/unit/models/transfer/transferDuplicateCheck.test.js index 8e8694596..ec3115676 100644 --- a/test/unit/models/transfer/transferDuplicateCheck.test.js +++ b/test/unit/models/transfer/transferDuplicateCheck.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -109,7 +112,6 @@ Test('TransferDuplicateCheck model', async (TransferDuplicateCheckTest) => { await Model.saveTransferDuplicateCheck(transferId, hash) test.fail(' should throw') test.end() - test.end() } catch (err) { test.pass('Error thrown') test.end() diff --git a/test/unit/models/transfer/transferError.test.js b/test/unit/models/transfer/transferError.test.js index 01a4a4a71..766fdfe2f 100644 --- a/test/unit/models/transfer/transferError.test.js +++ b/test/unit/models/transfer/transferError.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/transfer/transferErrorDuplicateCheck.test.js b/test/unit/models/transfer/transferErrorDuplicateCheck.test.js index c20e5abc4..9b535484d 100644 --- a/test/unit/models/transfer/transferErrorDuplicateCheck.test.js +++ b/test/unit/models/transfer/transferErrorDuplicateCheck.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/transfer/transferExtension.test.js b/test/unit/models/transfer/transferExtension.test.js index 3aeabd156..6e080e779 100644 --- a/test/unit/models/transfer/transferExtension.test.js +++ b/test/unit/models/transfer/transferExtension.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/transfer/transferFulfilment.test.js b/test/unit/models/transfer/transferFulfilment.test.js index a047c15f3..2c2c101bc 100644 --- a/test/unit/models/transfer/transferFulfilment.test.js +++ b/test/unit/models/transfer/transferFulfilment.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/transfer/transferFulfilmentDuplicateCheck.test.js b/test/unit/models/transfer/transferFulfilmentDuplicateCheck.test.js index c71768e42..1954ee4ad 100644 --- a/test/unit/models/transfer/transferFulfilmentDuplicateCheck.test.js +++ b/test/unit/models/transfer/transferFulfilmentDuplicateCheck.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/transfer/transferParticipant.test.js b/test/unit/models/transfer/transferParticipant.test.js index 46d0d1eb1..3a5ae22eb 100644 --- a/test/unit/models/transfer/transferParticipant.test.js +++ b/test/unit/models/transfer/transferParticipant.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/transfer/transferStateChange.test.js b/test/unit/models/transfer/transferStateChange.test.js index 8dd6b16b1..c4dc2c59d 100644 --- a/test/unit/models/transfer/transferStateChange.test.js +++ b/test/unit/models/transfer/transferStateChange.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/models/transfer/transferTimeout.test.js b/test/unit/models/transfer/transferTimeout.test.js index a202c8d21..904797880 100644 --- a/test/unit/models/transfer/transferTimeout.test.js +++ b/test/unit/models/transfer/transferTimeout.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/seeds/amountType.test.js b/test/unit/seeds/amountType.test.js index 6ae9eb472..513d728c4 100644 --- a/test/unit/seeds/amountType.test.js +++ b/test/unit/seeds/amountType.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/seeds/balanceOfPayments.test.js b/test/unit/seeds/balanceOfPayments.test.js index 83287ec4f..2142fefb9 100644 --- a/test/unit/seeds/balanceOfPayments.test.js +++ b/test/unit/seeds/balanceOfPayments.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/seeds/bulkProcessingState.test.js b/test/unit/seeds/bulkProcessingState.test.js index 4063f39a2..a1d60973e 100644 --- a/test/unit/seeds/bulkProcessingState.test.js +++ b/test/unit/seeds/bulkProcessingState.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/seeds/bulkTransferState.test.js b/test/unit/seeds/bulkTransferState.test.js index 4a7d8e8f4..d214954a0 100644 --- a/test/unit/seeds/bulkTransferState.test.js +++ b/test/unit/seeds/bulkTransferState.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/seeds/currency.test.js b/test/unit/seeds/currency.test.js index 16213c1bc..47f9ef7ac 100644 --- a/test/unit/seeds/currency.test.js +++ b/test/unit/seeds/currency.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/seeds/endpointType.test.js b/test/unit/seeds/endpointType.test.js index b29f11ede..956d86e06 100644 --- a/test/unit/seeds/endpointType.test.js +++ b/test/unit/seeds/endpointType.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/seeds/ledgerAccountType.test.js b/test/unit/seeds/ledgerAccountType.test.js index 10c0e3e4e..f645f8d91 100644 --- a/test/unit/seeds/ledgerAccountType.test.js +++ b/test/unit/seeds/ledgerAccountType.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/seeds/ledgerEntryType.test.js b/test/unit/seeds/ledgerEntryType.test.js index e3f77b6a8..67ac8fd89 100644 --- a/test/unit/seeds/ledgerEntryType.test.js +++ b/test/unit/seeds/ledgerEntryType.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/seeds/participant.test.js b/test/unit/seeds/participant.test.js index 74e1dcc78..fec78e4e6 100644 --- a/test/unit/seeds/participant.test.js +++ b/test/unit/seeds/participant.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -47,7 +50,7 @@ Test('Participant ', async (participantTest) => { knexStub.returns({ insert: sandbox.stub().returns({ onConflict: sandbox.stub().returns({ - ignore: sandbox.stub().returns(true) + merge: sandbox.stub().returns(true) }) }) }) diff --git a/test/unit/seeds/participantLimitType.test.js b/test/unit/seeds/participantLimitType.test.js index c393c4772..0dfa116b1 100644 --- a/test/unit/seeds/participantLimitType.test.js +++ b/test/unit/seeds/participantLimitType.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/seeds/partyIdentifierType.test.js b/test/unit/seeds/partyIdentifierType.test.js index fe7af5084..7f8ec06ed 100644 --- a/test/unit/seeds/partyIdentifierType.test.js +++ b/test/unit/seeds/partyIdentifierType.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/seeds/partyType.test.js b/test/unit/seeds/partyType.test.js index 473f86004..0912573f0 100644 --- a/test/unit/seeds/partyType.test.js +++ b/test/unit/seeds/partyType.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/seeds/settlementState.test.js b/test/unit/seeds/settlementState.test.js index 5917e2654..9a53c378a 100644 --- a/test/unit/seeds/settlementState.test.js +++ b/test/unit/seeds/settlementState.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/seeds/settlementWindow1State.test.js b/test/unit/seeds/settlementWindow1State.test.js index 7d37962e3..eff3dfd58 100644 --- a/test/unit/seeds/settlementWindow1State.test.js +++ b/test/unit/seeds/settlementWindow1State.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/seeds/settlementWindow2Open.test.js b/test/unit/seeds/settlementWindow2Open.test.js index 137f012a5..47bf1c72b 100644 --- a/test/unit/seeds/settlementWindow2Open.test.js +++ b/test/unit/seeds/settlementWindow2Open.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/seeds/transactionInitiator.test.js b/test/unit/seeds/transactionInitiator.test.js index f39527e60..da8324827 100644 --- a/test/unit/seeds/transactionInitiator.test.js +++ b/test/unit/seeds/transactionInitiator.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/seeds/transactionInitiatorType.test.js b/test/unit/seeds/transactionInitiatorType.test.js index c0b56a6d7..3d152d9ea 100644 --- a/test/unit/seeds/transactionInitiatorType.test.js +++ b/test/unit/seeds/transactionInitiatorType.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/seeds/transactionScenario.test.js b/test/unit/seeds/transactionScenario.test.js index 66d95c3a5..72700d219 100644 --- a/test/unit/seeds/transactionScenario.test.js +++ b/test/unit/seeds/transactionScenario.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/seeds/transferParticipantRoleType.test.js b/test/unit/seeds/transferParticipantRoleType.test.js index fe2369101..e269e9f2f 100644 --- a/test/unit/seeds/transferParticipantRoleType.test.js +++ b/test/unit/seeds/transferParticipantRoleType.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/seeds/transferState.test.js b/test/unit/seeds/transferState.test.js index f1c6c2398..f0d0fa6c9 100644 --- a/test/unit/seeds/transferState.test.js +++ b/test/unit/seeds/transferState.test.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation diff --git a/test/unit/shared/setup.test.js b/test/unit/shared/setup.test.js index 81e646356..3613151a8 100644 --- a/test/unit/shared/setup.test.js +++ b/test/unit/shared/setup.test.js @@ -15,10 +15,12 @@ Test('setup', setupTest => { let oldMongoDbHost let oldMongoDbPort let oldMongoDbDatabase + let oldProxyCacheEnabled let mongoDbUri const hostName = 'http://test.com' let Setup let DbStub + let ProxyCacheStub let CacheStub let ObjStoreStub // let ObjStoreStubThrows @@ -36,7 +38,7 @@ Test('setup', setupTest => { sandbox = Sinon.createSandbox() processExitStub = sandbox.stub(process, 'exit') PluginsStub = { - registerPlugins: sandbox.stub().returns(Promise.resolve()) + registerPlugins: sandbox.stub().resolves() } serverStub = { @@ -59,22 +61,32 @@ Test('setup', setupTest => { } requestLoggerStub = { - logRequest: sandbox.stub().returns(Promise.resolve()), - logResponse: sandbox.stub().returns(Promise.resolve()) + logRequest: sandbox.stub().resolves(), + logResponse: sandbox.stub().resolves() } DbStub = { + connect: sandbox.stub().resolves(), + disconnect: sandbox.stub().resolves() + } + + ProxyCacheStub = { connect: sandbox.stub().returns(Promise.resolve()), - disconnect: sandbox.stub().returns(Promise.resolve()) + getCache: sandbox.stub().returns( + { + connect: sandbox.stub().returns(Promise.resolve(true)), + disconnect: sandbox.stub().returns(Promise.resolve(true)) + } + ) } CacheStub = { - initCache: sandbox.stub().returns(Promise.resolve()) + initCache: sandbox.stub().resolves() } ObjStoreStub = { Db: { - connect: sandbox.stub().returns(Promise.resolve()), + connect: sandbox.stub().resolves(), Mongoose: { set: sandbox.stub() } @@ -89,34 +101,35 @@ Test('setup', setupTest => { uuidStub = sandbox.stub() MigratorStub = { - migrate: sandbox.stub().returns(Promise.resolve()) + migrate: sandbox.stub().resolves() } RegisterHandlersStub = { - registerAllHandlers: sandbox.stub().returns(Promise.resolve()), + registerAllHandlers: sandbox.stub().resolves(), transfers: { - registerPrepareHandler: sandbox.stub().returns(Promise.resolve()), - registerGetHandler: sandbox.stub().returns(Promise.resolve()), - registerFulfilHandler: sandbox.stub().returns(Promise.resolve()) - // registerRejectHandler: sandbox.stub().returns(Promise.resolve()) + registerPrepareHandler: sandbox.stub().resolves(), + registerGetHandler: sandbox.stub().resolves(), + registerFulfilHandler: sandbox.stub().resolves() + // registerRejectHandler: sandbox.stub().resolves() }, positions: { - registerPositionHandler: sandbox.stub().returns(Promise.resolve()) + registerPositionHandler: sandbox.stub().resolves() }, positionsBatch: { - registerPositionHandler: sandbox.stub().returns(Promise.resolve()) + registerPositionHandler: sandbox.stub().resolves() }, timeouts: { - registerAllHandlers: sandbox.stub().returns(Promise.resolve()), - registerTimeoutHandler: sandbox.stub().returns(Promise.resolve()) + registerAllHandlers: sandbox.stub().resolves(), + registerTimeoutHandler: sandbox.stub().resolves() }, admin: { - registerAdminHandlers: sandbox.stub().returns(Promise.resolve()) + registerAdminHandlers: sandbox.stub().resolves() }, bulk: { - registerBulkPrepareHandler: sandbox.stub().returns(Promise.resolve()), - registerBulkFulfilHandler: sandbox.stub().returns(Promise.resolve()), - registerBulkProcessingHandler: sandbox.stub().returns(Promise.resolve()) + registerBulkPrepareHandler: sandbox.stub().resolves(), + registerBulkFulfilHandler: sandbox.stub().resolves(), + registerBulkProcessingHandler: sandbox.stub().resolves(), + registerBulkGetHandler: sandbox.stub().resolves() } } const ConfigStub = Config @@ -130,6 +143,7 @@ Test('setup', setupTest => { }, '../handlers/register': RegisterHandlersStub, '../lib/db': DbStub, + '../lib/proxyCache': ProxyCacheStub, '../lib/cache': CacheStub, '@mojaloop/object-store-lib': ObjStoreStub, '../lib/migrator': MigratorStub, @@ -147,12 +161,14 @@ Test('setup', setupTest => { oldMongoDbHost = Config.MONGODB_HOST oldMongoDbPort = Config.MONGODB_PORT oldMongoDbDatabase = Config.MONGODB_DATABASE + oldProxyCacheEnabled = Config.PROXY_CACHE_CONFIG.enabled Config.HOSTNAME = hostName Config.MONGODB_HOST = 'testhost' Config.MONGODB_PORT = '1111' Config.MONGODB_USER = 'user' Config.MONGODB_PASSWORD = 'pass' Config.MONGODB_DATABASE = 'mlos' + Config.PROXY_CACHE_CONFIG.enabled = true mongoDbUri = MongoUriBuilder({ username: Config.MONGODB_USER, password: Config.MONGODB_PASSWORD, @@ -173,6 +189,7 @@ Test('setup', setupTest => { Config.MONGODB_USER = oldMongoDbUsername Config.MONGODB_PASSWORD = oldMongoDbPassword Config.MONGODB_DATABASE = oldMongoDbDatabase + Config.PROXY_CACHE_CONFIG.enabled = oldProxyCacheEnabled test.end() }) @@ -193,6 +210,7 @@ Test('setup', setupTest => { }, '../handlers/register': RegisterHandlersStub, '../lib/db': DbStub, + '../lib/proxyCache': ProxyCacheStub, '../lib/cache': CacheStub, '@mojaloop/object-store-lib': ObjStoreStub, '../lib/migrator': MigratorStub, @@ -245,6 +263,7 @@ Test('setup', setupTest => { }, '../handlers/register': RegisterHandlersStub, '../lib/db': DbStub, + '../lib/proxyCache': ProxyCacheStub, '../lib/cache': CacheStub, '@mojaloop/object-store-lib': ObjStoreStub, '../lib/migrator': MigratorStub, @@ -361,6 +380,7 @@ Test('setup', setupTest => { }, '../handlers/register': RegisterHandlersStub, '../lib/db': DbStub, + '../lib/proxyCache': ProxyCacheStub, '../lib/cache': CacheStub, '@mojaloop/object-store-lib': ObjStoreStub, '../lib/migrator': MigratorStub, @@ -394,6 +414,7 @@ Test('setup', setupTest => { }, '../handlers/register': RegisterHandlersStub, '../lib/db': DbStub, + '../lib/proxyCache': ProxyCacheStub, '../lib/cache': CacheStub, '@mojaloop/object-store-lib': ObjStoreStub, '../lib/migrator': MigratorStub, @@ -428,6 +449,7 @@ Test('setup', setupTest => { }, '../handlers/register': RegisterHandlersStub, '../lib/db': DbStub, + '../lib/proxyCache': ProxyCacheStub, '../lib/cache': CacheStub, '@mojaloop/object-store-lib': ObjStoreStub, '../lib/migrator': MigratorStub, @@ -464,6 +486,7 @@ Test('setup', setupTest => { }, '../handlers/register': RegisterHandlersStub, '../lib/db': DbStub, + '../lib/proxyCache': ProxyCacheStub, '../lib/cache': CacheStub, '@mojaloop/object-store-lib': ObjStoreStub, '../lib/migrator': MigratorStub, @@ -547,6 +570,11 @@ Test('setup', setupTest => { enabled: true } + const bulkGetHandler = { + type: 'bulkget', + enabled: true + } + const unknownHandler = { type: 'undefined', enabled: true @@ -563,6 +591,7 @@ Test('setup', setupTest => { bulkBrepareHandler, bulkFulfilHandler, bulkProcessingHandler, + bulkGetHandler, unknownHandler // rejectHandler ] @@ -578,6 +607,7 @@ Test('setup', setupTest => { test.ok(RegisterHandlersStub.bulk.registerBulkPrepareHandler.called) test.ok(RegisterHandlersStub.bulk.registerBulkFulfilHandler.called) test.ok(RegisterHandlersStub.bulk.registerBulkProcessingHandler.called) + test.ok(RegisterHandlersStub.bulk.registerBulkGetHandler.called) test.ok(processExitStub.called) test.end() }).catch(err => { @@ -706,6 +736,7 @@ Test('setup', setupTest => { }, '../handlers/register': RegisterHandlersStub, '../lib/db': DbStub, + '../lib/proxyCache': ProxyCacheStub, '../lib/cache': CacheStub, '@mojaloop/object-store-lib': ObjStoreStub, '../lib/migrator': MigratorStub, diff --git a/test/util/helpers.js b/test/util/helpers.js index c17ccd91e..ece6ee496 100644 --- a/test/util/helpers.js +++ b/test/util/helpers.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation @@ -24,7 +27,10 @@ 'use strict' +const { FSPIOPError } = require('@mojaloop/central-services-error-handling').Factory const Logger = require('@mojaloop/central-services-logger') +const Config = require('#src/lib/config') +const { logger } = require('#src/shared/logger/index') /* Helper Functions */ @@ -167,12 +173,34 @@ function getMessagePayloadOrThrow (message) { } } +const checkErrorPayload = test => (actualPayload, expectedFspiopError) => { + if (!(expectedFspiopError instanceof FSPIOPError)) { + throw new TypeError('Not a FSPIOPError') + } + const { errorCode, errorDescription } = expectedFspiopError.toApiErrorObject(Config.ERROR_HANDLING).errorInformation + test.equal(actualPayload.errorInformation?.errorCode, errorCode, 'errorCode matches') + test.equal(actualPayload.errorInformation?.errorDescription, errorDescription, 'errorDescription matches') +} + +// to use as a wrapper on Tape tests +const tryCatchEndTest = (testFn) => async (t) => { + try { + await testFn(t) + } catch (err) { + logger.error(`error in test "${t.name}":`, err) + t.fail(`${t.name} failed due to error: ${err?.message}`) + } + t.end() +} + module.exports = { + checkErrorPayload, currentEventLoopEnd, createRequest, sleepPromise, unwrapResponse, waitFor, wrapWithRetries, - getMessagePayloadOrThrow + getMessagePayloadOrThrow, + tryCatchEndTest } diff --git a/test/util/randomTransfers.js b/test/util/randomTransfers.js index ee13f5b35..9f28ab0a6 100644 --- a/test/util/randomTransfers.js +++ b/test/util/randomTransfers.js @@ -1,10 +1,13 @@ /***** License -------------- - Copyright © 2017 Bill & Melinda Gates Foundation - The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + Copyright © 2020-2024 Mojaloop Foundation + The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + Contributors -------------- This is the official list of the Mojaloop project contributors for this file. @@ -12,7 +15,7 @@ should be listed with a '*' in the first column. People who have contributed from an organization can be listed under the organization that actually holds the copyright for their contributions (see the - Gates Foundation organization for an example). Those individuals should have + Mojaloop Foundation for an example). Those individuals should have their names indented and be marked with a '-'. Email address can be added optionally within square brackets . * Gates Foundation