rust/hyperswitch
1
0
Fork 0
mirror of https://github.com/juspay/hyperswitch.git synced 2025-10-29 09:07:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(payments): add merchant order ref id filter (#6630)

Browse Source
This commit is contained in:
Apoorv Dixit
2024-11-25 19:04:53 +05:30
committed by GitHub
parent 0db3aed153
commit 57e64c26ca
5 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/api_models/src/payments.rs
View File

@ -4927,6 +4927,8 @@ pub struct PaymentListFilterConstraints {
pub order: Order,
/// The List of all the card networks to filter payments list
pub card_network: Option<Vec<enums::CardNetwork>>,
/// The identifier for merchant order reference id
pub merchant_order_reference_id: Option<String>,
}
impl PaymentListFilterConstraints {

5
crates/hyperswitch_domain_models/src/payments/payment_intent.rs
View File

@ -1002,6 +1002,7 @@ pub struct PaymentIntentListParams {
pub limit: Option<u32>,
pub order: api_models::payments::Order,
pub card_network: Option<Vec<storage_enums::CardNetwork>>,
pub merchant_order_reference_id: Option<String>,
}
impl From<api_models::payments::PaymentListConstraints> for PaymentIntentFetchConstraints {
@ -1036,6 +1037,7 @@ impl From<api_models::payments::PaymentListConstraints> for PaymentIntentFetchCo
limit: Some(std::cmp::min(limit, PAYMENTS_LIST_MAX_LIMIT_V1)),
order: Default::default(),
card_network: None,
merchant_order_reference_id: None,
}))
}
}
@ -1061,6 +1063,7 @@ impl From<common_utils::types::TimeRange> for PaymentIntentFetchConstraints {
limit: None,
order: Default::default(),
card_network: None,
merchant_order_reference_id: None,
}))
}
}
@ -1084,6 +1087,7 @@ impl From<api_models::payments::PaymentListFilterConstraints> for PaymentIntentF
merchant_connector_id,
order,
card_network,
merchant_order_reference_id,
} = value;
if let Some(payment_intent_id) = payment_id {
Self::Single { payment_intent_id }
@ -1107,6 +1111,7 @@ impl From<api_models::payments::PaymentListFilterConstraints> for PaymentIntentF
limit: Some(std::cmp::min(limit, PAYMENTS_LIST_MAX_LIMIT_V2)),
order,
card_network,
merchant_order_reference_id,
}))
}
}

10
crates/router/src/types/storage/dispute.rs
View File

@ -1,6 +1,6 @@
use async_bb8_diesel::AsyncRunQueryDsl;
use common_utils::errors::CustomResult;
use diesel::{associations::HasTable, ExpressionMethods, QueryDsl};
use diesel::{associations::HasTable, BoolExpressionMethods, ExpressionMethods, QueryDsl};
pub use diesel_models::dispute::{Dispute, DisputeNew, DisputeUpdate};
use diesel_models::{errors, query::generics::db_metrics, schema::dispute::dsl};
use error_stack::ResultExt;
@ -43,9 +43,11 @@ impl DisputeDbExt for Dispute {
&dispute_list_constraints.dispute_id,
) {
search_by_payment_or_dispute_id = true;
filter = filter
.filter(dsl::payment_id.eq(payment_id.to_owned()))
.or_filter(dsl::dispute_id.eq(dispute_id.to_owned()));
filter = filter.filter(
dsl::payment_id
.eq(payment_id.to_owned())
.or(dsl::dispute_id.eq(dispute_id.to_owned())),
);
};
if !search_by_payment_or_dispute_id {

17
crates/router/src/types/storage/refund.rs
View File

@ -1,7 +1,7 @@
use api_models::payments::AmountFilter;
use async_bb8_diesel::AsyncRunQueryDsl;
use common_utils::errors::CustomResult;
use diesel::{associations::HasTable, ExpressionMethods, QueryDsl};
use diesel::{associations::HasTable, BoolExpressionMethods, ExpressionMethods, QueryDsl};
pub use diesel_models::refund::{
Refund, RefundCoreWorkflow, RefundNew, RefundUpdate, RefundUpdateInternal,
};
@ -67,8 +67,11 @@ impl RefundDbExt for Refund {
) {
search_by_pay_or_ref_id = true;
filter = filter
.filter(dsl::payment_id.eq(pid.to_owned()))
.or_filter(dsl::refund_id.eq(ref_id.to_owned()))
.filter(
dsl::payment_id
.eq(pid.to_owned())
.or(dsl::refund_id.eq(ref_id.to_owned())),
)
.limit(limit)
.offset(offset);
};
@ -228,9 +231,11 @@ impl RefundDbExt for Refund {
&refund_list_details.refund_id,
) {
search_by_pay_or_ref_id = true;
filter = filter
.filter(dsl::payment_id.eq(pid.to_owned()))
.or_filter(dsl::refund_id.eq(ref_id.to_owned()));
filter = filter.filter(
dsl::payment_id
.eq(pid.to_owned())
.or(dsl::refund_id.eq(ref_id.to_owned())),
);
};
if !search_by_pay_or_ref_id {

11
crates/storage_impl/src/payments/payment_intent.rs
View File

@ -871,6 +871,12 @@ impl<T: DatabaseStore> PaymentIntentInterface for crate::RouterStore<T> {
query = query.filter(pi_dsl::customer_id.eq(customer_id.clone()));
}
if let Some(merchant_order_reference_id) = &params.merchant_order_reference_id {
query = query.filter(
pi_dsl::merchant_order_reference_id.eq(merchant_order_reference_id.clone()),
)
}
if let Some(profile_id) = &params.profile_id {
query = query.filter(pi_dsl::profile_id.eq_any(profile_id.clone()));
}
@ -1041,6 +1047,11 @@ impl<T: DatabaseStore> PaymentIntentInterface for crate::RouterStore<T> {
if let Some(customer_id) = &params.customer_id {
query = query.filter(pi_dsl::customer_id.eq(customer_id.clone()));
}
if let Some(merchant_order_reference_id) = &params.merchant_order_reference_id {
query = query.filter(
pi_dsl::merchant_order_reference_id.eq(merchant_order_reference_id.clone()),
)
}
if let Some(profile_id) = &params.profile_id {
query = query.filter(pi_dsl::profile_id.eq_any(profile_id.clone()));
}