feat(api): add annotations to customer

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

@@ -3674,6 +3674,11 @@ export interface components {
        *     Only with the `subscriptions` expand option.
        */
       readonly subscriptions?: components['schemas']['Subscription'][]
+      /**
+       * Annotations
+       * @description Set of key-value pairs managed by the system. Cannot be modified by user.
+       */
+      readonly annotations?: components['schemas']['Annotations']
     }
     /** @description CustomerAccess describes what features the customer has access to. */
     CustomerAccess: {

api/openapi.cloud.yaml

@@ -13342,6 +13342,12 @@ components:
             Only with the `subscriptions` expand option.
           title: Subscriptions
           readOnly: true
+        annotations:
+          allOf:
+            - $ref: '#/components/schemas/Annotations'
+          description: Set of key-value pairs managed by the system. Cannot be modified by user.
+          title: Annotations
+          readOnly: true
       description: A customer object.
       example:
         id: 01G65Z755AFWAKHE12NY0CQ9FH

api/openapi.yaml

@@ -13500,6 +13500,12 @@ components:
             Only with the `subscriptions` expand option.
           title: Subscriptions
           readOnly: true
+        annotations:
+          allOf:
+            - $ref: '#/components/schemas/Annotations'
+          description: Set of key-value pairs managed by the system. Cannot be modified by user.
+          title: Annotations
+          readOnly: true
       description: A customer object.
       example:
         id: 01G65Z755AFWAKHE12NY0CQ9FH

api/spec/src/customer.tsp

@@ -288,12 +288,17 @@ model Customer {
   /**
    * The subscriptions of the customer.
    * Only with the `subscriptions` expand option.
-   *
-   * @visibility(Lifecycle.Read)
    */
   @summary("Subscriptions")
   @visibility(Lifecycle.Read)
   subscriptions?: ProductCatalog.Subscription[];
+
+  /**
+   * Set of key-value pairs managed by the system. Cannot be modified by user.
+   */
+  @summary("Annotations")
+  @visibility(Lifecycle.Read)
+  annotations?: Annotations;
 }
 
 /**

openmeter/customer/adapter/customer.go

@@ -168,6 +168,10 @@ func (a *adapter) CreateCustomer(ctx context.Context, input customer.CreateCusto
 					query = query.SetMetadata(input.Metadata.ToMap())
 				}
 
+				if input.Annotation != nil {
+					query = query.SetAnnotations(*input.Annotation)
+				}
+
 				if input.BillingAddress != nil {
 					query = query.
 						SetNillableBillingAddressCity(input.BillingAddress.City).
@@ -445,6 +449,12 @@ func (a *adapter) UpdateCustomer(ctx context.Context, input customer.UpdateCusto
 					query = query.ClearMetadata()
 				}
 
+				if input.Annotation != nil {
+					query = query.SetAnnotations(*input.Annotation)
+				} else {
+					query = query.ClearAnnotations()
+				}
+
 				if input.BillingAddress != nil {
 					query = query.
 						SetNillableBillingAddressCity(input.BillingAddress.City).

openmeter/customer/adapter/entitymapping.go

@@ -26,6 +26,12 @@ func CustomerFromDBEntity(e db.Customer) (*customer.Customer, error) {
 		metadata = lo.ToPtr(models.NewMetadata(e.Metadata))
 	}
 
+	var annotations *models.Annotations
+
+	if len(e.Annotations) > 0 {
+		annotations = lo.ToPtr(e.Annotations)
+	}
+
 	result := &customer.Customer{
 		ManagedResource: models.NewManagedResource(models.ManagedResourceInput{
 			ID:          e.ID,
@@ -42,6 +48,7 @@ func CustomerFromDBEntity(e db.Customer) (*customer.Customer, error) {
 		PrimaryEmail: e.PrimaryEmail,
 		Currency:     e.Currency,
 		Metadata:     metadata,
+		Annotation:   annotations,
 	}
 
 	if e.Key != "" {

openmeter/customer/customer.go

@@ -21,6 +21,7 @@ type Customer struct {
 	Currency         *currencyx.Code          `json:"currency,omitempty"`
 	BillingAddress   *models.Address          `json:"billingAddress,omitempty"`
 	Metadata         *models.Metadata         `json:"metadata,omitempty"`
+	Annotation       *models.Annotations      `json:"annotations,omitempty"`
 }
 
 func (c Customer) Validate() error {
@@ -53,6 +54,7 @@ type CustomerMutate struct {
 	Currency         *currencyx.Code          `json:"currency"`
 	BillingAddress   *models.Address          `json:"billingAddress"`
 	Metadata         *models.Metadata         `json:"metadata"`
+	Annotation       *models.Annotations      `json:"annotations,omitempty"`
 }
 
 func (c CustomerMutate) Validate() error {

openmeter/customer/httpdriver/apimapping.go

@@ -79,13 +79,38 @@ func MapAddress(apiAddress *api.Address) *models.Address {
 	return &address
 }
 
-// CustomerToAPI converts a Customer to an API Customer
-func CustomerToAPI(c customer.Customer, subscriptions []subscription.Subscription, expand []api.CustomerExpand) (api.Customer, error) {
-	var metadata *api.Metadata
+func FromMetadata(metadata models.Metadata) *api.Metadata {
+	if len(metadata) == 0 {
+		return nil
+	}
+
+	result := make(api.Metadata)
+	if len(metadata) > 0 {
+		for k, v := range metadata {
+			result[k] = v
+		}
+	}
 
-	if c.Metadata != nil {
-		metadata = lo.ToPtr(c.Metadata.ToMap())
+	return &result
+}
+
+func FromAnnotations(annotations models.Annotations) *api.Annotations {
+	if len(annotations) == 0 {
+		return nil
 	}
+
+	result := make(api.Annotations)
+	if len(annotations) > 0 {
+		for k, v := range annotations {
+			result[k] = v
+		}
+	}
+
+	return &result
+}
+
+// CustomerToAPI converts a Customer to an API Customer
+func CustomerToAPI(c customer.Customer, subscriptions []subscription.Subscription, expand []api.CustomerExpand) (api.Customer, error) {
 	// Map the customer to the API Customer
 	apiCustomer := api.Customer{
 		Id:               c.ManagedResource.ID,
@@ -97,7 +122,8 @@ func CustomerToAPI(c customer.Customer, subscriptions []subscription.Subscriptio
 		CreatedAt:        c.CreatedAt,
 		UpdatedAt:        c.UpdatedAt,
 		DeletedAt:        c.DeletedAt,
-		Metadata:         metadata,
+		Metadata:         FromMetadata(lo.FromPtr(c.Metadata)),
+		Annotations:      FromAnnotations(lo.FromPtr(c.Annotation)),
 	}
 
 	if c.BillingAddress != nil {