refactor(taxcode): rename plan validator hook to plan hook

Author: borbelyr-kong

app/common/taxcode.go

@@ -45,21 +45,21 @@ func NewTaxCodeService(
 	})
 }
 
-// TaxCodePlanValidatorHook prevents deleting tax codes that are still referenced by plans.
-type TaxCodePlanValidatorHook taxcodehooks.PlanValidatorHook
+// TaxCodePlanHook prevents deleting tax codes that are still referenced by plans.
+type TaxCodePlanHook taxcodehooks.PlanHook
 
-// NewTaxCodePlanValidatorServiceHook builds the plan-reference validator hook and registers it
+// NewTaxCodePlanServiceHook builds the plan-reference hook and registers it
 // on the tax code service. It depends on both the plan and tax code services so wire constructs
 // it only after both exist, avoiding a construction cycle (plan already depends on tax code).
-func NewTaxCodePlanValidatorServiceHook(
+func NewTaxCodePlanServiceHook(
 	planService plan.Service,
 	taxCodeService taxcode.Service,
-) (TaxCodePlanValidatorHook, error) {
-	h, err := taxcodehooks.NewPlanValidatorHook(taxcodehooks.PlanValidatorHookConfig{
+) (TaxCodePlanHook, error) {
+	h, err := taxcodehooks.NewPlanHook(taxcodehooks.PlanHookConfig{
 		PlanService: planService,
 	})
 	if err != nil {
-		return nil, fmt.Errorf("failed to create tax code plan validator hook: %w", err)
+		return nil, fmt.Errorf("failed to create tax code plan hook: %w", err)
 	}
 
 	taxCodeService.RegisterHooks(h)

cmd/server/wire.go

@@ -99,7 +99,7 @@ type Application struct {
 	StreamingConnector               streaming.Connector
 	TaxCodeNamespaceHandler          *taxcode.NamespaceHandler
 	TaxCodeService                   taxcode.Service
-	TaxCodePlanValidatorHook         common.TaxCodePlanValidatorHook
+	TaxCodePlanHook                  common.TaxCodePlanHook
 	TelemetryServer                  common.TelemetryServer
 	TerminationChecker               *common.TerminationChecker
 	RuntimeMetricsCollector          common.RuntimeMetricsCollector
@@ -149,7 +149,7 @@ func initializeApplication(ctx context.Context, conf config.Configuration) (Appl
 		common.Server,
 		common.TaxCode,
 		common.TaxCodeNamespaceHandler,
-		common.NewTaxCodePlanValidatorServiceHook,
+		common.NewTaxCodePlanServiceHook,
 		common.Subscription,
 		common.Lockr,
 		common.Secret,

cmd/server/wire_gen.go

@@ -15,41 +15,41 @@ import (
 )
 
 type (
-	PlanValidatorHook     = models.ServiceHook[taxcode.TaxCode]
-	NoopPlanValidatorHook = models.NoopServiceHook[taxcode.TaxCode]
+	PlanHook     = models.ServiceHook[taxcode.TaxCode]
+	NoopPlanHook = models.NoopServiceHook[taxcode.TaxCode]
 )
 
-type PlanValidatorHookConfig struct {
+type PlanHookConfig struct {
 	PlanService plan.Service
 }
 
-func (e PlanValidatorHookConfig) Validate() error {
+func (e PlanHookConfig) Validate() error {
 	if e.PlanService == nil {
 		return fmt.Errorf("plan service is required")
 	}
 
 	return nil
 }
 
-var _ models.ServiceHook[taxcode.TaxCode] = (*planValidatorHook)(nil)
+var _ models.ServiceHook[taxcode.TaxCode] = (*planHook)(nil)
 
-type planValidatorHook struct {
-	NoopPlanValidatorHook
+type planHook struct {
+	NoopPlanHook
 
 	planService plan.Service
 }
 
-func NewPlanValidatorHook(config PlanValidatorHookConfig) (PlanValidatorHook, error) {
+func NewPlanHook(config PlanHookConfig) (PlanHook, error) {
 	if err := config.Validate(); err != nil {
-		return nil, fmt.Errorf("invalid plan validator hook config: %w", err)
+		return nil, fmt.Errorf("invalid plan hook config: %w", err)
 	}
 
-	return &planValidatorHook{
+	return &planHook{
 		planService: config.PlanService,
 	}, nil
 }
 
-func (e *planValidatorHook) PreDelete(ctx context.Context, tc *taxcode.TaxCode) error {
+func (e *planHook) PreDelete(ctx context.Context, tc *taxcode.TaxCode) error {
 	affectedPlans, err := e.planService.ListPlans(ctx, plan.ListPlansInput{
 		Status: []productcatalog.PlanStatus{
 			productcatalog.PlanStatusActive,

…r/taxcode/service/hooks/planvalidator.go …nmeter/taxcode/service/hooks/planhook.goopenmeter/taxcode/service/hooks/planvalidator.go renamed to openmeter/taxcode/service/hooks/planhook.go openmeter/taxcode/service/hooks/planvalidator.go renamed to openmeter/taxcode/service/hooks/planhook.go

@@ -13,7 +13,7 @@ import (
 	"github.com/openmeterio/openmeter/pkg/pagination"
 )
 
-// stubPlanService implements plan.Service for testing the plan validator hook.
+// stubPlanService implements plan.Service for testing the plan hook.
 // Only ListPlans has real behavior; all other methods panic.
 type stubPlanService struct {
 	listResult pagination.Result[plan.Plan]
@@ -58,7 +58,7 @@ var _ plan.Service = (*stubPlanService)(nil)
 
 const testTaxCodeID = "01234567890123456789012345"
 
-func TestPlanValidatorHook_PreDelete(t *testing.T) {
+func TestPlanHook_PreDelete(t *testing.T) {
 	tc := &taxcode.TaxCode{
 		NamespacedID: models.NamespacedID{
 			Namespace: "test-ns",
@@ -77,7 +77,7 @@ func TestPlanValidatorHook_PreDelete(t *testing.T) {
 			},
 		}
 
-		hook, err := hooks.NewPlanValidatorHook(hooks.PlanValidatorHookConfig{PlanService: stub})
+		hook, err := hooks.NewPlanHook(hooks.PlanHookConfig{PlanService: stub})
 		require.NoError(t, err)
 
 		// when: PreDelete is called
@@ -103,7 +103,7 @@ func TestPlanValidatorHook_PreDelete(t *testing.T) {
 			},
 		}
 
-		hook, err := hooks.NewPlanValidatorHook(hooks.PlanValidatorHookConfig{PlanService: stub})
+		hook, err := hooks.NewPlanHook(hooks.PlanHookConfig{PlanService: stub})
 		require.NoError(t, err)
 
 		// when: PreDelete is called