chore: address review comments

Author: hrithikesh026

crates/diesel_models/src/customers.rs

@@ -9,8 +9,7 @@ use crate::schema::customers;
 use crate::{
     diesel_impl::RequiredFromNullableWithDefault, enums::DeleteStatus, schema_v2::customers,
 };
-#[cfg(feature = "v2")]
-crate::impl_from_required_from_nullable_with_default!(DeleteStatus);
+
 #[cfg(feature = "v1")]
 #[derive(
     Clone, Debug, router_derive::DebugAsDisplay, serde::Deserialize, serde::Serialize, Insertable,

crates/diesel_models/src/lib.rs

@@ -61,7 +61,8 @@ pub mod user_key_store;
 pub mod user_role;
 
 use diesel_impl::{DieselArray, OptionalDieselArray};
-pub use diesel_impl::{RequiredFromNullable, RequiredFromNullableWithDefault};
+#[cfg(feature = "v2")]
+use diesel_impl::{RequiredFromNullable, RequiredFromNullableWithDefault};
 
 pub type StorageResult<T> = error_stack::Result<T, errors::DatabaseError>;
 pub type PgPooledConn = async_bb8_diesel::Connection<diesel::PgConnection>;
@@ -72,7 +73,6 @@ pub use self::{
     payment_intent::*, payment_method::*, payout_attempt::*, payouts::*, process_tracker::*,
     refund::*, reverse_lookup::*, user_authentication_method::*,
 };
-
 /// The types and implementations provided by this module are required for the schema generated by
 /// `diesel_cli` 2.0 to work with the types defined in Rust code. This is because
 /// [`diesel`][diesel] 2.0 [changed the nullability of array elements][diesel-2.0-array-nullability],
@@ -131,20 +131,22 @@ pub(crate) mod diesel_impl {
             Ok(Self(row))
         }
     }
-
+    #[cfg(feature = "v2")]
     /// If the DB value is null, this wrapper will return an error when deserializing.
     ///
     /// This is useful when you want to ensure that a field is always present, even if the database
     /// value is NULL. If the database column contains a NULL value, an error will be returned.
     pub struct RequiredFromNullable<T>(T);
 
+    #[cfg(feature = "v2")]
     impl<T> RequiredFromNullable<T> {
         /// Extracts the inner value from the wrapper
         pub fn into_inner(self) -> T {
             self.0
         }
     }
 
+    #[cfg(feature = "v2")]
     impl<T, ST, DB> Queryable<Nullable<ST>, DB> for RequiredFromNullable<T>
     where
         DB: diesel::backend::Backend,
@@ -165,19 +167,20 @@ pub(crate) mod diesel_impl {
         }
     }
 
+    #[cfg(feature = "v2")]
     /// If the DB value is null, this wrapper will provide a default value for the type `T`.
     ///
     /// This is useful when you want to ensure that a field is always present, even if the database
     /// value is NULL. The default value is provided by the `Default` trait implementation of `T`.
     pub struct RequiredFromNullableWithDefault<T>(T);
-
+    #[cfg(feature = "v2")]
     impl<T> RequiredFromNullableWithDefault<T> {
         /// Extracts the inner value from the wrapper
         pub fn into_inner(self) -> T {
             self.0
         }
     }
-
+    #[cfg(feature = "v2")]
     impl<T, ST, DB> Queryable<Nullable<ST>, DB> for RequiredFromNullableWithDefault<T>
     where
         DB: diesel::backend::Backend,
@@ -198,34 +201,54 @@ pub(crate) mod diesel_impl {
             }
         }
     }
-}
 
