mntx dev env

2026-01-30 15:45:50 +01:00
parent 51f5b0804a
commit 0e7f6ac9b2
6 changed files with 162 additions and 41 deletions
--- a/api/gateway/mntx/client/client.go
+++ b/api/gateway/mntx/client/client.go
@@ -7,8 +7,9 @@ import (

 	"github.com/shopspring/decimal"
 	"github.com/tech/sendico/pkg/merrors"
-	connectorv1 "github.com/tech/sendico/pkg/proto/connector/v1"
+	pmodel "github.com/tech/sendico/pkg/model"
 	moneyv1 "github.com/tech/sendico/pkg/proto/common/money/v1"
+	connectorv1 "github.com/tech/sendico/pkg/proto/connector/v1"
 	mntxv1 "github.com/tech/sendico/pkg/proto/gateway/mntx/v1"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
@@ -52,7 +53,7 @@ func New(ctx context.Context, cfg Config, opts ...grpc.DialOption) (Client, erro

 	conn, err := grpc.DialContext(dialCtx, cfg.Address, dialOpts...)
 	if err != nil {
-		return nil, merrors.Internal("mntx: dial failed: "+err.Error())
+		return nil, merrors.Internal("mntx: dial failed: " + err.Error())
 	}

 	return &gatewayClient{
@@ -148,12 +149,14 @@ func operationFromCardPayout(req *mntxv1.CardPayoutRequest) (*connectorv1.Operat
 	}
 	params := payoutParamsFromCard(req)
 	money := moneyFromMinor(req.GetAmountMinor(), req.GetCurrency())
-	return &connectorv1.Operation{
+	op := &connectorv1.Operation{
 		Type:           connectorv1.OperationType_PAYOUT,
 		IdempotencyKey: strings.TrimSpace(req.GetPayoutId()),
 		Money:          money,
 		Params:         structFromMap(params),
-	}, nil
+	}
+	setOperationRolesFromMetadata(op, req.GetMetadata())
+	return op, nil
 }

 func operationFromTokenPayout(req *mntxv1.CardTokenPayoutRequest) (*connectorv1.Operation, error) {
@@ -162,34 +165,52 @@ func operationFromTokenPayout(req *mntxv1.CardTokenPayoutRequest) (*connectorv1.
 	}
 	params := payoutParamsFromToken(req)
 	money := moneyFromMinor(req.GetAmountMinor(), req.GetCurrency())
-	return &connectorv1.Operation{
+	op := &connectorv1.Operation{
 		Type:           connectorv1.OperationType_PAYOUT,
 		IdempotencyKey: strings.TrimSpace(req.GetPayoutId()),
 		Money:          money,
 		Params:         structFromMap(params),
-	}, nil
+	}
+	setOperationRolesFromMetadata(op, req.GetMetadata())
+	return op, nil
+}
+
+func setOperationRolesFromMetadata(op *connectorv1.Operation, metadata map[string]string) {
+	if op == nil || len(metadata) == 0 {
+		return
+	}
+	if raw := strings.TrimSpace(metadata[pmodel.MetadataKeyFromRole]); raw != "" {
+		if role, ok := pmodel.Parse(raw); ok && role != "" {
+			op.FromRole = pmodel.ToProto(role)
+		}
+	}
+	if raw := strings.TrimSpace(metadata[pmodel.MetadataKeyToRole]); raw != "" {
+		if role, ok := pmodel.Parse(raw); ok && role != "" {
+			op.ToRole = pmodel.ToProto(role)
+		}
+	}
 }

 func payoutParamsFromCard(req *mntxv1.CardPayoutRequest) map[string]interface{} {
 	params := map[string]interface{}{
-		"payout_id":           strings.TrimSpace(req.GetPayoutId()),
-		"project_id":          req.GetProjectId(),
-		"customer_id":         strings.TrimSpace(req.GetCustomerId()),
-		"customer_first_name": strings.TrimSpace(req.GetCustomerFirstName()),
+		"payout_id":            strings.TrimSpace(req.GetPayoutId()),
+		"project_id":           req.GetProjectId(),
+		"customer_id":          strings.TrimSpace(req.GetCustomerId()),
+		"customer_first_name":  strings.TrimSpace(req.GetCustomerFirstName()),
 		"customer_middle_name": strings.TrimSpace(req.GetCustomerMiddleName()),
-		"customer_last_name":  strings.TrimSpace(req.GetCustomerLastName()),
-		"customer_ip":         strings.TrimSpace(req.GetCustomerIp()),
-		"customer_zip":        strings.TrimSpace(req.GetCustomerZip()),
-		"customer_country":    strings.TrimSpace(req.GetCustomerCountry()),
-		"customer_state":      strings.TrimSpace(req.GetCustomerState()),
-		"customer_city":       strings.TrimSpace(req.GetCustomerCity()),
-		"customer_address":    strings.TrimSpace(req.GetCustomerAddress()),
-		"amount_minor":        req.GetAmountMinor(),
-		"currency":            strings.TrimSpace(req.GetCurrency()),
-		"card_pan":            strings.TrimSpace(req.GetCardPan()),
+		"customer_last_name":   strings.TrimSpace(req.GetCustomerLastName()),
+		"customer_ip":          strings.TrimSpace(req.GetCustomerIp()),
+		"customer_zip":         strings.TrimSpace(req.GetCustomerZip()),
+		"customer_country":     strings.TrimSpace(req.GetCustomerCountry()),
+		"customer_state":       strings.TrimSpace(req.GetCustomerState()),
+		"customer_city":        strings.TrimSpace(req.GetCustomerCity()),
+		"customer_address":     strings.TrimSpace(req.GetCustomerAddress()),
+		"amount_minor":         req.GetAmountMinor(),
+		"currency":             strings.TrimSpace(req.GetCurrency()),
+		"card_pan":             strings.TrimSpace(req.GetCardPan()),
 		"card_exp_year":        req.GetCardExpYear(),
 		"card_exp_month":       req.GetCardExpMonth(),
-		"card_holder":         strings.TrimSpace(req.GetCardHolder()),
+		"card_holder":          strings.TrimSpace(req.GetCardHolder()),
 	}
 	if len(req.GetMetadata()) > 0 {
 		params["metadata"] = mapStringToInterface(req.GetMetadata())
@@ -199,23 +220,23 @@ func payoutParamsFromCard(req *mntxv1.CardPayoutRequest) map[string]interface{}

 func payoutParamsFromToken(req *mntxv1.CardTokenPayoutRequest) map[string]interface{} {
 	params := map[string]interface{}{
-		"payout_id":           strings.TrimSpace(req.GetPayoutId()),
-		"project_id":          req.GetProjectId(),
-		"customer_id":         strings.TrimSpace(req.GetCustomerId()),
-		"customer_first_name": strings.TrimSpace(req.GetCustomerFirstName()),
+		"payout_id":            strings.TrimSpace(req.GetPayoutId()),
+		"project_id":           req.GetProjectId(),
+		"customer_id":          strings.TrimSpace(req.GetCustomerId()),
+		"customer_first_name":  strings.TrimSpace(req.GetCustomerFirstName()),
 		"customer_middle_name": strings.TrimSpace(req.GetCustomerMiddleName()),
-		"customer_last_name":  strings.TrimSpace(req.GetCustomerLastName()),
-		"customer_ip":         strings.TrimSpace(req.GetCustomerIp()),
-		"customer_zip":        strings.TrimSpace(req.GetCustomerZip()),
-		"customer_country":    strings.TrimSpace(req.GetCustomerCountry()),
-		"customer_state":      strings.TrimSpace(req.GetCustomerState()),
-		"customer_city":       strings.TrimSpace(req.GetCustomerCity()),
-		"customer_address":    strings.TrimSpace(req.GetCustomerAddress()),
-		"amount_minor":        req.GetAmountMinor(),
-		"currency":            strings.TrimSpace(req.GetCurrency()),
-		"card_token":          strings.TrimSpace(req.GetCardToken()),
-		"card_holder":         strings.TrimSpace(req.GetCardHolder()),
-		"masked_pan":          strings.TrimSpace(req.GetMaskedPan()),
+		"customer_last_name":   strings.TrimSpace(req.GetCustomerLastName()),
+		"customer_ip":          strings.TrimSpace(req.GetCustomerIp()),
+		"customer_zip":         strings.TrimSpace(req.GetCustomerZip()),
+		"customer_country":     strings.TrimSpace(req.GetCustomerCountry()),
+		"customer_state":       strings.TrimSpace(req.GetCustomerState()),
+		"customer_city":        strings.TrimSpace(req.GetCustomerCity()),
+		"customer_address":     strings.TrimSpace(req.GetCustomerAddress()),
+		"amount_minor":         req.GetAmountMinor(),
+		"currency":             strings.TrimSpace(req.GetCurrency()),
+		"card_token":           strings.TrimSpace(req.GetCardToken()),
+		"card_holder":          strings.TrimSpace(req.GetCardHolder()),
+		"masked_pan":           strings.TrimSpace(req.GetMaskedPan()),
 	}
 	if len(req.GetMetadata()) > 0 {
 		params["metadata"] = mapStringToInterface(req.GetMetadata())