Skip to content

refactor: change package names #3065

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
GAlexIHU merged 2 commits into from
Jul 7, 2025
Merged

refactor: change package names #3065

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
6894b62
refactor: change package names
GAlexIHU Jul 3, 2025
2f72fcc
chore: ent codegen
GAlexIHU Jul 7, 2025
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
4 changes: 2 additions & 2 deletions app/config/config_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/meter"
notificationwebhook "github.com/openmeterio/openmeter/openmeter/notification/webhook"
"github.com/openmeterio/openmeter/openmeter/notification/webhook/svix"
"github.com/openmeterio/openmeter/pkg/isodate"
"github.com/openmeterio/openmeter/pkg/datetime"
pkgkafka "github.com/openmeterio/openmeter/pkg/kafka"
"github.com/openmeterio/openmeter/pkg/models"
"github.com/openmeterio/openmeter/pkg/redis"
Expand Down Expand Up @@ -138,7 +138,7 @@ func TestComplete(t *testing.T) {
AsyncInsertWait: false,
},
Entitlements: EntitlementsConfiguration{
GracePeriod: isodate.String("P1D"),
GracePeriod: datetime.ISODurationString("P1D"),
},
Billing: BillingConfiguration{
AdvancementStrategy: billing.ForegroundAdvancementStrategy,
Expand Down
8 changes: 4 additions & 4 deletions app/config/entitlements.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"github.com/spf13/pflag"
"github.com/spf13/viper"

"github.com/openmeterio/openmeter/pkg/isodate"
"github.com/openmeterio/openmeter/pkg/datetime"
)

type EntitlementsConfiguration struct {
GracePeriod isodate.String
GracePeriod datetime.ISODurationString
}

// Validate validates the configuration.
Expand All @@ -29,11 +29,11 @@ func (c EntitlementsConfiguration) Validate() error {
return nil
}

func (c *EntitlementsConfiguration) GetGracePeriod() isodate.Period {
func (c *EntitlementsConfiguration) GetGracePeriod() datetime.ISODuration {
gracePeriod, err := c.GracePeriod.Parse()
if err != nil {
slog.Error("failed to parse grace period, using default of 1 day", "error", err)
return isodate.NewPeriod(0, 0, 0, 1, 0, 0, 0)
return datetime.NewPeriod(0, 0, 0, 1, 0, 0, 0)
}
return gracePeriod
}
Expand Down
10 changes: 5 additions & 5 deletions openmeter/billing/customeroverride.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/customer"
"github.com/openmeterio/openmeter/openmeter/productcatalog"
"github.com/openmeterio/openmeter/pkg/isodate"
"github.com/openmeterio/openmeter/pkg/datetime"
"github.com/openmeterio/openmeter/pkg/pagination"
"github.com/openmeterio/openmeter/pkg/sortx"
)
Expand Down Expand Up @@ -65,8 +65,8 @@ func (c CustomerOverride) Validate() error {
}

type CollectionOverrideConfig struct {
Alignment *AlignmentKind `json:"alignment,omitempty"`
Interval *isodate.Period `json:"interval,omitempty"`
Alignment *AlignmentKind `json:"alignment,omitempty"`
Interval *datetime.ISODuration `json:"interval,omitempty"`
}

