PAGOPA-1733 change whitelist to blacklist for psp

pagopa · May 29, 2024 · 4ad78a1 · 4ad78a1
1 parent e663197
commit 4ad78a1
Show file tree

Hide file tree

Showing 10 changed files with 2,138 additions and 2,330 deletions.
diff --git a/openapi/openapi-node-v1.json b/openapi/openapi-node-v1.json
diff --git a/openapi/openapi-node-v2.json b/openapi/openapi-node-v2.json
diff --git a/openapi/openapi-v1-dev-uat.json b/openapi/openapi-v1-dev-uat.json
diff --git a/openapi/openapi-v1.json b/openapi/openapi-v1.json
diff --git a/openapi/openapi-v2.json b/openapi/openapi-v2.json
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
@@ -39,9 +39,9 @@ public class CosmosRepository {
 
   @Value("${pspPoste.id}")
   private String pspPosteId;
-  
-  @Value("#{'${psp.whitelist}'.split(',')}")
-  private List<String> pspWhitelist;
+
+  @Value("#{'${psp.blacklist}'.split(',')}")
+  private List<String> pspBlacklist;
 
   private static final String ID_PSP_PARAM = "idPsp";
 
@@ -155,10 +155,10 @@ private Iterable<ValidBundle> findValidBundlesMulti(PaymentOptionMulti paymentOp
       queryResult = and(queryResult, allCcpFilter);
     }
 
-    // add filter for PSP whitelist
-    if (!CollectionUtils.isEmpty(pspWhitelist)) {
-      var pspIn = in(ID_PSP_PARAM, pspWhitelist);
-      queryResult = and(queryResult, pspIn);
+    // add filter for PSP blacklist
+    if (!CollectionUtils.isEmpty(pspBlacklist)) {
+      var pspNotIn = notIn(ID_PSP_PARAM, pspBlacklist);
+      queryResult = and(queryResult, pspNotIn);
     }
 
     // execute the query
@@ -248,11 +248,11 @@ private Iterable<ValidBundle> findValidBundles(PaymentOption paymentOption, bool
       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);
+
+    // add filter for PSP blacklist
+    if (!CollectionUtils.isEmpty(pspBlacklist)) {
+      var pspNotIn = notIn(ID_PSP_PARAM, pspBlacklist);
+      queryResult = and(queryResult, pspNotIn);
     }
 
     // execute the query

diff --git a/src/main/java/it/gov/pagopa/afm/calculator/util/CriteriaBuilder.java b/src/main/java/it/gov/pagopa/afm/calculator/util/CriteriaBuilder.java
@@ -63,6 +63,11 @@ public static <T> Criteria in(String param, List<T> values) {
         CriteriaType.IN, param, Collections.singletonList(values), Part.IgnoreCaseType.ALWAYS);
   }
 
+  public static <T> Criteria notIn(String param, List<T> values) {
+    return Criteria.getInstance(
+        CriteriaType.NOT_IN, param, Collections.singletonList(values), Part.IgnoreCaseType.ALWAYS);
+  }
+
   public static <T> Criteria arrayContains(String param, T value) {
     return Criteria.getInstance(
         CriteriaType.ARRAY_CONTAINS,

diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties
@@ -19,13 +19,13 @@ table.issuer-range=issuerrangetable
 cache.enabled=false
 
 # Business config
-payment.amount.threshold=0 
+payment.amount.threshold=0
 
 # PSP Poste
 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
+# PSP blacklist to manage which bundles must be filtered
+psp.blacklist=
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -65,5 +65,5 @@ 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}
+# PSP blacklist to manage which bundles must be filtered
+psp.blacklist=${PSP_BLACKLIST}
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
@@ -43,8 +43,8 @@ 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,SIGPITM1XXX
+# PSP blacklist to manage which bundles must be filtered
+psp.blacklist=
 
 # Openapi
 springdoc.writer-with-order-by-keys=false