chore: update

Signed-off-by: Andras Toth <4157749+tothandras@users.noreply.github.com>

Author: tothandras

api/v3/handlers/subscriptions/subscriptionaddons/convert.go

@@ -20,27 +20,25 @@ import (
 	"github.com/openmeterio/openmeter/pkg/timeutil"
 )
 
-func mapCreateSubscriptionAddonRequestToInput(req apiv3.CreateSubscriptionAddonRequest) (subscriptionworkflow.AddAddonWorkflowInput, error) {
+func FromAPICreateSubscriptionAddonRequest(req apiv3.CreateSubscriptionAddonRequest) (subscriptionworkflow.AddAddonWorkflowInput, error) {
 	timing, err := subscriptions.FromAPIBillingSubscriptionEditTiming(req.Timing)
 	if err != nil {
-		return subscriptionworkflow.AddAddonWorkflowInput{}, fmt.Errorf("failed to cast Timing: %w", err)
+		return subscriptionworkflow.AddAddonWorkflowInput{}, fmt.Errorf("failed to convert timing: %w", err)
 	}
 
 	meta, err := labels.ToMetadata(req.Labels)
 	if err != nil {
 		return subscriptionworkflow.AddAddonWorkflowInput{}, err
 	}
 
-	r := subscriptionworkflow.AddAddonWorkflowInput{
+	return subscriptionworkflow.AddAddonWorkflowInput{
 		AddonID:         req.Addon.Id,
 		InitialQuantity: req.Quantity,
 		Timing:          timing,
 		MetadataModel: models.MetadataModel{
 			Metadata: meta,
 		},
-	}
-
-	return r, nil
+	}, nil
 }
 
 func toAPISubscriptionAddon(view subscription.SubscriptionView, addon subscriptionaddon.SubscriptionAddon) (apiv3.SubscriptionAddon, error) {
@@ -66,9 +64,10 @@ func toAPISubscriptionAddon(view subscription.SubscriptionView, addon subscripti
 	rateCards, err := slicesx.MapWithErr(addon.RateCards, func(r subscriptionaddon.SubscriptionAddonRateCard) (apiv3.SubscriptionAddonRateCard, error) {
 		rc, err := plans.ToAPIBillingRateCard(r.AddonRateCard.RateCard)
 		if err != nil {
-			return apiv3.SubscriptionAddonRateCard{}, fmt.Errorf("failed to cast RateCard: %w", err)
+			return apiv3.SubscriptionAddonRateCard{}, fmt.Errorf("failed to convert rate card: %w", err)
 		}
 
+		// JSON encoders should emit [] not null when no items are affected.
 		ids := affectedMap[r.AddonRateCard.RateCard.Key()]
 		if ids == nil {
 			ids = []string{}
@@ -80,7 +79,12 @@ func toAPISubscriptionAddon(view subscription.SubscriptionView, addon subscripti
 		}, nil
 	})
 	if err != nil {
-		return apiv3.SubscriptionAddon{}, fmt.Errorf("failed to cast RateCards: %w", err)
+		return apiv3.SubscriptionAddon{}, fmt.Errorf("failed to convert rate cards: %w", err)
+	}
+
+	// Addons with no rate cards leave RateCards nil; emit [] so the response satisfies the array schema.
+	if rateCards == nil {
+		rateCards = []apiv3.SubscriptionAddonRateCard{}
 	}
 
 	return apiv3.SubscriptionAddon{

api/v3/handlers/subscriptions/subscriptionaddons/convert_test.go

@@ -16,7 +16,7 @@ import (
 	"github.com/openmeterio/openmeter/pkg/timeutil"
 )
 
-func TestMapCreateSubscriptionAddonRequestToInput(t *testing.T) {
+func TestFromAPICreateSubscriptionAddonRequest(t *testing.T) {
 	t.Run("maps immediate timing and labels", func(t *testing.T) {
 		var timing apiv3.BillingSubscriptionEditTiming
 		require.NoError(t, timing.FromBillingSubscriptionEditTimingEnum(apiv3.BillingSubscriptionEditTimingEnum("immediate")))
@@ -29,7 +29,7 @@ func TestMapCreateSubscriptionAddonRequestToInput(t *testing.T) {
 			Timing:   timing,
 		}
 
-		input, err := mapCreateSubscriptionAddonRequestToInput(req)
+		input, err := FromAPICreateSubscriptionAddonRequest(req)
 		require.NoError(t, err)
 
 		assert.Equal(t, "01J8GFKQ0000000000000000", input.AddonID)
@@ -49,7 +49,7 @@ func TestMapCreateSubscriptionAddonRequestToInput(t *testing.T) {
 			Timing:   timing,
 		}
 
-		input, err := mapCreateSubscriptionAddonRequestToInput(req)
+		input, err := FromAPICreateSubscriptionAddonRequest(req)
 		require.NoError(t, err)
 		require.NotNil(t, input.Timing.Enum)
 		assert.Equal(t, subscription.TimingNextBillingCycle, *input.Timing.Enum)
@@ -66,7 +66,7 @@ func TestMapCreateSubscriptionAddonRequestToInput(t *testing.T) {
 			Timing:   timing,
 		}
 
-		_, err := mapCreateSubscriptionAddonRequestToInput(req)
+		_, err := FromAPICreateSubscriptionAddonRequest(req)
 		require.Error(t, err)
 	})
 }

api/v3/handlers/subscriptions/subscriptionaddons/create.go

@@ -36,7 +36,7 @@ func (h *handler) CreateSubscriptionAddon() CreateSubscriptionAddonHandler {
 				return CreateSubscriptionAddonRequest{}, err
 			}
 
-			addonInput, err := mapCreateSubscriptionAddonRequestToInput(body)
+			addonInput, err := FromAPICreateSubscriptionAddonRequest(body)
 			if err != nil {
 				return CreateSubscriptionAddonRequest{}, err
 			}

openmeter/subscription/addon/repo/subscriptionaddon.go

@@ -42,9 +42,11 @@ func (r *subscriptionAddonRepo) Create(ctx context.Context, namespace string, in
 		if err != nil {
 			// Surface the partial unique index on (namespace, subscription_id, addon_id)
 			// as a conflict so concurrent creators see the same error as the in-tx duplicate check.
+			// Keep the user-visible message generic so it does not echo addon/subscription IDs;
+			// the workflow's pre-Create validation already establishes that both exist.
 			if db.IsConstraintError(err) {
 				return nil, models.NewGenericConflictError(
-					fmt.Errorf("subscription %s already has addon %s", input.SubscriptionID, input.AddonID),
+					fmt.Errorf("addon is already attached to subscription"),
 				)
 			}
 

tools/migrate/migrations/20260602085650_add_subscription_addon_unique_index.up.sql

@@ -1,2 +1,3 @@
 -- create index "subscriptionaddon_namespace_subscription_id_addon_id" to table: "subscription_addons"
+-- atlas:nolint MF101
 CREATE UNIQUE INDEX "subscriptionaddon_namespace_subscription_id_addon_id" ON "subscription_addons" ("namespace", "subscription_id", "addon_id") WHERE (deleted_at IS NULL);

tools/migrate/migrations/atlas.sum

@@ -1,4 +1,4 @@
-h1:nAkpQ1B7kVBSv9ux4NA/OJgrxRVD/b2tsHY5tFgmt0A=
+h1:kpL0maRSgQC2xadilWbaPL8dFkTOArOj9Ftdqjdkkcs=
 20240826120919_init.up.sql h1:tc1V91/smlmaeJGQ8h+MzTEeFjjnrrFDbDAjOYJK91o=
 20240903155435_entitlement-expired-index.up.sql h1:Hp8u5uckmLXc1cRvWU0AtVnnK8ShlpzZNp8pbiJLhac=
 20240917172257_billing-entities.up.sql h1:Q1dAMo0Vjiit76OybClNfYPGC5nmvov2/M2W1ioi4Kw=
@@ -205,4 +205,4 @@ h1:nAkpQ1B7kVBSv9ux4NA/OJgrxRVD/b2tsHY5tFgmt0A=
 20260519132345_reset-sync-state.up.sql h1:R8ekG92vwXQbtqmh+R3ZTTRMCM0VqPoLzJG3VIKlG4k=
 20260520130000_repair_rebased_migrations.up.sql h1:XJhbK1CCplq5BEJi+VvHDVAcLUBJqHNF1LFGhaSa2Oo=
 20260520130500_add_ledger_tax_behavior.up.sql h1:M8Lq8lE/O+RwPLJ/7qe5tVddruuAxOcBAeJ1usFEveg=
-20260602085650_add_subscription_addon_unique_index.up.sql h1:+QPLmViVlpTDnxQTpi++vmstfyNb9SLvDGnlLiLpDyI=
+20260602085650_add_subscription_addon_unique_index.up.sql h1:wFwOAtuZnPyp1MdAwjHH9SGW1XE/JRP1VI+QVMn/o+M=