Merge pull request #121 from pagopa/PAGOPA-1327-psp-whitelist

feat: [PagoPA-1327]: psp whitelist
pagopa · Feb 7, 2024 · d0cf43a · d0cf43a
2 parents 95897e6 + ed9bfa2
commit d0cf43a
Show file tree

Hide file tree

Showing 13 changed files with 66 additions and 36 deletions.
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: pagopa-afm-calculator
 description: Microservice that handles calculation for pagoPA Advanced Fees Management
 type: application
-version: 2.14.0
+version: 2.15.0
 appVersion: 2.10.4
 dependencies:
  - name: microservice-chart

diff --git a/integration-test/src/config/.env.dev b/integration-test/src/config/.env.dev
@@ -1,3 +1,4 @@
 AFM_HOST=https://api.dev.platform.pagopa.it/afm/calculator-service/v1
 ID_PSP_POSTE=BPPIITRRZZZ
-AMEX_ABI=AMREX
+AMEX_ABI=AMREX
+PSP_WHITELIST=PPAYITR1XXX,BPPIITRRXXX,CIPBITMM,UNCRITMM,BNLIITRR,BCITITMM,BIC36019
diff --git a/integration-test/src/config/.env.local b/integration-test/src/config/.env.local
@@ -1,3 +1,4 @@
 AFM_HOST=http://localhost:8080
 ID_PSP_POSTE=BPPIITRRZZZ
 AMEX_ABI=AMREX
+PSP_WHITELIST=PPAYITR1XXX,BPPIITRRXXX,CIPBITMM,UNCRITMM,BNLIITRR,BCITITMM,BIC36019
diff --git a/integration-test/src/config/.env.prod b/integration-test/src/config/.env.prod
@@ -1,2 +1,3 @@
 AFM_HOST=https://api.platform.pagopa.it/afm/calculator-service/v1
+PSP_WHITELIST=PPAYITR1XXX,BPPIITRRXXX,CIPBITMM,UNCRITMM,BNLIITRR,BCITITMM,BIC36019
 
diff --git a/integration-test/src/config/.env.uat b/integration-test/src/config/.env.uat
@@ -1,3 +1,4 @@
 AFM_HOST=https://api.uat.platform.pagopa.it/afm/calculator-service/v1
 ID_PSP_POSTE=BPPIITRRXXX
