valitydev/daway
14
0
Fork 0
mirror of https://github.com/valitydev/daway.git synced 2024-11-06 08:35:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TD-249: fix refund aggregate (#49)

Browse Source
This commit is contained in:
mr-impossibru 2022-05-30 12:07:16 +03:00 committed by GitHub
parent 63bafe7720
commit a6fa291f87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 155 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/dev/vality/newway/dao/invoicing/impl/RefundDaoImpl.java
View File

@ -64,16 +64,28 @@ public class RefundDaoImpl extends AbstractGenericDao implements RefundDao {
MapSqlParameterSource params =
new MapSqlParameterSource("rfndId", rfndId).addValue("objType", PaymentChangeType.refund.name());
this.getNamedParameterJdbcTemplate().update(
"UPDATE dw.refund SET fee = (SELECT dw.get_refund_fee(dw.cash_flow.*) " +
"FROM dw.cash_flow WHERE obj_id = :rfndId " +
"AND obj_type = CAST(:objType as dw.payment_change_type)), " +
"provider_fee = (SELECT dw.get_refund_provider_fee(dw.cash_flow.*) " +
"FROM dw.cash_flow WHERE obj_id = :rfndId " +
"AND obj_type = CAST(:objType as dw.payment_change_type)), " +
"external_fee = (SELECT dw.get_refund_external_fee(dw.cash_flow.*) " +
"FROM dw.cash_flow WHERE obj_id = :rfndId " +
"AND obj_type = CAST(:objType as dw.payment_change_type)) " +
"WHERE id = :rfndId",
"""
UPDATE dw.refund
SET
fee = (
SELECT dw.get_refund_fee(dw.cash_flow.*)
FROM dw.cash_flow
WHERE obj_id = :rfndId
AND obj_type = CAST(:objType as dw.payment_change_type)
),
provider_fee = (
SELECT dw.get_refund_provider_fee(dw.cash_flow.*)
FROM dw.cash_flow
WHERE obj_id = :rfndId
AND obj_type = CAST(:objType as dw.payment_change_type)
),
external_fee = (
SELECT dw.get_refund_external_fee(dw.cash_flow.*)
FROM dw.cash_flow
WHERE obj_id = :rfndId
AND obj_type = CAST(:objType as dw.payment_change_type)
)
WHERE id = :rfndId""",
params);
}

130
src/main/resources/db/migration/V1__init.sql
View File

@ -1678,3 +1678,133 @@ CREATE TABLE dw.withdrawal_session
CREATE INDEX withdrawal_session_event_created_at_idx ON dw.withdrawal_session USING btree (event_created_at);
CREATE INDEX withdrawal_session_event_occured_at_idx ON dw.withdrawal_session USING btree (event_occured_at);
CREATE INDEX withdrawal_session_id_idx ON dw.withdrawal_session USING btree (withdrawal_session_id);
-- FUNCTION
CREATE FUNCTION dw.get_cashflow_sum(_cash_flow dw.cash_flow, obj_type dw.payment_change_type,
source_account_type dw.cash_flow_account,
source_account_type_values character varying[],
destination_account_type dw.cash_flow_account,
destination_account_type_values character varying[]) RETURNS bigint
LANGUAGE plpgsql
IMMUTABLE PARALLEL SAFE
AS
$_$
begin
return (
coalesce(
(
select amount
from (select ($1).*) as cash_flow
where cash_flow.obj_type = $2
and cash_flow.source_account_type = $3
and cash_flow.source_account_type_value = ANY ($4)
and cash_flow.destination_account_type = $5
and cash_flow.destination_account_type_value = ANY ($6)
and (
(cash_flow.obj_type = 'adjustment' and cash_flow.adj_flow_type = 'new_cash_flow')
or (cash_flow.obj_type != 'adjustment' and cash_flow.adj_flow_type is null)
)
), 0)
);
end;
$_$;
CREATE FUNCTION dw.cashflow_sum_finalfunc(amount bigint) RETURNS bigint
LANGUAGE plpgsql
IMMUTABLE PARALLEL SAFE
AS
$$
begin
return amount;
end;
$$;
CREATE FUNCTION dw.get_refund_fee_sfunc(amount bigint, cash_flow dw.cash_flow) RETURNS bigint
LANGUAGE plpgsql
IMMUTABLE PARALLEL SAFE
AS
$_$
begin
return $1 + (
dw.get_cashflow_sum(
$2,
'refund'::dw.payment_change_type,
'merchant'::dw.cash_flow_account,
'{"settlement"}',
'system'::dw.cash_flow_account,
'{"settlement"}'
)
);
end;
$_$;
CREATE FUNCTION dw.get_refund_external_fee_sfunc(amount bigint, cash_flow dw.cash_flow) RETURNS bigint
LANGUAGE plpgsql
IMMUTABLE PARALLEL SAFE
AS
$_$
begin
return $1 + (
dw.get_cashflow_sum(
$2,
'refund'::dw.payment_change_type,
'system'::dw.cash_flow_account,
'{"settlement"}',
'external'::dw.cash_flow_account,
'{"income", "outcome"}'
)
);
end;
$_$;
CREATE FUNCTION dw.get_refund_provider_fee_sfunc(amount bigint, cash_flow dw.cash_flow) RETURNS bigint
LANGUAGE plpgsql
IMMUTABLE PARALLEL SAFE
AS
$_$
begin
return $1 + (
dw.get_cashflow_sum(
$2,
'refund'::dw.payment_change_type,
'system'::dw.cash_flow_account,
'{"settlement"}',
'provider'::dw.cash_flow_account,
'{"settlement"}'
)
);
end;
$_$;
-- AGGREGATE
CREATE AGGREGATE dw.get_refund_external_fee(dw.cash_flow) (
SFUNC = dw.get_refund_external_fee_sfunc,
STYPE = bigint,
INITCOND = '0',
FINALFUNC = dw.cashflow_sum_finalfunc,
PARALLEL = safe
);
CREATE AGGREGATE dw.get_refund_fee(dw.cash_flow) (
SFUNC = dw.get_refund_fee_sfunc,
STYPE = bigint,
INITCOND = '0',
FINALFUNC = dw.cashflow_sum_finalfunc,
PARALLEL = safe
);
CREATE AGGREGATE dw.get_refund_provider_fee(dw.cash_flow) (
SFUNC = dw.get_refund_provider_fee_sfunc,
STYPE = bigint,
INITCOND = '0',
FINALFUNC = dw.cashflow_sum_finalfunc,
PARALLEL = safe
);

2
src/test/java/dev/vality/newway/dao/DaoTests.java
View File

@ -488,6 +488,8 @@ public class DaoTests {
assertEquals(refund, refundGet);
refundDao.updateNotCurrent(refund.getId());
refundDao.updateCommissions(refund.getId());
assertThrows(NotFoundException.class, () -> refundDao.get(refund.getInvoiceId(), refund.getPaymentId(), refund.getRefundId()));
}