Skip to content

[NOTASK] partnerFee refactoring #3483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Yannick1712 merged 2 commits into from
Mar 20, 2026
Merged

[NOTASK] partnerFee refactoring #3483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
296bc81
[NOTASK] partnerFee refactoring
Yannick1712 Mar 20, 2026
b7e52de
[NOTASK] prettier fix
Yannick1712 Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/subdomains/supporting/payment/entities/fee.entity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { FeeRequest } from '../services/fee.service';
export enum FeeType {
SPECIAL = 'Special', // Single use only, highest prio applies to all
CUSTOM = 'Custom', // Single use only, second highest prio
CUSTOM_PARTNER = 'CustomPartner', // Single use only, second highest prio, can be combined with PartnerFee
BASE = 'Base', // Single use only, absolute base fee
DISCOUNT = 'Discount', // Single use only, absolute discount
RELATIVE_DISCOUNT = 'RelativeDiscount', // Single use only, relative discount
Expand Down
24 changes: 12 additions & 12 deletions src/subdomains/supporting/payment/services/fee.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,13 +331,6 @@ export class FeeService {
]);
const blockchainFee = fromFee + toFee;

// get partner fee
const partnerFee = Util.minObj(
fees.filter((fee) => fee.type === FeeType.PARTNER),
'rate',
);
const partnerFeeSpec = { rate: partnerFee?.rate ?? 0, fixed: partnerFee?.fixed ?? 0 };

// get min special fee
const specialFee = Util.minObj(
fees.filter((fee) => fee.type === FeeType.SPECIAL),
Expand All @@ -346,26 +339,33 @@ export class FeeService {

if (specialFee)
return {
fees: [specialFee, partnerFee].filter((e) => e != null),
fees: [specialFee],
dfx: { rate: specialFee.rate, fixed: specialFee.fixed ?? 0 },
bank: { rate: 0, fixed: 0 },
partner: partnerFeeSpec,
partner: { rate: 0, fixed: 0 },
payoutRefBonus: specialFee.payoutRefBonus,
network: Math.min(specialFee.blockchainFactor * blockchainFee, Config.maxBlockchainFee),
};

// get partner fee
const partnerFee = Util.minObj(
fees.filter((fee) => fee.type === FeeType.PARTNER),
'rate',
);
const partnerFeeSpec = { rate: partnerFee?.rate ?? 0, fixed: partnerFee?.fixed ?? 0 };

// get min custom fee
const customFee = Util.minObj(
fees.filter((fee) => fee.type === FeeType.CUSTOM),
fees.filter((fee) => [FeeType.CUSTOM, FeeType.CUSTOM_PARTNER].includes(fee.type)),
'rate',
);

if (customFee)
return {
fees: [customFee, partnerFee].filter((e) => e != null),
fees: [customFee],
dfx: { rate: customFee.rate, fixed: customFee.fixed ?? 0 },
bank: { rate: 0, fixed: 0 },
partner: partnerFeeSpec,
partner: customFee.type === FeeType.CUSTOM_PARTNER ? partnerFeeSpec : { rate: 0, fixed: 0 },
network: Math.min(customFee.blockchainFactor * blockchainFee, Config.maxBlockchainFee),
payoutRefBonus: customFee.payoutRefBonus,
};
Expand Down
Loading