fix: remove AddonIDOrKey

Author: borosr

openmeter/subscription/addon/repo/subscriptionaddon.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	"github.com/openmeterio/openmeter/openmeter/ent/db"
-	addondb "github.com/openmeterio/openmeter/openmeter/ent/db/addon"
 	dbsubscriptionaddon "github.com/openmeterio/openmeter/openmeter/ent/db/subscriptionaddon"
 	dbsubscriptionaddonquantity "github.com/openmeterio/openmeter/openmeter/ent/db/subscriptionaddonquantity"
 	subscriptionaddon "github.com/openmeterio/openmeter/openmeter/subscription/addon"
@@ -56,20 +55,12 @@ func (r *subscriptionAddonRepo) Get(ctx context.Context, params subscriptionaddo
 	return entutils.TransactingRepo(ctx, r, func(ctx context.Context, repo *subscriptionAddonRepo) (*subscriptionaddon.SubscriptionAddon, error) {
 		query := querySubscriptionAddon(repo.db.SubscriptionAddon.Query())
 
-		if params.ID != "" {
-			query = query.Where(
-				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),
-				dbsubscriptionaddon.SubscriptionID(params.SubscriptionID),
-				dbsubscriptionaddon.HasAddonWith(addondb.Or(addondb.ID(params.AddonIDOrKey), addondb.Key(params.AddonIDOrKey))),
-			)
+		query = query.Where(
+			dbsubscriptionaddon.ID(params.ID),
+			dbsubscriptionaddon.Namespace(params.Namespace),
+		)
+		if params.SubscriptionID != "" {
+			query = query.Where(dbsubscriptionaddon.SubscriptionID(params.SubscriptionID))
 		}
 
 		entity, err := query.Only(ctx)

openmeter/subscription/addon/service.go

@@ -77,31 +77,22 @@ type GetSubscriptionAddonInput struct {
 
 	// SubscriptionID
 	SubscriptionID string `json:"subscriptionId"`
-
-	// AddonIDOrKey
-	AddonIDOrKey string `json:"addonIdOrKey"`
 }
 
 func (i GetSubscriptionAddonInput) Validate() error {
 	var errs []error
 
-	if i.NamespacedID.Namespace == "" {
-		errs = append(errs, errors.New("namespace is required"))
+	if err := i.NamespacedID.Validate(); err != nil {
+		errs = append(errs, err)
 	}
 
-	if i.ID == "" {
-		if i.SubscriptionID == "" {
-			errs = append(errs, errors.New("subscription id 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 _, err := ulid.Parse(i.NamespacedID.ID); err != nil {
+		errs = append(errs, errors.New("assignment 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"))
+	if i.SubscriptionID != "" {
+		if _, err := ulid.Parse(i.NamespacedID.ID); err != nil {
+			errs = append(errs, errors.New("subscription id is not a valid ULID"))
 		}
 	}