fix: address custom currency review feedback

Author: turip

openmeter/billing/charges/creditpurchase/adapter/charge.go

@@ -12,7 +12,6 @@ import (
 	"github.com/openmeterio/openmeter/openmeter/billing/charges/models/chargemeta"
 	"github.com/openmeterio/openmeter/openmeter/ent/db"
 	dbchargecreditpurchase "github.com/openmeterio/openmeter/openmeter/ent/db/chargecreditpurchase"
-	dbcustomcurrency "github.com/openmeterio/openmeter/openmeter/ent/db/customcurrency"
 	"github.com/openmeterio/openmeter/pkg/filter"
 	"github.com/openmeterio/openmeter/pkg/framework/entutils"
 	"github.com/openmeterio/openmeter/pkg/pagination"
@@ -53,7 +52,7 @@ func (a *adapter) UpdateCharge(ctx context.Context, charge creditpurchase.Charge
 			return creditpurchase.ChargeBase{}, err
 		}
 
-		return MapChargeBaseFromDB(dbCreditPurchase, charge.Intent.Currency)
+		return fromDBBaseWithCurrency(dbCreditPurchase, charge.Intent.Currency)
 	})
 }
 
@@ -110,7 +109,7 @@ func (a *adapter) CreateCharge(ctx context.Context, in creditpurchase.CreateInpu
 			return creditpurchase.Charge{}, err
 		}
 
-		return FromDBChargeCreditPurchaseWithCurrency(dbCreditPurchase, in.Intent.Currency, meta.ExpandNone)
+		return FromDBWithCurrency(dbCreditPurchase, in.Intent.Currency, meta.ExpandNone)
 	})
 }
 
@@ -128,7 +127,7 @@ func (a *adapter) MarkVoided(ctx context.Context, input creditpurchase.MarkVoide
 			return creditpurchase.ChargeBase{}, fmt.Errorf("marking credit purchase charge voided [id=%s]: %w", input.Charge.ID, err)
 		}
 
-		return MapChargeBaseFromDB(dbCreditPurchase, input.Charge.Intent.Currency)
+		return fromDBBaseWithCurrency(dbCreditPurchase, input.Charge.Intent.Currency)
 	})
 }
 
@@ -151,7 +150,7 @@ func (a *adapter) GetByID(ctx context.Context, input creditpurchase.GetByIDInput
 			return creditpurchase.Charge{}, fmt.Errorf("getting credit purchase charge [id=%s]: %w", input.ChargeID.ID, err)
 		}
 
-		return MapCreditPurchaseChargeFromDB(entity, input.Expands)
+		return FromDB(entity, input.Expands)
 	})
 }
 
@@ -178,7 +177,7 @@ func (a *adapter) GetByIDs(ctx context.Context, input creditpurchase.GetByIDsInp
 		}
 
 		return slicesx.MapWithErr(entitiesInOrder, func(entity *db.ChargeCreditPurchase) (creditpurchase.Charge, error) {
-			return MapCreditPurchaseChargeFromDB(entity, input.Expands)
+			return FromDB(entity, input.Expands)
 		})
 	})
 }
@@ -208,11 +207,7 @@ func (a *adapter) ListCharges(ctx context.Context, input creditpurchase.ListChar
 			query = query.Where(
 				dbchargecreditpurchase.Or(
 					dbchargecreditpurchase.FiatCurrencyCodeIn(input.Currencies...),
-					dbchargecreditpurchase.HasCustomCurrencyWith(
-						dbcustomcurrency.CodeIn(input.Currencies...),
-						dbcustomcurrency.Namespace(input.Namespace),
-						dbcustomcurrency.DeletedAtIsNil(),
-					),
+					hasCustomCurrencyCode(input.Namespace, input.Currencies...),
 				),
 			)
 		}
