Skip to content

fix(ledger): nit comments from #4731 #4839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mark-vass-konghq merged 2 commits into from
Aug 4, 2026
Merged

fix(ledger): nit comments from #4731 #4839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c9fb8d
fix(ledger): nit comments from #4731
mark-vass-konghq Aug 3, 2026
c16ec0d
fix: settlementcurrency validation
mark-vass-konghq Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/v3/handlers/customers/charges/convert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/openmeterio/openmeter/openmeter/billing"
"github.com/openmeterio/openmeter/openmeter/billing/charges/meta"
"github.com/openmeterio/openmeter/openmeter/billing/charges/usagebased"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
"github.com/openmeterio/openmeter/openmeter/productcatalog"
"github.com/openmeterio/openmeter/pkg/timeutil"
)
Expand Down
2 changes: 1 addition & 1 deletion api/v3/handlers/customers/credits/convert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
api "github.com/openmeterio/openmeter/api/v3"
"github.com/openmeterio/openmeter/openmeter/billing/charges/creditpurchase"
"github.com/openmeterio/openmeter/openmeter/billing/charges/meta"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
"github.com/openmeterio/openmeter/pkg/clock"
"github.com/openmeterio/openmeter/pkg/models"
)
Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/charges/creditpurchase/charge_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/require"

"github.com/openmeterio/openmeter/openmeter/billing/charges/meta"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
"github.com/openmeterio/openmeter/pkg/timeutil"
)

Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/charges/creditpurchase/service/external_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/openmeterio/openmeter/openmeter/billing/charges/meta"
"github.com/openmeterio/openmeter/openmeter/billing/charges/models/ledgertransaction"
"github.com/openmeterio/openmeter/openmeter/billing/charges/models/payment"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
"github.com/openmeterio/openmeter/pkg/currencyx"
"github.com/openmeterio/openmeter/pkg/models"
"github.com/openmeterio/openmeter/pkg/timeutil"
Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/charges/creditpurchase/service/promotional_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/openmeterio/openmeter/openmeter/billing/charges/lineage"
"github.com/openmeterio/openmeter/openmeter/billing/charges/meta"
"github.com/openmeterio/openmeter/openmeter/billing/charges/models/ledgertransaction"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
"github.com/openmeterio/openmeter/pkg/clock"
"github.com/openmeterio/openmeter/pkg/models"
"github.com/openmeterio/openmeter/pkg/timeutil"
Expand Down
15 changes: 8 additions & 7 deletions openmeter/billing/charges/creditpurchase/settlement.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"slices"

"github.com/alpacahq/alpacadecimal"
"github.com/samber/lo"

