PAGOPA-1778 aggregating duplicate code

pagopa · May 29, 2024 · c542b1f · c542b1f
1 parent a33328b
commit c542b1f
Showing 1 changed file with 11 additions and 8 deletions.
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
@@ -156,10 +156,7 @@ private Iterable<ValidBundle> findValidBundlesMulti(PaymentOptionMulti paymentOp
     }
 
     // add filter for PSP blacklist
-    if (!CollectionUtils.isEmpty(pspBlacklist)) {
-      var pspNotIn = notIn(ID_PSP_PARAM, pspBlacklist);
-      queryResult = and(queryResult, pspNotIn);
-    }
+    queryResult = blackListCriteria(queryResult);
 
     // execute the query
     return cosmosTemplate.find(new CosmosQuery(queryResult), ValidBundle.class, "validbundles");
@@ -250,10 +247,7 @@ private Iterable<ValidBundle> findValidBundles(PaymentOption paymentOption, bool
     }
 
     // add filter for PSP blacklist
-    if (!CollectionUtils.isEmpty(pspBlacklist)) {
-      var pspNotIn = notIn(ID_PSP_PARAM, pspBlacklist);
-      queryResult = and(queryResult, pspNotIn);
-    }
+    queryResult = blackListCriteria(queryResult);
 
     // execute the query
     return cosmosTemplate.find(new CosmosQuery(queryResult), ValidBundle.class, "validbundles");
@@ -419,4 +413,13 @@ private Criteria getPspFilterCriteria(
     }
     return queryTmp != null ? and(queryResult, queryTmp) : queryResult;
   }
+
+  private Criteria blackListCriteria(Criteria queryResult) {
+    // add filter for PSP blacklist
+    if (!CollectionUtils.isEmpty(pspBlacklist)) {
+      var pspNotIn = notIn(ID_PSP_PARAM, pspBlacklist);
+      queryResult = and(queryResult, pspNotIn);
+    }
+    return queryResult;
+  }
 }