hot fix: update db call and modify response

config.yaml

@@ -9,7 +9,7 @@ listener:
   addr: :8000
 
 networks:
-  list:
+  keys:
     - name: 'Ethereum'
       rpc: "https://mainnet.infura.io/v3/5afc5eb6b4424ad39f8c0db22125074a"
     - name: 'Polygon'

docs/spec/components/schemas/TxBlob.yaml

@@ -3,13 +3,16 @@ required:
   - payment_id
   - tx_hash
   - recipient
-  - network
+  - network_from
+  - network_to
 properties:
   payment_id:
     type: string
   recipient:
     type: string
   tx_hash:
     type: string
-  network:
+  network_from:
+    type: string
+  network_to:
     type: string

internal/config/networks.go

@@ -12,7 +12,7 @@ type NetworkConfiger interface {
 }
 
 type Network struct {
-	NetInfoList []NetInfo `fig:"list"`
+	NetInfoList []NetInfo `fig:"keys"`
 }
 
 type NetInfo struct {

internal/data/pg/master.go

@@ -12,12 +12,12 @@ type masterQ struct {
 
 func NewMasterQ(db *pgdb.DB) data.MasterQ {
 	return &masterQ{
-		db: db.Clone(),
+		db: db,
 	}
 }
 
 func (q *masterQ) New() data.MasterQ {
-	return NewMasterQ(q.db)
+	return NewMasterQ(q.db.Clone())
 }
 
 func (q *masterQ) TransactionsQ() data.TransactionsQ {

internal/data/pg/transactions.go

@@ -1,7 +1,6 @@
 package pg
 
 import (
-	"database/sql"
 	"fmt"
 	sq "github.com/Masterminds/squirrel"
 	"github.com/dl-only-tokens/back-listener/internal/data"
@@ -14,7 +13,7 @@ const transactionTableName = "transactions"
 
 const (
 	idField      = "id"
-	addressField = "address"
+	addressField = "recipient"
 )
 
 func NewTransactionsQ(db *pgdb.DB) data.TransactionsQ {
@@ -36,9 +35,6 @@ func (q *TransactionsQ) New() data.TransactionsQ {
 func (q *TransactionsQ) Select() ([]data.Transactions, error) {
 	var result []data.Transactions
 	err := q.db.Select(&result, q.sql)
-	if err == sql.ErrNoRows {
-		return nil, nil
-	}
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to select txs")
 	}

internal/service/api/handlers/get_tx_lists.go

@@ -1,6 +1,8 @@
 package handlers
 
 import (
+	"database/sql"
+	"errors"
 	"github.com/dl-only-tokens/back-listener/internal/data"
 	"github.com/dl-only-tokens/back-listener/internal/service/api/requests"
 	"github.com/dl-only-tokens/back-listener/resources"
@@ -19,15 +21,16 @@ func GetTxLists(w http.ResponseWriter, r *http.Request) {
 
 	txs, err := MasterQ(r).TransactionsQ().New().FilterByAddress(req.Address).Select()
 	if err != nil {
+		if errors.Is(err, sql.ErrNoRows) {
+			Log(r).WithError(err).Error("failed to empty select list")
+			ape.Render(w, resources.GetTxListResponse{})
+			return
+		}
+
 		Log(r).WithError(err).Error("failed to select txs by address")
 		ape.RenderErr(w, problems.InternalError())
 		return
 	}
-	if txs == nil {
-		Log(r).WithError(err).Error("failed to empty select list")
-		ape.RenderErr(w, problems.InternalError())
-		return
-	}
 
 	ape.Render(w, prepareResponse(txs))
 }
@@ -36,9 +39,11 @@ func prepareResponse(txs []data.Transactions) resources.GetTxListResponse {
 	txBlobs := make([]resources.TxBlob, 0)
 	for _, tx := range txs {
 		blob := resources.TxBlob{
-			PaymentId: tx.PaymentID,
-			Recipient: tx.Recipient,
-			TxHash:    tx.TxHash,
+			NetworkFrom: tx.NetworkFrom,
+			NetworkTo:   tx.NetworkTo,
+			PaymentId:   tx.PaymentID,
+			Recipient:   tx.Recipient,
+			TxHash:      tx.TxHash,
 		}
 		txBlobs = append(txBlobs, blob)
 	}

internal/service/core/listener/listenr.go

@@ -119,10 +119,8 @@ func (l *ListenData) Run() {
 
 func (l *ListenData) getTxIntputsOnBlock(txHashes []RecipientInfo, block *types.Block) map[string][]string {
 	result := make(map[string][]string)
-
 	for _, info := range txHashes {
 		tx := block.Transaction(info.TxHash)
-		l.log.Debug(hex.EncodeToString(tx.Data()))
 
 		parsedData, err := l.parsePayloadOnInput(hex.EncodeToString(tx.Data()), l.txMetaData.Header, l.txMetaData.Footer) //todo header
 		if err != nil {
@@ -135,6 +133,7 @@ func (l *ListenData) getTxIntputsOnBlock(txHashes []RecipientInfo, block *types.
 	return result
 }
 
+// parse some encoded info(payment id,  network  from  and  network  to ) from tx data
 func (l *ListenData) parsePayloadOnInput(input string, header string, footer string) ([]string, error) { //move to  another class
 	index := strings.Index(input, header)
 	if index == -1 {

internal/service/core/rarimo/api.go

@@ -27,14 +27,14 @@ func (h RarimoApi) GetContractsAddresses() ([]config.NetInfo, error) {
 		return nil, errors.Wrap(err, "failed to send request")
 	}
 
-	if resp.StatusCode >= 300 && resp.StatusCode < 500 {
-		return nil, errors.New("bad response code")
+	if resp.StatusCode >= 300 {
+		return nil, errors.New("failed get contract addresses via rarimo api: bad response code")
 	}
 
 	decodedResponse := new(NetworkListResponse)
 
 	if err := json.NewDecoder(resp.Body).Decode(&decodedResponse); err != nil {
-		return nil, errors.New("failed to decode response ")
+		return nil, errors.Wrap(err, "failed to decode response ")
 	}
 	return h.parseResponse(decodedResponse.Data), nil
 }

resources/model_tx_blob.go

@@ -5,8 +5,9 @@
 package resources
 
 type TxBlob struct {
-	Network   string `json:"network"`
-	PaymentId string `json:"payment_id"`
-	Recipient string `json:"recipient"`
-	TxHash    string `json:"tx_hash"`
+	NetworkFrom string `json:"network_from"`
+	NetworkTo   string `json:"network_to"`
+	PaymentId   string `json:"payment_id"`
+	Recipient   string `json:"recipient"`
+	TxHash      string `json:"tx_hash"`
 }