minor improvements of getfeed graphql endpoint.

diadata-org · Aug 3, 2023 · eaf16f6 · eaf16f6
1 parent 0fde4f0
commit eaf16f6
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 11 deletions.
diff --git a/cmd/http/graphqlServer/go.mod b/cmd/http/graphqlServer/go.mod
@@ -3,7 +3,7 @@ module graphqlServer
 go 1.17
 
 require (
-	github.com/diadata-org/diadata v1.4.316
+	github.com/diadata-org/diadata v1.4.320
 	github.com/graph-gophers/graphql-go v1.1.0
 	github.com/sirupsen/logrus v1.8.1
 )

diff --git a/cmd/http/graphqlServer/schema/quotation.graphql b/cmd/http/graphqlServer/schema/quotation.graphql
@@ -143,8 +143,6 @@ type FilterPointExtended {
   Symbol: String
   Time: Time
   Value: Float
-  Address: String
-  Blockchain: String
   Pools: [String!]
   Pairs: [String!]
   TradesCount: Int

diff --git a/pkg/dia/Messages.go b/pkg/dia/Messages.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"math"
 	"math/big"
+	"strings"
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -480,6 +481,25 @@ func (t *Trade) VolumeUSD() float64 {
 	return t.EstimatedUSDPrice * math.Abs(t.Volume)
 }
 
+// NormalizeSymbols normalizes @t.Symbol and @t.Pair in a trade struct to
+// upper case letters like so A@pairSplitterB. For instance, btcusdt will be BTC-USDT.
+func (t *Trade) NormalizeSymbols(upperCase bool, pairSplitter string) error {
+	symbols, err := GetPairSymbols(ExchangePair{Exchange: t.Source, ForeignName: t.Pair, Symbol: t.Symbol})
+	if err != nil {
+		return err
+	}
+	if len(symbols) == 2 {
+		if upperCase {
+			t.Pair = strings.ToUpper(symbols[0] + pairSplitter + symbols[1])
+			t.Symbol = strings.ToUpper(symbols[0])
+		} else {
+			t.Pair = strings.ToLower(symbols[0] + pairSplitter + symbols[1])
+			t.Symbol = strings.ToLower(symbols[0])
+		}
+	}
+	return nil
+}
+
 // SynthAssetSupply is a container for data on synthetic assets such as aUSDC.
 // https://etherscan.io/address/0xbcca60bb61934080951369a648fb03df4f96263c
 type SynthAssetSupply struct {

diff --git a/pkg/dia/helpers/queryHelper/blockgenerator.go b/pkg/dia/helpers/queryHelper/blockgenerator.go
@@ -10,6 +10,10 @@ var (
 	EXCHANGES = scrapers.Exchanges
 )
 
+const (
+	PAIR_SPLITTER = "-"
+)
+
 type Block struct {
 	Trades    []dia.Trade
 	TimeStamp int64
@@ -27,6 +31,10 @@ func (b *Block) GetBlockSources() (pairs []dia.ExchangePair, pools []dia.Pool) {
 
 	for _, t := range b.Trades {
 		if EXCHANGES[t.Source].Centralized {
+			err := t.NormalizeSymbols(true, PAIR_SPLITTER)
+			if err != nil {
+				log.Errorf("NormalizeSymbols on pair %s and exchange %s: %v", t.Pair, t.Source, err)
+			}
 			if _, ok := pairsCheckMap[t.Source+t.Pair]; !ok {
 				pairs = append(pairs, dia.ExchangePair{Exchange: t.Source, ForeignName: t.Pair})
 				pairsCheckMap[t.Source+t.Pair] = struct{}{}

diff --git a/pkg/graphql/resolver/feedresolver.go b/pkg/graphql/resolver/feedresolver.go
@@ -27,14 +27,6 @@ func (qr *FilterPointExtendedResolver) Value(ctx context.Context) (*float64, err
 	return &qr.q.FilterPoint.Value, nil
 }
 
-func (qr *FilterPointExtendedResolver) Address(ctx context.Context) (*string, error) {
-	return &qr.q.FilterPoint.Asset.Address, nil
-}
-
-func (qr *FilterPointExtendedResolver) Blockchain(ctx context.Context) (*string, error) {
-	return &qr.q.FilterPoint.Asset.Blockchain, nil
-}
-
 func (qr *FilterPointExtendedResolver) Pools(ctx context.Context) (*[]string, error) {
 	pools := []string{}
 	for _, p := range qr.q.Pools {