fix(invoice): cost customer filter

Author: hekike

openmeter/billing/httpdriver/handler.go

@@ -10,6 +10,7 @@ import (
 	"github.com/openmeterio/openmeter/openmeter/app"
 	appstripe "github.com/openmeterio/openmeter/openmeter/app/stripe"
 	"github.com/openmeterio/openmeter/openmeter/billing"
+	"github.com/openmeterio/openmeter/openmeter/customer"
 	"github.com/openmeterio/openmeter/openmeter/meter"
 	"github.com/openmeterio/openmeter/openmeter/namespace/namespacedriver"
 	"github.com/openmeterio/openmeter/openmeter/productcatalog/feature"
@@ -65,6 +66,7 @@ type handler struct {
 	streamingService streaming.Connector
 	meterService     meter.Service
 	featureService   feature.FeatureConnector
+	customerService  customer.Service
 	namespaceDecoder namespacedriver.NamespaceDecoder
 	featureSwitches  config.BillingFeatureSwitchesConfiguration
 	options          []httptransport.HandlerOption
@@ -89,6 +91,7 @@ func New(
 	streamingService streaming.Connector,
 	featureService feature.FeatureConnector,
 	meterService meter.Service,
+	customerService customer.Service,
 	options ...httptransport.HandlerOption,
 ) Handler {
 	return &handler{
@@ -100,5 +103,6 @@ func New(
 		streamingService: streamingService,
 		meterService:     meterService,
 		featureService:   featureService,
+		customerService:  customerService,
 	}
 }

openmeter/billing/httpdriver/invoicecost.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/openmeterio/openmeter/api"
 	"github.com/openmeterio/openmeter/openmeter/billing"
+	"github.com/openmeterio/openmeter/openmeter/customer"
 	"github.com/openmeterio/openmeter/openmeter/meter"
 	"github.com/openmeterio/openmeter/openmeter/streaming"
 	"github.com/openmeterio/openmeter/pkg/framework/commonhttp"
@@ -111,10 +112,24 @@ func (h *handler) GetInvoiceLineCost() GetInvoiceLineCostHandler {
 				meterGroupByFilters[k] = []string{v}
 			}
 
+			// Get the customer
+			customer, err := h.customerService.GetCustomer(ctx, customer.GetCustomerInput{
+				CustomerID: lo.ToPtr(invoice.CustomerID()),
+			})
+			if err != nil {
+				return GetInvoiceLineCostResponse{}, err
+			}
+
+			if customer == nil {
+				return GetInvoiceLineCostResponse{}, fmt.Errorf("customer cannot be nil")
+			}
+
+			// Query the meter
 			meterQueryParams := streaming.QueryParams{
-				From:          &line.Period.Start,
-				To:            &line.Period.End,
-				FilterGroupBy: meterGroupByFilters,
+				From:           &line.Period.Start,
+				To:             &line.Period.End,
+				FilterGroupBy:  meterGroupByFilters,
+				FilterCustomer: []streaming.Customer{*customer},
 			}
 
 			if request.Params.GroupBy != nil {

openmeter/server/router/router.go

@@ -365,6 +365,7 @@ func NewRouter(config Config) (*Router, error) {
 		config.StreamingConnector,
 		config.FeatureConnector,
 		config.MeterManageService,
+		config.Customer,
 		httptransport.WithErrorHandler(config.ErrorHandler),
 	)