Merge pull request 'improved message handling' (#402) from mntx-401 into main

Reviewed-on: #402

api/gateway/mntx/internal/service/gateway/card_processor.go

@@ -90,6 +90,7 @@ func (p *cardPayoutProcessor) Submit(ctx context.Context, req *mntxv1.CardPayout
 		PayoutID:       strings.TrimSpace(req.GetPayoutId()),
 		OperationRef:   strings.TrimSpace(req.GetOperationRef()),
 		IdempotencyKey: strings.TrimSpace(req.GetIdempotencyKey()),
+		IntentRef:      strings.TrimSpace(req.GetIntentRef()),
 		ProjectID:      projectID,
 		CustomerID:     strings.TrimSpace(req.GetCustomerId()),
 		AmountMinor:    req.GetAmountMinor(),

api/payments/orchestrator/internal/service/orchestrator/payment_plan_card.go

@@ -113,6 +113,8 @@ func (p *paymentExecutor) submitCardPayoutPlan(ctx context.Context, payment *mod
 			MaskedPan:          strings.TrimSpace(card.MaskedPan),
 			Metadata:           meta,
 			OperationRef:       operationRef,
+			IntentRef:          payment.Intent.Ref,
+			IdempotencyKey:     payment.IdempotencyKey,
 		}
 		resp, err := p.deps.mntx.client.CreateCardTokenPayout(ctx, req)
 		if err != nil {
@@ -139,6 +141,9 @@ func (p *paymentExecutor) submitCardPayoutPlan(ctx context.Context, payment *mod
 			CardExpMonth:       card.ExpMonth,
 			CardHolder:         holder,
 			Metadata:           meta,
+			OperationRef:       operationRef,
+			IntentRef:          payment.Intent.Ref,
+			IdempotencyKey:     payment.IdempotencyKey,
 		}
 		resp, err := p.deps.mntx.client.CreateCardPayout(ctx, req)
 		if err != nil {