Skip to content

Commit df7f44c

Browse files
committed
[usage] Use credit cents when computing listed usage balance
1 parent 39c5542 commit df7f44c

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

components/usage/pkg/apiv1/usage.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ func (s *UsageService) ListUsage(ctx context.Context, in *v1.ListUsageRequest) (
150150

151151
return &v1.ListUsageResponse{
152152
UsageEntries: usageData,
153-
CreditBalanceAtStart: float64(usageSummary.CreditCentsBalanceAtStart) / 100,
154-
CreditBalanceAtEnd: float64(usageSummary.CreditCentsBalanceAtEnd) / 100,
153+
CreditBalanceAtStart: usageSummary.CreditCentsBalanceAtStart.ToCredits(),
154+
CreditBalanceAtEnd: usageSummary.CreditCentsBalanceAtEnd.ToCredits(),
155155
Pagination: &pagination,
156156
}, nil
157157
}

components/usage/pkg/db/cost_center.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,15 +162,15 @@ func (c *CostCenterManager) ComputeInvoiceUsageRecord(ctx context.Context, attri
162162
if err != nil {
163163
return nil, err
164164
}
165-
if summary.CreditCentsBalanceAtEnd <= int64(0) {
166-
// account has not debt, do nothing
165+
if summary.CreditCentsBalanceAtEnd.ToCredits() <= 0 {
166+
// account has no debt, do nothing
167167
return nil, nil
168168
}
169169
return &Usage{
170170
ID: uuid.New(),
171171
AttributionID: attributionID,
172172
Description: "Credits",
173-
CreditCents: CreditCents(summary.CreditCentsBalanceAtEnd * -1),
173+
CreditCents: summary.CreditCentsBalanceAtEnd * -1,
174174
EffectiveTime: NewVarcharTime(now),
175175
Kind: InvoiceUsageKind,
176176
Draft: false,

components/usage/pkg/db/usage.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ func FindUsage(ctx context.Context, conn *gorm.DB, params *FindUsageParams) ([]U
163163

164164
type UsageSummary struct {
165165
NumRecordsInRange int
166-
CreditCentsBalanceAtStart int64
167-
CreditCentsBalanceAtEnd int64
166+
CreditCentsBalanceAtStart CreditCents
167+
CreditCentsBalanceAtEnd CreditCents
168168
}
169169

170170
func GetUsageSummary(ctx context.Context, conn *gorm.DB, attributionId AttributionID, from, to time.Time, excludeDrafts bool) (*UsageSummary, error) {
@@ -197,8 +197,8 @@ func GetUsageSummary(ctx context.Context, conn *gorm.DB, attributionId Attributi
197197
}
198198
return &UsageSummary{
199199
NumRecordsInRange: int(numRecordsInRange.Int32),
200-
CreditCentsBalanceAtStart: creditCentsBalanceAtStart.Int64,
201-
CreditCentsBalanceAtEnd: creditCentsBalanceAtStart.Int64 + creditCentsBalanceInPeriod.Int64,
200+
CreditCentsBalanceAtStart: CreditCents(creditCentsBalanceAtStart.Int64),
201+
CreditCentsBalanceAtEnd: CreditCents(creditCentsBalanceAtStart.Int64 + creditCentsBalanceInPeriod.Int64),
202202
}, nil
203203
}
204204

0 commit comments

Comments
 (0)