Skip to content

Commit d2ec8ae

Browse files
authored
chore: remove * expands from billing (#2422)
1 parent 3eca364 commit d2ec8ae

File tree

6 files changed

+748
-775
lines changed

6 files changed

+748
-775
lines changed

api/api.gen.go

Lines changed: 748 additions & 751 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/openapi.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8570,11 +8570,7 @@ components:
85708570
type: string
85718571
enum:
85728572
- apps
8573-
- '*'
85748573
description: BillingProfileExpand details what profile fields to expand
8575-
x-enum-varnames:
8576-
- apps
8577-
- all
85788574
BillingProfileOrderBy:
85798575
type: string
85808576
enum:
@@ -11620,16 +11616,10 @@ components:
1162011616
InvoiceExpand:
1162111617
type: string
1162211618
enum:
11623-
- '*'
1162411619
- lines
1162511620
- preceding
1162611621
- workflow.apps
1162711622
description: InvoiceExpand specifies the parts of the invoice to expand in the list output.
11628-
x-enum-varnames:
11629-
- all
11630-
- lines
11631-
- preceding
11632-
- workflowApps
1163311623
InvoiceFlatFeeCategory:
1163411624
type: string
1163511625
enum:

api/spec/src/billing/invoices.tsp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,9 +410,7 @@ model InvoiceListParams {
410410
* InvoiceExpand specifies the parts of the invoice to expand in the list output.
411411
*/
412412
@friendlyName("InvoiceExpand")
413-
@extension("x-enum-varnames", ["all", "lines", "preceding", "workflowApps"])
414413
enum InvoiceExpand {
415-
all: "*",
416414
lines: "lines",
417415
preceding: "preceding",
418416
workflowApps: "workflow.apps",

api/spec/src/billing/profile.tsp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,8 @@ enum BillingProfileOrderBy {
9999
* BillingProfileExpand details what profile fields to expand
100100
*/
101101
@friendlyName("BillingProfileExpand")
102-
@extension("x-enum-varnames", ["apps", "all"])
103102
enum BillingProfileExpand {
104103
apps: "apps",
105-
all: "*",
106104
}
107105

108106
/**

openmeter/billing/httpdriver/invoice.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -599,10 +599,6 @@ func mapInvoiceExpandToEntity(expand []api.InvoiceExpand) billing.InvoiceExpand
599599
return billing.InvoiceExpand{}
600600
}
601601

602-
if slices.Contains(expand, api.InvoiceExpandAll) {
603-
return billing.InvoiceExpandAll
604-
}
605-
606602
return billing.InvoiceExpand{
607603
Lines: slices.Contains(expand, api.InvoiceExpandLines),
608604
Preceding: slices.Contains(expand, api.InvoiceExpandPreceding),

openmeter/billing/httpdriver/profile.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -524,12 +524,6 @@ func mapProfileExpandToEntity(expand []api.BillingProfileExpand) billing.Profile
524524
return billing.ProfileExpand{}
525525
}
526526

527-
if slices.Contains(expand, api.BillingProfileExpandAll) {
528-
return billing.ProfileExpand{
529-
Apps: true,
530-
}
531-
}
532-
533527
return billing.ProfileExpand{
534528
Apps: slices.Contains(expand, api.BillingProfileExpandApps),
535529
}

0 commit comments

Comments
 (0)