Merge pull request #1833 from openmeterio/feat/plan-api-impl

fix: Plan API
openmeterio · Nov 12, 2024 · 4ea4a49 · 4ea4a49
2 parents 4d54451 + 09587ca
commit 4ea4a49
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/openmeter/productcatalog/plan/adapter/phase.go b/openmeter/productcatalog/plan/adapter/phase.go
@@ -422,9 +422,15 @@ func (a *adapter) UpdatePhase(ctx context.Context, params plan.UpdatePhaseInput)
 						SetOrClearDescription(rateCardInput.Description).
 						SetOrClearFeatureKey(rateCardInput.FeatureKey).
 						SetEntitlementTemplate(rateCardInput.EntitlementTemplate).
-						SetTaxConfig(rateCardInput.TaxConfig).
-						SetOrClearBillingCadence(rateCardInput.BillingCadence).
-						SetPrice(rateCardInput.Price)
+						SetOrClearBillingCadence(rateCardInput.BillingCadence)
+
+					if rateCardInput.TaxConfig != nil {
+						q.SetTaxConfig(rateCardInput.TaxConfig)
+					}
+
+					if rateCardInput.Price != nil {
+						q.SetPrice(rateCardInput.Price)
+					}
 
 					if rateCardInput.FeatureID == nil {
 						q.ClearFeatureID()

diff --git a/openmeter/productcatalog/plan/httpdriver/mapping.go b/openmeter/productcatalog/plan/httpdriver/mapping.go
@@ -450,7 +450,7 @@ func AsFlatFeeRateCard(flat api.RateCardFlatFee, namespace string) (plan.FlatFee
 		case api.PricePaymentTermInArrears:
 			paymentTerm = plan.InArrearsPaymentTerm
 		case api.PricePaymentTermInAdvance:
-			fallthrough
+			paymentTerm = plan.InAdvancePaymentTerm
 		default:
 			paymentTerm = plan.DefaultPaymentTerm
 		}
@@ -557,7 +557,7 @@ func AsPrice(p api.RateCardUsageBasedPrice) (plan.Price, error) {
 			case api.PricePaymentTermInArrears:
 				flatPrice.PaymentTerm = plan.InArrearsPaymentTerm
 			case api.PricePaymentTermInAdvance:
-				fallthrough
+				flatPrice.PaymentTerm = plan.InAdvancePaymentTerm
 			default:
 				flatPrice.PaymentTerm = plan.DefaultPaymentTerm
 			}