feat: Tiered price's first bucket's flat fee is always billed

openmeterio · Jan 20, 2025 · a2ade61 · a2ade61
1 parent dcd6850
commit a2ade61
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/openmeter/billing/service/lineservice/usagebasedline.go b/openmeter/billing/service/lineservice/usagebasedline.go
@@ -650,7 +650,7 @@ func tieredPriceCalculator(in tieredPriceCalculatorInput) error {
 
 	previousTierQty := alpacadecimal.Zero
 	for idx, tier := range in.TieredPrice.WithSortedTiers().Tiers {
-		if previousTierQty.GreaterThanOrEqual(in.ToQty) {
+		if previousTierQty.GreaterThan(in.ToQty) {
 			// We already have enough data to bill for this tiered price
 			break
 		}

diff --git a/openmeter/billing/service/lineservice/usagebasedline_test.go b/openmeter/billing/service/lineservice/usagebasedline_test.go
@@ -839,7 +839,15 @@ func TestTieredGraduatedCalculation(t *testing.T) {
 			usage: featureUsageResponse{
 				LinePeriodQty: alpacadecimal.NewFromFloat(0),
 			},
-			expect: newDetailedLinesInput{},
+			expect: newDetailedLinesInput{
+				{
+					Name:                   "feature: flat price for tier 1",
+					PerUnitAmount:          alpacadecimal.NewFromFloat(100),
+					Quantity:               alpacadecimal.NewFromFloat(1),
+					ChildUniqueReferenceID: "graduated-tiered-1-flat-price",
+					PaymentTerm:            productcatalog.InArrearsPaymentTerm,
+				},
+			},
 		})
 	})
 
@@ -931,9 +939,16 @@ func TestTieredGraduatedCalculation(t *testing.T) {
 				LinePeriodQty:    alpacadecimal.NewFromFloat(0),
 			},
 			expect: newDetailedLinesInput{
+				{
+					Name:                   "feature: flat price for tier 1",
+					PerUnitAmount:          alpacadecimal.NewFromFloat(100),
+					Quantity:               alpacadecimal.NewFromFloat(1),
+					ChildUniqueReferenceID: "graduated-tiered-1-flat-price",
+					PaymentTerm:            productcatalog.InArrearsPaymentTerm,
+				},
 				{
 					Name:                   "feature: minimum spend",
-					PerUnitAmount:          alpacadecimal.NewFromFloat(1000),
+					PerUnitAmount:          alpacadecimal.NewFromFloat(900),
 					Quantity:               alpacadecimal.NewFromFloat(1),
 					ChildUniqueReferenceID: GraduatedMinSpendChildUniqueReferenceID,
 					PaymentTerm:            productcatalog.InArrearsPaymentTerm,
@@ -1293,8 +1308,9 @@ func TestTieredPriceCalculator(t *testing.T) {
 	}
 
 	t.Run("totals, no usage", func(t *testing.T) {
+		// If there's no usage in the first tier we need to bill the flat fee regardless.
 		totalAmount := getTotalAmountForGraduatedTieredPrice(t, alpacadecimal.NewFromFloat(0), testIn)
-		require.Equal(t, alpacadecimal.NewFromFloat(0), totalAmount)
+		require.Equal(t, alpacadecimal.NewFromFloat(100), totalAmount)
 	})
 
 	t.Run("totals, usage in tier 1", func(t *testing.T) {
@@ -1306,7 +1322,10 @@ func TestTieredPriceCalculator(t *testing.T) {
 	})
 
 	t.Run("totals, usage in tier 2", func(t *testing.T) {
-		totalAmount := getTotalAmountForGraduatedTieredPrice(t, alpacadecimal.NewFromFloat(7), testIn)
+		totalAmount := getTotalAmountForGraduatedTieredPrice(t, alpacadecimal.NewFromFloat(5.001), testIn)
+		require.Equal(t, alpacadecimal.NewFromFloat(100+50), totalAmount)
+
+		totalAmount = getTotalAmountForGraduatedTieredPrice(t, alpacadecimal.NewFromFloat(7), testIn)
 		require.Equal(t, alpacadecimal.NewFromFloat(100+50), totalAmount)
 	})