Fix handling of multiple formats of contextual metadata

Author: kjarmicki-cloudinary

api/admin/asset.go

@@ -6,6 +6,7 @@ package admin
 
 import (
 	"context"
+	"encoding/json"
 	"time"
 
 	"github.com/cloudinary/cloudinary-go/v2/api"
@@ -148,6 +149,38 @@ type AssetContextResult struct {
 	Custom map[string]string `json:"custom"`
 }
 
+func (m *AssetContextResult) UnmarshalJSON(data []byte) error {
+	// map format
+	var mapData struct {
+		Custom map[string]string `json:"custom"`
+	}
+	if err := json.Unmarshal(data, &mapData); err == nil {
+		*m = AssetContextResult{
+			Custom: mapData.Custom,
+		}
+		return nil
+	}
+
+	// array format
+	var arrayData []struct {
+		Key   string `json:"key"`
+		Value string `json:"value"`
+	}
+	if err := json.Unmarshal(data, &arrayData); err != nil {
+		return err
+	}
+
+	result := AssetContextResult{
+		Custom: make(map[string]string),
+	}
+	for _, item := range arrayData {
+		result.Custom[item.Key] = item.Value
+	}
+	*m = result
+
+	return nil
+}
+
 // UpdateAssetParams are the parameters for UpdateAsset.
 type UpdateAssetParams struct {
 	AssetType         api.AssetType        `json:"-"`

api/admin/asset_acceptance_test.go

@@ -6,12 +6,13 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/cloudinary/cloudinary-go/v2/api"
-	"github.com/cloudinary/cloudinary-go/v2/api/admin"
-	"github.com/cloudinary/cloudinary-go/v2/internal/cldtest"
 	"net/url"
 	"reflect"
 	"testing"
+
+	"github.com/cloudinary/cloudinary-go/v2/api"
+	"github.com/cloudinary/cloudinary-go/v2/api/admin"
+	"github.com/cloudinary/cloudinary-go/v2/internal/cldtest"
 )
 
 // Acceptance test cases for `asset` method
@@ -95,6 +96,86 @@ func getAssetTestCases() []AdminAPIAcceptanceTestCase {
 	},
 	)
 
+	// Test case for AssetContextResult with map format
+	assetWithMapContext := admin.AssetResult{
+		AssetID:  "1",
+		PublicID: cldtest.PublicID,
+		Context: admin.AssetContextResult{
+			Custom: map[string]string{
+				"key1": "value1",
+				"key2": "value2",
+			},
+		},
+	}
+	responseJsonMapContext, _ := json.Marshal(assetWithMapContext)
+
+	testCases = append(testCases, AdminAPIAcceptanceTestCase{
+		Name: "Asset response with context in map format",
+		RequestTest: func(api *admin.API, ctx context.Context) (interface{}, error) {
+			return api.Asset(ctx, admin.AssetParams{PublicID: cldtest.PublicID})
+		},
+		ResponseTest: func(response interface{}, t *testing.T) {
+			v, ok := response.(*admin.AssetResult)
+			if !ok {
+				t.Errorf("Response should be type of AssetResult, %s given", reflect.TypeOf(response))
+			}
+			v.Response = nil // omit raw response comparison
+			if !reflect.DeepEqual(*v, assetWithMapContext) {
+				t.Errorf("Response asset should be %v, %v given", assetWithMapContext, *v)
+			}
+		},
+		ExpectedRequest: cldtest.ExpectedRequestParams{
+			Method: "GET",
+			URI:    "/resources/image/upload/" + cldtest.PublicID,
+		},
+		JsonResponse:      string(responseJsonMapContext),
+		ExpectedCallCount: 1,
+	})
+
+	// Test case for AssetContextResult with array format
+	// The JSON response will have context as an array, but the parsed result should be the same
+	assetWithArrayContext := admin.AssetResult{
+		AssetID:  "1",
+		PublicID: cldtest.PublicID,
+		Context: admin.AssetContextResult{
+			Custom: map[string]string{
+				"key1": "value1",
+				"key2": "value2",
+			},
+		},
+	}
+	responseJsonArrayContext, _ := json.Marshal(map[string]interface{}{
+		"asset_id":  "1",
+		"public_id": cldtest.PublicID,
+		"context": []map[string]string{
+			{"key": "key1", "value": "value1"},
+			{"key": "key2", "value": "value2"},
+		},
+	})
+
+	testCases = append(testCases, AdminAPIAcceptanceTestCase{
+		Name: "Asset response with context in array format",
+		RequestTest: func(api *admin.API, ctx context.Context) (interface{}, error) {
+			return api.Asset(ctx, admin.AssetParams{PublicID: cldtest.PublicID})
+		},
+		ResponseTest: func(response interface{}, t *testing.T) {
+			v, ok := response.(*admin.AssetResult)
+			if !ok {
+				t.Errorf("Response should be type of AssetResult, %s given", reflect.TypeOf(response))
+			}
+			v.Response = nil // omit raw response comparison
+			if !reflect.DeepEqual(*v, assetWithArrayContext) {
+				t.Errorf("Response asset should be %v, %v given", assetWithArrayContext, *v)
+			}
+		},
+		ExpectedRequest: cldtest.ExpectedRequestParams{
+			Method: "GET",
+			URI:    "/resources/image/upload/" + cldtest.PublicID,
+		},
+		JsonResponse:      string(responseJsonArrayContext),
+		ExpectedCallCount: 1,
+	})
+
 	return testCases
 }