refactor: currencies service pkg

Author: chrisgacsal

api/v3/handlers/currencies/create.go

@@ -35,7 +35,7 @@ func (h *handler) CreateCurrency() CreateCurrencyHandler {
 			return body, nil
 		},
 		func(ctx context.Context, request CreateCurrencyRequest) (CreateCurrencyResponse, error) {
-			resp, err := h.currencyService.CreateCurrency(ctx, request)
+			resp, err := h.service.CreateCurrency(ctx, request)
 			if err != nil {
 				return CreateCurrencyResponse{}, err
 			}

api/v3/handlers/currencies/create_cost_basis.go

@@ -37,7 +37,7 @@ func (h *handler) CreateCostBasis() CreateCostBasisHandler {
 			return body, nil
 		},
 		func(ctx context.Context, request CreateCostBasisRequest) (CreateCostBasisResponse, error) {
-			resp, err := h.currencyService.CreateCostBasis(ctx, request)
+			resp, err := h.service.CreateCostBasis(ctx, request)
 			if err != nil {
 				return CreateCostBasisResponse{}, err
 			}

api/v3/handlers/currencies/get_cost_bases.go

@@ -64,7 +64,7 @@ func (h *handler) ListCostBases() ListCostBasesHandler {
 			}, nil
 		},
 		func(ctx context.Context, req ListCostBasesRequest) (ListCostBasesResponse, error) {
-			result, err := h.currencyService.ListCostBases(ctx, req)
+			result, err := h.service.ListCostBases(ctx, req)
 			if err != nil {
 				return ListCostBasesResponse{}, err
 			}

api/v3/handlers/currencies/handler.go

@@ -17,17 +17,17 @@ type Handler interface {
 type handler struct {
 	resolveNamespace func(ctx context.Context) (string, error)
 	options          []httptransport.HandlerOption
-	currencyService  currencies.CurrencyService
+	service          currencies.Service
 }
 
 func New(
 	resolveNamespace func(ctx context.Context) (string, error),
-	currencyService currencies.CurrencyService,
+	currencyService currencies.Service,
 	options ...httptransport.HandlerOption,
 ) Handler {
 	return &handler{
 		resolveNamespace: resolveNamespace,
 		options:          options,
-		currencyService:  currencyService,
+		service:          currencyService,
 	}
 }

api/v3/handlers/currencies/list.go

@@ -89,7 +89,7 @@ func (h *handler) ListCurrencies() ListCurrenciesHandler {
 			return req, nil
 		},
 		func(ctx context.Context, request ListCurrenciesRequest) (ListCurrenciesResponse, error) {
-			result, err := h.currencyService.ListCurrencies(ctx, request)
+			result, err := h.service.ListCurrencies(ctx, request)
 			if err != nil {
 				return ListCurrenciesResponse{}, err
 			}

app/common/currency.go

@@ -2,26 +2,36 @@ package common
 
 import (
 	"fmt"
-	"log/slog"
 
 	"github.com/google/wire"
 
 	"github.com/openmeterio/openmeter/openmeter/currencies"
-	currencyAdapter "github.com/openmeterio/openmeter/openmeter/currencies/adapter"
+	currencyadapter "github.com/openmeterio/openmeter/openmeter/currencies/adapter"
 	"github.com/openmeterio/openmeter/openmeter/currencies/service"
 	entdb "github.com/openmeterio/openmeter/openmeter/ent/db"
 )
 
 var Currency = wire.NewSet(
+	NewCurrencyAdapter,
 	NewCurrencyService,
 )
 
-func NewCurrencyService(logger *slog.Logger, db *entdb.Client) (currencies.CurrencyService, error) {
-	adapter, err := currencyAdapter.New(currencyAdapter.Config{
+func NewCurrencyAdapter(db *entdb.Client) (currencies.Repository, error) {
+	repo, err := currencyadapter.New(currencyadapter.Config{
 		Client: db,
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to create currency adapter: %w", err)
 	}
-	return service.New(adapter), nil
+
+	return repo, nil
+}
+
+func NewCurrencyService(repo currencies.Repository) (currencies.Service, error) {
+	s, err := service.New(repo)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create currency service: %w", err)
+	}
+
+	return s, nil
 }

cmd/server/wire.go

@@ -59,7 +59,7 @@ type Application struct {
 	CustomerSubjectHook              common.CustomerSubjectHook
 	CustomerEntitlementValidatorHook common.CustomerEntitlementValidatorHook
 	BillingRegistry                  common.BillingRegistry
-	CurrencyService                  currencies.CurrencyService
+	CurrencyService                  currencies.Service
 	CostService                      cost.Service
 	CreditGrantService               creditgrant.Service
 	Ledger                           ledger.Ledger

cmd/server/wire_gen.go

@@ -24,17 +24,17 @@ func (c Config) Validate() error {
 	return nil
 }
 
-func New(config Config) (currencies.Adapter, error) {
+func New(config Config) (currencies.Repository, error) {
 	if err := config.Validate(); err != nil {
-		return nil, err
+		return nil, fmt.Errorf("invalid config: %w", err)
 	}
 
 	return &adapter{
 		db: config.Client,
 	}, nil
 }
 
-var _ currencies.Adapter = (*adapter)(nil)
+var _ currencies.Repository = (*adapter)(nil)
 
 type adapter struct {
 	db *entdb.Client

openmeter/currencies/adapter/adapter.go

@@ -20,8 +20,6 @@ import (
 	"github.com/openmeterio/openmeter/pkg/sortx"
 )
 
-var _ currencies.Adapter = (*adapter)(nil)
-
 func mapCurrencyFromDB(c *entdb.CustomCurrency) currencies.Currency {
 	return currencies.Currency{
 		NamespacedID: models.NamespacedID{ID: c.ID, Namespace: c.Namespace},