fix(billing): disallow charge intent field overrides (#4617)

Author: turip

api/v3/handlers/customers/charges/convert.go

@@ -67,7 +67,7 @@ func convertFlatFeeChargeToAPI(source flatfee.Charge) (api.BillingChargeFlatFee,
 		DeletedAt:              source.ChargeBase.ManagedResource.ManagedModel.DeletedAt,
 		Description:            intent.Description,
 		Discounts:              convertFlatFeeDiscounts(intent.PercentageDiscounts),
-		FeatureKey:             lo.ToPtr(intent.FeatureKey),
+		FeatureKey:             intent.FeatureKey,
 		FullServicePeriod:      ConvertClosedPeriodToAPI(intent.FullServicePeriod),
 		Id:                     source.ChargeBase.ManagedResource.ID,
 		InvoiceAt:              intent.InvoiceAt,
@@ -504,6 +504,7 @@ func convertFlatFeeChargeAPIToIntent(customerID string, flatFee api.CreateCharge
 			ManagedBy:         billing.ManuallyManagedLine,
 			CustomerID:        customerID,
 			Currency:          currencyx.Code(flatFee.Currency),
+			TaxConfig:         productcatalog.TaxCodeConfigFrom(taxConfig),
 			UniqueReferenceID: flatFee.UniqueReferenceId,
 			Subscription:      nil,
 		},
@@ -515,15 +516,14 @@ func convertFlatFeeChargeAPIToIntent(customerID string, flatFee api.CreateCharge
 				ServicePeriod:     timeutil.ClosedPeriod(flatFee.ServicePeriod),
 				FullServicePeriod: timeutil.ClosedPeriod(lo.FromPtrOr(flatFee.FullServicePeriod, flatFee.ServicePeriod)),
 				BillingPeriod:     timeutil.ClosedPeriod(lo.FromPtrOr(flatFee.BillingPeriod, flatFee.ServicePeriod)),
-				TaxConfig:         productcatalog.TaxCodeConfigFrom(taxConfig),
 			},
 			InvoiceAt:             flatFee.InvoiceAt,
 			PaymentTerm:           productcatalog.PaymentTermType(flatFee.PaymentTerm),
-			FeatureKey:            lo.FromPtr(flatFee.FeatureKey),
 			PercentageDiscounts:   discount,
 			ProRating:             proRating,
 			AmountBeforeProration: amountBeforeProration,
 		},
+		FeatureKey:     flatFee.FeatureKey,
 		SettlementMode: productcatalog.SettlementMode(flatFee.SettlementMode),
 	}), nil
 }
@@ -573,6 +573,7 @@ func convertUsageBaseChargeAPIToIntent(customerID string, usageBasedFee api.Crea
 			ManagedBy:         billing.ManuallyManagedLine,
 			CustomerID:        customerID,
 			Currency:          currencyx.Code(usageBasedFee.Currency),
+			TaxConfig:         productcatalog.TaxCodeConfigFrom(taxConfig),
 			UniqueReferenceID: usageBasedFee.UniqueReferenceId,
 			Subscription:      nil,
 		},
@@ -584,13 +585,12 @@ func convertUsageBaseChargeAPIToIntent(customerID string, usageBasedFee api.Crea
 				ServicePeriod:     timeutil.ClosedPeriod(usageBasedFee.ServicePeriod),
 				FullServicePeriod: timeutil.ClosedPeriod(lo.FromPtrOr(usageBasedFee.FullServicePeriod, usageBasedFee.ServicePeriod)),
 				BillingPeriod:     timeutil.ClosedPeriod(lo.FromPtrOr(usageBasedFee.BillingPeriod, usageBasedFee.ServicePeriod)),
-				TaxConfig:         productcatalog.TaxCodeConfigFrom(taxConfig),
 			},
-			InvoiceAt:  usageBasedFee.InvoiceAt,
-			FeatureKey: usageBasedFee.FeatureKey,
-			Price:      *price,
-			Discounts:  discounts,
+			InvoiceAt: usageBasedFee.InvoiceAt,
+			Price:     *price,
+			Discounts: discounts,
 		},
+		FeatureKey:     usageBasedFee.FeatureKey,
 		SettlementMode: productcatalog.SettlementMode(usageBasedFee.SettlementMode),
 	}), nil
 }

