fixed rail & operation names
This commit is contained in:
@@ -26,7 +26,7 @@ import (
|
||||
|
||||
const (
|
||||
ledgerConnectorID = "ledger"
|
||||
ledgerRailName = "LEDGER"
|
||||
ledgerRailName = discovery.RailLedger
|
||||
|
||||
opParamOperation = "operation"
|
||||
opParamToMoney = "to_money"
|
||||
@@ -175,6 +175,7 @@ func (c *ledgerClient) CreateTransaction(ctx context.Context, tx rail.LedgerTx)
|
||||
if money.GetCurrency() == "" || money.GetAmount() == "" {
|
||||
return "", merrors.InvalidArgument("ledger: amount is required")
|
||||
}
|
||||
tx = normalizeLedgerTxRails(tx)
|
||||
|
||||
description := strings.TrimSpace(tx.Description)
|
||||
metadata := ledgerTxMetadata(tx.Metadata, tx)
|
||||
@@ -849,7 +850,17 @@ func (c *ledgerClient) callContext(ctx context.Context) (context.Context, contex
|
||||
}
|
||||
|
||||
func isLedgerRail(value string) bool {
|
||||
return strings.EqualFold(strings.TrimSpace(value), ledgerRailName)
|
||||
return normalizeRail(value) == ledgerRailName
|
||||
}
|
||||
|
||||
func normalizeLedgerTxRails(tx rail.LedgerTx) rail.LedgerTx {
|
||||
tx.FromRail = normalizeRail(tx.FromRail)
|
||||
tx.ToRail = normalizeRail(tx.ToRail)
|
||||
return tx
|
||||
}
|
||||
|
||||
func normalizeRail(value string) string {
|
||||
return discovery.NormalizeRail(value)
|
||||
}
|
||||
|
||||
func cloneMoney(input *moneyv1.Money) *moneyv1.Money {
|
||||
@@ -881,10 +892,10 @@ func ledgerTxMetadata(base map[string]string, tx rail.LedgerTx) map[string]strin
|
||||
if val := strings.TrimSpace(tx.PaymentPlanID); val != "" {
|
||||
meta[txMetaPaymentPlanID] = val
|
||||
}
|
||||
if val := strings.TrimSpace(tx.FromRail); val != "" {
|
||||
if val := normalizeRail(tx.FromRail); val != "" {
|
||||
meta[txMetaFromRail] = val
|
||||
}
|
||||
if val := strings.TrimSpace(tx.ToRail); val != "" {
|
||||
if val := normalizeRail(tx.ToRail); val != "" {
|
||||
meta[txMetaToRail] = val
|
||||
}
|
||||
if val := strings.TrimSpace(tx.ExternalReferenceID); val != "" {
|
||||
|
||||
Reference in New Issue
Block a user