refactored API and fixes (#51)

* ignore case Signed-off-by: vadiminshakov <[email protected]> * fix example Signed-off-by: vadiminshakov <[email protected]> * fix test case Signed-off-by: vadiminshakov <[email protected]> * fix REST API test Signed-off-by: vadiminshakov <[email protected]> * Fix CI (#47) * remove log msg Signed-off-by: vadiminshakov <[email protected]> * trigger CI on push && PR to 1.x, 2.x branches Signed-off-by: vadiminshakov <[email protected]> * new example request Signed-off-by: vadiminshakov <[email protected]> * handle nil and null block values Signed-off-by: vadiminshakov <[email protected]> * add test case for querying all db entries Signed-off-by: vadiminshakov <[email protected]> * del Explore, add GetRange rpc Signed-off-by: vadiminshakov <[email protected]> * increment go version Signed-off-by: vadiminshakov <[email protected]> * add handler for GerRange rpc, handle case of querying all Signed-off-by: vadiminshakov <[email protected]> * vendor chaincode before integration tests Signed-off-by: vadiminshakov <[email protected]> * ignore case Signed-off-by: vadiminshakov <[email protected]> * fix example Signed-off-by: vadiminshakov <[email protected]> * fix test case Signed-off-by: vadiminshakov <[email protected]> * fix REST API test Signed-off-by: vadiminshakov <[email protected]> * add test case for querying all db entries Signed-off-by: vadiminshakov <[email protected]>
hyperledger-labs · Jun 3, 2020 · 66b27f3 · 66b27f3
1 parent 27bbe13
commit 66b27f3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/client/example/client.go b/client/example/client.go
@@ -20,6 +20,7 @@ import (
 	"fmt"
 	fabcli "github.com/hyperledger-labs/fabex/client"
 	"github.com/hyperledger-labs/fabex/helpers"
+	pb "github.com/hyperledger-labs/fabex/proto"
 	"log"
 )
 
@@ -42,9 +43,9 @@ func main() {
 
 	//txs, err := client.GetRange(1, 15)
 	//txs, err := client.Get(&pb.Entry{Txid:"3a3e933a3d9953b0b10e6573254b6d3cf2347d72058c0347a55054babdd8e1a1"})
-	//txs, err := client.Get(&pb.Entry{Payload: "WriteSet"})
-	//txs, err := client.Get(&pb.Entry{Blocknum: 5})
-	txs, err := client.Get(nil)
+	//txs, err := client.Get(&pb.Entry{Payload: "car0"})
+	//txs, err := client.Get(nil)
+	txs, err := client.Get(&pb.Entry{Blocknum: 5})
 	if err != nil {
 		log.Fatal(err)
 	}

diff --git a/client/fabex_client_test.go b/client/fabex_client_test.go
@@ -144,7 +144,13 @@ func TestGet(t *testing.T) {
 	}
 	assert.Greater(t, len(txs), 0, "No transactions found")
 
-	txs, err = fabcli.Get(&pb.Entry{Payload: "WriteSet"})
+	txs, err = fabcli.Get(&pb.Entry{Payload: "car0"})
+	if err != nil {
+		t.Errorf(err.Error())
+	}
+	assert.Greater(t, len(txs), 0, "No transactions found")
+
+	txs, err = fabcli.Get(nil)
 	if err != nil {
 		t.Errorf(err.Error())
 	}

diff --git a/db/mongodb.go b/db/mongodb.go
@@ -111,7 +111,7 @@ func (db *DBmongo) GetByBlocknum(blocknum uint64) ([]Tx, error) {
 }
 
 func (db *DBmongo) GetBlockInfoByPayload(payload string) ([]Tx, error) {
-	return db.getByFilter(bson.D{{"Payload", primitive.Regex{Pattern: payload, Options: ""}}})
+	return db.getByFilter(bson.D{{"Payload", primitive.Regex{Pattern: payload, Options: "i"}}})
 }
 
 func (db *DBmongo) QueryAll() ([]Tx, error) {

diff --git a/rest/router_test.go b/rest/router_test.go
@@ -170,7 +170,7 @@ func TestEndpoints(t *testing.T) {
 	})
 
 	t.Run("bykey", func(t *testing.T) {
-		resp, err := http.Get("http://localhost:5252/bykey/WriteSet")
+		resp, err := http.Get("http://localhost:5252/bykey/car0")
 		if err != nil {
 			t.Errorf(err.Error())
 		}