chore: prior run values

Author: turip

openmeter/billing/charges/usagebased/rating.go

@@ -16,6 +16,7 @@ var _ rating.StandardLineAccessor = (*RateableIntent)(nil)
 type RateableIntent struct {
 	Intent
 
+	ServicePeriod  timeutil.ClosedPeriod
 	MeterValue     alpacadecimal.Decimal
 	CreditsApplied billing.CreditsApplied
 }

openmeter/billing/charges/usagebased/service/creditheninvoice.go

@@ -248,16 +248,15 @@ func (s *CreditThenInvoiceStateMachine) startInvoiceCreatedRun(
 	}
 
 	result, err := s.Runs.CreateRatedRun(ctx, usagebasedrun.CreateRatedRunInput{
-		Charge:                  s.Charge,
-		CustomerOverride:        s.CustomerOverride,
-		FeatureMeter:            s.FeatureMeter,
-		Type:                    runType,
-		StoredAtLT:              storedAtLT,
-		ServicePeriodTo:         servicePeriodTo,
-		LineID:                  lo.ToPtr(input.LineID),
-		IgnoreMinimumCommitment: ignoreMinimumCommitmentForRunType(runType),
-		CreditAllocation:        usagebasedrun.CreditAllocationAvailable,
-		CurrencyCalculator:      s.CurrencyCalculator,
+		Charge:             s.Charge,
+		CustomerOverride:   s.CustomerOverride,
+		FeatureMeter:       s.FeatureMeter,
+		Type:               runType,
+		StoredAtLT:         storedAtLT,
+		ServicePeriodTo:    servicePeriodTo,
+		LineID:             lo.ToPtr(input.LineID),
+		CreditAllocation:   usagebasedrun.CreditAllocationAvailable,
+		CurrencyCalculator: s.CurrencyCalculator,
 	})
 	if err != nil {
 		return err
@@ -275,12 +274,6 @@ func (s *CreditThenInvoiceStateMachine) StartFinalInvoiceRun(ctx context.Context
 	return s.startInvoiceCreatedRun(ctx, input, usagebased.RealizationRunTypeFinalRealization)
 }
 
-func ignoreMinimumCommitmentForRunType(runType usagebased.RealizationRunType) bool {
-	// Partial invoice runs are interim cumulative checkpoints. Minimum commitment is billed only on the
-	// final realization, so partial runs must suppress it during both creation and later snapshotting.
-	return runType == usagebased.RealizationRunTypePartialInvoice
-}
-
 func resolveInvoiceCreatedTrigger(charge usagebased.Charge, billedPeriod timeutil.ClosedPeriod) meta.Trigger {
 	if meta.NormalizeTimestamp(billedPeriod.To).Equal(meta.NormalizeTimestamp(charge.Intent.ServicePeriod.To)) {
 		return meta.TriggerFinalInvoiceCreated
@@ -309,17 +302,15 @@ func (s *CreditThenInvoiceStateMachine) SnapshotInvoiceUsage(ctx context.Context
 
 	storedAtLT := meta.NormalizeTimestamp(currentRun.StoredAtLT)
 
-	ratingResult, err := s.Rater.GetDetailedLinesForUsage(ctx, usagebasedrating.GetDetailedLinesForUsageInput{
-		Charge:                  s.Charge,
-		PriorRuns:               s.Charge.Realizations.Without(currentRun.ID),
-		Customer:                s.CustomerOverride,
-		FeatureMeter:            s.FeatureMeter,
-		ServicePeriodTo:         currentRun.ServicePeriodTo,
-		StoredAtLT:              storedAtLT,
-		IgnoreMinimumCommitment: ignoreMinimumCommitmentForRunType(currentRun.Type),
+	ratingResult, err := s.Rater.GetDetailedRatingForUsage(ctx, usagebasedrating.GetDetailedRatingForUsageInput{
+		Charge:          s.Charge,
+		StoredAtLT:      storedAtLT,
+		ServicePeriodTo: currentRun.ServicePeriodTo,
+		Customer:        s.CustomerOverride,
+		FeatureMeter:    s.FeatureMeter,
 	})
 	if err != nil {
-		return fmt.Errorf("get rating for usage: %w", err)
+		return fmt.Errorf("get detailed rating for usage: %w", err)
 	}
 
 	currentTotals := ratingResult.Totals.RoundToPrecision(s.CurrencyCalculator)

openmeter/billing/charges/usagebased/service/creditheninvoice_test.go

@@ -58,13 +58,3 @@ func TestResolveInvoiceCreatedTrigger(t *testing.T) {
 		require.Equal(t, meta.TriggerFinalInvoiceCreated, trigger)
 	})
 }
-
-func TestIgnoreMinimumCommitmentForRunType(t *testing.T) {
-	t.Run("partial invoice run", func(t *testing.T) {
-		require.True(t, ignoreMinimumCommitmentForRunType(usagebased.RealizationRunTypePartialInvoice))
-	})
-
-	t.Run("final realization run", func(t *testing.T) {
-		require.False(t, ignoreMinimumCommitmentForRunType(usagebased.RealizationRunTypeFinalRealization))
-	})
-}

openmeter/billing/charges/usagebased/service/creditsonly.go

@@ -184,16 +184,15 @@ func (s *CreditsOnlyStateMachine) FinalizeRealizationRun(ctx context.Context) er
 
 	storedAtLT := meta.NormalizeTimestamp(currentRun.StoredAtLT)
 
-	ratingResult, err := s.Rater.GetDetailedLinesForUsage(ctx, usagebasedrating.GetDetailedLinesForUsageInput{
+	ratingResult, err := s.Rater.GetDetailedRatingForUsage(ctx, usagebasedrating.GetDetailedRatingForUsageInput{
 		Charge:          s.Charge,
-		PriorRuns:       s.Charge.Realizations.Without(currentRun.ID),
+		StoredAtLT:      storedAtLT,
+		ServicePeriodTo: currentRun.ServicePeriodTo,
 		Customer:        s.CustomerOverride,
 		FeatureMeter:    s.FeatureMeter,
-		ServicePeriodTo: currentRun.ServicePeriodTo,
-		StoredAtLT:      storedAtLT,
 	})
 	if err != nil {
-		return fmt.Errorf("get rating for usage: %w", err)
+		return fmt.Errorf("get detailed rating for usage: %w", err)
 	}
 
 	currentTotals := ratingResult.Totals.RoundToPrecision(s.CurrencyCalculator)
@@ -219,12 +218,18 @@ func (s *CreditsOnlyStateMachine) FinalizeRealizationRun(ctx context.Context) er
 	}
 	currentRun.DetailedLines = mo.Some(runDetailedLines)
 
-	if _, err := s.Adapter.UpdateRealizationRun(ctx, usagebased.UpdateRealizationRunInput{
+	currentRunBase, err := s.Adapter.UpdateRealizationRun(ctx, usagebased.UpdateRealizationRunInput{
 		ID:              currentRun.ID,
 		StoredAtLT:      mo.Some(storedAtLT),
 		MeteredQuantity: mo.Some(ratingResult.Quantity),
 		Totals:          mo.Some(currentTotals),
-	}); err != nil {
+	})
+	if err != nil {
+		return fmt.Errorf("update realization run: %w", err)
+	}
+	currentRun.RealizationRunBase = currentRunBase
+
+	if err := s.Charge.Realizations.SetRealizationRun(currentRun); err != nil {
 		return fmt.Errorf("update realization run: %w", err)
 	}