resolve merge conflicts

crates/api_models/src/payouts.rs

@@ -8,7 +8,6 @@ use masking::Secret;
 use serde::{Deserialize, Serialize};
 use time::PrimitiveDateTime;
 use utoipa::ToSchema;
-
 use crate::{enums as api_enums, payments};
 
 #[derive(Debug, Deserialize, Serialize, Clone, ToSchema)]
@@ -712,7 +711,7 @@ pub struct PayoutLinkDetails {
  pub pub_key: Secret<String>,
  pub client_secret: Secret<String>,
  pub payout_link_id: String,
- pub customer_id: String,
+ pub customer_id: id_type::CustomerId,
  #[serde(with = "common_utils::custom_serde::iso8601")]
  pub session_expiry: PrimitiveDateTime,
  pub return_url: Option<String>,

crates/diesel_models/src/schema.rs

@@ -813,11 +813,11 @@ diesel::table! {
  #[max_length = 64]
  payment_method_billing_address_id -> Nullable<Varchar>,
  #[max_length = 64]
- charge_id -> Nullable<Varchar>,
- #[max_length = 64]
  client_source -> Nullable<Varchar>,
  #[max_length = 64]
  client_version -> Nullable<Varchar>,
+ #[max_length = 64]
+ charge_id -> Nullable<Varchar>,
  }
 }
 
@@ -886,8 +886,8 @@ diesel::table! {
  #[max_length = 64]
  fingerprint_id -> Nullable<Varchar>,
  request_external_three_ds_authentication -> Nullable<Bool>,
- charges -> Nullable<Jsonb>,
  frm_metadata -> Nullable<Jsonb>,
+ charges -> Nullable<Jsonb>,
  }
 }
 
@@ -1049,12 +1049,12 @@ diesel::table! {
  profile_id -> Varchar,
  status -> PayoutStatus,
  confirm -> Nullable<Bool>,
- #[max_length = 32]
- priority -> Nullable<Varchar>,
  #[max_length = 255]
  payout_link_id -> Nullable<Varchar>,
  #[max_length = 128]
  client_secret -> Nullable<Varchar>,
+ #[max_length = 32]
+ priority -> Nullable<Varchar>,
  }
 }
 

crates/router/src/compatibility/stripe/webhooks.rs

@@ -158,7 +158,8 @@ impl From<common_enums::PayoutStatus> for StripePayoutStatus {
  | common_enums::PayoutStatus::RequiresCreation
  | common_enums::PayoutStatus::RequiresFulfillment
  | common_enums::PayoutStatus::RequiresPayoutMethodData
- | common_enums::PayoutStatus::RequiresVendorAccountCreation => Self::PayoutProcessing,
+ | common_enums::PayoutStatus::RequiresVendorAccountCreation
+ | common_enums::PayoutStatus::RequiresConfirmation => Self::PayoutProcessing,
  }
  }
 }

crates/router/src/core/payout_link.rs

@@ -3,16 +3,17 @@ use diesel_models::enums;
 
 use crate::{
  errors,
- routes::{app::StorageInterface, AppState},
+ routes::{app::StorageInterface, SessionState},
  services::{self, GenericLinks},
  types::domain,
 };
 use error_stack::ResultExt;
+use common_utils::id_type::CustomerId;
 
 use super::errors::{RouterResponse, StorageErrorExt};
 
 pub async fn initiate_payout_link(
- state: AppState,
+ state: SessionState,
  merchant_account: domain::MerchantAccount,
  key_store: domain::MerchantKeyStore,
  req: api_models::payouts::PayoutLinkInitiateRequest,
@@ -61,10 +62,15 @@ pub async fn initiate_payout_link(
 
  // else, send back form link
  } else {
+ let customer_id =
+ CustomerId::from(payout_link.primary_reference.clone().into())
+ .change_context(errors::ApiErrorResponse::InvalidDataValue {
+ field_name: "customer_id",
+ })?;
  // Fetch customer
  let customer = db
  .find_customer_by_customer_id_merchant_id(
- &payout_link.primary_reference,
+ &customer_id,
  &req.merchant_id,
  &key_store,
  merchant_account.storage_scheme,

crates/router/src/core/payouts.rs

@@ -343,7 +343,7 @@ pub async fn payouts_create_core(
 
 #[instrument(skip_all)]
 pub async fn payouts_confirm_core(
- state: AppState,
+ state: SessionState,
  merchant_account: domain::MerchantAccount,
  key_store: domain::MerchantKeyStore,
  req: payouts::PayoutCreateRequest,

crates/router/src/core/payouts/validator.rs

@@ -2,6 +2,7 @@ use api_models::admin;
 #[cfg(feature = "olap")]
 use common_utils::errors::CustomResult;
 use common_utils::ext_traits::ValueExt;
+use common_utils::id_type::CustomerId;
 use diesel_models::{enums::CollectLinkConfig, generic_link::PaymentMethodCollectLinkData};
 use error_stack::{report, ResultExt};
 pub use hyperswitch_domain_models::errors::StorageError;
@@ -185,10 +186,10 @@ pub(super) fn validate_payout_list_request_for_joins(
 }
 
 pub async fn create_payout_link(
- state: &AppState,
+ state: &SessionState,
  merchant_account: &domain::MerchantAccount,
  req: &api_models::payouts::PayoutCreatePayoutLinkConfig,
- customer_id: &String,
+ customer_id: &CustomerId,
  return_url: Option<String>,
  payout_id: &String,
 ) -> RouterResult<Option<PaymentMethodCollectLinkData>> {
@@ -231,7 +232,7 @@ pub async fn create_payout_link(
  let domain = merchant_config
  .clone()
  .and_then(|c| c.domain_name.clone())
- .unwrap_or_else(|| state.conf.server.base_url.clone());
+ .unwrap_or_else(|| state.base_url.clone());
 
  let (collector_name, logo, theme) = match ui_config {
  Some(config) => (
@@ -267,7 +268,7 @@ pub async fn create_payout_link(
 
  let data = PaymentMethodCollectLinkData {
  pm_collect_link_id: payout_link_id.clone(),
- customer_id: customer_id.to_string(),
+ customer_id: customer_id.clone(),
  link,
  sdk_host,
  client_secret: Secret::new(client_secret),

crates/router/src/types/transformers.rs

@@ -570,7 +570,8 @@ impl ForeignFrom<storage_enums::PayoutStatus> for Option<storage_enums::EventTyp
  | storage_enums::PayoutStatus::RequiresCreation
  | storage_enums::PayoutStatus::RequiresFulfillment
  | storage_enums::PayoutStatus::RequiresPayoutMethodData
- | storage_enums::PayoutStatus::RequiresVendorAccountCreation => None,
+ | storage_enums::PayoutStatus::RequiresVendorAccountCreation
+ | storage_enums::PayoutStatus::RequiresConfirmation => None,
  }
  }
 }