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

fix(payouts): persist status updates in payouts table (#4280)

Browse Source 
Co-authored-by: hyperswitch-bot[bot] <148525504+hyperswitch-bot[bot]@users.noreply.github.com>
This commit is contained in:
Kashif
2024-04-04 19:13:24 +05:30
committed by GitHub
parent 622aac3015
commit 02ffe7e480
11 changed files with 232 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/storage_impl/src/mock_db/payouts.rs
View File

@ -67,7 +67,7 @@ impl PayoutsInterface for MockDb {
_merchant_id: &str,
_filters: &data_models::payouts::PayoutFetchConstraints,
_storage_scheme: storage_enums::MerchantStorageScheme,
) -> CustomResult<Vec<(Payouts, PayoutAttempt)>, StorageError> {
) -> CustomResult<Vec<(Payouts, PayoutAttempt, diesel_models::Customer)>, StorageError> {
// TODO: Implement function for `MockDb`
Err(StorageError::MockDbError)?
}

28
crates/storage_impl/src/payouts/payouts.rs
View File

@ -9,6 +9,13 @@ use data_models::{
};
#[cfg(feature = "olap")]
use diesel::{associations::HasTable, ExpressionMethods, JoinOnDsl, QueryDsl};
#[cfg(feature = "olap")]
use diesel_models::{
customers::Customer as DieselCustomer,
payout_attempt::PayoutAttempt as DieselPayoutAttempt,
query::generics::db_metrics,
schema::{customers::dsl as cust_dsl, payout_attempt::dsl as poa_dsl, payouts::dsl as po_dsl},
};
use diesel_models::{
enums::MerchantStorageScheme,
kv,
@ -17,12 +24,6 @@ use diesel_models::{
PayoutsUpdate as DieselPayoutsUpdate,
},
};
#[cfg(feature = "olap")]
use diesel_models::{
payout_attempt::PayoutAttempt as DieselPayoutAttempt,
query::generics::db_metrics,
schema::{payout_attempt::dsl as poa_dsl, payouts::dsl as po_dsl},
};
use error_stack::ResultExt;
use redis_interface::HsetnxReply;
#[cfg(feature = "olap")]
@ -270,7 +271,8 @@ impl<T: DatabaseStore> PayoutsInterface for KVRouterStore<T> {
merchant_id: &str,
filters: &PayoutFetchConstraints,
storage_scheme: MerchantStorageScheme,
) -> error_stack::Result<Vec<(Payouts, PayoutAttempt)>, StorageError> {
) -> error_stack::Result<Vec<(Payouts, PayoutAttempt, diesel_models::Customer)>, StorageError>
{
self.router_store
.filter_payouts_and_attempts(merchant_id, filters, storage_scheme)
.await
@ -485,7 +487,7 @@ impl<T: DatabaseStore> PayoutsInterface for crate::RouterStore<T> {
merchant_id: &str,
filters: &PayoutFetchConstraints,
storage_scheme: MerchantStorageScheme,
) -> error_stack::Result<Vec<(Payouts, PayoutAttempt)>, StorageError> {
) -> error_stack::Result<Vec<(Payouts, PayoutAttempt, DieselCustomer)>, StorageError> {
use common_utils::errors::ReportSwitchExt;
let conn = connection::pg_connection_read(self).await.switch()?;
@ -495,6 +497,10 @@ impl<T: DatabaseStore> PayoutsInterface for crate::RouterStore<T> {
diesel_models::schema::payout_attempt::table
.on(poa_dsl::payout_id.eq(po_dsl::payout_id)),
)
.inner_join(
diesel_models::schema::customers::table
.on(cust_dsl::customer_id.eq(po_dsl::customer_id)),
)
.filter(po_dsl::merchant_id.eq(merchant_id.to_owned()))
.order(po_dsl::created_at.desc())
.into_boxed();
@ -585,15 +591,16 @@ impl<T: DatabaseStore> PayoutsInterface for crate::RouterStore<T> {
logger::debug!(filter = %diesel::debug_query::<diesel::pg::Pg,_>(&query).to_string());
query
.get_results_async::<(DieselPayouts, DieselPayoutAttempt)>(conn)
.get_results_async::<(DieselPayouts, DieselPayoutAttempt, DieselCustomer)>(conn)
.await
.map(|results| {
results
.into_iter()
.map(|(pi, pa)| {
.map(|(pi, pa, c)| {
(
Payouts::from_storage_model(pi),
PayoutAttempt::from_storage_model(pa),
c,
)
})
.collect()
@ -765,6 +772,7 @@ impl DataModelExt for PayoutsUpdate {
Self::AttemptCountUpdate { attempt_count } => {
DieselPayoutsUpdate::AttemptCountUpdate { attempt_count }
}
Self::StatusUpdate { status } => DieselPayoutsUpdate::StatusUpdate { status },
}
}