Skip to content
Merged
Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
7c29ffc
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Apr 6, 2023
7bd37eb
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Apr 9, 2023
2cb260f
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Apr 10, 2023
714017e
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Apr 19, 2023
2717631
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Apr 26, 2023
878d9e9
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 May 5, 2023
c683e3c
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 May 21, 2023
e6171b7
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Jun 14, 2023
9f905f8
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Aug 23, 2023
2c48dda
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Aug 24, 2023
5450287
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Aug 28, 2023
ff78e0e
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Aug 28, 2023
bc9e207
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Oct 18, 2023
ff515dc
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Nov 14, 2023
b24f6cd
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Nov 29, 2023
0878c7f
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Dec 15, 2023
795a7d4
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Dec 29, 2023
ce16af3
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Jan 1, 2024
6ef1cdd
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Jan 8, 2024
dcd8a84
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Jan 18, 2024
5193fd3
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Jan 24, 2024
c36dbc8
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Jan 29, 2024
d9602d6
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Feb 7, 2024
a12ded3
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Feb 20, 2024
5ea0d61
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Mar 5, 2024
677b958
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Mar 6, 2024
951bf32
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Mar 13, 2024
3f0f0c9
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Mar 21, 2024
64c22be
Merge branch 'main' of github.com:juspay/hyperswitch
JeevaRamu0104 Mar 26, 2024
930b42b
fix checkout wasm metadata
JeevaRamu0104 Mar 26, 2024
b76f414
fix checkout wasm metadata
JeevaRamu0104 Mar 26, 2024
6670082
refactor: rewirte code in idiomatic way
ArjunKarthik Mar 26, 2024
dab4833
Merge branch 'fix-checkout-wasm-metadata-issue' of github.com:juspay/…
JeevaRamu0104 Mar 26, 2024
22c4be5
fix clippy
JeevaRamu0104 Mar 26, 2024
b0a9dbe
Merge branch 'main' into fix-checkout-wasm-metadata-issue
JeevaRamu0104 Mar 26, 2024
3379e01
Merge branch 'main' into fix-checkout-wasm-metadata-issue
JeevaRamu0104 Mar 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions crates/connector_configs/src/common_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ pub struct ApiModelMetaData {
pub apple_pay: Option<ApplePayData>,
pub apple_pay_combined: Option<ApplePayData>,
pub endpoint_prefix: Option<String>,
pub mcc: Option<String>,
pub merchant_country_code: Option<String>,
pub merchant_name: Option<String>,
pub acquirer_bin: Option<String>,
pub acquirer_merchant_id: Option<String>,
}

#[serde_with::skip_serializing_none]
Expand Down Expand Up @@ -175,4 +180,9 @@ pub struct DashboardMetaData {
pub apple_pay: Option<ApplePayData>,
pub apple_pay_combined: Option<ApplePayData>,
pub endpoint_prefix: Option<String>,
pub mcc: Option<String>,
pub merchant_country_code: Option<String>,
pub merchant_name: Option<String>,
pub acquirer_bin: Option<String>,
pub acquirer_merchant_id: Option<String>,
}
123 changes: 49 additions & 74 deletions crates/connector_configs/src/response_modifier.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use crate::common_config::{
CardProvider, ConnectorApiIntegrationPayload, DashboardMetaData, DashboardPaymentMethodPayload,
DashboardRequestPayload, GoogleApiModelData, GooglePayData, GpayDashboardPayLoad, Provider,
ApiModelMetaData, CardProvider, ConnectorApiIntegrationPayload, DashboardMetaData,
DashboardPaymentMethodPayload, DashboardRequestPayload, GoogleApiModelData, GooglePayData,
GpayDashboardPayLoad, Provider,
};

impl ConnectorApiIntegrationPayload {
Expand Down Expand Up @@ -275,52 +276,9 @@ impl ConnectorApiIntegrationPayload {
card_provider: Some(credit_details),
};

let google_pay = Self::get_google_pay_metadata_response(response.clone());
let account_name = match response.metadata.clone() {
Some(meta_data) => meta_data.account_name,
_ => None,
};

let merchant_account_id = match response.metadata.clone() {
Some(meta_data) => meta_data.merchant_account_id,
_ => None,
};
let merchant_id = match response.metadata.clone() {
Some(meta_data) => meta_data.merchant_id,
_ => None,
};
let terminal_id = match response.metadata.clone() {
Some(meta_data) => meta_data.terminal_id,
_ => None,
};
let endpoint_prefix = match response.metadata.clone() {
Some(meta_data) => meta_data.endpoint_prefix,
_ => None,
};
let apple_pay = match response.metadata.clone() {
Some(meta_data) => meta_data.apple_pay,
_ => None,
};
let apple_pay_combined = match response.metadata.clone() {
Some(meta_data) => meta_data.apple_pay_combined,
_ => None,
};
let merchant_config_currency = match response.metadata.clone() {
Some(meta_data) => meta_data.merchant_config_currency,
_ => None,
};

let meta_data = DashboardMetaData {
merchant_config_currency,
merchant_account_id,
apple_pay,
apple_pay_combined,
google_pay,
account_name,
terminal_id,
merchant_id,
endpoint_prefix,
};
let meta_data = response
.metadata
.map(|metadata| DashboardMetaData::from(metadata));

DashboardRequestPayload {
connector: response.connector_name,
Expand All @@ -339,35 +297,52 @@ impl ConnectorApiIntegrationPayload {
credit_details,
gift_card,
]),
metadata: Some(meta_data),
metadata: meta_data,
}
}
}

