Refactor(core): reverts the payment method list filtering using constraint graph

crates/euclid/src/enums.rs

@@ -79,8 +79,6 @@ pub enum MandateAcceptanceType {
 pub enum PaymentType {
  SetupMandate,
  NonMandate,
- NewMandate,
- UpdateMandate,
 }
 
 #[derive(

crates/router/src/core/payment_methods.rs

@@ -1,7 +1,6 @@
 pub mod cards;
 pub mod surcharge_decision_configs;
 pub mod transformers;
-pub mod utils;
 pub mod vault;
 
 pub use api_models::enums::Connector;

crates/router/src/core/payment_methods/utils.rs

@@ -1,5 +1,5 @@
 use std::{str::FromStr, sync::Arc};
-
+:
 use api_models::{
  admin::{self, PaymentMethodsEnabled},
  enums as api_enums,
@@ -571,7 +571,7 @@ fn compile_accepted_countries_for_mca(
  agg_nodes.push((
  pm_object_country_value_node,
  cgraph::Relation::Positive,
- cgraph::Strength::Weak,
+ cgraph::Strength::Strong,
  ));
  }
  admin::AcceptedCountries::DisableOnly(countries) => {
@@ -592,7 +592,7 @@ fn compile_accepted_countries_for_mca(
  agg_nodes.push((
  pm_object_country_value_node,
  cgraph::Relation::Positive,
- cgraph::Strength::Weak,
+ cgraph::Strength::Strong,
  ));
  }
  admin::AcceptedCountries::AllAccepted => return Ok(None),
@@ -628,7 +628,7 @@ fn compile_accepted_countries_for_mca(
  agg_nodes.push((
  config_country_agg_node,
  cgraph::Relation::Positive,
- cgraph::Strength::Weak,
+ cgraph::Strength::Strong,
  ));
  }
  }

crates/router/src/db/merchant_connector_account.rs

@@ -538,9 +538,6 @@ impl MerchantConnectorAccountInterface for Store {
  cache::CacheKind::CGraph(
  format!("cgraph_{}_{_profile_id}", _merchant_id).into(),
  ),
- cache::CacheKind::PmFiltersCGraph(
- format!("pm_filters_cgraph_{}_{_profile_id}", _merchant_id).into(),
- ),
  ],
  update_call,
  )
@@ -598,9 +595,6 @@ impl MerchantConnectorAccountInterface for Store {
  cache::CacheKind::CGraph(
  format!("cgraph_{}_{_profile_id}", mca.merchant_id).into(),
  ),
- cache::CacheKind::PmFiltersCGraph(
- format!("pm_filters_cgraph_{}_{_profile_id}", mca.merchant_id).into(),
- ),
  ],
  delete_call,
  )

crates/router/src/routes/metrics/bg_metrics_collector.rs

@@ -11,7 +11,6 @@ pub fn spawn_metrics_collector(metrics_collection_interval_in_secs: &Option<u16>
  &cache::ACCOUNTS_CACHE,
  &cache::ROUTING_CACHE,
  &cache::CGRAPH_CACHE,
- &cache::PM_FILTERS_CGRAPH_CACHE,
  &cache::DECISION_MANAGER_CACHE,
  &cache::SURCHARGE_CACHE,
  ];

crates/storage_impl/src/redis/cache.rs

@@ -41,9 +41,6 @@ const SURCHARGE_CACHE_PREFIX: &str = "surcharge";
 /// Prefix for cgraph cache key
 const CGRAPH_CACHE_PREFIX: &str = "cgraph";
 
-/// Prefix for PM Filter cgraph cache key
-const PM_FILTERS_CGRAPH_CACHE_PREFIX: &str = "pm_filters_cgraph";
-
 /// Prefix for all kinds of cache key
 const ALL_CACHE_PREFIX: &str = "all_cache_kind";
 
@@ -86,16 +83,6 @@ pub static SURCHARGE_CACHE: Lazy<Cache> =
 pub static CGRAPH_CACHE: Lazy<Cache> =
  Lazy::new(|| Cache::new("CGRAPH_CACHE", CACHE_TTL, CACHE_TTI, Some(MAX_CAPACITY)));
 
