feat(taxcode): validate add-on tax codes on publish

Author: borbelyr-kong

app/common/productcatalog.go

@@ -118,6 +118,7 @@ func NewAddonService(
 	logger *slog.Logger,
 	db *entdb.Client,
 	featureResolver productcatalog.FeatureResolver,
+	taxCodeResolver productcatalog.TaxCodeResolver,
 	taxCodeService taxcode.Service,
 	publisher eventbus.Publisher,
 ) (addon.Service, error) {
@@ -132,6 +133,7 @@ func NewAddonService(
 	return addonservice.New(addonservice.Config{
 		Adapter:         adapter,
 		FeatureResolver: featureResolver,
+		TaxCodeResolver: taxCodeResolver,
 		TaxCode:         taxCodeService,
 		Logger:          logger.With("subsystem", "productcatalog.addon"),
 		Publisher:       publisher,

cmd/billing-worker/wire_gen.go

@@ -332,3 +332,9 @@ func ValidateAddonWithFeatures(ctx context.Context, resolver NamespacedFeatureRe
 		return ValidateRateCardsWithFeatures(ctx, resolver)(a.RateCards)
 	}
 }
+
+func ValidateAddonWithTaxCodes(ctx context.Context, resolver NamespacedTaxCodeResolver) models.ValidatorFunc[Addon] {
+	return func(a Addon) error {
+		return ValidateRateCardsWithTaxCodes(ctx, resolver)(a.RateCards)
+	}
+}

cmd/jobs/internal/wire_gen.go

@@ -426,6 +426,16 @@ func (s service) PublishAddon(ctx context.Context, params addon.PublishAddonInpu
 			)
 		}
 
+		// Validate add-on with tax codes
+		err = pa.ValidateWith(
+			productcatalog.ValidateAddonWithTaxCodes(ctx, s.taxCodeResolver.WithNamespace(params.Namespace)),
+		)
+		if err != nil {
+			errs = append(errs, fmt.Errorf("invalid add-on [id=%s key=%s version=%d]: %w",
+				add.ID, add.Key, add.Version, err),
+			)
+		}
+
 		if err = errors.Join(errs...); err != nil {
 			return nil, models.NewGenericValidationError(err)
 		}

cmd/server/wire_gen.go

@@ -17,6 +17,7 @@ type Config struct {
 	Publisher eventbus.Publisher
 
 	FeatureResolver productcatalog.FeatureResolver
+	TaxCodeResolver productcatalog.TaxCodeResolver
 }
 
 func New(config Config) (addon.Service, error) {
@@ -28,6 +29,10 @@ func New(config Config) (addon.Service, error) {
 		return nil, errors.New("feature resolver is required")
 	}
 
+	if config.TaxCodeResolver == nil {
+		return nil, errors.New("tax code resolver is required")
+	}
+
 	if config.TaxCode == nil {
 		return nil, errors.New("tax code service is required")
 	}
@@ -47,6 +52,7 @@ func New(config Config) (addon.Service, error) {
 		publisher: config.Publisher,
 
 		featureResolver: config.FeatureResolver,
+		taxCodeResolver: config.TaxCodeResolver,
 	}, nil
 }
 
@@ -59,4 +65,5 @@ type service struct {
 	publisher eventbus.Publisher
 
 	featureResolver productcatalog.FeatureResolver
+	taxCodeResolver productcatalog.TaxCodeResolver
 }

openmeter/productcatalog/addon.go

@@ -151,6 +151,7 @@ func NewTestEnv(t *testing.T) *TestEnv {
 	addonService, err := addonservice.New(addonservice.Config{
 		Adapter:         addonAdapter,
 		FeatureResolver: featureResolver,
+		TaxCodeResolver: taxCodeResolver,
 		TaxCode:         taxCodeService,
 		Logger:          logger,
 		Publisher:       publisher,

openmeter/productcatalog/addon/service/addon.go

@@ -234,6 +234,7 @@ func NewService(t *testing.T, dbDeps *DBDeps) SubscriptionDependencies {
 		Logger:          logger,
 		Publisher:       publisher,
 		FeatureResolver: featureResolver,
+		TaxCodeResolver: taxCodeResolver,
 		TaxCode:         taxCodeService,
 	})
 	require.NoError(t, err)

openmeter/productcatalog/addon/service/service.go

@@ -186,6 +186,7 @@ func (s *SubscriptionMixin) SetupSuite(t *testing.T, deps SubscriptionMixInDepen
 		Logger:          slog.Default(),
 		Publisher:       publisher,
 		FeatureResolver: featureResolver,
+		TaxCodeResolver: taxCodeResolver,
 		TaxCode:         taxCodeService,
 	})
 	require.NoError(t, err)