-AMEX_ABI=AMREX
+AMEX_ABI=AMREX
+PSP_WHITELIST=PPAYITR1XXX,BPPIITRRXXX,CIPBITMM,UNCRITMM,BNLIITRR,BCITITMM,BIC36019
diff --git a/integration-test/src/config/data.json b/integration-test/src/config/data.json
@@ -2,7 +2,7 @@
  "bundles": [
  {
  "id": "int-test-1",
- "idPsp": "88888888888",
+ "idPsp": "PPAYITR1XXX",
  "idBrokerPsp": "88888888899",
  "idChannel": "88888888899_01_ONUS",
  "digitalStamp": false,
@@ -22,7 +22,7 @@
  },
  {
  "id": "int-test-2",
- "idPsp": "88888888888",
+ "idPsp": "PPAYITR1XXX",
  "idBrokerPsp": "88888888899",
  "idChannel": "88888888899_01_ONUS",
  "digitalStamp": false,
@@ -42,7 +42,7 @@
  },
  {
  "id": "int-test-3",
- "idPsp": "88888888889",
+ "idPsp": "BPPIITRRXXX",
  "idBrokerPsp": "88888888899",
  "idChannel": "88888888899_01_ONUS",
  "digitalStamp": false,
@@ -63,7 +63,7 @@
  },
  {
  "id": "int-test-4",
- "idPsp": "88888888889",
+ "idPsp": "BPPIITRRXXX",
  "idBrokerPsp": "88888888899",
  "idChannel": "88888888899_01_ONUS",
  "digitalStamp": false,
@@ -86,7 +86,7 @@
  },
  {
  "id": "int-test-5",
- "idPsp": "88888888888",
+ "idPsp": "PPAYITR1XXX",
  "idBrokerPsp": "88888888899",
  "idChannel": "88888888899_01_ONUS",
  "digitalStamp": false,
@@ -111,7 +111,7 @@
  },
  {
  "id": "int-test-6",
- "idPsp": "88888888889",
+ "idPsp": "BPPIITRRXXX",
  "idBrokerPsp": "88888888899",
  "idChannel": "88888888899_01_ONUS",
  "digitalStamp": false,
@@ -131,7 +131,7 @@
  },
  {
  "id": "int-test-7",
- "idPsp": "88888888889",
+ "idPsp": "BPPIITRRXXX",
  "idBrokerPsp": "88888888899",
  "idChannel": "88888888899_01_ONUS",
  "digitalStamp": true,
@@ -151,7 +151,7 @@
  },
  {
  "id": "int-test-8",
- "idPsp": "88888888889",
+ "idPsp": "BPPIITRRXXX",
  "idBrokerPsp": "88888888899",
  "idChannel": "88888888899_01_ONUS",
  "digitalStamp": true,
@@ -171,7 +171,7 @@
  },
  {
  "id": "int-test-9",
- "idPsp": "BPPIITRRZZZ",
+ "idPsp": "CIPBITMM",
  "idBrokerPsp": "14847241008",
  "idChannel": "88888888899_01_ONUS",
  "digitalStamp": true,
@@ -191,9 +191,9 @@
  },
  {
  "id": "int-test-10",
- "idPsp": "AMEX",
+ "idPsp": "UNCRITMM",
  "idBrokerPsp": "88888888899",
- "idChannel": "AMEX_ONUS",
+ "idChannel": "UNCRITMM_ONUS",
  "digitalStamp": false,
  "digitalStampRestriction": false,
  "name": "pacchetto 10",

diff --git a/integration-test/src/features/getFeeByPsp.feature b/integration-test/src/features/getFeeByPsp.feature
@@ -24,7 +24,7 @@ Feature: GetFeeByPsp
  ]
  }
  """
- When the client send POST to /psps/88888888888/fees
+ When the client send POST to /psps/PPAYITR1XXX/fees
  Then check statusCode is 200
  And check response body is
  """
@@ -40,7 +40,7 @@ Feature: GetFeeByPsp
  "bundleName": "pacchetto 1",
  "bundleDescription": "pacchetto 1",
  "idCiBundle": "int-test-1",
- "idPsp": "88888888888",
+ "idPsp": "PPAYITR1XXX",
  "idBrokerPsp": "88888888899",
  "idChannel": "88888888899_01_ONUS",
  "onUs": false,
@@ -71,7 +71,7 @@ Feature: GetFeeByPsp
  ]
  }
  """
- When the client send POST to /psps/88888888888/fees
+ When the client send POST to /psps/PPAYITR1XXX/fees
  Then check statusCode is 200
  And the body response ordering for the bundleOptions.onUs field is:
  | onUs |
@@ -97,15 +97,15 @@ Feature: GetFeeByPsp
  ]
  }
  """
- When the client send POST to /psps/88888888889/fees
+ When the client send POST to /psps/BPPIITRRXXX/fees
  Then check statusCode is 200
  And the body response ordering for the bundleOptions.onUs field is:
  | onUs |
+ | true |
  | false |
  | false |
  | false |
  | false |
- | true |
 
  Scenario: Get List of fees by CI, amount, touchpoint and single PSP
  Given initial json
@@ -127,15 +127,15 @@ Feature: GetFeeByPsp
  ]
  }
  """
- When the client send POST to /psps/88888888889/fees
+ When the client send POST to /psps/BPPIITRRXXX/fees
  Then check statusCode is 200
  And the body response ordering for the bundleOptions.onUs field is:
  | onUs |
+ | true |
  | false |
  | false |
  | false |
  | false |
- | true |
 
  Scenario: Get List of fees by CI, amount, touchpoint and single PSP 2
  Given initial json
@@ -159,7 +159,7 @@ Feature: GetFeeByPsp
  ]
  }
  """
