Skip to content

Refactor provider selection and currency resolution; remove ProvisionBucket dependency #734

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

Closed
chibie wants to merge 1 commit into from
Closed

Refactor provider selection and currency resolution; remove ProvisionBucket dependency #734

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
99 changes: 9 additions & 90 deletions controllers/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,9 +448,6 @@ func (ctrl *ProviderController) handleExportPaymentOrders(ctx *gin.Context, prov
WithToken(func(tq *ent.TokenQuery) {
tq.WithNetwork()
}).
WithProvisionBucket(func(pbq *ent.ProvisionBucketQuery) {
pbq.WithCurrency()
}).
Limit(maxExportLimit).
Order(ent.Desc(paymentorder.FieldCreatedAt), ent.Desc(paymentorder.FieldID)).
All(reqCtx)
Expand Down Expand Up @@ -524,10 +521,7 @@ func (ctrl *ProviderController) handleExportPaymentOrders(ctx *gin.Context, prov
institutionName = name
}

var currencyCode string
if paymentOrder.Edges.ProvisionBucket != nil && paymentOrder.Edges.ProvisionBucket.Edges.Currency != nil {
currencyCode = paymentOrder.Edges.ProvisionBucket.Edges.Currency.Code
}
currencyCode, _ := u.GetInstitutionCurrencyCode(reqCtx, paymentOrder.Institution, true)

row := []string{
paymentOrder.ID.String(),
Expand Down Expand Up @@ -590,7 +584,6 @@ func (ctrl *ProviderController) AcceptOrder(ctx *gin.Context) {
WithProvider().
WithSenderProfile().
WithToken(func(tq *ent.TokenQuery) { tq.WithNetwork() }).
WithProvisionBucket(func(pbq *ent.ProvisionBucketQuery) { pbq.WithCurrency() }).
Only(reqCtx)
if fallbackErr != nil || fallbackOrder == nil {
if fallbackErr != nil && !ent.IsNotFound(fallbackErr) {
Expand Down Expand Up @@ -628,12 +621,9 @@ func (ctrl *ProviderController) AcceptOrder(ctx *gin.Context) {
}
if fallbackOrder.Direction == paymentorder.DirectionOnramp {
result["amount"] = fallbackOrder.Amount.Add(fallbackOrder.SenderFee).Mul(fallbackOrder.Rate).RoundBank(0).String()
if fallbackOrder.Edges.ProvisionBucket != nil && fallbackOrder.Edges.ProvisionBucket.Edges.Currency != nil {
result["currency"] = fallbackOrder.Edges.ProvisionBucket.Edges.Currency.Code
} else if fallbackOrder.Institution != "" {
inst, instErr := u.GetInstitutionByCode(reqCtx, fallbackOrder.Institution, true)
if instErr == nil && inst != nil && inst.Edges.FiatCurrency != nil {
result["currency"] = inst.Edges.FiatCurrency.Code
if fallbackOrder.Institution != "" {
if currencyCode, curErr := u.GetInstitutionCurrencyCode(reqCtx, fallbackOrder.Institution, true); curErr == nil {
result["currency"] = currencyCode
}
}
}
Expand Down Expand Up @@ -1407,16 +1397,7 @@ func (ctrl *ProviderController) handlePayoutFulfillment(ctx *gin.Context, orderI
return
}
providerID := fulfillment.Edges.Order.Edges.Provider.ID
currency := ""
if fulfillment.Edges.Order.Edges.ProvisionBucket != nil && fulfillment.Edges.Order.Edges.ProvisionBucket.Edges.Currency != nil {
currency = fulfillment.Edges.Order.Edges.ProvisionBucket.Edges.Currency.Code
}
if currency == "" && fulfillment.Edges.Order.Institution != "" {
inst, instErr := u.GetInstitutionByCode(reqCtx, fulfillment.Edges.Order.Institution, true)
if instErr == nil && inst != nil && inst.Edges.FiatCurrency != nil {
currency = inst.Edges.FiatCurrency.Code
}
}
currency, _ := u.GetInstitutionCurrencyCode(reqCtx, fulfillment.Edges.Order.Institution, true)
if currency == "" {
logger.WithFields(logger.Fields{
"OrderID": orderID.String(),
Expand Down Expand Up @@ -1548,16 +1529,7 @@ func (ctrl *ProviderController) handlePayoutFulfillment(ctx *gin.Context, orderI
return
}
providerID := fulfillment.Edges.Order.Edges.Provider.ID
currency := ""
if fulfillment.Edges.Order.Edges.ProvisionBucket != nil && fulfillment.Edges.Order.Edges.ProvisionBucket.Edges.Currency != nil {
currency = fulfillment.Edges.Order.Edges.ProvisionBucket.Edges.Currency.Code
}
if currency == "" && fulfillment.Edges.Order.Institution != "" {
inst, instErr := u.GetInstitutionByCode(reqCtx, fulfillment.Edges.Order.Institution, true)
if instErr == nil && inst != nil && inst.Edges.FiatCurrency != nil {
currency = inst.Edges.FiatCurrency.Code
}
}
currency, _ := u.GetInstitutionCurrencyCode(reqCtx, fulfillment.Edges.Order.Institution, true)
if currency == "" {
logger.WithFields(logger.Fields{
"OrderID": orderID.String(),
Expand Down Expand Up @@ -2358,9 +2330,6 @@ func (ctrl *ProviderController) CancelOrder(ctx *gin.Context) {
tq.WithNetwork()
}).
WithProvider().
WithProvisionBucket(func(pbq *ent.ProvisionBucketQuery) {
pbq.WithCurrency()
}).
Only(reqCtx)
if err != nil {
logger.WithFields(logger.Fields{
Expand All @@ -2381,49 +2350,8 @@ func (ctrl *ProviderController) CancelOrder(ctx *gin.Context) {
} else if payload.Reason != "Insufficient funds" {
cancellationCount += 1
orderUpdate.AppendCancellationReasons([]string{payload.Reason})
} else if payload.Reason == "Insufficient funds" && order.Edges.ProvisionBucket != nil && order.Edges.ProvisionBucket.Edges.Currency != nil {
// Search for the specific provider in the queue using a Redis list (private orders with nil bucket are not in the queue)
redisKey := fmt.Sprintf("bucket_%s_%s_%s", order.Edges.ProvisionBucket.Edges.Currency.Code, order.Edges.ProvisionBucket.MinAmount, order.Edges.ProvisionBucket.MaxAmount)

// Check if the provider ID exists in the list
for index := -1; ; index-- {
providerData, err := storage.RedisClient.LIndex(reqCtx, redisKey, int64(index)).Result()
if err != nil {
break
}

// Extract the id from the data (format "providerID:token:network:rate:minAmount:maxAmount")
parts := strings.Split(providerData, ":")
if len(parts) != 6 {
logger.WithFields(logger.Fields{
"Provider Data": providerData,
}).Error("Invalid provider data format")
continue // Skip this entry due to invalid format
}

if parts[0] == provider.ID {
// Remove the provider from the list
placeholder := "DELETED_PROVIDER" // Define a placeholder value
_, err := storage.RedisClient.LSet(reqCtx, redisKey, int64(index), placeholder).Result()
if err != nil {
logger.WithFields(logger.Fields{
"Error": fmt.Sprintf("%v", err),
"Index": index,
}).Errorf("Failed to set placeholder at index %d: %v", index, err)
}

// Remove all occurences of the placeholder from the list
_, err = storage.RedisClient.LRem(reqCtx, redisKey, 0, placeholder).Result()
if err != nil {
logger.WithFields(logger.Fields{
"Error": fmt.Sprintf("%v", err),
"Placeholder": placeholder,
}).Errorf("Failed to remove placeholder from circular queue: %v", err)
}

break
}
}
} else if payload.Reason == "Insufficient funds" {
// DB-driven provider selection no longer removes providers from Redis bucket queues here.
}

// Update order status to cancelled
Expand All @@ -2446,16 +2374,7 @@ func (ctrl *ProviderController) CancelOrder(ctx *gin.Context) {

// Release reserved balance for this cancelled order
providerID := order.Edges.Provider.ID
currency := ""
if order.Edges.ProvisionBucket != nil && order.Edges.ProvisionBucket.Edges.Currency != nil {
currency = order.Edges.ProvisionBucket.Edges.Currency.Code
}
if currency == "" && order.Institution != "" {
inst, instErr := u.GetInstitutionByCode(reqCtx, order.Institution, true)
if instErr == nil && inst != nil && inst.Edges.FiatCurrency != nil {
currency = inst.Edges.FiatCurrency.Code
}
}
currency, _ := u.GetInstitutionCurrencyCode(reqCtx, order.Institution, true)
if currency != "" {
amount := order.Amount.Mul(order.Rate).RoundBank(0)
err = ctrl.balanceService.ReleaseFiatBalance(reqCtx, providerID, currency, amount, nil)
Expand Down
8 changes: 3 additions & 5 deletions services/common/indexer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,13 +504,11 @@ func GetProviderAddressFromOrder(ctx context.Context, order *ent.PaymentOrder) (
return "", fmt.Errorf("payment order has no provider")
}

// Get the currency from the provision bucket
if order.Edges.ProvisionBucket == nil {
return "", fmt.Errorf("payment order has no provision bucket")
currencyCode, err := utils.GetInstitutionCurrencyCode(ctx, order.Institution, true)
if err != nil {
return "", fmt.Errorf("payment order institution currency lookup failed: %w", err)
}

currencyCode := order.Edges.ProvisionBucket.Edges.Currency.Code

// Get provider order token for this provider, token, and currency
providerOrderToken, err := storage.Client.ProviderOrderToken.
Query().
Expand Down
Loading
Loading