feat(app): switch Stripe invoice operations to use invoicesync

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: hekike

.gitignore

@@ -15,6 +15,7 @@ go.work
 go.work.sum
 
 __debug_bin*
+*.test
 
 openmeter.log
 

app/common/app.go

@@ -17,6 +17,9 @@ import (
 	appservice "github.com/openmeterio/openmeter/openmeter/app/service"
 	appstripe "github.com/openmeterio/openmeter/openmeter/app/stripe"
 	appstripeadapter "github.com/openmeterio/openmeter/openmeter/app/stripe/adapter"
+	"github.com/openmeterio/openmeter/openmeter/app/stripe/invoicesync"
+	invoicesyncadapter "github.com/openmeterio/openmeter/openmeter/app/stripe/invoicesync/adapter"
+	invoicesyncservice "github.com/openmeterio/openmeter/openmeter/app/stripe/invoicesync/service"
 	appstripeservice "github.com/openmeterio/openmeter/openmeter/app/stripe/service"
 	"github.com/openmeterio/openmeter/openmeter/billing"
 	"github.com/openmeterio/openmeter/openmeter/customer"
@@ -29,6 +32,8 @@ import (
 var App = wire.NewSet(
 	NewAppRegistry,
 	NewAppService,
+	NewSyncPlanAdapter,
+	NewSyncPlanService,
 	NewAppStripeService,
 	NewAppSandboxFactory,
 	NewAppSandboxProvisioner,
@@ -55,7 +60,21 @@ func NewAppService(
 	})
 }
 
-func NewAppStripeService(logger *slog.Logger, db *entdb.Client, appsConfig config.AppsConfiguration, appService app.Service, customerService customer.Service, secretService secret.Service, billingService billing.Service, publisher eventbus.Publisher) (appstripe.Service, error) {
+func NewSyncPlanAdapter(db *entdb.Client) (*invoicesyncadapter.Adapter, error) {
+	return invoicesyncadapter.New(invoicesyncadapter.Config{
+		Client: db,
+	})
+}
+
+func NewSyncPlanService(adapter *invoicesyncadapter.Adapter, publisher eventbus.Publisher, logger *slog.Logger) (invoicesync.Service, error) {
+	return invoicesyncservice.New(invoicesyncservice.Config{
+		Adapter:   adapter,
+		Publisher: publisher,
+		Logger:    logger.With("component", "invoicesync-service"),
+	})
+}
+
+func NewAppStripeService(logger *slog.Logger, db *entdb.Client, appsConfig config.AppsConfiguration, appService app.Service, customerService customer.Service, secretService secret.Service, billingService billing.Service, publisher eventbus.Publisher, syncPlanService invoicesync.Service) (appstripe.Service, error) {
 	appStripeAdapter, err := appstripeadapter.New(appstripeadapter.Config{
 		Client:          db,
 		AppService:      appService,
@@ -88,6 +107,7 @@ func NewAppStripeService(logger *slog.Logger, db *entdb.Client, appsConfig confi
 		DisableWebhookRegistration: appsConfig.Stripe.DisableWebhookRegistration,
 		Publisher:                  publisher,
 		WebhookURLGenerator:        webhookGenerator,
+		SyncPlanService:            syncPlanService,
 	})
 }
 

app/common/openmeter_billingworker.go

@@ -2,6 +2,7 @@ package common
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log/slog"
 	"syscall"
@@ -11,12 +12,20 @@ import (
 	"github.com/oklog/run"
 
 	"github.com/openmeterio/openmeter/app/config"
+	"github.com/openmeterio/openmeter/openmeter/app"
+	appstripe "github.com/openmeterio/openmeter/openmeter/app/stripe"
+	stripeclient "github.com/openmeterio/openmeter/openmeter/app/stripe/client"
+	"github.com/openmeterio/openmeter/openmeter/app/stripe/invoicesync"
+	invoicesyncadapter "github.com/openmeterio/openmeter/openmeter/app/stripe/invoicesync/adapter"
 	"github.com/openmeterio/openmeter/openmeter/billing"
 	billingworker "github.com/openmeterio/openmeter/openmeter/billing/worker"
 	"github.com/openmeterio/openmeter/openmeter/billing/worker/subscriptionsync"
+	"github.com/openmeterio/openmeter/openmeter/secret"
 	watermillkafka "github.com/openmeterio/openmeter/openmeter/watermill/driver/kafka"
 	"github.com/openmeterio/openmeter/openmeter/watermill/eventbus"
+	"github.com/openmeterio/openmeter/openmeter/watermill/grouphandler"
 	"github.com/openmeterio/openmeter/openmeter/watermill/router"
+	"github.com/openmeterio/openmeter/pkg/framework/lockr"
 	pkgkafka "github.com/openmeterio/openmeter/pkg/kafka"
 )
 
@@ -97,12 +106,61 @@ func NewBillingWorkerOptions(
 	}
 }
 
-func NewBillingWorker(workerOptions billingworker.WorkerOptions) (*billingworker.Worker, error) {
+func NewBillingWorker(
+	workerOptions billingworker.WorkerOptions,
+	appService app.Service,
+	stripeAppService appstripe.Service,
+	secretService secret.Service,
+	billingService billing.Service,
+	publisher eventbus.Publisher,
+	logger *slog.Logger,
+	syncPlanAdapter *invoicesyncadapter.Adapter,
+) (*billingworker.Worker, error) {
 	worker, err := billingworker.New(workerOptions)
 	if err != nil {
 		return nil, fmt.Errorf("failed to initialize worker: %w", err)
 	}
 
+	// Create locker for advisory locks on sync plan execution
+	syncPlanLocker, err := lockr.NewLocker(&lockr.LockerConfig{
+		Logger: logger.With("component", "stripe-sync-plan-locker"),
+	})
+	if err != nil {
+		return nil, fmt.Errorf("failed to create sync plan locker: %w", err)
+	}
+
+	// Register sync plan handler for async Stripe invoice sync
+	syncPlanHandler, err := invoicesync.NewHandler(invoicesync.HandlerConfig{
+		Adapter:                syncPlanAdapter,
+		AppService:             appService,
+		BillingService:         billingService,
+		StripeAppService:       stripeAppService,
+		SecretService:          secretService,
+		StripeAppClientFactory: stripeclient.NewStripeAppClient,
+		Publisher:              publisher,
+		LockFunc: func(ctx context.Context, namespace, invoiceID string) error {
+			key, err := lockr.NewKey("namespace", namespace, "invoice_sync", invoiceID)
+			if err != nil {
+				return fmt.Errorf("creating lock key: %w", err)
+			}
+			if err := syncPlanLocker.LockForTX(ctx, key); err != nil {
+				if errors.Is(err, lockr.ErrLockTimeout) {
+					return invoicesync.ErrSyncPlanLocked
+				}
+				return err
+			}
+			return nil
+		},
+		Logger: logger.With("component", "stripe-sync-plan"),
+	})
+	if err != nil {
+		return nil, fmt.Errorf("failed to create sync plan handler: %w", err)
+	}
+
+	worker.AddHandler(grouphandler.NewGroupEventHandler(func(ctx context.Context, event *invoicesync.ExecuteSyncPlanEvent) error {
+		return syncPlanHandler.Handle(ctx, event)
+	}))
+
 	return worker, nil
 }
 

cmd/billing-worker/wire_gen.go

@@ -1407,6 +1407,8 @@ github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s=
 github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ=
+github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
+github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/oliveagle/jsonpath v0.1.0 h1:W0H0fIMZPYED7cyrVdAQ6vETH9vCNMSL9Yh9h5sL3gs=
 github.com/oliveagle/jsonpath v0.1.0/go.mod h1:eqOVx5Vwu4gd2mmMZvVZsgIqNSaW3xxRThUJ0k/TPk4=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=

cmd/jobs/internal/wire_gen.go

@@ -9,6 +9,7 @@ import (
 	stripeapp "github.com/openmeterio/openmeter/openmeter/app/stripe"
 	stripeclient "github.com/openmeterio/openmeter/openmeter/app/stripe/client"
 	appstripeentity "github.com/openmeterio/openmeter/openmeter/app/stripe/entity"
+	"github.com/openmeterio/openmeter/openmeter/app/stripe/invoicesync"
 	"github.com/openmeterio/openmeter/openmeter/billing"
 	"github.com/openmeterio/openmeter/openmeter/secret"
 )
@@ -41,6 +42,9 @@ type App struct {
 	StripeAppClientFactory stripeclient.StripeAppClientFactory `json:"-"`
 	StripeAppService       stripeapp.Service                   `json:"-"`
 	SecretService          secret.Service                      `json:"-"`
+
+	// Sync plan support for async invoice sync
+	SyncPlanService invoicesync.Service `json:"-"`
 }
 
 func (a App) Validate() error {
@@ -84,6 +88,10 @@ func (a App) Validate() error {
 		return errors.New("logger is required")
 	}
 
+	if a.SyncPlanService == nil {
+		return errors.New("sync plan service is required")
+	}
+
 	return nil
 }