tech/sendico
2
0
Fork 0
Code Issues 32 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fixed mntx op provisioning' (#405) from tg-403 into main
All checks were successful
ci/woodpecker/push/payments_orchestrator Pipeline was successful
Details
ci/woodpecker/push/gateway_mntx Pipeline was successful
Details

Browse Source 
Reviewed-on: #405
This commit was merged in pull request #405.
This commit is contained in:
tech
2026-02-04 10:59:36 +00:00
parent 6198ceb9a4 571cea3b37
commit e1c439fb85
26 changed files with 59 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.woodpecker/bff.yml
View File

@@ -14,7 +14,7 @@ when:
- api/server/**
- api/proto/**
- api/pkg/**
ignore_message: '[REBUILD]'
ignore_message: '[rebuild]'
steps:
- name: version

2
.woodpecker/billing_documents.yml
View File

@@ -13,7 +13,7 @@ when:
- api/billing/documents/**
- api/proto/**
- api/pkg/**
ignore_message: '[REBUILD]'
ignore_message: '[rebuild]'
steps:
- name: version

2
.woodpecker/billing_fees.yml
View File

@@ -13,7 +13,7 @@ when:
- api/billing/fees/**
- api/proto/**
- api/pkg/**
ignore_message: '[REBUILD]'
ignore_message: '[rebuild]'
steps:
- name: version

3
.woodpecker/db.yml
View File

@@ -1,6 +1,9 @@
when:
- event: push
branch: main
path:
exclude: ['**']
ignore_message: '[infra]'
steps:
- name: version

2
.woodpecker/discovery.yml
View File

@@ -12,7 +12,7 @@ when:
- api/discovery/**
- api/proto/**
- api/pkg/**
ignore_message: '[REBUILD]'
ignore_message: '[rebuild]'
steps:
- name: version

2
.woodpecker/frontend.yml
View File

@@ -13,7 +13,7 @@ when:
- api/pkg/**
- api/proto/**
- frontend/**
ignore_message: '[REBUILD]'
ignore_message: '[rebuild]'
steps:
- name: version

2
.woodpecker/fx_ingestor.yml
View File

@@ -17,7 +17,7 @@ when:
- api/fx/storage/**
- api/proto/**
- api/pkg/**
ignore_message: '[REBUILD]'
ignore_message: '[rebuild]'
steps:
- name: version

2
.woodpecker/fx_oracle.yml
View File

@@ -17,7 +17,7 @@ when:
- api/fx/storage/**
- api/proto/**
- api/pkg/**
ignore_message: '[REBUILD]'
ignore_message: '[rebuild]'
steps:

2
.woodpecker/gateway_chain.yml
View File

@@ -16,7 +16,7 @@ when:
- api/gateway/chain/**
- api/proto/**
- api/pkg/**
ignore_message: '[REBUILD]'
ignore_message: '[rebuild]'
steps:
- name: version

2
.woodpecker/gateway_mntx.yml
View File

@@ -15,7 +15,7 @@ when:
- api/gateway/mntx/**
- api/proto/**
- api/pkg/**
ignore_message: '[REBUILD]'
ignore_message: '[rebuild]'
steps:
- name: version

2
.woodpecker/gateway_tgsettle.yml
View File

@@ -13,7 +13,7 @@ when:
- api/gateway/tgsettle/**
- api/proto/**
- api/pkg/**
ignore_message: '[REBUILD]'
ignore_message: '[rebuild]'
steps:
- name: version

2
.woodpecker/gateway_tron.yml
View File

@@ -16,7 +16,7 @@ when:
- api/gateway/tron/**
- api/proto/**
- api/pkg/**
ignore_message: '[REBUILD]'
ignore_message: '[rebuild]'
steps:
- name: version

2
.woodpecker/ledger.yml
View File

@@ -13,7 +13,7 @@ when:
- api/ledger/**
- api/proto/**
- api/pkg/**
ignore_message: '[REBUILD]'
ignore_message: '[rebuild]'
steps:
- name: version

4
.woodpecker/nats.yml
View File

@@ -1,6 +1,10 @@
when:
- event: push
branch: main
path:
exclude: ['**']
ignore_message: '[infra]'
steps:
- name: version

2
.woodpecker/notification.yml
View File

@@ -16,7 +16,7 @@ when:
- api/notification/**
- api/proto/**
- api/pkg/**
ignore_message: '[REBUILD]'
ignore_message: '[rebuild]'
steps:
- name: version

2
.woodpecker/payments_orchestrator.yml
View File

@@ -13,7 +13,7 @@ when:
- api/payments/orchestrator/**
- api/proto/**
- api/pkg/**
ignore_message: '[REBUILD]'
ignore_message: '[rebuild]'
steps:
- name: version

4
api/gateway/mntx/client/client.go
View File

@@ -151,7 +151,9 @@ func operationFromCardPayout(req *mntxv1.CardPayoutRequest) (*connectorv1.Operat
money := moneyFromMinor(req.GetAmountMinor(), req.GetCurrency())
op := &connectorv1.Operation{
Type: connectorv1.OperationType_PAYOUT,
IdempotencyKey: strings.TrimSpace(req.GetPayoutId()),
IdempotencyKey: strings.TrimSpace(req.GetIdempotencyKey()),
OperationRef: strings.TrimSpace(req.GetOperationRef()),
IntentRef: strings.TrimSpace(req.GetIntentRef()),
Money: money,
Params: structFromMap(params),
}

2
api/gateway/mntx/config.dev.yml
View File

@@ -48,7 +48,7 @@ monetix:
gateway:
id: "monetix"
is_enabled: true
network: "VISA_DIRECT"
network: "MIR"
currencies: ["RUB"]
limits:
min_amount: "0"

2
api/gateway/mntx/config.yml
View File

@@ -48,7 +48,7 @@ monetix:
gateway:
id: "monetix"
is_enabled: true
network: "VISA_DIRECT"
network: "MIR"
currencies: ["RUB"]
limits:
min_amount: "0"

4
api/gateway/mntx/internal/service/gateway/card_processor.go
View File

@@ -129,6 +129,8 @@ func (p *cardPayoutProcessor) Submit(ctx context.Context, req *mntxv1.CardPayout
zap.String("customer_id", state.CustomerID),
zap.String("operation_ref", state.OperationRef),
zap.String("idempotency_key", state.IdempotencyKey),
zap.String("operation_ref", state.OperationRef),
zap.String("intent_ref", state.IntentRef),
)
}
@@ -138,6 +140,8 @@ func (p *cardPayoutProcessor) Submit(ctx context.Context, req *mntxv1.CardPayout
zap.String("customer_id", state.CustomerID),
zap.String("operation_ref", state.OperationRef),
zap.String("idempotency_key", state.IdempotencyKey),
zap.String("operation_ref", state.OperationRef),
zap.String("intent_ref", state.IntentRef),
)
return nil, err

21
api/gateway/mntx/internal/service/gateway/connector.go
View File

@@ -49,9 +49,18 @@ func (s *Service) SubmitOperation(ctx context.Context, req *connectorv1.SubmitOp
return &connectorv1.SubmitOperationResponse{Receipt: &connectorv1.OperationReceipt{Error: connectorError(connectorv1.ErrorCode_INVALID_PARAMS, "submit_operation: operation is required", nil, "")}}, nil
}
op := req.GetOperation()
if strings.TrimSpace(op.GetIdempotencyKey()) == "" {
idempotencyKey := strings.TrimSpace(op.GetIdempotencyKey())
if idempotencyKey == "" {
return &connectorv1.SubmitOperationResponse{Receipt: &connectorv1.OperationReceipt{Error: connectorError(connectorv1.ErrorCode_INVALID_PARAMS, "submit_operation: idempotency_key is required", op, "")}}, nil
}
operationRef := strings.TrimSpace(op.GetOperationRef())
if operationRef == "" {
return &connectorv1.SubmitOperationResponse{Receipt: &connectorv1.OperationReceipt{Error: connectorError(connectorv1.ErrorCode_INVALID_PARAMS, "submit_operation: operation_ref is required", op, "")}}, nil
}
intentRef := strings.TrimSpace(op.GetIntentRef())
if intentRef == "" {
return &connectorv1.SubmitOperationResponse{Receipt: &connectorv1.OperationReceipt{Error: connectorError(connectorv1.ErrorCode_INVALID_PARAMS, "submit_operation: intent_ref is required", op, "")}}, nil
}
if op.GetType() != connectorv1.OperationType_PAYOUT {
return &connectorv1.SubmitOperationResponse{Receipt: &connectorv1.OperationReceipt{Error: connectorError(connectorv1.ErrorCode_UNSUPPORTED_OPERATION, "submit_operation: unsupported operation type", op, "")}}, nil
}
@@ -73,7 +82,8 @@ func (s *Service) SubmitOperation(ctx context.Context, req *connectorv1.SubmitOp
}
return &connectorv1.SubmitOperationResponse{Receipt: payoutReceipt(resp.GetPayout())}, nil
}
resp, err := s.CreateCardPayout(ctx, buildCardPayoutRequestFromParams(reader, payoutID, amountMinor, currency))
cr := buildCardPayoutRequestFromParams(reader, payoutID, idempotencyKey, operationRef, intentRef, amountMinor, currency)
resp, err := s.CreateCardPayout(ctx, cr)
if err != nil {
return &connectorv1.SubmitOperationResponse{Receipt: &connectorv1.OperationReceipt{Error: connectorError(mapErrorCode(err), err.Error(), op, "")}}, nil
}
@@ -183,7 +193,9 @@ func buildCardTokenPayoutRequestFromParams(reader params.Reader, payoutID string
return req
}
func buildCardPayoutRequestFromParams(reader params.Reader, payoutID string, amountMinor int64, currency string) *mntxv1.CardPayoutRequest {
func buildCardPayoutRequestFromParams(reader params.Reader,
payoutID, idempotencyKey, operationRef, intentRef string,
amountMinor int64, currency string) *mntxv1.CardPayoutRequest {
return &mntxv1.CardPayoutRequest{
PayoutId: payoutID,
ProjectId: readerInt64(reader, "project_id"),
@@ -204,6 +216,9 @@ func buildCardPayoutRequestFromParams(reader params.Reader, payoutID string, amo
CardExpMonth: uint32(readerInt64(reader, "card_exp_month")),
CardHolder: strings.TrimSpace(reader.String("card_holder")),
Metadata: reader.StringMap("metadata"),
OperationRef: operationRef,
IdempotencyKey: idempotencyKey,
IntentRef: intentRef,
}
}

10
api/gateway/mntx/internal/service/gateway/transfer_notifications.go
View File

@@ -11,7 +11,6 @@ import (
"github.com/tech/sendico/pkg/mutil/mzap"
"github.com/tech/sendico/pkg/payments/rail"
paytypes "github.com/tech/sendico/pkg/payments/types"
gatewayv1 "github.com/tech/sendico/pkg/proto/common/gateway/v1"
"go.uber.org/zap"
)
@@ -37,15 +36,6 @@ func toOpStatus(t *model.CardPayout) rail.OperationResult {
}
}
func toError(t *model.CardPayout) *gatewayv1.OperationError {
if t.Status == model.PayoutStatusSuccess {
return nil
}
return &gatewayv1.OperationError{
Message: t.FailureReason,
}
}
func (p *cardPayoutProcessor) updatePayoutStatus(ctx context.Context, state *model.CardPayout) error {
if err := p.store.Payouts().Upsert(ctx, state); err != nil {
p.logger.Warn("Failed to update transfer status", zap.String("transfer_ref", state.PayoutID), zap.String("status", string(state.Status)), zap.Error(err))

7
api/payments/orchestrator/internal/service/orchestrator/card_payout_submit.go
View File

@@ -13,7 +13,7 @@ import (
"go.uber.org/zap"
)
func (s *Service) submitCardPayout(ctx context.Context, payment *model.Payment) error {
func (s *Service) submitCardPayout(ctx context.Context, operationRef string, payment *model.Payment) error {
if payment == nil {
return merrors.InvalidArgument("payment is required")
}
@@ -133,6 +133,8 @@ func (s *Service) submitCardPayout(ctx context.Context, payment *model.Payment)
CardExpMonth: card.ExpMonth,
CardHolder: holder,
Metadata: meta,
IntentRef: payment.Intent.Ref,
OperationRef: operationRef,
}
resp, err := s.deps.mntx.client.CreateCardPayout(ctx, req)
if err != nil {
@@ -173,7 +175,8 @@ func (s *Service) submitCardPayout(ctx context.Context, payment *model.Payment)
updateExecutionPlanTotalNetworkFee(plan)
}
s.logger.Info("card payout submitted", zap.String("payment_ref", payment.PaymentRef), zap.String("payout_id", exec.CardPayoutRef))
s.logger.Info("card payout submitted", zap.String("payment_ref", payment.PaymentRef),
zap.String("payout_id", exec.CardPayoutRef), zap.String("operation_ref", state.OperationRef))
return nil
}

2
api/payments/orchestrator/internal/service/orchestrator/card_payout_test.go
View File

@@ -281,7 +281,7 @@ func TestSubmitCardPayout_UsesSettlementAmount(t *testing.T) {
},
}
if err := svc.submitCardPayout(ctx, payment); err != nil {
if err := svc.submitCardPayout(ctx, "op-ref", payment); err != nil {
t.Fatalf("submitCardPayout error: %v", err)
}

6
api/payments/orchestrator/internal/service/orchestrator/handlers_events.go
View File

@@ -20,12 +20,12 @@ type paymentEventHandler struct {
repo storage.Repository
ensureRepo func(ctx context.Context) error
logger mlogger.Logger
submitCardPayout func(ctx context.Context, payment *model.Payment) error
submitCardPayout func(ctx context.Context, operationRef string, payment *model.Payment) error
resumePlan func(ctx context.Context, store storage.PaymentsStore, payment *model.Payment) error
releaseHold func(ctx context.Context, store storage.PaymentsStore, payment *model.Payment) error
}
func newPaymentEventHandler(repo storage.Repository, ensure func(ctx context.Context) error, logger mlogger.Logger, submitCardPayout func(ctx context.Context, payment *model.Payment) error, resumePlan func(ctx context.Context, store storage.PaymentsStore, payment *model.Payment) error, releaseHold func(ctx context.Context, store storage.PaymentsStore, payment *model.Payment) error) *paymentEventHandler {
func newPaymentEventHandler(repo storage.Repository, ensure func(ctx context.Context) error, logger mlogger.Logger, submitCardPayout func(ctx context.Context, operationRef string, payment *model.Payment) error, resumePlan func(ctx context.Context, store storage.PaymentsStore, payment *model.Payment) error, releaseHold func(ctx context.Context, store storage.PaymentsStore, payment *model.Payment) error) *paymentEventHandler {
return &paymentEventHandler{
repo: repo,
ensureRepo: ensure,
@@ -140,7 +140,7 @@ func (h *paymentEventHandler) processTransferUpdate(ctx context.Context, req *or
payment.State = model.PaymentStateFundsReserved
if h.submitCardPayout == nil {
h.logger.Warn("card payout execution skipped", zap.String("payment_ref", payment.PaymentRef))
} else if err := h.submitCardPayout(ctx, payment); err != nil {
} else if err := h.submitCardPayout(ctx, transfer.GetOperationRef(), payment); err != nil {
payment.State = model.PaymentStateFailed
payment.FailureCode = model.PaymentFailureCodePolicy
payment.FailureReason = strings.TrimSpace(err.Error())

3
api/payments/orchestrator/internal/service/orchestrator/service_test.go
View File

@@ -269,7 +269,7 @@ func TestProcessTransferUpdateHandler_CardFundingWaitsForSources(t *testing.T) {
}
payoutCalls := 0
submit := func(ctx context.Context, payment *model.Payment) error {
submit := func(ctx context.Context, operationRef string, payment *model.Payment) error {
payoutCalls++
if payment.Execution == nil {
payment.Execution = &model.ExecutionRefs{}
@@ -279,6 +279,7 @@ func TestProcessTransferUpdateHandler_CardFundingWaitsForSources(t *testing.T) {
step := ensureExecutionStep(plan, stepCodeCardPayout)
setExecutionStepRole(step, executionStepRoleConsumer)
step.TransferRef = "payout-1"
step.OperationRef = operationRef
setExecutionStepStatus(step, model.OperationStateWaiting)
return nil
}