Merge branch 'feat/block_paymentmethod' of https://github.com/juspay/…

…hyperswitch into feat/block_paymentmethod

crates/api_models/src/lib.rs

@@ -7,7 +7,6 @@ pub mod cards_info;
 pub mod conditional_configs;
 pub mod connector_onboarding;
 pub mod currency;
-pub mod pm_blacklist;
 pub mod customers;
 pub mod disputes;
 pub mod enums;
@@ -24,6 +23,7 @@ pub mod payment_methods;
 pub mod payments;
 #[cfg(feature = "payouts")]
 pub mod payouts;
+pub mod pm_blacklist;
 pub mod refunds;
 pub mod routing;
 pub mod surcharge_decision_configs;

crates/api_models/src/pm_blacklist.rs

@@ -17,4 +17,3 @@ pub struct BlacklistPmResponse {
 
 impl ApiEventMetric for BlacklistPmRequest {}
 impl ApiEventMetric for BlacklistPmResponse {}
-

crates/router/src/core.rs

@@ -9,8 +9,6 @@ pub mod configs;
 pub mod connector_onboarding;
 #[cfg(any(feature = "olap", feature = "oltp"))]
 pub mod currency;
-#[cfg(any(feature = "olap", feature = "oltp"))]
-pub mod pm_blacklist;
 pub mod customers;
 pub mod disputes;
 pub mod errors;
@@ -24,6 +22,8 @@ pub mod payment_methods;
 pub mod payments;
 #[cfg(feature = "payouts")]
 pub mod payouts;
+#[cfg(any(feature = "olap", feature = "oltp"))]
+pub mod pm_blacklist;
 pub mod refunds;
 pub mod routing;
 pub mod surcharge_decision_config;

crates/router/src/core/pm_blacklist.rs

@@ -7,24 +7,26 @@ use crate::{
     core::errors::{self, api_error_response},
     headers, logger,
     routes::AppState,
-    services, types::{self, domain},
+    services,
+    types::{self, domain},
 };
 
 pub async fn block_payment_method(
     state: AppState,
     _req: &actix_web::HttpRequest,
     body: pm_blacklist::BlacklistPmRequest,
-    merchant_account: domain::MerchantAccount
+    merchant_account: domain::MerchantAccount,
 ) -> CustomResult<
     services::ApplicationResponse<pm_blacklist::BlacklistPmResponse>,
     api_error_response::ApiErrorResponse,
 > {
     let fingerprints_to_block = body.pm_to_block;
-    println!(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> {:?}",merchant_account);
+    println!(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> {:?}", merchant_account);
 
     Ok(services::api::ApplicationResponse::Json(
-        pm_blacklist::BlacklistPmResponse { status_message: "success".to_string() , fingerprints_blocked: fingerprints_to_block} 
+        pm_blacklist::BlacklistPmResponse {
+            status_message: "success".to_string(),
+            fingerprints_blocked: fingerprints_to_block,
+        },
     ))
-
 }
-

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

@@ -0,0 +1 @@
+

crates/router/src/routes.rs

@@ -8,8 +8,6 @@ pub mod configs;
 pub mod connector_onboarding;
 #[cfg(any(feature = "olap", feature = "oltp"))]
 pub mod currency;
-#[cfg(any(feature = "olap", feature = "oltp"))]
-pub mod pm_blacklist;
 pub mod customers;
 pub mod disputes;
 #[cfg(feature = "dummy_connector")]
@@ -26,6 +24,8 @@ pub mod payment_methods;
 pub mod payments;
 #[cfg(feature = "payouts")]
 pub mod payouts;
+#[cfg(any(feature = "olap", feature = "oltp"))]
+pub mod pm_blacklist;
 pub mod refunds;
 #[cfg(feature = "olap")]
 pub mod routing;
@@ -44,10 +44,10 @@ pub mod locker_migration;
 pub use self::app::DummyConnector;
 #[cfg(any(feature = "olap", feature = "oltp"))]
 pub use self::app::Forex;
-#[cfg(any(feature = "olap", feature = "oltp"))]
-pub use self::app::PmBlacklist;
 #[cfg(feature = "payouts")]
 pub use self::app::Payouts;
+#[cfg(any(feature = "olap", feature = "oltp"))]
+pub use self::app::PmBlacklist;
 #[cfg(feature = "olap")]
 pub use self::app::Routing;
 #[cfg(all(feature = "olap", feature = "kms"))]

crates/router/src/routes/app.rs

@@ -16,12 +16,12 @@ use tokio::sync::oneshot;
 
 #[cfg(any(feature = "olap", feature = "oltp"))]
 use super::currency;
-#[cfg(any(feature = "olap", feature = "oltp"))]
-use super::pm_blacklist;
 #[cfg(feature = "dummy_connector")]
 use super::dummy_connector::*;
 #[cfg(feature = "payouts")]
 use super::payouts::*;
+#[cfg(any(feature = "olap", feature = "oltp"))]
+use super::pm_blacklist;
 #[cfg(feature = "olap")]
 use super::routing as cloud_routing;
 #[cfg(all(feature = "olap", feature = "kms"))]
@@ -389,14 +389,10 @@ impl PmBlacklist {
         web::scope("/pm")
             .app_data(web::Data::new(state.clone()))
             .service(
-                web::resource("/block").route(web::post().to(pm_blacklist::block_payment_method))
-            )
-            .service(
-                web::resource("/unblock").route(web::post().to(currency::convert_forex))
-            )
-            .service(
-                web::resource("/blacklist").route(web::post().to(currency::convert_forex))
+                web::resource("/block").route(web::post().to(pm_blacklist::block_payment_method)),
             )
+            .service(web::resource("/unblock").route(web::post().to(currency::convert_forex)))
+            .service(web::resource("/blacklist").route(web::post().to(currency::convert_forex)))
     }
 }
 

crates/router/src/routes/pm_blacklist.rs

@@ -1,14 +1,13 @@
 use actix_web::{web, HttpRequest, HttpResponse};
-use router_env::Flow;
 use api_models::pm_blacklist as pm_blacklist_model;
+use router_env::Flow;
 
 use crate::{
     core::{api_locking, pm_blacklist},
     routes::AppState,
     services::{api, authentication as auth, authorization::permissions::Permission},
 };
 
-
 pub async fn block_payment_method(
     state: web::Data<AppState>,
     req: HttpRequest,
@@ -20,7 +19,9 @@ pub async fn block_payment_method(
         state,
         &req,
         json_payload.into_inner(),
-        |state, auth: auth::AuthenticationData, body| pm_blacklist::block_payment_method(state, &req, body, auth.merchant_account),
+        |state, auth: auth::AuthenticationData, body| {
+            pm_blacklist::block_payment_method(state, &req, body, auth.merchant_account)
+        },
         auth::auth_type(
             &auth::ApiKeyAuth,
             &auth::JWTAuth(Permission::MerchantAccountRead),
@@ -30,4 +31,3 @@ pub async fn block_payment_method(
     ))
     .await
 }
-