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

refactor(connector): [Iatapay] refactor authorize flow and fix payment status mapping #2409

Merged
merged 16 commits into from
Jan 25, 2024
Merged

refactor(connector): [Iatapay] refactor authorize flow and fix payment status mapping #2409

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
60a2906
refactor authorize flow and Payment status mapping
prasunna09 Oct 1, 2023
8bf23c1
Merge branch 'main' into refactor-iatapay
prasunna09 Oct 3, 2023
6b047db
merge main
prasunna09 Oct 29, 2023
f9920fc
chore: run formatter
github-actions[bot] Oct 29, 2023
9289539
Merge branch 'main' into refactor-iatapay
prasunna09 Jan 10, 2024
ed287a9
code refactoring
prasunna09 Jan 12, 2024
7ece58b
resolve pr comments
prasunna09 Jan 16, 2024
50994d9
remove comments
prasunna09 Jan 18, 2024
6c9114d
Merge branch 'main' into refactor-iatapay
prasunna09 Jan 18, 2024
a151696
resolve pr comments
prasunna09 Jan 18, 2024
270124f
resolve pr comments
prasunna09 Jan 19, 2024
b075442
handle error response when 2xx failure for refund
prasunna09 Jan 19, 2024
ee60437
update refund wh status
prasunna09 Jan 22, 2024
561407b
fix formatting
prasunna09 Jan 22, 2024
bddeb7c
resolve pr comments
prasunna09 Jan 23, 2024
04014be
resolve pr comments
prasunna09 Jan 24, 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
97 changes: 47 additions & 50 deletions crates/router/src/connector/iatapay.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,15 +369,13 @@ impl ConnectorIntegration<api::PSync, types::PaymentsSyncData, types::PaymentsRe
req: &types::PaymentsSyncRouterData,
connectors: &settings::Connectors,
) -> CustomResult<String, errors::ConnectorError> {
let connector_id = req
.request
.connector_transaction_id
.get_connector_transaction_id()
.change_context(errors::ConnectorError::MissingConnectorTransactionID)?;
let auth: iatapay::IatapayAuthType =
iatapay::IatapayAuthType::try_from(&req.connector_auth_type)?;
let merchant_id = auth.merchant_id.peek();
Ok(format!(
"{}/payments/{}",
"{}/merchants/{merchant_id}/payments/{}",
self.base_url(connectors),
connector_id
req.connector_request_reference_id.clone()
))
}

