Merge main and resolve conflicts

Author: Aishwariyaa Anand

crates/api_models/Cargo.toml

@@ -17,8 +17,7 @@ olap = []
 openapi = ["common_enums/openapi", "olap", "recon", "dummy_connector", "olap"]
 recon = []
 v1 = ["common_utils/v1"]
-v2 = ["common_types/v2", "common_utils/v2", "refunds_v2", "tokenization_v2", "dep:reqwest"]
-refunds_v2 = []
+v2 = ["common_types/v2", "common_utils/v2", "tokenization_v2", "dep:reqwest"]
 dynamic_routing = []
 control_center_theme = ["dep:actix-web", "dep:actix-multipart"]
 revenue_recovery = []

crates/api_models/src/refunds.rs

@@ -13,7 +13,7 @@ use super::payments::AmountFilter;
 use crate::admin;
 use crate::{admin::MerchantConnectorInfo, enums};
 
-#[cfg(all(any(feature = "v1", feature = "v2"), not(feature = "refunds_v2")))]
+#[cfg(feature = "v1")]
 #[derive(Default, Debug, ToSchema, Clone, Deserialize, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct RefundRequest {
@@ -63,7 +63,7 @@ pub struct RefundRequest {
     pub split_refunds: Option<common_types::refunds::SplitRefund>,
 }
 
-#[cfg(all(feature = "v2", feature = "refunds_v2"))]
+#[cfg(feature = "v2")]
 #[derive(Debug, ToSchema, Clone, Deserialize, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct RefundsCreateRequest {
@@ -109,19 +109,19 @@ pub struct RefundsCreateRequest {
     pub merchant_connector_details: Option<MerchantConnectorAuthDetails>,
 }
 
-#[cfg(all(any(feature = "v1", feature = "v2"), not(feature = "refunds_v2")))]
+#[cfg(feature = "v1")]
 #[derive(Default, Debug, Clone, Deserialize)]
 pub struct RefundsRetrieveBody {
     pub force_sync: Option<bool>,
 }
 
-#[cfg(all(feature = "v2", feature = "refunds_v2"))]
+#[cfg(feature = "v2")]
 #[derive(Default, Debug, Clone, Deserialize)]
 pub struct RefundsRetrieveBody {
     pub force_sync: Option<bool>,
 }
 
