Skip to content

Commit

Permalink
Merge pull request #1137 from openmeterio/fix/value-endpoint
Browse files Browse the repository at this point in the history
fix: subject filtering for value endpoint
  • Loading branch information
turip authored Jul 2, 2024
2 parents 9c62e13 + 2afa10a commit 64a7017
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions internal/entitlement/metered/balance.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ func (e *connector) GetEntitlementBalance(ctx context.Context, entitlementID mod
}

meterQuery := ownerMeter.DefaultParams
meterQuery.FilterSubject = []string{ownerMeter.SubjectKey}
meterQuery.From = &startOfPeriod
meterQuery.To = &at

Expand Down Expand Up @@ -150,6 +151,7 @@ func (e *connector) GetEntitlementBalanceHistory(ctx context.Context, entitlemen

// 2. and we get the windowed usage data
meterQuery := ownerMeter.DefaultParams
meterQuery.FilterSubject = []string{ownerMeter.SubjectKey}
meterQuery.From = params.From
meterQuery.To = params.To
meterQuery.WindowSize = convert.ToPointer(models.WindowSize(params.WindowSize))
Expand All @@ -164,6 +166,7 @@ func (e *connector) GetEntitlementBalanceHistory(ctx context.Context, entitlemen
// In this case we simply query for the entire period.
if len(meterRows) == 0 {
nonWindowedParams := *meterQuery
nonWindowedParams.FilterSubject = []string{ownerMeter.SubjectKey}
nonWindowedParams.WindowSize = nil
nonWindowedParams.WindowTimeZone = nil
meterRows, err = e.streamingConnector.QueryMeter(ctx, owner.Namespace, ownerMeter.MeterSlug, &nonWindowedParams)
Expand Down

0 comments on commit 64a7017

Please sign in to comment.