SirajRLX commited on
Commit
b016d21
·
verified ·
1 Parent(s): f7453fc

Add files using upload-large-folder tool

Browse files
This view is limited to 50 files because it contains too many changes.   See raw diff
Files changed (50) hide show
  1. diffs/pr_10008/42089a3/diff.json +6 -0
  2. diffs/pr_10096/1508486/diff.json +61 -0
  3. diffs/pr_10096/32e6c54/diff.json +154 -0
  4. diffs/pr_10096/6b0bf89/diff.json +24 -0
  5. diffs/pr_10096/b2b4caf/diff.json +123 -0
  6. diffs/pr_10096/e32df68/diff.json +34 -0
  7. diffs/pr_10140/1955840/diff.json +39 -0
  8. diffs/pr_10140/80eee7f/diff.json +39 -0
  9. diffs/pr_10140/a4ae47a/diff.json +55 -0
  10. diffs/pr_10140/eea5e7e/diff.json +65 -0
  11. diffs/pr_10140/f01b3cd/diff.json +0 -0
  12. diffs/pr_10155/8cf7196/diff.json +115 -0
  13. diffs/pr_10194/036f537/diff.json +6 -0
  14. diffs/pr_10226/3e00376/diff.json +0 -0
  15. diffs/pr_10226/7bfff64/diff.json +0 -0
  16. diffs/pr_10226/a89516d/diff.json +69 -0
  17. diffs/pr_10280/f72b5c9/diff.json +24 -0
  18. diffs/pr_6744/0b3f1d0/diff.json +24 -0
  19. diffs/pr_6789/395368b/diff.json +6 -0
  20. diffs/pr_6829/27ec108/diff.json +0 -0
  21. diffs/pr_6888/a2ac344/diff.json +0 -0
  22. diffs/pr_6906/0e9034a/diff.json +64 -0
  23. diffs/pr_6906/140853d/diff.json +49 -0
  24. diffs/pr_6906/29c4f5e/diff.json +100 -0
  25. diffs/pr_6906/35f39c1/diff.json +0 -0
  26. diffs/pr_6906/4d7959c/diff.json +54 -0
  27. diffs/pr_6906/5612162/diff.json +24 -0
  28. diffs/pr_6906/723c6f4/diff.json +244 -0
  29. diffs/pr_6906/750cfeb/diff.json +6 -0
  30. diffs/pr_6906/7c16081/diff.json +6 -0
  31. diffs/pr_6906/9e5edff/diff.json +184 -0
  32. diffs/pr_6906/a1d0992/diff.json +99 -0
  33. diffs/pr_6906/aef526d/diff.json +39 -0
  34. diffs/pr_6906/b649433/diff.json +137 -0
  35. diffs/pr_6906/c4e60d3/diff.json +6 -0
  36. diffs/pr_6906/e350a23/diff.json +24 -0
  37. diffs/pr_6906/e47e921/diff.json +211 -0
  38. diffs/pr_6906/eb87323/diff.json +99 -0
  39. diffs/pr_7925/53c7ba7/diff.json +0 -0
  40. diffs/pr_8018/824be43/diff.json +49 -0
  41. diffs/pr_8141/6b6facc/diff.json +24 -0
  42. diffs/pr_8141/752d9a7/diff.json +39 -0
  43. diffs/pr_8177/3553938/diff.json +24 -0
  44. diffs/pr_8198/7c6d82f/diff.json +0 -0
  45. diffs/pr_8198/9bc098d/diff.json +24 -0
  46. diffs/pr_8198/a676b9e/diff.json +0 -0
  47. diffs/pr_8198/e8a2216/diff.json +39 -0
  48. diffs/pr_8213/0095cc5/diff.json +674 -0
  49. diffs/pr_8213/5f8ceb1/diff.json +350 -0
  50. diffs/pr_8213/7a8c0ad/diff.json +6 -0
diffs/pr_10008/42089a3/diff.json ADDED
@@ -0,0 +1,6 @@
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "42089a3ac8ca39faa220047278aecd66cb45415b",
3
+ "pr_number": 10008,
4
+ "rust_files": [],
5
+ "diffs": []
6
+ }
diffs/pr_10096/1508486/diff.json ADDED
@@ -0,0 +1,61 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "15084864bf387a6e26caf3473509e5c7a2786e93",
3
+ "pr_number": 10096,
4
+ "rust_files": [
5
+ "crates/common_enums/src/enums.rs",
6
+ "crates/hyperswitch_connectors/src/connectors/adyenplatform.rs",
7
+ "crates/router/src/core/webhooks/incoming.rs"
8
+ ],
9
+ "diffs": [
10
+ {
11
+ "id": "crates/router/src/core/webhooks/incoming.rs::function::payouts_incoming_webhook_flow",
12
+ "file": "crates/router/src/core/webhooks/incoming.rs",
13
+ "kind": "function_item",
14
+ "status": "modified",
15
+ "code_changed": true,
16
+ "imports_changed": false,
17
+ "before_code": "async fn payouts_incoming_webhook_flow(\n state: SessionState,\n merchant_context: domain::MerchantContext,\n business_profile: domain::Profile,\n webhook_details: api::IncomingWebhookDetails,\n event_type: webhooks::IncomingWebhookEvent,\n source_verified: bool,\n request_details: &IncomingWebhookRequestDetails<'_>,\n connector: &ConnectorEnum,\n) -> CustomResult<WebhookResponseTracker, errors::ApiErrorResponse> {\n metrics::INCOMING_PAYOUT_WEBHOOK_METRIC.add(1, &[]);\n if source_verified {\n let db = &*state.store;\n //find payout_attempt by object_reference_id\n let payout_attempt = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::PayoutId(payout_id_type) => match payout_id_type {\n webhooks::PayoutIdType::PayoutAttemptId(id) => db\n .find_payout_attempt_by_merchant_id_payout_attempt_id(\n merchant_context.get_merchant_account().get_id(),\n &id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout attempt\")?,\n webhooks::PayoutIdType::ConnectorPayoutId(id) => db\n .find_payout_attempt_by_merchant_id_connector_payout_id(\n merchant_context.get_merchant_account().get_id(),\n &id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout attempt\")?,\n },\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received a non-payout id when processing payout webhooks\")?,\n };\n\n let payouts = db\n .find_payout_by_merchant_id_payout_id(\n merchant_context.get_merchant_account().get_id(),\n &payout_attempt.payout_id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout\")?;\n\n let payout_error_details = connector\n .get_payout_error_update_object(request_details)\n .switch()\n .attach_printable(\"Failed to get error object for payouts\")?;\n\n let payout_attempt_update = PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_attempt.connector_payout_id.clone(),\n status: common_enums::PayoutStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"failed payout status mapping from event type\")?,\n error_message: payout_error_details.error_message,\n error_code: payout_error_details.error_code,\n is_eligible: payout_attempt.is_eligible,\n unified_code: None,\n unified_message: None,\n payout_connector_metadata: payout_attempt.payout_connector_metadata.clone(),\n };\n\n let action_req =\n payout_models::PayoutRequest::PayoutActionRequest(payout_models::PayoutActionRequest {\n payout_id: payouts.payout_id.clone(),\n });\n\n let mut payout_data = Box::pin(payouts::make_payout_data(\n &state,\n &merchant_context,\n None,\n &action_req,\n common_utils::consts::DEFAULT_LOCALE,\n ))\n .await?;\n\n let updated_payout_attempt = db\n .update_payout_attempt(\n &payout_attempt,\n payout_attempt_update,\n &payout_data.payouts,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable_lazy(|| {\n format!(\n \"Failed while updating payout attempt: payout_attempt_id: {}\",\n payout_attempt.payout_attempt_id\n )\n })?;\n payout_data.payout_attempt = updated_payout_attempt;\n\n let event_type: Option<enums::EventType> = payout_data.payout_attempt.status.into();\n\n // If event is NOT an UnsupportedEvent, trigger Outgoing Webhook\n if let Some(outgoing_event_type) = event_type {\n let payout_create_response =\n payouts::response_handler(&state, &merchant_context, &payout_data).await?;\n\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_context,\n business_profile,\n outgoing_event_type,\n enums::EventClass::Payouts,\n payout_data\n .payout_attempt\n .payout_id\n .get_string_repr()\n .to_string(),\n enums::EventObjectType::PayoutDetails,\n api::OutgoingWebhookContent::PayoutDetails(Box::new(payout_create_response)),\n Some(payout_data.payout_attempt.created_at),\n ))\n .await?;\n }\n\n Ok(WebhookResponseTracker::Payout {\n payout_id: payout_data.payout_attempt.payout_id,\n status: payout_data.payout_attempt.status,\n })\n } else {\n metrics::INCOMING_PAYOUT_WEBHOOK_SIGNATURE_FAILURE_METRIC.add(1, &[]);\n Err(report!(\n errors::ApiErrorResponse::WebhookAuthenticationFailed\n ))\n }\n}",
18
+ "after_code": "async fn payouts_incoming_webhook_flow(\n state: SessionState,\n merchant_context: domain::MerchantContext,\n business_profile: domain::Profile,\n webhook_details: api::IncomingWebhookDetails,\n event_type: webhooks::IncomingWebhookEvent,\n source_verified: bool,\n request_details: &IncomingWebhookRequestDetails<'_>,\n connector: &ConnectorEnum,\n) -> CustomResult<WebhookResponseTracker, errors::ApiErrorResponse> {\n metrics::INCOMING_PAYOUT_WEBHOOK_METRIC.add(1, &[]);\n if source_verified {\n let db = &*state.store;\n //find payout_attempt by object_reference_id\n let payout_attempt = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::PayoutId(payout_id_type) => match payout_id_type {\n webhooks::PayoutIdType::PayoutAttemptId(id) => db\n .find_payout_attempt_by_merchant_id_payout_attempt_id(\n merchant_context.get_merchant_account().get_id(),\n &id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout attempt\")?,\n webhooks::PayoutIdType::ConnectorPayoutId(id) => db\n .find_payout_attempt_by_merchant_id_connector_payout_id(\n merchant_context.get_merchant_account().get_id(),\n &id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout attempt\")?,\n },\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received a non-payout id when processing payout webhooks\")?,\n };\n\n let payouts = db\n .find_payout_by_merchant_id_payout_id(\n merchant_context.get_merchant_account().get_id(),\n &payout_attempt.payout_id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout\")?;\n\n let status = common_enums::PayoutStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"failed payout status mapping from event type\")?;\n\n // if status is failure then update the error_code and error_message as well\n let payout_attempt_update = if status.is_payout_failure() {\n let payout_error_details = connector\n .get_payout_error_update_object(request_details)\n .switch()\n .attach_printable(\"Failed to get error object for payouts\")?;\n\n PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_attempt.connector_payout_id.clone(),\n status,\n error_message: payout_error_details.error_message,\n error_code: payout_error_details.error_code,\n is_eligible: payout_attempt.is_eligible,\n unified_code: None,\n unified_message: None,\n payout_connector_metadata: payout_attempt.payout_connector_metadata.clone(),\n }\n } else {\n PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_attempt.connector_payout_id.clone(),\n status,\n error_message: None,\n error_code: None,\n is_eligible: payout_attempt.is_eligible,\n unified_code: None,\n unified_message: None,\n payout_connector_metadata: payout_attempt.payout_connector_metadata.clone(),\n }\n };\n\n let action_req =\n payout_models::PayoutRequest::PayoutActionRequest(payout_models::PayoutActionRequest {\n payout_id: payouts.payout_id.clone(),\n });\n\n let mut payout_data = Box::pin(payouts::make_payout_data(\n &state,\n &merchant_context,\n None,\n &action_req,\n common_utils::consts::DEFAULT_LOCALE,\n ))\n .await?;\n\n let updated_payout_attempt = db\n .update_payout_attempt(\n &payout_attempt,\n payout_attempt_update,\n &payout_data.payouts,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable_lazy(|| {\n format!(\n \"Failed while updating payout attempt: payout_attempt_id: {}\",\n payout_attempt.payout_attempt_id\n )\n })?;\n payout_data.payout_attempt = updated_payout_attempt;\n\n let event_type: Option<enums::EventType> = payout_data.payout_attempt.status.into();\n\n // If event is NOT an UnsupportedEvent, trigger Outgoing Webhook\n if let Some(outgoing_event_type) = event_type {\n let payout_create_response =\n payouts::response_handler(&state, &merchant_context, &payout_data).await?;\n\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_context,\n business_profile,\n outgoing_event_type,\n enums::EventClass::Payouts,\n payout_data\n .payout_attempt\n .payout_id\n .get_string_repr()\n .to_string(),\n enums::EventObjectType::PayoutDetails,\n api::OutgoingWebhookContent::PayoutDetails(Box::new(payout_create_response)),\n Some(payout_data.payout_attempt.created_at),\n ))\n .await?;\n }\n\n Ok(WebhookResponseTracker::Payout {\n payout_id: payout_data.payout_attempt.payout_id,\n status: payout_data.payout_attempt.status,\n })\n } else {\n metrics::INCOMING_PAYOUT_WEBHOOK_SIGNATURE_FAILURE_METRIC.add(1, &[]);\n Err(report!(\n errors::ApiErrorResponse::WebhookAuthenticationFailed\n ))\n }\n}",
19
+ "diff_span": {
20
+ "before": " .attach_printable(\"Failed to fetch the payout\")?;\n\n let payout_error_details = connector\n .get_payout_error_update_object(request_details)\n .switch()\n .attach_printable(\"Failed to get error object for payouts\")?;\n\n let payout_attempt_update = PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_attempt.connector_payout_id.clone(),\n status: common_enums::PayoutStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"failed payout status mapping from event type\")?,\n error_message: payout_error_details.error_message,\n error_code: payout_error_details.error_code,\n is_eligible: payout_attempt.is_eligible,\n unified_code: None,\n unified_message: None,\n payout_connector_metadata: payout_attempt.payout_connector_metadata.clone(),\n };\n",
21
+ "after": " .attach_printable(\"Failed to fetch the payout\")?;\n\n let status = common_enums::PayoutStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"failed payout status mapping from event type\")?;\n\n // if status is failure then update the error_code and error_message as well\n let payout_attempt_update = if status.is_payout_failure() {\n let payout_error_details = connector\n .get_payout_error_update_object(request_details)\n .switch()\n .attach_printable(\"Failed to get error object for payouts\")?;\n\n PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_attempt.connector_payout_id.clone(),\n status,\n error_message: payout_error_details.error_message,\n error_code: payout_error_details.error_code,\n is_eligible: payout_attempt.is_eligible,\n unified_code: None,\n unified_message: None,\n payout_connector_metadata: payout_attempt.payout_connector_metadata.clone(),\n }\n } else {\n PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_attempt.connector_payout_id.clone(),\n status,\n error_message: None,\n error_code: None,\n is_eligible: payout_attempt.is_eligible,\n unified_code: None,\n unified_message: None,\n payout_connector_metadata: payout_attempt.payout_connector_metadata.clone(),\n }\n };\n"
22
+ },
23
+ "commit_sha": "15084864bf387a6e26caf3473509e5c7a2786e93"
24
+ },
25
+ {
26
+ "id": "crates/hyperswitch_connectors/src/connectors/adyenplatform.rs::Adyenplatform::function::get_payout_error_update_object",
27
+ "file": "crates/hyperswitch_connectors/src/connectors/adyenplatform.rs",
28
+ "kind": "function_item",
29
+ "status": "modified",
30
+ "code_changed": true,
31
+ "imports_changed": false,
32
+ "before_code": "fn get_payout_error_update_object(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::PayoutStatusUpdate, ConnectorError> {\n let webhook_body: adyenplatform::AdyenplatformIncomingWebhook = request\n .body\n .parse_struct(\"AdyenplatformIncomingWebhook\")\n .change_context(ConnectorError::WebhookSourceVerificationFailed)?;\n\n let error_message = webhook_body.data.reason.or(webhook_body\n .data\n .tracking\n .and_then(|tracking_data| tracking_data.reason));\n\n Ok(api_models::webhooks::PayoutStatusUpdate {\n error_message,\n error_code: None,\n })\n }",
33
+ "after_code": "fn get_payout_error_update_object(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::PayoutStatusUpdate, ConnectorError> {\n let webhook_body: adyenplatform::AdyenplatformIncomingWebhook = request\n .body\n .parse_struct(\"AdyenplatformIncomingWebhook\")\n .change_context(ConnectorError::WebhookSourceVerificationFailed)?;\n\n let error_reason = webhook_body.data.reason.or(webhook_body\n .data\n .tracking\n .and_then(|tracking_data| tracking_data.reason));\n\n Ok(api_models::webhooks::PayoutStatusUpdate {\n error_message: error_reason.clone(),\n error_code: error_reason,\n })\n }",
34
+ "diff_span": {
35
+ "before": " .change_context(ConnectorError::WebhookSourceVerificationFailed)?;\n\n let error_message = webhook_body.data.reason.or(webhook_body\n .data\n .tracking\n .and_then(|tracking_data| tracking_data.reason));\n\n Ok(api_models::webhooks::PayoutStatusUpdate {\n error_message,\n error_code: None,\n })\n }",
36
+ "after": " .change_context(ConnectorError::WebhookSourceVerificationFailed)?;\n\n let error_reason = webhook_body.data.reason.or(webhook_body\n .data\n .tracking\n .and_then(|tracking_data| tracking_data.reason));\n\n Ok(api_models::webhooks::PayoutStatusUpdate {\n error_message: error_reason.clone(),\n error_code: error_reason,\n })\n }"
37
+ },
38
+ "commit_sha": "15084864bf387a6e26caf3473509e5c7a2786e93"
39
+ },
40
+ {
41
+ "id": "crates/common_enums/src/enums.rs::PayoutStatus::function::is_payout_failure",
42
+ "file": "crates/common_enums/src/enums.rs",
43
+ "kind": "function_item",
44
+ "status": "added",
45
+ "before_code": null,
46
+ "after_code": "pub fn is_payout_failure(&self) -> bool {\n matches!(\n self,\n Self::Failed | Self::Cancelled | Self::Expired | Self::Ineligible\n )\n }",
47
+ "diff_span": null,
48
+ "commit_sha": "15084864bf387a6e26caf3473509e5c7a2786e93"
49
+ },
50
+ {
51
+ "id": "crates/common_enums/src/enums.rs::impl::PayoutStatus",
52
+ "file": "crates/common_enums/src/enums.rs",
53
+ "kind": "impl_item",
54
+ "status": "added",
55
+ "before_code": null,
56
+ "after_code": "impl PayoutStatus {\n pub fn is_payout_failure(&self) -> bool {\n matches!(\n self,\n Self::Failed | Self::Cancelled | Self::Expired | Self::Ineligible\n )\n }\n}",
57
+ "diff_span": null,
58
+ "commit_sha": "15084864bf387a6e26caf3473509e5c7a2786e93"
59
+ }
60
+ ]
61
+ }
diffs/pr_10096/32e6c54/diff.json ADDED
@@ -0,0 +1,154 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "32e6c54340ccaa4bda8b4fd20935be36914341ef",
3
+ "pr_number": 10096,
4
+ "rust_files": [
5
+ "crates/api_models/src/webhooks.rs",
6
+ "crates/hyperswitch_connectors/src/connectors/adyenplatform.rs",
7
+ "crates/hyperswitch_connectors/src/connectors/adyenplatform/transformers/payouts.rs",
8
+ "crates/hyperswitch_interfaces/src/connector_integration_interface.rs",
9
+ "crates/hyperswitch_interfaces/src/webhooks.rs",
10
+ "crates/router/src/core/webhooks/incoming.rs"
11
+ ],
12
+ "diffs": [
13
+ {
14
+ "id": "crates/router/src/core/webhooks/incoming.rs::function::process_webhook_business_logic",
15
+ "file": "crates/router/src/core/webhooks/incoming.rs",
16
+ "kind": "function_item",
17
+ "status": "modified",
18
+ "code_changed": true,
19
+ "imports_changed": false,
20
+ "before_code": "async fn process_webhook_business_logic(\n state: &SessionState,\n req_state: ReqState,\n merchant_context: &domain::MerchantContext,\n connector: &ConnectorEnum,\n connector_name: &str,\n event_type: webhooks::IncomingWebhookEvent,\n source_verified_via_ucs: bool,\n webhook_transform_data: &Option<Box<unified_connector_service::WebhookTransformData>>,\n shadow_ucs_data: &mut Option<ShadowUcsData<'_>>,\n request_details: &IncomingWebhookRequestDetails<'_>,\n is_relay_webhook: bool,\n) -> errors::RouterResult<WebhookResponseTracker> {\n let object_ref_id = connector\n .get_webhook_object_reference_id(request_details)\n .switch()\n .attach_printable(\"Could not find object reference id in incoming webhook body\")?;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector\",\n })\n .attach_printable_lazy(|| format!(\"unable to parse connector name {connector_name:?}\"))?;\n let connectors_with_source_verification_call = &state.conf.webhook_source_verification_call;\n\n let merchant_connector_account = match Box::pin(helper_utils::get_mca_from_object_reference_id(\n state,\n object_ref_id.clone(),\n merchant_context,\n connector_name,\n ))\n .await\n {\n Ok(mca) => mca,\n Err(error) => {\n let result = handle_incoming_webhook_error(\n error,\n connector,\n connector_name,\n request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match result {\n Ok((_, webhook_tracker, _)) => return Ok(webhook_tracker),\n Err(e) => return Err(e),\n }\n }\n };\n\n let source_verified = if source_verified_via_ucs {\n // If UCS handled verification, use that result\n source_verified_via_ucs\n } else {\n // Fall back to traditional source verification\n if connectors_with_source_verification_call\n .connectors_with_webhook_source_verification_call\n .contains(&connector_enum)\n {\n verify_webhook_source_verification_call(\n connector.clone(),\n state,\n merchant_context,\n merchant_connector_account.clone(),\n connector_name,\n request_details,\n )\n .await\n .or_else(|error| match error.current_context() {\n errors::ConnectorError::WebhookSourceVerificationFailed => {\n logger::error!(?error, \"Source Verification Failed\");\n Ok(false)\n }\n _ => Err(error),\n })\n .switch()\n .attach_printable(\"There was an issue in incoming webhook source verification\")?\n } else {\n connector\n .clone()\n .verify_webhook_source(\n request_details,\n merchant_context.get_merchant_account().get_id(),\n merchant_connector_account.connector_webhook_details.clone(),\n merchant_connector_account.connector_account_details.clone(),\n connector_name,\n )\n .await\n .or_else(|error| match error.current_context() {\n errors::ConnectorError::WebhookSourceVerificationFailed => {\n logger::error!(?error, \"Source Verification Failed\");\n Ok(false)\n }\n _ => Err(error),\n })\n .switch()\n .attach_printable(\"There was an issue in incoming webhook source verification\")?\n }\n };\n\n if source_verified {\n metrics::WEBHOOK_SOURCE_VERIFIED_COUNT.add(\n 1,\n router_env::metric_attributes!((\n MERCHANT_ID,\n merchant_context.get_merchant_account().get_id().clone()\n )),\n );\n } else if connector.is_webhook_source_verification_mandatory() {\n // if webhook consumption is mandatory for connector, fail webhook\n // so that merchant can retrigger it after updating merchant_secret\n return Err(errors::ApiErrorResponse::WebhookAuthenticationFailed.into());\n }\n\n logger::info!(source_verified=?source_verified);\n\n let event_object: Box<dyn masking::ErasedMaskSerialize> = match webhook_transform_data {\n Some(webhook_transform_data) => {\n // Extract resource_object from UCS webhook content\n webhook_transform_data\n .webhook_content\n .as_ref()\n .map(|webhook_response_content| {\n get_ucs_webhook_resource_object(webhook_response_content)\n })\n .unwrap_or_else(|| {\n // Fall back to connector extraction\n connector\n .get_webhook_resource_object(request_details)\n .switch()\n .attach_printable(\"Could not find resource object in incoming webhook body\")\n })?\n }\n None => {\n // Use traditional connector extraction\n connector\n .get_webhook_resource_object(request_details)\n .switch()\n .attach_printable(\"Could not find resource object in incoming webhook body\")?\n }\n };\n\n let webhook_details = api::IncomingWebhookDetails {\n object_reference_id: object_ref_id.clone(),\n resource_object: serde_json::to_vec(&event_object)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))\n .attach_printable(\"Unable to convert webhook payload to a value\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"There was an issue when encoding the incoming webhook body to bytes\",\n )?,\n };\n\n // Create shadow_event_object and shadow_webhook_details using shadow UCS data\n let shadow_event_object: Option<Box<dyn masking::ErasedMaskSerialize>> =\n shadow_ucs_data.as_ref().and_then(|shadow_data| {\n // Create shadow event object using UCS transform data and shadow request details\n let shadow_event_result = shadow_data\n .ucs_transform_data\n .webhook_content\n .as_ref()\n .map(|webhook_response_content| {\n get_ucs_webhook_resource_object(webhook_response_content)\n })\n .unwrap_or_else(|| {\n // Fall back to connector extraction using shadow request details\n connector\n .get_webhook_resource_object(shadow_data.request_details)\n .switch()\n .attach_printable(\n \"Could not find resource object in shadow incoming webhook body\",\n )\n });\n\n match shadow_event_result {\n Ok(shadow_obj) => Some(shadow_obj),\n Err(error) => {\n logger::warn!(\n connector = connector_name,\n merchant_id = ?merchant_context.get_merchant_account().get_id(),\n error = ?error,\n \"Failed to create shadow event object from UCS transform data\"\n );\n None\n }\n }\n });\n\n let shadow_webhook_details: Option<api::IncomingWebhookDetails> =\n shadow_event_object.as_ref().and_then(|shadow_obj| {\n let resource_object_result = serde_json::to_vec(shadow_obj)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))\n .attach_printable(\"Unable to convert shadow webhook payload to a value\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"There was an issue when encoding the shadow incoming webhook body to bytes\",\n );\n\n match resource_object_result {\n Ok(resource_object) => Some(api::IncomingWebhookDetails {\n object_reference_id: object_ref_id.clone(),\n resource_object,\n }),\n Err(error) => {\n logger::warn!(\n connector = connector_name,\n merchant_id = ?merchant_context.get_merchant_account().get_id(),\n error = ?error,\n \"Failed to serialize shadow webhook payload to bytes\"\n );\n None\n }\n }\n });\n\n // Assign shadow_webhook_details to shadow_ucs_data\n if let Some(shadow_data) = shadow_ucs_data.as_mut() {\n shadow_data.webhook_details = shadow_webhook_details;\n }\n\n let profile_id = &merchant_connector_account.profile_id;\n let key_manager_state = &(state).into();\n\n let business_profile = state\n .store\n .find_business_profile_by_profile_id(\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n profile_id,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {\n id: profile_id.get_string_repr().to_owned(),\n })?;\n\n // If the incoming webhook is a relay webhook, then we need to trigger the relay webhook flow\n let result_response = if is_relay_webhook {\n let relay_webhook_response = Box::pin(relay_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n event_type,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for relay failed\");\n\n // Using early return ensures unsupported webhooks are acknowledged to the connector\n if let Some(errors::ApiErrorResponse::NotSupported { .. }) = relay_webhook_response\n .as_ref()\n .err()\n .map(|a| a.current_context())\n {\n logger::error!(\n webhook_payload =? request_details.body,\n \"Failed while identifying the event type\",\n );\n\n let _response = connector\n .get_webhook_api_response(request_details, None)\n .switch()\n .attach_printable(\n \"Failed while early return in case of not supported event type in relay webhooks\",\n )?;\n\n return Ok(WebhookResponseTracker::NoEffect);\n };\n\n relay_webhook_response\n } else {\n let flow_type: api::WebhookFlow = event_type.into();\n match flow_type {\n api::WebhookFlow::Payment => Box::pin(payments_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n webhook_transform_data,\n shadow_ucs_data,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for payments failed\"),\n\n api::WebhookFlow::Refund => Box::pin(refunds_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n connector_name,\n source_verified,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for refunds failed\"),\n\n api::WebhookFlow::Dispute => Box::pin(disputes_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for disputes failed\"),\n\n api::WebhookFlow::BankTransfer => Box::pin(bank_transfer_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming bank-transfer webhook flow failed\"),\n\n api::WebhookFlow::ReturnResponse => Ok(WebhookResponseTracker::NoEffect),\n\n api::WebhookFlow::Mandate => Box::pin(mandates_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for mandates failed\"),\n\n api::WebhookFlow::ExternalAuthentication => {\n Box::pin(external_authentication_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n source_verified,\n event_type,\n request_details,\n connector,\n object_ref_id,\n business_profile,\n merchant_connector_account,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for external authentication failed\")\n }\n api::WebhookFlow::FraudCheck => Box::pin(frm_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n source_verified,\n event_type,\n object_ref_id,\n business_profile,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for fraud check failed\"),\n\n #[cfg(feature = \"payouts\")]\n api::WebhookFlow::Payout => Box::pin(payouts_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n event_type,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for payouts failed\"),\n\n api::WebhookFlow::Subscription => {\n Box::pin(subscriptions::webhooks::incoming_webhook_flow(\n state.clone().into(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n merchant_connector_account,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for subscription failed\")\n }\n\n _ => Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unsupported Flow Type received in incoming webhooks\"),\n }\n };\n\n match result_response {\n Ok(response) => Ok(response),\n Err(error) => {\n let result = handle_incoming_webhook_error(\n error,\n connector,\n connector_name,\n request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match result {\n Ok((_, webhook_tracker, _)) => Ok(webhook_tracker),\n Err(e) => Err(e),\n }\n }\n }\n}",
21
+ "after_code": "async fn process_webhook_business_logic(\n state: &SessionState,\n req_state: ReqState,\n merchant_context: &domain::MerchantContext,\n connector: &ConnectorEnum,\n connector_name: &str,\n event_type: webhooks::IncomingWebhookEvent,\n source_verified_via_ucs: bool,\n webhook_transform_data: &Option<Box<unified_connector_service::WebhookTransformData>>,\n shadow_ucs_data: &mut Option<ShadowUcsData<'_>>,\n request_details: &IncomingWebhookRequestDetails<'_>,\n is_relay_webhook: bool,\n) -> errors::RouterResult<WebhookResponseTracker> {\n let object_ref_id = connector\n .get_webhook_object_reference_id(request_details)\n .switch()\n .attach_printable(\"Could not find object reference id in incoming webhook body\")?;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector\",\n })\n .attach_printable_lazy(|| format!(\"unable to parse connector name {connector_name:?}\"))?;\n let connectors_with_source_verification_call = &state.conf.webhook_source_verification_call;\n\n let merchant_connector_account = match Box::pin(helper_utils::get_mca_from_object_reference_id(\n state,\n object_ref_id.clone(),\n merchant_context,\n connector_name,\n ))\n .await\n {\n Ok(mca) => mca,\n Err(error) => {\n let result = handle_incoming_webhook_error(\n error,\n connector,\n connector_name,\n request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match result {\n Ok((_, webhook_tracker, _)) => return Ok(webhook_tracker),\n Err(e) => return Err(e),\n }\n }\n };\n\n let source_verified = if source_verified_via_ucs {\n // If UCS handled verification, use that result\n source_verified_via_ucs\n } else {\n // Fall back to traditional source verification\n if connectors_with_source_verification_call\n .connectors_with_webhook_source_verification_call\n .contains(&connector_enum)\n {\n verify_webhook_source_verification_call(\n connector.clone(),\n state,\n merchant_context,\n merchant_connector_account.clone(),\n connector_name,\n request_details,\n )\n .await\n .or_else(|error| match error.current_context() {\n errors::ConnectorError::WebhookSourceVerificationFailed => {\n logger::error!(?error, \"Source Verification Failed\");\n Ok(false)\n }\n _ => Err(error),\n })\n .switch()\n .attach_printable(\"There was an issue in incoming webhook source verification\")?\n } else {\n connector\n .clone()\n .verify_webhook_source(\n request_details,\n merchant_context.get_merchant_account().get_id(),\n merchant_connector_account.connector_webhook_details.clone(),\n merchant_connector_account.connector_account_details.clone(),\n connector_name,\n )\n .await\n .or_else(|error| match error.current_context() {\n errors::ConnectorError::WebhookSourceVerificationFailed => {\n logger::error!(?error, \"Source Verification Failed\");\n Ok(false)\n }\n _ => Err(error),\n })\n .switch()\n .attach_printable(\"There was an issue in incoming webhook source verification\")?\n }\n };\n\n if source_verified {\n metrics::WEBHOOK_SOURCE_VERIFIED_COUNT.add(\n 1,\n router_env::metric_attributes!((\n MERCHANT_ID,\n merchant_context.get_merchant_account().get_id().clone()\n )),\n );\n } else if connector.is_webhook_source_verification_mandatory() {\n // if webhook consumption is mandatory for connector, fail webhook\n // so that merchant can retrigger it after updating merchant_secret\n return Err(errors::ApiErrorResponse::WebhookAuthenticationFailed.into());\n }\n\n logger::info!(source_verified=?source_verified);\n\n let event_object: Box<dyn masking::ErasedMaskSerialize> = match webhook_transform_data {\n Some(webhook_transform_data) => {\n // Extract resource_object from UCS webhook content\n webhook_transform_data\n .webhook_content\n .as_ref()\n .map(|webhook_response_content| {\n get_ucs_webhook_resource_object(webhook_response_content)\n })\n .unwrap_or_else(|| {\n // Fall back to connector extraction\n connector\n .get_webhook_resource_object(request_details)\n .switch()\n .attach_printable(\"Could not find resource object in incoming webhook body\")\n })?\n }\n None => {\n // Use traditional connector extraction\n connector\n .get_webhook_resource_object(request_details)\n .switch()\n .attach_printable(\"Could not find resource object in incoming webhook body\")?\n }\n };\n\n let webhook_details = api::IncomingWebhookDetails {\n object_reference_id: object_ref_id.clone(),\n resource_object: serde_json::to_vec(&event_object)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))\n .attach_printable(\"Unable to convert webhook payload to a value\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"There was an issue when encoding the incoming webhook body to bytes\",\n )?,\n };\n\n // Create shadow_event_object and shadow_webhook_details using shadow UCS data\n let shadow_event_object: Option<Box<dyn masking::ErasedMaskSerialize>> =\n shadow_ucs_data.as_ref().and_then(|shadow_data| {\n // Create shadow event object using UCS transform data and shadow request details\n let shadow_event_result = shadow_data\n .ucs_transform_data\n .webhook_content\n .as_ref()\n .map(|webhook_response_content| {\n get_ucs_webhook_resource_object(webhook_response_content)\n })\n .unwrap_or_else(|| {\n // Fall back to connector extraction using shadow request details\n connector\n .get_webhook_resource_object(shadow_data.request_details)\n .switch()\n .attach_printable(\n \"Could not find resource object in shadow incoming webhook body\",\n )\n });\n\n match shadow_event_result {\n Ok(shadow_obj) => Some(shadow_obj),\n Err(error) => {\n logger::warn!(\n connector = connector_name,\n merchant_id = ?merchant_context.get_merchant_account().get_id(),\n error = ?error,\n \"Failed to create shadow event object from UCS transform data\"\n );\n None\n }\n }\n });\n\n let shadow_webhook_details: Option<api::IncomingWebhookDetails> =\n shadow_event_object.as_ref().and_then(|shadow_obj| {\n let resource_object_result = serde_json::to_vec(shadow_obj)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))\n .attach_printable(\"Unable to convert shadow webhook payload to a value\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"There was an issue when encoding the shadow incoming webhook body to bytes\",\n );\n\n match resource_object_result {\n Ok(resource_object) => Some(api::IncomingWebhookDetails {\n object_reference_id: object_ref_id.clone(),\n resource_object,\n }),\n Err(error) => {\n logger::warn!(\n connector = connector_name,\n merchant_id = ?merchant_context.get_merchant_account().get_id(),\n error = ?error,\n \"Failed to serialize shadow webhook payload to bytes\"\n );\n None\n }\n }\n });\n\n // Assign shadow_webhook_details to shadow_ucs_data\n if let Some(shadow_data) = shadow_ucs_data.as_mut() {\n shadow_data.webhook_details = shadow_webhook_details;\n }\n\n let profile_id = &merchant_connector_account.profile_id;\n let key_manager_state = &(state).into();\n\n let business_profile = state\n .store\n .find_business_profile_by_profile_id(\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n profile_id,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {\n id: profile_id.get_string_repr().to_owned(),\n })?;\n\n // If the incoming webhook is a relay webhook, then we need to trigger the relay webhook flow\n let result_response = if is_relay_webhook {\n let relay_webhook_response = Box::pin(relay_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n event_type,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for relay failed\");\n\n // Using early return ensures unsupported webhooks are acknowledged to the connector\n if let Some(errors::ApiErrorResponse::NotSupported { .. }) = relay_webhook_response\n .as_ref()\n .err()\n .map(|a| a.current_context())\n {\n logger::error!(\n webhook_payload =? request_details.body,\n \"Failed while identifying the event type\",\n );\n\n let _response = connector\n .get_webhook_api_response(request_details, None)\n .switch()\n .attach_printable(\n \"Failed while early return in case of not supported event type in relay webhooks\",\n )?;\n\n return Ok(WebhookResponseTracker::NoEffect);\n };\n\n relay_webhook_response\n } else {\n let flow_type: api::WebhookFlow = event_type.into();\n match flow_type {\n api::WebhookFlow::Payment => Box::pin(payments_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n webhook_transform_data,\n shadow_ucs_data,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for payments failed\"),\n\n api::WebhookFlow::Refund => Box::pin(refunds_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n connector_name,\n source_verified,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for refunds failed\"),\n\n api::WebhookFlow::Dispute => Box::pin(disputes_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for disputes failed\"),\n\n api::WebhookFlow::BankTransfer => Box::pin(bank_transfer_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming bank-transfer webhook flow failed\"),\n\n api::WebhookFlow::ReturnResponse => Ok(WebhookResponseTracker::NoEffect),\n\n api::WebhookFlow::Mandate => Box::pin(mandates_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for mandates failed\"),\n\n api::WebhookFlow::ExternalAuthentication => {\n Box::pin(external_authentication_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n source_verified,\n event_type,\n request_details,\n connector,\n object_ref_id,\n business_profile,\n merchant_connector_account,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for external authentication failed\")\n }\n api::WebhookFlow::FraudCheck => Box::pin(frm_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n source_verified,\n event_type,\n object_ref_id,\n business_profile,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for fraud check failed\"),\n\n #[cfg(feature = \"payouts\")]\n api::WebhookFlow::Payout => Box::pin(payouts_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n event_type,\n source_verified,\n request_details,\n connector,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for payouts failed\"),\n\n api::WebhookFlow::Subscription => {\n Box::pin(subscriptions::webhooks::incoming_webhook_flow(\n state.clone().into(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n merchant_connector_account,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for subscription failed\")\n }\n\n _ => Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unsupported Flow Type received in incoming webhooks\"),\n }\n };\n\n match result_response {\n Ok(response) => Ok(response),\n Err(error) => {\n let result = handle_incoming_webhook_error(\n error,\n connector,\n connector_name,\n request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match result {\n Ok((_, webhook_tracker, _)) => Ok(webhook_tracker),\n Err(e) => Err(e),\n }\n }\n }\n}",
22
+ "diff_span": {
23
+ "before": "",
24
+ "after": " event_type,\n source_verified,\n request_details,\n connector,\n ))\n .await"
25
+ },
26
+ "commit_sha": "32e6c54340ccaa4bda8b4fd20935be36914341ef"
27
+ },
28
+ {
29
+ "id": "crates/hyperswitch_connectors/src/connectors/adyenplatform/transformers/payouts.rs::struct::AdyenplatformTrackingData",
30
+ "file": "crates/hyperswitch_connectors/src/connectors/adyenplatform/transformers/payouts.rs",
31
+ "kind": "struct_item",
32
+ "status": "modified",
33
+ "code_changed": true,
34
+ "imports_changed": false,
35
+ "before_code": "pub struct AdyenplatformTrackingData {\n status: TrackingStatus,\n estimated_arrival_time: Option<String>,\n}",
36
+ "after_code": "pub struct AdyenplatformTrackingData {\n pub status: TrackingStatus,\n pub reason: Option<String>,\n pub estimated_arrival_time: Option<String>,\n}",
37
+ "diff_span": {
38
+ "before": "pub struct AdyenplatformTrackingData {\n status: TrackingStatus,\n estimated_arrival_time: Option<String>,\n}",
39
+ "after": "pub struct AdyenplatformTrackingData {\n pub status: TrackingStatus,\n pub reason: Option<String>,\n pub estimated_arrival_time: Option<String>,\n}"
40
+ },
41
+ "commit_sha": "32e6c54340ccaa4bda8b4fd20935be36914341ef"
42
+ },
43
+ {
44
+ "id": "crates/router/src/core/webhooks/incoming.rs::function::payouts_incoming_webhook_flow",
45
+ "file": "crates/router/src/core/webhooks/incoming.rs",
46
+ "kind": "function_item",
47
+ "status": "modified",
48
+ "code_changed": true,
49
+ "imports_changed": true,
50
+ "before_code": "async fn payouts_incoming_webhook_flow(\n state: SessionState,\n merchant_context: domain::MerchantContext,\n business_profile: domain::Profile,\n webhook_details: api::IncomingWebhookDetails,\n event_type: webhooks::IncomingWebhookEvent,\n source_verified: bool,\n) -> CustomResult<WebhookResponseTracker, errors::ApiErrorResponse> {\n metrics::INCOMING_PAYOUT_WEBHOOK_METRIC.add(1, &[]);\n if source_verified {\n let db = &*state.store;\n //find payout_attempt by object_reference_id\n let payout_attempt = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::PayoutId(payout_id_type) => match payout_id_type {\n webhooks::PayoutIdType::PayoutAttemptId(id) => db\n .find_payout_attempt_by_merchant_id_payout_attempt_id(\n merchant_context.get_merchant_account().get_id(),\n &id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout attempt\")?,\n webhooks::PayoutIdType::ConnectorPayoutId(id) => db\n .find_payout_attempt_by_merchant_id_connector_payout_id(\n merchant_context.get_merchant_account().get_id(),\n &id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout attempt\")?,\n },\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received a non-payout id when processing payout webhooks\")?,\n };\n\n let payouts = db\n .find_payout_by_merchant_id_payout_id(\n merchant_context.get_merchant_account().get_id(),\n &payout_attempt.payout_id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout\")?;\n\n let payout_attempt_update = PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_attempt.connector_payout_id.clone(),\n status: common_enums::PayoutStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"failed payout status mapping from event type\")?,\n error_message: None,\n error_code: None,\n is_eligible: payout_attempt.is_eligible,\n unified_code: None,\n unified_message: None,\n payout_connector_metadata: payout_attempt.payout_connector_metadata.clone(),\n };\n\n let action_req =\n payout_models::PayoutRequest::PayoutActionRequest(payout_models::PayoutActionRequest {\n payout_id: payouts.payout_id.clone(),\n });\n\n let mut payout_data = Box::pin(payouts::make_payout_data(\n &state,\n &merchant_context,\n None,\n &action_req,\n common_utils::consts::DEFAULT_LOCALE,\n ))\n .await?;\n\n let updated_payout_attempt = db\n .update_payout_attempt(\n &payout_attempt,\n payout_attempt_update,\n &payout_data.payouts,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable_lazy(|| {\n format!(\n \"Failed while updating payout attempt: payout_attempt_id: {}\",\n payout_attempt.payout_attempt_id\n )\n })?;\n payout_data.payout_attempt = updated_payout_attempt;\n\n let event_type: Option<enums::EventType> = payout_data.payout_attempt.status.into();\n\n // If event is NOT an UnsupportedEvent, trigger Outgoing Webhook\n if let Some(outgoing_event_type) = event_type {\n let payout_create_response =\n payouts::response_handler(&state, &merchant_context, &payout_data).await?;\n\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_context,\n business_profile,\n outgoing_event_type,\n enums::EventClass::Payouts,\n payout_data\n .payout_attempt\n .payout_id\n .get_string_repr()\n .to_string(),\n enums::EventObjectType::PayoutDetails,\n api::OutgoingWebhookContent::PayoutDetails(Box::new(payout_create_response)),\n Some(payout_data.payout_attempt.created_at),\n ))\n .await?;\n }\n\n Ok(WebhookResponseTracker::Payout {\n payout_id: payout_data.payout_attempt.payout_id,\n status: payout_data.payout_attempt.status,\n })\n } else {\n metrics::INCOMING_PAYOUT_WEBHOOK_SIGNATURE_FAILURE_METRIC.add(1, &[]);\n Err(report!(\n errors::ApiErrorResponse::WebhookAuthenticationFailed\n ))\n }\n}",
51
+ "after_code": "async fn payouts_incoming_webhook_flow(\n state: SessionState,\n merchant_context: domain::MerchantContext,\n business_profile: domain::Profile,\n webhook_details: api::IncomingWebhookDetails,\n event_type: webhooks::IncomingWebhookEvent,\n source_verified: bool,\n request_details: &IncomingWebhookRequestDetails<'_>,\n connector: &ConnectorEnum,\n) -> CustomResult<WebhookResponseTracker, errors::ApiErrorResponse> {\n metrics::INCOMING_PAYOUT_WEBHOOK_METRIC.add(1, &[]);\n if source_verified {\n let db = &*state.store;\n //find payout_attempt by object_reference_id\n let payout_attempt = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::PayoutId(payout_id_type) => match payout_id_type {\n webhooks::PayoutIdType::PayoutAttemptId(id) => db\n .find_payout_attempt_by_merchant_id_payout_attempt_id(\n merchant_context.get_merchant_account().get_id(),\n &id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout attempt\")?,\n webhooks::PayoutIdType::ConnectorPayoutId(id) => db\n .find_payout_attempt_by_merchant_id_connector_payout_id(\n merchant_context.get_merchant_account().get_id(),\n &id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout attempt\")?,\n },\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received a non-payout id when processing payout webhooks\")?,\n };\n\n let payouts = db\n .find_payout_by_merchant_id_payout_id(\n merchant_context.get_merchant_account().get_id(),\n &payout_attempt.payout_id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout\")?;\n\n let payout_error_details = connector\n .get_payout_error_update_object(request_details)\n .switch()\n .attach_printable(\"Failed to get error object for payouts\")?;\n\n let payout_attempt_update = PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_attempt.connector_payout_id.clone(),\n status: common_enums::PayoutStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"failed payout status mapping from event type\")?,\n error_message: payout_error_details.error_message,\n error_code: payout_error_details.error_code,\n is_eligible: payout_attempt.is_eligible,\n unified_code: None,\n unified_message: None,\n payout_connector_metadata: payout_attempt.payout_connector_metadata.clone(),\n };\n\n let action_req =\n payout_models::PayoutRequest::PayoutActionRequest(payout_models::PayoutActionRequest {\n payout_id: payouts.payout_id.clone(),\n });\n\n let mut payout_data = Box::pin(payouts::make_payout_data(\n &state,\n &merchant_context,\n None,\n &action_req,\n common_utils::consts::DEFAULT_LOCALE,\n ))\n .await?;\n\n let updated_payout_attempt = db\n .update_payout_attempt(\n &payout_attempt,\n payout_attempt_update,\n &payout_data.payouts,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable_lazy(|| {\n format!(\n \"Failed while updating payout attempt: payout_attempt_id: {}\",\n payout_attempt.payout_attempt_id\n )\n })?;\n payout_data.payout_attempt = updated_payout_attempt;\n\n let event_type: Option<enums::EventType> = payout_data.payout_attempt.status.into();\n\n // If event is NOT an UnsupportedEvent, trigger Outgoing Webhook\n if let Some(outgoing_event_type) = event_type {\n let payout_create_response =\n payouts::response_handler(&state, &merchant_context, &payout_data).await?;\n\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_context,\n business_profile,\n outgoing_event_type,\n enums::EventClass::Payouts,\n payout_data\n .payout_attempt\n .payout_id\n .get_string_repr()\n .to_string(),\n enums::EventObjectType::PayoutDetails,\n api::OutgoingWebhookContent::PayoutDetails(Box::new(payout_create_response)),\n Some(payout_data.payout_attempt.created_at),\n ))\n .await?;\n }\n\n Ok(WebhookResponseTracker::Payout {\n payout_id: payout_data.payout_attempt.payout_id,\n status: payout_data.payout_attempt.status,\n })\n } else {\n metrics::INCOMING_PAYOUT_WEBHOOK_SIGNATURE_FAILURE_METRIC.add(1, &[]);\n Err(report!(\n errors::ApiErrorResponse::WebhookAuthenticationFailed\n ))\n }\n}",
52
+ "diff_span": {
53
+ "before": " .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"failed payout status mapping from event type\")?,\n error_message: None,\n error_code: None,\n is_eligible: payout_attempt.is_eligible,\n unified_code: None,",
54
+ "after": " event_type: webhooks::IncomingWebhookEvent,\n source_verified: bool,\n request_details: &IncomingWebhookRequestDetails<'_>,\n connector: &ConnectorEnum,\n) -> CustomResult<WebhookResponseTracker, errors::ApiErrorResponse> {\n metrics::INCOMING_PAYOUT_WEBHOOK_METRIC.add(1, &[]);\n if source_verified {\n let db = &*state.store;\n //find payout_attempt by object_reference_id\n let payout_attempt = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::PayoutId(payout_id_type) => match payout_id_type {\n webhooks::PayoutIdType::PayoutAttemptId(id) => db\n .find_payout_attempt_by_merchant_id_payout_attempt_id(\n merchant_context.get_merchant_account().get_id(),\n &id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout attempt\")?,\n webhooks::PayoutIdType::ConnectorPayoutId(id) => db\n .find_payout_attempt_by_merchant_id_connector_payout_id(\n merchant_context.get_merchant_account().get_id(),\n &id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout attempt\")?,\n },\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received a non-payout id when processing payout webhooks\")?,\n };\n\n let payouts = db\n .find_payout_by_merchant_id_payout_id(\n merchant_context.get_merchant_account().get_id(),\n &payout_attempt.payout_id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout\")?;\n\n let payout_error_details = connector\n .get_payout_error_update_object(request_details)\n .switch()\n .attach_printable(\"Failed to get error object for payouts\")?;\n\n let payout_attempt_update = PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_attempt.connector_payout_id.clone(),\n status: common_enums::PayoutStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"failed payout status mapping from event type\")?,\n error_message: payout_error_details.error_message,\n error_code: payout_error_details.error_code,\n is_eligible: payout_attempt.is_eligible,\n unified_code: None,"
55
+ },
56
+ "commit_sha": "32e6c54340ccaa4bda8b4fd20935be36914341ef",
57
+ "before_imports": [
58
+ "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};",
59
+ "use common_utils::{\n errors::ReportSwitchExt,\n events::ApiEventsType,\n ext_traits::{AsyncExt, ByteSliceExt},\n types::{AmountConvertor, StringMinorUnitForConnector},\n};",
60
+ "use error_stack::{report, ResultExt};",
61
+ "use super::{types, utils, MERCHANT_ID};",
62
+ "use api_models::{\n enums::Connector,\n webhooks::{self, WebhookResponseTracker},\n};"
63
+ ],
64
+ "after_imports": [
65
+ "use hyperswitch_domain_models::{\n mandates::CommonMandateReference,\n payments::{payment_attempt::PaymentAttempt, HeaderPayload},\n router_request_types::VerifyWebhookSourceRequestData,\n router_response_types::{VerifyWebhookSourceResponseData, VerifyWebhookStatus},\n};",
66
+ "use common_utils::{\n errors::ReportSwitchExt,\n events::ApiEventsType,\n ext_traits::{AsyncExt, ByteSliceExt},\n types::{AmountConvertor, StringMinorUnitForConnector},\n};",
67
+ "use error_stack::{report, ResultExt};",
68
+ "use hyperswitch_interfaces::webhooks::{IncomingWebhookFlowError, IncomingWebhookRequestDetails};",
69
+ "use super::{types, utils, MERCHANT_ID};",
70
+ "use api_models::{\n enums::Connector,\n webhooks::{self, WebhookResponseTracker},\n};"
71
+ ]
72
+ },
73
+ {
74
+ "id": "crates/hyperswitch_connectors/src/connectors/adyenplatform/transformers/payouts.rs::struct::AdyenplatformIncomingWebhookData",
75
+ "file": "crates/hyperswitch_connectors/src/connectors/adyenplatform/transformers/payouts.rs",
76
+ "kind": "struct_item",
77
+ "status": "modified",
78
+ "code_changed": true,
79
+ "imports_changed": false,
80
+ "before_code": "pub struct AdyenplatformIncomingWebhookData {\n pub status: AdyenplatformWebhookStatus,\n pub reference: String,\n pub tracking: Option<AdyenplatformTrackingData>,\n pub category: Option<AdyenPayoutMethod>,\n}",
81
+ "after_code": "pub struct AdyenplatformIncomingWebhookData {\n pub status: AdyenplatformWebhookStatus,\n pub reference: String,\n pub tracking: Option<AdyenplatformTrackingData>,\n pub reason: Option<String>,\n pub category: Option<AdyenPayoutMethod>,\n pub events: Vec<AdyenPayoutEventData>,\n}",
82
+ "diff_span": {
83
+ "before": "",
84
+ "after": " pub reference: String,\n pub tracking: Option<AdyenplatformTrackingData>,\n pub reason: Option<String>,\n pub category: Option<AdyenPayoutMethod>,\n pub events: Vec<AdyenPayoutEventData>,\n}"
85
+ },
86
+ "commit_sha": "32e6c54340ccaa4bda8b4fd20935be36914341ef"
87
+ },
88
+ {
89
+ "id": "crates/hyperswitch_interfaces/src/webhooks.rs::trait::IncomingWebhook",
90
+ "file": "crates/hyperswitch_interfaces/src/webhooks.rs",
91
+ "kind": "trait_item",
92
+ "status": "modified",
93
+ "code_changed": true,
94
+ "imports_changed": false,
95
+ "before_code": "pub trait IncomingWebhook: ConnectorCommon + Sync {\n /// fn get_webhook_body_decoding_algorithm\n fn get_webhook_body_decoding_algorithm(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn crypto::DecodeMessage + Send>, errors::ConnectorError> {\n Ok(Box::new(crypto::NoAlgorithm))\n }\n\n /// fn get_webhook_body_decoding_message\n fn get_webhook_body_decoding_message(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n Ok(request.body.to_vec())\n }\n\n /// fn decode_webhook_body\n async fn decode_webhook_body(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n merchant_id: &common_utils::id_type::MerchantId,\n connector_webhook_details: Option<common_utils::pii::SecretSerdeValue>,\n connector_name: &str,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n let algorithm = self.get_webhook_body_decoding_algorithm(request)?;\n\n let message = self\n .get_webhook_body_decoding_message(request)\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n let secret = self\n .get_webhook_source_verification_merchant_secret(\n merchant_id,\n connector_name,\n connector_webhook_details,\n )\n .await\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n algorithm\n .decode_message(&secret.secret, message.into())\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)\n }\n\n /// fn get_webhook_source_verification_algorithm\n fn get_webhook_source_verification_algorithm(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn crypto::VerifySignature + Send>, errors::ConnectorError> {\n Ok(Box::new(crypto::NoAlgorithm))\n }\n\n /// fn get_webhook_source_verification_merchant_secret\n async fn get_webhook_source_verification_merchant_secret(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n connector_name: &str,\n connector_webhook_details: Option<common_utils::pii::SecretSerdeValue>,\n ) -> CustomResult<api_models::webhooks::ConnectorWebhookSecrets, errors::ConnectorError> {\n let debug_suffix =\n format!(\"For merchant_id: {merchant_id:?}, and connector_name: {connector_name}\");\n let default_secret = \"default_secret\".to_string();\n let merchant_secret = match connector_webhook_details {\n Some(merchant_connector_webhook_details) => {\n let connector_webhook_details = merchant_connector_webhook_details\n .parse_value::<api_models::admin::MerchantConnectorWebhookDetails>(\n \"MerchantConnectorWebhookDetails\",\n )\n .change_context_lazy(|| errors::ConnectorError::WebhookSourceVerificationFailed)\n .attach_printable_lazy(|| {\n format!(\n \"Deserializing MerchantConnectorWebhookDetails failed {debug_suffix}\",\n )\n })?;\n api_models::webhooks::ConnectorWebhookSecrets {\n secret: connector_webhook_details\n .merchant_secret\n .expose()\n .into_bytes(),\n additional_secret: connector_webhook_details.additional_secret,\n }\n }\n\n None => api_models::webhooks::ConnectorWebhookSecrets {\n secret: default_secret.into_bytes(),\n additional_secret: None,\n },\n };\n\n //need to fetch merchant secret from config table with caching in future for enhanced performance\n\n //If merchant has not set the secret for webhook source verification, \"default_secret\" is returned.\n //So it will fail during verification step and goes to psync flow.\n Ok(merchant_secret)\n }\n\n /// fn get_webhook_source_verification_signature\n fn get_webhook_source_verification_signature(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n _connector_webhook_secrets: &api_models::webhooks::ConnectorWebhookSecrets,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n Ok(Vec::new())\n }\n\n /// fn get_webhook_source_verification_message\n fn get_webhook_source_verification_message(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n _merchant_id: &common_utils::id_type::MerchantId,\n _connector_webhook_secrets: &api_models::webhooks::ConnectorWebhookSecrets,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n Ok(Vec::new())\n }\n\n /// fn verify_webhook_source\n async fn verify_webhook_source(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n merchant_id: &common_utils::id_type::MerchantId,\n connector_webhook_details: Option<common_utils::pii::SecretSerdeValue>,\n _connector_account_details: crypto::Encryptable<Secret<serde_json::Value>>,\n connector_name: &str,\n ) -> CustomResult<bool, errors::ConnectorError> {\n let algorithm = self\n .get_webhook_source_verification_algorithm(request)\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n let connector_webhook_secrets = self\n .get_webhook_source_verification_merchant_secret(\n merchant_id,\n connector_name,\n connector_webhook_details,\n )\n .await\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n let signature = self\n .get_webhook_source_verification_signature(request, &connector_webhook_secrets)\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n let message = self\n .get_webhook_source_verification_message(\n request,\n merchant_id,\n &connector_webhook_secrets,\n )\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n algorithm\n .verify_signature(&connector_webhook_secrets.secret, &signature, &message)\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)\n }\n\n /// fn get_webhook_object_reference_id\n fn get_webhook_object_reference_id(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::ObjectReferenceId, errors::ConnectorError>;\n\n /// fn get_webhook_event_type\n fn get_webhook_event_type(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::IncomingWebhookEvent, errors::ConnectorError>;\n\n /// fn get_webhook_resource_object\n fn get_webhook_resource_object(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, errors::ConnectorError>;\n\n /// fn get_webhook_api_response\n fn get_webhook_api_response(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n _error_kind: Option<IncomingWebhookFlowError>,\n ) -> CustomResult<ApplicationResponse<serde_json::Value>, errors::ConnectorError> {\n Ok(ApplicationResponse::StatusOk)\n }\n\n /// fn get_dispute_details\n fn get_dispute_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<crate::disputes::DisputePayload, errors::ConnectorError> {\n Err(errors::ConnectorError::NotImplemented(\"get_dispute_details method\".to_string()).into())\n }\n\n /// fn get_external_authentication_details\n fn get_external_authentication_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<crate::authentication::ExternalAuthenticationPayload, errors::ConnectorError>\n {\n Err(errors::ConnectorError::NotImplemented(\n \"get_external_authentication_details method\".to_string(),\n )\n .into())\n }\n\n /// fn get_mandate_details\n fn get_mandate_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n Option<hyperswitch_domain_models::router_flow_types::ConnectorMandateDetails>,\n errors::ConnectorError,\n > {\n Ok(None)\n }\n\n /// fn get_network_txn_id\n fn get_network_txn_id(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n Option<hyperswitch_domain_models::router_flow_types::ConnectorNetworkTxnId>,\n errors::ConnectorError,\n > {\n Ok(None)\n }\n\n #[cfg(all(feature = \"revenue_recovery\", feature = \"v2\"))]\n /// get revenue recovery invoice details\n fn get_revenue_recovery_attempt_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n hyperswitch_domain_models::revenue_recovery::RevenueRecoveryAttemptData,\n errors::ConnectorError,\n > {\n Err(errors::ConnectorError::NotImplemented(\n \"get_revenue_recovery_attempt_details method\".to_string(),\n )\n .into())\n }\n #[cfg(all(feature = \"revenue_recovery\", feature = \"v2\"))]\n /// get revenue recovery transaction details\n fn get_revenue_recovery_invoice_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n hyperswitch_domain_models::revenue_recovery::RevenueRecoveryInvoiceData,\n errors::ConnectorError,\n > {\n Err(errors::ConnectorError::NotImplemented(\n \"get_revenue_recovery_invoice_details method\".to_string(),\n )\n .into())\n }\n\n /// get subscription MIT payment data from webhook\n fn get_subscription_mit_payment_data(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n hyperswitch_domain_models::router_flow_types::SubscriptionMitPaymentData,\n errors::ConnectorError,\n > {\n Err(errors::ConnectorError::NotImplemented(\n \"get_subscription_mit_payment_data method\".to_string(),\n )\n .into())\n }\n}",
96
+ "after_code": "pub trait IncomingWebhook: ConnectorCommon + Sync {\n /// fn get_webhook_body_decoding_algorithm\n fn get_webhook_body_decoding_algorithm(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn crypto::DecodeMessage + Send>, errors::ConnectorError> {\n Ok(Box::new(crypto::NoAlgorithm))\n }\n\n /// fn get_webhook_body_decoding_message\n fn get_webhook_body_decoding_message(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n Ok(request.body.to_vec())\n }\n\n /// fn decode_webhook_body\n async fn decode_webhook_body(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n merchant_id: &common_utils::id_type::MerchantId,\n connector_webhook_details: Option<common_utils::pii::SecretSerdeValue>,\n connector_name: &str,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n let algorithm = self.get_webhook_body_decoding_algorithm(request)?;\n\n let message = self\n .get_webhook_body_decoding_message(request)\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n let secret = self\n .get_webhook_source_verification_merchant_secret(\n merchant_id,\n connector_name,\n connector_webhook_details,\n )\n .await\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n algorithm\n .decode_message(&secret.secret, message.into())\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)\n }\n\n /// fn get_webhook_source_verification_algorithm\n fn get_webhook_source_verification_algorithm(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn crypto::VerifySignature + Send>, errors::ConnectorError> {\n Ok(Box::new(crypto::NoAlgorithm))\n }\n\n /// fn get_webhook_source_verification_merchant_secret\n async fn get_webhook_source_verification_merchant_secret(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n connector_name: &str,\n connector_webhook_details: Option<common_utils::pii::SecretSerdeValue>,\n ) -> CustomResult<api_models::webhooks::ConnectorWebhookSecrets, errors::ConnectorError> {\n let debug_suffix =\n format!(\"For merchant_id: {merchant_id:?}, and connector_name: {connector_name}\");\n let default_secret = \"default_secret\".to_string();\n let merchant_secret = match connector_webhook_details {\n Some(merchant_connector_webhook_details) => {\n let connector_webhook_details = merchant_connector_webhook_details\n .parse_value::<api_models::admin::MerchantConnectorWebhookDetails>(\n \"MerchantConnectorWebhookDetails\",\n )\n .change_context_lazy(|| errors::ConnectorError::WebhookSourceVerificationFailed)\n .attach_printable_lazy(|| {\n format!(\n \"Deserializing MerchantConnectorWebhookDetails failed {debug_suffix}\",\n )\n })?;\n api_models::webhooks::ConnectorWebhookSecrets {\n secret: connector_webhook_details\n .merchant_secret\n .expose()\n .into_bytes(),\n additional_secret: connector_webhook_details.additional_secret,\n }\n }\n\n None => api_models::webhooks::ConnectorWebhookSecrets {\n secret: default_secret.into_bytes(),\n additional_secret: None,\n },\n };\n\n //need to fetch merchant secret from config table with caching in future for enhanced performance\n\n //If merchant has not set the secret for webhook source verification, \"default_secret\" is returned.\n //So it will fail during verification step and goes to psync flow.\n Ok(merchant_secret)\n }\n\n /// fn get_webhook_source_verification_signature\n fn get_webhook_source_verification_signature(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n _connector_webhook_secrets: &api_models::webhooks::ConnectorWebhookSecrets,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n Ok(Vec::new())\n }\n\n /// fn get_webhook_source_verification_message\n fn get_webhook_source_verification_message(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n _merchant_id: &common_utils::id_type::MerchantId,\n _connector_webhook_secrets: &api_models::webhooks::ConnectorWebhookSecrets,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n Ok(Vec::new())\n }\n\n /// fn verify_webhook_source\n async fn verify_webhook_source(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n merchant_id: &common_utils::id_type::MerchantId,\n connector_webhook_details: Option<common_utils::pii::SecretSerdeValue>,\n _connector_account_details: crypto::Encryptable<Secret<serde_json::Value>>,\n connector_name: &str,\n ) -> CustomResult<bool, errors::ConnectorError> {\n let algorithm = self\n .get_webhook_source_verification_algorithm(request)\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n let connector_webhook_secrets = self\n .get_webhook_source_verification_merchant_secret(\n merchant_id,\n connector_name,\n connector_webhook_details,\n )\n .await\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n let signature = self\n .get_webhook_source_verification_signature(request, &connector_webhook_secrets)\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n let message = self\n .get_webhook_source_verification_message(\n request,\n merchant_id,\n &connector_webhook_secrets,\n )\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n algorithm\n .verify_signature(&connector_webhook_secrets.secret, &signature, &message)\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)\n }\n\n /// fn get_webhook_object_reference_id\n fn get_webhook_object_reference_id(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::ObjectReferenceId, errors::ConnectorError>;\n\n /// fn get_status_update_object\n #[cfg(feature = \"payouts\")]\n fn get_payout_error_update_object(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::PayoutStatusUpdate, errors::ConnectorError> {\n Ok(api_models::webhooks::PayoutStatusUpdate {\n error_code: None,\n error_message: None,\n })\n }\n\n /// fn get_webhook_event_type\n fn get_webhook_event_type(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::IncomingWebhookEvent, errors::ConnectorError>;\n\n /// fn get_webhook_resource_object\n fn get_webhook_resource_object(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, errors::ConnectorError>;\n\n /// fn get_webhook_api_response\n fn get_webhook_api_response(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n _error_kind: Option<IncomingWebhookFlowError>,\n ) -> CustomResult<ApplicationResponse<serde_json::Value>, errors::ConnectorError> {\n Ok(ApplicationResponse::StatusOk)\n }\n\n /// fn get_dispute_details\n fn get_dispute_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<crate::disputes::DisputePayload, errors::ConnectorError> {\n Err(errors::ConnectorError::NotImplemented(\"get_dispute_details method\".to_string()).into())\n }\n\n /// fn get_external_authentication_details\n fn get_external_authentication_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<crate::authentication::ExternalAuthenticationPayload, errors::ConnectorError>\n {\n Err(errors::ConnectorError::NotImplemented(\n \"get_external_authentication_details method\".to_string(),\n )\n .into())\n }\n\n /// fn get_mandate_details\n fn get_mandate_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n Option<hyperswitch_domain_models::router_flow_types::ConnectorMandateDetails>,\n errors::ConnectorError,\n > {\n Ok(None)\n }\n\n /// fn get_network_txn_id\n fn get_network_txn_id(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n Option<hyperswitch_domain_models::router_flow_types::ConnectorNetworkTxnId>,\n errors::ConnectorError,\n > {\n Ok(None)\n }\n\n #[cfg(all(feature = \"revenue_recovery\", feature = \"v2\"))]\n /// get revenue recovery invoice details\n fn get_revenue_recovery_attempt_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n hyperswitch_domain_models::revenue_recovery::RevenueRecoveryAttemptData,\n errors::ConnectorError,\n > {\n Err(errors::ConnectorError::NotImplemented(\n \"get_revenue_recovery_attempt_details method\".to_string(),\n )\n .into())\n }\n #[cfg(all(feature = \"revenue_recovery\", feature = \"v2\"))]\n /// get revenue recovery transaction details\n fn get_revenue_recovery_invoice_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n hyperswitch_domain_models::revenue_recovery::RevenueRecoveryInvoiceData,\n errors::ConnectorError,\n > {\n Err(errors::ConnectorError::NotImplemented(\n \"get_revenue_recovery_invoice_details method\".to_string(),\n )\n .into())\n }\n\n /// get subscription MIT payment data from webhook\n fn get_subscription_mit_payment_data(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n hyperswitch_domain_models::router_flow_types::SubscriptionMitPaymentData,\n errors::ConnectorError,\n > {\n Err(errors::ConnectorError::NotImplemented(\n \"get_subscription_mit_payment_data method\".to_string(),\n )\n .into())\n }\n}",
97
+ "diff_span": {
98
+ "before": "",
99
+ "after": " ) -> CustomResult<api_models::webhooks::ObjectReferenceId, errors::ConnectorError>;\n\n /// fn get_status_update_object\n #[cfg(feature = \"payouts\")]\n fn get_payout_error_update_object(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::PayoutStatusUpdate, errors::ConnectorError> {\n Ok(api_models::webhooks::PayoutStatusUpdate {\n error_code: None,\n error_message: None,\n })\n }\n\n /// fn get_webhook_event_type\n fn get_webhook_event_type("
100
+ },
101
+ "commit_sha": "32e6c54340ccaa4bda8b4fd20935be36914341ef"
102
+ },
103
+ {
104
+ "id": "crates/hyperswitch_interfaces/src/webhooks.rs::IncomingWebhook::function::get_payout_error_update_object",
105
+ "file": "crates/hyperswitch_interfaces/src/webhooks.rs",
106
+ "kind": "function_item",
107
+ "status": "added",
108
+ "before_code": null,
109
+ "after_code": "fn get_payout_error_update_object(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::PayoutStatusUpdate, errors::ConnectorError> {\n Ok(api_models::webhooks::PayoutStatusUpdate {\n error_code: None,\n error_message: None,\n })\n }",
110
+ "diff_span": null,
111
+ "commit_sha": "32e6c54340ccaa4bda8b4fd20935be36914341ef"
112
+ },
113
+ {
114
+ "id": "crates/api_models/src/webhooks.rs::struct::PayoutStatusUpdate",
115
+ "file": "crates/api_models/src/webhooks.rs",
116
+ "kind": "struct_item",
117
+ "status": "added",
118
+ "before_code": null,
119
+ "after_code": "pub struct PayoutStatusUpdate {\n pub error_message: Option<String>,\n pub error_code: Option<String>,\n}",
120
+ "diff_span": null,
121
+ "commit_sha": "32e6c54340ccaa4bda8b4fd20935be36914341ef"
122
+ },
123
+ {
124
+ "id": "crates/hyperswitch_interfaces/src/connector_integration_interface.rs::ConnectorEnum::function::get_payout_error_update_object",
125
+ "file": "crates/hyperswitch_interfaces/src/connector_integration_interface.rs",
126
+ "kind": "function_item",
127
+ "status": "added",
128
+ "before_code": null,
129
+ "after_code": "fn get_payout_error_update_object(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::PayoutStatusUpdate, errors::ConnectorError> {\n match self {\n Self::Old(connector) => connector.get_payout_error_update_object(request),\n Self::New(connector) => connector.get_payout_error_update_object(request),\n }\n }",
130
+ "diff_span": null,
131
+ "commit_sha": "32e6c54340ccaa4bda8b4fd20935be36914341ef"
132
+ },
133
+ {
134
+ "id": "crates/hyperswitch_connectors/src/connectors/adyenplatform/transformers/payouts.rs::struct::AdyenPayoutEventData",
135
+ "file": "crates/hyperswitch_connectors/src/connectors/adyenplatform/transformers/payouts.rs",
136
+ "kind": "struct_item",
137
+ "status": "added",
138
+ "before_code": null,
139
+ "after_code": "pub struct AdyenPayoutEventData {\n pub status: AdyenplatformWebhookStatus,\n pub reason: Option<String>,\n}",
140
+ "diff_span": null,
141
+ "commit_sha": "32e6c54340ccaa4bda8b4fd20935be36914341ef"
142
+ },
143
+ {
144
+ "id": "crates/hyperswitch_connectors/src/connectors/adyenplatform.rs::Adyenplatform::function::get_payout_error_update_object",
145
+ "file": "crates/hyperswitch_connectors/src/connectors/adyenplatform.rs",
146
+ "kind": "function_item",
147
+ "status": "added",
148
+ "before_code": null,
149
+ "after_code": "fn get_payout_error_update_object(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::PayoutStatusUpdate, ConnectorError> {\n let webhook_body: adyenplatform::AdyenplatformIncomingWebhook = request\n .body\n .parse_struct(\"AdyenplatformIncomingWebhook\")\n .change_context(ConnectorError::WebhookSourceVerificationFailed)?;\n\n Ok(api_models::webhooks::PayoutStatusUpdate {\n error_message: webhook_body\n .data\n .tracking\n .and_then(|tracking_data| tracking_data.reason)\n .or(webhook_body.data.reason),\n error_code: None,\n })\n }",
150
+ "diff_span": null,
151
+ "commit_sha": "32e6c54340ccaa4bda8b4fd20935be36914341ef"
152
+ }
153
+ ]
154
+ }
diffs/pr_10096/6b0bf89/diff.json ADDED
@@ -0,0 +1,24 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "6b0bf89634013d7d5f65ae4bf6eb38a59646ffd0",
3
+ "pr_number": 10096,
4
+ "rust_files": [
5
+ "crates/hyperswitch_connectors/src/connectors/adyenplatform.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/hyperswitch_connectors/src/connectors/adyenplatform.rs::Adyenplatform::function::get_payout_error_update_object",
10
+ "file": "crates/hyperswitch_connectors/src/connectors/adyenplatform.rs",
11
+ "kind": "function_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "fn get_payout_error_update_object(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::PayoutStatusUpdate, ConnectorError> {\n let webhook_body: adyenplatform::AdyenplatformIncomingWebhook = request\n .body\n .parse_struct(\"AdyenplatformIncomingWebhook\")\n .change_context(ConnectorError::WebhookSourceVerificationFailed)?;\n\n Ok(api_models::webhooks::PayoutStatusUpdate {\n error_message: webhook_body\n .data\n .tracking\n .and_then(|tracking_data| tracking_data.reason)\n .or(webhook_body.data.reason),\n error_code: None,\n })\n }",
16
+ "after_code": "fn get_payout_error_update_object(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::PayoutStatusUpdate, ConnectorError> {\n let webhook_body: adyenplatform::AdyenplatformIncomingWebhook = request\n .body\n .parse_struct(\"AdyenplatformIncomingWebhook\")\n .change_context(ConnectorError::WebhookSourceVerificationFailed)?;\n\n let error_message = webhook_body.data.reason.or(webhook_body\n .data\n .tracking\n .and_then(|tracking_data| tracking_data.reason));\n\n Ok(api_models::webhooks::PayoutStatusUpdate {\n error_message,\n error_code: None,\n })\n }",
17
+ "diff_span": {
18
+ "before": "\n Ok(api_models::webhooks::PayoutStatusUpdate {\n error_message: webhook_body\n .data\n .tracking\n .and_then(|tracking_data| tracking_data.reason)\n .or(webhook_body.data.reason),\n error_code: None,\n })",
19
+ "after": " .change_context(ConnectorError::WebhookSourceVerificationFailed)?;\n\n let error_message = webhook_body.data.reason.or(webhook_body\n .data\n .tracking\n .and_then(|tracking_data| tracking_data.reason));\n\n Ok(api_models::webhooks::PayoutStatusUpdate {\n error_message,\n error_code: None,\n })"
20
+ },
21
+ "commit_sha": "6b0bf89634013d7d5f65ae4bf6eb38a59646ffd0"
22
+ }
23
+ ]
24
+ }
diffs/pr_10096/b2b4caf/diff.json ADDED
@@ -0,0 +1,123 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "b2b4cafbe893eadc0a01eb2ba261da2701985b4d",
3
+ "pr_number": 10096,
4
+ "rust_files": [
5
+ "crates/api_models/src/webhooks.rs",
6
+ "crates/hyperswitch_connectors/src/connectors/adyenplatform.rs",
7
+ "crates/hyperswitch_interfaces/src/connector_integration_interface.rs",
8
+ "crates/hyperswitch_interfaces/src/webhooks.rs",
9
+ "crates/router/src/core/webhooks/incoming.rs"
10
+ ],
11
+ "diffs": [
12
+ {
13
+ "id": "crates/router/src/core/webhooks/incoming.rs::function::payouts_incoming_webhook_flow",
14
+ "file": "crates/router/src/core/webhooks/incoming.rs",
15
+ "kind": "function_item",
16
+ "status": "modified",
17
+ "code_changed": true,
18
+ "imports_changed": false,
19
+ "before_code": "async fn payouts_incoming_webhook_flow(\n state: SessionState,\n merchant_context: domain::MerchantContext,\n business_profile: domain::Profile,\n webhook_details: api::IncomingWebhookDetails,\n event_type: webhooks::IncomingWebhookEvent,\n source_verified: bool,\n request_details: &IncomingWebhookRequestDetails<'_>,\n connector: &ConnectorEnum,\n) -> CustomResult<WebhookResponseTracker, errors::ApiErrorResponse> {\n metrics::INCOMING_PAYOUT_WEBHOOK_METRIC.add(1, &[]);\n if source_verified {\n let db = &*state.store;\n //find payout_attempt by object_reference_id\n let payout_attempt = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::PayoutId(payout_id_type) => match payout_id_type {\n webhooks::PayoutIdType::PayoutAttemptId(id) => db\n .find_payout_attempt_by_merchant_id_payout_attempt_id(\n merchant_context.get_merchant_account().get_id(),\n &id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout attempt\")?,\n webhooks::PayoutIdType::ConnectorPayoutId(id) => db\n .find_payout_attempt_by_merchant_id_connector_payout_id(\n merchant_context.get_merchant_account().get_id(),\n &id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout attempt\")?,\n },\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received a non-payout id when processing payout webhooks\")?,\n };\n\n let payouts = db\n .find_payout_by_merchant_id_payout_id(\n merchant_context.get_merchant_account().get_id(),\n &payout_attempt.payout_id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout\")?;\n\n let status = common_enums::PayoutStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"failed payout status mapping from event type\")?;\n\n // if status is failure then update the error_code and error_message as well\n let payout_attempt_update = if status.is_payout_failure() {\n let payout_error_details = connector\n .get_payout_error_update_object(request_details)\n .switch()\n .attach_printable(\"Failed to get error object for payouts\")?;\n\n PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_attempt.connector_payout_id.clone(),\n status,\n error_message: payout_error_details.error_message,\n error_code: payout_error_details.error_code,\n is_eligible: payout_attempt.is_eligible,\n unified_code: None,\n unified_message: None,\n payout_connector_metadata: payout_attempt.payout_connector_metadata.clone(),\n }\n } else {\n PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_attempt.connector_payout_id.clone(),\n status,\n error_message: None,\n error_code: None,\n is_eligible: payout_attempt.is_eligible,\n unified_code: None,\n unified_message: None,\n payout_connector_metadata: payout_attempt.payout_connector_metadata.clone(),\n }\n };\n\n let action_req =\n payout_models::PayoutRequest::PayoutActionRequest(payout_models::PayoutActionRequest {\n payout_id: payouts.payout_id.clone(),\n });\n\n let mut payout_data = Box::pin(payouts::make_payout_data(\n &state,\n &merchant_context,\n None,\n &action_req,\n common_utils::consts::DEFAULT_LOCALE,\n ))\n .await?;\n\n let updated_payout_attempt = db\n .update_payout_attempt(\n &payout_attempt,\n payout_attempt_update,\n &payout_data.payouts,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable_lazy(|| {\n format!(\n \"Failed while updating payout attempt: payout_attempt_id: {}\",\n payout_attempt.payout_attempt_id\n )\n })?;\n payout_data.payout_attempt = updated_payout_attempt;\n\n let event_type: Option<enums::EventType> = payout_data.payout_attempt.status.into();\n\n // If event is NOT an UnsupportedEvent, trigger Outgoing Webhook\n if let Some(outgoing_event_type) = event_type {\n let payout_create_response =\n payouts::response_handler(&state, &merchant_context, &payout_data).await?;\n\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_context,\n business_profile,\n outgoing_event_type,\n enums::EventClass::Payouts,\n payout_data\n .payout_attempt\n .payout_id\n .get_string_repr()\n .to_string(),\n enums::EventObjectType::PayoutDetails,\n api::OutgoingWebhookContent::PayoutDetails(Box::new(payout_create_response)),\n Some(payout_data.payout_attempt.created_at),\n ))\n .await?;\n }\n\n Ok(WebhookResponseTracker::Payout {\n payout_id: payout_data.payout_attempt.payout_id,\n status: payout_data.payout_attempt.status,\n })\n } else {\n metrics::INCOMING_PAYOUT_WEBHOOK_SIGNATURE_FAILURE_METRIC.add(1, &[]);\n Err(report!(\n errors::ApiErrorResponse::WebhookAuthenticationFailed\n ))\n }\n}",
20
+ "after_code": "async fn payouts_incoming_webhook_flow(\n state: SessionState,\n merchant_context: domain::MerchantContext,\n business_profile: domain::Profile,\n webhook_details: api::IncomingWebhookDetails,\n event_type: webhooks::IncomingWebhookEvent,\n source_verified: bool,\n request_details: &IncomingWebhookRequestDetails<'_>,\n connector: &ConnectorEnum,\n) -> CustomResult<WebhookResponseTracker, errors::ApiErrorResponse> {\n metrics::INCOMING_PAYOUT_WEBHOOK_METRIC.add(1, &[]);\n if source_verified {\n let db = &*state.store;\n //find payout_attempt by object_reference_id\n let payout_attempt = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::PayoutId(payout_id_type) => match payout_id_type {\n webhooks::PayoutIdType::PayoutAttemptId(id) => db\n .find_payout_attempt_by_merchant_id_payout_attempt_id(\n merchant_context.get_merchant_account().get_id(),\n &id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout attempt\")?,\n webhooks::PayoutIdType::ConnectorPayoutId(id) => db\n .find_payout_attempt_by_merchant_id_connector_payout_id(\n merchant_context.get_merchant_account().get_id(),\n &id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout attempt\")?,\n },\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received a non-payout id when processing payout webhooks\")?,\n };\n\n let payouts = db\n .find_payout_by_merchant_id_payout_id(\n merchant_context.get_merchant_account().get_id(),\n &payout_attempt.payout_id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the payout\")?;\n\n let status = common_enums::PayoutStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"failed payout status mapping from event type\")?;\n\n let payout_webhook_details = connector\n .get_payout_webhook_details(request_details)\n .switch()\n .attach_printable(\"Failed to get error object for payouts\")?;\n\n // if status is failure then update the error_code and error_message as well\n let payout_attempt_update = if status.is_payout_failure() {\n PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_attempt.connector_payout_id.clone(),\n status,\n error_message: payout_webhook_details.error_message,\n error_code: payout_webhook_details.error_code,\n is_eligible: payout_attempt.is_eligible,\n unified_code: None,\n unified_message: None,\n payout_connector_metadata: payout_attempt.payout_connector_metadata.clone(),\n }\n } else {\n PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_attempt.connector_payout_id.clone(),\n status,\n error_message: None,\n error_code: None,\n is_eligible: payout_attempt.is_eligible,\n unified_code: None,\n unified_message: None,\n payout_connector_metadata: payout_attempt.payout_connector_metadata.clone(),\n }\n };\n\n let action_req =\n payout_models::PayoutRequest::PayoutActionRequest(payout_models::PayoutActionRequest {\n payout_id: payouts.payout_id.clone(),\n });\n\n let mut payout_data = Box::pin(payouts::make_payout_data(\n &state,\n &merchant_context,\n None,\n &action_req,\n common_utils::consts::DEFAULT_LOCALE,\n ))\n .await?;\n\n let updated_payout_attempt = db\n .update_payout_attempt(\n &payout_attempt,\n payout_attempt_update,\n &payout_data.payouts,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable_lazy(|| {\n format!(\n \"Failed while updating payout attempt: payout_attempt_id: {}\",\n payout_attempt.payout_attempt_id\n )\n })?;\n payout_data.payout_attempt = updated_payout_attempt;\n\n let event_type: Option<enums::EventType> = payout_data.payout_attempt.status.into();\n\n // If event is NOT an UnsupportedEvent, trigger Outgoing Webhook\n if let Some(outgoing_event_type) = event_type {\n let payout_create_response =\n payouts::response_handler(&state, &merchant_context, &payout_data).await?;\n\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_context,\n business_profile,\n outgoing_event_type,\n enums::EventClass::Payouts,\n payout_data\n .payout_attempt\n .payout_id\n .get_string_repr()\n .to_string(),\n enums::EventObjectType::PayoutDetails,\n api::OutgoingWebhookContent::PayoutDetails(Box::new(payout_create_response)),\n Some(payout_data.payout_attempt.created_at),\n ))\n .await?;\n }\n\n Ok(WebhookResponseTracker::Payout {\n payout_id: payout_data.payout_attempt.payout_id,\n status: payout_data.payout_attempt.status,\n })\n } else {\n metrics::INCOMING_PAYOUT_WEBHOOK_SIGNATURE_FAILURE_METRIC.add(1, &[]);\n Err(report!(\n errors::ApiErrorResponse::WebhookAuthenticationFailed\n ))\n }\n}",
21
+ "diff_span": {
22
+ "before": " // if status is failure then update the error_code and error_message as well\n let payout_attempt_update = if status.is_payout_failure() {\n let payout_error_details = connector\n .get_payout_error_update_object(request_details)\n .switch()\n .attach_printable(\"Failed to get error object for payouts\")?;\n\n PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_attempt.connector_payout_id.clone(),\n status,\n error_message: payout_error_details.error_message,\n error_code: payout_error_details.error_code,\n is_eligible: payout_attempt.is_eligible,\n unified_code: None,",
23
+ "after": " .attach_printable(\"failed payout status mapping from event type\")?;\n\n let payout_webhook_details = connector\n .get_payout_webhook_details(request_details)\n .switch()\n .attach_printable(\"Failed to get error object for payouts\")?;\n\n // if status is failure then update the error_code and error_message as well\n let payout_attempt_update = if status.is_payout_failure() {\n PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_attempt.connector_payout_id.clone(),\n status,\n error_message: payout_webhook_details.error_message,\n error_code: payout_webhook_details.error_code,\n is_eligible: payout_attempt.is_eligible,\n unified_code: None,"
24
+ },
25
+ "commit_sha": "b2b4cafbe893eadc0a01eb2ba261da2701985b4d"
26
+ },
27
+ {
28
+ "id": "crates/hyperswitch_interfaces/src/webhooks.rs::trait::IncomingWebhook",
29
+ "file": "crates/hyperswitch_interfaces/src/webhooks.rs",
30
+ "kind": "trait_item",
31
+ "status": "modified",
32
+ "code_changed": true,
33
+ "imports_changed": false,
34
+ "before_code": "pub trait IncomingWebhook: ConnectorCommon + Sync {\n /// fn get_webhook_body_decoding_algorithm\n fn get_webhook_body_decoding_algorithm(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn crypto::DecodeMessage + Send>, errors::ConnectorError> {\n Ok(Box::new(crypto::NoAlgorithm))\n }\n\n /// fn get_webhook_body_decoding_message\n fn get_webhook_body_decoding_message(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n Ok(request.body.to_vec())\n }\n\n /// fn decode_webhook_body\n async fn decode_webhook_body(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n merchant_id: &common_utils::id_type::MerchantId,\n connector_webhook_details: Option<common_utils::pii::SecretSerdeValue>,\n connector_name: &str,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n let algorithm = self.get_webhook_body_decoding_algorithm(request)?;\n\n let message = self\n .get_webhook_body_decoding_message(request)\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n let secret = self\n .get_webhook_source_verification_merchant_secret(\n merchant_id,\n connector_name,\n connector_webhook_details,\n )\n .await\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n algorithm\n .decode_message(&secret.secret, message.into())\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)\n }\n\n /// fn get_webhook_source_verification_algorithm\n fn get_webhook_source_verification_algorithm(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn crypto::VerifySignature + Send>, errors::ConnectorError> {\n Ok(Box::new(crypto::NoAlgorithm))\n }\n\n /// fn get_webhook_source_verification_merchant_secret\n async fn get_webhook_source_verification_merchant_secret(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n connector_name: &str,\n connector_webhook_details: Option<common_utils::pii::SecretSerdeValue>,\n ) -> CustomResult<api_models::webhooks::ConnectorWebhookSecrets, errors::ConnectorError> {\n let debug_suffix =\n format!(\"For merchant_id: {merchant_id:?}, and connector_name: {connector_name}\");\n let default_secret = \"default_secret\".to_string();\n let merchant_secret = match connector_webhook_details {\n Some(merchant_connector_webhook_details) => {\n let connector_webhook_details = merchant_connector_webhook_details\n .parse_value::<api_models::admin::MerchantConnectorWebhookDetails>(\n \"MerchantConnectorWebhookDetails\",\n )\n .change_context_lazy(|| errors::ConnectorError::WebhookSourceVerificationFailed)\n .attach_printable_lazy(|| {\n format!(\n \"Deserializing MerchantConnectorWebhookDetails failed {debug_suffix}\",\n )\n })?;\n api_models::webhooks::ConnectorWebhookSecrets {\n secret: connector_webhook_details\n .merchant_secret\n .expose()\n .into_bytes(),\n additional_secret: connector_webhook_details.additional_secret,\n }\n }\n\n None => api_models::webhooks::ConnectorWebhookSecrets {\n secret: default_secret.into_bytes(),\n additional_secret: None,\n },\n };\n\n //need to fetch merchant secret from config table with caching in future for enhanced performance\n\n //If merchant has not set the secret for webhook source verification, \"default_secret\" is returned.\n //So it will fail during verification step and goes to psync flow.\n Ok(merchant_secret)\n }\n\n /// fn get_webhook_source_verification_signature\n fn get_webhook_source_verification_signature(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n _connector_webhook_secrets: &api_models::webhooks::ConnectorWebhookSecrets,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n Ok(Vec::new())\n }\n\n /// fn get_webhook_source_verification_message\n fn get_webhook_source_verification_message(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n _merchant_id: &common_utils::id_type::MerchantId,\n _connector_webhook_secrets: &api_models::webhooks::ConnectorWebhookSecrets,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n Ok(Vec::new())\n }\n\n /// fn verify_webhook_source\n async fn verify_webhook_source(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n merchant_id: &common_utils::id_type::MerchantId,\n connector_webhook_details: Option<common_utils::pii::SecretSerdeValue>,\n _connector_account_details: crypto::Encryptable<Secret<serde_json::Value>>,\n connector_name: &str,\n ) -> CustomResult<bool, errors::ConnectorError> {\n let algorithm = self\n .get_webhook_source_verification_algorithm(request)\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n let connector_webhook_secrets = self\n .get_webhook_source_verification_merchant_secret(\n merchant_id,\n connector_name,\n connector_webhook_details,\n )\n .await\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n let signature = self\n .get_webhook_source_verification_signature(request, &connector_webhook_secrets)\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n let message = self\n .get_webhook_source_verification_message(\n request,\n merchant_id,\n &connector_webhook_secrets,\n )\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n algorithm\n .verify_signature(&connector_webhook_secrets.secret, &signature, &message)\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)\n }\n\n /// fn get_webhook_object_reference_id\n fn get_webhook_object_reference_id(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::ObjectReferenceId, errors::ConnectorError>;\n\n /// fn get_status_update_object\n #[cfg(feature = \"payouts\")]\n fn get_payout_error_update_object(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::PayoutStatusUpdate, errors::ConnectorError> {\n Ok(api_models::webhooks::PayoutStatusUpdate {\n error_code: None,\n error_message: None,\n })\n }\n\n /// fn get_webhook_event_type\n fn get_webhook_event_type(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::IncomingWebhookEvent, errors::ConnectorError>;\n\n /// fn get_webhook_resource_object\n fn get_webhook_resource_object(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, errors::ConnectorError>;\n\n /// fn get_webhook_api_response\n fn get_webhook_api_response(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n _error_kind: Option<IncomingWebhookFlowError>,\n ) -> CustomResult<ApplicationResponse<serde_json::Value>, errors::ConnectorError> {\n Ok(ApplicationResponse::StatusOk)\n }\n\n /// fn get_dispute_details\n fn get_dispute_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<crate::disputes::DisputePayload, errors::ConnectorError> {\n Err(errors::ConnectorError::NotImplemented(\"get_dispute_details method\".to_string()).into())\n }\n\n /// fn get_external_authentication_details\n fn get_external_authentication_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<crate::authentication::ExternalAuthenticationPayload, errors::ConnectorError>\n {\n Err(errors::ConnectorError::NotImplemented(\n \"get_external_authentication_details method\".to_string(),\n )\n .into())\n }\n\n /// fn get_mandate_details\n fn get_mandate_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n Option<hyperswitch_domain_models::router_flow_types::ConnectorMandateDetails>,\n errors::ConnectorError,\n > {\n Ok(None)\n }\n\n /// fn get_network_txn_id\n fn get_network_txn_id(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n Option<hyperswitch_domain_models::router_flow_types::ConnectorNetworkTxnId>,\n errors::ConnectorError,\n > {\n Ok(None)\n }\n\n #[cfg(all(feature = \"revenue_recovery\", feature = \"v2\"))]\n /// get revenue recovery invoice details\n fn get_revenue_recovery_attempt_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n hyperswitch_domain_models::revenue_recovery::RevenueRecoveryAttemptData,\n errors::ConnectorError,\n > {\n Err(errors::ConnectorError::NotImplemented(\n \"get_revenue_recovery_attempt_details method\".to_string(),\n )\n .into())\n }\n #[cfg(all(feature = \"revenue_recovery\", feature = \"v2\"))]\n /// get revenue recovery transaction details\n fn get_revenue_recovery_invoice_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n hyperswitch_domain_models::revenue_recovery::RevenueRecoveryInvoiceData,\n errors::ConnectorError,\n > {\n Err(errors::ConnectorError::NotImplemented(\n \"get_revenue_recovery_invoice_details method\".to_string(),\n )\n .into())\n }\n\n /// get subscription MIT payment data from webhook\n fn get_subscription_mit_payment_data(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n hyperswitch_domain_models::router_flow_types::SubscriptionMitPaymentData,\n errors::ConnectorError,\n > {\n Err(errors::ConnectorError::NotImplemented(\n \"get_subscription_mit_payment_data method\".to_string(),\n )\n .into())\n }\n}",
35
+ "after_code": "pub trait IncomingWebhook: ConnectorCommon + Sync {\n /// fn get_webhook_body_decoding_algorithm\n fn get_webhook_body_decoding_algorithm(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn crypto::DecodeMessage + Send>, errors::ConnectorError> {\n Ok(Box::new(crypto::NoAlgorithm))\n }\n\n /// fn get_webhook_body_decoding_message\n fn get_webhook_body_decoding_message(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n Ok(request.body.to_vec())\n }\n\n /// fn decode_webhook_body\n async fn decode_webhook_body(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n merchant_id: &common_utils::id_type::MerchantId,\n connector_webhook_details: Option<common_utils::pii::SecretSerdeValue>,\n connector_name: &str,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n let algorithm = self.get_webhook_body_decoding_algorithm(request)?;\n\n let message = self\n .get_webhook_body_decoding_message(request)\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n let secret = self\n .get_webhook_source_verification_merchant_secret(\n merchant_id,\n connector_name,\n connector_webhook_details,\n )\n .await\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n algorithm\n .decode_message(&secret.secret, message.into())\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)\n }\n\n /// fn get_webhook_source_verification_algorithm\n fn get_webhook_source_verification_algorithm(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn crypto::VerifySignature + Send>, errors::ConnectorError> {\n Ok(Box::new(crypto::NoAlgorithm))\n }\n\n /// fn get_webhook_source_verification_merchant_secret\n async fn get_webhook_source_verification_merchant_secret(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n connector_name: &str,\n connector_webhook_details: Option<common_utils::pii::SecretSerdeValue>,\n ) -> CustomResult<api_models::webhooks::ConnectorWebhookSecrets, errors::ConnectorError> {\n let debug_suffix =\n format!(\"For merchant_id: {merchant_id:?}, and connector_name: {connector_name}\");\n let default_secret = \"default_secret\".to_string();\n let merchant_secret = match connector_webhook_details {\n Some(merchant_connector_webhook_details) => {\n let connector_webhook_details = merchant_connector_webhook_details\n .parse_value::<api_models::admin::MerchantConnectorWebhookDetails>(\n \"MerchantConnectorWebhookDetails\",\n )\n .change_context_lazy(|| errors::ConnectorError::WebhookSourceVerificationFailed)\n .attach_printable_lazy(|| {\n format!(\n \"Deserializing MerchantConnectorWebhookDetails failed {debug_suffix}\",\n )\n })?;\n api_models::webhooks::ConnectorWebhookSecrets {\n secret: connector_webhook_details\n .merchant_secret\n .expose()\n .into_bytes(),\n additional_secret: connector_webhook_details.additional_secret,\n }\n }\n\n None => api_models::webhooks::ConnectorWebhookSecrets {\n secret: default_secret.into_bytes(),\n additional_secret: None,\n },\n };\n\n //need to fetch merchant secret from config table with caching in future for enhanced performance\n\n //If merchant has not set the secret for webhook source verification, \"default_secret\" is returned.\n //So it will fail during verification step and goes to psync flow.\n Ok(merchant_secret)\n }\n\n /// fn get_webhook_source_verification_signature\n fn get_webhook_source_verification_signature(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n _connector_webhook_secrets: &api_models::webhooks::ConnectorWebhookSecrets,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n Ok(Vec::new())\n }\n\n /// fn get_webhook_source_verification_message\n fn get_webhook_source_verification_message(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n _merchant_id: &common_utils::id_type::MerchantId,\n _connector_webhook_secrets: &api_models::webhooks::ConnectorWebhookSecrets,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n Ok(Vec::new())\n }\n\n /// fn verify_webhook_source\n async fn verify_webhook_source(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n merchant_id: &common_utils::id_type::MerchantId,\n connector_webhook_details: Option<common_utils::pii::SecretSerdeValue>,\n _connector_account_details: crypto::Encryptable<Secret<serde_json::Value>>,\n connector_name: &str,\n ) -> CustomResult<bool, errors::ConnectorError> {\n let algorithm = self\n .get_webhook_source_verification_algorithm(request)\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n let connector_webhook_secrets = self\n .get_webhook_source_verification_merchant_secret(\n merchant_id,\n connector_name,\n connector_webhook_details,\n )\n .await\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n let signature = self\n .get_webhook_source_verification_signature(request, &connector_webhook_secrets)\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n let message = self\n .get_webhook_source_verification_message(\n request,\n merchant_id,\n &connector_webhook_secrets,\n )\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n algorithm\n .verify_signature(&connector_webhook_secrets.secret, &signature, &message)\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)\n }\n\n /// fn get_webhook_object_reference_id\n fn get_webhook_object_reference_id(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::ObjectReferenceId, errors::ConnectorError>;\n\n /// fn get_status_update_object\n #[cfg(feature = \"payouts\")]\n fn get_payout_webhook_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::PayoutWebhookUpdate, errors::ConnectorError> {\n Ok(api_models::webhooks::PayoutWebhookUpdate {\n error_code: None,\n error_message: None,\n })\n }\n\n /// fn get_webhook_event_type\n fn get_webhook_event_type(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::IncomingWebhookEvent, errors::ConnectorError>;\n\n /// fn get_webhook_resource_object\n fn get_webhook_resource_object(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, errors::ConnectorError>;\n\n /// fn get_webhook_api_response\n fn get_webhook_api_response(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n _error_kind: Option<IncomingWebhookFlowError>,\n ) -> CustomResult<ApplicationResponse<serde_json::Value>, errors::ConnectorError> {\n Ok(ApplicationResponse::StatusOk)\n }\n\n /// fn get_dispute_details\n fn get_dispute_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<crate::disputes::DisputePayload, errors::ConnectorError> {\n Err(errors::ConnectorError::NotImplemented(\"get_dispute_details method\".to_string()).into())\n }\n\n /// fn get_external_authentication_details\n fn get_external_authentication_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<crate::authentication::ExternalAuthenticationPayload, errors::ConnectorError>\n {\n Err(errors::ConnectorError::NotImplemented(\n \"get_external_authentication_details method\".to_string(),\n )\n .into())\n }\n\n /// fn get_mandate_details\n fn get_mandate_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n Option<hyperswitch_domain_models::router_flow_types::ConnectorMandateDetails>,\n errors::ConnectorError,\n > {\n Ok(None)\n }\n\n /// fn get_network_txn_id\n fn get_network_txn_id(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n Option<hyperswitch_domain_models::router_flow_types::ConnectorNetworkTxnId>,\n errors::ConnectorError,\n > {\n Ok(None)\n }\n\n #[cfg(all(feature = \"revenue_recovery\", feature = \"v2\"))]\n /// get revenue recovery invoice details\n fn get_revenue_recovery_attempt_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n hyperswitch_domain_models::revenue_recovery::RevenueRecoveryAttemptData,\n errors::ConnectorError,\n > {\n Err(errors::ConnectorError::NotImplemented(\n \"get_revenue_recovery_attempt_details method\".to_string(),\n )\n .into())\n }\n #[cfg(all(feature = \"revenue_recovery\", feature = \"v2\"))]\n /// get revenue recovery transaction details\n fn get_revenue_recovery_invoice_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n hyperswitch_domain_models::revenue_recovery::RevenueRecoveryInvoiceData,\n errors::ConnectorError,\n > {\n Err(errors::ConnectorError::NotImplemented(\n \"get_revenue_recovery_invoice_details method\".to_string(),\n )\n .into())\n }\n\n /// get subscription MIT payment data from webhook\n fn get_subscription_mit_payment_data(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n hyperswitch_domain_models::router_flow_types::SubscriptionMitPaymentData,\n errors::ConnectorError,\n > {\n Err(errors::ConnectorError::NotImplemented(\n \"get_subscription_mit_payment_data method\".to_string(),\n )\n .into())\n }\n}",
36
+ "diff_span": {
37
+ "before": " /// fn get_status_update_object\n #[cfg(feature = \"payouts\")]\n fn get_payout_error_update_object(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::PayoutStatusUpdate, errors::ConnectorError> {\n Ok(api_models::webhooks::PayoutStatusUpdate {\n error_code: None,\n error_message: None,",
38
+ "after": " /// fn get_status_update_object\n #[cfg(feature = \"payouts\")]\n fn get_payout_webhook_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::PayoutWebhookUpdate, errors::ConnectorError> {\n Ok(api_models::webhooks::PayoutWebhookUpdate {\n error_code: None,\n error_message: None,"
39
+ },
40
+ "commit_sha": "b2b4cafbe893eadc0a01eb2ba261da2701985b4d"
41
+ },
42
+ {
43
+ "id": "crates/hyperswitch_interfaces/src/webhooks.rs::IncomingWebhook::function::get_payout_webhook_details",
44
+ "file": "crates/hyperswitch_interfaces/src/webhooks.rs",
45
+ "kind": "function_item",
46
+ "status": "added",
47
+ "before_code": null,
48
+ "after_code": "fn get_payout_webhook_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::PayoutWebhookUpdate, errors::ConnectorError> {\n Ok(api_models::webhooks::PayoutWebhookUpdate {\n error_code: None,\n error_message: None,\n })\n }",
49
+ "diff_span": null,
50
+ "commit_sha": "b2b4cafbe893eadc0a01eb2ba261da2701985b4d"
51
+ },
52
+ {
53
+ "id": "crates/hyperswitch_connectors/src/connectors/adyenplatform.rs::Adyenplatform::function::get_payout_webhook_details",
54
+ "file": "crates/hyperswitch_connectors/src/connectors/adyenplatform.rs",
55
+ "kind": "function_item",
56
+ "status": "added",
57
+ "before_code": null,
58
+ "after_code": "fn get_payout_webhook_details(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::PayoutWebhookUpdate, ConnectorError> {\n let webhook_body: adyenplatform::AdyenplatformIncomingWebhook = request\n .body\n .parse_struct(\"AdyenplatformIncomingWebhook\")\n .change_context(ConnectorError::ResponseDeserializationFailed)?;\n\n let error_reason = webhook_body.data.reason.or(webhook_body\n .data\n .tracking\n .and_then(|tracking_data| tracking_data.reason));\n\n Ok(api_models::webhooks::PayoutWebhookUpdate {\n error_message: error_reason.clone(),\n error_code: error_reason,\n })\n }",
59
+ "diff_span": null,
60
+ "commit_sha": "b2b4cafbe893eadc0a01eb2ba261da2701985b4d"
61
+ },
62
+ {
63
+ "id": "crates/api_models/src/webhooks.rs::struct::PayoutWebhookUpdate",
64
+ "file": "crates/api_models/src/webhooks.rs",
65
+ "kind": "struct_item",
66
+ "status": "added",
67
+ "before_code": null,
68
+ "after_code": "pub struct PayoutWebhookUpdate {\n pub error_message: Option<String>,\n pub error_code: Option<String>,\n}",
69
+ "diff_span": null,
70
+ "commit_sha": "b2b4cafbe893eadc0a01eb2ba261da2701985b4d"
71
+ },
72
+ {
73
+ "id": "crates/hyperswitch_interfaces/src/connector_integration_interface.rs::ConnectorEnum::function::get_payout_webhook_details",
74
+ "file": "crates/hyperswitch_interfaces/src/connector_integration_interface.rs",
75
+ "kind": "function_item",
76
+ "status": "added",
77
+ "before_code": null,
78
+ "after_code": "fn get_payout_webhook_details(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::PayoutWebhookUpdate, errors::ConnectorError> {\n match self {\n Self::Old(connector) => connector.get_payout_webhook_details(request),\n Self::New(connector) => connector.get_payout_webhook_details(request),\n }\n }",
79
+ "diff_span": null,
80
+ "commit_sha": "b2b4cafbe893eadc0a01eb2ba261da2701985b4d"
81
+ },
82
+ {
83
+ "id": "crates/hyperswitch_connectors/src/connectors/adyenplatform.rs::Adyenplatform::function::get_payout_error_update_object",
84
+ "file": "crates/hyperswitch_connectors/src/connectors/adyenplatform.rs",
85
+ "kind": "function_item",
86
+ "status": "removed",
87
+ "before_code": "fn get_payout_error_update_object(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::PayoutStatusUpdate, ConnectorError> {\n let webhook_body: adyenplatform::AdyenplatformIncomingWebhook = request\n .body\n .parse_struct(\"AdyenplatformIncomingWebhook\")\n .change_context(ConnectorError::WebhookSourceVerificationFailed)?;\n\n let error_reason = webhook_body.data.reason.or(webhook_body\n .data\n .tracking\n .and_then(|tracking_data| tracking_data.reason));\n\n Ok(api_models::webhooks::PayoutStatusUpdate {\n error_message: error_reason.clone(),\n error_code: error_reason,\n })\n }",
88
+ "after_code": null,
89
+ "diff_span": null,
90
+ "commit_sha": "b2b4cafbe893eadc0a01eb2ba261da2701985b4d"
91
+ },
92
+ {
93
+ "id": "crates/hyperswitch_interfaces/src/webhooks.rs::IncomingWebhook::function::get_payout_error_update_object",
94
+ "file": "crates/hyperswitch_interfaces/src/webhooks.rs",
95
+ "kind": "function_item",
96
+ "status": "removed",
97
+ "before_code": "fn get_payout_error_update_object(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::PayoutStatusUpdate, errors::ConnectorError> {\n Ok(api_models::webhooks::PayoutStatusUpdate {\n error_code: None,\n error_message: None,\n })\n }",
98
+ "after_code": null,
99
+ "diff_span": null,
100
+ "commit_sha": "b2b4cafbe893eadc0a01eb2ba261da2701985b4d"
101
+ },
102
+ {
103
+ "id": "crates/api_models/src/webhooks.rs::struct::PayoutStatusUpdate",
104
+ "file": "crates/api_models/src/webhooks.rs",
105
+ "kind": "struct_item",
106
+ "status": "removed",
107
+ "before_code": "pub struct PayoutStatusUpdate {\n pub error_message: Option<String>,\n pub error_code: Option<String>,\n}",
108
+ "after_code": null,
109
+ "diff_span": null,
110
+ "commit_sha": "b2b4cafbe893eadc0a01eb2ba261da2701985b4d"
111
+ },
112
+ {
113
+ "id": "crates/hyperswitch_interfaces/src/connector_integration_interface.rs::ConnectorEnum::function::get_payout_error_update_object",
114
+ "file": "crates/hyperswitch_interfaces/src/connector_integration_interface.rs",
115
+ "kind": "function_item",
116
+ "status": "removed",
117
+ "before_code": "fn get_payout_error_update_object(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::PayoutStatusUpdate, errors::ConnectorError> {\n match self {\n Self::Old(connector) => connector.get_payout_error_update_object(request),\n Self::New(connector) => connector.get_payout_error_update_object(request),\n }\n }",
118
+ "after_code": null,
119
+ "diff_span": null,
120
+ "commit_sha": "b2b4cafbe893eadc0a01eb2ba261da2701985b4d"
121
+ }
122
+ ]
123
+ }
diffs/pr_10096/e32df68/diff.json ADDED
@@ -0,0 +1,34 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "e32df68f722eed21d8005672a6aa9c04a5e52c44",
3
+ "pr_number": 10096,
4
+ "rust_files": [
5
+ "crates/hyperswitch_connectors/src/connectors/adyenplatform/transformers/payouts.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/hyperswitch_connectors/src/connectors/adyenplatform/transformers/payouts.rs::struct::AdyenplatformIncomingWebhookData",
10
+ "file": "crates/hyperswitch_connectors/src/connectors/adyenplatform/transformers/payouts.rs",
11
+ "kind": "struct_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "pub struct AdyenplatformIncomingWebhookData {\n pub status: AdyenplatformWebhookStatus,\n pub reference: String,\n pub tracking: Option<AdyenplatformTrackingData>,\n pub reason: Option<String>,\n pub category: Option<AdyenPayoutMethod>,\n pub events: Vec<AdyenPayoutEventData>,\n}",
16
+ "after_code": "pub struct AdyenplatformIncomingWebhookData {\n pub status: AdyenplatformWebhookStatus,\n pub reference: String,\n pub tracking: Option<AdyenplatformTrackingData>,\n pub reason: Option<String>,\n pub category: Option<AdyenPayoutMethod>,\n}",
17
+ "diff_span": {
18
+ "before": " pub reason: Option<String>,\n pub category: Option<AdyenPayoutMethod>,\n pub events: Vec<AdyenPayoutEventData>,\n}",
19
+ "after": ""
20
+ },
21
+ "commit_sha": "e32df68f722eed21d8005672a6aa9c04a5e52c44"
22
+ },
23
+ {
24
+ "id": "crates/hyperswitch_connectors/src/connectors/adyenplatform/transformers/payouts.rs::struct::AdyenPayoutEventData",
25
+ "file": "crates/hyperswitch_connectors/src/connectors/adyenplatform/transformers/payouts.rs",
26
+ "kind": "struct_item",
27
+ "status": "removed",
28
+ "before_code": "pub struct AdyenPayoutEventData {\n pub status: AdyenplatformWebhookStatus,\n pub reason: Option<String>,\n}",
29
+ "after_code": null,
30
+ "diff_span": null,
31
+ "commit_sha": "e32df68f722eed21d8005672a6aa9c04a5e52c44"
32
+ }
33
+ ]
34
+ }
diffs/pr_10140/1955840/diff.json ADDED
@@ -0,0 +1,39 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "19558407144e7e97f9b9cfdffb66e8a409fbd9f9",
3
+ "pr_number": 10140,
4
+ "rust_files": [
5
+ "crates/router/src/core/payments/transformers.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/router/src/core/payments/transformers.rs::api_models::payments::PaymentsListResponseItem::function::foreign_from",
10
+ "file": "crates/router/src/core/payments/transformers.rs",
11
+ "kind": "function_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n Self {\n id: pi.id,\n merchant_id: pi.merchant_id,\n profile_id: pi.profile_id,\n customer_id: pi.customer_id,\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id,\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata,\n description: pi.description.map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url,\n statement_descriptor: pi.statement_descriptor,\n allowed_payment_method_types: pi.allowed_payment_method_types,\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment: pi.is_split_payment(),\n }\n }",
16
+ "after_code": "fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n Self {\n id: pi.id.clone(),\n merchant_id: pi.merchant_id.clone(),\n profile_id: pi.profile_id.clone(),\n customer_id: pi.customer_id.clone(),\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id.clone(),\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata.clone(),\n description: pi\n .description\n .as_ref()\n .map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url.clone(),\n statement_descriptor: pi.statement_descriptor.clone(),\n allowed_payment_method_types: pi.allowed_payment_method_types.clone(),\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment: pi.is_split_payment(),\n }\n }",
17
+ "diff_span": {
18
+ "before": "fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n Self {\n id: pi.id,\n merchant_id: pi.merchant_id,\n profile_id: pi.profile_id,\n customer_id: pi.customer_id,\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id,\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata,\n description: pi.description.map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url,\n statement_descriptor: pi.statement_descriptor,\n allowed_payment_method_types: pi.allowed_payment_method_types,\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),",
19
+ "after": "fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n Self {\n id: pi.id.clone(),\n merchant_id: pi.merchant_id.clone(),\n profile_id: pi.profile_id.clone(),\n customer_id: pi.customer_id.clone(),\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id.clone(),\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata.clone(),\n description: pi\n .description\n .as_ref()\n .map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url.clone(),\n statement_descriptor: pi.statement_descriptor.clone(),\n allowed_payment_method_types: pi.allowed_payment_method_types.clone(),\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),"
20
+ },
21
+ "commit_sha": "19558407144e7e97f9b9cfdffb66e8a409fbd9f9"
22
+ },
23
+ {
24
+ "id": "crates/router/src/core/payments/transformers.rs::impl::api_models::payments::PaymentsListResponseItem",
25
+ "file": "crates/router/src/core/payments/transformers.rs",
26
+ "kind": "impl_item",
27
+ "status": "modified",
28
+ "code_changed": true,
29
+ "imports_changed": false,
30
+ "before_code": "impl ForeignFrom<(storage::PaymentIntent, Option<storage::PaymentAttempt>)>\n for api_models::payments::PaymentsListResponseItem\n{\n fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n Self {\n id: pi.id,\n merchant_id: pi.merchant_id,\n profile_id: pi.profile_id,\n customer_id: pi.customer_id,\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id,\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata,\n description: pi.description.map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url,\n statement_descriptor: pi.statement_descriptor,\n allowed_payment_method_types: pi.allowed_payment_method_types,\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment: pi.is_split_payment(),\n }\n }\n}",
31
+ "after_code": "impl ForeignFrom<(storage::PaymentIntent, Option<storage::PaymentAttempt>)>\n for api_models::payments::PaymentsListResponseItem\n{\n fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n Self {\n id: pi.id.clone(),\n merchant_id: pi.merchant_id.clone(),\n profile_id: pi.profile_id.clone(),\n customer_id: pi.customer_id.clone(),\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id.clone(),\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata.clone(),\n description: pi\n .description\n .as_ref()\n .map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url.clone(),\n statement_descriptor: pi.statement_descriptor.clone(),\n allowed_payment_method_types: pi.allowed_payment_method_types.clone(),\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment: pi.is_split_payment(),\n }\n }\n}",
32
+ "diff_span": {
33
+ "before": " fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n Self {\n id: pi.id,\n merchant_id: pi.merchant_id,\n profile_id: pi.profile_id,\n customer_id: pi.customer_id,\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id,\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata,\n description: pi.description.map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url,\n statement_descriptor: pi.statement_descriptor,\n allowed_payment_method_types: pi.allowed_payment_method_types,\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),",
34
+ "after": " fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n Self {\n id: pi.id.clone(),\n merchant_id: pi.merchant_id.clone(),\n profile_id: pi.profile_id.clone(),\n customer_id: pi.customer_id.clone(),\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id.clone(),\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata.clone(),\n description: pi\n .description\n .as_ref()\n .map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url.clone(),\n statement_descriptor: pi.statement_descriptor.clone(),\n allowed_payment_method_types: pi.allowed_payment_method_types.clone(),\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),"
35
+ },
36
+ "commit_sha": "19558407144e7e97f9b9cfdffb66e8a409fbd9f9"
37
+ }
38
+ ]
39
+ }
diffs/pr_10140/80eee7f/diff.json ADDED
@@ -0,0 +1,39 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "80eee7f8e01e84055660b63dcefbdcc46bf08292",
3
+ "pr_number": 10140,
4
+ "rust_files": [
5
+ "crates/router/src/core/payments/transformers.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/router/src/core/payments/transformers.rs::api_models::payments::PaymentsListResponseItem::function::foreign_from",
10
+ "file": "crates/router/src/core/payments/transformers.rs",
11
+ "kind": "function_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n Self {\n id: pi.id.clone(),\n merchant_id: pi.merchant_id.clone(),\n profile_id: pi.profile_id.clone(),\n customer_id: pi.customer_id.clone(),\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id.clone(),\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata.clone(),\n description: pi\n .description\n .as_ref()\n .map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url.clone(),\n statement_descriptor: pi.statement_descriptor.clone(),\n allowed_payment_method_types: pi.allowed_payment_method_types.clone(),\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment: pi.is_split_payment(),\n }\n }",
16
+ "after_code": "fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n let is_split_payment = pi.is_split_payment();\n Self {\n id: pi.id,\n merchant_id: pi.merchant_id,\n profile_id: pi.profile_id,\n customer_id: pi.customer_id,\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id,\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata,\n description: pi.description.map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url,\n statement_descriptor: pi.statement_descriptor,\n allowed_payment_method_types: pi.allowed_payment_method_types,\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment,\n }\n }",
17
+ "diff_span": {
18
+ "before": "fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n Self {\n id: pi.id.clone(),\n merchant_id: pi.merchant_id.clone(),\n profile_id: pi.profile_id.clone(),\n customer_id: pi.customer_id.clone(),\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id.clone(),\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata.clone(),\n description: pi\n .description\n .as_ref()\n .map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url.clone(),\n statement_descriptor: pi.statement_descriptor.clone(),\n allowed_payment_method_types: pi.allowed_payment_method_types.clone(),\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment: pi.is_split_payment(),\n }\n }",
19
+ "after": "fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n let is_split_payment = pi.is_split_payment();\n Self {\n id: pi.id,\n merchant_id: pi.merchant_id,\n profile_id: pi.profile_id,\n customer_id: pi.customer_id,\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id,\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata,\n description: pi.description.map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url,\n statement_descriptor: pi.statement_descriptor,\n allowed_payment_method_types: pi.allowed_payment_method_types,\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment,\n }\n }"
20
+ },
21
+ "commit_sha": "80eee7f8e01e84055660b63dcefbdcc46bf08292"
22
+ },
23
+ {
24
+ "id": "crates/router/src/core/payments/transformers.rs::impl::api_models::payments::PaymentsListResponseItem",
25
+ "file": "crates/router/src/core/payments/transformers.rs",
26
+ "kind": "impl_item",
27
+ "status": "modified",
28
+ "code_changed": true,
29
+ "imports_changed": false,
30
+ "before_code": "impl ForeignFrom<(storage::PaymentIntent, Option<storage::PaymentAttempt>)>\n for api_models::payments::PaymentsListResponseItem\n{\n fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n Self {\n id: pi.id.clone(),\n merchant_id: pi.merchant_id.clone(),\n profile_id: pi.profile_id.clone(),\n customer_id: pi.customer_id.clone(),\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id.clone(),\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata.clone(),\n description: pi\n .description\n .as_ref()\n .map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url.clone(),\n statement_descriptor: pi.statement_descriptor.clone(),\n allowed_payment_method_types: pi.allowed_payment_method_types.clone(),\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment: pi.is_split_payment(),\n }\n }\n}",
31
+ "after_code": "impl ForeignFrom<(storage::PaymentIntent, Option<storage::PaymentAttempt>)>\n for api_models::payments::PaymentsListResponseItem\n{\n fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n let is_split_payment = pi.is_split_payment();\n Self {\n id: pi.id,\n merchant_id: pi.merchant_id,\n profile_id: pi.profile_id,\n customer_id: pi.customer_id,\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id,\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata,\n description: pi.description.map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url,\n statement_descriptor: pi.statement_descriptor,\n allowed_payment_method_types: pi.allowed_payment_method_types,\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment,\n }\n }\n}",
32
+ "diff_span": {
33
+ "before": " fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n Self {\n id: pi.id.clone(),\n merchant_id: pi.merchant_id.clone(),\n profile_id: pi.profile_id.clone(),\n customer_id: pi.customer_id.clone(),\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id.clone(),\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata.clone(),\n description: pi\n .description\n .as_ref()\n .map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url.clone(),\n statement_descriptor: pi.statement_descriptor.clone(),\n allowed_payment_method_types: pi.allowed_payment_method_types.clone(),\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment: pi.is_split_payment(),\n }\n }",
34
+ "after": "{\n fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n let is_split_payment = pi.is_split_payment();\n Self {\n id: pi.id,\n merchant_id: pi.merchant_id,\n profile_id: pi.profile_id,\n customer_id: pi.customer_id,\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id,\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata,\n description: pi.description.map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url,\n statement_descriptor: pi.statement_descriptor,\n allowed_payment_method_types: pi.allowed_payment_method_types,\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment,\n }\n }"
35
+ },
36
+ "commit_sha": "80eee7f8e01e84055660b63dcefbdcc46bf08292"
37
+ }
38
+ ]
39
+ }
diffs/pr_10140/a4ae47a/diff.json ADDED
@@ -0,0 +1,55 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "a4ae47af302147a2736ea576260cabe074b149ca",
3
+ "pr_number": 10140,
4
+ "rust_files": [
5
+ "crates/api_models/src/payments.rs",
6
+ "crates/router/src/core/payments/transformers.rs"
7
+ ],
8
+ "diffs": [
9
+ {
10
+ "id": "crates/api_models/src/payments.rs::struct::PaymentsListResponseItem",
11
+ "file": "crates/api_models/src/payments.rs",
12
+ "kind": "struct_item",
13
+ "status": "modified",
14
+ "code_changed": true,
15
+ "imports_changed": false,
16
+ "before_code": "pub struct PaymentsListResponseItem {\n /// Unique identifier for the payment\n #[schema(\n min_length = 32,\n max_length = 64,\n example = \"12345_pay_01926c58bc6e77c09e809964e72af8c8\",\n value_type = String,\n )]\n pub id: id_type::GlobalPaymentId,\n\n /// This is an identifier for the merchant account. This is inferred from the API key\n /// provided during the request\n #[schema(max_length = 255, example = \"merchant_1668273825\", value_type = String)]\n pub merchant_id: id_type::MerchantId,\n\n /// The business profile that is associated with this payment\n #[schema(value_type = String)]\n pub profile_id: id_type::ProfileId,\n\n /// The identifier for the customer\n #[schema(\n min_length = 32,\n max_length = 64,\n example = \"12345_cus_01926c58bc6e77c09e809964e72af8c8\",\n value_type = Option<String>\n )]\n pub customer_id: Option<id_type::GlobalCustomerId>,\n\n /// Identifier for Payment Method used for the payment\n #[schema(value_type = Option<String>)]\n pub payment_method_id: Option<id_type::GlobalPaymentMethodId>,\n\n /// Status of the payment\n #[schema(value_type = IntentStatus, example = \"failed\", default = \"requires_confirmation\")]\n pub status: api_enums::IntentStatus,\n\n /// Amount related information for this payment and attempt\n pub amount: PaymentAmountDetailsResponse,\n\n /// Time when the payment was created\n #[schema(example = \"2022-09-10T10:11:12Z\")]\n #[serde(with = \"common_utils::custom_serde::iso8601\")]\n pub created: PrimitiveDateTime,\n\n /// The payment method type for this payment attempt\n #[schema(value_type = Option<PaymentMethod>, example = \"wallet\")]\n pub payment_method_type: Option<api_enums::PaymentMethod>,\n\n #[schema(value_type = Option<PaymentMethodType>, example = \"apple_pay\")]\n pub payment_method_subtype: Option<api_enums::PaymentMethodType>,\n\n /// The connector used for the payment\n #[schema(value_type = Option<Connector>, example = \"stripe\")]\n pub connector: Option<String>,\n\n /// Identifier of the connector ( merchant connector account ) which was chosen to make the payment\n #[schema(value_type = Option<String>)]\n pub merchant_connector_id: Option<id_type::MerchantConnectorAccountId>,\n\n /// Details of the customer\n pub customer: Option<CustomerDetailsResponse>,\n\n /// The reference id for the order in the merchant's system. This value can be passed by the merchant.\n #[schema(value_type = Option<String>)]\n pub merchant_reference_id: Option<id_type::PaymentReferenceId>,\n\n /// A unique identifier for a payment provided by the connector\n #[schema(value_type = Option<String>, example = \"993672945374576J\")]\n pub connector_payment_id: Option<String>,\n\n /// Reference to the capture at connector side\n pub connector_response_reference_id: Option<String>,\n\n /// Metadata is useful for storing additional, unstructured information on an object.\n #[schema(value_type = Option<Object>, example = r#\"{ \"udf1\": \"some-value\", \"udf2\": \"some-value\" }\"#)]\n pub metadata: Option<Secret<serde_json::Value>>,\n\n /// A description of the payment\n #[schema(example = \"It's my first payment request\")]\n pub description: Option<String>,\n\n /// The transaction authentication can be set to undergo payer authentication. By default, the authentication will be marked as NO_THREE_DS\n #[schema(value_type = Option<AuthenticationType>, example = \"no_three_ds\", default = \"three_ds\")]\n pub authentication_type: Option<api_enums::AuthenticationType>,\n\n /// This is the instruction for capture/ debit the money from the users' card. On the other hand authorization refers to blocking the amount on the users' payment method.\n #[schema(value_type = Option<CaptureMethod>, example = \"automatic\")]\n pub capture_method: Option<api_enums::CaptureMethod>,\n\n /// Indicates that you intend to make future payments with this Payment\u2019s payment method. Providing this parameter will attach the payment method to the Customer, if present, after the Payment is confirmed and any required actions from the user are complete.\n #[schema(value_type = Option<FutureUsage>, example = \"off_session\")]\n pub setup_future_usage: Option<api_enums::FutureUsage>,\n\n /// Total number of attempts associated with this payment\n pub attempt_count: i16,\n\n /// Error details for the payment if any\n pub error: Option<ErrorDetails>,\n\n /// If the payment was cancelled the reason will be provided here\n pub cancellation_reason: Option<String>,\n\n /// Information about the product , quantity and amount for connectors. (e.g. Klarna)\n #[schema(value_type = Option<Vec<OrderDetailsWithAmount>>, example = r#\"[{\n \"product_name\": \"gillete creme\",\n \"quantity\": 15,\n \"amount\" : 900\n }]\"#)]\n pub order_details: Option<Vec<Secret<OrderDetailsWithAmount>>>,\n\n /// The URL to redirect after the completion of the operation\n #[schema(value_type = String, example = \"https://hyperswitch.io\")]\n pub return_url: Option<common_utils::types::Url>,\n\n /// For non-card charges, you can use this value as the complete description that appears on your customers\u2019 statements. Must contain at least one letter, maximum 22 characters.\n #[schema(value_type = Option<String>, max_length = 255, example = \"Hyperswitch Router\")]\n pub statement_descriptor: Option<common_utils::types::StatementDescriptor>,\n\n /// Allowed Payment Method Types for a given PaymentIntent\n #[schema(value_type = Option<Vec<PaymentMethodType>>)]\n pub allowed_payment_method_types: Option<Vec<common_enums::PaymentMethodType>>,\n\n /// Total number of authorizations happened in an incremental_authorization payment\n pub authorization_count: Option<i32>,\n\n /// Date time at which payment was updated\n #[schema(example = \"2022-09-10T10:11:12Z\")]\n #[serde(default, with = \"common_utils::custom_serde::iso8601::option\")]\n pub modified_at: Option<PrimitiveDateTime>,\n}",
17
+ "after_code": "pub struct PaymentsListResponseItem {\n /// Unique identifier for the payment\n #[schema(\n min_length = 32,\n max_length = 64,\n example = \"12345_pay_01926c58bc6e77c09e809964e72af8c8\",\n value_type = String,\n )]\n pub id: id_type::GlobalPaymentId,\n\n /// This is an identifier for the merchant account. This is inferred from the API key\n /// provided during the request\n #[schema(max_length = 255, example = \"merchant_1668273825\", value_type = String)]\n pub merchant_id: id_type::MerchantId,\n\n /// The business profile that is associated with this payment\n #[schema(value_type = String)]\n pub profile_id: id_type::ProfileId,\n\n /// The identifier for the customer\n #[schema(\n min_length = 32,\n max_length = 64,\n example = \"12345_cus_01926c58bc6e77c09e809964e72af8c8\",\n value_type = Option<String>\n )]\n pub customer_id: Option<id_type::GlobalCustomerId>,\n\n /// Identifier for Payment Method used for the payment\n #[schema(value_type = Option<String>)]\n pub payment_method_id: Option<id_type::GlobalPaymentMethodId>,\n\n /// Status of the payment\n #[schema(value_type = IntentStatus, example = \"failed\", default = \"requires_confirmation\")]\n pub status: api_enums::IntentStatus,\n\n /// Amount related information for this payment and attempt\n pub amount: PaymentAmountDetailsResponse,\n\n /// Time when the payment was created\n #[schema(example = \"2022-09-10T10:11:12Z\")]\n #[serde(with = \"common_utils::custom_serde::iso8601\")]\n pub created: PrimitiveDateTime,\n\n /// The payment method type for this payment attempt\n #[schema(value_type = Option<PaymentMethod>, example = \"wallet\")]\n pub payment_method_type: Option<api_enums::PaymentMethod>,\n\n #[schema(value_type = Option<PaymentMethodType>, example = \"apple_pay\")]\n pub payment_method_subtype: Option<api_enums::PaymentMethodType>,\n\n /// The connector used for the payment\n #[schema(value_type = Option<Connector>, example = \"stripe\")]\n pub connector: Option<String>,\n\n /// Identifier of the connector ( merchant connector account ) which was chosen to make the payment\n #[schema(value_type = Option<String>)]\n pub merchant_connector_id: Option<id_type::MerchantConnectorAccountId>,\n\n /// Details of the customer\n pub customer: Option<CustomerDetailsResponse>,\n\n /// The reference id for the order in the merchant's system. This value can be passed by the merchant.\n #[schema(value_type = Option<String>)]\n pub merchant_reference_id: Option<id_type::PaymentReferenceId>,\n\n /// A unique identifier for a payment provided by the connector\n #[schema(value_type = Option<String>, example = \"993672945374576J\")]\n pub connector_payment_id: Option<String>,\n\n /// Reference to the capture at connector side\n pub connector_response_reference_id: Option<String>,\n\n /// Metadata is useful for storing additional, unstructured information on an object.\n #[schema(value_type = Option<Object>, example = r#\"{ \"udf1\": \"some-value\", \"udf2\": \"some-value\" }\"#)]\n pub metadata: Option<Secret<serde_json::Value>>,\n\n /// A description of the payment\n #[schema(example = \"It's my first payment request\")]\n pub description: Option<String>,\n\n /// The transaction authentication can be set to undergo payer authentication. By default, the authentication will be marked as NO_THREE_DS\n #[schema(value_type = Option<AuthenticationType>, example = \"no_three_ds\", default = \"three_ds\")]\n pub authentication_type: Option<api_enums::AuthenticationType>,\n\n /// This is the instruction for capture/ debit the money from the users' card. On the other hand authorization refers to blocking the amount on the users' payment method.\n #[schema(value_type = Option<CaptureMethod>, example = \"automatic\")]\n pub capture_method: Option<api_enums::CaptureMethod>,\n\n /// Indicates that you intend to make future payments with this Payment\u2019s payment method. Providing this parameter will attach the payment method to the Customer, if present, after the Payment is confirmed and any required actions from the user are complete.\n #[schema(value_type = Option<FutureUsage>, example = \"off_session\")]\n pub setup_future_usage: Option<api_enums::FutureUsage>,\n\n /// Total number of attempts associated with this payment\n pub attempt_count: i16,\n\n /// Error details for the payment if any\n pub error: Option<ErrorDetails>,\n\n /// If the payment was cancelled the reason will be provided here\n pub cancellation_reason: Option<String>,\n\n /// Information about the product , quantity and amount for connectors. (e.g. Klarna)\n #[schema(value_type = Option<Vec<OrderDetailsWithAmount>>, example = r#\"[{\n \"product_name\": \"gillete creme\",\n \"quantity\": 15,\n \"amount\" : 900\n }]\"#)]\n pub order_details: Option<Vec<Secret<OrderDetailsWithAmount>>>,\n\n /// The URL to redirect after the completion of the operation\n #[schema(value_type = String, example = \"https://hyperswitch.io\")]\n pub return_url: Option<common_utils::types::Url>,\n\n /// For non-card charges, you can use this value as the complete description that appears on your customers\u2019 statements. Must contain at least one letter, maximum 22 characters.\n #[schema(value_type = Option<String>, max_length = 255, example = \"Hyperswitch Router\")]\n pub statement_descriptor: Option<common_utils::types::StatementDescriptor>,\n\n /// Allowed Payment Method Types for a given PaymentIntent\n #[schema(value_type = Option<Vec<PaymentMethodType>>)]\n pub allowed_payment_method_types: Option<Vec<common_enums::PaymentMethodType>>,\n\n /// Total number of authorizations happened in an incremental_authorization payment\n pub authorization_count: Option<i32>,\n\n /// Date time at which payment was updated\n #[schema(example = \"2022-09-10T10:11:12Z\")]\n #[serde(default, with = \"common_utils::custom_serde::iso8601::option\")]\n pub modified_at: Option<PrimitiveDateTime>,\n\n /// Indicates if the payment amount is split across multiple payment methods\n pub is_split_payment: bool,\n}",
18
+ "diff_span": {
19
+ "before": "",
20
+ "after": " #[serde(default, with = \"common_utils::custom_serde::iso8601::option\")]\n pub modified_at: Option<PrimitiveDateTime>,\n\n /// Indicates if the payment amount is split across multiple payment methods\n pub is_split_payment: bool,\n}"
21
+ },
22
+ "commit_sha": "a4ae47af302147a2736ea576260cabe074b149ca"
23
+ },
24
+ {
25
+ "id": "crates/router/src/core/payments/transformers.rs::api_models::payments::PaymentsListResponseItem::function::foreign_from",
26
+ "file": "crates/router/src/core/payments/transformers.rs",
27
+ "kind": "function_item",
28
+ "status": "modified",
29
+ "code_changed": true,
30
+ "imports_changed": false,
31
+ "before_code": "fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n Self {\n id: pi.id,\n merchant_id: pi.merchant_id,\n profile_id: pi.profile_id,\n customer_id: pi.customer_id,\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id,\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata,\n description: pi.description.map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url,\n statement_descriptor: pi.statement_descriptor,\n allowed_payment_method_types: pi.allowed_payment_method_types,\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n }\n }",
32
+ "after_code": "fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n Self {\n id: pi.id,\n merchant_id: pi.merchant_id,\n profile_id: pi.profile_id,\n customer_id: pi.customer_id,\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id,\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata,\n description: pi.description.map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url,\n statement_descriptor: pi.statement_descriptor,\n allowed_payment_method_types: pi.allowed_payment_method_types,\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment: pi.split_txns_enabled == enums::SplitTxnsEnabled::Enable\n && pi.active_attempt_id_type == enums::ActiveAttemptIDType::AttemptsGroupID,\n }\n }",
33
+ "diff_span": {
34
+ "before": "",
35
+ "after": " authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment: pi.split_txns_enabled == enums::SplitTxnsEnabled::Enable\n && pi.active_attempt_id_type == enums::ActiveAttemptIDType::AttemptsGroupID,\n }\n }"
36
+ },
37
+ "commit_sha": "a4ae47af302147a2736ea576260cabe074b149ca"
38
+ },
39
+ {
40
+ "id": "crates/router/src/core/payments/transformers.rs::impl::api_models::payments::PaymentsListResponseItem",
41
+ "file": "crates/router/src/core/payments/transformers.rs",
42
+ "kind": "impl_item",
43
+ "status": "modified",
44
+ "code_changed": true,
45
+ "imports_changed": false,
46
+ "before_code": "impl ForeignFrom<(storage::PaymentIntent, Option<storage::PaymentAttempt>)>\n for api_models::payments::PaymentsListResponseItem\n{\n fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n Self {\n id: pi.id,\n merchant_id: pi.merchant_id,\n profile_id: pi.profile_id,\n customer_id: pi.customer_id,\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id,\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata,\n description: pi.description.map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url,\n statement_descriptor: pi.statement_descriptor,\n allowed_payment_method_types: pi.allowed_payment_method_types,\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n }\n }\n}",
47
+ "after_code": "impl ForeignFrom<(storage::PaymentIntent, Option<storage::PaymentAttempt>)>\n for api_models::payments::PaymentsListResponseItem\n{\n fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n Self {\n id: pi.id,\n merchant_id: pi.merchant_id,\n profile_id: pi.profile_id,\n customer_id: pi.customer_id,\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id,\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata,\n description: pi.description.map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url,\n statement_descriptor: pi.statement_descriptor,\n allowed_payment_method_types: pi.allowed_payment_method_types,\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment: pi.split_txns_enabled == enums::SplitTxnsEnabled::Enable\n && pi.active_attempt_id_type == enums::ActiveAttemptIDType::AttemptsGroupID,\n }\n }\n}",
48
+ "diff_span": {
49
+ "before": "",
50
+ "after": " authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment: pi.split_txns_enabled == enums::SplitTxnsEnabled::Enable\n && pi.active_attempt_id_type == enums::ActiveAttemptIDType::AttemptsGroupID,\n }\n }"
51
+ },
52
+ "commit_sha": "a4ae47af302147a2736ea576260cabe074b149ca"
53
+ }
54
+ ]
55
+ }
diffs/pr_10140/eea5e7e/diff.json ADDED
@@ -0,0 +1,65 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "eea5e7e8593b45cf962d5a2d7bd67a0dfed3aa1d",
3
+ "pr_number": 10140,
4
+ "rust_files": [
5
+ "crates/hyperswitch_domain_models/src/payments.rs",
6
+ "crates/router/src/core/payments/transformers.rs"
7
+ ],
8
+ "diffs": [
9
+ {
10
+ "id": "crates/hyperswitch_domain_models/src/payments.rs::impl::PaymentIntent",
11
+ "file": "crates/hyperswitch_domain_models/src/payments.rs",
12
+ "kind": "impl_item",
13
+ "status": "modified",
14
+ "code_changed": true,
15
+ "imports_changed": false,
16
+ "before_code": "impl PaymentIntent {\n /// Extract customer_id from payment intent feature metadata\n pub fn extract_connector_customer_id_from_payment_intent(\n &self,\n ) -> Result<String, common_utils::errors::ValidationError> {\n self.feature_metadata\n .as_ref()\n .and_then(|metadata| metadata.payment_revenue_recovery_metadata.as_ref())\n .map(|recovery| {\n recovery\n .billing_connector_payment_details\n .connector_customer_id\n .clone()\n })\n .ok_or(\n common_utils::errors::ValidationError::MissingRequiredField {\n field_name: \"connector_customer_id\".to_string(),\n },\n )\n }\n\n fn get_payment_method_sub_type(&self) -> Option<common_enums::PaymentMethodType> {\n self.feature_metadata\n .as_ref()\n .and_then(|metadata| metadata.get_payment_method_sub_type())\n }\n\n fn get_payment_method_type(&self) -> Option<common_enums::PaymentMethod> {\n self.feature_metadata\n .as_ref()\n .and_then(|metadata| metadata.get_payment_method_type())\n }\n\n pub fn get_connector_customer_id_from_feature_metadata(&self) -> Option<String> {\n self.feature_metadata\n .as_ref()\n .and_then(|metadata| metadata.payment_revenue_recovery_metadata.as_ref())\n .map(|recovery_metadata| {\n recovery_metadata\n .billing_connector_payment_details\n .connector_customer_id\n .clone()\n })\n }\n\n pub fn get_billing_merchant_connector_account_id(\n &self,\n ) -> Option<id_type::MerchantConnectorAccountId> {\n self.feature_metadata.as_ref().and_then(|feature_metadata| {\n feature_metadata.get_billing_merchant_connector_account_id()\n })\n }\n\n fn get_request_incremental_authorization_value(\n request: &api_models::payments::PaymentsCreateIntentRequest,\n ) -> CustomResult<\n common_enums::RequestIncrementalAuthorization,\n errors::api_error_response::ApiErrorResponse,\n > {\n request.request_incremental_authorization\n .map(|request_incremental_authorization| {\n if request_incremental_authorization == common_enums::RequestIncrementalAuthorization::True {\n if request.capture_method == Some(common_enums::CaptureMethod::Automatic) {\n Err(errors::api_error_response::ApiErrorResponse::InvalidRequestData { message: \"incremental authorization is not supported when capture_method is automatic\".to_owned() })?\n }\n Ok(common_enums::RequestIncrementalAuthorization::True)\n } else {\n Ok(common_enums::RequestIncrementalAuthorization::False)\n }\n })\n .unwrap_or(Ok(common_enums::RequestIncrementalAuthorization::default()))\n }\n\n pub async fn create_domain_model_from_request(\n payment_id: &id_type::GlobalPaymentId,\n merchant_context: &merchant_context::MerchantContext,\n profile: &business_profile::Profile,\n request: api_models::payments::PaymentsCreateIntentRequest,\n decrypted_payment_intent: DecryptedPaymentIntent,\n ) -> CustomResult<Self, errors::api_error_response::ApiErrorResponse> {\n let request_incremental_authorization =\n Self::get_request_incremental_authorization_value(&request)?;\n let allowed_payment_method_types = request.allowed_payment_method_types;\n\n let session_expiry =\n common_utils::date_time::now().saturating_add(time::Duration::seconds(\n request.session_expiry.map(i64::from).unwrap_or(\n profile\n .session_expiry\n .unwrap_or(common_utils::consts::DEFAULT_SESSION_EXPIRY),\n ),\n ));\n let order_details = request.order_details.map(|order_details| {\n order_details\n .into_iter()\n .map(|order_detail| Secret::new(OrderDetailsWithAmount::convert_from(order_detail)))\n .collect()\n });\n\n Ok(Self {\n id: payment_id.clone(),\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n // Intent status would be RequiresPaymentMethod because we are creating a new payment intent\n status: common_enums::IntentStatus::RequiresPaymentMethod,\n amount_details: AmountDetails::from(request.amount_details),\n amount_captured: None,\n customer_id: request.customer_id,\n description: request.description,\n return_url: request.return_url,\n metadata: request.metadata,\n statement_descriptor: request.statement_descriptor,\n created_at: common_utils::date_time::now(),\n modified_at: common_utils::date_time::now(),\n last_synced: None,\n setup_future_usage: request.setup_future_usage.unwrap_or_default(),\n active_attempt_id: None,\n active_attempt_id_type: common_enums::ActiveAttemptIDType::AttemptID,\n active_attempts_group_id: None,\n order_details,\n allowed_payment_method_types,\n connector_metadata: request.connector_metadata,\n feature_metadata: request.feature_metadata.map(FeatureMetadata::convert_from),\n // Attempt count is 0 in create intent as no attempt is made yet\n attempt_count: 0,\n profile_id: profile.get_id().clone(),\n payment_link_id: None,\n frm_merchant_decision: None,\n updated_by: merchant_context\n .get_merchant_account()\n .storage_scheme\n .to_string(),\n request_incremental_authorization,\n // Authorization count is 0 in create intent as no authorization is made yet\n authorization_count: Some(0),\n session_expiry,\n request_external_three_ds_authentication: request\n .request_external_three_ds_authentication\n .unwrap_or_default(),\n split_txns_enabled: profile.split_txns_enabled,\n frm_metadata: request.frm_metadata,\n customer_details: None,\n merchant_reference_id: request.merchant_reference_id,\n billing_address: decrypted_payment_intent\n .billing_address\n .as_ref()\n .map(|data| {\n data.clone()\n .deserialize_inner_value(|value| value.parse_value(\"Address\"))\n })\n .transpose()\n .change_context(errors::api_error_response::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to decode billing address\")?,\n shipping_address: decrypted_payment_intent\n .shipping_address\n .as_ref()\n .map(|data| {\n data.clone()\n .deserialize_inner_value(|value| value.parse_value(\"Address\"))\n })\n .transpose()\n .change_context(errors::api_error_response::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to decode shipping address\")?,\n capture_method: request.capture_method.unwrap_or_default(),\n authentication_type: request.authentication_type,\n prerouting_algorithm: None,\n organization_id: merchant_context\n .get_merchant_account()\n .organization_id\n .clone(),\n enable_payment_link: request.payment_link_enabled.unwrap_or_default(),\n apply_mit_exemption: request.apply_mit_exemption.unwrap_or_default(),\n customer_present: request.customer_present.unwrap_or_default(),\n payment_link_config: request\n .payment_link_config\n .map(ApiModelToDieselModelConvertor::convert_from),\n routing_algorithm_id: request.routing_algorithm_id,\n split_payments: None,\n force_3ds_challenge: None,\n force_3ds_challenge_trigger: None,\n processor_merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n created_by: None,\n is_iframe_redirection_enabled: None,\n is_payment_id_from_merchant: None,\n enable_partial_authorization: request.enable_partial_authorization,\n })\n }\n\n pub fn get_revenue_recovery_metadata(\n &self,\n ) -> Option<diesel_models::types::PaymentRevenueRecoveryMetadata> {\n self.feature_metadata\n .as_ref()\n .and_then(|feature_metadata| feature_metadata.payment_revenue_recovery_metadata.clone())\n }\n\n pub fn get_feature_metadata(&self) -> Option<FeatureMetadata> {\n self.feature_metadata.clone()\n }\n\n pub fn create_revenue_recovery_attempt_data(\n &self,\n revenue_recovery_metadata: api_models::payments::PaymentRevenueRecoveryMetadata,\n billing_connector_account: &merchant_connector_account::MerchantConnectorAccount,\n card_info: api_models::payments::AdditionalCardInfo,\n payment_processor_token: &str,\n ) -> CustomResult<\n revenue_recovery::RevenueRecoveryAttemptData,\n errors::api_error_response::ApiErrorResponse,\n > {\n let merchant_reference_id = self.merchant_reference_id.clone().ok_or_else(|| {\n error_stack::report!(\n errors::api_error_response::ApiErrorResponse::GenericNotFoundError {\n message: \"mandate reference id not found\".to_string()\n }\n )\n })?;\n\n let connector_account_reference_id = billing_connector_account\n .get_account_reference_id_using_payment_merchant_connector_account_id(\n revenue_recovery_metadata.active_attempt_payment_connector_id,\n )\n .ok_or_else(|| {\n error_stack::report!(\n errors::api_error_response::ApiErrorResponse::GenericNotFoundError {\n message: \"connector account reference id not found\".to_string()\n }\n )\n })?;\n\n Ok(revenue_recovery::RevenueRecoveryAttemptData {\n amount: self.amount_details.order_amount,\n currency: self.amount_details.currency,\n merchant_reference_id,\n connector_transaction_id: None, // No connector id\n error_code: None,\n error_message: None,\n processor_payment_method_token: payment_processor_token.to_string(),\n connector_customer_id: revenue_recovery_metadata\n .billing_connector_payment_details\n .connector_customer_id,\n connector_account_reference_id,\n transaction_created_at: None, // would unwrap_or as now\n status: common_enums::AttemptStatus::Started,\n payment_method_type: self\n .get_payment_method_type()\n .unwrap_or(revenue_recovery_metadata.payment_method_type),\n payment_method_sub_type: self\n .get_payment_method_sub_type()\n .unwrap_or(revenue_recovery_metadata.payment_method_subtype),\n network_advice_code: None,\n network_decline_code: None,\n network_error_message: None,\n retry_count: None,\n invoice_next_billing_time: None,\n invoice_billing_started_at_time: None,\n // No charge id is present here since it is an internal payment and we didn't call connector yet.\n charge_id: None,\n card_info: card_info.clone(),\n })\n }\n\n pub fn get_optional_customer_id(\n &self,\n ) -> CustomResult<Option<id_type::CustomerId>, common_utils::errors::ValidationError> {\n self.customer_id\n .as_ref()\n .map(|customer_id| id_type::CustomerId::try_from(customer_id.clone()))\n .transpose()\n }\n\n pub fn get_currency(&self) -> storage_enums::Currency {\n self.amount_details.currency\n }\n}",
17
+ "after_code": "impl PaymentIntent {\n /// Extract customer_id from payment intent feature metadata\n pub fn extract_connector_customer_id_from_payment_intent(\n &self,\n ) -> Result<String, common_utils::errors::ValidationError> {\n self.feature_metadata\n .as_ref()\n .and_then(|metadata| metadata.payment_revenue_recovery_metadata.as_ref())\n .map(|recovery| {\n recovery\n .billing_connector_payment_details\n .connector_customer_id\n .clone()\n })\n .ok_or(\n common_utils::errors::ValidationError::MissingRequiredField {\n field_name: \"connector_customer_id\".to_string(),\n },\n )\n }\n\n fn get_payment_method_sub_type(&self) -> Option<common_enums::PaymentMethodType> {\n self.feature_metadata\n .as_ref()\n .and_then(|metadata| metadata.get_payment_method_sub_type())\n }\n\n fn get_payment_method_type(&self) -> Option<common_enums::PaymentMethod> {\n self.feature_metadata\n .as_ref()\n .and_then(|metadata| metadata.get_payment_method_type())\n }\n\n pub fn get_connector_customer_id_from_feature_metadata(&self) -> Option<String> {\n self.feature_metadata\n .as_ref()\n .and_then(|metadata| metadata.payment_revenue_recovery_metadata.as_ref())\n .map(|recovery_metadata| {\n recovery_metadata\n .billing_connector_payment_details\n .connector_customer_id\n .clone()\n })\n }\n\n pub fn get_billing_merchant_connector_account_id(\n &self,\n ) -> Option<id_type::MerchantConnectorAccountId> {\n self.feature_metadata.as_ref().and_then(|feature_metadata| {\n feature_metadata.get_billing_merchant_connector_account_id()\n })\n }\n\n fn get_request_incremental_authorization_value(\n request: &api_models::payments::PaymentsCreateIntentRequest,\n ) -> CustomResult<\n common_enums::RequestIncrementalAuthorization,\n errors::api_error_response::ApiErrorResponse,\n > {\n request.request_incremental_authorization\n .map(|request_incremental_authorization| {\n if request_incremental_authorization == common_enums::RequestIncrementalAuthorization::True {\n if request.capture_method == Some(common_enums::CaptureMethod::Automatic) {\n Err(errors::api_error_response::ApiErrorResponse::InvalidRequestData { message: \"incremental authorization is not supported when capture_method is automatic\".to_owned() })?\n }\n Ok(common_enums::RequestIncrementalAuthorization::True)\n } else {\n Ok(common_enums::RequestIncrementalAuthorization::False)\n }\n })\n .unwrap_or(Ok(common_enums::RequestIncrementalAuthorization::default()))\n }\n\n pub async fn create_domain_model_from_request(\n payment_id: &id_type::GlobalPaymentId,\n merchant_context: &merchant_context::MerchantContext,\n profile: &business_profile::Profile,\n request: api_models::payments::PaymentsCreateIntentRequest,\n decrypted_payment_intent: DecryptedPaymentIntent,\n ) -> CustomResult<Self, errors::api_error_response::ApiErrorResponse> {\n let request_incremental_authorization =\n Self::get_request_incremental_authorization_value(&request)?;\n let allowed_payment_method_types = request.allowed_payment_method_types;\n\n let session_expiry =\n common_utils::date_time::now().saturating_add(time::Duration::seconds(\n request.session_expiry.map(i64::from).unwrap_or(\n profile\n .session_expiry\n .unwrap_or(common_utils::consts::DEFAULT_SESSION_EXPIRY),\n ),\n ));\n let order_details = request.order_details.map(|order_details| {\n order_details\n .into_iter()\n .map(|order_detail| Secret::new(OrderDetailsWithAmount::convert_from(order_detail)))\n .collect()\n });\n\n Ok(Self {\n id: payment_id.clone(),\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n // Intent status would be RequiresPaymentMethod because we are creating a new payment intent\n status: common_enums::IntentStatus::RequiresPaymentMethod,\n amount_details: AmountDetails::from(request.amount_details),\n amount_captured: None,\n customer_id: request.customer_id,\n description: request.description,\n return_url: request.return_url,\n metadata: request.metadata,\n statement_descriptor: request.statement_descriptor,\n created_at: common_utils::date_time::now(),\n modified_at: common_utils::date_time::now(),\n last_synced: None,\n setup_future_usage: request.setup_future_usage.unwrap_or_default(),\n active_attempt_id: None,\n active_attempt_id_type: common_enums::ActiveAttemptIDType::AttemptID,\n active_attempts_group_id: None,\n order_details,\n allowed_payment_method_types,\n connector_metadata: request.connector_metadata,\n feature_metadata: request.feature_metadata.map(FeatureMetadata::convert_from),\n // Attempt count is 0 in create intent as no attempt is made yet\n attempt_count: 0,\n profile_id: profile.get_id().clone(),\n payment_link_id: None,\n frm_merchant_decision: None,\n updated_by: merchant_context\n .get_merchant_account()\n .storage_scheme\n .to_string(),\n request_incremental_authorization,\n // Authorization count is 0 in create intent as no authorization is made yet\n authorization_count: Some(0),\n session_expiry,\n request_external_three_ds_authentication: request\n .request_external_three_ds_authentication\n .unwrap_or_default(),\n split_txns_enabled: profile.split_txns_enabled,\n frm_metadata: request.frm_metadata,\n customer_details: None,\n merchant_reference_id: request.merchant_reference_id,\n billing_address: decrypted_payment_intent\n .billing_address\n .as_ref()\n .map(|data| {\n data.clone()\n .deserialize_inner_value(|value| value.parse_value(\"Address\"))\n })\n .transpose()\n .change_context(errors::api_error_response::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to decode billing address\")?,\n shipping_address: decrypted_payment_intent\n .shipping_address\n .as_ref()\n .map(|data| {\n data.clone()\n .deserialize_inner_value(|value| value.parse_value(\"Address\"))\n })\n .transpose()\n .change_context(errors::api_error_response::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to decode shipping address\")?,\n capture_method: request.capture_method.unwrap_or_default(),\n authentication_type: request.authentication_type,\n prerouting_algorithm: None,\n organization_id: merchant_context\n .get_merchant_account()\n .organization_id\n .clone(),\n enable_payment_link: request.payment_link_enabled.unwrap_or_default(),\n apply_mit_exemption: request.apply_mit_exemption.unwrap_or_default(),\n customer_present: request.customer_present.unwrap_or_default(),\n payment_link_config: request\n .payment_link_config\n .map(ApiModelToDieselModelConvertor::convert_from),\n routing_algorithm_id: request.routing_algorithm_id,\n split_payments: None,\n force_3ds_challenge: None,\n force_3ds_challenge_trigger: None,\n processor_merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n created_by: None,\n is_iframe_redirection_enabled: None,\n is_payment_id_from_merchant: None,\n enable_partial_authorization: request.enable_partial_authorization,\n })\n }\n\n pub fn get_revenue_recovery_metadata(\n &self,\n ) -> Option<diesel_models::types::PaymentRevenueRecoveryMetadata> {\n self.feature_metadata\n .as_ref()\n .and_then(|feature_metadata| feature_metadata.payment_revenue_recovery_metadata.clone())\n }\n\n pub fn get_feature_metadata(&self) -> Option<FeatureMetadata> {\n self.feature_metadata.clone()\n }\n\n pub fn create_revenue_recovery_attempt_data(\n &self,\n revenue_recovery_metadata: api_models::payments::PaymentRevenueRecoveryMetadata,\n billing_connector_account: &merchant_connector_account::MerchantConnectorAccount,\n card_info: api_models::payments::AdditionalCardInfo,\n payment_processor_token: &str,\n ) -> CustomResult<\n revenue_recovery::RevenueRecoveryAttemptData,\n errors::api_error_response::ApiErrorResponse,\n > {\n let merchant_reference_id = self.merchant_reference_id.clone().ok_or_else(|| {\n error_stack::report!(\n errors::api_error_response::ApiErrorResponse::GenericNotFoundError {\n message: \"mandate reference id not found\".to_string()\n }\n )\n })?;\n\n let connector_account_reference_id = billing_connector_account\n .get_account_reference_id_using_payment_merchant_connector_account_id(\n revenue_recovery_metadata.active_attempt_payment_connector_id,\n )\n .ok_or_else(|| {\n error_stack::report!(\n errors::api_error_response::ApiErrorResponse::GenericNotFoundError {\n message: \"connector account reference id not found\".to_string()\n }\n )\n })?;\n\n Ok(revenue_recovery::RevenueRecoveryAttemptData {\n amount: self.amount_details.order_amount,\n currency: self.amount_details.currency,\n merchant_reference_id,\n connector_transaction_id: None, // No connector id\n error_code: None,\n error_message: None,\n processor_payment_method_token: payment_processor_token.to_string(),\n connector_customer_id: revenue_recovery_metadata\n .billing_connector_payment_details\n .connector_customer_id,\n connector_account_reference_id,\n transaction_created_at: None, // would unwrap_or as now\n status: common_enums::AttemptStatus::Started,\n payment_method_type: self\n .get_payment_method_type()\n .unwrap_or(revenue_recovery_metadata.payment_method_type),\n payment_method_sub_type: self\n .get_payment_method_sub_type()\n .unwrap_or(revenue_recovery_metadata.payment_method_subtype),\n network_advice_code: None,\n network_decline_code: None,\n network_error_message: None,\n retry_count: None,\n invoice_next_billing_time: None,\n invoice_billing_started_at_time: None,\n // No charge id is present here since it is an internal payment and we didn't call connector yet.\n charge_id: None,\n card_info: card_info.clone(),\n })\n }\n\n pub fn get_optional_customer_id(\n &self,\n ) -> CustomResult<Option<id_type::CustomerId>, common_utils::errors::ValidationError> {\n self.customer_id\n .as_ref()\n .map(|customer_id| id_type::CustomerId::try_from(customer_id.clone()))\n .transpose()\n }\n\n pub fn get_currency(&self) -> storage_enums::Currency {\n self.amount_details.currency\n }\n\n pub fn is_split_payment(&self) -> bool {\n self.split_txns_enabled == common_enums::SplitTxnsEnabled::Enable\n && self.active_attempt_id_type == common_enums::ActiveAttemptIDType::AttemptsGroupID\n }\n}",
18
+ "diff_span": {
19
+ "before": "",
20
+ "after": " self.amount_details.currency\n }\n\n pub fn is_split_payment(&self) -> bool {\n self.split_txns_enabled == common_enums::SplitTxnsEnabled::Enable\n && self.active_attempt_id_type == common_enums::ActiveAttemptIDType::AttemptsGroupID\n }\n}"
21
+ },
22
+ "commit_sha": "eea5e7e8593b45cf962d5a2d7bd67a0dfed3aa1d"
23
+ },
24
+ {
25
+ "id": "crates/router/src/core/payments/transformers.rs::api_models::payments::PaymentsListResponseItem::function::foreign_from",
26
+ "file": "crates/router/src/core/payments/transformers.rs",
27
+ "kind": "function_item",
28
+ "status": "modified",
29
+ "code_changed": true,
30
+ "imports_changed": false,
31
+ "before_code": "fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n Self {\n id: pi.id,\n merchant_id: pi.merchant_id,\n profile_id: pi.profile_id,\n customer_id: pi.customer_id,\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id,\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata,\n description: pi.description.map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url,\n statement_descriptor: pi.statement_descriptor,\n allowed_payment_method_types: pi.allowed_payment_method_types,\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment: pi.split_txns_enabled == enums::SplitTxnsEnabled::Enable\n && pi.active_attempt_id_type == enums::ActiveAttemptIDType::AttemptsGroupID,\n }\n }",
32
+ "after_code": "fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n Self {\n id: pi.id,\n merchant_id: pi.merchant_id,\n profile_id: pi.profile_id,\n customer_id: pi.customer_id,\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id,\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata,\n description: pi.description.map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url,\n statement_descriptor: pi.statement_descriptor,\n allowed_payment_method_types: pi.allowed_payment_method_types,\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment: pi.is_split_payment(),\n }\n }",
33
+ "diff_span": {
34
+ "before": " authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment: pi.split_txns_enabled == enums::SplitTxnsEnabled::Enable\n && pi.active_attempt_id_type == enums::ActiveAttemptIDType::AttemptsGroupID,\n }\n }",
35
+ "after": " authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment: pi.is_split_payment(),\n }\n }"
36
+ },
37
+ "commit_sha": "eea5e7e8593b45cf962d5a2d7bd67a0dfed3aa1d"
38
+ },
39
+ {
40
+ "id": "crates/router/src/core/payments/transformers.rs::impl::api_models::payments::PaymentsListResponseItem",
41
+ "file": "crates/router/src/core/payments/transformers.rs",
42
+ "kind": "impl_item",
43
+ "status": "modified",
44
+ "code_changed": true,
45
+ "imports_changed": false,
46
+ "before_code": "impl ForeignFrom<(storage::PaymentIntent, Option<storage::PaymentAttempt>)>\n for api_models::payments::PaymentsListResponseItem\n{\n fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n Self {\n id: pi.id,\n merchant_id: pi.merchant_id,\n profile_id: pi.profile_id,\n customer_id: pi.customer_id,\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id,\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata,\n description: pi.description.map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url,\n statement_descriptor: pi.statement_descriptor,\n allowed_payment_method_types: pi.allowed_payment_method_types,\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment: pi.split_txns_enabled == enums::SplitTxnsEnabled::Enable\n && pi.active_attempt_id_type == enums::ActiveAttemptIDType::AttemptsGroupID,\n }\n }\n}",
47
+ "after_code": "impl ForeignFrom<(storage::PaymentIntent, Option<storage::PaymentAttempt>)>\n for api_models::payments::PaymentsListResponseItem\n{\n fn foreign_from((pi, pa): (storage::PaymentIntent, Option<storage::PaymentAttempt>)) -> Self {\n Self {\n id: pi.id,\n merchant_id: pi.merchant_id,\n profile_id: pi.profile_id,\n customer_id: pi.customer_id,\n payment_method_id: pa.as_ref().and_then(|p| p.payment_method_id.clone()),\n status: pi.status,\n amount: api_models::payments::PaymentAmountDetailsResponse::foreign_from((\n &pi.amount_details,\n pa.as_ref().map(|p| &p.amount_details),\n )),\n created: pi.created_at,\n payment_method_type: pa.as_ref().and_then(|p| p.payment_method_type.into()),\n payment_method_subtype: pa.as_ref().and_then(|p| p.payment_method_subtype.into()),\n connector: pa.as_ref().and_then(|p| p.connector.clone()),\n merchant_connector_id: pa.as_ref().and_then(|p| p.merchant_connector_id.clone()),\n customer: None,\n merchant_reference_id: pi.merchant_reference_id,\n connector_payment_id: pa.as_ref().and_then(|p| p.connector_payment_id.clone()),\n connector_response_reference_id: pa\n .as_ref()\n .and_then(|p| p.connector_response_reference_id.clone()),\n metadata: pi.metadata,\n description: pi.description.map(|val| val.get_string_repr().to_string()),\n authentication_type: pi.authentication_type,\n capture_method: Some(pi.capture_method),\n setup_future_usage: Some(pi.setup_future_usage),\n attempt_count: pi.attempt_count,\n error: pa\n .as_ref()\n .and_then(|p| p.error.as_ref())\n .map(api_models::payments::ErrorDetails::foreign_from),\n cancellation_reason: pa.as_ref().and_then(|p| p.cancellation_reason.clone()),\n order_details: None,\n return_url: pi.return_url,\n statement_descriptor: pi.statement_descriptor,\n allowed_payment_method_types: pi.allowed_payment_method_types,\n authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment: pi.is_split_payment(),\n }\n }\n}",
48
+ "diff_span": {
49
+ "before": " authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment: pi.split_txns_enabled == enums::SplitTxnsEnabled::Enable\n && pi.active_attempt_id_type == enums::ActiveAttemptIDType::AttemptsGroupID,\n }\n }",
50
+ "after": " authorization_count: pi.authorization_count,\n modified_at: pa.as_ref().map(|p| p.modified_at),\n is_split_payment: pi.is_split_payment(),\n }\n }"
51
+ },
52
+ "commit_sha": "eea5e7e8593b45cf962d5a2d7bd67a0dfed3aa1d"
53
+ },
54
+ {
55
+ "id": "crates/hyperswitch_domain_models/src/payments.rs::PaymentIntent::function::is_split_payment",
56
+ "file": "crates/hyperswitch_domain_models/src/payments.rs",
57
+ "kind": "function_item",
58
+ "status": "added",
59
+ "before_code": null,
60
+ "after_code": "pub fn is_split_payment(&self) -> bool {\n self.split_txns_enabled == common_enums::SplitTxnsEnabled::Enable\n && self.active_attempt_id_type == common_enums::ActiveAttemptIDType::AttemptsGroupID\n }",
61
+ "diff_span": null,
62
+ "commit_sha": "eea5e7e8593b45cf962d5a2d7bd67a0dfed3aa1d"
63
+ }
64
+ ]
65
+ }
diffs/pr_10140/f01b3cd/diff.json ADDED
The diff for this file is too large to render. See raw diff
 
diffs/pr_10155/8cf7196/diff.json ADDED
@@ -0,0 +1,115 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "8cf719686440f2bb234d251d55c92d5503e3a6bf",
3
+ "pr_number": 10155,
4
+ "rust_files": [
5
+ "crates/hyperswitch_connectors/src/connectors/payjustnow.rs",
6
+ "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs"
7
+ ],
8
+ "diffs": [
9
+ {
10
+ "id": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs::PayjustnowRefundRequest::function::try_from",
11
+ "file": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs",
12
+ "kind": "function_item",
13
+ "status": "modified",
14
+ "code_changed": true,
15
+ "imports_changed": false,
16
+ "before_code": "fn try_from(item: &RefundsRouterData<F>) -> Result<Self, Self::Error> {\n Ok(Self {\n request_id: Some(item.request.refund_id.clone()),\n checkout_token: item.request.connector_transaction_id.clone(),\n merchant_refund_reference: item.request.refund_id.clone(),\n refund_amount_cents: item.request.minor_refund_amount,\n refund_description: item\n .request\n .reason\n .clone()\n .unwrap_or(NO_REFUND_REASON.to_string()),\n })\n }",
17
+ "after_code": "fn try_from(item: &RefundsRouterData<F>) -> Result<Self, Self::Error> {\n Ok(Self {\n request_id: Some(item.connector_request_reference_id.clone()),\n checkout_token: item.request.connector_transaction_id.clone(),\n merchant_refund_reference: item.request.refund_id.clone(),\n refund_amount_cents: item.request.minor_refund_amount,\n refund_description: item\n .request\n .reason\n .clone()\n .unwrap_or(NO_REFUND_REASON.to_string()),\n })\n }",
18
+ "diff_span": {
19
+ "before": "fn try_from(item: &RefundsRouterData<F>) -> Result<Self, Self::Error> {\n Ok(Self {\n request_id: Some(item.request.refund_id.clone()),\n checkout_token: item.request.connector_transaction_id.clone(),\n merchant_refund_reference: item.request.refund_id.clone(),",
20
+ "after": "fn try_from(item: &RefundsRouterData<F>) -> Result<Self, Self::Error> {\n Ok(Self {\n request_id: Some(item.connector_request_reference_id.clone()),\n checkout_token: item.request.connector_transaction_id.clone(),\n merchant_refund_reference: item.request.refund_id.clone(),"
21
+ },
22
+ "commit_sha": "8cf719686440f2bb234d251d55c92d5503e3a6bf"
23
+ },
24
+ {
25
+ "id": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs::impl::PayjustnowPaymentsRequest",
26
+ "file": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs",
27
+ "kind": "impl_item",
28
+ "status": "modified",
29
+ "code_changed": true,
30
+ "imports_changed": false,
31
+ "before_code": "impl TryFrom<&PayjustnowRouterData<&PaymentsAuthorizeRouterData>> for PayjustnowPaymentsRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(\n item: &PayjustnowRouterData<&PaymentsAuthorizeRouterData>,\n ) -> Result<Self, Self::Error> {\n let router_data = item.router_data;\n let order_items = router_data\n .request\n .order_details\n .as_ref()\n .map(|order_details| {\n order_details\n .iter()\n .map(|order| {\n Ok(OrderItem {\n name: order.product_name.clone(),\n sku: order.product_id.clone().unwrap_or_default(),\n quantity: u32::from(order.quantity),\n price_cents: order.amount,\n })\n })\n .collect::<Result<Vec<OrderItem>, errors::ConnectorError>>()\n })\n .transpose()?;\n\n let customer = router_data\n .get_optional_billing_email()\n .or_else(|| item.router_data.request.email.clone())\n .map(|email| Customer {\n first_name: router_data.get_optional_billing_first_name(),\n last_name: router_data.get_optional_billing_last_name(),\n email,\n phone_number: router_data.get_optional_billing_phone_number(),\n });\n\n let billing_address = Some(Address {\n address_line1: router_data.get_optional_billing_line1(),\n address_line2: router_data.get_optional_billing_line2(),\n city: router_data.get_optional_billing_city(),\n province: router_data.get_optional_billing_state(),\n postal_code: item.router_data.get_optional_billing_zip(),\n });\n\n let shipping_address = Some(Address {\n address_line1: item.router_data.get_optional_shipping_line1(),\n address_line2: item.router_data.get_optional_shipping_line2(),\n city: item.router_data.get_optional_shipping_city(),\n province: item.router_data.get_optional_shipping_state(),\n postal_code: item.router_data.get_optional_shipping_zip(),\n });\n\n let router_return_url = item.router_data.request.get_router_return_url()?;\n\n let payjustnow_request = PayjustnowRequest {\n request_id: Some(item.router_data.payment_id.clone()),\n merchant_order_reference: router_data.connector_request_reference_id.clone(),\n order_amount_cents: item.amount,\n order_items,\n customer,\n billing_address,\n shipping_address,\n confirm_redirect_url: router_return_url.clone(),\n cancel_redirect_url: router_return_url,\n };\n\n Ok(Self {\n payjustnow: payjustnow_request,\n checkout_total_cents: item.amount,\n })\n }\n}",
32
+ "after_code": "impl TryFrom<&PayjustnowRouterData<&PaymentsAuthorizeRouterData>> for PayjustnowPaymentsRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(\n item: &PayjustnowRouterData<&PaymentsAuthorizeRouterData>,\n ) -> Result<Self, Self::Error> {\n let router_data = item.router_data;\n let order_items = router_data\n .request\n .order_details\n .as_ref()\n .map(|order_details| {\n order_details\n .iter()\n .map(|order| {\n Ok(OrderItem {\n name: order.product_name.clone(),\n sku: order.product_id.clone().unwrap_or_default(),\n quantity: u32::from(order.quantity),\n price_cents: order.amount,\n })\n })\n .collect::<Result<Vec<OrderItem>, errors::ConnectorError>>()\n })\n .transpose()?;\n\n let customer = router_data\n .get_optional_billing_email()\n .or_else(|| item.router_data.request.email.clone())\n .map(|email| Customer {\n first_name: router_data.get_optional_billing_first_name(),\n last_name: router_data.get_optional_billing_last_name(),\n email,\n phone_number: router_data.get_optional_billing_phone_number(),\n });\n\n let billing_address = Some(Address {\n address_line1: router_data.get_optional_billing_line1(),\n address_line2: router_data.get_optional_billing_line2(),\n city: router_data.get_optional_billing_city(),\n province: router_data.get_optional_billing_state(),\n postal_code: item.router_data.get_optional_billing_zip(),\n });\n\n let shipping_address = Some(Address {\n address_line1: item.router_data.get_optional_shipping_line1(),\n address_line2: item.router_data.get_optional_shipping_line2(),\n city: item.router_data.get_optional_shipping_city(),\n province: item.router_data.get_optional_shipping_state(),\n postal_code: item.router_data.get_optional_shipping_zip(),\n });\n\n let router_return_url = item.router_data.request.get_router_return_url()?;\n\n let payjustnow_request = PayjustnowRequest {\n request_id: Some(item.router_data.connector_request_reference_id.clone()),\n merchant_order_reference: item\n .router_data\n .request\n .merchant_order_reference_id\n .clone()\n .unwrap_or(item.router_data.payment_id.clone()),\n order_amount_cents: item.amount,\n order_items,\n customer,\n billing_address,\n shipping_address,\n confirm_redirect_url: router_return_url.clone(),\n cancel_redirect_url: router_return_url,\n };\n\n Ok(Self {\n payjustnow: payjustnow_request,\n checkout_total_cents: item.amount,\n })\n }\n}",
33
+ "diff_span": {
34
+ "before": "\n let payjustnow_request = PayjustnowRequest {\n request_id: Some(item.router_data.payment_id.clone()),\n merchant_order_reference: router_data.connector_request_reference_id.clone(),\n order_amount_cents: item.amount,\n order_items,",
35
+ "after": "\n let payjustnow_request = PayjustnowRequest {\n request_id: Some(item.router_data.connector_request_reference_id.clone()),\n merchant_order_reference: item\n .router_data\n .request\n .merchant_order_reference_id\n .clone()\n .unwrap_or(item.router_data.payment_id.clone()),\n order_amount_cents: item.amount,\n order_items,"
36
+ },
37
+ "commit_sha": "8cf719686440f2bb234d251d55c92d5503e3a6bf"
38
+ },
39
+ {
40
+ "id": "crates/hyperswitch_connectors/src/connectors/payjustnow.rs::Payjustnow::function::build_error_response",
41
+ "file": "crates/hyperswitch_connectors/src/connectors/payjustnow.rs",
42
+ "kind": "function_item",
43
+ "status": "modified",
44
+ "code_changed": true,
45
+ "imports_changed": false,
46
+ "before_code": "fn build_error_response(\n &self,\n res: Response,\n event_builder: Option<&mut ConnectorEvent>,\n ) -> CustomResult<ErrorResponse, errors::ConnectorError> {\n let response: payjustnow::PayjustnowErrorResponse = res\n .response\n .parse_struct(\"PayjustnowErrorResponse\")\n .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;\n\n event_builder.map(|i| i.set_response_body(&response));\n router_env::logger::info!(connector_response=?response);\n\n Ok(ErrorResponse {\n status_code: res.status_code,\n code: hyperswitch_interfaces::consts::NO_ERROR_CODE.to_string(),\n message: response.message,\n reason: None,\n attempt_status: None,\n connector_transaction_id: None,\n network_advice_code: None,\n network_decline_code: None,\n network_error_message: None,\n connector_metadata: None,\n })\n }",
47
+ "after_code": "fn build_error_response(\n &self,\n res: Response,\n event_builder: Option<&mut ConnectorEvent>,\n ) -> CustomResult<ErrorResponse, errors::ConnectorError> {\n let response: payjustnow::PayjustnowErrorResponse = res\n .response\n .parse_struct(\"PayjustnowErrorResponse\")\n .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;\n\n event_builder.map(|i| i.set_response_body(&response));\n router_env::logger::info!(connector_response=?response);\n\n let message = match response {\n payjustnow::PayjustnowErrorResponse::Structured(error) => error.message,\n payjustnow::PayjustnowErrorResponse::Message(message) => message,\n };\n\n Ok(ErrorResponse {\n status_code: res.status_code,\n code: hyperswitch_interfaces::consts::NO_ERROR_CODE.to_string(),\n message,\n reason: None,\n attempt_status: None,\n connector_transaction_id: None,\n network_advice_code: None,\n network_decline_code: None,\n network_error_message: None,\n connector_metadata: None,\n })\n }",
48
+ "diff_span": {
49
+ "before": " status_code: res.status_code,\n code: hyperswitch_interfaces::consts::NO_ERROR_CODE.to_string(),\n message: response.message,\n reason: None,\n attempt_status: None,",
50
+ "after": " router_env::logger::info!(connector_response=?response);\n\n let message = match response {\n payjustnow::PayjustnowErrorResponse::Structured(error) => error.message,\n payjustnow::PayjustnowErrorResponse::Message(message) => message,\n };\n\n Ok(ErrorResponse {\n status_code: res.status_code,\n code: hyperswitch_interfaces::consts::NO_ERROR_CODE.to_string(),\n message,\n reason: None,\n attempt_status: None,"
51
+ },
52
+ "commit_sha": "8cf719686440f2bb234d251d55c92d5503e3a6bf"
53
+ },
54
+ {
55
+ "id": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs::impl::PayjustnowRefundRequest",
56
+ "file": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs",
57
+ "kind": "impl_item",
58
+ "status": "modified",
59
+ "code_changed": true,
60
+ "imports_changed": false,
61
+ "before_code": "impl<F> TryFrom<&RefundsRouterData<F>> for PayjustnowRefundRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: &RefundsRouterData<F>) -> Result<Self, Self::Error> {\n Ok(Self {\n request_id: Some(item.request.refund_id.clone()),\n checkout_token: item.request.connector_transaction_id.clone(),\n merchant_refund_reference: item.request.refund_id.clone(),\n refund_amount_cents: item.request.minor_refund_amount,\n refund_description: item\n .request\n .reason\n .clone()\n .unwrap_or(NO_REFUND_REASON.to_string()),\n })\n }\n}",
62
+ "after_code": "impl<F> TryFrom<&RefundsRouterData<F>> for PayjustnowRefundRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: &RefundsRouterData<F>) -> Result<Self, Self::Error> {\n Ok(Self {\n request_id: Some(item.connector_request_reference_id.clone()),\n checkout_token: item.request.connector_transaction_id.clone(),\n merchant_refund_reference: item.request.refund_id.clone(),\n refund_amount_cents: item.request.minor_refund_amount,\n refund_description: item\n .request\n .reason\n .clone()\n .unwrap_or(NO_REFUND_REASON.to_string()),\n })\n }\n}",
63
+ "diff_span": {
64
+ "before": " fn try_from(item: &RefundsRouterData<F>) -> Result<Self, Self::Error> {\n Ok(Self {\n request_id: Some(item.request.refund_id.clone()),\n checkout_token: item.request.connector_transaction_id.clone(),\n merchant_refund_reference: item.request.refund_id.clone(),",
65
+ "after": " fn try_from(item: &RefundsRouterData<F>) -> Result<Self, Self::Error> {\n Ok(Self {\n request_id: Some(item.connector_request_reference_id.clone()),\n checkout_token: item.request.connector_transaction_id.clone(),\n merchant_refund_reference: item.request.refund_id.clone(),"
66
+ },
67
+ "commit_sha": "8cf719686440f2bb234d251d55c92d5503e3a6bf"
68
+ },
69
+ {
70
+ "id": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs::PayjustnowPaymentsRequest::function::try_from",
71
+ "file": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs",
72
+ "kind": "function_item",
73
+ "status": "modified",
74
+ "code_changed": true,
75
+ "imports_changed": false,
76
+ "before_code": "fn try_from(\n item: &PayjustnowRouterData<&PaymentsAuthorizeRouterData>,\n ) -> Result<Self, Self::Error> {\n let router_data = item.router_data;\n let order_items = router_data\n .request\n .order_details\n .as_ref()\n .map(|order_details| {\n order_details\n .iter()\n .map(|order| {\n Ok(OrderItem {\n name: order.product_name.clone(),\n sku: order.product_id.clone().unwrap_or_default(),\n quantity: u32::from(order.quantity),\n price_cents: order.amount,\n })\n })\n .collect::<Result<Vec<OrderItem>, errors::ConnectorError>>()\n })\n .transpose()?;\n\n let customer = router_data\n .get_optional_billing_email()\n .or_else(|| item.router_data.request.email.clone())\n .map(|email| Customer {\n first_name: router_data.get_optional_billing_first_name(),\n last_name: router_data.get_optional_billing_last_name(),\n email,\n phone_number: router_data.get_optional_billing_phone_number(),\n });\n\n let billing_address = Some(Address {\n address_line1: router_data.get_optional_billing_line1(),\n address_line2: router_data.get_optional_billing_line2(),\n city: router_data.get_optional_billing_city(),\n province: router_data.get_optional_billing_state(),\n postal_code: item.router_data.get_optional_billing_zip(),\n });\n\n let shipping_address = Some(Address {\n address_line1: item.router_data.get_optional_shipping_line1(),\n address_line2: item.router_data.get_optional_shipping_line2(),\n city: item.router_data.get_optional_shipping_city(),\n province: item.router_data.get_optional_shipping_state(),\n postal_code: item.router_data.get_optional_shipping_zip(),\n });\n\n let router_return_url = item.router_data.request.get_router_return_url()?;\n\n let payjustnow_request = PayjustnowRequest {\n request_id: Some(item.router_data.payment_id.clone()),\n merchant_order_reference: router_data.connector_request_reference_id.clone(),\n order_amount_cents: item.amount,\n order_items,\n customer,\n billing_address,\n shipping_address,\n confirm_redirect_url: router_return_url.clone(),\n cancel_redirect_url: router_return_url,\n };\n\n Ok(Self {\n payjustnow: payjustnow_request,\n checkout_total_cents: item.amount,\n })\n }",
77
+ "after_code": "fn try_from(\n item: &PayjustnowRouterData<&PaymentsAuthorizeRouterData>,\n ) -> Result<Self, Self::Error> {\n let router_data = item.router_data;\n let order_items = router_data\n .request\n .order_details\n .as_ref()\n .map(|order_details| {\n order_details\n .iter()\n .map(|order| {\n Ok(OrderItem {\n name: order.product_name.clone(),\n sku: order.product_id.clone().unwrap_or_default(),\n quantity: u32::from(order.quantity),\n price_cents: order.amount,\n })\n })\n .collect::<Result<Vec<OrderItem>, errors::ConnectorError>>()\n })\n .transpose()?;\n\n let customer = router_data\n .get_optional_billing_email()\n .or_else(|| item.router_data.request.email.clone())\n .map(|email| Customer {\n first_name: router_data.get_optional_billing_first_name(),\n last_name: router_data.get_optional_billing_last_name(),\n email,\n phone_number: router_data.get_optional_billing_phone_number(),\n });\n\n let billing_address = Some(Address {\n address_line1: router_data.get_optional_billing_line1(),\n address_line2: router_data.get_optional_billing_line2(),\n city: router_data.get_optional_billing_city(),\n province: router_data.get_optional_billing_state(),\n postal_code: item.router_data.get_optional_billing_zip(),\n });\n\n let shipping_address = Some(Address {\n address_line1: item.router_data.get_optional_shipping_line1(),\n address_line2: item.router_data.get_optional_shipping_line2(),\n city: item.router_data.get_optional_shipping_city(),\n province: item.router_data.get_optional_shipping_state(),\n postal_code: item.router_data.get_optional_shipping_zip(),\n });\n\n let router_return_url = item.router_data.request.get_router_return_url()?;\n\n let payjustnow_request = PayjustnowRequest {\n request_id: Some(item.router_data.connector_request_reference_id.clone()),\n merchant_order_reference: item\n .router_data\n .request\n .merchant_order_reference_id\n .clone()\n .unwrap_or(item.router_data.payment_id.clone()),\n order_amount_cents: item.amount,\n order_items,\n customer,\n billing_address,\n shipping_address,\n confirm_redirect_url: router_return_url.clone(),\n cancel_redirect_url: router_return_url,\n };\n\n Ok(Self {\n payjustnow: payjustnow_request,\n checkout_total_cents: item.amount,\n })\n }",
78
+ "diff_span": {
79
+ "before": "\n let payjustnow_request = PayjustnowRequest {\n request_id: Some(item.router_data.payment_id.clone()),\n merchant_order_reference: router_data.connector_request_reference_id.clone(),\n order_amount_cents: item.amount,\n order_items,",
80
+ "after": "\n let payjustnow_request = PayjustnowRequest {\n request_id: Some(item.router_data.connector_request_reference_id.clone()),\n merchant_order_reference: item\n .router_data\n .request\n .merchant_order_reference_id\n .clone()\n .unwrap_or(item.router_data.payment_id.clone()),\n order_amount_cents: item.amount,\n order_items,"
81
+ },
82
+ "commit_sha": "8cf719686440f2bb234d251d55c92d5503e3a6bf"
83
+ },
84
+ {
85
+ "id": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs::struct::PayjustnowError",
86
+ "file": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs",
87
+ "kind": "struct_item",
88
+ "status": "added",
89
+ "before_code": null,
90
+ "after_code": "pub struct PayjustnowError {\n pub message: String,\n}",
91
+ "diff_span": null,
92
+ "commit_sha": "8cf719686440f2bb234d251d55c92d5503e3a6bf"
93
+ },
94
+ {
95
+ "id": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs::enum::PayjustnowErrorResponse",
96
+ "file": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs",
97
+ "kind": "enum_item",
98
+ "status": "added",
99
+ "before_code": null,
100
+ "after_code": "pub enum PayjustnowErrorResponse {\n Structured(PayjustnowError),\n Message(String),\n}",
101
+ "diff_span": null,
102
+ "commit_sha": "8cf719686440f2bb234d251d55c92d5503e3a6bf"
103
+ },
104
+ {
105
+ "id": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs::struct::PayjustnowErrorResponse",
106
+ "file": "crates/hyperswitch_connectors/src/connectors/payjustnow/transformers.rs",
107
+ "kind": "struct_item",
108
+ "status": "removed",
109
+ "before_code": "pub struct PayjustnowErrorResponse {\n pub code: String,\n pub message: String,\n pub reason: Option<String>,\n}",
110
+ "after_code": null,
111
+ "diff_span": null,
112
+ "commit_sha": "8cf719686440f2bb234d251d55c92d5503e3a6bf"
113
+ }
114
+ ]
115
+ }
diffs/pr_10194/036f537/diff.json ADDED
@@ -0,0 +1,6 @@
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "036f537798511b5801488dba6c95e4f4ce233566",
3
+ "pr_number": 10194,
4
+ "rust_files": [],
5
+ "diffs": []
6
+ }
diffs/pr_10226/3e00376/diff.json ADDED
The diff for this file is too large to render. See raw diff
 
diffs/pr_10226/7bfff64/diff.json ADDED
The diff for this file is too large to render. See raw diff
 
diffs/pr_10226/a89516d/diff.json ADDED
@@ -0,0 +1,69 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "a89516d5a6ed510acae57bc989280920ec3fb37b",
3
+ "pr_number": 10226,
4
+ "rust_files": [
5
+ "crates/router/src/core/payment_methods/vault.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/router/src/core/payment_methods/vault.rs::api::WalletPayout::function::get_value2",
10
+ "file": "crates/router/src/core/payment_methods/vault.rs",
11
+ "kind": "function_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "fn get_value2(\n &self,\n customer_id: Option<id_type::CustomerId>,\n ) -> CustomResult<String, errors::VaultError> {\n let value2 = TokenizedWalletInsensitiveValues { customer_id };\n\n value2\n .encode_to_string_of_json()\n .change_context(errors::VaultError::RequestEncodingFailed)\n .attach_printable(\"Failed to encode data - TokenizedWalletInsensitiveValues\")\n }",
16
+ "after_code": "fn get_value2(\n &self,\n customer_id: Option<id_type::CustomerId>,\n ) -> CustomResult<String, errors::VaultError> {\n let value2 = match self {\n Self::Paypal(_paypal_data) => TokenizedWalletInsensitiveValues {\n customer_id,\n card_network: None,\n },\n Self::Venmo(_venmo_data) => TokenizedWalletInsensitiveValues {\n customer_id,\n card_network: None,\n },\n Self::ApplePayDecrypt(apple_pay_decrypt_data) => TokenizedWalletInsensitiveValues {\n customer_id,\n card_network: apple_pay_decrypt_data.card_network.clone(),\n },\n };\n\n value2\n .encode_to_string_of_json()\n .change_context(errors::VaultError::RequestEncodingFailed)\n .attach_printable(\"Failed to encode data - TokenizedWalletInsensitiveValues\")\n }",
17
+ "diff_span": {
18
+ "before": " customer_id: Option<id_type::CustomerId>,\n ) -> CustomResult<String, errors::VaultError> {\n let value2 = TokenizedWalletInsensitiveValues { customer_id };\n\n value2",
19
+ "after": " customer_id: Option<id_type::CustomerId>,\n ) -> CustomResult<String, errors::VaultError> {\n let value2 = match self {\n Self::Paypal(_paypal_data) => TokenizedWalletInsensitiveValues {\n customer_id,\n card_network: None,\n },\n Self::Venmo(_venmo_data) => TokenizedWalletInsensitiveValues {\n customer_id,\n card_network: None,\n },\n Self::ApplePayDecrypt(apple_pay_decrypt_data) => TokenizedWalletInsensitiveValues {\n customer_id,\n card_network: apple_pay_decrypt_data.card_network.clone(),\n },\n };\n\n value2"
20
+ },
21
+ "commit_sha": "a89516d5a6ed510acae57bc989280920ec3fb37b"
22
+ },
23
+ {
24
+ "id": "crates/router/src/core/payment_methods/vault.rs::api::WalletPayout::function::from_values",
25
+ "file": "crates/router/src/core/payment_methods/vault.rs",
26
+ "kind": "function_item",
27
+ "status": "modified",
28
+ "code_changed": true,
29
+ "imports_changed": false,
30
+ "before_code": "fn from_values(\n value1: String,\n value2: String,\n ) -> CustomResult<(Self, SupplementaryVaultData), errors::VaultError> {\n let value1: TokenizedWalletSensitiveValues = value1\n .parse_struct(\"TokenizedWalletSensitiveValues\")\n .change_context(errors::VaultError::ResponseDeserializationFailed)\n .attach_printable(\"Could not deserialize into wallet data wallet_sensitive_data\")?;\n\n let value2: TokenizedWalletInsensitiveValues = value2\n .parse_struct(\"TokenizedWalletInsensitiveValues\")\n .change_context(errors::VaultError::ResponseDeserializationFailed)\n .attach_printable(\"Could not deserialize into wallet data wallet_insensitive_data\")?;\n\n let wallet = match value1.wallet_type {\n PaymentMethodType::Paypal => Self::Paypal(api_models::payouts::Paypal {\n email: value1.email,\n telephone_number: value1.telephone_number,\n paypal_id: value1.wallet_id,\n }),\n PaymentMethodType::Venmo => Self::Venmo(api_models::payouts::Venmo {\n telephone_number: value1.telephone_number,\n }),\n PaymentMethodType::ApplePay => {\n match (value1.dpan, value1.expiry_month, value1.expiry_year) {\n (Some(dpan), Some(expiry_month), Some(expiry_year)) => {\n Self::ApplePayDecrypt(api_models::payouts::ApplePayDecrypt {\n dpan,\n expiry_month,\n expiry_year,\n card_holder_name: value1.card_holder_name,\n card_network: None,\n })\n }\n _ => Err(errors::VaultError::ResponseDeserializationFailed)?,\n }\n }\n _ => Err(errors::VaultError::PayoutMethodNotSupported)?,\n };\n let supp_data = SupplementaryVaultData {\n customer_id: value2.customer_id,\n payment_method_id: None,\n };\n\n Ok((wallet, supp_data))\n }",
31
+ "after_code": "fn from_values(\n value1: String,\n value2: String,\n ) -> CustomResult<(Self, SupplementaryVaultData), errors::VaultError> {\n let value1: TokenizedWalletSensitiveValues = value1\n .parse_struct(\"TokenizedWalletSensitiveValues\")\n .change_context(errors::VaultError::ResponseDeserializationFailed)\n .attach_printable(\"Could not deserialize into wallet data wallet_sensitive_data\")?;\n\n let value2: TokenizedWalletInsensitiveValues = value2\n .parse_struct(\"TokenizedWalletInsensitiveValues\")\n .change_context(errors::VaultError::ResponseDeserializationFailed)\n .attach_printable(\"Could not deserialize into wallet data wallet_insensitive_data\")?;\n\n let wallet = match value1.wallet_type {\n PaymentMethodType::Paypal => Self::Paypal(api_models::payouts::Paypal {\n email: value1.email,\n telephone_number: value1.telephone_number,\n paypal_id: value1.wallet_id,\n }),\n PaymentMethodType::Venmo => Self::Venmo(api_models::payouts::Venmo {\n telephone_number: value1.telephone_number,\n }),\n PaymentMethodType::ApplePay => {\n match (value1.dpan, value1.expiry_month, value1.expiry_year) {\n (Some(dpan), Some(expiry_month), Some(expiry_year)) => {\n Self::ApplePayDecrypt(api_models::payouts::ApplePayDecrypt {\n dpan,\n expiry_month,\n expiry_year,\n card_holder_name: value1.card_holder_name,\n card_network: value2.card_network,\n })\n }\n _ => Err(errors::VaultError::ResponseDeserializationFailed)?,\n }\n }\n _ => Err(errors::VaultError::PayoutMethodNotSupported)?,\n };\n let supp_data = SupplementaryVaultData {\n customer_id: value2.customer_id,\n payment_method_id: None,\n };\n\n Ok((wallet, supp_data))\n }",
32
+ "diff_span": {
33
+ "before": " expiry_year,\n card_holder_name: value1.card_holder_name,\n card_network: None,\n })\n }",
34
+ "after": " expiry_year,\n card_holder_name: value1.card_holder_name,\n card_network: value2.card_network,\n })\n }"
35
+ },
36
+ "commit_sha": "a89516d5a6ed510acae57bc989280920ec3fb37b"
37
+ },
38
+ {
39
+ "id": "crates/router/src/core/payment_methods/vault.rs::impl::api::WalletPayout",
40
+ "file": "crates/router/src/core/payment_methods/vault.rs",
41
+ "kind": "impl_item",
42
+ "status": "modified",
43
+ "code_changed": true,
44
+ "imports_changed": false,
45
+ "before_code": "impl Vaultable for api::WalletPayout {\n fn get_value1(\n &self,\n _customer_id: Option<id_type::CustomerId>,\n ) -> CustomResult<String, errors::VaultError> {\n let value1 = match self {\n Self::Paypal(paypal_data) => TokenizedWalletSensitiveValues {\n email: paypal_data.email.clone(),\n telephone_number: paypal_data.telephone_number.clone(),\n wallet_id: paypal_data.paypal_id.clone(),\n wallet_type: PaymentMethodType::Paypal,\n dpan: None,\n expiry_month: None,\n expiry_year: None,\n card_holder_name: None,\n },\n Self::Venmo(venmo_data) => TokenizedWalletSensitiveValues {\n email: None,\n telephone_number: venmo_data.telephone_number.clone(),\n wallet_id: None,\n wallet_type: PaymentMethodType::Venmo,\n dpan: None,\n expiry_month: None,\n expiry_year: None,\n card_holder_name: None,\n },\n Self::ApplePayDecrypt(apple_pay_decrypt_data) => TokenizedWalletSensitiveValues {\n email: None,\n telephone_number: None,\n wallet_id: None,\n wallet_type: PaymentMethodType::ApplePay,\n dpan: Some(apple_pay_decrypt_data.dpan.clone()),\n expiry_month: Some(apple_pay_decrypt_data.expiry_month.clone()),\n expiry_year: Some(apple_pay_decrypt_data.expiry_year.clone()),\n card_holder_name: apple_pay_decrypt_data.card_holder_name.clone(),\n },\n };\n\n value1\n .encode_to_string_of_json()\n .change_context(errors::VaultError::RequestEncodingFailed)\n .attach_printable(\"Failed to encode wallet data - TokenizedWalletSensitiveValues\")\n }\n\n fn get_value2(\n &self,\n customer_id: Option<id_type::CustomerId>,\n ) -> CustomResult<String, errors::VaultError> {\n let value2 = TokenizedWalletInsensitiveValues { customer_id };\n\n value2\n .encode_to_string_of_json()\n .change_context(errors::VaultError::RequestEncodingFailed)\n .attach_printable(\"Failed to encode data - TokenizedWalletInsensitiveValues\")\n }\n\n fn from_values(\n value1: String,\n value2: String,\n ) -> CustomResult<(Self, SupplementaryVaultData), errors::VaultError> {\n let value1: TokenizedWalletSensitiveValues = value1\n .parse_struct(\"TokenizedWalletSensitiveValues\")\n .change_context(errors::VaultError::ResponseDeserializationFailed)\n .attach_printable(\"Could not deserialize into wallet data wallet_sensitive_data\")?;\n\n let value2: TokenizedWalletInsensitiveValues = value2\n .parse_struct(\"TokenizedWalletInsensitiveValues\")\n .change_context(errors::VaultError::ResponseDeserializationFailed)\n .attach_printable(\"Could not deserialize into wallet data wallet_insensitive_data\")?;\n\n let wallet = match value1.wallet_type {\n PaymentMethodType::Paypal => Self::Paypal(api_models::payouts::Paypal {\n email: value1.email,\n telephone_number: value1.telephone_number,\n paypal_id: value1.wallet_id,\n }),\n PaymentMethodType::Venmo => Self::Venmo(api_models::payouts::Venmo {\n telephone_number: value1.telephone_number,\n }),\n PaymentMethodType::ApplePay => {\n match (value1.dpan, value1.expiry_month, value1.expiry_year) {\n (Some(dpan), Some(expiry_month), Some(expiry_year)) => {\n Self::ApplePayDecrypt(api_models::payouts::ApplePayDecrypt {\n dpan,\n expiry_month,\n expiry_year,\n card_holder_name: value1.card_holder_name,\n card_network: None,\n })\n }\n _ => Err(errors::VaultError::ResponseDeserializationFailed)?,\n }\n }\n _ => Err(errors::VaultError::PayoutMethodNotSupported)?,\n };\n let supp_data = SupplementaryVaultData {\n customer_id: value2.customer_id,\n payment_method_id: None,\n };\n\n Ok((wallet, supp_data))\n }\n}",
46
+ "after_code": "impl Vaultable for api::WalletPayout {\n fn get_value1(\n &self,\n _customer_id: Option<id_type::CustomerId>,\n ) -> CustomResult<String, errors::VaultError> {\n let value1 = match self {\n Self::Paypal(paypal_data) => TokenizedWalletSensitiveValues {\n email: paypal_data.email.clone(),\n telephone_number: paypal_data.telephone_number.clone(),\n wallet_id: paypal_data.paypal_id.clone(),\n wallet_type: PaymentMethodType::Paypal,\n dpan: None,\n expiry_month: None,\n expiry_year: None,\n card_holder_name: None,\n },\n Self::Venmo(venmo_data) => TokenizedWalletSensitiveValues {\n email: None,\n telephone_number: venmo_data.telephone_number.clone(),\n wallet_id: None,\n wallet_type: PaymentMethodType::Venmo,\n dpan: None,\n expiry_month: None,\n expiry_year: None,\n card_holder_name: None,\n },\n Self::ApplePayDecrypt(apple_pay_decrypt_data) => TokenizedWalletSensitiveValues {\n email: None,\n telephone_number: None,\n wallet_id: None,\n wallet_type: PaymentMethodType::ApplePay,\n dpan: Some(apple_pay_decrypt_data.dpan.clone()),\n expiry_month: Some(apple_pay_decrypt_data.expiry_month.clone()),\n expiry_year: Some(apple_pay_decrypt_data.expiry_year.clone()),\n card_holder_name: apple_pay_decrypt_data.card_holder_name.clone(),\n },\n };\n\n value1\n .encode_to_string_of_json()\n .change_context(errors::VaultError::RequestEncodingFailed)\n .attach_printable(\"Failed to encode wallet data - TokenizedWalletSensitiveValues\")\n }\n\n fn get_value2(\n &self,\n customer_id: Option<id_type::CustomerId>,\n ) -> CustomResult<String, errors::VaultError> {\n let value2 = match self {\n Self::Paypal(_paypal_data) => TokenizedWalletInsensitiveValues {\n customer_id,\n card_network: None,\n },\n Self::Venmo(_venmo_data) => TokenizedWalletInsensitiveValues {\n customer_id,\n card_network: None,\n },\n Self::ApplePayDecrypt(apple_pay_decrypt_data) => TokenizedWalletInsensitiveValues {\n customer_id,\n card_network: apple_pay_decrypt_data.card_network.clone(),\n },\n };\n\n value2\n .encode_to_string_of_json()\n .change_context(errors::VaultError::RequestEncodingFailed)\n .attach_printable(\"Failed to encode data - TokenizedWalletInsensitiveValues\")\n }\n\n fn from_values(\n value1: String,\n value2: String,\n ) -> CustomResult<(Self, SupplementaryVaultData), errors::VaultError> {\n let value1: TokenizedWalletSensitiveValues = value1\n .parse_struct(\"TokenizedWalletSensitiveValues\")\n .change_context(errors::VaultError::ResponseDeserializationFailed)\n .attach_printable(\"Could not deserialize into wallet data wallet_sensitive_data\")?;\n\n let value2: TokenizedWalletInsensitiveValues = value2\n .parse_struct(\"TokenizedWalletInsensitiveValues\")\n .change_context(errors::VaultError::ResponseDeserializationFailed)\n .attach_printable(\"Could not deserialize into wallet data wallet_insensitive_data\")?;\n\n let wallet = match value1.wallet_type {\n PaymentMethodType::Paypal => Self::Paypal(api_models::payouts::Paypal {\n email: value1.email,\n telephone_number: value1.telephone_number,\n paypal_id: value1.wallet_id,\n }),\n PaymentMethodType::Venmo => Self::Venmo(api_models::payouts::Venmo {\n telephone_number: value1.telephone_number,\n }),\n PaymentMethodType::ApplePay => {\n match (value1.dpan, value1.expiry_month, value1.expiry_year) {\n (Some(dpan), Some(expiry_month), Some(expiry_year)) => {\n Self::ApplePayDecrypt(api_models::payouts::ApplePayDecrypt {\n dpan,\n expiry_month,\n expiry_year,\n card_holder_name: value1.card_holder_name,\n card_network: value2.card_network,\n })\n }\n _ => Err(errors::VaultError::ResponseDeserializationFailed)?,\n }\n }\n _ => Err(errors::VaultError::PayoutMethodNotSupported)?,\n };\n let supp_data = SupplementaryVaultData {\n customer_id: value2.customer_id,\n payment_method_id: None,\n };\n\n Ok((wallet, supp_data))\n }\n}",
47
+ "diff_span": {
48
+ "before": " customer_id: Option<id_type::CustomerId>,\n ) -> CustomResult<String, errors::VaultError> {\n let value2 = TokenizedWalletInsensitiveValues { customer_id };\n\n value2\n .encode_to_string_of_json()\n .change_context(errors::VaultError::RequestEncodingFailed)\n .attach_printable(\"Failed to encode data - TokenizedWalletInsensitiveValues\")\n }\n\n fn from_values(\n value1: String,\n value2: String,\n ) -> CustomResult<(Self, SupplementaryVaultData), errors::VaultError> {\n let value1: TokenizedWalletSensitiveValues = value1\n .parse_struct(\"TokenizedWalletSensitiveValues\")\n .change_context(errors::VaultError::ResponseDeserializationFailed)\n .attach_printable(\"Could not deserialize into wallet data wallet_sensitive_data\")?;\n\n let value2: TokenizedWalletInsensitiveValues = value2\n .parse_struct(\"TokenizedWalletInsensitiveValues\")\n .change_context(errors::VaultError::ResponseDeserializationFailed)\n .attach_printable(\"Could not deserialize into wallet data wallet_insensitive_data\")?;\n\n let wallet = match value1.wallet_type {\n PaymentMethodType::Paypal => Self::Paypal(api_models::payouts::Paypal {\n email: value1.email,\n telephone_number: value1.telephone_number,\n paypal_id: value1.wallet_id,\n }),\n PaymentMethodType::Venmo => Self::Venmo(api_models::payouts::Venmo {\n telephone_number: value1.telephone_number,\n }),\n PaymentMethodType::ApplePay => {\n match (value1.dpan, value1.expiry_month, value1.expiry_year) {\n (Some(dpan), Some(expiry_month), Some(expiry_year)) => {\n Self::ApplePayDecrypt(api_models::payouts::ApplePayDecrypt {\n dpan,\n expiry_month,\n expiry_year,\n card_holder_name: value1.card_holder_name,\n card_network: None,\n })\n }",
49
+ "after": " customer_id: Option<id_type::CustomerId>,\n ) -> CustomResult<String, errors::VaultError> {\n let value2 = match self {\n Self::Paypal(_paypal_data) => TokenizedWalletInsensitiveValues {\n customer_id,\n card_network: None,\n },\n Self::Venmo(_venmo_data) => TokenizedWalletInsensitiveValues {\n customer_id,\n card_network: None,\n },\n Self::ApplePayDecrypt(apple_pay_decrypt_data) => TokenizedWalletInsensitiveValues {\n customer_id,\n card_network: apple_pay_decrypt_data.card_network.clone(),\n },\n };\n\n value2\n .encode_to_string_of_json()\n .change_context(errors::VaultError::RequestEncodingFailed)\n .attach_printable(\"Failed to encode data - TokenizedWalletInsensitiveValues\")\n }\n\n fn from_values(\n value1: String,\n value2: String,\n ) -> CustomResult<(Self, SupplementaryVaultData), errors::VaultError> {\n let value1: TokenizedWalletSensitiveValues = value1\n .parse_struct(\"TokenizedWalletSensitiveValues\")\n .change_context(errors::VaultError::ResponseDeserializationFailed)\n .attach_printable(\"Could not deserialize into wallet data wallet_sensitive_data\")?;\n\n let value2: TokenizedWalletInsensitiveValues = value2\n .parse_struct(\"TokenizedWalletInsensitiveValues\")\n .change_context(errors::VaultError::ResponseDeserializationFailed)\n .attach_printable(\"Could not deserialize into wallet data wallet_insensitive_data\")?;\n\n let wallet = match value1.wallet_type {\n PaymentMethodType::Paypal => Self::Paypal(api_models::payouts::Paypal {\n email: value1.email,\n telephone_number: value1.telephone_number,\n paypal_id: value1.wallet_id,\n }),\n PaymentMethodType::Venmo => Self::Venmo(api_models::payouts::Venmo {\n telephone_number: value1.telephone_number,\n }),\n PaymentMethodType::ApplePay => {\n match (value1.dpan, value1.expiry_month, value1.expiry_year) {\n (Some(dpan), Some(expiry_month), Some(expiry_year)) => {\n Self::ApplePayDecrypt(api_models::payouts::ApplePayDecrypt {\n dpan,\n expiry_month,\n expiry_year,\n card_holder_name: value1.card_holder_name,\n card_network: value2.card_network,\n })\n }"
50
+ },
51
+ "commit_sha": "a89516d5a6ed510acae57bc989280920ec3fb37b"
52
+ },
53
+ {
54
+ "id": "crates/router/src/core/payment_methods/vault.rs::struct::TokenizedWalletInsensitiveValues",
55
+ "file": "crates/router/src/core/payment_methods/vault.rs",
56
+ "kind": "struct_item",
57
+ "status": "modified",
58
+ "code_changed": true,
59
+ "imports_changed": false,
60
+ "before_code": "pub struct TokenizedWalletInsensitiveValues {\n pub customer_id: Option<id_type::CustomerId>,\n}",
61
+ "after_code": "pub struct TokenizedWalletInsensitiveValues {\n pub customer_id: Option<id_type::CustomerId>,\n pub card_network: Option<common_enums::CardNetwork>,\n}",
62
+ "diff_span": {
63
+ "before": "",
64
+ "after": "pub struct TokenizedWalletInsensitiveValues {\n pub customer_id: Option<id_type::CustomerId>,\n pub card_network: Option<common_enums::CardNetwork>,\n}"
65
+ },
66
+ "commit_sha": "a89516d5a6ed510acae57bc989280920ec3fb37b"
67
+ }
68
+ ]
69
+ }
diffs/pr_10280/f72b5c9/diff.json ADDED
@@ -0,0 +1,24 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "f72b5c9654b775381f3371411399e1d0ff3153b8",
3
+ "pr_number": 10280,
4
+ "rust_files": [
5
+ "crates/router/src/core/blocklist/utils.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/router/src/core/blocklist/utils.rs::function::toggle_blocklist_guard_for_merchant",
10
+ "file": "crates/router/src/core/blocklist/utils.rs",
11
+ "kind": "function_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "pub async fn toggle_blocklist_guard_for_merchant(\n state: &SessionState,\n merchant_id: &common_utils::id_type::MerchantId,\n query: api_blocklist::ToggleBlocklistQuery,\n) -> CustomResult<api_blocklist::ToggleBlocklistResponse, errors::ApiErrorResponse> {\n let key = merchant_id.get_blocklist_guard_key();\n let maybe_guard = state.store.find_config_by_key(&key).await;\n let new_config = configs::ConfigNew {\n key: key.clone(),\n config: query.status.to_string(),\n };\n match maybe_guard {\n Ok(_config) => {\n let updated_config = configs::ConfigUpdate::Update {\n config: Some(query.status.to_string()),\n };\n state\n .store\n .update_config_by_key(&key, updated_config)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error enabling the blocklist guard\")?;\n }\n Err(e) if e.current_context().is_db_not_found() => {\n state\n .store\n .insert_config(new_config)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error enabling the blocklist guard\")?;\n }\n Err(error) => {\n logger::error!(?error);\n Err(error)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error enabling the blocklist guard\")?;\n }\n };\n let guard_status = if query.status { \"enabled\" } else { \"disabled\" };\n Ok(api_blocklist::ToggleBlocklistResponse {\n blocklist_guard_status: guard_status.to_string(),\n })\n}",
16
+ "after_code": "pub async fn toggle_blocklist_guard_for_merchant(\n state: &SessionState,\n merchant_id: &common_utils::id_type::MerchantId,\n query: api_blocklist::ToggleBlocklistQuery,\n) -> CustomResult<api_blocklist::ToggleBlocklistResponse, errors::ApiErrorResponse> {\n let key = merchant_id.get_blocklist_guard_key();\n let maybe_guard = state.store.find_config_by_key_from_db(&key).await;\n let new_config = configs::ConfigNew {\n key: key.clone(),\n config: query.status.to_string(),\n };\n match maybe_guard {\n Ok(_config) => {\n let updated_config = configs::ConfigUpdate::Update {\n config: Some(query.status.to_string()),\n };\n state\n .store\n .update_config_by_key(&key, updated_config)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error enabling the blocklist guard\")?;\n }\n Err(e) if e.current_context().is_db_not_found() => {\n state\n .store\n .insert_config(new_config)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error enabling the blocklist guard\")?;\n }\n Err(error) => {\n logger::error!(?error);\n Err(error)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error enabling the blocklist guard\")?;\n }\n };\n let guard_status = if query.status { \"enabled\" } else { \"disabled\" };\n Ok(api_blocklist::ToggleBlocklistResponse {\n blocklist_guard_status: guard_status.to_string(),\n })\n}",
17
+ "diff_span": {
18
+ "before": ") -> CustomResult<api_blocklist::ToggleBlocklistResponse, errors::ApiErrorResponse> {\n let key = merchant_id.get_blocklist_guard_key();\n let maybe_guard = state.store.find_config_by_key(&key).await;\n let new_config = configs::ConfigNew {\n key: key.clone(),",
19
+ "after": ") -> CustomResult<api_blocklist::ToggleBlocklistResponse, errors::ApiErrorResponse> {\n let key = merchant_id.get_blocklist_guard_key();\n let maybe_guard = state.store.find_config_by_key_from_db(&key).await;\n let new_config = configs::ConfigNew {\n key: key.clone(),"
20
+ },
21
+ "commit_sha": "f72b5c9654b775381f3371411399e1d0ff3153b8"
22
+ }
23
+ ]
24
+ }
diffs/pr_6744/0b3f1d0/diff.json ADDED
@@ -0,0 +1,24 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "0b3f1d07b44c735fc9f35e991a2368395733805d",
3
+ "pr_number": 6744,
4
+ "rust_files": [
5
+ "crates/router/src/core/payment_methods/utils.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/router/src/core/payment_methods/utils.rs::function::construct_supported_connectors_for_update_mandate_node",
10
+ "file": "crates/router/src/core/payment_methods/utils.rs",
11
+ "kind": "function_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "fn construct_supported_connectors_for_update_mandate_node(\n builder: &mut cgraph::ConstraintGraphBuilder<dir::DirValue>,\n domain_id: cgraph::DomainId,\n supported_payment_methods_for_update_mandate: &settings::SupportedPaymentMethodsForMandate,\n pmt: RequestPaymentMethodTypes,\n payment_method: &enums::PaymentMethod,\n) -> Result<Option<cgraph::NodeId>, KgraphError> {\n let card_value_node = builder.make_value_node(\n cgraph::NodeValue::Value(dir::DirValue::PaymentMethod(enums::PaymentMethod::Card)),\n None,\n None::<()>,\n );\n\n let payment_type_value_node = builder.make_value_node(\n cgraph::NodeValue::Value(dir::DirValue::PaymentType(\n euclid::enums::PaymentType::UpdateMandate,\n )),\n None,\n None::<()>,\n );\n\n let mut agg_nodes: Vec<(cgraph::NodeId, cgraph::Relation, cgraph::Strength)> = Vec::new();\n let mut card_dir_values = Vec::new();\n let mut non_card_dir_values = Vec::new();\n\n if let Some(supported_pm_for_mandates) = supported_payment_methods_for_update_mandate\n .0\n .get(payment_method)\n {\n if payment_method == &enums::PaymentMethod::Card {\n if let Some(credit_connector_list) = supported_pm_for_mandates\n .0\n .get(&api_enums::PaymentMethodType::Credit)\n {\n card_dir_values.extend(\n credit_connector_list\n .connector_list\n .clone()\n .into_iter()\n .filter_map(|connector| {\n api_enums::RoutableConnectors::from_str(connector.to_string().as_str())\n .ok()\n .map(|connector| {\n dir::DirValue::Connector(Box::new(\n api_models::routing::ast::ConnectorChoice { connector },\n ))\n })\n }),\n );\n }\n\n if let Some(debit_connector_list) = supported_pm_for_mandates\n .0\n .get(&api_enums::PaymentMethodType::Debit)\n {\n card_dir_values.extend(\n debit_connector_list\n .connector_list\n .clone()\n .into_iter()\n .filter_map(|connector| {\n api_enums::RoutableConnectors::from_str(connector.to_string().as_str())\n .ok()\n .map(|connector| {\n dir::DirValue::Connector(Box::new(\n api_models::routing::ast::ConnectorChoice { connector },\n ))\n })\n }),\n );\n }\n let card_in_node = builder\n .make_in_aggregator(card_dir_values, None, None::<()>)\n .map_err(KgraphError::GraphConstructionError)?;\n\n let card_and_node = builder\n .make_all_aggregator(\n &[\n (\n card_value_node,\n cgraph::Relation::Positive,\n cgraph::Strength::Strong,\n ),\n (\n payment_type_value_node,\n cgraph::Relation::Positive,\n cgraph::Strength::Strong,\n ),\n (\n card_in_node,\n cgraph::Relation::Positive,\n cgraph::Strength::Strong,\n ),\n ],\n None,\n None::<()>,\n Some(domain_id),\n )\n .map_err(KgraphError::GraphConstructionError)?;\n\n agg_nodes.push((\n card_and_node,\n cgraph::Relation::Positive,\n cgraph::Strength::Strong,\n ));\n } else if let Some(connector_list) =\n supported_pm_for_mandates.0.get(&pmt.payment_method_type)\n {\n non_card_dir_values.extend(\n connector_list\n .connector_list\n .clone()\n .into_iter()\n .filter_map(|connector| {\n api_enums::RoutableConnectors::from_str(connector.to_string().as_str())\n .ok()\n .map(|connector| {\n dir::DirValue::Connector(Box::new(\n api_models::routing::ast::ConnectorChoice { connector },\n ))\n })\n }),\n );\n let non_card_mandate_in_node = builder\n .make_in_aggregator(non_card_dir_values, None, None::<()>)\n .map_err(KgraphError::GraphConstructionError)?;\n\n let non_card_and_node = builder\n .make_all_aggregator(\n &[\n (\n card_value_node,\n cgraph::Relation::Negative,\n cgraph::Strength::Strong,\n ),\n (\n payment_type_value_node,\n cgraph::Relation::Positive,\n cgraph::Strength::Strong,\n ),\n (\n non_card_mandate_in_node,\n cgraph::Relation::Positive,\n cgraph::Strength::Strong,\n ),\n ],\n None,\n None::<()>,\n Some(domain_id),\n )\n .map_err(KgraphError::GraphConstructionError)?;\n\n agg_nodes.push((\n non_card_and_node,\n cgraph::Relation::Positive,\n cgraph::Strength::Strong,\n ));\n }\n }\n\n if agg_nodes.len() > 0 {\n Ok(Some(\n builder\n .make_any_aggregator(\n &agg_nodes,\n Some(\"any node for card and non card pm\"),\n None::<()>,\n Some(domain_id),\n )\n .map_err(KgraphError::GraphConstructionError)?,\n ))\n } else {\n Ok(None)\n }\n}",
16
+ "after_code": "fn construct_supported_connectors_for_update_mandate_node(\n builder: &mut cgraph::ConstraintGraphBuilder<dir::DirValue>,\n domain_id: cgraph::DomainId,\n supported_payment_methods_for_update_mandate: &settings::SupportedPaymentMethodsForMandate,\n pmt: RequestPaymentMethodTypes,\n payment_method: &enums::PaymentMethod,\n) -> Result<Option<cgraph::NodeId>, KgraphError> {\n let card_value_node = builder.make_value_node(\n cgraph::NodeValue::Value(dir::DirValue::PaymentMethod(enums::PaymentMethod::Card)),\n None,\n None::<()>,\n );\n\n let payment_type_value_node = builder.make_value_node(\n cgraph::NodeValue::Value(dir::DirValue::PaymentType(\n euclid::enums::PaymentType::UpdateMandate,\n )),\n None,\n None::<()>,\n );\n\n let mut agg_nodes: Vec<(cgraph::NodeId, cgraph::Relation, cgraph::Strength)> = Vec::new();\n let mut card_dir_values = Vec::new();\n let mut non_card_dir_values = Vec::new();\n\n if let Some(supported_pm_for_mandates) = supported_payment_methods_for_update_mandate\n .0\n .get(payment_method)\n {\n if payment_method == &enums::PaymentMethod::Card {\n if let Some(credit_connector_list) = supported_pm_for_mandates\n .0\n .get(&api_enums::PaymentMethodType::Credit)\n {\n card_dir_values.extend(\n credit_connector_list\n .connector_list\n .clone()\n .into_iter()\n .filter_map(|connector| {\n api_enums::RoutableConnectors::from_str(connector.to_string().as_str())\n .ok()\n .map(|connector| {\n dir::DirValue::Connector(Box::new(\n api_models::routing::ast::ConnectorChoice { connector },\n ))\n })\n }),\n );\n }\n\n if let Some(debit_connector_list) = supported_pm_for_mandates\n .0\n .get(&api_enums::PaymentMethodType::Debit)\n {\n card_dir_values.extend(\n debit_connector_list\n .connector_list\n .clone()\n .into_iter()\n .filter_map(|connector| {\n api_enums::RoutableConnectors::from_str(connector.to_string().as_str())\n .ok()\n .map(|connector| {\n dir::DirValue::Connector(Box::new(\n api_models::routing::ast::ConnectorChoice { connector },\n ))\n })\n }),\n );\n }\n let card_in_node = builder\n .make_in_aggregator(card_dir_values, None, None::<()>)\n .map_err(KgraphError::GraphConstructionError)?;\n\n let card_and_node = builder\n .make_all_aggregator(\n &[\n (\n card_value_node,\n cgraph::Relation::Positive,\n cgraph::Strength::Strong,\n ),\n (\n payment_type_value_node,\n cgraph::Relation::Positive,\n cgraph::Strength::Strong,\n ),\n (\n card_in_node,\n cgraph::Relation::Positive,\n cgraph::Strength::Strong,\n ),\n ],\n None,\n None::<()>,\n Some(domain_id),\n )\n .map_err(KgraphError::GraphConstructionError)?;\n\n agg_nodes.push((\n card_and_node,\n cgraph::Relation::Positive,\n cgraph::Strength::Strong,\n ));\n } else if let Some(connector_list) =\n supported_pm_for_mandates.0.get(&pmt.payment_method_type)\n {\n non_card_dir_values.extend(\n connector_list\n .connector_list\n .clone()\n .into_iter()\n .filter_map(|connector| {\n api_enums::RoutableConnectors::from_str(connector.to_string().as_str())\n .ok()\n .map(|connector| {\n dir::DirValue::Connector(Box::new(\n api_models::routing::ast::ConnectorChoice { connector },\n ))\n })\n }),\n );\n let non_card_mandate_in_node = builder\n .make_in_aggregator(non_card_dir_values, None, None::<()>)\n .map_err(KgraphError::GraphConstructionError)?;\n\n let non_card_and_node = builder\n .make_all_aggregator(\n &[\n (\n card_value_node,\n cgraph::Relation::Negative,\n cgraph::Strength::Strong,\n ),\n (\n payment_type_value_node,\n cgraph::Relation::Positive,\n cgraph::Strength::Strong,\n ),\n (\n non_card_mandate_in_node,\n cgraph::Relation::Positive,\n cgraph::Strength::Strong,\n ),\n ],\n None,\n None::<()>,\n Some(domain_id),\n )\n .map_err(KgraphError::GraphConstructionError)?;\n\n agg_nodes.push((\n non_card_and_node,\n cgraph::Relation::Positive,\n cgraph::Strength::Strong,\n ));\n }\n }\n\n if !agg_nodes.is_empty() {\n Ok(Some(\n builder\n .make_any_aggregator(\n &agg_nodes,\n Some(\"any node for card and non card pm\"),\n None::<()>,\n Some(domain_id),\n )\n .map_err(KgraphError::GraphConstructionError)?,\n ))\n } else {\n Ok(None)\n }\n}",
17
+ "diff_span": {
18
+ "before": " }\n\n if agg_nodes.len() > 0 {\n Ok(Some(\n builder",
19
+ "after": " }\n\n if !agg_nodes.is_empty() {\n Ok(Some(\n builder"
20
+ },
21
+ "commit_sha": "0b3f1d07b44c735fc9f35e991a2368395733805d"
22
+ }
23
+ ]
24
+ }
diffs/pr_6789/395368b/diff.json ADDED
@@ -0,0 +1,6 @@
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "395368b23866eebc6ed8218767621b3adc98737e",
3
+ "pr_number": 6789,
4
+ "rust_files": [],
5
+ "diffs": []
6
+ }
diffs/pr_6829/27ec108/diff.json ADDED
The diff for this file is too large to render. See raw diff
 
diffs/pr_6888/a2ac344/diff.json ADDED
The diff for this file is too large to render. See raw diff
 
diffs/pr_6906/0e9034a/diff.json ADDED
@@ -0,0 +1,64 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "0e9034af214356d4e6ae56a90b52d363149f4587",
3
+ "pr_number": 6906,
4
+ "rust_files": [
5
+ "crates/router/src/utils/currency.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/router/src/utils/currency.rs::function::get_forex_rates",
10
+ "file": "crates/router/src/utils/currency.rs",
11
+ "kind": "function_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "pub async fn get_forex_rates(\n state: &SessionState,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n if let Some(local_rates) = retrieve_forex_from_local_cache().await {\n if local_rates.is_expired(call_delay) {\n // expired local data\n logger::debug!(\"forex_log: Forex stored in cache is expired\");\n call_forex_api_and_save_data_to_cache_and_redis(state, Some(local_rates)).await\n } else {\n // Valid data present in local\n logger::debug!(\"forex_log: forex found in cache\");\n Ok(local_rates)\n }\n } else {\n // No data in local\n check_local_cache_expiry_and_call_api(state, call_delay).await\n }\n}",
16
+ "after_code": "pub async fn get_forex_rates(\n state: &SessionState,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n if let Some(local_rates) = retrieve_forex_from_local_cache().await {\n if local_rates.is_expired(call_delay) {\n // expired local data\n logger::debug!(\"forex_log: Forex stored in cache is expired\");\n call_forex_api_and_save_data_to_cache_and_redis(state, Some(local_rates)).await\n } else {\n // Valid data present in local\n logger::debug!(\"forex_log: forex found in cache\");\n Ok(local_rates)\n }\n } else {\n // No data in local\n call_api_if_redis_forex_data_expired(state, call_delay).await\n }\n}",
17
+ "diff_span": {
18
+ "before": " } else {\n // No data in local\n check_local_cache_expiry_and_call_api(state, call_delay).await\n }\n}",
19
+ "after": " } else {\n // No data in local\n call_api_if_redis_forex_data_expired(state, call_delay).await\n }\n}"
20
+ },
21
+ "commit_sha": "0e9034af214356d4e6ae56a90b52d363149f4587"
22
+ },
23
+ {
24
+ "id": "crates/router/src/utils/currency.rs::function::call_forex_api_if_redis_data_expired",
25
+ "file": "crates/router/src/utils/currency.rs",
26
+ "kind": "function_item",
27
+ "status": "added",
28
+ "before_code": null,
29
+ "after_code": "async fn call_forex_api_if_redis_data_expired(\n state: &SessionState,\n redis_data: FxExchangeRatesCacheEntry,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match is_redis_expired(Some(redis_data.clone()).as_ref(), call_delay).await {\n Some(redis_forex) => {\n // Valid data present in redis\n let exchange_rates = FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());\n logger::debug!(\"forex_log: forex response found in redis\");\n save_forex_data_to_local_cache(exchange_rates.clone()).await?;\n Ok(exchange_rates)\n }\n None => {\n // redis expired\n call_forex_api_and_save_data_to_cache_and_redis(state, Some(redis_data)).await\n }\n }\n}",
30
+ "diff_span": null,
31
+ "commit_sha": "0e9034af214356d4e6ae56a90b52d363149f4587"
32
+ },
33
+ {
34
+ "id": "crates/router/src/utils/currency.rs::function::call_api_if_redis_forex_data_expired",
35
+ "file": "crates/router/src/utils/currency.rs",
36
+ "kind": "function_item",
37
+ "status": "added",
38
+ "before_code": null,
39
+ "after_code": "async fn call_api_if_redis_forex_data_expired(\n state: &SessionState,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match retrieve_forex_data_from_redis(state).await {\n Ok(Some(data)) => call_forex_api_if_redis_data_expired(state, data, call_delay).await,\n Ok(None) => {\n // No data in local as well as redis\n call_forex_api_and_save_data_to_cache_and_redis(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n Err(error) => {\n // Error in deriving forex rates from redis\n logger::error!(\"forex_error: {:?}\", error);\n call_forex_api_and_save_data_to_cache_and_redis(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n }\n}",
40
+ "diff_span": null,
41
+ "commit_sha": "0e9034af214356d4e6ae56a90b52d363149f4587"
42
+ },
43
+ {
44
+ "id": "crates/router/src/utils/currency.rs::function::check_local_cache_expiry_and_call_api",
45
+ "file": "crates/router/src/utils/currency.rs",
46
+ "kind": "function_item",
47
+ "status": "removed",
48
+ "before_code": "async fn check_local_cache_expiry_and_call_api(\n state: &SessionState,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match retrieve_forex_data_from_redis(state).await {\n Ok(Some(data)) => check_redis_data_expiry_and_call_api(state, data, call_delay).await,\n Ok(None) => {\n // No data in local as well as redis\n call_forex_api_and_save_data_to_cache_and_redis(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n Err(error) => {\n // Error in deriving forex rates from redis\n logger::error!(\"forex_error: {:?}\", error);\n call_forex_api_and_save_data_to_cache_and_redis(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n }\n}",
49
+ "after_code": null,
50
+ "diff_span": null,
51
+ "commit_sha": "0e9034af214356d4e6ae56a90b52d363149f4587"
52
+ },
53
+ {
54
+ "id": "crates/router/src/utils/currency.rs::function::check_redis_data_expiry_and_call_api",
55
+ "file": "crates/router/src/utils/currency.rs",
56
+ "kind": "function_item",
57
+ "status": "removed",
58
+ "before_code": "async fn check_redis_data_expiry_and_call_api(\n state: &SessionState,\n redis_data: FxExchangeRatesCacheEntry,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match is_redis_expired(Some(redis_data.clone()).as_ref(), call_delay).await {\n Some(redis_forex) => {\n // Valid data present in redis\n let exchange_rates = FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());\n logger::debug!(\"forex_log: forex response found in redis\");\n save_forex_data_to_local_cache(exchange_rates.clone()).await?;\n Ok(exchange_rates)\n }\n None => {\n // redis expired\n call_forex_api_and_save_data_to_cache_and_redis(state, Some(redis_data)).await\n }\n }\n}",
59
+ "after_code": null,
60
+ "diff_span": null,
61
+ "commit_sha": "0e9034af214356d4e6ae56a90b52d363149f4587"
62
+ }
63
+ ]
64
+ }
diffs/pr_6906/140853d/diff.json ADDED
@@ -0,0 +1,49 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "140853dc89bbf2a90d8bfc62fe4feb54a7bcc7b8",
3
+ "pr_number": 6906,
4
+ "rust_files": [
5
+ "crates/router/src/utils/currency.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/router/src/utils/currency.rs::function::successive_fetch_and_save_forex",
10
+ "file": "crates/router/src/utils/currency.rs",
11
+ "kind": "function_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "async fn successive_fetch_and_save_forex(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match acquire_redis_lock(state).await {\n Ok(lock_acquired) => {\n if !lock_acquired {\n return stale_redis_data.ok_or(ForexCacheError::CouldNotAcquireLock.into());\n }\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => successive_save_data_to_redis_local(state, rates).await,\n Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(?error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(error) => stale_redis_data.ok_or({\n logger::error!(?error);\n release_redis_lock(state).await?;\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n }\n }\n }\n Err(error) => stale_redis_data.ok_or({\n logger::error!(?error);\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n}",
16
+ "after_code": "async fn successive_fetch_and_save_forex(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n // spawn a new thread and do the api fetch and write operations on redis.\n let stale_forex_data = stale_redis_data.clone();\n let state = state.clone();\n tokio::spawn(\n async move {\n acquire_redis_lock_and_fetch_data(&state, stale_redis_data).await;\n }\n .in_current_span(),\n );\n stale_forex_data.ok_or(ForexCacheError::EntryNotFound.into())\n}",
17
+ "diff_span": {
18
+ "before": " stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match acquire_redis_lock(state).await {\n Ok(lock_acquired) => {\n if !lock_acquired {\n return stale_redis_data.ok_or(ForexCacheError::CouldNotAcquireLock.into());\n }\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => successive_save_data_to_redis_local(state, rates).await,\n Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(?error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(error) => stale_redis_data.ok_or({\n logger::error!(?error);\n release_redis_lock(state).await?;\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n }\n }\n }\n Err(error) => stale_redis_data.ok_or({\n logger::error!(?error);\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n}",
19
+ "after": " stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n // spawn a new thread and do the api fetch and write operations on redis.\n let stale_forex_data = stale_redis_data.clone();\n let state = state.clone();\n tokio::spawn(\n async move {\n acquire_redis_lock_and_fetch_data(&state, stale_redis_data).await;\n }\n .in_current_span(),\n );\n stale_forex_data.ok_or(ForexCacheError::EntryNotFound.into())\n}"
20
+ },
21
+ "commit_sha": "140853dc89bbf2a90d8bfc62fe4feb54a7bcc7b8"
22
+ },
23
+ {
24
+ "id": "crates/router/src/utils/currency.rs::function::acquire_redis_lock",
25
+ "file": "crates/router/src/utils/currency.rs",
26
+ "kind": "function_item",
27
+ "status": "modified",
28
+ "code_changed": true,
29
+ "imports_changed": false,
30
+ "before_code": "async fn acquire_redis_lock(state: &SessionState) -> CustomResult<bool, ForexCacheError> {\n let forex_api = state.conf.forex_api.get_inner();\n state\n .store\n .get_redis_conn()\n .change_context(ForexCacheError::RedisConnectionError)?\n .set_key_if_not_exists_with_expiry(\n REDIX_FOREX_CACHE_KEY,\n \"\",\n Some(\n i64::try_from(\n forex_api.local_fetch_retry_count * forex_api.local_fetch_retry_delay\n + forex_api.api_timeout,\n )\n .change_context(ForexCacheError::ConversionError)?,\n ),\n )\n .await\n .map(|val| matches!(val, redis_interface::SetnxReply::KeySet))\n .change_context(ForexCacheError::CouldNotAcquireLock)\n .attach_printable(\"Unable to acquire redis lock\")\n}",
31
+ "after_code": "async fn acquire_redis_lock(state: &SessionState) -> CustomResult<bool, ForexCacheError> {\n let forex_api = state.conf.forex_api.get_inner();\n state\n .store\n .get_redis_conn()\n .change_context(ForexCacheError::RedisConnectionError)?\n .set_key_if_not_exists_with_expiry(\n REDIX_FOREX_CACHE_KEY,\n \"\",\n Some(\n i64::try_from(forex_api.local_fetch_retry_delay)\n .change_context(ForexCacheError::ConversionError)?,\n ),\n )\n .await\n .map(|val| matches!(val, redis_interface::SetnxReply::KeySet))\n .change_context(ForexCacheError::CouldNotAcquireLock)\n .attach_printable(\"Unable to acquire redis lock\")\n}",
32
+ "diff_span": {
33
+ "before": " \"\",\n Some(\n i64::try_from(\n forex_api.local_fetch_retry_count * forex_api.local_fetch_retry_delay\n + forex_api.api_timeout,\n )\n .change_context(ForexCacheError::ConversionError)?,\n ),\n )",
34
+ "after": " \"\",\n Some(\n i64::try_from(forex_api.local_fetch_retry_delay)\n .change_context(ForexCacheError::ConversionError)?,\n ),\n )"
35
+ },
36
+ "commit_sha": "140853dc89bbf2a90d8bfc62fe4feb54a7bcc7b8"
37
+ },
38
+ {
39
+ "id": "crates/router/src/utils/currency.rs::function::acquire_redis_lock_and_fetch_data",
40
+ "file": "crates/router/src/utils/currency.rs",
41
+ "kind": "function_item",
42
+ "status": "added",
43
+ "before_code": null,
44
+ "after_code": "async fn acquire_redis_lock_and_fetch_data(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match acquire_redis_lock(state).await {\n Ok(lock_acquired) => {\n if !lock_acquired {\n return stale_redis_data.ok_or(ForexCacheError::CouldNotAcquireLock.into());\n }\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => successive_save_data_to_redis_local(state, rates).await,\n Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(?error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(error) => stale_redis_data.ok_or({\n logger::error!(?error);\n release_redis_lock(state).await?;\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n }\n }\n }\n Err(error) => stale_redis_data.ok_or({\n logger::error!(?error);\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n}",
45
+ "diff_span": null,
46
+ "commit_sha": "140853dc89bbf2a90d8bfc62fe4feb54a7bcc7b8"
47
+ }
48
+ ]
49
+ }
diffs/pr_6906/29c4f5e/diff.json ADDED
@@ -0,0 +1,100 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "29c4f5e49e7653e47c345e8659663522552b9233",
3
+ "pr_number": 6906,
4
+ "rust_files": [
5
+ "crates/router/src/configs/settings.rs",
6
+ "crates/router/src/utils/currency.rs"
7
+ ],
8
+ "diffs": [
9
+ {
10
+ "id": "crates/router/src/utils/currency.rs::function::fallback_forex_redis_check",
11
+ "file": "crates/router/src/utils/currency.rs",
12
+ "kind": "function_item",
13
+ "status": "modified",
14
+ "code_changed": true,
15
+ "imports_changed": false,
16
+ "before_code": "async fn fallback_forex_redis_check(\n state: &SessionState,\n redis_data: FxExchangeRatesCacheEntry,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match is_redis_expired(Some(redis_data.clone()).as_ref(), call_delay).await {\n Some(redis_forex) => {\n // Valid data present in redis\n let exchange_rates = FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());\n save_forex_to_local(exchange_rates.clone()).await?;\n Ok(exchange_rates)\n }\n None => {\n // redis expired\n successive_fetch_and_save_forex(state, Some(redis_data)).await\n }\n }\n}",
17
+ "after_code": "async fn fallback_forex_redis_check(\n state: &SessionState,\n redis_data: FxExchangeRatesCacheEntry,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match is_redis_expired(Some(redis_data.clone()).as_ref(), call_delay).await {\n Some(redis_forex) => {\n // Valid data present in redis\n let exchange_rates = FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());\n logger::debug!(\"forex_log: forex response from redis\");\n save_forex_to_local(exchange_rates.clone()).await?;\n Ok(exchange_rates)\n }\n None => {\n // redis expired\n successive_fetch_and_save_forex(state, Some(redis_data)).await\n }\n }\n}",
18
+ "diff_span": {
19
+ "before": "",
20
+ "after": " // Valid data present in redis\n let exchange_rates = FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());\n logger::debug!(\"forex_log: forex response from redis\");\n save_forex_to_local(exchange_rates.clone()).await?;\n Ok(exchange_rates)"
21
+ },
22
+ "commit_sha": "29c4f5e49e7653e47c345e8659663522552b9233"
23
+ },
24
+ {
25
+ "id": "crates/router/src/configs/settings.rs::struct::ForexApi",
26
+ "file": "crates/router/src/configs/settings.rs",
27
+ "kind": "struct_item",
28
+ "status": "modified",
29
+ "code_changed": true,
30
+ "imports_changed": false,
31
+ "before_code": "pub struct ForexApi {\n pub local_fetch_retry_count: u64,\n pub api_key: Secret<String>,\n pub fallback_api_key: Secret<String>,\n /// in ms\n pub call_delay: i64,\n /// in ms\n pub local_fetch_retry_delay: u64,\n /// in ms\n pub api_timeout: u64,\n /// in ms\n pub redis_lock_timeout: u64,\n}",
32
+ "after_code": "pub struct ForexApi {\n pub api_key: Secret<String>,\n pub fallback_api_key: Secret<String>,\n /// in s\n pub call_delay: i64,\n /// in ms\n pub api_timeout: u64,\n /// in s\n pub redis_lock_timeout: u64,\n}",
33
+ "diff_span": {
34
+ "before": "pub struct ForexApi {\n pub local_fetch_retry_count: u64,\n pub api_key: Secret<String>,\n pub fallback_api_key: Secret<String>,\n /// in ms\n pub call_delay: i64,\n /// in ms\n pub local_fetch_retry_delay: u64,\n /// in ms\n pub api_timeout: u64,\n /// in ms\n pub redis_lock_timeout: u64,\n}",
35
+ "after": " pub api_key: Secret<String>,\n pub fallback_api_key: Secret<String>,\n /// in s\n pub call_delay: i64,\n /// in ms\n pub api_timeout: u64,\n /// in s\n pub redis_lock_timeout: u64,\n}"
36
+ },
37
+ "commit_sha": "29c4f5e49e7653e47c345e8659663522552b9233"
38
+ },
39
+ {
40
+ "id": "crates/router/src/utils/currency.rs::function::get_forex_rates",
41
+ "file": "crates/router/src/utils/currency.rs",
42
+ "kind": "function_item",
43
+ "status": "modified",
44
+ "code_changed": true,
45
+ "imports_changed": false,
46
+ "before_code": "pub async fn get_forex_rates(\n state: &SessionState,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n if let Some(local_rates) = retrieve_forex_from_local().await {\n if local_rates.is_expired(call_delay) {\n // expired local data\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n } else {\n // Valid data present in local\n Ok(local_rates)\n }\n } else {\n // No data in local\n handler_local_no_data(state, call_delay).await\n }\n}",
47
+ "after_code": "pub async fn get_forex_rates(\n state: &SessionState,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n if let Some(local_rates) = retrieve_forex_from_local().await {\n if local_rates.is_expired(call_delay) {\n // expired local data\n logger::debug!(\"forex_log: Forex stored in cache is expired\");\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n } else {\n // Valid data present in local\n logger::debug!(\"forex_log: forex response from cache\");\n Ok(local_rates)\n }\n } else {\n // No data in local\n handler_local_no_data(state, call_delay).await\n }\n}",
48
+ "diff_span": {
49
+ "before": "",
50
+ "after": " if local_rates.is_expired(call_delay) {\n // expired local data\n logger::debug!(\"forex_log: Forex stored in cache is expired\");\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n } else {\n // Valid data present in local\n logger::debug!(\"forex_log: forex response from cache\");\n Ok(local_rates)\n }"
51
+ },
52
+ "commit_sha": "29c4f5e49e7653e47c345e8659663522552b9233"
53
+ },
54
+ {
55
+ "id": "crates/router/src/utils/currency.rs::function::successive_fetch_and_save_forex",
56
+ "file": "crates/router/src/utils/currency.rs",
57
+ "kind": "function_item",
58
+ "status": "modified",
59
+ "code_changed": true,
60
+ "imports_changed": false,
61
+ "before_code": "async fn successive_fetch_and_save_forex(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n // spawn a new thread and do the api fetch and write operations on redis.\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n if forex_api_key.eq(\"\") {\n logger::debug!(\"forex_log: api_keys not present in configs\");\n Err(ForexCacheError::ConfigurationError.into())\n } else {\n let stale_forex_data = stale_redis_data.clone();\n let state = state.clone();\n tokio::spawn(\n async move {\n let _ = acquire_redis_lock_and_fetch_data(&state, stale_redis_data).await;\n }\n .in_current_span(),\n );\n stale_forex_data.ok_or(ForexCacheError::EntryNotFound.into())\n }\n}",
62
+ "after_code": "async fn successive_fetch_and_save_forex(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n // spawn a new thread and do the api fetch and write operations on redis.\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n if forex_api_key.is_empty() {\n logger::debug!(\"forex_log: api_keys not present in configs\");\n Err(ForexCacheError::ConfigurationError.into())\n } else {\n let stale_forex_data = stale_redis_data.clone();\n let state = state.clone();\n tokio::spawn(\n async move {\n let _ = acquire_redis_lock_and_fetch_data(&state, stale_redis_data).await;\n }\n .in_current_span(),\n );\n stale_forex_data.ok_or(ForexCacheError::EntryNotFound.into())\n }\n}",
63
+ "diff_span": {
64
+ "before": " // spawn a new thread and do the api fetch and write operations on redis.\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n if forex_api_key.eq(\"\") {\n logger::debug!(\"forex_log: api_keys not present in configs\");\n Err(ForexCacheError::ConfigurationError.into())",
65
+ "after": " // spawn a new thread and do the api fetch and write operations on redis.\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n if forex_api_key.is_empty() {\n logger::debug!(\"forex_log: api_keys not present in configs\");\n Err(ForexCacheError::ConfigurationError.into())"
66
+ },
67
+ "commit_sha": "29c4f5e49e7653e47c345e8659663522552b9233"
68
+ },
69
+ {
70
+ "id": "crates/router/src/utils/currency.rs::function::is_redis_expired",
71
+ "file": "crates/router/src/utils/currency.rs",
72
+ "kind": "function_item",
73
+ "status": "modified",
74
+ "code_changed": true,
75
+ "imports_changed": false,
76
+ "before_code": "async fn is_redis_expired(\n redis_cache: Option<&FxExchangeRatesCacheEntry>,\n call_delay: i64,\n) -> Option<Arc<ExchangeRates>> {\n redis_cache.and_then(|cache| {\n if cache.timestamp + call_delay > date_time::now_unix_timestamp() {\n Some(cache.data.clone())\n } else {\n None\n }\n })\n}",
77
+ "after_code": "async fn is_redis_expired(\n redis_cache: Option<&FxExchangeRatesCacheEntry>,\n call_delay: i64,\n) -> Option<Arc<ExchangeRates>> {\n redis_cache.and_then(|cache| {\n if cache.timestamp + call_delay > date_time::now_unix_timestamp() {\n Some(cache.data.clone())\n } else {\n logger::debug!(\"forex_log: Forex stored in redis is expired\");\n None\n }\n })\n}",
78
+ "diff_span": {
79
+ "before": "",
80
+ "after": " Some(cache.data.clone())\n } else {\n logger::debug!(\"forex_log: Forex stored in redis is expired\");\n None\n }"
81
+ },
82
+ "commit_sha": "29c4f5e49e7653e47c345e8659663522552b9233"
83
+ },
84
+ {
85
+ "id": "crates/router/src/utils/currency.rs::function::save_forex_to_local",
86
+ "file": "crates/router/src/utils/currency.rs",
87
+ "kind": "function_item",
88
+ "status": "modified",
89
+ "code_changed": true,
90
+ "imports_changed": false,
91
+ "before_code": "async fn save_forex_to_local(\n exchange_rates_cache_entry: FxExchangeRatesCacheEntry,\n) -> CustomResult<(), ForexCacheError> {\n let mut local = FX_EXCHANGE_RATES_CACHE.write().await;\n *local = Some(exchange_rates_cache_entry);\n Ok(())\n}",
92
+ "after_code": "async fn save_forex_to_local(\n exchange_rates_cache_entry: FxExchangeRatesCacheEntry,\n) -> CustomResult<(), ForexCacheError> {\n let mut local = FX_EXCHANGE_RATES_CACHE.write().await;\n *local = Some(exchange_rates_cache_entry);\n logger::debug!(\"forex_log: forex saved in cache\");\n Ok(())\n}",
93
+ "diff_span": {
94
+ "before": "",
95
+ "after": " let mut local = FX_EXCHANGE_RATES_CACHE.write().await;\n *local = Some(exchange_rates_cache_entry);\n logger::debug!(\"forex_log: forex saved in cache\");\n Ok(())\n}"
96
+ },
97
+ "commit_sha": "29c4f5e49e7653e47c345e8659663522552b9233"
98
+ }
99
+ ]
100
+ }
diffs/pr_6906/35f39c1/diff.json ADDED
The diff for this file is too large to render. See raw diff
 
diffs/pr_6906/4d7959c/diff.json ADDED
@@ -0,0 +1,54 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "4d7959c6d40f633139051b63b92cc947f8be3d40",
3
+ "pr_number": 6906,
4
+ "rust_files": [
5
+ "crates/router/src/utils/currency.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/router/src/utils/currency.rs::function::acquire_redis_lock_and_fetch_data",
10
+ "file": "crates/router/src/utils/currency.rs",
11
+ "kind": "function_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "async fn acquire_redis_lock_and_fetch_data(\n state: &SessionState,\n) -> CustomResult<(), ForexCacheError> {\n match acquire_redis_lock(state).await {\n Ok(lock_acquired) => {\n if !lock_acquired {\n logger::debug!(\"forex_log: Unable to acquire redis lock\");\n }\n logger::debug!(\"forex_log: redis lock acquired\");\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => {\n successive_save_data_to_redis_local(state, rates).await?;\n Ok(())\n }\n Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(\"forex_log: {:?}\", error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => {\n successive_save_data_to_redis_local(state, rates).await?;\n Ok(())\n }\n Err(error) => {\n logger::error!(\"forex_log: {:?}\", error);\n release_redis_lock(state).await?;\n Ok(())\n }\n }\n }\n }\n }\n Err(error) => {\n logger::error!(\"forex_log: {:?}\", error);\n Ok(())\n }\n }\n}",
16
+ "after_code": "async fn acquire_redis_lock_and_fetch_data(\n state: &SessionState,\n) -> CustomResult<(), ForexCacheError> {\n match acquire_redis_lock(state).await {\n Ok(lock_acquired) => {\n if !lock_acquired {\n logger::error!(\"forex_log: Unable to acquire redis lock\");\n return Err(ForexCacheError::CouldNotAcquireLock.into());\n }\n logger::debug!(\"forex_log: redis lock acquired\");\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => {\n successive_save_data_to_redis_local(state, rates).await?;\n Ok(())\n }\n Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(\"forex_log: {:?}\", error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => {\n successive_save_data_to_redis_local(state, rates).await?;\n Ok(())\n }\n Err(error) => {\n logger::error!(\"forex_log: {:?}\", error);\n release_redis_lock(state).await?;\n Ok(())\n }\n }\n }\n }\n }\n Err(error) => {\n logger::error!(\"forex_log: {:?}\", error);\n Ok(())\n }\n }\n}",
17
+ "diff_span": {
18
+ "before": " Ok(lock_acquired) => {\n if !lock_acquired {\n logger::debug!(\"forex_log: Unable to acquire redis lock\");\n }\n logger::debug!(\"forex_log: redis lock acquired\");",
19
+ "after": " Ok(lock_acquired) => {\n if !lock_acquired {\n logger::error!(\"forex_log: Unable to acquire redis lock\");\n return Err(ForexCacheError::CouldNotAcquireLock.into());\n }\n logger::debug!(\"forex_log: redis lock acquired\");"
20
+ },
21
+ "commit_sha": "4d7959c6d40f633139051b63b92cc947f8be3d40"
22
+ },
23
+ {
24
+ "id": "crates/router/src/utils/currency.rs::function::fetch_forex_rates",
25
+ "file": "crates/router/src/utils/currency.rs",
26
+ "kind": "function_item",
27
+ "status": "modified",
28
+ "code_changed": true,
29
+ "imports_changed": false,
30
+ "before_code": "async fn fetch_forex_rates(\n state: &SessionState,\n) -> Result<FxExchangeRatesCacheEntry, error_stack::Report<ForexCacheError>> {\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n\n logger::debug!(\"forex_log: Primary api call for forex fetch\");\n let forex_url: String = format!(\"{}{}{}\", FOREX_BASE_URL, forex_api_key, FOREX_BASE_CURRENCY);\n let forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&forex_url)\n .build();\n\n logger::debug!(\"forex_log: Primary api call for forex fetch\");\n logger::info!(\"forex_log: primary_forex_request: {:?}\", forex_request);\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Primary forex fetch api unresponsive\")?;\n let forex_response = response\n .json::<ForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from primary api into ForexResponse\",\n )?;\n\n logger::info!(\"forex_log: primary_forex_response: {:?}\", forex_response);\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match forex_response.rates.get(&enum_curr.to_string()) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n }\n };\n }\n\n Ok(FxExchangeRatesCacheEntry::new(ExchangeRates::new(\n enums::Currency::USD,\n conversions,\n )))\n}",
31
+ "after_code": "async fn fetch_forex_rates(\n state: &SessionState,\n) -> Result<FxExchangeRatesCacheEntry, error_stack::Report<ForexCacheError>> {\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n\n logger::debug!(\"forex_log: Primary api call for forex fetch\");\n let forex_url: String = format!(\"{}{}{}\", FOREX_BASE_URL, forex_api_key, FOREX_BASE_CURRENCY);\n let forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&forex_url)\n .build();\n\n logger::debug!(\"forex_log: Primary api call for forex fetch\");\n logger::info!(primary_forex_request=?forex_request,\"forex_log\");\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Primary forex fetch api unresponsive\")?;\n let forex_response = response\n .json::<ForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from primary api into ForexResponse\",\n )?;\n\n logger::info!(primary_forex_response=?forex_response,\"forex_log\");\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match forex_response.rates.get(&enum_curr.to_string()) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n }\n };\n }\n\n Ok(FxExchangeRatesCacheEntry::new(ExchangeRates::new(\n enums::Currency::USD,\n conversions,\n )))\n}",
32
+ "diff_span": {
33
+ "before": "\n logger::debug!(\"forex_log: Primary api call for forex fetch\");\n logger::info!(\"forex_log: primary_forex_request: {:?}\", forex_request);\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Primary forex fetch api unresponsive\")?;\n let forex_response = response\n .json::<ForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from primary api into ForexResponse\",\n )?;\n\n logger::info!(\"forex_log: primary_forex_response: {:?}\", forex_response);\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();",
34
+ "after": "\n logger::debug!(\"forex_log: Primary api call for forex fetch\");\n logger::info!(primary_forex_request=?forex_request,\"forex_log\");\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Primary forex fetch api unresponsive\")?;\n let forex_response = response\n .json::<ForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from primary api into ForexResponse\",\n )?;\n\n logger::info!(primary_forex_response=?forex_response,\"forex_log\");\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();"
35
+ },
36
+ "commit_sha": "4d7959c6d40f633139051b63b92cc947f8be3d40"
37
+ },
38
+ {
39
+ "id": "crates/router/src/utils/currency.rs::function::fallback_fetch_forex_rates",
40
+ "file": "crates/router/src/utils/currency.rs",
41
+ "kind": "function_item",
42
+ "status": "modified",
43
+ "code_changed": true,
44
+ "imports_changed": false,
45
+ "before_code": "pub async fn fallback_fetch_forex_rates(\n state: &SessionState,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n let fallback_forex_api_key = state.conf.forex_api.get_inner().fallback_api_key.peek();\n\n let fallback_forex_url: String =\n format!(\"{}{}\", FALLBACK_FOREX_BASE_URL, fallback_forex_api_key,);\n let fallback_forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&fallback_forex_url)\n .build();\n\n logger::debug!(\"forex_log: Fallback api call for forex fetch\");\n logger::info!(\n \"forex_log: fallback_forex_request: {:?}\",\n fallback_forex_request\n );\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n fallback_forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Fallback forex fetch api unresponsive\")?;\n\n let fallback_forex_response = response\n .json::<FallbackForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from falback api into ForexResponse\",\n )?;\n\n logger::info!(\n \"forex_log: fallback_forex_response: {:?}\",\n fallback_forex_response\n );\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match fallback_forex_response.quotes.get(\n format!(\n \"{}{}\",\n FALLBACK_FOREX_API_CURRENCY_PREFIX,\n &enum_curr.to_string()\n )\n .as_str(),\n ) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n if enum_curr == enums::Currency::USD {\n let currency_factors =\n CurrencyFactors::new(Decimal::new(1, 0), Decimal::new(1, 0));\n conversions.insert(enum_curr, currency_factors);\n } else {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n }\n }\n };\n }\n\n let rates =\n FxExchangeRatesCacheEntry::new(ExchangeRates::new(enums::Currency::USD, conversions));\n match acquire_redis_lock(state).await {\n Ok(_) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(e) => {\n logger::error!(\"forex_log: {:?}\", e);\n Ok(rates)\n }\n }\n}",
46
+ "after_code": "pub async fn fallback_fetch_forex_rates(\n state: &SessionState,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n let fallback_forex_api_key = state.conf.forex_api.get_inner().fallback_api_key.peek();\n\n let fallback_forex_url: String =\n format!(\"{}{}\", FALLBACK_FOREX_BASE_URL, fallback_forex_api_key,);\n let fallback_forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&fallback_forex_url)\n .build();\n\n logger::debug!(\"forex_log: Fallback api call for forex fetch\");\n logger::info!(fallback_forex_request=?fallback_forex_request,\"forex_log\");\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n fallback_forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Fallback forex fetch api unresponsive\")?;\n\n let fallback_forex_response = response\n .json::<FallbackForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from falback api into ForexResponse\",\n )?;\n\n logger::info!(fallback_forex_response=?fallback_forex_response,\"forex_log\");\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match fallback_forex_response.quotes.get(\n format!(\n \"{}{}\",\n FALLBACK_FOREX_API_CURRENCY_PREFIX,\n &enum_curr.to_string()\n )\n .as_str(),\n ) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n if enum_curr == enums::Currency::USD {\n let currency_factors =\n CurrencyFactors::new(Decimal::new(1, 0), Decimal::new(1, 0));\n conversions.insert(enum_curr, currency_factors);\n } else {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n }\n }\n };\n }\n\n let rates =\n FxExchangeRatesCacheEntry::new(ExchangeRates::new(enums::Currency::USD, conversions));\n match acquire_redis_lock(state).await {\n Ok(_) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(e) => {\n logger::error!(\"forex_log: {:?}\", e);\n Ok(rates)\n }\n }\n}",
47
+ "diff_span": {
48
+ "before": "\n logger::debug!(\"forex_log: Fallback api call for forex fetch\");\n logger::info!(\n \"forex_log: fallback_forex_request: {:?}\",\n fallback_forex_request\n );\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n fallback_forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Fallback forex fetch api unresponsive\")?;\n\n let fallback_forex_response = response\n .json::<FallbackForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from falback api into ForexResponse\",\n )?;\n\n logger::info!(\n \"forex_log: fallback_forex_response: {:?}\",\n fallback_forex_response\n );\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {",
49
+ "after": "\n logger::debug!(\"forex_log: Fallback api call for forex fetch\");\n logger::info!(fallback_forex_request=?fallback_forex_request,\"forex_log\");\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n fallback_forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Fallback forex fetch api unresponsive\")?;\n\n let fallback_forex_response = response\n .json::<FallbackForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from falback api into ForexResponse\",\n )?;\n\n logger::info!(fallback_forex_response=?fallback_forex_response,\"forex_log\");\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {"
50
+ },
51
+ "commit_sha": "4d7959c6d40f633139051b63b92cc947f8be3d40"
52
+ }
53
+ ]
54
+ }
diffs/pr_6906/5612162/diff.json ADDED
@@ -0,0 +1,24 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "5612162cdbb0489877363935795c14134acfb805",
3
+ "pr_number": 6906,
4
+ "rust_files": [
5
+ "crates/router/src/utils/currency.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/router/src/utils/currency.rs::function::acquire_redis_lock_and_fetch_data",
10
+ "file": "crates/router/src/utils/currency.rs",
11
+ "kind": "function_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "async fn acquire_redis_lock_and_fetch_data(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match acquire_redis_lock(state).await {\n Ok(lock_acquired) => {\n if !lock_acquired {\n return stale_redis_data.ok_or(ForexCacheError::CouldNotAcquireLock.into());\n }\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => {\n successive_save_data_to_redis_local(state, rates).await\n }\n Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(?error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(error) => stale_redis_data.ok_or({\n logger::error!(?error);\n release_redis_lock(state).await?;\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n }\n }\n }\n Err(error) => stale_redis_data.ok_or({\n logger::error!(?error);\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n}",
16
+ "after_code": "async fn acquire_redis_lock_and_fetch_data(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match acquire_redis_lock(state).await {\n Ok(lock_acquired) => {\n if !lock_acquired {\n return stale_redis_data.ok_or(ForexCacheError::CouldNotAcquireLock.into());\n }\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => successive_save_data_to_redis_local(state, rates).await,\n Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(?error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(error) => stale_redis_data.ok_or({\n logger::error!(?error);\n release_redis_lock(state).await?;\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n }\n }\n }\n Err(error) => stale_redis_data.ok_or({\n logger::error!(?error);\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n}",
17
+ "diff_span": {
18
+ "before": " let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => {\n successive_save_data_to_redis_local(state, rates).await\n }\n Err(error) => {\n // API not able to fetch data call secondary service",
19
+ "after": " let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => successive_save_data_to_redis_local(state, rates).await,\n Err(error) => {\n // API not able to fetch data call secondary service"
20
+ },
21
+ "commit_sha": "5612162cdbb0489877363935795c14134acfb805"
22
+ }
23
+ ]
24
+ }
diffs/pr_6906/723c6f4/diff.json ADDED
@@ -0,0 +1,244 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8",
3
+ "pr_number": 6906,
4
+ "rust_files": [
5
+ "crates/router/src/utils/currency.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/router/src/utils/currency.rs::function::get_forex_rates",
10
+ "file": "crates/router/src/utils/currency.rs",
11
+ "kind": "function_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "pub async fn get_forex_rates(\n state: &SessionState,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n if let Some(local_rates) = retrieve_forex_from_local().await {\n if local_rates.is_expired(call_delay) {\n // expired local data\n logger::debug!(\"forex_log: Forex stored in cache is expired\");\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n } else {\n // Valid data present in local\n logger::debug!(\"forex_log: forex found in cache\");\n Ok(local_rates)\n }\n } else {\n // No data in local\n handler_local_no_data(state, call_delay).await\n }\n}",
16
+ "after_code": "pub async fn get_forex_rates(\n state: &SessionState,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n if let Some(local_rates) = retrieve_forex_from_local_cache().await {\n if local_rates.is_expired(call_delay) {\n // expired local data\n logger::debug!(\"forex_log: Forex stored in cache is expired\");\n call_forex_api_and_save_data_to_cache_and_redis(state, Some(local_rates)).await\n } else {\n // Valid data present in local\n logger::debug!(\"forex_log: forex found in cache\");\n Ok(local_rates)\n }\n } else {\n // No data in local\n check_local_cache_expiry_and_call_api(state, call_delay).await\n }\n}",
17
+ "diff_span": {
18
+ "before": " call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n if let Some(local_rates) = retrieve_forex_from_local().await {\n if local_rates.is_expired(call_delay) {\n // expired local data\n logger::debug!(\"forex_log: Forex stored in cache is expired\");\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n } else {\n // Valid data present in local\n logger::debug!(\"forex_log: forex found in cache\");\n Ok(local_rates)\n }\n } else {\n // No data in local\n handler_local_no_data(state, call_delay).await\n }\n}",
19
+ "after": " call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n if let Some(local_rates) = retrieve_forex_from_local_cache().await {\n if local_rates.is_expired(call_delay) {\n // expired local data\n logger::debug!(\"forex_log: Forex stored in cache is expired\");\n call_forex_api_and_save_data_to_cache_and_redis(state, Some(local_rates)).await\n } else {\n // Valid data present in local\n logger::debug!(\"forex_log: forex found in cache\");\n Ok(local_rates)\n }\n } else {\n // No data in local\n check_local_cache_expiry_and_call_api(state, call_delay).await\n }\n}"
20
+ },
21
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
22
+ },
23
+ {
24
+ "id": "crates/router/src/utils/currency.rs::function::save_forex_data_to_redis",
25
+ "file": "crates/router/src/utils/currency.rs",
26
+ "kind": "function_item",
27
+ "status": "added",
28
+ "before_code": null,
29
+ "after_code": "async fn save_forex_data_to_redis(\n app_state: &SessionState,\n forex_exchange_cache_entry: &FxExchangeRatesCacheEntry,\n) -> CustomResult<(), ForexCacheError> {\n logger::debug!(\"forex_log: Saving forex to redis\");\n app_state\n .store\n .get_redis_conn()\n .change_context(ForexCacheError::RedisConnectionError)?\n .serialize_and_set_key(REDIX_FOREX_CACHE_DATA, forex_exchange_cache_entry)\n .await\n .change_context(ForexCacheError::RedisWriteError)\n .attach_printable(\"Unable to save forex data to redis\")\n}",
30
+ "diff_span": null,
31
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
32
+ },
33
+ {
34
+ "id": "crates/router/src/utils/currency.rs::function::call_forex_api_and_save_data_to_cache_and_redis",
35
+ "file": "crates/router/src/utils/currency.rs",
36
+ "kind": "function_item",
37
+ "status": "added",
38
+ "before_code": null,
39
+ "after_code": "async fn call_forex_api_and_save_data_to_cache_and_redis(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n // spawn a new thread and do the api fetch and write operations on redis.\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n if forex_api_key.is_empty() {\n Err(ForexCacheError::ConfigurationError(\"api_keys not provided\".into()).into())\n } else {\n let state = state.clone();\n tokio::spawn(\n async move {\n acquire_redis_lock_and_call_forex_api(&state)\n .await\n .map_err(|err| {\n logger::error!(forex_error=?err);\n })\n .ok();\n }\n .in_current_span(),\n );\n stale_redis_data.ok_or(ForexCacheError::EntryNotFound.into())\n }\n}",
40
+ "diff_span": null,
41
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
42
+ },
43
+ {
44
+ "id": "crates/router/src/utils/currency.rs::function::retrieve_forex_data_from_redis",
45
+ "file": "crates/router/src/utils/currency.rs",
46
+ "kind": "function_item",
47
+ "status": "added",
48
+ "before_code": null,
49
+ "after_code": "async fn retrieve_forex_data_from_redis(\n app_state: &SessionState,\n) -> CustomResult<Option<FxExchangeRatesCacheEntry>, ForexCacheError> {\n logger::debug!(\"forex_log: Retrieving forex from redis\");\n app_state\n .store\n .get_redis_conn()\n .change_context(ForexCacheError::RedisConnectionError)?\n .get_and_deserialize_key(REDIX_FOREX_CACHE_DATA, \"FxExchangeRatesCache\")\n .await\n .change_context(ForexCacheError::EntryNotFound)\n .attach_printable(\"Forex entry not found in redis\")\n}",
50
+ "diff_span": null,
51
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
52
+ },
53
+ {
54
+ "id": "crates/router/src/utils/currency.rs::function::save_forex_data_to_cache_and_redis",
55
+ "file": "crates/router/src/utils/currency.rs",
56
+ "kind": "function_item",
57
+ "status": "added",
58
+ "before_code": null,
59
+ "after_code": "async fn save_forex_data_to_cache_and_redis(\n state: &SessionState,\n forex: FxExchangeRatesCacheEntry,\n) -> CustomResult<(), ForexCacheError> {\n save_forex_data_to_redis(state, &forex)\n .await\n .async_and_then(|_rates| release_redis_lock(state))\n .await\n .async_and_then(|_val| save_forex_data_to_local_cache(forex.clone()))\n .await\n}",
60
+ "diff_span": null,
61
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
62
+ },
63
+ {
64
+ "id": "crates/router/src/utils/currency.rs::function::check_local_cache_expiry_and_call_api",
65
+ "file": "crates/router/src/utils/currency.rs",
66
+ "kind": "function_item",
67
+ "status": "added",
68
+ "before_code": null,
69
+ "after_code": "async fn check_local_cache_expiry_and_call_api(\n state: &SessionState,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match retrieve_forex_data_from_redis(state).await {\n Ok(Some(data)) => check_redis_data_expiry_and_call_api(state, data, call_delay).await,\n Ok(None) => {\n // No data in local as well as redis\n call_forex_api_and_save_data_to_cache_and_redis(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n Err(error) => {\n // Error in deriving forex rates from redis\n logger::error!(\"forex_error: {:?}\", error);\n call_forex_api_and_save_data_to_cache_and_redis(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n }\n}",
70
+ "diff_span": null,
71
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
72
+ },
73
+ {
74
+ "id": "crates/router/src/utils/currency.rs::function::fetch_forex_rates_from_fallback_api",
75
+ "file": "crates/router/src/utils/currency.rs",
76
+ "kind": "function_item",
77
+ "status": "added",
78
+ "before_code": null,
79
+ "after_code": "pub async fn fetch_forex_rates_from_fallback_api(\n state: &SessionState,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n let fallback_forex_api_key = state.conf.forex_api.get_inner().fallback_api_key.peek();\n\n let fallback_forex_url: String =\n format!(\"{}{}\", FALLBACK_FOREX_BASE_URL, fallback_forex_api_key,);\n let fallback_forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&fallback_forex_url)\n .build();\n\n logger::info!(fallback_forex_request=?fallback_forex_request,\"forex_log: Fallback api call for forex fetch\");\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n fallback_forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Fallback forex fetch api unresponsive\")?;\n\n let fallback_forex_response = response\n .json::<FallbackForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from falback api into ForexResponse\",\n )?;\n\n logger::info!(fallback_forex_response=?fallback_forex_response,\"forex_log\");\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match fallback_forex_response.quotes.get(\n format!(\n \"{}{}\",\n FALLBACK_FOREX_API_CURRENCY_PREFIX,\n &enum_curr.to_string()\n )\n .as_str(),\n ) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\n \"forex_error: Rates for {} not received from API\",\n &enum_curr\n );\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n if enum_curr == enums::Currency::USD {\n let currency_factors =\n CurrencyFactors::new(Decimal::new(1, 0), Decimal::new(1, 0));\n conversions.insert(enum_curr, currency_factors);\n } else {\n logger::error!(\n \"forex_error: Rates for {} not received from API\",\n &enum_curr\n );\n }\n }\n };\n }\n\n let rates =\n FxExchangeRatesCacheEntry::new(ExchangeRates::new(enums::Currency::USD, conversions));\n match acquire_redis_lock(state).await {\n Ok(_) => {\n save_forex_data_to_cache_and_redis(state, rates.clone()).await?;\n Ok(rates)\n }\n Err(e) => Err(e),\n }\n}",
80
+ "diff_span": null,
81
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
82
+ },
83
+ {
84
+ "id": "crates/router/src/utils/currency.rs::function::acquire_redis_lock_and_call_forex_api",
85
+ "file": "crates/router/src/utils/currency.rs",
86
+ "kind": "function_item",
87
+ "status": "added",
88
+ "before_code": null,
89
+ "after_code": "async fn acquire_redis_lock_and_call_forex_api(\n state: &SessionState,\n) -> CustomResult<(), ForexCacheError> {\n let lock_acquired = acquire_redis_lock(state).await?;\n if !lock_acquired {\n Err(ForexCacheError::CouldNotAcquireLock.into())\n } else {\n logger::debug!(\"forex_log: redis lock acquired\");\n let api_rates = fetch_forex_rates_from_primary_api(state).await;\n match api_rates {\n Ok(rates) => save_forex_data_to_cache_and_redis(state, rates).await,\n Err(error) => {\n logger::error!(forex_error=?error,\"primary_forex_error\");\n // API not able to fetch data call secondary service\n let secondary_api_rates = fetch_forex_rates_from_fallback_api(state).await;\n match secondary_api_rates {\n Ok(rates) => save_forex_data_to_cache_and_redis(state, rates).await,\n Err(error) => {\n release_redis_lock(state).await?;\n Err(error)\n }\n }\n }\n }\n }\n}",
90
+ "diff_span": null,
91
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
92
+ },
93
+ {
94
+ "id": "crates/router/src/utils/currency.rs::function::save_forex_data_to_local_cache",
95
+ "file": "crates/router/src/utils/currency.rs",
96
+ "kind": "function_item",
97
+ "status": "added",
98
+ "before_code": null,
99
+ "after_code": "async fn save_forex_data_to_local_cache(\n exchange_rates_cache_entry: FxExchangeRatesCacheEntry,\n) -> CustomResult<(), ForexCacheError> {\n let mut local = FX_EXCHANGE_RATES_CACHE.write().await;\n *local = Some(exchange_rates_cache_entry);\n logger::debug!(\"forex_log: forex saved in cache\");\n Ok(())\n}",
100
+ "diff_span": null,
101
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
102
+ },
103
+ {
104
+ "id": "crates/router/src/utils/currency.rs::function::fetch_forex_rates_from_primary_api",
105
+ "file": "crates/router/src/utils/currency.rs",
106
+ "kind": "function_item",
107
+ "status": "added",
108
+ "before_code": null,
109
+ "after_code": "async fn fetch_forex_rates_from_primary_api(\n state: &SessionState,\n) -> Result<FxExchangeRatesCacheEntry, error_stack::Report<ForexCacheError>> {\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n\n logger::debug!(\"forex_log: Primary api call for forex fetch\");\n let forex_url: String = format!(\"{}{}{}\", FOREX_BASE_URL, forex_api_key, FOREX_BASE_CURRENCY);\n let forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&forex_url)\n .build();\n\n logger::info!(primary_forex_request=?forex_request,\"forex_log: Primary api call for forex fetch\");\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Primary forex fetch api unresponsive\")?;\n let forex_response = response\n .json::<ForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from primary api into ForexResponse\",\n )?;\n\n logger::info!(primary_forex_response=?forex_response,\"forex_log\");\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match forex_response.rates.get(&enum_curr.to_string()) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\n \"forex_error: Rates for {} not received from API\",\n &enum_curr\n );\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n logger::error!(\n \"forex_error: Rates for {} not received from API\",\n &enum_curr\n );\n }\n };\n }\n\n Ok(FxExchangeRatesCacheEntry::new(ExchangeRates::new(\n enums::Currency::USD,\n conversions,\n )))\n}",
110
+ "diff_span": null,
111
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
112
+ },
113
+ {
114
+ "id": "crates/router/src/utils/currency.rs::function::retrieve_forex_from_local_cache",
115
+ "file": "crates/router/src/utils/currency.rs",
116
+ "kind": "function_item",
117
+ "status": "added",
118
+ "before_code": null,
119
+ "after_code": "async fn retrieve_forex_from_local_cache() -> Option<FxExchangeRatesCacheEntry> {\n FX_EXCHANGE_RATES_CACHE.read().await.clone()\n}",
120
+ "diff_span": null,
121
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
122
+ },
123
+ {
124
+ "id": "crates/router/src/utils/currency.rs::function::check_redis_data_expiry_and_call_api",
125
+ "file": "crates/router/src/utils/currency.rs",
126
+ "kind": "function_item",
127
+ "status": "added",
128
+ "before_code": null,
129
+ "after_code": "async fn check_redis_data_expiry_and_call_api(\n state: &SessionState,\n redis_data: FxExchangeRatesCacheEntry,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match is_redis_expired(Some(redis_data.clone()).as_ref(), call_delay).await {\n Some(redis_forex) => {\n // Valid data present in redis\n let exchange_rates = FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());\n logger::debug!(\"forex_log: forex response found in redis\");\n save_forex_data_to_local_cache(exchange_rates.clone()).await?;\n Ok(exchange_rates)\n }\n None => {\n // redis expired\n call_forex_api_and_save_data_to_cache_and_redis(state, Some(redis_data)).await\n }\n }\n}",
130
+ "diff_span": null,
131
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
132
+ },
133
+ {
134
+ "id": "crates/router/src/utils/currency.rs::function::successive_fetch_and_save_forex",
135
+ "file": "crates/router/src/utils/currency.rs",
136
+ "kind": "function_item",
137
+ "status": "removed",
138
+ "before_code": "async fn successive_fetch_and_save_forex(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n // spawn a new thread and do the api fetch and write operations on redis.\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n if forex_api_key.is_empty() {\n Err(ForexCacheError::ConfigurationError(\"api_keys not provided\".into()).into())\n } else {\n let state = state.clone();\n tokio::spawn(\n async move {\n acquire_redis_lock_and_fetch_data(&state)\n .await\n .map_err(|err| {\n logger::error!(forex_error=?err);\n })\n .ok();\n }\n .in_current_span(),\n );\n stale_redis_data.ok_or(ForexCacheError::EntryNotFound.into())\n }\n}",
139
+ "after_code": null,
140
+ "diff_span": null,
141
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
142
+ },
143
+ {
144
+ "id": "crates/router/src/utils/currency.rs::function::fallback_fetch_forex_rates",
145
+ "file": "crates/router/src/utils/currency.rs",
146
+ "kind": "function_item",
147
+ "status": "removed",
148
+ "before_code": "pub async fn fallback_fetch_forex_rates(\n state: &SessionState,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n let fallback_forex_api_key = state.conf.forex_api.get_inner().fallback_api_key.peek();\n\n let fallback_forex_url: String =\n format!(\"{}{}\", FALLBACK_FOREX_BASE_URL, fallback_forex_api_key,);\n let fallback_forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&fallback_forex_url)\n .build();\n\n logger::info!(fallback_forex_request=?fallback_forex_request,\"forex_log: Fallback api call for forex fetch\");\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n fallback_forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Fallback forex fetch api unresponsive\")?;\n\n let fallback_forex_response = response\n .json::<FallbackForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from falback api into ForexResponse\",\n )?;\n\n logger::info!(fallback_forex_response=?fallback_forex_response,\"forex_log\");\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match fallback_forex_response.quotes.get(\n format!(\n \"{}{}\",\n FALLBACK_FOREX_API_CURRENCY_PREFIX,\n &enum_curr.to_string()\n )\n .as_str(),\n ) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\n \"forex_error: Rates for {} not received from API\",\n &enum_curr\n );\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n if enum_curr == enums::Currency::USD {\n let currency_factors =\n CurrencyFactors::new(Decimal::new(1, 0), Decimal::new(1, 0));\n conversions.insert(enum_curr, currency_factors);\n } else {\n logger::error!(\n \"forex_error: Rates for {} not received from API\",\n &enum_curr\n );\n }\n }\n };\n }\n\n let rates =\n FxExchangeRatesCacheEntry::new(ExchangeRates::new(enums::Currency::USD, conversions));\n match acquire_redis_lock(state).await {\n Ok(_) => {\n successive_save_data_to_redis_local(state, rates.clone()).await?;\n Ok(rates)\n }\n Err(e) => Err(e),\n }\n}",
149
+ "after_code": null,
150
+ "diff_span": null,
151
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
152
+ },
153
+ {
154
+ "id": "crates/router/src/utils/currency.rs::function::retrieve_forex_from_redis",
155
+ "file": "crates/router/src/utils/currency.rs",
156
+ "kind": "function_item",
157
+ "status": "removed",
158
+ "before_code": "async fn retrieve_forex_from_redis(\n app_state: &SessionState,\n) -> CustomResult<Option<FxExchangeRatesCacheEntry>, ForexCacheError> {\n logger::debug!(\"forex_log: Retrieving forex from redis\");\n app_state\n .store\n .get_redis_conn()\n .change_context(ForexCacheError::RedisConnectionError)?\n .get_and_deserialize_key(REDIX_FOREX_CACHE_DATA, \"FxExchangeRatesCache\")\n .await\n .change_context(ForexCacheError::EntryNotFound)\n .attach_printable(\"Forex entry not found in redis\")\n}",
159
+ "after_code": null,
160
+ "diff_span": null,
161
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
162
+ },
163
+ {
164
+ "id": "crates/router/src/utils/currency.rs::function::fallback_forex_redis_check",
165
+ "file": "crates/router/src/utils/currency.rs",
166
+ "kind": "function_item",
167
+ "status": "removed",
168
+ "before_code": "async fn fallback_forex_redis_check(\n state: &SessionState,\n redis_data: FxExchangeRatesCacheEntry,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match is_redis_expired(Some(redis_data.clone()).as_ref(), call_delay).await {\n Some(redis_forex) => {\n // Valid data present in redis\n let exchange_rates = FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());\n logger::debug!(\"forex_log: forex response found in redis\");\n save_forex_to_local(exchange_rates.clone()).await?;\n Ok(exchange_rates)\n }\n None => {\n // redis expired\n successive_fetch_and_save_forex(state, Some(redis_data)).await\n }\n }\n}",
169
+ "after_code": null,
170
+ "diff_span": null,
171
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
172
+ },
173
+ {
174
+ "id": "crates/router/src/utils/currency.rs::function::fetch_forex_rates",
175
+ "file": "crates/router/src/utils/currency.rs",
176
+ "kind": "function_item",
177
+ "status": "removed",
178
+ "before_code": "async fn fetch_forex_rates(\n state: &SessionState,\n) -> Result<FxExchangeRatesCacheEntry, error_stack::Report<ForexCacheError>> {\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n\n logger::debug!(\"forex_log: Primary api call for forex fetch\");\n let forex_url: String = format!(\"{}{}{}\", FOREX_BASE_URL, forex_api_key, FOREX_BASE_CURRENCY);\n let forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&forex_url)\n .build();\n\n logger::info!(primary_forex_request=?forex_request,\"forex_log: Primary api call for forex fetch\");\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Primary forex fetch api unresponsive\")?;\n let forex_response = response\n .json::<ForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from primary api into ForexResponse\",\n )?;\n\n logger::info!(primary_forex_response=?forex_response,\"forex_log\");\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match forex_response.rates.get(&enum_curr.to_string()) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\n \"forex_error: Rates for {} not received from API\",\n &enum_curr\n );\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n logger::error!(\n \"forex_error: Rates for {} not received from API\",\n &enum_curr\n );\n }\n };\n }\n\n Ok(FxExchangeRatesCacheEntry::new(ExchangeRates::new(\n enums::Currency::USD,\n conversions,\n )))\n}",
179
+ "after_code": null,
180
+ "diff_span": null,
181
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
182
+ },
183
+ {
184
+ "id": "crates/router/src/utils/currency.rs::function::successive_save_data_to_redis_local",
185
+ "file": "crates/router/src/utils/currency.rs",
186
+ "kind": "function_item",
187
+ "status": "removed",
188
+ "before_code": "async fn successive_save_data_to_redis_local(\n state: &SessionState,\n forex: FxExchangeRatesCacheEntry,\n) -> CustomResult<(), ForexCacheError> {\n save_forex_to_redis(state, &forex)\n .await\n .async_and_then(|_rates| release_redis_lock(state))\n .await\n .async_and_then(|_val| save_forex_to_local(forex.clone()))\n .await\n}",
189
+ "after_code": null,
190
+ "diff_span": null,
191
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
192
+ },
193
+ {
194
+ "id": "crates/router/src/utils/currency.rs::function::acquire_redis_lock_and_fetch_data",
195
+ "file": "crates/router/src/utils/currency.rs",
196
+ "kind": "function_item",
197
+ "status": "removed",
198
+ "before_code": "async fn acquire_redis_lock_and_fetch_data(\n state: &SessionState,\n) -> CustomResult<(), ForexCacheError> {\n let lock_acquired = acquire_redis_lock(state).await?;\n if !lock_acquired {\n Err(ForexCacheError::CouldNotAcquireLock.into())\n } else {\n logger::debug!(\"forex_log: redis lock acquired\");\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => successive_save_data_to_redis_local(state, rates).await,\n Err(error) => {\n logger::error!(forex_error=?error,\"primary_forex_error\");\n // API not able to fetch data call secondary service\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => successive_save_data_to_redis_local(state, rates).await,\n Err(error) => {\n release_redis_lock(state).await?;\n Err(error)\n }\n }\n }\n }\n }\n}",
199
+ "after_code": null,
200
+ "diff_span": null,
201
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
202
+ },
203
+ {
204
+ "id": "crates/router/src/utils/currency.rs::function::handler_local_no_data",
205
+ "file": "crates/router/src/utils/currency.rs",
206
+ "kind": "function_item",
207
+ "status": "removed",
208
+ "before_code": "async fn handler_local_no_data(\n state: &SessionState,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match retrieve_forex_from_redis(state).await {\n Ok(Some(data)) => fallback_forex_redis_check(state, data, call_delay).await,\n Ok(None) => {\n // No data in local as well as redis\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n Err(error) => {\n // Error in deriving forex rates from redis\n logger::error!(\"forex_error: {:?}\", error);\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n }\n}",
209
+ "after_code": null,
210
+ "diff_span": null,
211
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
212
+ },
213
+ {
214
+ "id": "crates/router/src/utils/currency.rs::function::save_forex_to_local",
215
+ "file": "crates/router/src/utils/currency.rs",
216
+ "kind": "function_item",
217
+ "status": "removed",
218
+ "before_code": "async fn save_forex_to_local(\n exchange_rates_cache_entry: FxExchangeRatesCacheEntry,\n) -> CustomResult<(), ForexCacheError> {\n let mut local = FX_EXCHANGE_RATES_CACHE.write().await;\n *local = Some(exchange_rates_cache_entry);\n logger::debug!(\"forex_log: forex saved in cache\");\n Ok(())\n}",
219
+ "after_code": null,
220
+ "diff_span": null,
221
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
222
+ },
223
+ {
224
+ "id": "crates/router/src/utils/currency.rs::function::retrieve_forex_from_local",
225
+ "file": "crates/router/src/utils/currency.rs",
226
+ "kind": "function_item",
227
+ "status": "removed",
228
+ "before_code": "async fn retrieve_forex_from_local() -> Option<FxExchangeRatesCacheEntry> {\n FX_EXCHANGE_RATES_CACHE.read().await.clone()\n}",
229
+ "after_code": null,
230
+ "diff_span": null,
231
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
232
+ },
233
+ {
234
+ "id": "crates/router/src/utils/currency.rs::function::save_forex_to_redis",
235
+ "file": "crates/router/src/utils/currency.rs",
236
+ "kind": "function_item",
237
+ "status": "removed",
238
+ "before_code": "async fn save_forex_to_redis(\n app_state: &SessionState,\n forex_exchange_cache_entry: &FxExchangeRatesCacheEntry,\n) -> CustomResult<(), ForexCacheError> {\n logger::debug!(\"forex_log: Saving forex to redis\");\n app_state\n .store\n .get_redis_conn()\n .change_context(ForexCacheError::RedisConnectionError)?\n .serialize_and_set_key(REDIX_FOREX_CACHE_DATA, forex_exchange_cache_entry)\n .await\n .change_context(ForexCacheError::RedisWriteError)\n .attach_printable(\"Unable to save forex data to redis\")\n}",
239
+ "after_code": null,
240
+ "diff_span": null,
241
+ "commit_sha": "723c6f4e2dc63ab05d3c5f4ee984298575106ba8"
242
+ }
243
+ ]
244
+ }
diffs/pr_6906/750cfeb/diff.json ADDED
@@ -0,0 +1,6 @@
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "750cfeb8f3099639cf451de1213d72887067cf7c",
3
+ "pr_number": 6906,
4
+ "rust_files": [],
5
+ "diffs": []
6
+ }
diffs/pr_6906/7c16081/diff.json ADDED
@@ -0,0 +1,6 @@
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "7c16081adabc0bb7a2389a0626b4d709170d378a",
3
+ "pr_number": 6906,
4
+ "rust_files": [],
5
+ "diffs": []
6
+ }
diffs/pr_6906/9e5edff/diff.json ADDED
@@ -0,0 +1,184 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "9e5edffc349c5b9d50c079e190ba1951c26e1fc4",
3
+ "pr_number": 6906,
4
+ "rust_files": [
5
+ "crates/router/src/utils/currency.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/router/src/utils/currency.rs::function::successive_fetch_and_save_forex",
10
+ "file": "crates/router/src/utils/currency.rs",
11
+ "kind": "function_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "async fn successive_fetch_and_save_forex(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n // spawn a new thread and do the api fetch and write operations on redis.\n let stale_forex_data = stale_redis_data.clone();\n let state = state.clone();\n tokio::spawn(\n async move {\n acquire_redis_lock_and_fetch_data(&state, stale_redis_data).await;\n }\n .in_current_span(),\n );\n stale_forex_data.ok_or(ForexCacheError::EntryNotFound.into())\n}",
16
+ "after_code": "async fn successive_fetch_and_save_forex(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n // spawn a new thread and do the api fetch and write operations on redis.\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n if forex_api_key.eq(\"\") {\n logger::debug!(\"forex_log: api_keys not present in configs\");\n Err(ForexCacheError::ConfigurationError.into())\n } else {\n let stale_forex_data = stale_redis_data.clone();\n let state = state.clone();\n tokio::spawn(\n async move {\n let _ = acquire_redis_lock_and_fetch_data(&state, stale_redis_data).await;\n }\n .in_current_span(),\n );\n stale_forex_data.ok_or(ForexCacheError::EntryNotFound.into())\n }\n}",
17
+ "diff_span": {
18
+ "before": ") -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n // spawn a new thread and do the api fetch and write operations on redis.\n let stale_forex_data = stale_redis_data.clone();\n let state = state.clone();\n tokio::spawn(\n async move {\n acquire_redis_lock_and_fetch_data(&state, stale_redis_data).await;\n }\n .in_current_span(),\n );\n stale_forex_data.ok_or(ForexCacheError::EntryNotFound.into())\n}",
19
+ "after": ") -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n // spawn a new thread and do the api fetch and write operations on redis.\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n if forex_api_key.eq(\"\") {\n logger::debug!(\"forex_log: api_keys not present in configs\");\n Err(ForexCacheError::ConfigurationError.into())\n } else {\n let stale_forex_data = stale_redis_data.clone();\n let state = state.clone();\n tokio::spawn(\n async move {\n let _ = acquire_redis_lock_and_fetch_data(&state, stale_redis_data).await;\n }\n .in_current_span(),\n );\n stale_forex_data.ok_or(ForexCacheError::EntryNotFound.into())\n }\n}"
20
+ },
21
+ "commit_sha": "9e5edffc349c5b9d50c079e190ba1951c26e1fc4"
22
+ },
23
+ {
24
+ "id": "crates/router/src/utils/currency.rs::function::retrieve_forex_from_redis",
25
+ "file": "crates/router/src/utils/currency.rs",
26
+ "kind": "function_item",
27
+ "status": "modified",
28
+ "code_changed": true,
29
+ "imports_changed": false,
30
+ "before_code": "async fn retrieve_forex_from_redis(\n app_state: &SessionState,\n) -> CustomResult<Option<FxExchangeRatesCacheEntry>, ForexCacheError> {\n app_state\n .store\n .get_redis_conn()\n .change_context(ForexCacheError::RedisConnectionError)?\n .get_and_deserialize_key(REDIX_FOREX_CACHE_DATA, \"FxExchangeRatesCache\")\n .await\n .change_context(ForexCacheError::EntryNotFound)\n .attach_printable(\"Forex entry not found in redis\")\n}",
31
+ "after_code": "async fn retrieve_forex_from_redis(\n app_state: &SessionState,\n) -> CustomResult<Option<FxExchangeRatesCacheEntry>, ForexCacheError> {\n logger::debug!(\"forex_log: Retrieving forex from redis\");\n app_state\n .store\n .get_redis_conn()\n .change_context(ForexCacheError::RedisConnectionError)?\n .get_and_deserialize_key(REDIX_FOREX_CACHE_DATA, \"FxExchangeRatesCache\")\n .await\n .change_context(ForexCacheError::EntryNotFound)\n .attach_printable(\"Forex entry not found in redis\")\n}",
32
+ "diff_span": {
33
+ "before": "",
34
+ "after": " app_state: &SessionState,\n) -> CustomResult<Option<FxExchangeRatesCacheEntry>, ForexCacheError> {\n logger::debug!(\"forex_log: Retrieving forex from redis\");\n app_state\n .store"
35
+ },
36
+ "commit_sha": "9e5edffc349c5b9d50c079e190ba1951c26e1fc4"
37
+ },
38
+ {
39
+ "id": "crates/router/src/utils/currency.rs::function::acquire_redis_lock_and_fetch_data",
40
+ "file": "crates/router/src/utils/currency.rs",
41
+ "kind": "function_item",
42
+ "status": "modified",
43
+ "code_changed": true,
44
+ "imports_changed": false,
45
+ "before_code": "async fn acquire_redis_lock_and_fetch_data(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match acquire_redis_lock(state).await {\n Ok(lock_acquired) => {\n if !lock_acquired {\n return stale_redis_data.ok_or(ForexCacheError::CouldNotAcquireLock.into());\n }\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => successive_save_data_to_redis_local(state, rates).await,\n Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(?error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(error) => stale_redis_data.ok_or({\n logger::error!(?error);\n release_redis_lock(state).await?;\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n }\n }\n }\n Err(error) => stale_redis_data.ok_or({\n logger::error!(?error);\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n}",
46
+ "after_code": "async fn acquire_redis_lock_and_fetch_data(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match acquire_redis_lock(state).await {\n Ok(lock_acquired) => {\n if !lock_acquired {\n logger::debug!(\"forex_log: Unable to acquire redis lock\");\n return stale_redis_data.ok_or(ForexCacheError::CouldNotAcquireLock.into());\n }\n logger::debug!(\"forex_log: redis lock acquired\");\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => successive_save_data_to_redis_local(state, rates).await,\n Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(\"forex_log: {:?}\", error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(error) => stale_redis_data.ok_or({\n logger::error!(\"forex_log: {:?}\", error);\n release_redis_lock(state).await?;\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n }\n }\n }\n Err(error) => stale_redis_data.ok_or({\n logger::error!(\"forex_log: {:?}\", error);\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n}",
47
+ "diff_span": {
48
+ "before": " Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(?error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(error) => stale_redis_data.ok_or({\n logger::error!(?error);\n release_redis_lock(state).await?;\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n }\n }\n }\n Err(error) => stale_redis_data.ok_or({\n logger::error!(?error);\n ForexCacheError::ApiUnresponsive.into()\n }),",
49
+ "after": " Ok(lock_acquired) => {\n if !lock_acquired {\n logger::debug!(\"forex_log: Unable to acquire redis lock\");\n return stale_redis_data.ok_or(ForexCacheError::CouldNotAcquireLock.into());\n }\n logger::debug!(\"forex_log: redis lock acquired\");\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => successive_save_data_to_redis_local(state, rates).await,\n Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(\"forex_log: {:?}\", error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(error) => stale_redis_data.ok_or({\n logger::error!(\"forex_log: {:?}\", error);\n release_redis_lock(state).await?;\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n }\n }\n }\n Err(error) => stale_redis_data.ok_or({\n logger::error!(\"forex_log: {:?}\", error);\n ForexCacheError::ApiUnresponsive.into()\n }),"
50
+ },
51
+ "commit_sha": "9e5edffc349c5b9d50c079e190ba1951c26e1fc4"
52
+ },
53
+ {
54
+ "id": "crates/router/src/utils/currency.rs::function::save_forex_to_redis",
55
+ "file": "crates/router/src/utils/currency.rs",
56
+ "kind": "function_item",
57
+ "status": "modified",
58
+ "code_changed": true,
59
+ "imports_changed": false,
60
+ "before_code": "async fn save_forex_to_redis(\n app_state: &SessionState,\n forex_exchange_cache_entry: &FxExchangeRatesCacheEntry,\n) -> CustomResult<(), ForexCacheError> {\n app_state\n .store\n .get_redis_conn()\n .change_context(ForexCacheError::RedisConnectionError)?\n .serialize_and_set_key(REDIX_FOREX_CACHE_DATA, forex_exchange_cache_entry)\n .await\n .change_context(ForexCacheError::RedisWriteError)\n .attach_printable(\"Unable to save forex data to redis\")\n}",
61
+ "after_code": "async fn save_forex_to_redis(\n app_state: &SessionState,\n forex_exchange_cache_entry: &FxExchangeRatesCacheEntry,\n) -> CustomResult<(), ForexCacheError> {\n logger::debug!(\"forex_log: Saving forex to redis\");\n app_state\n .store\n .get_redis_conn()\n .change_context(ForexCacheError::RedisConnectionError)?\n .serialize_and_set_key(REDIX_FOREX_CACHE_DATA, forex_exchange_cache_entry)\n .await\n .change_context(ForexCacheError::RedisWriteError)\n .attach_printable(\"Unable to save forex data to redis\")\n}",
62
+ "diff_span": {
63
+ "before": "",
64
+ "after": " forex_exchange_cache_entry: &FxExchangeRatesCacheEntry,\n) -> CustomResult<(), ForexCacheError> {\n logger::debug!(\"forex_log: Saving forex to redis\");\n app_state\n .store"
65
+ },
66
+ "commit_sha": "9e5edffc349c5b9d50c079e190ba1951c26e1fc4"
67
+ },
68
+ {
69
+ "id": "crates/router/src/utils/currency.rs::function::release_redis_lock",
70
+ "file": "crates/router/src/utils/currency.rs",
71
+ "kind": "function_item",
72
+ "status": "modified",
73
+ "code_changed": true,
74
+ "imports_changed": false,
75
+ "before_code": "async fn release_redis_lock(\n state: &SessionState,\n) -> Result<DelReply, error_stack::Report<ForexCacheError>> {\n state\n .store\n .get_redis_conn()\n .change_context(ForexCacheError::RedisConnectionError)?\n .delete_key(REDIX_FOREX_CACHE_KEY)\n .await\n .change_context(ForexCacheError::RedisLockReleaseFailed)\n .attach_printable(\"Unable to release redis lock\")\n}",
76
+ "after_code": "async fn release_redis_lock(\n state: &SessionState,\n) -> Result<DelReply, error_stack::Report<ForexCacheError>> {\n logger::debug!(\"forex_log: Releasing redis lock\");\n state\n .store\n .get_redis_conn()\n .change_context(ForexCacheError::RedisConnectionError)?\n .delete_key(REDIX_FOREX_CACHE_KEY)\n .await\n .change_context(ForexCacheError::RedisLockReleaseFailed)\n .attach_printable(\"Unable to release redis lock\")\n}",
77
+ "diff_span": {
78
+ "before": "",
79
+ "after": " state: &SessionState,\n) -> Result<DelReply, error_stack::Report<ForexCacheError>> {\n logger::debug!(\"forex_log: Releasing redis lock\");\n state\n .store"
80
+ },
81
+ "commit_sha": "9e5edffc349c5b9d50c079e190ba1951c26e1fc4"
82
+ },
83
+ {
84
+ "id": "crates/router/src/utils/currency.rs::function::fetch_forex_rates",
85
+ "file": "crates/router/src/utils/currency.rs",
86
+ "kind": "function_item",
87
+ "status": "modified",
88
+ "code_changed": true,
89
+ "imports_changed": false,
90
+ "before_code": "async fn fetch_forex_rates(\n state: &SessionState,\n) -> Result<FxExchangeRatesCacheEntry, error_stack::Report<ForexCacheError>> {\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n\n let forex_url: String = format!(\"{}{}{}\", FOREX_BASE_URL, forex_api_key, FOREX_BASE_CURRENCY);\n let forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&forex_url)\n .build();\n\n logger::info!(?forex_request);\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Primary forex fetch api unresponsive\")?;\n let forex_response = response\n .json::<ForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from primary api into ForexResponse\",\n )?;\n\n logger::info!(\"{:?}\", forex_response);\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match forex_response.rates.get(&enum_curr.to_string()) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\"Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n logger::error!(\"Rates for {} not received from API\", &enum_curr);\n }\n };\n }\n\n Ok(FxExchangeRatesCacheEntry::new(ExchangeRates::new(\n enums::Currency::USD,\n conversions,\n )))\n}",
91
+ "after_code": "async fn fetch_forex_rates(\n state: &SessionState,\n) -> Result<FxExchangeRatesCacheEntry, error_stack::Report<ForexCacheError>> {\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n\n logger::debug!(\"forex_log: Primary api call for forex fetch\");\n let forex_url: String = format!(\"{}{}{}\", FOREX_BASE_URL, forex_api_key, FOREX_BASE_CURRENCY);\n let forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&forex_url)\n .build();\n\n logger::info!(\"forex_log: {:?}\", forex_request);\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Primary forex fetch api unresponsive\")?;\n let forex_response = response\n .json::<ForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from primary api into ForexResponse\",\n )?;\n\n logger::info!(\"forex_log: {:?}\", forex_response);\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match forex_response.rates.get(&enum_curr.to_string()) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n }\n };\n }\n\n Ok(FxExchangeRatesCacheEntry::new(ExchangeRates::new(\n enums::Currency::USD,\n conversions,\n )))\n}",
92
+ "diff_span": {
93
+ "before": " .build();\n\n logger::info!(?forex_request);\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Primary forex fetch api unresponsive\")?;\n let forex_response = response\n .json::<ForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from primary api into ForexResponse\",\n )?;\n\n logger::info!(\"{:?}\", forex_response);\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match forex_response.rates.get(&enum_curr.to_string()) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\"Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n logger::error!(\"Rates for {} not received from API\", &enum_curr);\n }\n };",
94
+ "after": " let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n\n logger::debug!(\"forex_log: Primary api call for forex fetch\");\n let forex_url: String = format!(\"{}{}{}\", FOREX_BASE_URL, forex_api_key, FOREX_BASE_CURRENCY);\n let forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&forex_url)\n .build();\n\n logger::info!(\"forex_log: {:?}\", forex_request);\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Primary forex fetch api unresponsive\")?;\n let forex_response = response\n .json::<ForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from primary api into ForexResponse\",\n )?;\n\n logger::info!(\"forex_log: {:?}\", forex_response);\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match forex_response.rates.get(&enum_curr.to_string()) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n }\n };"
95
+ },
96
+ "commit_sha": "9e5edffc349c5b9d50c079e190ba1951c26e1fc4"
97
+ },
98
+ {
99
+ "id": "crates/router/src/utils/currency.rs::function::successive_save_data_to_redis_local",
100
+ "file": "crates/router/src/utils/currency.rs",
101
+ "kind": "function_item",
102
+ "status": "modified",
103
+ "code_changed": true,
104
+ "imports_changed": false,
105
+ "before_code": "async fn successive_save_data_to_redis_local(\n state: &SessionState,\n forex: FxExchangeRatesCacheEntry,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n Ok(save_forex_to_redis(state, &forex)\n .await\n .async_and_then(|_rates| release_redis_lock(state))\n .await\n .async_and_then(|_val| save_forex_to_local(forex.clone()))\n .await\n .map_or_else(\n |error| {\n logger::error!(?error);\n forex.clone()\n },\n |_| forex.clone(),\n ))\n}",
106
+ "after_code": "async fn successive_save_data_to_redis_local(\n state: &SessionState,\n forex: FxExchangeRatesCacheEntry,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n Ok(save_forex_to_redis(state, &forex)\n .await\n .async_and_then(|_rates| release_redis_lock(state))\n .await\n .async_and_then(|_val| save_forex_to_local(forex.clone()))\n .await\n .map_or_else(\n |error| {\n logger::error!(\"forex_log: {:?}\", error);\n forex.clone()\n },\n |_| forex.clone(),\n ))\n}",
107
+ "diff_span": {
108
+ "before": " .map_or_else(\n |error| {\n logger::error!(?error);\n forex.clone()\n },",
109
+ "after": " .map_or_else(\n |error| {\n logger::error!(\"forex_log: {:?}\", error);\n forex.clone()\n },"
110
+ },
111
+ "commit_sha": "9e5edffc349c5b9d50c079e190ba1951c26e1fc4"
112
+ },
113
+ {
114
+ "id": "crates/router/src/utils/currency.rs::function::acquire_redis_lock",
115
+ "file": "crates/router/src/utils/currency.rs",
116
+ "kind": "function_item",
117
+ "status": "modified",
118
+ "code_changed": true,
119
+ "imports_changed": false,
120
+ "before_code": "async fn acquire_redis_lock(state: &SessionState) -> CustomResult<bool, ForexCacheError> {\n let forex_api = state.conf.forex_api.get_inner();\n state\n .store\n .get_redis_conn()\n .change_context(ForexCacheError::RedisConnectionError)?\n .set_key_if_not_exists_with_expiry(\n REDIX_FOREX_CACHE_KEY,\n \"\",\n Some(\n i64::try_from(forex_api.redis_lock_timeout)\n .change_context(ForexCacheError::ConversionError)?,\n ),\n )\n .await\n .map(|val| matches!(val, redis_interface::SetnxReply::KeySet))\n .change_context(ForexCacheError::CouldNotAcquireLock)\n .attach_printable(\"Unable to acquire redis lock\")\n}",
121
+ "after_code": "async fn acquire_redis_lock(state: &SessionState) -> CustomResult<bool, ForexCacheError> {\n let forex_api = state.conf.forex_api.get_inner();\n logger::debug!(\"forex_log: Acquiring redis lock\");\n state\n .store\n .get_redis_conn()\n .change_context(ForexCacheError::RedisConnectionError)?\n .set_key_if_not_exists_with_expiry(\n REDIX_FOREX_CACHE_KEY,\n \"\",\n Some(\n i64::try_from(forex_api.redis_lock_timeout)\n .change_context(ForexCacheError::ConversionError)?,\n ),\n )\n .await\n .map(|val| matches!(val, redis_interface::SetnxReply::KeySet))\n .change_context(ForexCacheError::CouldNotAcquireLock)\n .attach_printable(\"Unable to acquire redis lock\")\n}",
122
+ "diff_span": {
123
+ "before": "",
124
+ "after": "async fn acquire_redis_lock(state: &SessionState) -> CustomResult<bool, ForexCacheError> {\n let forex_api = state.conf.forex_api.get_inner();\n logger::debug!(\"forex_log: Acquiring redis lock\");\n state\n .store"
125
+ },
126
+ "commit_sha": "9e5edffc349c5b9d50c079e190ba1951c26e1fc4"
127
+ },
128
+ {
129
+ "id": "crates/router/src/utils/currency.rs::function::get_forex_rates",
130
+ "file": "crates/router/src/utils/currency.rs",
131
+ "kind": "function_item",
132
+ "status": "modified",
133
+ "code_changed": true,
134
+ "imports_changed": false,
135
+ "before_code": "pub async fn get_forex_rates(\n state: &SessionState,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n if let Some(local_rates) = retrieve_forex_from_local().await {\n if local_rates.is_expired(call_delay) {\n // expired local data\n handler_local_expired(state, call_delay, local_rates).await\n } else {\n // Valid data present in local\n Ok(local_rates)\n }\n } else {\n // No data in local\n handler_local_no_data(state, call_delay).await\n }\n}",
136
+ "after_code": "pub async fn get_forex_rates(\n state: &SessionState,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n if let Some(local_rates) = retrieve_forex_from_local().await {\n if local_rates.is_expired(call_delay) {\n // expired local data\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n } else {\n // Valid data present in local\n Ok(local_rates)\n }\n } else {\n // No data in local\n handler_local_no_data(state, call_delay).await\n }\n}",
137
+ "diff_span": {
138
+ "before": " if local_rates.is_expired(call_delay) {\n // expired local data\n handler_local_expired(state, call_delay, local_rates).await\n } else {\n // Valid data present in local",
139
+ "after": " if local_rates.is_expired(call_delay) {\n // expired local data\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n } else {\n // Valid data present in local"
140
+ },
141
+ "commit_sha": "9e5edffc349c5b9d50c079e190ba1951c26e1fc4"
142
+ },
143
+ {
144
+ "id": "crates/router/src/utils/currency.rs::function::fallback_fetch_forex_rates",
145
+ "file": "crates/router/src/utils/currency.rs",
146
+ "kind": "function_item",
147
+ "status": "modified",
148
+ "code_changed": true,
149
+ "imports_changed": false,
150
+ "before_code": "pub async fn fallback_fetch_forex_rates(\n state: &SessionState,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n let fallback_forex_api_key = state.conf.forex_api.get_inner().fallback_api_key.peek();\n\n let fallback_forex_url: String =\n format!(\"{}{}\", FALLBACK_FOREX_BASE_URL, fallback_forex_api_key,);\n let fallback_forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&fallback_forex_url)\n .build();\n\n logger::info!(?fallback_forex_request);\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n fallback_forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Fallback forex fetch api unresponsive\")?;\n\n let fallback_forex_response = response\n .json::<FallbackForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from falback api into ForexResponse\",\n )?;\n\n logger::info!(\"{:?}\", fallback_forex_response);\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match fallback_forex_response.quotes.get(\n format!(\n \"{}{}\",\n FALLBACK_FOREX_API_CURRENCY_PREFIX,\n &enum_curr.to_string()\n )\n .as_str(),\n ) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\"Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n if enum_curr == enums::Currency::USD {\n let currency_factors =\n CurrencyFactors::new(Decimal::new(1, 0), Decimal::new(1, 0));\n conversions.insert(enum_curr, currency_factors);\n } else {\n logger::error!(\"Rates for {} not received from API\", &enum_curr);\n }\n }\n };\n }\n\n let rates =\n FxExchangeRatesCacheEntry::new(ExchangeRates::new(enums::Currency::USD, conversions));\n match acquire_redis_lock(state).await {\n Ok(_) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(e) => {\n logger::error!(?e);\n Ok(rates)\n }\n }\n}",
151
+ "after_code": "pub async fn fallback_fetch_forex_rates(\n state: &SessionState,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n let fallback_forex_api_key = state.conf.forex_api.get_inner().fallback_api_key.peek();\n\n let fallback_forex_url: String =\n format!(\"{}{}\", FALLBACK_FOREX_BASE_URL, fallback_forex_api_key,);\n let fallback_forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&fallback_forex_url)\n .build();\n\n logger::debug!(\"forex_log: Fallback api call for forex fetch\");\n logger::info!(\"forex_log: {:?}\", fallback_forex_request);\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n fallback_forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Fallback forex fetch api unresponsive\")?;\n\n let fallback_forex_response = response\n .json::<FallbackForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from falback api into ForexResponse\",\n )?;\n\n logger::info!(\"forex_log: {:?}\", fallback_forex_response);\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match fallback_forex_response.quotes.get(\n format!(\n \"{}{}\",\n FALLBACK_FOREX_API_CURRENCY_PREFIX,\n &enum_curr.to_string()\n )\n .as_str(),\n ) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n if enum_curr == enums::Currency::USD {\n let currency_factors =\n CurrencyFactors::new(Decimal::new(1, 0), Decimal::new(1, 0));\n conversions.insert(enum_curr, currency_factors);\n } else {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n }\n }\n };\n }\n\n let rates =\n FxExchangeRatesCacheEntry::new(ExchangeRates::new(enums::Currency::USD, conversions));\n match acquire_redis_lock(state).await {\n Ok(_) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(e) => {\n logger::error!(\"forex_log: {:?}\", e);\n Ok(rates)\n }\n }\n}",
152
+ "diff_span": {
153
+ "before": " .build();\n\n logger::info!(?fallback_forex_request);\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n fallback_forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Fallback forex fetch api unresponsive\")?;\n\n let fallback_forex_response = response\n .json::<FallbackForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from falback api into ForexResponse\",\n )?;\n\n logger::info!(\"{:?}\", fallback_forex_response);\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match fallback_forex_response.quotes.get(\n format!(\n \"{}{}\",\n FALLBACK_FOREX_API_CURRENCY_PREFIX,\n &enum_curr.to_string()\n )\n .as_str(),\n ) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\"Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n if enum_curr == enums::Currency::USD {\n let currency_factors =\n CurrencyFactors::new(Decimal::new(1, 0), Decimal::new(1, 0));\n conversions.insert(enum_curr, currency_factors);\n } else {\n logger::error!(\"Rates for {} not received from API\", &enum_curr);\n }\n }\n };\n }\n\n let rates =\n FxExchangeRatesCacheEntry::new(ExchangeRates::new(enums::Currency::USD, conversions));\n match acquire_redis_lock(state).await {\n Ok(_) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(e) => {\n logger::error!(?e);\n Ok(rates)\n }",
154
+ "after": " .build();\n\n logger::debug!(\"forex_log: Fallback api call for forex fetch\");\n logger::info!(\"forex_log: {:?}\", fallback_forex_request);\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n fallback_forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Fallback forex fetch api unresponsive\")?;\n\n let fallback_forex_response = response\n .json::<FallbackForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from falback api into ForexResponse\",\n )?;\n\n logger::info!(\"forex_log: {:?}\", fallback_forex_response);\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match fallback_forex_response.quotes.get(\n format!(\n \"{}{}\",\n FALLBACK_FOREX_API_CURRENCY_PREFIX,\n &enum_curr.to_string()\n )\n .as_str(),\n ) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n if enum_curr == enums::Currency::USD {\n let currency_factors =\n CurrencyFactors::new(Decimal::new(1, 0), Decimal::new(1, 0));\n conversions.insert(enum_curr, currency_factors);\n } else {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n }\n }\n };\n }\n\n let rates =\n FxExchangeRatesCacheEntry::new(ExchangeRates::new(enums::Currency::USD, conversions));\n match acquire_redis_lock(state).await {\n Ok(_) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(e) => {\n logger::error!(\"forex_log: {:?}\", e);\n Ok(rates)\n }"
155
+ },
156
+ "commit_sha": "9e5edffc349c5b9d50c079e190ba1951c26e1fc4"
157
+ },
158
+ {
159
+ "id": "crates/router/src/utils/currency.rs::function::handler_local_no_data",
160
+ "file": "crates/router/src/utils/currency.rs",
161
+ "kind": "function_item",
162
+ "status": "modified",
163
+ "code_changed": true,
164
+ "imports_changed": false,
165
+ "before_code": "async fn handler_local_no_data(\n state: &SessionState,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n if forex_api_key.eq(\"\") {\n Err(ForexCacheError::ConfigurationError.into())\n } else {\n match retrieve_forex_from_redis(state).await {\n Ok(Some(data)) => fallback_forex_redis_check(state, data, call_delay).await,\n Ok(None) => {\n // No data in local as well as redis\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n Err(error) => {\n // Error in deriving forex rates from redis\n logger::error!(?error);\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n }\n }\n}",
166
+ "after_code": "async fn handler_local_no_data(\n state: &SessionState,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match retrieve_forex_from_redis(state).await {\n Ok(Some(data)) => fallback_forex_redis_check(state, data, call_delay).await,\n Ok(None) => {\n // No data in local as well as redis\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n Err(error) => {\n // Error in deriving forex rates from redis\n logger::error!(\"forex_log: {:?}\", error);\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n }\n}",
167
+ "diff_span": {
168
+ "before": " call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n if forex_api_key.eq(\"\") {\n Err(ForexCacheError::ConfigurationError.into())\n } else {\n match retrieve_forex_from_redis(state).await {\n Ok(Some(data)) => fallback_forex_redis_check(state, data, call_delay).await,\n Ok(None) => {\n // No data in local as well as redis\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n Err(error) => {\n // Error in deriving forex rates from redis\n logger::error!(?error);\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n }\n }",
169
+ "after": " call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match retrieve_forex_from_redis(state).await {\n Ok(Some(data)) => fallback_forex_redis_check(state, data, call_delay).await,\n Ok(None) => {\n // No data in local as well as redis\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n Err(error) => {\n // Error in deriving forex rates from redis\n logger::error!(\"forex_log: {:?}\", error);\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n }"
170
+ },
171
+ "commit_sha": "9e5edffc349c5b9d50c079e190ba1951c26e1fc4"
172
+ },
173
+ {
174
+ "id": "crates/router/src/utils/currency.rs::function::handler_local_expired",
175
+ "file": "crates/router/src/utils/currency.rs",
176
+ "kind": "function_item",
177
+ "status": "removed",
178
+ "before_code": "async fn handler_local_expired(\n state: &SessionState,\n call_delay: i64,\n local_rates: FxExchangeRatesCacheEntry,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n if forex_api_key.eq(\"\") {\n Err(ForexCacheError::ConfigurationError.into())\n } else {\n match retrieve_forex_from_redis(state).await {\n Ok(redis_data) => {\n match is_redis_expired(redis_data.as_ref(), call_delay).await {\n Some(redis_forex) => {\n // Valid data present in redis\n let exchange_rates =\n FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());\n save_forex_to_local(exchange_rates.clone()).await?;\n Ok(exchange_rates)\n }\n None => {\n // Redis is expired going for API request\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n }\n }\n }\n Err(error) => {\n // data not present in redis waited fetch\n logger::error!(?error);\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n }\n }\n }\n}",
179
+ "after_code": null,
180
+ "diff_span": null,
181
+ "commit_sha": "9e5edffc349c5b9d50c079e190ba1951c26e1fc4"
182
+ }
183
+ ]
184
+ }
diffs/pr_6906/a1d0992/diff.json ADDED
@@ -0,0 +1,99 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "a1d0992edaeea24068e25ca611b27fa1617bd31b",
3
+ "pr_number": 6906,
4
+ "rust_files": [
5
+ "crates/router/src/utils/currency.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/router/src/utils/currency.rs::function::successive_fetch_and_save_forex",
10
+ "file": "crates/router/src/utils/currency.rs",
11
+ "kind": "function_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "async fn successive_fetch_and_save_forex(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n // spawn a new thread and do the api fetch and write operations on redis.\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n if forex_api_key.is_empty() {\n Err(ForexCacheError::ConfigurationError(\"api_keys not provided\".into()).into())\n } else {\n let state = state.clone();\n tokio::spawn(\n async move {\n acquire_redis_lock_and_fetch_data(&state).await.ok();\n }\n .in_current_span(),\n );\n stale_redis_data.ok_or(ForexCacheError::EntryNotFound.into())\n }\n}",
16
+ "after_code": "async fn successive_fetch_and_save_forex(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n // spawn a new thread and do the api fetch and write operations on redis.\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n if forex_api_key.is_empty() {\n Err(ForexCacheError::ConfigurationError(\"api_keys not provided\".into()).into())\n } else {\n let state = state.clone();\n tokio::spawn(\n async move {\n acquire_redis_lock_and_fetch_data(&state)\n .await\n .map_err(|err| {\n logger::error!(forex_error=?err);\n })\n .ok();\n }\n .in_current_span(),\n );\n stale_redis_data.ok_or(ForexCacheError::EntryNotFound.into())\n }\n}",
17
+ "diff_span": {
18
+ "before": " tokio::spawn(\n async move {\n acquire_redis_lock_and_fetch_data(&state).await.ok();\n }\n .in_current_span(),",
19
+ "after": " tokio::spawn(\n async move {\n acquire_redis_lock_and_fetch_data(&state)\n .await\n .map_err(|err| {\n logger::error!(forex_error=?err);\n })\n .ok();\n }\n .in_current_span(),"
20
+ },
21
+ "commit_sha": "a1d0992edaeea24068e25ca611b27fa1617bd31b"
22
+ },
23
+ {
24
+ "id": "crates/router/src/utils/currency.rs::function::acquire_redis_lock_and_fetch_data",
25
+ "file": "crates/router/src/utils/currency.rs",
26
+ "kind": "function_item",
27
+ "status": "modified",
28
+ "code_changed": true,
29
+ "imports_changed": false,
30
+ "before_code": "async fn acquire_redis_lock_and_fetch_data(\n state: &SessionState,\n) -> CustomResult<(), ForexCacheError> {\n match acquire_redis_lock(state).await {\n Ok(lock_acquired) => {\n if !lock_acquired {\n logger::error!(\"forex_log: Unable to acquire redis lock\");\n return Err(ForexCacheError::CouldNotAcquireLock.into());\n }\n logger::debug!(\"forex_log: redis lock acquired\");\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => {\n successive_save_data_to_redis_local(state, rates).await?;\n Ok(())\n }\n Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(\"forex_log: {:?}\", error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => {\n successive_save_data_to_redis_local(state, rates).await?;\n Ok(())\n }\n Err(error) => {\n logger::error!(\"forex_log: {:?}\", error);\n release_redis_lock(state).await?;\n Ok(())\n }\n }\n }\n }\n }\n Err(error) => {\n logger::error!(\"forex_log: {:?}\", error);\n Ok(())\n }\n }\n}",
31
+ "after_code": "async fn acquire_redis_lock_and_fetch_data(\n state: &SessionState,\n) -> CustomResult<(), ForexCacheError> {\n match acquire_redis_lock(state).await {\n Ok(lock_acquired) => {\n if !lock_acquired {\n return Err(ForexCacheError::CouldNotAcquireLock.into());\n }\n logger::debug!(\"forex_log: redis lock acquired\");\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => {\n successive_save_data_to_redis_local(state, rates).await?;\n Ok(())\n }\n Err(error) => {\n logger::error!(forex_error=?error,\"primary_forex_error\");\n // API not able to fetch data call secondary service\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => {\n successive_save_data_to_redis_local(state, rates).await?;\n Ok(())\n }\n Err(error) => {\n release_redis_lock(state).await?;\n Err(error)\n }\n }\n }\n }\n }\n Err(error) => Err(error),\n }\n}",
32
+ "diff_span": {
33
+ "before": " Ok(lock_acquired) => {\n if !lock_acquired {\n logger::error!(\"forex_log: Unable to acquire redis lock\");\n return Err(ForexCacheError::CouldNotAcquireLock.into());\n }\n logger::debug!(\"forex_log: redis lock acquired\");\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => {\n successive_save_data_to_redis_local(state, rates).await?;\n Ok(())\n }\n Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(\"forex_log: {:?}\", error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => {\n successive_save_data_to_redis_local(state, rates).await?;\n Ok(())\n }\n Err(error) => {\n logger::error!(\"forex_log: {:?}\", error);\n release_redis_lock(state).await?;\n Ok(())\n }\n }\n }\n }\n }\n Err(error) => {\n logger::error!(\"forex_log: {:?}\", error);\n Ok(())\n }\n }\n}",
34
+ "after": " }\n Err(error) => {\n logger::error!(forex_error=?error,\"primary_forex_error\");\n // API not able to fetch data call secondary service\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => {\n successive_save_data_to_redis_local(state, rates).await?;\n Ok(())\n }\n Err(error) => {\n release_redis_lock(state).await?;\n Err(error)\n }\n }\n }\n }\n }\n Err(error) => Err(error),\n }\n}"
35
+ },
36
+ "commit_sha": "a1d0992edaeea24068e25ca611b27fa1617bd31b"
37
+ },
38
+ {
39
+ "id": "crates/router/src/utils/currency.rs::function::fetch_forex_rates",
40
+ "file": "crates/router/src/utils/currency.rs",
41
+ "kind": "function_item",
42
+ "status": "modified",
43
+ "code_changed": true,
44
+ "imports_changed": false,
45
+ "before_code": "async fn fetch_forex_rates(\n state: &SessionState,\n) -> Result<FxExchangeRatesCacheEntry, error_stack::Report<ForexCacheError>> {\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n\n logger::debug!(\"forex_log: Primary api call for forex fetch\");\n let forex_url: String = format!(\"{}{}{}\", FOREX_BASE_URL, forex_api_key, FOREX_BASE_CURRENCY);\n let forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&forex_url)\n .build();\n\n logger::info!(primary_forex_request=?forex_request,\"forex_log: Primary api call for forex fetch\");\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Primary forex fetch api unresponsive\")?;\n let forex_response = response\n .json::<ForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from primary api into ForexResponse\",\n )?;\n\n logger::info!(primary_forex_response=?forex_response,\"forex_log\");\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match forex_response.rates.get(&enum_curr.to_string()) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n }\n };\n }\n\n Ok(FxExchangeRatesCacheEntry::new(ExchangeRates::new(\n enums::Currency::USD,\n conversions,\n )))\n}",
46
+ "after_code": "async fn fetch_forex_rates(\n state: &SessionState,\n) -> Result<FxExchangeRatesCacheEntry, error_stack::Report<ForexCacheError>> {\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n\n logger::debug!(\"forex_log: Primary api call for forex fetch\");\n let forex_url: String = format!(\"{}{}{}\", FOREX_BASE_URL, forex_api_key, FOREX_BASE_CURRENCY);\n let forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&forex_url)\n .build();\n\n logger::info!(primary_forex_request=?forex_request,\"forex_log: Primary api call for forex fetch\");\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Primary forex fetch api unresponsive\")?;\n let forex_response = response\n .json::<ForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from primary api into ForexResponse\",\n )?;\n\n logger::info!(primary_forex_response=?forex_response,\"forex_log\");\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match forex_response.rates.get(&enum_curr.to_string()) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\n \"forex_error: Rates for {} not received from API\",\n &enum_curr\n );\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n logger::error!(\n \"forex_error: Rates for {} not received from API\",\n &enum_curr\n );\n }\n };\n }\n\n Ok(FxExchangeRatesCacheEntry::new(ExchangeRates::new(\n enums::Currency::USD,\n conversions,\n )))\n}",
47
+ "diff_span": {
48
+ "before": " Some(rate) => rate,\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n }\n };",
49
+ "after": " Some(rate) => rate,\n None => {\n logger::error!(\n \"forex_error: Rates for {} not received from API\",\n &enum_curr\n );\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n logger::error!(\n \"forex_error: Rates for {} not received from API\",\n &enum_curr\n );\n }\n };"
50
+ },
51
+ "commit_sha": "a1d0992edaeea24068e25ca611b27fa1617bd31b"
52
+ },
53
+ {
54
+ "id": "crates/router/src/utils/currency.rs::function::successive_save_data_to_redis_local",
55
+ "file": "crates/router/src/utils/currency.rs",
56
+ "kind": "function_item",
57
+ "status": "modified",
58
+ "code_changed": true,
59
+ "imports_changed": false,
60
+ "before_code": "async fn successive_save_data_to_redis_local(\n state: &SessionState,\n forex: FxExchangeRatesCacheEntry,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n Ok(save_forex_to_redis(state, &forex)\n .await\n .async_and_then(|_rates| release_redis_lock(state))\n .await\n .async_and_then(|_val| save_forex_to_local(forex.clone()))\n .await\n .map_or_else(\n |error| {\n logger::error!(\"forex_log: {:?}\", error);\n forex.clone()\n },\n |_| forex.clone(),\n ))\n}",
61
+ "after_code": "async fn successive_save_data_to_redis_local(\n state: &SessionState,\n forex: FxExchangeRatesCacheEntry,\n) -> CustomResult<(), ForexCacheError> {\n save_forex_to_redis(state, &forex)\n .await\n .async_and_then(|_rates| release_redis_lock(state))\n .await\n .async_and_then(|_val| save_forex_to_local(forex.clone()))\n .await\n}",
62
+ "diff_span": {
63
+ "before": " state: &SessionState,\n forex: FxExchangeRatesCacheEntry,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n Ok(save_forex_to_redis(state, &forex)\n .await\n .async_and_then(|_rates| release_redis_lock(state))\n .await\n .async_and_then(|_val| save_forex_to_local(forex.clone()))\n .await\n .map_or_else(\n |error| {\n logger::error!(\"forex_log: {:?}\", error);\n forex.clone()\n },\n |_| forex.clone(),\n ))\n}",
64
+ "after": " state: &SessionState,\n forex: FxExchangeRatesCacheEntry,\n) -> CustomResult<(), ForexCacheError> {\n save_forex_to_redis(state, &forex)\n .await\n .async_and_then(|_rates| release_redis_lock(state))"
65
+ },
66
+ "commit_sha": "a1d0992edaeea24068e25ca611b27fa1617bd31b"
67
+ },
68
+ {
69
+ "id": "crates/router/src/utils/currency.rs::function::fallback_fetch_forex_rates",
70
+ "file": "crates/router/src/utils/currency.rs",
71
+ "kind": "function_item",
72
+ "status": "modified",
73
+ "code_changed": true,
74
+ "imports_changed": false,
75
+ "before_code": "pub async fn fallback_fetch_forex_rates(\n state: &SessionState,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n let fallback_forex_api_key = state.conf.forex_api.get_inner().fallback_api_key.peek();\n\n let fallback_forex_url: String =\n format!(\"{}{}\", FALLBACK_FOREX_BASE_URL, fallback_forex_api_key,);\n let fallback_forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&fallback_forex_url)\n .build();\n\n logger::info!(fallback_forex_request=?fallback_forex_request,\"forex_log: Fallback api call for forex fetch\");\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n fallback_forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Fallback forex fetch api unresponsive\")?;\n\n let fallback_forex_response = response\n .json::<FallbackForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from falback api into ForexResponse\",\n )?;\n\n logger::info!(fallback_forex_response=?fallback_forex_response,\"forex_log\");\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match fallback_forex_response.quotes.get(\n format!(\n \"{}{}\",\n FALLBACK_FOREX_API_CURRENCY_PREFIX,\n &enum_curr.to_string()\n )\n .as_str(),\n ) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n if enum_curr == enums::Currency::USD {\n let currency_factors =\n CurrencyFactors::new(Decimal::new(1, 0), Decimal::new(1, 0));\n conversions.insert(enum_curr, currency_factors);\n } else {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n }\n }\n };\n }\n\n let rates =\n FxExchangeRatesCacheEntry::new(ExchangeRates::new(enums::Currency::USD, conversions));\n match acquire_redis_lock(state).await {\n Ok(_) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(e) => {\n logger::error!(\"forex_log: {:?}\", e);\n Ok(rates)\n }\n }\n}",
76
+ "after_code": "pub async fn fallback_fetch_forex_rates(\n state: &SessionState,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n let fallback_forex_api_key = state.conf.forex_api.get_inner().fallback_api_key.peek();\n\n let fallback_forex_url: String =\n format!(\"{}{}\", FALLBACK_FOREX_BASE_URL, fallback_forex_api_key,);\n let fallback_forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&fallback_forex_url)\n .build();\n\n logger::info!(fallback_forex_request=?fallback_forex_request,\"forex_log: Fallback api call for forex fetch\");\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n fallback_forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Fallback forex fetch api unresponsive\")?;\n\n let fallback_forex_response = response\n .json::<FallbackForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from falback api into ForexResponse\",\n )?;\n\n logger::info!(fallback_forex_response=?fallback_forex_response,\"forex_log\");\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match fallback_forex_response.quotes.get(\n format!(\n \"{}{}\",\n FALLBACK_FOREX_API_CURRENCY_PREFIX,\n &enum_curr.to_string()\n )\n .as_str(),\n ) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\n \"forex_error: Rates for {} not received from API\",\n &enum_curr\n );\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n if enum_curr == enums::Currency::USD {\n let currency_factors =\n CurrencyFactors::new(Decimal::new(1, 0), Decimal::new(1, 0));\n conversions.insert(enum_curr, currency_factors);\n } else {\n logger::error!(\n \"forex_error: Rates for {} not received from API\",\n &enum_curr\n );\n }\n }\n };\n }\n\n let rates =\n FxExchangeRatesCacheEntry::new(ExchangeRates::new(enums::Currency::USD, conversions));\n match acquire_redis_lock(state).await {\n Ok(_) => {\n successive_save_data_to_redis_local(state, rates.clone()).await?;\n Ok(rates)\n }\n Err(e) => Err(e),\n }\n}",
77
+ "diff_span": {
78
+ "before": " Some(rate) => rate,\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n if enum_curr == enums::Currency::USD {\n let currency_factors =\n CurrencyFactors::new(Decimal::new(1, 0), Decimal::new(1, 0));\n conversions.insert(enum_curr, currency_factors);\n } else {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n }\n }\n };\n }\n\n let rates =\n FxExchangeRatesCacheEntry::new(ExchangeRates::new(enums::Currency::USD, conversions));\n match acquire_redis_lock(state).await {\n Ok(_) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(e) => {\n logger::error!(\"forex_log: {:?}\", e);\n Ok(rates)\n }",
79
+ "after": " Some(rate) => rate,\n None => {\n logger::error!(\n \"forex_error: Rates for {} not received from API\",\n &enum_curr\n );\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n if enum_curr == enums::Currency::USD {\n let currency_factors =\n CurrencyFactors::new(Decimal::new(1, 0), Decimal::new(1, 0));\n conversions.insert(enum_curr, currency_factors);\n } else {\n logger::error!(\n \"forex_error: Rates for {} not received from API\",\n &enum_curr\n );\n }\n }\n };\n }\n\n let rates =\n FxExchangeRatesCacheEntry::new(ExchangeRates::new(enums::Currency::USD, conversions));\n match acquire_redis_lock(state).await {\n Ok(_) => {\n successive_save_data_to_redis_local(state, rates.clone()).await?;\n Ok(rates)\n }\n Err(e) => Err(e),\n }\n}"
80
+ },
81
+ "commit_sha": "a1d0992edaeea24068e25ca611b27fa1617bd31b"
82
+ },
83
+ {
84
+ "id": "crates/router/src/utils/currency.rs::function::handler_local_no_data",
85
+ "file": "crates/router/src/utils/currency.rs",
86
+ "kind": "function_item",
87
+ "status": "modified",
88
+ "code_changed": true,
89
+ "imports_changed": false,
90
+ "before_code": "async fn handler_local_no_data(\n state: &SessionState,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match retrieve_forex_from_redis(state).await {\n Ok(Some(data)) => fallback_forex_redis_check(state, data, call_delay).await,\n Ok(None) => {\n // No data in local as well as redis\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n Err(error) => {\n // Error in deriving forex rates from redis\n logger::error!(\"forex_log: {:?}\", error);\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n }\n}",
91
+ "after_code": "async fn handler_local_no_data(\n state: &SessionState,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match retrieve_forex_from_redis(state).await {\n Ok(Some(data)) => fallback_forex_redis_check(state, data, call_delay).await,\n Ok(None) => {\n // No data in local as well as redis\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n Err(error) => {\n // Error in deriving forex rates from redis\n logger::error!(\"forex_error: {:?}\", error);\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n }\n}",
92
+ "diff_span": {
93
+ "before": " Err(error) => {\n // Error in deriving forex rates from redis\n logger::error!(\"forex_log: {:?}\", error);\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())",
94
+ "after": " Err(error) => {\n // Error in deriving forex rates from redis\n logger::error!(\"forex_error: {:?}\", error);\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())"
95
+ },
96
+ "commit_sha": "a1d0992edaeea24068e25ca611b27fa1617bd31b"
97
+ }
98
+ ]
99
+ }
diffs/pr_6906/aef526d/diff.json ADDED
@@ -0,0 +1,39 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "aef526da88bdf6c8699d2aebf049fb3716abc489",
3
+ "pr_number": 6906,
4
+ "rust_files": [
5
+ "crates/router/src/utils/currency.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/router/src/utils/currency.rs::function::fetch_forex_rates",
10
+ "file": "crates/router/src/utils/currency.rs",
11
+ "kind": "function_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "async fn fetch_forex_rates(\n state: &SessionState,\n) -> Result<FxExchangeRatesCacheEntry, error_stack::Report<ForexCacheError>> {\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n\n logger::debug!(\"forex_log: Primary api call for forex fetch\");\n let forex_url: String = format!(\"{}{}{}\", FOREX_BASE_URL, forex_api_key, FOREX_BASE_CURRENCY);\n let forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&forex_url)\n .build();\n\n logger::debug!(\"forex_log: Primary api call for forex fetch\");\n logger::info!(primary_forex_request=?forex_request,\"forex_log\");\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Primary forex fetch api unresponsive\")?;\n let forex_response = response\n .json::<ForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from primary api into ForexResponse\",\n )?;\n\n logger::info!(primary_forex_response=?forex_response,\"forex_log\");\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match forex_response.rates.get(&enum_curr.to_string()) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n }\n };\n }\n\n Ok(FxExchangeRatesCacheEntry::new(ExchangeRates::new(\n enums::Currency::USD,\n conversions,\n )))\n}",
16
+ "after_code": "async fn fetch_forex_rates(\n state: &SessionState,\n) -> Result<FxExchangeRatesCacheEntry, error_stack::Report<ForexCacheError>> {\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n\n logger::debug!(\"forex_log: Primary api call for forex fetch\");\n let forex_url: String = format!(\"{}{}{}\", FOREX_BASE_URL, forex_api_key, FOREX_BASE_CURRENCY);\n let forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&forex_url)\n .build();\n\n logger::info!(primary_forex_request=?forex_request,\"forex_log: Primary api call for forex fetch\");\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Primary forex fetch api unresponsive\")?;\n let forex_response = response\n .json::<ForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from primary api into ForexResponse\",\n )?;\n\n logger::info!(primary_forex_response=?forex_response,\"forex_log\");\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match forex_response.rates.get(&enum_curr.to_string()) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n }\n };\n }\n\n Ok(FxExchangeRatesCacheEntry::new(ExchangeRates::new(\n enums::Currency::USD,\n conversions,\n )))\n}",
17
+ "diff_span": {
18
+ "before": " .build();\n\n logger::debug!(\"forex_log: Primary api call for forex fetch\");\n logger::info!(primary_forex_request=?forex_request,\"forex_log\");\n let response = state\n .api_client",
19
+ "after": " .build();\n\n logger::info!(primary_forex_request=?forex_request,\"forex_log: Primary api call for forex fetch\");\n let response = state\n .api_client"
20
+ },
21
+ "commit_sha": "aef526da88bdf6c8699d2aebf049fb3716abc489"
22
+ },
23
+ {
24
+ "id": "crates/router/src/utils/currency.rs::function::fallback_fetch_forex_rates",
25
+ "file": "crates/router/src/utils/currency.rs",
26
+ "kind": "function_item",
27
+ "status": "modified",
28
+ "code_changed": true,
29
+ "imports_changed": false,
30
+ "before_code": "pub async fn fallback_fetch_forex_rates(\n state: &SessionState,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n let fallback_forex_api_key = state.conf.forex_api.get_inner().fallback_api_key.peek();\n\n let fallback_forex_url: String =\n format!(\"{}{}\", FALLBACK_FOREX_BASE_URL, fallback_forex_api_key,);\n let fallback_forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&fallback_forex_url)\n .build();\n\n logger::debug!(\"forex_log: Fallback api call for forex fetch\");\n logger::info!(fallback_forex_request=?fallback_forex_request,\"forex_log\");\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n fallback_forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Fallback forex fetch api unresponsive\")?;\n\n let fallback_forex_response = response\n .json::<FallbackForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from falback api into ForexResponse\",\n )?;\n\n logger::info!(fallback_forex_response=?fallback_forex_response,\"forex_log\");\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match fallback_forex_response.quotes.get(\n format!(\n \"{}{}\",\n FALLBACK_FOREX_API_CURRENCY_PREFIX,\n &enum_curr.to_string()\n )\n .as_str(),\n ) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n if enum_curr == enums::Currency::USD {\n let currency_factors =\n CurrencyFactors::new(Decimal::new(1, 0), Decimal::new(1, 0));\n conversions.insert(enum_curr, currency_factors);\n } else {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n }\n }\n };\n }\n\n let rates =\n FxExchangeRatesCacheEntry::new(ExchangeRates::new(enums::Currency::USD, conversions));\n match acquire_redis_lock(state).await {\n Ok(_) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(e) => {\n logger::error!(\"forex_log: {:?}\", e);\n Ok(rates)\n }\n }\n}",
31
+ "after_code": "pub async fn fallback_fetch_forex_rates(\n state: &SessionState,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n let fallback_forex_api_key = state.conf.forex_api.get_inner().fallback_api_key.peek();\n\n let fallback_forex_url: String =\n format!(\"{}{}\", FALLBACK_FOREX_BASE_URL, fallback_forex_api_key,);\n let fallback_forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&fallback_forex_url)\n .build();\n\n logger::info!(fallback_forex_request=?fallback_forex_request,\"forex_log: Fallback api call for forex fetch\");\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n fallback_forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Fallback forex fetch api unresponsive\")?;\n\n let fallback_forex_response = response\n .json::<FallbackForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from falback api into ForexResponse\",\n )?;\n\n logger::info!(fallback_forex_response=?fallback_forex_response,\"forex_log\");\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match fallback_forex_response.quotes.get(\n format!(\n \"{}{}\",\n FALLBACK_FOREX_API_CURRENCY_PREFIX,\n &enum_curr.to_string()\n )\n .as_str(),\n ) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n if enum_curr == enums::Currency::USD {\n let currency_factors =\n CurrencyFactors::new(Decimal::new(1, 0), Decimal::new(1, 0));\n conversions.insert(enum_curr, currency_factors);\n } else {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n }\n }\n };\n }\n\n let rates =\n FxExchangeRatesCacheEntry::new(ExchangeRates::new(enums::Currency::USD, conversions));\n match acquire_redis_lock(state).await {\n Ok(_) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(e) => {\n logger::error!(\"forex_log: {:?}\", e);\n Ok(rates)\n }\n }\n}",
32
+ "diff_span": {
33
+ "before": " .build();\n\n logger::debug!(\"forex_log: Fallback api call for forex fetch\");\n logger::info!(fallback_forex_request=?fallback_forex_request,\"forex_log\");\n let response = state\n .api_client",
34
+ "after": " .build();\n\n logger::info!(fallback_forex_request=?fallback_forex_request,\"forex_log: Fallback api call for forex fetch\");\n let response = state\n .api_client"
35
+ },
36
+ "commit_sha": "aef526da88bdf6c8699d2aebf049fb3716abc489"
37
+ }
38
+ ]
39
+ }
diffs/pr_6906/b649433/diff.json ADDED
@@ -0,0 +1,137 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "b64943367c6394505e0afeef416c6cab49e0f971",
3
+ "pr_number": 6906,
4
+ "rust_files": [
5
+ "crates/router/src/configs/settings.rs",
6
+ "crates/router/src/utils/currency.rs"
7
+ ],
8
+ "diffs": [
9
+ {
10
+ "id": "crates/router/src/utils/currency.rs::function::acquire_redis_lock_and_fetch_data",
11
+ "file": "crates/router/src/utils/currency.rs",
12
+ "kind": "function_item",
13
+ "status": "modified",
14
+ "code_changed": true,
15
+ "imports_changed": true,
16
+ "before_code": "async fn acquire_redis_lock_and_fetch_data(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match acquire_redis_lock(state).await {\n Ok(lock_acquired) => {\n if !lock_acquired {\n logger::debug!(\"forex_log: Unable to acquire redis lock\");\n return stale_redis_data.ok_or(ForexCacheError::CouldNotAcquireLock.into());\n }\n logger::debug!(\"forex_log: redis lock acquired\");\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => successive_save_data_to_redis_local(state, rates).await,\n Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(\"forex_log: {:?}\", error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(error) => stale_redis_data.ok_or({\n logger::error!(\"forex_log: {:?}\", error);\n release_redis_lock(state).await?;\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n }\n }\n }\n Err(error) => stale_redis_data.ok_or({\n logger::error!(\"forex_log: {:?}\", error);\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n}",
17
+ "after_code": "async fn acquire_redis_lock_and_fetch_data(\n state: &SessionState,\n) -> CustomResult<(), ForexCacheError> {\n match acquire_redis_lock(state).await {\n Ok(lock_acquired) => {\n if !lock_acquired {\n logger::debug!(\"forex_log: Unable to acquire redis lock\");\n }\n logger::debug!(\"forex_log: redis lock acquired\");\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => {\n successive_save_data_to_redis_local(state, rates).await?;\n Ok(())\n }\n Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(\"forex_log: {:?}\", error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => {\n successive_save_data_to_redis_local(state, rates).await?;\n Ok(())\n }\n Err(error) => {\n logger::error!(\"forex_log: {:?}\", error);\n release_redis_lock(state).await?;\n Ok(())\n }\n }\n }\n }\n }\n Err(error) => {\n logger::error!(\"forex_log: {:?}\", error);\n Ok(())\n }\n }\n}",
18
+ "diff_span": {
19
+ "before": "async fn acquire_redis_lock_and_fetch_data(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match acquire_redis_lock(state).await {\n Ok(lock_acquired) => {\n if !lock_acquired {\n logger::debug!(\"forex_log: Unable to acquire redis lock\");\n return stale_redis_data.ok_or(ForexCacheError::CouldNotAcquireLock.into());\n }\n logger::debug!(\"forex_log: redis lock acquired\");\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => successive_save_data_to_redis_local(state, rates).await,\n Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(\"forex_log: {:?}\", error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(error) => stale_redis_data.ok_or({\n logger::error!(\"forex_log: {:?}\", error);\n release_redis_lock(state).await?;\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n }\n }\n }\n Err(error) => stale_redis_data.ok_or({\n logger::error!(\"forex_log: {:?}\", error);\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n}",
20
+ "after": "async fn acquire_redis_lock_and_fetch_data(\n state: &SessionState,\n) -> CustomResult<(), ForexCacheError> {\n match acquire_redis_lock(state).await {\n Ok(lock_acquired) => {\n if !lock_acquired {\n logger::debug!(\"forex_log: Unable to acquire redis lock\");\n }\n logger::debug!(\"forex_log: redis lock acquired\");\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => {\n successive_save_data_to_redis_local(state, rates).await?;\n Ok(())\n }\n Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(\"forex_log: {:?}\", error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => {\n successive_save_data_to_redis_local(state, rates).await?;\n Ok(())\n }\n Err(error) => {\n logger::error!(\"forex_log: {:?}\", error);\n release_redis_lock(state).await?;\n Ok(())\n }\n }\n }\n }\n }\n Err(error) => {\n logger::error!(\"forex_log: {:?}\", error);\n Ok(())\n }\n }\n}"
21
+ },
22
+ "commit_sha": "b64943367c6394505e0afeef416c6cab49e0f971",
23
+ "before_imports": [
24
+ "use currency_conversion::types::{CurrencyFactors, ExchangeRates};",
25
+ "use crate::{\n logger,\n routes::app::settings::{Conversion, DefaultExchangeRates},\n services, SessionState,\n};"
26
+ ],
27
+ "after_imports": [
28
+ "use crate::{\n logger,\n routes::app::settings::{Conversion, DefaultExchangeRates},\n services, SessionState,\n};"
29
+ ]
30
+ },
31
+ {
32
+ "id": "crates/router/src/utils/currency.rs::enum::ForexCacheError",
33
+ "file": "crates/router/src/utils/currency.rs",
34
+ "kind": "enum_item",
35
+ "status": "modified",
36
+ "code_changed": true,
37
+ "imports_changed": false,
38
+ "before_code": "pub enum ForexCacheError {\n #[error(\"API error\")]\n ApiError,\n #[error(\"API timeout\")]\n ApiTimeout,\n #[error(\"API unresponsive\")]\n ApiUnresponsive,\n #[error(\"Conversion error\")]\n ConversionError,\n #[error(\"Could not acquire the lock for cache entry\")]\n CouldNotAcquireLock,\n #[error(\"Provided currency not acceptable\")]\n CurrencyNotAcceptable,\n #[error(\"Configuration error, api_keys not provided\")]\n ConfigurationError,\n #[error(\"Incorrect entries in default Currency response\")]\n DefaultCurrencyParsingError,\n #[error(\"Entry not found in cache\")]\n EntryNotFound,\n #[error(\"Forex data unavailable\")]\n ForexDataUnavailable,\n #[error(\"Expiration time invalid\")]\n InvalidLogExpiry,\n #[error(\"Error reading local\")]\n LocalReadError,\n #[error(\"Error writing to local cache\")]\n LocalWriteError,\n #[error(\"Json Parsing error\")]\n ParsingError,\n #[error(\"Aws Kms decryption error\")]\n AwsKmsDecryptionFailed,\n #[error(\"Error connecting to redis\")]\n RedisConnectionError,\n #[error(\"Not able to release write lock\")]\n RedisLockReleaseFailed,\n #[error(\"Error writing to redis\")]\n RedisWriteError,\n #[error(\"Not able to acquire write lock\")]\n WriteLockNotAcquired,\n}",
39
+ "after_code": "pub enum ForexCacheError {\n #[error(\"API error\")]\n ApiError,\n #[error(\"API timeout\")]\n ApiTimeout,\n #[error(\"API unresponsive\")]\n ApiUnresponsive,\n #[error(\"Conversion error\")]\n ConversionError,\n #[error(\"Could not acquire the lock for cache entry\")]\n CouldNotAcquireLock,\n #[error(\"Provided currency not acceptable\")]\n CurrencyNotAcceptable,\n #[error(\"Forex configuration error: {0}\")]\n ConfigurationError(String),\n #[error(\"Incorrect entries in default Currency response\")]\n DefaultCurrencyParsingError,\n #[error(\"Entry not found in cache\")]\n EntryNotFound,\n #[error(\"Forex data unavailable\")]\n ForexDataUnavailable,\n #[error(\"Expiration time invalid\")]\n InvalidLogExpiry,\n #[error(\"Error reading local\")]\n LocalReadError,\n #[error(\"Error writing to local cache\")]\n LocalWriteError,\n #[error(\"Json Parsing error\")]\n ParsingError,\n #[error(\"Aws Kms decryption error\")]\n AwsKmsDecryptionFailed,\n #[error(\"Error connecting to redis\")]\n RedisConnectionError,\n #[error(\"Not able to release write lock\")]\n RedisLockReleaseFailed,\n #[error(\"Error writing to redis\")]\n RedisWriteError,\n #[error(\"Not able to acquire write lock\")]\n WriteLockNotAcquired,\n}",
40
+ "diff_span": {
41
+ "before": " #[error(\"Provided currency not acceptable\")]\n CurrencyNotAcceptable,\n #[error(\"Configuration error, api_keys not provided\")]\n ConfigurationError,\n #[error(\"Incorrect entries in default Currency response\")]\n DefaultCurrencyParsingError,",
42
+ "after": " #[error(\"Provided currency not acceptable\")]\n CurrencyNotAcceptable,\n #[error(\"Forex configuration error: {0}\")]\n ConfigurationError(String),\n #[error(\"Incorrect entries in default Currency response\")]\n DefaultCurrencyParsingError,"
43
+ },
44
+ "commit_sha": "b64943367c6394505e0afeef416c6cab49e0f971"
45
+ },
46
+ {
47
+ "id": "crates/router/src/utils/currency.rs::function::fallback_forex_redis_check",
48
+ "file": "crates/router/src/utils/currency.rs",
49
+ "kind": "function_item",
50
+ "status": "modified",
51
+ "code_changed": true,
52
+ "imports_changed": false,
53
+ "before_code": "async fn fallback_forex_redis_check(\n state: &SessionState,\n redis_data: FxExchangeRatesCacheEntry,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match is_redis_expired(Some(redis_data.clone()).as_ref(), call_delay).await {\n Some(redis_forex) => {\n // Valid data present in redis\n let exchange_rates = FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());\n logger::debug!(\"forex_log: forex response from redis\");\n save_forex_to_local(exchange_rates.clone()).await?;\n Ok(exchange_rates)\n }\n None => {\n // redis expired\n successive_fetch_and_save_forex(state, Some(redis_data)).await\n }\n }\n}",
54
+ "after_code": "async fn fallback_forex_redis_check(\n state: &SessionState,\n redis_data: FxExchangeRatesCacheEntry,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match is_redis_expired(Some(redis_data.clone()).as_ref(), call_delay).await {\n Some(redis_forex) => {\n // Valid data present in redis\n let exchange_rates = FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());\n logger::debug!(\"forex_log: forex response found in redis\");\n save_forex_to_local(exchange_rates.clone()).await?;\n Ok(exchange_rates)\n }\n None => {\n // redis expired\n successive_fetch_and_save_forex(state, Some(redis_data)).await\n }\n }\n}",
55
+ "diff_span": {
56
+ "before": " // Valid data present in redis\n let exchange_rates = FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());\n logger::debug!(\"forex_log: forex response from redis\");\n save_forex_to_local(exchange_rates.clone()).await?;\n Ok(exchange_rates)",
57
+ "after": " // Valid data present in redis\n let exchange_rates = FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());\n logger::debug!(\"forex_log: forex response found in redis\");\n save_forex_to_local(exchange_rates.clone()).await?;\n Ok(exchange_rates)"
58
+ },
59
+ "commit_sha": "b64943367c6394505e0afeef416c6cab49e0f971"
60
+ },
61
+ {
62
+ "id": "crates/router/src/configs/settings.rs::struct::ForexApi",
63
+ "file": "crates/router/src/configs/settings.rs",
64
+ "kind": "struct_item",
65
+ "status": "modified",
66
+ "code_changed": true,
67
+ "imports_changed": false,
68
+ "before_code": "pub struct ForexApi {\n pub api_key: Secret<String>,\n pub fallback_api_key: Secret<String>,\n /// in s\n pub call_delay: i64,\n /// in ms\n pub api_timeout: u64,\n /// in s\n pub redis_lock_timeout: u64,\n}",
69
+ "after_code": "pub struct ForexApi {\n pub api_key: Secret<String>,\n pub fallback_api_key: Secret<String>,\n /// in s\n pub call_delay: i64,\n /// in s\n pub redis_lock_timeout: u64,\n}",
70
+ "diff_span": {
71
+ "before": " /// in s\n pub call_delay: i64,\n /// in ms\n pub api_timeout: u64,\n /// in s\n pub redis_lock_timeout: u64,",
72
+ "after": ""
73
+ },
74
+ "commit_sha": "b64943367c6394505e0afeef416c6cab49e0f971"
75
+ },
76
+ {
77
+ "id": "crates/router/src/utils/currency.rs::function::fetch_forex_rates",
78
+ "file": "crates/router/src/utils/currency.rs",
79
+ "kind": "function_item",
80
+ "status": "modified",
81
+ "code_changed": true,
82
+ "imports_changed": false,
83
+ "before_code": "async fn fetch_forex_rates(\n state: &SessionState,\n) -> Result<FxExchangeRatesCacheEntry, error_stack::Report<ForexCacheError>> {\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n\n logger::debug!(\"forex_log: Primary api call for forex fetch\");\n let forex_url: String = format!(\"{}{}{}\", FOREX_BASE_URL, forex_api_key, FOREX_BASE_CURRENCY);\n let forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&forex_url)\n .build();\n\n logger::info!(\"forex_log: {:?}\", forex_request);\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Primary forex fetch api unresponsive\")?;\n let forex_response = response\n .json::<ForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from primary api into ForexResponse\",\n )?;\n\n logger::info!(\"forex_log: {:?}\", forex_response);\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match forex_response.rates.get(&enum_curr.to_string()) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n }\n };\n }\n\n Ok(FxExchangeRatesCacheEntry::new(ExchangeRates::new(\n enums::Currency::USD,\n conversions,\n )))\n}",
84
+ "after_code": "async fn fetch_forex_rates(\n state: &SessionState,\n) -> Result<FxExchangeRatesCacheEntry, error_stack::Report<ForexCacheError>> {\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n\n logger::debug!(\"forex_log: Primary api call for forex fetch\");\n let forex_url: String = format!(\"{}{}{}\", FOREX_BASE_URL, forex_api_key, FOREX_BASE_CURRENCY);\n let forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&forex_url)\n .build();\n\n logger::debug!(\"forex_log: Primary api call for forex fetch\");\n logger::info!(\"forex_log: primary_forex_request: {:?}\", forex_request);\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Primary forex fetch api unresponsive\")?;\n let forex_response = response\n .json::<ForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from primary api into ForexResponse\",\n )?;\n\n logger::info!(\"forex_log: primary_forex_response: {:?}\", forex_response);\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match forex_response.rates.get(&enum_curr.to_string()) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n }\n };\n }\n\n Ok(FxExchangeRatesCacheEntry::new(ExchangeRates::new(\n enums::Currency::USD,\n conversions,\n )))\n}",
85
+ "diff_span": {
86
+ "before": " .build();\n\n logger::info!(\"forex_log: {:?}\", forex_request);\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Primary forex fetch api unresponsive\")?;\n let forex_response = response\n .json::<ForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from primary api into ForexResponse\",\n )?;\n\n logger::info!(\"forex_log: {:?}\", forex_response);\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();",
87
+ "after": " .build();\n\n logger::debug!(\"forex_log: Primary api call for forex fetch\");\n logger::info!(\"forex_log: primary_forex_request: {:?}\", forex_request);\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Primary forex fetch api unresponsive\")?;\n let forex_response = response\n .json::<ForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from primary api into ForexResponse\",\n )?;\n\n logger::info!(\"forex_log: primary_forex_response: {:?}\", forex_response);\n\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();"
88
+ },
89
+ "commit_sha": "b64943367c6394505e0afeef416c6cab49e0f971"
90
+ },
91
+ {
92
+ "id": "crates/router/src/utils/currency.rs::function::get_forex_rates",
93
+ "file": "crates/router/src/utils/currency.rs",
94
+ "kind": "function_item",
95
+ "status": "modified",
96
+ "code_changed": true,
97
+ "imports_changed": false,
98
+ "before_code": "pub async fn get_forex_rates(\n state: &SessionState,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n if let Some(local_rates) = retrieve_forex_from_local().await {\n if local_rates.is_expired(call_delay) {\n // expired local data\n logger::debug!(\"forex_log: Forex stored in cache is expired\");\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n } else {\n // Valid data present in local\n logger::debug!(\"forex_log: forex response from cache\");\n Ok(local_rates)\n }\n } else {\n // No data in local\n handler_local_no_data(state, call_delay).await\n }\n}",
99
+ "after_code": "pub async fn get_forex_rates(\n state: &SessionState,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n if let Some(local_rates) = retrieve_forex_from_local().await {\n if local_rates.is_expired(call_delay) {\n // expired local data\n logger::debug!(\"forex_log: Forex stored in cache is expired\");\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n } else {\n // Valid data present in local\n logger::debug!(\"forex_log: forex found in cache\");\n Ok(local_rates)\n }\n } else {\n // No data in local\n handler_local_no_data(state, call_delay).await\n }\n}",
100
+ "diff_span": {
101
+ "before": " } else {\n // Valid data present in local\n logger::debug!(\"forex_log: forex response from cache\");\n Ok(local_rates)\n }",
102
+ "after": " } else {\n // Valid data present in local\n logger::debug!(\"forex_log: forex found in cache\");\n Ok(local_rates)\n }"
103
+ },
104
+ "commit_sha": "b64943367c6394505e0afeef416c6cab49e0f971"
105
+ },
106
+ {
107
+ "id": "crates/router/src/utils/currency.rs::function::successive_fetch_and_save_forex",
108
+ "file": "crates/router/src/utils/currency.rs",
109
+ "kind": "function_item",
110
+ "status": "modified",
111
+ "code_changed": true,
112
+ "imports_changed": false,
113
+ "before_code": "async fn successive_fetch_and_save_forex(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n // spawn a new thread and do the api fetch and write operations on redis.\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n if forex_api_key.is_empty() {\n logger::debug!(\"forex_log: api_keys not present in configs\");\n Err(ForexCacheError::ConfigurationError.into())\n } else {\n let stale_forex_data = stale_redis_data.clone();\n let state = state.clone();\n tokio::spawn(\n async move {\n let _ = acquire_redis_lock_and_fetch_data(&state, stale_redis_data).await;\n }\n .in_current_span(),\n );\n stale_forex_data.ok_or(ForexCacheError::EntryNotFound.into())\n }\n}",
114
+ "after_code": "async fn successive_fetch_and_save_forex(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n // spawn a new thread and do the api fetch and write operations on redis.\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n if forex_api_key.is_empty() {\n Err(ForexCacheError::ConfigurationError(\"api_keys not provided\".into()).into())\n } else {\n let state = state.clone();\n tokio::spawn(\n async move {\n acquire_redis_lock_and_fetch_data(&state).await.ok();\n }\n .in_current_span(),\n );\n stale_redis_data.ok_or(ForexCacheError::EntryNotFound.into())\n }\n}",
115
+ "diff_span": {
116
+ "before": " let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n if forex_api_key.is_empty() {\n logger::debug!(\"forex_log: api_keys not present in configs\");\n Err(ForexCacheError::ConfigurationError.into())\n } else {\n let stale_forex_data = stale_redis_data.clone();\n let state = state.clone();\n tokio::spawn(\n async move {\n let _ = acquire_redis_lock_and_fetch_data(&state, stale_redis_data).await;\n }\n .in_current_span(),\n );\n stale_forex_data.ok_or(ForexCacheError::EntryNotFound.into())\n }\n}",
117
+ "after": " let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n if forex_api_key.is_empty() {\n Err(ForexCacheError::ConfigurationError(\"api_keys not provided\".into()).into())\n } else {\n let state = state.clone();\n tokio::spawn(\n async move {\n acquire_redis_lock_and_fetch_data(&state).await.ok();\n }\n .in_current_span(),\n );\n stale_redis_data.ok_or(ForexCacheError::EntryNotFound.into())\n }\n}"
118
+ },
119
+ "commit_sha": "b64943367c6394505e0afeef416c6cab49e0f971"
120
+ },
121
+ {
122
+ "id": "crates/router/src/utils/currency.rs::function::fallback_fetch_forex_rates",
123
+ "file": "crates/router/src/utils/currency.rs",
124
+ "kind": "function_item",
125
+ "status": "modified",
126
+ "code_changed": true,
127
+ "imports_changed": false,
128
+ "before_code": "pub async fn fallback_fetch_forex_rates(\n state: &SessionState,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n let fallback_forex_api_key = state.conf.forex_api.get_inner().fallback_api_key.peek();\n\n let fallback_forex_url: String =\n format!(\"{}{}\", FALLBACK_FOREX_BASE_URL, fallback_forex_api_key,);\n let fallback_forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&fallback_forex_url)\n .build();\n\n logger::debug!(\"forex_log: Fallback api call for forex fetch\");\n logger::info!(\"forex_log: {:?}\", fallback_forex_request);\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n fallback_forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Fallback forex fetch api unresponsive\")?;\n\n let fallback_forex_response = response\n .json::<FallbackForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from falback api into ForexResponse\",\n )?;\n\n logger::info!(\"forex_log: {:?}\", fallback_forex_response);\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match fallback_forex_response.quotes.get(\n format!(\n \"{}{}\",\n FALLBACK_FOREX_API_CURRENCY_PREFIX,\n &enum_curr.to_string()\n )\n .as_str(),\n ) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n if enum_curr == enums::Currency::USD {\n let currency_factors =\n CurrencyFactors::new(Decimal::new(1, 0), Decimal::new(1, 0));\n conversions.insert(enum_curr, currency_factors);\n } else {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n }\n }\n };\n }\n\n let rates =\n FxExchangeRatesCacheEntry::new(ExchangeRates::new(enums::Currency::USD, conversions));\n match acquire_redis_lock(state).await {\n Ok(_) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(e) => {\n logger::error!(\"forex_log: {:?}\", e);\n Ok(rates)\n }\n }\n}",
129
+ "after_code": "pub async fn fallback_fetch_forex_rates(\n state: &SessionState,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n let fallback_forex_api_key = state.conf.forex_api.get_inner().fallback_api_key.peek();\n\n let fallback_forex_url: String =\n format!(\"{}{}\", FALLBACK_FOREX_BASE_URL, fallback_forex_api_key,);\n let fallback_forex_request = services::RequestBuilder::new()\n .method(services::Method::Get)\n .url(&fallback_forex_url)\n .build();\n\n logger::debug!(\"forex_log: Fallback api call for forex fetch\");\n logger::info!(\n \"forex_log: fallback_forex_request: {:?}\",\n fallback_forex_request\n );\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n fallback_forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Fallback forex fetch api unresponsive\")?;\n\n let fallback_forex_response = response\n .json::<FallbackForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from falback api into ForexResponse\",\n )?;\n\n logger::info!(\n \"forex_log: fallback_forex_response: {:?}\",\n fallback_forex_response\n );\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {\n match fallback_forex_response.quotes.get(\n format!(\n \"{}{}\",\n FALLBACK_FOREX_API_CURRENCY_PREFIX,\n &enum_curr.to_string()\n )\n .as_str(),\n ) {\n Some(rate) => {\n let from_factor = match Decimal::new(1, 0).checked_div(**rate) {\n Some(rate) => rate,\n None => {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n continue;\n }\n };\n let currency_factors = CurrencyFactors::new(**rate, from_factor);\n conversions.insert(enum_curr, currency_factors);\n }\n None => {\n if enum_curr == enums::Currency::USD {\n let currency_factors =\n CurrencyFactors::new(Decimal::new(1, 0), Decimal::new(1, 0));\n conversions.insert(enum_curr, currency_factors);\n } else {\n logger::error!(\"forex_log: Rates for {} not received from API\", &enum_curr);\n }\n }\n };\n }\n\n let rates =\n FxExchangeRatesCacheEntry::new(ExchangeRates::new(enums::Currency::USD, conversions));\n match acquire_redis_lock(state).await {\n Ok(_) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(e) => {\n logger::error!(\"forex_log: {:?}\", e);\n Ok(rates)\n }\n }\n}",
130
+ "diff_span": {
131
+ "before": "\n logger::debug!(\"forex_log: Fallback api call for forex fetch\");\n logger::info!(\"forex_log: {:?}\", fallback_forex_request);\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n fallback_forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Fallback forex fetch api unresponsive\")?;\n\n let fallback_forex_response = response\n .json::<FallbackForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from falback api into ForexResponse\",\n )?;\n\n logger::info!(\"forex_log: {:?}\", fallback_forex_response);\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {",
132
+ "after": "\n logger::debug!(\"forex_log: Fallback api call for forex fetch\");\n logger::info!(\n \"forex_log: fallback_forex_request: {:?}\",\n fallback_forex_request\n );\n let response = state\n .api_client\n .send_request(\n &state.clone(),\n fallback_forex_request,\n Some(FOREX_API_TIMEOUT),\n false,\n )\n .await\n .change_context(ForexCacheError::ApiUnresponsive)\n .attach_printable(\"Fallback forex fetch api unresponsive\")?;\n\n let fallback_forex_response = response\n .json::<FallbackForexResponse>()\n .await\n .change_context(ForexCacheError::ParsingError)\n .attach_printable(\n \"Unable to parse response received from falback api into ForexResponse\",\n )?;\n\n logger::info!(\n \"forex_log: fallback_forex_response: {:?}\",\n fallback_forex_response\n );\n let mut conversions: HashMap<enums::Currency, CurrencyFactors> = HashMap::new();\n for enum_curr in enums::Currency::iter() {"
133
+ },
134
+ "commit_sha": "b64943367c6394505e0afeef416c6cab49e0f971"
135
+ }
136
+ ]
137
+ }
diffs/pr_6906/c4e60d3/diff.json ADDED
@@ -0,0 +1,6 @@
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "c4e60d3698dccf14a9e937ec17b348657b377a02",
3
+ "pr_number": 6906,
4
+ "rust_files": [],
5
+ "diffs": []
6
+ }
diffs/pr_6906/e350a23/diff.json ADDED
@@ -0,0 +1,24 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "e350a2394bcdf35f04af13b671ebdbd99c9f6c0e",
3
+ "pr_number": 6906,
4
+ "rust_files": [
5
+ "crates/router/src/utils/currency.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/router/src/utils/currency.rs::function::acquire_redis_lock_and_fetch_data",
10
+ "file": "crates/router/src/utils/currency.rs",
11
+ "kind": "function_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "async fn acquire_redis_lock_and_fetch_data(\n state: &SessionState,\n) -> CustomResult<(), ForexCacheError> {\n match acquire_redis_lock(state).await {\n Ok(lock_acquired) => {\n if !lock_acquired {\n return Err(ForexCacheError::CouldNotAcquireLock.into());\n }\n logger::debug!(\"forex_log: redis lock acquired\");\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => {\n successive_save_data_to_redis_local(state, rates).await?;\n Ok(())\n }\n Err(error) => {\n logger::error!(forex_error=?error,\"primary_forex_error\");\n // API not able to fetch data call secondary service\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => {\n successive_save_data_to_redis_local(state, rates).await?;\n Ok(())\n }\n Err(error) => {\n release_redis_lock(state).await?;\n Err(error)\n }\n }\n }\n }\n }\n Err(error) => Err(error),\n }\n}",
16
+ "after_code": "async fn acquire_redis_lock_and_fetch_data(\n state: &SessionState,\n) -> CustomResult<(), ForexCacheError> {\n let lock_acquired = acquire_redis_lock(state).await?;\n if !lock_acquired {\n Err(ForexCacheError::CouldNotAcquireLock.into())\n } else {\n logger::debug!(\"forex_log: redis lock acquired\");\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => successive_save_data_to_redis_local(state, rates).await,\n Err(error) => {\n logger::error!(forex_error=?error,\"primary_forex_error\");\n // API not able to fetch data call secondary service\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => successive_save_data_to_redis_local(state, rates).await,\n Err(error) => {\n release_redis_lock(state).await?;\n Err(error)\n }\n }\n }\n }\n }\n}",
17
+ "diff_span": {
18
+ "before": " state: &SessionState,\n) -> CustomResult<(), ForexCacheError> {\n match acquire_redis_lock(state).await {\n Ok(lock_acquired) => {\n if !lock_acquired {\n return Err(ForexCacheError::CouldNotAcquireLock.into());\n }\n logger::debug!(\"forex_log: redis lock acquired\");\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => {\n successive_save_data_to_redis_local(state, rates).await?;\n Ok(())\n }\n Err(error) => {\n logger::error!(forex_error=?error,\"primary_forex_error\");\n // API not able to fetch data call secondary service\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => {\n successive_save_data_to_redis_local(state, rates).await?;\n Ok(())\n }\n Err(error) => {\n release_redis_lock(state).await?;\n Err(error)\n }\n }\n }\n }\n }\n Err(error) => Err(error),\n }\n}",
19
+ "after": " state: &SessionState,\n) -> CustomResult<(), ForexCacheError> {\n let lock_acquired = acquire_redis_lock(state).await?;\n if !lock_acquired {\n Err(ForexCacheError::CouldNotAcquireLock.into())\n } else {\n logger::debug!(\"forex_log: redis lock acquired\");\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => successive_save_data_to_redis_local(state, rates).await,\n Err(error) => {\n logger::error!(forex_error=?error,\"primary_forex_error\");\n // API not able to fetch data call secondary service\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => successive_save_data_to_redis_local(state, rates).await,\n Err(error) => {\n release_redis_lock(state).await?;\n Err(error)\n }\n }"
20
+ },
21
+ "commit_sha": "e350a2394bcdf35f04af13b671ebdbd99c9f6c0e"
22
+ }
23
+ ]
24
+ }
diffs/pr_6906/e47e921/diff.json ADDED
@@ -0,0 +1,211 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "e47e9216c5e1b65a879c2e4d6caa5997a0fe8d41",
3
+ "pr_number": 6906,
4
+ "rust_files": [
5
+ "crates/router/src/core/currency.rs",
6
+ "crates/router/src/utils/currency.rs"
7
+ ],
8
+ "diffs": [
9
+ {
10
+ "id": "crates/router/src/utils/currency.rs::static::FX_EXCHANGE_RATES_CACHE",
11
+ "file": "crates/router/src/utils/currency.rs",
12
+ "kind": "static_item",
13
+ "status": "modified",
14
+ "code_changed": false,
15
+ "imports_changed": true,
16
+ "before_code": "static FX_EXCHANGE_RATES_CACHE: Lazy<RwLock<Option<FxExchangeRatesCacheEntry>>> =\n Lazy::new(|| RwLock::new(None));",
17
+ "after_code": "static FX_EXCHANGE_RATES_CACHE: Lazy<RwLock<Option<FxExchangeRatesCacheEntry>>> =\n Lazy::new(|| RwLock::new(None));",
18
+ "diff_span": {
19
+ "before": "",
20
+ "after": ""
21
+ },
22
+ "commit_sha": "e47e9216c5e1b65a879c2e4d6caa5997a0fe8d41",
23
+ "before_imports": [
24
+ "use currency_conversion::types::{CurrencyFactors, ExchangeRates};",
25
+ "use crate::{\n logger,\n routes::app::settings::{Conversion, DefaultExchangeRates},\n services, SessionState,\n};",
26
+ "use once_cell::sync::Lazy;"
27
+ ],
28
+ "after_imports": [
29
+ "use tokio::sync::RwLock;",
30
+ "use currency_conversion::types::{CurrencyFactors, ExchangeRates};",
31
+ "use crate::{\n logger,\n routes::app::settings::{Conversion, DefaultExchangeRates},\n services, SessionState,\n};",
32
+ "use once_cell::sync::Lazy;"
33
+ ]
34
+ },
35
+ {
36
+ "id": "crates/router/src/utils/currency.rs::function::successive_fetch_and_save_forex",
37
+ "file": "crates/router/src/utils/currency.rs",
38
+ "kind": "function_item",
39
+ "status": "modified",
40
+ "code_changed": true,
41
+ "imports_changed": false,
42
+ "before_code": "async fn successive_fetch_and_save_forex(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n // spawn a new thread and do the api fetch and write operations on redis.\n let stale_forex_data = stale_redis_data.clone();\n let state = state.clone();\n tokio::spawn(\n async move {\n acquire_redis_lock_and_fetch_data(&state, stale_redis_data).await;\n }\n .in_current_span(),\n );\n stale_forex_data.ok_or(ForexCacheError::EntryNotFound.into())\n}",
43
+ "after_code": "async fn successive_fetch_and_save_forex(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n // spawn a new thread and do the api fetch and write operations on redis.\n let stale_forex_data = stale_redis_data.clone();\n let state = state.clone();\n println!(\">>>>>>>>>>>>>>>>>>>>>>>code -1\");\n tokio::spawn(\n async move {\n acquire_redis_lock_and_fetch_data(&state, stale_redis_data).await;\n }\n .in_current_span(),\n );\n println!(\">>>>>>>>>>>>>>>>>>>>>>>code 8\");\n stale_forex_data.ok_or(ForexCacheError::EntryNotFound.into())\n}",
44
+ "diff_span": {
45
+ "before": "",
46
+ "after": " let stale_forex_data = stale_redis_data.clone();\n let state = state.clone();\n println!(\">>>>>>>>>>>>>>>>>>>>>>>code -1\");\n tokio::spawn(\n async move {\n acquire_redis_lock_and_fetch_data(&state, stale_redis_data).await;\n }\n .in_current_span(),\n );\n println!(\">>>>>>>>>>>>>>>>>>>>>>>code 8\");\n stale_forex_data.ok_or(ForexCacheError::EntryNotFound.into())\n}"
47
+ },
48
+ "commit_sha": "e47e9216c5e1b65a879c2e4d6caa5997a0fe8d41"
49
+ },
50
+ {
51
+ "id": "crates/router/src/utils/currency.rs::function::acquire_redis_lock_and_fetch_data",
52
+ "file": "crates/router/src/utils/currency.rs",
53
+ "kind": "function_item",
54
+ "status": "modified",
55
+ "code_changed": true,
56
+ "imports_changed": false,
57
+ "before_code": "async fn acquire_redis_lock_and_fetch_data(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match acquire_redis_lock(state).await {\n Ok(lock_acquired) => {\n if !lock_acquired {\n return stale_redis_data.ok_or(ForexCacheError::CouldNotAcquireLock.into());\n }\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => successive_save_data_to_redis_local(state, rates).await,\n Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(?error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(error) => stale_redis_data.ok_or({\n logger::error!(?error);\n release_redis_lock(state).await?;\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n }\n }\n }\n Err(error) => stale_redis_data.ok_or({\n logger::error!(?error);\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n}",
58
+ "after_code": "async fn acquire_redis_lock_and_fetch_data(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match acquire_redis_lock(state).await {\n Ok(lock_acquired) => {\n if !lock_acquired {\n return stale_redis_data.ok_or(ForexCacheError::CouldNotAcquireLock.into());\n }\n println!(\">>>>>>>>>>>>>>>>>>>>>>>code 0\");\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => {\n println!(\">>>>>>>>>>>>>>>>>>>>>>>code 1\");\n successive_save_data_to_redis_local(state, rates).await\n }\n Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(?error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(error) => stale_redis_data.ok_or({\n logger::error!(?error);\n release_redis_lock(state).await?;\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n }\n }\n }\n Err(error) => stale_redis_data.ok_or({\n println!(\">>>>>>>>>>>>>>>>>>>>>>>code 2\");\n logger::error!(?error);\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n}",
59
+ "diff_span": {
60
+ "before": " let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => successive_save_data_to_redis_local(state, rates).await,\n Err(error) => {\n // API not able to fetch data call secondary service",
61
+ "after": " return stale_redis_data.ok_or(ForexCacheError::CouldNotAcquireLock.into());\n }\n println!(\">>>>>>>>>>>>>>>>>>>>>>>code 0\");\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => {\n println!(\">>>>>>>>>>>>>>>>>>>>>>>code 1\");\n successive_save_data_to_redis_local(state, rates).await\n }\n Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(?error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(error) => stale_redis_data.ok_or({\n logger::error!(?error);\n release_redis_lock(state).await?;\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n }\n }\n }\n Err(error) => stale_redis_data.ok_or({\n println!(\">>>>>>>>>>>>>>>>>>>>>>>code 2\");\n logger::error!(?error);\n ForexCacheError::ApiUnresponsive.into()"
62
+ },
63
+ "commit_sha": "e47e9216c5e1b65a879c2e4d6caa5997a0fe8d41"
64
+ },
65
+ {
66
+ "id": "crates/router/src/core/currency.rs::function::get_forex_exchange_rates",
67
+ "file": "crates/router/src/core/currency.rs",
68
+ "kind": "function_item",
69
+ "status": "modified",
70
+ "code_changed": true,
71
+ "imports_changed": false,
72
+ "before_code": "pub async fn get_forex_exchange_rates(\n state: SessionState,\n) -> CustomResult<ExchangeRates, AnalyticsError> {\n let forex_api = state.conf.forex_api.get_inner();\n let rates = get_forex_rates(\n &state,\n forex_api.call_delay,\n forex_api.local_fetch_retry_delay,\n forex_api.local_fetch_retry_count,\n )\n .await\n .change_context(AnalyticsError::ForexFetchFailed)?;\n\n Ok((*rates.data).clone())\n}",
73
+ "after_code": "pub async fn get_forex_exchange_rates(\n state: SessionState,\n) -> CustomResult<ExchangeRates, AnalyticsError> {\n let forex_api = state.conf.forex_api.get_inner();\n let rates = get_forex_rates(&state, forex_api.call_delay)\n .await\n .change_context(AnalyticsError::ForexFetchFailed)?;\n\n Ok((*rates.data).clone())\n}",
74
+ "diff_span": {
75
+ "before": ") -> CustomResult<ExchangeRates, AnalyticsError> {\n let forex_api = state.conf.forex_api.get_inner();\n let rates = get_forex_rates(\n &state,\n forex_api.call_delay,\n forex_api.local_fetch_retry_delay,\n forex_api.local_fetch_retry_count,\n )\n .await\n .change_context(AnalyticsError::ForexFetchFailed)?;\n\n Ok((*rates.data).clone())",
76
+ "after": ") -> CustomResult<ExchangeRates, AnalyticsError> {\n let forex_api = state.conf.forex_api.get_inner();\n let rates = get_forex_rates(&state, forex_api.call_delay)\n .await\n .change_context(AnalyticsError::ForexFetchFailed)?;\n\n Ok((*rates.data).clone())"
77
+ },
78
+ "commit_sha": "e47e9216c5e1b65a879c2e4d6caa5997a0fe8d41"
79
+ },
80
+ {
81
+ "id": "crates/router/src/utils/currency.rs::function::handler_local_expired",
82
+ "file": "crates/router/src/utils/currency.rs",
83
+ "kind": "function_item",
84
+ "status": "modified",
85
+ "code_changed": true,
86
+ "imports_changed": false,
87
+ "before_code": "async fn handler_local_expired(\n state: &SessionState,\n call_delay: i64,\n local_rates: FxExchangeRatesCacheEntry,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match retrieve_forex_from_redis(state).await {\n Ok(redis_data) => {\n match is_redis_expired(redis_data.as_ref(), call_delay).await {\n Some(redis_forex) => {\n // Valid data present in redis\n let exchange_rates =\n FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());\n save_forex_to_local(exchange_rates.clone()).await?;\n Ok(exchange_rates)\n }\n None => {\n // Redis is expired going for API request\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n }\n }\n }\n Err(error) => {\n // data not present in redis waited fetch\n logger::error!(?error);\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n }\n }\n}",
88
+ "after_code": "async fn handler_local_expired(\n state: &SessionState,\n call_delay: i64,\n local_rates: FxExchangeRatesCacheEntry,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match retrieve_forex_from_redis(state).await {\n Ok(redis_data) => {\n match is_redis_expired(redis_data.as_ref(), call_delay).await {\n Some(redis_forex) => {\n // Valid data present in redis\n let exchange_rates =\n FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());\n save_forex_to_local(exchange_rates.clone()).await?;\n Ok(exchange_rates)\n }\n None => {\n // Redis is expired going for API request\n println!(\">>>>>>>>>>>>>>>>redis expired 1\");\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n }\n }\n }\n Err(error) => {\n // data not present in redis waited fetch\n logger::error!(?error);\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n }\n }\n}",
89
+ "diff_span": {
90
+ "before": "",
91
+ "after": " None => {\n // Redis is expired going for API request\n println!(\">>>>>>>>>>>>>>>>redis expired 1\");\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n }"
92
+ },
93
+ "commit_sha": "e47e9216c5e1b65a879c2e4d6caa5997a0fe8d41"
94
+ },
95
+ {
96
+ "id": "crates/router/src/utils/currency.rs::function::acquire_redis_lock",
97
+ "file": "crates/router/src/utils/currency.rs",
98
+ "kind": "function_item",
99
+ "status": "modified",
100
+ "code_changed": true,
101
+ "imports_changed": false,
102
+ "before_code": "async fn acquire_redis_lock(state: &SessionState) -> CustomResult<bool, ForexCacheError> {\n let forex_api = state.conf.forex_api.get_inner();\n state\n .store\n .get_redis_conn()\n .change_context(ForexCacheError::RedisConnectionError)?\n .set_key_if_not_exists_with_expiry(\n REDIX_FOREX_CACHE_KEY,\n \"\",\n Some(\n i64::try_from(forex_api.local_fetch_retry_delay)\n .change_context(ForexCacheError::ConversionError)?,\n ),\n )\n .await\n .map(|val| matches!(val, redis_interface::SetnxReply::KeySet))\n .change_context(ForexCacheError::CouldNotAcquireLock)\n .attach_printable(\"Unable to acquire redis lock\")\n}",
103
+ "after_code": "async fn acquire_redis_lock(state: &SessionState) -> CustomResult<bool, ForexCacheError> {\n let forex_api = state.conf.forex_api.get_inner();\n state\n .store\n .get_redis_conn()\n .change_context(ForexCacheError::RedisConnectionError)?\n .set_key_if_not_exists_with_expiry(\n REDIX_FOREX_CACHE_KEY,\n \"\",\n Some(\n i64::try_from(forex_api.redis_lock_timeout)\n .change_context(ForexCacheError::ConversionError)?,\n ),\n )\n .await\n .map(|val| matches!(val, redis_interface::SetnxReply::KeySet))\n .change_context(ForexCacheError::CouldNotAcquireLock)\n .attach_printable(\"Unable to acquire redis lock\")\n}",
104
+ "diff_span": {
105
+ "before": " \"\",\n Some(\n i64::try_from(forex_api.local_fetch_retry_delay)\n .change_context(ForexCacheError::ConversionError)?,\n ),",
106
+ "after": " \"\",\n Some(\n i64::try_from(forex_api.redis_lock_timeout)\n .change_context(ForexCacheError::ConversionError)?,\n ),"
107
+ },
108
+ "commit_sha": "e47e9216c5e1b65a879c2e4d6caa5997a0fe8d41"
109
+ },
110
+ {
111
+ "id": "crates/router/src/utils/currency.rs::function::get_forex_rates",
112
+ "file": "crates/router/src/utils/currency.rs",
113
+ "kind": "function_item",
114
+ "status": "modified",
115
+ "code_changed": true,
116
+ "imports_changed": false,
117
+ "before_code": "pub async fn get_forex_rates(\n state: &SessionState,\n call_delay: i64,\n local_fetch_retry_delay: u64,\n local_fetch_retry_count: u64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n if let Some(local_rates) = retrieve_forex_from_local().await {\n if local_rates.is_expired(call_delay) {\n // expired local data\n handler_local_expired(state, call_delay, local_rates).await\n } else {\n // Valid data present in local\n Ok(local_rates)\n }\n } else {\n // No data in local\n handler_local_no_data(\n state,\n call_delay,\n local_fetch_retry_delay,\n local_fetch_retry_count,\n )\n .await\n }\n}",
118
+ "after_code": "pub async fn get_forex_rates(\n state: &SessionState,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n if let Some(local_rates) = retrieve_forex_from_local().await {\n if local_rates.is_expired(call_delay) {\n // expired local data\n handler_local_expired(state, call_delay, local_rates).await\n } else {\n // Valid data present in local\n Ok(local_rates)\n }\n } else {\n // No data in local\n handler_local_no_data(state, call_delay).await\n }\n}",
119
+ "diff_span": {
120
+ "before": " state: &SessionState,\n call_delay: i64,\n local_fetch_retry_delay: u64,\n local_fetch_retry_count: u64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n if let Some(local_rates) = retrieve_forex_from_local().await {\n if local_rates.is_expired(call_delay) {\n // expired local data\n handler_local_expired(state, call_delay, local_rates).await\n } else {\n // Valid data present in local\n Ok(local_rates)\n }\n } else {\n // No data in local\n handler_local_no_data(\n state,\n call_delay,\n local_fetch_retry_delay,\n local_fetch_retry_count,\n )\n .await\n }\n}",
121
+ "after": " } else {\n // No data in local\n handler_local_no_data(state, call_delay).await\n }\n}"
122
+ },
123
+ "commit_sha": "e47e9216c5e1b65a879c2e4d6caa5997a0fe8d41"
124
+ },
125
+ {
126
+ "id": "crates/router/src/utils/currency.rs::enum::ForexCacheError",
127
+ "file": "crates/router/src/utils/currency.rs",
128
+ "kind": "enum_item",
129
+ "status": "modified",
130
+ "code_changed": true,
131
+ "imports_changed": false,
132
+ "before_code": "pub enum ForexCacheError {\n #[error(\"API error\")]\n ApiError,\n #[error(\"API timeout\")]\n ApiTimeout,\n #[error(\"API unresponsive\")]\n ApiUnresponsive,\n #[error(\"Conversion error\")]\n ConversionError,\n #[error(\"Could not acquire the lock for cache entry\")]\n CouldNotAcquireLock,\n #[error(\"Provided currency not acceptable\")]\n CurrencyNotAcceptable,\n #[error(\"Incorrect entries in default Currency response\")]\n DefaultCurrencyParsingError,\n #[error(\"Entry not found in cache\")]\n EntryNotFound,\n #[error(\"Expiration time invalid\")]\n InvalidLogExpiry,\n #[error(\"Error reading local\")]\n LocalReadError,\n #[error(\"Error writing to local cache\")]\n LocalWriteError,\n #[error(\"Json Parsing error\")]\n ParsingError,\n #[error(\"Aws Kms decryption error\")]\n AwsKmsDecryptionFailed,\n #[error(\"Error connecting to redis\")]\n RedisConnectionError,\n #[error(\"Not able to release write lock\")]\n RedisLockReleaseFailed,\n #[error(\"Error writing to redis\")]\n RedisWriteError,\n #[error(\"Not able to acquire write lock\")]\n WriteLockNotAcquired,\n}",
133
+ "after_code": "pub enum ForexCacheError {\n #[error(\"API error\")]\n ApiError,\n #[error(\"API timeout\")]\n ApiTimeout,\n #[error(\"API unresponsive\")]\n ApiUnresponsive,\n #[error(\"Conversion error\")]\n ConversionError,\n #[error(\"Could not acquire the lock for cache entry\")]\n CouldNotAcquireLock,\n #[error(\"Provided currency not acceptable\")]\n CurrencyNotAcceptable,\n #[error(\"Incorrect entries in default Currency response\")]\n DefaultCurrencyParsingError,\n #[error(\"Entry not found in cache\")]\n EntryNotFound,\n #[error(\"Forex data unavailable\")]\n ForexDataUnavailable,\n #[error(\"Expiration time invalid\")]\n InvalidLogExpiry,\n #[error(\"Error reading local\")]\n LocalReadError,\n #[error(\"Error writing to local cache\")]\n LocalWriteError,\n #[error(\"Json Parsing error\")]\n ParsingError,\n #[error(\"Aws Kms decryption error\")]\n AwsKmsDecryptionFailed,\n #[error(\"Error connecting to redis\")]\n RedisConnectionError,\n #[error(\"Not able to release write lock\")]\n RedisLockReleaseFailed,\n #[error(\"Error writing to redis\")]\n RedisWriteError,\n #[error(\"Not able to acquire write lock\")]\n WriteLockNotAcquired,\n}",
134
+ "diff_span": {
135
+ "before": "",
136
+ "after": " #[error(\"Entry not found in cache\")]\n EntryNotFound,\n #[error(\"Forex data unavailable\")]\n ForexDataUnavailable,\n #[error(\"Expiration time invalid\")]\n InvalidLogExpiry,"
137
+ },
138
+ "commit_sha": "e47e9216c5e1b65a879c2e4d6caa5997a0fe8d41"
139
+ },
140
+ {
141
+ "id": "crates/router/src/core/currency.rs::function::retrieve_forex",
142
+ "file": "crates/router/src/core/currency.rs",
143
+ "kind": "function_item",
144
+ "status": "modified",
145
+ "code_changed": true,
146
+ "imports_changed": false,
147
+ "before_code": "pub async fn retrieve_forex(\n state: SessionState,\n) -> CustomResult<ApplicationResponse<currency::FxExchangeRatesCacheEntry>, ApiErrorResponse> {\n let forex_api = state.conf.forex_api.get_inner();\n Ok(ApplicationResponse::Json(\n get_forex_rates(\n &state,\n forex_api.call_delay,\n forex_api.local_fetch_retry_delay,\n forex_api.local_fetch_retry_count,\n )\n .await\n .change_context(ApiErrorResponse::GenericNotFoundError {\n message: \"Unable to fetch forex rates\".to_string(),\n })?,\n ))\n}",
148
+ "after_code": "pub async fn retrieve_forex(\n state: SessionState,\n) -> CustomResult<ApplicationResponse<currency::FxExchangeRatesCacheEntry>, ApiErrorResponse> {\n let forex_api = state.conf.forex_api.get_inner();\n Ok(ApplicationResponse::Json(\n get_forex_rates(&state, forex_api.call_delay)\n .await\n .change_context(ApiErrorResponse::GenericNotFoundError {\n message: \"Unable to fetch forex rates\".to_string(),\n })?,\n ))\n}",
149
+ "diff_span": {
150
+ "before": " let forex_api = state.conf.forex_api.get_inner();\n Ok(ApplicationResponse::Json(\n get_forex_rates(\n &state,\n forex_api.call_delay,\n forex_api.local_fetch_retry_delay,\n forex_api.local_fetch_retry_count,\n )\n .await\n .change_context(ApiErrorResponse::GenericNotFoundError {\n message: \"Unable to fetch forex rates\".to_string(),\n })?,\n ))\n}",
151
+ "after": " let forex_api = state.conf.forex_api.get_inner();\n Ok(ApplicationResponse::Json(\n get_forex_rates(&state, forex_api.call_delay)\n .await\n .change_context(ApiErrorResponse::GenericNotFoundError {\n message: \"Unable to fetch forex rates\".to_string(),\n })?,\n ))\n}"
152
+ },
153
+ "commit_sha": "e47e9216c5e1b65a879c2e4d6caa5997a0fe8d41"
154
+ },
155
+ {
156
+ "id": "crates/router/src/utils/currency.rs::function::convert_currency",
157
+ "file": "crates/router/src/utils/currency.rs",
158
+ "kind": "function_item",
159
+ "status": "modified",
160
+ "code_changed": true,
161
+ "imports_changed": false,
162
+ "before_code": "pub async fn convert_currency(\n state: SessionState,\n amount: i64,\n to_currency: String,\n from_currency: String,\n) -> CustomResult<api_models::currency::CurrencyConversionResponse, ForexCacheError> {\n let forex_api = state.conf.forex_api.get_inner();\n let rates = get_forex_rates(\n &state,\n forex_api.call_delay,\n forex_api.local_fetch_retry_delay,\n forex_api.local_fetch_retry_count,\n )\n .await\n .change_context(ForexCacheError::ApiError)?;\n\n let to_currency = enums::Currency::from_str(to_currency.as_str())\n .change_context(ForexCacheError::CurrencyNotAcceptable)\n .attach_printable(\"The provided currency is not acceptable\")?;\n\n let from_currency = enums::Currency::from_str(from_currency.as_str())\n .change_context(ForexCacheError::CurrencyNotAcceptable)\n .attach_printable(\"The provided currency is not acceptable\")?;\n\n let converted_amount =\n currency_conversion::conversion::convert(&rates.data, from_currency, to_currency, amount)\n .change_context(ForexCacheError::ConversionError)\n .attach_printable(\"Unable to perform currency conversion\")?;\n\n Ok(api_models::currency::CurrencyConversionResponse {\n converted_amount: converted_amount.to_string(),\n currency: to_currency.to_string(),\n })\n}",
163
+ "after_code": "pub async fn convert_currency(\n state: SessionState,\n amount: i64,\n to_currency: String,\n from_currency: String,\n) -> CustomResult<api_models::currency::CurrencyConversionResponse, ForexCacheError> {\n let forex_api = state.conf.forex_api.get_inner();\n let rates = get_forex_rates(&state, forex_api.call_delay)\n .await\n .change_context(ForexCacheError::ApiError)?;\n\n let to_currency = enums::Currency::from_str(to_currency.as_str())\n .change_context(ForexCacheError::CurrencyNotAcceptable)\n .attach_printable(\"The provided currency is not acceptable\")?;\n\n let from_currency = enums::Currency::from_str(from_currency.as_str())\n .change_context(ForexCacheError::CurrencyNotAcceptable)\n .attach_printable(\"The provided currency is not acceptable\")?;\n\n let converted_amount =\n currency_conversion::conversion::convert(&rates.data, from_currency, to_currency, amount)\n .change_context(ForexCacheError::ConversionError)\n .attach_printable(\"Unable to perform currency conversion\")?;\n\n Ok(api_models::currency::CurrencyConversionResponse {\n converted_amount: converted_amount.to_string(),\n currency: to_currency.to_string(),\n })\n}",
164
+ "diff_span": {
165
+ "before": ") -> CustomResult<api_models::currency::CurrencyConversionResponse, ForexCacheError> {\n let forex_api = state.conf.forex_api.get_inner();\n let rates = get_forex_rates(\n &state,\n forex_api.call_delay,\n forex_api.local_fetch_retry_delay,\n forex_api.local_fetch_retry_count,\n )\n .await\n .change_context(ForexCacheError::ApiError)?;\n\n let to_currency = enums::Currency::from_str(to_currency.as_str())",
166
+ "after": ") -> CustomResult<api_models::currency::CurrencyConversionResponse, ForexCacheError> {\n let forex_api = state.conf.forex_api.get_inner();\n let rates = get_forex_rates(&state, forex_api.call_delay)\n .await\n .change_context(ForexCacheError::ApiError)?;\n\n let to_currency = enums::Currency::from_str(to_currency.as_str())"
167
+ },
168
+ "commit_sha": "e47e9216c5e1b65a879c2e4d6caa5997a0fe8d41"
169
+ },
170
+ {
171
+ "id": "crates/router/src/utils/currency.rs::function::fallback_forex_redis_check",
172
+ "file": "crates/router/src/utils/currency.rs",
173
+ "kind": "function_item",
174
+ "status": "modified",
175
+ "code_changed": true,
176
+ "imports_changed": false,
177
+ "before_code": "async fn fallback_forex_redis_check(\n state: &SessionState,\n redis_data: FxExchangeRatesCacheEntry,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match is_redis_expired(Some(redis_data.clone()).as_ref(), call_delay).await {\n Some(redis_forex) => {\n // Valid data present in redis\n let exchange_rates = FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());\n save_forex_to_local(exchange_rates.clone()).await?;\n Ok(exchange_rates)\n }\n None => {\n // redis expired\n successive_fetch_and_save_forex(state, Some(redis_data)).await\n }\n }\n}",
178
+ "after_code": "async fn fallback_forex_redis_check(\n state: &SessionState,\n redis_data: FxExchangeRatesCacheEntry,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match is_redis_expired(Some(redis_data.clone()).as_ref(), call_delay).await {\n Some(redis_forex) => {\n // Valid data present in redis\n let exchange_rates = FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());\n save_forex_to_local(exchange_rates.clone()).await?;\n Ok(exchange_rates)\n }\n None => {\n // redis expired\n println!(\">>>>>>>>>>>>>>>>redis expired 2\");\n successive_fetch_and_save_forex(state, Some(redis_data)).await\n }\n }\n}",
179
+ "diff_span": {
180
+ "before": "",
181
+ "after": " None => {\n // redis expired\n println!(\">>>>>>>>>>>>>>>>redis expired 2\");\n successive_fetch_and_save_forex(state, Some(redis_data)).await\n }"
182
+ },
183
+ "commit_sha": "e47e9216c5e1b65a879c2e4d6caa5997a0fe8d41"
184
+ },
185
+ {
186
+ "id": "crates/router/src/utils/currency.rs::function::handler_local_no_data",
187
+ "file": "crates/router/src/utils/currency.rs",
188
+ "kind": "function_item",
189
+ "status": "modified",
190
+ "code_changed": true,
191
+ "imports_changed": false,
192
+ "before_code": "async fn handler_local_no_data(\n state: &SessionState,\n call_delay: i64,\n _local_fetch_retry_delay: u64,\n _local_fetch_retry_count: u64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match retrieve_forex_from_redis(state).await {\n Ok(Some(data)) => fallback_forex_redis_check(state, data, call_delay).await,\n Ok(None) => {\n // No data in local as well as redis\n Ok(successive_fetch_and_save_forex(state, None).await?)\n }\n Err(error) => {\n logger::error!(?error);\n Ok(successive_fetch_and_save_forex(state, None).await?)\n }\n }\n}",
193
+ "after_code": "async fn handler_local_no_data(\n state: &SessionState,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match retrieve_forex_from_redis(state).await {\n Ok(Some(data)) => fallback_forex_redis_check(state, data, call_delay).await,\n Ok(None) => {\n // No data in local as well as redis\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n Err(error) => {\n // Error in deriving forex rates from redis\n logger::error!(?error);\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n }\n}",
194
+ "diff_span": {
195
+ "before": " state: &SessionState,\n call_delay: i64,\n _local_fetch_retry_delay: u64,\n _local_fetch_retry_count: u64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match retrieve_forex_from_redis(state).await {\n Ok(Some(data)) => fallback_forex_redis_check(state, data, call_delay).await,\n Ok(None) => {\n // No data in local as well as redis\n Ok(successive_fetch_and_save_forex(state, None).await?)\n }\n Err(error) => {\n logger::error!(?error);\n Ok(successive_fetch_and_save_forex(state, None).await?)\n }\n }",
196
+ "after": " Ok(None) => {\n // No data in local as well as redis\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n Err(error) => {\n // Error in deriving forex rates from redis\n logger::error!(?error);\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n }"
197
+ },
198
+ "commit_sha": "e47e9216c5e1b65a879c2e4d6caa5997a0fe8d41"
199
+ },
200
+ {
201
+ "id": "crates/router/src/utils/currency.rs::function::waited_fetch_and_update_caches",
202
+ "file": "crates/router/src/utils/currency.rs",
203
+ "kind": "function_item",
204
+ "status": "removed",
205
+ "before_code": "async fn waited_fetch_and_update_caches(\n state: &SessionState,\n local_fetch_retry_delay: u64,\n local_fetch_retry_count: u64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n for _n in 1..local_fetch_retry_count {\n sleep(Duration::from_millis(local_fetch_retry_delay)).await;\n //read from redis and update local plus break the loop and return\n match retrieve_forex_from_redis(state).await {\n Ok(Some(rates)) => {\n save_forex_to_local(rates.clone()).await?;\n return Ok(rates.clone());\n }\n Ok(None) => continue,\n Err(error) => {\n logger::error!(?error);\n continue;\n }\n }\n }\n //acquire lock one last time and try to fetch and update local & redis\n successive_fetch_and_save_forex(state, None).await\n}",
206
+ "after_code": null,
207
+ "diff_span": null,
208
+ "commit_sha": "e47e9216c5e1b65a879c2e4d6caa5997a0fe8d41"
209
+ }
210
+ ]
211
+ }
diffs/pr_6906/eb87323/diff.json ADDED
@@ -0,0 +1,99 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "eb8732365070e24e130edc7ef0d7da525caa713b",
3
+ "pr_number": 6906,
4
+ "rust_files": [
5
+ "crates/router/src/utils/currency.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/router/src/utils/currency.rs::function::successive_fetch_and_save_forex",
10
+ "file": "crates/router/src/utils/currency.rs",
11
+ "kind": "function_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "async fn successive_fetch_and_save_forex(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n // spawn a new thread and do the api fetch and write operations on redis.\n let stale_forex_data = stale_redis_data.clone();\n let state = state.clone();\n println!(\">>>>>>>>>>>>>>>>>>>>>>>code -1\");\n tokio::spawn(\n async move {\n acquire_redis_lock_and_fetch_data(&state, stale_redis_data).await;\n }\n .in_current_span(),\n );\n println!(\">>>>>>>>>>>>>>>>>>>>>>>code 8\");\n stale_forex_data.ok_or(ForexCacheError::EntryNotFound.into())\n}",
16
+ "after_code": "async fn successive_fetch_and_save_forex(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n // spawn a new thread and do the api fetch and write operations on redis.\n let stale_forex_data = stale_redis_data.clone();\n let state = state.clone();\n tokio::spawn(\n async move {\n acquire_redis_lock_and_fetch_data(&state, stale_redis_data).await;\n }\n .in_current_span(),\n );\n stale_forex_data.ok_or(ForexCacheError::EntryNotFound.into())\n}",
17
+ "diff_span": {
18
+ "before": " let stale_forex_data = stale_redis_data.clone();\n let state = state.clone();\n println!(\">>>>>>>>>>>>>>>>>>>>>>>code -1\");\n tokio::spawn(\n async move {\n acquire_redis_lock_and_fetch_data(&state, stale_redis_data).await;\n }\n .in_current_span(),\n );\n println!(\">>>>>>>>>>>>>>>>>>>>>>>code 8\");\n stale_forex_data.ok_or(ForexCacheError::EntryNotFound.into())\n}",
19
+ "after": ""
20
+ },
21
+ "commit_sha": "eb8732365070e24e130edc7ef0d7da525caa713b"
22
+ },
23
+ {
24
+ "id": "crates/router/src/utils/currency.rs::function::acquire_redis_lock_and_fetch_data",
25
+ "file": "crates/router/src/utils/currency.rs",
26
+ "kind": "function_item",
27
+ "status": "modified",
28
+ "code_changed": true,
29
+ "imports_changed": false,
30
+ "before_code": "async fn acquire_redis_lock_and_fetch_data(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match acquire_redis_lock(state).await {\n Ok(lock_acquired) => {\n if !lock_acquired {\n return stale_redis_data.ok_or(ForexCacheError::CouldNotAcquireLock.into());\n }\n println!(\">>>>>>>>>>>>>>>>>>>>>>>code 0\");\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => {\n println!(\">>>>>>>>>>>>>>>>>>>>>>>code 1\");\n successive_save_data_to_redis_local(state, rates).await\n }\n Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(?error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(error) => stale_redis_data.ok_or({\n logger::error!(?error);\n release_redis_lock(state).await?;\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n }\n }\n }\n Err(error) => stale_redis_data.ok_or({\n println!(\">>>>>>>>>>>>>>>>>>>>>>>code 2\");\n logger::error!(?error);\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n}",
31
+ "after_code": "async fn acquire_redis_lock_and_fetch_data(\n state: &SessionState,\n stale_redis_data: Option<FxExchangeRatesCacheEntry>,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match acquire_redis_lock(state).await {\n Ok(lock_acquired) => {\n if !lock_acquired {\n return stale_redis_data.ok_or(ForexCacheError::CouldNotAcquireLock.into());\n }\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => {\n successive_save_data_to_redis_local(state, rates).await\n }\n Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(?error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(error) => stale_redis_data.ok_or({\n logger::error!(?error);\n release_redis_lock(state).await?;\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n }\n }\n }\n Err(error) => stale_redis_data.ok_or({\n logger::error!(?error);\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n}",
32
+ "diff_span": {
33
+ "before": " return stale_redis_data.ok_or(ForexCacheError::CouldNotAcquireLock.into());\n }\n println!(\">>>>>>>>>>>>>>>>>>>>>>>code 0\");\n let api_rates = fetch_forex_rates(state).await;\n match api_rates {\n Ok(rates) => {\n println!(\">>>>>>>>>>>>>>>>>>>>>>>code 1\");\n successive_save_data_to_redis_local(state, rates).await\n }\n Err(error) => {\n // API not able to fetch data call secondary service\n logger::error!(?error);\n let secondary_api_rates = fallback_fetch_forex_rates(state).await;\n match secondary_api_rates {\n Ok(rates) => Ok(successive_save_data_to_redis_local(state, rates).await?),\n Err(error) => stale_redis_data.ok_or({\n logger::error!(?error);\n release_redis_lock(state).await?;\n ForexCacheError::ApiUnresponsive.into()\n }),\n }\n }\n }\n }\n Err(error) => stale_redis_data.ok_or({\n println!(\">>>>>>>>>>>>>>>>>>>>>>>code 2\");\n logger::error!(?error);\n ForexCacheError::ApiUnresponsive.into()",
34
+ "after": ""
35
+ },
36
+ "commit_sha": "eb8732365070e24e130edc7ef0d7da525caa713b"
37
+ },
38
+ {
39
+ "id": "crates/router/src/utils/currency.rs::function::handler_local_expired",
40
+ "file": "crates/router/src/utils/currency.rs",
41
+ "kind": "function_item",
42
+ "status": "modified",
43
+ "code_changed": true,
44
+ "imports_changed": false,
45
+ "before_code": "async fn handler_local_expired(\n state: &SessionState,\n call_delay: i64,\n local_rates: FxExchangeRatesCacheEntry,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match retrieve_forex_from_redis(state).await {\n Ok(redis_data) => {\n match is_redis_expired(redis_data.as_ref(), call_delay).await {\n Some(redis_forex) => {\n // Valid data present in redis\n let exchange_rates =\n FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());\n save_forex_to_local(exchange_rates.clone()).await?;\n Ok(exchange_rates)\n }\n None => {\n // Redis is expired going for API request\n println!(\">>>>>>>>>>>>>>>>redis expired 1\");\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n }\n }\n }\n Err(error) => {\n // data not present in redis waited fetch\n logger::error!(?error);\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n }\n }\n}",
46
+ "after_code": "async fn handler_local_expired(\n state: &SessionState,\n call_delay: i64,\n local_rates: FxExchangeRatesCacheEntry,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n if forex_api_key.eq(\"\") {\n Err(ForexCacheError::ConfigurationError.into())\n } else {\n match retrieve_forex_from_redis(state).await {\n Ok(redis_data) => {\n match is_redis_expired(redis_data.as_ref(), call_delay).await {\n Some(redis_forex) => {\n // Valid data present in redis\n let exchange_rates =\n FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());\n save_forex_to_local(exchange_rates.clone()).await?;\n Ok(exchange_rates)\n }\n None => {\n // Redis is expired going for API request\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n }\n }\n }\n Err(error) => {\n // data not present in redis waited fetch\n logger::error!(?error);\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n }\n }\n }\n}",
47
+ "diff_span": {
48
+ "before": " local_rates: FxExchangeRatesCacheEntry,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match retrieve_forex_from_redis(state).await {\n Ok(redis_data) => {\n match is_redis_expired(redis_data.as_ref(), call_delay).await {\n Some(redis_forex) => {\n // Valid data present in redis\n let exchange_rates =\n FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());\n save_forex_to_local(exchange_rates.clone()).await?;\n Ok(exchange_rates)\n }\n None => {\n // Redis is expired going for API request\n println!(\">>>>>>>>>>>>>>>>redis expired 1\");\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n }\n }\n }\n Err(error) => {\n // data not present in redis waited fetch\n logger::error!(?error);\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n }\n }",
49
+ "after": " local_rates: FxExchangeRatesCacheEntry,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n if forex_api_key.eq(\"\") {\n Err(ForexCacheError::ConfigurationError.into())\n } else {\n match retrieve_forex_from_redis(state).await {\n Ok(redis_data) => {\n match is_redis_expired(redis_data.as_ref(), call_delay).await {\n Some(redis_forex) => {\n // Valid data present in redis\n let exchange_rates =\n FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());\n save_forex_to_local(exchange_rates.clone()).await?;\n Ok(exchange_rates)\n }\n None => {\n // Redis is expired going for API request\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n }\n }\n }\n Err(error) => {\n // data not present in redis waited fetch\n logger::error!(?error);\n successive_fetch_and_save_forex(state, Some(local_rates)).await\n }\n }\n }"
50
+ },
51
+ "commit_sha": "eb8732365070e24e130edc7ef0d7da525caa713b"
52
+ },
53
+ {
54
+ "id": "crates/router/src/utils/currency.rs::enum::ForexCacheError",
55
+ "file": "crates/router/src/utils/currency.rs",
56
+ "kind": "enum_item",
57
+ "status": "modified",
58
+ "code_changed": true,
59
+ "imports_changed": false,
60
+ "before_code": "pub enum ForexCacheError {\n #[error(\"API error\")]\n ApiError,\n #[error(\"API timeout\")]\n ApiTimeout,\n #[error(\"API unresponsive\")]\n ApiUnresponsive,\n #[error(\"Conversion error\")]\n ConversionError,\n #[error(\"Could not acquire the lock for cache entry\")]\n CouldNotAcquireLock,\n #[error(\"Provided currency not acceptable\")]\n CurrencyNotAcceptable,\n #[error(\"Incorrect entries in default Currency response\")]\n DefaultCurrencyParsingError,\n #[error(\"Entry not found in cache\")]\n EntryNotFound,\n #[error(\"Forex data unavailable\")]\n ForexDataUnavailable,\n #[error(\"Expiration time invalid\")]\n InvalidLogExpiry,\n #[error(\"Error reading local\")]\n LocalReadError,\n #[error(\"Error writing to local cache\")]\n LocalWriteError,\n #[error(\"Json Parsing error\")]\n ParsingError,\n #[error(\"Aws Kms decryption error\")]\n AwsKmsDecryptionFailed,\n #[error(\"Error connecting to redis\")]\n RedisConnectionError,\n #[error(\"Not able to release write lock\")]\n RedisLockReleaseFailed,\n #[error(\"Error writing to redis\")]\n RedisWriteError,\n #[error(\"Not able to acquire write lock\")]\n WriteLockNotAcquired,\n}",
61
+ "after_code": "pub enum ForexCacheError {\n #[error(\"API error\")]\n ApiError,\n #[error(\"API timeout\")]\n ApiTimeout,\n #[error(\"API unresponsive\")]\n ApiUnresponsive,\n #[error(\"Conversion error\")]\n ConversionError,\n #[error(\"Could not acquire the lock for cache entry\")]\n CouldNotAcquireLock,\n #[error(\"Provided currency not acceptable\")]\n CurrencyNotAcceptable,\n #[error(\"Configuration error, api_keys not provided\")]\n ConfigurationError,\n #[error(\"Incorrect entries in default Currency response\")]\n DefaultCurrencyParsingError,\n #[error(\"Entry not found in cache\")]\n EntryNotFound,\n #[error(\"Forex data unavailable\")]\n ForexDataUnavailable,\n #[error(\"Expiration time invalid\")]\n InvalidLogExpiry,\n #[error(\"Error reading local\")]\n LocalReadError,\n #[error(\"Error writing to local cache\")]\n LocalWriteError,\n #[error(\"Json Parsing error\")]\n ParsingError,\n #[error(\"Aws Kms decryption error\")]\n AwsKmsDecryptionFailed,\n #[error(\"Error connecting to redis\")]\n RedisConnectionError,\n #[error(\"Not able to release write lock\")]\n RedisLockReleaseFailed,\n #[error(\"Error writing to redis\")]\n RedisWriteError,\n #[error(\"Not able to acquire write lock\")]\n WriteLockNotAcquired,\n}",
62
+ "diff_span": {
63
+ "before": "",
64
+ "after": " #[error(\"Provided currency not acceptable\")]\n CurrencyNotAcceptable,\n #[error(\"Configuration error, api_keys not provided\")]\n ConfigurationError,\n #[error(\"Incorrect entries in default Currency response\")]\n DefaultCurrencyParsingError,"
65
+ },
66
+ "commit_sha": "eb8732365070e24e130edc7ef0d7da525caa713b"
67
+ },
68
+ {
69
+ "id": "crates/router/src/utils/currency.rs::function::fallback_forex_redis_check",
70
+ "file": "crates/router/src/utils/currency.rs",
71
+ "kind": "function_item",
72
+ "status": "modified",
73
+ "code_changed": true,
74
+ "imports_changed": false,
75
+ "before_code": "async fn fallback_forex_redis_check(\n state: &SessionState,\n redis_data: FxExchangeRatesCacheEntry,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match is_redis_expired(Some(redis_data.clone()).as_ref(), call_delay).await {\n Some(redis_forex) => {\n // Valid data present in redis\n let exchange_rates = FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());\n save_forex_to_local(exchange_rates.clone()).await?;\n Ok(exchange_rates)\n }\n None => {\n // redis expired\n println!(\">>>>>>>>>>>>>>>>redis expired 2\");\n successive_fetch_and_save_forex(state, Some(redis_data)).await\n }\n }\n}",
76
+ "after_code": "async fn fallback_forex_redis_check(\n state: &SessionState,\n redis_data: FxExchangeRatesCacheEntry,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match is_redis_expired(Some(redis_data.clone()).as_ref(), call_delay).await {\n Some(redis_forex) => {\n // Valid data present in redis\n let exchange_rates = FxExchangeRatesCacheEntry::new(redis_forex.as_ref().clone());\n save_forex_to_local(exchange_rates.clone()).await?;\n Ok(exchange_rates)\n }\n None => {\n // redis expired\n successive_fetch_and_save_forex(state, Some(redis_data)).await\n }\n }\n}",
77
+ "diff_span": {
78
+ "before": " None => {\n // redis expired\n println!(\">>>>>>>>>>>>>>>>redis expired 2\");\n successive_fetch_and_save_forex(state, Some(redis_data)).await\n }",
79
+ "after": ""
80
+ },
81
+ "commit_sha": "eb8732365070e24e130edc7ef0d7da525caa713b"
82
+ },
83
+ {
84
+ "id": "crates/router/src/utils/currency.rs::function::handler_local_no_data",
85
+ "file": "crates/router/src/utils/currency.rs",
86
+ "kind": "function_item",
87
+ "status": "modified",
88
+ "code_changed": true,
89
+ "imports_changed": false,
90
+ "before_code": "async fn handler_local_no_data(\n state: &SessionState,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match retrieve_forex_from_redis(state).await {\n Ok(Some(data)) => fallback_forex_redis_check(state, data, call_delay).await,\n Ok(None) => {\n // No data in local as well as redis\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n Err(error) => {\n // Error in deriving forex rates from redis\n logger::error!(?error);\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n }\n}",
91
+ "after_code": "async fn handler_local_no_data(\n state: &SessionState,\n call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n if forex_api_key.eq(\"\") {\n Err(ForexCacheError::ConfigurationError.into())\n } else {\n match retrieve_forex_from_redis(state).await {\n Ok(Some(data)) => fallback_forex_redis_check(state, data, call_delay).await,\n Ok(None) => {\n // No data in local as well as redis\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n Err(error) => {\n // Error in deriving forex rates from redis\n logger::error!(?error);\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n }\n }\n}",
92
+ "diff_span": {
93
+ "before": " call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n match retrieve_forex_from_redis(state).await {\n Ok(Some(data)) => fallback_forex_redis_check(state, data, call_delay).await,\n Ok(None) => {\n // No data in local as well as redis\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n Err(error) => {\n // Error in deriving forex rates from redis\n logger::error!(?error);\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n }",
94
+ "after": " call_delay: i64,\n) -> CustomResult<FxExchangeRatesCacheEntry, ForexCacheError> {\n let forex_api_key = state.conf.forex_api.get_inner().api_key.peek();\n if forex_api_key.eq(\"\") {\n Err(ForexCacheError::ConfigurationError.into())\n } else {\n match retrieve_forex_from_redis(state).await {\n Ok(Some(data)) => fallback_forex_redis_check(state, data, call_delay).await,\n Ok(None) => {\n // No data in local as well as redis\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n Err(error) => {\n // Error in deriving forex rates from redis\n logger::error!(?error);\n successive_fetch_and_save_forex(state, None).await?;\n Err(ForexCacheError::ForexDataUnavailable.into())\n }\n }\n }"
95
+ },
96
+ "commit_sha": "eb8732365070e24e130edc7ef0d7da525caa713b"
97
+ }
98
+ ]
99
+ }
diffs/pr_7925/53c7ba7/diff.json ADDED
The diff for this file is too large to render. See raw diff
 
diffs/pr_8018/824be43/diff.json ADDED
@@ -0,0 +1,49 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "824be43568054ea0d34ac2de95c3fd127d82c0c5",
3
+ "pr_number": 8018,
4
+ "rust_files": [
5
+ "crates/router/src/services/api/generic_link_response/context.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/router/src/services/api/generic_link_response/context.rs::function::insert_locales_in_context_for_payout_link_status",
10
+ "file": "crates/router/src/services/api/generic_link_response/context.rs",
11
+ "kind": "function_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "pub fn insert_locales_in_context_for_payout_link_status(context: &mut Context, locale: &str) {\n let i18n_payout_link_status_title = t!(\"payout_link.status.title\", locale = locale);\n let i18n_success_text = t!(\"payout_link.status.text.success\", locale = locale);\n let i18n_success_message = t!(\"payout_link.status.message.success\", locale = locale);\n let i18n_pending_text = t!(\"payout_link.status.text.processing\", locale = locale);\n let i18n_pending_message = t!(\"payout_link.status.message.processing\", locale = locale);\n let i18n_failed_text = t!(\"payout_link.status.text.failed\", locale = locale);\n let i18n_failed_message = t!(\"payout_link.status.message.failed\", locale = locale);\n let i18n_ref_id_text = t!(\"payout_link.status.info.ref_id\", locale = locale);\n let i18n_error_code_text = t!(\"payout_link.status.info.error_code\", locale = locale);\n let i18n_error_message = t!(\"payout_link.status.info.error_message\", locale = locale);\n let i18n_redirecting_text = t!(\n \"payout_link.status.redirection_text.redirecting\",\n locale = locale\n );\n let i18n_redirecting_in_text = t!(\n \"payout_link.status.redirection_text.redirecting_in\",\n locale = locale\n );\n let i18n_seconds_text = t!(\n \"payout_link.status.redirection_text.seconds\",\n locale = locale\n );\n\n context.insert(\n \"i18n_payout_link_status_title\",\n &i18n_payout_link_status_title,\n );\n context.insert(\"i18n_success_text\", &i18n_success_text);\n context.insert(\"i18n_success_message\", &i18n_success_message);\n context.insert(\"i18n_pending_text\", &i18n_pending_text);\n context.insert(\"i18n_pending_message\", &i18n_pending_message);\n context.insert(\"i18n_failed_text\", &i18n_failed_text);\n context.insert(\"i18n_failed_message\", &i18n_failed_message);\n context.insert(\"i18n_ref_id_text\", &i18n_ref_id_text);\n context.insert(\"i18n_error_code_text\", &i18n_error_code_text);\n context.insert(\"i18n_error_message\", &i18n_error_message);\n context.insert(\"i18n_redirecting_text\", &i18n_redirecting_text);\n context.insert(\"i18n_redirecting_in_text\", &i18n_redirecting_in_text);\n context.insert(\"i18n_seconds_text\", &i18n_seconds_text);\n}",
16
+ "after_code": "pub fn insert_locales_in_context_for_payout_link_status(context: &mut Context, locale: &str) {\n let language = get_language(locale);\n let locale = language.as_str();\n let i18n_payout_link_status_title = t!(\"payout_link.status.title\", locale = locale);\n let i18n_success_text = t!(\"payout_link.status.text.success\", locale = locale);\n let i18n_success_message = t!(\"payout_link.status.message.success\", locale = locale);\n let i18n_pending_text = t!(\"payout_link.status.text.processing\", locale = locale);\n let i18n_pending_message = t!(\"payout_link.status.message.processing\", locale = locale);\n let i18n_failed_text = t!(\"payout_link.status.text.failed\", locale = locale);\n let i18n_failed_message = t!(\"payout_link.status.message.failed\", locale = locale);\n let i18n_ref_id_text = t!(\"payout_link.status.info.ref_id\", locale = locale);\n let i18n_error_code_text = t!(\"payout_link.status.info.error_code\", locale = locale);\n let i18n_error_message = t!(\"payout_link.status.info.error_message\", locale = locale);\n let i18n_redirecting_text = t!(\n \"payout_link.status.redirection_text.redirecting\",\n locale = locale\n );\n let i18n_redirecting_in_text = t!(\n \"payout_link.status.redirection_text.redirecting_in\",\n locale = locale\n );\n let i18n_seconds_text = t!(\n \"payout_link.status.redirection_text.seconds\",\n locale = locale\n );\n\n context.insert(\n \"i18n_payout_link_status_title\",\n &i18n_payout_link_status_title,\n );\n context.insert(\"i18n_success_text\", &i18n_success_text);\n context.insert(\"i18n_success_message\", &i18n_success_message);\n context.insert(\"i18n_pending_text\", &i18n_pending_text);\n context.insert(\"i18n_pending_message\", &i18n_pending_message);\n context.insert(\"i18n_failed_text\", &i18n_failed_text);\n context.insert(\"i18n_failed_message\", &i18n_failed_message);\n context.insert(\"i18n_ref_id_text\", &i18n_ref_id_text);\n context.insert(\"i18n_error_code_text\", &i18n_error_code_text);\n context.insert(\"i18n_error_message\", &i18n_error_message);\n context.insert(\"i18n_redirecting_text\", &i18n_redirecting_text);\n context.insert(\"i18n_redirecting_in_text\", &i18n_redirecting_in_text);\n context.insert(\"i18n_seconds_text\", &i18n_seconds_text);\n}",
17
+ "diff_span": {
18
+ "before": "",
19
+ "after": "pub fn insert_locales_in_context_for_payout_link_status(context: &mut Context, locale: &str) {\n let language = get_language(locale);\n let locale = language.as_str();\n let i18n_payout_link_status_title = t!(\"payout_link.status.title\", locale = locale);\n let i18n_success_text = t!(\"payout_link.status.text.success\", locale = locale);"
20
+ },
21
+ "commit_sha": "824be43568054ea0d34ac2de95c3fd127d82c0c5"
22
+ },
23
+ {
24
+ "id": "crates/router/src/services/api/generic_link_response/context.rs::function::insert_locales_in_context_for_payout_link",
25
+ "file": "crates/router/src/services/api/generic_link_response/context.rs",
26
+ "kind": "function_item",
27
+ "status": "modified",
28
+ "code_changed": true,
29
+ "imports_changed": false,
30
+ "before_code": "pub fn insert_locales_in_context_for_payout_link(context: &mut Context, locale: &str) {\n let i18n_payout_link_title = t!(\"payout_link.initiate.title\", locale = locale);\n let i18n_january = t!(\"months.january\", locale = locale);\n let i18n_february = t!(\"months.february\", locale = locale);\n let i18n_march = t!(\"months.march\", locale = locale);\n let i18n_april = t!(\"months.april\", locale = locale);\n let i18n_may = t!(\"months.may\", locale = locale);\n let i18n_june = t!(\"months.june\", locale = locale);\n let i18n_july = t!(\"months.july\", locale = locale);\n let i18n_august = t!(\"months.august\", locale = locale);\n let i18n_september = t!(\"months.september\", locale = locale);\n let i18n_october = t!(\"months.october\", locale = locale);\n let i18n_november = t!(\"months.november\", locale = locale);\n let i18n_december = t!(\"months.december\", locale = locale);\n let i18n_not_allowed = t!(\"payout_link.initiate.not_allowed\", locale = locale);\n let i18n_am = t!(\"time.am\", locale = locale);\n let i18n_pm = t!(\"time.pm\", locale = locale);\n\n context.insert(\"i18n_payout_link_title\", &i18n_payout_link_title);\n context.insert(\"i18n_january\", &i18n_january);\n context.insert(\"i18n_february\", &i18n_february);\n context.insert(\"i18n_march\", &i18n_march);\n context.insert(\"i18n_april\", &i18n_april);\n context.insert(\"i18n_may\", &i18n_may);\n context.insert(\"i18n_june\", &i18n_june);\n context.insert(\"i18n_july\", &i18n_july);\n context.insert(\"i18n_august\", &i18n_august);\n context.insert(\"i18n_september\", &i18n_september);\n context.insert(\"i18n_october\", &i18n_october);\n context.insert(\"i18n_november\", &i18n_november);\n context.insert(\"i18n_december\", &i18n_december);\n context.insert(\"i18n_not_allowed\", &i18n_not_allowed);\n context.insert(\"i18n_am\", &i18n_am);\n context.insert(\"i18n_pm\", &i18n_pm);\n}",
31
+ "after_code": "pub fn insert_locales_in_context_for_payout_link(context: &mut Context, locale: &str) {\n let language = get_language(locale);\n let locale = language.as_str();\n let i18n_payout_link_title = t!(\"payout_link.initiate.title\", locale = locale);\n let i18n_january = t!(\"months.january\", locale = locale);\n let i18n_february = t!(\"months.february\", locale = locale);\n let i18n_march = t!(\"months.march\", locale = locale);\n let i18n_april = t!(\"months.april\", locale = locale);\n let i18n_may = t!(\"months.may\", locale = locale);\n let i18n_june = t!(\"months.june\", locale = locale);\n let i18n_july = t!(\"months.july\", locale = locale);\n let i18n_august = t!(\"months.august\", locale = locale);\n let i18n_september = t!(\"months.september\", locale = locale);\n let i18n_october = t!(\"months.october\", locale = locale);\n let i18n_november = t!(\"months.november\", locale = locale);\n let i18n_december = t!(\"months.december\", locale = locale);\n let i18n_not_allowed = t!(\"payout_link.initiate.not_allowed\", locale = locale);\n let i18n_am = t!(\"time.am\", locale = locale);\n let i18n_pm = t!(\"time.pm\", locale = locale);\n\n context.insert(\"i18n_payout_link_title\", &i18n_payout_link_title);\n context.insert(\"i18n_january\", &i18n_january);\n context.insert(\"i18n_february\", &i18n_february);\n context.insert(\"i18n_march\", &i18n_march);\n context.insert(\"i18n_april\", &i18n_april);\n context.insert(\"i18n_may\", &i18n_may);\n context.insert(\"i18n_june\", &i18n_june);\n context.insert(\"i18n_july\", &i18n_july);\n context.insert(\"i18n_august\", &i18n_august);\n context.insert(\"i18n_september\", &i18n_september);\n context.insert(\"i18n_october\", &i18n_october);\n context.insert(\"i18n_november\", &i18n_november);\n context.insert(\"i18n_december\", &i18n_december);\n context.insert(\"i18n_not_allowed\", &i18n_not_allowed);\n context.insert(\"i18n_am\", &i18n_am);\n context.insert(\"i18n_pm\", &i18n_pm);\n}",
32
+ "diff_span": {
33
+ "before": "",
34
+ "after": "pub fn insert_locales_in_context_for_payout_link(context: &mut Context, locale: &str) {\n let language = get_language(locale);\n let locale = language.as_str();\n let i18n_payout_link_title = t!(\"payout_link.initiate.title\", locale = locale);\n let i18n_january = t!(\"months.january\", locale = locale);"
35
+ },
36
+ "commit_sha": "824be43568054ea0d34ac2de95c3fd127d82c0c5"
37
+ },
38
+ {
39
+ "id": "crates/router/src/services/api/generic_link_response/context.rs::function::get_language",
40
+ "file": "crates/router/src/services/api/generic_link_response/context.rs",
41
+ "kind": "function_item",
42
+ "status": "added",
43
+ "before_code": null,
44
+ "after_code": "fn get_language(locale_str: &str) -> String {\n let lowercase_str = locale_str.to_lowercase();\n let primary_locale = lowercase_str.split(',').next().unwrap_or(\"\").trim();\n\n if primary_locale.is_empty() {\n return DEFAULT_LOCALE.to_string();\n }\n\n let parts = primary_locale.split('-').collect::<Vec<&str>>();\n let language = *parts.first().unwrap_or(&DEFAULT_LOCALE);\n let country = parts.get(1).copied();\n\n match (language, country) {\n (\"en\", Some(\"gb\")) => \"en_gb\".to_string(),\n (\"fr\", Some(\"be\")) => \"fr_be\".to_string(),\n (lang, _) => lang.to_string(),\n }\n}",
45
+ "diff_span": null,
46
+ "commit_sha": "824be43568054ea0d34ac2de95c3fd127d82c0c5"
47
+ }
48
+ ]
49
+ }
diffs/pr_8141/6b6facc/diff.json ADDED
@@ -0,0 +1,24 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "6b6faccbdc21f15cc1842ac5c0f10bc57165f46c",
3
+ "pr_number": 8141,
4
+ "rust_files": [
5
+ "crates/router/src/core/debit_routing.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/router/src/core/debit_routing.rs::function::should_execute_debit_routing",
10
+ "file": "crates/router/src/core/debit_routing.rs",
11
+ "kind": "function_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "async fn should_execute_debit_routing<F, Req, D>(\n state: &SessionState,\n business_profile: &domain::Profile,\n operation: &BoxedOperation<'_, F, Req, D>,\n payment_data: &D,\n) -> bool\nwhere\n F: Send + Clone,\n D: OperationSessionGetters<F> + OperationSessionSetters<F> + Send + Sync + Clone,\n{\n if business_profile.is_debit_routing_enabled\n && state.conf.open_router.enabled\n {\n logger::info!(\"Debit routing is enabled for the profile\");\n\n let debit_routing_config = &state.conf.debit_routing_config;\n\n if should_perform_debit_routing_for_the_flow(operation, payment_data, debit_routing_config)\n {\n let is_debit_routable_connector_present = check_for_debit_routing_connector_in_profile(\n state,\n business_profile.get_id(),\n payment_data,\n )\n .await;\n\n if is_debit_routable_connector_present {\n logger::debug!(\"Debit routable connector is configured for the profile\");\n return true;\n }\n }\n }\n false\n}",
16
+ "after_code": "async fn should_execute_debit_routing<F, Req, D>(\n state: &SessionState,\n business_profile: &domain::Profile,\n operation: &BoxedOperation<'_, F, Req, D>,\n payment_data: &D,\n) -> bool\nwhere\n F: Send + Clone,\n D: OperationSessionGetters<F> + OperationSessionSetters<F> + Send + Sync + Clone,\n{\n if business_profile.is_debit_routing_enabled && state.conf.open_router.enabled {\n logger::info!(\"Debit routing is enabled for the profile\");\n\n let debit_routing_config = &state.conf.debit_routing_config;\n\n if should_perform_debit_routing_for_the_flow(operation, payment_data, debit_routing_config)\n {\n let is_debit_routable_connector_present = check_for_debit_routing_connector_in_profile(\n state,\n business_profile.get_id(),\n payment_data,\n )\n .await;\n\n if is_debit_routable_connector_present {\n logger::debug!(\"Debit routable connector is configured for the profile\");\n return true;\n }\n }\n }\n false\n}",
17
+ "diff_span": {
18
+ "before": " D: OperationSessionGetters<F> + OperationSessionSetters<F> + Send + Sync + Clone,\n{\n if business_profile.is_debit_routing_enabled\n && state.conf.open_router.enabled\n {\n logger::info!(\"Debit routing is enabled for the profile\");\n",
19
+ "after": " D: OperationSessionGetters<F> + OperationSessionSetters<F> + Send + Sync + Clone,\n{\n if business_profile.is_debit_routing_enabled && state.conf.open_router.enabled {\n logger::info!(\"Debit routing is enabled for the profile\");\n"
20
+ },
21
+ "commit_sha": "6b6faccbdc21f15cc1842ac5c0f10bc57165f46c"
22
+ }
23
+ ]
24
+ }
diffs/pr_8141/752d9a7/diff.json ADDED
@@ -0,0 +1,39 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "752d9a728bb347c70197c39c242f5d049ecca56e",
3
+ "pr_number": 8141,
4
+ "rust_files": [
5
+ "crates/router/src/core/debit_routing.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/router/src/core/debit_routing.rs::function::perform_debit_routing",
10
+ "file": "crates/router/src/core/debit_routing.rs",
11
+ "kind": "function_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "pub async fn perform_debit_routing<F, Req, D>(\n operation: &BoxedOperation<'_, F, Req, D>,\n state: &SessionState,\n business_profile: &domain::Profile,\n payment_data: &mut D,\n connector: Option<ConnectorCallType>,\n) -> (\n Option<ConnectorCallType>,\n Option<open_router::DebitRoutingOutput>,\n)\nwhere\n F: Send + Clone,\n D: OperationSessionGetters<F> + OperationSessionSetters<F> + Send + Sync + Clone,\n{\n let mut debit_routing_output = None;\n\n if should_execute_debit_routing(state, business_profile, operation, payment_data).await {\n let debit_routing_config = state.conf.debit_routing_config.clone();\n let debit_routing_supported_connectors = debit_routing_config.supported_connectors.clone();\n\n if let Some((call_connector_type, acquirer_country)) = connector\n .clone()\n .zip(business_profile.merchant_business_country)\n {\n debit_routing_output = match call_connector_type {\n ConnectorCallType::PreDetermined(connector_data) => {\n logger::info!(\"Performing debit routing for PreDetermined connector\");\n handle_pre_determined_connector(\n state,\n &debit_routing_config,\n debit_routing_supported_connectors,\n &connector_data,\n payment_data,\n acquirer_country,\n )\n .await\n }\n ConnectorCallType::Retryable(connector_data) => {\n logger::info!(\"Performing debit routing for Retryable connector\");\n handle_retryable_connector(\n state,\n &debit_routing_config,\n debit_routing_supported_connectors,\n connector_data,\n payment_data,\n acquirer_country,\n )\n .await\n }\n ConnectorCallType::SessionMultiple(_) => {\n logger::info!(\n \"SessionMultiple connector type is not supported for debit routing\"\n );\n None\n }\n #[cfg(feature = \"v2\")]\n ConnectorCallType::Skip => {\n logger::info!(\"Skip connector type is not supported for debit routing\");\n None\n }\n };\n }\n }\n\n if let Some(debit_routing_output) = debit_routing_output {\n (\n Some(debit_routing_output.debit_routing_connector_call_type),\n Some(debit_routing_output.debit_routing_output),\n )\n } else {\n // If debit_routing_output is None, return the static routing output (connector)\n logger::info!(\"Debit routing is not performed, returning static routing output\");\n (connector, None)\n }\n}",
16
+ "after_code": "pub async fn perform_debit_routing<F, Req, D>(\n operation: &BoxedOperation<'_, F, Req, D>,\n state: &SessionState,\n business_profile: &domain::Profile,\n payment_data: &mut D,\n connector: Option<ConnectorCallType>,\n) -> (\n Option<ConnectorCallType>,\n Option<open_router::DebitRoutingOutput>,\n)\nwhere\n F: Send + Clone,\n D: OperationSessionGetters<F> + OperationSessionSetters<F> + Send + Sync + Clone,\n{\n let mut debit_routing_output = None;\n\n if should_execute_debit_routing(state, business_profile, operation, payment_data).await {\n let debit_routing_config = state.conf.debit_routing_config.clone();\n let debit_routing_supported_connectors = debit_routing_config.supported_connectors.clone();\n\n // If the business profile does not have a country set, we cannot perform debit routing,\n // because the merchant_business_country will be treated as the acquirer_country,\n // which is used to determine whether a transaction is local or global in the open router.\n // For now, since debit routing is only implemented for USD, we can safely assume the\n // acquirer_country is US if not provided by the merchant.\n\n let acquirer_country = business_profile\n .merchant_business_country\n .unwrap_or_default();\n\n if let Some(call_connector_type) = connector.clone() {\n debit_routing_output = match call_connector_type {\n ConnectorCallType::PreDetermined(connector_data) => {\n logger::info!(\"Performing debit routing for PreDetermined connector\");\n handle_pre_determined_connector(\n state,\n &debit_routing_config,\n debit_routing_supported_connectors,\n &connector_data,\n payment_data,\n acquirer_country,\n )\n .await\n }\n ConnectorCallType::Retryable(connector_data) => {\n logger::info!(\"Performing debit routing for Retryable connector\");\n handle_retryable_connector(\n state,\n &debit_routing_config,\n debit_routing_supported_connectors,\n connector_data,\n payment_data,\n acquirer_country,\n )\n .await\n }\n ConnectorCallType::SessionMultiple(_) => {\n logger::info!(\n \"SessionMultiple connector type is not supported for debit routing\"\n );\n None\n }\n #[cfg(feature = \"v2\")]\n ConnectorCallType::Skip => {\n logger::info!(\"Skip connector type is not supported for debit routing\");\n None\n }\n };\n }\n }\n\n if let Some(debit_routing_output) = debit_routing_output {\n (\n Some(debit_routing_output.debit_routing_connector_call_type),\n Some(debit_routing_output.debit_routing_output),\n )\n } else {\n // If debit_routing_output is None, return the static routing output (connector)\n logger::info!(\"Debit routing is not performed, returning static routing output\");\n (connector, None)\n }\n}",
17
+ "diff_span": {
18
+ "before": " let debit_routing_supported_connectors = debit_routing_config.supported_connectors.clone();\n\n if let Some((call_connector_type, acquirer_country)) = connector\n .clone()\n .zip(business_profile.merchant_business_country)\n {\n debit_routing_output = match call_connector_type {\n ConnectorCallType::PreDetermined(connector_data) => {",
19
+ "after": " let debit_routing_supported_connectors = debit_routing_config.supported_connectors.clone();\n\n // If the business profile does not have a country set, we cannot perform debit routing,\n // because the merchant_business_country will be treated as the acquirer_country,\n // which is used to determine whether a transaction is local or global in the open router.\n // For now, since debit routing is only implemented for USD, we can safely assume the\n // acquirer_country is US if not provided by the merchant.\n\n let acquirer_country = business_profile\n .merchant_business_country\n .unwrap_or_default();\n\n if let Some(call_connector_type) = connector.clone() {\n debit_routing_output = match call_connector_type {\n ConnectorCallType::PreDetermined(connector_data) => {"
20
+ },
21
+ "commit_sha": "752d9a728bb347c70197c39c242f5d049ecca56e"
22
+ },
23
+ {
24
+ "id": "crates/router/src/core/debit_routing.rs::function::should_execute_debit_routing",
25
+ "file": "crates/router/src/core/debit_routing.rs",
26
+ "kind": "function_item",
27
+ "status": "modified",
28
+ "code_changed": true,
29
+ "imports_changed": false,
30
+ "before_code": "async fn should_execute_debit_routing<F, Req, D>(\n state: &SessionState,\n business_profile: &domain::Profile,\n operation: &BoxedOperation<'_, F, Req, D>,\n payment_data: &D,\n) -> bool\nwhere\n F: Send + Clone,\n D: OperationSessionGetters<F> + OperationSessionSetters<F> + Send + Sync + Clone,\n{\n if business_profile.is_debit_routing_enabled\n && state.conf.open_router.enabled\n && business_profile.merchant_business_country.is_some()\n {\n logger::info!(\"Debit routing is enabled for the profile\");\n\n let debit_routing_config = &state.conf.debit_routing_config;\n\n if should_perform_debit_routing_for_the_flow(operation, payment_data, debit_routing_config)\n {\n let is_debit_routable_connector_present = check_for_debit_routing_connector_in_profile(\n state,\n business_profile.get_id(),\n payment_data,\n )\n .await;\n\n if is_debit_routable_connector_present {\n logger::debug!(\"Debit routable connector is configured for the profile\");\n return true;\n }\n }\n }\n false\n}",
31
+ "after_code": "async fn should_execute_debit_routing<F, Req, D>(\n state: &SessionState,\n business_profile: &domain::Profile,\n operation: &BoxedOperation<'_, F, Req, D>,\n payment_data: &D,\n) -> bool\nwhere\n F: Send + Clone,\n D: OperationSessionGetters<F> + OperationSessionSetters<F> + Send + Sync + Clone,\n{\n if business_profile.is_debit_routing_enabled\n && state.conf.open_router.enabled\n {\n logger::info!(\"Debit routing is enabled for the profile\");\n\n let debit_routing_config = &state.conf.debit_routing_config;\n\n if should_perform_debit_routing_for_the_flow(operation, payment_data, debit_routing_config)\n {\n let is_debit_routable_connector_present = check_for_debit_routing_connector_in_profile(\n state,\n business_profile.get_id(),\n payment_data,\n )\n .await;\n\n if is_debit_routable_connector_present {\n logger::debug!(\"Debit routable connector is configured for the profile\");\n return true;\n }\n }\n }\n false\n}",
32
+ "diff_span": {
33
+ "before": " if business_profile.is_debit_routing_enabled\n && state.conf.open_router.enabled\n && business_profile.merchant_business_country.is_some()\n {\n logger::info!(\"Debit routing is enabled for the profile\");",
34
+ "after": ""
35
+ },
36
+ "commit_sha": "752d9a728bb347c70197c39c242f5d049ecca56e"
37
+ }
38
+ ]
39
+ }
diffs/pr_8177/3553938/diff.json ADDED
@@ -0,0 +1,24 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "3553938bbd2e778c47fa2f2c49bfff5557a1f82f",
3
+ "pr_number": 8177,
4
+ "rust_files": [
5
+ "crates/router/src/core/payments/operations/payment_get.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/router/src/core/payments/operations/payment_get.rs::PaymentGet::function::get_trackers",
10
+ "file": "crates/router/src/core/payments/operations/payment_get.rs",
11
+ "kind": "function_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "async fn get_trackers<'a>(\n &'a self,\n state: &'a SessionState,\n payment_id: &common_utils::id_type::GlobalPaymentId,\n request: &PaymentsRetrieveRequest,\n merchant_context: &domain::MerchantContext,\n _profile: &domain::Profile,\n _header_payload: &hyperswitch_domain_models::payments::HeaderPayload,\n ) -> RouterResult<operations::GetTrackerResponse<PaymentStatusData<F>>> {\n let db = &*state.store;\n let key_manager_state = &state.into();\n\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n self.validate_status_for_operation(payment_intent.status)?;\n\n let active_attempt_id = payment_intent.active_attempt_id.as_ref().ok_or_else(|| {\n errors::ApiErrorResponse::MissingRequiredField {\n field_name: (\"active_attempt_id\"),\n }\n })?;\n\n let payment_attempt = db\n .find_payment_attempt_by_id(\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n active_attempt_id,\n storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not find payment attempt given the attempt id\")?;\n\n let should_sync_with_connector =\n request.force_sync && payment_intent.status.should_force_sync_with_connector();\n\n // We need the address here to send it in the response\n let payment_address = hyperswitch_domain_models::payment_address::PaymentAddress::new(\n payment_intent\n .shipping_address\n .clone()\n .map(|address| address.into_inner()),\n payment_intent\n .billing_address\n .clone()\n .map(|address| address.into_inner()),\n payment_attempt\n .payment_method_billing_address\n .clone()\n .map(|address| address.into_inner()),\n Some(true),\n );\n\n let attempts = match request.expand_attempts {\n true => payment_intent\n .active_attempt_id\n .as_ref()\n .async_map(|active_attempt| async {\n db.find_payment_attempts_by_payment_intent_id(\n key_manager_state,\n payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not find payment attempts for the given the intent id\")\n })\n .await\n .transpose()?,\n false => None,\n };\n\n let payment_data = PaymentStatusData {\n flow: std::marker::PhantomData,\n payment_intent,\n payment_attempt,\n payment_address,\n attempts,\n should_sync_with_connector,\n };\n\n let get_trackers_response = operations::GetTrackerResponse { payment_data };\n\n Ok(get_trackers_response)\n }",
16
+ "after_code": "async fn get_trackers<'a>(\n &'a self,\n state: &'a SessionState,\n payment_id: &common_utils::id_type::GlobalPaymentId,\n request: &PaymentsRetrieveRequest,\n merchant_context: &domain::MerchantContext,\n _profile: &domain::Profile,\n _header_payload: &hyperswitch_domain_models::payments::HeaderPayload,\n ) -> RouterResult<operations::GetTrackerResponse<PaymentStatusData<F>>> {\n let db = &*state.store;\n let key_manager_state = &state.into();\n\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n self.validate_status_for_operation(payment_intent.status)?;\n\n let active_attempt_id = payment_intent.active_attempt_id.as_ref().ok_or_else(|| {\n errors::ApiErrorResponse::MissingRequiredField {\n field_name: (\"active_attempt_id\"),\n }\n })?;\n\n let mut payment_attempt = db\n .find_payment_attempt_by_id(\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n active_attempt_id,\n storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not find payment attempt given the attempt id\")?;\n\n payment_attempt.encoded_data = request\n .param\n .as_ref()\n .map(|val| masking::Secret::new(val.clone()));\n\n let should_sync_with_connector =\n request.force_sync && payment_intent.status.should_force_sync_with_connector();\n\n // We need the address here to send it in the response\n let payment_address = hyperswitch_domain_models::payment_address::PaymentAddress::new(\n payment_intent\n .shipping_address\n .clone()\n .map(|address| address.into_inner()),\n payment_intent\n .billing_address\n .clone()\n .map(|address| address.into_inner()),\n payment_attempt\n .payment_method_billing_address\n .clone()\n .map(|address| address.into_inner()),\n Some(true),\n );\n\n let attempts = match request.expand_attempts {\n true => payment_intent\n .active_attempt_id\n .as_ref()\n .async_map(|active_attempt| async {\n db.find_payment_attempts_by_payment_intent_id(\n key_manager_state,\n payment_id,\n merchant_context.get_merchant_key_store(),\n storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not find payment attempts for the given the intent id\")\n })\n .await\n .transpose()?,\n false => None,\n };\n\n let payment_data = PaymentStatusData {\n flow: std::marker::PhantomData,\n payment_intent,\n payment_attempt,\n payment_address,\n attempts,\n should_sync_with_connector,\n };\n\n let get_trackers_response = operations::GetTrackerResponse { payment_data };\n\n Ok(get_trackers_response)\n }",
17
+ "diff_span": {
18
+ "before": " })?;\n\n let payment_attempt = db\n .find_payment_attempt_by_id(\n key_manager_state,",
19
+ "after": " })?;\n\n let mut payment_attempt = db\n .find_payment_attempt_by_id(\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n active_attempt_id,\n storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not find payment attempt given the attempt id\")?;\n\n payment_attempt.encoded_data = request\n .param\n .as_ref()\n .map(|val| masking::Secret::new(val.clone()));\n\n let should_sync_with_connector ="
20
+ },
21
+ "commit_sha": "3553938bbd2e778c47fa2f2c49bfff5557a1f82f"
22
+ }
23
+ ]
24
+ }
diffs/pr_8198/7c6d82f/diff.json ADDED
The diff for this file is too large to render. See raw diff
 
diffs/pr_8198/9bc098d/diff.json ADDED
@@ -0,0 +1,24 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "9bc098d71c06f12d20079bc566e5f651f1d2b138",
3
+ "pr_number": 8198,
4
+ "rust_files": [
5
+ "crates/diesel_models/src/payment_attempt.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/diesel_models/src/payment_attempt.rs::PaymentAttemptUpdateInternal::function::apply_changeset",
10
+ "file": "crates/diesel_models/src/payment_attempt.rs",
11
+ "kind": "function_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "pub fn apply_changeset(self, source: PaymentAttempt) -> PaymentAttempt {\n let Self {\n status,\n authentication_type,\n error_message,\n connector_payment_id,\n modified_at,\n browser_info,\n error_code,\n connector_metadata,\n error_reason,\n amount_capturable,\n amount_to_capture,\n updated_by,\n merchant_connector_id,\n connector,\n redirection_data,\n unified_code,\n unified_message,\n connector_token_details,\n feature_metadata,\n network_decline_code,\n network_advice_code,\n network_error_message,\n payment_method_id,\n connector_request_reference_id,\n } = self;\n\n PaymentAttempt {\n payment_id: source.payment_id,\n merchant_id: source.merchant_id,\n status: status.unwrap_or(source.status),\n connector: connector.or(source.connector),\n error_message: error_message.or(source.error_message),\n surcharge_amount: source.surcharge_amount,\n payment_method_id: payment_method_id.or(source.payment_method_id),\n authentication_type: authentication_type.unwrap_or(source.authentication_type),\n created_at: source.created_at,\n modified_at: common_utils::date_time::now(),\n last_synced: source.last_synced,\n cancellation_reason: source.cancellation_reason,\n amount_to_capture: amount_to_capture.or(source.amount_to_capture),\n browser_info: browser_info\n .and_then(|val| {\n serde_json::from_value::<common_utils::types::BrowserInformation>(val).ok()\n })\n .or(source.browser_info),\n error_code: error_code.or(source.error_code),\n payment_token: source.payment_token,\n connector_metadata: connector_metadata.or(source.connector_metadata),\n payment_experience: source.payment_experience,\n payment_method_data: source.payment_method_data,\n preprocessing_step_id: source.preprocessing_step_id,\n error_reason: error_reason.or(source.error_reason),\n multiple_capture_count: source.multiple_capture_count,\n connector_response_reference_id: source.connector_response_reference_id,\n amount_capturable: amount_capturable.unwrap_or(source.amount_capturable),\n updated_by,\n merchant_connector_id: merchant_connector_id.or(source.merchant_connector_id),\n encoded_data: source.encoded_data,\n unified_code: unified_code.flatten().or(source.unified_code),\n unified_message: unified_message.flatten().or(source.unified_message),\n net_amount: source.net_amount,\n external_three_ds_authentication_attempted: source.external_three_ds_authentication_attempted,\n authentication_connector: source.authentication_connector,\n authentication_id: source.authentication_id,\n fingerprint_id: source.fingerprint_id,\n client_source: source.client_source,\n client_version: source.client_version,\n customer_acceptance: source.customer_acceptance,\n profile_id: source.profile_id,\n organization_id: source.organization_id,\n card_network: source.card_network,\n shipping_cost: source.shipping_cost,\n order_tax_amount: source.order_tax_amount,\n request_extended_authorization: source.request_extended_authorization,\n extended_authorization_applied: source.extended_authorization_applied,\n capture_before: source.capture_before,\n card_discovery: source.card_discovery,\n charges: source.charges,\n processor_merchant_id: source.processor_merchant_id,\n created_by: source.created_by,\n payment_method_type_v2: source.payment_method_type_v2,\n connector_payment_id: source.connector_payment_id,\n payment_method_subtype: source.payment_method_subtype,\n routing_result: source.routing_result,\n authentication_applied: source.authentication_applied,\n external_reference_id: source.external_reference_id,\n tax_on_surcharge: source.tax_on_surcharge,\n payment_method_billing_address: source.payment_method_billing_address,\n redirection_data: redirection_data.or(source.redirection_data),\n connector_payment_data: source.connector_payment_data,\n connector_token_details: connector_token_details.or(source.connector_token_details),\n id: source.id,\n feature_metadata: feature_metadata.or(source.feature_metadata),\n network_advice_code: network_advice_code.or(source.network_advice_code),\n network_decline_code: network_decline_code.or(source.network_decline_code),\n network_error_message: network_error_message.or(source.network_error_message),\n connector_request_reference_id: connector_request_reference_id\n .or(source.connector_request_reference_id),\n }\n }",
16
+ "after_code": "pub fn apply_changeset(self, source: PaymentAttempt) -> PaymentAttempt {\n let Self {\n status,\n authentication_type,\n error_message,\n connector_payment_id,\n modified_at,\n browser_info,\n error_code,\n connector_metadata,\n error_reason,\n amount_capturable,\n amount_to_capture,\n updated_by,\n merchant_connector_id,\n connector,\n redirection_data,\n unified_code,\n unified_message,\n connector_token_details,\n feature_metadata,\n network_decline_code,\n network_advice_code,\n network_error_message,\n payment_method_id,\n connector_request_reference_id,\n } = self;\n\n PaymentAttempt {\n payment_id: source.payment_id,\n merchant_id: source.merchant_id,\n status: status.unwrap_or(source.status),\n connector: connector.or(source.connector),\n error_message: error_message.or(source.error_message),\n surcharge_amount: source.surcharge_amount,\n payment_method_id: payment_method_id.or(source.payment_method_id),\n authentication_type: authentication_type.unwrap_or(source.authentication_type),\n created_at: source.created_at,\n modified_at: common_utils::date_time::now(),\n last_synced: source.last_synced,\n cancellation_reason: source.cancellation_reason,\n amount_to_capture: amount_to_capture.or(source.amount_to_capture),\n browser_info: browser_info\n .and_then(|val| {\n serde_json::from_value::<common_utils::types::BrowserInformation>(val).ok()\n })\n .or(source.browser_info),\n error_code: error_code.or(source.error_code),\n payment_token: source.payment_token,\n connector_metadata: connector_metadata.or(source.connector_metadata),\n payment_experience: source.payment_experience,\n payment_method_data: source.payment_method_data,\n preprocessing_step_id: source.preprocessing_step_id,\n error_reason: error_reason.or(source.error_reason),\n multiple_capture_count: source.multiple_capture_count,\n connector_response_reference_id: source.connector_response_reference_id,\n amount_capturable: amount_capturable.unwrap_or(source.amount_capturable),\n updated_by,\n merchant_connector_id: merchant_connector_id.or(source.merchant_connector_id),\n encoded_data: source.encoded_data,\n unified_code: unified_code.flatten().or(source.unified_code),\n unified_message: unified_message.flatten().or(source.unified_message),\n net_amount: source.net_amount,\n external_three_ds_authentication_attempted: source\n .external_three_ds_authentication_attempted,\n authentication_connector: source.authentication_connector,\n authentication_id: source.authentication_id,\n fingerprint_id: source.fingerprint_id,\n client_source: source.client_source,\n client_version: source.client_version,\n customer_acceptance: source.customer_acceptance,\n profile_id: source.profile_id,\n organization_id: source.organization_id,\n card_network: source.card_network,\n shipping_cost: source.shipping_cost,\n order_tax_amount: source.order_tax_amount,\n request_extended_authorization: source.request_extended_authorization,\n extended_authorization_applied: source.extended_authorization_applied,\n capture_before: source.capture_before,\n card_discovery: source.card_discovery,\n charges: source.charges,\n processor_merchant_id: source.processor_merchant_id,\n created_by: source.created_by,\n payment_method_type_v2: source.payment_method_type_v2,\n connector_payment_id: source.connector_payment_id,\n payment_method_subtype: source.payment_method_subtype,\n routing_result: source.routing_result,\n authentication_applied: source.authentication_applied,\n external_reference_id: source.external_reference_id,\n tax_on_surcharge: source.tax_on_surcharge,\n payment_method_billing_address: source.payment_method_billing_address,\n redirection_data: redirection_data.or(source.redirection_data),\n connector_payment_data: source.connector_payment_data,\n connector_token_details: connector_token_details.or(source.connector_token_details),\n id: source.id,\n feature_metadata: feature_metadata.or(source.feature_metadata),\n network_advice_code: network_advice_code.or(source.network_advice_code),\n network_decline_code: network_decline_code.or(source.network_decline_code),\n network_error_message: network_error_message.or(source.network_error_message),\n connector_request_reference_id: connector_request_reference_id\n .or(source.connector_request_reference_id),\n }\n }",
17
+ "diff_span": {
18
+ "before": " unified_message: unified_message.flatten().or(source.unified_message),\n net_amount: source.net_amount,\n external_three_ds_authentication_attempted: source.external_three_ds_authentication_attempted,\n authentication_connector: source.authentication_connector,\n authentication_id: source.authentication_id,",
19
+ "after": " unified_message: unified_message.flatten().or(source.unified_message),\n net_amount: source.net_amount,\n external_three_ds_authentication_attempted: source\n .external_three_ds_authentication_attempted,\n authentication_connector: source.authentication_connector,\n authentication_id: source.authentication_id,"
20
+ },
21
+ "commit_sha": "9bc098d71c06f12d20079bc566e5f651f1d2b138"
22
+ }
23
+ ]
24
+ }
diffs/pr_8198/a676b9e/diff.json ADDED
The diff for this file is too large to render. See raw diff
 
diffs/pr_8198/e8a2216/diff.json ADDED
@@ -0,0 +1,39 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "e8a22167356efecb1e09e63c78d95e5589e2804f",
3
+ "pr_number": 8198,
4
+ "rust_files": [
5
+ "crates/storage_impl/src/lib.rs"
6
+ ],
7
+ "diffs": [
8
+ {
9
+ "id": "crates/storage_impl/src/lib.rs::diesel_models::PaymentAttempt::function::unique_constraints",
10
+ "file": "crates/storage_impl/src/lib.rs",
11
+ "kind": "function_item",
12
+ "status": "modified",
13
+ "code_changed": true,
14
+ "imports_changed": false,
15
+ "before_code": "fn unique_constraints(&self) -> Vec<String> {\n vec![format!(\n \"pa_{}_{}_{}\",\n self.merchant_id.get_string_repr(),\n self.payment_id.get_string_repr(),\n self.id.get_string_repr()\n )]\n }",
16
+ "after_code": "fn unique_constraints(&self) -> Vec<String> {\n vec![format!(\n \"pa_{}_{}\",\n self.merchant_id.get_string_repr(),\n self.id.get_string_repr()\n )]\n }",
17
+ "diff_span": {
18
+ "before": "fn unique_constraints(&self) -> Vec<String> {\n vec![format!(\n \"pa_{}_{}_{}\",\n self.merchant_id.get_string_repr(),\n self.payment_id.get_string_repr(),\n self.id.get_string_repr()\n )]",
19
+ "after": "fn unique_constraints(&self) -> Vec<String> {\n vec![format!(\n \"pa_{}_{}\",\n self.merchant_id.get_string_repr(),\n self.id.get_string_repr()"
20
+ },
21
+ "commit_sha": "e8a22167356efecb1e09e63c78d95e5589e2804f"
22
+ },
23
+ {
24
+ "id": "crates/storage_impl/src/lib.rs::impl::diesel_models::PaymentAttempt",
25
+ "file": "crates/storage_impl/src/lib.rs",
26
+ "kind": "impl_item",
27
+ "status": "modified",
28
+ "code_changed": true,
29
+ "imports_changed": false,
30
+ "before_code": "impl UniqueConstraints for diesel_models::PaymentAttempt {\n fn unique_constraints(&self) -> Vec<String> {\n vec![format!(\n \"pa_{}_{}_{}\",\n self.merchant_id.get_string_repr(),\n self.payment_id.get_string_repr(),\n self.id.get_string_repr()\n )]\n }\n fn table_name(&self) -> &str {\n \"PaymentAttempt\"\n }\n}",
31
+ "after_code": "impl UniqueConstraints for diesel_models::PaymentAttempt {\n fn unique_constraints(&self) -> Vec<String> {\n vec![format!(\n \"pa_{}_{}\",\n self.merchant_id.get_string_repr(),\n self.id.get_string_repr()\n )]\n }\n fn table_name(&self) -> &str {\n \"PaymentAttempt\"\n }\n}",
32
+ "diff_span": {
33
+ "before": " fn unique_constraints(&self) -> Vec<String> {\n vec![format!(\n \"pa_{}_{}_{}\",\n self.merchant_id.get_string_repr(),\n self.payment_id.get_string_repr(),\n self.id.get_string_repr()\n )]",
34
+ "after": " fn unique_constraints(&self) -> Vec<String> {\n vec![format!(\n \"pa_{}_{}\",\n self.merchant_id.get_string_repr(),\n self.id.get_string_repr()"
35
+ },
36
+ "commit_sha": "e8a22167356efecb1e09e63c78d95e5589e2804f"
37
+ }
38
+ ]
39
+ }
diffs/pr_8213/0095cc5/diff.json ADDED
@@ -0,0 +1,674 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc",
3
+ "pr_number": 8213,
4
+ "rust_files": [
5
+ "connector-template/mod.rs",
6
+ "connector-template/test.rs",
7
+ "connector-template/transformers.rs",
8
+ "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs"
9
+ ],
10
+ "diffs": [
11
+ {
12
+ "id": "connector-template/transformers.rs::RefundsRouterData<RSync>::function::try_from",
13
+ "file": "connector-template/transformers.rs",
14
+ "kind": "function_item",
15
+ "status": "modified",
16
+ "code_changed": false,
17
+ "imports_changed": true,
18
+ "before_code": "fn try_from(item: RefundsResponseRouterData<RSync, RefundResponse>) -> Result<Self,Self::Error> {\n Ok(Self {\n response: Ok(RefundsResponseData {\n connector_refund_id: item.response.id.to_string(),\n refund_status: enums::RefundStatus::from(item.response.status),\n }),\n ..item.data\n })\n }",
19
+ "after_code": "fn try_from(item: RefundsResponseRouterData<RSync, RefundResponse>) -> Result<Self,Self::Error> {\n Ok(Self {\n response: Ok(RefundsResponseData {\n connector_refund_id: item.response.id.to_string(),\n refund_status: enums::RefundStatus::from(item.response.status),\n }),\n ..item.data\n })\n }",
20
+ "diff_span": {
21
+ "before": "",
22
+ "after": ""
23
+ },
24
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc",
25
+ "before_imports": [
26
+ "use common_enums::enums;",
27
+ "use hyperswitch_domain_models::{\n payment_method_data::PaymentMethodData,\n router_data::{ConnectorAuthType, RouterData},\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::ResponseId,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n types::{PaymentsAuthorizeRouterData, RefundsRouterData},\n};"
28
+ ],
29
+ "after_imports": [
30
+ "use common_enums::enums;",
31
+ "use crate::types::{RefundsResponseRouterData, ResponseRouterData};",
32
+ "use hyperswitch_domain_models::{\n payment_method_data::PaymentMethodData,\n router_data::{ConnectorAuthType, RouterData},\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::ResponseId,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n types::{PaymentsAuthorizeRouterData, RefundsRouterData},\n};"
33
+ ]
34
+ },
35
+ {
36
+ "id": "connector-template/transformers.rs::impl::RefundsRouterData<Execute>",
37
+ "file": "connector-template/transformers.rs",
38
+ "kind": "impl_item",
39
+ "status": "modified",
40
+ "code_changed": false,
41
+ "imports_changed": true,
42
+ "before_code": "impl TryFrom<RefundsResponseRouterData<Execute, RefundResponse>>\n for RefundsRouterData<Execute>\n{\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(\n item: RefundsResponseRouterData<Execute, RefundResponse>,\n ) -> Result<Self, Self::Error> {\n Ok(Self {\n response: Ok(RefundsResponseData {\n connector_refund_id: item.response.id.to_string(),\n refund_status: enums::RefundStatus::from(item.response.status),\n }),\n ..item.data\n })\n }\n}",
43
+ "after_code": "impl TryFrom<RefundsResponseRouterData<Execute, RefundResponse>>\n for RefundsRouterData<Execute>\n{\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(\n item: RefundsResponseRouterData<Execute, RefundResponse>,\n ) -> Result<Self, Self::Error> {\n Ok(Self {\n response: Ok(RefundsResponseData {\n connector_refund_id: item.response.id.to_string(),\n refund_status: enums::RefundStatus::from(item.response.status),\n }),\n ..item.data\n })\n }\n}",
44
+ "diff_span": {
45
+ "before": "",
46
+ "after": ""
47
+ },
48
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc",
49
+ "before_imports": [
50
+ "use common_enums::enums;",
51
+ "use hyperswitch_interfaces::errors;",
52
+ "use hyperswitch_domain_models::{\n payment_method_data::PaymentMethodData,\n router_data::{ConnectorAuthType, RouterData},\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::ResponseId,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n types::{PaymentsAuthorizeRouterData, RefundsRouterData},\n};"
53
+ ],
54
+ "after_imports": [
55
+ "use common_enums::enums;",
56
+ "use hyperswitch_interfaces::errors;",
57
+ "use crate::types::{RefundsResponseRouterData, ResponseRouterData};",
58
+ "use hyperswitch_domain_models::{\n payment_method_data::PaymentMethodData,\n router_data::{ConnectorAuthType, RouterData},\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::ResponseId,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n types::{PaymentsAuthorizeRouterData, RefundsRouterData},\n};"
59
+ ]
60
+ },
61
+ {
62
+ "id": "connector-template/mod.rs::function::build_error_response",
63
+ "file": "connector-template/mod.rs",
64
+ "kind": "function_item",
65
+ "status": "modified",
66
+ "code_changed": true,
67
+ "imports_changed": false,
68
+ "before_code": "fn build_error_response(\n &self,\n res: Response,\n event_builder: Option<&mut ConnectorEvent>,\n ) -> CustomResult<ErrorResponse, errors::ConnectorError> {\n let response: {{project-name | downcase}}::{{project-name | downcase | pascal_case}}ErrorResponse = res\n .response\n .parse_struct(\"{{project-name | downcase | pascal_case}}ErrorResponse\")\n .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;\n\n event_builder.map(|i| i.set_response_body(&response));\n router_env::logger::info!(connector_response=?response);\n\n Ok(ErrorResponse {\n status_code: res.status_code,\n code: response.code,\n message: response.message,\n reason: response.reason,\n attempt_status: None,\n connector_transaction_id: None,\n })\n }",
69
+ "after_code": "fn build_error_response(\n &self,\n res: Response,\n event_builder: Option<&mut ConnectorEvent>,\n ) -> CustomResult<ErrorResponse, errors::ConnectorError> {\n let response: {{project-name | downcase}}::{{project-name | downcase | pascal_case}}ErrorResponse = res\n .response\n .parse_struct(\"{{project-name | downcase | pascal_case}}ErrorResponse\")\n .change_context(errors::ConnectorError::ResponseDeserializationFailed)?;\n\n event_builder.map(|i| i.set_response_body(&response));\n router_env::logger::info!(connector_response=?response);\n\n Ok(ErrorResponse {\n status_code: res.status_code,\n code: response.code,\n message: response.message,\n reason: response.reason,\n attempt_status: None,\n connector_transaction_id: None,\n network_advice_code: None,\n network_decline_code: None,\n network_error_message: None,\n })\n }",
70
+ "diff_span": {
71
+ "before": "",
72
+ "after": " attempt_status: None,\n connector_transaction_id: None,\n network_advice_code: None,\n network_decline_code: None,\n network_error_message: None,\n })\n }"
73
+ },
74
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
75
+ },
76
+ {
77
+ "id": "connector-template/mod.rs::function::get_url",
78
+ "file": "connector-template/mod.rs",
79
+ "kind": "function_item",
80
+ "status": "modified",
81
+ "code_changed": true,
82
+ "imports_changed": false,
83
+ "before_code": "fn get_url(&self, _req: &RefundSyncRouterData,_connectors: &Connectors,) -> CustomResult<String,errors::ConnectorError> {\n Err(errors::ConnectorError::NotImplemented(\"get_url method\".to_string()).into())\n }",
84
+ "after_code": "fn get_url(\n &self,\n _req: &RefundSyncRouterData,_connectors: &Connectors,) -> CustomResult<String,errors::ConnectorError> {\n Err(errors::ConnectorError::NotImplemented(\"get_url method\".to_string()).into())\n }",
85
+ "diff_span": {
86
+ "before": "fn get_url(&self, _req: &RefundSyncRouterData,_connectors: &Connectors,) -> CustomResult<String,errors::ConnectorError> {\n Err(errors::ConnectorError::NotImplemented(\"get_url method\".to_string()).into())\n }",
87
+ "after": "fn get_url(\n &self,\n _req: &RefundSyncRouterData,_connectors: &Connectors,) -> CustomResult<String,errors::ConnectorError> {\n Err(errors::ConnectorError::NotImplemented(\"get_url method\".to_string()).into())\n }"
88
+ },
89
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
90
+ },
91
+ {
92
+ "id": "connector-template/transformers.rs::impl::RefundsRouterData<RSync>",
93
+ "file": "connector-template/transformers.rs",
94
+ "kind": "impl_item",
95
+ "status": "modified",
96
+ "code_changed": false,
97
+ "imports_changed": true,
98
+ "before_code": "impl TryFrom<RefundsResponseRouterData<RSync, RefundResponse>> for RefundsRouterData<RSync>\n{\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: RefundsResponseRouterData<RSync, RefundResponse>) -> Result<Self,Self::Error> {\n Ok(Self {\n response: Ok(RefundsResponseData {\n connector_refund_id: item.response.id.to_string(),\n refund_status: enums::RefundStatus::from(item.response.status),\n }),\n ..item.data\n })\n }\n }",
99
+ "after_code": "impl TryFrom<RefundsResponseRouterData<RSync, RefundResponse>> for RefundsRouterData<RSync>\n{\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: RefundsResponseRouterData<RSync, RefundResponse>) -> Result<Self,Self::Error> {\n Ok(Self {\n response: Ok(RefundsResponseData {\n connector_refund_id: item.response.id.to_string(),\n refund_status: enums::RefundStatus::from(item.response.status),\n }),\n ..item.data\n })\n }\n }",
100
+ "diff_span": {
101
+ "before": "",
102
+ "after": ""
103
+ },
104
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc",
105
+ "before_imports": [
106
+ "use common_enums::enums;",
107
+ "use hyperswitch_interfaces::errors;",
108
+ "use hyperswitch_domain_models::{\n payment_method_data::PaymentMethodData,\n router_data::{ConnectorAuthType, RouterData},\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::ResponseId,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n types::{PaymentsAuthorizeRouterData, RefundsRouterData},\n};"
109
+ ],
110
+ "after_imports": [
111
+ "use common_enums::enums;",
112
+ "use hyperswitch_interfaces::errors;",
113
+ "use crate::types::{RefundsResponseRouterData, ResponseRouterData};",
114
+ "use hyperswitch_domain_models::{\n payment_method_data::PaymentMethodData,\n router_data::{ConnectorAuthType, RouterData},\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::ResponseId,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n types::{PaymentsAuthorizeRouterData, RefundsRouterData},\n};"
115
+ ]
116
+ },
117
+ {
118
+ "id": "connector-template/mod.rs::impl::project",
119
+ "file": "connector-template/mod.rs",
120
+ "kind": "impl_item",
121
+ "status": "modified",
122
+ "code_changed": false,
123
+ "imports_changed": true,
124
+ "before_code": "impl ConnectorSpecifications for {{project",
125
+ "after_code": "impl ConnectorSpecifications for {{project",
126
+ "diff_span": {
127
+ "before": "",
128
+ "after": ""
129
+ },
130
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc",
131
+ "before_imports": [
132
+ "use common_utils::{\n errors::CustomResult,\n ext_traits::BytesExt,\n types::{AmountConvertor, StringMinorUnit, StringMinorUnitForConnector},\n request::{Method, Request, RequestBuilder, RequestContent},\n};",
133
+ "use hyperswitch_interfaces::{\n api::{self, ConnectorCommon, ConnectorCommonExt, ConnectorIntegration, ConnectorValidation, ConnectorSpecifications},\n configs::Connectors,\n errors,\n events::connector_api_logs::ConnectorEvent,\n types::{self, Response},\n webhooks,\n};",
134
+ "use hyperswitch_domain_models::{\n router_data::{AccessToken, ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::{\n access_token_auth::AccessTokenAuth,\n payments::{\n Authorize, Capture, PSync, PaymentMethodToken, Session,\n SetupMandate, Void,\n },\n refunds::{Execute, RSync},\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData,\n PaymentsAuthorizeData, PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData,\n PaymentsSyncData, RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n types::{\n PaymentsAuthorizeRouterData,\n PaymentsCaptureRouterData, PaymentsSyncRouterData, RefundSyncRouterData, RefundsRouterData,\n },\n};"
135
+ ],
136
+ "after_imports": [
137
+ "use common_utils::{\n errors::CustomResult,\n ext_traits::BytesExt,\n types::{AmountConvertor, StringMinorUnit, StringMinorUnitForConnector},\n request::{Method, Request, RequestBuilder, RequestContent},\n};",
138
+ "use hyperswitch_interfaces::{\n api::{self, ConnectorCommon, ConnectorCommonExt, ConnectorIntegration, ConnectorValidation, ConnectorSpecifications},\n configs::Connectors,\n errors,\n events::connector_api_logs::ConnectorEvent,\n types::{self, Response},\n webhooks,\n};",
139
+ "use hyperswitch_domain_models::{\n router_data::{AccessToken, ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::{\n access_token_auth::AccessTokenAuth,\n payments::{\n Authorize, Capture, PSync, PaymentMethodToken, Session,\n SetupMandate, Void,\n },\n refunds::{Execute, RSync},\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData,\n PaymentsAuthorizeData, PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData,\n PaymentsSyncData, RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n types::{\n PaymentsAuthorizeRouterData,\n PaymentsCaptureRouterData, PaymentsSyncRouterData, RefundSyncRouterData, RefundsRouterData,\n },\n};",
140
+ "use hyperswitch_interfaces::api::ConnectorSpecifications;"
141
+ ]
142
+ },
143
+ {
144
+ "id": "connector-template/test.rs::function::should_fail_payment_for_invalid_exp_month",
145
+ "file": "connector-template/test.rs",
146
+ "kind": "function_item",
147
+ "status": "modified",
148
+ "code_changed": true,
149
+ "imports_changed": true,
150
+ "before_code": "async fn should_fail_payment_for_invalid_exp_month() {\n let response = CONNECTOR\n .make_payment(\n Some(types::PaymentsAuthorizeData {\n payment_method_data: api::PaymentMethodData::Card(api::Card {\n card_exp_month: Secret::new(\"20\".to_string()),\n ..utils::CCardType::default().0\n }),\n ..utils::PaymentAuthorizeType::default().0\n }),\n get_default_payment_info(),\n )\n .await\n .unwrap();\n assert_eq!(\n response.response.unwrap_err().message,\n \"Your card's expiration month is invalid.\".to_string(),\n );\n}",
151
+ "after_code": "async fn should_fail_payment_for_invalid_exp_month() {\n let response = CONNECTOR\n .make_payment(\n Some(types::PaymentsAuthorizeData {\n payment_method_data: PaymentMethodData::Card(Card {\n card_exp_month: Secret::new(\"20\".to_string()),\n ..utils::CCardType::default().0\n }),\n ..utils::PaymentAuthorizeType::default().0\n }),\n get_default_payment_info(),\n )\n .await\n .unwrap();\n assert_eq!(\n response.response.unwrap_err().message,\n \"Your card's expiration month is invalid.\".to_string(),\n );\n}",
152
+ "diff_span": {
153
+ "before": " .make_payment(\n Some(types::PaymentsAuthorizeData {\n payment_method_data: api::PaymentMethodData::Card(api::Card {\n card_exp_month: Secret::new(\"20\".to_string()),\n ..utils::CCardType::default().0",
154
+ "after": " .make_payment(\n Some(types::PaymentsAuthorizeData {\n payment_method_data: PaymentMethodData::Card(Card {\n card_exp_month: Secret::new(\"20\".to_string()),\n ..utils::CCardType::default().0"
155
+ },
156
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc",
157
+ "before_imports": [
158
+ "use masking::Secret;"
159
+ ],
160
+ "after_imports": [
161
+ "use masking::Secret;",
162
+ "use hyperswitch_domain_models::payment_method_data::{Card, PaymentMethodData};"
163
+ ]
164
+ },
165
+ {
166
+ "id": "connector-template/test.rs::function::should_fail_payment_for_incorrect_cvc",
167
+ "file": "connector-template/test.rs",
168
+ "kind": "function_item",
169
+ "status": "modified",
170
+ "code_changed": true,
171
+ "imports_changed": true,
172
+ "before_code": "async fn should_fail_payment_for_incorrect_cvc() {\n let response = CONNECTOR\n .make_payment(\n Some(types::PaymentsAuthorizeData {\n payment_method_data: types::api::PaymentMethodData::Card(api::Card {\n card_cvc: Secret::new(\"12345\".to_string()),\n ..utils::CCardType::default().0\n }),\n ..utils::PaymentAuthorizeType::default().0\n }),\n get_default_payment_info(),\n )\n .await\n .unwrap();\n assert_eq!(\n response.response.unwrap_err().message,\n \"Your card's security code is invalid.\".to_string(),\n );\n}",
173
+ "after_code": "async fn should_fail_payment_for_incorrect_cvc() {\n let response = CONNECTOR\n .make_payment(\n Some(types::PaymentsAuthorizeData {\n payment_method_data: PaymentMethodData::Card(Card {\n card_cvc: Secret::new(\"12345\".to_string()),\n ..utils::CCardType::default().0\n }),\n ..utils::PaymentAuthorizeType::default().0\n }),\n get_default_payment_info(),\n )\n .await\n .unwrap();\n assert_eq!(\n response.response.unwrap_err().message,\n \"Your card's security code is invalid.\".to_string(),\n );\n}",
174
+ "diff_span": {
175
+ "before": " .make_payment(\n Some(types::PaymentsAuthorizeData {\n payment_method_data: types::api::PaymentMethodData::Card(api::Card {\n card_cvc: Secret::new(\"12345\".to_string()),\n ..utils::CCardType::default().0",
176
+ "after": " .make_payment(\n Some(types::PaymentsAuthorizeData {\n payment_method_data: PaymentMethodData::Card(Card {\n card_cvc: Secret::new(\"12345\".to_string()),\n ..utils::CCardType::default().0"
177
+ },
178
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc",
179
+ "before_imports": [
180
+ "use masking::Secret;"
181
+ ],
182
+ "after_imports": [
183
+ "use masking::Secret;",
184
+ "use hyperswitch_domain_models::payment_method_data::{Card, PaymentMethodData};"
185
+ ]
186
+ },
187
+ {
188
+ "id": "connector-template/transformers.rs::RouterData<F, T, PaymentsResponseData>::function::try_from",
189
+ "file": "connector-template/transformers.rs",
190
+ "kind": "function_item",
191
+ "status": "modified",
192
+ "code_changed": false,
193
+ "imports_changed": true,
194
+ "before_code": "fn try_from(item: ResponseRouterData<F, {{project-name | downcase | pascal_case}}PaymentsResponse, T, PaymentsResponseData>) -> Result<Self,Self::Error> {\n Ok(Self {\n status: common_enums::AttemptStatus::from(item.response.status),\n response: Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(item.response.id),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: None,\n incremental_authorization_allowed: None,\n charges: None,\n }),\n ..item.data\n })\n }",
195
+ "after_code": "fn try_from(item: ResponseRouterData<F, {{project-name | downcase | pascal_case}}PaymentsResponse, T, PaymentsResponseData>) -> Result<Self,Self::Error> {\n Ok(Self {\n status: common_enums::AttemptStatus::from(item.response.status),\n response: Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(item.response.id),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: None,\n incremental_authorization_allowed: None,\n charges: None,\n }),\n ..item.data\n })\n }",
196
+ "diff_span": {
197
+ "before": "",
198
+ "after": ""
199
+ },
200
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc",
201
+ "before_imports": [
202
+ "use common_enums::enums;",
203
+ "use hyperswitch_domain_models::{\n payment_method_data::PaymentMethodData,\n router_data::{ConnectorAuthType, RouterData},\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::ResponseId,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n types::{PaymentsAuthorizeRouterData, RefundsRouterData},\n};"
204
+ ],
205
+ "after_imports": [
206
+ "use common_enums::enums;",
207
+ "use crate::types::{RefundsResponseRouterData, ResponseRouterData};",
208
+ "use hyperswitch_domain_models::{\n payment_method_data::PaymentMethodData,\n router_data::{ConnectorAuthType, RouterData},\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::ResponseId,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n types::{PaymentsAuthorizeRouterData, RefundsRouterData},\n};"
209
+ ]
210
+ },
211
+ {
212
+ "id": "connector-template/transformers.rs::impl::RouterData<F, T, PaymentsResponseData>",
213
+ "file": "connector-template/transformers.rs",
214
+ "kind": "impl_item",
215
+ "status": "modified",
216
+ "code_changed": false,
217
+ "imports_changed": true,
218
+ "before_code": "impl<F,T> TryFrom<ResponseRouterData<F, {{project-name | downcase | pascal_case}}PaymentsResponse, T, PaymentsResponseData>> for RouterData<F, T, PaymentsResponseData> {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: ResponseRouterData<F, {{project-name | downcase | pascal_case}}PaymentsResponse, T, PaymentsResponseData>) -> Result<Self,Self::Error> {\n Ok(Self {\n status: common_enums::AttemptStatus::from(item.response.status),\n response: Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(item.response.id),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: None,\n incremental_authorization_allowed: None,\n charges: None,\n }),\n ..item.data\n })\n }\n}",
219
+ "after_code": "impl<F,T> TryFrom<ResponseRouterData<F, {{project-name | downcase | pascal_case}}PaymentsResponse, T, PaymentsResponseData>> for RouterData<F, T, PaymentsResponseData> {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: ResponseRouterData<F, {{project-name | downcase | pascal_case}}PaymentsResponse, T, PaymentsResponseData>) -> Result<Self,Self::Error> {\n Ok(Self {\n status: common_enums::AttemptStatus::from(item.response.status),\n response: Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(item.response.id),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: None,\n incremental_authorization_allowed: None,\n charges: None,\n }),\n ..item.data\n })\n }\n}",
220
+ "diff_span": {
221
+ "before": "",
222
+ "after": ""
223
+ },
224
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc",
225
+ "before_imports": [
226
+ "use common_enums::enums;",
227
+ "use hyperswitch_interfaces::errors;",
228
+ "use hyperswitch_domain_models::{\n payment_method_data::PaymentMethodData,\n router_data::{ConnectorAuthType, RouterData},\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::ResponseId,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n types::{PaymentsAuthorizeRouterData, RefundsRouterData},\n};"
229
+ ],
230
+ "after_imports": [
231
+ "use common_enums::enums;",
232
+ "use hyperswitch_interfaces::errors;",
233
+ "use crate::types::{RefundsResponseRouterData, ResponseRouterData};",
234
+ "use hyperswitch_domain_models::{\n payment_method_data::PaymentMethodData,\n router_data::{ConnectorAuthType, RouterData},\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::ResponseId,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n types::{PaymentsAuthorizeRouterData, RefundsRouterData},\n};"
235
+ ]
236
+ },
237
+ {
238
+ "id": "connector-template/test.rs::function::should_fail_payment_for_incorrect_expiry_year",
239
+ "file": "connector-template/test.rs",
240
+ "kind": "function_item",
241
+ "status": "modified",
242
+ "code_changed": true,
243
+ "imports_changed": true,
244
+ "before_code": "async fn should_fail_payment_for_incorrect_expiry_year() {\n let response = CONNECTOR\n .make_payment(\n Some(types::PaymentsAuthorizeData {\n payment_method_data: api::PaymentMethodData::Card(api::Card {\n card_exp_year: Secret::new(\"2000\".to_string()),\n ..utils::CCardType::default().0\n }),\n ..utils::PaymentAuthorizeType::default().0\n }),\n get_default_payment_info(),\n )\n .await\n .unwrap();\n assert_eq!(\n response.response.unwrap_err().message,\n \"Your card's expiration year is invalid.\".to_string(),\n );\n}",
245
+ "after_code": "async fn should_fail_payment_for_incorrect_expiry_year() {\n let response = CONNECTOR\n .make_payment(\n Some(types::PaymentsAuthorizeData {\n payment_method_data: PaymentMethodData::Card(Card {\n card_exp_year: Secret::new(\"2000\".to_string()),\n ..utils::CCardType::default().0\n }),\n ..utils::PaymentAuthorizeType::default().0\n }),\n get_default_payment_info(),\n )\n .await\n .unwrap();\n assert_eq!(\n response.response.unwrap_err().message,\n \"Your card's expiration year is invalid.\".to_string(),\n );\n}",
246
+ "diff_span": {
247
+ "before": " .make_payment(\n Some(types::PaymentsAuthorizeData {\n payment_method_data: api::PaymentMethodData::Card(api::Card {\n card_exp_year: Secret::new(\"2000\".to_string()),\n ..utils::CCardType::default().0",
248
+ "after": " .make_payment(\n Some(types::PaymentsAuthorizeData {\n payment_method_data: PaymentMethodData::Card(Card {\n card_exp_year: Secret::new(\"2000\".to_string()),\n ..utils::CCardType::default().0"
249
+ },
250
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc",
251
+ "before_imports": [
252
+ "use masking::Secret;"
253
+ ],
254
+ "after_imports": [
255
+ "use masking::Secret;",
256
+ "use hyperswitch_domain_models::payment_method_data::{Card, PaymentMethodData};"
257
+ ]
258
+ },
259
+ {
260
+ "id": "connector-template/transformers.rs::RefundsRouterData<Execute>::function::try_from",
261
+ "file": "connector-template/transformers.rs",
262
+ "kind": "function_item",
263
+ "status": "modified",
264
+ "code_changed": false,
265
+ "imports_changed": true,
266
+ "before_code": "fn try_from(\n item: RefundsResponseRouterData<Execute, RefundResponse>,\n ) -> Result<Self, Self::Error> {\n Ok(Self {\n response: Ok(RefundsResponseData {\n connector_refund_id: item.response.id.to_string(),\n refund_status: enums::RefundStatus::from(item.response.status),\n }),\n ..item.data\n })\n }",
267
+ "after_code": "fn try_from(\n item: RefundsResponseRouterData<Execute, RefundResponse>,\n ) -> Result<Self, Self::Error> {\n Ok(Self {\n response: Ok(RefundsResponseData {\n connector_refund_id: item.response.id.to_string(),\n refund_status: enums::RefundStatus::from(item.response.status),\n }),\n ..item.data\n })\n }",
268
+ "diff_span": {
269
+ "before": "",
270
+ "after": ""
271
+ },
272
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc",
273
+ "before_imports": [
274
+ "use common_enums::enums;",
275
+ "use hyperswitch_domain_models::{\n payment_method_data::PaymentMethodData,\n router_data::{ConnectorAuthType, RouterData},\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::ResponseId,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n types::{PaymentsAuthorizeRouterData, RefundsRouterData},\n};"
276
+ ],
277
+ "after_imports": [
278
+ "use common_enums::enums;",
279
+ "use crate::types::{RefundsResponseRouterData, ResponseRouterData};",
280
+ "use hyperswitch_domain_models::{\n payment_method_data::PaymentMethodData,\n router_data::{ConnectorAuthType, RouterData},\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::ResponseId,\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n types::{PaymentsAuthorizeRouterData, RefundsRouterData},\n};"
281
+ ]
282
+ },
283
+ {
284
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::impl::common_enums::AttemptStatus",
285
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
286
+ "kind": "impl_item",
287
+ "status": "added",
288
+ "before_code": null,
289
+ "after_code": "impl From<DummyconnPaymentStatus> for common_enums::AttemptStatus {\n fn from(item: DummyconnPaymentStatus) -> Self {\n match item {\n DummyconnPaymentStatus::Succeeded => Self::Charged,\n DummyconnPaymentStatus::Failed => Self::Failure,\n DummyconnPaymentStatus::Processing => Self::Authorizing,\n }\n }\n}",
290
+ "diff_span": null,
291
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
292
+ },
293
+ {
294
+ "id": "connector-template/mod.rs::function::validate_mandate_payment",
295
+ "file": "connector-template/mod.rs",
296
+ "kind": "function_item",
297
+ "status": "added",
298
+ "before_code": null,
299
+ "after_code": "fn validate_mandate_payment(\n &self,\n _pm_type: Option<enums::PaymentMethodType>,\n pm_data: PaymentMethodData,\n ) -> CustomResult<(), errors::ConnectorError> {\n match pm_data {\n PaymentMethodData::Card(_) => Err(errors::ConnectorError::NotImplemented(\n \"validate_mandate_payment does not support cards\".to_string(),\n )\n .into()),\n _ => Ok(()),\n }\n }",
300
+ "diff_span": null,
301
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
302
+ },
303
+ {
304
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::DummyconnAuthType::function::try_from",
305
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
306
+ "kind": "function_item",
307
+ "status": "added",
308
+ "before_code": null,
309
+ "after_code": "fn try_from(auth_type: &ConnectorAuthType) -> Result<Self, Self::Error> {\n match auth_type {\n ConnectorAuthType::HeaderKey { api_key } => Ok(Self {\n api_key: api_key.to_owned(),\n }),\n _ => Err(errors::ConnectorError::FailedToObtainAuthType.into()),\n }\n }",
310
+ "diff_span": null,
311
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
312
+ },
313
+ {
314
+ "id": "connector-template/mod.rs::function::get_supported_payment_methods",
315
+ "file": "connector-template/mod.rs",
316
+ "kind": "function_item",
317
+ "status": "added",
318
+ "before_code": null,
319
+ "after_code": "fn get_supported_payment_methods(&self) -> Option<&'static SupportedPaymentMethods> {\n Some(&*{{project-name | upcase}}_SUPPORTED_PAYMENT_METHODS)\n }",
320
+ "diff_span": null,
321
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
322
+ },
323
+ {
324
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::struct::RefundResponse",
325
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
326
+ "kind": "struct_item",
327
+ "status": "added",
328
+ "before_code": null,
329
+ "after_code": "pub struct RefundResponse {\n id: String,\n status: RefundStatus\n}",
330
+ "diff_span": null,
331
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
332
+ },
333
+ {
334
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::RefundsRouterData<Execute>::type::Error",
335
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
336
+ "kind": "type_item",
337
+ "status": "added",
338
+ "before_code": null,
339
+ "after_code": "type Error = error_stack::Report<errors::ConnectorError>;",
340
+ "diff_span": null,
341
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
342
+ },
343
+ {
344
+ "id": "connector-template/mod.rs::function::get_supported_webhook_flows",
345
+ "file": "connector-template/mod.rs",
346
+ "kind": "function_item",
347
+ "status": "added",
348
+ "before_code": null,
349
+ "after_code": "fn get_supported_webhook_flows(&self) -> Option<&'static [enums::EventClass]> {\n Some(&{{project-name | upcase}}_SUPPORTED_WEBHOOK_FLOWS)\n }",
350
+ "diff_span": null,
351
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
352
+ },
353
+ {
354
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::DummyconnRefundRequest::type::Error",
355
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
356
+ "kind": "type_item",
357
+ "status": "added",
358
+ "before_code": null,
359
+ "after_code": "type Error = error_stack::Report<errors::ConnectorError>;",
360
+ "diff_span": null,
361
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
362
+ },
363
+ {
364
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::RefundsRouterData<Execute>::function::try_from",
365
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
366
+ "kind": "function_item",
367
+ "status": "added",
368
+ "before_code": null,
369
+ "after_code": "fn try_from(\n item: RefundsResponseRouterData<Execute, RefundResponse>,\n ) -> Result<Self, Self::Error> {\n Ok(Self {\n response: Ok(RefundsResponseData {\n connector_refund_id: item.response.id.to_string(),\n refund_status: enums::RefundStatus::from(item.response.status),\n }),\n ..item.data\n })\n }",
370
+ "diff_span": null,
371
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
372
+ },
373
+ {
374
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::enum::DummyconnPaymentStatus",
375
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
376
+ "kind": "enum_item",
377
+ "status": "added",
378
+ "before_code": null,
379
+ "after_code": "pub enum DummyconnPaymentStatus {\n Succeeded,\n Failed,\n #[default]\n Processing,\n}",
380
+ "diff_span": null,
381
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
382
+ },
383
+ {
384
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::RouterData<F, T, PaymentsResponseData>::function::try_from",
385
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
386
+ "kind": "function_item",
387
+ "status": "added",
388
+ "before_code": null,
389
+ "after_code": "fn try_from(item: ResponseRouterData<F, DummyconnPaymentsResponse, T, PaymentsResponseData>) -> Result<Self,Self::Error> {\n Ok(Self {\n status: common_enums::AttemptStatus::from(item.response.status),\n response: Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(item.response.id),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: None,\n incremental_authorization_allowed: None,\n charges: None,\n }),\n ..item.data\n })\n }",
390
+ "diff_span": null,
391
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
392
+ },
393
+ {
394
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::enums::RefundStatus::function::from",
395
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
396
+ "kind": "function_item",
397
+ "status": "added",
398
+ "before_code": null,
399
+ "after_code": "fn from(item: RefundStatus) -> Self {\n match item {\n RefundStatus::Succeeded => Self::Success,\n RefundStatus::Failed => Self::Failure,\n RefundStatus::Processing => Self::Pending,\n //TODO: Review mapping\n }\n }",
400
+ "diff_span": null,
401
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
402
+ },
403
+ {
404
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::impl::enums::RefundStatus",
405
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
406
+ "kind": "impl_item",
407
+ "status": "added",
408
+ "before_code": null,
409
+ "after_code": "impl From<RefundStatus> for enums::RefundStatus {\n fn from(item: RefundStatus) -> Self {\n match item {\n RefundStatus::Succeeded => Self::Success,\n RefundStatus::Failed => Self::Failure,\n RefundStatus::Processing => Self::Pending,\n //TODO: Review mapping\n }\n }\n}",
410
+ "diff_span": null,
411
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
412
+ },
413
+ {
414
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::common_enums::AttemptStatus::function::from",
415
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
416
+ "kind": "function_item",
417
+ "status": "added",
418
+ "before_code": null,
419
+ "after_code": "fn from(item: DummyconnPaymentStatus) -> Self {\n match item {\n DummyconnPaymentStatus::Succeeded => Self::Charged,\n DummyconnPaymentStatus::Failed => Self::Failure,\n DummyconnPaymentStatus::Processing => Self::Authorizing,\n }\n }",
420
+ "diff_span": null,
421
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
422
+ },
423
+ {
424
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::struct::DummyconnRefundRequest",
425
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
426
+ "kind": "struct_item",
427
+ "status": "added",
428
+ "before_code": null,
429
+ "after_code": "pub struct DummyconnRefundRequest {\n pub amount: StringMinorUnit\n}",
430
+ "diff_span": null,
431
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
432
+ },
433
+ {
434
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::RefundsRouterData<RSync>::type::Error",
435
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
436
+ "kind": "type_item",
437
+ "status": "added",
438
+ "before_code": null,
439
+ "after_code": "type Error = error_stack::Report<errors::ConnectorError>;",
440
+ "diff_span": null,
441
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
442
+ },
443
+ {
444
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::DummyconnRouterData<T>::function::from",
445
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
446
+ "kind": "function_item",
447
+ "status": "added",
448
+ "before_code": null,
449
+ "after_code": "fn from(\n (amount, item): (\n StringMinorUnit,\n T,\n ),\n ) -> Self {\n //Todo : use utils to convert the amount to the type of amount that a connector accepts\n Self {\n amount,\n router_data: item,\n }\n }",
450
+ "diff_span": null,
451
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
452
+ },
453
+ {
454
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::struct::DummyconnAuthType",
455
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
456
+ "kind": "struct_item",
457
+ "status": "added",
458
+ "before_code": null,
459
+ "after_code": "pub struct DummyconnAuthType {\n pub(super) api_key: Secret<String>\n}",
460
+ "diff_span": null,
461
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
462
+ },
463
+ {
464
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::struct::DummyconnCard",
465
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
466
+ "kind": "struct_item",
467
+ "status": "added",
468
+ "before_code": null,
469
+ "after_code": "pub struct DummyconnCard {\n number: cards::CardNumber,\n expiry_month: Secret<String>,\n expiry_year: Secret<String>,\n cvc: Secret<String>,\n complete: bool,\n}",
470
+ "diff_span": null,
471
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
472
+ },
473
+ {
474
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::struct::DummyconnRouterData",
475
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
476
+ "kind": "struct_item",
477
+ "status": "added",
478
+ "before_code": null,
479
+ "after_code": "pub struct DummyconnRouterData<T> {\n pub amount: StringMinorUnit, // The type of amount that a connector accepts, for example, String, i64, f64, etc.\n pub router_data: T,\n}",
480
+ "diff_span": null,
481
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
482
+ },
483
+ {
484
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::DummyconnPaymentsRequest::function::try_from",
485
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
486
+ "kind": "function_item",
487
+ "status": "added",
488
+ "before_code": null,
489
+ "after_code": "fn try_from(item: &DummyconnRouterData<&PaymentsAuthorizeRouterData>) -> Result<Self,Self::Error> {\n match item.router_data.request.payment_method_data.clone() {\n PaymentMethodData::Card(_) => {\n Err(errors::ConnectorError::NotImplemented(\"Card payment method not implemented\".to_string()).into())\n },\n _ => Err(errors::ConnectorError::NotImplemented(\"Payment method\".to_string()).into()),\n }\n \n }",
490
+ "diff_span": null,
491
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
492
+ },
493
+ {
494
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::DummyconnAuthType::type::Error",
495
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
496
+ "kind": "type_item",
497
+ "status": "added",
498
+ "before_code": null,
499
+ "after_code": "type Error = error_stack::Report<errors::ConnectorError>;",
500
+ "diff_span": null,
501
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
502
+ },
503
+ {
504
+ "id": "connector-template/mod.rs::function::validate_psync_reference_id",
505
+ "file": "connector-template/mod.rs",
506
+ "kind": "function_item",
507
+ "status": "added",
508
+ "before_code": null,
509
+ "after_code": "fn validate_psync_reference_id(\n &self,\n _data: &PaymentsSyncData,\n _is_three_ds: bool,\n _status: enums::AttemptStatus,\n _connector_meta_data: Option<common_utils::pii::SecretSerdeValue>,\n ) -> CustomResult<(), errors::ConnectorError> {\n Ok(())\n }",
510
+ "diff_span": null,
511
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
512
+ },
513
+ {
514
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::DummyconnRefundRequest::function::try_from",
515
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
516
+ "kind": "function_item",
517
+ "status": "added",
518
+ "before_code": null,
519
+ "after_code": "fn try_from(item: &DummyconnRouterData<&RefundsRouterData<F>>) -> Result<Self,Self::Error> {\n Ok(Self {\n amount: item.amount.to_owned(),\n })\n }",
520
+ "diff_span": null,
521
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
522
+ },
523
+ {
524
+ "id": "connector-template/mod.rs::function::get_connector_about",
525
+ "file": "connector-template/mod.rs",
526
+ "kind": "function_item",
527
+ "status": "added",
528
+ "before_code": null,
529
+ "after_code": "fn get_connector_about(&self) -> Option<&'static ConnectorInfo> {\n Some(&{{project-name | upcase}}_CONNECTOR_INFO)\n }",
530
+ "diff_span": null,
531
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
532
+ },
533
+ {
534
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::impl::RouterData<F, T, PaymentsResponseData>",
535
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
536
+ "kind": "impl_item",
537
+ "status": "added",
538
+ "before_code": null,
539
+ "after_code": "impl<F,T> TryFrom<ResponseRouterData<F, DummyconnPaymentsResponse, T, PaymentsResponseData>> for RouterData<F, T, PaymentsResponseData> {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: ResponseRouterData<F, DummyconnPaymentsResponse, T, PaymentsResponseData>) -> Result<Self,Self::Error> {\n Ok(Self {\n status: common_enums::AttemptStatus::from(item.response.status),\n response: Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(item.response.id),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: None,\n incremental_authorization_allowed: None,\n charges: None,\n }),\n ..item.data\n })\n }\n}",
540
+ "diff_span": null,
541
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
542
+ },
543
+ {
544
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::impl::DummyconnRefundRequest",
545
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
546
+ "kind": "impl_item",
547
+ "status": "added",
548
+ "before_code": null,
549
+ "after_code": "impl<F> TryFrom<&DummyconnRouterData<&RefundsRouterData<F>>> for DummyconnRefundRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: &DummyconnRouterData<&RefundsRouterData<F>>) -> Result<Self,Self::Error> {\n Ok(Self {\n amount: item.amount.to_owned(),\n })\n }\n}",
550
+ "diff_span": null,
551
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
552
+ },
553
+ {
554
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::RouterData<F, T, PaymentsResponseData>::type::Error",
555
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
556
+ "kind": "type_item",
557
+ "status": "added",
558
+ "before_code": null,
559
+ "after_code": "type Error = error_stack::Report<errors::ConnectorError>;",
560
+ "diff_span": null,
561
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
562
+ },
563
+ {
564
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::impl::DummyconnAuthType",
565
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
566
+ "kind": "impl_item",
567
+ "status": "added",
568
+ "before_code": null,
569
+ "after_code": "impl TryFrom<&ConnectorAuthType> for DummyconnAuthType {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(auth_type: &ConnectorAuthType) -> Result<Self, Self::Error> {\n match auth_type {\n ConnectorAuthType::HeaderKey { api_key } => Ok(Self {\n api_key: api_key.to_owned(),\n }),\n _ => Err(errors::ConnectorError::FailedToObtainAuthType.into()),\n }\n }\n}",
570
+ "diff_span": null,
571
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
572
+ },
573
+ {
574
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::impl::DummyconnRouterData<T>",
575
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
576
+ "kind": "impl_item",
577
+ "status": "added",
578
+ "before_code": null,
579
+ "after_code": "impl<T>\n From<(\n StringMinorUnit,\n T,\n )> for DummyconnRouterData<T>\n{\n fn from(\n (amount, item): (\n StringMinorUnit,\n T,\n ),\n ) -> Self {\n //Todo : use utils to convert the amount to the type of amount that a connector accepts\n Self {\n amount,\n router_data: item,\n }\n }\n}",
580
+ "diff_span": null,
581
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
582
+ },
583
+ {
584
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::DummyconnPaymentsRequest::type::Error",
585
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
586
+ "kind": "type_item",
587
+ "status": "added",
588
+ "before_code": null,
589
+ "after_code": "type Error = error_stack::Report<errors::ConnectorError>;",
590
+ "diff_span": null,
591
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
592
+ },
593
+ {
594
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::struct::DummyconnPaymentsRequest",
595
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
596
+ "kind": "struct_item",
597
+ "status": "added",
598
+ "before_code": null,
599
+ "after_code": "pub struct DummyconnPaymentsRequest {\n amount: StringMinorUnit,\n card: DummyconnCard\n}",
600
+ "diff_span": null,
601
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
602
+ },
603
+ {
604
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::enum::RefundStatus",
605
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
606
+ "kind": "enum_item",
607
+ "status": "added",
608
+ "before_code": null,
609
+ "after_code": "pub enum RefundStatus {\n Succeeded,\n Failed,\n #[default]\n Processing,\n}",
610
+ "diff_span": null,
611
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
612
+ },
613
+ {
614
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::RefundsRouterData<RSync>::function::try_from",
615
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
616
+ "kind": "function_item",
617
+ "status": "added",
618
+ "before_code": null,
619
+ "after_code": "fn try_from(item: RefundsResponseRouterData<RSync, RefundResponse>) -> Result<Self,Self::Error> {\n Ok(Self {\n response: Ok(RefundsResponseData {\n connector_refund_id: item.response.id.to_string(),\n refund_status: enums::RefundStatus::from(item.response.status),\n }),\n ..item.data\n })\n }",
620
+ "diff_span": null,
621
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
622
+ },
623
+ {
624
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::struct::DummyconnErrorResponse",
625
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
626
+ "kind": "struct_item",
627
+ "status": "added",
628
+ "before_code": null,
629
+ "after_code": "pub struct DummyconnErrorResponse {\n pub status_code: u16,\n pub code: String,\n pub message: String,\n pub reason: Option<String>,\n pub network_advice_code: Option<String>,\n pub network_decline_code: Option<String>,\n pub network_error_message: Option<String>,\n}",
630
+ "diff_span": null,
631
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
632
+ },
633
+ {
634
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::impl::RefundsRouterData<RSync>",
635
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
636
+ "kind": "impl_item",
637
+ "status": "added",
638
+ "before_code": null,
639
+ "after_code": "impl TryFrom<RefundsResponseRouterData<RSync, RefundResponse>> for RefundsRouterData<RSync>\n{\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: RefundsResponseRouterData<RSync, RefundResponse>) -> Result<Self,Self::Error> {\n Ok(Self {\n response: Ok(RefundsResponseData {\n connector_refund_id: item.response.id.to_string(),\n refund_status: enums::RefundStatus::from(item.response.status),\n }),\n ..item.data\n })\n }\n }",
640
+ "diff_span": null,
641
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
642
+ },
643
+ {
644
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::impl::RefundsRouterData<Execute>",
645
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
646
+ "kind": "impl_item",
647
+ "status": "added",
648
+ "before_code": null,
649
+ "after_code": "impl TryFrom<RefundsResponseRouterData<Execute, RefundResponse>>\n for RefundsRouterData<Execute>\n{\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(\n item: RefundsResponseRouterData<Execute, RefundResponse>,\n ) -> Result<Self, Self::Error> {\n Ok(Self {\n response: Ok(RefundsResponseData {\n connector_refund_id: item.response.id.to_string(),\n refund_status: enums::RefundStatus::from(item.response.status),\n }),\n ..item.data\n })\n }\n}",
650
+ "diff_span": null,
651
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
652
+ },
653
+ {
654
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::struct::DummyconnPaymentsResponse",
655
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
656
+ "kind": "struct_item",
657
+ "status": "added",
658
+ "before_code": null,
659
+ "after_code": "pub struct DummyconnPaymentsResponse {\n status: DummyconnPaymentStatus,\n id: String,\n}",
660
+ "diff_span": null,
661
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
662
+ },
663
+ {
664
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::impl::DummyconnPaymentsRequest",
665
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
666
+ "kind": "impl_item",
667
+ "status": "added",
668
+ "before_code": null,
669
+ "after_code": "impl TryFrom<&DummyconnRouterData<&PaymentsAuthorizeRouterData>> for DummyconnPaymentsRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: &DummyconnRouterData<&PaymentsAuthorizeRouterData>) -> Result<Self,Self::Error> {\n match item.router_data.request.payment_method_data.clone() {\n PaymentMethodData::Card(_) => {\n Err(errors::ConnectorError::NotImplemented(\"Card payment method not implemented\".to_string()).into())\n },\n _ => Err(errors::ConnectorError::NotImplemented(\"Payment method\".to_string()).into()),\n }\n \n }\n}",
670
+ "diff_span": null,
671
+ "commit_sha": "0095cc52a70485b7cc6c9041ffc6eb7a7b0eb6fc"
672
+ }
673
+ ]
674
+ }
diffs/pr_8213/5f8ceb1/diff.json ADDED
@@ -0,0 +1,350 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38",
3
+ "pr_number": 8213,
4
+ "rust_files": [
5
+ "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
6
+ "crates/hyperswitch_connectors/src/default_implementations.rs"
7
+ ],
8
+ "diffs": [
9
+ {
10
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::impl::common_enums::AttemptStatus",
11
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
12
+ "kind": "impl_item",
13
+ "status": "removed",
14
+ "before_code": "impl From<DummyconnPaymentStatus> for common_enums::AttemptStatus {\n fn from(item: DummyconnPaymentStatus) -> Self {\n match item {\n DummyconnPaymentStatus::Succeeded => Self::Charged,\n DummyconnPaymentStatus::Failed => Self::Failure,\n DummyconnPaymentStatus::Processing => Self::Authorizing,\n }\n }\n}",
15
+ "after_code": null,
16
+ "diff_span": null,
17
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
18
+ },
19
+ {
20
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::DummyconnAuthType::function::try_from",
21
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
22
+ "kind": "function_item",
23
+ "status": "removed",
24
+ "before_code": "fn try_from(auth_type: &ConnectorAuthType) -> Result<Self, Self::Error> {\n match auth_type {\n ConnectorAuthType::HeaderKey { api_key } => Ok(Self {\n api_key: api_key.to_owned(),\n }),\n _ => Err(errors::ConnectorError::FailedToObtainAuthType.into()),\n }\n }",
25
+ "after_code": null,
26
+ "diff_span": null,
27
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
28
+ },
29
+ {
30
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::struct::RefundResponse",
31
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
32
+ "kind": "struct_item",
33
+ "status": "removed",
34
+ "before_code": "pub struct RefundResponse {\n id: String,\n status: RefundStatus\n}",
35
+ "after_code": null,
36
+ "diff_span": null,
37
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
38
+ },
39
+ {
40
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::RefundsRouterData<Execute>::type::Error",
41
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
42
+ "kind": "type_item",
43
+ "status": "removed",
44
+ "before_code": "type Error = error_stack::Report<errors::ConnectorError>;",
45
+ "after_code": null,
46
+ "diff_span": null,
47
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
48
+ },
49
+ {
50
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::DummyconnRefundRequest::type::Error",
51
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
52
+ "kind": "type_item",
53
+ "status": "removed",
54
+ "before_code": "type Error = error_stack::Report<errors::ConnectorError>;",
55
+ "after_code": null,
56
+ "diff_span": null,
57
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
58
+ },
59
+ {
60
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::RefundsRouterData<Execute>::function::try_from",
61
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
62
+ "kind": "function_item",
63
+ "status": "removed",
64
+ "before_code": "fn try_from(\n item: RefundsResponseRouterData<Execute, RefundResponse>,\n ) -> Result<Self, Self::Error> {\n Ok(Self {\n response: Ok(RefundsResponseData {\n connector_refund_id: item.response.id.to_string(),\n refund_status: enums::RefundStatus::from(item.response.status),\n }),\n ..item.data\n })\n }",
65
+ "after_code": null,
66
+ "diff_span": null,
67
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
68
+ },
69
+ {
70
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::enum::DummyconnPaymentStatus",
71
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
72
+ "kind": "enum_item",
73
+ "status": "removed",
74
+ "before_code": "pub enum DummyconnPaymentStatus {\n Succeeded,\n Failed,\n #[default]\n Processing,\n}",
75
+ "after_code": null,
76
+ "diff_span": null,
77
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
78
+ },
79
+ {
80
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::RouterData<F, T, PaymentsResponseData>::function::try_from",
81
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
82
+ "kind": "function_item",
83
+ "status": "removed",
84
+ "before_code": "fn try_from(item: ResponseRouterData<F, DummyconnPaymentsResponse, T, PaymentsResponseData>) -> Result<Self,Self::Error> {\n Ok(Self {\n status: common_enums::AttemptStatus::from(item.response.status),\n response: Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(item.response.id),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: None,\n incremental_authorization_allowed: None,\n charges: None,\n }),\n ..item.data\n })\n }",
85
+ "after_code": null,
86
+ "diff_span": null,
87
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
88
+ },
89
+ {
90
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::enums::RefundStatus::function::from",
91
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
92
+ "kind": "function_item",
93
+ "status": "removed",
94
+ "before_code": "fn from(item: RefundStatus) -> Self {\n match item {\n RefundStatus::Succeeded => Self::Success,\n RefundStatus::Failed => Self::Failure,\n RefundStatus::Processing => Self::Pending,\n //TODO: Review mapping\n }\n }",
95
+ "after_code": null,
96
+ "diff_span": null,
97
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
98
+ },
99
+ {
100
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::impl::enums::RefundStatus",
101
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
102
+ "kind": "impl_item",
103
+ "status": "removed",
104
+ "before_code": "impl From<RefundStatus> for enums::RefundStatus {\n fn from(item: RefundStatus) -> Self {\n match item {\n RefundStatus::Succeeded => Self::Success,\n RefundStatus::Failed => Self::Failure,\n RefundStatus::Processing => Self::Pending,\n //TODO: Review mapping\n }\n }\n}",
105
+ "after_code": null,
106
+ "diff_span": null,
107
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
108
+ },
109
+ {
110
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::common_enums::AttemptStatus::function::from",
111
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
112
+ "kind": "function_item",
113
+ "status": "removed",
114
+ "before_code": "fn from(item: DummyconnPaymentStatus) -> Self {\n match item {\n DummyconnPaymentStatus::Succeeded => Self::Charged,\n DummyconnPaymentStatus::Failed => Self::Failure,\n DummyconnPaymentStatus::Processing => Self::Authorizing,\n }\n }",
115
+ "after_code": null,
116
+ "diff_span": null,
117
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
118
+ },
119
+ {
120
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::struct::DummyconnRefundRequest",
121
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
122
+ "kind": "struct_item",
123
+ "status": "removed",
124
+ "before_code": "pub struct DummyconnRefundRequest {\n pub amount: StringMinorUnit\n}",
125
+ "after_code": null,
126
+ "diff_span": null,
127
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
128
+ },
129
+ {
130
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::RefundsRouterData<RSync>::type::Error",
131
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
132
+ "kind": "type_item",
133
+ "status": "removed",
134
+ "before_code": "type Error = error_stack::Report<errors::ConnectorError>;",
135
+ "after_code": null,
136
+ "diff_span": null,
137
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
138
+ },
139
+ {
140
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::DummyconnRouterData<T>::function::from",
141
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
142
+ "kind": "function_item",
143
+ "status": "removed",
144
+ "before_code": "fn from(\n (amount, item): (\n StringMinorUnit,\n T,\n ),\n ) -> Self {\n //Todo : use utils to convert the amount to the type of amount that a connector accepts\n Self {\n amount,\n router_data: item,\n }\n }",
145
+ "after_code": null,
146
+ "diff_span": null,
147
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
148
+ },
149
+ {
150
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::struct::DummyconnAuthType",
151
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
152
+ "kind": "struct_item",
153
+ "status": "removed",
154
+ "before_code": "pub struct DummyconnAuthType {\n pub(super) api_key: Secret<String>\n}",
155
+ "after_code": null,
156
+ "diff_span": null,
157
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
158
+ },
159
+ {
160
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::struct::DummyconnCard",
161
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
162
+ "kind": "struct_item",
163
+ "status": "removed",
164
+ "before_code": "pub struct DummyconnCard {\n number: cards::CardNumber,\n expiry_month: Secret<String>,\n expiry_year: Secret<String>,\n cvc: Secret<String>,\n complete: bool,\n}",
165
+ "after_code": null,
166
+ "diff_span": null,
167
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
168
+ },
169
+ {
170
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::struct::DummyconnRouterData",
171
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
172
+ "kind": "struct_item",
173
+ "status": "removed",
174
+ "before_code": "pub struct DummyconnRouterData<T> {\n pub amount: StringMinorUnit, // The type of amount that a connector accepts, for example, String, i64, f64, etc.\n pub router_data: T,\n}",
175
+ "after_code": null,
176
+ "diff_span": null,
177
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
178
+ },
179
+ {
180
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::DummyconnPaymentsRequest::function::try_from",
181
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
182
+ "kind": "function_item",
183
+ "status": "removed",
184
+ "before_code": "fn try_from(item: &DummyconnRouterData<&PaymentsAuthorizeRouterData>) -> Result<Self,Self::Error> {\n match item.router_data.request.payment_method_data.clone() {\n PaymentMethodData::Card(_) => {\n Err(errors::ConnectorError::NotImplemented(\"Card payment method not implemented\".to_string()).into())\n },\n _ => Err(errors::ConnectorError::NotImplemented(\"Payment method\".to_string()).into()),\n }\n \n }",
185
+ "after_code": null,
186
+ "diff_span": null,
187
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
188
+ },
189
+ {
190
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::DummyconnAuthType::type::Error",
191
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
192
+ "kind": "type_item",
193
+ "status": "removed",
194
+ "before_code": "type Error = error_stack::Report<errors::ConnectorError>;",
195
+ "after_code": null,
196
+ "diff_span": null,
197
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
198
+ },
199
+ {
200
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::DummyconnRefundRequest::function::try_from",
201
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
202
+ "kind": "function_item",
203
+ "status": "removed",
204
+ "before_code": "fn try_from(item: &DummyconnRouterData<&RefundsRouterData<F>>) -> Result<Self,Self::Error> {\n Ok(Self {\n amount: item.amount.to_owned(),\n })\n }",
205
+ "after_code": null,
206
+ "diff_span": null,
207
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
208
+ },
209
+ {
210
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::impl::RouterData<F, T, PaymentsResponseData>",
211
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
212
+ "kind": "impl_item",
213
+ "status": "removed",
214
+ "before_code": "impl<F,T> TryFrom<ResponseRouterData<F, DummyconnPaymentsResponse, T, PaymentsResponseData>> for RouterData<F, T, PaymentsResponseData> {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: ResponseRouterData<F, DummyconnPaymentsResponse, T, PaymentsResponseData>) -> Result<Self,Self::Error> {\n Ok(Self {\n status: common_enums::AttemptStatus::from(item.response.status),\n response: Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(item.response.id),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: None,\n incremental_authorization_allowed: None,\n charges: None,\n }),\n ..item.data\n })\n }\n}",
215
+ "after_code": null,
216
+ "diff_span": null,
217
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
218
+ },
219
+ {
220
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::impl::DummyconnRefundRequest",
221
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
222
+ "kind": "impl_item",
223
+ "status": "removed",
224
+ "before_code": "impl<F> TryFrom<&DummyconnRouterData<&RefundsRouterData<F>>> for DummyconnRefundRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: &DummyconnRouterData<&RefundsRouterData<F>>) -> Result<Self,Self::Error> {\n Ok(Self {\n amount: item.amount.to_owned(),\n })\n }\n}",
225
+ "after_code": null,
226
+ "diff_span": null,
227
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
228
+ },
229
+ {
230
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::impl::DummyconnAuthType",
231
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
232
+ "kind": "impl_item",
233
+ "status": "removed",
234
+ "before_code": "impl TryFrom<&ConnectorAuthType> for DummyconnAuthType {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(auth_type: &ConnectorAuthType) -> Result<Self, Self::Error> {\n match auth_type {\n ConnectorAuthType::HeaderKey { api_key } => Ok(Self {\n api_key: api_key.to_owned(),\n }),\n _ => Err(errors::ConnectorError::FailedToObtainAuthType.into()),\n }\n }\n}",
235
+ "after_code": null,
236
+ "diff_span": null,
237
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
238
+ },
239
+ {
240
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::RouterData<F, T, PaymentsResponseData>::type::Error",
241
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
242
+ "kind": "type_item",
243
+ "status": "removed",
244
+ "before_code": "type Error = error_stack::Report<errors::ConnectorError>;",
245
+ "after_code": null,
246
+ "diff_span": null,
247
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
248
+ },
249
+ {
250
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::impl::DummyconnRouterData<T>",
251
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
252
+ "kind": "impl_item",
253
+ "status": "removed",
254
+ "before_code": "impl<T>\n From<(\n StringMinorUnit,\n T,\n )> for DummyconnRouterData<T>\n{\n fn from(\n (amount, item): (\n StringMinorUnit,\n T,\n ),\n ) -> Self {\n //Todo : use utils to convert the amount to the type of amount that a connector accepts\n Self {\n amount,\n router_data: item,\n }\n }\n}",
255
+ "after_code": null,
256
+ "diff_span": null,
257
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
258
+ },
259
+ {
260
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::DummyconnPaymentsRequest::type::Error",
261
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
262
+ "kind": "type_item",
263
+ "status": "removed",
264
+ "before_code": "type Error = error_stack::Report<errors::ConnectorError>;",
265
+ "after_code": null,
266
+ "diff_span": null,
267
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
268
+ },
269
+ {
270
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::struct::DummyconnPaymentsRequest",
271
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
272
+ "kind": "struct_item",
273
+ "status": "removed",
274
+ "before_code": "pub struct DummyconnPaymentsRequest {\n amount: StringMinorUnit,\n card: DummyconnCard\n}",
275
+ "after_code": null,
276
+ "diff_span": null,
277
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
278
+ },
279
+ {
280
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::enum::RefundStatus",
281
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
282
+ "kind": "enum_item",
283
+ "status": "removed",
284
+ "before_code": "pub enum RefundStatus {\n Succeeded,\n Failed,\n #[default]\n Processing,\n}",
285
+ "after_code": null,
286
+ "diff_span": null,
287
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
288
+ },
289
+ {
290
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::RefundsRouterData<RSync>::function::try_from",
291
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
292
+ "kind": "function_item",
293
+ "status": "removed",
294
+ "before_code": "fn try_from(item: RefundsResponseRouterData<RSync, RefundResponse>) -> Result<Self,Self::Error> {\n Ok(Self {\n response: Ok(RefundsResponseData {\n connector_refund_id: item.response.id.to_string(),\n refund_status: enums::RefundStatus::from(item.response.status),\n }),\n ..item.data\n })\n }",
295
+ "after_code": null,
296
+ "diff_span": null,
297
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
298
+ },
299
+ {
300
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::struct::DummyconnErrorResponse",
301
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
302
+ "kind": "struct_item",
303
+ "status": "removed",
304
+ "before_code": "pub struct DummyconnErrorResponse {\n pub status_code: u16,\n pub code: String,\n pub message: String,\n pub reason: Option<String>,\n pub network_advice_code: Option<String>,\n pub network_decline_code: Option<String>,\n pub network_error_message: Option<String>,\n}",
305
+ "after_code": null,
306
+ "diff_span": null,
307
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
308
+ },
309
+ {
310
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::impl::RefundsRouterData<RSync>",
311
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
312
+ "kind": "impl_item",
313
+ "status": "removed",
314
+ "before_code": "impl TryFrom<RefundsResponseRouterData<RSync, RefundResponse>> for RefundsRouterData<RSync>\n{\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: RefundsResponseRouterData<RSync, RefundResponse>) -> Result<Self,Self::Error> {\n Ok(Self {\n response: Ok(RefundsResponseData {\n connector_refund_id: item.response.id.to_string(),\n refund_status: enums::RefundStatus::from(item.response.status),\n }),\n ..item.data\n })\n }\n }",
315
+ "after_code": null,
316
+ "diff_span": null,
317
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
318
+ },
319
+ {
320
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::impl::RefundsRouterData<Execute>",
321
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
322
+ "kind": "impl_item",
323
+ "status": "removed",
324
+ "before_code": "impl TryFrom<RefundsResponseRouterData<Execute, RefundResponse>>\n for RefundsRouterData<Execute>\n{\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(\n item: RefundsResponseRouterData<Execute, RefundResponse>,\n ) -> Result<Self, Self::Error> {\n Ok(Self {\n response: Ok(RefundsResponseData {\n connector_refund_id: item.response.id.to_string(),\n refund_status: enums::RefundStatus::from(item.response.status),\n }),\n ..item.data\n })\n }\n}",
325
+ "after_code": null,
326
+ "diff_span": null,
327
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
328
+ },
329
+ {
330
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::struct::DummyconnPaymentsResponse",
331
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
332
+ "kind": "struct_item",
333
+ "status": "removed",
334
+ "before_code": "pub struct DummyconnPaymentsResponse {\n status: DummyconnPaymentStatus,\n id: String,\n}",
335
+ "after_code": null,
336
+ "diff_span": null,
337
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
338
+ },
339
+ {
340
+ "id": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs::impl::DummyconnPaymentsRequest",
341
+ "file": "crates/hyperswitch_connectors/src/connectors/dummyconn/transformers.rs",
342
+ "kind": "impl_item",
343
+ "status": "removed",
344
+ "before_code": "impl TryFrom<&DummyconnRouterData<&PaymentsAuthorizeRouterData>> for DummyconnPaymentsRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(item: &DummyconnRouterData<&PaymentsAuthorizeRouterData>) -> Result<Self,Self::Error> {\n match item.router_data.request.payment_method_data.clone() {\n PaymentMethodData::Card(_) => {\n Err(errors::ConnectorError::NotImplemented(\"Card payment method not implemented\".to_string()).into())\n },\n _ => Err(errors::ConnectorError::NotImplemented(\"Payment method\".to_string()).into()),\n }\n \n }\n}",
345
+ "after_code": null,
346
+ "diff_span": null,
347
+ "commit_sha": "5f8ceb172410ffc12b09e71ff7b9dcbcf4acdd38"
348
+ }
349
+ ]
350
+ }
diffs/pr_8213/7a8c0ad/diff.json ADDED
@@ -0,0 +1,6 @@
 
 
 
 
 
 
 
1
+ {
2
+ "commit_sha": "7a8c0ad8fc8424ea74fd815f91293de6893dc643",
3
+ "pr_number": 8213,
4
+ "rust_files": [],
5
+ "diffs": []
6
+ }