granular fees plans

api/billing/fees/storage/mongo/store/plans.go

@@ -10,10 +10,10 @@ import (
 
 	"github.com/tech/sendico/billing/fees/storage"
 	"github.com/tech/sendico/billing/fees/storage/model"
-	dmath "github.com/tech/sendico/pkg/decimal"
 	"github.com/tech/sendico/pkg/db/repository"
 	"github.com/tech/sendico/pkg/db/repository/builder"
 	ri "github.com/tech/sendico/pkg/db/repository/index"
+	dmath "github.com/tech/sendico/pkg/decimal"
 	"github.com/tech/sendico/pkg/merrors"
 	"github.com/tech/sendico/pkg/mlogger"
 	m "github.com/tech/sendico/pkg/model"
@@ -257,11 +257,46 @@ func normalizeAppliesTo(applies map[string]string) string {
 	sort.Strings(keys)
 	parts := make([]string, 0, len(keys))
 	for _, k := range keys {
-		parts = append(parts, k+"="+applies[k])
+		parts = append(parts, k+"="+normalizeAppliesToValue(applies[k]))
 	}
 	return strings.Join(parts, ",")
 }
 
+func normalizeAppliesToValue(value string) string {
+	trimmed := strings.TrimSpace(value)
+	if trimmed == "" {
+		return ""
+	}
+
+	values := strings.Split(trimmed, ",")
+	seen := make(map[string]struct{}, len(values))
+	normalized := make([]string, 0, len(values))
+	hasWildcard := false
+	for _, value := range values {
+		value = strings.TrimSpace(value)
+		if value == "" {
+			continue
+		}
+		if value == "*" {
+			hasWildcard = true
+			continue
+		}
+		if _, ok := seen[value]; ok {
+			continue
+		}
+		seen[value] = struct{}{}
+		normalized = append(normalized, value)
+	}
+	if hasWildcard {
+		return "*"
+	}
+	if len(normalized) == 0 {
+		return ""
+	}
+	sort.Strings(normalized)
+	return strings.Join(normalized, ",")
+}
+
 func (p *plansStore) ensureNoOverlap(ctx context.Context, plan *model.FeePlan) error {
 	if plan == nil || !plan.Active {
 		return nil