feat!: add customer to entitlement notification events

api/client/javascript/src/client/schemas.ts

@@ -7594,6 +7594,8 @@ export interface components {
       readonly subject: components['schemas']['Subject']
       /** Entitlement Value */
       readonly value: components['schemas']['EntitlementValue']
+      /** Customer */
+      readonly customer?: components['schemas']['Customer']
       /** Threshold */
       readonly threshold: components['schemas']['NotificationRuleBalanceThresholdValue']
     }
@@ -7643,6 +7645,8 @@ export interface components {
       readonly subject: components['schemas']['Subject']
       /** Entitlement Value */
       readonly value: components['schemas']['EntitlementValue']
+      /** Customer */
+      readonly customer?: components['schemas']['Customer']
     }
     /** @description Payload for notification event with `invoice.created` type. */
     NotificationEventInvoiceCreatedPayload: {

api/openapi.cloud.yaml

@@ -19516,6 +19516,11 @@ components:
             - $ref: '#/components/schemas/EntitlementValue'
           title: Entitlement Value
           readOnly: true
+        customer:
+          allOf:
+            - $ref: '#/components/schemas/Customer'
+          title: Customer
+          readOnly: true
         threshold:
           allOf:
             - $ref: '#/components/schemas/NotificationRuleBalanceThresholdValue'
@@ -19598,6 +19603,11 @@ components:
             - $ref: '#/components/schemas/EntitlementValue'
           title: Entitlement Value
           readOnly: true
+        customer:
+          allOf:
+            - $ref: '#/components/schemas/Customer'
+          title: Customer
+          readOnly: true
       description: Base data for any payload with entitlement entitlement value.
     NotificationEventInvoiceCreatedPayload:
       type: object

api/openapi.yaml

@@ -20203,6 +20203,11 @@ components:
             - $ref: '#/components/schemas/EntitlementValue'
           title: Entitlement Value
           readOnly: true
+        customer:
+          allOf:
+            - $ref: '#/components/schemas/Customer'
+          title: Customer
+          readOnly: true
         threshold:
           allOf:
             - $ref: '#/components/schemas/NotificationRuleBalanceThresholdValue'
@@ -20285,6 +20290,11 @@ components:
             - $ref: '#/components/schemas/EntitlementValue'
           title: Entitlement Value
           readOnly: true
+        customer:
+          allOf:
+            - $ref: '#/components/schemas/Customer'
+          title: Customer
+          readOnly: true
       description: Base data for any payload with entitlement entitlement value.
     NotificationEventInvoiceCreatedPayload:
       type: object

api/spec/src/notification/entitlements.tsp

@@ -63,6 +63,10 @@ model NotificationEventEntitlementValuePayloadBase {
   @visibility(Lifecycle.Read)
   @summary("Entitlement Value")
   value: OpenMeter.Entitlements.EntitlementValue;
+
+  @visibility(Lifecycle.Read)
+  @summary("Customer")
+  customer?: OpenMeter.Customer.Customer;
 }
 
 /**

openmeter/notification/consumer/entitlementbalancethreshold.go

@@ -15,6 +15,7 @@ import (
 	"golang.org/x/exp/slices"
 
 	"github.com/openmeterio/openmeter/api"
+	customerhttpdriver "github.com/openmeterio/openmeter/openmeter/customer/httpdriver"
 	"github.com/openmeterio/openmeter/openmeter/entitlement"
 	entitlementdriver "github.com/openmeterio/openmeter/openmeter/entitlement/driver"
 	"github.com/openmeterio/openmeter/openmeter/entitlement/snapshot"
@@ -201,6 +202,15 @@ func (b *EntitlementSnapshotHandler) createEvent(ctx context.Context, in createB
 		annotations[notification.AnnotationEventFeatureID] = in.Snapshot.Feature.ID
 	}
 
+	var cus api.Customer
+
+	if in.Snapshot.Customer != nil {
+		cus, err = customerhttpdriver.CustomerToAPI(*in.Snapshot.Customer, nil, nil)
+		if err != nil {
+			return fmt.Errorf("failed to map customer to API: %w", err)
+		}
+	}
+
 	_, err = b.Notification.CreateEvent(ctx, notification.CreateEventInput{
 		NamespacedModel: models.NamespacedModel{
 			Namespace: in.Snapshot.Namespace.ID,
@@ -216,6 +226,7 @@ func (b *EntitlementSnapshotHandler) createEvent(ctx context.Context, in createB
 					Entitlement: *entitlementAPIEntity,
 					Feature:     productcatalogdriver.MapFeatureToResponse(in.Snapshot.Feature),
 					Subject:     subjecthttphandler.FromSubject(in.Snapshot.Subject),
+					Customer:    lo.EmptyableToPtr(cus),
 					Value:       (api.EntitlementValue)(*in.Snapshot.Value),
 				},
 				Threshold: in.Threshold,

openmeter/notification/consumer/entitlementreset.go

@@ -9,6 +9,7 @@ import (
 	"golang.org/x/exp/slices"
 
 	"github.com/openmeterio/openmeter/api"
+	customerhttpdriver "github.com/openmeterio/openmeter/openmeter/customer/httpdriver"
 	entitlementdriver "github.com/openmeterio/openmeter/openmeter/entitlement/driver"
 	"github.com/openmeterio/openmeter/openmeter/entitlement/snapshot"
 	"github.com/openmeterio/openmeter/openmeter/notification"
@@ -114,6 +115,15 @@ func (b *EntitlementSnapshotHandler) createResetEvent(ctx context.Context, in cr
 		annotations[notification.AnnotationEventFeatureID] = in.Snapshot.Feature.ID
 	}
 
+	var cus api.Customer
+
+	if in.Snapshot.Customer != nil {
+		cus, err = customerhttpdriver.CustomerToAPI(*in.Snapshot.Customer, nil, nil)
+		if err != nil {
+			return fmt.Errorf("failed to map customer to API: %w", err)
+		}
+	}
+
 	_, err = b.Notification.CreateEvent(ctx, notification.CreateEventInput{
 		NamespacedModel: models.NamespacedModel{
 			Namespace: in.Snapshot.Namespace.ID,
@@ -128,6 +138,7 @@ func (b *EntitlementSnapshotHandler) createResetEvent(ctx context.Context, in cr
 				Entitlement: *entitlementAPIEntity,
 				Feature:     productcatalogdriver.MapFeatureToResponse(in.Snapshot.Feature),
 				Subject:     subjecthttphandler.FromSubject(in.Snapshot.Subject),
+				Customer:    lo.EmptyableToPtr(cus),
 				Value:       (api.EntitlementValue)(*in.Snapshot.Value),
 			},
 		},

openmeter/notification/entitlements.go

@@ -17,6 +17,7 @@ type EntitlementValuePayloadBase struct {
 	Feature     api.Feature            `json:"feature"`
 	Subject     api.Subject            `json:"subject"`
 	Value       api.EntitlementValue   `json:"value"`
+	Customer    *api.Customer          `json:"customer,omitempty"`
 }
 
 type BalanceThresholdPayload struct {

openmeter/notification/httpdriver/mapping.go

@@ -530,17 +530,12 @@ func FromEventAsBalanceThresholdPayload(e notification.Event) (api.NotificationE
 		Id:        e.ID,
 		Timestamp: e.CreatedAt,
 		Type:      api.NotificationEventBalanceThresholdPayloadTypeEntitlementsBalanceThreshold,
-		Data: struct {
-			Entitlement api.EntitlementMetered                    `json:"entitlement"`
-			Feature     api.Feature                               `json:"feature"`
-			Subject     api.Subject                               `json:"subject"`
-			Threshold   api.NotificationRuleBalanceThresholdValue `json:"threshold"`
-			Value       api.EntitlementValue                      `json:"value"`
-		}{
+		Data: api.NotificationEventBalanceThresholdPayloadData{
 			Value:       e.Payload.BalanceThreshold.Value,
 			Entitlement: e.Payload.BalanceThreshold.Entitlement,
 			Feature:     e.Payload.BalanceThreshold.Feature,
 			Subject:     e.Payload.BalanceThreshold.Subject,
+			Customer:    e.Payload.BalanceThreshold.Customer,
 			Threshold:   e.Payload.BalanceThreshold.Threshold,
 		},
 	}, nil
@@ -560,6 +555,7 @@ func FromEventAsEntitlementResetPayload(e notification.Event) (api.NotificationE
 			Entitlement: e.Payload.EntitlementReset.Entitlement,
 			Feature:     e.Payload.EntitlementReset.Feature,
 			Subject:     e.Payload.EntitlementReset.Subject,
+			Customer:    e.Payload.BalanceThreshold.Customer,
 		},
 	}, nil
 }