-#[cfg(all(feature = "v2", feature = "refunds_v2"))]
+#[cfg(feature = "v2")]
 #[derive(Default, Debug, Clone, Deserialize)]
 pub struct RefundsRetrievePayload {
     /// `force_sync` with the connector to get refund details
@@ -131,7 +131,7 @@ pub struct RefundsRetrievePayload {
     pub merchant_connector_details: Option<MerchantConnectorAuthDetails>,
 }
 
-#[cfg(all(any(feature = "v1", feature = "v2"), not(feature = "refunds_v2")))]
+#[cfg(feature = "v1")]
 #[derive(Default, Debug, ToSchema, Clone, Deserialize, Serialize)]
 pub struct RefundsRetrieveRequest {
     /// Unique Identifier for the Refund. This is to ensure idempotency for multiple partial refund initiated against the same payment. If the identifiers is not defined by the merchant, this filed shall be auto generated and provide in the API response. It is recommended to generate uuid(v4) as the refund_id.
@@ -150,7 +150,7 @@ pub struct RefundsRetrieveRequest {
     pub merchant_connector_details: Option<admin::MerchantConnectorDetailsWrap>,
 }
 
-#[cfg(all(feature = "v2", feature = "refunds_v2"))]
+#[cfg(feature = "v2")]
 #[derive(Debug, ToSchema, Clone, Deserialize, Serialize)]
 pub struct RefundsRetrieveRequest {
     /// Unique Identifier for the Refund. This is to ensure idempotency for multiple partial refund initiated against the same payment. If the identifiers is not defined by the merchant, this filed shall be auto generated and provide in the API response. It is recommended to generate uuid(v4) as the refund_id.
@@ -183,7 +183,7 @@ pub struct RefundUpdateRequest {
     pub metadata: Option<pii::SecretSerdeValue>,
 }
 
-#[cfg(all(feature = "v2", feature = "refunds_v2"))]
+#[cfg(feature = "v2")]
 #[derive(Default, Debug, ToSchema, Clone, Deserialize, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct RefundMetadataUpdateRequest {

crates/diesel_models/Cargo.toml

@@ -12,7 +12,6 @@ default = ["kv_store"]
 kv_store = []
 v1 = ["common_utils/v1", "common_types/v1"]
 v2 = ["common_utils/v2", "common_types/v2"]
-refunds_v2 = []
 tokenization_v2 = []
 
 [dependencies]

crates/diesel_models/src/kv.rs

@@ -133,11 +133,11 @@ impl DBOperation {
                         )
                         .await?,
                 )),
-                #[cfg(all(any(feature = "v1", feature = "v2"), not(feature = "refunds_v2")))]
+                #[cfg(feature = "v1")]
                 Updateable::RefundUpdate(a) => {
                     DBResult::Refund(Box::new(a.orig.update(conn, a.update_data).await?))
                 }
-                #[cfg(all(feature = "v2", feature = "refunds_v2"))]
+                #[cfg(feature = "v2")]
                 Updateable::RefundUpdate(a) => {
                     DBResult::Refund(Box::new(a.orig.update_with_id(conn, a.update_data).await?))
                 }

crates/diesel_models/src/query/refund.rs

@@ -1,29 +1,23 @@
 use diesel::{associations::HasTable, BoolExpressionMethods, ExpressionMethods, Table};
 
 use super::generics;
+#[cfg(feature = "v1")]
+use crate::schema::refund::dsl;
+#[cfg(feature = "v2")]
+use crate::schema_v2::refund::dsl;
 use crate::{
     errors,
-    refund::{RefundUpdate, RefundUpdateInternal},
+    refund::{Refund, RefundNew, RefundUpdate, RefundUpdateInternal},
     PgPooledConn, StorageResult,
 };
-#[cfg(all(any(feature = "v1", feature = "v2"), not(feature = "refunds_v2")))]
-use crate::{
-    refund::{Refund, RefundNew},
-    schema::refund::dsl,
-};
-#[cfg(all(feature = "v2", feature = "refunds_v2"))]
-use crate::{
-    refund::{Refund, RefundNew},
-    schema_v2::refund::dsl,
-};
 
 impl RefundNew {
     pub async fn insert(self, conn: &PgPooledConn) -> StorageResult<Refund> {
         generics::generic_insert(conn, self).await
     }
 }
 
-#[cfg(all(any(feature = "v1", feature = "v2"), not(feature = "refunds_v2")))]
+#[cfg(feature = "v1")]
 impl Refund {
     pub async fn update(self, conn: &PgPooledConn, refund: RefundUpdate) -> StorageResult<Self> {
         match generics::generic_update_with_unique_predicate_get_result::<
@@ -138,7 +132,7 @@ impl Refund {
     }
 }
 
-#[cfg(all(feature = "v2", feature = "refunds_v2"))]
+#[cfg(feature = "v2")]
 impl Refund {
     pub async fn update_with_id(
         self,

crates/diesel_models/src/refund.rs

@@ -7,11 +7,11 @@ use serde::{Deserialize, Serialize};
 use time::PrimitiveDateTime;
 
 use crate::enums as storage_enums;
-#[cfg(all(any(feature = "v1", feature = "v2"), not(feature = "refunds_v2")))]
+#[cfg(feature = "v1")]
 use crate::schema::refund;
-#[cfg(all(feature = "v2", feature = "refunds_v2"))]
+#[cfg(feature = "v2")]
 use crate::schema_v2::refund;
-#[cfg(all(any(feature = "v1", feature = "v2"), not(feature = "refunds_v2")))]
+#[cfg(feature = "v1")]
 #[derive(
     Clone,
     Debug,
@@ -68,7 +68,7 @@ pub struct Refund {
     pub issuer_error_message: Option<String>,
 }
 
-#[cfg(all(feature = "v2", feature = "refunds_v2"))]
+#[cfg(feature = "v2")]
 #[derive(
     Clone,
     Debug,
@@ -119,7 +119,7 @@ pub struct Refund {
     pub connector_id: Option<common_utils::id_type::MerchantConnectorAccountId>,
 }
 
-#[cfg(all(any(feature = "v1", feature = "v2"), not(feature = "refunds_v2")))]
+#[cfg(feature = "v1")]
 #[derive(
     Clone,
     Debug,
@@ -166,7 +166,7 @@ pub struct RefundNew {
     pub processor_transaction_data: Option<String>,
 }
 
-#[cfg(all(feature = "v2", feature = "refunds_v2"))]
+#[cfg(feature = "v2")]
 #[derive(
     Clone,
     Debug,
@@ -213,7 +213,7 @@ pub struct RefundNew {
     pub processor_transaction_data: Option<String>,
 }
 
-#[cfg(all(any(feature = "v1", feature = "v2"), not(feature = "refunds_v2")))]
+#[cfg(feature = "v1")]
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub enum RefundUpdate {
     Update {
@@ -257,7 +257,7 @@ pub enum RefundUpdate {
     },
 }
 
-#[cfg(all(feature = "v2", feature = "refunds_v2"))]
+#[cfg(feature = "v2")]
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub enum RefundUpdate {
     Update {
@@ -299,7 +299,7 @@ pub enum RefundUpdate {
     },
 }
 
-#[cfg(all(any(feature = "v1", feature = "v2"), not(feature = "refunds_v2")))]
+#[cfg(feature = "v1")]
 #[derive(Clone, Debug, AsChangeset, router_derive::DebugAsDisplay)]
 #[diesel(table_name = refund)]
 pub struct RefundUpdateInternal {
@@ -320,7 +320,7 @@ pub struct RefundUpdateInternal {
     issuer_error_message: Option<String>,
 }
 
-#[cfg(all(feature = "v2", feature = "refunds_v2"))]
+#[cfg(feature = "v2")]
 #[derive(Clone, Debug, AsChangeset, router_derive::DebugAsDisplay)]
 #[diesel(table_name = refund)]
 pub struct RefundUpdateInternal {
@@ -339,7 +339,7 @@ pub struct RefundUpdateInternal {
     unified_message: Option<String>,
 }
 
-#[cfg(all(any(feature = "v1", feature = "v2"), not(feature = "refunds_v2")))]
+#[cfg(feature = "v1")]
 impl RefundUpdateInternal {
     pub fn create_refund(self, source: Refund) -> Refund {
         Refund {
@@ -361,7 +361,7 @@ impl RefundUpdateInternal {
     }
 }
 
-#[cfg(all(feature = "v2", feature = "refunds_v2"))]
+#[cfg(feature = "v2")]
 impl RefundUpdateInternal {
     pub fn create_refund(self, source: Refund) -> Refund {
         Refund {
@@ -383,7 +383,7 @@ impl RefundUpdateInternal {
     }
 }
 
-#[cfg(all(any(feature = "v1", feature = "v2"), not(feature = "refunds_v2")))]
+#[cfg(feature = "v1")]
 impl From<RefundUpdate> for RefundUpdateInternal {
     fn from(refund_update: RefundUpdate) -> Self {
         match refund_update {
@@ -510,7 +510,7 @@ impl From<RefundUpdate> for RefundUpdateInternal {
     }
 }
 
-#[cfg(all(feature = "v2", feature = "refunds_v2"))]
+#[cfg(feature = "v2")]
 impl From<RefundUpdate> for RefundUpdateInternal {
     fn from(refund_update: RefundUpdate) -> Self {
         match refund_update {
@@ -625,7 +625,7 @@ impl From<RefundUpdate> for RefundUpdateInternal {
     }
 }
 
-#[cfg(all(any(feature = "v1", feature = "v2"), not(feature = "refunds_v2")))]
+#[cfg(feature = "v1")]
 impl RefundUpdate {
     pub fn apply_changeset(self, source: Refund) -> Refund {
         let RefundUpdateInternal {
@@ -666,7 +666,7 @@ impl RefundUpdate {
     }
 }
 
-#[cfg(all(feature = "v2", feature = "refunds_v2"))]
+#[cfg(feature = "v2")]
 impl RefundUpdate {
     pub fn apply_changeset(self, source: Refund) -> Refund {
         let RefundUpdateInternal {
@@ -777,7 +777,7 @@ impl RefundUpdate {
     }
 }
 
-#[cfg(all(any(feature = "v1", feature = "v2"), not(feature = "refunds_v2")))]
+#[cfg(feature = "v1")]
 #[derive(Debug, Eq, PartialEq, Deserialize, Serialize)]
 pub struct RefundCoreWorkflow {
     pub refund_internal_reference_id: String,
@@ -787,7 +787,7 @@ pub struct RefundCoreWorkflow {
     pub processor_transaction_data: Option<String>,
 }
 
-#[cfg(all(feature = "v2", feature = "refunds_v2"))]
+#[cfg(feature = "v2")]
 #[derive(Debug, Eq, PartialEq, Deserialize, Serialize)]
 pub struct RefundCoreWorkflow {
     pub refund_id: common_utils::id_type::GlobalRefundId,

crates/hyperswitch_domain_models/Cargo.toml

@@ -16,7 +16,6 @@ frm = ["api_models/frm"]
 v2 = ["api_models/v2", "diesel_models/v2", "common_utils/v2", "common_types/v2"]
 v1 = ["api_models/v1", "diesel_models/v1", "common_utils/v1", "common_types/v1"]
 tokenization_v2 = ["api_models/tokenization_v2", "diesel_models/tokenization_v2"]
-refunds_v2 = ["api_models/refunds_v2"]
 dummy_connector = []
 revenue_recovery= []
 

crates/hyperswitch_domain_models/src/refunds.rs

@@ -1,9 +1,9 @@
-#[cfg(all(feature = "v2", feature = "refunds_v2"))]
+#[cfg(feature = "v2")]
 use crate::business_profile::Profile;
-#[cfg(all(any(feature = "v1", feature = "v2"), not(feature = "refunds_v2")))]
+#[cfg(feature = "v1")]
 use crate::errors;
 
-#[cfg(all(any(feature = "v1", feature = "v2"), not(feature = "refunds_v2")))]
+#[cfg(feature = "v1")]
 pub struct RefundListConstraints {
     pub payment_id: Option<common_utils::id_type::PaymentId>,
     pub refund_id: Option<String>,
@@ -18,7 +18,7 @@ pub struct RefundListConstraints {
     pub refund_status: Option<Vec<common_enums::RefundStatus>>,
 }
 
-#[cfg(all(feature = "v2", feature = "refunds_v2"))]
+#[cfg(feature = "v2")]
 pub struct RefundListConstraints {
     pub payment_id: Option<common_utils::id_type::GlobalPaymentId>,
     pub refund_id: Option<common_utils::id_type::GlobalRefundId>,
@@ -33,7 +33,7 @@ pub struct RefundListConstraints {
     pub refund_status: Option<Vec<common_enums::RefundStatus>>,
 }
 
-#[cfg(all(any(feature = "v1", feature = "v2"), not(feature = "refunds_v2")))]
+#[cfg(feature = "v1")]
 impl
     TryFrom<(
         api_models::refunds::RefundListRequest,
@@ -101,7 +101,7 @@ impl
     }
 }
 
-#[cfg(all(feature = "v2", feature = "refunds_v2"))]
+#[cfg(feature = "v2")]
 impl From<(api_models::refunds::RefundListRequest, Profile)> for RefundListConstraints {
     fn from((value, profile): (api_models::refunds::RefundListRequest, Profile)) -> Self {
         let api_models::refunds::RefundListRequest {

crates/openapi/Cargo.toml

@@ -18,7 +18,7 @@ router_env = { version = "0.1.0", path = "../router_env" }
 euclid = { version = "0.1.0", path = "../euclid" }
 
 [features]
-v2 = ["api_models/v2", "common_utils/v2",  "api_models/refunds_v2", "api_models/tokenization_v2"]
+v2 = ["api_models/v2", "common_utils/v2", "api_models/tokenization_v2"]
 v1 = ["api_models/v1", "common_utils/v1"]
 
 [lints]

crates/router/Cargo.toml

@@ -33,11 +33,10 @@ payouts = ["api_models/payouts", "common_enums/payouts", "hyperswitch_connectors
 payout_retry = ["payouts"]
 recon = ["email", "api_models/recon"]
 retry = []
-v2 = [ "common_default", "api_models/v2", "diesel_models/v2", "hyperswitch_domain_models/v2", "storage_impl/v2", "kgraph_utils/v2", "common_utils/v2", "hyperswitch_connectors/v2", "hyperswitch_interfaces/v2", "common_types/v2", "revenue_recovery", "scheduler/v2", "refunds_v2", "euclid/v2", "payment_methods/v2", "tokenization_v2"]
+v2 = [ "common_default", "api_models/v2", "diesel_models/v2", "hyperswitch_domain_models/v2", "storage_impl/v2", "kgraph_utils/v2", "common_utils/v2", "hyperswitch_connectors/v2", "hyperswitch_interfaces/v2", "common_types/v2", "revenue_recovery", "scheduler/v2", "euclid/v2", "payment_methods/v2", "tokenization_v2"]
 v1 = ["common_default", "api_models/v1", "diesel_models/v1", "hyperswitch_domain_models/v1", "storage_impl/v1", "hyperswitch_interfaces/v1", "kgraph_utils/v1", "common_utils/v1", "hyperswitch_connectors/v1", "common_types/v1", "scheduler/v1", "payment_methods/v1"]
 dynamic_routing = ["external_services/dynamic_routing", "storage_impl/dynamic_routing", "api_models/dynamic_routing"]
 revenue_recovery = ["api_models/revenue_recovery", "hyperswitch_interfaces/revenue_recovery", "hyperswitch_domain_models/revenue_recovery", "hyperswitch_connectors/revenue_recovery"]
-refunds_v2 = ["api_models/refunds_v2", "diesel_models/refunds_v2", "storage_impl/refunds_v2", "hyperswitch_domain_models/refunds_v2"]
 tokenization_v2 = ["api_models/tokenization_v2", "diesel_models/tokenization_v2", "hyperswitch_domain_models/tokenization_v2", "storage_impl/tokenization_v2"]
 
 # Partial Auth