Fixes + stable gateway ids

api/payments/orchestrator/internal/service/plan_builder/gateways.go

@@ -107,9 +107,6 @@ func selectGateway(ctx context.Context, registry GatewayRegistry, rail model.Rai
 	eligible := make([]*model.GatewayInstanceDescriptor, 0)
 	var lastErr error
 	for _, gw := range all {
-		if instanceID != "" && !strings.EqualFold(strings.TrimSpace(gw.InstanceID), instanceID) {
-			continue
-		}
 		if err := isGatewayEligible(gw, rail, network, currency, action, dir, amt); err != nil {
 			lastErr = err
 			continue
@@ -125,6 +122,13 @@ func selectGateway(ctx context.Context, registry GatewayRegistry, rail model.Rai
 	sort.Slice(eligible, func(i, j int) bool {
 		return eligible[i].ID < eligible[j].ID
 	})
+	if instanceID != "" {
+		for _, gw := range eligible {
+			if strings.EqualFold(strings.TrimSpace(gw.InstanceID), instanceID) {
+				return gw, nil
+			}
+		}
+	}
 	return eligible[0], nil
 }
 

api/payments/orchestrator/internal/service/plan_builder/plans.go

@@ -14,11 +14,12 @@ func buildFXConversionPlan(payment *model.Payment) (*model.PaymentPlan, error) {
 		return nil, merrors.InvalidArgument("plan builder: payment is required")
 	}
 	step := &model.PaymentStep{
-		StepID:       "fx_convert",
-		Rail:         model.RailLedger,
-		Action:       model.RailOperationFXConvert,
-		CommitPolicy: model.CommitPolicyImmediate,
-		Amount:       cloneMoney(payment.Intent.Amount),
+		StepID:           "fx_convert",
+		Rail:             model.RailLedger,
+		Action:           model.RailOperationFXConvert,
+		ReportVisibility: model.ReportVisibilityUser,
+		CommitPolicy:     model.CommitPolicyImmediate,
+		Amount:           cloneMoney(payment.Intent.Amount),
 	}
 	return &model.PaymentPlan{
 		ID:             payment.PaymentRef,

api/payments/orchestrator/internal/service/plan_builder/steps.go

@@ -131,6 +131,7 @@ func (b *defaultPlanBuilder) buildPlanFromTemplate(ctx context.Context, payment
 			StepID:       stepID,
 			Rail:         tpl.Rail,
 			Action:       action,
+			ReportVisibility: tpl.ReportVisibility,
 			DependsOn:    cloneStringList(tpl.DependsOn),
 			CommitPolicy: policy,
 			CommitAfter:  cloneStringList(tpl.CommitAfter),
@@ -178,6 +179,7 @@ func (b *defaultPlanBuilder) buildPlanFromTemplate(ctx context.Context, payment
 			}
 			step.GatewayID = strings.TrimSpace(gw.ID)
 			step.InstanceID = strings.TrimSpace(gw.InstanceID)
+			step.GatewayInvokeURI = strings.TrimSpace(gw.InvokeURI)
 		}
 
 		logger.Debug("Plan step added",

api/payments/orchestrator/internal/service/plan_builder/templates.go

@@ -155,6 +155,12 @@ func validatePlanTemplate(logger mlogger.Logger, template *model.PaymentPlanTemp
 				zap.Int("step_index", idx))
 			return merrors.InvalidArgument("plan builder: plan template operation is required")
 		}
+		if !model.IsValidReportVisibility(step.ReportVisibility) {
+			logger.Warn("Plan template step has invalid report visibility",
+				zap.String("step_id", id),
+				zap.String("report_visibility", string(step.ReportVisibility)))
+			return merrors.InvalidArgument("plan builder: plan template report visibility is invalid")
+		}
 		action, err := actionForOperation(step.Operation)
 		if err != nil {
 			logger.Warn("Plan template step has invalid operation", zap.String("step_id", id),