Merge pull request #113 from ElrondNetwork/fix-api

Fix api

process/accountProcessor.go

@@ -2,6 +2,7 @@ package process
 
 import (
 	"errors"
+	"fmt"
 	"net/http"
 
 	"github.com/ElrondNetwork/elrond-go/core"
@@ -102,6 +103,10 @@ func (ap *AccountProcessor) GetValueForKey(address string, key string) (string,
 
 // GetTransactions resolves the request and returns a slice of transaction for the specific address
 func (ap *AccountProcessor) GetTransactions(address string) ([]data.DatabaseTransaction, error) {
+	if _, err := ap.pubKeyConverter.Decode(address); err != nil {
+		return nil, fmt.Errorf("%w, %v", ErrInvalidAddress, err)
+	}
+
 	return ap.connector.GetTransactionsByAddress(address)
 }
 

process/accountProcessor_test.go

@@ -4,7 +4,9 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/ElrondNetwork/elrond-go/config"
 	"github.com/ElrondNetwork/elrond-go/core/pubkeyConverter"
+	"github.com/ElrondNetwork/elrond-go/data/state/factory"
 	"github.com/ElrondNetwork/elrond-go/sharding"
 	"github.com/ElrondNetwork/elrond-proxy-go/data"
 	"github.com/ElrondNetwork/elrond-proxy-go/process"
@@ -281,3 +283,26 @@ func TestAccountProcessor_GetShardIDForAddressShouldError(t *testing.T) {
 	assert.Equal(t, uint32(0), shardID)
 	assert.Equal(t, expectedError, err)
 }
+
+func TestAccountProcessor_GetTransactions(t *testing.T) {
+	t.Parallel()
+
+	converter, _ := factory.NewPubkeyConverter(config.PubkeyConfig{
+		Length: 32,
+		Type:   "bech32",
+	})
+	ap, _ := process.NewAccountProcessor(
+		&mock.ProcessorStub{},
+		converter,
+		&mock.ElasticSearchConnectorMock{},
+	)
+
+	_, err := ap.GetTransactions("invalidAddress")
+	assert.True(t, errors.Is(err, process.ErrInvalidAddress))
+
+	_, err = ap.GetTransactions("")
+	assert.True(t, errors.Is(err, process.ErrInvalidAddress))
+
+	_, err = ap.GetTransactions("erd1ycega644rvjtgtyd8hfzt6hl5ymaa8ml2nhhs5cv045cz5vxm00q022myr")
+	assert.Nil(t, err)
+}

process/database/elasticSearchConnector.go

@@ -37,8 +37,7 @@ func NewElasticSearchConnector(url, username, password string) (*elasticSearchCo
 
 // GetTransactionsByAddress gets transactions TO or FROM the specified address
 func (esc *elasticSearchConnector) GetTransactionsByAddress(address string) ([]data.DatabaseTransaction, error) {
-	query := txsByAddrQuery(address)
-	decodedBody, err := esc.doSearchRequest(query, "transactions", numTopTransactions)
+	decodedBody, err := esc.doSearchRequestTx(address, "transactions", numTopTransactions)
 	if err != nil {
 		return nil, err
 	}
@@ -151,6 +150,33 @@ func (esc *elasticSearchConnector) doSearchRequest(query object, index string, s
 	return decodedBody, nil
 }
 
+func (esc *elasticSearchConnector) doSearchRequestTx(address string, index string, size int) (object, error) {
+	query := fmt.Sprintf("sender:%s OR receiver:%s", address, address)
+	res, err := esc.client.Search(
+		esc.client.Search.WithIndex(index),
+		esc.client.Search.WithSize(size),
+		esc.client.Search.WithQuery(query),
+		esc.client.Search.WithSort("timestamp:desc"),
+	)
+	if err != nil {
+		return nil, fmt.Errorf("cannot get data from database: %w", err)
+	}
+
+	defer func() {
+		_ = res.Body.Close()
+	}()
+	if res.IsError() {
+		return nil, fmt.Errorf("cannot get data from database: %v", res)
+	}
+
+	var decodedBody map[string]interface{}
+	if err := json.NewDecoder(res.Body).Decode(&decodedBody); err != nil {
+		return nil, err
+	}
+
+	return decodedBody, nil
+}
+
 // IsInterfaceNil returns true if there is no value under the interface
 func (esc *elasticSearchConnector) IsInterfaceNil() bool {
 	return esc == nil

process/database/queries.go

@@ -17,32 +17,6 @@ func encodeQuery(query object) (bytes.Buffer, error) {
 	return buff, nil
 }
 
-func txsByAddrQuery(addr string) object {
-	return object{
-		"query": object{
-			"bool": object{
-				"should": []interface{}{
-					object{
-						"match": object{
-							"sender": addr,
-						},
-					},
-					object{
-						"match": object{
-							"receiver": addr,
-						},
-					},
-				},
-			},
-		},
-		"sort": object{
-			"timestamp": object{
-				"order": "desc",
-			},
-		},
-	}
-}
-
 func blockByNonceAndShardIDQuery(nonce uint64, shardID uint32) object {
 	return object{
 		"query": object{

process/mock/elasticSearchConnectorMock.go

@@ -0,0 +1,21 @@
+package mock
+
+import "github.com/ElrondNetwork/elrond-proxy-go/data"
+
+type ElasticSearchConnectorMock struct {
+}
+
+// GetTransactionsByAddress -
+func (escm *ElasticSearchConnectorMock) GetTransactionsByAddress(_ string) ([]data.DatabaseTransaction, error) {
+	return nil, nil
+}
+
+// GetAtlasBlockByShardIDAndNonce -
+func (escm *ElasticSearchConnectorMock) GetAtlasBlockByShardIDAndNonce(_ uint32, _ uint64) (data.AtlasBlock, error) {
+	return data.AtlasBlock{}, nil
+}
+
+// IsInterfaceNil -
+func (escm *ElasticSearchConnectorMock) IsInterfaceNil() bool {
+	return escm == nil
+}