add replacer for newline in symbols&names.

diadata-org · Aug 7, 2023 · e657782 · e657782
1 parent c778048
commit e657782
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 14 deletions.
diff --git a/cmd/services/filtersBlockService/go.mod b/cmd/services/filtersBlockService/go.mod
@@ -3,7 +3,7 @@ module github.com/diadata-org/diadata/services/filtersBlockService
 go 1.17
 
 require (
-	github.com/diadata-org/diadata v1.4.297
+	github.com/diadata-org/diadata v1.4.321
 	github.com/segmentio/kafka-go v0.4.35
 	github.com/sirupsen/logrus v1.8.1
 )

diff --git a/cmd/services/tradesBlockService/go.mod b/cmd/services/tradesBlockService/go.mod
@@ -3,7 +3,7 @@ module github.com/diadata-org/diadata/services/tradesBlockService
 go 1.17
 
 require (
-	github.com/diadata-org/diadata v1.4.319
+	github.com/diadata-org/diadata v1.4.321
 	github.com/segmentio/kafka-go v0.4.35
 	github.com/sirupsen/logrus v1.8.1
 )

diff --git a/pkg/model/db.go b/pkg/model/db.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/diadata-org/diadata/pkg/dia/helpers/db"
@@ -153,6 +154,8 @@ type DB struct {
 	influxPointsInBatch int
 }
 
+var EscapeReplacer = strings.NewReplacer("\n", `\n`)
+
 const (
 	influxDbName                      = "dia"
 	influxDbTradesTable               = "trades"
@@ -312,7 +315,7 @@ func (datastore *DB) CopyInfluxMeasurements(dbOrigin string, dbDestination strin
 
 func (datastore *DB) SetVWAPFirefly(foreignName string, value float64, timestamp time.Time) error {
 	tags := map[string]string{
-		"foreignName": foreignName,
+		"foreignName": EscapeReplacer.Replace(foreignName),
 	}
 	fields := map[string]interface{}{
 		"value": value,

diff --git a/pkg/model/filters.go b/pkg/model/filters.go
@@ -230,8 +230,8 @@ func (datastore *DB) SaveFilterInflux(filter string, asset dia.Asset, exchange s
 	// Create a point and add to batch
 	tags := map[string]string{
 		"filter":     filter,
-		"symbol":     asset.Symbol,
-		"address":    asset.Address,
+		"symbol":     EscapeReplacer.Replace(asset.Symbol),
+		"address":    EscapeReplacer.Replace(asset.Address),
 		"blockchain": asset.Blockchain,
 		"exchange":   exchange,
 	}

diff --git a/pkg/model/quotation.go b/pkg/model/quotation.go
@@ -77,8 +77,8 @@ func (datastore *DB) GetAssetPriceUSD(asset dia.Asset, timestamp time.Time) (pri
 func (datastore *DB) AddAssetQuotationsToBatch(quotations []*AssetQuotation) error {
 	for _, quotation := range quotations {
 		tags := map[string]string{
-			"symbol":     quotation.Asset.Symbol,
-			"name":       quotation.Asset.Name,
+			"symbol":     EscapeReplacer.Replace(quotation.Asset.Symbol),
+			"name":       EscapeReplacer.Replace(quotation.Asset.Name),
 			"address":    quotation.Asset.Address,
 			"blockchain": quotation.Asset.Blockchain,
 		}
@@ -99,8 +99,8 @@ func (datastore *DB) AddAssetQuotationsToBatch(quotations []*AssetQuotation) err
 func (datastore *DB) SetAssetQuotation(quotation *AssetQuotation) error {
 	// Write to influx
 	tags := map[string]string{
-		"symbol":     quotation.Asset.Symbol,
-		"name":       quotation.Asset.Name,
+		"symbol":     EscapeReplacer.Replace(quotation.Asset.Symbol),
+		"name":       EscapeReplacer.Replace(quotation.Asset.Name),
 		"address":    quotation.Asset.Address,
 		"blockchain": quotation.Asset.Blockchain,
 	}

diff --git a/pkg/model/supplies.go b/pkg/model/supplies.go
@@ -32,8 +32,8 @@ func (datastore *DB) SaveSupplyInflux(supply *dia.Supply) error {
 		"source":            supply.Source,
 	}
 	tags := map[string]string{
-		"symbol":     supply.Asset.Symbol,
-		"name":       supply.Asset.Name,
+		"symbol":     EscapeReplacer.Replace(supply.Asset.Symbol),
+		"name":       EscapeReplacer.Replace(supply.Asset.Name),
 		"address":    supply.Asset.Address,
 		"blockchain": supply.Asset.Blockchain,
 	}

diff --git a/pkg/model/synthAssets.go b/pkg/model/synthAssets.go
@@ -21,8 +21,8 @@ func (datastore *DB) SaveSynthSupplyInfluxToTable(t *dia.SynthAssetSupply, table
 
 	// Create a point and add to batch
 	tags := map[string]string{
-		"synthassetsymbol":       t.Asset.Symbol,
-		"underlyingassetsymbol":  t.AssetUnderlying.Symbol,
+		"synthassetsymbol":       EscapeReplacer.Replace(t.Asset.Symbol),
+		"underlyingassetsymbol":  EscapeReplacer.Replace(t.AssetUnderlying.Symbol),
 		"synthtokenaddress":      t.Asset.Address,
 		"underlyingtokenaddress": t.AssetUnderlying.Address,
 		"blockchain":             t.Asset.Blockchain,

diff --git a/pkg/model/trades.go b/pkg/model/trades.go
@@ -24,7 +24,7 @@ func (datastore *DB) SaveTradeInfluxToTable(t *dia.Trade, table string) error {
 
 	// Create a point and add to batch
 	tags := map[string]string{
-		"symbol":               t.Symbol,
+		"symbol":               EscapeReplacer.Replace(t.Symbol),
 		"pair":                 t.Pair,
 		"exchange":             t.Source,
 		"verified":             strconv.FormatBool(t.VerifiedPair),