@@ -246,7 +241,7 @@ func (a *adapter) ListCharges(ctx context.Context, input creditpurchase.ListChar
 		}
 
 		charges, err := slicesx.MapWithErr(res.Items, func(entity *db.ChargeCreditPurchase) (creditpurchase.Charge, error) {
-			return MapCreditPurchaseChargeFromDB(entity, input.Expands)
+			return FromDB(entity, input.Expands)
 		})
 		if err != nil {
 			return pagination.Result[creditpurchase.Charge]{}, err

openmeter/billing/charges/creditpurchase/adapter/funded_credit_activity.go

@@ -15,7 +15,6 @@ import (
 	"github.com/openmeterio/openmeter/openmeter/ent/db"
 	dbchargecreditpurchase "github.com/openmeterio/openmeter/openmeter/ent/db/chargecreditpurchase"
 	dbchargecreditpurchasecreditgrant "github.com/openmeterio/openmeter/openmeter/ent/db/chargecreditpurchasecreditgrant"
-	dbcustomcurrency "github.com/openmeterio/openmeter/openmeter/ent/db/customcurrency"
 	"github.com/openmeterio/openmeter/openmeter/ent/db/predicate"
 	"github.com/openmeterio/openmeter/pkg/framework/entutils/entedge"
 )
@@ -66,11 +65,7 @@ func ListFundedCreditActivities(ctx context.Context, dbClient *db.Client, input
 	if input.Currency != nil {
 		query = query.Where(dbchargecreditpurchasecreditgrant.HasCreditPurchaseWith(
 			dbchargecreditpurchase.Or(
-				dbchargecreditpurchase.HasCustomCurrencyWith(
-					dbcustomcurrency.CodeEQ(*input.Currency),
-					dbcustomcurrency.Namespace(input.Customer.Namespace),
-					dbcustomcurrency.DeletedAtIsNil(),
-				),
+				hasCustomCurrencyCode(input.Customer.Namespace, *input.Currency),
 				dbchargecreditpurchase.FiatCurrencyCodeEQ(*input.Currency),
 			),
 		))
@@ -110,7 +105,7 @@ func ListFundedCreditActivities(ctx context.Context, dbClient *db.Client, input
 			return creditpurchase.ListFundedCreditActivitiesResult{}, fmt.Errorf("failed to get custom currency: %w", err)
 		}
 
-		resolvedCurrency, err := currenciesadapter.MapCustomCurrencyOrFiatCurrencyFromDB(currenciesadapter.CustomCurrencyOrFiatCurrency{
+		resolvedCurrency, err := currenciesadapter.FromDBCustomCurrencyOrFiatCurrency(currenciesadapter.CustomCurrencyOrFiatCurrency{
 			CustomCurrency: dbCustomCurrency,
 			FiatCurrency:   creditPurchase.FiatCurrencyCode,
 		})

openmeter/billing/charges/creditpurchase/adapter/mapper.go

@@ -16,16 +16,16 @@ import (
 	"github.com/openmeterio/openmeter/pkg/convert"
 )
 
-func MapChargeBaseFromDB(dbEntity *entdb.ChargeCreditPurchase, currency currencies.Currency) (creditpurchase.ChargeBase, error) {
-	mappedMeta, err := chargemeta.FromDBCharge(dbEntity, currency)
+func fromDBBaseWithCurrency(dbEntity *entdb.ChargeCreditPurchase, currency currencies.Currency) (creditpurchase.ChargeBase, error) {
+	mappedMeta, err := chargemeta.FromDBWithCurrency(dbEntity, currency)
 	if err != nil {
 		return creditpurchase.ChargeBase{}, fmt.Errorf("failed to map charge base: %w", err)
 	}
 
-	return mapChargeBaseFromDB(dbEntity, mappedMeta), nil
+	return fromDBBase(dbEntity, mappedMeta), nil
 }
 
-func mapChargeBaseFromDB(dbEntity *entdb.ChargeCreditPurchase, mappedMeta meta.Charge) creditpurchase.ChargeBase {
+func fromDBBase(dbEntity *entdb.ChargeCreditPurchase, mappedMeta meta.Charge) creditpurchase.ChargeBase {
 	return creditpurchase.ChargeBase{
 		ManagedResource: mappedMeta.ManagedResource,
 		Status:          dbEntity.StatusDetailed,
@@ -48,26 +48,26 @@ func mapChargeBaseFromDB(dbEntity *entdb.ChargeCreditPurchase, mappedMeta meta.C
 	}
 }
 
-func MapCreditPurchaseChargeFromDB(dbEntity *entdb.ChargeCreditPurchase, expands meta.Expands) (creditpurchase.Charge, error) {
-	mappedMeta, err := chargemeta.FromDBChargeWithCurrencyEdge(dbEntity, dbEntity.Edges)
+func FromDB(dbEntity *entdb.ChargeCreditPurchase, expands meta.Expands) (creditpurchase.Charge, error) {
+	mappedMeta, err := chargemeta.FromDB(dbEntity, dbEntity.Edges)
 	if err != nil {
 		return creditpurchase.Charge{}, fmt.Errorf("failed to map charge meta: %w", err)
 	}
 
-	return mapCreditPurchaseChargeFromDB(dbEntity, mappedMeta, expands)
+	return fromDBWithMeta(dbEntity, mappedMeta, expands)
 }
 
-func FromDBChargeCreditPurchaseWithCurrency(dbEntity *entdb.ChargeCreditPurchase, currency currencies.Currency, expands meta.Expands) (creditpurchase.Charge, error) {
-	mappedMeta, err := chargemeta.FromDBCharge(dbEntity, currency)
+func FromDBWithCurrency(dbEntity *entdb.ChargeCreditPurchase, currency currencies.Currency, expands meta.Expands) (creditpurchase.Charge, error) {
+	mappedMeta, err := chargemeta.FromDBWithCurrency(dbEntity, currency)
 	if err != nil {
 		return creditpurchase.Charge{}, fmt.Errorf("failed to map charge meta: %w", err)
 	}
 
-	return mapCreditPurchaseChargeFromDB(dbEntity, mappedMeta, expands)
+	return fromDBWithMeta(dbEntity, mappedMeta, expands)
 }
 
-func mapCreditPurchaseChargeFromDB(dbEntity *entdb.ChargeCreditPurchase, mappedMeta meta.Charge, expands meta.Expands) (creditpurchase.Charge, error) {
-	chargeBase := mapChargeBaseFromDB(dbEntity, mappedMeta)
+func fromDBWithMeta(dbEntity *entdb.ChargeCreditPurchase, mappedMeta meta.Charge, expands meta.Expands) (creditpurchase.Charge, error) {
+	chargeBase := fromDBBase(dbEntity, mappedMeta)
 
 	var creditGrantRealization *ledgertransaction.TimedGroupReference
 	var externalPaymentSettlement *payment.External

openmeter/billing/charges/creditpurchase/adapter/predicate.go

@@ -0,0 +1,16 @@
+package adapter
+
+import (
+	dbchargecreditpurchase "github.com/openmeterio/openmeter/openmeter/ent/db/chargecreditpurchase"
+	dbcustomcurrency "github.com/openmeterio/openmeter/openmeter/ent/db/customcurrency"
+	"github.com/openmeterio/openmeter/openmeter/ent/db/predicate"
+	"github.com/openmeterio/openmeter/pkg/currencyx"
+)
+
+func hasCustomCurrencyCode(namespace string, codes ...currencyx.Code) predicate.ChargeCreditPurchase {
+	return dbchargecreditpurchase.HasCustomCurrencyWith(
+		dbcustomcurrency.CodeIn(codes...),
+		dbcustomcurrency.Namespace(namespace),
+		dbcustomcurrency.DeletedAtIsNil(),
+	)
+}

openmeter/billing/charges/flatfee/adapter/charge.go

@@ -95,7 +95,7 @@ func (a *adapter) UpdateCharge(ctx context.Context, charge flatfee.ChargeBase) (
 			dbUpdatedChargeBase.Edges.IntentOverride = intentOverride
 		}
 
-		return MapChargeBaseFromDB(dbUpdatedChargeBase, intent.Currency)
+		return fromDBBaseWithCurrency(dbUpdatedChargeBase, intent.Currency)
 	})
 }
 
@@ -132,7 +132,7 @@ func (a *adapter) UpdateSubscriptionItemID(ctx context.Context, charge flatfee.C
 		}
 
 		updatedChargeBase.Edges.IntentOverride = override
-		mappedChargeBase, err := MapChargeBaseFromDB(updatedChargeBase, charge.Intent.GetBaseIntent().Currency)
+		mappedChargeBase, err := fromDBBaseWithCurrency(updatedChargeBase, charge.Intent.GetBaseIntent().Currency)
 		if err != nil {
 			return flatfee.Charge{}, err
 		}
@@ -236,7 +236,7 @@ func (a *adapter) CreateCharges(ctx context.Context, in flatfee.CreateChargesInp
 		}
 
 		return lo.MapErr(entities, func(entity *db.ChargeFlatFee, idx int) (flatfee.Charge, error) {
-			return FromDBChargeFlatFeeWithCurrency(entity, in.Intents[idx].Intent.Currency, meta.ExpandNone)
+			return FromDBWithCurrency(entity, in.Intents[idx].Intent.Currency, meta.ExpandNone)
 		})
 	})
 }
@@ -268,7 +268,7 @@ func (a *adapter) GetByIDs(ctx context.Context, input flatfee.GetByIDsInput) ([]
 		}
 
 		out, err := slicesx.MapWithErr(entitiesInOrder, func(entity *db.ChargeFlatFee) (flatfee.Charge, error) {
-			return MapChargeFlatFeeFromDB(entity, input.Expands)
+			return FromDB(entity, input.Expands)
 		})
 		if err != nil {
 			return nil, err
@@ -309,7 +309,7 @@ func (a *adapter) GetByID(ctx context.Context, input flatfee.GetByIDInput) (flat
 			return flatfee.Charge{}, fmt.Errorf("querying flat fee charge [id=%s]: %w", input.ChargeID, err)
 		}
 
-		charge, err := MapChargeFlatFeeFromDB(entity, input.Expands)
+		charge, err := FromDB(entity, input.Expands)
 		if err != nil {
 			return flatfee.Charge{}, err
 		}

openmeter/billing/charges/flatfee/adapter/intentoverride.go

@@ -20,7 +20,7 @@ import (
 	"github.com/openmeterio/openmeter/pkg/timeutil"
 )
 
-func mapIntentOverrideFromDB(dbOverride *entdb.ChargeFlatFeeOverride) *flatfee.IntentMutableFields {
+func fromDBOverride(dbOverride *entdb.ChargeFlatFeeOverride) *flatfee.IntentMutableFields {
 	if dbOverride == nil {
 		return nil
 	}
@@ -35,9 +35,9 @@ func mapIntentOverrideFromDB(dbOverride *entdb.ChargeFlatFeeOverride) *flatfee.I
 			Name:              dbOverride.Name,
 			Description:       dbOverride.Description,
 			Metadata:          lo.FromPtr(dbOverride.Metadata),
-			ServicePeriod:     closedPeriodFromDB(dbOverride.ServicePeriodFrom, dbOverride.ServicePeriodTo),
-			FullServicePeriod: closedPeriodFromDB(dbOverride.FullServicePeriodFrom, dbOverride.FullServicePeriodTo),
-			BillingPeriod:     closedPeriodFromDB(dbOverride.BillingPeriodFrom, dbOverride.BillingPeriodTo),
+			ServicePeriod:     fromDBClosedPeriod(dbOverride.ServicePeriodFrom, dbOverride.ServicePeriodTo),
+			FullServicePeriod: fromDBClosedPeriod(dbOverride.FullServicePeriodFrom, dbOverride.FullServicePeriodTo),
+			BillingPeriod:     fromDBClosedPeriod(dbOverride.BillingPeriodFrom, dbOverride.BillingPeriodTo),
 		},
 		IntentDeletedAt:       convert.TimePtrIn(dbOverride.IntentDeletedAt, time.UTC),
 		InvoiceAt:             dbOverride.InvoiceAt.UTC(),
@@ -84,7 +84,7 @@ func (a *adapter) CreateChargeOverride(ctx context.Context, charge flatfee.Charg
 
 		dbCharge.Edges.IntentOverride = dbIntentOverride
 
-		return MapChargeBaseFromDB(dbCharge, charge.Intent.GetBaseIntent().Currency)
+		return fromDBBaseWithCurrency(dbCharge, charge.Intent.GetBaseIntent().Currency)
 	})
 }
 
@@ -225,7 +225,7 @@ func (a *adapter) updateIntentOverride(ctx context.Context, chargeID meta.Charge
 	return dbOverride, nil
 }
 
-func closedPeriodFromDB(from, to time.Time) timeutil.ClosedPeriod {
+func fromDBClosedPeriod(from, to time.Time) timeutil.ClosedPeriod {
 	return timeutil.ClosedPeriod{
 		From: from.UTC(),
 		To:   to.UTC(),

openmeter/billing/charges/flatfee/adapter/mapper.go

@@ -24,32 +24,32 @@ import (
 	"github.com/openmeterio/openmeter/pkg/timeutil"
 )
 
-// MapFlatFeeChargeFromDB converts a DB Charge entity (with loaded FlatFee edge) to a FlatFeeCharge.
-func MapChargeFlatFeeFromDB(entity *entdb.ChargeFlatFee, expands meta.Expands) (flatfee.Charge, error) {
-	mappedMeta, err := chargemeta.FromDBChargeWithCurrencyEdge(entity, entity.Edges)
+// FromDB converts a DB ChargeFlatFee entity to a flat fee charge.
+func FromDB(entity *entdb.ChargeFlatFee, expands meta.Expands) (flatfee.Charge, error) {
+	mappedMeta, err := chargemeta.FromDB(entity, entity.Edges)
 	if err != nil {
 		return flatfee.Charge{}, fmt.Errorf("mapping flat fee charge meta [id=%s]: %w", entity.ID, err)
 	}
 
-	return mapChargeFlatFeeFromDB(entity, mappedMeta, expands)
+	return fromDBWithMeta(entity, mappedMeta, expands)
 }
 
-func FromDBChargeFlatFeeWithCurrency(entity *entdb.ChargeFlatFee, currency currencies.Currency, expands meta.Expands) (flatfee.Charge, error) {
-	mappedMeta, err := chargemeta.FromDBCharge(entity, currency)
+func FromDBWithCurrency(entity *entdb.ChargeFlatFee, currency currencies.Currency, expands meta.Expands) (flatfee.Charge, error) {
+	mappedMeta, err := chargemeta.FromDBWithCurrency(entity, currency)
 	if err != nil {
 		return flatfee.Charge{}, fmt.Errorf("mapping flat fee charge meta [id=%s]: %w", entity.ID, err)
 	}
 
-	return mapChargeFlatFeeFromDB(entity, mappedMeta, expands)
+	return fromDBWithMeta(entity, mappedMeta, expands)
 }
 
-func mapChargeFlatFeeFromDB(entity *entdb.ChargeFlatFee, mappedMeta meta.Charge, expands meta.Expands) (flatfee.Charge, error) {
+func fromDBWithMeta(entity *entdb.ChargeFlatFee, mappedMeta meta.Charge, expands meta.Expands) (flatfee.Charge, error) {
 	charge := flatfee.Charge{
-		ChargeBase: mapChargeBaseFromDB(entity, mappedMeta),
+		ChargeBase: fromDBBase(entity, mappedMeta),
 	}
 
 	if expands.Has(meta.ExpandRealizations) {
-		realizations, err := mapRealizationsFromDB(entity)
+		realizations, err := fromDBRealizations(entity)
 		if err != nil {
 			return flatfee.Charge{}, fmt.Errorf("mapping flat fee charge [id=%s]: %w", entity.ID, err)
 		}
@@ -59,15 +59,15 @@ func mapChargeFlatFeeFromDB(entity *entdb.ChargeFlatFee, mappedMeta meta.Charge,
 	return charge, nil
 }
 
-func mapRealizationsFromDB(entity *entdb.ChargeFlatFee) (flatfee.Realizations, error) {
+func fromDBRealizations(entity *entdb.ChargeFlatFee) (flatfee.Realizations, error) {
 	dbRuns, err := entity.Edges.RunsOrErr()
 	if err != nil {
 		return flatfee.Realizations{}, fmt.Errorf("runs not loaded for flat fee charge [id=%s]: %w", entity.ID, err)
 	}
 
 	var realizations flatfee.Realizations
 	for _, dbRun := range dbRuns {
-		run, err := mapRealizationRunFromDB(dbRun)
+		run, err := fromDBRun(dbRun)
 		if err != nil {
 			return flatfee.Realizations{}, fmt.Errorf("mapping flat fee realization run [id=%s]: %w", dbRun.ID, err)
 		}
@@ -87,7 +87,7 @@ func mapRealizationsFromDB(entity *entdb.ChargeFlatFee) (flatfee.Realizations, e
 	return realizations, nil
 }
 
-func mapRealizationRunBaseFromDB(dbRun *entdb.ChargeFlatFeeRun) flatfee.RealizationRunBase {
+func fromDBRunBase(dbRun *entdb.ChargeFlatFeeRun) flatfee.RealizationRunBase {
 	return flatfee.RealizationRunBase{
 		ID: flatfee.RealizationRunID{
 			Namespace: dbRun.Namespace,
@@ -107,9 +107,9 @@ func mapRealizationRunBaseFromDB(dbRun *entdb.ChargeFlatFeeRun) flatfee.Realizat
 	}
 }
 
-func mapRealizationRunFromDB(dbRun *entdb.ChargeFlatFeeRun) (flatfee.RealizationRun, error) {
+func fromDBRun(dbRun *entdb.ChargeFlatFeeRun) (flatfee.RealizationRun, error) {
 	run := flatfee.RealizationRun{
-		RealizationRunBase: mapRealizationRunBaseFromDB(dbRun),
+		RealizationRunBase: fromDBRunBase(dbRun),
 	}
 
 	dbCreditsAllocated, err := dbRun.Edges.CreditAllocationsOrErr()
@@ -148,16 +148,16 @@ func sortDetailedLines(lines flatfee.DetailedLines) {
 	slices.SortStableFunc(lines, stddetailedline.Compare[flatfee.DetailedLine])
 }
 
-func MapChargeBaseFromDB(entity *entdb.ChargeFlatFee, currency currencies.Currency) (flatfee.ChargeBase, error) {
-	mappedMeta, err := chargemeta.FromDBCharge(entity, currency)
+func fromDBBaseWithCurrency(entity *entdb.ChargeFlatFee, currency currencies.Currency) (flatfee.ChargeBase, error) {
+	mappedMeta, err := chargemeta.FromDBWithCurrency(entity, currency)
 	if err != nil {
 		return flatfee.ChargeBase{}, fmt.Errorf("mapping charge meta: %w", err)
 	}
 
-	return mapChargeBaseFromDB(entity, mappedMeta), nil
+	return fromDBBase(entity, mappedMeta), nil
 }
 
-func mapChargeBaseFromDB(entity *entdb.ChargeFlatFee, mappedMeta meta.Charge) flatfee.ChargeBase {
+func fromDBBase(entity *entdb.ChargeFlatFee, mappedMeta meta.Charge) flatfee.ChargeBase {
 	var percentageDiscounts *billing.PercentageDiscount
 	if entity.Discounts != nil {
 		percentageDiscounts = entity.Discounts.Percentage
@@ -181,15 +181,15 @@ func mapChargeBaseFromDB(entity *entdb.ChargeFlatFee, mappedMeta meta.Charge) fl
 				IntentDeletedAt:       convert.TimePtrIn(entity.IntentDeletedAt, time.UTC),
 				PaymentTerm:           entity.PaymentTerm,
 				PercentageDiscounts:   percentageDiscounts,
-				ProRating:             proRatingConfigFromDB(entity.ProRating),
+				ProRating:             fromDBProRatingConfig(entity.ProRating),
 				AmountBeforeProration: entity.AmountBeforeProration,
 			},
-		}, mapIntentOverrideFromDB(entity.Edges.IntentOverride)),
+		}, fromDBOverride(entity.Edges.IntentOverride)),
 	}
 }
 
-// proRatingConfigFromDB converts a DB ProRatingModeAdapterEnum to a ProRatingConfig.
-func proRatingConfigFromDB(pr flatfee.ProRatingModeAdapterEnum) productcatalog.ProRatingConfig {
+// fromDBProRatingConfig converts a DB ProRatingModeAdapterEnum to a ProRatingConfig.
+func fromDBProRatingConfig(pr flatfee.ProRatingModeAdapterEnum) productcatalog.ProRatingConfig {
 	switch pr {
 	case flatfee.ProratePricesProratingAdapterMode:
 		return productcatalog.ProRatingConfig{