Skip to content

Commit 3e07496

Browse files
prasunna09prasunna09
committed
fix clippy
1 parent 4a6a1a0 commit 3e07496

File tree

9 files changed

+193
-188
lines changed

9 files changed

+193
-188
lines changed

‎crates/router/src/core/payments.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ use common_utils::{
3838
id_type, pii,
3939
types::{AmountConvertor, MinorUnit, Surcharge},
4040
};
41-
use diesel_models::{ephemeral_key, fraud_check::FraudCheck};
41+
use diesel_models::{ephemeral_key, fraud_check::FraudCheck, refund as diesel_refund};
4242
use error_stack::{report, ResultExt};
4343
use events::EventInfo;
4444
use futures::future::join_all;
@@ -5643,7 +5643,7 @@ where
56435643
pub all_keys_required: Option<bool>,
56445644
pub payment_method_data: Option<domain::PaymentMethodData>,
56455645
pub payment_method_info: Option<domain::PaymentMethod>,
5646-
pub refunds: Vec<storage::Refund>,
5646+
pub refunds: Vec<diesel_refund::Refund>,
56475647
pub disputes: Vec<storage::Dispute>,
56485648
pub attempts: Option<Vec<storage::PaymentAttempt>>,
56495649
pub sessions_token: Vec<api::SessionToken>,
@@ -8530,7 +8530,7 @@ pub trait OperationSessionGetters<F> {
85308530
&self,
85318531
) -> Option<&hyperswitch_domain_models::router_request_types::authentication::AuthenticationStore>;
85328532
fn get_frm_message(&self) -> Option<FraudCheck>;
8533-
fn get_refunds(&self) -> Vec<storage::Refund>;
8533+
fn get_refunds(&self) -> Vec<diesel_refund::Refund>;
85348534
fn get_disputes(&self) -> Vec<storage::Dispute>;
85358535
fn get_authorizations(&self) -> Vec<diesel_models::authorization::Authorization>;
85368536
fn get_attempts(&self) -> Option<Vec<storage::PaymentAttempt>>;
@@ -8700,7 +8700,7 @@ impl<F: Clone> OperationSessionGetters<F> for PaymentData<F> {
87008700
self.frm_message.clone()
87018701
}
87028702

