fix(entitlement): reject duplicate reset time (#4511)

Author: GAlexIHU

openmeter/entitlement/metered/reset.go

@@ -38,6 +38,12 @@ func (e *connector) ResetEntitlementUsage(ctx context.Context, entitlementID mod
 			return nil, fmt.Errorf("failed to parse entitlement: %w", err)
 		}
 
+		resetTime := params.At.Truncate(time.Minute)
+		lastReset := mEnt.LastReset.Truncate(time.Minute)
+		if resetTime.Equal(lastReset) {
+			return nil, models.NewGenericValidationError(fmt.Errorf("reset at %s must be after last reset at %s", resetTime, lastReset))
+		}
+
 		if err := e.hooks.PreUpdate(ctx, mEnt); err != nil {
 			return nil, err
 		}

openmeter/entitlement/metered/reset_test.go

@@ -204,6 +204,47 @@ func TestResetEntitlementUsage(t *testing.T) {
 				assert.ErrorContains(t, err, "in the future")
 			},
 		},
+		{
+			name: "Should error if requested reset time is the same minute as the last reset",
+			run: func(t *testing.T, connector meteredentitlement.Connector, deps *dependencies) {
+				ctx := t.Context()
+				startTime := getAnchor(t)
+				randName := testutils.NameGenerator.Generate()
+
+				// given:
+				// - a metered entitlement that has already been reset in a specific minute
+				// when:
+				// - reset is requested again inside the same minute
+				// then:
+				// - the second reset is rejected as a duplicate reset time
+
+				// create customer and subject
+				cust := createCustomerAndSubject(t, deps.subjectService, deps.customerService, namespace, randName.Key, randName.Name)
+
+				// create entitlement in db
+				inp := getEntitlement(t, feat, cust.GetUsageAttribution())
+				inp.MeasureUsageFrom = &startTime
+				ent, err := deps.entitlementRepo.CreateEntitlement(ctx, inp)
+				require.NoError(t, err)
+
+				deps.streamingConnector.AddSimpleEvent(meterSlug, 100, startTime.Add(time.Minute))
+
+				resetTime := startTime.Add(3*time.Hour + 10*time.Second)
+				_, err = connector.ResetEntitlementUsage(ctx,
+					models.NamespacedID{Namespace: namespace, ID: ent.ID},
+					meteredentitlement.ResetEntitlementUsageParams{
+						At: resetTime,
+					})
+				require.NoError(t, err)
+
+				_, err = connector.ResetEntitlementUsage(ctx,
+					models.NamespacedID{Namespace: namespace, ID: ent.ID},
+					meteredentitlement.ResetEntitlementUsageParams{
+						At: resetTime.Truncate(time.Minute).Add(30 * time.Second),
+					})
+				assert.ErrorContains(t, err, "must be after last reset")
+			},
+		},
 		{
 			name: "Should invalidate snapshots after the reset time",
 			run: func(t *testing.T, connector meteredentitlement.Connector, deps *dependencies) {