feat(taxcode): add annotations to update

Author: borbelyr-kong

api/v3/handlers/taxcodes/convert.go

@@ -27,6 +27,7 @@ var (
 	// goverter:context namespacedID
 	// goverter:map NamespacedID | ResolveNamespacedIDFromContext
 	// goverter:map Labels Metadata
+	// goverter:ignore Annotations
 	ConvertFromUpsertTaxCodeRequestToUpdateTaxCodeInput func(namespacedID models.NamespacedID, upsertTaxCodeRequest api.UpsertTaxCodeRequest) (taxcode.UpdateTaxCodeInput, error)
 
 	// goverter:map . Labels | ConvertTaxCodeToLabels

openmeter/taxcode/adapter/taxcode.go

@@ -58,7 +58,8 @@ func (a *adapter) UpdateTaxCode(ctx context.Context, input taxcode.UpdateTaxCode
 			Where(taxcodedb.DeletedAtIsNil()).
 			SetName(input.Name).
 			SetNillableDescription(input.Description).
-			SetMetadata(input.Metadata)
+			SetMetadata(input.Metadata).
+			SetAnnotations(input.Annotations)
 
 		if len(input.AppMappings) > 0 {
 			query = query.SetAppMappings(&input.AppMappings)

openmeter/taxcode/service.go

@@ -68,6 +68,7 @@ type UpdateTaxCodeInput struct {
 	Description *string
 	AppMappings TaxCodeAppMappings
 	Metadata    models.Metadata
+	Annotations models.Annotations
 }
 
 func (i UpdateTaxCodeInput) Validate() error {

openmeter/taxcode/service/taxcode.go

@@ -110,9 +110,6 @@ func (s *service) GetOrCreateByAppMapping(ctx context.Context, input taxcode.Get
 			AppMappings: taxcode.TaxCodeAppMappings{
 				{AppType: input.AppType, TaxCode: input.TaxCode},
 			},
-			Annotations: models.Annotations{
-				taxcode.AnnotationKeyManagedBy: taxcode.AnnotationValueManagedBySystem,
-			},
 		})
 		if err != nil {
 			// Another request may have created it concurrently.

openmeter/taxcode/service/taxcode_test.go

@@ -6,7 +6,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/openmeterio/openmeter/openmeter/app"
 	"github.com/openmeterio/openmeter/openmeter/taxcode"
 	taxcodetestutils "github.com/openmeterio/openmeter/openmeter/taxcode/testutils"
 	"github.com/openmeterio/openmeter/openmeter/testutils"
@@ -21,11 +20,15 @@ func TestTaxCodeService(t *testing.T) {
 	ns := testutils.NameGenerator.Generate().Key
 
 	t.Run("SystemManaged", func(t *testing.T) {
-		// Create a system-managed tax code via GetOrCreateByAppMapping.
-		tc, err := env.Service.GetOrCreateByAppMapping(t.Context(), taxcode.GetOrCreateByAppMappingInput{
+		// Create a system-managed tax code by explicitly setting the annotation.
+		name := testutils.NameGenerator.Generate()
+		tc, err := env.Service.CreateTaxCode(t.Context(), taxcode.CreateTaxCodeInput{
 			Namespace: ns,
-			AppType:   app.AppTypeStripe,
-			TaxCode:   "txcd_99999999",
+			Key:       name.Key,
+			Name:      name.Name,
+			Annotations: models.Annotations{
+				taxcode.AnnotationKeyManagedBy: taxcode.AnnotationValueManagedBySystem,
+			},
 		})
 		require.NoError(t, err)
 		assert.True(t, tc.IsManagedBySystem())
@@ -73,6 +76,20 @@ func TestTaxCodeService(t *testing.T) {
 			assert.Equal(t, "updated name", updated.Name)
 		})
 
+		t.Run("UpdateAnnotationsSucceeds", func(t *testing.T) {
+			updated, err := env.Service.UpdateTaxCode(t.Context(), taxcode.UpdateTaxCodeInput{
+				NamespacedID: models.NamespacedID{Namespace: ns, ID: tc.ID},
+				Name:         tc.Name,
+				Annotations: models.Annotations{
+					taxcode.AnnotationKeyManagedBy: taxcode.AnnotationValueManagedBySystem,
+					"schema_version":               1,
+				},
+			})
+			require.NoError(t, err)
+			assert.True(t, updated.IsManagedBySystem())
+			assert.Equal(t, float64(1), updated.Annotations["schema_version"])
+		})
+
 		t.Run("DeleteSucceeds", func(t *testing.T) {
 			// Create a fresh one to delete (the one above was updated, still valid).
 			name2 := testutils.NameGenerator.Generate()