8703-
fn get_refunds(&self) -> Vec<storage::Refund> {
8703+
fn get_refunds(&self) -> Vec<diesel_refund::Refund> {
87048704
self.refunds.clone()
87058705
}
87068706

@@ -9001,7 +9001,7 @@ impl<F: Clone> OperationSessionGetters<F> for PaymentIntentData<F> {
90019001
todo!()
90029002
}
90039003

9004-
fn get_refunds(&self) -> Vec<storage::Refund> {
9004+
fn get_refunds(&self) -> Vec<diesel_refund::Refund> {
90059005
todo!()
90069006
}
90079007

@@ -9275,7 +9275,7 @@ impl<F: Clone> OperationSessionGetters<F> for PaymentConfirmData<F> {
92759275
todo!()
92769276
}
92779277

9278-
fn get_refunds(&self) -> Vec<storage::Refund> {
9278+
fn get_refunds(&self) -> Vec<diesel_refund::Refund> {
92799279
todo!()
92809280
}
92819281

@@ -9554,7 +9554,7 @@ impl<F: Clone> OperationSessionGetters<F> for PaymentStatusData<F> {
95549554
todo!()
95559555
}
95569556

9557-
fn get_refunds(&self) -> Vec<storage::Refund> {
9557+
fn get_refunds(&self) -> Vec<diesel_refund::Refund> {
95589558
todo!()
95599559
}
95609560

@@ -9830,7 +9830,7 @@ impl<F: Clone> OperationSessionGetters<F> for PaymentCaptureData<F> {
98309830
todo!()
98319831
}
98329832

9833-
fn get_refunds(&self) -> Vec<storage::Refund> {
9833+
fn get_refunds(&self) -> Vec<diesel_refund::Refund> {
98349834
todo!()
98359835
}
98369836

‎crates/router/src/core/refunds.rs

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use common_utils::{
77
ext_traits::AsyncExt,
88
types::{ConnectorTransactionId, MinorUnit},
99
};
10-
use diesel_models::process_tracker::business_status;
10+
use diesel_models::{process_tracker::business_status, refund as diesel_refund};
1111
use error_stack::{report, ResultExt};
1212
use hyperswitch_domain_models::{
1313
router_data::ErrorResponse, router_request_types::SplitRefundsRequest,
@@ -136,13 +136,13 @@ pub async fn refund_create_core(
136136
#[instrument(skip_all)]
137137
pub async fn trigger_refund_to_gateway(
138138
state: &SessionState,
139-
refund: &storage::Refund,
139+
refund: &diesel_refund::Refund,
140140
merchant_context: &domain::MerchantContext,
141141
payment_attempt: &storage::PaymentAttempt,
142142
payment_intent: &storage::PaymentIntent,
143143
creds_identifier: Option<String>,
144144
split_refunds: Option<SplitRefundsRequest>,
145-
) -> RouterResult<storage::Refund> {
145+
) -> RouterResult<diesel_refund::Refund> {
146146
let routed_through = payment_attempt
147147
.connector
148148
.clone()
@@ -223,7 +223,7 @@ pub async fn trigger_refund_to_gateway(
223223
.err()
224224
.and_then(|error| match error.current_context() {
225225
errors::ConnectorError::NotImplemented(message) => {
226-
Some(storage::RefundUpdate::ErrorUpdate {
226+
Some(diesel_refund::RefundUpdate::ErrorUpdate {
227227
refund_status: Some(enums::RefundStatus::Failure),
228228
refund_error_message: Some(
229229
errors::ConnectorError::NotImplemented(message.to_owned())
@@ -240,7 +240,7 @@ pub async fn trigger_refund_to_gateway(
240240
})
241241
}
242242
errors::ConnectorError::NotSupported { message, connector } => {
243-
Some(storage::RefundUpdate::ErrorUpdate {
243+
Some(diesel_refund::RefundUpdate::ErrorUpdate {
244244
refund_status: Some(enums::RefundStatus::Failure),
245245
refund_error_message: Some(format!(
246246
"{message} is not supported by {connector}"
@@ -327,7 +327,7 @@ pub async fn trigger_refund_to_gateway(
327327
)
328328
};
329329

330-
storage::RefundUpdate::ErrorUpdate {
330+
diesel_refund::RefundUpdate::ErrorUpdate {
331331
refund_status: Some(enums::RefundStatus::Failure),
332332
refund_error_message: err.reason.or(Some(err.message)),
333333
refund_error_code: Some(err.code),
@@ -360,7 +360,7 @@ pub async fn trigger_refund_to_gateway(
360360
),
361361
),
362362
);
363-
storage::RefundUpdate::ErrorUpdate {
363+
diesel_refund::RefundUpdate::ErrorUpdate {
364364
refund_status: Some(enums::RefundStatus::ManualReview),
365365
refund_error_message: Some(format!(
366366
"Integrity Check Failed! as data mismatched for fields {}",
@@ -388,7 +388,7 @@ pub async fn trigger_refund_to_gateway(
388388
}
389389
let (connector_refund_id, processor_refund_data) =
390390
ConnectorTransactionId::form_id_and_data(response.connector_refund_id);
391-
storage::RefundUpdate::Update {
391+
diesel_refund::RefundUpdate::Update {
392392
connector_refund_id,
393393
refund_status: response.refund_status,
394394
sent_to_gateway: true,
@@ -477,8 +477,8 @@ pub async fn refund_retrieve_core(
477477
merchant_context: domain::MerchantContext,
478478
profile_id: Option<common_utils::id_type::ProfileId>,
479479
request: refunds::RefundsRetrieveRequest,
480-
refund: storage::Refund,
481-
) -> RouterResult<storage::Refund> {
480+
refund: diesel_refund::Refund,
481+
) -> RouterResult<diesel_refund::Refund> {
482482
let db = &*state.store;
483483
let merchant_id = merchant_context.get_merchant_account().get_id();
484484
core_utils::validate_profile_id_from_auth_layer(profile_id, &refund)?;
@@ -539,7 +539,7 @@ pub async fn refund_retrieve_core(
539539
refund.unified_message
540540
};
541541

542-
let refund = storage::Refund {
542+
let refund = diesel_refund::Refund {
543543
unified_message: unified_translated_message,
544544
..refund
545545
};
@@ -586,10 +586,10 @@ pub async fn sync_refund_with_gateway(
586586
merchant_context: &domain::MerchantContext,
587587
payment_attempt: &storage::PaymentAttempt,
588588
payment_intent: &storage::PaymentIntent,
589-
refund: &storage::Refund,
589+
refund: &diesel_refund::Refund,
590590
creds_identifier: Option<String>,
591591
split_refunds: Option<SplitRefundsRequest>,
592-
) -> RouterResult<storage::Refund> {
592+
) -> RouterResult<diesel_refund::Refund> {
593593
let connector_id = refund.connector.to_string();
594594
let connector: api::ConnectorData = api::ConnectorData::get_connector_by_name(
595595
&state.conf.connectors,
@@ -673,7 +673,7 @@ pub async fn sync_refund_with_gateway(
673673
200..=299 => Some(enums::RefundStatus::Failure),
674674
_ => None,
675675
};
676-
storage::RefundUpdate::ErrorUpdate {
676+
diesel_refund::RefundUpdate::ErrorUpdate {
677677
refund_status,
678678
refund_error_message: error_message.reason.or(Some(error_message.message)),
679679
refund_error_code: Some(error_message.code),
@@ -705,7 +705,7 @@ pub async fn sync_refund_with_gateway(
705705
ConnectorTransactionId::form_id_and_data(refund_id);
706706
(Some(refund_id), refund_data)
707707
});
708-
storage::RefundUpdate::ErrorUpdate {
708+
diesel_refund::RefundUpdate::ErrorUpdate {
709709
refund_status: Some(enums::RefundStatus::ManualReview),
710710
refund_error_message: Some(format!(
711711
"Integrity Check Failed! as data mismatched for fields {}",
@@ -724,7 +724,7 @@ pub async fn sync_refund_with_gateway(
724724
Ok(()) => {
725725
let (connector_refund_id, processor_refund_data) =
726726
ConnectorTransactionId::form_id_and_data(response.connector_refund_id);
727-
storage::RefundUpdate::Update {
727+
diesel_refund::RefundUpdate::Update {
728728
connector_refund_id,
729729
refund_status: response.refund_status,
730730
sent_to_gateway: true,
@@ -784,7 +784,7 @@ pub async fn refund_update_core(
784784
let response = db
785785
.update_refund(
786786
refund,
787-
storage::RefundUpdate::MetadataAndReasonUpdate {
787+
diesel_refund::RefundUpdate::MetadataAndReasonUpdate {
788788
metadata: req.metadata,
789789
reason: req.reason,
790790
updated_by: merchant_context
@@ -894,7 +894,7 @@ pub async fn validate_and_create_refund(
894894
.attach_printable("No connector populated in payment attempt")?;
895895
let (connector_transaction_id, processor_transaction_data) =
896896
ConnectorTransactionId::form_id_and_data(connector_transaction_id);
897-
let refund_create_req = storage::RefundNew {
897+
let refund_create_req = diesel_refund::RefundNew {
898898
refund_id: refund_id.to_string(),
899899
internal_reference_id: utils::generate_id(consts::ID_LENGTH, "refid"),
900900
external_reference_id: Some(refund_id.clone()),
@@ -974,7 +974,7 @@ pub async fn validate_and_create_refund(
974974
refund.unified_message
975975
};
976976

977-
let refund = storage::Refund {
977+
let refund = diesel_refund::Refund {
978978
unified_message: unified_translated_message,
979979
..refund
980980
};
@@ -1059,7 +1059,7 @@ pub async fn refund_retrieve_core_with_internal_reference_id(
10591059
profile_id: Option<common_utils::id_type::ProfileId>,
10601060
refund_internal_request_id: String,
10611061
force_sync: Option<bool>,
1062-
) -> RouterResult<storage::Refund> {
1062+
) -> RouterResult<diesel_refund::Refund> {
10631063
let db = &*state.store;
10641064
let merchant_id = merchant_context.get_merchant_account().get_id();
10651065

@@ -1094,7 +1094,7 @@ pub async fn refund_retrieve_core_with_refund_id(
10941094
merchant_context: domain::MerchantContext,
10951095
profile_id: Option<common_utils::id_type::ProfileId>,
10961096
request: refunds::RefundsRetrieveRequest,
1097-
) -> RouterResult<storage::Refund> {
1097+
) -> RouterResult<diesel_refund::Refund> {
10981098
let refund_id = request.refund_id.clone();
10991099
let db = &*state.store;
11001100
let merchant_id = merchant_context.get_merchant_account().get_id();
@@ -1150,7 +1150,7 @@ pub async fn refund_manual_update(
11501150
)
11511151
.await
11521152
.to_not_found_response(errors::ApiErrorResponse::RefundNotFound)?;
1153-
let refund_update = storage::RefundUpdate::ManualUpdate {
1153+
let refund_update = diesel_refund::RefundUpdate::ManualUpdate {
11541154
refund_status: req.status.map(common_enums::RefundStatus::from),
11551155
refund_error_message: req.error_message,
11561156
refund_error_code: req.error_code,
@@ -1254,8 +1254,8 @@ pub async fn get_aggregates_for_refunds(
12541254
))
12551255
}
12561256

1257-
impl ForeignFrom<storage::Refund> for api::RefundResponse {
1258-
fn foreign_from(refund: storage::Refund) -> Self {
1257+
impl ForeignFrom<diesel_refund::Refund> for api::RefundResponse {
1258+
fn foreign_from(refund: diesel_refund::Refund) -> Self {
12591259
let refund = refund;
12601260

12611261
Self {
@@ -1288,14 +1288,14 @@ impl ForeignFrom<storage::Refund> for api::RefundResponse {
12881288
#[allow(clippy::too_many_arguments)]
12891289
pub async fn schedule_refund_execution(
12901290
state: &SessionState,
1291-
refund: storage::Refund,
1291+
refund: diesel_refund::Refund,
12921292
refund_type: api_models::refunds::RefundType,
12931293
merchant_context: &domain::MerchantContext,
12941294
payment_attempt: &storage::PaymentAttempt,
12951295
payment_intent: &storage::PaymentIntent,
12961296
creds_identifier: Option<String>,
12971297
split_refunds: Option<SplitRefundsRequest>,
1298-
) -> RouterResult<storage::Refund> {
1298+
) -> RouterResult<diesel_refund::Refund> {
12991299
// refunds::RefundResponse> {
13001300
let db = &*state.store;
13011301
let runner = storage::ProcessTrackerRunner::RefundWorkflowRouter;
@@ -1383,7 +1383,7 @@ pub async fn sync_refund_with_gateway_workflow(
13831383
) -> Result<(), errors::ProcessTrackerError> {
13841384
let key_manager_state = &state.into();
13851385
let refund_core =
1386-
serde_json::from_value::<storage::RefundCoreWorkflow>(refund_tracker.tracking_data.clone())
1386+
serde_json::from_value::<diesel_refund::RefundCoreWorkflow>(refund_tracker.tracking_data.clone())
13871387
.change_context(errors::ApiErrorResponse::InternalServerError)
13881388
.attach_printable_lazy(|| {
13891389
format!(
@@ -1474,7 +1474,7 @@ pub async fn trigger_refund_execute_workflow(
14741474
) -> Result<(), errors::ProcessTrackerError> {
14751475
let db = &*state.store;
14761476
let refund_core =
1477-
serde_json::from_value::<storage::RefundCoreWorkflow>(refund_tracker.tracking_data.clone())
1477+
serde_json::from_value::<diesel_refund::RefundCoreWorkflow>(refund_tracker.tracking_data.clone())
14781478
.change_context(errors::ApiErrorResponse::InternalServerError)
14791479
.attach_printable_lazy(|| {
14801480
format!(
@@ -1593,9 +1593,9 @@ pub async fn trigger_refund_execute_workflow(
15931593

15941594
#[instrument]
15951595
pub fn refund_to_refund_core_workflow_model(
1596-
refund: &storage::Refund,
1597-
) -> storage::RefundCoreWorkflow {
1598-
storage::RefundCoreWorkflow {
1596+
refund: &diesel_refund::Refund,
1597+
) -> diesel_refund::RefundCoreWorkflow {
1598+
diesel_refund::RefundCoreWorkflow {
15991599
refund_internal_reference_id: refund.internal_reference_id.clone(),
16001600
connector_transaction_id: refund.connector_transaction_id.clone(),
16011601
merchant_id: refund.merchant_id.clone(),
@@ -1607,7 +1607,7 @@ pub fn refund_to_refund_core_workflow_model(
16071607
#[instrument(skip_all)]
16081608
pub async fn add_refund_sync_task(
16091609
db: &dyn db::StorageInterface,
1610-
refund: &storage::Refund,
1610+
refund: &diesel_refund::Refund,
16111611
runner: storage::ProcessTrackerRunner,
16121612
) -> RouterResult<storage::ProcessTracker> {
16131613
let task = "SYNC_REFUND";
@@ -1646,7 +1646,7 @@ pub async fn add_refund_sync_task(
16461646
#[instrument(skip_all)]
16471647
pub async fn add_refund_execute_task(
16481648
db: &dyn db::StorageInterface,
1649-
refund: &storage::Refund,
1649+
refund: &diesel_refund::Refund,
16501650
runner: storage::ProcessTrackerRunner,
16511651
) -> RouterResult<storage::ProcessTracker> {
16521652
let task = "EXECUTE_REFUND";

0 commit comments

Comments
 (0)