- When the client send POST to /psps/88888888889/fees
+ When the client send POST to /psps/BPPIITRRXXX/fees
  Then check statusCode is 200
  And check response body is
  """
@@ -175,7 +175,7 @@ Feature: GetFeeByPsp
  "bundleName": "pacchetto 7",
  "bundleDescription": "pacchetto 7",
  "idCiBundle": null,
- "idPsp": "88888888889",
+ "idPsp": "BPPIITRRXXX",
  "idBrokerPsp": "88888888899",
  "idChannel": "88888888899_01_ONUS",
  "onUs": false,
@@ -208,7 +208,7 @@ Feature: GetFeeByPsp
  ]
  }
  """
- When the client send POST to /psps/88888888889/fees
+ When the client send POST to /psps/BPPIITRRXXX/fees
  Then check statusCode is 200
  And the body response ordering for the bundleOptions.onUs field is:
  | onUs |
@@ -235,15 +235,15 @@ Feature: GetFeeByPsp
  ]
  }
  """
- When the client send POST to /psps/88888888889/fees
+ When the client send POST to /psps/BPPIITRRXXX/fees
  Then check statusCode is 200
  And the body response ordering for the bundleOptions.onUs field is:
  | onUs |
+ | true |
  | false |
  | false |
  | false |
  | false |
- | true |
 
  Scenario: Get fee by psp with non-existing bin
  Given initial json
@@ -265,7 +265,7 @@ Feature: GetFeeByPsp
  ]
  }
  """
- When the client send POST to /psps/88888888889/fees
+ When the client send POST to /psps/BPPIITRRXXX/fees
  Then check statusCode is 200
  And check response body is
  """
@@ -296,7 +296,7 @@ Feature: GetFeeByPsp
  ]
  } 
  """