Expand Down Expand Up @@ -634,56 +632,55 @@ impl api::IncomingWebhook for Iatapay {
&self,
request: &api::IncomingWebhookRequestDetails<'_>,
) -> CustomResult<api_models::webhooks::ObjectReferenceId, errors::ConnectorError> {
let notif: IatapayPaymentsResponse =
request
.body
.parse_struct("IatapayPaymentsResponse")
.change_context(errors::ConnectorError::WebhookReferenceIdNotFound)?;
if notif.iata_payment_id.is_some() {
Ok(api_models::webhooks::ObjectReferenceId::PaymentId(
api_models::payments::PaymentIdType::ConnectorTransactionId(
notif.iata_payment_id.unwrap_or_default(),
),
))
} else {
Ok(api_models::webhooks::ObjectReferenceId::RefundId(
api_models::webhooks::RefundIdType::ConnectorRefundId(
notif.iata_refund_id.unwrap_or_default(),
),
))
let notif: iatapay::IatapayWebhookResponse = request
.body
.parse_struct("IatapayWebhookResponse")
.change_context(errors::ConnectorError::WebhookReferenceIdNotFound)?;
match notif {
iatapay::IatapayWebhookResponse::IatapayPaymentWebhookBody(wh_body) => {
match wh_body.merchant_payment_id {
Some(merchant_payment_id) => {
Ok(api_models::webhooks::ObjectReferenceId::PaymentId(
api_models::payments::PaymentIdType::PaymentAttemptId(
merchant_payment_id,
),
))
}
None => Ok(api_models::webhooks::ObjectReferenceId::PaymentId(
api_models::payments::PaymentIdType::ConnectorTransactionId(
wh_body.iata_payment_id,
),
)),
}
}
iatapay::IatapayWebhookResponse::IatapayRefundWebhookBody(wh_body) => {
match wh_body.merchant_refund_id {
Some(merchant_refund_id) => {
Ok(api_models::webhooks::ObjectReferenceId::PaymentId(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be RefundId not PaymentId

api_models::payments::PaymentIdType::PaymentAttemptId(
merchant_refund_id,
),
))
}
None => Ok(api_models::webhooks::ObjectReferenceId::RefundId(
api_models::webhooks::RefundIdType::ConnectorRefundId(
wh_body.iata_refund_id,
),
)),
}
}
}
}

fn get_webhook_event_type(
&self,
request: &api::IncomingWebhookRequestDetails<'_>,
) -> CustomResult<api::IncomingWebhookEvent, errors::ConnectorError> {
let notif: IatapayPaymentsResponse =
request
.body
.parse_struct("IatapayPaymentsResponse")
.change_context(errors::ConnectorError::WebhookEventTypeNotFound)?;
match notif.status {
iatapay::IatapayPaymentStatus::Authorized => match notif.iata_payment_id.is_some() {
true => Ok(api::IncomingWebhookEvent::PaymentIntentSuccess),
false => Ok(api::IncomingWebhookEvent::RefundSuccess),
},
iatapay::IatapayPaymentStatus::Failed => match notif.iata_payment_id.is_some() {
true => Ok(api::IncomingWebhookEvent::PaymentIntentFailure),
false => Ok(api::IncomingWebhookEvent::RefundFailure),
},
iatapay::IatapayPaymentStatus::Unknown
| iatapay::IatapayPaymentStatus::Created
| iatapay::IatapayPaymentStatus::Initiated
| iatapay::IatapayPaymentStatus::Cleared
| iatapay::IatapayPaymentStatus::Settled
| iatapay::IatapayPaymentStatus::Tobeinvestigated
| iatapay::IatapayPaymentStatus::Blocked
| iatapay::IatapayPaymentStatus::Locked
| iatapay::IatapayPaymentStatus::UnexpectedSettled => {
Ok(api::IncomingWebhookEvent::EventNotSupported)
}
}
let notif: iatapay::IatapayWebhookResponse = request
.body
.parse_struct("IatapayWebhookResponse")
.change_context(errors::ConnectorError::WebhookEventTypeNotFound)?;
api::IncomingWebhookEvent::try_from(notif)
}

fn get_webhook_resource_object(
Expand Down
172 changes: 152 additions & 20 deletions crates/router/src/connector/iatapay/transformers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ use masking::{Secret, SwitchStrategy};
use serde::{Deserialize, Serialize};

use crate::{
connector::utils::{self, PaymentsAuthorizeRequestData, RefundsRequestData, RouterData},
connector::utils::{
self as connector_util, PaymentsAuthorizeRequestData, RefundsRequestData, RouterData,
},
consts,
core::errors,
services,
Expand Down Expand Up @@ -53,7 +55,7 @@ impl<T>
),
) -> Result<Self, Self::Error> {
Ok(Self {
amount: utils::to_currency_base_unit_asf64(_amount, _currency)?,
amount: connector_util::to_currency_base_unit_asf64(_amount, _currency)?,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

_ is used before an unused variable name, if we are consuming or passing it as an argument, it should not start with an _

router_data: item,
})
}
Expand Down Expand Up @@ -136,7 +138,6 @@ impl
let payment_method = item.router_data.payment_method;
let country = match payment_method {
PaymentMethod::Upi => "IN".to_string(),

PaymentMethod::Card
| PaymentMethod::CardRedirect
| PaymentMethod::PayLater
Expand All @@ -154,7 +155,19 @@ impl
api::PaymentMethodData::Upi(upi_data) => upi_data.vpa_id.map(|id| PayerInfo {
token_id: id.switch_strategy(),
}),
_ => None,
api::PaymentMethodData::Card(_)
| api::PaymentMethodData::CardRedirect(_)
| api::PaymentMethodData::Wallet(_)
| api::PaymentMethodData::PayLater(_)
| api::PaymentMethodData::BankRedirect(_)
| api::PaymentMethodData::BankDebit(_)
| api::PaymentMethodData::BankTransfer(_)
| api::PaymentMethodData::Crypto(_)
| api::PaymentMethodData::MandatePayment
| api::PaymentMethodData::Reward
| api::PaymentMethodData::Voucher(_)
| api::PaymentMethodData::GiftCard(_)
| api::PaymentMethodData::CardToken(_) => None,
};
let payload = Self {
merchant_id: IatapayAuthType::try_from(&item.router_data.connector_auth_type)?
Expand Down Expand Up @@ -212,15 +225,9 @@ pub enum IatapayPaymentStatus {
Initiated,
Authorized,
Settled,
Tobeinvestigated,
Blocked,
Cleared,
Failed,
Locked,
#[serde(rename = "UNEXPECTED SETTLED")]
UnexpectedSettled,
#[serde(other)]
Unknown,
}

impl From<IatapayPaymentStatus> for enums::AttemptStatus {
Expand All @@ -230,7 +237,6 @@ impl From<IatapayPaymentStatus> for enums::AttemptStatus {
IatapayPaymentStatus::Failed | IatapayPaymentStatus::UnexpectedSettled => Self::Failure,
IatapayPaymentStatus::Created => Self::AuthenticationPending,
IatapayPaymentStatus::Initiated => Self::Pending,
_ => Self::Voided,
}
}
}
Expand Down Expand Up @@ -276,7 +282,7 @@ fn get_iatpay_response(
errors::ConnectorError,
> {
let status = enums::AttemptStatus::from(response.status);
let error = if status == enums::AttemptStatus::Failure {
let error = if connector_util::is_payment_failure(status) {
Some(types::ErrorResponse {
code: response
.failure_code
Expand Down Expand Up @@ -433,11 +439,31 @@ impl TryFrom<types::RefundsResponseRouterData<api::Execute, RefundResponse>>
fn try_from(
item: types::RefundsResponseRouterData<api::Execute, RefundResponse>,
) -> Result<Self, Self::Error> {
let refund_status = enums::RefundStatus::from(item.response.status);

Ok(Self {
response: Ok(types::RefundsResponseData {
connector_refund_id: item.response.iata_refund_id.to_string(),
refund_status: enums::RefundStatus::from(item.response.status),
}),
response: if connector_util::is_refund_failure(refund_status) {
Err(types::ErrorResponse {
code: item
.response
.failure_code
.unwrap_or_else(|| consts::NO_ERROR_CODE.to_string()),
message: item
.response
.failure_details
.clone()
.unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_string()),
reason: item.response.failure_details,
status_code: item.http_code,
attempt_status: None,
connector_transaction_id: Some(item.response.iata_refund_id.clone()),
})
} else {
Ok(types::RefundsResponseData {
connector_refund_id: item.response.iata_refund_id.to_string(),
refund_status,
})
},
..item.data
})
}
Expand All @@ -450,11 +476,30 @@ impl TryFrom<types::RefundsResponseRouterData<api::RSync, RefundResponse>>
fn try_from(
item: types::RefundsResponseRouterData<api::RSync, RefundResponse>,
) -> Result<Self, Self::Error> {
let refund_status = enums::RefundStatus::from(item.response.status);
Ok(Self {
response: Ok(types::RefundsResponseData {
connector_refund_id: item.response.iata_refund_id.to_string(),
refund_status: enums::RefundStatus::from(item.response.status),
}),
response: if connector_util::is_refund_failure(refund_status) {
Err(types::ErrorResponse {
code: item
.response
.failure_code
.unwrap_or_else(|| consts::NO_ERROR_CODE.to_string()),
message: item
.response
.failure_details
.clone()
.unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_string()),
reason: item.response.failure_details,
status_code: item.http_code,
attempt_status: None,
connector_transaction_id: Some(item.response.iata_refund_id.clone()),
})
} else {
Ok(types::RefundsResponseData {
connector_refund_id: item.response.iata_refund_id.to_string(),
refund_status,
})
},
..item.data
})
}
Expand All @@ -473,3 +518,90 @@ pub struct IatapayAccessTokenErrorResponse {
pub error: String,
pub path: String,
}

#[derive(Debug, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct IatapayPaymentWebhookBody {
pub status: IatapayWebhookStatus,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

incase of payment failure error_message, error_code and error_reason should be captured

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we are already doing this for payments!

pub iata_payment_id: String,
pub merchant_payment_id: Option<String>,
pub failure_code: Option<String>,
pub failure_details: Option<String>,
}

#[derive(Debug, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct IatapayRefundWebhookBody {
pub status: IatapayRefundWebhookStatus,
pub iata_refund_id: String,
pub merchant_refund_id: Option<String>,
pub failure_code: Option<String>,
pub failure_details: Option<String>,
}

#[derive(Debug, Serialize, Deserialize)]
pub enum IatapayWebhookResponse {
IatapayPaymentWebhookBody(IatapayPaymentWebhookBody),
IatapayRefundWebhookBody(IatapayRefundWebhookBody),
}

impl TryFrom<IatapayWebhookResponse> for api::IncomingWebhookEvent {
type Error = error_stack::Report<errors::ConnectorError>;
fn try_from(payload: IatapayWebhookResponse) -> CustomResult<Self, errors::ConnectorError> {
match payload {
IatapayWebhookResponse::IatapayPaymentWebhookBody(wh_body) => match wh_body.status {
IatapayWebhookStatus::Authorized | IatapayWebhookStatus::Settled => {
Ok(Self::PaymentIntentSuccess)
}
IatapayWebhookStatus::Initiated => Ok(Self::PaymentIntentProcessing),
IatapayWebhookStatus::Failed => Ok(Self::PaymentIntentFailure),
IatapayWebhookStatus::Created
| IatapayWebhookStatus::Cleared
| IatapayWebhookStatus::Tobeinvestigated
| IatapayWebhookStatus::Blocked
| IatapayWebhookStatus::UnexpectedSettled
| IatapayWebhookStatus::Unknown => Ok(Self::EventNotSupported),
},
IatapayWebhookResponse::IatapayRefundWebhookBody(wh_body) => match wh_body.status {
IatapayRefundWebhookStatus::Authorized | IatapayRefundWebhookStatus::Settled => {
Ok(Self::RefundSuccess)
}
IatapayRefundWebhookStatus::Failed => Ok(Self::RefundFailure),
IatapayRefundWebhookStatus::Created
| IatapayRefundWebhookStatus::Locked
| IatapayRefundWebhookStatus::Initiated
| IatapayRefundWebhookStatus::Unknown => Ok(Self::EventNotSupported),
},
}
}
}

#[derive(Debug, Serialize, Deserialize)]
#[serde(rename_all = "UPPERCASE")]
pub enum IatapayWebhookStatus {
Created,
Initiated,
Authorized,
Settled,
Cleared,
Failed,
Tobeinvestigated,
Blocked,
#[serde(rename = "UNEXPECTED SETTLED")]
UnexpectedSettled,
#[serde(other)]
Unknown,
}

#[derive(Debug, Serialize, Deserialize)]
#[serde(rename_all = "UPPERCASE")]
pub enum IatapayRefundWebhookStatus {
Created,
Initiated,
Authorized,
Settled,
Failed,
Locked,
#[serde(other)]
Unknown,
}
Loading