Skip to content

Commit e8e6322

Browse files
committed
fix: resolve validaton issue, use proper method for wrapping
1 parent fcce958 commit e8e6322

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

openmeter/subscription/addon/repo/subscriptionaddon.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ func (r *subscriptionAddonRepo) Get(ctx context.Context, params subscriptionaddo
5656
query := querySubscriptionAddon(repo.db.SubscriptionAddon.Query())
5757

5858
query = query.Where(
59-
dbsubscriptionaddon.ID(params.ID),
60-
dbsubscriptionaddon.Namespace(params.Namespace),
59+
dbsubscriptionaddon.ID(params.NamespacedID.ID),
60+
dbsubscriptionaddon.Namespace(params.NamespacedID.Namespace),
6161
)
6262
if params.SubscriptionID != "" {
6363
query = query.Where(dbsubscriptionaddon.SubscriptionID(params.SubscriptionID))
@@ -67,7 +67,7 @@ func (r *subscriptionAddonRepo) Get(ctx context.Context, params subscriptionaddo
6767
if err != nil {
6868
if db.IsNotFound(err) {
6969
return nil, models.NewGenericNotFoundError(
70-
fmt.Errorf("subscription addon %s not found", params.ID),
70+
fmt.Errorf("subscription addon %s not found", params.NamespacedID.ID),
7171
)
7272
}
7373

openmeter/subscription/addon/service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,5 @@ func (i GetSubscriptionAddonInput) Validate() error {
8484
errs = append(errs, err)
8585
}
8686

87-
return models.NewGenericValidationError(errors.Join(errs...))
87+
return models.NewNillableGenericValidationError(errors.Join(errs...))
8888
}

0 commit comments

Comments
 (0)