static key for mapping (#69)

Author: vitiko

state/mapping/mapping_test.go

@@ -28,7 +28,7 @@ func TestState(t *testing.T) {
 }
 
 var (
-	compositeIDCC, complexIDCC, sliceIDCC, indexesCC *testcc.MockStub
+	compositeIDCC, complexIDCC, sliceIDCC, indexesCC, configCC *testcc.MockStub
 
 	Owner = identitytestdata.Certificates[0].MustIdentity(`SOME_MSP`)
 )
@@ -47,6 +47,9 @@ var _ = Describe(`Mapping`, func() {
 
 		indexesCC = testcc.NewMockStub(`indexes`, testdata.NewIndexesCC())
 		indexesCC.From(Owner).Init()
+
+		configCC = testcc.NewMockStub(`config`, testdata.NewCCWithConfig())
+		configCC.From(Owner).Init()
 	})
 
 	Describe(`Entity with composite id`, func() {
@@ -369,4 +372,26 @@ var _ = Describe(`Mapping`, func() {
 		})
 
 	})
+
+	Describe(`Entity with static key`, func() {
+		configSample := &schema.Config{
+			Field1: `aaa`,
+			Field2: `bbb`,
+		}
+
+		It("Disallow to get config before set", func() {
+			expectcc.ResponseError(configCC.Invoke(`configGet`), `state entry not found: Config | config`)
+		})
+
+		It("Allow to set config", func() {
+			expectcc.ResponseOk(configCC.Invoke(`configSet`, configSample))
+		})
+
+		It("Allow to get config", func() {
+			confFromCC := expectcc.PayloadIs(configCC.Invoke(`configGet`), &schema.Config{}).(*schema.Config)
+			Expect(confFromCC.Field1).To(Equal(configSample.Field1))
+			Expect(confFromCC.Field2).To(Equal(configSample.Field2))
+		})
+
+	})
 })

state/mapping/state_mapping_opt.go

@@ -16,13 +16,22 @@ const (
 	TimestampKeyLayout = `2006-01-02`
 )
 
-// StateNamespace sets namespace for mapping
-func StateNamespace(namespace state.Key) StateMappingOpt {
+// WithStateNamespace sets namespace for mapping
+func WithStateNamespace(namespace state.Key) StateMappingOpt {
 	return func(sm *StateMapping, smm StateMappings) {
 		sm.namespace = namespace
 	}
 }
 
+// WithStaticPKey set static key for all instances of mapped entry
+func WithStaticPKey(key state.Key) StateMappingOpt {
+	return func(sm *StateMapping, smm StateMappings) {
+		sm.primaryKeyer = func(_ interface{}) (state.Key, error) {
+			return key, nil
+		}
+	}
+}
+
 func KeyerFor(schema interface{}) StateMappingOpt {
 	return func(sm *StateMapping, smm StateMappings) {
 		sm.keyerForSchema = schema
@@ -99,7 +108,7 @@ func PKeySchema(pkeySchema interface{}) StateMappingOpt {
 		//add mapping for schema identifier
 		smm.Add(
 			pkeySchema,
-			StateNamespace(namespace),
+			WithStateNamespace(namespace),
 			PKeyAttr(attrs...),
 			KeyerFor(sm.schema))
 	}
@@ -131,7 +140,7 @@ func PKeyComplexId(pkeySchema interface{}) StateMappingOpt {
 	return func(sm *StateMapping, smm StateMappings) {
 		sm.primaryKeyer = attrsKeyer([]string{`Id`})
 		smm.Add(pkeySchema,
-			StateNamespace(SchemaNamespace(sm.schema)),
+			WithStateNamespace(SchemaNamespace(sm.schema)),
 			PKeyAttr(attrsFrom(pkeySchema)...),
 			KeyerFor(sm.schema))
 	}

state/mapping/testdata/cc_composite_id.go

@@ -14,7 +14,7 @@ var (
 	EntityCompositeIdNamespace        = state.Key{`entity-composite-id`}
 	EntityWithCompositeIdStateMapping = mapping.StateMappings{}.Add(&schema.EntityWithCompositeId{},
 		// explicit set namespace for primary key, otherwise namespace will be based of schema type string representation
-		mapping.StateNamespace(EntityCompositeIdNamespace),
+		mapping.WithStateNamespace(EntityCompositeIdNamespace),
 		//  schema for Primary Key
 		mapping.PKeySchema(&schema.EntityCompositeId{}),
 		mapping.List(&schema.EntityWithCompositeIdList{}))

state/mapping/testdata/cc_withconfig.go

@@ -0,0 +1,36 @@
+package testdata
+
+import (
+	"github.com/s7techlab/cckit/extensions/owner"
+	"github.com/s7techlab/cckit/router"
+	"github.com/s7techlab/cckit/router/param/defparam"
+	"github.com/s7techlab/cckit/state"
+	m "github.com/s7techlab/cckit/state/mapping"
+	"github.com/s7techlab/cckit/state/mapping/testdata/schema"
+)
+
+func NewCCWithConfig() *router.Chaincode {
+	r := router.New(`withConfig`)
+
+	// Mappings for chaincode state
+	r.Use(m.MapStates(m.StateMappings{}.
+		//key will be <`config`>
+		Add(&schema.Config{}, m.WithStaticPKey(state.Key{`config`}))))
+
+	r.Init(owner.InvokeSetFromCreator)
+
+	r.Group(`config`).
+		Invoke(`Set`, configSet, defparam.Proto(&schema.Config{})).
+		Invoke(`Get`, configGet)
+
+	return router.NewChaincode(r)
+}
+
+func configGet(c router.Context) (interface{}, error) {
+	return c.State().Get(&schema.Config{}, &schema.Config{})
+}
+
+func configSet(c router.Context) (interface{}, error) {
+	conf := c.Param()
+	return conf, c.State().Put(conf)
+}

state/mapping/testdata/schema/some_config.pb.go

@@ -0,0 +1,7 @@
+syntax = "proto3";
+package schema;
+
+message Config {
+    string field1 = 1;
+    string field2 = 2;
+}