chore: update diesel models

Author: hrithikesh026

crates/common_enums/src/enums.rs

@@ -7942,6 +7942,7 @@ pub enum UIWidgetFormLayout {
     Clone,
     Copy,
     Debug,
+    Default,
     Eq,
     PartialEq,
     serde::Deserialize,
@@ -7954,6 +7955,7 @@ pub enum UIWidgetFormLayout {
 #[strum(serialize_all = "snake_case")]
 #[serde(rename_all = "snake_case")]
 pub enum DeleteStatus {
+    #[default]
     Active,
     Redacted,
 }

crates/diesel_models/src/customers.rs

@@ -6,8 +6,11 @@ use time::PrimitiveDateTime;
 #[cfg(feature = "v1")]
 use crate::schema::customers;
 #[cfg(feature = "v2")]
-use crate::{enums::DeleteStatus, schema_v2::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,
@@ -164,6 +167,7 @@ pub struct Customer {
     pub merchant_reference_id: Option<common_utils::id_type::CustomerId>,
     pub default_billing_address: Option<Encryption>,
     pub default_shipping_address: Option<Encryption>,
+    #[diesel(deserialize_as = RequiredFromNullableWithDefault<DeleteStatus>)]
     pub status: DeleteStatus,
     pub id: common_utils::id_type::GlobalCustomerId,
 }

crates/diesel_models/src/lib.rs

@@ -60,7 +60,8 @@ pub mod user_authentication_method;
 pub mod user_key_store;
 pub mod user_role;
 
-use diesel_impl::{DieselArray, OptionalDieselArray, RequiredFromNullable};
+use diesel_impl::{DieselArray, OptionalDieselArray};
+pub use diesel_impl::{RequiredFromNullable, RequiredFromNullableWithDefault};
 
 pub type StorageResult<T> = error_stack::Result<T, errors::DatabaseError>;
 pub type PgPooledConn = async_bb8_diesel::Connection<diesel::PgConnection>;
@@ -162,6 +163,13 @@ pub(crate) mod diesel_impl {
 
     pub struct RequiredFromNullableWithDefault<T>(T);
 
+    impl<T> RequiredFromNullableWithDefault<T> {
+        /// Extracts the inner value from the wrapper
+        pub fn into_inner(self) -> T {
+            self.0
+        }
+    }
+
     impl<T, ST, DB> Queryable<Nullable<ST>, DB> for RequiredFromNullableWithDefault<T>
     where
         DB: diesel::backend::Backend,
@@ -184,6 +192,34 @@ 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()
+                }
+            }
+        )*
+    };
+}
+
+/// 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()
+                }
+            }
+        )*
+    };
+}
+
 pub(crate) mod metrics {
     use router_env::{counter_metric, global_meter, histogram_metric_f64};
 

crates/diesel_models/src/merchant_connector_account.rs

@@ -64,6 +64,15 @@ impl MerchantConnectorAccount {
     }
 }
 
+#[cfg(feature = "v2")]
+use crate::RequiredFromNullable;
+#[cfg(feature = "v2")]
+impl From<RequiredFromNullable<id_type::ProfileId>> for id_type::ProfileId {
+    fn from(wrapper: RequiredFromNullable<id_type::ProfileId>) -> Self {
+        wrapper.into_inner()
+    }
+}
+
 #[cfg(feature = "v2")]
 #[derive(
     Clone,
@@ -91,6 +100,7 @@ pub struct MerchantConnectorAccount {
     pub connector_webhook_details: Option<pii::SecretSerdeValue>,
     #[diesel(deserialize_as = super::OptionalDieselArray<pii::SecretSerdeValue>)]
     pub frm_config: Option<Vec<pii::SecretSerdeValue>>,
+    #[diesel(deserialize_as = RequiredFromNullable<id_type::ProfileId>)]
     pub profile_id: id_type::ProfileId,
     #[diesel(deserialize_as = super::OptionalDieselArray<String>)]
     pub applepay_verified_domains: Option<Vec<String>>,

crates/diesel_models/src/payment_attempt.rs

@@ -16,7 +16,11 @@ 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,
@@ -35,6 +39,8 @@ impl ConnectorMandateReferenceId {
     }
 }
 