-/// Macro to implement From trait for types wrapped in RequiredFromNullable
-#[macro_export]
-macro_rules! impl_from_required_from_nullable {
-    ($($type:ty),* $(,)?) => {
-        $(
-            impl From<$crate::RequiredFromNullable<$type>> for $type {
-                fn from(wrapper: $crate::RequiredFromNullable<$type>) -> Self {
-                    wrapper.into_inner()
+    #[cfg(feature = "v2")]
+    /// Macro to implement From trait for types wrapped in RequiredFromNullable
+    #[macro_export]
+    macro_rules! impl_from_required_from_nullable {
+        ($($type:ty),* $(,)?) => {
+            $(
+                impl From<$crate::RequiredFromNullable<$type>> for $type {
+                    fn from(wrapper: $crate::RequiredFromNullable<$type>) -> Self {
+                        wrapper.into_inner()
+                    }
                 }
-            }
-        )*
-    };
-}
+            )*
+        };
+    }
 
-/// Macro to implement From trait for types wrapped in RequiredFromNullableWithDefault
-#[macro_export]
-macro_rules! impl_from_required_from_nullable_with_default {
-    ($($type:ty),* $(,)?) => {
-        $(
-            impl From<$crate::RequiredFromNullableWithDefault<$type>> for $type {
-                fn from(wrapper: $crate::RequiredFromNullableWithDefault<$type>) -> Self {
-                    wrapper.into_inner()
+    #[cfg(feature = "v2")]
+    /// Macro to implement From trait for types wrapped in RequiredFromNullableWithDefault
+    #[macro_export]
+    macro_rules! impl_from_required_from_nullable_with_default {
+        ($($type:ty),* $(,)?) => {
+            $(
+                impl From<$crate::RequiredFromNullableWithDefault<$type>> for $type {
+                    fn from(wrapper: $crate::RequiredFromNullableWithDefault<$type>) -> Self {
+                        wrapper.into_inner()
+                    }
                 }
-            }
-        )*
-    };
+            )*
+        };
+    }
+    #[cfg(feature = "v2")]
+    use common_utils::{id_type, types};
+
+    #[cfg(feature = "v2")]
+    use crate::enums;
+    #[cfg(feature = "v2")]
+    crate::impl_from_required_from_nullable_with_default!(enums::DeleteStatus);
+
+    #[cfg(feature = "v2")]
+    crate::impl_from_required_from_nullable!(
+        enums::AuthenticationType,
+        types::MinorUnit,
+        enums::PaymentMethod,
+        enums::Currency,
+        id_type::ProfileId,
+        time::PrimitiveDateTime,
+        id_type::RefundReferenceId,
+    );
 }
 
 pub(crate) mod metrics {

crates/diesel_models/src/payment_attempt.rs

@@ -16,11 +16,7 @@ use crate::enums as storage_enums;
 use crate::schema::payment_attempt;
 #[cfg(feature = "v2")]
 use crate::schema_v2::payment_attempt;
-crate::impl_from_required_from_nullable!(
-    storage_enums::AuthenticationType,
-    MinorUnit,
-    storage_enums::PaymentMethod
-);
+
 common_utils::impl_to_sql_from_sql_json!(ConnectorMandateReferenceId);
 #[derive(
     Clone, Debug, serde::Deserialize, serde::Serialize, Eq, PartialEq, diesel::AsExpression,

crates/diesel_models/src/payment_intent.rs

@@ -14,11 +14,7 @@ use crate::types::{FeatureMetadata, OrderDetailsWithAmount};
 #[cfg(feature = "v2")]
 use crate::RequiredFromNullable;
 use crate::{business_profile::PaymentLinkBackgroundImageConfig, enums as storage_enums};
-crate::impl_from_required_from_nullable!(
-    storage_enums::Currency,
-    common_utils::id_type::ProfileId,
-    PrimitiveDateTime
-);
+
 #[cfg(feature = "v2")]
 #[derive(Clone, Debug, PartialEq, Identifiable, Queryable, Serialize, Deserialize, Selectable)]
 #[diesel(table_name = payment_intent, primary_key(id), check_for_backend(diesel::pg::Pg))]

crates/diesel_models/src/refund.rs

@@ -13,8 +13,7 @@ use crate::schema::refund;
 use crate::schema_v2::refund;
 #[cfg(feature = "v2")]
 use crate::RequiredFromNullable;
-#[cfg(feature = "v2")]
-crate::impl_from_required_from_nullable!(id_type::RefundReferenceId);
+
 #[cfg(feature = "v1")]
 #[derive(
     Clone,