Orchestrator refactoring + planned amounts

api/payments/orchestrator/internal/server/internal/builders.go

@@ -54,6 +54,7 @@ func buildBatchOptimizationPolicy(cfg optimizerConfig) psvc.BatchOptimizationPol
 			Enabled:  ruleCfg.Enabled,
 			Priority: ruleCfg.Priority,
 			Mode:     psvc.BatchOptimizationMode(strings.TrimSpace(ruleCfg.Mode)),
+			GroupBy:  psvc.BatchOptimizationGrouping(strings.TrimSpace(ruleCfg.GroupBy)),
 			Match: psvc.BatchOptimizationMatch{
 				Rail:       model.ParseRail(ruleCfg.Match.Rail),
 				Providers:  cloneTrimmedSlice(ruleCfg.Match.Providers),

api/payments/orchestrator/internal/server/internal/config.go

@@ -33,6 +33,7 @@ type aggregationRuleConfig struct {
 	Enabled  *bool                  `yaml:"enabled"`
 	Priority int                    `yaml:"priority"`
 	Mode     string                 `yaml:"mode"`
+	GroupBy  string                 `yaml:"group_by"`
 	Match    aggregationMatchConfig `yaml:"match"`
 }