"github.com/openmeterio/openmeter/pkg/currencyx"
"github.com/openmeterio/openmeter/pkg/models"
Expand Down Expand Up @@ -331,23 +332,23 @@ func (s Settlement) GetCostBasis() (alpacadecimal.Decimal, error) {
// GetCurrency returns the fiat currency real money settles in. Promotional
// settlements never move real money, so they return an empty currency rather
// than an error.
func (s Settlement) GetCurrency() (currencyx.FiatCode, error) {
func (s Settlement) GetCurrency() (*currencyx.FiatCode, error) {
switch s.t {
case SettlementTypeInvoice:
if s.invoice == nil {
return "", fmt.Errorf("invoice is nil")
return nil, fmt.Errorf("invoice is nil")
}

return s.invoice.Currency, nil
return lo.ToPtr(s.invoice.Currency), nil
case SettlementTypeExternal:
if s.external == nil {
return "", fmt.Errorf("external is nil")
return nil, fmt.Errorf("external is nil")
}

return s.external.Currency, nil
return &s.external.Currency, nil
case SettlementTypePromotional:
return "", nil
return nil, nil
default:
return "", fmt.Errorf("invalid settlement type: %s", s.t)
return nil, fmt.Errorf("invalid settlement type: %s", s.t)
}
}
2 changes: 1 addition & 1 deletion openmeter/billing/charges/flatfee/adapter/detailedline_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
metaadapter "github.com/openmeterio/openmeter/openmeter/billing/charges/meta/adapter"
"github.com/openmeterio/openmeter/openmeter/billing/models/stddetailedline"
"github.com/openmeterio/openmeter/openmeter/billing/models/totals"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
entdb "github.com/openmeterio/openmeter/openmeter/ent/db"
dbchargeflatfee "github.com/openmeterio/openmeter/openmeter/ent/db/chargeflatfee"
dbchargeflatfeerundetailedline "github.com/openmeterio/openmeter/openmeter/ent/db/chargeflatfeerundetailedline"
Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/charges/flatfee/adapter/intentoverride_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/openmeterio/openmeter/openmeter/billing/charges/flatfee"
chargesmeta "github.com/openmeterio/openmeter/openmeter/billing/charges/meta"
metaadapter "github.com/openmeterio/openmeter/openmeter/billing/charges/meta/adapter"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
entdb "github.com/openmeterio/openmeter/openmeter/ent/db"
"github.com/openmeterio/openmeter/openmeter/productcatalog"
taxcodetestutils "github.com/openmeterio/openmeter/openmeter/taxcode/testutils"
Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/charges/flatfee/adapter/realizationrun_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/openmeterio/openmeter/openmeter/billing/charges/flatfee"
chargesmeta "github.com/openmeterio/openmeter/openmeter/billing/charges/meta"
metaadapter "github.com/openmeterio/openmeter/openmeter/billing/charges/meta/adapter"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
entdb "github.com/openmeterio/openmeter/openmeter/ent/db"
"github.com/openmeterio/openmeter/openmeter/productcatalog"
taxcodetestutils "github.com/openmeterio/openmeter/openmeter/taxcode/testutils"
Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/charges/flatfee/charge_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/openmeterio/openmeter/openmeter/billing/charges/meta"
"github.com/openmeterio/openmeter/openmeter/billing/charges/models/costbasis"
"github.com/openmeterio/openmeter/openmeter/currencies"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
"github.com/openmeterio/openmeter/openmeter/productcatalog"
"github.com/openmeterio/openmeter/pkg/currencyx"
"github.com/openmeterio/openmeter/pkg/datetime"
Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/charges/lineage/lineage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/openmeterio/openmeter/openmeter/billing/charges/meta"
"github.com/openmeterio/openmeter/openmeter/billing/charges/models/creditrealization"
"github.com/openmeterio/openmeter/openmeter/currencies"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
"github.com/openmeterio/openmeter/pkg/currencyx"
)

Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/charges/service/base_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
currencyadapter "github.com/openmeterio/openmeter/openmeter/currencies/adapter"
"github.com/openmeterio/openmeter/openmeter/currencies/currencyresolver"
currencyservice "github.com/openmeterio/openmeter/openmeter/currencies/service"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
"github.com/openmeterio/openmeter/openmeter/customer"
"github.com/openmeterio/openmeter/openmeter/ledger/recognizer"
"github.com/openmeterio/openmeter/openmeter/productcatalog"
Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/charges/service/creditpurchase_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/openmeterio/openmeter/openmeter/billing/charges/meta"
"github.com/openmeterio/openmeter/openmeter/billing/charges/models/payment"
"github.com/openmeterio/openmeter/openmeter/currencies"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
"github.com/openmeterio/openmeter/openmeter/customer"
"github.com/openmeterio/openmeter/openmeter/productcatalog"
"github.com/openmeterio/openmeter/pkg/clock"
Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/charges/service/invoicable_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
billingtotals "github.com/openmeterio/openmeter/openmeter/billing/models/totals"
billingratingservice "github.com/openmeterio/openmeter/openmeter/billing/rating/service"
"github.com/openmeterio/openmeter/openmeter/currencies"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
"github.com/openmeterio/openmeter/openmeter/customer"
"github.com/openmeterio/openmeter/openmeter/productcatalog"
streamingtestutils "github.com/openmeterio/openmeter/openmeter/streaming/testutils"
Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/charges/service/lineage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/openmeterio/openmeter/openmeter/billing/charges/models/creditrealization"
"github.com/openmeterio/openmeter/openmeter/billing/charges/models/ledgertransaction"
"github.com/openmeterio/openmeter/openmeter/billing/charges/usagebased"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
"github.com/openmeterio/openmeter/openmeter/customer"
entdb "github.com/openmeterio/openmeter/openmeter/ent/db"
"github.com/openmeterio/openmeter/openmeter/ent/db/creditrealizationlineage"
Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/charges/service/taxcode_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/openmeterio/openmeter/openmeter/billing/charges/models/creditrealization"
"github.com/openmeterio/openmeter/openmeter/billing/charges/models/ledgertransaction"
"github.com/openmeterio/openmeter/openmeter/billing/charges/usagebased"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
"github.com/openmeterio/openmeter/openmeter/productcatalog"
"github.com/openmeterio/openmeter/openmeter/taxcode"
"github.com/openmeterio/openmeter/pkg/clock"
Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/charges/service/truncation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/openmeterio/openmeter/openmeter/billing/charges/flatfee"
"github.com/openmeterio/openmeter/openmeter/billing/charges/meta"
"github.com/openmeterio/openmeter/openmeter/billing/charges/usagebased"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
"github.com/openmeterio/openmeter/openmeter/productcatalog"
"github.com/openmeterio/openmeter/pkg/clock"
"github.com/openmeterio/openmeter/pkg/datetime"
Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/charges/usagebased/adapter/detailedline_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/openmeterio/openmeter/openmeter/billing/charges/usagebased"
"github.com/openmeterio/openmeter/openmeter/billing/models/stddetailedline"
"github.com/openmeterio/openmeter/openmeter/billing/models/totals"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
entdb "github.com/openmeterio/openmeter/openmeter/ent/db"
dbchargeusagebasedrundetailedline "github.com/openmeterio/openmeter/openmeter/ent/db/chargeusagebasedrundetailedline"
dbchargeusagebasedruns "github.com/openmeterio/openmeter/openmeter/ent/db/chargeusagebasedruns"
Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/charges/usagebased/adapter/intentoverride_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
chargesmeta "github.com/openmeterio/openmeter/openmeter/billing/charges/meta"
metaadapter "github.com/openmeterio/openmeter/openmeter/billing/charges/meta/adapter"
"github.com/openmeterio/openmeter/openmeter/billing/charges/usagebased"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
entdb "github.com/openmeterio/openmeter/openmeter/ent/db"
"github.com/openmeterio/openmeter/openmeter/productcatalog"
taxcodetestutils "github.com/openmeterio/openmeter/openmeter/taxcode/testutils"
Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/charges/usagebased/charge_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/openmeterio/openmeter/openmeter/billing/charges/meta"
"github.com/openmeterio/openmeter/openmeter/billing/charges/models/costbasis"
"github.com/openmeterio/openmeter/openmeter/currencies"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
"github.com/openmeterio/openmeter/openmeter/productcatalog"
"github.com/openmeterio/openmeter/pkg/currencyx"
"github.com/openmeterio/openmeter/pkg/models"
Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/charges/usagebased/service/creditheninvoice_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/openmeterio/openmeter/openmeter/billing/charges/models/invoicedusage"
chargestatemachine "github.com/openmeterio/openmeter/openmeter/billing/charges/statemachine"
"github.com/openmeterio/openmeter/openmeter/billing/charges/usagebased"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
"github.com/openmeterio/openmeter/openmeter/productcatalog"
"github.com/openmeterio/openmeter/pkg/models"
"github.com/openmeterio/openmeter/pkg/timeutil"
Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/charges/usagebased/service/creditsonly_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/openmeterio/openmeter/openmeter/billing/charges/usagebased"
usagebasedrating "github.com/openmeterio/openmeter/openmeter/billing/charges/usagebased/service/rating"
usagebasedrun "github.com/openmeterio/openmeter/openmeter/billing/charges/usagebased/service/run"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
"github.com/openmeterio/openmeter/openmeter/productcatalog"
"github.com/openmeterio/openmeter/pkg/currencyx"
"github.com/openmeterio/openmeter/pkg/models"
Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/charges/usagebased/service/rating/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/openmeterio/openmeter/openmeter/billing/models/totals"
billingrating "github.com/openmeterio/openmeter/openmeter/billing/rating"
billingratingservice "github.com/openmeterio/openmeter/openmeter/billing/rating/service"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
"github.com/openmeterio/openmeter/openmeter/customer"
"github.com/openmeterio/openmeter/openmeter/meter"
"github.com/openmeterio/openmeter/openmeter/productcatalog"
Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/charges/usagebased/service/rating/subtract/subtract_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/openmeterio/openmeter/openmeter/billing/models/totals"
billingrating "github.com/openmeterio/openmeter/openmeter/billing/rating"
billingratingservice "github.com/openmeterio/openmeter/openmeter/billing/rating/service"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
"github.com/openmeterio/openmeter/openmeter/productcatalog"
"github.com/openmeterio/openmeter/pkg/models"
"github.com/openmeterio/openmeter/pkg/timeutil"
Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/charges/usagebased/service/rating/testutils/testutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/openmeterio/openmeter/openmeter/billing/charges/usagebased"
"github.com/openmeterio/openmeter/openmeter/billing/models/stddetailedline"
"github.com/openmeterio/openmeter/openmeter/billing/models/totals"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
"github.com/openmeterio/openmeter/openmeter/productcatalog"
"github.com/openmeterio/openmeter/pkg/timeutil"
)
Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/charges/usagebased/service/run/payment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/openmeterio/openmeter/openmeter/billing/charges/models/payment"
"github.com/openmeterio/openmeter/openmeter/billing/charges/usagebased"
"github.com/openmeterio/openmeter/openmeter/billing/models/totals"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
"github.com/openmeterio/openmeter/openmeter/productcatalog"
"github.com/openmeterio/openmeter/pkg/currencyx"
"github.com/openmeterio/openmeter/pkg/models"
Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/worker/subscriptionsync/service/reconciler/patchcharge_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
chargesusagebased "github.com/openmeterio/openmeter/openmeter/billing/charges/usagebased"
"github.com/openmeterio/openmeter/openmeter/billing/worker/subscriptionsync/service/persistedstate"
"github.com/openmeterio/openmeter/openmeter/billing/worker/subscriptionsync/service/targetstate"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
"github.com/openmeterio/openmeter/openmeter/productcatalog"
"github.com/openmeterio/openmeter/openmeter/subscription"
"github.com/openmeterio/openmeter/pkg/currencyx"
Expand Down
2 changes: 1 addition & 1 deletion openmeter/billing/worker/subscriptionsync/service/sync_credittheninvoice_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/openmeterio/openmeter/openmeter/billing/models/totals"
"github.com/openmeterio/openmeter/openmeter/billing/worker/subscriptionsync"
"github.com/openmeterio/openmeter/openmeter/currencies"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/currency"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
"github.com/openmeterio/openmeter/openmeter/customer"
enttx "github.com/openmeterio/openmeter/openmeter/ent/tx"
"github.com/openmeterio/openmeter/openmeter/ledger"
Expand Down
9 changes: 5 additions & 4 deletions openmeter/currencies/adapter/currencies_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/openmeterio/openmeter/openmeter/currencies"
currencyadapter "github.com/openmeterio/openmeter/openmeter/currencies/adapter"
currenciestestutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils"
currenciestestenvutils "github.com/openmeterio/openmeter/openmeter/currencies/testutils/env"
entdb "github.com/openmeterio/openmeter/openmeter/ent/db"
customcurrencydb "github.com/openmeterio/openmeter/openmeter/ent/db/customcurrency"
"github.com/openmeterio/openmeter/pkg/currencyx"
Expand All @@ -20,7 +21,7 @@ import (
)

