fix: unittests

mark-vass-konghq · mark-vass-konghq · commit 7ecad006ea08 · 2026-07-02T15:58:17.000+02:00
diff --git a/AGENTS.md b/AGENTS.md
@@ -227,6 +227,7 @@ For TypeSpec-specific coding constraints, update `api/spec/AGENTS.md` instead of
 - Do not extract helper functions only to hide a couple of simple operations or short guard checks. If the helper would only wrap 2-4 lines and its name does not add meaningful domain or business intent, keep the code inline even when there is some duplication. Readers can inspect the function body to see what the code does; prefer function names that explain the domain reason for the call over names that merely restate the implementation steps. When you encounter a leftover pass-through wrapper that only calls another function without adding behavior, remove it and call the underlying function directly, even if it is outside the immediate change area.
 - Do not hide non-trivial branching or domain translation inside local inline functions. If a closure performs type switching, validation, persistence mapping, or meaningful domain conversion, make it a named helper near the code that uses it so it is discoverable, testable, and grep-friendly. Reserve inline closures for tiny callbacks where the surrounding API requires a function literal and the logic is obvious at the call site.
 - For `Validate() error` methods, prefer collecting all validation issues into `var errs []error` and returning `models.NewNillableGenericValidationError(errors.Join(errs...))` instead of returning on the first invalid field. Preserve field context with wrapped errors like `fmt.Errorf("field: %w", err)` and use plain `errors.New(...)` for simple local checks.
+- Credit-purchase charges can carry custom ledger currency codes even though standard invoice and settlement currencies stay fiat-only. When persisting credit-purchase charge metadata through shared helpers such as `chargemeta.Create` or `chargemeta.Update`, use the credit-purchase-specific intent validator instead of falling back to generic `meta.Intent.Validate`, which intentionally rejects non-fiat codes.
 - Do not introduce `context.Background()` or `context.TODO()` to sidestep missing context propagation in application code. Either propagate the caller's context through the full call path, or remove the unused `context.Context` parameter from the API if the operation is purely local and does not need cancellation, deadlines, or request-scoped values.
 - Never use `panic` in non-test code paths. If a new failure mode is possible, change the function signature to return an error and propagate it explicitly.
 - In production constructors and initialization, do not use `slog.Default()` as a fallback dependency. Require a `*slog.Logger` in config/provider inputs and inject it explicitly.