- When the client send POST to /psps/AMEX/fees
+ When the client send POST to /psps/UNCRITMM/fees
  Then check statusCode is 200
  And check response body is
  """
@@ -312,9 +312,9 @@ Feature: GetFeeByPsp
  "bundleName": "pacchetto 10",
  "bundleDescription": "pacchetto 10",
  "idCiBundle": null,
- "idPsp": "AMEX",
+ "idPsp": "UNCRITMM",
  "idBrokerPsp": "88888888899",
- "idChannel": "AMEX_ONUS",
+ "idChannel": "UNCRITMM_ONUS",
  "onUs": true,
  "abi": "AMREX",
  "pspBusinessName": "psp business name int-test-10"

diff --git a/integration-test/src/features/getFees.feature b/integration-test/src/features/getFees.feature
@@ -62,13 +62,13 @@ Feature: GetFees - Get List of fees by CI, amount, method, touchpoint
  And the body response ordering for the bundleOptions.onUs field is:
  | onUs |
  | true |
- | false |
  | true |
  | false |
  | false |
  | false |
  | false |
  | false |
+ | false |
 
  Scenario: Get List of fees by CI, amount, method and single PSP
  Given initial json
@@ -144,7 +144,7 @@ Feature: GetFees - Get List of fees by CI, amount, method, touchpoint
  "bin": "309500",
  "paymentMethod": null,
  "touchpoint": "IO",
- "idPspList": [{"idPsp":"88888888889"}],
+ "idPspList": [{"idPsp":"BPPIITRRXXX"}],
  "transferList": [
  {
  "creditorInstitution": "77777777777",
@@ -175,7 +175,7 @@ Feature: GetFees - Get List of fees by CI, amount, method, touchpoint
  "bundleName": "pacchetto 7",
  "bundleDescription": "pacchetto 7",
  "idCiBundle": null,
- "idPsp": "88888888889",
+ "idPsp": "BPPIITRRXXX",
  "idChannel": "88888888899_01_ONUS",
  "idBrokerPsp": "88888888899",
  "onUs": false,
@@ -245,13 +245,13 @@ Feature: GetFees - Get List of fees by CI, amount, method, touchpoint
  And the body response ordering for the bundleOptions.onUs field is:
  | onUs |
  | true |
- | false |
  | true |
  | false |
  | false |
  | false |
  | false |
  | false |
+ | false |
 
 
  Scenario: Execute a GetFees request with non-existing bin

diff --git a/integration-test/src/step_definitions/support/steps.js b/integration-test/src/step_definitions/support/steps.js
@@ -102,6 +102,11 @@ Then(/^check response body is$/, function(payload) {
 });
 
 Then('the body response ordering for the bundleOptions.onUs field is:', function (dataTable) {
+ // force the obtained list to be sorted by onUs field value
+ responseToCheck.data.bundleOptions.sort(function (a, b) {
+ // true values first
+ return (a.onUs === b.onUs)? 0 : a.onUs? -1 : 1;
+ });
  for (let i=0; i<responseToCheck.data.bundleOptions.length; i++){
  let bodyOnUs = responseToCheck.data.bundleOptions[i].onUs;
  let checkOnUs = JSON.parse(dataTable.rows()[i][0]);

diff --git a/src/main/java/it/gov/pagopa/afm/calculator/repository/CosmosRepository.java b/src/main/java/it/gov/pagopa/afm/calculator/repository/CosmosRepository.java
@@ -19,6 +19,7 @@
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Repository;
+import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -36,6 +37,11 @@ public class CosmosRepository {
 
  @Value("${pspPoste.id}")
  private String pspPosteId;
+
+ @Value("#{'${psp.whitelist}'.split(',')}")
+ private List<String> pspWhitelist;
+
+ private static final String ID_PSP_PARAM = "idPsp";
 
  /**
  * @param ciFiscalCode fiscal code of the CI
@@ -136,9 +142,15 @@ private Iterable<ValidBundle> findValidBundles(PaymentOption paymentOption, bool
 
  // add filter for Poste bundles
  if (!allCcp) {
- var allCcpFilter = isNotEqual("idPsp", pspPosteId);
+ var allCcpFilter = isNotEqual(ID_PSP_PARAM, pspPosteId);
  queryResult = and(queryResult, allCcpFilter);
  }
+
+ // add filter for PSP whitelist
+ if (!CollectionUtils.isEmpty(pspWhitelist)) {
+ var pspIn = in(ID_PSP_PARAM, pspWhitelist);
+ queryResult = and(queryResult, pspIn);
+ }
 
  // execute the query
  return cosmosTemplate.find(new CosmosQuery(queryResult), ValidBundle.class, "validbundles");
@@ -230,7 +242,7 @@ private Criteria getPspFilterCriteria(
  Criteria queryTmp = null;
  while (iterator.hasNext()) {
  var pspSearch = iterator.next();
- var queryItem = isEqual("idPsp", pspSearch.getIdPsp());
+ var queryItem = isEqual(ID_PSP_PARAM, pspSearch.getIdPsp());
  if (StringUtils.isNotEmpty(pspSearch.getIdChannel())) {
  queryItem = and(queryItem, isEqual("idChannel", pspSearch.getIdChannel()));
  }

diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties
@@ -26,3 +26,6 @@ pspPoste.id=BPPIITRRZZZ
 
 # AMEX (American Express) payment ABI
 pspAmex.abi=AMREX
+
+# PSP whitelist to manage which bundles must be filtered
+psp.whitelist=PPAYITR1XXX,BPPIITRRXXX,CIPBITMM,UNCRITMM,BNLIITRR,BCITITMM,BIC36019
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -55,3 +55,6 @@ pspPoste.id=${ID_PSP_POSTE}
 
 # AMEX (American Express) payment ABI
 pspAmex.abi=${AMEX_ABI}
+
+# PSP whitelist to manage which bundles must be filtered
+psp.whitelist=${PSP_WHITELIST}
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
@@ -43,6 +43,9 @@ payment.amount.threshold=0
 # PSP Poste
 pspPoste.id=testIdPspPoste
 
+# PSP whitelist to manage which bundles must be filtered
+psp.whitelist=PPAYITR1XXX,BPPIITRRXXX,CIPBITMM,UNCRITMM,BNLIITRR,BCITITMM,BIC36019
+
 # Openapi
 springdoc.writer-with-order-by-keys=false
 springdoc.writer-with-default-pretty-printer=true