func TestListCustomCurrenciesFiltersCurrencyType(t *testing.T) {
env := currenciestestutils.NewTestEnv(t)
env := currenciestestenvutils.NewTestEnv(t)
t.Cleanup(func() {
env.Close(t)
})
Expand Down Expand Up @@ -81,7 +82,7 @@ func TestListCustomCurrenciesFiltersCurrencyType(t *testing.T) {
}

func TestCostBasisEagerLoaders(t *testing.T) {
env := currenciestestutils.NewTestEnv(t)
env := currenciestestenvutils.NewTestEnv(t)
t.Cleanup(func() {
env.Close(t)
})
Expand Down Expand Up @@ -376,7 +377,7 @@ func TestCostBasisEagerLoaders(t *testing.T) {

func loadCostBasisIDs(
t *testing.T,
env *currenciestestutils.TestEnv,
env *currenciestestenvutils.TestEnv,
currencyID string,
eagerLoad func(*entdb.CustomCurrencyQuery) *entdb.CustomCurrencyQuery,
) []string {
Expand All @@ -397,7 +398,7 @@ func loadCostBasisIDs(
}

func TestGetCostBasisAt(t *testing.T) {
env := currenciestestutils.NewTestEnv(t)
env := currenciestestenvutils.NewTestEnv(t)
t.Cleanup(func() {
env.Close(t)
})
Expand Down
Loading
Loading