+use crate::RequiredFromNullable;
+
 #[cfg(feature = "v2")]
 #[derive(
     Clone, Debug, Eq, PartialEq, Identifiable, Queryable, Serialize, Deserialize, Selectable,
@@ -48,6 +54,7 @@ pub struct PaymentAttempt {
     pub error_message: Option<String>,
     pub surcharge_amount: Option<MinorUnit>,
     pub payment_method_id: Option<id_type::GlobalPaymentMethodId>,
+    #[diesel(deserialize_as = RequiredFromNullable<storage_enums::AuthenticationType>)]
     pub authentication_type: storage_enums::AuthenticationType,
     #[serde(with = "common_utils::custom_serde::iso8601")]
     pub created_at: PrimitiveDateTime,
@@ -73,6 +80,7 @@ pub struct PaymentAttempt {
     pub encoded_data: Option<masking::Secret<String>>,
     pub unified_code: Option<String>,
     pub unified_message: Option<String>,
+    #[diesel(deserialize_as = RequiredFromNullable<MinorUnit>)]
     pub net_amount: MinorUnit,
     pub external_three_ds_authentication_attempted: Option<bool>,
     pub authentication_connector: Option<String>,
@@ -94,6 +102,7 @@ pub struct PaymentAttempt {
     pub processor_merchant_id: Option<id_type::MerchantId>,
     pub created_by: Option<String>,
     pub connector_request_reference_id: Option<String>,
+    #[diesel(deserialize_as = RequiredFromNullable<storage_enums::PaymentMethod>)]
     pub payment_method_type_v2: storage_enums::PaymentMethod,
     pub connector_payment_id: Option<ConnectorTransactionId>,
     pub payment_method_subtype: storage_enums::PaymentMethodType,

crates/diesel_models/src/payment_intent.rs

@@ -11,15 +11,19 @@ use crate::schema::payment_intent;
 use crate::schema_v2::payment_intent;
 #[cfg(feature = "v2")]
 use crate::types::{FeatureMetadata, OrderDetailsWithAmount};
-use crate::{business_profile::PaymentLinkBackgroundImageConfig, enums as storage_enums};
-
+use crate::{
+    business_profile::PaymentLinkBackgroundImageConfig, enums as storage_enums,
+    RequiredFromNullable,
+};
+crate::impl_from_required_from_nullable!(storage_enums::Currency, 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))]
 pub struct PaymentIntent {
     pub merchant_id: common_utils::id_type::MerchantId,
     pub status: storage_enums::IntentStatus,
     pub amount: MinorUnit,
+    #[diesel(deserialize_as = RequiredFromNullable<storage_enums::Currency>)]
     pub currency: storage_enums::Currency,
     pub amount_captured: Option<MinorUnit>,
     pub customer_id: Option<common_utils::id_type::GlobalCustomerId>,
@@ -40,12 +44,14 @@ pub struct PaymentIntent {
     pub connector_metadata: Option<pii::SecretSerdeValue>,
     pub feature_metadata: Option<FeatureMetadata>,
     pub attempt_count: i16,
+    #[diesel(deserialize_as = RequiredFromNullable<common_utils::id_type::ProfileId>)]
     pub profile_id: common_utils::id_type::ProfileId,
     pub payment_link_id: Option<String>,
     pub updated_by: String,
     pub surcharge_applicable: Option<bool>,
     pub request_incremental_authorization: Option<RequestIncrementalAuthorization>,
     pub authorization_count: Option<i32>,
+    #[diesel(deserialize_as = RequiredFromNullable<PrimitiveDateTime>)]
     pub session_expiry: PrimitiveDateTime,
     pub request_external_three_ds_authentication: Option<bool>,
     pub frm_metadata: Option<pii::SecretSerdeValue>,

crates/diesel_models/src/refund.rs

@@ -14,11 +14,7 @@ use crate::schema_v2::refund;
 #[cfg(feature = "v2")]
 use crate::RequiredFromNullable;
 #[cfg(feature = "v2")]
-impl From<RequiredFromNullable<id_type::RefundReferenceId>> for id_type::RefundReferenceId {
-    fn from(wrapper: RequiredFromNullable<id_type::RefundReferenceId>) -> Self {
-        wrapper.into_inner()
-    }
-}
+crate::impl_from_required_from_nullable!(id_type::RefundReferenceId);
 #[cfg(feature = "v1")]
 #[derive(
     Clone,

crates/diesel_models/src/schema_v2.rs

@@ -369,7 +369,7 @@ diesel::table! {
         merchant_reference_id -> Nullable<Varchar>,
         default_billing_address -> Nullable<Bytea>,
         default_shipping_address -> Nullable<Bytea>,
-        status -> DeleteStatus,
+        status -> Nullable<DeleteStatus>,
         #[max_length = 64]
         id -> Varchar,
     }
@@ -781,7 +781,7 @@ diesel::table! {
         connector_webhook_details -> Nullable<Jsonb>,
         frm_config -> Nullable<Array<Nullable<Jsonb>>>,
         #[max_length = 64]
-        profile_id -> Varchar,
+        profile_id -> Nullable<Varchar>,
         applepay_verified_domains -> Nullable<Array<Nullable<Text>>>,
         pm_auth_config -> Nullable<Jsonb>,
         status -> ConnectorStatus,
@@ -842,7 +842,7 @@ diesel::table! {
         surcharge_amount -> Nullable<Int8>,
         #[max_length = 64]
         payment_method_id -> Nullable<Varchar>,
-        authentication_type -> AuthenticationType,
+        authentication_type -> Nullable<AuthenticationType>,
         created_at -> Timestamp,
         modified_at -> Timestamp,
         last_synced -> Nullable<Timestamp>,
@@ -873,7 +873,7 @@ diesel::table! {
         unified_code -> Nullable<Varchar>,
         #[max_length = 1024]
         unified_message -> Nullable<Varchar>,
-        net_amount -> Int8,
+        net_amount -> Nullable<Int8>,
         external_three_ds_authentication_attempted -> Nullable<Bool>,
         #[max_length = 64]
         authentication_connector -> Nullable<Varchar>,
@@ -905,7 +905,7 @@ diesel::table! {
         created_by -> Nullable<Varchar>,
         #[max_length = 255]
         connector_request_reference_id -> Nullable<Varchar>,
-        payment_method_type_v2 -> Varchar,
+        payment_method_type_v2 -> Nullable<Varchar>,
         #[max_length = 128]
         connector_payment_id -> Nullable<Varchar>,
         #[max_length = 64]
@@ -939,7 +939,7 @@ diesel::table! {
         merchant_id -> Varchar,
         status -> IntentStatus,
         amount -> Int8,
-        currency -> Currency,
+        currency -> Nullable<Currency>,
         amount_captured -> Nullable<Int8>,
         #[max_length = 64]
         customer_id -> Nullable<Varchar>,
@@ -960,15 +960,15 @@ diesel::table! {
         feature_metadata -> Nullable<Json>,
         attempt_count -> Int2,
         #[max_length = 64]
-        profile_id -> Varchar,
+        profile_id -> Nullable<Varchar>,
         #[max_length = 255]
         payment_link_id -> Nullable<Varchar>,
         #[max_length = 32]
         updated_by -> Varchar,
         surcharge_applicable -> Nullable<Bool>,
         request_incremental_authorization -> Nullable<RequestIncrementalAuthorization>,
         authorization_count -> Nullable<Int4>,
-        session_expiry -> Timestamp,
+        session_expiry -> Nullable<Timestamp>,
         request_external_three_ds_authentication -> Nullable<Bool>,
         frm_metadata -> Nullable<Jsonb>,
         customer_details -> Nullable<Bytea>,
@@ -1259,7 +1259,7 @@ diesel::table! {
         #[max_length = 64]
         id -> Varchar,
         #[max_length = 64]
-        merchant_reference_id -> Varchar,
+        merchant_reference_id -> Nullable<Varchar>,
         #[max_length = 64]
         connector_id -> Nullable<Varchar>,
     }