Skip to content

Commit 6ac2c95

Browse files
turipturip
authored
refactor: get rid of appstripe entity package (#4148)
1 parent 776a9d0 commit 6ac2c95

41 files changed

Lines changed: 290 additions & 310 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/v3/handlers/apps/convert.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/openmeterio/openmeter/openmeter/app"
1414
appcustominvoicing "github.com/openmeterio/openmeter/openmeter/app/custominvoicing"
1515
appsandbox "github.com/openmeterio/openmeter/openmeter/app/sandbox"
16-
appstripeentityapp "github.com/openmeterio/openmeter/openmeter/app/stripe/entity/app"
16+
appstripe "github.com/openmeterio/openmeter/openmeter/app/stripe"
1717
)
1818

1919
// goverter:variables
@@ -50,7 +50,7 @@ func ToAPIBillingApp(item app.App) (api.BillingApp, error) {
5050

5151
switch item.GetType() {
5252
case app.AppTypeStripe:
53-
stripeApp, ok := item.(appstripeentityapp.App)
53+
stripeApp, ok := item.(appstripe.App)
5454
if !ok {
5555
return api.BillingApp{}, fmt.Errorf("expected stripe app, got %T", item)
5656
}
@@ -126,7 +126,7 @@ func toAPIBillingAppSandbox(sandboxApp appsandbox.Meta) (api.BillingAppSandbox,
126126
}
127127

128128
func toAPIBillingAppStripe(
129-
stripeApp appstripeentityapp.Meta,
129+
stripeApp appstripe.Meta,
130130
) (api.BillingAppStripe, error) {
131131
definition, err := ToAPIBillingAppCatalogItem(stripeApp.GetListing())
132132
if err != nil {

‎api/v3/handlers/customers/billing/convert.gen.go‎

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

‎api/v3/handlers/customers/billing/convert.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package customersbilling
44
import (
55
apilegacy "github.com/openmeterio/openmeter/api"
66
api "github.com/openmeterio/openmeter/api/v3"
7-
appstripeentity "github.com/openmeterio/openmeter/openmeter/app/stripe/entity"
7+
appstripe "github.com/openmeterio/openmeter/openmeter/app/stripe"
88
"github.com/openmeterio/openmeter/openmeter/customer"
99
)
1010

@@ -53,10 +53,10 @@ var (
5353
FromAPIBillingAppStripeCheckoutSessionUIMode func(source api.BillingAppStripeCheckoutSessionUIMode) (apilegacy.CheckoutSessionUIMode, error)
5454

5555
// goverter:map Configuration.ID ConfigurationId
56-
ToAPIBillingAppStripeCreateCustomerPortalSessionResult func(portalSession appstripeentity.StripePortalSession) api.BillingAppStripeCreateCustomerPortalSessionResult
56+
ToAPIBillingAppStripeCreateCustomerPortalSessionResult func(portalSession appstripe.StripePortalSession) api.BillingAppStripeCreateCustomerPortalSessionResult
5757

5858
// goverter:autoMap StripeCheckoutSession
59-
ToAPIBillingAppStripeCreateCheckoutSessionResult func(source appstripeentity.CreateCheckoutSessionOutput) api.BillingAppStripeCreateCheckoutSessionResult
59+
ToAPIBillingAppStripeCreateCheckoutSessionResult func(source appstripe.CreateCheckoutSessionOutput) api.BillingAppStripeCreateCheckoutSessionResult
6060
)
6161

6262
func ResolveIDFromCustomerId(namespacedID customer.CustomerID) string {

‎api/v3/handlers/customers/billing/create_customer_stripe_checkout_session.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ import (
1010
api "github.com/openmeterio/openmeter/api/v3"
1111
"github.com/openmeterio/openmeter/api/v3/apierrors"
1212
"github.com/openmeterio/openmeter/api/v3/request"
13-
appstripeentity "github.com/openmeterio/openmeter/openmeter/app/stripe/entity"
13+
appstripe "github.com/openmeterio/openmeter/openmeter/app/stripe"
1414
"github.com/openmeterio/openmeter/openmeter/customer"
1515
"github.com/openmeterio/openmeter/pkg/framework/commonhttp"
1616
"github.com/openmeterio/openmeter/pkg/framework/transport/httptransport"
1717
)
1818

1919
type (
20-
CreateCustomerStripeCheckoutSessionRequest = appstripeentity.CreateCheckoutSessionInput
20+
CreateCustomerStripeCheckoutSessionRequest = appstripe.CreateCheckoutSessionInput
2121
CreateCustomerStripeCheckoutSessionResponse = api.BillingAppStripeCreateCheckoutSessionResult
2222
CreateCustomerStripeCheckoutSessionHandler httptransport.HandlerWithArgs[CreateCustomerStripeCheckoutSessionRequest, CreateCustomerStripeCheckoutSessionResponse, string]
2323
)

‎api/v3/handlers/customers/billing/create_customer_stripe_portal_session.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ import (
1010
"github.com/openmeterio/openmeter/api/v3/apierrors"
1111
"github.com/openmeterio/openmeter/api/v3/request"
1212
"github.com/openmeterio/openmeter/openmeter/app"
13-
appstripeentity "github.com/openmeterio/openmeter/openmeter/app/stripe/entity"
14-
appstripeentityapp "github.com/openmeterio/openmeter/openmeter/app/stripe/entity/app"
13+
appstripe "github.com/openmeterio/openmeter/openmeter/app/stripe"
1514
"github.com/openmeterio/openmeter/openmeter/billing"
1615
"github.com/openmeterio/openmeter/openmeter/customer"
1716
"github.com/openmeterio/openmeter/pkg/framework/commonhttp"
@@ -80,13 +79,13 @@ func (h *handler) CreateCustomerStripePortalSession() CreateCustomerStripePortal
8079
}
8180

8281
// Enforce stripe apptype, see app type filter above
83-
stripeApp, ok := genericApp.(appstripeentityapp.App)
82+
stripeApp, ok := genericApp.(appstripe.App)
8483
if !ok {
8584
return CreateCustomerStripePortalSessionResponse{}, fmt.Errorf("customer app is not a stripe app")
8685
}
8786

8887
// Create the portal session
89-
portalSession, err := h.stripeService.CreatePortalSession(ctx, appstripeentity.CreateStripePortalSessionInput{
88+
portalSession, err := h.stripeService.CreatePortalSession(ctx, appstripe.CreateStripePortalSessionInput{
9089
AppID: stripeApp.GetID(),
9190
CustomerID: request.customerId,
9291
ConfigurationID: request.options.ConfigurationId,

‎api/v3/handlers/customers/billing/get_billing.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/openmeterio/openmeter/api/v3/apierrors"
1212
"github.com/openmeterio/openmeter/openmeter/app"
1313
appcustominvoicing "github.com/openmeterio/openmeter/openmeter/app/custominvoicing"
14-
appstripeentity "github.com/openmeterio/openmeter/openmeter/app/stripe/entity"
14+
appstripe "github.com/openmeterio/openmeter/openmeter/app/stripe"
1515
"github.com/openmeterio/openmeter/openmeter/billing"
1616
"github.com/openmeterio/openmeter/openmeter/customer"
1717
"github.com/openmeterio/openmeter/pkg/framework/commonhttp"
@@ -68,7 +68,7 @@ func (h *handler) GetCustomerBilling() GetCustomerBillingHandler {
6868

6969
switch application.GetType() {
7070
case app.AppTypeStripe:
71-
if data, ok := data.(appstripeentity.CustomerData); ok {
71+
if data, ok := data.(appstripe.CustomerData); ok {
7272
// TODO: we don't have metadata on the stripe customer data yet
7373
appData.Stripe = &api.BillingAppCustomerDataStripe{
7474
CustomerId: &data.StripeCustomerID,

‎api/v3/handlers/customers/billing/update_billing.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/openmeterio/openmeter/openmeter/app"
1313
appcustominvoicing "github.com/openmeterio/openmeter/openmeter/app/custominvoicing"
1414
appsandbox "github.com/openmeterio/openmeter/openmeter/app/sandbox"
15-
appstripeentity "github.com/openmeterio/openmeter/openmeter/app/stripe/entity"
15+
appstripe "github.com/openmeterio/openmeter/openmeter/app/stripe"
1616
"github.com/openmeterio/openmeter/openmeter/billing"
1717
"github.com/openmeterio/openmeter/openmeter/customer"
1818
"github.com/openmeterio/openmeter/pkg/framework/commonhttp"
@@ -146,7 +146,7 @@ func (h *handler) UpdateCustomerBilling() UpdateCustomerBillingHandler {
146146
resp.AppData = &api.BillingAppCustomerData{
147147
Stripe: request.AppData.Stripe,
148148
}
149-
appData = appstripeentity.CustomerData{
149+
appData = appstripe.CustomerData{
150150
StripeCustomerID: *request.AppData.Stripe.CustomerId,
151151
StripeDefaultPaymentMethodID: request.AppData.Stripe.DefaultPaymentMethodId,
152152
}

‎api/v3/handlers/customers/billing/update_billing_app_data.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/openmeterio/openmeter/openmeter/app"
1313
appcustominvoicing "github.com/openmeterio/openmeter/openmeter/app/custominvoicing"
1414
appsandbox "github.com/openmeterio/openmeter/openmeter/app/sandbox"
15-
appstripeentity "github.com/openmeterio/openmeter/openmeter/app/stripe/entity"
15+
appstripe "github.com/openmeterio/openmeter/openmeter/app/stripe"
1616
"github.com/openmeterio/openmeter/openmeter/billing"
1717
"github.com/openmeterio/openmeter/openmeter/customer"
1818
"github.com/openmeterio/openmeter/pkg/framework/commonhttp"
@@ -111,7 +111,7 @@ func (h *handler) UpdateCustomerBillingAppData() UpdateCustomerBillingAppDataHan
111111
}
112112

113113
resp.Stripe = request.Data.Stripe
114-
appData = appstripeentity.CustomerData{
114+
appData = appstripe.CustomerData{
115115
StripeCustomerID: *request.Data.Stripe.CustomerId,
116116
StripeDefaultPaymentMethodID: request.Data.Stripe.DefaultPaymentMethodId,
117117
}

‎openmeter/app/httpdriver/app.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/openmeterio/openmeter/openmeter/app"
1212
appcustominvoicing "github.com/openmeterio/openmeter/openmeter/app/custominvoicing"
1313
appsandbox "github.com/openmeterio/openmeter/openmeter/app/sandbox"
14-
appstripeentityapp "github.com/openmeterio/openmeter/openmeter/app/stripe/entity/app"
14+
appstripe "github.com/openmeterio/openmeter/openmeter/app/stripe"
1515
"github.com/openmeterio/openmeter/pkg/framework/commonhttp"
1616
"github.com/openmeterio/openmeter/pkg/framework/transport/httptransport"
1717
"github.com/openmeterio/openmeter/pkg/models"
@@ -155,7 +155,7 @@ func (h *handler) UpdateApp() UpdateAppHandler {
155155
Name: payload.Name,
156156
Description: payload.Description,
157157
Metadata: payload.Metadata,
158-
AppConfigUpdate: appstripeentityapp.Configuration{
158+
AppConfigUpdate: appstripe.Configuration{
159159
SecretAPIKey: payload.SecretAPIKey,
160160
},
161161
}, nil

‎openmeter/app/httpdriver/customer.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ import (
1111
"github.com/openmeterio/openmeter/openmeter/app"
1212
appcustominvoicing "github.com/openmeterio/openmeter/openmeter/app/custominvoicing"
1313
appsandbox "github.com/openmeterio/openmeter/openmeter/app/sandbox"
14-
appstripeentity "github.com/openmeterio/openmeter/openmeter/app/stripe/entity"
15-
appstripeentityapp "github.com/openmeterio/openmeter/openmeter/app/stripe/entity/app"
14+
appstripe "github.com/openmeterio/openmeter/openmeter/app/stripe"
1615
"github.com/openmeterio/openmeter/openmeter/billing"
1716
"github.com/openmeterio/openmeter/openmeter/customer"
1817
"github.com/openmeterio/openmeter/pkg/framework/commonhttp"
@@ -362,8 +361,8 @@ func (h *handler) toAPICustomerAppData(a app.CustomerApp) (api.CustomerAppData,
362361
appId := a.App.GetID().ID
363362

364363
switch customerAppData := a.CustomerData.(type) {
365-
case appstripeentity.CustomerData:
366-
stripeApp, ok := a.App.(appstripeentityapp.App)
364+
case appstripe.CustomerData:
365+
stripeApp, ok := a.App.(appstripe.App)
367366
if !ok {
368367
return apiCustomerAppData, fmt.Errorf("error casting app to stripe app")
369368
}

0 commit comments

Comments
 (0)