fix uint mapping in entity key (#78)

s7techlab · Nov 15, 2021 · ce2a4c0 · ce2a4c0
1 parent d43b186
commit ce2a4c0
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 29 deletions.
diff --git a/state/mapping/mapping_test.go b/state/mapping/mapping_test.go
@@ -1,6 +1,7 @@
 package mapping_test
 
 import (
+	"strconv"
 	"strings"
 	"testing"
 	"time"
@@ -71,7 +72,7 @@ var _ = Describe(`State mapping in chaincode`, func() {
 			Expect(err).NotTo(HaveOccurred())
 			Expect(key).To(Equal(
 				testdata.EntityCompositeIdNamespace.Append(
-					state.Key{create1.IdFirstPart, create1.IdSecondPart, testdata.Dates[0]})))
+					state.Key{create1.IdFirstPart, strconv.Itoa(int(create1.IdSecondPart)), testdata.Dates[0]})))
 		})
 
 		It("Allow to add data to chaincode state", func(done Done) {

diff --git a/state/mapping/state_mapping_opt.go b/state/mapping/state_mapping_opt.go
@@ -3,6 +3,7 @@ package mapping
 import (
 	"fmt"
 	"reflect"
+	"strconv"
 	"strings"
 
 	"github.com/golang/protobuf/proto"
@@ -249,12 +250,17 @@ func keysFromValue(v reflect.Value) ([]state.Key, error) {
 func keyFromValue(v reflect.Value) (state.Key, error) {
 	switch v.Kind() {
 
-	// enum in protobuf
-	case reflect.Int32:
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		return state.Key{strconv.Itoa(int(v.Uint()))}, nil
+
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		// if it is enum in protobuf
 		if stringer, ok := v.Interface().(fmt.Stringer); ok {
 			return state.Key{stringer.String()}, nil
 		}
 
+		return state.Key{strconv.Itoa(int(v.Int()))}, nil
+
 	case reflect.Ptr:
 		// todo: extract key producer and add custom serializers
 		switch val := v.Interface().(type) {
@@ -290,7 +296,7 @@ func keyFromValue(v reflect.Value) (state.Key, error) {
 
 	switch v.Type().String() {
 
-	case `string`, `int32`, `bool`:
+	case `string`, `int32`, `uint32`, `bool`:
 		// multi key possible
 		return state.Key{v.String()}, nil
 

diff --git a/state/mapping/testdata/schema/with_composite_id.pb.go b/state/mapping/testdata/schema/with_composite_id.pb.go
diff --git a/state/mapping/testdata/schema/with_composite_id.proto b/state/mapping/testdata/schema/with_composite_id.proto
@@ -6,7 +6,7 @@ import "google/protobuf/timestamp.proto";
 // EntityWithCompositeId
 message EntityWithCompositeId {
     string id_first_part = 1; // part of composite primary key
-    string id_second_part = 2; // part of composite primary key
+    uint32 id_second_part = 2; // part of composite primary key
     google.protobuf.Timestamp id_third_part = 3; // part of composite primary key
 
     string name = 4;
@@ -16,7 +16,7 @@ message EntityWithCompositeId {
 // EntityCompositeId - container for composite primary key
 message EntityCompositeId {
     string id_first_part = 1;
-    string id_second_part = 2;
+    uint32 id_second_part = 2;
     google.protobuf.Timestamp id_third_part = 3;
 }
 
@@ -28,7 +28,7 @@ message EntityWithCompositeIdList {
 // CreateEntityWithCompositeId
 message CreateEntityWithCompositeId {
     string id_first_part = 1;
-    string id_second_part = 2;
+    uint32 id_second_part = 2;
     google.protobuf.Timestamp id_third_part = 3;
     string name = 4;
     int32 value = 5;
@@ -37,7 +37,7 @@ message CreateEntityWithCompositeId {
 // UpdateEntityWithCompositeId
 message UpdateEntityWithCompositeId {
     string id_first_part = 1;
-    string id_second_part = 2;
+    uint32 id_second_part = 2;
     google.protobuf.Timestamp id_third_part = 3;
     string name = 4;
     int32 value = 5;

diff --git a/state/mapping/testdata/testdata.go b/state/mapping/testdata/testdata.go
@@ -18,19 +18,19 @@ var (
 
 	CreateEntityWithCompositeId = []*schema.CreateEntityWithCompositeId{{
 		IdFirstPart:  "A",
-		IdSecondPart: "1",
+		IdSecondPart: 1,
 		IdThirdPart:  testing.MustTime(Dates[0] + `T00:00:00Z`),
 		Name:         "Lorem",
 		Value:        1,
 	}, {
 		IdFirstPart:  "B",
-		IdSecondPart: "1",
+		IdSecondPart: 1,
 		IdThirdPart:  testing.MustTime(Dates[1] + `T00:00:00Z`),
 		Name:         "Ipsum",
 		Value:        2,
 	}, {
 		IdFirstPart:  "B",
-		IdSecondPart: "2",
+		IdSecondPart: 2,
 		IdThirdPart:  testing.MustTime(Dates[2] + `T00:00:00Z`),
 		Name:         "Dolor",
 		Value:        3,