Merge pull request 'config fix' (#80) from discovery-79 into main

Reviewed-on: #80

api/server/config.yml

@@ -91,7 +91,7 @@ api:
     insecure: true
   payment_orchestrator:
     address: sendico_payment_orchestrator:50062
-    address_env: PAYMENT_ORCHESTRATOR_ADDRESS
+    address_env: PAYMENTS_ADDRESS
     dial_timeout_seconds: 5
     call_timeout_seconds: 5
     insecure: true

api/server/interface/api/srequest/payment_intent.go

@@ -15,6 +15,12 @@ type PaymentIntent struct {
 	Attributes     map[string]string `json:"attributes,omitempty"`
 }
 
+type AssetResolverStub struct{}
+
+func (a *AssetResolverStub) IsSupported(_ string) bool {
+	return true
+}
+
 func (p *PaymentIntent) Validate() error {
 	// Kind must be set (non-zero)
 	var zeroKind PaymentKind
@@ -33,7 +39,8 @@ func (p *PaymentIntent) Validate() error {
 	if p.Amount == nil {
 		return merrors.InvalidArgument("amount is required", "intent.amount")
 	}
-	if err := ValidateMoney(p.Amount); err != nil {
+	//TODO: collect supported currencies and validate against them
+	if err := ValidateMoney(p.Amount, &AssetResolverStub{}); err != nil {
 		return err
 	}
 

api/server/interface/api/srequest/payment_value_objects.go

@@ -1,30 +1,76 @@
 package srequest
 
 import (
+	"regexp"
+	"strings"
+
 	"github.com/shopspring/decimal"
 	"github.com/tech/sendico/pkg/merrors"
 	"github.com/tech/sendico/pkg/model"
 )
 
-func ValidateMoney(m *model.Money) error {
+// AssetResolver defines environment-specific supported assets.
-	if m.Amount == "" {
+// Implementations should check:
+// - fiat assets (ISO-4217)
+// - crypto assets supported by gateways / FX providers
+type AssetResolver interface {
+	IsSupported(ticker string) bool
+}
+
+// Precompile regex for efficiency.
+var currencySyntax = regexp.MustCompile(`^[A-Z0-9]{2,10}$`)
+
+func ValidateMoney(m *model.Money, assetResolver AssetResolver) error {
+	if m == nil {
+		return merrors.InvalidArgument("money is required", "intent.amount")
+	}
+
+	//
+	// 1) Basic presence
+	//
+	if strings.TrimSpace(m.Amount) == "" {
 		return merrors.InvalidArgument("amount is required", "intent.amount")
 	}
-	if m.Currency == "" {
+	if strings.TrimSpace(m.Currency) == "" {
 		return merrors.InvalidArgument("currency is required", "intent.currency")
 	}
 
-	if _, err := decimal.NewFromString(m.Amount); err != nil {
+	//
-		return merrors.InvalidArgument("invalid amount decimal", "intent.amount")
+	// 2) Validate decimal amount
+	//
+	amount, err := decimal.NewFromString(m.Amount)
+	if err != nil {
+		return merrors.InvalidArgument("invalid decimal amount", "intent.amount")
 	}
 
-	if len(m.Currency) != 3 {
+	if amount.IsNegative() {
-		return merrors.InvalidArgument("currency must be 3 letters", "intent.currency")
+		return merrors.InvalidArgument("amount must be >= 0", "intent.amount")
 	}
-	for _, c := range m.Currency {
+
-		if c < 'A' || c > 'Z' {
+	//
-			return merrors.InvalidArgument("currency must be uppercase A-Z", "intent.currency")
+	// 3) Normalize currency
+	//
+	cur := strings.ToUpper(strings.TrimSpace(m.Currency))
+
+	//
+	// 4) Syntax validation first — reject malformed tickers early
+	//
+	if !currencySyntax.MatchString(cur) {
+		return merrors.InvalidArgument(
+			"invalid currency format (must be A–Z0–9, length 2–10)",
+			"intent.currency",
+		)
 	}
+
+	//
+	// 5) Dictionary / environment validation
+	//
+	if assetResolver == nil {
+		return merrors.InvalidArgument("asset resolver is not configured", "intent.currency")
+	}
+
+	if !assetResolver.IsSupported(cur) {
+		return merrors.InvalidArgument("unsupported currency/asset", "intent.currency")
 	}
 
 	return nil

ci/prod/compose/bff.yml

@@ -31,6 +31,7 @@ services:
       NATS_PASSWORD: ${NATS_PASSWORD}
       CHAIN_GATEWAY_ADDRESS: ${CHAIN_GATEWAY_SERVICE_NAME}:${CHAIN_GATEWAY_GRPC_PORT}
       LEDGER_ADDRESS: ${LEDGER_SERVICE_NAME}:${LEDGER_GRPC_PORT}
+      PAYMENTS_ADDRESS: ${PAYMENTS_SERVICE_NAME}:${PAYMENTS_GRPC_PORT}
       MONGO_HOST: ${MONGO_HOST}
       MONGO_PORT: ${MONGO_PORT}
       MONGO_DATABASE: ${MONGO_DATABASE}

frontend/pshared/lib/models/resources.dart

@@ -82,6 +82,9 @@ enum ResourceType {
   @JsonValue('payment_methods')
   paymentMethods,
 
+  @JsonValue('payment_orchestrator')
+  paymentOrchestrator,
+
   /// Represents permissions service
   @JsonValue('permissions')
   permissions,