Bug limit receipt selection when select by root 774 (#776)

* versi 1

* small edit

* update mock ExecuteSelect

* make sure the query is similar as mock

* make it simpler

* merge schema

Co-authored-by: Nawi Kartini <[email protected]>

Author: nawikart

common/query/nodeReceiptQuery.go

@@ -14,7 +14,7 @@ type (
 		InsertReceipt(receipt *model.Receipt) (str string, args []interface{})
 		InsertReceipts(receipts []*model.Receipt) (str string, args []interface{})
 		GetReceipts(paginate model.Pagination) string
-		GetReceiptByRoot(root []byte) (str string, args []interface{})
+		GetReceiptByRoot(lowerHeight, upperHeight uint32, root []byte) (str string, args []interface{})
 		GetReceiptsWithUniqueRecipient(limit, lowerBlockHeight, upperBlockHeight uint32) string
 		SelectReceipt(lowerHeight, upperHeight, limit uint32) (str string)
 		RemoveReceipts(blockHeight, limit uint32) (string, []interface{})
@@ -99,12 +99,14 @@ func (rq *NodeReceiptQuery) GetReceiptsWithUniqueRecipient(
 
 // GetReceiptByRoot return sql query to fetch receipts by its merkle root, the datum_hash should not already exists in
 // published_receipt table
-func (rq *NodeReceiptQuery) GetReceiptByRoot(root []byte) (str string, args []interface{}) {
+func (rq *NodeReceiptQuery) GetReceiptByRoot(
+	lowerHeight, upperHeight uint32, root []byte) (str string, args []interface{}) {
 	query := fmt.Sprintf("SELECT %s FROM %s AS rc WHERE rc.rmr = ? AND "+
 		"NOT EXISTS (SELECT datum_hash FROM published_receipt AS pr WHERE "+
-		"pr.datum_hash = rc.datum_hash AND pr.recipient_public_key = rc.recipient_public_key) "+
+		"pr.datum_hash = rc.datum_hash AND pr.recipient_public_key = rc.recipient_public_key AND "+
+		"block_height BETWEEN %d AND %d) "+
 		"GROUP BY recipient_public_key",
-		strings.Join(rq.Fields, ", "), rq.getTableName())
+		strings.Join(rq.Fields, ", "), rq.getTableName(), lowerHeight, upperHeight)
 	return query, []interface{}{
 		root,
 	}

common/schema

@@ -129,7 +129,7 @@ func (rs *ReceiptService) SelectReceipts(
 		var nodeReceipts []*model.Receipt
 
 		nodeReceipts, err = func() ([]*model.Receipt, error) {
-			nodeReceiptsQ, rootArgs := rs.NodeReceiptQuery.GetReceiptByRoot([]byte(linkedRoot))
+			nodeReceiptsQ, rootArgs := rs.NodeReceiptQuery.GetReceiptByRoot(lowerBlockHeight, lastBlockHeight, []byte(linkedRoot))
 			rows, err := rs.QueryExecutor.ExecuteSelect(nodeReceiptsQ, false, rootArgs...)
 			if err != nil {
 				return nil, err

core/service/receiptService.go

@@ -222,7 +222,8 @@ func (*mockQueryExecutorFailExecuteSelectReceipt) ExecuteSelect(
 	case "SELECT sender_public_key, recipient_public_key, datum_type, datum_hash, reference_block_height, " +
 		"reference_block_hash, rmr_linked, recipient_signature, rmr, rmr_index FROM node_receipt AS rc " +
 		"WHERE rc.rmr = ? AND NOT EXISTS (SELECT datum_hash FROM published_receipt AS pr WHERE " +
-		"pr.datum_hash = rc.datum_hash AND pr.recipient_public_key = rc.recipient_public_key) " +
+		"pr.datum_hash = rc.datum_hash AND pr.recipient_public_key = rc.recipient_public_key AND " +
+		"block_height BETWEEN 280 AND 1000) " +
 		"GROUP BY recipient_public_key":
 		return nil, errors.New("mockError")
 	}
@@ -251,7 +252,8 @@ func (*mockQueryExecutorSuccessOneLinkedReceipts) ExecuteSelect(
 	case "SELECT sender_public_key, recipient_public_key, datum_type, datum_hash, reference_block_height, " +
 		"reference_block_hash, rmr_linked, recipient_signature, rmr, rmr_index FROM node_receipt AS rc " +
 		"WHERE rc.rmr = ? AND NOT EXISTS (SELECT datum_hash FROM published_receipt AS pr WHERE " +
-		"pr.datum_hash = rc.datum_hash AND pr.recipient_public_key = rc.recipient_public_key) " +
+		"pr.datum_hash = rc.datum_hash AND pr.recipient_public_key = rc.recipient_public_key AND " +
+		"block_height BETWEEN 280 AND 1000) " +
 		"GROUP BY recipient_public_key":
 		mock.ExpectQuery(regexp.QuoteMeta(qe)).WillReturnRows(sqlmock.NewRows([]string{
 			"sender_public_key",
@@ -464,7 +466,8 @@ func (*mockQueryExecutorSuccessOneLinkedReceiptsAndMore) ExecuteSelect(
 	case "SELECT sender_public_key, recipient_public_key, datum_type, datum_hash, reference_block_height, " +
 		"reference_block_hash, rmr_linked, recipient_signature, rmr, rmr_index FROM node_receipt AS rc " +
 		"WHERE rc.rmr = ? AND NOT EXISTS (SELECT datum_hash FROM published_receipt AS pr WHERE " +
-		"pr.datum_hash = rc.datum_hash AND pr.recipient_public_key = rc.recipient_public_key) " +
+		"pr.datum_hash = rc.datum_hash AND pr.recipient_public_key = rc.recipient_public_key AND " +
+		"block_height BETWEEN 280 AND 1000) " +
 		"GROUP BY recipient_public_key":
 		mock.ExpectQuery(regexp.QuoteMeta(qe)).WillReturnRows(sqlmock.NewRows([]string{
 			"sender_public_key",