refactor(request_body): Added FRM data in payment request #7615
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sweta-Kumari-Sharma
added
A-connector-integration
|
Review changes with Changed Files
|
Sweta-Kumari-Sharma
force-pushed
the
adyen-add-fields
branch
from
d86e69d to
60127f3
Compare
Sweta-Kumari-Sharma
force-pushed
the
adyen-add-fields
branch
from
aa34a43 to
13b21ac
Compare
deepanshu-iiitu
requested changes
Mar 25, 2025
| visits_year: Option<String>, | ||
| ship_to_name: Option<String>, | ||
| first8charactersof_address_line1_zip: Option<String>, | ||
| affiliate_order: Option<String>, |
There was a problem hiding this comment.
This value should be bool
There was a problem hiding this comment.
affiliate_order is already bool, rest fields should be string only, right?
Comment on lines
184
to
185
| #[serde(rename = "itemID")] | ||
| item_id: Option<String>, |
There was a problem hiding this comment.
Suggested change
| #[serde(rename = "itemID")] | |
| item_id: Option<String>, | |
| item_i_d: Option<String>, |
| #[derive(Clone, Default, Debug, Serialize, Deserialize)] | ||
| #[serde(rename_all = "camelCase")] | ||
| pub struct Basket { | ||
| basket: Vec<OrderLines>, |
There was a problem hiding this comment.
Shouldn;t the hierarchy here be riskdata.basket.item1.itemID?
Where is item1?
Sweta-Kumari-Sharma
force-pushed
the
adyen-add-fields
branch
from
8f88d9c to
ae05fbf
Compare
Sweta-Kumari-Sharma
force-pushed
the
adyen-add-fields
branch
from
ae05fbf to
a44d2c8
Compare
Sweta-Kumari-Sharma
changed the title
deepanshu-iiitu
requested changes
Mar 26, 2025
| impl ForeignTryFrom<serde_json::Value> for RiskData { | ||
| type Error = error_stack::Report<errors::ConnectorError>; | ||
|
|
||
| fn foreign_try_from(metadata: serde_json::Value) -> Result<Self, Self::Error> { |
There was a problem hiding this comment.
Do not use foreign try from here, instead create a function like get_risk_data
Also the return type for that function can be Option
Comment on lines
2649
to
2743
| let device_country = risk_data_value | ||
| .get("device_country") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let house_numberor_name = risk_data_value | ||
| .get("house_numberor_name") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let account_creation_date = risk_data_value | ||
| .get("account_creation_date") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let affiliate_channel = risk_data_value | ||
| .get("affiliate_channel") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let avg_order_value = risk_data_value | ||
| .get("avg_order_value") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let delivery_method = risk_data_value | ||
| .get("delivery_method") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let email_name = risk_data_value | ||
| .get("email_name") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let email_domain = risk_data_value | ||
| .get("email_domain") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let last_order_date = risk_data_value | ||
| .get("last_order_date") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let merchant_reference = risk_data_value | ||
| .get("merchant_reference") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let payment_method = risk_data_value | ||
| .get("payment_method") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let promotion_name = risk_data_value | ||
| .get("promotion_name") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let secondary_phone_number = risk_data_value | ||
| .get("secondary_phone_number") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let timefrom_loginto_order = risk_data_value | ||
| .get("timefrom_loginto_order") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let total_session_time = risk_data_value | ||
| .get("total_session_time") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let total_authorized_amount_in_last30_days = risk_data_value | ||
| .get("total_authorized_amount_in_last30_days") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let total_order_quantity = risk_data_value | ||
| .get("total_order_quantity") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let total_lifetime_value = risk_data_value | ||
| .get("total_lifetime_value") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let visits_month = risk_data_value | ||
| .get("visits_month") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let visits_week = risk_data_value | ||
| .get("visits_week") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let visits_year = risk_data_value | ||
| .get("visits_year") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let ship_to_name = risk_data_value | ||
| .get("ship_to_name") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let first8charactersof_address_line1_zip = risk_data_value | ||
| .get("first8charactersof_address_line1_zip") | ||
| .and_then(|v| v.as_str()) | ||
| .map(|s| s.to_string()); | ||
| let affiliate_order = risk_data_value | ||
| .get("affiliate_order") | ||
| .and_then(|v| v.as_bool()); |
There was a problem hiding this comment.
Suggested change
| let device_country = risk_data_value | |
| .get("device_country") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let house_numberor_name = risk_data_value | |
| .get("house_numberor_name") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let account_creation_date = risk_data_value | |
| .get("account_creation_date") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let affiliate_channel = risk_data_value | |
| .get("affiliate_channel") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let avg_order_value = risk_data_value | |
| .get("avg_order_value") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let delivery_method = risk_data_value | |
| .get("delivery_method") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let email_name = risk_data_value | |
| .get("email_name") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let email_domain = risk_data_value | |
| .get("email_domain") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let last_order_date = risk_data_value | |
| .get("last_order_date") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let merchant_reference = risk_data_value | |
| .get("merchant_reference") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let payment_method = risk_data_value | |
| .get("payment_method") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let promotion_name = risk_data_value | |
| .get("promotion_name") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let secondary_phone_number = risk_data_value | |
| .get("secondary_phone_number") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let timefrom_loginto_order = risk_data_value | |
| .get("timefrom_loginto_order") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let total_session_time = risk_data_value | |
| .get("total_session_time") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let total_authorized_amount_in_last30_days = risk_data_value | |
| .get("total_authorized_amount_in_last30_days") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let total_order_quantity = risk_data_value | |
| .get("total_order_quantity") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let total_lifetime_value = risk_data_value | |
| .get("total_lifetime_value") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let visits_month = risk_data_value | |
| .get("visits_month") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let visits_week = risk_data_value | |
| .get("visits_week") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let visits_year = risk_data_value | |
| .get("visits_year") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let ship_to_name = risk_data_value | |
| .get("ship_to_name") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let first8charactersof_address_line1_zip = risk_data_value | |
| .get("first8charactersof_address_line1_zip") | |
| .and_then(|v| v.as_str()) | |
| .map(|s| s.to_string()); | |
| let affiliate_order = risk_data_value | |
| .get("affiliate_order") | |
| .and_then(|v| v.as_bool()); | |
| device_country: get_str("device_country"), | |
| house_numberor_name: get_str("house_numberor_name"), | |
| account_creation_date: get_str("account_creation_date"), | |
| affiliate_channel: get_str("affiliate_channel"), | |
| avg_order_value: get_str("avg_order_value"), | |
| delivery_method: get_str("delivery_method"), | |
| email_name: get_str("email_name"), | |
| email_domain: get_str("email_domain"), | |
| last_order_date: get_str("last_order_date"), | |
| merchant_reference: get_str("merchant_reference"), | |
| payment_method: get_str("payment_method"), | |
| promotion_name: get_str("promotion_name"), | |
| secondary_phone_number: get_str("secondary_phone_number"), | |
| timefrom_loginto_order: get_str("timefrom_loginto_order"), | |
| total_session_time: get_str("total_session_time"), | |
| total_authorized_amount_in_last30_days: get_str("total_authorized_amount_in_last30_days"), | |
| total_order_quantity: get_str("total_order_quantity"), | |
| total_lifetime_value: get_str("total_lifetime_value"), | |
| visits_month: get_str("visits_month"), | |
| visits_week: get_str("visits_week"), | |
| visits_year: get_str("visits_year"), | |
| ship_to_name: get_str("ship_to_name"), | |
| first8charactersof_address_line1_zip: get_str("first8charactersof_address_line1_zip"), | |
| affiliate_order: get_bool("affiliate_order"), |
| impl ForeignTryFrom<serde_json::Value> for Option<Secret<String>> { | ||
| type Error = error_stack::Report<errors::ConnectorError>; | ||
|
|
||
| fn foreign_try_from(metadata: serde_json::Value) -> Result<Self, Self::Error> { |
There was a problem hiding this comment.
do not use foreign_try_from
Sweta-Kumari-Sharma
force-pushed
the
adyen-add-fields
branch
from
fb74022 to
0b093de
Compare
deepanshu-iiitu
requested changes
Mar 26, 2025
Comment on lines
181
to
210
| #[serde_with::skip_serializing_none] | ||
| #[derive(Clone, Default, Debug, Serialize, Deserialize)] | ||
| #[serde(rename_all = "camelCase")] | ||
| pub struct ItemData { | ||
| item_i_d: Option<String>, | ||
| product_title: Option<String>, | ||
| amount_per_item: Option<String>, | ||
| currency: Option<String>, | ||
| upc: Option<String>, | ||
| brand: Option<String>, | ||
| manufacturer: Option<String>, | ||
| category: Option<String>, | ||
| quantity: Option<String>, | ||
| color: Option<String>, | ||
| size: Option<String>, | ||
| } | ||
|
|
||
| #[serde_with::skip_serializing_none] | ||
| #[derive(Clone, Default, Debug, Serialize, Deserialize)] | ||
| #[serde(rename_all = "camelCase")] | ||
| pub struct Basket { | ||
| basket: Option<Item>, | ||
| } | ||
|
|
||
| #[serde_with::skip_serializing_none] | ||
| #[derive(Clone, Default, Debug, Serialize, Deserialize)] | ||
| #[serde(rename_all = "camelCase")] | ||
| pub struct Item { | ||
| item1: Option<ItemData>, | ||
| } |
There was a problem hiding this comment.
These structs can be removed now.
Sweta-Kumari-Sharma
force-pushed
the
adyen-add-fields
branch
from
ba453f0 to
a002041
Compare
Sweta-Kumari-Sharma
force-pushed
the
adyen-add-fields
branch
from
a002041 to
3898049
Compare
deepanshu-iiitu
previously approved these changes
Mar 27, 2025
swangi-kumari
previously approved these changes
Mar 27, 2025
Sweta-Kumari-Sharma
dismissed stale reviews from swangi-kumari and deepanshu-iiitu
via
d01209a
deepanshu-iiitu
approved these changes
Mar 27, 2025
swangi-kumari
approved these changes
Mar 27, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Type of Change
Description
Added
FRMdata in payment request for connectorAdyenAdditional Changes
Motivation and Context
How did you test it?
Response
Checklist
cargo +nightly fmt --allcargo clippy