v0.11.x backport: Fix querying transfers by tx or type, batches by tx

docs/swagger/swagger.yaml

@@ -5581,6 +5581,21 @@ paths:
         name: tokenindex
         schema:
           type: string
+      - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^'
+        in: query
+        name: tx.id
+        schema:
+          type: string
+      - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^'
+        in: query
+        name: tx.type
+        schema:
+          type: string
+      - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^'
+        in: query
+        name: type
+        schema:
+          type: string
       - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^'
         in: query
         name: uri
@@ -6954,6 +6969,21 @@ paths:
         name: tokenindex
         schema:
           type: string
+      - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^'
+        in: query
+        name: tx.id
+        schema:
+          type: string
+      - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^'
+        in: query
+        name: tx.type
+        schema:
+          type: string
+      - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^'
+        in: query
+        name: type
+        schema:
+          type: string
       - description: 'Data filter field. Prefixes supported: > >= < <= @ ^ ! !@ !^'
         in: query
         name: uri

internal/database/sqlcommon/batch_sql.go

@@ -1,4 +1,4 @@
-// Copyright © 2021 Kaleido, Inc.
+// Copyright © 2022 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -45,12 +45,12 @@ var (
 		"node_id",
 	}
 	batchFilterFieldMap = map[string]string{
-		"type":             "btype",
-		"payloadref":       "payload_ref",
-		"transaction.type": "tx_type",
-		"transaction.id":   "tx_id",
-		"group":            "group_hash",
-		"node":             "node_id",
+		"type":       "btype",
+		"payloadref": "payload_ref",
+		"tx.type":    "tx_type",
+		"tx.id":      "tx_id",
+		"group":      "group_hash",
+		"node":       "node_id",
 	}
 )
 

internal/database/sqlcommon/tokentransfer_sql.go

@@ -1,4 +1,4 @@
-// Copyright © 2021 Kaleido, Inc.
+// Copyright © 2022 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -48,16 +48,16 @@ var (
 		"created",
 	}
 	tokenTransferFilterFieldMap = map[string]string{
-		"localid":          "local_id",
-		"pool":             "pool_id",
-		"tokenindex":       "token_index",
-		"from":             "from_key",
-		"to":               "to_key",
-		"protocolid":       "protocol_id",
-		"message":          "message_id",
-		"messagehash":      "message_hash",
-		"transaction.type": "tx_type",
-		"transaction.id":   "tx_id",
+		"localid":     "local_id",
+		"pool":        "pool_id",
+		"tokenindex":  "token_index",
+		"from":        "from_key",
+		"to":          "to_key",
+		"protocolid":  "protocol_id",
+		"message":     "message_id",
+		"messagehash": "message_hash",
+		"tx.type":     "tx_type",
+		"tx.id":       "tx_id",
 	}
 )
 

pkg/database/plugin.go

@@ -1,4 +1,4 @@
-// Copyright © 2021 Kaleido, Inc.
+// Copyright © 2022 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -808,6 +808,7 @@ var TokenBalanceQueryFactory = &queryFields{
 
 // TokenTransferQueryFactory filter fields for token transfers
 var TokenTransferQueryFactory = &queryFields{
+	"type":        &StringField{},
 	"localid":     &StringField{},
 	"pool":        &UUIDField{},
 	"tokenindex":  &StringField{},
@@ -822,4 +823,6 @@ var TokenTransferQueryFactory = &queryFields{
 	"message":     &UUIDField{},
 	"messagehash": &Bytes32Field{},
 	"created":     &TimeField{},
+	"tx.type":     &StringField{},
+	"tx.id":       &UUIDField{},
 }