diff --git a/openmeter/billing/charges/creditpurchase/adapter/charge.go b/openmeter/billing/charges/creditpurchase/adapter/charge.go
@@ -42,6 +42,7 @@ func (a *adapter) UpdateCharge(ctx context.Context, charge creditpurchase.Charge
 			Intent:              charge.Intent.Intent,
 			IntentMutableFields: charge.Intent.IntentMutableFields.IntentMutableFields,
 			Status:              metaStatus,
+			ValidateIntent:      charge.Intent.Validate,
 		})
 		if err != nil {
 			return creditpurchase.ChargeBase{}, err
@@ -85,6 +86,7 @@ func (a *adapter) CreateCharge(ctx context.Context, in creditpurchase.CreateChar
 			Intent:              in.Intent.Intent,
 			IntentMutableFields: in.Intent.IntentMutableFields.IntentMutableFields,
 			Status:              metaStatus,
+			ValidateIntent:      in.Intent.Validate,
 		})
 		if err != nil {
 			return creditpurchase.Charge{}, err
diff --git a/openmeter/billing/charges/creditpurchase/charge.go b/openmeter/billing/charges/creditpurchase/charge.go
@@ -3,11 +3,13 @@ package creditpurchase
 import (
 	"errors"
 	"fmt"
+	"slices"
 	"time"
 
 	"github.com/alpacahq/alpacadecimal"
 	"github.com/samber/lo"
 
+	"github.com/openmeterio/openmeter/openmeter/billing"
 	"github.com/openmeterio/openmeter/openmeter/billing/charges/meta"
 	"github.com/openmeterio/openmeter/openmeter/billing/charges/models/ledgertransaction"
 	"github.com/openmeterio/openmeter/openmeter/billing/charges/models/payment"
@@ -217,8 +219,30 @@ func (i Intent) CalculateEffectiveAt() time.Time {
 func (i Intent) Validate() error {
 	var errs []error
 
-	if err := i.Intent.Validate(); err != nil {
-		errs = append(errs, fmt.Errorf("intent meta: %w", err))
+	if !slices.Contains(billing.InvoiceLineManagedBy("").Values(), string(i.ManagedBy)) {
+		errs = append(errs, fmt.Errorf("intent meta: invalid managed by %s", i.ManagedBy))
+	}
+
+	if i.CustomerID == "" {
+		errs = append(errs, fmt.Errorf("intent meta: customer ID is required"))
+	}
+
+	if err := i.Currency.ValidateFormat(); err != nil {
+		errs = append(errs, fmt.Errorf("intent meta: currency: %w", err))
+	}
+
+	if err := i.TaxConfig.Validate(); err != nil {
+		errs = append(errs, fmt.Errorf("intent meta: tax config: %w", err))
+	}
+
+	if i.Subscription != nil {
+		if err := i.Subscription.Validate(); err != nil {
+			errs = append(errs, fmt.Errorf("intent meta: subscription: %w", err))
+		}
+	}
+
+	if i.UniqueReferenceID != nil && *i.UniqueReferenceID == "" {
+		errs = append(errs, fmt.Errorf("intent meta: unique reference ID cannot be empty"))
 	}
 
 	if err := i.IntentMutableFields.Validate(); err != nil {
diff --git a/openmeter/billing/charges/creditpurchase/charge_test.go b/openmeter/billing/charges/creditpurchase/charge_test.go
@@ -7,6 +7,8 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/openmeterio/openmeter/openmeter/billing/charges/meta"
+	"github.com/openmeterio/openmeter/openmeter/customer"
+	"github.com/openmeterio/openmeter/pkg/currencyx"
 	"github.com/openmeterio/openmeter/pkg/timeutil"
 )
 
@@ -71,3 +73,18 @@ func TestFeatureFiltersValidateAsFeatureFilter(t *testing.T) {
 		require.Error(t, FeatureFilters([]string{""}).ValidateAsFeatureFilter())
 	})
 }
+
+func TestListFundedCreditActivitiesInputValidateAllowsCustomCurrency(t *testing.T) {
+	currency := currencyx.Code("CREDITS")
+
+	input := ListFundedCreditActivitiesInput{
+		Customer: customer.CustomerID{
+			Namespace: "ns",
+			ID:        "customer-id",
+		},
+		Limit:    1,
+		Currency: &currency,
+	}
+
+	require.NoError(t, input.Validate())
+}
diff --git a/openmeter/billing/charges/creditpurchase/funded_credit_activity.go b/openmeter/billing/charges/creditpurchase/funded_credit_activity.go
@@ -88,7 +88,7 @@ func (i ListFundedCreditActivitiesInput) Validate() error {
 	}
 
 	if i.Currency != nil {
-		if err := i.Currency.Validate(); err != nil {
+		if err := i.Currency.ValidateFormat(); err != nil {
 			errs = append(errs, fmt.Errorf("currency: %w", err))
 		}
 	}
diff --git a/openmeter/billing/charges/creditpurchase/settlement.go b/openmeter/billing/charges/creditpurchase/settlement.go
@@ -43,9 +43,9 @@ type GenericSettlement struct {
 func (s GenericSettlement) Validate() error {
 	var errs []error
 
-	if err := s.Currency.Validate(); err != nil {
+	if err := s.Currency.ValidateFormat(); err != nil {
 		errs = append(errs, fmt.Errorf("settlement currency: %w", err))
-	} else if s.Currency.CurrencyType() != currencyx.CurrencyTypeFiat {
+	} else if !s.Currency.IsKnownFiat() {
 		errs = append(errs, fmt.Errorf("settlement currency must be a known fiat currency"))
 	}
 
diff --git a/openmeter/billing/charges/lineage/service.go b/openmeter/billing/charges/lineage/service.go
@@ -110,7 +110,7 @@ func (i BackfillAdvanceLineageSegmentsInput) Validate() error {
 	if i.CustomerID == "" {
 		errs = append(errs, errors.New("customer id is required"))
 	}
-	if err := i.Currency.Validate(); err != nil {
+	if err := i.Currency.ValidateFormat(); err != nil {
 		errs = append(errs, fmt.Errorf("currency: %w", err))
 	}
 	if !i.Amount.IsPositive() {
@@ -138,7 +138,7 @@ func (i LoadLineagesByCustomerInput) Validate() error {
 	if i.CustomerID == "" {
 		errs = append(errs, errors.New("customer id is required"))
 	}
-	if err := i.Currency.Validate(); err != nil {
+	if err := i.Currency.ValidateFormat(); err != nil {
 		errs = append(errs, fmt.Errorf("currency: %w", err))
 	}
 
diff --git a/openmeter/billing/charges/models/chargemeta/mixin.go b/openmeter/billing/charges/models/chargemeta/mixin.go
@@ -117,8 +117,9 @@ type CreateInput struct {
 	Intent              meta.Intent
 	IntentMutableFields meta.IntentMutableFields
 
-	Status       meta.ChargeStatus
-	AdvanceAfter *time.Time
+	Status         meta.ChargeStatus
+	AdvanceAfter   *time.Time
+	ValidateIntent func() error
 }
 
 type Creator[T any] interface {
@@ -170,7 +171,11 @@ func Create[T Creator[T]](creator Creator[T], in CreateInput) (T, error) {
 	in.IntentMutableFields = in.IntentMutableFields.Normalized()
 	in.AdvanceAfter = meta.NormalizeOptionalTimestamp(in.AdvanceAfter)
 
-	if err := in.Intent.Validate(); err != nil {
+	validateIntent := in.Intent.Validate
+	if in.ValidateIntent != nil {
+		validateIntent = in.ValidateIntent
+	}
+	if err := validateIntent(); err != nil {
 		var empty T
 		return empty, err
 	}
@@ -223,8 +228,9 @@ type UpdateInput struct {
 	Intent              meta.Intent
 	IntentMutableFields meta.IntentMutableFields
 
-	Status       meta.ChargeStatus
-	AdvanceAfter *time.Time
+	Status         meta.ChargeStatus
+	AdvanceAfter   *time.Time
+	ValidateIntent func() error
 }
 
 func Update[T Updater[T]](updater Updater[T], in UpdateInput) (T, error) {
@@ -236,7 +242,11 @@ func Update[T Updater[T]](updater Updater[T], in UpdateInput) (T, error) {
 		return empty, err
 	}
 
-	if err := in.Intent.Validate(); err != nil {
+	validateIntent := in.Intent.Validate
+	if in.ValidateIntent != nil {
+		validateIntent = in.ValidateIntent
+	}
+	if err := validateIntent(); err != nil {
 		var empty T
 		return empty, err
 	}
diff --git a/openmeter/billing/charges/service/creditpurchase_test.go b/openmeter/billing/charges/service/creditpurchase_test.go
@@ -136,16 +136,20 @@ func (s *CreditPurchaseTestSuite) TestCreditPurchaseRejectsCustomSettlementCurre
 		s.Run(tc.name, func() {
 			intent := charges.NewChargeIntent(creditpurchase.Intent{
 				Intent: meta.Intent{
-					Name:              "Credit Purchase",
-					ManagedBy:         billing.ManuallyManagedLine,
-					CustomerID:        cust.ID,
-					Currency:          USD,
-					ServicePeriod:     servicePeriod,
-					BillingPeriod:     servicePeriod,
-					FullServicePeriod: servicePeriod,
+					ManagedBy:  billing.ManuallyManagedLine,
+					CustomerID: cust.ID,
+					Currency:   USD,
+				},
+				IntentMutableFields: creditpurchase.IntentMutableFields{
+					IntentMutableFields: meta.IntentMutableFields{
+						Name:              "Credit Purchase",
+						ServicePeriod:     servicePeriod,
+						BillingPeriod:     servicePeriod,
+						FullServicePeriod: servicePeriod,
+					},
+					CreditAmount: alpacadecimal.NewFromFloat(100),
+					Settlement:   tc.settlement,
 				},
-				CreditAmount: alpacadecimal.NewFromFloat(100),
-				Settlement:   tc.settlement,
 			})
 
 			res, err := s.Charges.Create(ctx, charges.CreateInput{
diff --git a/openmeter/billing/charges/service/lineage_test.go b/openmeter/billing/charges/service/lineage_test.go
@@ -238,14 +238,15 @@ func (s *CreditRealizationLineageTestSuite) TestBackfillAdvanceLineageSegmentsFi
 
 	ns := s.GetUniqueNamespace("charges-service-lineage-feature-backfill")
 	customerID := ulid.Make().String()
-	apiLineageID := s.createAdvanceLineageForBackfill(ctx, ns, customerID, []string{"api-calls"}, alpacadecimal.NewFromInt(40))
-	storageLineageID := s.createAdvanceLineageForBackfill(ctx, ns, customerID, []string{"storage"}, alpacadecimal.NewFromInt(30))
+	customCurrency := currencyx.Code("CREDITS")
+	apiLineageID := s.createAdvanceLineageForBackfill(ctx, ns, customerID, customCurrency, []string{"api-calls"}, alpacadecimal.NewFromInt(40))
+	storageLineageID := s.createAdvanceLineageForBackfill(ctx, ns, customerID, customCurrency, []string{"storage"}, alpacadecimal.NewFromInt(30))
 	backingTransactionGroupID := ulid.Make().String()
 
 	err = service.BackfillAdvanceLineageSegments(ctx, lineage.BackfillAdvanceLineageSegmentsInput{
 		Namespace:                 ns,
 		CustomerID:                customerID,
-		Currency:                  currencyx.Code(currency.USD),
+		Currency:                  customCurrency,
 		Amount:                    alpacadecimal.NewFromInt(50),
 		BackingTransactionGroupID: backingTransactionGroupID,
 		FeatureFilters:            []string{"api-calls"},
@@ -439,7 +440,7 @@ func (s *CreditRealizationLineageTestSuite) mustListLineages(namespace string, r
 	return out
 }
 
-func (s *CreditRealizationLineageTestSuite) createAdvanceLineageForBackfill(ctx context.Context, namespace string, customerID string, advanceFeatures []string, amount alpacadecimal.Decimal) string {
+func (s *CreditRealizationLineageTestSuite) createAdvanceLineageForBackfill(ctx context.Context, namespace string, customerID string, currencyCode currencyx.Code, advanceFeatures []string, amount alpacadecimal.Decimal) string {
 	s.T().Helper()
 
 	chargeID := ulid.Make().String()
@@ -458,7 +459,7 @@ func (s *CreditRealizationLineageTestSuite) createAdvanceLineageForBackfill(ctx
 		SetChargeID(chargeID).
 		SetRootRealizationID(ulid.Make().String()).
 		SetCustomerID(customerID).
-		SetCurrency(currencyx.Code(currency.USD)).
+		SetCurrency(currencyCode).
 		SetOriginKind(creditrealization.LineageOriginKindAdvance).
 		SetAdvanceFeatures(pq.StringArray(advanceFeatures)).
 		Save(ctx)
diff --git a/openmeter/billing/stdinvoiceline.go b/openmeter/billing/stdinvoiceline.go
@@ -111,9 +111,9 @@ func (i StandardLineBase) Validate() error {
 		errs = append(errs, errors.New("name is required"))
 	}
 
-	if err := i.Currency.Validate(); err != nil {
+	if err := i.Currency.ValidateFormat(); err != nil {
 		errs = append(errs, fmt.Errorf("currency: %w", err))
-	} else if i.Currency.CurrencyType() != currencyx.CurrencyTypeFiat {
+	} else if !i.Currency.IsKnownFiat() {
 		errs = append(errs, errors.New("currency must be a known fiat currency"))
 	}
 
diff --git a/openmeter/currencies/models_test.go b/openmeter/currencies/models_test.go
@@ -33,7 +33,7 @@ func TestCreateCurrencyInputValidate(t *testing.T) {
 				Name:      "Credits",
 				Symbol:    "cr",
 			},
-			wantErr: "custom currency code cannot conflict with fiat currency code",
+			wantErr: "conflicts with fiat currency code",
 		},
 		{
 			name: "invalid structural code",
diff --git a/openmeter/ledger/customerbalance/service.go b/openmeter/ledger/customerbalance/service.go
@@ -115,7 +115,7 @@ func (i GetBalanceServiceInput) Validate() error {
 		errs = append(errs, fmt.Errorf("customer ID: %w", err))
 	}
 
-	if err := i.Currency.Validate(); err != nil {
+	if err := ledger.ValidateCurrency(i.Currency); err != nil {
 		errs = append(errs, fmt.Errorf("currency: %w", err))
 	}
 
diff --git a/openmeter/ledger/customerbalance/service_test.go b/openmeter/ledger/customerbalance/service_test.go
@@ -63,7 +63,7 @@ func TestGetBalanceServiceInputValidate(t *testing.T) {
 			name: "invalid currency",
 			input: GetBalanceServiceInput{
 				CustomerID: valid.CustomerID,
-				Currency:   currencyx.Code("not-a-currency"),
+				Currency:   currencyx.Code("NO"),
 			},
 			wantErr: true,
 		},
diff --git a/openmeter/ledger/customerbalance/transactions.go b/openmeter/ledger/customerbalance/transactions.go
@@ -84,7 +84,7 @@ func (i ListCreditTransactionsInput) Validate() error {
 	}
 
 	if i.Currency != nil {
-		if err := i.Currency.Validate(); err != nil {
+		if err := ledger.ValidateCurrency(*i.Currency); err != nil {
 			errs = append(errs, fmt.Errorf("currency: %w", err))
 		}
 	}
diff --git a/openmeter/ledger/recognizer/service.go b/openmeter/ledger/recognizer/service.go
@@ -97,7 +97,7 @@ func (i RecognizeEarningsInput) Validate() error {
 	if i.At.IsZero() {
 		errs = append(errs, errors.New("at is required"))
 	}
-	if err := i.Currency.Validate(); err != nil {
+	if err := i.Currency.ValidateFormat(); err != nil {
 		errs = append(errs, fmt.Errorf("currency: %w", err))
 	}
 
diff --git a/openmeter/ledger/recognizer/service_test.go b/openmeter/ledger/recognizer/service_test.go
@@ -19,6 +19,7 @@ import (
 	ledgertestutils "github.com/openmeterio/openmeter/openmeter/ledger/testutils"
 	"github.com/openmeterio/openmeter/openmeter/ledger/transactions"
 	"github.com/openmeterio/openmeter/pkg/clock"
+	"github.com/openmeterio/openmeter/pkg/currencyx"
 	"github.com/openmeterio/openmeter/pkg/timeutil"
 )
 
@@ -67,6 +68,18 @@ func testID() string {
 	return ulid.Make().String()
 }
 
+func TestRecognizeEarnings_AllowsCustomCurrencyWithoutLineages(t *testing.T) {
+	env := newRecognizerTestEnv(t)
+
+	result, err := env.recognizer.RecognizeEarnings(t.Context(), recognizer.RecognizeEarningsInput{
+		CustomerID: env.CustomerID,
+		At:         clock.Now(),
+		Currency:   currencyx.Code("CREDITS"),
+	})
+	require.NoError(t, err)
+	require.True(t, result.RecognizedAmount.IsZero())
+}
+
 func (e *recognizerTestEnv) resolverDeps() transactions.ResolverDependencies {
 	return transactions.ResolverDependencies{
 		AccountService: e.Deps.ResolversService,
diff --git a/openmeter/ledger/routing.go b/openmeter/ledger/routing.go
@@ -571,14 +571,14 @@ func ValidateCurrencySource(currency currencyx.Code, source *currencyx.Code) err
 		})
 	}
 
-	if source.CurrencyType() != currencyx.CurrencyTypeFiat {
+	if !source.IsKnownFiat() {
 		return ErrCurrencyInvalid.WithAttrs(models.Attributes{
 			"source": *source,
 			"reason": "source_must_be_fiat",
 		})
 	}
 
-	if currency.CurrencyType() == currencyx.CurrencyTypeFiat {
+	if currency.IsKnownFiat() {
 		return ErrCurrencyInvalid.WithAttrs(models.Attributes{
 			"currency": currency,
 			"source":   *source,
diff --git a/openmeter/ledger/transactions/fx.go b/openmeter/ledger/transactions/fx.go
@@ -74,7 +74,7 @@ func (t ConvertCurrencyTemplate) resolve(ctx context.Context, customerID custome
 	}
 	costBasis := t.CostBasis
 	var targetSource *currencyx.Code
-	if t.SourceCurrency.CurrencyType() == currencyx.CurrencyTypeFiat && t.TargetCurrency.CurrencyType() == currencyx.CurrencyTypeCustom {
+	if t.SourceCurrency.IsKnownFiat() && !t.TargetCurrency.IsKnownFiat() {
 		targetSource = &t.SourceCurrency
 	}
 
diff --git a/test/credits/sanity_test.go b/test/credits/sanity_test.go
@@ -152,7 +152,7 @@ func (s *SanitySuite) TestCustomCurrencyLedgerCreditBalanceSanity() {
 	s.Require().Len(explicitBalances, 1)
 	s.Equal(customCurrency, explicitBalances[0].Currency)
 	s.AssertDecimalEqual(amount, explicitBalances[0].Balance.Settled(), "explicit custom currency settled balance")
-	s.AssertDecimalEqual(amount, explicitBalances[0].Balance.Pending(), "explicit custom currency pending balance")
+	s.AssertDecimalEqual(alpacadecimal.Zero, explicitBalances[0].Balance.Pending(), "explicit custom currency pending balance")
 
 	discoveredBalances, err := facade.GetBalances(ctx, customerbalance.GetBalancesInput{
 		CustomerID: cust.GetID(),
@@ -164,7 +164,7 @@ func (s *SanitySuite) TestCustomCurrencyLedgerCreditBalanceSanity() {
 	})
 	s.Require().True(ok, "custom currency must be discovered from FBO routes")
 	s.AssertDecimalEqual(amount, customBalance.Balance.Settled(), "discovered custom currency settled balance")
-	s.AssertDecimalEqual(amount, customBalance.Balance.Pending(), "discovered custom currency pending balance")
+	s.AssertDecimalEqual(alpacadecimal.Zero, customBalance.Balance.Pending(), "discovered custom currency pending balance")
 }
 
 func (s *SanitySuite) TestFlatFeeFundedCreditOnlyRecognizedRevenueDeleteCorrectionSanity() {
diff --git a/tools/migrate/migrations/20260702111040_widen_currency_codes.down.sql b/tools/migrate/migrations/20260702111040_widen_currency_codes.down.sql
diff --git a/tools/migrate/migrations/20260702111040_widen_currency_codes.up.sql b/tools/migrate/migrations/20260702111040_widen_currency_codes.up.sql
diff --git a/tools/migrate/migrations/atlas.sum b/tools/migrate/migrations/atlas.sum

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func (i ListFundedCreditActivitiesInput) Validate() error {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`if i.Currency != nil {`
`91`		`- if err := i.Currency.Validate(); err != nil {`
	`91`	`+ if err := i.Currency.ValidateFormat(); err != nil {`
`92`	`92`	`errs = append(errs, fmt.Errorf("currency: %w", err))`
`93`	`93`	`}`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ func (i BackfillAdvanceLineageSegmentsInput) Validate() error {`
`110`	`110`	`if i.CustomerID == "" {`
`111`	`111`	`errs = append(errs, errors.New("customer id is required"))`
`112`	`112`	`}`
`113`		`- if err := i.Currency.Validate(); err != nil {`
	`113`	`+ if err := i.Currency.ValidateFormat(); err != nil {`
`114`	`114`	`errs = append(errs, fmt.Errorf("currency: %w", err))`
`115`	`115`	`}`
`116`	`116`	`if !i.Amount.IsPositive() {`
`@@ -138,7 +138,7 @@ func (i LoadLineagesByCustomerInput) Validate() error {`
`138`	`138`	`if i.CustomerID == "" {`
`139`	`139`	`errs = append(errs, errors.New("customer id is required"))`
`140`	`140`	`}`
`141`		`- if err := i.Currency.Validate(); err != nil {`
	`141`	`+ if err := i.Currency.ValidateFormat(); err != nil {`
`142`	`142`	`errs = append(errs, fmt.Errorf("currency: %w", err))`
`143`	`143`	`}`
`144`	`144`