fix(pr): comments

Author: hekike

openmeter/app/stripe/invoicesync/handler_test.go

@@ -11,15 +11,53 @@ import (
 	"github.com/stretchr/testify/require"
 
 	stripeclient "github.com/openmeterio/openmeter/openmeter/app/stripe/client"
+	"github.com/openmeterio/openmeter/openmeter/billing"
 )
 
 func TestNewHandler_AllFieldsRequired(t *testing.T) {
-	// NewHandler should reject nil for every required field.
-	// We test this by passing an empty config — all fields are nil.
-	_, err := NewHandler(HandlerConfig{})
-	require.Error(t, err)
-	// Should fail on the first nil check (adapter)
-	assert.Contains(t, err.Error(), "adapter is required")
+	// Build a fully valid config, then nil out one field at a time
+	// to verify each required field produces an appropriate error.
+	validConfig := HandlerConfig{
+		Adapter:          &mockAdapter{},
+		AppService:       &noopAppService{},
+		BillingService:   billing.NoopService{},
+		StripeAppService: &noopStripeAppService{},
+		SecretService:    &noopSecretService{},
+		StripeAppClientFactory: func(config stripeclient.StripeAppClientConfig) (stripeclient.StripeAppClient, error) {
+			return nil, nil
+		},
+		Publisher: noopPublisher{},
+		LockFunc: func(ctx context.Context, namespace, invoiceID string) error {
+			return nil
+		},
+		Logger: slog.New(slog.NewTextHandler(os.Stderr, nil)),
+	}
+
+	tests := []struct {
+		name    string
+		mutate  func(c *HandlerConfig)
+		wantErr string
+	}{
+		{"adapter", func(c *HandlerConfig) { c.Adapter = nil }, "adapter is required"},
+		{"app service", func(c *HandlerConfig) { c.AppService = nil }, "app service is required"},
+		{"billing service", func(c *HandlerConfig) { c.BillingService = nil }, "billing service is required"},
+		{"stripe app service", func(c *HandlerConfig) { c.StripeAppService = nil }, "stripe app service is required"},
+		{"secret service", func(c *HandlerConfig) { c.SecretService = nil }, "secret service is required"},
+		{"stripe app client factory", func(c *HandlerConfig) { c.StripeAppClientFactory = nil }, "stripe app client factory is required"},
+		{"publisher", func(c *HandlerConfig) { c.Publisher = nil }, "publisher is required"},
+		{"lock function", func(c *HandlerConfig) { c.LockFunc = nil }, "lock function is required"},
+		{"logger", func(c *HandlerConfig) { c.Logger = nil }, "logger is required"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cfg := validConfig
+			tt.mutate(&cfg)
+			_, err := NewHandler(cfg)
+			require.Error(t, err)
+			assert.Contains(t, err.Error(), tt.wantErr)
+		})
+	}
 }
 
 func TestHandle_NilEvent(t *testing.T) {

openmeter/app/stripe/invoicesync/types_test.go

@@ -48,6 +48,7 @@ func TestGenerateIdempotencyKey(t *testing.T) {
 	t.Run("key is hex encoded sha256", func(t *testing.T) {
 		key := GenerateIdempotencyKey("inv-1", "sess-1", 0, OpTypeInvoiceCreate)
 		require.Len(t, key, 64, "sha256 hex encoding should be 64 chars")
+		assert.Regexp(t, `^[0-9a-f]{64}$`, key, "key should be lowercase hex")
 	})
 }
 

openmeter/billing/adapter/invoiceapp.go

@@ -7,6 +7,9 @@ import (
 	"github.com/openmeterio/openmeter/openmeter/billing"
 	"github.com/openmeterio/openmeter/openmeter/ent/db"
 	"github.com/openmeterio/openmeter/openmeter/ent/db/billinginvoice"
+	"github.com/openmeterio/openmeter/openmeter/ent/db/billinginvoiceline"
+	"github.com/openmeterio/openmeter/openmeter/ent/db/billinginvoicelinediscount"
+	"github.com/openmeterio/openmeter/openmeter/ent/db/billingstandardinvoicedetailedline"
 	"github.com/openmeterio/openmeter/pkg/framework/entutils"
 )
 
@@ -35,6 +38,7 @@ func (a *adapter) SyncExternalIDs(ctx context.Context, in billing.SyncExternalID
 		// Update detailed line external IDs
 		for lineID, externalID := range in.LineExternalIDs {
 			_, err := tx.db.BillingStandardInvoiceDetailedLine.UpdateOneID(lineID).
+				Where(billingstandardinvoicedetailedline.InvoiceID(in.Invoice.ID)).
 				SetInvoicingAppExternalID(externalID).
 				Save(ctx)
 			if err != nil {
@@ -49,6 +53,9 @@ func (a *adapter) SyncExternalIDs(ctx context.Context, in billing.SyncExternalID
 		// Update discount external IDs
 		for discountID, externalID := range in.LineDiscountExternalIDs {
 			_, err := tx.db.BillingInvoiceLineDiscount.UpdateOneID(discountID).
+				Where(billinginvoicelinediscount.HasBillingInvoiceLineWith(
+					billinginvoiceline.InvoiceID(in.Invoice.ID),
+				)).
 				SetInvoicingAppExternalID(externalID).
 				Save(ctx)
 			if err != nil {