func (c *CollectionOverrideConfig) Validate() error {
Expand All @@ -83,8 +83,8 @@ func (c *CollectionOverrideConfig) Validate() error {

type InvoicingOverrideConfig struct {
AutoAdvance *bool `json:"autoAdvance,omitempty"`
DraftPeriod *isodate.Period `json:"draftPeriod,omitempty"`
DueAfter *isodate.Period `json:"dueAfter,omitempty"`
DraftPeriod *datetime.ISODuration `json:"draftPeriod,omitempty"`
DueAfter *datetime.ISODuration `json:"dueAfter,omitempty"`
ProgressiveBilling *bool `json:"progressiveBilling,omitempty"`
DefaultTaxConfig *productcatalog.TaxConfig `json:"defaultTaxConfig,omitempty"`
}
Expand Down
8 changes: 4 additions & 4 deletions openmeter/billing/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/samber/lo"

"github.com/openmeterio/openmeter/pkg/isodate"
"github.com/openmeterio/openmeter/pkg/datetime"
)

const (
Expand All @@ -15,12 +15,12 @@ const (
var DefaultWorkflowConfig = WorkflowConfig{
Collection: CollectionConfig{
Alignment: AlignmentKindSubscription,
Interval: lo.Must(isodate.String("PT1H").Parse()),
Interval: lo.Must(datetime.ISODurationString("PT1H").Parse()),
},
Invoicing: InvoicingConfig{
AutoAdvance: true,
DraftPeriod: lo.Must(isodate.String("P0D").Parse()),
DueAfter: lo.Must(isodate.String("P30D").Parse()),
DraftPeriod: lo.Must(datetime.ISODurationString("P0D").Parse()),
DueAfter: lo.Must(datetime.ISODurationString("P30D").Parse()),
ProgressiveBilling: true,
DefaultTaxConfig: nil,
},
Expand Down
6 changes: 3 additions & 3 deletions openmeter/billing/httpdriver/invoice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
customerhttpdriver "github.com/openmeterio/openmeter/openmeter/customer/httpdriver"
"github.com/openmeterio/openmeter/pkg/convert"
"github.com/openmeterio/openmeter/pkg/currencyx"
"github.com/openmeterio/openmeter/pkg/datetime"
"github.com/openmeterio/openmeter/pkg/framework/commonhttp"
"github.com/openmeterio/openmeter/pkg/framework/transport/httptransport"
"github.com/openmeterio/openmeter/pkg/isodate"
"github.com/openmeterio/openmeter/pkg/models"
"github.com/openmeterio/openmeter/pkg/pagination"
"github.com/openmeterio/openmeter/pkg/slicesx"
Expand Down Expand Up @@ -749,7 +749,7 @@ func mergeInvoiceWorkflowFromAPI(existing billing.InvoiceWorkflow, updatedWorkfl
if updatedWorkflow.Workflow.Invoicing.DraftPeriod == nil {
existing.Config.Invoicing.DraftPeriod = billing.DefaultWorkflowConfig.Invoicing.DraftPeriod
} else {
period, err := isodate.String(*updatedWorkflow.Workflow.Invoicing.DraftPeriod).Parse()
period, err := datetime.ISODurationString(*updatedWorkflow.Workflow.Invoicing.DraftPeriod).Parse()
if err != nil {
return existing, billing.ValidationError{
Err: fmt.Errorf("failed to parse draft period: %w", err),
Expand All @@ -762,7 +762,7 @@ func mergeInvoiceWorkflowFromAPI(existing billing.InvoiceWorkflow, updatedWorkfl
if updatedWorkflow.Workflow.Invoicing.DueAfter == nil {
existing.Config.Invoicing.DueAfter = billing.DefaultWorkflowConfig.Invoicing.DueAfter
} else {
period, err := isodate.String(*updatedWorkflow.Workflow.Invoicing.DueAfter).Parse()
period, err := datetime.ISODurationString(*updatedWorkflow.Workflow.Invoicing.DueAfter).Parse()
if err != nil {
return existing, billing.ValidationError{
Err: fmt.Errorf("failed to parse due after: %w", err),
Expand Down
6 changes: 3 additions & 3 deletions openmeter/billing/httpdriver/profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
apphttpdriver "github.com/openmeterio/openmeter/openmeter/app/httpdriver"
"github.com/openmeterio/openmeter/openmeter/billing"
"github.com/openmeterio/openmeter/pkg/convert"
"github.com/openmeterio/openmeter/pkg/datetime"
"github.com/openmeterio/openmeter/pkg/defaultx"
"github.com/openmeterio/openmeter/pkg/framework/commonhttp"
"github.com/openmeterio/openmeter/pkg/framework/transport/httptransport"
"github.com/openmeterio/openmeter/pkg/isodate"
"github.com/openmeterio/openmeter/pkg/models"
"github.com/openmeterio/openmeter/pkg/pagination"
"github.com/openmeterio/openmeter/pkg/sortx"
Expand Down Expand Up @@ -409,12 +409,12 @@ func fromAPIBillingWorkflowCreate(i api.BillingWorkflowCreate) (billing.Workflow
return fromAPIBillingWorkflow(api.BillingWorkflow(i))
}

func parseDurationPtr(d *string, defaultDuration isodate.Period) (isodate.Period, error) {
func parseDurationPtr(d *string, defaultDuration datetime.ISODuration) (datetime.ISODuration, error) {
if d == nil {
return defaultDuration, nil
}

return isodate.String(*d).Parse()
return datetime.ISODurationString(*d).Parse()
}

func (h *handler) MapProfileToApi(ctx context.Context, p *billing.Profile) (api.BillingProfile, error) {
Expand Down
6 changes: 3 additions & 3 deletions openmeter/billing/profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/openmeterio/openmeter/api"
"github.com/openmeterio/openmeter/openmeter/app"
"github.com/openmeterio/openmeter/openmeter/productcatalog"
"github.com/openmeterio/openmeter/pkg/isodate"
"github.com/openmeterio/openmeter/pkg/datetime"
"github.com/openmeterio/openmeter/pkg/models"
"github.com/openmeterio/openmeter/pkg/pagination"
"github.com/openmeterio/openmeter/pkg/sortx"
Expand All @@ -36,8 +36,8 @@ func (k AlignmentKind) Values() []string {
// InvoiceConfig groups fields related to invoice settings.
type InvoicingConfig struct {
AutoAdvance bool `json:"autoAdvance,omitempty"`
DraftPeriod isodate.Period `json:"draftPeriod,omitempty"`
DueAfter isodate.Period `json:"dueAfter,omitempty"`
DraftPeriod datetime.ISODuration `json:"draftPeriod,omitempty"`
DueAfter datetime.ISODuration `json:"dueAfter,omitempty"`
ProgressiveBilling bool `json:"progressiveBilling,omitempty"`
DefaultTaxConfig *productcatalog.TaxConfig `json:"defaultTaxConfig,omitempty"`
}
Expand Down
Loading