Skip to content

feat: add provider fee tracking to payment orders #733

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

Open
Dprof-in-tech wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add provider fee tracking to payment orders #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 13 additions & 5 deletions controllers/sender/sender.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2894,8 +2894,9 @@ func (ctrl *SenderController) Stats(ctx *gin.Context) {

// Get USD volume
var w []struct {
Sum decimal.Decimal
SumFieldSenderFee decimal.Decimal
Sum decimal.Decimal
SumFieldSenderFee decimal.Decimal
SumFieldProviderFee decimal.Decimal
}
err := storage.Client.PaymentOrder.
Query().
Expand All @@ -2907,6 +2908,7 @@ func (ctrl *SenderController) Stats(ctx *gin.Context) {
Aggregate(
ent.Sum(paymentorder.FieldAmount),
ent.As(ent.Sum(paymentorder.FieldSenderFee), "SumFieldSenderFee"),
ent.As(ent.Sum(paymentorder.FieldProviderFee), "SumFieldProviderFee"),
).
Scan(reqCtx, &w)
if err != nil {
Expand All @@ -2932,6 +2934,7 @@ func (ctrl *SenderController) Stats(ctx *gin.Context) {

var localStablecoinSum decimal.Decimal
var localStablecoinSenderFee decimal.Decimal
var localStablecoinProviderFee decimal.Decimal

// Convert local stablecoin volume to USD (direction-aware: onramp use buy rate, offramp use sell rate)
for _, paymentOrder := range paymentOrders {
Expand All @@ -2957,9 +2960,13 @@ func (ctrl *SenderController) Stats(ctx *gin.Context) {
if paymentOrder.SenderFee.GreaterThan(decimal.Zero) {
paymentOrder.SenderFee = paymentOrder.SenderFee.Div(rate)
}
if paymentOrder.ProviderFee.GreaterThan(decimal.Zero) {
paymentOrder.ProviderFee = paymentOrder.ProviderFee.Div(rate)
}

localStablecoinSum = localStablecoinSum.Add(paymentOrder.Amount)
localStablecoinSenderFee = localStablecoinSenderFee.Add(paymentOrder.SenderFee)
localStablecoinProviderFee = localStablecoinProviderFee.Add(paymentOrder.ProviderFee)
}

count, err := storage.Client.PaymentOrder.
Expand All @@ -2975,9 +2982,10 @@ func (ctrl *SenderController) Stats(ctx *gin.Context) {
}

u.APIResponse(ctx, http.StatusOK, "success", "Sender stats retrieved successfully", types.SenderStatsResponse{
TotalOrders: count,
TotalOrderVolume: w[0].Sum.Add(localStablecoinSum),
TotalFeeEarnings: w[0].SumFieldSenderFee.Add(localStablecoinSenderFee),
TotalOrders: count,
TotalOrderVolume: w[0].Sum.Add(localStablecoinSum),
TotalFeeEarnings: w[0].SumFieldSenderFee.Add(localStablecoinSenderFee),
TotalProviderFees: w[0].SumFieldProviderFee.Add(localStablecoinProviderFee),
})
}

Expand Down
2 changes: 2 additions & 0 deletions ent/migrate/migrations/20260319165304_add_provider_fee.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- Add provider_fee column to payment_orders for tracking provider's portion of transaction fee
ALTER TABLE "payment_orders" ADD COLUMN "provider_fee" numeric NOT NULL DEFAULT 0;
3 changes: 2 additions & 1 deletion ent/migrate/migrations/atlas.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
h1:XGc0qj58R4xn+fMjZJqIdeosU14dhOs5U5YvG/w+7EM=
h1:8qEvlOVE47PPZVAj9dY0zt2RoYXdI34dFRVo0Gz0LyQ=
20240118234246_initial.sql h1:dYuYBqns33WT+3p8VQvbKUP62k3k6w6h8S+FqNqgSvU=
20240130122324_order_from_address.sql h1:mMVI2iBUd1roIYLUqu0d2jZ7+B6exppRN8qqn+aIHx4=
20240202010744_fees_on_order.sql h1:P7ngxZKqDKefBM5vk6M3kbWeMPVwbZ4MZVcLBjEfS34=
Expand Down Expand Up @@ -80,3 +80,4 @@ h1:XGc0qj58R4xn+fMjZJqIdeosU14dhOs5U5YvG/w+7EM=
20260310185904_add_wallet_service.sql h1:eG863f+be3Cac7dzU6+rOJ+tVEVIouatPBlIGtKI+VY=
20260313024459_onramp_bump.sql h1:Px+OHr6ARShsDgaMq95Io5cY36KmfrSYSuk+KGfDvz4=
20260318151618_txlog_edge.sql h1:kgqV1eVk/bpOO0l8RGkLLJZ4EpQ5IaPS9MLbLCxgIao=
20260319165304_add_provider_fee.sql h1:Z6aWLnzTGWagWo7XXpbSrDVrOCzPLjnMHtkdHfJZiZk=
13 changes: 7 additions & 6 deletions ent/migrate/schema.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

89 changes: 88 additions & 1 deletion ent/mutation.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 12 additions & 1 deletion ent/paymentorder.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions ent/paymentorder/paymentorder.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading