fix: fix minor issues and add extra checks

Author: borosr

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

@@ -2,6 +2,8 @@ package subscriptionaddons
 
 import (
 	"errors"
+	"fmt"
+	"time"
 
 	"github.com/samber/lo"
 
@@ -15,8 +17,10 @@ import (
 func toAPISubscriptionAddon(addon subscriptionaddon.SubscriptionAddon) (apiv3.SubscriptionAddon, error) {
 	now := clock.Now()
 
-	// If no instance is active at `now`, quantity stays 0.
-	inst, _ := addon.GetInstanceAt(now)
+	inst, found := addon.GetInstanceAt(now)
+	if !found {
+		return apiv3.SubscriptionAddon{}, fmt.Errorf("no instance is active at %s", now.Format(time.RFC3339))
+	}
 
 	pers := lo.Map(addon.GetInstances(), func(i subscriptionaddon.SubscriptionAddonInstance, _ int) timeutil.OpenPeriod {
 		return i.AsPeriod()

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

@@ -21,7 +21,7 @@ type (
 	GetSubscriptionAddonHandler  httptransport.HandlerWithArgs[GetSubscriptionAddonRequest, GetSubscriptionAddonResponse, GetSubscriptionAddonParams]
 )
 
-func (h *handler) GetSubscriptionAddons() GetSubscriptionAddonHandler {
+func (h *handler) GetSubscriptionAddon() GetSubscriptionAddonHandler {
 	return httptransport.NewHandlerWithArgs(
 		func(ctx context.Context, r *http.Request, params GetSubscriptionAddonParams) (GetSubscriptionAddonRequest, error) {
 			ns, err := h.resolveNamespace(ctx)

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

@@ -9,7 +9,7 @@ import (
 
 type Handler interface {
 	ListSubscriptionAddons() ListSubscriptionAddonsHandler
-	GetSubscriptionAddons() GetSubscriptionAddonHandler
+	GetSubscriptionAddon() GetSubscriptionAddonHandler
 }
 
 type handler struct {

api/v3/server/routes.go

@@ -118,7 +118,7 @@ func (s *Server) ListSubscriptionAddons(w http.ResponseWriter, r *http.Request,
 }
 
 func (s *Server) GetSubscriptionAddon(w http.ResponseWriter, r *http.Request, subscriptionId api.ULID, subscriptionAddonId api.ULID) {
-	s.subscriptionAddonsHandler.GetSubscriptionAddons().With(subscriptionaddonshandler.GetSubscriptionAddonParams{
+	s.subscriptionAddonsHandler.GetSubscriptionAddon().With(subscriptionaddonshandler.GetSubscriptionAddonParams{
 		SubscriptionID:      subscriptionId,
 		SubscriptionAddonID: subscriptionAddonId,
 	}).ServeHTTP(w, r)

openmeter/subscription/addon/repo/subscriptionaddon.go

@@ -61,6 +61,9 @@ func (r *subscriptionAddonRepo) Get(ctx context.Context, params subscriptionaddo
 				dbsubscriptionaddon.ID(params.ID),
 				dbsubscriptionaddon.Namespace(params.Namespace),
 			)
+			if params.SubscriptionID != "" {
+				query = query.Where(dbsubscriptionaddon.SubscriptionID(params.SubscriptionID))
+			}
 		} else {
 			query = query.Where(
 				dbsubscriptionaddon.Namespace(params.Namespace),

openmeter/subscription/addon/service.go

@@ -6,6 +6,8 @@ import (
 	"fmt"
 	"slices"
 
+	"github.com/oklog/ulid/v2"
+
 	"github.com/openmeterio/openmeter/pkg/models"
 	"github.com/openmeterio/openmeter/pkg/pagination"
 	"github.com/openmeterio/openmeter/pkg/sortx"
@@ -74,7 +76,7 @@ type GetSubscriptionAddonInput struct {
 	models.NamespacedID
 
 	// SubscriptionID
-	SubscriptionID string `json:"subscriptionIdOrKey"`
+	SubscriptionID string `json:"subscriptionId"`
 
 	// AddonIDOrKey
 	AddonIDOrKey string `json:"addonIdOrKey"`
@@ -90,11 +92,17 @@ func (i GetSubscriptionAddonInput) Validate() error {
 	if i.ID == "" {
 		if i.SubscriptionID == "" {
 			errs = append(errs, errors.New("subscription id or key must be provided if assignment id is not provided"))
+		} else if _, err := ulid.Parse(i.SubscriptionID); err != nil {
+			errs = append(errs, errors.New("subscription id is not a valid ULID"))
 		}
 
 		if i.AddonIDOrKey == "" {
 			errs = append(errs, errors.New("add-on id or key must be provided if assignment id is not provided"))
 		}
+	} else {
+		if _, err := ulid.Parse(i.ID); err != nil {
+			errs = append(errs, errors.New("assignment id is not a valid ULID"))
+		}
 	}
 
 	return errors.Join(errs...)

openmeter/subscription/addon/service/service.go

@@ -201,6 +201,9 @@ func (s *service) Create(ctx context.Context, ns string, input subscriptionaddon
 
 // Get gets a subscription add-on
 func (s *service) Get(ctx context.Context, params subscriptionaddon.GetSubscriptionAddonInput) (*subscriptionaddon.SubscriptionAddon, error) {
+	if err := params.Validate(); err != nil {
+		return nil, models.NewGenericValidationError(err)
+	}
 	return s.cfg.SubAddRepo.Get(ctx, params)
 }