openmeter/billing/charges/charge.go

@@ -472,8 +472,8 @@ func (i ChargeIntents) CollectFeatureKeys() ([]string, error) {
 			if err != nil {
 				return nil, fmt.Errorf("converting flat fee intent[%d]: %w", idx, err)
 			}
-			if flatFee.FeatureKey != "" {
-				keys = append(keys, flatFee.FeatureKey)
+			if flatFee.FeatureKey != nil && *flatFee.FeatureKey != "" {
+				keys = append(keys, *flatFee.FeatureKey)
 			}
 		case meta.ChargeTypeUsageBased:
 			usageBased, err := ch.AsUsageBasedIntent()

openmeter/billing/charges/creditpurchase/adapter/charge.go

@@ -39,8 +39,8 @@ func (a *adapter) UpdateCharge(ctx context.Context, charge creditpurchase.Charge
 
 		update, err = chargemeta.Update(update, chargemeta.UpdateInput{
 			ManagedResource:     charge.ManagedResource,
+			Intent:              charge.Intent.Intent,
 			IntentMutableFields: charge.Intent.IntentMutableFields.IntentMutableFields,
-			Annotations:         charge.Intent.Annotations,
 			Status:              metaStatus,
 		})
 		if err != nil {

openmeter/billing/charges/flatfee/adapter/charge.go

@@ -70,8 +70,8 @@ func (a *adapter) UpdateCharge(ctx context.Context, charge flatfee.ChargeBase) (
 
 		update, err = chargemeta.Update(update, chargemeta.UpdateInput{
 			ManagedResource:     charge.ManagedResource,
+			Intent:              intent.Intent,
 			IntentMutableFields: intent.IntentMutableFields.IntentMutableFields,
-			Annotations:         intent.Annotations,
 			Status:              metaStatus,
 			AdvanceAfter:        meta.NormalizeOptionalTimestamp(charge.State.AdvanceAfter),
 		})
@@ -172,8 +172,8 @@ func (a *adapter) DeleteCharge(ctx context.Context, charge flatfee.Charge) error
 
 		update, err = chargemeta.Update(update, chargemeta.UpdateInput{
 			ManagedResource:     charge.ManagedResource,
+			Intent:              baseIntent.Intent,
 			IntentMutableFields: baseIntent.IntentMutableFields.IntentMutableFields,
-			Annotations:         baseIntent.Annotations,
 			Status:              metaStatus,
 		})
 		if err != nil {
@@ -362,7 +362,7 @@ func (a *adapter) buildCreateFlatFeeCharge(ns string, intentWithStatus flatfee.I
 		SetInvoiceAt(meta.NormalizeTimestamp(intent.InvoiceAt).In(time.UTC)).
 		SetSettlementMode(intent.SettlementMode).
 		SetNillableFeatureID(intentWithStatus.FeatureID).
-		SetNillableFeatureKey(lo.EmptyableToPtr(intent.FeatureKey)).
+		SetNillableFeatureKey(intent.FeatureKey).
 		SetStatusDetailed(intentWithStatus.InitialStatus).
 		SetProRating(proRating).
 		SetAmountBeforeProration(intent.AmountBeforeProration).

openmeter/billing/charges/flatfee/adapter/detailedline_test.go

@@ -108,16 +108,16 @@ func (s *FlatFeeDetailedLineAdapterSuite) TestUpsertDetailedLinesReplacesAndSoft
 						ManagedBy:  billing.SubscriptionManagedLine,
 						CustomerID: customerID,
 						Currency:   currencyx.Code("USD"),
+						TaxConfig: productcatalog.TaxCodeConfig{
+							TaxCodeID: taxCodeID,
+						},
 					},
 					IntentMutableFields: flatfee.IntentMutableFields{
 						IntentMutableFields: chargesmeta.IntentMutableFields{
 							Name:              "flat-fee-charge",
 							ServicePeriod:     servicePeriod,
 							FullServicePeriod: servicePeriod,
 							BillingPeriod:     servicePeriod,
-							TaxConfig: productcatalog.TaxCodeConfig{
-								TaxCodeID: taxCodeID,
-							},
 						},
 						InvoiceAt:             servicePeriod.To,
 						PaymentTerm:           productcatalog.InAdvancePaymentTerm,

openmeter/billing/charges/flatfee/adapter/intentoverride.go

@@ -14,7 +14,6 @@ import (
 	entdb "github.com/openmeterio/openmeter/openmeter/ent/db"
 	dbchargeflatfee "github.com/openmeterio/openmeter/openmeter/ent/db/chargeflatfee"
 	dbchargeflatfeeoverride "github.com/openmeterio/openmeter/openmeter/ent/db/chargeflatfeeoverride"
-	"github.com/openmeterio/openmeter/openmeter/productcatalog"
 	"github.com/openmeterio/openmeter/pkg/convert"
 	"github.com/openmeterio/openmeter/pkg/framework/entutils"
 	"github.com/openmeterio/openmeter/pkg/timeutil"
@@ -32,20 +31,15 @@ func mapIntentOverrideFromDB(dbOverride *entdb.ChargeFlatFeeOverride) *flatfee.I
 
 	return &flatfee.IntentMutableFields{
 		IntentMutableFields: meta.IntentMutableFields{
-			Name:        dbOverride.Name,
-			Description: dbOverride.Description,
-			Metadata:    lo.FromPtr(dbOverride.Metadata),
-			TaxConfig: productcatalog.TaxCodeConfig{
-				Behavior:  dbOverride.TaxBehavior,
-				TaxCodeID: lo.FromPtrOr(dbOverride.TaxCodeID, ""),
-			},
+			Name:              dbOverride.Name,
+			Description:       dbOverride.Description,
+			Metadata:          lo.FromPtr(dbOverride.Metadata),
 			ServicePeriod:     closedPeriodFromDB(dbOverride.ServicePeriodFrom, dbOverride.ServicePeriodTo),
 			FullServicePeriod: closedPeriodFromDB(dbOverride.FullServicePeriodFrom, dbOverride.FullServicePeriodTo),
 			BillingPeriod:     closedPeriodFromDB(dbOverride.BillingPeriodFrom, dbOverride.BillingPeriodTo),
 		},
 		IntentDeletedAt:       convert.TimePtrIn(dbOverride.IntentDeletedAt, time.UTC),
 		InvoiceAt:             dbOverride.InvoiceAt.UTC(),
-		FeatureKey:            lo.FromPtr(dbOverride.FeatureKey),
 		PaymentTerm:           dbOverride.PaymentTerm,
 		ProRating:             lo.FromPtr(dbOverride.ProRating),
 		AmountBeforeProration: dbOverride.AmountBeforeProration,
@@ -150,8 +144,6 @@ func (a *adapter) createIntentOverride(ctx context.Context, chargeID meta.Charge
 		SetFlatFeeID(chargeID.ID).
 		SetName(normalized.Name).
 		SetNillableDescription(normalized.Description).
-		SetNillableTaxBehavior(normalized.TaxConfig.Behavior).
-		SetNillableTaxCodeID(lo.EmptyableToPtr(normalized.TaxConfig.TaxCodeID)).
 		SetNillableIntentDeletedAt(convert.TimePtrIn(normalized.IntentDeletedAt, time.UTC)).
 		SetServicePeriodFrom(normalized.ServicePeriod.From.UTC()).
 		SetServicePeriodTo(normalized.ServicePeriod.To.UTC()).
@@ -160,7 +152,6 @@ func (a *adapter) createIntentOverride(ctx context.Context, chargeID meta.Charge
 		SetBillingPeriodFrom(normalized.BillingPeriod.From.UTC()).
 		SetBillingPeriodTo(normalized.BillingPeriod.To.UTC()).
 		SetInvoiceAt(normalized.InvoiceAt.UTC()).
-		SetNillableFeatureKey(lo.EmptyableToPtr(normalized.FeatureKey)).
 		SetPaymentTerm(normalized.PaymentTerm).
 		SetProRating(&normalized.ProRating).
 		SetAmountBeforeProration(normalized.AmountBeforeProration)
@@ -189,8 +180,6 @@ func (a *adapter) updateIntentOverride(ctx context.Context, chargeID meta.Charge
 		Where(dbchargeflatfeeoverride.ChargeIDEQ(chargeID.ID)).
 		SetName(normalized.Name).
 		SetOrClearDescription(normalized.Description).
-		SetOrClearTaxBehavior(normalized.TaxConfig.Behavior).
-		SetOrClearTaxCodeID(lo.EmptyableToPtr(normalized.TaxConfig.TaxCodeID)).
 		SetOrClearIntentDeletedAt(convert.TimePtrIn(normalized.IntentDeletedAt, time.UTC)).
 		SetServicePeriodFrom(normalized.ServicePeriod.From.UTC()).
 		SetServicePeriodTo(normalized.ServicePeriod.To.UTC()).
@@ -199,7 +188,6 @@ func (a *adapter) updateIntentOverride(ctx context.Context, chargeID meta.Charge
 		SetBillingPeriodFrom(normalized.BillingPeriod.From.UTC()).
 		SetBillingPeriodTo(normalized.BillingPeriod.To.UTC()).
 		SetInvoiceAt(normalized.InvoiceAt.UTC()).
-		SetOrClearFeatureKey(lo.EmptyableToPtr(normalized.FeatureKey)).
 		SetPaymentTerm(normalized.PaymentTerm).
 		SetProRating(&normalized.ProRating).
 		SetAmountBeforeProration(normalized.AmountBeforeProration)

openmeter/billing/charges/flatfee/adapter/intentoverride_test.go

@@ -81,7 +81,6 @@ func (s *FlatFeeIntentOverrideAdapterSuite) TestUpdateAndReadIntentOverride() {
 	ctx := s.T().Context()
 	namespace := "flatfee-intentoverride-adapter"
 	charge := s.createCharge(namespace)
-	overrideTaxCodeID := s.taxCodeEnv.CreateTaxCode(s.T(), namespace).ID
 
 	overrideServicePeriod := timeutil.ClosedPeriod{
 		From: time.Date(2026, 1, 10, 0, 0, 0, 0, time.UTC),
@@ -114,16 +113,11 @@ func (s *FlatFeeIntentOverrideAdapterSuite) TestUpdateAndReadIntentOverride() {
 			Metadata: models.Metadata{
 				"source": "manual",
 			},
-			TaxConfig: productcatalog.TaxCodeConfig{
-				Behavior:  lo.ToPtr(productcatalog.InclusiveTaxBehavior),
-				TaxCodeID: overrideTaxCodeID,
-			},
 			ServicePeriod:     overrideServicePeriod,
 			FullServicePeriod: overrideFullServicePeriod,
 			BillingPeriod:     overrideBillingPeriod,
 		},
 		InvoiceAt:             overrideInvoiceAt,
-		FeatureKey:            "manual-feature",
 		PaymentTerm:           paymentTerm,
 		ProRating:             proRating,
 		AmountBeforeProration: amountBeforeProration,
@@ -153,7 +147,7 @@ func (s *FlatFeeIntentOverrideAdapterSuite) TestUpdateAndReadIntentOverride() {
 	updated, err = s.adapter.CreateChargeOverride(ctx, updated, override)
 	s.Require().NoError(err)
 	s.Nil(updated.DeletedAt)
-	s.requireOverrideMatches(updated.Intent.GetOverrideLayerMutableFields(), overrideServicePeriod, overrideFullServicePeriod, overrideBillingPeriod, overrideInvoiceAt, overrideTaxCodeID, overrideDiscountCorrelationID)
+	s.requireOverrideMatches(updated.Intent.GetOverrideLayerMutableFields(), overrideServicePeriod, overrideFullServicePeriod, overrideBillingPeriod, overrideInvoiceAt, overrideDiscountCorrelationID)
 
 	_, err = s.adapter.CreateChargeOverride(ctx, updated, override)
 	s.Require().Error(err)
@@ -164,14 +158,11 @@ func (s *FlatFeeIntentOverrideAdapterSuite) TestUpdateAndReadIntentOverride() {
 	}))
 	updated, err = s.adapter.UpdateCharge(ctx, updated)
 	s.Require().NoError(err)
-	s.requireOverrideMatches(updated.Intent.GetOverrideLayerMutableFields(), overrideServicePeriod, overrideFullServicePeriod, overrideBillingPeriod, overrideInvoiceAt, overrideTaxCodeID, overrideDiscountCorrelationID)
+	s.requireOverrideMatches(updated.Intent.GetOverrideLayerMutableFields(), overrideServicePeriod, overrideFullServicePeriod, overrideBillingPeriod, overrideInvoiceAt, overrideDiscountCorrelationID)
 
 	s.Require().NoError(updated.Intent.Mutate(chargesmeta.ChangeTargetOverride, func(fields *flatfee.IntentMutableFields) {
 		fields.Description = nil
 		fields.Metadata = nil
-		fields.TaxConfig.Behavior = nil
-		fields.TaxConfig.TaxCodeID = overrideTaxCodeID
-		fields.FeatureKey = ""
 		fields.PercentageDiscounts = nil
 	}))
 	updated, err = s.adapter.UpdateCharge(ctx, updated)
@@ -180,9 +171,6 @@ func (s *FlatFeeIntentOverrideAdapterSuite) TestUpdateAndReadIntentOverride() {
 	s.Require().NotNil(updatedOverride)
 	s.Nil(updatedOverride.Description)
 	s.Nil(updatedOverride.Metadata)
-	s.Nil(updatedOverride.TaxConfig.Behavior)
-	s.Equal(overrideTaxCodeID, updatedOverride.TaxConfig.TaxCodeID)
-	s.Empty(updatedOverride.FeatureKey)
 	s.Nil(updatedOverride.PercentageDiscounts)
 
 	fetched, err := s.adapter.GetByID(ctx, flatfee.GetByIDInput{
@@ -193,10 +181,13 @@ func (s *FlatFeeIntentOverrideAdapterSuite) TestUpdateAndReadIntentOverride() {
 	s.Require().NotNil(fetchedOverride)
 	s.Nil(fetchedOverride.Description)
 	s.Nil(fetchedOverride.Metadata)
-	s.Nil(fetchedOverride.TaxConfig.Behavior)
-	s.Equal(overrideTaxCodeID, fetchedOverride.TaxConfig.TaxCodeID)
-	s.Empty(fetchedOverride.FeatureKey)
 	s.Nil(fetchedOverride.PercentageDiscounts)
+	s.Equal(updated.Intent.GetBaseIntent().TaxConfig, fetched.Intent.GetTaxConfig())
+	expectedFeatureKey := ""
+	if updated.Intent.GetBaseIntent().FeatureKey != nil {
+		expectedFeatureKey = *updated.Intent.GetBaseIntent().FeatureKey
+	}
+	s.Equal(expectedFeatureKey, fetched.Intent.GetFeatureKey())
 
 	fetchedByIDs, err := s.adapter.GetByIDs(ctx, flatfee.GetByIDsInput{
 		Namespace: namespace,
@@ -208,9 +199,6 @@ func (s *FlatFeeIntentOverrideAdapterSuite) TestUpdateAndReadIntentOverride() {
 	s.Require().NotNil(fetchedByIDOverride)
 	s.Nil(fetchedByIDOverride.Description)
 	s.Nil(fetchedByIDOverride.Metadata)
-	s.Nil(fetchedByIDOverride.TaxConfig.Behavior)
-	s.Equal(overrideTaxCodeID, fetchedByIDOverride.TaxConfig.TaxCodeID)
-	s.Empty(fetchedByIDOverride.FeatureKey)
 	s.Nil(fetchedByIDOverride.PercentageDiscounts)
 
 	cleared, err := s.adapter.DeleteChargeOverride(ctx, fetched.ChargeBase)
@@ -238,7 +226,6 @@ func (s *FlatFeeIntentOverrideAdapterSuite) TestDeleteChargeWithIntentOverrideDe
 	override := flatfee.IntentMutableFields{
 		IntentMutableFields: chargesmeta.IntentMutableFields{
 			Name:              "manual flat fee",
-			TaxConfig:         baseIntent.TaxConfig,
 			ServicePeriod:     baseIntent.ServicePeriod,
 			FullServicePeriod: baseIntent.FullServicePeriod,
 			BillingPeriod:     baseIntent.BillingPeriod,
@@ -286,7 +273,6 @@ func (s *FlatFeeIntentOverrideAdapterSuite) requireOverrideMatches(
 	fullServicePeriod timeutil.ClosedPeriod,
 	billingPeriod timeutil.ClosedPeriod,
 	invoiceAt time.Time,
-	taxCodeID string,
 	discountCorrelationID string,
 ) {
 	s.T().Helper()
@@ -295,10 +281,6 @@ func (s *FlatFeeIntentOverrideAdapterSuite) requireOverrideMatches(
 	s.Equal("manual flat fee", override.Name)
 	s.Equal("manual description", lo.FromPtr(override.Description))
 	s.Equal(models.Metadata{"source": "manual"}, override.Metadata)
-	s.Require().NotNil(override.TaxConfig.Behavior)
-	s.Equal(productcatalog.InclusiveTaxBehavior, *override.TaxConfig.Behavior)
-	s.Equal(taxCodeID, override.TaxConfig.TaxCodeID)
-	s.Equal("manual-feature", override.FeatureKey)
 	s.Equal(servicePeriod, override.ServicePeriod)
 	s.Equal(fullServicePeriod, override.FullServicePeriod)
 	s.Equal(billingPeriod, override.BillingPeriod)
@@ -331,13 +313,13 @@ func (s *FlatFeeIntentOverrideAdapterSuite) createCharge(namespace string) flatf
 						ManagedBy:  billing.SubscriptionManagedLine,
 						CustomerID: customerID,
 						Currency:   currencyx.Code("USD"),
+						TaxConfig: productcatalog.TaxCodeConfig{
+							TaxCodeID: taxCodeID,
+						},
 					},
 					IntentMutableFields: flatfee.IntentMutableFields{
 						IntentMutableFields: chargesmeta.IntentMutableFields{
-							Name: "flat-fee-charge",
-							TaxConfig: productcatalog.TaxCodeConfig{
-								TaxCodeID: taxCodeID,
-							},
+							Name:              "flat-fee-charge",
 							ServicePeriod:     servicePeriod,
 							FullServicePeriod: servicePeriod,
 							BillingPeriod:     servicePeriod,

openmeter/billing/charges/flatfee/adapter/mapper.go

@@ -148,12 +148,12 @@ func MapChargeBaseFromDB(entity *entdb.ChargeFlatFee) flatfee.ChargeBase {
 		Intent: flatfee.NewOverridableIntent(flatfee.Intent{
 			Intent:         mappedMeta.Intent,
 			SettlementMode: entity.SettlementMode,
+			FeatureKey:     entity.FeatureKey,
 			IntentMutableFields: flatfee.IntentMutableFields{
 				IntentMutableFields:   mappedMeta.IntentMutableFields,
 				InvoiceAt:             entity.InvoiceAt.UTC(),
 				IntentDeletedAt:       convert.TimePtrIn(entity.IntentDeletedAt, time.UTC),
 				PaymentTerm:           entity.PaymentTerm,
-				FeatureKey:            lo.FromPtrOr(entity.FeatureKey, ""),
 				PercentageDiscounts:   percentageDiscounts,
 				ProRating:             proRatingConfigFromDB(entity.ProRating),
 				AmountBeforeProration: entity.AmountBeforeProration,

openmeter/billing/charges/flatfee/adapter/realizationrun_test.go

@@ -94,16 +94,16 @@ func (s *FlatFeeRealizationRunAdapterSuite) TestCreateCurrentRunFailsWhenCurrent
 						ManagedBy:  billing.SubscriptionManagedLine,
 						CustomerID: customerID,
 						Currency:   currencyx.Code("USD"),
+						TaxConfig: productcatalog.TaxCodeConfig{
+							TaxCodeID: taxCodeID,
+						},
 					},
 					IntentMutableFields: flatfee.IntentMutableFields{
 						IntentMutableFields: chargesmeta.IntentMutableFields{
 							Name:              "flat-fee-charge",
 							ServicePeriod:     servicePeriod,
 							FullServicePeriod: servicePeriod,
 							BillingPeriod:     servicePeriod,
-							TaxConfig: productcatalog.TaxCodeConfig{
-								TaxCodeID: taxCodeID,
-							},
 						},
 						InvoiceAt:             servicePeriod.To,
 						PaymentTerm:           productcatalog.InAdvancePaymentTerm,