refactor(subs): subscription validations (#3442)

Signed-off-by: Alex Goth <64845621+GAlexIHU@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

Author: GAlexIHU

app/common/subscription.go

@@ -64,7 +64,7 @@ func NewSubscriptionServices(
 		subscriptionItemRepo,
 	)
 
-	subscriptionService := subscriptionservice.New(subscriptionservice.ServiceConfig{
+	subscriptionService, err := subscriptionservice.New(subscriptionservice.ServiceConfig{
 		SubscriptionRepo:      subscriptionRepo,
 		SubscriptionPhaseRepo: subscriptionPhaseRepo,
 		SubscriptionItemRepo:  subscriptionItemRepo,
@@ -76,6 +76,9 @@ func NewSubscriptionServices(
 		FeatureFlags:          featureFlags,
 		Lockr:                 lockr,
 	})
+	if err != nil {
+		return SubscriptionServiceWithWorkflow{}, err
+	}
 
 	subAddRepo := subscriptionaddonrepo.NewSubscriptionAddonRepo(db)
 	subAddQtyRepo := subscriptionaddonrepo.NewSubscriptionAddonQuantityRepo(db)

openmeter/billing/validators/customer/customer.go

@@ -46,8 +46,8 @@ func (v *Validator) ValidateDeleteCustomer(ctx context.Context, input customer.D
 
 	// Let's sync any subscriptions pending for this customer
 	subs, err := v.subscriptionService.List(ctx, subscription.ListSubscriptionsInput{
-		Namespaces: []string{input.Namespace},
-		Customers:  []string{input.ID},
+		Namespaces:  []string{input.Namespace},
+		CustomerIDs: []string{input.ID},
 	})
 	if err != nil {
 		return err

openmeter/billing/validators/subscription/validator.go

@@ -13,11 +13,11 @@ import (
 )
 
 type Validator struct {
-	subscription.NoOpSubscriptionValidator
+	subscription.NoOpSubscriptionCommandValidator
 	billingService billing.Service
 }
 
-func NewValidator(billingService billing.Service) (*Validator, error) {
+func NewValidator(billingService billing.Service) (subscription.SubscriptionCommandValidator, error) {
 	if billingService == nil {
 		return nil, fmt.Errorf("billing service is required")
 	}
@@ -27,7 +27,7 @@ func NewValidator(billingService billing.Service) (*Validator, error) {
 	}, nil
 }
 
-func (v Validator) ValidateCreate(ctx context.Context, view subscription.SubscriptionView) error {
+func (v Validator) ValidateCreated(ctx context.Context, view subscription.SubscriptionView) error {
 	err := v.validateBillingSetup(ctx, view)
 	if err != nil {
 		return models.NewGenericConflictError(fmt.Errorf("invalid billing setup: %w", err))
@@ -36,7 +36,7 @@ func (v Validator) ValidateCreate(ctx context.Context, view subscription.Subscri
 	return nil
 }
 
-func (v Validator) ValidateUpdate(ctx context.Context, view subscription.SubscriptionView) error {
+func (v Validator) ValidateUpdated(ctx context.Context, view subscription.SubscriptionView) error {
 	err := v.validateBillingSetup(ctx, view)
 	if err != nil {
 		return models.NewGenericConflictError(fmt.Errorf("invalid billing setup: %w", err))

openmeter/billing/worker/subscription/reconciler.go

@@ -7,8 +7,11 @@ import (
 	"log/slog"
 	"time"
 
+	"github.com/samber/lo"
+
 	"github.com/openmeterio/openmeter/openmeter/customer"
 	"github.com/openmeterio/openmeter/openmeter/subscription"
+	"github.com/openmeterio/openmeter/pkg/clock"
 	"github.com/openmeterio/openmeter/pkg/models"
 	"github.com/openmeterio/openmeter/pkg/timeutil"
 )
@@ -83,11 +86,11 @@ func (r *Reconciler) ListSubscriptions(ctx context.Context, in ReconcilerListSub
 	}
 
 	subscriptions, err := r.subscriptionService.List(ctx, subscription.ListSubscriptionsInput{
-		Namespaces: in.Namespaces,
-		Customers:  in.Customers,
-		ActiveInPeriod: &timeutil.ClosedPeriod{
-			From: time.Now().Add(-in.Lookback),
-			To:   time.Now(),
+		Namespaces:  in.Namespaces,
+		CustomerIDs: in.Customers,
+		ActiveInPeriod: &timeutil.StartBoundedPeriod{
+			From: clock.Now().Add(-in.Lookback),
+			To:   lo.ToPtr(clock.Now()),
 		},
 	})
 	if err != nil {

openmeter/customer/httpdriver/customer.go

@@ -92,9 +92,9 @@ func (h *handler) ListCustomers() ListCustomersHandler {
 				})
 
 				subscriptions, err := h.subscriptionService.List(ctx, subscription.ListSubscriptionsInput{
-					Namespaces: []string{request.Namespace},
-					Customers:  customerIDs,
-					ActiveAt:   lo.ToPtr(time.Now()),
+					Namespaces:  []string{request.Namespace},
+					CustomerIDs: customerIDs,
+					ActiveAt:    lo.ToPtr(time.Now()),
 				})
 				if err != nil {
 					return ListCustomersResponse{}, err
@@ -475,9 +475,9 @@ func (h *handler) GetCustomerAccess() GetCustomerAccessHandler {
 func (h *handler) mapCustomerWithSubscriptionsToAPI(ctx context.Context, customer customer.Customer, expand []api.CustomerExpand) (api.Customer, error) {
 	// Get the customer's subscriptions
 	subscriptions, err := h.subscriptionService.List(ctx, subscription.ListSubscriptionsInput{
-		Namespaces: []string{customer.Namespace},
-		Customers:  []string{customer.ID},
-		ActiveAt:   lo.ToPtr(time.Now()),
+		Namespaces:  []string{customer.Namespace},
+		CustomerIDs: []string{customer.ID},
+		ActiveAt:    lo.ToPtr(time.Now()),
 	})
 	if err != nil {
 		return GetCustomerResponse{}, err

openmeter/productcatalog/subscription/http/get.go

@@ -113,9 +113,9 @@ func (h *handler) ListCustomerSubscriptions() ListCustomerSubscriptionsHandler {
 			var def ListCustomerSubscriptionsResponse
 
 			subs, err := h.SubscriptionService.List(ctx, subscription.ListSubscriptionsInput{
-				Page:       req.Page,
-				Namespaces: []string{req.CustomerID.Namespace},
-				Customers:  []string{req.CustomerID.ID},
+				Page:        req.Page,
+				Namespaces:  []string{req.CustomerID.Namespace},
+				CustomerIDs: []string{req.CustomerID.ID},
 			})
 			if err != nil {
 				return def, err

openmeter/server/server_test.go

@@ -62,6 +62,7 @@ import (
 	"github.com/openmeterio/openmeter/pkg/models"
 	"github.com/openmeterio/openmeter/pkg/pagination"
 	"github.com/openmeterio/openmeter/pkg/ref"
+	"github.com/openmeterio/openmeter/pkg/timeutil"
 )
 
 var DefaultNamespace = "test"
@@ -1209,7 +1210,7 @@ var _ subscription.Service = (*NoopSubscriptionService)(nil)
 // for use in testing
 type NoopSubscriptionService struct{}
 
-func (n NoopSubscriptionService) RegisterValidator(validator subscription.SubscriptionValidator) error {
+func (n NoopSubscriptionService) RegisterValidator(validator subscription.SubscriptionCommandValidator) error {
 	return nil
 }
 
@@ -1245,10 +1246,14 @@ func (n NoopSubscriptionService) List(ctx context.Context, params subscription.L
 	return pagination.Result[subscription.Subscription]{}, nil
 }
 
-func (n NoopSubscriptionService) GetAllForCustomerSince(ctx context.Context, customerID models.NamespacedID, at time.Time) ([]subscription.Subscription, error) {
+func (n NoopSubscriptionService) GetAllForCustomer(ctx context.Context, customerID models.NamespacedID, period timeutil.StartBoundedPeriod) ([]subscription.Subscription, error) {
 	return []subscription.Subscription{}, nil
 }
 
+func (n NoopSubscriptionService) ExpandViews(ctx context.Context, subs []subscription.Subscription) ([]subscription.SubscriptionView, error) {
+	return []subscription.SubscriptionView{}, nil
+}
+
 var _ subscriptionworkflow.Service = (*NoopSubscriptionWorkflowService)(nil)
 
 // NoopSubscriptionWorkflowService implements subscriptionworkflow.Service with no-op operations

openmeter/subscription/entitlement.go

@@ -3,7 +3,6 @@ package subscription
 import (
 	"context"
 	"fmt"
-	"time"
 
 	"github.com/openmeterio/openmeter/openmeter/entitlement"
 	"github.com/openmeterio/openmeter/pkg/models"
@@ -62,7 +61,9 @@ type EntitlementAdapter interface {
 	// At refers to a point in time for which we're querying the system state, meaning:
 	// if t1 < t2 < t3, and some entitlement was deleted effective at t2, then
 	// with at = t1 the entitlement will be returned, while with at = t3 it won't.
-	GetForSubscriptionAt(ctx context.Context, subscriptionID models.NamespacedID, at time.Time) ([]SubscriptionEntitlement, error)
+	GetForSubscriptionAt(ctx context.Context, input GetForSubscriptionAtInput) ([]SubscriptionEntitlement, error)
+
+	GetForSubscriptionsAt(ctx context.Context, input []GetForSubscriptionAtInput) ([]SubscriptionEntitlement, error)
 
 	DeleteByItemID(ctx context.Context, itemId models.NamespacedID) error
 }

openmeter/subscription/entitlement/adapter.go

@@ -3,7 +3,6 @@ package subscriptionentitlement
 import (
 	"context"
 	"fmt"
-	"time"
 
 	"github.com/samber/lo"
 
@@ -13,6 +12,7 @@ import (
 	"github.com/openmeterio/openmeter/pkg/framework/transaction"
 	"github.com/openmeterio/openmeter/pkg/models"
 	"github.com/openmeterio/openmeter/pkg/pagination"
+	"github.com/openmeterio/openmeter/pkg/slicesx"
 )
 
 type EntitlementSubscriptionAdapter struct {
@@ -105,8 +105,8 @@ func (a *EntitlementSubscriptionAdapter) GetByItemID(ctx context.Context, id mod
 	}, nil
 }
 
-func (a *EntitlementSubscriptionAdapter) GetForSubscriptionAt(ctx context.Context, subscriptionID models.NamespacedID, at time.Time) ([]subscription.SubscriptionEntitlement, error) {
-	items, err := a.itemRepo.GetForSubscriptionAt(ctx, subscriptionID, at)
+func (a *EntitlementSubscriptionAdapter) GetForSubscriptionAt(ctx context.Context, input subscription.GetForSubscriptionAtInput) ([]subscription.SubscriptionEntitlement, error) {
+	items, err := a.itemRepo.GetForSubscriptionAt(ctx, input)
 	if err != nil {
 		return nil, err
 	}
@@ -118,7 +118,7 @@ func (a *EntitlementSubscriptionAdapter) GetForSubscriptionAt(ctx context.Contex
 	if len(items) > 0 {
 		ents, err = a.entitlementConnector.ListEntitlements(ctx, entitlement.ListEntitlementsParams{
 			IDs:        lo.Map(items, func(s subscription.SubscriptionItem, _ int) string { return *s.EntitlementID }),
-			Namespaces: []string{subscriptionID.Namespace},
+			Namespaces: []string{input.Namespace},
 			Page:       pagination.Page{}, // zero value so all entitlements are fetched
 		})
 		if err != nil {
@@ -148,6 +148,42 @@ func (a *EntitlementSubscriptionAdapter) GetForSubscriptionAt(ctx context.Contex
 	return subEnts, nil
 }
 
+func (a *EntitlementSubscriptionAdapter) GetForSubscriptionsAt(ctx context.Context, input []subscription.GetForSubscriptionAtInput) ([]subscription.SubscriptionEntitlement, error) {
+	items, err := a.itemRepo.GetForSubscriptionsAt(ctx, input)
+	if err != nil {
+		return nil, err
+	}
+
+	items = lo.Filter(items, func(s subscription.SubscriptionItem, _ int) bool { return s.EntitlementID != nil })
+
+	if len(items) == 0 {
+		return nil, nil
+	}
+
+	ents, err := a.entitlementConnector.ListEntitlements(ctx, entitlement.ListEntitlementsParams{
+		IDs:        lo.Map(items, func(s subscription.SubscriptionItem, _ int) string { return *s.EntitlementID }),
+		Namespaces: lo.Uniq(lo.Map(input, func(s subscription.GetForSubscriptionAtInput, _ int) string { return s.Namespace })),
+		Page:       pagination.Page{}, // zero value so all entitlements are fetched
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return slicesx.MapWithErr(ents.Items, func(ent entitlement.Entitlement) (subscription.SubscriptionEntitlement, error) {
+		if ent.ActiveFrom == nil {
+			return subscription.SubscriptionEntitlement{}, fmt.Errorf("entitlement active from is nil, entitlement doesn't have cadence")
+		}
+
+		return subscription.SubscriptionEntitlement{
+			Entitlement: ent,
+			Cadence: models.CadencedModel{
+				ActiveFrom: *ent.ActiveFrom,
+				ActiveTo:   ent.ActiveTo,
+			},
+		}, nil
+	})
+}
+
 func (a *EntitlementSubscriptionAdapter) DeleteByItemID(ctx context.Context, id models.NamespacedID) error {
 	item, err := a.itemRepo.GetByID(ctx, id)
 	if err != nil {

openmeter/subscription/list.go

@@ -13,9 +13,9 @@ type ListSubscriptionsInput struct {
 	pagination.Page
 
 	Namespaces     []string
-	Customers      []string
+	CustomerIDs    []string
 	ActiveAt       *time.Time
-	ActiveInPeriod *timeutil.ClosedPeriod
+	ActiveInPeriod *timeutil.StartBoundedPeriod
 }
 
 func (i ListSubscriptionsInput) Validate() error {