Skip to content

Commit fda362f

Browse files
authored
fix: plan ratecard mapping (#4516)
1 parent fccacdb commit fda362f

2 files changed

Lines changed: 18 additions & 8 deletions

File tree

openmeter/productcatalog/addon/adapter/mapping.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,16 @@ func FromAddonRateCardRow(r entdb.AddonRateCard) (*addon.RateCard, error) {
100100

101101
if r.FeatureID != nil || r.FeatureKey != nil {
102102
ratecardFeature, err := r.Edges.FeaturesOrErr()
103-
if err != nil {
104-
return nil, errors.New("feature is not loaded for ratecard")
103+
//if err != nil {
104+
// return nil, errors.New("feature is not loaded for ratecard")
105+
//}
106+
//
107+
//meta.SetFeature(&ratecardFeature.ID, &ratecardFeature.Key)
108+
109+
// FIXME(chrisgacsal): temporary fix until data is migrated
110+
if err == nil && ratecardFeature != nil {
111+
meta.SetFeature(&ratecardFeature.ID, &ratecardFeature.Key)
105112
}
106-
107-
meta.SetFeature(&ratecardFeature.ID, &ratecardFeature.Key)
108113
}
109114

110115
// Map TaxCode if eagerly loaded.

openmeter/productcatalog/plan/adapter/mapping.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,11 +301,16 @@ func fromPlanRateCardRow(r entdb.PlanRateCard) (productcatalog.RateCard, error)
301301

302302
if r.FeatureID != nil || r.FeatureKey != nil {
303303
ratecardFeature, err := r.Edges.FeaturesOrErr()
304-
if err != nil {
305-
return nil, errors.New("feature is not loaded for ratecard")
304+
//if err != nil {
305+
// return nil, errors.New("feature is not loaded for ratecard")
306+
//}
307+
//
308+
//meta.SetFeature(&ratecardFeature.ID, &ratecardFeature.Key)
309+
310+
// FIXME(chrisgacsal): temporary fix until data is migrated
311+
if err == nil && ratecardFeature != nil {
312+
meta.SetFeature(&ratecardFeature.ID, &ratecardFeature.Key)
306313
}
307-
308-
meta.SetFeature(&ratecardFeature.ID, &ratecardFeature.Key)
309314
}
310315

311316
// Map TaxCode if eagerly loaded.

0 commit comments

Comments
 (0)