pub fn get_google_pay_metadata_response(response: Self) -> Option<GooglePayData> {
match response.metadata {
Some(meta_data) => {
match meta_data.google_pay {
Some(google_pay) => match google_pay {
GoogleApiModelData::Standard(standard_data) => {
let data = standard_data.allowed_payment_methods.first().map(
|allowed_pm| {
allowed_pm.tokenization_specification.parameters.clone()
},
)?;
Some(GooglePayData::Standard(GpayDashboardPayLoad {
gateway_merchant_id: data.gateway_merchant_id,
stripe_version: data.stripe_version,
stripe_publishable_key: data.stripe_publishable_key,
merchant_name: standard_data.merchant_info.merchant_name,
merchant_id: standard_data.merchant_info.merchant_id,
}))
}
GoogleApiModelData::Zen(data) => Some(GooglePayData::Zen(data)),
},
None => None,
}
}
None => None,
impl From<ApiModelMetaData> for DashboardMetaData {
fn from(api_model: ApiModelMetaData) -> Self {
Self {
merchant_config_currency: api_model.merchant_config_currency,
merchant_account_id: api_model.merchant_account_id,
account_name: api_model.account_name,
terminal_id: api_model.terminal_id,
merchant_id: api_model.merchant_id,
google_pay: get_google_pay_metadata_response(api_model.google_pay),
apple_pay: api_model.apple_pay,
apple_pay_combined: api_model.apple_pay_combined,
endpoint_prefix: api_model.endpoint_prefix,
mcc: api_model.mcc,
merchant_country_code: api_model.merchant_country_code,
merchant_name: api_model.merchant_name,
acquirer_bin: api_model.acquirer_bin,
acquirer_merchant_id: api_model.acquirer_merchant_id,
}
}
}

pub fn get_google_pay_metadata_response(
google_pay_data: Option<GoogleApiModelData>,
) -> Option<GooglePayData> {
match google_pay_data {
Some(google_pay) => match google_pay {
GoogleApiModelData::Standard(standard_data) => {
let data = standard_data
.allowed_payment_methods
.first()
.map(|allowed_pm| allowed_pm.tokenization_specification.parameters.clone())?;
Some(GooglePayData::Standard(GpayDashboardPayLoad {
gateway_merchant_id: data.gateway_merchant_id,
stripe_version: data.stripe_version,
stripe_publishable_key: data.stripe_publishable_key,
merchant_name: standard_data.merchant_info.merchant_name,
merchant_id: standard_data.merchant_info.merchant_id,
}))
}
GoogleApiModelData::Zen(data) => Some(GooglePayData::Zen(data)),
},
None => None,
}
}
16 changes: 16 additions & 0 deletions crates/connector_configs/src/transformer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,11 @@ impl DashboardRequestPayload {
merchant_id: None,
merchant_config_currency: None,
endpoint_prefix: None,
mcc: None,
merchant_country_code: None,
merchant_name: None,
acquirer_bin: None,
acquirer_merchant_id: None,
};
let meta_data = match request.metadata {
Some(data) => data,
Expand All @@ -201,6 +206,12 @@ impl DashboardRequestPayload {
let apple_pay = meta_data.apple_pay;
let apple_pay_combined = meta_data.apple_pay_combined;
let merchant_config_currency = meta_data.merchant_config_currency;
let mcc = meta_data.mcc;
let merchant_country_code = meta_data.merchant_country_code;
let merchant_name = meta_data.merchant_name;
let acquirer_bin = meta_data.acquirer_bin;
let acquirer_merchant_id = meta_data.acquirer_merchant_id;

Some(ApiModelMetaData {
google_pay,
apple_pay,
Expand All @@ -211,6 +222,11 @@ impl DashboardRequestPayload {
merchant_config_currency,
apple_pay_combined,
endpoint_prefix,
mcc,
merchant_country_code,
merchant_name,
acquirer_bin,
acquirer_merchant_id,
})
}

Expand Down