Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(connectors): Amount received should be zero for pending and failed status #4331

Merged
merged 5 commits into from
Apr 10, 2024
Merged

fix(connectors): Amount received should be zero for pending and failed status #4331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
698167f
bugfix: amount received should be zero for pending and failed status
Sakilmostak Apr 8, 2024
e6f381f
refactor: merge main
Sakilmostak Apr 8, 2024
dcf556e
refactor: add all the status for check
Sakilmostak Apr 10, 2024
b7bb37e
feat: add test cases
Sakilmostak Apr 10, 2024
95aefc4
refactor: use only storage_enums for match statement
Sakilmostak Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/router/src/connector/adyen/transformers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3950,7 +3950,7 @@ impl TryFrom<types::PaymentsCaptureResponseRouterData<AdyenCaptureResponse>>
connector_response_reference_id: Some(item.response.reference),
incremental_authorization_allowed: None,
}),
amount_captured: Some(item.response.amount.value),
amount_captured: Some(0),
..item.data
})
}
Expand Down
29 changes: 28 additions & 1 deletion crates/router/src/connector/paypal/transformers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1544,8 +1544,35 @@ impl TryFrom<types::PaymentsCaptureResponseRouterData<PaypalCaptureResponse>>
fn try_from(
item: types::PaymentsCaptureResponseRouterData<PaypalCaptureResponse>,
) -> Result<Self, Self::Error> {
let amount_captured = item.data.request.amount_to_capture;
let status = storage_enums::AttemptStatus::from(item.response.status);
let amount_captured = match status {
storage_enums::AttemptStatus::Pending
| storage_enums::AttemptStatus::Authorized
| storage_enums::AttemptStatus::Failure
| storage_enums::AttemptStatus::RouterDeclined
| storage_enums::AttemptStatus::AuthenticationFailed
| storage_enums::AttemptStatus::CaptureFailed
| storage_enums::AttemptStatus::Started
| storage_enums::AttemptStatus::AuthenticationPending
| storage_enums::AttemptStatus::AuthenticationSuccessful
| storage_enums::AttemptStatus::AuthorizationFailed
| storage_enums::AttemptStatus::Authorizing
| storage_enums::AttemptStatus::VoidInitiated
| storage_enums::AttemptStatus::CodInitiated
| storage_enums::AttemptStatus::CaptureInitiated
| storage_enums::AttemptStatus::VoidFailed
| storage_enums::AttemptStatus::AutoRefunded
| storage_enums::AttemptStatus::Unresolved
| storage_enums::AttemptStatus::PaymentMethodAwaited
| storage_enums::AttemptStatus::ConfirmationAwaited
| storage_enums::AttemptStatus::DeviceDataCollectionPending
| storage_enums::AttemptStatus::Voided => 0,
storage_enums::AttemptStatus::Charged
| storage_enums::AttemptStatus::PartialCharged
| storage_enums::AttemptStatus::PartialChargedAndChargeable => {
item.data.request.amount_to_capture
}
};
let connector_payment_id: PaypalMeta =
to_connector_meta(item.data.request.connector_meta.clone())?;
Ok(Self {
Expand Down
6 changes: 3 additions & 3 deletions ...Happy Cases/Scenario4-Create payment with Manual capture/Payments - Capture/event.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@ if (jsonData?.amount) {
);
}

// Response body should have value "6000" for "amount_received"
// Response body should have value "0" for "amount_received"
if (jsonData?.amount_received) {
pm.test(
"[POST]::/payments:id/capture - Content check if value for 'amount_received' matches '6000'",
"[POST]::/payments:id/capture - Content check if value for 'amount_received' matches '0'",
function () {
pm.expect(jsonData.amount_received).to.eql(6000);
pm.expect(jsonData.amount_received).to.eql(0);
},
);
}
10 changes: 10 additions & 0 deletions ...Happy Cases/Scenario4-Create payment with Manual capture/Payments - Capture/event.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,13 @@ if (jsonData?.amount_capturable) {
},
);
}

// Response body should have value "0" for "amount_received"
if (jsonData?.amount_received) {
pm.test(
"[post]:://payments/:id/capture - Content check if value for 'amount_received' matches 0",
function () {
pm.expect(jsonData.amount_received).to.eql(0);
},
);
}
6 changes: 3 additions & 3 deletions postman/collection-json/adyen_uk.postman_collection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2688,12 +2688,12 @@
" );",
"}",
"",
"// Response body should have value \"6000\" for \"amount_received\"",
"// Response body should have value \"0\" for \"amount_received\"",
"if (jsonData?.amount_received) {",
" pm.test(",
" \"[POST]::/payments:id/capture - Content check if value for 'amount_received' matches '6000'\",",
" \"[POST]::/payments:id/capture - Content check if value for 'amount_received' matches '0'\",",
" function () {",
" pm.expect(jsonData.amount_received).to.eql(6000);",
" pm.expect(jsonData.amount_received).to.eql(0);",
" },",
" );",
"}",
Expand Down
10 changes: 10 additions & 0 deletions postman/collection-json/paypal.postman_collection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3506,6 +3506,16 @@
" },",
" );",
"}",
"",
"// Response body should have value \"0\" for \"amount_received\"",
"if (jsonData?.amount_received) {",
" pm.test(",
" \"[post]:://payments/:id/capture - Content check if value for 'amount_received' matches 0\",",
" function () {",
" pm.expect(jsonData.amount_received).to.eql(0);",
" },",
" );",
"}",
""
],
"type": "text/javascript"
Expand Down
Loading