Skip to content

Commit 3556b8c

Browse files
committed
Merge branch 'invoice_record_back' of https://github.com/juspay/hyperswitch into invoice_record_back
2 parents c44377e + 47b4bf5 commit 3556b8c

File tree

4 files changed

+20
-38
lines changed

4 files changed

+20
-38
lines changed

crates/hyperswitch_connectors/src/connectors/chargebee.rs

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,29 @@ use common_utils::{
1212
#[cfg(feature = "v1")]
1313
use error_stack::report;
1414
use error_stack::ResultExt;
15-
use hyperswitch_domain_models::{
16-
router_flow_types::revenue_recovery::InvoiceRecordBack,
17-
router_request_types::revenue_recovery::InvoiceRecordBackRequest,
18-
router_response_types::revenue_recovery::InvoiceRecordBackResponse,
19-
types::InvoiceRecordBackRouterData,
20-
};
2115
#[cfg(all(feature = "v2", feature = "revenue_recovery"))]
22-
use hyperswitch_domain_models::{
23-
revenue_recovery
24-
};
16+
use hyperswitch_domain_models::revenue_recovery;
2517
use hyperswitch_domain_models::{
2618
router_data::{AccessToken, ConnectorAuthType, ErrorResponse, RouterData},
2719
router_flow_types::{
2820
access_token_auth::AccessTokenAuth,
2921
payments::{Authorize, Capture, PSync, PaymentMethodToken, Session, SetupMandate, Void},
3022
refunds::{Execute, RSync},
23+
revenue_recovery::InvoiceRecordBack,
3124
},
3225
router_request_types::{
33-
AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,
34-
PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,
35-
RefundsData, SetupMandateRequestData,
26+
revenue_recovery::InvoiceRecordBackRequest, AccessTokenRequestData,
27+
PaymentMethodTokenizationData, PaymentsAuthorizeData, PaymentsCancelData,
28+
PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData, RefundsData,
29+
SetupMandateRequestData,
30+
},
31+
router_response_types::{
32+
revenue_recovery::InvoiceRecordBackResponse, ConnectorInfo, PaymentsResponseData,
33+
RefundsResponseData,
3634
},
37-
router_response_types::{ConnectorInfo, PaymentsResponseData, RefundsResponseData},
3835
types::{
39-
PaymentsAuthorizeRouterData, PaymentsCaptureRouterData, PaymentsSyncRouterData,
40-
RefundSyncRouterData, RefundsRouterData,
36+
InvoiceRecordBackRouterData, PaymentsAuthorizeRouterData, PaymentsCaptureRouterData,
37+
PaymentsSyncRouterData, RefundSyncRouterData, RefundsRouterData,
4138
},
4239
};
4340
use hyperswitch_interfaces::{
@@ -563,13 +560,8 @@ impl ConnectorIntegration<RSync, RefundsData, RefundsResponseData> for Chargebee
563560
}
564561
}
565562

566-
567-
impl
568-
ConnectorIntegration<
569-
InvoiceRecordBack,
570-
InvoiceRecordBackRequest,
571-
InvoiceRecordBackResponse,
572-
> for Chargebee
563+
impl ConnectorIntegration<InvoiceRecordBack, InvoiceRecordBackRequest, InvoiceRecordBackResponse>
564+
for Chargebee
573565
{
574566
fn get_headers(
575567
&self,

crates/hyperswitch_connectors/src/connectors/chargebee/transformers.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ use hyperswitch_domain_models::{
1515
},
1616
router_request_types::{revenue_recovery::InvoiceRecordBackRequest, ResponseId},
1717
router_response_types::{
18-
revenue_recovery::InvoiceRecordBackResponse, PaymentsResponseData,
19-
RefundsResponseData,
18+
revenue_recovery::InvoiceRecordBackResponse, PaymentsResponseData, RefundsResponseData,
2019
},
21-
types::{PaymentsAuthorizeRouterData, RefundsRouterData, InvoiceRecordBackRouterData},
20+
types::{InvoiceRecordBackRouterData, PaymentsAuthorizeRouterData, RefundsRouterData},
2221
};
2322
use hyperswitch_interfaces::errors;
2423
use masking::Secret;
@@ -673,9 +672,7 @@ pub enum ChargebeeRecordStatus {
673672
Failure,
674673
}
675674

676-
impl TryFrom<&ChargebeeRouterData<&InvoiceRecordBackRouterData>>
677-
for ChargebeeRecordPaymentRequest
678-
{
675+
impl TryFrom<&ChargebeeRouterData<&InvoiceRecordBackRouterData>> for ChargebeeRecordPaymentRequest {
679676
type Error = error_stack::Report<errors::ConnectorError>;
680677
fn try_from(
681678
item: &ChargebeeRouterData<&InvoiceRecordBackRouterData>,

crates/hyperswitch_domain_models/src/types.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,8 @@ pub type VerifyWebhookSourceRouterData = RouterData<
114114
#[cfg(feature = "payouts")]
115115
pub type PayoutsRouterData<F> = RouterData<F, PayoutsData, PayoutsResponseData>;
116116

117-
pub type InvoiceRecordBackRouterData = RouterData<
118-
InvoiceRecordBack,
119-
InvoiceRecordBackRequest,
120-
InvoiceRecordBackResponse,
121-
>;
117+
pub type InvoiceRecordBackRouterData =
118+
RouterData<InvoiceRecordBack, InvoiceRecordBackRequest, InvoiceRecordBackResponse>;
122119

123120
pub type UasAuthenticationRouterData =
124121
RouterData<Authenticate, UasAuthenticationRequestData, UasAuthenticationResponseData>;

crates/hyperswitch_interfaces/src/api/revenue_recovery.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,7 @@ pub trait BillingConnectorPaymentsSyncIntegration:
4040

4141
/// trait RevenueRecoveryRecordBack
4242
pub trait RevenueRecoveryRecordBack:
43-
ConnectorIntegration<
44-
InvoiceRecordBack,
45-
InvoiceRecordBackRequest,
46-
InvoiceRecordBackResponse,
47-
>
43+
ConnectorIntegration<InvoiceRecordBack, InvoiceRecordBackRequest, InvoiceRecordBackResponse>
4844
{
4945
}
5046

0 commit comments

Comments
 (0)