Merge pull request #13 from GoLedgerDev/develop

Add support for generic JSON objects as asset property: @object

assets/dataType.go

@@ -1,8 +1,10 @@
 package assets
 
 import (
+	"encoding/json"
 	"fmt"
 	"math"
+	"net/http"
 	"strconv"
 	"time"
 
@@ -158,4 +160,33 @@ var dataTypeMap = map[string]*DataType{
 			return dataTime.Format(time.RFC3339), dataTime, nil
 		},
 	},
+	"@object": {
+		AcceptedFormats: []string{"@object"},
+		Parse: func(data interface{}) (string, interface{}, errors.ICCError) {
+			dataVal, ok := data.(map[string]interface{})
+			if !ok {
+				switch v := data.(type) {
+				case []byte:
+					err := json.Unmarshal(v, &dataVal)
+					if err != nil {
+						return "", nil, errors.WrapErrorWithStatus(err, "failed to unmarshal []byte into map[string]interface{}", http.StatusBadRequest)
+					}
+				case string:
+					err := json.Unmarshal([]byte(v), &dataVal)
+					if err != nil {
+						return "", nil, errors.WrapErrorWithStatus(err, "failed to unmarshal string into map[string]interface{}", http.StatusBadRequest)
+					}
+				default:
+					return "", nil, errors.NewCCError(fmt.Sprintf("asset property must be either a byte array or a string, but received type is: %T", data), http.StatusBadRequest)
+				}
+			}
+
+			retVal, err := json.Marshal(dataVal)
+			if err != nil {
+				return "", nil, errors.WrapErrorWithStatus(err, "failed to marshal return value", http.StatusInternalServerError)
+			}
+
+			return string(retVal), dataVal, nil
+		},
+	},
 }

test/chaincode_test.go

@@ -65,6 +65,12 @@ var testAssetList = []assets.AssetType{
 				DefaultValue: 0,
 				DataType:     "number",
 			},
+			{
+				// Generic JSON object
+				Tag:      "info",
+				Label:    "Other Info",
+				DataType: "@object",
+			},
 		},
 	},
 	{

test/tx_createAsset_test.go

@@ -16,6 +16,9 @@ func TestCreateAsset(t *testing.T) {
 		"@assetType": "person",
 		"name":       "Maria",
 		"id":         "318.207.920-48",
+		"info": map[string]interface{}{
+			"passport": "1234",
+		},
 	}
 	req := map[string]interface{}{
 		"asset": []map[string]interface{}{person},
@@ -39,6 +42,9 @@ func TestCreateAsset(t *testing.T) {
 		"name":         "Maria",
 		"id":           "31820792048",
 		"height":       0.0,
+		"info": map[string]interface{}{
+			"passport": "1234",
+		},
 	}
 
 	if res.GetStatus() != 200 {

test/tx_getDataTypes_test.go

@@ -45,6 +45,12 @@ func TestGetDataTypes(t *testing.T) {
 			},
 			"DropDownValues": nil,
 		},
+		"@object": map[string]interface{}{
+			"acceptedFormats": []interface{}{
+				"@object",
+			},
+			"DropDownValues": nil,
+		},
 	}
 	err := invokeAndVerify(stub, "getDataTypes", nil, expectedResponse, 200)
 	if err != nil {

test/tx_getSchema_test.go

@@ -99,6 +99,16 @@ func TestGetSchema(t *testing.T) {
 				"tag":          "height",
 				"writers":      nil,
 			},
+			map[string]interface{}{
+				"dataType":    "@object",
+				"description": "",
+				"isKey":       false,
+				"label":       "Other Info",
+				"readOnly":    false,
+				"required":    false,
+				"tag":         "info",
+				"writers":     nil,
+			},
 		},
 	}
 	err = invokeAndVerify(stub, "getSchema", req, expectedPersonSchema, 200)

test/tx_updateAsset_test.go

@@ -39,6 +39,7 @@ func TestUpdateAsset(t *testing.T) {
 		"id":          "318.207.920-48",
 		"dateOfBirth": "1999-05-06T22:12:41Z",
 		"height":      1.66,
+		"info":        map[string]interface{}{},
 	}
 
 	req := map[string]interface{}{