-/// PM Filter CGraph Cache
-pub static PM_FILTERS_CGRAPH_CACHE: Lazy<Cache> = Lazy::new(|| {
- Cache::new(
- "PM_FILTERS_CGRAPH_CACHE",
- CACHE_TTL,
- CACHE_TTI,
- Some(MAX_CAPACITY),
- )
-});
-
 /// Trait which defines the behaviour of types that's gonna be stored in Cache
 pub trait Cacheable: Any + Send + Sync + DynClone {
  fn as_any(&self) -> &dyn Any;
@@ -108,7 +95,6 @@ pub enum CacheKind<'a> {
  DecisionManager(Cow<'a, str>),
  Surcharge(Cow<'a, str>),
  CGraph(Cow<'a, str>),
- PmFiltersCGraph(Cow<'a, str>),
  All(Cow<'a, str>),
 }
 
@@ -121,7 +107,6 @@ impl<'a> From<CacheKind<'a>> for RedisValue {
  CacheKind::DecisionManager(s) => format!("{DECISION_MANAGER_CACHE_PREFIX},{s}"),
  CacheKind::Surcharge(s) => format!("{SURCHARGE_CACHE_PREFIX},{s}"),
  CacheKind::CGraph(s) => format!("{CGRAPH_CACHE_PREFIX},{s}"),
- CacheKind::PmFiltersCGraph(s) => format!("{PM_FILTERS_CGRAPH_CACHE_PREFIX},{s}"),
  CacheKind::All(s) => format!("{ALL_CACHE_PREFIX},{s}"),
  };
  Self::from_string(value)
@@ -145,10 +130,6 @@ impl<'a> TryFrom<RedisValue> for CacheKind<'a> {
  }
  SURCHARGE_CACHE_PREFIX => Ok(Self::Surcharge(Cow::Owned(split.1.to_string()))),
  CGRAPH_CACHE_PREFIX => Ok(Self::CGraph(Cow::Owned(split.1.to_string()))),
- PM_FILTERS_CGRAPH_CACHE_PREFIX => {
- Ok(Self::PmFiltersCGraph(Cow::Owned(split.1.to_string())))
- }
-
  ALL_CACHE_PREFIX => Ok(Self::All(Cow::Owned(split.1.to_string()))),
  _ => Err(validation_err.into()),
  }

crates/storage_impl/src/redis/pub_sub.rs

@@ -4,7 +4,7 @@ use router_env::{logger, tracing::Instrument};
 
 use crate::redis::cache::{
  CacheKey, CacheKind, ACCOUNTS_CACHE, CGRAPH_CACHE, CONFIG_CACHE, DECISION_MANAGER_CACHE,
- PM_FILTERS_CGRAPH_CACHE, ROUTING_CACHE, SURCHARGE_CACHE,
+ ROUTING_CACHE, SURCHARGE_CACHE,
 };
 
 #[async_trait::async_trait]
@@ -100,16 +100,6 @@ impl PubSubInterface for std::sync::Arc<redis_interface::RedisConnectionPool> {
  .await;
  key
  }
- CacheKind::PmFiltersCGraph(key) => {
- PM_FILTERS_CGRAPH_CACHE
- .remove(CacheKey {
- key: key.to_string(),
- prefix: self.key_prefix.clone(),
- })
- .await;
-
- key
- }
  CacheKind::Routing(key) => {
  ROUTING_CACHE
  .remove(CacheKey {
@@ -156,12 +146,6 @@ impl PubSubInterface for std::sync::Arc<redis_interface::RedisConnectionPool> {
  prefix: self.key_prefix.clone(),
  })
  .await;
- PM_FILTERS_CGRAPH_CACHE
- .remove(CacheKey {
- key: key.to_string(),
- prefix: self.key_prefix.clone(),
- })
- .await;
  ROUTING_CACHE
  .remove(CacheKey {
  key: key.to_string(),